From b0adf43689b13634b521c5de4af84591cdcf581e Mon Sep 17 00:00:00 2001
From: xuechunyuan <17853500702@163.com>
Date: Mon, 3 Jul 2023 14:03:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=A6=E6=83=85=E6=94=B9?=
 =?UTF-8?q?=E4=B8=BA=E6=8E=A5=E5=8F=A3=E8=AF=B7=E6=B1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/plugin/workflow/workorder.js          |   9 ++
 src/router/views/index.js                     |   6 +
 .../workflow/process/components/detail.vue    |  15 ++-
 .../workflow/process/components/effect.vue    | 112 ++++++++++--------
 .../workflow/process/implementation.vue       |   3 +-
 src/views/plugin/workflow/process/todo.vue    |  12 +-
 .../plugin/workflow/process/workorder.vue     |  15 ++-
 vue.config.js                                 |   3 +-
 8 files changed, 114 insertions(+), 61 deletions(-)

diff --git a/src/api/plugin/workflow/workorder.js b/src/api/plugin/workflow/workorder.js
index fff81c7..2132728 100644
--- a/src/api/plugin/workflow/workorder.js
+++ b/src/api/plugin/workflow/workorder.js
@@ -91,3 +91,12 @@ export const workOrderExcel = (query) => {
     responseType: "blob",
   });
 };
+
+// 工单详情
+export const workOrderDetail = (query) => {
+  return request({
+    url: `${prefix}/detail`,
+    method: "get",
+    params: query,
+  });
+};
\ No newline at end of file
diff --git a/src/router/views/index.js b/src/router/views/index.js
index 6ced693..ba159f5 100644
--- a/src/router/views/index.js
+++ b/src/router/views/index.js
@@ -131,6 +131,12 @@ export default [{
       component: () =>
         import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/process/components/form'),
     },
+    {
+      path: 'process/details',
+      name: '流程详情',
+      component: () =>
+        import( /* webpackChunkName: "views" */ '@/views/plugin/workflow/process/components/detail'),
+    },
     {
       path: 'process/detail/:params',
       name: '流程详情',
diff --git a/src/views/plugin/workflow/process/components/detail.vue b/src/views/plugin/workflow/process/components/detail.vue
index b9ffd2e..0a7fa81 100644
--- a/src/views/plugin/workflow/process/components/detail.vue
+++ b/src/views/plugin/workflow/process/components/detail.vue
@@ -247,11 +247,20 @@ export default {
   mixins: [exForm, theme],
   components: { userSelect, WfExamineForm, WfButton, WfFlow },
   watch: {
-    "$route.params.params": {
+    // "$route.params.params": {
+    //   handler(val) {
+    //     if (val) {
+    //       const param = JSON.parse(Buffer.from(val, "base64").toString());
+    //       const { taskId, processInsId } = param;
+    //       if (taskId && processInsId) this.getDetail(taskId, processInsId);
+    //     }
+    //   },
+    //   immediate: true,
+    // },
+    "$route.query": {
       handler(val) {
         if (val) {
-          const param = JSON.parse(Buffer.from(val, "base64").toString());
-          const { taskId, processInsId } = param;
+          const { taskId, processInsId } = val;
           if (taskId && processInsId) this.getDetail(taskId, processInsId);
         }
       },
diff --git a/src/views/plugin/workflow/process/components/effect.vue b/src/views/plugin/workflow/process/components/effect.vue
index dc53023..c11605f 100644
--- a/src/views/plugin/workflow/process/components/effect.vue
+++ b/src/views/plugin/workflow/process/components/effect.vue
@@ -51,7 +51,7 @@
 
 <script>
 import { downloadFile } from "@/api/plugin/workflow/form.js";
-import { add } from "@/api/plugin/workflow/workorder.js";
+import { add, workOrderDetail } from "@/api/plugin/workflow/workorder.js";
 import { mapGetters } from "vuex";
 import website from '@/config/website';
 export default {
@@ -129,7 +129,7 @@ export default {
             prop: "operateSys",
             labelPosition: "top",
             disabled: true,
-            display: JSON.parse(this.$route.query.form).operateSysName ? false : true,
+            // display: this.form.operateSysName ? false : true,
           },
           {
             type: "input",
@@ -141,7 +141,7 @@ export default {
             prop: "operateSysName",
             labelPosition: "top",
             disabled: true,
-            display: JSON.parse(this.$route.query.form).operateSysName ? true : false,
+            // display: this.form.operateSysName ? true : false,
           },
           {
             type: "input",
@@ -240,55 +240,63 @@ export default {
     };
   },
   created() {
-    const {
-      applyUser,
-      maintenanceCompanyName,
-      maintenanceCompany,
-      managementName,
-      taskParentName,
-      taskTypeName,
-      taskLevelName,
-      operateSys,
-      operateSysName,
-      operateModuleName,
-      repeatModeName,
-      uploadRecords,
-      expectedCompletionTime,
-      isFinish,
-      id,
-      remark,
-      detail
-    } = JSON.parse(this.$route.query.form);
-    this.form = {
-      applyUser,
-      maintenanceCompanyName,
-      maintenanceCompany,
-      managementName,
-      taskParentName,
-      taskTypeName,
-      operateSys,
-      taskLevelName,
-      operateSysName,
-      operateModuleName,
-      repeatModeName,
-      uploadRecords,
-      expectedCompletionTime,
-      isFinish,
-      id,
-      remark,
-      detail
-    };
-    if(this.userInfo){
-    this.option.column.find(item => item.prop == 'remark').disabled = (JSON.parse(this.$route.query.form).isFinish === 1 ||
-      JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
-    ) ? true : false;
-    this.option.column.find(item => item.prop == 'remark').placeholder = (JSON.parse(this.$route.query.form).isFinish === 1 ||
-      JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
-    ) ? " " : "请输入实施反馈";
-     this.option.column.find(item => item.prop == 'shangchuan').display = (JSON.parse(this.$route.query.form).isFinish === 1 ||
-      JSON.parse(this.$route.query.form).maintenanceCompany !== this.userInfo.user_id
-    ) ? false : true
-    }
+    const id = this.$route.query.id;
+    // const {
+    //   applyUser,
+    //   maintenanceCompanyName,
+    //   maintenanceCompany,
+    //   managementName,
+    //   taskParentName,
+    //   taskTypeName,
+    //   taskLevelName,
+    //   operateSys,
+    //   operateSysName,
+    //   operateModuleName,
+    //   repeatModeName,
+    //   uploadRecords,
+    //   expectedCompletionTime,
+    //   isFinish,
+    //   id,
+    //   remark,
+    //   detail
+    // } = JSON.parse(this.$route.query.form);
+    // this.form = {
+    //   applyUser,
+    //   maintenanceCompanyName,
+    //   maintenanceCompany,
+    //   managementName,
+    //   taskParentName,
+    //   taskTypeName,
+    //   operateSys,
+    //   taskLevelName,
+    //   operateSysName,
+    //   operateModuleName,
+    //   repeatModeName,
+    //   uploadRecords,
+    //   expectedCompletionTime,
+    //   isFinish,
+    //   id,
+    //   remark,
+    //   detail
+    // };
+    workOrderDetail({id:id}).then(res =>{
+      this.form = res.data.data;
+      // console.log('form',this.form)
+      if(this.userInfo){
+        this.option.column.find(item => item.prop == 'operateSys').display = this.form.operateSysName ? true : false;
+        this.option.column.find(item => item.prop == 'operateSysName').display = this.form.operateSysName ? true : false;
+
+        this.option.column.find(item => item.prop == 'remark').disabled = (this.form.isFinish === 1 ||
+          this.form.maintenanceCompany !== this.userInfo.user_id
+        ) ? true : false;
+        this.option.column.find(item => item.prop == 'remark').placeholder = (this.form.isFinish === 1 ||
+          this.form.maintenanceCompany !== this.userInfo.user_id
+        ) ? " " : "请输入实施反馈";
+        this.option.column.find(item => item.prop == 'shangchuan').display = (this.form.isFinish === 1 ||
+        this.form.maintenanceCompany !== this.userInfo.user_id
+        ) ? false : true
+      }
+    })
     
   },
   computed: {
diff --git a/src/views/plugin/workflow/process/implementation.vue b/src/views/plugin/workflow/process/implementation.vue
index c3397b5..2729f1f 100644
--- a/src/views/plugin/workflow/process/implementation.vue
+++ b/src/views/plugin/workflow/process/implementation.vue
@@ -305,7 +305,8 @@ export default {
       this.$router.push({
         path: "/workflow/process/effect",
         query: {
-          form: JSON.stringify(row),
+          id: row.id
+          // form: JSON.stringify(row),
         },
       });
     },
diff --git a/src/views/plugin/workflow/process/todo.vue b/src/views/plugin/workflow/process/todo.vue
index 1db7936..de1166d 100644
--- a/src/views/plugin/workflow/process/todo.vue
+++ b/src/views/plugin/workflow/process/todo.vue
@@ -277,11 +277,19 @@ export default {
         this.$router.push({
           path: "/workflow/process/effect",
           query: {
-            form: JSON.stringify(row),
+            id: row.id
+            // form: JSON.stringify(row),
           },
         });
       } else {
-        this.dynamicRoute(row, "detail");
+        // this.dynamicRoute(row, "detail");
+        this.$router.push({
+          path: "/workflow/process/details",
+          query: {
+            taskId: row.taskId,
+            processInsId: row.processInstanceId,
+          },
+        });
       }
     },
   },
diff --git a/src/views/plugin/workflow/process/workorder.vue b/src/views/plugin/workflow/process/workorder.vue
index 5eb6eb3..a457d5f 100644
--- a/src/views/plugin/workflow/process/workorder.vue
+++ b/src/views/plugin/workflow/process/workorder.vue
@@ -158,7 +158,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="details(row)" >详情</el-button>
           <el-button @click="effect(row)" style="margin-left:8px;" v-if="row.status == '已完成'">实施详情</el-button>
         </template>
         <template slot-scope="scope" slot="status">
@@ -348,7 +349,17 @@ export default {
       this.$router.push({
         path: '/plugin/workflow/process/implementation?id=' + row.processInstanceId,
       })
-    }
+    },
+    // 详情
+    details(row) {
+      this.$router.push({
+        path: "/workflow/process/details",
+        query: {
+          taskId: row.taskId,
+          processInsId: row.processInstanceId,
+        },
+      });
+    },
   },
 };
 </script>
diff --git a/vue.config.js b/vue.config.js
index 15993c4..7b51a1e 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -26,7 +26,8 @@ module.exports = {
     proxy: {
       '/api': {
         //本地服务接口地址
-        target: 'http://192.168.3.36:81',
+        target: 'http://192.168.1.34:81',
+        // target: 'http://192.168.3.36:81',
         // target: 'http://192.168.1.12:81',
         // target: 'http://192.168.1.102:81',
         //远程演示服务地址,可用于直接启动项目