From 6f0457633a861093f0f167c097d4a5436e6467a9 Mon Sep 17 00:00:00 2001
From: jinna <jn517618@163.com>
Date: Tue, 21 Jan 2025 17:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/customerFeedback/feedback.vue    |  9 +++++++++
 src/views/goodsManagement/examineList.vue  | 16 ++++++++++++++--
 src/views/goodsManagement/reciviceList.vue |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/src/views/customerFeedback/feedback.vue b/src/views/customerFeedback/feedback.vue
index 1a05c3c..34526df 100644
--- a/src/views/customerFeedback/feedback.vue
+++ b/src/views/customerFeedback/feedback.vue
@@ -65,6 +65,7 @@
                             :on-remove="handleRemove"
                             accept=".png,.jpg"
                             :file-list="imgList"
+                            :headers="headers"
                             :disabled="viewType == 'view'"
                             :class="{ 'hide-upload-btn': viewType == 'view' }">
                             <i class="el-icon-plus" ></i>
@@ -83,6 +84,8 @@
 </template>
 
 <script>
+import website from '@/config/website';
+import { getToken, removeToken, removeRefreshToken } from '@/util/auth';
 import {getFeedList,getDetail,updateFeedback,saveFeedback} from '@/api/feedback/feedback'
 import {getChildList} from '@/api/system/dictbiz'
 export default {
@@ -114,6 +117,7 @@ export default {
                     children: 'children'
                 }
             },
+            headers:{},
             option: {
                 height: 'auto',
                 calcHeight: 80,
@@ -223,6 +227,11 @@ export default {
         }
     },
     created() {
+        this.headers = {
+            "Authorization": `Basic ${Base64.encode(`${website.clientId}:${website.clientSecret}`)}`,
+            'Blade-Auth': 'bearer ' + getToken(),
+            'Blade-Requested-With': 'BladeHttpRequest'
+        }
         getChildList(1,100,'1850021405049475074').then(res =>{
             this.typeList = res.data.data
         })
diff --git a/src/views/goodsManagement/examineList.vue b/src/views/goodsManagement/examineList.vue
index 160a992..07a0291 100644
--- a/src/views/goodsManagement/examineList.vue
+++ b/src/views/goodsManagement/examineList.vue
@@ -387,8 +387,20 @@ export default {
                 cancelButtonText: '取消',
                 type: 'warning'
             }).then(() => {
-                this.$message.success('驳回成功')
-                this.dialogReceive = false
+                let query = {
+                    id:this.receiveForm.id,
+                    status:-1,
+                    reason:this.receiveForm.reason
+                }
+                approveGoods(query).then(res =>{
+                    if(res.data.code == 200){
+                        this.$message.success('驳回成功')
+                        this.onLoad()
+                        this.dialogReceive = false
+                    }
+                })
+                // this.$message.success('驳回成功')
+                // this.dialogReceive = false
             })
         },
         // 点击申领审核关闭按钮
diff --git a/src/views/goodsManagement/reciviceList.vue b/src/views/goodsManagement/reciviceList.vue
index 353bd6b..d68a028 100644
--- a/src/views/goodsManagement/reciviceList.vue
+++ b/src/views/goodsManagement/reciviceList.vue
@@ -22,8 +22,8 @@
         </el-tag>
       </template>
       <template slot-scope="{ row }" slot="status">
-        <el-tag :type="row.status == 0 ? '' : row.status == 1 ? 'success' : row.status == 2 ? 'info' : 'warning'">
-          {{ row.status == 0 ? '待审批' : row.status == 1 ? '待领取' : row.status == 2 ? '已完成' : row.status == 3 ? '待归还' : ''
+        <el-tag :type="row.status == 0 ? '' : row.status == 1 ? 'success' : row.status == 2 ? 'info' : row.status == -1 ? 'danger' : 'warning'">
+          {{ row.status == 0 ? '待审批' : row.status == 1 ? '待领取' : row.status == 2 ? '已完成' : row.status == 3 ? '待归还' : row.status == -1 ? '已驳回' : ''
           }}
         </el-tag>
       </template>