Merge branch 'dev' of http://47.108.105.48:3000/java_project/logpm_page into dev

src/page/login/aiqa.vue

@@ -144,6 +144,9 @@ const Data = ref({
     {
       content: '蓝牙打印机芝柯tx453设备连接密码是多少',
     },
+    {
+      content: '向日葵下载地址',
+    }
 
   ],
   ChathistoryList: [
@@ -329,6 +332,12 @@ const AiData = (value = '') => {
     ) {
       aiResponse = '蓝牙打印机芝柯xt453设备连接密码是：0000';
     }
+    else if (
+      lowercaseValue.includes('向日葵') ||  lowercaseValue.includes('向日葵下载地址')
+    ) {
+      aiResponse = '向日葵下载地址：https://sunlogin.oray.com/,使用教程点击下方立即下载';
+      data.link = 'http://files.huo5u.com/plugins/%E5%90%91%E6%97%A5%E8%91%B5%E8%BF%9C%E7%A8%8B%E8%BD%AF%E4%BB%B6%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B.docx';
+    }
     else {
       aiResponse = '我不太理解您的问题，我正在努力学习中，请重新描述或输入其他问题，或联系管理员';
     }

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1486,7 +1486,7 @@ const ButtonPermissions = computed(() => {
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
-        assignment: false, //工单指派
+        assignment: UserPermissions.value != '仓库客服', //工单指派
         applyArbitration: UserPermissions.value == '仓库客服', //客服介入
         DingTalkNumber: false, //钉钉号填写
         batchFinish: false, //批量完结
@@ -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, //超时导出
@@ -1620,7 +1620,7 @@ const ButtonPermissions = computed(() => {
       return {
         add: false, //新增按钮
         batchReject: false, //批量打回
-        assignment: UserPermissions.value == '总部客服经理', //工单指派
+        assignment: false, //工单指派
         applyArbitration: false, //客服介入
         batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
@@ -2051,7 +2051,6 @@ const InformationViewing = val => {
     });
     $router.push({ path: workOrderInfoPath, query: queryParams });
     console.log('申诉跳转');
-
     return;
   }
 
@@ -3161,7 +3160,7 @@ const DataRendering = (val, input, Refresh) => {
   console.log(input, '接搜的搜索参数');
   console.log('执行了公共函数');
   if (val != 6) {
-    // AppealStatusT.value = false; //申诉列表关闭
+    AppealStatusT.value = false; //申诉列表关闭
   }
   console.log(val, '触发了标签栏');
   let data = {
@@ -3235,13 +3234,13 @@ const DataRendering = (val, input, Refresh) => {
     ArbitrationStatus.value = false; //不可以申请完结
 
     IndexTable(data, Refresh);
-  } else if (val == 6 && AppealStatusT.value) {
+  } else if (val == 6 &&  arbitrationTemp.value==1) {
     // 申诉列表
-    Tableheaderswitching(AppealList); //切换表头
     console.log('申诉列表');
     data.workOrderStatus = null;
     details.query.workOrderStatus = null;
     AppealListFn(data, Refresh); //申诉列表函数
+    Tableheaderswitching(AppealList); //切换表头
   } else if (val == 6) {
     console.log(arbitrationTemp.value, 'arbitrationTemp.value');
     console.log(AppealStatusT.value, 'AppealStatusT.value');
@@ -3250,8 +3249,10 @@ const DataRendering = (val, input, Refresh) => {
     data.workOrderStatus = 80;
     details.query.workOrderStatus = 80;
     ArbitrationStatus.value = false; //不可以申请完结
-    Tableheaderswitching(columnList); //表头切换
+    // arbitrationTemp.value = 1;
     IndexTable(data, Refresh);
+    Tableheaderswitching(columnList); //表头切换
+
     var bodyContent = document.querySelectorAll('.maboxhi');
     const _height = getWinHight();
     // 设置列表的高度
@@ -3719,7 +3720,7 @@ const ResultConfirmation = val => {
         return;
       }
     }
-    ElMessageBox.confirm('是否确定当前处理信息?', 'Warning', {
+    ElMessageBox.confirm('是否确定当前处理信息?', '提示', {
       confirmButtonText: '确定',
       cancelButtonText: '取消',
       type: 'warning',

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -987,7 +987,7 @@ const DiscoveringNodesChange = async value => {
     workOrderType: form.value.basis.workOrderType, //异常类型
     discoveryNode: form.value.basis.discoveryNode, //发现节点
     typeServiceName: form.value.basis.typeServiceName, //合作模式
-    TabactiveName: 1, //订单类型
+    TabactiveName: form.value.basis.TabactiveName, //订单类型
   };
   if (value == '3') {
     form.value.basis.processorEntityList = [];
@@ -1612,7 +1612,7 @@ const onSubmit = () => {
       }
 
       // 处理结果
-      if (form.value.basis.result.length) {
+      if (form.value.basis.result?.length) {
         submitData.aftersalesProcessingResultsDTO = {
           money: 0, //金额总和
           resultType: [], //处理结果名称

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -1411,7 +1411,7 @@ const Fileidentifier = val => {
 // 聊天记录获取
 const Chathistory = res => {
   Msgloading.value = true; //开启加载效果
-  MessageResponsibility.value = []; //清空选择内容
+  // MessageResponsibility.value = []; //清空选择内容
   Msgtextarea.value = ''; //清空输入框消息
   MessageContent.value = []; //先清空内容，防止内容重复叠加
 
@@ -2691,7 +2691,6 @@ const CustomerServiceCompleted = () => {
   }
 }
 .el_cwBtn {
-  width: 8%;
   display: flex;
   justify-content: flex-end;
 }

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.state == 1 && !res.warehouseId);
+if (_warehouseId) {
+  ElMessage({
+    message: `有赔款方仓库未选择`,
+    type: 'warning',
+  });
+  return;
+}
   ElMessageBox.confirm('是否提交完结信息?', '完结', {
     confirmButtonText: '确定',
     cancelButtonText: '取消',