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 | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/src/views/business/inspectionTask/inspection.vue b/src/views/business/inspectionTask/inspection.vue
index 780fbc4..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 && [0,1].includes(typeSource)" 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>-->
@@ -1013,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;
},
@@ -1167,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)
}
@@ -1358,6 +1359,7 @@
});
const params = {
entrustCode: this.insOrder.entrustCode,
+ lotBatchNo: this.insOrder.lotBatchNo,
sampleCode: this.currentSample.sampleCode,
id: this.currentSample.id,
itemIds: itemIds,
@@ -1505,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,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 (
@@ -1564,6 +1572,7 @@
});
});
// 鑾峰彇鍒版渶澶ф楠屽�艰緭鍏ヤ釜鏁板悗閲嶇粍鏁版嵁
+ console.log("鏈�澶т釜鏁帮細", maxNum);
let obj0 = {
name: j,
arr: data[i][j].result,
--
Gitblit v1.9.3