From 860c08388adb4196f30851d23ef652deaef26ffc Mon Sep 17 00:00:00 2001
From: zouyu <2723363702@qq.com>
Date: 星期六, 10 八月 2024 15:32:48 +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 | 234 +++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 173 insertions(+), 61 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 99b9bed..7ae348a 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -35,12 +35,12 @@
</div>
<div class="search-item" style="margin-right: 10px;">
<label style="width: 100px">姣忔牴绠℃娊妫�鏍囧噯閲�</label>
- <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="active!=1" style="width:100px"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @blur="addStandNum" :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
</div>
<div class="search-item">
<label style="width: 100px">姣忔牴绠℃娊妫�妫�娴嬮噺</label>
<el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @blur="addTestNum"
- :disabled="packageInfo.radio===0||active!=1" style="width:100px"></el-input>
+ :disabled="packageInfo.radio===0||active!=1" style="width:70px"></el-input>
</div>
</div>
<el-table ref="table0" :data="bushing" tooltip-effect="dark" style="width: 100%" height="203px" size="small"
@@ -95,8 +95,14 @@
</el-table-column> -->
<el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
<template slot-scope="scope">
- <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead"></el-input>
+ <el-input v-model="scope.row.ask" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
<span v-else>{{ scope.row.ask }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="tell" label="瑕佹眰鎻忚堪" show-overflow-tooltip width="150">
+ <template slot-scope="scope">
+ <el-input v-model="scope.row.tell" placeholder="璇疯緭鍏�" size="small" :disabled="active!=1" v-if="!isAskOnlyRead" @change="changeASk(scope.row)"></el-input>
+ <span v-else>{{ scope.row.tell }}</span>
</template>
</el-table-column>
</el-table>
@@ -134,7 +140,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>
@@ -152,8 +158,11 @@
</div>
</div>
- <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+ <!-- <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="(row, column, event)=>rowClickFiber(row, column, event,1)"
+ :header-cell-class-name="setClassName0"> -->
+ <el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" @selection-change="handleSelectionChange" highlight-current-row
:header-cell-class-name="setClassName0">
<el-table-column
type="selection"
@@ -227,9 +236,12 @@
</el-select>
</div>
</div>
- <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
+ <!-- <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
size="small" highlight-current-row @selection-change="handleSelectionChange4"
@row-click="(row, column, event)=>rowClickFiber(row, column, event,0)"
+ :header-cell-class-name="setClassName0"> -->
+ <el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
+ size="small" highlight-current-row @selection-change="handleSelectionChange4"
:header-cell-class-name="setClassName0">
<el-table-column
type="selection"
@@ -476,7 +488,7 @@
this.fiberList.push(b)
})
}
-
+
}else{
this.fiberList = []
a.fiber.forEach(b=>{
@@ -485,7 +497,7 @@
}
})
}
-
+
this.getTypeDicts1()
this.getStandTreeBySampleType()
this.getStandTreeBySampleType2()
@@ -506,7 +518,7 @@
this.detectionSelect = val
// 璧嬪�兼娴嬮」淇℃伅 鍏夌氦甯�
if(this.detectionItems.type == 1) {
- this.multiFiberList.forEach(item => {
+ this.multiFiberList.forEach(item => {
this.fibersList.forEach(a => {
if(a.ident == item.ident){
a.productList = []
@@ -514,8 +526,10 @@
}
})
})
-
}
+ console.log(this.fibersList);
+
+
if(this.detectionItems.type == 0) {
// 璧嬪�兼娴嬮」淇℃伅 鍏夌氦
this.selectFiberList.forEach(item => {
@@ -526,8 +540,9 @@
}
})
})
-
- if(this.multiFiberList.length == 1) {
+ // 閫夋嫨鐨勬椂鍊欏氨灏唂iberList鐨勫�艰祴鍊肩粰瀵瑰簲鐨刦iberList
+ setTimeout(() => {
+ if(this.multiFiberList.length > 0) {
this.multiFiberList.forEach(item => {
this.fibersList.forEach(a => {
if(a.ident == item.ident){
@@ -535,11 +550,8 @@
}
})
})
- }else if(this.multiFiberList.length > 1) {
- this.fibersList.forEach(item => {
- item.fiber = this.fiberList
- })
}
+ },100)
}
},
handleSelectionChange4(val){
@@ -547,6 +559,46 @@
if(val != 0) {
this.rowClickFiber(val[val.length-1],null,null,0)
}
+ },
+
+ changeASk(row) {
+ // 鍏堝嬀閫夌殑鎯呭喌涓�
+ this.detectionSelect.forEach(item => {
+ if(item.id == row.id) {
+ item.ask = row.ask
+ item.tell = row.tell
+ // 鍏夌氦 0 鍏夌氦甯� 1
+ if(item.isFibers == 0) {
+ this.selectFiberList.forEach(a => {
+ this.fiberList.forEach(b => {
+ if(b.ident == a.ident){
+ b.productList.forEach(item => {
+ if(item.id == row.id) {
+ item.ask = row.ask
+ item.tell = row.tell
+ }
+ })
+ }
+ })
+ })
+ }
+ if(item.isFibers == 1) {
+ this.multiFiberList.forEach(a => {
+ this.fibersList.forEach(b => {
+ if(b.ident == a.ident){
+ b.productList.forEach(item => {
+ if(item.id == row.id) {
+ item.ask = row.ask
+ item.tell = row.tell
+ }
+ })
+ }
+ })
+ })
+
+ }
+ }
+ })
},
outConfig() {
this.$parent.configShow = false
@@ -575,6 +627,11 @@
},
// 濂楃鏍囧噯閲忚祴鍊�
addStandNum() {
+ if(this.packageInfo.testNum > this.packageInfo.standNum) {
+ this.$message.error('妫�娴嬮噺涓嶈兘澶т簬鏍囧噯閲�')
+ this.packageInfo.testNum = this.packageInfo.standNum
+ }
+
if(this.selectBushing.length > 0) {
this.bushing.forEach(item => {
this.selectBushing.forEach(a => {
@@ -587,7 +644,7 @@
},
// 濂楃妫�娴嬮噺璧嬪��
addTestNum() {
-
+
if(parseInt(this.packageInfo.testNum) > parseInt(this.packageInfo.standNum)) {
this.packageInfo.testNum = this.packageInfo.standNum
this.$message.error('妫�娴嬮噺涓嶈兘澶т簬鏍囧噯閲�')
@@ -606,24 +663,32 @@
this.fiberList = []
this.fibersList = []
this.detectionItems = []
-
// 椤甸潰鏄惁鍚湁鍏夌氦甯�
if(this.packageInfo.ismiers) {
// 鍏ㄦ
if (this.packageInfo.radio == 0) {
+ if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
+ this.$message.error('璇峰厛杈撳叆鏍囧噯閲�')
+ return
+ }
// 鏍规嵁鏍囧噯閲忚祴鍊兼娴嬮噺
if(parseInt(this.packageInfo.standNum) > 0 ) {
- // 缁欏厜绾ゅ甫璧嬪��
this.packageInfo.testNum = this.packageInfo.standNum
- this.selectBushing = this.bushing
+ // 缁欏厜绾ゅ甫璧嬪��
+ this.bushing.forEach(item => {
+ item.testNum = this.packageInfo.testNum
+ item.standNum = this.packageInfo.standNum
+ this.$refs.table0.toggleRowSelection(item, true)
+ })
+
this.addFibers()
this.multiFiberList = this.fibersList
// 榛樿鍕鹃��
setTimeout(() => {
- this.selectBushing.forEach(item =>{
- let rowToSelect = this.bushing.find(a => a.ident == item.ident)
- this.$refs.table0.toggleRowSelection(rowToSelect, true)
- })
+ // this.selectBushing.forEach(item =>{
+ // let rowToSelect = this.bushing.find(a => a.ident == item.ident)
+ // this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ // })
this.multiFiberList.forEach(item =>{
let rowToSelect = this.fibersList.find(a => a.ident == item.ident)
@@ -634,23 +699,37 @@
}
}else {
if(this.packageInfo.radio == 0) {
+ if(this.packageInfo.standNum == null || this.packageInfo.standNum == '') {
+ this.$message.error('璇峰厛杈撳叆鏍囧噯閲�')
+ return
+ }
if(parseInt(this.packageInfo.standNum) > 0 ) {
- this.packageInfo.testNum = this.packageInfo.standNum
+ this.packageInfo.testNum = this.packageInfo.standNum
+ this.bushing.forEach(item => {
+ item.testNum = this.packageInfo.testNum
+ item.standNum = this.packageInfo.standNum
+ this.$refs.table0.toggleRowSelection(item, true)
+ })
+ console.log(this.bushing);
this.selectBushing = this.bushing
this.addFiber()
// 榛樿鍕鹃��
setTimeout(() => {
- this.selectBushing.forEach(item =>{
- let rowToSelect = this.bushing.find(a => a.ident == item.ident)
- this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ // this.selectBushing.forEach(item =>{
+ // let rowToSelect = this.bushing.find(a => a.ident == item.ident)
+ // this.$refs.table0.toggleRowSelection(rowToSelect, true)
+ // })
+
+ this.fiberList.forEach(item =>{
+ this.$refs.table3.toggleRowSelection(item, true)
})
}, 200)
}
}
}
-
-
+
+
},
upNum() {
this.fiberList = []
@@ -711,7 +790,7 @@
}
a.fibers.push(fibers)
this.fibersList.push(fibers)
- }
+ }
})
} else {
this.bushing = []
@@ -785,23 +864,13 @@
// this.addFiber()
// }, 200)
// })
-
+
// 灏嗕笅鎷夋鍊艰祴鍊肩粰鍏夌氦 鐩戝惉鍘婚櫎
if(this.selectFiberList.length == 0) {
this.$message.error('璇烽�夋嫨鏁版嵁')
return
}
- this.selectFiberList.forEach(item => {
- this.fiberList.forEach(a => {
- if(a.ident == item.ident){
- a.model = this.mireModel.split(' - ')[1] // 鍏夌氦瑙勬牸
- a.noSplitModel = this.mireModel // 鍏夌氦瑙勬牸
- if(this.mireStandards != null) {
- a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code // 鍙傝�冩爣鍑�
- }
- }
- })
- })
+
if (val === null || val === '') return
if(this.mireStandards == null ) return
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
@@ -822,7 +891,19 @@
this.detectionType = 0
this.$set(this.detectionItems,'type',0)
}
-
+ this.mireStandards.find(a => a.id == val).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+ this.selectFiberList.forEach(item => {
+ this.fiberList.forEach(a => {
+ if(a.ident == item.ident){
+ a.model = this.mireModel.split(' - ')[1] // 鍏夌氦瑙勬牸
+ a.noSplitModel = this.mireModel // 鍏夌氦瑙勬牸
+ if(this.mireStandards != null) {
+ a.standard = this.mireStandards.find(a => a.id == this.mireStandard).code // 鍙傝�冩爣鍑�
+ }
+ }
+ })
+ })
+
})
},
methodChange2(val) {
@@ -871,6 +952,8 @@
this.detectionItems = res.data
this.detectionType = 1
this.$set(this.detectionItems,'type',1)
+ // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+ this.miresStandards.find(a => a.id == val).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
}
// 缁欓�変腑鐨勫厜绾ゅ甫璧嬪��
@@ -919,7 +1002,7 @@
fibersIdent: a.ident,
productList: []
}
- this.fiberList.push(fiber)
+ this.fiberList.push(fiber)
}
})
} else {
@@ -940,7 +1023,7 @@
})
}
}else {
- this.fiberList = []
+ this.fiberList = []
let flag = true
// 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
let colors2 = []
@@ -982,7 +1065,7 @@
// this.$message.error('鏈�夋嫨濂楃')
// return
// }
- // this.fiberList = []
+ // this.fiberList = []
// let flag = true
// // 鎸夌収椤哄簭鐢熸垚鍏夌氦鑹叉爣
// let colors2 = []
@@ -1184,6 +1267,21 @@
// 灏嗚幏鍙栫殑妫�娴嬮」淇℃伅璧嬪��
this.detectionItems = []
if(res.data != null && res.data.length != 0){
+ res.data.forEach(a => {
+ this.$set(a,'isFibers',1)
+ })
+ // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+ this.miresStandards.find(a => a.id == this.miresStandard).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+ if(!this.isAskOnlyRead){
+ row.productList.forEach(a => {
+ res.data.forEach(b => {
+ if(a.id == b.id){
+ b.ask = a.ask
+ b.tell = a.tell
+ }
+ })
+ })
+ }
this.detectionItems = res.data
this.detectionType = 1
this.$set(this.detectionItems,'type',1)
@@ -1191,16 +1289,16 @@
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)
}
}
})
- },1000)
+ },500)
}else if(type == 0) {
if((row.noSplitModel == null || row.noSplitModel == '') && (row.standard == null || row.standard == '')){
this.detectionItems = []
@@ -1216,7 +1314,7 @@
}
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
model: this.mireModel.split(' - ')[1],
- standardMethodListId: this.mireStandard,
+ standardMethodListId: this.mireStandard,
factory: ''
}, {
headers: {
@@ -1227,25 +1325,39 @@
if(res.data != null && res.data.length != 0){
res.data.forEach(a => {
a.state = 0
+ this.$set(a,'isFibers',0)
})
+ // 鍒ゆ柇鏄惁涓哄鎵樿姹�
+ this.mireStandards.find(a => a.id == this.mireStandard).code == '濮旀墭瑕佹眰'?this.isAskOnlyRead = false:this.isAskOnlyRead = true
+ if(!this.isAskOnlyRead){
+ row.productList.forEach(a => {
+ res.data.forEach(b => {
+ if(a.id == b.id){
+ b.ask = a.ask
+ b.tell = a.tell
+ }
+ })
+ })
+ }
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)
}
}
})
- },1000);
+ },500);
}
},
toggleSelection(row) {
--
Gitblit v1.9.3