From e557d6d79c33b239cb6a7244ca013fc37f2381d3 Mon Sep 17 00:00:00 2001 From: xzg <4727863@qq.com> Date: Mon, 25 Dec 2023 10:32:34 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/aftersales/aftersalesWorkOrder.vue | 844 +++--------------- .../reservation/reservationAddFrom.vue | 2 +- 2 files changed, 129 insertions(+), 717 deletions(-) diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index c7332e8d..21458146 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -81,7 +81,7 @@
- + 新 增 - 批量打回 + 批量打回 - 工单指派 + 工单指派 - 申请仲裁 + 申请仲裁 - 批量完结 + 批量完结 - 申诉 + 申诉
@@ -108,7 +127,7 @@
- +
@@ -182,622 +201,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - -
-
- 运损照片 - - - - - - 图片 - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 处理方 - - - - -
- -
- 责任方 - - - -
- - -
- 处理结果 - - - -
- - - -
-
处理结果-理赔金额
-
-
- {{ item.name }}: - -
-
- -
- 理赔支付时间 - -
-
- - -
- 图片 - - - - - - Preview Image - -
- - - - -
- - - - - - -
- - - - - - - - -
- -
-
-
-
- {{ item.businessName }} -
- {{ item.content }} -
-
{{ item.createTime }}
-
-
-
-
-
-
- - - - -
- 发送 -
- @@ -1043,7 +448,7 @@ import { ElMessage } from 'element-plus'; import { ElMessageBox } from 'element-plus'; import { Plus } from '@element-plus/icons-vue'; -import { useStore } from "vuex"; +import { useStore } from 'vuex'; import { $_getList, $_submit, @@ -1068,7 +473,16 @@ 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 ,getCurrentInstance} from 'vue'; +import { + ref, + reactive, + toRefs, + computed, + onMounted, + nextTick, + watch, + getCurrentInstance, +} from 'vue'; import { columnList, recordList, @@ -1076,7 +490,7 @@ import { AppealList, timeoutList, } from '@/option/aftersales/vueTvemp.js'; -import { processRowProperty, isNumer, computeNumber } from '@/utils/util'; +import { processRowProperty, isNumer, computeNumber} from '@/utils/util'; import { useRouter } from 'vue-router'; import dayjs from 'dayjs'; const $router = useRouter(); @@ -1084,8 +498,9 @@ const $useStore = useStore(); const $route = useRoute(); /** vuex */ -const accessControl= $useStore.getters.permission -console.log(accessControl,'权限按钮'); +const accessControl = $useStore.getters.permission; +console.log(accessControl, '权限按钮'); + // workAdd;//新增 // batch_return;//批量打回 // assign;//工单指派 @@ -1098,23 +513,23 @@ console.log(accessControl,'权限按钮'); // repulse;//打回 // arbitration_completed;//仲裁完结 // information_editing;//信息编辑 -console.log(accessControl.workAdd,'新增按钮权限'); +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,//信息编辑 - } - }); + 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); //客服实例 @@ -1387,10 +802,6 @@ const { // const TabPermissions = ref(0); //菜单权限 // 按钮权限 - - - - const ButtonPermissions = computed(() => { // 根据 TabPermissions 的状态，决定每个按钮的显示隐藏逻辑 switch (TabPermissions.value) { @@ -1553,78 +964,83 @@ const IndexTable = val => { }); $_getList(data).then(res => { - Tableheaderswitching(); + Tableheaderswitching(columnList); + console.log(res, '初始化返回值'); details.loadingObj.list = false; //关闭动画加载 - page.value.total = res.data.data.total; //总页数 - if (res.data.data.records.length) { - res.data.data.records.forEach(item => { - console.log(item, 'item'); - // 对为null的数据进行处理 - // for (const property in item) { - // if (item[property] == null) { - // item[property] = '/'; - // } - // } - // 对状态进行处理 - if (item.workOrderType == 1) { - item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损 - } else if (item.workOrderType == 2) { - item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货 - } else if (item.workOrderType == 3) { - item.workOrderTypeNameS = columnList[2].checkarr[2].label; //窜货 - } else if (item.workOrderType == 4) { - item.workOrderTypeNameS = columnList[2].checkarr[3].label; //加急 - } else if (item.workOrderType == 5) { - item.workOrderTypeNameS = columnList[2].checkarr[4].label; //其他 - } - // 提货环节下拉赋值 - if (item.discoveryNode == 1) { - item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节 - } else if (item.discoveryNode == 2) { - item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节 - } else if (item.discoveryNode == 3) { - item.discoveryNodeNameS = columnList[3].checkarr[2].label; //干线卸车环节 - } else if (item.discoveryNode == 4) { - item.discoveryNodeNameS = columnList[3].checkarr[3].label; //库内作业环节 - } else if (item.discoveryNode == 5) { - item.discoveryNodeNameS = columnList[3].checkarr[4].label; //配送装车环节 - } else if (item.discoveryNode == 6) { - item.discoveryNodeNameS = columnList[3].checkarr[5].label; //其他 - } else if (item.discoveryNode == 7) { - item.discoveryNodeNameS = columnList[3].checkarr[6].label; //配送签收环节 - } else if (item.discoveryNode == 8) { - item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节 - } - if (item.workOrderStatus == 10) { - item.workOrderStatusNameS = columnList[17].checkarr[0].label; //待处理 - } else if (item.workOrderStatus == 20) { - item.workOrderStatusNameS = columnList[17].checkarr[1].label; //处理中 - } else if (item.workOrderStatus == 30) { - item.workOrderStatusNameS = columnList[17].checkarr[2].label; //已处理 - } else if (item.workOrderStatus == 40) { - item.workOrderStatusNameS = columnList[17].checkarr[4].label; //待审核 - } else if (item.workOrderStatus == 50) { - item.workOrderStatusNameS = columnList[17].checkarr[5].label; //已审核 - } else if (item.workOrderStatus == 60) { - item.workOrderStatusNameS = columnList[17].checkarr[3].label; //超时未处理 - } else if (item.workOrderStatus == 70) { - item.workOrderStatusNameS = columnList[17].checkarr[6].label; //仲裁中 - } else if (item.workOrderStatus == 80) { - item.workOrderStatusNameS = columnList[17].checkarr[7].label; //完结 - } else if (item.workOrderStatus == 90) { - item.workOrderStatusNameS = columnList[17].checkarr[8].label; //理赔金未出 - } - }); - details.data = res.data.data.records; - } else { - details.data = res.data.data.records; //这里是空的 + + if (res.data.data) { + page.value.total = res.data.data.total; //总页数 + + if (res.data.data.records.length) { + res.data.data.records.forEach(item => { + console.log(item, 'item'); + // 对为null的数据进行处理 + // for (const property in item) { + // if (item[property] == null) { + // item[property] = '/'; + // } + // } + // 对状态进行处理 + if (item.workOrderType == 1) { + item.workOrderTypeNameS = columnList[2].checkarr[0].label; //货损 + } else if (item.workOrderType == 2) { + item.workOrderTypeNameS = columnList[2].checkarr[1].label; //少货 + } else if (item.workOrderType == 3) { + item.workOrderTypeNameS = columnList[2].checkarr[2].label; //窜货 + } else if (item.workOrderType == 4) { + item.workOrderTypeNameS = columnList[2].checkarr[3].label; //加急 + } else if (item.workOrderType == 5) { + item.workOrderTypeNameS = columnList[2].checkarr[4].label; //其他 + } + // 提货环节下拉赋值 + if (item.discoveryNode == 1) { + item.discoveryNodeNameS = columnList[3].checkarr[0].label; //提货环节 + } else if (item.discoveryNode == 2) { + item.discoveryNodeNameS = columnList[3].checkarr[1].label; //发货环节 + } else if (item.discoveryNode == 3) { + item.discoveryNodeNameS = columnList[3].checkarr[2].label; //干线卸车环节 + } else if (item.discoveryNode == 4) { + item.discoveryNodeNameS = columnList[3].checkarr[3].label; //库内作业环节 + } else if (item.discoveryNode == 5) { + item.discoveryNodeNameS = columnList[3].checkarr[4].label; //配送装车环节 + } else if (item.discoveryNode == 6) { + item.discoveryNodeNameS = columnList[3].checkarr[5].label; //其他 + } else if (item.discoveryNode == 7) { + item.discoveryNodeNameS = columnList[3].checkarr[6].label; //配送签收环节 + } else if (item.discoveryNode == 8) { + item.discoveryNodeNameS = columnList[3].checkarr[7].label; //安装环节 + } + if (item.workOrderStatus == 10) { + item.workOrderStatusNameS = columnList[17].checkarr[0].label; //待处理 + } else if (item.workOrderStatus == 20) { + item.workOrderStatusNameS = columnList[17].checkarr[1].label; //处理中 + } else if (item.workOrderStatus == 30) { + item.workOrderStatusNameS = columnList[17].checkarr[2].label; //已处理 + } else if (item.workOrderStatus == 40) { + item.workOrderStatusNameS = columnList[17].checkarr[4].label; //待审核 + } else if (item.workOrderStatus == 50) { + item.workOrderStatusNameS = columnList[17].checkarr[5].label; //已审核 + } else if (item.workOrderStatus == 60) { + item.workOrderStatusNameS = columnList[17].checkarr[3].label; //超时未处理 + } else if (item.workOrderStatus == 70) { + item.workOrderStatusNameS = columnList[17].checkarr[6].label; //仲裁中 + } else if (item.workOrderStatus == 80) { + item.workOrderStatusNameS = columnList[17].checkarr[7].label; //完结 + } else if (item.workOrderStatus == 90) { + item.workOrderStatusNameS = columnList[17].checkarr[8].label; //理赔金未出 + } + }); + details.data = res.data.data.records; + }else{ + details.data = res.data.data.records + } } loading.value = false; //关闭加载效果 }); }; // 表格切换 -const Tableheaderswitching = (val = columnList) => { +const Tableheaderswitching = (val) => { publicColumnList.value = val; //默认加载表格 details.columnList = val; }; @@ -1633,7 +1049,6 @@ const Tableheaderswitching = (val = columnList) => { const OnLoad = () => { // 表格切换 - userInfo.value = JSON.parse(localStorage.getItem('TWMS-userInfo')); //获取本地登录人参数 Mydata.value = JSON.parse(localStorage.getItem('my_data')); //获取本地仓库信息 currentUser.value = Mydata.value.id; @@ -1648,12 +1063,9 @@ const OnLoad = () => { data.current = page.value.currentPage; //页码 data.size = page.value.pageSize; //条数 console.log(data, '要提交的数据'); - updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型 updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节 - IndexTable(details.query); - getDeptWarehouse({}).then(res => { res.data.data.forEach(item => { warehouseData.value.push({ @@ -1773,7 +1185,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,//当前记录参数 + RouteIndexs: TabPermissions.value, //当前记录参数 }, }); return; diff --git a/src/views/distribution/reservation/reservationAddFrom.vue b/src/views/distribution/reservation/reservationAddFrom.vue index 99cf6c33..1681fedb 100644 --- a/src/views/distribution/reservation/reservationAddFrom.vue +++ b/src/views/distribution/reservation/reservationAddFrom.vue @@ -2571,7 +2571,7 @@ export default { if (item.id === row.id) { this.orderData.splice(index, 1); } - console.log(item); + console.log(this.orderData,'当前存在的数据'); }); // 当两个列表没有数据时, 清空限制 if (this.inventoryData.length === 0 && this.orderData.length === 0) this.marketName = '';