From 7e7081b87ea4facc85a92f93b4cbe7ab6f16a6c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Tue, 28 Mar 2023 14:39:25 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E5=B7=A5=E5=8D=95=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/img/gdwel/7.png                       | Bin 0 -> 2116 bytes
 .../plugin/workflow/process/components/form.vue  |  15 ++++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)
 create mode 100644 src/assets/img/gdwel/7.png

diff --git a/src/assets/img/gdwel/7.png b/src/assets/img/gdwel/7.png
new file mode 100644
index 0000000000000000000000000000000000000000..8686e93d672fcef37e0516532389862ec48ca87b
GIT binary patch
literal 2116
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

literal 0
HcmV?d00001

diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index f51e235..d57c418 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -174,7 +174,7 @@ import WfExamineForm from "./examForm.vue";
 import WfUserSelect from "./user-select";
 import exForm from "../../mixins/ex-form";
 import draft from "../../mixins/draft";
-// import { dateFormat } from "@/util/date";
+import { dateFormat } from "@/util/date";
 import { mapGetters } from "vuex";
 export default {
   components: {
@@ -370,10 +370,11 @@ export default {
           //   this.taskParentChange(id);
           // }
           this.form.renwufulei = this.$route.query.parent;
-          // const time = this.findObject(
-          //   this.option.column,
-          //   "qiwangwanchengshijian"
-          // );
+
+          const time = this.findObject(
+            this.option.column,
+            "qiwangwanchengshijian"
+          );
           // 期望完成时间限制
           // time.pickerOptions = {
           //   disabledDate(time) {
@@ -381,8 +382,8 @@ export default {
           //   },
           // };
           // 重复模式默认值
-          // let addHour = new Date().setHours(new Date().getHours() + 48);
-          // time.value = dateFormat(new Date(addHour));
+          let addHour = new Date().setHours(new Date().getHours() + 48);
+          time.value = dateFormat(new Date(addHour));
           // this.form.chongfumoshi = "1627589799957266433";
           if (this.permission.wf_process_draft) {
             // 查询是否有草稿箱