feat:分析管理select-data

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'
 

manifest.json

@@ -2,8 +2,8 @@
     "name" : "实验室管理系统",
     "appid" : "__UNI__4B3B4B0",
     "description" : "实验室管理系统",
-    "versionName" : "1.1.0",
+    "versionName" : "1.1.2",
-    "versionCode" : 110,
+    "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
         }

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
+    })
+}

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"
 			}
 		},

pages/analysis/sample/components/task-item.vue

@@ -14,7 +14,7 @@
         <view class="mt8 mb8">{{ task.taskName }}{{ task.assayOper }}</view>
         <view class="x-f">
           <u-icon name="clock"></u-icon>
-          <text class="ml5">{{ taskOperatorTime }}</text>
+          <text class="ml5">{{ taskAssignTime }}</text>
         </view>
       </u-col>
     </u-row>
@@ -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 = () => {

pages/analysis/sample/sample-work-edit-task.vue

@@ -35,10 +35,12 @@
                   :disabled="field.disabled || field.fillingWay == 'calculate'"
                 />
                 <uni-data-select
-                  v-if="field.type == 'Select' || field.type == 'HtmlSelect'"
+                  v-if="field.type == 'Select'"
                   v-model="field.value"
+                  :multiple="field.multiple"
                   :localdata="field.options"
-                >
+                />
+                <uni-data-select v-if="field.type == 'HtmlSelect'" v-model="field.value" :localdata="field.options">
                   <template v-slot:selected="{ selectedItems }">
                     <view v-if="selectedItems.length == 0" style="color: #c0c4cc"> 请选择 </view>
                     <view v-else v-html="selectedItems[0].value"> </view>
@@ -46,7 +48,7 @@
                   <template v-slot:option="{ item, itemSelected }">
                     <uni-list-item :disabled="item.disable">
                       <template #body>
-                        <view v-html="item.label"></view>
+                        <view v-html="item.text"></view>
                       </template>
                     </uni-list-item>
                   </template>
@@ -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