From dd6aa18a74f7c47d816ae57be4667274a48ebee3 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 09 八月 2024 09:29:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 26 ++++++++++++++------------
1 files changed, 14 insertions(+), 12 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index fa001fe..c454335 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -1150,16 +1150,16 @@
})
},
currentTable(val1, val0) {
- if(val0 !=null && val1 != val0){
- if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�')){
- if(this.casing.length>0){
- this.handleChange(this.casing[0].id,3)
+ if (val0 != null && val1 != val0) {
+ if(this.tableLists.find(m=>m.templateId==val1)&&(this.tableLists.find(m=>m.templateId==val1).templateName=='鎴愬搧缂嗘楠屽師濮嬭褰�')){
+ if(this.casing.length>0){
+ this.handleChange(this.casing[0].id,3)
+ }
+ return
}
- return
- }
- if(this.changeType && this.changeType>0){
- return
- }
+ if(this.changeType&&this.changeType>0){
+ return
+ }
this.tableLists.forEach(async (m, i) => {
if (m.templateId == val1) {
let list = await this.getCurrentProduct(this.currentSample.id,0)
@@ -1203,7 +1203,6 @@
}
}
})
- this.handleCasing()
}
},
equipForm:{
@@ -2116,7 +2115,7 @@
})
},
async handleChange(m,type){
- this.changeType = type;
+ this.changeType = type
if(m){
let list = await this.getCurrentProduct(m,type)
if(list.length>0){
@@ -2677,16 +2676,19 @@
this.tableList[0].arr.forEach(item=>{
item.forEach(m=>{
if(m.i==pId&&m.v.ps&&m.v.ps.value=='缁撹'){
- this.$set(m.v,'v',3)
+ this.$set(m.v,'v',3)
}
})
})
if(this.param[pId].insResult&&this.param[pId].insResult.v){
+ this.param[pId].insResult.v.v = 3
}
this.saveInsContext()
return
}
}
+ // this.currentTable.
+ // if(!this.param[pId].equipValue||this.param[pId].equipValue.length==0||!this.param[pId].equipValue[0].v.v){}
if (n) {
// if (this.PROJECT === '瑁呭鐢电紗') {
// let num2 = new this.$Big(n.v.v)
--
Gitblit v1.9.3