From d315aa1e107e04af18d61f86c3ca469a3a3549ca Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Thu, 22 Feb 2024 09:51:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8C=87=E6=A0=87=E7=AE=A1=E7=90=86=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/aftersales/vueTvemp.js                |  2 +-
 src/views/aftersales/aftersalesWorkOrder.vue     | 13 +++++++++++--
 src/views/aftersales/aftersalesWorkOrderInfo.vue | 11 +++++++++--
 src/views/aftersales/aftersalesWorkOrderend.vue  |  2 +-
 src/views/supervise/management.vue               | 12 +++++++-----
 5 files changed, 29 insertions(+), 11 deletions(-)

diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js
index c66ba1d9..02835ad8 100644
--- a/src/option/aftersales/vueTvemp.js
+++ b/src/option/aftersales/vueTvemp.js
@@ -336,7 +336,7 @@ export const columnList = [
     label: '操作',
     type: 6,
     values: '',
-    width: '100',
+    width: '130',
     checkarr: [],
     fixed: 'right',
     sortable: false,
diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 2ec63509..acdf2d2f 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -261,8 +261,11 @@
                             (UserPermissions == '仓库客服' || UserPermissions == '总部客服经理')
                           "
                           @click="ResultConfirmation(slotProps.scope)"
-                          >确定</el-button
+                          >结果确定</el-button
                         >
+
+                   
+
                         <!-- 仲裁中确定结束仲裁按钮 -->
                         <el-button
                           v-if="TabPermissions == '5'"
@@ -3044,6 +3047,7 @@ const TimeoutHandling = (val, Refresh) => {
       TabList.value.find(res => res.name == TabPermissions.value).DataList = [];
       TabList.value.find(res => res.name == TabPermissions.value).total = 0;
       TabList.value.find(res => res.name == TabPermissions.value).request = true;
+      details.data= res.data.data.records
     }
   }).catch(res=>{
     details.loadingObj.list = false; //关闭动画加载
@@ -3639,7 +3643,7 @@ const ResultConfirmation = val => {
         return;
       }
     }
-    ElMessageBox.confirm('是否确定当前处理结果?', 'Warning', {
+    ElMessageBox.confirm('是否确定当前处理结果?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',
@@ -3751,6 +3755,11 @@ const ResultConfirmation = val => {
       });
   }
 };
+
+// 审核确定
+const findingAudit=()=>{
+
+}
 // 批量打回
 const BatchReturn = () => {
   BatchFrom.value.businessDepartment = [];
diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue
index 64232283..f572ed04 100644
--- a/src/views/aftersales/aftersalesWorkOrderInfo.vue
+++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue
@@ -665,6 +665,9 @@
         <el-button type="primary" v-if="PermissionButton.Processing_results" @click="addingRecord"
           >处理结果
         </el-button>
+        <!-- <el-button type="primary" v-if="PermissionButton.Confirm_review" @click="ConfirmReview"
+          >确定审核
+        </el-button> -->
         <el-button type="primary" v-if="PermissionButton.work_order_completion" @click="EndJump"
           >完结</el-button
         >
@@ -1073,7 +1076,8 @@ const PermissionButton = computed(() => {
         $route.query.RouteIndexs == '9' &&
         $route.query.workOrderStatus == '40'),//待审核确定
         Result_determination: (UserPermissions.value == '仓库客服' && $route.query.RouteIndexs == '0' && $route.query.workOrderStatus == '21') || (UserPermissions.value == '仓库客服' && $route.query.RouteIndexs == '2' && $route.query.workOrderStatus == '21'),//处理结果确定
-  };
+        Confirm_review:UserPermissions.value == '总部客服经理' && $route.query.RouteIndexs == '9'
+      };
 });
 
 // appeal.value && AppealReview.value,
@@ -1492,7 +1496,10 @@ const addingRecord = () => {
     },
   });
 };
+// 待审核里面确定审核
+const ConfirmReview=()=>{
 
+}
 // 完结
 const EndJump = () => {
   $router.push({
@@ -1635,7 +1642,7 @@ const ConfirmReturn = () => {
     });
 };
 
-// 待处理确定
+// 待审核确定
 const ResultConfirmation = () => {
 let data = {
       assignList: [],
diff --git a/src/views/aftersales/aftersalesWorkOrderend.vue b/src/views/aftersales/aftersalesWorkOrderend.vue
index 0d7def0c..5f1fb95a 100644
--- a/src/views/aftersales/aftersalesWorkOrderend.vue
+++ b/src/views/aftersales/aftersalesWorkOrderend.vue
@@ -590,7 +590,7 @@
             > -->
 
             <el-button
-              v-if="$route.query.workOrderStatus == '10' && UserPermissions.value != '仓库客服'"
+              v-if="$route.query.workOrderStatus == '10' && UserPermissions != '仓库客服'"
               type="primary"
               class="button"
               @click="CustomerServiceCompleted"
diff --git a/src/views/supervise/management.vue b/src/views/supervise/management.vue
index 12879062..2d66e2c3 100644
--- a/src/views/supervise/management.vue
+++ b/src/views/supervise/management.vue
@@ -82,9 +82,9 @@
         @selection="selectionChange"
       >
         <template #default="slotProps">
-          <template v-if="slotProps.scope.column.label === '操作'">
-            <div class="ElBtnClass">
-              <el-button text @click="ClassificationDditing(slotProps.scope)">编辑</el-button>
+          <template v-if="slotProps.scope.column.label == '操作'">
+            <div class="ElBtnClass" v-if="slotProps.scope.row.isEdit == '1'">
+              <el-button  text @click="ClassificationDditing(slotProps.scope)">编辑</el-button>
               <el-button text type="primary" @click="CategoryDeletion(slotProps.scope)"
                 >删除</el-button
               >
@@ -280,10 +280,11 @@ const examineDeptName = ref(''); //考核部门名字
 
 /** 表格实例 */
 const tableNode = ref();
-const departmentName =ref('');//归属名称
+const departmentNameTemp =ref('');//归属名称
+const departmentName=ref('')//归属名称
 const departmentNameID =ref('');//归属ID
 let my_DATA=JSON.parse(localStorage.getItem('my_data'))
-departmentName.value = my_DATA.departmentName//归属名称
+departmentNameTemp.value = my_DATA.departmentName//归属名称
 departmentNameID.value = my_DATA.department//归属名称ID
 console.log(departmentName.value,'归属名称');
 console.log(departmentNameID.value,'归属名称ID');
@@ -507,6 +508,7 @@ const ClassificationDditing = val => {
   lassificationform.value.name = data.name; //分类名称
   lassificationform.value.description = data.description; //分类描述
   lassificationform.value.examineDeptId = data.examineDeptId; //审核部门ID
+  departmentName.value = data.createDeptName; //归属部门
   // 积分管理回显
   data.pointsEntities.forEach(res => {
     PointsList.value.push({ integral: res.point });