From 7a2039181be3ad03efb28acf141b0654247f47d4 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期二, 10 十二月 2024 17:34:55 +0800
Subject: [PATCH] 电路试验退出保存优化
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index c09a890..0497449 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -802,7 +802,7 @@
</el-drawer>
<el-dialog title="妫�楠屽鏍�" :visible.sync="reviewDia" width="500px">
<div class="body" style="display: flex;padding: 10px;" v-if="reviewDia">
- <div class="search_label" style="width: 150px;"><span class="required-span">* </span>涓嶉�氳繃鐨勭悊鐢憋細</div>
+ <div class="search_label" style="width: 150px;"><span class="required-span">* </span>鍐嶆璇曢獙鐨勭悊鐢憋細</div>
<div class="search_input" style="width: 100%;">
<el-input size="small" clearable v-model="noReason" type="textarea" :autosize="{ minRows: 4}"></el-input>
</div>
@@ -3319,7 +3319,7 @@
this.addVerifyDia = true
}
},
- handleSubmit(){
+ async handleSubmit(){
if(!this.otherForm.temperature){
this.$message.error('璇疯緭鍏ユ俯搴�')
return
@@ -3328,7 +3328,7 @@
this.$message.error('璇疯緭鍏ユ箍搴�')
return
}
- if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!this.$refs.CircuitParameters.saveAll()){
+ if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!(await this.$refs.CircuitParameters.saveAll())){
return
}
this.experimentDia = true
@@ -3735,11 +3735,13 @@
}
},
beforeUpload(file) {
- if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!this.$refs.CircuitParameters.allBandList.find(m=>m.band)){
+ if(this.sonLaboratory === '鐢佃矾璇曢獙'&&(file.name.includes('浜よ皟')||file.name.includes('浜掕皟'))&&!this.$refs.CircuitParameters.allBandList.find(m=>m.band)){
this.$message.error('涓婁紶闄勪欢鍓嶈鍏堝～鍐欏苟淇濆瓨棰戞');
return false
}else{
- this.$refs.CircuitParameters.saveAll()
+ if(file.name.includes('浜よ皟')||file.name.includes('浜掕皟')){
+ this.$refs.CircuitParameters.saveAll()
+ }
if (file.size > 1024 * 1024 * 10) {
this.$message.error('涓婁紶鏂囦欢涓嶈秴杩�10M');
this.$refs.upload.clearFiles()
@@ -3846,8 +3848,8 @@
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
- }).then(() => {
- if(this.$refs.CircuitParameters.saveAll()){
+ }).then(async () => {
+ if(await this.$refs.CircuitParameters.saveAll()){
this.$emit('goback')
}
})
--
Gitblit v1.9.3