From 1adf527b99dd79ffd45796325710f0896756841c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 07 八月 2024 21:44:39 +0800
Subject: [PATCH] 光纤配置查看
---
/dev/null | 1 -
src/components/do/b1-inspect-order-plan/Inspection.vue | 19 ++++++++++++-------
src/components/view/b1-inspect-order-plan.vue | 2 +-
3 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/.nvmdrc b/.nvmdrc
deleted file mode 100644
index 421dc09..0000000
--- a/.nvmdrc
+++ /dev/null
@@ -1 +0,0 @@
-18.11.0
\ No newline at end of file
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 2f55a89..cf1bc9f 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -943,6 +943,7 @@
requiredUp: []
},
upIndex: 0,
+ changeType:null,
getReportModelLoading:false,
insOrder: {},
sampleProduct: [],
@@ -1142,7 +1143,16 @@
})
},
currentTable(val1, val0) {
- if (val0 != null && 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)
+ }
+ 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)
@@ -1185,11 +1195,6 @@
}
})
this.handleCasing()
- 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)
- }
- }
}
},
equipForm:{
@@ -1351,7 +1356,6 @@
maxNum = num
}
}
- console.log('data[i][j].equipName',data[i][j].equipName,'data[i][j].equipValue',data[i][j].equipValue,'m.v',m.v,'m.v.ps',m.v.ps,'m.v.ps.value',m.v.ps.value,'str0',str0,'str',str,'m.v.v',m.v.v)
if(data[i][j].equipName&&data[i][j].equipValue&&m.v&&m.v.ps&&m.v.ps.value=='璁惧缂栫爜'&&str0==str){
if(!m.v.v){
this.changeEquip(data[i][j].equipValue,m,data[i][j].equipName)
@@ -2094,6 +2098,7 @@
})
},
async handleChange(m,type){
+ this.changeType = type;
if(m){
let list = await this.getCurrentProduct(m,type)
if(list.length>0){
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 05c0f51..c20f6ed 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -345,7 +345,7 @@
type: 'text',
method: 'claimFun',
disabFun: (row, index) => {
- return row.userName != null||(row.userName&&!row.userName.includes(JSON.parse(localStorage.getItem("user")).name))
+ return row.userName != null || row.checkName!=null
}
}
],
--
Gitblit v1.9.3