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

src/views/aftersales/aftersalesWorkOrder.vue

@@ -1366,7 +1366,7 @@ const ButtonPermissions = computed(() => {
         batchReject: UserPermissions.value == '职能客服', //批量打回
         assignment: UserPermissions.value == '客服经理', //工单指派
         applyArbitration: UserPermissions.value == '仓库客服', //申请仲裁
-        batchFinish: UserPermissions.value == '职能客服', //批量完结
+        batchFinish: UserPermissions.value != '仓库客服', //批量完结
         appeal: false, //申诉
       };
     case 1: //处理中
@@ -1390,7 +1390,7 @@ const ButtonPermissions = computed(() => {
     case 3: //待处理
       return {
         add: false, //新增按钮
-        batchReject: UserPermissions.value == '仓库客服', //批量打回
+        batchReject: UserPermissions.value == '职能客服', //批量打回
         assignment: UserPermissions.value == '客服经理', //工单指派
         applyArbitration: false, //申请仲裁
         batchFinish: false, //批量完结
@@ -1737,6 +1737,7 @@ const view = val => {
       workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码
       businessId: val.row.businessId,
       ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理
+      RouteIndexs:TabPermissions.value,//当前记录参数
     },
   });
   return;

src/views/aftersales/aftersalesWorkOrderAdd.vue

@@ -185,7 +185,6 @@
           clearable
           @change="DeliveryTrainnumber"
         />
-     
       </el-form-item>
 
       <el-form-item
@@ -273,8 +272,6 @@
         <el-input v-model="Indexform.processNumber" placeholder="请输入钉钉流程号" />
       </el-form-item> -->
 
-
-
       <!-- 必填 -->
       <el-form-item label="异常问题描述">
         <el-input v-model="Indexform.problemDescription" placeholder="请输入异常问题" clearable />
@@ -653,7 +650,6 @@ const ImgSuccess = (response, uploadFile) => {
     console.log(response);
     console.log(Indexform.value['packList'], '图片列表');
     amplifysrcList.value.push(response.data.link);
-    
   }
 };
 
@@ -745,7 +741,7 @@ const DiscoveringNodesChange = val => {
 function DeliveryTrainnumber() {
   let data = {
     trainNumber: Indexform.value.trainNumber,
-    taskTime:Indexform.value.deliveryTime
+    taskTime: Indexform.value.deliveryTime,
   };
   data.current = 1; //页码
   data.size = 999; //条数
@@ -848,7 +844,20 @@ const ConfirmForm = () => {
       });
     }
   }
-
+  if (SelectType.value == 1 && DataSubmit['decreaseImageEntityList'].length < 2) {
+    ElMessage({
+      message: '货损至少提供2张图片附件',
+      type: 'warning',
+    });
+    return;
+  }
+  if (SelectType.value == 3 && !DataSubmit['decreaseImageEntityList'].length) {
+    ElMessage({
+      message: '窜货必须提供图片附件',
+      type: 'warning',
+    });
+    return;
+  }
   console.log(DataSubmit['decreaseImageEntityList'], '处理好的图片');
   //司机信息处理
   if (Indexform.value.deliveryDriver) {
@@ -1027,12 +1036,12 @@ const ConfirmForm = () => {
   });
 };
 // 选择司机带出车次号日期
-const changeDeliveryDriver=(val)=>{
+const changeDeliveryDriver = val => {
   console.log(val);
   console.log(DeliveryDriver.value, '司机信息');
   Indexform.value.trainNumber = DeliveryDriver.value.find(res => res.id == val).trainNumber; //车次号
   Indexform.value.deliveryTime = DeliveryDriver.value.find(res => res.id == val).taskTime; //日期
-}
+};
 // 少货件数对应事件
 const ShortageTtems = val => {
   ShortageList.value = []; //进入之前重置参数
@@ -1157,7 +1166,7 @@ const ChangePackageInfo = (val, index) => {
           HistoricalPackageList.value = res.data.data;
           PackageInfo.value[index].state = true; //状态
         }
-      })
+      });
     }
     // packageCode; //包件码
     // //订单自编码
@@ -1447,7 +1456,6 @@ const ViewPackageDetails = val => {
   .el-tabs__content {
     padding: 0;
   }
- 
 }
 .foot_btn {
   position: fixed;

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -446,12 +446,12 @@
     </div>
 
     <div class="foot_btn">
-      <el-button type="primary" @click="addireply">回复</el-button>
-      <el-button type="primary" @click="addingRecord">处理结果</el-button>
-      <el-button type="primary" @click="EndJump">完结 </el-button>
-      <el-button type="primary" @click="BatchReturn">打回 </el-button>
-      <el-button type="primary" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
-      <el-button type="primary" @click="EditInformation">信息编辑</el-button>
+      <el-button type="primary" v-if="ButtonPermissions.reply"   @click="addireply">回复</el-button>
+      <el-button type="primary" v-if="ButtonPermissions.ProcessingResults" @click="addingRecord">处理结果</el-button>
+      <el-button type="primary" v-if="ButtonPermissions.end" @click="EndJump">完结 </el-button>
+      <el-button type="primary" v-if="ButtonPermissions.repulse" @click="BatchReturn">打回 </el-button>
+      <el-button type="primary" v-if="ButtonPermissions.ArbitrationCompleted" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
+      <el-button type="primary" v-if="ButtonPermissions.edit" @click="EditInformation">信息编辑</el-button>
     </div>
   </el-card>
   <!-- 批量打回弹窗 -->
@@ -495,14 +495,12 @@
 </template>
 
 <script setup>
-
-
 import { ElMessage } from 'element-plus';
 import { ElMessageBox } from 'element-plus';
 import { useRouter, useRoute } from 'vue-router';
 import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
-import {AddressClosed} from '@/utils/util'
+import { AddressClosed } from '@/utils/util';
 import {
   $_getList,
   $_submit,
@@ -522,7 +520,7 @@ const Indexform = ref({
   packList: [],
   decreaseImageEntityList: [], //处理好的图片数据
 }); //首页新增表单
-const dialogImgList=ref(false)
+const dialogImgList = ref(false);
 const IndexException = ref([]); //异常类型下拉选择
 const DiscoveringNodes = ref([]); //发现节点下拉选择
 const ProcessingResults = ref([]); //处理结果列表选项
@@ -554,6 +552,8 @@ const dialogReturn = ref(false); //打回弹窗
 const repulse = ref(false); //加载效果
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
+const RouteIndexs = ref(''); //进入前的页面索引
+const UserPermissions = ref('');//当前状态
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' },
@@ -606,6 +606,24 @@ function updateDictionary(targetArray, dictionaryType) {
     });
   });
 }
+
+  // 获取角色权限
+  getDictionaryBiz('after_sales_visits').then(res => {
+    console.log(res, '角色字典');
+    const matchingItem = res.data.data.find(
+      item => item.dictValue == JSON.parse(localStorage.getItem('TWMS-userInfo')).content.role_name
+    );
+    if (matchingItem) {
+      UserPermissions.value = matchingItem.dictValue;
+    } else {
+      UserPermissions.value = '仓库客服';
+    }
+    console.log(UserPermissions.value, '当前角色权限');
+  });
+
+
+
+
 // 图片上传必须携带TOKEN
 const headers = computed(() => {
   return { 'Blade-Auth': 'Bearer ' + getToken() };
@@ -627,6 +645,94 @@ const ImgSuccess = (response, uploadFile) => {
     console.log(Indexform.value['packList'], '图片列表');
   }
 };
+// 详情按钮权限
+const ButtonPermissions = computed(() => {
+  // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑
+  switch (RouteIndexs.value !='null') {
+    case RouteIndexs.value == 0: //全部
+      return {
+        reply: true, //回复按钮(都可以查看)
+        ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
+        end: UserPermissions.value == '职能客服', //完结按钮
+        repulse: UserPermissions.value == '客服经理', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: UserPermissions.value != '仓库客服', //编辑
+      };
+    case RouteIndexs.value == 1: //处理中
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 2: //处理完毕
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: UserPermissions.value == '职能客服', //完结按钮
+        repulse: UserPermissions.value == '客服经理', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 3: //待处理
+      return {
+        reply: UserPermissions.value == '仓库客服', //回复按钮
+        ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
+        end: UserPermissions.value == '职能客服', //完结按钮
+        repulse: UserPermissions.value == '职能客服', //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 4: //理赔金额未出
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 5: //仲裁中
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 6: //完结
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+    case RouteIndexs.value == 7: //超时未处理
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+    // 其他任何情况下的默认情况
+    default:
+      return {
+        reply: false, //回复按钮
+        ProcessingResults: false, //处理结果按钮
+        end: false, //完结按钮
+        repulse: false, //打回按钮
+        ArbitrationCompleted: false, //客服仲裁完结
+        edit: false, //编辑
+      };
+  }
+});
 
 // 上传图片规则
 const beforeAvatarUpload = rawFile => {
@@ -712,6 +818,10 @@ const ResponsiblePartychange = (val, index) => {
   });
 };
 const onLoad = () => {
+  if($route.query.RouteIndexs!='null'){
+    RouteIndexs.value = $route.query.RouteIndexs;//记录当前状态
+  }
+ 
   console.log($route.query.id, '页面初始化');
   routerState.value = $route.query.routerState;
   updateDictionary(IndexException.value, 'pc_work_order'); //异常类型
@@ -1096,7 +1206,6 @@ const addingRecord = () => {
 };
 // 客服仲裁完结
 const CustomerServiceCompleted = () => {
-
   $router.push({
     path: '/aftersales/aftersalesWorkOrdermodify',
     query: {
@@ -1109,7 +1218,6 @@ const CustomerServiceCompleted = () => {
       index: '1',
     },
   });
-
 };
 // 编辑信息
 const EditInformation = () => {

vite.config.js

@@ -25,7 +25,7 @@ export default ({ mode, command }) => {
           // target: 'http://192.168.6.122:8777',
           // target: 'http://192.168.10.25:13000',
           // target: 'http://192.168.10.25:2888',
-          target: 'http://192.168.6.122:9777',
+          target: 'http://192.168.6.148:9777',
           // target: 'http://192.168.6.116:8777',  
           // tjj
           // sst