From 41c2f79abd464e6c063166d680b51f746d6f0456 Mon Sep 17 00:00:00 2001 From: licp <lichunping@guanfang.com.cn> Date: 星期六, 10 八月 2024 16:25:13 +0800 Subject: [PATCH] 修改特殊值填值 --- src/components/do/b1-ins-order/add.vue | 14 ++++++-------- 1 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue index d477f91..d77d67e 100644 --- a/src/components/do/b1-ins-order/add.vue +++ b/src/components/do/b1-ins-order/add.vue @@ -620,8 +620,7 @@ </el-row> </span> </el-dialog> - <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 0" :active="active" /> - <fiberOpticConfigTwo :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow && examine == 1" :active="active" /> + <fiberOpticConfig :currentId="currentId" @saveFiberopticConfig="getTotal()" v-if="configShow" :active="active" /> <equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" /> <cableConfig v-if="cableConfigShow" :active="active" /> <!-- 鍗曢�夌壒娈婂�煎鐞嗘--> @@ -1187,7 +1186,7 @@ const nextIndex = index+1 for (let i = nextIndex; i < this.editTable.length; i++) { const element = this.editTable[i]; - if(element.model==row.model){ + if(element.model==row.model&&row.symbolItem==element.symbolItem){ this.editTable[i].value = row.value }else{ break; @@ -1600,10 +1599,9 @@ return } } - console.log('isHaveBushing===', this.totalArr) - // inspectionItem - let spcialItem = null//this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�')) - // console.log('isHaveBushing===', isHaveBushing) + + // console.log('isHaveBushing===', this.totalArr) + let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�')) if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) { this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆') this.$refs.sampleTable.setCurrentRow(this.currentMethod, true) @@ -3003,7 +3001,7 @@ this.totalArr = [] this.total = 0; this.sampleList.forEach(item => { - if (item.insProduct && item.insProduct.length > 0) { + if (item.insProduct && item.insProduct.length > 0) { item.insProduct.forEach(a => { this.totalArr.push(a) }) -- Gitblit v1.9.3