From 996e3e343760bcfa23b55138f85abd62d6ebfb22 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 25 十二月 2024 09:02:07 +0800
Subject: [PATCH] 报告预览调试
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 22 +++++++++++++++-------
1 files changed, 15 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 92b3d27..39e590b 100644
--- a/src/components/do/b1-inspect-order-plan/Inspection.vue
+++ b/src/components/do/b1-inspect-order-plan/Inspection.vue
@@ -259,7 +259,7 @@
<el-row class="title">
<el-col :span="12" style="padding-left: 20px;text-align: left;" :class="{noShow:noBack}">妫�楠屽崟璇︽儏
</el-col>
- <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;margin-bottom: 16px;">
+ <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;height: 60px;">
<el-button size="small" type="primary" @click="versionDialogVisible=true" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')">鐢佃皟/闈炵數璋冩ā鏉垮垏鎹�</el-button>
<el-select v-model="template" size="medium" placeholder="鐢佃矾棰勮妯℃澘" style="margin-right: 10px;margin-left: 10px;" v-if="state==1&&tableLists.find(m=>m.templateId==currentTable)&&tableLists.find(m=>m.templateId==currentTable).templateName.includes('鐢佃矾璇曢獙')"
@change="selectInsProductTemplateById">
@@ -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