更新依赖

package.json

@@ -18,7 +18,7 @@
         "dayjs": "^1.11.11",
         "echarts": "^5.5.0",
         "element-plus": "^2.7.3",
-        "hc-vue3-ui": "^3.9.4",
+        "hc-vue3-ui": "^3.9.5",
         "js-base64": "^3.7.7",
         "js-fast-way": "^0.5.0",
         "js-md5": "^0.8.3",

src/views/tentative/detect/test.vue

@@ -479,8 +479,8 @@ const tableColumn = ref([
     { key: 'isUploadCertificate', name: '是否上传合格证', width: 120, autoWidth: true },
     { key: 'contractId', name: '合同段', width: 140, autoWidth: true },
     { key: 'company', name: '单位', width: 160, autoWidth: true },
-    { key: 'key1', name: '委托单名称', autoWidth: true },
-    { key: 'key2', name: '委托单编号', autoWidth: true },
+    { key: 'entrustName', name: '委托单名称', autoWidth: true },
+    { key: 'entrustNo', name: '委托单编号', autoWidth: true },
     { key: 'specificationNumber', name: '样品编号', width: 220, autoWidth: true },
     { key: 'specificationModel', name: '规格类型', width: 200, autoWidth: true },
     //{key:'projectPosition', name: '工程部位及用途', width: 160},
@@ -987,17 +987,19 @@ const relatedColumn1 = [
     { key: 'userName', name: '取样人' },
     { key: 'carryTime', name: '入库时间', align: 'center' },
     { key: 'createTime', name: '试验时间', align: 'center' },
-    { key: 'key12', name: '样品处理' },
-    { key: 'key13', name: '时间(或处理原因)' },
+    { key: 'no-key', name: '样品处理' },
+    { key: 'no-key', name: '时间(或处理原因)' },
 ]
-const relatedData1 = ref([])
+const relatedData1 = ref([
+    {},
+])
 
 //委托单信息
 const relatedColumn2 = [
-    { key: 'key1', name: '委托单位' },
-    { key: 'key2', name: '委托单编号' },
-    { key: 'key3', name: '委托名称' },
-    { key: 'key4', name: '委托状态' },
+    { key: 'entrustInfo', name: '委托单位' },
+    { key: 'entrustNo', name: '委托单编号' },
+    { key: 'entrustName', name: '委托单名称' },
+    { key: 'status', name: '委托单状态', width: 120, align: 'center' },
 ]
 const relatedData2 = ref([])
 

src/views/tentative/material/modules/testSample/dispose.vue

@@ -117,7 +117,7 @@ const tableColumn = ref([
     { key: 'entrustTime', name: '委托上报时间', align: 'center' },
     { key: 'carryTime', name: '入库时间', align: 'center' },
     { key: 'createTime', name: '创建试验时间', align: 'center' },
-    { key: 'key9', name: '是否留样', align: 'center' },
+    { key: 'no-key', name: '是否留样', align: 'center' },
     { key: 'resamTime', name: '留样时间', align: 'center' },
     { key: 'repealTime', name: '废除时间', align: 'center' },
     { key: 'repealReason', name: '废除原因', align: 'center' },

src/views/tentative/material/modules/testSample/leave.vue

@@ -133,7 +133,7 @@ const tableColumn = ref([
     { key: 'specificationModel', name: '规格型号', align: 'center' },
     { key: 'materialCount', name: '试样数量', align: 'center' },
     { key: 'expCount', name: '试验数量', align: 'center' },
-    { key: 'key5', name: '留样数量', align: 'center' },
+    { key: 'no-key', name: '留样数量', align: 'center' },
     { key: 'calculationUnit', name: '计算单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },

src/views/tentative/material/modules/testSample/testUnder.vue

@@ -154,7 +154,7 @@ const tableColumn = ref([
     { key: 'specificationModel', name: '规格型号', align: 'center' },
     { key: 'materialCount', name: '试样数量', align: 'center' },
     { key: 'expCount', name: '试验数量', align: 'center' },
-    { key: 'key5', name: '剩余数量', align: 'center' },
+    { key: 'no-key', name: '剩余数量', align: 'center' },
     { key: 'calculationUnit', name: '计算单位', align: 'center' },
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },

src/views/tentative/material/modules/testSample/tested.vue

@@ -155,7 +155,7 @@ const tableColumn = ref([
     { key: 'proposedPosition', name: '拟用部位' },
     { key: 'representativeCount', name: '代表数量', align: 'center' },
     { key: 'userName', name: '取样人', align: 'center' },
-    { key: 'key8', name: '待测时间', align: 'center' },
+    { key: 'no-key', name: '待测时间', align: 'center' },
     { key: 'action', name: '操作', width: 150, align: 'center' },
 ])
 const tableData = ref([])

yarn.lock

@@ -1946,10 +1946,10 @@ has-flag@^4.0.0:
   resolved "http://39.108.216.210:9000/has-flag/-/has-flag-4.0.0.tgz"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-hc-vue3-ui@^3.9.4:
-  version "3.9.4"
-  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.9.4.tgz#c2f6215a304a91fafe73b80edccc331944c2c670"
-  integrity sha512-QSrBWXD/ILFD86x7elcyV17uM9hB0nJpGmfUaiWgbEcUEt44+tfpa5Ur0x2T6Mw38SSJHr2k60epMefsL+F2uw==
+hc-vue3-ui@^3.9.5:
+  version "3.9.5"
+  resolved "http://39.108.216.210:9000/hc-vue3-ui/-/hc-vue3-ui-3.9.5.tgz#4fc2cedc65df557c37131a77dacb1eacab10db40"
+  integrity sha512-IETjKA9jbc+FzQc2hsG2wsn9gxEbl9gX0PRq1AZnwGLurRIFA3oxoi3kTrac/EAbe1KKS9eZ6cI4pcEI/S+Vmw==
   dependencies:
     axios "^1.6.8"
     dayjs "^1.11.11"