From 32de1932cf6b38e9e5f0cbe16f2eef4108755a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=9F=B9=E5=8F=8B?= <17852335869@163.com>
Date: Fri, 17 Mar 2023 16:36:49 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=A0=B9=E6=8D=AE=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E9=9C=80=E6=B1=82=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/const/workflow/workorder.js                    |  8 ++++----
 src/page/index/sidebar/index.vue                   | 11 ++++++++---
 src/page/index/sidebar/sidebarItem.vue             |  1 +
 src/page/index/top/index.vue                       |  2 +-
 src/page/login/userlogin.vue                       | 11 ++++++++---
 src/router/axios.js                                |  6 +++---
 src/styles/custom/custom.scss                      | 13 +++++++++++--
 .../plugin/workflow/process/components/detail.vue  |  7 ++++++-
 .../plugin/workflow/process/components/form.vue    | 14 +++++++++++---
 .../plugin/workflow/process/implementation.vue     |  1 +
 src/views/plugin/workflow/process/workorder.vue    | 10 +++++++++-
 src/views/wel/index.vue                            | 10 +++++-----
 12 files changed, 68 insertions(+), 26 deletions(-)

diff --git a/src/const/workflow/workorder.js b/src/const/workflow/workorder.js
index 8823cb8..ac9baaf 100644
--- a/src/const/workflow/workorder.js
+++ b/src/const/workflow/workorder.js
@@ -1,14 +1,14 @@
 export const tableOption = {
   index: true,
   indexLabel: "序号",
-  indexWidth:120,
+  indexWidth:80,
   selection: false,
   border: false,
   gutter: 60, //设置input的大小
   headerAlign: "left",
   align: "left",
-  menuAlign:'left',
-  menuHeaderAlign:'left',
+  menuAlign:'center',
+  menuHeaderAlign:'center',
   menuBtn: true,
   editBtn: false,
   delBtn: false,
@@ -19,7 +19,7 @@ export const tableOption = {
   refreshBtn: false,
   // dialogCustomClass: "custom",
   header: false,
-  menuWidth:120,
+  menuWidth:210,
   column: [
     {
       type: "input",
diff --git a/src/page/index/sidebar/index.vue b/src/page/index/sidebar/index.vue
index 9b883ef..25190c3 100644
--- a/src/page/index/sidebar/index.vue
+++ b/src/page/index/sidebar/index.vue
@@ -9,7 +9,9 @@
                :default-active="nowTagValue"
                mode="vertical"
                :show-timeout="200"
-               :collapse="keyCollapse">
+               :collapse="keyCollapse"
+               :default-openeds="openeds"
+               >
         <sidebar-item :menu="menu"
                       :screen="screen"
                       first
@@ -30,7 +32,9 @@
     components: {sidebarItem, logo},
     inject: ["index"],
     data() {
-      return {};
+      return {
+        openeds: ["/plugin/workflow/process"],
+      };
     },
     created() {
       this.index.openMenu();
@@ -41,7 +45,8 @@
         return this.$router.$avueRouter.getValue(this.$route);
       }
     },
-    methods: {}
+    methods: {
+    }
   };
 </script>
 <style lang="scss" scoped>
diff --git a/src/page/index/sidebar/sidebarItem.vue b/src/page/index/sidebar/sidebarItem.vue
index 2693e31..ff013aa 100644
--- a/src/page/index/sidebar/sidebarItem.vue
+++ b/src/page/index/sidebar/sidebarItem.vue
@@ -125,6 +125,7 @@
         }
       },
       open(item) {
+        console.log(item)
         if (this.screen <= 1) this.$store.commit("SET_COLLAPSE");
         if (this.validIsOpen(item)) {
           window.open(item[this.pathKey]);
diff --git a/src/page/index/top/index.vue b/src/page/index/top/index.vue
index 816e3f6..3541468 100644
--- a/src/page/index/top/index.vue
+++ b/src/page/index/top/index.vue
@@ -21,7 +21,7 @@
       </div> -->
       <el-dropdown>
         <span class="el-dropdown-link">
-          <span style="cursor:pointer;">{{userInfo.real_name}}</span>
+          <span style="cursor:pointer;color:#000;">{{userInfo.real_name}}</span>
           <i class="el-icon-arrow-down el-icon--right"></i>
         </span>
         <el-dropdown-menu slot="dropdown">
diff --git a/src/page/login/userlogin.vue b/src/page/login/userlogin.vue
index 4d2db3f..a3b213c 100644
--- a/src/page/login/userlogin.vue
+++ b/src/page/login/userlogin.vue
@@ -42,7 +42,7 @@
         />
       </el-input>
     </el-form-item>
-    <div><el-checkbox v-model="rememberPwd">记住密码</el-checkbox></div>
+    <div><el-checkbox v-model="rememberPwd"><span style="color:#666;">记住密码</span></el-checkbox></div>
     <!-- <el-form-item v-if="this.website.captchaMode" prop="code">
       <el-row :span="24">
         <el-col :span="16">
@@ -332,14 +332,19 @@ export default {
   height: 50px;
   line-height: 50px;
   border-radius: 3px 3px 3px 3px;
-  color: #333;
+  color: #000;
   position: relative;
+  font-size: 14px;
 }
 /deep/ .el-form--label-top .el-form-item__label {
   font-size: 16px;
-  color: #333;
+  color: #000 !important;
   padding: 0 !important;
 }
+/deep/ .el-form-item__label {
+  color: #000;
+
+}
 /deep/ .el-form-item__label:before {
   display: none;
 }
diff --git a/src/router/axios.js b/src/router/axios.js
index d4f9b30..625c850 100644
--- a/src/router/axios.js
+++ b/src/router/axios.js
@@ -31,7 +31,7 @@ NProgress.configure({
 //http request拦截
 axios.interceptors.request.use(config => {
   //开启 progress bar
-  NProgress.start();
+  // NProgress.start();
   //headers判断是否需要
   const authorization = config.authorization === false;
   if (!authorization) {
@@ -58,7 +58,7 @@ axios.interceptors.request.use(config => {
 //http response 拦截
 axios.interceptors.response.use(res => {
   //关闭 progress bar
-  NProgress.done();
+  // NProgress.done();
   //获取状态码
   const status = res.data.code || res.status;
   const statusWhiteList = website.statusWhiteList || [];
@@ -77,7 +77,7 @@ axios.interceptors.response.use(res => {
   }
   return res;
 }, error => {
-  NProgress.done();
+  // NProgress.done();
   return Promise.reject(new Error(error));
 });
 
diff --git a/src/styles/custom/custom.scss b/src/styles/custom/custom.scss
index f768cf0..4f5b200 100644
--- a/src/styles/custom/custom.scss
+++ b/src/styles/custom/custom.scss
@@ -21,7 +21,11 @@
   }
   .el-table tr {
     height: 80px;
-    color: #374454;
+    color: #000;
+  }
+  .el-table td {
+    color: #000;
+    font-size: 14px;
   }
 }
 // 分页
@@ -131,4 +135,9 @@
 // 查看表单
 .avue--detail .el-col-7 {
   width: 33.3%;
-}
\ No newline at end of file
+}
+
+.el-button--default {
+  color: #000;
+}
+
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index 057ace6..3522275 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -344,7 +344,12 @@ export default {
       let vars = [];
       if (status != "todo") {
         // 已办，删除字段默认值
-        option.detail = true;
+        // option.detail = true;
+        for (const i in option.column) {
+          option.column[i].disabled = true
+        }
+        let shangchuan = this.findObject(option.column, "shangchuan");
+        shangchuan.display = false
         if (column && column.length > 0) {
           // 处理column
           column.forEach((col) => this.handleResolveEvent(col));
diff --git a/src/views/plugin/workflow/process/components/form.vue b/src/views/plugin/workflow/process/components/form.vue
index 189ae86..2b8f8c7 100644
--- a/src/views/plugin/workflow/process/components/form.vue
+++ b/src/views/plugin/workflow/process/components/form.vue
@@ -55,6 +55,7 @@
           <template slot="xitongmingchengshujuku">
             <el-select
               filterable
+              clearable
               v-model="form.xitongmingchengshujuku"
               placeholder="请选择系统名称/数据库"
               @change="systemChange"
@@ -173,6 +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 { mapGetters } from "vuex";
 export default {
   components: {
@@ -254,8 +256,8 @@ export default {
         // const guanlibumen = this.findObject(this.option.column, "guanlibumen");
         const guanlibumen = this.option.column[1];
         guanlibumen.dicData = res.data.data;
-        if(res.data.data.length === 1) {
-          this.form.guanlibumen = guanlibumen.dicData[0].id
+        if (res.data.data.length === 1) {
+          this.form.guanlibumen = guanlibumen.dicData[0].id;
         }
       });
       getTaskAndDataBase({ id }).then((res) => {
@@ -371,11 +373,16 @@ export default {
             this.option.column,
             "qiwangwanchengshijian"
           );
+          // 期望完成时间限制
           time.pickerOptions = {
             disabledDate(time) {
               return time.getTime() < Date.now() - 24 * 60 * 60 * 1000;
             },
           };
+          // 重复模式默认值
+          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) {
             // 查询是否有草稿箱
             this.initDraft(process.id).then((data) => {
@@ -383,12 +390,13 @@ export default {
                 .then(() => {
                   const form = JSON.parse(data);
                   this.systemChange(form.xitongmingchengshujuku, 1);
-                  this.form = form
+                  this.form = form;
                 })
                 .catch(() => {});
             });
           }
         }
+
         this.waiting = false;
       });
     },
diff --git a/src/views/plugin/workflow/process/implementation.vue b/src/views/plugin/workflow/process/implementation.vue
index 6767177..8c14f34 100644
--- a/src/views/plugin/workflow/process/implementation.vue
+++ b/src/views/plugin/workflow/process/implementation.vue
@@ -209,6 +209,7 @@ export default {
         this.searchForm.endTime = this.searchForm.timeArr[1];
       }
       getList({
+        processInstanceId: this.$route.query.id?this.$route.query.id:'',
         current: currentPage,
         size: pageSize,
         ...this.searchForm,
diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue
index 40f150c..9893b8e 100644
--- a/src/views/plugin/workflow/process/workorder.vue
+++ b/src/views/plugin/workflow/process/workorder.vue
@@ -142,7 +142,8 @@
         @size-change="sizeChange"
       >
         <template slot-scope="{ row }" slot="menu">
-          <el-button @click="dynamicRoute(row, 'detail')">详情</el-button>
+          <el-button @click="dynamicRoute(row, 'detail')" >详情</el-button>
+          <el-button @click="effect(row)" style="margin-left:8px;">实施详情</el-button>
         </template>
         <template slot-scope="scope" slot="status">
           <span
@@ -293,6 +294,13 @@ export default {
         this.$message.success("导出成功！");
       });
     },
+    // 跳转实施
+    effect(row) {
+      console.log(row)
+      this.$router.push({
+        path: '/plugin/workflow/process/implementation?id=' + row.processInstanceId,
+      })
+    }
   },
 };
 </script>
diff --git a/src/views/wel/index.vue b/src/views/wel/index.vue
index 4898dfe..2b6cce4 100644
--- a/src/views/wel/index.vue
+++ b/src/views/wel/index.vue
@@ -18,9 +18,9 @@
               class="num"
               :style="{
                 color:
-                  item.id === 1
+                  item.id === 2
                     ? '#FF8723'
-                    : item.id === 2
+                    : item.id === 1
                     ? '#27D477'
                     : item.id === 3
                     ? '#2E92F6'
@@ -87,13 +87,13 @@ export default {
       headerList: [
         {
           id: 1,
-          title: "到期提醒",
+          title: "我的待办",
           num: "",
           link: "/plugin/workflow/process/todo",
         },
-        {
+         {
           id: 2,
-          title: "我的待办",
+          title: "到期提醒",
           num: "",
           link: "/plugin/workflow/process/todo",
         },