From f37d45b8998ea08a42002579ecc103244bdac17b Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 11:06:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/components/CompProblemAddOrUpd.vue | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/src/views/fysp/check/components/CompProblemAddOrUpd.vue b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
index 6fe60eb..2f58db3 100644
--- a/src/views/fysp/check/components/CompProblemAddOrUpd.vue
+++ b/src/views/fysp/check/components/CompProblemAddOrUpd.vue
@@ -80,12 +80,6 @@
</el-select>
</el-form-item>
<el-form-item
- v-show="
- problem &&
- problem.guid &&
- deepCopyProblem.advice &&
- deepCopyProblem.advice != ''
- "
label="闂寤鸿淇"
prop="_adviseEdit"
:disabled="false"
@@ -173,7 +167,7 @@
<el-button type="primary" @click="onSubmit" v-show="!readonly"
>淇濆瓨</el-button
>
- <el-button @click="$emit('submit', false)" v-show="!readonly"
+ <el-button @click="onCancel" v-show="!readonly"
>鍙栨秷</el-button
>
</el-form-item>
@@ -233,7 +227,7 @@
import deviceApi from '@/api/fysp/deviceApi';
import { useFormConfirm } from '@/composables/formConfirm';
export default {
- emits: ['submit'],
+ emits: ['submit', 'cancel'],
components: {
ArbitraryPhoto,
CompDevicePhoto,
@@ -332,6 +326,11 @@
this.pictureValidate();
},
deep: true
+ },
+ problem: {
+ handler(nv, ov) {
+ this.initOptions();
+ }
}
},
computed: {
@@ -561,6 +560,9 @@
}
return true;
},
+ onCancel() {
+ this.$emit("cancel")
+ },
onSubmit() {
this.$refs.formRef.validate((valid) => {
if (valid && this.pictureValidate()) {
--
Gitblit v1.9.3