From 6fb9ccefdb939d728340fc7b626e97b26f2eab57 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 04 十二月 2024 13:44:18 +0800
Subject: [PATCH] 修改电路试验保存
---
src/components/do/b1-inspect-order-plan/Inspection.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/components/do/b1-inspect-order-plan/Inspection.vue b/src/components/do/b1-inspect-order-plan/Inspection.vue
index 32ee71d..038c937 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-top: 16px;">
+ <el-col :span="12" style="text-align: right;display: flex;align-items: center;justify-content: end;margin-top: 0px;">
<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">
@@ -3317,6 +3317,9 @@
this.$message.error('璇疯緭鍏ユ箍搴�')
return
}
+ if(this.sonLaboratory === '鐢佃矾璇曢獙'&&!this.$refs.CircuitParameters.saveAll()){
+ return
+ }
this.experimentDia = true
this.newUserInfo = []
this.userInfo.name.forEach((item,index)=>{
@@ -3820,7 +3823,9 @@
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- this.$emit('goback')
+ if(this.$refs.CircuitParameters.saveAll()){
+ this.$emit('goback')
+ }
})
}else{
this.$emit('goback')
--
Gitblit v1.9.3