From 8536c4f96aa2524aaa4c37d763d54b36307d85ae Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 13:17:51 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/backlogDetailRecords.vue       | 38 ++++++++++++++--
 .../components/completeDetailRecords.vue      | 38 ++++++++++++++--
 .../closeLoopDispose/components/copy.vue      |  4 +-
 .../components/copyDetailRecords.vue          | 38 ++++++++++++++--
 .../components/myCourseDetailRecords.vue      | 44 +++++++++++++++----
 5 files changed, 139 insertions(+), 23 deletions(-)

diff --git a/src/views/closeLoopDispose/components/backlogDetailRecords.vue b/src/views/closeLoopDispose/components/backlogDetailRecords.vue
index 035f407..ca4f9a4 100644
--- a/src/views/closeLoopDispose/components/backlogDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailRecords.vue
@@ -45,7 +45,12 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="processType" label="操作状态" width="280">
+            <el-table-column prop="use_status" label="操作状态" width="280">
+              <template slot-scope="scope">
+                <div :style="{ color: styleChange(scope.row.use_status) }">
+                  {{ scope.row.use_status }}
+                </div>
+              </template>
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
@@ -112,6 +117,13 @@ export default {
     };
     get_my_course_record(param).then((res) => {
       this.record_list = res.data.wfDetailVo.recordList;
+      for ( let i = 0; i< this.record_list.length; i++) {
+        for ( let j = 0; j< this.record_list[i].historyTaskList.length; j++ ) {
+          this.record_list[i].historyTaskList[j].use_status = this.use_change(
+            this.record_list[i].historyTaskList[j].assigneeId
+          )
+        }
+      }
       console.log("this.record_list", this.record_list);
       // for(let i = 0; i < this.record_list.length;i++) {
       //   if ( i + 1 == this.record_list.length )  {
@@ -125,6 +137,24 @@ export default {
     });
   },
   methods: {
+    // 根据返回码值判断流程状态
+    use_change(val) {
+      if (val != null ) {
+        return "已操作者"
+      } else {
+        return "未操作者"
+      }
+    },
+    styleChange(val) {
+      switch (val) {
+        case "未操作者":
+          return "#3eba75";
+        // case "yellow":
+        //   return "#FDA722";
+        case "已操作者":
+          return "#fff";
+      }
+    },
     // 表头样式
     table_header({ row, rowIndex }) {
       console.log(row);
@@ -219,16 +249,16 @@ export default {
         text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
       }
       .step_table_top_opeartion {
-        width: 21vw;
+        width: 30vw;
         height: 5vh;
         // border: 0.1px solid #fff;
         display: flex;
         .opeartion_num {
-          width: 7vw;
+          width: 10vw;
           height: 5vh;
           display: flex;
           .opeartion_num_text {
-            width: 4vw;
+            width: 7vw;
             height: 5vh;
             color: #fff;
             font-size: 16px;
diff --git a/src/views/closeLoopDispose/components/completeDetailRecords.vue b/src/views/closeLoopDispose/components/completeDetailRecords.vue
index ae56a6d..fdc6133 100644
--- a/src/views/closeLoopDispose/components/completeDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/completeDetailRecords.vue
@@ -45,7 +45,12 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="processType" label="操作状态" width="280">
+            <el-table-column prop="use_status" label="操作状态" width="280">
+              <template slot-scope="scope">
+                <div :style="{ color: styleChange(scope.row.use_status) }">
+                  {{ scope.row.use_status }}
+                </div>
+              </template>
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
@@ -88,10 +93,35 @@ export default {
     };
     get_my_course_record(param).then((res) => {
       this.record_list = res.data.wfDetailVo.recordList;
+      for ( let i = 0; i< this.record_list.length; i++) {
+        for ( let j = 0; j< this.record_list[i].historyTaskList.length; j++ ) {
+          this.record_list[i].historyTaskList[j].use_status = this.use_change(
+            this.record_list[i].historyTaskList[j].assigneeId
+          )
+        }
+      }
       console.log("this.record_list", this.record_list);
     });
   },
   methods: {
+    // 根据返回码值判断流程状态
+    use_change(val) {
+      if (val != null ) {
+        return "已操作者"
+      } else {
+        return "未操作者"
+      }
+    },
+    styleChange(val) {
+      switch (val) {
+        case "未操作者":
+          return "#3eba75";
+        // case "yellow":
+        //   return "#FDA722";
+        case "已操作者":
+          return "#fff";
+      }
+    },
     // 表头样式
     table_header({ row, rowIndex }) {
       console.log(row);
@@ -186,16 +216,16 @@ export default {
         text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
       }
       .step_table_top_opeartion {
-        width: 21vw;
+        width: 30vw;
         height: 5vh;
         // border: 0.1px solid #fff;
         display: flex;
         .opeartion_num {
-          width: 7vw;
+          width: 10vw;
           height: 5vh;
           display: flex;
           .opeartion_num_text {
-            width: 4vw;
+            width: 7vw;
             height: 5vh;
             color: #fff;
             font-size: 16px;
diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue
index 5b7f438..0756a6c 100644
--- a/src/views/closeLoopDispose/components/copy.vue
+++ b/src/views/closeLoopDispose/components/copy.vue
@@ -53,11 +53,11 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="200">
           </el-table-column>
-          <el-table-column prop="course_type" label="流程类型" width="200">
+          <el-table-column prop="processType" label="流程类型" width="200">
           </el-table-column>
           <el-table-column prop="originatorName" label="创建者" width="200">
           </el-table-column>
-          <el-table-column prop="build_unit" label="创建单位" width="200">
+          <el-table-column prop="deptName" label="创建单位" width="200">
           </el-table-column>
           <el-table-column prop="process_status" label="流程状态" width="200">
             <template slot-scope="scope">
diff --git a/src/views/closeLoopDispose/components/copyDetailRecords.vue b/src/views/closeLoopDispose/components/copyDetailRecords.vue
index 3287ddd..daaaa0d 100644
--- a/src/views/closeLoopDispose/components/copyDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/copyDetailRecords.vue
@@ -45,7 +45,12 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="processType" label="操作状态" width="280">
+            <el-table-column prop="use_status" label="操作状态" width="280">
+              <template slot-scope="scope">
+                <div :style="{ color: styleChange(scope.row.use_status) }">
+                  {{ scope.row.use_status }}
+                </div>
+              </template>
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
@@ -112,6 +117,13 @@ export default {
     };
     get_my_course_record(param).then((res) => {
       this.record_list = res.data.wfDetailVo.recordList;
+      for ( let i = 0; i< this.record_list.length; i++) {
+        for ( let j = 0; j< this.record_list[i].historyTaskList.length; j++ ) {
+          this.record_list[i].historyTaskList[j].use_status = this.use_change(
+            this.record_list[i].historyTaskList[j].assigneeId
+          )
+        }
+      }
       console.log("this.record_list", this.record_list);
       // for(let i = 0; i < this.record_list.length;i++) {
       //   if ( i + 1 == this.record_list.length )  {
@@ -125,6 +137,24 @@ export default {
     });
   },
   methods: {
+    // 根据返回码值判断流程状态
+    use_change(val) {
+      if (val != null ) {
+        return "已操作者"
+      } else {
+        return "未操作者"
+      }
+    },
+    styleChange(val) {
+      switch (val) {
+        case "未操作者":
+          return "#3eba75";
+        // case "yellow":
+        //   return "#FDA722";
+        case "已操作者":
+          return "#fff";
+      }
+    },
     // 表头样式
     table_header({ row, rowIndex }) {
       console.log(row);
@@ -219,16 +249,16 @@ export default {
         text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
       }
       .step_table_top_opeartion {
-        width: 21vw;
+        width: 30vw;
         height: 5vh;
         // border: 0.1px solid #fff;
         display: flex;
         .opeartion_num {
-          width: 7vw;
+          width: 10vw;
           height: 5vh;
           display: flex;
           .opeartion_num_text {
-            width: 4vw;
+            width: 7vw;
             height: 5vh;
             color: #fff;
             font-size: 16px;
diff --git a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
index c509f15..5c029af 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
@@ -45,15 +45,16 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="processType" label="操作状态" width="280">
+            <el-table-column prop="use_status" label="操作状态" width="280">
+              <template slot-scope="scope">
+                <div :style="{ color: styleChange(scope.row.use_status) }">
+                  {{ scope.row.use_status }}
+                </div>
+              </template>
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
-            <el-table-column
-              prop="createTime"
-              label="操作时间"
-              width="280"
-            >
+            <el-table-column prop="createTime" label="操作时间" width="280">
             </el-table-column>
             <el-table-column prop="duration" label="耗时"> </el-table-column>
           </el-table>
@@ -112,6 +113,13 @@ export default {
     };
     get_my_course_record(param).then((res) => {
       this.record_list = res.data.wfDetailVo.recordList;
+      for (let i = 0; i < this.record_list.length; i++) {
+        for (let j = 0; j < this.record_list[i].historyTaskList.length; j++) {
+          this.record_list[i].historyTaskList[j].use_status = this.use_change(
+            this.record_list[i].historyTaskList[j].assigneeId
+          );
+        }
+      }
       console.log("this.record_list", this.record_list);
       // for(let i = 0; i < this.record_list.length;i++) {
       //   if ( i + 1 == this.record_list.length )  {
@@ -125,6 +133,24 @@ export default {
     });
   },
   methods: {
+    // 根据返回码值判断流程状态
+    use_change(val) {
+      if (val != null) {
+        return "已操作者";
+      } else {
+        return "未操作者";
+      }
+    },
+    styleChange(val) {
+      switch (val) {
+        case "未操作者":
+          return "#3eba75";
+        // case "yellow":
+        //   return "#FDA722";
+        case "已操作者":
+          return "#fff";
+      }
+    },
     // 表头样式
     table_header({ row, rowIndex }) {
       console.log(row);
@@ -219,16 +245,16 @@ export default {
         text-shadow: 0 0 9px rgba(21, 255, 198, 0.64);
       }
       .step_table_top_opeartion {
-        width: 21vw;
+        width: 30vw;
         height: 5vh;
         // border: 0.1px solid #fff;
         display: flex;
         .opeartion_num {
-          width: 7vw;
+          width: 10vw;
           height: 5vh;
           display: flex;
           .opeartion_num_text {
-            width: 4vw;
+            width: 7vw;
             height: 5vh;
             color: #fff;
             font-size: 16px;

From 879747060d4ddbde03f53a014a5c517def47c6e7 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 13:57:58 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js                                         | 4 ++--
 src/views/closeLoopDispose/components/backlogDetailForm.vue  | 1 +
 src/views/closeLoopDispose/components/completeDetailForm.vue | 1 +
 src/views/closeLoopDispose/components/copyDetailForm.vue     | 1 +
 src/views/closeLoopDispose/components/myCourseDetailForm.vue | 1 +
 5 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index dd427d8..17c8c35 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -4,10 +4,10 @@ import vm from "../main";
 import { getToken } from '@/utils/auth'
 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
 const request = axios.create({
-  baseURL: 'http://172.18.113.50:8080/zhapi',
+  //baseURL: 'http://172.18.113.50:8080/zhapi',
   //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
-  //baseURL: `http://${window.location.host}/zhapi`,
+  baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
   headers: { 'content-type': 'application/json' },
 })
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index 11ad0ec..c218081 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -535,6 +535,7 @@ export default {
     .send_person,
     .backlog_time {
       display: flex;
+      margin-bottom: 2vh;
     }
     .backlog_text {
       width: 4vw;
diff --git a/src/views/closeLoopDispose/components/completeDetailForm.vue b/src/views/closeLoopDispose/components/completeDetailForm.vue
index 178def0..eaa99e3 100644
--- a/src/views/closeLoopDispose/components/completeDetailForm.vue
+++ b/src/views/closeLoopDispose/components/completeDetailForm.vue
@@ -407,6 +407,7 @@ export default {
     .complete_person,
     .complete_time {
       display: flex;
+      margin-bottom: 2vh;
     }
     .complete_text {
       width: 4vw;
diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue
index 160c202..1e3b8ea 100644
--- a/src/views/closeLoopDispose/components/copyDetailForm.vue
+++ b/src/views/closeLoopDispose/components/copyDetailForm.vue
@@ -406,6 +406,7 @@ export default {
     .copy_person,
     .course_time {
       display: flex;
+      margin-bottom: 2vh;
     }
     .course_text {
       width: 4vw;
diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
index b22f7a2..2c0292c 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
@@ -447,6 +447,7 @@ export default {
     .send_person,
     .course_time {
       display: flex;
+      margin-bottom: 2vh;
     }
     .course_text {
       width: 4vw;

From 84e6b9f206c90b23605518a3131af60c07de8409 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 14:05:38 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/closeLoopDispose/components/backlogDetailRecords.vue  | 2 +-
 src/views/closeLoopDispose/components/completeDetailRecords.vue | 2 +-
 src/views/closeLoopDispose/components/copyDetailRecords.vue     | 2 +-
 src/views/closeLoopDispose/components/myCourseDetailRecords.vue | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/closeLoopDispose/components/backlogDetailRecords.vue b/src/views/closeLoopDispose/components/backlogDetailRecords.vue
index ca4f9a4..77f0e6f 100644
--- a/src/views/closeLoopDispose/components/backlogDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailRecords.vue
@@ -120,7 +120,7 @@ export default {
       for ( let i = 0; i< this.record_list.length; i++) {
         for ( let j = 0; j< this.record_list[i].historyTaskList.length; j++ ) {
           this.record_list[i].historyTaskList[j].use_status = this.use_change(
-            this.record_list[i].historyTaskList[j].assigneeId
+            this.record_list[i].historyTaskList[j].finishTime
           )
         }
       }
diff --git a/src/views/closeLoopDispose/components/completeDetailRecords.vue b/src/views/closeLoopDispose/components/completeDetailRecords.vue
index fdc6133..ee31deb 100644
--- a/src/views/closeLoopDispose/components/completeDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/completeDetailRecords.vue
@@ -96,7 +96,7 @@ export default {
       for ( let i = 0; i< this.record_list.length; i++) {
         for ( let j = 0; j< this.record_list[i].historyTaskList.length; j++ ) {
           this.record_list[i].historyTaskList[j].use_status = this.use_change(
-            this.record_list[i].historyTaskList[j].assigneeId
+            this.record_list[i].historyTaskList[j].finishTime
           )
         }
       }
diff --git a/src/views/closeLoopDispose/components/copyDetailRecords.vue b/src/views/closeLoopDispose/components/copyDetailRecords.vue
index daaaa0d..278c6f5 100644
--- a/src/views/closeLoopDispose/components/copyDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/copyDetailRecords.vue
@@ -120,7 +120,7 @@ export default {
       for ( let i = 0; i< this.record_list.length; i++) {
         for ( let j = 0; j< this.record_list[i].historyTaskList.length; j++ ) {
           this.record_list[i].historyTaskList[j].use_status = this.use_change(
-            this.record_list[i].historyTaskList[j].assigneeId
+            this.record_list[i].historyTaskList[j].finishTime
           )
         }
       }
diff --git a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
index 5c029af..b15f5df 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
@@ -116,7 +116,7 @@ export default {
       for (let i = 0; i < this.record_list.length; i++) {
         for (let j = 0; j < this.record_list[i].historyTaskList.length; j++) {
           this.record_list[i].historyTaskList[j].use_status = this.use_change(
-            this.record_list[i].historyTaskList[j].assigneeId
+            this.record_list[i].historyTaskList[j].finishTime
           );
         }
       }