From 2e198ba184bb0661da07e9d72daa9f718b190ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Mon, 6 Mar 2023 18:25:46 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=9C=9F=E6=9C=9B=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js                     |  2 --
 .../workflow/process/components/effect.vue    | 15 ++++----
 .../workflow/process/components/form.vue      | 36 +++++++++----------
 3 files changed, 24 insertions(+), 29 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6be4d32..f92f525 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -262,8 +262,6 @@ const user = {
       setStore({name: 'tenantId', content: state.tenantId})
     },
     SET_USER_INFO: (state, userInfo) => {
-      console.log(state)
-      console.log(userInfo)
       if (validatenull(userInfo.avatar)) {
         userInfo.avatar = "/img/bg/img-logo.png";
       }
diff --git a/src/views/plugin/workflow/process/components/effect.vue b/src/views/plugin/workflow/process/components/effect.vue
index 253ce21..2f064c7 100644
--- a/src/views/plugin/workflow/process/components/effect.vue
+++ b/src/views/plugin/workflow/process/components/effect.vue
@@ -163,6 +163,13 @@ export default {
           //   labelPosition: "top",
           //   disabled: true,
           // },
+          {
+            type: "input",
+            span: 24,
+            display: true,
+            prop: "uploadRecords",
+            labelPosition: "top",
+          },
           {
             type: "upload",
             propsHttp: {
@@ -181,13 +188,7 @@ export default {
             dragFile: true,
             label: "附件上传",
           },
-          {
-            type: "input",
-            span: 24,
-            display: true,
-            prop: "uploadRecords",
-            labelPosition: "top",
-          },
+          
           {
             type: "textarea",
             label: "实施反馈",
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 03101ad..afe09a2 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -200,7 +200,9 @@ export default {
           "renwuzhonglei"
         );
         for (let i in renwuzhonglei.dicData) {
-          this.form.renwudengji = renwuzhonglei.dicData[i].taskLevel;
+          if (val === renwuzhonglei.dicData[i].id) {
+            this.form.renwudengji = renwuzhonglei.dicData[i].taskLevel;
+          }
         }
       }
     },
@@ -241,7 +243,7 @@ export default {
       visible: false,
     };
   },
-  mounted() {
+  created() {
     // 运维公司
     getCompany().then((res) => {
       const data = res.data.data;
@@ -282,13 +284,9 @@ export default {
       getTaskTypeData({ parentId: id }).then((res) => {
         this.form.renwuzhonglei = "";
         this.form.renwudengji = "";
-        const renwuzhonglei = this.findObject(
-          this.option.column,
-          "renwuzhonglei"
-        );
-        this.$nextTick(() => {
-          renwuzhonglei.dicData = res.data.data;
-        });
+        console.log(this.option);
+        const renwuzhonglei = this.option.column[3];
+        renwuzhonglei.dicData = res.data.data;
       });
     },
     systemChange(id) {
@@ -370,17 +368,15 @@ export default {
           option.column = columnArr;
           option.group = groupArr;
           this.option = option;
-
-          // this.findObject(this.option.column, 'yunweigongsi').disabled = true
-          // 输入框禁用
-          // const gongshimingcheng = this.findObject(
-          //   this.option.column,
-          //   "gongshimingcheng"
-          // );
-          // if(gongshimingcheng.dicData.length === 1) {
-          //   gongshimingcheng.disabled = true;
-          //   gongshimingcheng.value = gongshimingcheng.dicData[0].dictKey;
-          // }
+          const time = this.findObject(
+            this.option.column,
+            "qiwangwanchengshijian"
+          );
+          time.pickerOptions = {
+            disabledDate(time) {
+              return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
+            },
+          };
           if (this.permission.wf_process_draft) {
             // 查询是否有草稿箱
             this.initDraft(process.id).then((data) => {