From 16d86c76d55eb062fa11ba6272e97379e0496d9d Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 12 六月 2024 14:43:51 +0800
Subject: [PATCH] 检验下单RTS功能修改
---
src/components/do/b1-ins-order/add.vue | 108 ++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 93 insertions(+), 15 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 210ac64..9ff08a8 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>
@@ -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">
@@ -556,6 +559,14 @@
</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>
</el-dialog>
</div>
@@ -565,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: {
@@ -699,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: []
@@ -802,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('&')) {
@@ -813,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)
}
@@ -824,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
}
}
@@ -856,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)
@@ -866,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
}
@@ -881,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
}
@@ -895,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
}
@@ -907,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
}
@@ -1204,6 +1219,16 @@
} else if (row.bsm === '1' && row.inspectionItem === '鐔旀帴鎹熻��' && row.state === 1) {
this.bsm2 = false
}
+ 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) {
item.insProduct.map(m => {
@@ -1427,6 +1452,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) {
@@ -1447,6 +1473,15 @@
}
} 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.bsm3 = true
+ this.bsm1Dia = true
+ this.bsmRow3.push(p)
+ }else{
+ this.bsm3 = false
}
})
if (e.length > 0) {
@@ -1572,6 +1607,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);
@@ -1622,6 +1686,20 @@
}
}
}
+ 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()
},
getTotal() {
--
Gitblit v1.9.3