From 904d1c4ea471802f8dff57eb9f2aecca89512e61 Mon Sep 17 00:00:00 2001
From: houjunxiang <hjx@example.com>
Date: Fri, 20 Mar 2026 17:56:17 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=BE=E5=A4=87=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/n-upload/n-upload.vue              |   2 +-
 manifest.json                                 | 261 +++++++-------
 pages.json                                    |   4 +-
 .../analysis/sample/sample-work-edit-task.vue |  13 +-
 pages/device/deviceBusDailyCheck/detail.vue   | 294 ++++++++--------
 pages/device/deviceBusDailyCheck/index.vue    |   4 +
 pages/device/deviceBusMaintain/detail.vue     | 320 ++++++++++--------
 pages/device/deviceBusMaintain/index.vue      |   4 +
 .../deviceBusUseRecord/SampleSelectPopup.vue  |  55 +--
 pages/device/deviceBusUseRecord/index.vue     |  25 +-
 pages/material/index/index.vue                |   2 +-
 pages/material/openMark/index.vue             |   5 +-
 pages/material/outbound/index.vue             |  37 +-
 pages/material/useRecord/useForm.vue          |   3 +-
 pages/material/useUpMark/index.vue            |   3 +-
 15 files changed, 564 insertions(+), 468 deletions(-)

diff --git a/components/n-upload/n-upload.vue b/components/n-upload/n-upload.vue
index 2b56151..0ddb0ad 100644
--- a/components/n-upload/n-upload.vue
+++ b/components/n-upload/n-upload.vue
@@ -50,7 +50,7 @@ watch(
   newVal => {
     if (!newVal) return (fileList.value = [])
     const urls = Array.isArray(newVal) ? newVal : newVal.split(',')
-    imgs.value = urls.map(url => url.previewUrl)
+    imgs.value = urls.map(url => url.url)
     fileList.value = urls.map(url => ({
       url: url.url,
       status: 'success',
diff --git a/manifest.json b/manifest.json
index 0bc9b69..23bfa3c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,31 +1,31 @@
 {
-    "name": "实验室管理系统",
-    "appid": "__UNI__4B3B4B0",
-    "description": "实验室管理系统",
-    "versionName": "1.1.6",
-    "versionCode": 116,
-    "transformPx": false,
-    "app-plus": {
-        "usingComponents": true,
-        "nvueCompiler": "uni-app",
-        "compilerVersion": 3,
-        "splashscreen": {
-            "alwaysShowBeforeRender": true,
-            "waiting": true,
-            "autoclose": true,
-            "delay": 0
+    "name" : "实验室管理系统",
+    "appid" : "__UNI__4B3B4B0",
+    "description" : "实验室管理系统",
+    "versionName" : "1.1.7",
+    "versionCode" : 117,
+    "transformPx" : false,
+    "app-plus" : {
+        "usingComponents" : true,
+        "nvueCompiler" : "uni-app",
+        "compilerVersion" : 3,
+        "splashscreen" : {
+            "alwaysShowBeforeRender" : true,
+            "waiting" : true,
+            "autoclose" : true,
+            "delay" : 0
         },
-        "modules": {
-            "LivePusher": {},
-            "Camera": {}
+        "modules" : {
+            "LivePusher" : {},
+            "Camera" : {}
         },
-        "distribute": {
-            "android": {
-                "packagename": "tech.zzjc.mas.zgtylims",
-                "keystore": "zzjc_android.jks",
-                "password": "zzjc@20190226",
-                "aliasname": "app",
-                "permissions": [
+        "distribute" : {
+            "android" : {
+                "packagename" : "tech.zzjc.mas.zgtylims",
+                "keystore" : "zzjc_android.jks",
+                "password" : "zzjc@20190226",
+                "aliasname" : "app",
+                "permissions" : [
                     "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
                     "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
                     "<uses-permission android:name=\"android.permission.READ_CONTACTS\"/>",
@@ -50,158 +50,155 @@
                     "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
                 ]
             },
-            "ios": {
-                "dSYMs": false
+            "ios" : {
+                "dSYMs" : false
             },
-            "harmony": {
-                "permissions": [
-                    "ohos.permission.INTERNET",
-                    "ohos.permission.GET_NETWORK_INFO"
-                ],
-                "package": "zzjc.test.app",
-                "compatibleSdkVersion": 5
+            "harmony" : {
+                "permissions" : [ "ohos.permission.INTERNET", "ohos.permission.GET_NETWORK_INFO" ],
+                "package" : "zzjc.test.app",
+                "compatibleSdkVersion" : 5
             },
-            "sdkConfigs": {},
-            "icons": {
-                "android": {
-                    "hdpi": "unpackage/res/icons/72x72.png",
-                    "xhdpi": "unpackage/res/icons/96x96.png",
-                    "xxhdpi": "unpackage/res/icons/144x144.png",
-                    "xxxhdpi": "unpackage/res/icons/192x192.png"
+            "sdkConfigs" : {},
+            "icons" : {
+                "android" : {
+                    "hdpi" : "unpackage/res/icons/72x72.png",
+                    "xhdpi" : "unpackage/res/icons/96x96.png",
+                    "xxhdpi" : "unpackage/res/icons/144x144.png",
+                    "xxxhdpi" : "unpackage/res/icons/192x192.png"
                 },
-                "ios": {
-                    "appstore": "unpackage/res/icons/1024x1024.png",
-                    "ipad": {
-                        "app": "unpackage/res/icons/76x76.png",
-                        "app@2x": "unpackage/res/icons/152x152.png",
-                        "notification": "unpackage/res/icons/20x20.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "proapp@2x": "unpackage/res/icons/167x167.png",
-                        "settings": "unpackage/res/icons/29x29.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "spotlight": "unpackage/res/icons/40x40.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png"
+                "ios" : {
+                    "appstore" : "unpackage/res/icons/1024x1024.png",
+                    "ipad" : {
+                        "app" : "unpackage/res/icons/76x76.png",
+                        "app@2x" : "unpackage/res/icons/152x152.png",
+                        "notification" : "unpackage/res/icons/20x20.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "proapp@2x" : "unpackage/res/icons/167x167.png",
+                        "settings" : "unpackage/res/icons/29x29.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "spotlight" : "unpackage/res/icons/40x40.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png"
                     },
-                    "iphone": {
-                        "app@2x": "unpackage/res/icons/120x120.png",
-                        "app@3x": "unpackage/res/icons/180x180.png",
-                        "notification@2x": "unpackage/res/icons/40x40.png",
-                        "notification@3x": "unpackage/res/icons/60x60.png",
-                        "settings@2x": "unpackage/res/icons/58x58.png",
-                        "settings@3x": "unpackage/res/icons/87x87.png",
-                        "spotlight@2x": "unpackage/res/icons/80x80.png",
-                        "spotlight@3x": "unpackage/res/icons/120x120.png"
+                    "iphone" : {
+                        "app@2x" : "unpackage/res/icons/120x120.png",
+                        "app@3x" : "unpackage/res/icons/180x180.png",
+                        "notification@2x" : "unpackage/res/icons/40x40.png",
+                        "notification@3x" : "unpackage/res/icons/60x60.png",
+                        "settings@2x" : "unpackage/res/icons/58x58.png",
+                        "settings@3x" : "unpackage/res/icons/87x87.png",
+                        "spotlight@2x" : "unpackage/res/icons/80x80.png",
+                        "spotlight@3x" : "unpackage/res/icons/120x120.png"
                     }
                 }
             }
         },
         /* 可选，JSON对象，应用UserAgent相关配置 **/
-        "useragent": {
+        "useragent" : {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value": "LIMS-PDA/1.1.6",
+            "value" : "LIMS-PDA/1.1.7",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
-            "concatenate": true
+            "concatenate" : true
         },
         /* 可选，JSON对象，Android平台应用UserAgent相关配置，优先级高于useragent配置 */
-        "useragent_android": {
+        "useragent_android" : {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value": "LIMS-PDA/1.1.6",
+            "value" : "LIMS-PDA/1.1.7",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
-            "concatenate": true
+            "concatenate" : true
         },
         /* 可选，JSON对象，iOS平台应用UserAgent相关配置，优先级高于useragent配置 */
-        "useragent_ios": {
+        "useragent_ios" : {
             /* 可选，字符串类型，设置的默认userAgent值 */
-            "value": "LIMS-PDA/1.1.6",
+            "value" : "LIMS-PDA/1.1.7",
             /* 可选，Boolean类型，是否将value值作为追加值连接到系统默认userAgent值之后 */
-            "concatenate": true
+            "concatenate" : true
         }
     },
-    "quickapp": {},
-    "mp-weixin": {
-        "appid": "",
-        "setting": {
-            "urlCheck": false,
-            "minified": false
+    "quickapp" : {},
+    "mp-weixin" : {
+        "appid" : "",
+        "setting" : {
+            "urlCheck" : false,
+            "minified" : false
         },
-        "optimization": {
-            "subPackages": true
+        "optimization" : {
+            "subPackages" : true
         },
-        "usingComponents": true,
-        "mergeVirtualHostAttributes": true
+        "usingComponents" : true,
+        "mergeVirtualHostAttributes" : true
     },
-    "mp-alipay": {
-        "usingComponents": true
+    "mp-alipay" : {
+        "usingComponents" : true
     },
-    "mp-baidu": {
-        "usingComponents": true
+    "mp-baidu" : {
+        "usingComponents" : true
     },
-    "mp-toutiao": {
-        "usingComponents": true
+    "mp-toutiao" : {
+        "usingComponents" : true
     },
-    "uniStatistics": {
-        "enable": false
+    "uniStatistics" : {
+        "enable" : false
     },
-    "vueVersion": "3",
-    "h5": {
-        "devServer": {
-            "port": 33888,
-            "https": false,
-            "proxy": {
-                "/api": {
+    "vueVersion" : "3",
+    "h5" : {
+        "devServer" : {
+            "port" : 33888,
+            "https" : false,
+            "proxy" : {
+                "/api" : {
                     // "target" : "http://mas.new.will-way.cn/api/",
                     //"target" : "http://192.168.31.180:9090/",
-                    "target": "http://127.0.0.1:9999/",
-                    "changeOrigin": true,
-                    "ws": true,
-                    "pathRewrite": {
-                        "^/api": ""
+                    "target" : "http://127.0.0.1:9999/",
+                    "changeOrigin" : true,
+                    "ws" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
                     }
                 },
-                "/sys": {
+                "/sys" : {
                     // "target" : "http://mas.new.will-way.cn/api/",
                     //"target" : "http://192.168.31.180:9090/",
-                    "target": "http://127.0.0.1:9999/sys",
-                    "changeOrigin": true,
-                    "ws": true,
-                    "pathRewrite": {
-                        "^/api": ""
+                    "target" : "http://127.0.0.1:9999/sys",
+                    "changeOrigin" : true,
+                    "ws" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
                     }
                 },
-                "/report": {
-                    "target": "http://127.0.0.1:9999/report/",
-                    "changeOrigin": true,
-                    "ws": true,
-                    "pathRewrite": {
-                        "^/api": ""
+                "/report" : {
+                    "target" : "http://127.0.0.1:9999/report/",
+                    "changeOrigin" : true,
+                    "ws" : true,
+                    "pathRewrite" : {
+                        "^/api" : ""
                     }
                 }
             }
         },
-        "optimization": {
-            "treeShaking": {
-                "enable": true
+        "optimization" : {
+            "treeShaking" : {
+                "enable" : true
             }
         },
-        "router": {
-            "base": "./"
+        "router" : {
+            "base" : "./"
         },
-        "template": "template.h5.html"
+        "template" : "template.h5.html"
     },
-    "app-harmony": {
-        "distribute": {
-            "bundleName": "zzjc.test.app",
-            "signingConfigs": {
-                "default": {
-                    "certpath": "certs\\DebugCert.cer",
-                    "keyAlias": "zzjc-test",
-                    "keyPassword": "0000001A62465932FE19E037517BC61FE03A8F9D69CB7892019EEC82A5A07691ECAE824A92BAD8FAEB34",
-                    "profile": "certs\\DebugProfileDebug.p7b",
-                    "signAlg": "SHA256withECDSA",
-                    "storeFile": "certs\\.p12",
-                    "storePassword": "0000001ACE8F050DA6F2E36A4D0EC332ECF3A78E16F485E7C0B9DA5919649626428710609023E1DD99FD"
+    "app-harmony" : {
+        "distribute" : {
+            "bundleName" : "zzjc.test.app",
+            "signingConfigs" : {
+                "default" : {
+                    "certpath" : "certs\\DebugCert.cer",
+                    "keyAlias" : "zzjc-test",
+                    "keyPassword" : "0000001A62465932FE19E037517BC61FE03A8F9D69CB7892019EEC82A5A07691ECAE824A92BAD8FAEB34",
+                    "profile" : "certs\\DebugProfileDebug.p7b",
+                    "signAlg" : "SHA256withECDSA",
+                    "storeFile" : "certs\\.p12",
+                    "storePassword" : "0000001ACE8F050DA6F2E36A4D0EC332ECF3A78E16F485E7C0B9DA5919649626428710609023E1DD99FD"
                 }
             }
         }
     }
-}
\ No newline at end of file
+}
diff --git a/pages.json b/pages.json
index df485ae..92bbea9 100644
--- a/pages.json
+++ b/pages.json
@@ -305,7 +305,7 @@
 		{
 			"path": "pages/material/outbound/index",
 			"style": {
-				"navigationBarTitleText": "出库",
+				"navigationBarTitleText": "物料领用",
 				"navigationStyle": "custom"
 			}
 		},
@@ -347,7 +347,7 @@
 		{
 			"path": "pages/material/openMark/index",
 			"style": {
-				"navigationBarTitleText": "试剂开封",
+				"navigationBarTitleText": "开封",
 				"navigationStyle": "custom"
 			}
 		},
diff --git a/pages/analysis/sample/sample-work-edit-task.vue b/pages/analysis/sample/sample-work-edit-task.vue
index 13ae59a..6bd88a7 100644
--- a/pages/analysis/sample/sample-work-edit-task.vue
+++ b/pages/analysis/sample/sample-work-edit-task.vue
@@ -10,7 +10,7 @@
               <view
                 class="label-my"
                 :style="{ fontWeight: checkFeadToDetailField(field.headToDetailField) ? 'bold' : 'normal' }"
-                >{{ field.label }}</view
+                ><text v-if="field.required" style="color: red">*</text>{{ field.label }}</view
               >
               <view class="content-my">
                 <view v-if="field.type == 'title'" class="content-title">
@@ -34,7 +34,7 @@
                   :placeholder="field.placeholder"
                   :disabled="field.disabled || field.fillingWay == 'calculate'"
                 />
-                <uni-data-select
+                <zxz-uni-data-select
                   v-if="field.type == 'Select'"
                   v-model="field.value"
                   :multiple="field.multiple"
@@ -162,6 +162,7 @@ async function loadTaskDetail() {
       label: item.fieldName,
       fieldKey: item.fieldKey,
       type: item.fieldType,
+      required: customConfig.required,
       placeholder: '请输入',
       hidden: false
     }
@@ -364,6 +365,14 @@ function looseEqual(a, b) {
 // 保存抬头字段（带确认弹窗）
 function saveHeadData() {
   if (!realFormData.value['assayTime']) return nx.$helper.showToast('请选择分析时间')
+  // 校验动态字段是否为空
+
+  for (const field of formFields.value) {
+    if (field.required && (!field.value || field.value?.length === 0)) {
+      nx.$helper.showToast('请填写' + field.label)
+      return
+    }
+  }
   if (checkPropertyEquality()) {
     uni.showModal({
       title: '提示',
diff --git a/pages/device/deviceBusDailyCheck/detail.vue b/pages/device/deviceBusDailyCheck/detail.vue
index dce0b6f..6323a16 100644
--- a/pages/device/deviceBusDailyCheck/detail.vue
+++ b/pages/device/deviceBusDailyCheck/detail.vue
@@ -1,148 +1,166 @@
 <template>
-  <up-popup :show="visible" mode="right" closeable @close="handleClose" @open="handleOpen">
-    <uni-section titleFontSize="18px" type="line" title="设备点检信息"> </uni-section>
-    <scroll-view scroll-y="true" style="height: 85vh; width: 90vw">
-      <view class="content">
-        <up-row class="flex-wrap p10" style="background-color: #f5f7fa">
-          <up-col class="mb10" :span="gridCol" v-for="(item, index) in detailSchema">
-            <view style="color: #666"
-              ><span style="color: #333">{{ item.label }}：</span>{{ deviceInfo[item.value] }}</view
-            >
-          </up-col>
-        </up-row>
+	<up-popup :show="visible" mode="right" closeable @close="handleClose" @open="handleOpen">
+		<uni-section titleFontSize="18px" type="line" title="设备点检信息"> </uni-section>
+		<scroll-view scroll-y="true" style="height: 85vh; width: 90vw">
+			<view class="content">
+				<up-row class="flex-wrap p10" style="background-color: #f5f7fa">
+					<up-col class="mb10" :span="gridCol" v-for="(item, index) in detailSchema">
+						<view style="color: #666"><span
+								style="color: #333">{{ item.label }}：</span>{{ deviceInfo[item.value] }}</view>
+					</up-col>
+				</up-row>
 
-        <view class="p10">
-          <view
-            >备注：
-            <text style="color: #666">
-              {{ detailInfo.content }}
-            </text>
-          </view>
-          <up-row>
-            <up-col span="6">
-              <view class="pt10"
-                >点检人：
-                <text style="color: #666">
-                  {{ detailInfo.checkUserName }}
-                </text>
-              </view>
-              <view class="pt10"
-                >点检日期：
-                <text style="color: #666">
-                  {{ nx.$helper.formateToDateTime(detailInfo.checkDate) }}
-                </text>
-              </view>
-            </up-col>
-            <up-col span="6">
-              <up-album multiple-size="70" single-size="70" :urls="attachment" row-count="4"> </up-album>
-            </up-col>
-          </up-row>
-        </view>
-        <view>
-          <up-row class="p10 font-bold" style="background-color: #f5f5f5">
-            <up-col span="3">点检项目</up-col>
-            <up-col span="5">检查标准</up-col>
-            <up-col span="2"> 频次</up-col>
-            <up-col span="2">是否正常</up-col>
-          </up-row>
-          <view class="pt10">
-            <up-row class="pb10" v-for="(item, index) in detailInfo.maintainItemList" :key="index">
-              <up-col span="3">
-                <view class="x-f">
-                  <text class="pl10">
-                    {{ item.itemName }}
-                  </text>
-                </view>
-              </up-col>
+				<view class="p10">
+					<view>备注：
+						<text style="color: #666">
+							{{ detailInfo.content }}
+						</text>
+					</view>
+					<up-row>
+						<up-col span="6">
+							<view class="pt10">点检人：
+								<text style="color: #666">
+									{{ detailInfo.checkUserName }}
+								</text>
+							</view>
+							<view class="pt10">点检日期：
+								<text style="color: #666">
+									{{ nx.$helper.formateToDateTime(detailInfo.checkDate) }}
+								</text>
+							</view>
+						</up-col>
+						<up-col span="6">
+							<up-album multiple-size="70" single-size="70" :urls="attachment" row-count="4"> </up-album>
+						</up-col>
+					</up-row>
+				</view>
+				<view>
+					<up-row class="p10 font-bold" style="background-color: #f5f5f5">
+						<up-col span="3">点检项目</up-col>
+						<up-col span="5">检查标准</up-col>
+						<up-col span="2"> 频次</up-col>
+						<up-col span="2">是否正常</up-col>
+					</up-row>
+					<view class="pt10">
+						<up-row class="pb10" v-for="(item, index) in detailInfo.maintainItemList" :key="index">
+							<up-col span="3">
+								<view class="x-f">
+									<text class="pl10">
+										{{ item.itemName }}
+									</text>
+								</view>
+							</up-col>
 
-              <up-col span="5">{{ item.standard }}</up-col>
-              <up-col span="2">{{ item.frequencyRemark }}</up-col>
-              <up-col span="2">
-                <u-tag v-if="item.checkResult == '正常'" text="正常" size="mini" type="success" plain plainFill></u-tag>
-                <u-tag v-else text="不正常" type="error" size="mini" plain plainFill></u-tag>
-              </up-col>
-            </up-row>
-          </view>
-          <view class="p10"></view>
-        </view>
-      </view>
-    </scroll-view>
-  </up-popup>
+							<up-col span="5">{{ item.standard }}</up-col>
+							<up-col span="2">{{ item.frequencyRemark }}</up-col>
+							<up-col span="2">
+								<u-tag v-if="item.checkResult == '正常'" text="正常" size="mini" type="success" plain
+									plainFill></u-tag>
+								<u-tag v-else text="不正常" type="error" size="mini" plain plainFill></u-tag>
+							</up-col>
+						</up-row>
+					</view>
+					<view class="p10"></view>
+				</view>
+			</view>
+		</scroll-view>
+	</up-popup>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch, computed } from 'vue'
-import { getDeviceBusInfoById } from '@/nx/api/deviceInfo'
-import { detailSchema } from './dailyCheck.data'
-import dailyCheckApi from '@/nx/api/dailyCheck'
-import { getImgBaseUrl } from '@/defaultBaseUrl'
-import { useGridCol } from '@/nx/hooks/useGridCol'
-import nx from '@/nx'
-const { gridCol } = useGridCol([700], [6, 4])
-const props = defineProps({
-  show: {
-    type: Boolean,
-    default: false
-  },
-  checkInfo: {
-    type: Object
-  }
-})
-const visible = ref(props.show)
-// 监听外部传入的show属性变化
-watch(
-  () => props.show,
-  newVal => {
-    visible.value = newVal
-  }
-)
-let detailInfo = ref({})
-const attachment = ref([])
-async function getDetailInfo(id) {
-  const res = await dailyCheckApi.queryById(id)
-  res.maintainItemList.forEach(item => {
-    if (item.checkResult == 'false' || !item.checkResult) {
-      item.checkResult = false
-    }
-    if (item.checkResult == 'true') {
-      item.checkResult = true
-    }
-  })
+	import {
+		ref,
+		reactive,
+		onMounted,
+		watch,
+		computed
+	} from 'vue'
+	import {
+		getDeviceBusInfoById
+	} from '@/nx/api/deviceInfo'
+	import {
+		detailSchema
+	} from './dailyCheck.data'
+	import dailyCheckApi from '@/nx/api/dailyCheck'
+	import {
+		getImgBaseUrl
+	} from '@/defaultBaseUrl'
+	import {
+		useGridCol
+	} from '@/nx/hooks/useGridCol'
+	import nx from '@/nx'
+	const {
+		gridCol
+	} = useGridCol([700], [6, 4])
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		checkInfo: {
+			type: Object
+		}
+	})
+	const visible = ref(props.show)
+	// 监听外部传入的show属性变化
+	watch(
+		() => props.show,
+		newVal => {
+			visible.value = newVal
+		}
+	)
+	let detailInfo = ref({})
+	const attachment = computed(() => {
+		const fileRet = detailInfo.value.businessFileRet.data
+		if (fileRet.length) {
+			return fileRet.map((item) => item.fileUrl)
+		} else {
+			return []
+		}
+	})
+	async function getDetailInfo(id) {
+		const res = await dailyCheckApi.queryById(id)
+		res.maintainItemList.forEach(item => {
+			if (item.checkResult == 'false' || !item.checkResult) {
+				item.checkResult = false
+			}
+			if (item.checkResult == 'true') {
+				item.checkResult = true
+			}
+		})
+		detailInfo.value = res
+	}
+	const deviceInfo = ref({})
+	async function getDeviceInfo(id) {
+		const res = await getDeviceBusInfoById(id)
+		deviceInfo.value = res
+	}
+	const emit = defineEmits(['close', 'open'])
 
-  detailInfo.value = res
-  attachment.value = []
-  let files = res?.attachment?.split(',') || []
-  if (files.length > 0) {
-    attachment.value = files.map(item => getImgBaseUrl() + item)
-  }
-}
-const deviceInfo = ref({})
-async function getDeviceInfo(id) {
-  const res = await getDeviceBusInfoById(id)
-  deviceInfo.value = res
-}
-const emit = defineEmits(['close', 'open'])
-function handleClose() {
-  emit('close')
-}
-function handleOpen() {
-  getDetailInfo(props.checkInfo.id)
-  getDeviceInfo(props.checkInfo.deviceId)
-}
+	function handleClose() {
+		emit('close')
+	}
+
+	function handleOpen() {
+		getDetailInfo(props.checkInfo.id)
+		getDeviceInfo(props.checkInfo.deviceId)
+	}
 </script>
 
 <style lang="scss" scoped>
-.content {
-  background-color: #fff;
-  height: 100%;
-  padding: 16px;
-  padding-top: 10px;
-  font-size: 16px;
-}
-:deep(.uicon-close) {
-  font-size: 22px !important;
-}
-:deep(.u-popup__content__close--top-right) {
-  top: 30px;
-}
-</style>
+	.content {
+		background-color: #fff;
+		height: 100%;
+		padding: 16px;
+		padding-top: 10px;
+		font-size: 16px;
+	}
+
+	:deep(.uicon-close) {
+		font-size: 22px !important;
+	}
+
+	:deep(.u-popup__content__close--top-right) {
+		top: 30px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/device/deviceBusDailyCheck/index.vue b/pages/device/deviceBusDailyCheck/index.vue
index a37dc17..01728d8 100644
--- a/pages/device/deviceBusDailyCheck/index.vue
+++ b/pages/device/deviceBusDailyCheck/index.vue
@@ -165,6 +165,10 @@ async function getDailyCheckRecord(id) {
     res.checkUserName = nx.$store('user').userInfo.nickname
   }
   detailInfo.value = res
+	let files = res.businessFileRet.data.map((item) => {
+         return { id: item.fileId, name: item.fileName, url: item.fileUrl ,status: 'success',}
+     })
+  	  detailInfo.value.files = files
   modalType.value = res.submitFlag
 
   lockOrientation('landscape')
diff --git a/pages/device/deviceBusMaintain/detail.vue b/pages/device/deviceBusMaintain/detail.vue
index 4b3edd9..a2f08a0 100644
--- a/pages/device/deviceBusMaintain/detail.vue
+++ b/pages/device/deviceBusMaintain/detail.vue
@@ -1,152 +1,182 @@
 <template>
-  <up-popup :show="visible" mode="right" closeable @close="handleClose" @open="handleOpen">
-    <uni-section titleFontSize="18px" type="line" title="设备维护保养信息"> </uni-section>
-    <scroll-view scroll-y="true" style="height: 85vh; width: 90vw">
-      <view class="content">
-        <up-row class="flex-wrap pt10 pl10" style="background-color: #f5f7fa">
-          <up-col class="mb8" :span="gridCol" v-for="(item, index) in detailSchema">
-            <view style="color: #666"
-              ><span style="color: #333">{{ item.label }}：</span>{{ deviceInfo[item.value] }}</view
-            >
-          </up-col>
-        </up-row>
-        <view class="p10">
-          <up-row>
-            <up-col span="6">
-              <view
-                >维护保养人：
-                <text style="color: #666">
-                  {{ detailInfo.checkUserName }}
-                </text>
-              </view>
-              <view class="pt10"
-                >维护保养日期：
-                <text style="color: #666">
-                  {{ nx.$helper.formateToDateTime(detailInfo.checkDate) }}
-                </text>
-              </view>
-            </up-col>
-            <up-col span="6">
-              <u-album multiple-size="70" single-size="70" :urls="attachment" row-count="4" />
-            </up-col>
-          </up-row>
-        </view>
-        <view>
-          <up-row class="p10 font-bold" style="background-color: #f5f5f5">
-            <up-col span="5">维护保养内容</up-col>
-            <up-col span="3"> 频次</up-col>
-            <up-col span="4">维护保养标准</up-col>
-          </up-row>
-          <view>
-            <view v-for="(item, index) in detailInfo.maintainItemList" :key="index">
-              <up-row class="p10">
-                <up-col span="5">
-                  <view class="x-f">
-                    <text>
-                      {{ item.itemName }}
-                    </text>
-                  </view>
-                </up-col>
-                <up-col span="3">{{ item.frequencyRemark }}</up-col>
-                <up-col span="4">{{ item.standard }}</up-col>
-              </up-row>
-              <up-row class="fill-content">
-                <up-col span="12"
-                  ><view
-                    >维护保养情况:
-                    <text style="color: #666">
-                      {{ item.checkRemark }}
-                    </text>
-                  </view>
-                </up-col>
-              </up-row>
-            </view>
-            <view class="p10"></view>
-          </view>
-        </view>
-      </view>
-    </scroll-view>
-  </up-popup>
+	<up-popup :show="visible" mode="right" closeable @close="handleClose" @open="handleOpen">
+		<uni-section titleFontSize="18px" type="line" title="设备维护保养信息"> </uni-section>
+		<scroll-view scroll-y="true" style="height: 85vh; width: 90vw">
+			<view class="content">
+				<up-row class="flex-wrap pt10 pl10" style="background-color: #f5f7fa">
+					<up-col class="mb8" :span="gridCol" v-for="(item, index) in detailSchema">
+						<view style="color: #666"><span
+								style="color: #333">{{ item.label }}：</span>{{ deviceInfo[item.value] }}</view>
+					</up-col>
+				</up-row>
+				<view class="p10">
+					<up-row>
+						<up-col span="6">
+							<view>维护保养人：
+								<text style="color: #666">
+									{{ detailInfo.checkUserName }}
+								</text>
+							</view>
+							<view class="pt10">维护保养日期：
+								<text style="color: #666">
+									{{ nx.$helper.formateToDateTime(detailInfo.checkDate) }}
+								</text>
+							</view>
+						</up-col>
+						<up-col span="6">
+							<u-album multiple-size="70" single-size="70" :urls="attachment" row-count="4" />
+						</up-col>
+					</up-row>
+				</view>
+				<view>
+					<up-row class="p10 font-bold" style="background-color: #f5f5f5">
+						<up-col span="5">维护保养内容</up-col>
+						<up-col span="3"> 频次</up-col>
+						<up-col span="4">维护保养标准</up-col>
+					</up-row>
+					<view>
+						<view v-for="(item, index) in detailInfo.maintainItemList" :key="index">
+							<up-row class="p10">
+								<up-col span="5">
+									<view class="x-f">
+										<text>
+											{{ item.itemName }}
+										</text>
+									</view>
+								</up-col>
+								<up-col span="3">{{ item.frequencyRemark }}</up-col>
+								<up-col span="4">{{ item.standard }}</up-col>
+							</up-row>
+							<up-row class="fill-content">
+								<up-col span="12">
+									<view>维护保养情况:
+										<text style="color: #666">
+											{{ item.checkRemark }}
+										</text>
+									</view>
+								</up-col>
+							</up-row>
+						</view>
+						<view class="p10"></view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+	</up-popup>
 </template>
 
 <script setup>
-import { ref, reactive, onMounted, watch, computed } from 'vue'
-import { useGridCol } from '@/nx/hooks/useGridCol'
-import dailyCheckApi from '@/nx/api/dailyCheck'
-import { getDeviceBusInfoById } from '@/nx/api/deviceInfo'
-import { getImgBaseUrl } from '@/defaultBaseUrl'
-import nx from '@/nx'
-const { gridCol } = useGridCol([700], [6, 4])
-const props = defineProps({
-  show: {
-    type: Boolean,
-    default: false
-  },
-  checkInfo: {
-    type: Object
-  }
-})
-const detailSchema = [
-  { label: '设备名称', value: 'deviceName' },
-  { label: '别名', value: 'alias' },
-  { label: '设备型号', value: 'modelNo' },
-  { label: '设备编码', value: 'deviceCode' },
-  { label: '使用班组', value: 'deptName' }
-]
-const visible = ref(props.show)
-// 监听外部传入的show属性变化
-watch(
-  () => props.show,
-  newVal => {
-    visible.value = newVal
-  }
-)
-const attachment = computed(() => {
-  let files = detailInfo.value?.attachment?.split(',') || []
-  if (files.length > 0) {
-    return files.map(item => getImgBaseUrl() + item)
-  } else {
-    return []
-  }
-})
-let detailInfo = ref({})
-async function getDetailInfo(id) {
-  const res = await dailyCheckApi.queryById(id)
-  detailInfo.value = res
-}
-const deviceInfo = ref({})
-async function getDeviceInfo(id) {
-  const res = await getDeviceBusInfoById(id)
-  deviceInfo.value = res
-}
-const emit = defineEmits(['close', 'open'])
-function handleClose() {
-  emit('close')
-}
-function handleOpen() {
-  getDetailInfo(props.checkInfo.id)
-  getDeviceInfo(props.checkInfo.deviceId)
-}
+	import {
+		ref,
+		reactive,
+		onMounted,
+		watch,
+		computed
+	} from 'vue'
+	import {
+		useGridCol
+	} from '@/nx/hooks/useGridCol'
+	import dailyCheckApi from '@/nx/api/dailyCheck'
+	import {
+		getDeviceBusInfoById
+	} from '@/nx/api/deviceInfo'
+	import {
+		getImgBaseUrl
+	} from '@/defaultBaseUrl'
+	import nx from '@/nx'
+	const {
+		gridCol
+	} = useGridCol([700], [6, 4])
+	const props = defineProps({
+		show: {
+			type: Boolean,
+			default: false
+		},
+		checkInfo: {
+			type: Object
+		}
+	})
+	const detailSchema = [{
+			label: '设备名称',
+			value: 'deviceName'
+		},
+		{
+			label: '别名',
+			value: 'alias'
+		},
+		{
+			label: '设备型号',
+			value: 'modelNo'
+		},
+		{
+			label: '设备编码',
+			value: 'deviceCode'
+		},
+		{
+			label: '使用班组',
+			value: 'deptName'
+		}
+	]
+	const visible = ref(props.show)
+	// 监听外部传入的show属性变化
+	watch(
+		() => props.show,
+		newVal => {
+			visible.value = newVal
+		}
+	)
+	const attachment = computed(() => {
+		const fileRet = detailInfo.value.businessFileRet.data
+		if (fileRet.length) {
+			return fileRet.map((item) => item.fileUrl)
+		}else{
+			return []
+		}
+	})
+	let detailInfo = ref({})
+	async function getDetailInfo(id) {
+		const res = await dailyCheckApi.queryById(id)
+		detailInfo.value = res
+
+	}
+	const deviceInfo = ref({})
+	async function getDeviceInfo(id) {
+		const res = await getDeviceBusInfoById(id)
+		deviceInfo.value = res
+	}
+	const emit = defineEmits(['close', 'open'])
+
+	function handleClose() {
+		emit('close')
+	}
+
+	function handleOpen() {
+		getDetailInfo(props.checkInfo.id)
+		getDeviceInfo(props.checkInfo.deviceId)
+	}
 </script>
 
 <style lang="scss" scoped>
-.content {
-  background-color: #fff;
-  height: 100%;
-  padding: 10px;
-  font-size: 16px;
-  .fill-content {
-    font-size: 14px;
-    border-radius: 3px;
-    box-shadow: 2px 2px 8px 2px rgba(0, 0, 0, 0.2);
-    background-color: #fdf6ec;
-    padding: 10px;
-  }
-}
-:deep(.uicon-close) {
-  font-size: 22px !important;
-}
-:deep(.u-popup__content__close--top-right) {
-  top: 30px;
-}
-</style>
+	.content {
+		background-color: #fff;
+		height: 100%;
+		padding: 10px;
+		font-size: 16px;
+
+		.fill-content {
+			font-size: 14px;
+			border-radius: 3px;
+			box-shadow: 2px 2px 8px 2px rgba(0, 0, 0, 0.2);
+			background-color: #fdf6ec;
+			padding: 10px;
+		}
+	}
+
+	:deep(.uicon-close) {
+		font-size: 22px !important;
+	}
+
+	:deep(.u-popup__content__close--top-right) {
+		top: 30px;
+	}
+</style>
\ No newline at end of file
diff --git a/pages/device/deviceBusMaintain/index.vue b/pages/device/deviceBusMaintain/index.vue
index acd1370..b8187ce 100644
--- a/pages/device/deviceBusMaintain/index.vue
+++ b/pages/device/deviceBusMaintain/index.vue
@@ -150,6 +150,10 @@ async function getDetailInfo(id) {
     res.checkUserName = nx.$store('user').userInfo.nickname
   }
   detailInfo.value = res
+  let files = res.businessFileRet.data.map((item) => {
+         return { id: item.fileId, name: item.fileName, url: item.fileUrl ,status: 'success',}
+     })
+  	  detailInfo.value.files = files
   modalType.value = res.submitFlag
   lockOrientation('landscape')
 }
diff --git a/pages/device/deviceBusUseRecord/SampleSelectPopup.vue b/pages/device/deviceBusUseRecord/SampleSelectPopup.vue
index 8c48b70..851dc54 100644
--- a/pages/device/deviceBusUseRecord/SampleSelectPopup.vue
+++ b/pages/device/deviceBusUseRecord/SampleSelectPopup.vue
@@ -8,26 +8,22 @@
       </view>
       <scroll-view style="height: 60vh" scroll-y scroll-with-animation class="mt16 pl16">
         <template v-if="taskList.length > 0">
-          <up-radio-group v-model="selectRowId" placement="column">
+          <u-checkbox-group placement="column" v-model="selectRows">
             <view v-for="(task, index) in taskList">
-              <up-radio :name="task.id">
+              <u-checkbox :name="task.id">
                 <template #label>
-                  <view
-                    class="x-f pb4 pl8 border-b full-width"
-                    :class="{ active: current === index }"
-                    @click="current = index"
-                  >
+                  <view class="x-f pb4 pl8 border-b full-width" @click="current = index">
                     <view class="fs20">{{ task.taskNo }}</view>
-                    <view class="pl16 pr16">{{ task.taskName }}{{ task.assayOper }}</view>
+                    <view class="pl32 pr32">{{ task.taskName }}{{ task.assayOper }}</view>
                     <view class="x-f">
                       <u-icon name="clock"></u-icon>
                       <text class="ml5">{{ nx.$helper.formateToDateTime(task.taskAssignTime) }}</text>
                     </view>
                   </view>
                 </template>
-              </up-radio>
+              </u-checkbox>
             </view>
-          </up-radio-group>
+          </u-checkbox-group>
         </template>
         <up-empty v-else text="暂无数据" mode="list"> </up-empty>
       </scroll-view>
@@ -44,7 +40,7 @@ let emits = defineEmits(['confirm'])
 const addConfigShow = ref(false)
 function show() {
   addConfigShow.value = true
-  selectRowId.value = undefined
+  selectRows.value = []
   current.value = undefined
   getAssayTaskList()
 }
@@ -63,21 +59,40 @@ const getAssayTaskList = async () => {
 function handleCancel() {
   addConfigShow.value = false
 }
-const selectRowId = ref(undefined)
-function handleAdd() {
-  if (!selectRowId.value) {
+const selectRows = ref([])
+
+async function handleAdd() {
+  // 1. 校验是否选择了数据
+  if (!selectRows.value || !selectRows.value.length) {
     return uni.showToast({
       title: '请选择任务单',
       icon: 'none'
     })
   }
-  let sampleList = []
-  nx.$api.assayTask.getAssayTaskDetailList({ businessAssayTaskId: selectRowId.value }).then(res => {
-    const list = res || []
-    sampleList = list
+  try {
+    const requestPromises = selectRows.value.map(businessAssayTaskId => {
+      return nx.$api.assayTask.getAssayTaskDetailList({
+        businessAssayTaskId
+      })
+    })
+    const results = await Promise.all(requestPromises)
+
+    let sampleList = []
+    results.forEach(res => {
+      const list = res || []
+      sampleList = sampleList.concat(list)
+    })
+
+    // 5. 执行回调和关闭弹窗
     emits('confirm', sampleList)
     addConfigShow.value = false
-  })
+  } catch (error) {
+    console.error('批量获取详情失败:', error)
+    uni.showToast({
+      title: '数据加载失败',
+      icon: 'none'
+    })
+  }
 }
 
 defineExpose({
@@ -86,7 +101,7 @@ defineExpose({
 </script>
 
 <style lang="scss" scoped>
-:deep(.u-radio__label-wrap) {
+:deep(.u-checkbox__label-wrap) {
   width: 100%;
 }
 .active {
diff --git a/pages/device/deviceBusUseRecord/index.vue b/pages/device/deviceBusUseRecord/index.vue
index 1314008..9e3f46d 100644
--- a/pages/device/deviceBusUseRecord/index.vue
+++ b/pages/device/deviceBusUseRecord/index.vue
@@ -48,7 +48,7 @@
           </up-row>
           <up-row justify="space-around">
             <up-col span="3.5">
-              <view class="p5">{{isHighTemperature?'使用':''}}温度（℃）：</view>
+              <view class="p5">{{ isHighTemperature ? '使用' : '' }}温度（℃）：</view>
               <up-input v-model="formData.temperature"></up-input>
             </up-col>
             <up-col v-if="!isHighTemperature" span="3.5">
@@ -148,6 +148,7 @@ const detailSchema = [
   { label: '使用班组', value: 'deptName' }
 ]
 const columns = ref([
+  { title: '任务单号', key: 'taskNo', align: 'center' },
   { title: '样品名称', key: 'sampleName', align: 'center' },
   { title: '样品编号', key: 'sampleCode', align: 'center' },
   { title: '操作', key: 'action', width: '100px', align: 'center' }
@@ -167,7 +168,6 @@ function handleSampleSelect(dataList, type) {
   const transformData = newData => {
     if (type === 'sample') {
       return {
-        id: newData.id,
         detailType: 'sample',
         sampleCode: newData.sampleCode,
         sampleName: newData.sampleName,
@@ -176,16 +176,16 @@ function handleSampleSelect(dataList, type) {
       }
     } else {
       return {
-        id: newData.id,
         detailType: 'standard',
         sampleCode: newData.code,
-        sampleName: newData.name
+        sampleName: newData.name,
+        taskId: newData.id
       }
     }
   }
-	tableData.value =  tableData.value.filter(item => item.detailType !== type)
   for (const newData of dataList) {
-    const index = tableData.value.findIndex(item => item.id === newData.id)
+    const taskIdKey = type === 'sample' ? 'businessAssayTaskId' : 'id'
+    const index = tableData.value.findIndex(item => item.taskId === newData[taskIdKey])
     const transformedItem = transformData(newData)
 
     if (index > -1) {
@@ -206,7 +206,6 @@ const userId = nx.$store('user').userInfo['id']
 const userName = nx.$store('user').userInfo['realname']
 let detailInfo = ref({})
 
-
 function handleScanResult(result) {
   const codeObj = JSON.parse(result)
   if (!pageLoading.value) {
@@ -244,12 +243,12 @@ function handleTestAction(id) {
   getLastDailyCheckOfToday(id)
 }
 // 是否是高温设备
-const isHighTemperature = computed(()=>{
-	if(detailInfo.value.customConfigJson&&detailInfo.value.customConfigJson.highTemperature){
-		return true
-	}else{
-		return false
-	}
+const isHighTemperature = computed(() => {
+  if (detailInfo.value.customConfigJson && detailInfo.value.customConfigJson.highTemperature) {
+    return true
+  } else {
+    return false
+  }
 })
 // 获取设备详情
 async function getDeviceInfo(id) {
diff --git a/pages/material/index/index.vue b/pages/material/index/index.vue
index 32a39f5..0815917 100644
--- a/pages/material/index/index.vue
+++ b/pages/material/index/index.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <navbar-back title="实验室管理系统【试剂耗材管理】" titleWidth="800" :autoBack="false" leftIcon="" leftText="">
+    <navbar-back title="实验室管理系统【物料管理】" titleWidth="800" :autoBack="false" leftIcon="" leftText="">
       <u-icon @click="popupShow = true" size="28" color="#FFF" name="setting-fill" />
     </navbar-back>
 
diff --git a/pages/material/openMark/index.vue b/pages/material/openMark/index.vue
index 34c9bfc..fcb6ab8 100644
--- a/pages/material/openMark/index.vue
+++ b/pages/material/openMark/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <navbar-back title="试剂开封"></navbar-back>
+  <navbar-back title="物料开封"></navbar-back>
   <view class="pl8 pr8 pt8">
     <up-input
       style="padding-top: 20px"
@@ -82,7 +82,8 @@ async function getMaterialList() {
     code: materialCode.value,
     usageStatus: 1,
     openStatus:0,
-	openDueFalg:1
+	openDueFalg:1,
+	businessType:'open_seal'
 	
   }
   const data = await nx.$api.material.queryMaterialInfo(params)
diff --git a/pages/material/outbound/index.vue b/pages/material/outbound/index.vue
index c8b7605..57cf27e 100644
--- a/pages/material/outbound/index.vue
+++ b/pages/material/outbound/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <navbar-back title="物资领用"></navbar-back>
+  <navbar-back title="物料领用"></navbar-back>
   <view class="pl8 pr8 pt8">
     <view class="x-f">
       <text class="pl6">领用人：</text>
@@ -23,7 +23,14 @@
     <uni-section v-if="materialList.length > 0" type="line" title="领用明细" titleFontSize="15px">
       <template #right> <up-text type="error" size="18" bold :text="materialList.length"></up-text></template>
       <scroll-view style="height: 55 vh" scroll-y scroll-with-animation>
-        <uni-card margin="5px" v-for="item in materialList" class="sample-item">
+        <uni-card margin="5px" v-for="(item, index) in materialList" class="sample-item">
+          <uni-icons
+            class="delete"
+            type="trash-filled"
+            color="#f56c6c"
+            size="40"
+            @click="handleDelete(index)"
+          ></uni-icons>
           <template v-if="item.standardSolutionFlag !== 1">
             <view class="mt4">
               <view
@@ -43,11 +50,11 @@
             >
           </template>
           <template v-else>
-			  <view class="mt4">
-			    <view
-			      >溶液编号：<text class="black">{{ item.code }}</text></view
-			    >
-			  </view>
+            <view class="mt4">
+              <view
+                >溶液编号：<text class="black">{{ item.code }}</text></view
+              >
+            </view>
             <view class="mt4">
               <view
                 >溶液名称：<text class="black">{{ item.name }}</text></view
@@ -118,7 +125,8 @@ onShow(() => {
 async function getMaterialList() {
   if (materialCode.value === '') return
   let params = {
-    code: materialCode.value
+    code: materialCode.value,
+    businessType: 'outbound'
   }
   const data = await nx.$api.material.queryMaterialInfo(params)
   if (!data) return uni.showToast({ title: '未查询到该物料信息', icon: 'none' })
@@ -129,6 +137,11 @@ async function getMaterialList() {
 
   materialList.value.push(data)
 }
+function handleDelete(index) {
+  console.log(index)
+
+  materialList.value.splice(index, 1)
+}
 async function handleSubmit() {
   if (selectUserId.value === '') {
     return uni.showToast({
@@ -138,7 +151,6 @@ async function handleSubmit() {
   }
   btnLoading.value = true
   const selectUser = range.value.find(item => item.value === selectUserId.value)
-  console.log(selectUser)
 
   let params = {
     businessType: '领用出库',
@@ -169,7 +181,12 @@ onMounted(async () => {
 <style lang="scss" scoped>
 .sample-item {
   position: relative;
-  pointer-events: none;
+
+  .delete {
+    position: absolute;
+    right: 10px;
+    top: 10px;
+  }
 }
 :deep(.uni-select__input-placeholder) {
   font-size: 16px;
diff --git a/pages/material/useRecord/useForm.vue b/pages/material/useRecord/useForm.vue
index 8bae4c9..7708024 100644
--- a/pages/material/useRecord/useForm.vue
+++ b/pages/material/useRecord/useForm.vue
@@ -101,7 +101,8 @@ async function getMaterialInfo() {
     code: materialCode.value,
     hazardous: 1,
     usageStatus: 1,
-    useEndFlag: 0
+    useEndFlag: 0,
+	businessType:'use_record'
   }
   const data = await nx.$api.material.queryMaterialInfo(params)
   if (!data) return uni.showToast({ title: '未查询到可以使用的危化品信息', icon: 'none' })
diff --git a/pages/material/useUpMark/index.vue b/pages/material/useUpMark/index.vue
index 80bfbc2..952ab26 100644
--- a/pages/material/useUpMark/index.vue
+++ b/pages/material/useUpMark/index.vue
@@ -77,7 +77,8 @@ async function getMaterialList() {
   let params = {
     code: materialCode.value,
     usageStatus: 1,
-    useEndFlag: 0
+    useEndFlag: 0,
+	businessType:'used_mark'
   }
   const data = await nx.$api.material.queryMaterialInfo(params)
   if (!data) return uni.showToast({ title: '未查询到该物料信息', icon: 'none' })