From c26e25fc5307d23fddcda5f6692ec62acbecc8f3 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 12 六月 2024 14:43:59 +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/add.vue | 166 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 146 insertions(+), 20 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 5598379..ec27cad 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -100,7 +100,7 @@
<template>
<div class="ins_order_add">
- <div v-show="!configShow&&!equipConfigShow">
+ <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭� 鎬讳环锛�<span
style="color: #3A7BFA">锟{total}}</span></el-col>
@@ -116,6 +116,8 @@
<el-button size="medium" @click="templateDia=true" v-show="active==1">
<span style="color: #3A7BFA;">淇濆瓨妯℃澘</span>
</el-button>
+ <el-button size="medium" type="primary" @click="openCableConfig"
+ v-if="active==1&&PROJECT=='瑁呭鐢电紗'">鐢电紗閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="openEquipConfig"
v-if="active==1">瀛愭牱鍝侀厤缃�</el-button>
<el-button size="medium" type="primary" @click="openConfig"
@@ -132,7 +134,7 @@
</el-col>
</el-row>
</div>
- <div class="search" v-show="!configShow&&!equipConfigShow">
+ <div class="search" v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<el-row>
<el-col class="search_thing" :span="6">
<div class="search_label">濮旀墭缂栧彿锛�</div>
@@ -292,15 +294,15 @@
v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
- <el-col class="search_thing" :span="6" v-if="active==1">
+ <!-- <el-col class="search_thing" :span="6" v-if="active==1">
<div class="search_label">RTS锛�</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="RTS"></el-input>
</div>
- </el-col>
+ </el-col> -->
</el-row>
</div>
- <div v-show="!configShow&&!equipConfigShow">
+ <div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
border @selection-change="selectSample" highlight-current-row @row-click="rowClick" style="margin-top: 10px;">
<el-table-column type="selection" width="60" :selectable="selectable" v-if="active==1"></el-table-column>
@@ -451,7 +453,7 @@
<el-col class="search_thing" :span="22">
<div class="search_label"><span class="required-span" v-if="addObj.type == 2">* </span>鎸囨淳浜哄憳锛�</div>
<div class="search_input">
- <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" style="width: 100%;">
+ <el-select v-model="distributeData.userId" placeholder="璇烽�夋嫨" size="small" filterable style="width: 100%;">
<el-option v-for="item in personList" :key="item.value" :label="item.label" :value="item.value">
</el-option>
</el-select>
@@ -489,6 +491,7 @@
v-if="configShow" :active="active" />
<equipConfig :currentId="currentId"
v-if="equipConfigShow" :active="active"/>
+ <cableConfig v-if="cableConfigShow" :active="active" />
<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">
@@ -530,10 +533,38 @@
</el-col>
<el-col style="margin-top: 6px;">
<el-col v-for="(a,ai) in bsm2Val2" :key="ai">
- <el-col :span="10" class="pairing">{{a[0]}}</el-col>
+ <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" class="pairing">{{a[1]}}</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">
+ <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>
@@ -545,11 +576,13 @@
import ValueTable from '../../tool/value-table.vue'
import fiberOpticConfig from './fiberoptic-config.vue'
import equipConfig from './equip-config.vue'
+ import cableConfig from './cable-config.vue'
export default {
components: {
ValueTable,
fiberOpticConfig,
- equipConfig
+ equipConfig,
+ cableConfig
},
props: {
active: {
@@ -679,11 +712,15 @@
bsm1Val: null,
bsm1Dia: false,
equipConfigShow: false,
+ cableConfigShow:false,
bsm2: false,
bsm2Val: null,
bsm2Dia: false,
bsm2Val2: [],
bsm2Val3: [],
+ bsmRow3:null,
+ bsm3Val:null,
+ bsm3:false,
total: 0,
RTS: '',
totalArr: []
@@ -782,7 +819,7 @@
this.addObj.companyId = selects.id
this.selectUserDia = false
},
- handleAsk(ask) {
+ handleAsk(ask,rts) {
let code = [">", "<", "=", "锛�", "锛�", "鈮�", "鈮�", "卤"];
if (ask.includes('RTS')) {
if (ask.includes('&')) {
@@ -793,7 +830,7 @@
let index = code.findIndex(b => m.includes(b))
if (index > -1) {
let arr = m.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], 'RTS', this.RTS))
+ let num = eval(this.replaceAll(arr[0], 'RTS', rts))
m = code[index] + '' + num
arr1.push(m)
}
@@ -804,7 +841,7 @@
let index = code.findIndex(b => ask.includes(b))
if (index > -1) {
let arr = ask.split(code[index]).filter(b => !!b)
- let num = eval(this.replaceAll(arr[0], 'RTS', this.RTS))
+ let num = eval(this.replaceAll(arr[0], 'RTS', rts))
return code[index] + '' + num
}
}
@@ -836,8 +873,6 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
- } else if (this.totalArr.find(a => a.ask!=null&&a.ask.includes('RTS')&&a.state==1) && !this.RTS) {
- this.$message.error('璇疯緭鍏TS')
} else {
let sampleList = this.HaveJson(this.sampleList)
let isRTS = this.totalArr.find(a=>a.ask!=null&&a.ask.includes('RTS')&&a.state==1)
@@ -846,7 +881,7 @@
if(item.insProduct&&item.insProduct.length>0){
item.insProduct.forEach(a=>{
if(a.state==1){
- let ask = this.handleAsk(a.ask)
+ let ask = this.handleAsk(a.ask,a.rts)
if(ask&&a.state==1){
a.ask = ask
}
@@ -861,7 +896,7 @@
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
if(c.state==1){
- let ask = this.handleAsk(c.ask)
+ let ask = this.handleAsk(c.ask,c.rts)
if(ask&&c.state==1){
c.ask = ask
}
@@ -875,7 +910,7 @@
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
if(c.state==1){
- let ask = this.handleAsk(c.ask)
+ let ask = this.handleAsk(c.ask,c.rts)
if(ask&&c.state==1){
c.ask = ask
}
@@ -887,7 +922,7 @@
if(c.productList&&c.productList.length>0){
c.productList.forEach(d=>{
if(d.state==1){
- let ask = this.handleAsk(d.ask)
+ let ask = this.handleAsk(d.ask,d.rts)
if(ask){
d.ask = ask
}
@@ -1099,6 +1134,7 @@
addStandardTree() {
if (this.selectTree == null) return
this.sampleList = []
+ this.productList = []
for (var i = 0; i < this.addObj.sampleNum; i++) {
this.sample.joinName = null
this.sample.joinModel = null
@@ -1112,6 +1148,8 @@
this.sampleList.push(this.HaveJson(this.sample))
this.count++
}
+ this.computationalPairing(this.sampleList.length)
+ this.bsm2Val2 = this.HaveJson(this.bsm2Val3)
},
selectSample(val) {
this.sampleIds = []
@@ -1179,8 +1217,23 @@
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.sampleList.length > 1) {
this.bsm2 = false
+ } else if(row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2){
+ this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ row.state = row.state == 1 ? 0 : 1
+ this.$refs.productTable.toggleRowSelection(row, false)
+ return
+ }
+ if (row.ask.includes('RTS')&&row.state === 1) {
+ this.bsmRow3 = null;
+ row.rts = ''
+ this.bsm3Val = ''
+ this.bsm3 = true
+ this.bsm1Dia = true
+ this.bsmRow3 = row
+ }else{
+ this.bsm3 = false
}
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1405,6 +1458,7 @@
return m
})
}
+ this.bsmRow3 = [];
this.productList.forEach(p => {
if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
if (p.section.indexOf('[') > -1) {
@@ -1423,8 +1477,21 @@
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.sampleList.length > 1) {
this.bsm2 = false
+ } else if(p.bsm === '1' && p.inspectionItem === '鐔旀帴鎹熻��' && this.sampleList.length < 2){
+ this.$message.error('鏍峰搧鏁伴噺涓嶈冻澶熻繘琛岄厤瀵规搷浣�')
+ this.$refs.productTable.clearSelection()
+ return
+ }
+ if (p.ask.includes('RTS')&&p.state === 1) {
+ p.rts = ''
+ this.bsm3Val = ''
+ this.bsm3 = true
+ this.bsm1Dia = true
+ this.bsmRow3.push(p)
+ }else{
+ this.bsm3 = false
}
})
if (e.length > 0) {
@@ -1550,6 +1617,35 @@
// })
}
},
+ openCableConfig(){
+ if (this.active === 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ return
+ }
+ this.cableConfigShow = true
+ } else {
+ if (this.sampleId === null) {
+ this.$message.error('鏈�変腑鏍峰搧')
+ return
+ }
+ // this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
+ // sampleId: this.sampleId
+ // }).then(res => {
+ // if (res.data.length === 0) {
+ // this.$message.error('璇ユ牱鍝佹病鏈夐厤缃厜绾�')
+ // return
+ // }
+ // for (var i in this.sampleList) {
+ // if (this.sampleList[i].id = this.sampleId) {
+ // this.sampleList[i].bushing = res.data
+ // break
+ // }
+ // }
+ // this.configShow = true
+ // })
+ }
+ },
upBsm1(val) {
let sections = JSON.parse(this.bsmRow.section);
let asks = JSON.parse(this.bsmRow.ask);
@@ -1583,6 +1679,36 @@
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
+ }
+ }
+ }
+ if(this.bsm3){
+ 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()
},
--
Gitblit v1.9.3