From 32a95699e59c5c65e18c08643266c9cbfa380ee4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期五, 07 六月 2024 09:56:05 +0800
Subject: [PATCH] 优化设备明细、检验任务附件权限
---
src/components/do/b1-ins-order/add.vue | 99 +++++++++++++++++++++++++++++++++++++------------
1 files changed, 74 insertions(+), 25 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index c33889d..142aa7b 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -92,7 +92,7 @@
<template>
<div class="ins_order_add">
- <div v-show="!configShow">
+ <div v-show="!configShow&&!equipConfigShow">
<el-row class="title">
<el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭� 鎬讳环锛�<span style="color: #3A7BFA">锟{total}}</span></el-col>
<el-col :span="18" style="text-align: right;">
@@ -107,8 +107,10 @@
<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="openEquipConfig"
+ v-if="PROJECT==='瑁呭鐢电紗'">鐢电紗閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="openConfig"
- v-if="this.addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button>
+ v-if="addObj.sampleType==='鍏夌紗'">鍏夌氦閰嶇疆</el-button>
<el-button size="medium" type="primary" @click="save" :loading="saveLoad" v-show="active==1">鎻愪氦</el-button>
<!-- 瀹℃牳 -->
<el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3"
@@ -121,7 +123,7 @@
</el-col>
</el-row>
</div>
- <div class="search" v-show="!configShow">
+ <div class="search" v-show="!configShow&&!equipConfigShow">
<el-row>
<el-col class="search_thing" :span="6">
<div class="search_label">濮旀墭缂栧彿锛�</div>
@@ -289,7 +291,7 @@
</el-col>
</el-row>
</div>
- <div v-show="!configShow">
+ <div v-show="!configShow&&!equipConfigShow">
<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>
@@ -476,6 +478,8 @@
<fiberOpticConfig :currentId="currentId"
@saveFiberopticConfig="getTotal()"
v-if="configShow" :active="active" />
+ <equipConfig :currentId="currentId"
+ v-if="equipConfigShow" :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">
@@ -504,10 +508,12 @@
<script>
import ValueTable from '../../tool/value-table.vue'
import fiberOpticConfig from './fiberoptic-config.vue'
+ import equipConfig from './equip-config.vue'
export default {
components: {
ValueTable,
- fiberOpticConfig
+ fiberOpticConfig,
+ equipConfig
},
props: {
active: {
@@ -638,7 +644,8 @@
bsm1Dia: false,
total:0,
RTS:'',
- totalArr:[]
+ totalArr:[],
+ equipConfigShow: false,
}
},
watch: {
@@ -740,25 +747,30 @@
if(ask.includes('&')){
// 澶氫釜鏉′欢
let arr0 = ask.split('&')
+ let arr1 = []
arr0.forEach(m=>{
let index = code.findIndex(b=>m.includes(b))
if(index>-1){
- let arr = m.split(code[index]).find(b=>b)
- let num = eval(arr[0].replace(/RTS/g, this.RTS))
+ let arr = m.split(code[index]).filter(b=>!!b)
+ let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
m = code[index] + ''+ num
+ arr1.push(m)
}
})
- return arr0.join('&')
+ return arr1.join('&')
}else{
// 鍗曚釜鏉′欢
let index = code.findIndex(b=>ask.includes(b))
if(index>-1){
- let arr = ask.split(code[index]).find(b=>b)
- let num = eval(arr[0].replace(/RTS/g, this.RTS))
+ let arr = ask.split(code[index]).filter(b=>!!b)
+ let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
return code[index] + ''+ num
}
}
}
+ },
+ replaceAll(str, find, replace) {
+ return str.replace(new RegExp(find, 'g'), replace);
},
save() {
if (!this.addObj.companyId) {
@@ -783,18 +795,20 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
- }else if (this.totalArr.find(a=>a.ask.includes('RTS'))&&!this.RTS) {
+ }else if (this.totalArr.find(a=>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.includes('RTS'))
+ let isRTS = this.totalArr.find(a=>a.ask.includes('RTS')&&a.state==1)
if(isRTS){
sampleList.forEach(item=>{
if(item.insProduct&&item.insProduct.length>0){
item.insProduct.forEach(a=>{
- let ask = this.handleAsk(a.ask)
- if(ask){
- a.ask = ask
+ if(a.state==1){
+ let ask = this.handleAsk(a.ask)
+ if(ask&&a.state==1){
+ a.ask = ask
+ }
}
})
}
@@ -805,9 +819,11 @@
a.fiber.forEach(b=>{
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
- let ask = this.handleAsk(c.ask)
- if(ask){
- c.ask = ask
+ if(c.state==1){
+ let ask = this.handleAsk(c.ask)
+ if(ask&&c.state==1){
+ c.ask = ask
+ }
}
})
}
@@ -817,9 +833,11 @@
a.fibers.forEach(b=>{
if(b.productList&&b.productList.length>0){
b.productList.forEach(c=>{
- let ask = this.handleAsk(c.ask)
- if(ask){
- c.ask = ask
+ if(c.state==1){
+ let ask = this.handleAsk(c.ask)
+ if(ask&&c.state==1){
+ c.ask = ask
+ }
}
})
}
@@ -827,9 +845,11 @@
b.fiber.forEach(c=>{
if(c.productList&&c.productList.length>0){
c.productList.forEach(d=>{
- let ask = this.handleAsk(d.ask)
- if(ask){
- d.ask = ask
+ if(d.state==1){
+ let ask = this.handleAsk(d.ask)
+ if(ask){
+ d.ask = ask
+ }
}
})
}
@@ -1412,6 +1432,35 @@
})
}
},
+ openEquipConfig(){
+ if (this.active === 1) {
+ if (this.sampleIds.length === 0) {
+ this.$message.error("鏈�夋嫨鏍峰搧")
+ return
+ }
+ this.equipConfigShow = 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);
--
Gitblit v1.9.3