From f2c6ac0fa8ea3af161e204329b61d7c95a0e3c63 Mon Sep 17 00:00:00 2001
From: lukeyan <1727408482@qq.com>
Date: Fri, 30 Jun 2023 10:12:22 +0800
Subject: [PATCH] =?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                          |  2 +-
 .../closeLoopDispose/components/backlog.vue   |  6 +--
 .../components/backlogDetailForm.vue          |  2 +-
 .../closeLoopDispose/components/complete.vue  |  4 +-
 .../components/completeDetailForm.vue         |  2 +-
 .../closeLoopDispose/components/copy.vue      |  4 +-
 .../components/copyDetailForm.vue             |  2 +-
 .../closeLoopDispose/components/myCourse.vue  | 50 +++++++++++++------
 .../components/myCourseDetailForm.vue         |  2 +-
 9 files changed, 47 insertions(+), 27 deletions(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index affd2a5..17c8c35 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -5,7 +5,7 @@ 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.11//.13:8080/zhapi', // 孙强
+  //baseURL: 'http://172.18.113.13:8080/zhapi', // 孙强
   //baseURL: 'http://192.168.0.188:8888/zhapi',
   baseURL: `http://${window.location.host}/zhapi`,
   timeout: 50000,
diff --git a/src/views/closeLoopDispose/components/backlog.vue b/src/views/closeLoopDispose/components/backlog.vue
index d0a4eae..5fe8016 100644
--- a/src/views/closeLoopDispose/components/backlog.vue
+++ b/src/views/closeLoopDispose/components/backlog.vue
@@ -38,7 +38,7 @@
           </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="process_status" label="流程状态">
             <template slot-scope="scope">
@@ -223,7 +223,7 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
@@ -235,7 +235,7 @@ export default {
         case 2 :
           return "审核完成";
         case 3 :
-          return "驳回完成";
+          return "驳回";
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/closeLoopDispose/components/backlogDetailForm.vue b/src/views/closeLoopDispose/components/backlogDetailForm.vue
index 4052bfd..aa9726b 100644
--- a/src/views/closeLoopDispose/components/backlogDetailForm.vue
+++ b/src/views/closeLoopDispose/components/backlogDetailForm.vue
@@ -117,7 +117,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="backlog_text">处理意见:</div>
-              <div class="backlog_value">{{ item.comment }}</div>
+              <div class="backlog_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment">
diff --git a/src/views/closeLoopDispose/components/complete.vue b/src/views/closeLoopDispose/components/complete.vue
index d83419c..03321d3 100644
--- a/src/views/closeLoopDispose/components/complete.vue
+++ b/src/views/closeLoopDispose/components/complete.vue
@@ -258,7 +258,7 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
@@ -270,7 +270,7 @@ export default {
         case 2 :
           return "审核完成";
         case 3 :
-          return "驳回完成";
+          return "驳回";
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/closeLoopDispose/components/completeDetailForm.vue b/src/views/closeLoopDispose/components/completeDetailForm.vue
index d990566..b2a2496 100644
--- a/src/views/closeLoopDispose/components/completeDetailForm.vue
+++ b/src/views/closeLoopDispose/components/completeDetailForm.vue
@@ -85,7 +85,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="complete_text">处理意见:</div>
-              <div class="complete_value">{{ item.comment }}</div>
+              <div class="complete_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment"> -->
diff --git a/src/views/closeLoopDispose/components/copy.vue b/src/views/closeLoopDispose/components/copy.vue
index 0bc1b61..d0f301d 100644
--- a/src/views/closeLoopDispose/components/copy.vue
+++ b/src/views/closeLoopDispose/components/copy.vue
@@ -255,7 +255,7 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
@@ -267,7 +267,7 @@ export default {
         case 2 :
           return "审核完成";
         case 3 :
-          return "驳回完成";
+          return "驳回";
       }
     },
     handleSizeChange(val) {
diff --git a/src/views/closeLoopDispose/components/copyDetailForm.vue b/src/views/closeLoopDispose/components/copyDetailForm.vue
index 33ae73c..c5d8ed2 100644
--- a/src/views/closeLoopDispose/components/copyDetailForm.vue
+++ b/src/views/closeLoopDispose/components/copyDetailForm.vue
@@ -85,7 +85,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="course_text">处理意见:</div>
-              <div class="course_value">{{ item.comment }}</div>
+              <div class="course_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment"> -->
diff --git a/src/views/closeLoopDispose/components/myCourse.vue b/src/views/closeLoopDispose/components/myCourse.vue
index 03e95cf..3fd1a6e 100644
--- a/src/views/closeLoopDispose/components/myCourse.vue
+++ b/src/views/closeLoopDispose/components/myCourse.vue
@@ -3,10 +3,10 @@
   <div>
     <div class="course_body">
       <div class="search_top">
-        <div class="btn">
+        <!-- <div class="btn">
           <el-button @click="search_data">搜索</el-button>
           <el-button @click="reset">重置</el-button>
-        </div>
+        </div> -->
         <el-form :model="search" class="search_top_form">
           <el-form-item label="流程状态">
             <el-select v-model="search.course_status" @change="change_course">
@@ -36,6 +36,10 @@
               placeholder="请选择关键词"
             ></el-input>
           </el-form-item>
+          <el-form-item>
+            <el-button @click="search_data">搜索</el-button>
+            <el-button @click="reset">重置</el-button>
+          </el-form-item>
         </el-form>
       </div>
       <div class="search_table">
@@ -176,10 +180,12 @@ export default {
       };
       get_my_course(param).then((res) => {
         // 根据返回码值判断流程状态
-        for( let i = 0; i<res.rows.length;i++) {
-          res.rows[i].process_status = this.process_change(res.rows[i].alarmStatus)
+        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);
+        console.log("res.rows", res.rows);
         this.table_data = res.rows;
         this.total = res.total;
       });
@@ -194,7 +200,7 @@ export default {
     },
     // 详情点击跳转
     check_details(val) {
-      console.log('12344',val);
+      console.log("12344", val);
       this.$emit("change_to_detail", val); // 通知跳转
     },
     // 转换时间格式
@@ -257,31 +263,31 @@ export default {
         //   return "#FDA722";
         case "审核完成":
           return "#2eb9ef";
-        case "驳回完成":
+        case "驳回":
           return "#e55b5b";
       }
     },
     // 根据返回码值判断流程状态
     process_change(val) {
-      switch(val) {
-        case 1 :
+      switch (val) {
+        case 1:
           return "审核中";
-        case 2 :
+        case 2:
           return "审核完成";
-        case 3 :
-          return "驳回完成";
+        case 3:
+          return "驳回";
       }
     },
     handleSizeChange(val) {
       console.log(`每页 ${val} 条`);
       this.pageNum = 1;
       this.pageSize = val;
-      this.search_data()
+      this.search_data();
     },
     handleCurrentChange(val) {
       console.log(`当前页: ${val}`);
       this.pageNum = val;
-      this.search_data()
+      this.search_data();
     },
   },
 };
@@ -371,7 +377,6 @@ export default {
           border-radius: 0px;
           height: 3.7vh;
           border: 1px solid #3d505e;
-          // border: 0.5px dashed;
           background: #283436;
           color: #fff;
         }
@@ -386,6 +391,21 @@ export default {
           background: #283436;
         }
       }
+      .el-button {
+        width: 70px;
+        height: 3.7vh !important;
+        border: 1px solid #4a6072;
+        color: #fff;
+        border-radius: 0px !important;
+        background: #323f43;
+      }
+      .el-button:focus,
+      .el-button:hover {
+        color: #34e1b3;
+        border: 2px solid #137868;
+        background: url("~@/assets/companyFile/2121.png") no-repeat !important;
+        background-size: 100% 100% !important;
+      }
     }
     /deep/.el-range-separator {
       color: #fff;
diff --git a/src/views/closeLoopDispose/components/myCourseDetailForm.vue b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
index 46cf1b5..39d5ec9 100644
--- a/src/views/closeLoopDispose/components/myCourseDetailForm.vue
+++ b/src/views/closeLoopDispose/components/myCourseDetailForm.vue
@@ -85,7 +85,7 @@
             <!-- 第一行，处理意见 -->
             <div class="dispose_idea">
               <div class="course_text">处理意见:</div>
-              <div class="course_value">{{ item.comment }}</div>
+              <div class="course_value">{{ item.comment.comment }}</div>
             </div>
             <!-- 第二行，附件 按需显示或者隐藏 -->
             <!-- <div v-if="attachment_show" class="attachment"> -->