From 232c1b9317cbf057e46d32311db882d8bb25b6d7 Mon Sep 17 00:00:00 2001
From: xzg <4727863@qq.com>
Date: Fri, 18 Oct 2024 17:26:14 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=A2=E6=9C=8D=E7=94=B3=E8=AF=89=E6=88=90?=
 =?UTF-8?q?=E7=AB=8B=E5=8F=97=E6=AC=BE=E6=96=B9=E9=9D=9E=E5=BF=85=E5=A1=AB?=
 =?UTF-8?q?=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/aftersales/aftersalesWorkOrder.vue  |  2 +-
 .../aftersales/aftersalesWorkOrdermodify.vue  | 20 +++++++++----------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue
index 0577fb23..f71e678e 100644
--- a/src/views/aftersales/aftersalesWorkOrder.vue
+++ b/src/views/aftersales/aftersalesWorkOrder.vue
@@ -1579,7 +1579,7 @@ const ButtonPermissions = computed(() => {
         Batchdetermination: false, //批量确定
         ManagerConfirmed: false, //处理完毕下面的客服经理批量确定
         ArbitrationDetermination: false, //批量完结确定
-        Financial_accounting: true && !AppealStatusT.value, //财务入账
+        Financial_accounting:  UserPermissions.value != '仓库客服' && !AppealStatusT.value, //财务入账
         defaultassignments: false, //默认指派
         export_Report: true, //导出报表
         Timed_outexport: false, //超时导出
diff --git a/src/views/aftersales/aftersalesWorkOrdermodify.vue b/src/views/aftersales/aftersalesWorkOrdermodify.vue
index 1dbae27b..d0160a72 100644
--- a/src/views/aftersales/aftersalesWorkOrdermodify.vue
+++ b/src/views/aftersales/aftersalesWorkOrdermodify.vue
@@ -2173,14 +2173,14 @@ const AppealEditor = () => {
   console.log(form.value.responsibilitiesList);
   console.log(form.value.completion);
   let completion = form.value;
-  let _warehouseId = form.value.completion.find(res => !res.warehouseId);
-  if (_warehouseId) {
-    ElMessage({
-      message: `有赔款方或受款方仓库未选择`,
-      type: 'warning',
-    });
-    return;
-  }
+  // let _warehouseId = form.value.completion.find(res => !res.warehouseId);
+  // if (_warehouseId) {
+  //   ElMessage({
+  //     message: `有赔款方或受款方仓库未选择`,
+  //     type: 'warning',
+  //   });
+  //   return;
+  // }
   ElMessageBox.confirm('是否提交完结信息?', '完结', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',
@@ -2206,7 +2206,7 @@ const AppealEditor = () => {
               reason: item.reason, //原因
               money: item.money, //金额
               compensationPersonnel: item.compensationPersonnel, //责任人（手动填写）
-              warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
+              warehouseId: item.warehouseId||null, //赔款方是那个仓库（传入ID）
               workOrderId: info.id, //异常工单
             });
           } else if (item.state == 1) {
@@ -2222,7 +2222,7 @@ const AppealEditor = () => {
                     .join(',')
                 )
                 .join(','),
-              warehouseId: item.warehouseId, //赔款方是那个仓库（传入ID）
+              warehouseId: item.warehouseId||null, //赔款方是那个仓库（传入ID）
               workOrderNumber: info.workOrderNumber, //工单号
               workOrderId: info.id, //异常工单
             });