From f1b825f0afe70723dd7375cf7cdbef768938e13d Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期一, 05 八月 2024 20:26:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 150 ++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 132 insertions(+), 18 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index b94b79c..77a6e60 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -429,9 +429,9 @@
<el-table-column prop="proNum" label="寰呮椤规暟閲�" width="105" 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" :row-key="rowKey"
+ @selection-change="selectProduct" style="margin-bottom: 10px;" @select="upProductSelect"
:row-class-name="tableRowClassName" v-loading="getProductLoad" @select-all="handleAll">
- <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1" :reserve-selection="true"></el-table-column>
+ <el-table-column type="selection" width="65" :selectable="selectable" v-if="active==1"></el-table-column>
<el-table-column prop="inspectionItemClass" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItemClassEn" v-if="PROJECT === '瑁呭鐢电紗'" label="妫�楠岄」鍒嗙被(EN)" min-width="140" show-overflow-tooltip></el-table-column>
<el-table-column prop="inspectionItem" label="妫�楠岄」" min-width="140" show-overflow-tooltip>
@@ -623,8 +623,11 @@
<equipConfig :currentId="currentId" v-if="equipConfigShow" :active="active" />
<cableConfig v-if="cableConfigShow" :active="active" />
<!-- 鍗曢�夌壒娈婂�煎鐞嗘-->
- <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia" min-width="400px" :show-close="false"
- :before-close="beforeClose">
+ <el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1Dia"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
+ min-width="400px" :show-close="false"
+ :before-close="beforeClose">
<div class="body" style="max-height: 60vh;">
<el-row v-if="bsm1">
<el-col class="search_thing" :span="24" style="height: initial;margin: 5px 0;">
@@ -683,9 +686,16 @@
</el-col>
</el-row> -->
</div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button type="primary" @click="save2" :loading="saveLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
</el-dialog>
<!-- 鍏ㄩ�夌壒娈婂�煎鐞嗘-->
<el-dialog title="妫�娴嬪埌鐗规畩椤癸紝璇蜂綔鍑轰互涓嬮�夋嫨" :visible.sync="bsm1DiaAll" min-width="400px" :show-close="false"
+ :close-on-press-escape="false"
+ :close-on-click-modal="false"
:before-close="beforeClose">
<div class="body" style="max-height: 60vh;" v-for="(item, index) in bsm1DiaList" :key="index">
<el-row v-if="item.bsm1">
@@ -737,8 +747,15 @@
</el-col>
</el-row>
</div>
+ <span slot="footer" class="dialog-footer">
+ <el-row>
+ <el-button type="primary" @click="save1" :loading="saveLoad">纭� 瀹�</el-button>
+ </el-row>
+ </span>
</el-dialog>
- <el-dialog title="鐗规畩鍊煎～鍐�" :visible.sync="bsm3Dia" width="800px" :show-close="false">
+ <el-dialog title="鐗规畩鍊煎～鍐�" :visible.sync="bsm3Dia"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ width="800px" :show-close="false">
<el-table
:data="editTable"
style="width: 100%">
@@ -766,7 +783,7 @@
prop="value"
label="璇嗗埆绗﹀��">
<template slot-scope="scope">
- <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" size="small"></el-input>
+ <el-input v-model="scope.row.value" placeholder="璇疯緭鍏�" @input="inputValueHandler(scope.row,scope.$index)" size="small"></el-input>
</template>
</el-table-column>
</el-table>
@@ -777,7 +794,9 @@
</el-row>
</span>
</el-dialog>
- <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="900px" :before-close="beforeCirculateShowClose" :show-close="false">
+ <el-dialog title="娓╁害寰幆瑕佹眰濉啓" :visible.sync="circulateShow" width="900px"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ :before-close="beforeCirculateShowClose" :show-close="false">
<div class="search" style="display: flex;background: transparent;">
<div class="search_thing">
<div class="search_label">淇濇俯鏃堕棿锛�</div>
@@ -862,7 +881,9 @@
</span>
</el-dialog>
<!-- 鐢靛姏璇曢獙瀹�---娓╁崌璇曢獙/鐑惊鐜� -->
- <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow" width="260px" :before-close="temperatureShowClose" :show-close="false">
+ <el-dialog :title="temperatureTitle" :visible.sync="temperatureShow"
+ :close-on-click-modal="false" :close-on-press-escape="false"
+ width="260px" :before-close="temperatureShowClose" :show-close="false">
<div>
<div v-if="isShowInput" style="margin-bottom: 6px">
<span>寰幆娆℃暟:</span>
@@ -908,6 +929,7 @@
},
data() {
return {
+ sampleSelectionList: [],//鏍峰搧琛ㄦ牸閫変腑鏁版嵁
editTable:[],
template: null,
templates: [],
@@ -1151,6 +1173,21 @@
}
},
methods: {
+ //鐗规畩鍊煎～鍐欏鐞�
+ inputValueHandler(row,index){
+ if(row){
+ const nextIndex = index+1
+ for (let i = nextIndex; i < this.editTable.length; i++) {
+ const element = this.editTable[i];
+ if(element.model==row.model){
+ this.editTable[i].value = row.value
+ }else{
+ break;
+ }
+ }
+ }
+
+ },
spliceData () {
if (!this.circulateForm.entrustNum || !this.circulateForm.entrustTime || !this.circulateForm.entrustPoint || this.opticalProjectList.length === 0 || this.temperatureData.length === 0) {
this.$message.error('璇峰～鍐欏畬鏁存暟鎹�')
@@ -1378,6 +1415,9 @@
a.manHour = obj.manHour
a.price = obj.price
a.tell = obj.tell
+ }
+ if(a.state == 0&&a.bsmRow){
+ a = this.HaveJson(a.bsmRow)
}
})
},
@@ -1824,7 +1864,8 @@
state,
id: this.currentId,
companyId:this.addObj.companyId,
- laboratory:this.addObj.laboratory
+ laboratory:this.addObj.laboratory,
+ company: this.addObj.company
}, {
headers: {
'Content-Type': 'application/json'
@@ -1914,8 +1955,8 @@
})
},
getProNum() {
- this.sampleList.forEach((m, i) => {
- Vue.set(this.sampleList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
+ this.sampleSelectionList.forEach((m, i) => {
+ Vue.set(this.sampleSelectionList[i], 'proNum', m.insProduct.filter(a => a.state == 1).length)
})
this.$refs.sampleTable.doLayout()
},
@@ -2048,6 +2089,7 @@
val.forEach(a => {
this.sampleIds.push(a.id)
})
+ this.sampleSelectionList = val
},
delSample() {
this.sampleIds.forEach(a => {
@@ -2061,9 +2103,6 @@
})
this.$refs.sampleTable.doLayout()
},
- rowKey (row) {
- return row.id;
- },
selectProduct(val) {
this.productListSelected = val
this.productIds = []
@@ -2082,13 +2121,21 @@
this.sampleId = row.id
if (this.active !== 1) {
this.sampleIds = []
- this.sampleIds.push(row.id)
+ this.sampleSelectionList.forEach(ele=>{
+ if(ele.id == row.id){
+ this.sampleIds.push(row.id)
+ }
+ })
}
this.productList = row.insProduct
this.productList0 = JSON.parse(JSON.stringify(this.productList))
setTimeout(() => {
this.productList.forEach(a => {
- if (a.state == 1) this.toggleSelection(a)
+ if (a.state == 1) {
+ this.toggleSelection(a)
+ }else{
+ this.$refs.productTable.toggleRowSelection(a, false);
+ }
})
}, 200)
},
@@ -2332,9 +2379,9 @@
}
this.getProductLoad = true
let selectTreeList = this.selectTree.split(" - ")
- selectTreeList[selectTreeList.length - 1] = this.addObj.model
+ this.addObj.model&&(selectTreeList[selectTreeList.length - 1] = this.addObj.model)
this.$axios.post(this.$api.standardTree.selectStandardProductList, {
- model: this.addObj.model + '-' + row.modelNum,
+ model: (this.addObj.model?this.addObj.model:row.model) + '-' + row.modelNum,
standardMethodListId: val,
factory: selectTreeList.join(" - "),
}, {
@@ -2440,6 +2487,7 @@
})
} else {
this.productList.map(m => {
+ console.log('m----', m)
m.state = 0
return m
})
@@ -2700,6 +2748,72 @@
this.changeProductList0()
this.currentMethod.insProduct = this.productList0
},
+ save1 () {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ if (this.bsm2) {
+ if (this.bsm2Val2.length === 0) {
+ this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ return
+ }
+ let set = new Set()
+ for (let i = 0; i < this.bsm2Val2.length; i++) {
+ let num0 = set.size
+ set.add(JSON.stringify(this.bsm2Val2[i]))
+ let num1 = set.size
+ if (num1 == num0) {
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
+ let num2 = set.size
+ if (num1 == num2) {
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ }
+ this.isBsm2Val2 = true;
+ }
+ this.bsm1DiaAll = false
+ },
+ save2 () {
+ if (this.bsm1DiaList.length > 0) {
+ this.bsm1DiaList.forEach(item => {
+ if (!item.bsm1Val) {
+ throw this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ }
+ })
+ }
+ if (this.bsm2) {
+ if (this.bsm2Val2.length === 0) {
+ this.$message.error('鐗规畩椤圭洰蹇呴』澶勭悊')
+ return
+ }
+ let set = new Set()
+ for (let i = 0; i < this.bsm2Val2.length; i++) {
+ let num0 = set.size
+ set.add(JSON.stringify(this.bsm2Val2[i]))
+ let num1 = set.size
+ if (num1 == num0) {
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ set.add(JSON.stringify(this.bsm2Val2[i].reverse()))
+ let num2 = set.size
+ if (num1 == num2) {
+ this.$message.error('鍏宠仈椤圭洰涓嶈兘閲嶅')
+ return
+ }
+ }
+ this.isBsm2Val2 = true;
+ }
+ this.bsm1Dia = false
+ },
beforeClose(done) {
// if (this.bsm1) {
// if (this.bsm1Val === null || this.bsm1Val === '') {
--
Gitblit v1.9.3