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 | 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 1377575..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>
@@ -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>
@@ -588,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)
@@ -603,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)
@@ -753,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){
@@ -761,16 +761,16 @@
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 (p.ask.includes('RTS')&&p.state === 1) {
- p.rts = ''
- this.bsm3Val = ''
- this.bsm3Dia = true
- this.bsmRow3.push(p)
- }
+ // if (p.ask.includes('RTS')&&p.state === 1) {
+ // p.rts = ''
+ // this.bsm3Val = ''
+ // this.bsm3Dia = true
+ // this.bsmRow3.push(p)
+ // }
})
if (e.length > 0) {
@@ -828,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){
@@ -836,21 +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
- }
+ // 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 = [];
--
Gitblit v1.9.3