From ff017259dac281ca30195b4d2d337f14c24f9332 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期四, 19 十二月 2024 14:16:25 +0800
Subject: [PATCH] 完成cnas8.7搬迁
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 92b3d27..3334450 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -3328,8 +3328,12 @@
this.$message.error('璇疯緭鍏ユ箍搴�')
return
}
+ this.loading = true
if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!(await this.$refs.CircuitParameters.saveAll())){
+ this.loading = false
return
+ }else{
+ this.loading = false
}
this.experimentDia = true
this.newUserInfo = []
@@ -3728,9 +3732,9 @@
if(this.sonLaboratory === '鐢佃矾璇曢獙'){
// // 鐢佃矾璇曢獙鏁伴噰
// 鑾峰彇褰撳墠鏍峰搧鐨勬楠岄」
- // let list = await this.getCurrentProduct(this.currentSample.id,0)
- // this.currentSample.insProduct = this.HaveJson(list)
- // this.currentNum++
+ let list = await this.getCurrentProduct(this.currentSample.id,0)
+ this.currentSample.insProduct = this.HaveJson(list)
+ this.currentNum++
}
}else {
this.$message.error(response.message);
@@ -3741,9 +3745,9 @@
this.$message.error('涓婁紶闄勪欢鍓嶈鍏堝～鍐欏苟淇濆瓨棰戞');
return false
}else{
- if(file.name.includes('浜よ皟')||file.name.includes('浜掕皟')){
- 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()
@@ -3851,8 +3855,12 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(async () => {
+ this.loading = true
if(await this.$refs.CircuitParameters.saveAll()){
this.$emit('goback')
+ this.loading = false
+ }else{
+ this.loading = false
}
})
}else{
--
Gitblit v1.9.3