diff --git a/defaultBaseUrl.js b/defaultBaseUrl.js
index 1b95b15..e048450 100644
--- a/defaultBaseUrl.js
+++ b/defaultBaseUrl.js
@@ -6,7 +6,7 @@ const upgradeBaseUrl = isDev ? 'http://172.17.19.29:48080/admin-api' : 'http://1
const websocketUrl = isDev ? 'ws://172.17.19.11:30330' : 'ws://172.17.19.11:30330'
// 公司测试环境
-// const BaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
+// const BaseUrl = isDev ? 'http://192.168.26.253:48080/admin-api' : 'http://192.168.26.116:888/admin-api'
// const upgradeBaseUrl = isDev ? 'http://192.168.26.116:888/admin-api' : 'http://192.168.26.116:888/admin-api'
// const websocketUrl = isDev ? 'ws://192.168.26.116:888/ws' : 'ws://192.168.26.116:888/ws'
diff --git a/manifest.json b/manifest.json
index 3b7001c..b7336a2 100644
--- a/manifest.json
+++ b/manifest.json
@@ -2,8 +2,8 @@
"name" : "实验室管理系统",
"appid" : "__UNI__4B3B4B0",
"description" : "实验室管理系统",
- "versionName" : "1.1.0",
- "versionCode" : 110,
+ "versionName" : "1.1.2",
+ "versionCode" : 112,
"transformPx" : false,
"app-plus" : {
"usingComponents" : true,
@@ -95,21 +95,21 @@
/* 可选,JSON对象,应用UserAgent相关配置 **/
"useragent" : {
/* 可选,字符串类型,设置的默认userAgent值 */
- "value" : "LIMS-PDA/1.1.0",
+ "value" : "LIMS-PDA/1.1.2",
/* 可选,Boolean类型,是否将value值作为追加值连接到系统默认userAgent值之后 */
"concatenate" : true
},
/* 可选,JSON对象,Android平台应用UserAgent相关配置,优先级高于useragent配置 */
"useragent_android" : {
/* 可选,字符串类型,设置的默认userAgent值 */
- "value" : "LIMS-PDA/1.1.0",
+ "value" : "LIMS-PDA/1.1.2",
/* 可选,Boolean类型,是否将value值作为追加值连接到系统默认userAgent值之后 */
"concatenate" : true
},
/* 可选,JSON对象,iOS平台应用UserAgent相关配置,优先级高于useragent配置 */
"useragent_ios" : {
/* 可选,字符串类型,设置的默认userAgent值 */
- "value" : "LIMS-PDA/1.1.0",
+ "value" : "LIMS-PDA/1.1.2",
/* 可选,Boolean类型,是否将value值作为追加值连接到系统默认userAgent值之后 */
"concatenate" : true
}
diff --git a/nx/api/material.js b/nx/api/material.js
index e69de29..1641864 100644
--- a/nx/api/material.js
+++ b/nx/api/material.js
@@ -0,0 +1,17 @@
+import request from '@/nx/request'
+export default {
+ // 查询物料信息
+ queryMaterialInfo: params =>
+ request({
+ url: '/qms/resource/material-infomation/get-by-code',
+ method: 'GET',
+ params
+ }),
+ // 物料出库
+ execMaterialOut: data =>
+ request({
+ url: '/qms/resource/material-inventory-outbound/add',
+ method: 'POST',
+ data
+ })
+}
diff --git a/pages.json b/pages.json
index 60c00a6..56f0bf5 100644
--- a/pages.json
+++ b/pages.json
@@ -298,7 +298,14 @@
{
"path": "pages/material/inbound/index",
"style": {
- "navigationBarTitleText": "物料列表",
+ "navigationBarTitleText": "入库",
+ "navigationStyle": "custom"
+ }
+ },
+ {
+ "path": "pages/material/outbound/index",
+ "style": {
+ "navigationBarTitleText": "出库",
"navigationStyle": "custom"
}
},
diff --git a/pages/analysis/sample/components/task-item.vue b/pages/analysis/sample/components/task-item.vue
index f42decb..e911d97 100644
--- a/pages/analysis/sample/components/task-item.vue
+++ b/pages/analysis/sample/components/task-item.vue
@@ -14,7 +14,7 @@
{{ task.taskName }}{{ task.assayOper }}
- {{ taskOperatorTime }}
+ {{ taskAssignTime }}
@@ -39,7 +39,7 @@ const props = defineProps({
}
})
-const taskOperatorTime = nx.$dayjs(props.task.taskOperatorTime).format('YYYY-MM-DD HH:mm:ss')
+const taskAssignTime = nx.$dayjs(props.task.taskAssignTime).format('YYYY-MM-DD HH:mm:ss')
const emit = defineEmits(['click'])
const handleClick = () => {
diff --git a/pages/analysis/sample/sample-work-edit-task.vue b/pages/analysis/sample/sample-work-edit-task.vue
index 65d9fa1..13ae59a 100644
--- a/pages/analysis/sample/sample-work-edit-task.vue
+++ b/pages/analysis/sample/sample-work-edit-task.vue
@@ -35,10 +35,12 @@
:disabled="field.disabled || field.fillingWay == 'calculate'"
/>
+ />
+
请选择
@@ -46,7 +48,7 @@
-
+
@@ -164,7 +166,10 @@ async function loadTaskDetail() {
hidden: false
}
if (customConfig?.componentProps?.options) {
- field.options = customConfig.componentProps.options
+ field.options = customConfig.componentProps.options.map(option => ({ value: option.value, text: option.label }))
+ }
+ if (customConfig?.componentProps?.multiple) {
+ field.multiple = true
}
if (customConfig.hidden) {
field.hidden = true
diff --git a/pages/material/outbound/index.vue b/pages/material/outbound/index.vue
new file mode 100644
index 0000000..2a23042
--- /dev/null
+++ b/pages/material/outbound/index.vue
@@ -0,0 +1,172 @@
+
+
+
+
+ 领用人:
+
+
+ 库管员:{{ userInfo.nickname }}
+
+
+
+
+
+
+
+
+
+ 物料编号:{{ item.code }}
+
+
+ 物料名称:{{ item.name }}
+
+ 规格型号:{{ item.modelNo }}
+ 单位:{{ item.unit }}
+
+
+
+ 溶液名称:{{ item.code }}
+
+
+ 规格:{{ item.name }}
+
+ 滴定系数:{{ item.titer }}
+ 配置人:{{ item.makeUser }}
+ 配置日期:{{ nx.$dayjs(item.makeDate).format('YYYY-MM-DD') }}
+ 有效期:{{ nx.$dayjs(item.dueDate).format('YYYY-MM-DD') }}
+ 备注:{{ item.solutionRemark }}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/static/images/menus/inventoryCheck.png b/static/images/menus/inventoryCheck.png
new file mode 100644
index 0000000..f78d591
Binary files /dev/null and b/static/images/menus/inventoryCheck.png differ
diff --git a/static/images/menus/outbound.png b/static/images/menus/outbound.png
new file mode 100644
index 0000000..d111d4c
Binary files /dev/null and b/static/images/menus/outbound.png differ
diff --git a/static/images/menus/sign.png b/static/images/menus/sign.png
new file mode 100644
index 0000000..7ce4327
Binary files /dev/null and b/static/images/menus/sign.png differ
diff --git a/static/images/menus/useRecords.png b/static/images/menus/useRecords.png
new file mode 100644
index 0000000..aff5cc3
Binary files /dev/null and b/static/images/menus/useRecords.png differ