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 | 8 +++++---
src/components/view/b1-inspect-order-plan.vue | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 014a596..0497449 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -3734,12 +3734,14 @@
}
}
},
- async beforeUpload(file) {
- if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!this.$refs.CircuitParameters.allBandList.find(m=>m.band)){
+ beforeUpload(file) {
+ if(this.sonLaboratory === '鐢佃矾璇曢獙'&&(file.name.includes('浜よ皟')||file.name.includes('浜掕皟'))&&!this.$refs.CircuitParameters.allBandList.find(m=>m.band)){
this.$message.error('涓婁紶闄勪欢鍓嶈鍏堝～鍐欏苟淇濆瓨棰戞');
return false
}else{
- await 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()
diff --git a/src/components/view/b1-inspect-order-plan.vue b/src/components/view/b1-inspect-order-plan.vue
index 2e0232d..d4c6c44 100644
--- a/src/components/view/b1-inspect-order-plan.vue
+++ b/src/components/view/b1-inspect-order-plan.vue
@@ -421,7 +421,7 @@
<el-dialog title="鍑哄簱" :visible.sync="exportVisible" width="400px">
<el-row>
<el-col class="search_thing" :span="24">
- <div class="search_label" style="width: 90px"><span class="required-span">* </span>濮旀墭缂栧彿锛�</div>
+ <div class="search_label" style="width: 90px"><span class="required-span">* </span>鏍峰搧缂栧彿锛�</div>
<div class="search_input">
<el-input v-model="sampleCode" size="small" clearable :disabled="sampleCodeBtnDisabled">
<el-tooltip :content="sampleCodeBtnDisabled?'鎵嬪姩杈撳叆':'鎵爜鏋緭鍏�'" placement="top" slot="append">
--
Gitblit v1.9.3