From d4ccd9051e65c9675de5d44d3fe4aaab4f6c53e2 Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期四, 20 十一月 2025 13:15:53 +0800
Subject: [PATCH] 数采调整
---
src/views/business/inspectionTask/inspection.vue | 31 ++++++++++++++-----------------
1 files changed, 14 insertions(+), 17 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 7f8b10d..1bcf62d 100644
--- a/src/views/business/inspectionTask/inspection.vue
+++ b/src/views/business/inspectionTask/inspection.vue
@@ -20,7 +20,7 @@
<el-button v-if="insOrder.ifsOrderType && insOrder.ifsOrderType==='02wg'" size="small" type="primary" @click="showMaterialPropsDialog">IFS鐗╂枡灞炴�ф洿鏂�</el-button>
<el-button size="small" type="primary" @click="refreshView">鍒锋柊</el-button>
<el-button v-if="typeSource == 1" size="small" type="primary" @click="openPurchase">杩涜揣楠岃瘉</el-button>
- <el-button v-if="state == 1 && typeSource == 1" size="small" type="primary"
+ <el-button v-if="state == 1 && [0,1].includes(Number(typeSource))" size="small" type="primary"
@click="openUnPassDialog('add')">涓嶅悎鏍煎鐞�</el-button>
<el-button size="small" type="primary" @click="sampleVisible = true; uploadSample();">鏍峰搧鍒囨崲</el-button>
<!-- <el-button v-if="state == 1" size="small" type="primary" @click="taskVisible = true">浠诲姟鍒囨崲</el-button>-->
@@ -986,7 +986,6 @@
}
});
}
- console.log("澶勭悊鍚庣殑妯℃澘-",this.tableList)
},
// 鐗规畩妫�楠岄」--鐩戝惉璁惧淇℃伅鏀瑰彉
equipForm: {
@@ -1014,7 +1013,8 @@
calcInbondLength(startMeterMark,endMeterMark){
let inboundLength = null;
if((startMeterMark!=null && startMeterMark!=='') && (endMeterMark!=null&&endMeterMark!=='')){
- inboundLength = Math.abs(endMeterMark - startMeterMark)
+ let minus = this.$Big(endMeterMark).minus(this.$Big(startMeterMark));
+ inboundLength = Math.abs(minus)
}
return inboundLength;
},
@@ -1085,9 +1085,6 @@
},
disconnect() {
return disconnect
- },
- sss() {
- console.log(this.$store.state.weightList) //
},
// 鏂囦欢绠＄悊--寮�濮�
getList() {
@@ -1171,7 +1168,7 @@
laboratory: this.sonLaboratory,
}).then(async (res) => {
this.insOrder = res.data.insOrder;
- if(res.data.insOrder.ifsOrderType){
+ if(res.data.insOrder.ifsOrderType==='02wg'){
//鏌ヨ闆朵欢灞炴��
this.getPartProps(res.data.insOrder.ifsInventoryId)
}
@@ -1362,6 +1359,7 @@
});
const params = {
entrustCode: this.insOrder.entrustCode,
+ lotBatchNo: this.insOrder.lotBatchNo,
sampleCode: this.currentSample.sampleCode,
id: this.currentSample.id,
itemIds: itemIds,
@@ -1389,7 +1387,6 @@
return newObj;
},
handleDataAcquisition(data, noDialog) {
- console.log("dadad--",data)
// 鏄惁鍙互缂栬緫鏁伴噰鏁版嵁
if (this.dataAcquisitionEidtAble) {
this.getDataType = 1;
@@ -1413,9 +1410,7 @@
};
}
// 寰幆鏁伴噰鏁版嵁
- console.log(data[i],i)
for (let j in data[i]) {
- console.log("jjjjj--",j)
// 鎷兼帴瀛楃涓� 妫�楠岄」鍒嗙被+妫�楠岄」+妫�楠屽瓙椤�
let str0 = "";
if (i.includes("@")) {
@@ -1512,6 +1507,7 @@
};
let list = this.tableList[0].arr;
let maxNum = 0;
+ let itemNum = 0;//鍖呭惈妫�楠屽�兼壒娉ㄧ殑涓暟
list.forEach((item, index) => {
let num0 = 0;
let str = "";
@@ -1542,7 +1538,6 @@
}
let num = 0;
list[index].forEach((n) => {
- // console.log(n.v.ps.value);
if (
n.v.ps &&
n.v.ps.value &&
@@ -1550,11 +1545,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 (
@@ -1572,6 +1572,7 @@
});
});
// 鑾峰彇鍒版渶澶ф楠屽�艰緭鍏ヤ釜鏁板悗閲嶇粍鏁版嵁
+ console.log("鏈�澶т釜鏁帮細", maxNum);
let obj0 = {
name: j,
arr: data[i][j].result,
@@ -1619,7 +1620,6 @@
this.getDataIndexLoading = false;
this.dataGetDia = false;
this.getDataTypeId = "";
- console.log("dadada---",this.dataAcquisitionInfo)
this.worker0.postMessage(
JSON.stringify({
dataAcquisitionInfo: this.dataAcquisitionInfo,
@@ -1633,7 +1633,6 @@
// 鐩戝惉 Worker 杩斿洖鐨勭粨鏋�
this.worker0.onmessage = (event) => {
let result = JSON.parse(event.data);
- console.log("Worker 杩斿洖鐨勭粨鏋�:", result);
if (result.method == "changeInput") {
// 閲囬泦鍚庣殑鏁版嵁锛岄渶瑕佽繘琛岃绠楃殑绾跨▼杩涜璁＄畻
let { list, n } = result.value;
@@ -2162,7 +2161,6 @@
let aa = inspectionItemClass +
inspectionItem +
inspectionItemSubclass;
- console.log(aa,str,aa===str)
if (
this.currentSample.insProduct[i].templateId ===
a.templateId &&
@@ -2864,7 +2862,6 @@
orderId: this.orderId,
laboratory: this.sonLaboratory,
}).then((res) => {
- console.log(res)
if (res.code === 200) {
if (!res.data || res.data.errorMsg.length == 0) {
this.submitLoading = true;
--
Gitblit v1.9.3