From 2ac4bfa6dfd8ed100e972d990787b458330c3c12 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 13 六月 2024 16:39:57 +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 | 144 ++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 120 insertions(+), 24 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 9ff08a8..e0749b0 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -303,6 +303,33 @@
</el-row>
</div>
<div v-show="!configShow&&!equipConfigShow&&!cableConfigShow">
+ <div class="search" v-if="active==1" style="display: flex;background: transparent;">
+ <div class="search_thing">
+ <div class="search_label">鏍峰搧鍨嬪彿锛�</div>
+ <div class="search_input">
+ <el-select v-model="model" placeholder="璇烽�夋嫨" filterable allow-create default-first-option size="small" @change="changeModel">
+ <el-option
+ v-for="item in models"
+ :key="item.value"
+ :label="item.label"
+ :value="item.value">
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ <div class="search_thing">
+ <div class="search_label">妫�楠屾爣鍑嗭細</div>
+ <div class="search_input">
+ <el-select v-model="standardMethodListId" placeholder="璇烽�夋嫨" size="small" @focus="methodFocus"
+ :loading="methodLoad" @change="changeStandardMethodListId">
+ <el-option
+ v-for="item in methods"
+ :key="item.id" :label="item.code" :value="item.id" >
+ </el-option>
+ </el-select>
+ </div>
+ </div>
+ </div>
<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>
@@ -362,6 +389,7 @@
:controls="false" style="width: 80%;"></el-input-number>
</template>
</el-table-column>
+ <el-table-column prop="proNum" label="妫�楠岄」璁℃暟" width="120" align="center" ></el-table-column>
</el-table>
<el-table class="el-table" ref="productTable" :data="productList" height="380px" tooltip-effect="dark" border
@selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
@@ -559,15 +587,25 @@
</el-col>
</el-col>
</el-row>
- <el-row v-if="bsm3">
+ <!-- <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>
+ </el-row> -->
</div>
+ </el-dialog>
+ <el-dialog title="RTS濉啓" :visible.sync="bsm3Dia" width="500px" :show-close="false" :before-close="beforeClose0">
+ <el-row>
+ <el-col class="search_thing" :span="22" style="display: flex;align-items: center;">
+ <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>
</el-dialog>
</div>
</template>
@@ -577,6 +615,7 @@
import fiberOpticConfig from './fiberoptic-config.vue'
import equipConfig from './equip-config.vue'
import cableConfig from './cable-config.vue'
+ import Vue from 'vue'
export default {
components: {
ValueTable,
@@ -720,10 +759,12 @@
bsm2Val3: [],
bsmRow3:null,
bsm3Val:null,
- bsm3:false,
+ bsm3Dia:false,
total: 0,
RTS: '',
- totalArr: []
+ totalArr: [],
+ model:null,
+ standardMethodListId:null,
}
},
watch: {
@@ -753,7 +794,15 @@
handler(val) {
this.getTotal()
}
- }
+ },
+ 'addObj.sample'(val){
+ this.model = null
+ this.standardMethodListId = null
+ },
+ 'addObj.sampleNum'(val){
+ this.model = null
+ this.standardMethodListId = null
+ },
},
mounted() {
this.selectEnumByCategoryForType()
@@ -777,6 +826,7 @@
};
this.addObj.type = String(this.addObj.type)
this.sampleList = this.HaveJson(res.data.sampleProduct);
+ this.getProNum()
this.addObj.sampleNum = this.sampleList.length
this.$nextTick(() => {
this.$refs.sampleTable.doLayout()
@@ -1040,6 +1090,12 @@
this.addObj.productionEn = '/'
})
},
+ getProNum(){
+ this.sampleList.forEach((m,i)=>{
+ Vue.set(this.sampleList[i],'proNum',m.insProduct.filter(a=>a.state==1).length)
+ })
+ this.$refs.sampleTable.doLayout()
+ },
searchFilter() {
this.$refs.tree.filter(this.search)
},
@@ -1134,6 +1190,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
@@ -1199,6 +1256,7 @@
},
upProductSelect(selection, row) {
row.state = row.state == 1 ? 0 : 1
+ this.getProNum()
if (row.bsm === '1' && row.section !== '' && row.section !== null && row.state === 1) {
if (row.section.indexOf('[') > -1) {
this.bsmRow = this.HaveJson(row)
@@ -1216,18 +1274,22 @@
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.bsm3Dia = true
this.bsmRow3 = row
}else{
- this.bsm3 = false
+ this.bsm3Dia = false
}
this.sampleList.map(item => {
if (this.sampleIds.indexOf(item.id) > -1) {
@@ -1401,6 +1463,22 @@
}, 200)
})
},
+ changeModel(){
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if(obj){
+ a.model = this.model
+ }
+ })
+ },
+ changeStandardMethodListId(){
+ this.sampleList.forEach(a => {
+ let obj = this.sampleIds.find(b => b == a.id)
+ if(obj){
+ a.standardMethodListId = this.standardMethodListId
+ }
+ })
+ },
methodFocus() {
this.selectsStandardMethodByFLSSM()
},
@@ -1452,6 +1530,7 @@
return m
})
}
+ this.getProNum()
this.bsmRow3 = [];
this.productList.forEach(p => {
if (p.bsm === '1' && p.section !== '' && p.section !== null && p.state === 1) {
@@ -1471,17 +1550,19 @@
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.bsm3Dia = true
this.bsmRow3.push(p)
- }else{
- this.bsm3 = false
}
})
if (e.length > 0) {
@@ -1686,18 +1767,33 @@
}
}
}
- if(this.bsm3){
- if(!this.bsm3Val){
- this.$message.error('RST蹇呴』濉啓')
- 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()
+ },
+ beforeClose0(done) {
+ if(!this.bsm3Val){
+ this.$message.error('RST蹇呴』濉啓')
+ return
+ }else{
+ if(Array.isArray(this.bsmRow3)){
+ this.bsmRow3.forEach(item=>{
+ item.rts = this.bsm3Val
+ })
}else{
- if(Array.isArray(this.bsmRow3)){
- this.bsmRow3.forEach(item=>{
- item.rts = this.bsm3Val
- })
- }else{
- this.bsmRow3.rts = this.bsm3Val
- }
+ this.bsmRow3.rts = this.bsm3Val
}
}
done()
--
Gitblit v1.9.3