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 | 248 +++++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 238 insertions(+), 10 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 1d19dd8..142aa7b 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -92,9 +92,9 @@
<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;">濮旀墭鍗曚俊鎭�</el-col>
+ <el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭� 鎬讳环锛�<span style="color: #3A7BFA">锟{total}}</span></el-col>
<el-col :span="18" style="text-align: right;">
<el-select v-model="template" size="medium" placeholder="涓嬪崟妯℃澘" style="margin-right: 10px;" v-show="active==1"
@change="selectInsOrderTemplateById">
@@ -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>
@@ -281,9 +283,15 @@
v-model="addObj.remark" :readonly="active>1"></el-input>
</div>
</el-col>
+ <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-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>
@@ -467,7 +475,11 @@
</el-row>
</span>
</el-dialog>
- <fiberOpticConfig :currentId="currentId" v-if="configShow" :active="active" />
+ <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">
@@ -496,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: {
@@ -627,13 +641,40 @@
bsmRow: null,
bsm1: false,
bsm1Val: null,
- bsm1Dia: false
+ bsm1Dia: false,
+ total:0,
+ RTS:'',
+ totalArr:[],
+ equipConfigShow: false,
}
},
watch: {
sampleList() {
this.addObj.method = null
this.productList = []
+ },
+ productList:{
+ deep:true,
+ handler(val){
+ if(val&&val.length>0){
+ let arr = [];
+ val.forEach(item => {
+ if(item.sonLaboratory&&!arr.find(a=>a.value==item.sonLaboratory)){
+ arr.push({
+ text: item.sonLaboratory,
+ value: item.sonLaboratory
+ })
+ }
+ })
+ this.filters = arr
+ }
+ }
+ },
+ sampleList:{
+ deep:true,
+ handler(val){
+ this.getTotal()
+ }
}
},
mounted() {
@@ -645,7 +686,7 @@
this.selectEnumByCategoryForUnit()
this.selectStandardMethods()
this.selectEnumByCategoryForOrderType()
- this.selectEnumByCategoryForSonLaboratory()
+ // this.selectEnumByCategoryForSonLaboratory()
this.selectEnumByCategoryForSampleForm()
if (this.active != 1) {
// 鏌ョ湅/瀹℃牳娴佺▼
@@ -700,6 +741,37 @@
this.addObj.companyId = selects.id
this.selectUserDia = false
},
+ handleAsk(ask){
+ let code = [">","<","=","锛�","锛�","鈮�","鈮�","卤"];
+ if(ask.includes('RTS')){
+ 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]).filter(b=>!!b)
+ let num = eval(this.replaceAll(arr[0],'RTS', this.RTS))
+ m = code[index] + ''+ num
+ arr1.push(m)
+ }
+ })
+ return arr1.join('&')
+ }else{
+ // 鍗曚釜鏉′欢
+ 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))
+ return code[index] + ''+ num
+ }
+ }
+ }
+ },
+ replaceAll(str, find, replace) {
+ return str.replace(new RegExp(find, 'g'), replace);
+ },
save() {
if (!this.addObj.companyId) {
this.$message.error('鏈�夋嫨瀹㈡埛鍗曚綅')
@@ -723,11 +795,76 @@
this.$message.error('璇疯緭鍏ユ牱鍝佸瀷鍙�')
} else if (!this.sampleList.every(m => m.standardMethodListId)) {
this.$message.error('璇烽�夋嫨妫�楠屾爣鍑�')
+ }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')&&a.state==1)
+ if(isRTS){
+ sampleList.forEach(item=>{
+ if(item.insProduct&&item.insProduct.length>0){
+ item.insProduct.forEach(a=>{
+ if(a.state==1){
+ let ask = this.handleAsk(a.ask)
+ if(ask&&a.state==1){
+ a.ask = ask
+ }
+ }
+ })
+ }
+ // 鍏夌氦甯﹂」鐩�
+ if(item.bushing&&item.bushing.length>0){
+ item.bushing.forEach(a=>{
+ if(a.fiber&&a.fiber.length>0){
+ a.fiber.forEach(b=>{
+ if(b.productList&&b.productList.length>0){
+ b.productList.forEach(c=>{
+ if(c.state==1){
+ let ask = this.handleAsk(c.ask)
+ if(ask&&c.state==1){
+ c.ask = ask
+ }
+ }
+ })
+ }
+ })
+ }
+ if(a.fibers&&a.fibers.length>0){
+ a.fibers.forEach(b=>{
+ if(b.productList&&b.productList.length>0){
+ b.productList.forEach(c=>{
+ if(c.state==1){
+ let ask = this.handleAsk(c.ask)
+ if(ask&&c.state==1){
+ c.ask = ask
+ }
+ }
+ })
+ }
+ if(b.fiber&&b.fiber.length>0){
+ b.fiber.forEach(c=>{
+ if(c.productList&&c.productList.length>0){
+ c.productList.forEach(d=>{
+ if(d.state==1){
+ let ask = this.handleAsk(d.ask)
+ if(ask){
+ d.ask = ask
+ }
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
this.saveLoad = true
this.$axios.post(this.$api.insOrder.addInsOrder, {
insOrder: this.addObj,
- list: JSON.stringify(this.sampleList.map(a => {
+ list: JSON.stringify(sampleList.map(a => {
a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ? '' : (
'-' + a.modelNum))
return a
@@ -1295,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);
@@ -1324,6 +1490,68 @@
}
}
done()
+ },
+ getTotal(){
+ this.totalArr = []
+ this.total = 0;
+ this.sampleList.forEach(item=>{
+ if(item.insProduct&&item.insProduct.length>0){
+ item.insProduct.forEach(a=>{
+ this.totalArr.push(a)
+ })
+ }
+ if(item.bushing&&item.bushing.length>0){
+ item.bushing.forEach(a=>{
+ if(a.fiber&&a.fiber.length>0){
+ a.fiber.forEach(b=>{
+ if(b.productList&&b.productList.length>0){
+ b.productList.forEach(c=>{
+ this.totalArr.push(c)
+ })
+ }
+ })
+ }
+ if(a.fibers&&a.fibers.length>0){
+ a.fibers.forEach(b=>{
+ if(b.productList&&b.productList.length>0){
+ b.productList.forEach(c=>{
+ this.totalArr.push(c)
+ })
+ }
+ if(b.fiber&&b.fiber.length>0){
+ b.fiber.forEach(c=>{
+ if(c.productList&&c.productList.length>0){
+ c.productList.forEach(d=>{
+ this.totalArr.push(d)
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ }
+ })
+ let mySet = new Set();
+ let arr0 = this.totalArr.filter(item=>{
+ if(item.state == 1){
+ let num1= mySet.size
+ if(item.manHourGroup===''||!item.manHourGroup){
+ return true
+ }else{
+ mySet.add(item.manHourGroup)
+ let num2= mySet.size
+ if(num2 > num1){
+ return true
+ }else{
+ return false
+ }
+ }
+ }
+ })
+ arr0.forEach(item=>{
+ this.total += Number(item.price)
+ })
}
}
}
--
Gitblit v1.9.3