From 19cef95ff89bc719d7a5e41aa735351b44f24a85 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 06 八月 2024 17:03:47 +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 | 30 +++++++++++++++++++++---------
1 files changed, 21 insertions(+), 9 deletions(-)
diff --git a/src/components/do/b1-ins-order/add.vue b/src/components/do/b1-ins-order/add.vue
index 77a6e60..5d8f08b 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>
@@ -475,7 +475,7 @@
<template slot-scope="scope">
<el-input size="small" placeholder="瑕佹眰鍊�" v-model="scope.row.ask" clearable type="textarea"
:autosize="{ minRows: 1, maxRows: 3}" @change="e=>requestChange(e,scope.row,'ask')"
- v-if="active==1&&isAskOnlyRead"></el-input>
+ v-if="active==1&&isAskOnlyRead&&/[0-9]/.test(scope.row.ask)"></el-input>
<span v-else>
<!-- <template v-if="(scope.row.ask.indexOf('D')>-1
||scope.row.ask.indexOf('W')>-1
@@ -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,10 +1573,19 @@
isHaveBushing = false
}
})
+ // console.log('isHaveBushing===', this.totalArr)
+ // inspectionItem
+ let spcialItem = this.totalArr.find(a => a.state == 1 && a.inspectionItem.includes('鏉惧绠�'))
// console.log('isHaveBushing===', isHaveBushing)
if (productListSelected && select[2] === '鍏夌紗' && isHaveBushing === false) {
this.$message.error('鍏夌紗娓╁害寰幆椤圭洰蹇呴』杩涜鍏夌氦閰嶇疆')
-
+ this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
+ this.rowClick(this.currentMethod)
+ this.sampleIds = [this.currentMethod.id]
+ this.openConfig()
+ return
+ }else if(spcialItem&& isHaveBushing === false){
+ this.$message.error('鏉惧绠￠」鐩繀椤昏繘琛屽厜绾ら厤缃�')
this.$refs.sampleTable.setCurrentRow(this.currentMethod, true)
this.rowClick(this.currentMethod)
this.sampleIds = [this.currentMethod.id]
@@ -1821,7 +1831,6 @@
},
saveMethod(sampleList){
this.saveLoad = true
- console.log(333333,sampleList)
this.$axios.post(this.$api.insOrder.addInsOrder, {
str: JSON.stringify({
insOrder: this.addObj,
@@ -2160,6 +2169,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)
@@ -2477,6 +2487,7 @@
}
},
handleAll(e) {
+ console.log(1111,this.bsm1DiaAll,this.bsm1Dia)
// console.log('e---', e)
if (e.length > 0) {
this.productList.map(m => {
@@ -2625,6 +2636,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