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

src/views/aftersales/aftersalesWorkOrder.vue

@@ -81,7 +81,7 @@
                 <!-- 头部左侧按钮模块 -->
                 <div class="avue-crud__left">
                   <!-- v-if="ButtonPermissions.add" -->
-                  <el-button type="primary" @click="AddInfo">
+                  <el-button v-if="ButtonPermissions.add" type="primary" @click="AddInfo">
                     <el-icon><Plus /></el-icon>新 增</el-button
                   >
                   <!-- <el-button type="primary" @click="BatchDelete">
@@ -89,18 +89,18 @@
                   > -->
 
                   <!-- v-if="ButtonPermissions.batchReject" -->
-                  <el-button type="primary" @click="BatchReturn">批量打回</el-button>
+                  <el-button v-if="ButtonPermissions.batchReject"  type="primary"  @click="BatchReturn">批量打回</el-button>
                   <!-- v-if="ButtonPermissions.assignment" -->
-                  <el-button type="primary" @click="assign">工单指派</el-button>
+                  <el-button v-if="ButtonPermissions.assignment" type="primary" @click="assign">工单指派</el-button>
 
                   <!-- v-if="ButtonPermissions.applyArbitration" -->
-                  <el-button type="primary" @click="arbitrate">申请仲裁</el-button>
+                  <el-button v-if="ButtonPermissions.applyArbitration" type="primary" @click="arbitrate">申请仲裁</el-button>
 
                   <!-- v-if="ButtonPermissions.batchFinish" -->
-                  <el-button type="primary" @click="Batchcompletion">批量完结</el-button>
+                  <el-button v-if="ButtonPermissions.batchFinish" type="primary" @click="Batchcompletion">批量完结</el-button>
 
                   <!-- v-if="ButtonPermissions.appeal" -->
-                  <el-button type="primary" @click="appeal">申诉</el-button>
+                  <el-button v-if="ButtonPermissions.appeal" type="primary" @click="appeal">申诉</el-button>
                   <!-- v-if="details.query.workOrderStatus == 30" -->
                   <!-- <el-button type="primary" @click="ProcessingParty"> 处理方信息</el-button> -->
                 </div>
@@ -1069,6 +1069,7 @@ import { getDictionaryBiz } from '@/api/system/dict'; //字典
 import functions from '@/utils/functions.js';
 import { getDetailWarehouse, getDeptWarehouse } from '@/api/basicdata/basicdataWarehouse'; //处理方
 import { ref, reactive, toRefs, computed, onMounted, nextTick, watch } from 'vue';
+import { mapGetters,useStore } from "vuex";
 import {
   columnList,
   recordList,
@@ -1076,6 +1077,7 @@ import {
   AppealList,
   timeoutList,
 } from '@/option/aftersales/vueTvemp.js';
+
 import { processRowProperty, isNumer, computeNumber } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import dayjs from 'dayjs';
@@ -1349,6 +1351,11 @@ const {
 // 例如：
 // const UserPermissions = ref('仓库客服'); //客服权限
 // const TabPermissions = ref(0); //菜单权限
+// 按钮权限
+
+
+
+
 
 const ButtonPermissions = computed(() => {
   // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑

src/views/aftersales/aftersalesWorkOrderend.vue

@@ -1636,6 +1636,7 @@ const submit = () => {
     console.log(info, 'info');
     let data = [
       {
+        id:$route.query.id,
         completionRecipientEntities: [], //收款方
         completionRecordEntities: [], //赔款方
         reasonArbitration: endFrom.value.arbitrate, //仲裁原因
@@ -1679,7 +1680,7 @@ const submit = () => {
     });
 
     // 赔款方
-
+    
     console.log(data, '处理好的值');
     $_addCompletionEnd(data).then(res => {
       console.log(res, '完结成功返回值');

src/views/aftersales/aftersalesWorkOrdermodify.vue

@@ -812,7 +812,6 @@ const ImgSuccess = (response, uploadFile) => {
   if(response.code==200){
     amplifysrcList.value.push(response.data.link);   
   }
- 
 };
 
 // 上传图片规则