From d44b083e83ce8e17b681fa8e3f4ea3ed0f1572ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期六, 27 七月 2024 09:59:26 +0800
Subject: [PATCH] 修改班次分页
---
src/components/do/b1-ins-order/fiberoptic-config.vue | 322 ++++++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 305 insertions(+), 17 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 859813e..94f73f9 100644
--- a/src/components/do/b1-ins-order/fiberoptic-config.vue
+++ b/src/components/do/b1-ins-order/fiberoptic-config.vue
@@ -2,7 +2,7 @@
<div class="ins_order_config">
<div>
<el-row class="title">
- <el-col :span="6" style="padding-left: 20px;">鍏夌氦閰嶇疆</el-col>
+ <el-col :span="6" style="padding-left: 20px;text-align: left;">鍏夌氦閰嶇疆</el-col>
<el-col :span="18" style="text-align: right;">
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-if="active==1">淇� 瀛�</el-button>
<el-button size="medium" @click="outConfig">
@@ -53,7 +53,7 @@
</el-table-column>
<el-table-column label="绠¤壊鏍�" show-overflow-tooltip>
<template slot-scope="scope">
- <el-select v-model="scope.row.color" size="mini" :disabled="active!=1">
+ <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable >
<el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
:value="color.value"></el-option>
</el-select>
@@ -104,11 +104,11 @@
</el-col>
</el-row>
<el-row :gutter="10">
- <el-col :span="12">
+ <el-col :span="12" v-if="packageInfo.ismiers">
<div class="grid-content">
<h5>鍏夌氦甯�
- <el-button size="mini" type="primary" class="btns" @click="addFibers"
- :disabled="packageInfo.ismiers===false||miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button>
+ <!-- <el-button size="mini" type="primary" class="btns" @click="addFibers"
+ :disabled="miresModel===null||miresStandard===null" v-if="active==1">鐢熸垚鍏夌氦甯�</el-button> -->
<el-button size="mini" class="btns" @click="clearFibers" :disabled="selectBushing.length === 0" v-if="active==1">娓呴櫎</el-button>
</h5>
<div
@@ -150,10 +150,12 @@
</el-table>
</div>
</el-col>
- <el-col :span="12">
+ <el-col :span="!packageInfo.ismiers?24:12">
<div class="grid-content">
- <h5>鍏夌氦<el-button size="mini" type="primary" class="btns" @click="addFiber"
- :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button></h5>
+ <h5>鍏夌氦
+ <!-- <el-button size="mini" type="primary" class="btns" @click="addFiber"
+ :disabled="mireModel===null||mireStandard===null" v-if="active==1">鍏夌氦閰嶈壊</el-button> -->
+ </h5>
<div
style="display: flex;align-items: center;justify-content: space-between;margin: 4px 0 6px 0;padding: 0 12px;box-sizing: border-box;">
<div class="search-item" style="width: 50%;margin-right: 16px;">
@@ -187,7 +189,7 @@
</el-table-column>
<el-table-column prop="color" label="鍏夌氦鑹叉爣" width="120">
<template slot-scope="scope">
- <el-select v-model="scope.row.color" size="mini" :disabled="active!=1">
+ <el-select v-model="scope.row.color" size="mini" :disabled="active!=1" allow-create filterable >
<el-option v-for="(color,i) in colors" :key="i" :label="color.lable"
:value="color.value"></el-option>
</el-select>
@@ -202,6 +204,93 @@
</el-col>
</el-row>
</div>
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" width="500px" :show-close="false" :before-close="beforeClose">
+ <div class="body" style="max-height: 60vh;">
+ <el-row v-if="bsm1">
+ <el-col class="search_thing" :span="22">
+ <div class="search_label"><span class="required-span">* </span>鎶ゅ瀵嗗害锛�</div>
+ <div class="search_input">
+ <el-radio-group v-model="bsm1Val" @input="upBsm1">
+ <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a"></el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label">瑕佹眰鍊硷細</div>
+ <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
+ <el-radio-group v-model="bsm1Val" @input="upBsm1">
+ <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
+ :label="a">{{JSON.parse(bsmRow.ask)[ai]}}</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="22">
+ <div class="search_label">鍗曚环锛�</div>
+ <div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
+ <el-radio-group v-model="bsm1Val" @input="upBsm1">
+ <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai"
+ :label="a">{{JSON.parse(bsmRow.price)[ai]}}</el-radio>
+ </el-radio-group>
+ </div>
+ </el-col>
+ </el-row>
+ <el-row v-if="bsm2">
+ <el-col class="search_thing" :span="22">
+ <div class="search_label" style="width: 220px;"><span class="required-span">* </span>鏍峰搧鐔旀帴閰嶅鏁伴噺锛�</div>
+ <div class="search_input">
+ <el-input-number size="medium" v-model="bsm2Val" :min="1" :max="bsm2Val3.length" :precision="0" style="width: 70%;"
+ :controls="false" @change="bsm2Up"></el-input-number>
+ <span>MAX锛歿{bsm2Val3.length}}</span>
+ </div>
+ </el-col>
+ <el-col style="margin-top: 6px;">
+ <el-col v-for="(a,ai) in bsm2Val2" :key="ai">
+ <el-col :span="10">
+ <el-select v-model="a[0]" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="(item,index) in sampleList"
+ :key="index"
+ :label="index+1"
+ :value="index+1">
+ </el-option>
+ </el-select>
+ </el-col>
+ <!-- <el-col :span="10" class="pairing">{{a[0]}}</el-col> -->
+ <el-col :span="4" class="pairing" style="border: 0;color: rgba(0, 0, 0, 0.2);">鈥斺��</el-col>
+ <el-col :span="10">
+ <el-select v-model="a[1]" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-option
+ v-for="(item,index) in sampleList"
+ :key="index"
+ :label="index+1"
+ :value="index+1">
+ </el-option>
+ </el-select>
+ </el-col>
+ <!-- <el-col :span="10" class="pairing">{{a[1]}}</el-col> -->
+ </el-col>
+ </el-col>
+ </el-row>
+ <!-- <el-row v-if="bsm3">
+ <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
+ <div class="search_label"><span class="required-span">* </span>RTS锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input>
+ </div>
+ </el-col>
+ </el-row> -->
+ </div>
+ </el-dialog>
+ <el-dialog title="RTS濉啓" :visible.sync="bsm3Dia" width="500px" :show-close="false" :before-close="beforeClose0">
+ <el-row>
+ <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
+ <div class="search_label"><span class="required-span">* </span>RTS锛�</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="bsm3Val"></el-input>
+ </div>
+ </el-col>
+ </el-row>
+ </el-dialog>
</div>
</template>
@@ -215,6 +304,7 @@
},
data() {
return {
+ type:1,
saveLoad: false,
packageInfo: {
radio: 1,
@@ -251,7 +341,20 @@
currentDetectionItems:null,
mireStandardLoading:false,
multiFiberList:[],
- isAskOnlyRead:true
+ isAskOnlyRead:true,
+ bsm1Dia: false,
+ bsmRow: null,
+ bsm1: false,
+ bsm1Val: null,
+ bsm2: false,
+ bsm2Val: null,
+ bsm2Dia: false,
+ bsm2Val2: [],
+ bsm2Val3: [],
+ sampleIds:[],
+ bsm3Val: null,
+ bsmRow3: null,
+ bsm3Dia: false,
}
},
computed: {
@@ -289,7 +392,7 @@
}
})
this.models = this.models.replace(',', '')
- this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')))
+ this.packageInfo.ismiers = this.models.split(',').every(e=>(e.indexOf('d')>-1||e.indexOf('D')>-1))
if(this.sample[0].bushing === undefined || this.sample[0].bushing === null){
this.bushing = []
}else{
@@ -400,8 +503,8 @@
this.miresModels = []
res.data.forEach(a => {
this.miresModels.push({
- label: a.sample,
- value: a.sample
+ label: a.model,
+ value: a.model
})
})
})
@@ -443,6 +546,7 @@
this.productList.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
+ this.addFiber()
}, 200)
})
},
@@ -465,6 +569,7 @@
this.productList2.forEach(a => {
if (a.state == 1) this.toggleSelection(a)
})
+ this.addFibers()
}, 200)
})
},
@@ -487,12 +592,12 @@
this.$message.error('鏈�夋嫨鍏夌氦甯�')
return
}
- this.selectFibers.forEach(a => {
+ this.selectFibers.forEach((a,index) => {
a.fiber = []
for (var i = 0; i < parseInt(a.num); i++) {
let fiber = {
bushColor: a.color,
- color: colors2[i].label,
+ color: colors2[(i+(parseInt(a.num)*index))>colors2.length?0:i+(parseInt(a.num)*index)*index].label,
model: model,
standard: standard,
productList: this.HaveJson(this.productList)
@@ -502,12 +607,12 @@
}
})
} else {
- this.selectBushing.forEach(a => {
+ this.selectBushing.forEach((a,index) => {
a.fiber = []
for (var i = 0; i < parseInt(a.testNum); i++) {
let fiber = {
bushColor: a.color,
- color: colors2[i].label,
+ color: colors2[(i+(parseInt(a.testNum))*index)>colors2.length?0:i+(parseInt(a.testNum))*index].label,
model: model,
standard: standard,
productList: this.HaveJson(this.productList)
@@ -546,6 +651,7 @@
})
},
rowClickFiber(row, column, event,type){
+ this.type = type
if(this.active===1){
if(type==0){
let standard = null;
@@ -567,6 +673,12 @@
}else{
this.isAskOnlyRead = true;
}
+ }
+ }
+ if(this.type==1){
+ if (this.active !== 1) {
+ this.sampleIds = []
+ this.sampleIds.push(row.id)
}
}
this.currentDetectionItems = row
@@ -633,6 +745,59 @@
});
}
}
+ this.bsmRow3 = []
+ this.detectionItems.forEach(p => {
+ if(this.type==1){
+ if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
+ if (p.section.indexOf('[') > -1) {
+ this.bsmRow = this.HaveJson(p)
+ }
+ this.bsm1 = true
+ this.bsm1Dia = true
+ } else if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 0) {
+ this.bsm1 = false
+ }
+ if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
+ this.bsm2 = true
+ this.bsm1Dia = true
+ if(this.bsm2Val2.length === 0){
+ this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
+ this.computationalPairing(this.sampleList.length)
+ this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
+ }
+ } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && p.state === 1) {
+ this.bsm2 = false
+ }
+ }
+ // if (p.ask.includes('RTS')&&p.state === 1) {
+ // p.rts = ''
+ // this.bsm3Val = ''
+ // this.bsm3Dia = true
+ // this.bsmRow3.push(p)
+ // }
+ })
+
+ if (e.length > 0) {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 1
+ return m;
+ })
+ }
+ return item
+ })
+ } else {
+ this.sampleList.map(item => {
+ if (this.sampleIds.indexOf(item.id) > -1) {
+ item.insProduct.map(m => {
+ m.state = 0
+ return m;
+ })
+ }
+ return item
+ })
+ }
this.$nextTick(() => {
this.$refs.productTable.doLayout()
})
@@ -657,6 +822,46 @@
return m;
});
}
+ if(this.type==1){
+ if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
+ if (row.section.indexOf('[') > -1) {
+ this.bsmRow = this.HaveJson(row)
+ }
+ this.bsm1 = true
+ this.bsm1Dia = true
+ } else if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 0) {
+ this.bsm1 = false
+ }
+ if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
+ this.bsm2 = true
+ this.bsm1Dia = true
+ if(this.bsm2Val2.length === 0){
+ this.bsm2Val = (this.sampleList.length - 1) * this.sampleList.length / 2
+ this.computationalPairing(this.sampleList.length)
+ this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
+ }
+ } else if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && row.state === 1) {
+ this.bsm2 = false
+ }
+ }else{
+ this.bsm1Dia = false
+ }
+ // if (row.ask.includes('RTS')&&row.state === 1) {
+ // this.bsmRow3 = null;
+ // row.rts = ''
+ // this.bsm3Val = ''
+ // this.bsm3Dia = true
+ // this.bsmRow3 = row
+ // }else{
+ // this.bsm3Dia = false
+ // }
+ },
+ computationalPairing(n){
+ const nums = [];
+ for (let i = 1; i <= n; i++) {
+ nums.push(i);
+ }
+ this.bsm2Val3 = this.HaveJson(this.permute(nums))
},
setClassName({ column }) {
if (column.type == 'selection' && !this.isAllDisabled) {
@@ -690,6 +895,89 @@
a.bushing = this.bushing
})
this.$message.success('宸蹭繚瀛�')
+ this.$emit('saveFiberopticConfig')
+ },
+ beforeClose(done){
+ if (this.bsm1) {
+ if (this.bsm1Val === null || this.bsm1Val === '') {
+ this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ return
+ }
+ }
+ if (this.bsm2) {
+ if (this.bsm2Val2.length === 0) {
+ this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ return
+ }
+ let set = new Set()
+ for (let i=0;i<this.bsm2Val2.length;i++){
+ let num0 = set.size
+ set.add(JSON.stringify(this.bsm2Val2[i]))
+ let num1 = set.size
+ if(num1==num0){
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
+ let num2 = set.size
+ if(num1==num2){
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ }
+ }
+ done()
+ },
+ beforeClose0(done){
+ if(!this.bsm3Val){
+ this.$message.error('RST蹇呴』濉啓')
+ return
+ }else{
+ if(Array.isArray(this.bsmRow3)){
+ this.bsmRow3.forEach(item=>{
+ item.rts = this.bsm3Val
+ })
+ }else{
+ this.bsmRow3.rts = this.bsm3Val
+ }
+ }
+ done()
+ },
+ upBsm1(val) {
+ let sections = JSON.parse(this.bsmRow.section);
+ let asks = JSON.parse(this.bsmRow.ask);
+ let tells = JSON.parse(this.bsmRow.tell);
+ let manHours = JSON.parse(this.bsmRow.manHour);
+ let prices = JSON.parse(this.bsmRow.price);
+ for (var a in sections) {
+ if (val === sections[a]) {
+ this.productList.forEach(p => {
+ if (p.id === this.bsmRow.id) {
+ p.section = sections[a]
+ p.ask = asks[a]
+ p.tell = tells[a]
+ p.manHour = manHours[a]
+ p.price = prices[a]
+ }
+ })
+ break
+ }
+ }
+ },
+ bsm2Up(val){
+ let list = []
+ for(let a=1;a < this.bsm2Val3.length + 1;a++){
+ list.push(a)
+ }
+ let set = new Set()
+ let size1 = set.length
+ while(set.size < val){
+ set.add(Math.ceil(Math.random() * this.bsm2Val3.length))
+ }
+ this.bsm2Val2 = []
+ for(let a of set){
+ this.bsm2Val2.push(this.HaveJson(this.bsm2Val3[a-1]))
+ }
}
}
}
--
Gitblit v1.9.3