From 897faa2d11f5a64d0c5e0f3d802e363430f8bdc0 Mon Sep 17 00:00:00 2001
From: gaoluyang <gaoluyang@rengu.cc>
Date: 星期五, 28 六月 2024 13:36:13 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 114 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 82 insertions(+), 32 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index b75659e..53ac6d8 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -117,7 +117,7 @@
<div class="ins_order_add">
<div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
<el-row class="title">
- <el-col :span="6" style="padding-left: 20px;">濮旀墭鍗曚俊鎭� 鎬讳环锛�<span
+ <el-col :span="6" style="padding-left: 20px;text-align: left;">濮旀墭鍗曚俊鎭� 鎬讳环锛�<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"
@@ -163,20 +163,14 @@
</el-select>
</div>
</el-col>
- <el-col class="search_thing" :span="6" style="display: none;">
- <div class="search_label"><span class="required-span">* </span>濮旀墭浜猴細</div>
+ <el-col class="search_thing" :span="6" >
+ <div class="search_label"><span class="required-span">* </span>鍒跺崟浜猴細</div>
<div class="search_input">
<el-input size="small" clearable disabled v-model="addObj.custom"></el-input>
<!-- <el-input readonly size="small" v-model="addObj.custom">
<template slot="append"><el-button slot="append" icon="el-icon-search" @click="selectUserDia = true"
:disabled="active>1"></el-button></template>
</el-input> -->
- </div>
- </el-col>
- <el-col class="search_thing" :span="6">
- <div class="search_label">鍒跺崟浜猴細</div>
- <div class="search_input">
- <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -192,7 +186,7 @@
<el-col class="search_thing" :span="6">
<div class="search_label"><span class="required-span">* </span>鑱旂郴鏂瑰紡锛�</div>
<div class="search_input">
- <el-input size="small" placeholder="閫夋嫨濮旀墭瀹㈡埛" clearable disabled v-model="addObj.phone"></el-input>
+ <el-input size="small" placeholder="閫夋嫨濮旀墭瀹㈡埛" clearable :readonly="active>1" v-model="addObj.phone"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6">
@@ -309,6 +303,12 @@
<div class="search_label">OTC璁㈠崟鍙凤細</div>
<div class="search_input">
<el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.otcCode" :readonly="active>1"></el-input>
+ </div>
+ </el-col>
+ <el-col class="search_thing" :span="6">
+ <div class="search_label">濮旀墭浜猴細</div>
+ <div class="search_input">
+ <el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="addObj.prepareUser" :readonly="active>1"></el-input>
</div>
</el-col>
<el-col class="search_thing" :span="6" style="align-items: flex-start;margin: 8px 0;">
@@ -551,15 +551,15 @@
:before-close="beforeClose">
<div class="body" style="max-height: 60vh;">
<el-row v-if="bsm1">
- <el-col class="search_thing" :span="22">
+ <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
<div class="search_label"><span class="required-span">* </span>閫夐」锛�</div>
<div class="search_input">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
- <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a"></el-radio>
+ <el-radio v-for="(a, ai) in JSON.parse(bsmRow.section)" :key="ai" :label="a" style="margin-bottom: 2px;margin-top: 2px;"></el-radio>
</el-radio-group>
</div>
</el-col>
- <el-col class="search_thing" :span="22">
+ <el-col class="search_thing" :span="22" style="height: initial;margin: 5px 0;">
<div class="search_label">瑕佹眰鍊硷細</div>
<div class="search_input" v-show="bsm1Val!==null&&bsm1Val!==''">
<el-radio-group v-model="bsm1Val" @input="upBsm1">
@@ -612,6 +612,12 @@
<el-table
:data="editTable"
style="width: 100%">
+ <!-- inspectionItemList -->
+ <el-table-column
+ prop="inspectionItemList"
+ label="妫�楠岄」"
+ width="180">
+ </el-table-column>
<el-table-column
prop="sampleCode"
label="鏍峰搧缂栧彿"
@@ -908,14 +914,16 @@
this.selectUserDia = false
},
containsValue(str) {
- let symbolItem = ''
- this.symbolList.some(value =>{
- if(str.includes(value)){
- symbolItem = value
- return true
- }
- })
- return symbolItem
+ if(str){
+ let symbolItem = ''
+ this.symbolList.some(value =>{
+ if(str.includes(value)){
+ symbolItem = value
+ return true
+ }
+ })
+ return symbolItem
+ }
},
handleAsk(ask,symbolItem, value) {
try{
@@ -995,6 +1003,9 @@
let isRTS = this.totalArr.find(a => a.ask != null && this.symbolList.find(b=>a.ask.includes(b)) && a.state == 1)
if (isRTS) {
this.editTable = this.handleData(sampleList,this.containsValue, 0)
+ this.editTable.forEach(item => {
+ item.value = item.modelNum
+ })
this.bsm3Dia = true;
return
}
@@ -1003,8 +1014,12 @@
}
},
save0(){
- let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
- this.saveMethod(sampleList)
+ if(this.editTable.every(m=>m.value)){
+ let sampleList = this.handleData(this.HaveJson(this.sampleList),this.handleAsk,1)
+ this.saveMethod(sampleList)
+ }else{
+ this.$message.error('璇峰～鍐欒瘑鍒鍊�')
+ }
},
handleData(sampleList,calBack,type){
let editTable = []
@@ -1014,13 +1029,17 @@
model:item.model,
symbolList:[],
sampleId:item.id,
+ modelNum:item.modelNum,
}
if (item.insProduct && item.insProduct.length > 0) {
item.insProduct.forEach(a => {
if (a.state == 1) {
if(type==0){
let str = calBack(a.ask)
- str&&obj.symbolList.push(str)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:a.inspectionItem,
+ })
}else if(type==1){
let arr = this.editTable.filter(b => b.sampleId == item.id)
arr.forEach(f => {
@@ -1049,7 +1068,10 @@
if (c.state == 1) {
if(type==0){
let str = calBack(c.ask)
- str&&obj.symbolList.push(str)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:c.inspectionItem,
+ })
}else if(type==1){
let arr = this.editTable.filter(b => b.sampleId == item.id)
arr.forEach(f => {
@@ -1077,7 +1099,10 @@
if (c.state == 1) {
if(type==0){
let str = calBack(c.ask)
- str&&obj.symbolList.push(str)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:c.inspectionItem,
+ })
}else if(type==1){
// let ask = calBack(c.ask, c.rts)
// if (ask && c.state == 1) {
@@ -1107,7 +1132,10 @@
if (d.state == 1) {
if(type==0){
let str = calBack(d.ask)
- str&&obj.symbolList.push(str)
+ str&&obj.symbolList.push({
+ symbolItem:str,
+ inspectionItem:d.inspectionItem,
+ })
}else if(type==1){
// let ask = calBack(d.ask, d.rts)
// if (ask && d.state == 1) {
@@ -1142,7 +1170,23 @@
})
if(type==0){
editTable.forEach(a => {
- a.symbolList = Array.from(new Set(a.symbolList))
+ a.symbolList.forEach(b => {
+ let arr = a.symbolList.filter(c => c.symbolItem == b.symbolItem);
+ b.inspectionItemList = arr.map(c => c.inspectionItem).join(',')
+ })
+ })
+ editTable.forEach(a => {
+ let mySet = new Set();
+ a.symbolList = a.symbolList.filter(b =>{
+ let num0 = mySet.size;
+ mySet.add(b.symbolItem);
+ let num1 = mySet.size;
+ if(num0!=num1){
+ return true;
+ }else{
+ return false
+ }
+ })
})
let editTableNew = []
editTable.forEach(a => {
@@ -1150,9 +1194,11 @@
let obj = {
sampleCode:a.sampleCode,
model:a.model,
- symbolItem:b,
+ symbolItem:b.symbolItem,
sampleId:a.sampleId,
- value:null
+ value:null,
+ inspectionItemList:b.inspectionItemList,
+ modelNum:a.modelNum,
}
editTableNew.push(obj)
})
@@ -1171,6 +1217,7 @@
a.model = a.model + ((a.modelNum == null || a.modelNum == '' || a.modelNum == 'null') ?
'' : (
'-' + a.modelNum))
+ a.insProduct = a.insProduct.filter(b=>b.state === 1)
return a
})),
pairing: JSON.stringify(this.bsm2Val2)
@@ -1190,7 +1237,8 @@
this.saveLoad = true
this.$axios.post(this.$api.insOrder.upInsOrderOfState, {
state,
- id: this.currentId
+ id: this.currentId,
+ companyId:this.addObj.companyId
}, {
headers: {
'Content-Type': 'application/json'
@@ -1199,6 +1247,8 @@
this.saveLoad = false
if (res.code == 201) return
this.$message.success('鎻愪氦鎴愬姛')
+ // this.$parent.multipleSelection = [{id: this.currentId}]
+ // this.$parent.print()
// 濡傛灉绱ф�ョ▼搴︿负绱ф�ワ紝闇�瑕佺洿鎺ヤ笅鍙戜汉鍛�
// if (this.addObj.type == 2) {
// this.issuedDialogVisible = true;
@@ -1307,7 +1357,7 @@
}
},
selectStandardTreeList() {
- this.$axios.get(this.$api.standardTree.selectStandardTreeList).then(res => {
+ this.$axios.get(this.$api.standardTree.selectStandardTreeList2).then(res => {
this.list = res.data
this.list.forEach(a => {
this.expandedKeys.push(a.label)
--
Gitblit v1.9.3