From 57e76b55709e8ea88a83ab6c3f665fd9ee7fd64c Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 14:23:48 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/do/b1-ins-order/fiberoptic-config.vue | 133 +++++++++++++++++++++++++++++++-------------
1 files changed, 93 insertions(+), 40 deletions(-)
diff --git a/src/components/do/b1-ins-order/fiberoptic-config.vue b/src/components/do/b1-ins-order/fiberoptic-config.vue
index 633a1c2..8255f67 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>
+ :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,7 +150,7 @@
</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>
@@ -187,7 +187,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>
@@ -269,7 +269,25 @@
</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>
@@ -331,7 +349,10 @@
bsm2Dia: false,
bsm2Val2: [],
bsm2Val3: [],
- sampleIds:[]
+ sampleIds:[],
+ bsm3Val: null,
+ bsmRow3: null,
+ bsm3Dia: false,
}
},
computed: {
@@ -480,8 +501,8 @@
this.miresModels = []
res.data.forEach(a => {
this.miresModels.push({
- label: a.sample,
- value: a.sample
+ label: a.model,
+ value: a.model
})
})
})
@@ -567,12 +588,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)
@@ -582,12 +603,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)
@@ -720,8 +741,9 @@
});
}
}
- if(this.type==1){
- this.detectionItems.forEach(p => {
+ 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)
@@ -731,7 +753,7 @@
} 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) {
+ if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && p.state === 1) {
this.bsm2 = true
this.bsm1Dia = true
if(this.bsm2Val2.length === 0){
@@ -739,31 +761,38 @@
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
- } else if (p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && p.state === 1) {
+ } else if (p.bsm === '1' && p.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && p.state === 1) {
this.bsm2 = false
}
- })
- 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
- })
}
+ // 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()
@@ -799,7 +828,7 @@
} 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) {
+ if (row.bsm === '1' && row.inspectionItem === '鍏夌氦鎺ュご鎹熻��' && this.sampleList.length > 1 && row.state === 1) {
this.bsm2 = true
this.bsm1Dia = true
if(this.bsm2Val2.length === 0){
@@ -807,12 +836,21 @@
this.computationalPairing(this.sampleList.length)
this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
}
- } else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1) {
+ } 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 = [];
@@ -886,6 +924,21 @@
}
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);
--
Gitblit v1.9.3