From 327d3a64008d516e2654564a74873c4f77df3871 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 06 八月 2024 22:19:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/components/do/b1-ins-order/add.vue | 77 +++++++++++++++++++++++++++++++++++---
1 files changed, 70 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 3557a4d..7def651 100644
--- a/src/components/do/b1-ins-order/add.vue
+++ b/src/components/do/b1-ins-order/add.vue
@@ -154,10 +154,10 @@
<el-button size="medium" type="primary" @click="openConfig" 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"
+ <el-button size="medium" @click="upInsOrderOfState(2)" :loading="saveLoad" v-show="active==3&&addObj.companyId"
:disabled="saveLoad">涓嶉�氳繃</el-button>
<el-button size="medium" type="primary" @click="upInsOrderOfState(1)" :loading="saveLoad"
- v-show="active==3">閫氳繃</el-button>
+ v-show="active==3&&addObj.companyId">閫氳繃</el-button>
<el-button size="medium" @click="$parent.playOrder(0)">
<span style="color: #3A7BFA;">杩斿洖</span>
</el-button>
@@ -367,7 +367,7 @@
</div>
</div>
</div>
- <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" height="250px" tooltip-effect="dark"
+ <el-table class="el-table sampleTable" ref="sampleTable" :data="sampleList" max-height="400px" 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>
<el-table-column type="index" label="搴忓彿" width="65" align="center"></el-table-column>
@@ -428,7 +428,7 @@
</el-table-column>
<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
+ <el-table class="el-table" ref="productTable" :data="productList" max-height="400px" tooltip-effect="dark" border
@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"></el-table-column>
@@ -563,7 +563,8 @@
<el-button type="primary" @click="addTemplateDia" :loading="templateLoading">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px">
+ <el-dialog title="妫�楠屼笅鍙�" :visible.sync="issuedDialogVisible" width="400px" :close-on-click-modal="false"
+ :close-on-press-escape="false" :show-close="false">
<div class="body" style="max-height: 60vh;">
<el-row>
<el-col class="search_thing" :span="22">
@@ -596,7 +597,7 @@
</div>
<span slot="footer" class="dialog-footer">
<el-row>
- <el-button @click="issuedDialogVisible=false">鍙� 娑�</el-button>
+ <el-button @click="issuedDialogVisible=false;$parent.playOrder(0)">鍙� 娑�</el-button>
<el-button type="primary" @click="submitForm2" :loading="upLoad">纭� 瀹�</el-button>
</el-row>
</span>
@@ -1572,9 +1573,28 @@
isHaveBushing = false
}
})
+ //杩囨护妫�娴嬮」锛氬幓闄ょ壒娈婇」(bsm=1),
+ let filterProductList = this.productListSelected.filter(ele=>ele.bsm==0&&/[0-9]/.test(ele.ask)).filter(ele=>{
+ if(select[1].indexOf('閫氫俊')>=0 && ['鍏夌紗','鍏夌氦'].includes(select[2])){
+ return !['娓╁害寰幆','鍏夌氦鎺ュご鎹熻��'].includes(ele.inspectionItem)
+ }
+ return true
+ }).filter(ele=>{
+ if(select[1].indexOf('鐢靛姏')>=0){
+ return !['娓╁崌璇曢獙','鐑惊鐜�'].includes(ele.inspectionItem)
+ }
+ return true
+ })
+ //鏍￠獙妫�楠岄」鐨勮姹傚�煎拰瑕佹眰鎻忚堪
+ const isTrue = this.checkRequiredValueAndRemark(filterProductList)
+ if(!isTrue){
+ this.$message.error('妫�楠岄」鐨勮姹傚�间笌瑕佹眰鎻忚堪涓嶅尮閰嶏紝 璇锋鏌�')
+ return
+ }
+
console.log('isHaveBushing===', this.totalArr)
// inspectionItem
- let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
+ let spcialItem = null//this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
// console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
@@ -1614,6 +1634,46 @@
this.saveMethod(sampleList)
}
}
+ },
+ checkRequiredValueAndRemark(data){
+ let isTrue = true
+ try{
+ data.forEach(ele=>{
+ if(['鈮�','鈮�','>','<','='].includes(ele.ask[0])){
+ const askVal = ele.ask.substring(1,ele.ask.length)
+ if(isNaN(askVal) || ele.tell.indexOf(askVal)<0){
+ isTrue = false
+ }
+ }
+ if(ele.ask.indexOf('-')>0 && ele.ask.length>1){
+ const splits = ele.ask.split('-')
+ if(splits.length==2 && !isNaN(splits[0]) && !isNaN(splits[1])){
+ let min = Math.min(...splits)
+ let max = Math.max(...splits)
+ if(ele.tell.indexOf('卤')<0&&ele.tell!=ele.ask){
+ isTrue = false
+ }else if(ele.tell.indexOf('卤')>0&&ele.tell!=ele.ask){
+ let splitNums = ele.tell.split('卤')
+ if(splitNums.length<2){
+ isTrue = false
+ }else{
+ let minTell = Number(splitNums[0])-Number(splitNums[1])
+ let maxTell = Number(splitNums[0])+Number(splitNums[1])
+ if(minTell!=min || maxTell!=max){
+ isTrue = false
+ }
+ }
+ }
+ }else{
+ isTrue = false
+ }
+ }
+ })
+ }catch(error){
+ console.log(error);
+ isTrue = false
+ }
+ return isTrue
},
save0(){
if(this.editTable.every(m=>m.value)){
@@ -2168,6 +2228,7 @@
row.bsm1 = false
}else if(arr.length>0){
try{
+ row.bsmRow = this.HaveJson(row)
let section = arr[0].section
let arr0 = JSON.parse(row.section)
let arr1 = JSON.parse(row.ask)
@@ -2485,6 +2546,7 @@
}
},
handleAll(e) {
+ console.log(1111,this.bsm1DiaAll,this.bsm1Dia)
// console.log('e---', e)
if (e.length > 0) {
this.productList.map(m => {
@@ -2633,6 +2695,7 @@
this.$message.error('鏈�変腑鏍峰搧')
return
}
+ this.sampleIds = [this.sampleId]
this.$axios.post(this.$api.insBushing.selectBushingBySampleId, {
sampleId: this.sampleId
}).then(res => {
--
Gitblit v1.9.3