From 2c62b12634a37586391f2465c99b0db5a66bc0ec Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期一, 06 五月 2024 16:15:31 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/mes-ocea-before into master
---
src/views/quality/teststandard/standard-form.vue | 47 ++++++++++++++++++++++++++++++++---------------
1 files changed, 32 insertions(+), 15 deletions(-)
diff --git a/src/views/quality/teststandard/standard-form.vue b/src/views/quality/teststandard/standard-form.vue
index 6e9dfa2..061e4af 100644
--- a/src/views/quality/teststandard/standard-form.vue
+++ b/src/views/quality/teststandard/standard-form.vue
@@ -32,7 +32,7 @@
</el-option>
</el-select>
</el-form-item>
- <el-form-item label="宸ュ簭" prop="operationName">
+ <!-- <el-form-item label="宸ュ簭" prop="operationName">
<el-input v-model="dataForm.operationName" placeholder="璇烽�夋嫨宸ュ簭">
<el-button
slot="append"
@@ -40,7 +40,7 @@
@click="openOperationDialog()"
></el-button>
</el-input>
- </el-form-item>
+ </el-form-item> -->
<el-form-item label="澶囨敞" prop="remark">
<el-input v-model="dataForm.remark" placeholder=""></el-input>
</el-form-item>
@@ -93,11 +93,17 @@
</el-form>
<span slot="footer" class="dialog-footer">
<el-button @click="visible = false">鍙栨秷</el-button>
- <el-button
+ <!-- <el-button
type="primary"
:disabled="isSubmit"
v-thinclick="`dataFormSubmit`"
v-if="editable"
+ >纭畾</el-button
+ > -->
+ <el-button
+ type="primary"
+ :disabled="isSubmit"
+ v-thinclick="`dataFormSubmit`"
>纭畾</el-button
>
</span>
@@ -155,6 +161,23 @@
ZttMonacoEditor,
operationDialog
},
+ watch:{
+ visible(newVal){
+ if(!newVal){
+ this.dataForm = {
+ id: 0,
+ standardName: '',
+ standardNo: '',
+ remark: '',
+ judgeFormula: '',
+ inspectionType: null,
+ operationId: null,
+ operationNo: null,
+ operationName: null,
+ }
+ }
+ }
+ },
created() {
this.funcs = funcForStandard()
this.constants = constantForStandard()
@@ -194,20 +217,8 @@
this.visible = true
this.$nextTick(() => {
this.$refs.dataForm.resetFields()
- this.dataForm = {
- id: 0,
- standardName: '',
- standardNo: '',
- remark: '',
- judgeFormula: '',
- inspectionType: null,
- operationId: null,
- operationNo: null,
- operationName: null,
- }
if (this.dataForm.id) {
getTestStandard(this.dataForm.id).then((response) => {
- console.log(response.data.data)
this.dataForm = response.data.data
// this.$refs.templateJudgmentCondition.setVal(
// this.dataForm.judgeFormula == null
@@ -257,6 +268,9 @@
this.visible = false
this.isSubmit = false
this.$emit('refreshDataList')
+ }).catch(error=>{
+ console.error(error);
+ this.isSubmit = false
})
} else {
addTestStandard(this.dataForm).then((data) => {
@@ -264,6 +278,9 @@
this.visible = false
this.isSubmit = false
this.$emit('refreshDataList')
+ }).catch(error=>{
+ console.error(error);
+ this.isSubmit = false
})
}
} else {
--
Gitblit v1.9.3