From 7f7cfbbeabbecbde562ac78e9c5b05e2e99a9ab3 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Wed, 28 Jun 2023 10:54:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AD=E7=8E=AF=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../closeLoopDispose/components/backlog.vue   | 30 ++++++++++---
 .../components/backlogDetailForm.vue          |  2 +-
 .../components/backlogDetailRecords.vue       |  2 +-
 .../closeLoopDispose/components/complete.vue  | 38 +++++++++++-----
 .../components/completeDetailForm.vue         |  2 +-
 .../components/completeDetailRecords.vue      |  2 +-
 .../closeLoopDispose/components/copy.vue      | 39 +++++++++++-----
 .../components/copyDetailRecords.vue          |  2 +-
 .../closeLoopDispose/components/myCourse.vue  | 44 ++++++++++++-------
 .../components/myCourseDetailForm.vue         |  2 +-
 .../components/myCourseDetailRecords.vue      |  2 +-
 11 files changed, 113 insertions(+), 52 deletions(-)

diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue
index 1b1418e..c6dcd73 100644
--- a/src/views/closeLoopDispose/components/backlog.vue
+++ b/src/views/closeLoopDispose/components/backlog.vue
@@ -39,10 +39,10 @@
           </el-table-column>
           <el-table-column prop="course_type" label="流程类型" width="280">
           </el-table-column>
-          <el-table-column prop="course_status" label="流程状态" width="220">
+          <el-table-column prop="process_status" label="流程状态" width="220">
             <template slot-scope="scope">
-              <div :style="{ color: styleChange(scope.row.course_status) }">
-                {{ scope.row.course_status }}
+              <div :style="{ color: styleChange(scope.row.process_status) }">
+                {{ scope.row.process_status }}
               </div>
             </template>
           </el-table-column>
@@ -145,6 +145,11 @@ export default {
         searchKey: this.search.word,
       };
       get_backlog(param).then((res) => {
+        // 根据返回码值判断流程状态
+        for( let i = 0; i<res.rows.length;i++) {
+          res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
+        }
+        console.log('res.rows',res.rows);
         this.table_data = res.rows;
         this.total = res.total;
       })
@@ -211,16 +216,27 @@ export default {
     // 跟后端返回判断流程状态颜色
     styleChange(val) {
       switch (val) {
-        case "进行中":
+        case "审核中":
           return "#3eba75";
         // case "yellow":
         //   return "#FDA722";
-        case "处置成功":
+        case "审核完成":
           return "#2eb9ef";
-        case "处置失败":
+        case "驳回完成":
           return "#e55b5b";
       }
     },
+    // 根据返回码值判断流程状态
+    process_change(val) {
+      switch(val) {
+        case 1 :
+          return "审核中";
+        case 2 :
+          return "审核完成";
+        case 3 :
+          return "驳回完成";
+      }
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
@@ -238,7 +254,7 @@ export default {
 <style lang="less" scoped>
 /deep/.el-table {
   //   width: 96vw;
-  height: 60vh;
+  height: 57vh;
   background: rgba(0, 0, 0, 0);
   border: 0.1px solid #3f5564;
   thead {
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index a6a5ca3..0ef80c5 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -524,7 +524,7 @@ export default {
   margin-left: 1vw;
   display: flex;
   .backlog_idea_person_img {
-    width: 10vw;
+    width: 15vw;
     height: 7vh;
     margin-left: 1.5vw;
     // border: 0.1px solid #3f5564;
diff --git a/src/views/closeLoopDispose/components/backlogDetailRecords.vue b/src/views/closeLoopDispose/components/backlogDetailRecords.vue
index 6a2a340..035f407 100644
--- a/src/views/closeLoopDispose/components/backlogDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailRecords.vue
@@ -45,7 +45,7 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="type" label="操作状态" width="280">
+            <el-table-column prop="processType" label="操作状态" width="280">
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue
index b70ac62..3be4683 100644
--- a/src/views/closeLoopDispose/components/complete.vue
+++ b/src/views/closeLoopDispose/components/complete.vue
@@ -57,10 +57,10 @@
           </el-table-column>
           <el-table-column prop="startDeptName" label="创建单位" width="220">
           </el-table-column>
-          <el-table-column prop="course_status" label="流程状态" width="200">
+          <el-table-column prop="process_status" label="流程状态" width="200">
             <template slot-scope="scope">
-              <div :style="{ color: styleChange(scope.row.course_status) }">
-                {{ scope.row.course_status }}
+              <div :style="{ color: styleChange(scope.row.process_status) }">
+                {{ scope.row.process_status }}
               </div>
             </template>
           </el-table-column>
@@ -110,10 +110,10 @@ export default {
         word: "",
       },
       complete_list: [
-        { label: "待审核", value: "1" },
-        { label: "通过", value: "2" },
-        { label: "驳回", value: "3" },
-        { label: "处置中", value: "4" },
+        // { label: "待审核", value: "1" },
+        { label: "审核中", value: "1" },
+        { label: "审核完成", value: "2" },
+        { label: "驳回完成", value: "3" },
       ],
       pickerOptions: {
         shortcuts: [
@@ -177,6 +177,11 @@ export default {
         procStatus: this.search.procStatus,
       };
       get_complete(param).then((res) => {
+        // 根据返回码值判断流程状态
+        for( let i = 0; i<res.rows.length;i++) {
+          res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
+        }
+        console.log('res.rows',res.rows);
         this.table_data = res.rows;
         this.total = res.total;
       });
@@ -246,16 +251,27 @@ export default {
     // 跟后端返回判断流程状态颜色
     styleChange(val) {
       switch (val) {
-        case "进行中":
+        case "审核中":
           return "#3eba75";
         // case "yellow":
         //   return "#FDA722";
-        case "处置成功":
+        case "审核完成":
           return "#2eb9ef";
-        case "处置失败":
+        case "驳回完成":
           return "#e55b5b";
       }
     },
+    // 根据返回码值判断流程状态
+    process_change(val) {
+      switch(val) {
+        case 1 :
+          return "审核中";
+        case 2 :
+          return "审核完成";
+        case 3 :
+          return "驳回完成";
+      }
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
@@ -273,7 +289,7 @@ export default {
 <style lang="less" scoped>
 /deep/.el-table {
   //   width: 96vw;
-  height: 60vh;
+  height: 57vh;
   background: rgba(0, 0, 0, 0);
   border: 0.1px solid #3f5564;
   thead {
diff --git a/src/views/closeLoopDispose/components/completeDetailForm.vue b/src/views/closeLoopDispose/components/completeDetailForm.vue
index 4b638d5..d990566 100644
--- a/src/views/closeLoopDispose/components/completeDetailForm.vue
+++ b/src/views/closeLoopDispose/components/completeDetailForm.vue
@@ -359,7 +359,7 @@ export default {
   margin-left: 1vw;
   display: flex;
   .complete_idea_person_img {
-    width: 10vw;
+    width: 15vw;
     height: 7vh;
     margin-left: 1.5vw;
     // border: 0.1px solid #3f5564;
diff --git a/src/views/closeLoopDispose/components/completeDetailRecords.vue b/src/views/closeLoopDispose/components/completeDetailRecords.vue
index 4df070f..ae56a6d 100644
--- a/src/views/closeLoopDispose/components/completeDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/completeDetailRecords.vue
@@ -45,7 +45,7 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="type" label="操作状态" width="280">
+            <el-table-column prop="processType" label="操作状态" width="280">
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue
index d2a4808..a26ccfa 100644
--- a/src/views/closeLoopDispose/components/copy.vue
+++ b/src/views/closeLoopDispose/components/copy.vue
@@ -11,7 +11,7 @@
           <el-form-item label="流程状态">
             <el-select
               v-model="search.copy_status"
-              @change="change_complete"
+              @change="change_copy"
             >
               <el-option
                 v-for="item in copy_list"
@@ -57,10 +57,10 @@
           </el-table-column>
           <el-table-column prop="build_unit" label="创建单位" width="200">
           </el-table-column>
-          <el-table-column prop="course_status" label="流程状态" width="200">
+          <el-table-column prop="process_status" label="流程状态" width="200">
             <template slot-scope="scope">
-              <div :style="{ color: styleChange(scope.row.course_status) }">
-                {{ scope.row.course_status }}
+              <div :style="{ color: styleChange(scope.row.process_status) }">
+                {{ scope.row.process_status }}
               </div>
             </template>
           </el-table-column>
@@ -109,10 +109,10 @@ export default {
         word: "",
       },
       copy_list: [
-        { label: "待审核", value: "1" },
-        { label: "通过", value: "2" },
-        { label: "驳回", value: "3" },
-        { label: "处置中", value: "4" },
+        // { label: "待审核", value: "1" },
+        { label: "审核中", value: "1" },
+        { label: "审核完成", value: "2" },
+        { label: "驳回完成", value: "3" },
       ],
       pickerOptions: {
         shortcuts: [
@@ -176,6 +176,10 @@ export default {
         procStatus: this.search.procStatus,
       };
       get_copy(param).then((res) => {
+        // 根据返回码值判断流程状态
+        for( let i = 0; i<res.rows.length;i++) {
+          res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
+        }
         this.table_data = res.rows;
         this.total = res.total;
       });
@@ -244,16 +248,27 @@ export default {
     // 跟后端返回判断流程状态颜色
     styleChange(val) {
       switch (val) {
-        case "进行中":
+        case "审核中":
           return "#3eba75";
         // case "yellow":
         //   return "#FDA722";
-        case "处置成功":
+        case "审核完成":
           return "#2eb9ef";
-        case "处置失败":
+        case "驳回完成":
           return "#e55b5b";
       }
     },
+    // 根据返回码值判断流程状态
+    process_change(val) {
+      switch(val) {
+        case 1 :
+          return "审核中";
+        case 2 :
+          return "审核完成";
+        case 3 :
+          return "驳回完成";
+      }
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
@@ -271,7 +286,7 @@ export default {
 <style lang="less" scoped>
 /deep/.el-table {
   //   width: 96vw;
-  height: 60vh;
+  height: 57vh;
   background: rgba(0, 0, 0, 0);
   border: 0.1px solid #3f5564;
   thead {
diff --git a/src/views/closeLoopDispose/components/copyDetailRecords.vue b/src/views/closeLoopDispose/components/copyDetailRecords.vue
index cf98d9e..3287ddd 100644
--- a/src/views/closeLoopDispose/components/copyDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/copyDetailRecords.vue
@@ -45,7 +45,7 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="type" label="操作状态" width="280">
+            <el-table-column prop="processType" label="操作状态" width="280">
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue
index aec6f4f..168f7f1 100644
--- a/src/views/closeLoopDispose/components/myCourse.vue
+++ b/src/views/closeLoopDispose/components/myCourse.vue
@@ -48,12 +48,12 @@
           </el-table-column>
           <el-table-column prop="createTime" label="创建时间" width="280">
           </el-table-column>
-          <el-table-column prop="course_type" label="流程类型" width="280">
+          <el-table-column prop="processType" label="流程类型" width="280">
           </el-table-column>
-          <el-table-column prop="course_status" label="流程状态" width="220">
+          <el-table-column prop="process_status" label="流程状态" width="220">
             <template slot-scope="scope">
-              <div :style="{ color: styleChange(scope.row.course_status) }">
-                {{ scope.row.course_status }}
+              <div :style="{ color: styleChange(scope.row.process_status) }">
+                {{ scope.row.process_status }}
               </div>
             </template>
           </el-table-column>
@@ -103,10 +103,10 @@ export default {
         word: "",
       },
       course_list: [
-        { label: "待审核", value: "1" },
-        { label: "通过", value: "2" },
-        { label: "驳回", value: "3" },
-        { label: "处置中", value: "4" },
+        // { label: "待审核", value: "1" },
+        { label: "审核中", value: "1" },
+        { label: "审核完成", value: "2" },
+        { label: "驳回完成", value: "3" },
       ],
       pickerOptions: {
         shortcuts: [
@@ -174,7 +174,11 @@ export default {
         procStatus: this.search.procStatus,
       };
       get_my_course(param).then((res) => {
-        console.log("get_data", res);
+        // 根据返回码值判断流程状态
+        for( let i = 0; i<res.rows.length;i++) {
+          res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
+        }
+        console.log('res.rows',res.rows);
         this.table_data = res.rows;
         this.total = res.total;
       });
@@ -190,7 +194,7 @@ export default {
     // 详情点击跳转
     check_details(val) {
       console.log('12344',val);
-      this.$emit("change_complete_detail", val); // 通知跳转
+      this.$emit("change_to_detail", val); // 通知跳转
     },
     // 转换时间格式
     dateConversion(value) {
@@ -246,16 +250,27 @@ export default {
     // 跟后端返回判断流程状态颜色
     styleChange(val) {
       switch (val) {
-        case "进行中":
+        case "审核中":
           return "#3eba75";
         // case "yellow":
         //   return "#FDA722";
-        case "处置成功":
+        case "审核完成":
           return "#2eb9ef";
-        case "处置失败":
+        case "驳回完成":
           return "#e55b5b";
       }
     },
+    // 根据返回码值判断流程状态
+    process_change(val) {
+      switch(val) {
+        case 1 :
+          return "审核中";
+        case 2 :
+          return "审核完成";
+        case 3 :
+          return "驳回完成";
+      }
+    },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
@@ -273,7 +288,7 @@ export default {
 <style lang="less" scoped>
 /deep/.el-table {
   //   width: 96vw;
-  height: 60vh;
+  height: 57vh;
   background: rgba(0, 0, 0, 0);
   border: 0.1px solid #3f5564;
   thead {
@@ -304,7 +319,6 @@ export default {
   background-color: #5e666a;
   border-radius: 4px;
 }
-
 /deep/.el-table__body-wrapper::-webkit-scrollbar-thumb {
   display: none;
   width: 5px;
diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
index 6bd53da..46cf1b5 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
@@ -402,7 +402,7 @@ export default {
   margin-left: 1vw;
   display: flex;
   .course_idea_person_img {
-    width: 10vw;
+    width: 15vw;
     height: 7vh;
     margin-left: 1.5vw;
     // border: 0.1px solid #3f5564;
diff --git a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
index ab284ba..c509f15 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailRecords.vue
@@ -45,7 +45,7 @@
             </el-table-column>
             <el-table-column prop="candidate" label="候选办理" width="280">
             </el-table-column>
-            <el-table-column prop="type" label="操作状态" width="280">
+            <el-table-column prop="processType" label="操作状态" width="280">
             </el-table-column>
             <el-table-column prop="finishTime" label="接收时间" width="280">
             </el-table-column>
-- 
2.36.3