From 620880da2e11fe0a56d24662f4736332bf08e9e5 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期五, 31 五月 2024 15:48:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/fiberoptic-config.vue | 150 +++++++++++++++++++++++++++++++++-----------------
1 files changed, 99 insertions(+), 51 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 0309a28..6dc61c9 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -6,7 +6,7 @@
<el-col :span="18" style="text-align: right;">
<el-button size="medium" type="primary" @click="save" :loading="saveLoad">淇� 瀛�</el-button>
<el-button size="medium" @click="outConfig">
- <span style="color: #3A7BFA;">鍙� 娑�</span>
+ <span style="color: #3A7BFA;">杩� 鍥�</span>
</el-button>
</el-col>
</el-row>
@@ -35,11 +35,11 @@
</div>
<div class="search-item" style="margin-right: 10px;">
<label style="width: 70px;">鏍囧噯閲�</label>
- <el-input v-model="packageInfo.num2" placeholder="璇疯緭鍏�" size="small" @change="upNum"></el-input>
+ <el-input v-model="packageInfo.standNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"></el-input>
</div>
<div class="search-item">
<label style="width: 70px;">妫�娴嬮噺</label>
- <el-input v-model="packageInfo.num3" placeholder="璇疯緭鍏�" size="small" @change="upNum"
+ <el-input v-model="packageInfo.testNum" placeholder="璇疯緭鍏�" size="small" @change="upNum"
:disabled="packageInfo.radio===0"></el-input>
</div>
</div>
@@ -55,9 +55,9 @@
</el-select>
</template>
</el-table-column>
- <el-table-column prop="num2" label="鏍囬噺" show-overflow-tooltip>
+ <el-table-column prop="standNum" label="鏍囬噺" show-overflow-tooltip align="center">
</el-table-column>
- <el-table-column prop="num3" label="娴嬭瘯閲�" show-overflow-tooltip>
+ <el-table-column prop="testNum" label="娴嬭瘯閲�" show-overflow-tooltip align="center">
</el-table-column>
</el-table>
</div>
@@ -65,7 +65,7 @@
<el-col :span="15">
<div class="grid-content">
<h5>妫�娴嬮」淇℃伅</h5>
- <el-table ref="table1" :data="detectionItems" tooltip-effect="dark" style="width: 100%"
+ <el-table ref="productTable" :data="detectionItems" tooltip-effect="dark" style="width: 100%"
:row-class-name="tableRowClassName"
:header-cell-class-name="setClassName"
height="283px"
@@ -81,13 +81,13 @@
</el-table-column>
<el-table-column prop="inspectionItemSubclass" label="妫�楠岄」瀛愰」" show-overflow-tooltip width="100px">
</el-table-column>
- <el-table-column prop="methodS" label="璇曢獙鏂规硶" show-overflow-tooltip>
+ <el-table-column prop="methodS" label="璇曢獙鏂规硶" min-width="90" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="price" label="鍗曚环" width="70" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="unit" label="鍗曚綅" width="70" show-overflow-tooltip>
</el-table-column>
- <el-table-column prop="manDay" label="棰勮鏃堕棿" show-overflow-tooltip>
+ <el-table-column prop="manDay" label="棰勮鏃堕棿" width="90" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="ask" label="妫�娴嬭姹�" show-overflow-tooltip width="200px">
<template slot-scope="scope">
@@ -103,7 +103,7 @@
<div class="grid-content">
<h5>鍏夌氦甯�
<el-button size="mini" type="primary" class="btns" @click="addFibers"
- :disabled="miresModel===null||miresStandard===null">鐢熸垚鍏夌氦甯�</el-button>
+ :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null">鐢熸垚鍏夌氦甯�</el-button>
<el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0">娓呴櫎</el-button>
</h5>
<div
@@ -111,7 +111,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%;"
- :disabled="bushing.length===0">
+ :disabled="selectBushing.length===0">
<el-option v-for="(item,a) in miresModels" :key="a" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -127,7 +127,7 @@
</div>
</div>
<el-table ref="table2" :data="fibersList" tooltip-effect="dark" style="width: 100%" height="270px"
- size="small" @selection-change="handleSelectionChange" highlight-current-row>
+ size="small" @selection-change="handleSelectionChange" highlight-current-row @row-click="rowClickFiber">
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column prop="code" label="鍏夌氦甯︾紪鍙�" show-overflow-tooltip align="center">
@@ -150,7 +150,7 @@
<div class="search-item" style="width: 50%;margin-right: 16px;">
<label style="width: 80px;">鍏夌氦绫诲瀷</label>
<el-select v-model="mireModel" placeholder="璇烽�夋嫨" size="small" style="width: 100%;"
- :disabled="bushing.length===0">
+ :disabled="selectBushing.length===0">
<el-option v-for="(item,a) in mireModels" :key="a" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -166,7 +166,7 @@
</div>
</div>
<el-table ref="table3" :data="fiberList" tooltip-effect="dark" style="width: 100%" height="270px"
- size="small" @selection-change="handleSelectionChange4"
+ size="small" highlight-current-row @selection-change="handleSelectionChange4"
@row-click="rowClickFiber">
<el-table-column type="selection" width="55">
</el-table-column>
@@ -200,8 +200,8 @@
packageInfo: {
radio: 1,
num1: null,
- num2: null,
- num3: null,
+ standNum: null,
+ testNum: null,
ismiers: false
},
tableData: [],
@@ -247,7 +247,6 @@
this.multiFiberList = []
this.detectionItems = []
this.currentDetectionItems = null;
- this.mireStandard = null;
}
},
mireStandard(val1,val0) {
@@ -270,6 +269,31 @@
}
})
this.models = this.models.replace(',', '')
+ this.packageInfo.ismiers = this.models.split(',').every(e=>e.indexOf('d')>-1)
+ if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
+ this.bushing = []
+ }else{
+ this.bushing = this.HaveJson(this.sample[0].bushing)
+ this.packageInfo.num1 = this.sample[0].bushing.length
+ this.packageInfo.standNum = this.sample[0].bushing[0].standNum
+ this.packageInfo.testNum = this.sample[0].bushing[0].testNum
+ this.bushing.forEach(a=>{
+ if(a.fibers===null)a.fibers=[]
+ if(a.fiber===null)a.fiber=[]
+ if(this.packageInfo.ismiers){
+ a.fibers.forEach(b=>{
+ this.fibersList.push(b)
+ b.fiber.forEach(c=>{
+ this.fiberList.push(c)
+ })
+ })
+ }else{
+ a.fiber.forEach(b=>{
+ this.fiberList.push(b)
+ })
+ }
+ })
+ }
this.getTypeDicts1()
this.getStandTreeBySampleType()
this.getStandTreeBySampleType2()
@@ -277,18 +301,14 @@
methods: {
handleSelectionChange(val) {
this.selectFibers = val
+ this.multiFiberList = val
},
handleSelectionChange1(val) {
this.selectBushing = val
- this.mireModel = null
},
handleSelectionChange2(val){},
- handleSelectionChange3(val){
- this.detectionItems = this.HaveJson(this.productList)
- },
handleSelectionChange4(val){
this.multiFiberList = val
- this.detectionItems = this.HaveJson(this.productList)
},
outConfig() {
this.$parent.configShow = false
@@ -301,15 +321,18 @@
})
},
upNum() {
+ this.fiberList = []
+ this.fibersList = []
+ this.detectionItems = []
if (this.packageInfo.radio === 0) {
- this.packageInfo.num3 = this.packageInfo.num2
+ this.packageInfo.testNum = this.packageInfo.standNum
}
- if (parseInt(this.packageInfo.num2) < parseInt(this.packageInfo.num3)) {
- this.packageInfo.num3 = this.packageInfo.num2
+ if (parseInt(this.packageInfo.standNum) < parseInt(this.packageInfo.testNum)) {
+ this.packageInfo.testNum = this.packageInfo.standNum
}
if (this.packageInfo.num1 !== null && this.packageInfo.num1 !== '' &&
- this.packageInfo.num2 !== null && this.packageInfo.num2 !== '' &&
- this.packageInfo.num3 != null && this.packageInfo.num3 !== '') {
+ this.packageInfo.standNum !== null && this.packageInfo.standNum !== '' &&
+ this.packageInfo.testNum != null && this.packageInfo.testNum !== '') {
let colors2 = []
if (this.packageInfo.num1 / this.colors.length > 1) {
let num = this.packageInfo.num1 / this.colors.length
@@ -324,9 +347,8 @@
for (var i = 0; i < this.packageInfo.num1; i++) {
let bushing = {
color: colors2[i].label,
- num2: this.packageInfo.num2,
- num3: this.packageInfo.num3,
- ismiers: this.packageInfo.ismiers,
+ standNum: this.packageInfo.standNum,
+ testNum: this.packageInfo.testNum,
fibers: [],
fiber: []
}
@@ -358,8 +380,8 @@
this.miresModels = []
res.data.forEach(a => {
this.miresModels.push({
- label: a.model,
- value: a.sample + ' - ' + a.model
+ label: a.sample,
+ value: a.sample
})
})
})
@@ -407,9 +429,9 @@
methodChange2(val) {
if (val === null || val === '') return
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
- model: this.miresModel.split(' - ')[1],
+ model: '',
standardMethodListId: val,
- factory: ''
+ factory: '涓ぉ绉戞妧妫�娴嬩腑蹇� - 閫氫俊浜у搧瀹為獙瀹� - 鍏夌氦甯� - ' + this.miresModel + ' - ',
}, {
headers: {
'Content-Type': 'application/json'
@@ -441,34 +463,34 @@
let model = this.mireModel.split(' - ')[1]
let standard = this.mireStandards.find(a => a.id == this.mireStandard).code
if (this.packageInfo.ismiers) {
- /* if(this.selectFibers.length === 0){
+ if(this.selectFibers.length === 0){
this.$message.error('鏈�夋嫨鍏夌氦甯�')
return
- } */
- // this.selectFibers.forEach(a => {
- this.fibersList.forEach(a => {
+ }
+ this.selectFibers.forEach(a => {
+ a.fiber = []
for (var i = 0; i < parseInt(a.num); i++) {
let fiber = {
bushColor: a.color,
color: colors2[i].label,
model: model,
standard: standard,
- product: this.productList
+ productList: this.HaveJson(this.productList)
}
a.fiber.push(fiber)
this.fiberList.push(fiber)
}
})
} else {
- // this.selectBushing.forEach(a => {
- this.bushing.forEach(a => {
- for (var i = 0; i < parseInt(a.num3); i++) {
+ this.selectBushing.forEach(a => {
+ a.fiber = []
+ for (var i = 0; i < parseInt(a.testNum); i++) {
let fiber = {
bushColor: a.color,
color: colors2[i].label,
model: model,
standard: standard,
- productList:this.HaveJson(this.productList),
+ productList: this.HaveJson(this.productList)
}
a.fiber.push(fiber)
this.fiberList.push(fiber)
@@ -477,22 +499,25 @@
}
},
addFibers() {
+ if(this.selectBushing.length===0){
+ this.$message.error('鏈�夋嫨濂楃')
+ return
+ }
this.fibersList = []
- let model = this.miresModel.split(' - ')[1]
let standard = this.miresStandards.find(a => a.id == this.miresStandard).code
this.packageInfo.ismiers = true
this.fiberList = []
- this.bushing.forEach(a => {
- // this.selectBushing.forEach(a => {
+ this.selectBushing.forEach(a => {
a.fiber = []
- for (var i = 0; i < parseInt(a.num3); i++) {
+ a.fibers = []
+ for (var i = 0; i < parseInt(a.testNum); i++) {
let fibers = {
code: null,
color: a.color,
- model: model,
+ model: this.miresModel,
standard: standard,
- num: a.num3,
- product: this.HaveJson(this.productList2),
+ num: a.testNum,
+ productList: this.HaveJson(this.productList2),
fiber: []
}
a.fibers.push(fibers)
@@ -502,7 +527,16 @@
},
rowClickFiber(row, column, event){
this.currentDetectionItems = row
- this.detectionItems = this.HaveJson(this.productList)
+ this.detectionItems = row.productList
+ if(this.detectionItems === null) return
+ setTimeout(() => {
+ this.detectionItems.forEach(a => {
+ if (a.state == 1) this.toggleSelection(a)
+ })
+ }, 200)
+ },
+ toggleSelection(row) {
+ this.$refs.productTable.toggleRowSelection(row, true);
},
tableRowClassName({
row,
@@ -557,7 +591,7 @@
}
}
this.$nextTick(() => {
- this.$refs.table1.doLayout()
+ this.$refs.productTable.doLayout()
})
},
upProductSelect(selection, row) {
@@ -594,6 +628,20 @@
})
},
save(){
+ if(this.bushing.length === 0){
+ this.$message.error('缂哄皯閰嶇疆鏃犳硶淇濆瓨')
+ return
+ }
+ for(let a in this.bushing){
+ if(this.bushing[a].fibers.length===0&&this.bushing[a].fiber.length===0){
+ this.$message.error(this.bushing[a].color+'绠¤壊鏍囧绠＄己灏戦厤缃棤娉曚繚瀛�')
+ return
+ }
+ }
+ this.sample.forEach(a=>{
+ a.bushing = this.bushing
+ })
+ this.$message.success('宸蹭繚瀛�')
console.log(this.bushing);
}
}
--
Gitblit v1.9.3