From 21b72ca52af6c9a825729df6c1e186228fff959e Mon Sep 17 00:00:00 2001 From: houjunxiang Date: Mon, 9 Feb 2026 17:13:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=88=86=E6=9E=90=E7=AE=A1=E7=90=86select?= =?UTF-8?q?-data?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- defaultBaseUrl.js | 2 +- manifest.json | 10 +- nx/api/material.js | 17 ++ pages.json | 9 +- .../analysis/sample/components/task-item.vue | 4 +- .../analysis/sample/sample-work-edit-task.vue | 13 +- pages/material/outbound/index.vue | 172 ++++++++++++++++++ static/images/menus/inventoryCheck.png | Bin 0 -> 7457 bytes static/images/menus/outbound.png | Bin 0 -> 6995 bytes static/images/menus/sign.png | Bin 0 -> 9570 bytes static/images/menus/useRecords.png | Bin 0 -> 7041 bytes 11 files changed, 214 insertions(+), 13 deletions(-) create mode 100644 pages/material/outbound/index.vue create mode 100644 static/images/menus/inventoryCheck.png create mode 100644 static/images/menus/outbound.png create mode 100644 static/images/menus/sign.png create mode 100644 static/images/menus/useRecords.png 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'" /> + /> +