From c4bcc6e78ecaec6e9ea68802be7c1d3a7b063512 Mon Sep 17 00:00:00 2001
From: riku <risaku@163.com>
Date: 星期四, 21 十一月 2024 13:08:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'supervisionVue/hc-dataproduct-v1112' into lsf-dataproduct-1024
---
src/views/fysp/check/components/CompProblemCard.vue | 16 ++++++++++++----
1 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/views/fysp/check/components/CompProblemCard.vue b/src/views/fysp/check/components/CompProblemCard.vue
index e599f5c..35697a3 100644
--- a/src/views/fysp/check/components/CompProblemCard.vue
+++ b/src/views/fysp/check/components/CompProblemCard.vue
@@ -139,6 +139,7 @@
:subtask="subtask"
:topTask="topTask"
ref="compProblemAddOrUpdRef"
+ @cancel="onProCanceled"
@submit="onProSubmited"
/>
<!-- 鏁存敼 -->
@@ -151,6 +152,7 @@
:subtask="subtask"
:month="month"
:oldChangeFileList="problem.mediafileList"
+ @cancel="onChangeCanceled"
@submit="onChangeSubmited"
/>
<!-- 闂澶嶇幇 -->
@@ -173,7 +175,7 @@
import CompProRecent from './CompProRecent.vue';
import { useCloned } from '@vueuse/core';
export default {
- emits: ['submmit'],
+ emits: ['check', 'submit', 'cancel'],
components: {
CompProblemAddOrUpd,
ComChangeEdit,
@@ -210,7 +212,6 @@
default: 1
}
},
- emits: ['submit', 'updated'],
data() {
return {
changeDialogVisible: false,
@@ -282,9 +283,14 @@
}
},
methods: {
+ onProCanceled() {
+ this.proAddOrUpdDialogVisible = false;
+ },
onProSubmited(isOk) {
this.$emit('submit', isOk);
this.proAddOrUpdDialogVisible = false;
+ },
+ onChangeCanceled() {
},
onChangeSubmited(isOk) {
this.$emit('submit', isOk);
@@ -333,7 +339,8 @@
.checkProblem({ pId: pro.guid, action: action })
.then((res) => {
if (res.success) {
- this.$emit('submit', false);
+ pro.extension3 = status
+ this.$emit('check');
}
});
}
@@ -354,7 +361,8 @@
.checkProblem({ pId: pro.guid, action: action })
.then((res) => {
if (res.success) {
- this.$emit('submit', false);
+ pro.extension3 = status
+ this.$emit('check');
}
});
}
--
Gitblit v1.9.3