From cd948d4615d3ae6c571e4ed04275e851632a2dba Mon Sep 17 00:00:00 2001 From: lxp <1928192722@qq.com> Date: 星期五, 09 八月 2024 09:24:20 +0800 Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before --- src/components/do/b1-ins-order/fiberoptic-config.vue | 52 ++++++++++++++++++++++++++-------------------------- 1 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue index cc416bc..6ffdb00 100644 --- a/src/components/do/b1-ins-order/fiberoptic-config.vue +++ b/src/components/do/b1-ins-order/fiberoptic-config.vue @@ -134,7 +134,7 @@ <div class="search-item" style="width: 50%;margin-right: 16px;"> <label style="width: 80px;">绾ゅ甫绫诲瀷</label> <el-select v-model="miresModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;" - + > <el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value"> </el-option> @@ -476,7 +476,7 @@ this.fiberList.push(b) }) } - + }else{ this.fiberList = [] a.fiber.forEach(b=>{ @@ -485,7 +485,7 @@ } }) } - + this.getTypeDicts1() this.getStandTreeBySampleType() this.getStandTreeBySampleType2() @@ -514,7 +514,7 @@ } }) }) - + } if(this.detectionItems.type == 0) { // 璧嬪�兼娴嬮」淇℃伅 鍏夌氦 @@ -584,7 +584,7 @@ }, // 濂楃妫�娴嬮噺璧嬪�� addTestNum() { - + if(parseInt(this.packageInfo.testNum) > parseInt(this.packageInfo.standNum)) { this.packageInfo.testNum = this.packageInfo.standNum this.$message.error('妫�娴嬮噺涓嶈兘澶т簬鏍囧噯閲�') @@ -603,7 +603,7 @@ this.fiberList = [] this.fibersList = [] this.detectionItems = [] - + // 椤甸潰鏄惁鍚湁鍏夌氦甯� if(this.packageInfo.ismiers) { // 鍏ㄦ @@ -646,8 +646,8 @@ } } - - + + }, upNum() { this.fiberList = [] @@ -708,7 +708,7 @@ } a.fibers.push(fibers) this.fibersList.push(fibers) - } + } }) } else { this.bushing = [] @@ -782,7 +782,7 @@ // this.addFiber() // }, 200) // }) - + // 灏嗕笅鎷夋鍊艰祴鍊肩粰鍏夌氦 鐩戝惉鍘婚櫎 if(this.selectFiberList.length == 0) { this.$message.error('璇烽�夋嫨鏁版嵁') @@ -819,7 +819,7 @@ this.detectionType = 0 this.$set(this.detectionItems,'type',0) } - + }) }, methodChange2(val) { @@ -916,7 +916,7 @@ fibersIdent: a.ident, productList: [] } - this.fiberList.push(fiber) + this.fiberList.push(fiber) } }) } else { @@ -937,7 +937,7 @@ }) } }else { - this.fiberList = [] + this.fiberList = [] let flag = true // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣 let colors2 = [] @@ -979,7 +979,7 @@ // this.$message.error('鏈�夋嫨濂楃') // return // } - // this.fiberList = [] + // this.fiberList = [] // let flag = true // // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣 // let colors2 = [] @@ -1188,11 +1188,11 @@ let product = JSON.parse(JSON.stringify(row.productList)) setTimeout(() => { product.forEach(p => { - let rowToSelect = this.detectionItems.find(item => item.id === p.id); - if (rowToSelect) { + let rowToSelect = this.detectionItems.find(item => item.id === p.id); + if (rowToSelect) { this.toggleSelection(rowToSelect); } - }); + }); },200) } } @@ -1213,7 +1213,7 @@ } this.$axios.post(this.$api.standardTree.selectStandardProductList, { model: this.mireModel.split(' - ')[1], - standardMethodListId: this.mireStandard, + standardMethodListId: this.mireStandard, factory: '' }, { headers: { @@ -1228,16 +1228,16 @@ this.detectionItems = res.data this.detectionType = 0 this.$set(this.detectionItems,'type',0) - - if (row.productList != null && row.productList.length > 0) { - let product = JSON.parse(JSON.stringify(row.productList)) + + if (row.productList != null && row.productList.length > 0) { + let product = JSON.parse(JSON.stringify(row.productList)) setTimeout(() => { - product.forEach(p => { - let rowToSelect = this.detectionItems.find(item => item.id === p.id); - if (rowToSelect) { + product.forEach(p => { + let rowToSelect = this.detectionItems.find(item => item.id === p.id); + if (rowToSelect) { this.toggleSelection(rowToSelect); - } - }); + } + }); },200) } } -- Gitblit v1.9.3