From 09f732bae0f40b9442429ad20938ff70ad220e60 Mon Sep 17 00:00:00 2001
From: binbin_pan <max_163email@163.com>
Date: Sat, 20 Apr 2024 14:46:12 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E9=80=80=E6=96=99=E6=8E=A5=E6=94=B6?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86-=E9=80=80=E6=96=99=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=8B=E6=8B=89=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../claimAndRefund/return/returnApply.vue     | 17 +++++-
 .../claimAndRefund/return/returnApplyByCq.vue | 16 +++++-
 .../claimAndRefund/return/returnExamine.vue   | 57 ++++++++++++-------
 .../views/claimAndRefund/return/returnIn.vue  | 22 +++++--
 4 files changed, 83 insertions(+), 29 deletions(-)

diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
index dd411b9d..87b2583d 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApply.vue
@@ -654,13 +654,25 @@
                 proList: [],
                 taskStatusList: [
                     {
-                        name: '待审核',
+                        name: '待退料审核',
                         id: '37',
                     },
                     {
-                        name: '已审核',
+                        name: '退料审核通过',
                         id: '38',
                     },
+                    {
+                        name: '退料核查中',
+                        id: '39',
+                    },
+                    {
+                        name: '退料完成',
+                        id: '40',
+                    },
+                    {
+                        name: '退料审核驳回',
+                        id: '101',
+                    },
                 ],
                 rowObj: {},
                 loadingType: '',
@@ -677,6 +689,7 @@
         methods: {
             getTree() {
                 listPartTypeApi().then((response) => {
+                    console.log('🚀 ~ listPartTypeApi ~ response:', response);
                     this.deptList = response.data
                 })
             },
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
index c017f0e4..baf6ac3f 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnApplyByCq.vue
@@ -657,13 +657,25 @@
                 proList: [],
                 taskStatusList: [
                     {
-                        name: '待审核',
+                        name: '待退料审核',
                         id: '37',
                     },
                     {
-                        name: '已审核',
+                        name: '退料审核通过',
                         id: '38',
                     },
+                    {
+                        name: '退料核查中',
+                        id: '39',
+                    },
+                    {
+                        name: '退料完成',
+                        id: '40',
+                    },
+                    {
+                        name: '退料审核驳回',
+                        id: '101',
+                    },
                 ],
                 rowObj: {},
                 loadingType: '',
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
index 80d769b2..8357d056 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnExamine.vue
@@ -142,30 +142,33 @@
       </el-table-column>
       <el-table-column label="退料状态" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-          <!-- 状态
-37-待审核
-          38-已审核-->
-          <el-button type="text" v-if="scope.row.applyStatus == '0'">待审核</el-button>
+          <el-button type="text" v-if="scope.row.taskStatus == '37'">
+              待审核
+          </el-button>
           <el-button
             type="text"
             style="color: #67c23a"
-            v-if="
-                            scope.row.applyStatus == '1' ||
-                            scope.row.applyStatus == '3'
-                        "
-          >退料通过</el-button>
-          <!-- <el-button type="text" v-if="scope.row.taskStatus == '39'">
+            v-if="scope.row.taskStatus == '38'"
+          >
+            已审核
+          </el-button>
+          <el-button type="text" v-if="scope.row.taskStatus == '39'">
             退料核查
-          </el-button>-->
+          </el-button>
           <el-button
             type="text"
-            style="color: red"
-            v-if="
-                            scope.row.applyStatus == '2' ||
-                            scope.row.applyStatus == '4'
-                        "
-          >退料驳回</el-button>
-          <el-button type="text" style="color: #67c23a" v-if="scope.row.taskStatus == '40'">退料完成</el-button>
+            style="color: #67c23a"
+            v-if="scope.row.taskStatus == '40'"
+          >
+            退料完成
+          </el-button>
+          <el-button
+            type="text"
+            style="color: #67c23a"
+            v-if="scope.row.taskStatus == '101'"
+          >
+            退料驳回
+          </el-button>
         </template>
       </el-table-column>
       <el-table-column label="不通过原因" align="center" prop="dictName" :show-overflow-tooltip="true" />
@@ -513,13 +516,25 @@ export default {
       proList: [],
       taskStatusList: [
         {
-          name: '待审核',
+          name: '待退料审核',
           id: '37',
         },
         {
-          name: '已审核',
+          name: '退料审核通过',
           id: '38',
         },
+        {
+          name: '退料核查中',
+          id: '39',
+        },
+        {
+          name: '退料完成',
+          id: '40',
+        },
+        {
+          name: '退料审核驳回',
+          id: '101',
+        },
       ],
       loadingList: [],
       loadingTotal: 0,
@@ -548,6 +563,7 @@ export default {
         console.log('paramsparamsparams', params)
         const res = await getBackAuditList(params)
         this.typeList = res.data.rows
+        console.log('🚀 ~ getList ~ this.typeList:', this.typeList);
         this.total = res.data.total
         this.loading = false
       } catch (error) {}
@@ -576,6 +592,7 @@ export default {
     /** 重置按钮操作 */
     resetQuery() {
       this.dateRange = []
+      this.timeRange = []
       // this.resetForm("queryForm");
       this.$refs.queryForm.resetFields()
       this.initSelectData()
diff --git a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
index bc561f98..5d171155 100644
--- a/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
+++ b/sgzb-ui/src/views/claimAndRefund/return/returnIn.vue
@@ -253,13 +253,25 @@
         proList: [],
         taskStatusList: [
           {
-            name: '待审核',
-            id: '37'
+            name: '待退料审核',
+            id: '37',
           },
           {
-            name: '已审核',
-            id: '38'
-          }
+            name: '退料审核通过',
+            id: '38',
+          },
+          {
+            name: '退料核查中',
+            id: '39',
+          },
+          {
+            name: '退料完成',
+            id: '40',
+          },
+          {
+            name: '退料审核驳回',
+            id: '101',
+          },
         ],
         rowObj: {},
       };