From e205b66078be147a678ef52f788488e1cfec243c Mon Sep 17 00:00:00 2001
From: kclf <1195754634@qq.com>
Date: Wed, 7 Dec 2022 16:33:34 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/research/ResearchManage.vue | 82 +++++++++++++--------------
1 file changed, 41 insertions(+), 41 deletions(-)
diff --git a/src/views/research/ResearchManage.vue b/src/views/research/ResearchManage.vue
index 6e56bc80..19d107a4 100644
--- a/src/views/research/ResearchManage.vue
+++ b/src/views/research/ResearchManage.vue
@@ -44,7 +44,7 @@
@@ -230,46 +230,46 @@ export default {
number: null,
selectTime: null,
tableData: [
- {
- key: 1,
- number: 1,
- manager: "产品经理评估",
- state: "已发布",
- creater: "管理员",
- pubtime: "2022-07-20 9:03",
- cretime: "2022-07-20 9:03",
- haspub: false,
- },
- {
- key: 2,
- number: 2,
- manager: "高级产品经理评估",
- state: "已发布",
- creater: "管理员",
- pubtime: "2022-07-20 9:03",
- cretime: "2022-07-20 9:03",
- haspub: false,
- },
- {
- key: 3,
- number: 3,
- manager: "管理者进阶腾飞班管理者进阶腾飞班评估",
- state: "待发布",
- creater: "管理员",
- pubtime: "2022-07-20 9:03",
- cretime: "2022-07-20 9:03",
- haspub: true,
- },
- {
- key: 4,
- number: 4,
- manager: "HR评估",
- state: "已结束",
- creater: "管理员",
- pubtime: "2022-07-20 9:03",
- cretime: "2022-07-20 9:03",
- haspub: true,
- },
+ // {
+ // key: 1,
+ // number: 1,
+ // manager: "产品经理评估",
+ // state: "已发布",
+ // creater: "管理员",
+ // pubtime: "2022-07-20 9:03",
+ // cretime: "2022-07-20 9:03",
+ // haspub: false,
+ // },
+ // {
+ // key: 2,
+ // number: 2,
+ // manager: "高级产品经理评估",
+ // state: "已发布",
+ // creater: "管理员",
+ // pubtime: "2022-07-20 9:03",
+ // cretime: "2022-07-20 9:03",
+ // haspub: false,
+ // },
+ // {
+ // key: 3,
+ // number: 3,
+ // manager: "管理者进阶腾飞班管理者进阶腾飞班评估",
+ // state: "待发布",
+ // creater: "管理员",
+ // pubtime: "2022-07-20 9:03",
+ // cretime: "2022-07-20 9:03",
+ // haspub: true,
+ // },
+ // {
+ // key: 4,
+ // number: 4,
+ // manager: "HR评估",
+ // state: "已结束",
+ // creater: "管理员",
+ // pubtime: "2022-07-20 9:03",
+ // cretime: "2022-07-20 9:03",
+ // haspub: true,
+ // },
],
currentPage: 1,
tableDataTotal: 0,
From dee1b09e90e038041c3496c91a59a0333aa688a9 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 7 Dec 2022 16:39:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BD=9C=E4=B8=9A=E6=B7=BB=E5=8A=A0?=
=?UTF-8?q?=E9=87=8D=E7=BD=AEform=E8=A1=A8=E5=8D=95=E4=BF=A1=E6=81=AF?=
=?UTF-8?q?=E5=8F=8A=E9=80=89=E4=B8=AD=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddHomework.vue | 19 ++++++++++++-------
1 file changed, 12 insertions(+), 7 deletions(-)
diff --git a/src/components/drawers/AddHomework.vue b/src/components/drawers/AddHomework.vue
index e239ba3f..3dc2a0f6 100644
--- a/src/components/drawers/AddHomework.vue
+++ b/src/components/drawers/AddHomework.vue
@@ -44,7 +44,7 @@
-
+
{
- //formRef.value.resetFields();
-
-
+ // formRef.value.resetFields();
+ formState.workName = ''
+ formState.workRequirement = ''
+ formState.choosedTime = []
};
const handleValidate = (...args) => {
@@ -309,13 +310,18 @@ export default {
localStorage.setItem("chapterId", props.isactive);
fileList.value = [];
state.workEnclosureAddress = "";
- alert(1)
resetForm();
};
+
+ // 重置表单选项
const afterVisibleChange = () => {
+ console.log('11223344', props.EditWorkId)
if (props.EditWorkId > 0) {
state.EditWorkId = props.EditWorkId;
queryWork();
+ }else{
+ formRef.value.resetFields();
+ resetForm();
}
};
@@ -467,7 +473,6 @@ export default {
if (props.face) {
createWorkTask(obj).then((res) => {
ctx.emit("getWork", res.data.data);
- closeDrawer2();
});
}
};
From 58f8e6d875e7a8f357c376289ba0d5c5ff19c177 Mon Sep 17 00:00:00 2001
From: wyx <51903@qq.com>
Date: Wed, 7 Dec 2022 16:51:23 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix:=E6=B5=8B=E8=AF=84=E7=82=B9=E5=87=BB?=
=?UTF-8?q?=E5=A4=9A=E6=AC=A1=E6=B7=BB=E5=8A=A0=E9=97=AE=E9=A2=98=EF=BC=8C?=
=?UTF-8?q?=E9=99=90=E5=88=B6=E7=82=B9=E5=87=BB=E9=A2=91=E7=8E=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/drawers/AddEval.vue | 14 +++++++++++++-
1 file changed, 13 insertions(+), 1 deletion(-)
diff --git a/src/components/drawers/AddEval.vue b/src/components/drawers/AddEval.vue
index e2dcc16d..60d3756e 100644
--- a/src/components/drawers/AddEval.vue
+++ b/src/components/drawers/AddEval.vue
@@ -78,7 +78,7 @@