From 3a45bd762e14e654f252965adddeee2f9b3efb9d Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 14 一月 2026 17:52:11 +0800
Subject: [PATCH] Merge branch 'dev_ztns' of http://114.132.189.42:9002/r/lims-ruoyi-before into dev_ztns
---
src/views/business/inspectionTask/inspection.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 2714171..35e1996 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -1070,6 +1070,7 @@
if(res.code==200){
this.$message.success("淇濆瓨鎴愬姛");
this.ifsMaterialPropsVisible = false;
+ this.refreshView()
}
})
},
@@ -1359,6 +1360,7 @@
});
const params = {
entrustCode: this.insOrder.entrustCode,
+ lotBatchNo: this.insOrder.lotBatchNo,
sampleCode: this.currentSample.sampleCode,
id: this.currentSample.id,
itemIds: itemIds,
@@ -1506,6 +1508,7 @@
};
let list = this.tableList[0].arr;
let maxNum = 0;
+ let itemNum = 0;//鍖呭惈妫�楠屽�兼壒娉ㄧ殑涓暟
list.forEach((item, index) => {
let num0 = 0;
let str = "";
@@ -1543,11 +1546,16 @@
n.v.ps.value.includes("妫�楠屽��")
) {
num++;
- if (str0 == str) {
- maxNum = num;
+ const matchArray = n.v.ps.value.match(/\d+/g);
+ if(matchArray){
+ const no = Number(matchArray[0]);
+ itemNum = itemNum>= no ? itemNum : no;
}
}
});
+ if (str0 == str) {
+ maxNum = num===itemNum ? num : itemNum;
+ }
}
// 缁戝畾璁惧
if (
--
Gitblit v1.9.3