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

src/api/aftersales/aftersalesCustomerMall.js

@@ -0,0 +1,50 @@
+import request from '@/axios';
+
+export const getList = (current, size, params) => {
+  return request({
+    url: '/blade-aftersales/aftersalesCustomerMall/list',
+    method: 'get',
+    params: {
+      ...params,
+      current,
+      size,
+    }
+  })
+}
+
+export const getDetail = (id) => {
+  return request({
+    url: '/blade-aftersales/aftersalesCustomerMall/detail',
+    method: 'get',
+    params: {
+      id
+    }
+  })
+}
+
+export const remove = (ids) => {
+  return request({
+    url: '/blade-aftersales/aftersalesCustomerMall/remove',
+    method: 'post',
+    params: {
+      ids,
+    }
+  })
+}
+
+export const add = (row) => {
+  return request({
+    url: '/blade-aftersales/aftersalesCustomerMall/submit',
+    method: 'post',
+    data: row
+  })
+}
+
+export const update = (row) => {
+  return request({
+    url: '/blade-aftersales/aftersalesCustomerMall/submit',
+    method: 'post',
+    data: row
+  })
+}
+

src/option/aftersales/aftersalesCustomerMall.js

@@ -0,0 +1,8 @@
+export default {
+  expand: false,
+  index: true,
+  border: true,
+  selection: true,
+  column: [
+  ]
+}

src/views/aftersales/aftersalesCustomerMall.vue

@@ -0,0 +1,288 @@
+<template>
+  <basic-container>
+    <div class="avue-crud">
+      <el-row :hidden="!search" style="padding:6px 18px">
+        <!-- 查询模块 -->
+        <el-form :inline="true" :model="query">
+          <!-- 查询按钮 -->
+          <el-form-item>
+            <el-button type="primary" icon="el-icon-search" @click="searchChange">搜 索</el-button>
+            <el-button icon="el-icon-delete" @click="searchReset()">清 空</el-button>
+          </el-form-item>
+        </el-form>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__header">
+          <!-- 头部左侧按钮模块 -->
+          <div class="avue-crud__left">
+            <el-button v-if="this.permissionList.addBtn" type="primary" icon="el-icon-plus" @click="handleAdd">新 增</el-button>
+            <el-button v-if="this.permissionList.delBtn" type="danger" icon="el-icon-delete" @click="handleDelete" plain>删 除</el-button>
+          </div>
+          <!-- 头部右侧按钮模块 -->
+          <div class="avue-crud__right">
+            <el-button icon="el-icon-refresh" @click="searchChange" circle></el-button>
+            <el-button icon="el-icon-search" @click="searchHide" circle></el-button>
+          </div>
+        </div>
+      </el-row>
+      <el-row>
+        <!-- 列表模块 -->
+        <el-table ref="table" v-loading="loading"
+                  @selection-change="selectionChange"
+                  :data="data"
+                  :height="height"
+                  style="width: 100%"
+                  :border="option.border">
+          <el-table-column type="selection" v-if="option.selection" width="55" align="center"></el-table-column>
+          <el-table-column type="expand" v-if="option.expand" align="center"></el-table-column>
+          <el-table-column v-if="option.index" label="#" type="index" width="50" align="center">
+          </el-table-column>
+          <template v-for="(item,index) in option.column">
+            <!-- table字段 -->
+            <el-table-column v-if="item.hide!==true"
+                             :prop="item.prop"
+                             :label="item.label"
+                             :width="item.width"
+                             :key="index">
+            </el-table-column>
+          </template>
+          <!-- 操作栏模块 -->
+          <el-table-column prop="menu" label="操作" :width="220" align="center">
+            <template #="{row}">
+              <el-button v-if="this.permissionList.viewBtn" type="primary" text icon="el-icon-view" @click="handleView(row)">查看</el-button>
+              <el-button v-if="this.permissionList.editBtn" type="primary" text icon="el-icon-edit" @click="handleEdit(row)">编辑</el-button>
+              <el-button v-if="this.permissionList.delBtn" type="primary" text icon="el-icon-delete" @click="rowDel(row)">删除</el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-row>
+      <el-row>
+        <div class="avue-crud__pagination" style="width:100%">
+          <!-- 分页模块 -->
+          <el-pagination align="right"
+                         background
+                         @size-change="sizeChange"
+                         @current-change="currentChange"
+                         :current-page="page.currentPage"
+                         :page-sizes="[10, 20, 30, 40, 50, 100]"
+                         :page-size="page.pageSize"
+                         layout="total, sizes, prev, pager, next, jumper"
+                         :total="page.total">
+          </el-pagination>
+        </div>
+      </el-row>
+      <!-- 表单模块 -->
+      <el-dialog :title="title"
+                 v-model="box"
+                 width="50%"
+                 :before-close="beforeClose"
+                 append-to-body>
+        <el-form :disabled="view" ref="form" :model="form" label-width="80px">
+          <!-- 表单字段 -->
+        </el-form>
+        <!-- 表单按钮 -->
+        <template #footer>
+          <span v-if="!view" class="dialog-footer">
+            <el-button type="primary" icon="el-icon-circle-check" @click="handleSubmit">提 交</el-button>
+            <el-button icon="el-icon-circle-close" @click="box = false">取 消</el-button>
+          </span>
+        </template>
+      </el-dialog>
+    </div>
+  </basic-container>
+</template>
+
+<script>
+import { getList, getDetail, add, update, remove } from "@/api/aftersales/aftersalesCustomerMall";
+import option from "@/option/aftersales/aftersalesCustomerMall";
+import { mapGetters } from "vuex";
+
+export default {
+  data () {
+    return {
+      height: 0,
+      // 弹框标题
+      title: '',
+      // 是否展示弹框
+      box: false,
+      // 是否显示查询
+      search: true,
+      // 加载中
+      loading: true,
+      // 是否为查看模式
+      view: false,
+      // 查询信息
+      query: {},
+      // 分页信息
+      page: {
+        currentPage: 1,
+        pageSize: 10,
+        total: 40
+      },
+      // 表单数据
+      form: {},
+      // 选择行
+      selectionList: [],
+      // 表单配置
+      option: option,
+      // 表单列表
+      data: [],
+    }
+  },
+  mounted() {
+    this.init();
+    this.onLoad(this.page);
+  },
+  computed: {
+    ...mapGetters(["permission"]),
+    permissionList() {
+      return {
+        addBtn: this.validData(this.permission.param_add, false),
+        viewBtn: this.validData(this.permission.param_view, false),
+        delBtn: this.validData(this.permission.param_delete, false),
+        editBtn: this.validData(this.permission.param_edit, false),
+      };
+    },
+    ids() {
+      let ids = [];
+      this.selectionList.forEach(ele => {
+        ids.push(ele.id);
+      });
+      return ids.join(",");
+    }
+  },
+  methods: {
+    init() {
+      this.height = this.setPx(document.body.clientHeight - 340);
+    },
+    searchHide() {
+      this.search = !this.search;
+    },
+    searchChange() {
+      this.onLoad(this.page);
+    },
+    searchReset() {
+      this.query = {};
+      this.page.currentPage = 1;
+      this.onLoad(this.page);
+    },
+    handleSubmit() {
+      if (!this.form.id) {
+        add(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+      } else {
+        update(this.form).then(() => {
+          this.box = false;
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        })
+      }
+    },
+    handleAdd(){
+      this.title = '新增'
+      this.form = {}
+      this.box = true
+    },
+    handleEdit(row) {
+      this.title = '编辑'
+      this.box = true
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleView(row) {
+      this.title = '查看'
+      this.view = true;
+      this.box = true;
+      getDetail(row.id).then(res => {
+        this.form = res.data.data;
+      });
+    },
+    handleDelete() {
+      if (this.selectionList.length === 0) {
+        this.$message.warning("请选择至少一条数据");
+        return;
+      }
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(this.ids);
+        })
+        .then(() => {
+          this.selectionClear();
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    rowDel(row) {
+      this.$confirm("确定将选择数据删除?", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      })
+        .then(() => {
+          return remove(row.id);
+        })
+        .then(() => {
+          this.onLoad(this.page);
+          this.$message({
+            type: "success",
+            message: "操作成功!"
+          });
+        });
+    },
+    beforeClose (done) {
+      done()
+      this.form = {};
+      this.view = false;
+    },
+    selectionChange(list) {
+      this.selectionList = list;
+    },
+    selectionClear() {
+      this.selectionList = [];
+      this.$refs.table.clearSelection();
+    },
+    currentChange(currentPage) {
+      this.page.currentPage = currentPage;
+      this.onLoad(this.page);
+    },
+    sizeChange(pageSize) {
+      this.page.pageSize = pageSize;
+      this.onLoad(this.page);
+    },
+    onLoad(page, params = {}) {
+      this.loading = true;
+
+      const {
+      } = this.query;
+
+      let values = {
+      };
+
+      getList(page.currentPage, page.pageSize, values).then(res => {
+        const data = res.data.data;
+        this.page.total = data.total;
+        this.data = data.records;
+        this.loading = false;
+        this.selectionClear();
+      });
+    }
+  }
+};
+</script>

src/views/aftersales/aftersalesWorkOrder.vue

@@ -81,7 +81,7 @@
                 <!-- 头部左侧按钮模块 -->
                 <div class="avue-crud__left">
                   <!-- v-if="ButtonPermissions.add" -->
-                  <el-button v-if="ButtonPermissions.add" type="primary" @click="AddInfo">
+                  <el-button  v-if="PermissionButton.workAdd" 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 v-if="ButtonPermissions.batchReject"  type="primary"  @click="BatchReturn">批量打回</el-button>
+                  <el-button v-if="PermissionButton.batch_return"  type="primary"  @click="BatchReturn">批量打回</el-button>
                   <!-- v-if="ButtonPermissions.assignment" -->
-                  <el-button v-if="ButtonPermissions.assignment" type="primary" @click="assign">工单指派</el-button>
+                  <el-button v-if="PermissionButton.assign"  type="primary" @click="assign">工单指派</el-button>
 
                   <!-- v-if="ButtonPermissions.applyArbitration" -->
-                  <el-button v-if="ButtonPermissions.applyArbitration" type="primary" @click="arbitrate">申请仲裁</el-button>
+                  <el-button v-if="PermissionButton.apply_arbitration" type="primary" @click="arbitrate">申请仲裁</el-button>
 
                   <!-- v-if="ButtonPermissions.batchFinish" -->
-                  <el-button v-if="ButtonPermissions.batchFinish" type="primary" @click="Batchcompletion">批量完结</el-button>
+                  <el-button v-if="PermissionButton.batch_completion" type="primary" @click="Batchcompletion">批量完结</el-button>
 
                   <!-- v-if="ButtonPermissions.appeal" -->
-                  <el-button v-if="ButtonPermissions.appeal" type="primary" @click="appeal">申诉</el-button>
+                  <el-button v-if="PermissionButton.representations" type="primary" @click="appeal">申诉</el-button>
                   <!-- v-if="details.query.workOrderStatus == 30" -->
                   <!-- <el-button type="primary" @click="ProcessingParty"> 处理方信息</el-button> -->
                 </div>
@@ -1039,11 +1039,11 @@
     :columnList="details.columnList"
   ></edittablehead>
 </template>
-
 <script setup>
 import { ElMessage } from 'element-plus';
 import { ElMessageBox } from 'element-plus';
 import { Plus } from '@element-plus/icons-vue';
+import { useStore } from "vuex";
 import {
   $_getList,
   $_submit,
@@ -1068,8 +1068,7 @@ import { getToken } from '@/utils/auth';
 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 { ref, reactive, toRefs, computed, onMounted, nextTick, watch ,getCurrentInstance} from 'vue';
-import { mapGetters,useStore } from "vuex";
 import {
   columnList,
   recordList,
@@ -1077,11 +1076,45 @@ import {
   AppealList,
   timeoutList,
 } from '@/option/aftersales/vueTvemp.js';
-
 import { processRowProperty, isNumer, computeNumber } from '@/utils/util';
 import { useRouter } from 'vue-router';
 import dayjs from 'dayjs';
 const $router = useRouter();
+const $useStore = useStore();
+
+const $route = useRoute();
+/** vuex */
+const accessControl= $useStore.getters.permission
+console.log(accessControl,'权限按钮');
+// workAdd;//新增
+// batch_return;//批量打回
+// assign;//工单指派
+// apply_arbitration;//申请仲裁
+// batch_completion;//批量完结
+// representations;//申诉
+// reply;//回复
+// processing_completed;//处理完结
+// work_order_completion;//完结
+// repulse;//打回
+// arbitration_completed;//仲裁完结
+// information_editing;//信息编辑
+console.log(accessControl.workAdd,'新增按钮权限');
+const PermissionButton = computed(() => {
+      return {
+        workAdd:accessControl.workAdd,//新增
+        batch_return:accessControl.batch_return,//批量打回
+        assign:accessControl.assign,//工单指派
+        apply_arbitration:accessControl.apply_arbitration,//申请仲裁
+        batch_completion:accessControl.batch_completion,//批量完结
+        representations:accessControl.representations,//申诉
+        reply:accessControl.reply,//回复
+        processing_completed:accessControl.processing_completed,//处理完结
+        work_order_completion:accessControl.work_order_completion,//完结
+        repulse:accessControl.repulse,//打回
+        arbitration_completed:accessControl.arbitration_completed,//仲裁完结
+        information_editing:accessControl.information_editing,//信息编辑
+      }
+    });
 const tabValue = ref(0); //侧边栏激活状态
 const publicColumnList = ref([]); //公共列表参数
 const scrollContainer = ref(null); //客服实例
@@ -1151,6 +1184,7 @@ const AppealStatus = ref(false); //申诉列表状态
 const dialogModifyAmount = ref(false); //超时金额修改弹出状态
 const UserPermissions = ref('仓库客服'); //客服权限
 const TabPermissions = ref(0); //菜单权限
+
 const AppealStatusT = ref(false); //是否为申诉列表
 const TabList = ref([
   { name: 0, label: '全部' },
@@ -1594,10 +1628,12 @@ const Tableheaderswitching = (val = columnList) => {
   publicColumnList.value = val; //默认加载表格
   details.columnList = val;
 };
+
 // 页面初始化
 const OnLoad = () => {
   // 表格切换
 
+
   userInfo.value = JSON.parse(localStorage.getItem('TWMS-userInfo')); //获取本地登录人参数
   Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息
   currentUser.value = Mydata.value.id;

src/views/aftersales/aftersalesWorkOrderFF.vue

@@ -330,6 +330,9 @@ export default {
   mounted() {
     this.init();
     this.onLoad(this.page);
+    console.log(this,'this方法');
+    console.log(this.permission.workAdd,'this权限');
+    console.log(this.validData(this.permission.workAdd,true),'this处理');
   },
   computed: {
     ...mapGetters(["permission"]),

src/views/aftersales/aftersalesWorkOrderInfo.vue

@@ -444,14 +444,13 @@
         />
       </el-dialog>
     </div>
-
     <div class="foot_btn">
-      <el-button type="primary" v-if="ButtonPermissions.reply"   @click="addireply">回复</el-button>
+      <el-button type="primary" v-if="PermissionButton.reply"   @click="addireply">回复</el-button>
-      <el-button type="primary" v-if="ButtonPermissions.ProcessingResults" @click="addingRecord">处理结果</el-button>
+      <el-button type="primary" v-if="PermissionButton.processing_completed" @click="addingRecord">处理结果</el-button>
-      <el-button type="primary" v-if="ButtonPermissions.end" @click="EndJump">完结 </el-button>
+      <el-button type="primary" v-if="PermissionButton.work_order_completion" @click="EndJump">完结 </el-button>
-      <el-button type="primary" v-if="ButtonPermissions.repulse" @click="BatchReturn">打回 </el-button>
+      <el-button type="primary" v-if="PermissionButton.repulse" @click="BatchReturn">打回 </el-button>
-      <el-button type="primary" v-if="ButtonPermissions.ArbitrationCompleted" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
+      <el-button type="primary" v-if="PermissionButton.arbitration_completed" @click="CustomerServiceCompleted">客服仲裁完结 </el-button>
-      <el-button type="primary" v-if="ButtonPermissions.edit" @click="EditInformation">信息编辑</el-button>
+      <el-button type="primary" v-if="PermissionButton.information_editing" @click="EditInformation">信息编辑</el-button>
     </div>
   </el-card>
   <!-- 批量打回弹窗 -->
@@ -501,6 +500,7 @@ 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 { useStore } from "vuex";
 import {
   $_getList,
   $_submit,
@@ -550,6 +550,7 @@ const HistorIndex = ref(0); //历史包件索引
 const TotalClaimAmount = ref(0); //总金额
 const dialogReturn = ref(false); //打回弹窗
 const ProcessingRecords =ref([]);//处理放记录用于匹配按钮
+const ProcessingRecordsName=ref([]);//匹配的处理方中文名字
 const repulse = ref(false); //加载效果
 const amplifyurl = ref(''); //当前点击的图片
 const amplifysrcList = ref([]); //图片循环列表
@@ -557,6 +558,8 @@ const RouteIndexs = ref(''); //进入前的页面索引
 const UserPermissions = ref('');//当前状态
 const warehouseInfo=ref('');//仓库信息
 const warehouseState=ref(false);//仓库权限
+const $useStore = useStore();
+const accessControl= $useStore.getters.permission
 const PackageInfo = ref([
   //包件信息
   { packageCode: '', orderCode: '', waybillNumber: '', brandName: '' },
@@ -648,18 +651,38 @@ const ImgSuccess = (response, uploadFile) => {
     console.log(Indexform.value['packList'], '图片列表');
   }
 };
+
+
+// 后台控制权限按钮
+const PermissionButton = computed(() => {
+      return {
+        workAdd:accessControl.workAdd,//新增
+        batch_return:accessControl.batch_return,//批量打回
+        assign:accessControl.assign,//工单指派
+        apply_arbitration:accessControl.apply_arbitration,//申请仲裁
+        batch_completion:accessControl.batch_completion,//批量完结
+        representations:accessControl.representations,//申诉
+        reply:accessControl.reply,//回复
+        processing_completed:accessControl.processing_completed,//处理完结
+        work_order_completion:accessControl.work_order_completion,//完结
+        repulse:accessControl.repulse,//打回
+        arbitration_completed:accessControl.arbitration_completed,//仲裁完结
+        information_editing:accessControl.information_editing,//信息编辑
+      }
+    });
+
 // 详情按钮权限
 const ButtonPermissions = computed(() => {
   // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑
   switch (RouteIndexs.value !='null') {
     case RouteIndexs.value == 0: //全部
       return {
-        reply: true, //回复按钮(都可以查看)
+        reply: false, //回复按钮(都可以查看)
-        ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
+        ProcessingResults:false, //处理结果按钮
-        end: UserPermissions.value == '职能客服', //完结按钮
+        end: false, //完结按钮
-        repulse: UserPermissions.value == '客服经理', //打回按钮
+        repulse: false, //打回按钮
-        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        ArbitrationCompleted:false, //客服仲裁完结
-        edit: UserPermissions.value != '仓库客服', //编辑
+        edit:false, //编辑
       };
     case RouteIndexs.value == 1: //处理中
       return {
@@ -676,7 +699,7 @@ const ButtonPermissions = computed(() => {
         ProcessingResults: false, //处理结果按钮
         end: UserPermissions.value == '职能客服', //完结按钮
         repulse: UserPermissions.value == '客服经理', //打回按钮
-        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        ArbitrationCompleted: false, //客服仲裁完结
         edit: false, //编辑
       };
     case RouteIndexs.value == 3: //待处理
@@ -685,7 +708,7 @@ const ButtonPermissions = computed(() => {
         ProcessingResults: UserPermissions.value == '仓库客服', //处理结果按钮
         end: UserPermissions.value != '仓库客服', //完结按钮
         repulse: UserPermissions.value != '仓库客服', //打回按钮
-        ArbitrationCompleted: UserPermissions.value == '职能客服', //客服仲裁完结
+        ArbitrationCompleted: false, //客服仲裁完结
         edit:UserPermissions.value == '仓库客服', //编辑
       };
     case RouteIndexs.value == 4: //理赔金额未出
@@ -879,8 +902,10 @@ const onLoad = () => {
     });
     // let a=['张三','李四']
     // let b=['张三']
+    // let result = b.some(item => a.includes(item));
     companyProportion.value = 100 - sum;
-
+    ProcessingRecordsName.value = ProcessingRecords.value.filter(item => warehouseData.value.includes(item.value)).label;
+    console.log(   ProcessingRecordsName.value ,'匹配到的中文处理方');
     // updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型
     // updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节
     getDictionaryBiz('result_handling').then(res => {