diff --git a/src/option/distribution/addVehicleStowage.js b/src/option/distribution/addVehicleStowage.js index ea659f75..fe97781c 100644 --- a/src/option/distribution/addVehicleStowage.js +++ b/src/option/distribution/addVehicleStowage.js @@ -489,7 +489,7 @@ export const newColumnList = [ sortable: true, }, { - prop: 'loadingNum', + prop: 'realNum', label: '装车数', type: 2, values: '', diff --git a/src/views/aftersales/aftersalesWorkOrder.vue b/src/views/aftersales/aftersalesWorkOrder.vue index 6430cc9b..b5265280 100644 --- a/src/views/aftersales/aftersalesWorkOrder.vue +++ b/src/views/aftersales/aftersalesWorkOrder.vue @@ -179,21 +179,33 @@ 查看 - + 确定 - + + + 编辑 编辑 确定理赔金额 - { + console.log(columnList[10],'22212as'); + val.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[10].checkarr[0].label; //待处理 + } else if (item.workOrderStatus == 20) { + item.workOrderStatusNameS = columnList[10].checkarr[1].label; //处理中 + } else if (item.workOrderStatus == 30) { + item.workOrderStatusNameS = columnList[10].checkarr[2].label; //已处理 + } else if (item.workOrderStatus == 40) { + item.workOrderStatusNameS = columnList[10].checkarr[4].label; //待审核 + } else if (item.workOrderStatus == 50) { + item.workOrderStatusNameS = columnList[10].checkarr[5].label; //已审核 + } else if (item.workOrderStatus == 60) { + item.workOrderStatusNameS = columnList[10].checkarr[3].label; //超时未处理 + } else if (item.workOrderStatus == 70) { + item.workOrderStatusNameS = columnList[10].checkarr[6].label; //仲裁中 + } else if (item.workOrderStatus == 80) { + item.workOrderStatusNameS = columnList[10].checkarr[7].label; //完结 + } else if (item.workOrderStatus == 90) { + item.workOrderStatusNameS = columnList[10].checkarr[8].label; //理赔金未出 + } else if (item.workOrderStatus == 21) { + item.workOrderStatusNameS = columnList[10].checkarr[9].label; //处理结果已提交 + } else if (item.workOrderStatus == 100) { + item.workOrderStatusNameS = columnList[10].checkarr[10].label; //已结束 + }else if (item.workOrderStatus == 110) { + item.workOrderStatusNameS = columnList[10].checkarr[11].label; //已结束 + } + }); +}; // 页面初始化数据 const IndexTable = val => { ClaimStatus.value = false; @@ -1122,10 +1200,9 @@ const IndexTable = val => { TimeoutStatus.value = false; //关闭超时 // ProcessingPartyState.value = false; //关闭处理方 details.loadingObj.list = true; //开启动画加载 - columnList[2].checkarr = []; //重置下拉搜索框 columnList[3].checkarr = []; - columnList[10].checkarr=[] + columnList[10].checkarr = []; updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型 updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节 updateDictionary(columnList[10].checkarr, 'work_order_status'); //工单状态 @@ -1149,82 +1226,27 @@ const IndexTable = val => { } console.log(UserPermissions.value, '当前角色权限'); let data = { - workOrderStatus:TabPermissions.value == '0' && UserPermissions.value == '仓库客服' ? '1000' : null, //不可调整顺序 ...val, //接收搜索参数值 current: page.value.currentPage, //页码 size: page.value.pageSize, //条数 }; + if (TabPermissions.value == 0) { + if (UserPermissions.value != '仓库客服') { + data.workOrderStatus = null; + } else { + data.workOrderStatus = '1000'; + } + } + + console.log(data, '处理的参数'); $_getList(data).then(res => { Tableheaderswitching(columnList); console.log(res, '初始化返回值'); details.loadingObj.list = false; //关闭动画加载 - console.log(columnList[17].checkarr,'工单状态12312421'); 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[10].checkarr[0].label; //待处理 - } else if (item.workOrderStatus == 20) { - item.workOrderStatusNameS = columnList[10].checkarr[1].label; //处理中 - } else if (item.workOrderStatus == 30) { - item.workOrderStatusNameS = columnList[10].checkarr[2].label; //已处理 - } else if (item.workOrderStatus == 40) { - item.workOrderStatusNameS = columnList[10].checkarr[4].label; //待审核 - } else if (item.workOrderStatus == 50) { - item.workOrderStatusNameS = columnList[10].checkarr[5].label; //已审核 - } else if (item.workOrderStatus == 60) { - item.workOrderStatusNameS = columnList[10].checkarr[3].label; //超时未处理 - } else if (item.workOrderStatus == 70) { - item.workOrderStatusNameS = columnList[10].checkarr[6].label; //仲裁中 - } else if (item.workOrderStatus == 80) { - item.workOrderStatusNameS = columnList[10].checkarr[7].label; //完结 - } else if (item.workOrderStatus == 90) { - item.workOrderStatusNameS = columnList[10].checkarr[8].label; //理赔金未出 - }else if (item.workOrderStatus == 21) { - item.workOrderStatusNameS = columnList[10].checkarr[9].label; //处理结果已提交 - }else if (item.workOrderStatus == 100) { - item.workOrderStatusNameS = columnList[10].checkarr[10].label; //已结束 - } - }); + Statusprocessing(res.data.data.records); details.data = res.data.data.records; } else { details.data = res.data.data.records; @@ -1236,15 +1258,14 @@ const IndexTable = val => { }; // 表格切换 -const Tableheaderswitching = val => { +const Tableheaderswitching = val => { publicColumnList.value = val; //默认加载表格 - details.columnList = 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; @@ -1255,13 +1276,12 @@ const OnLoad = () => { BatchcompletionHeight.value = screenHeight.value * 0.6; loading.value = true; //开启加载效果 let data = {}; - console.log(page, 'page'); 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(); + IndexTable(details.query); getDeptWarehouse({}).then(res => { res.data.data.forEach(item => { warehouseData.value.push({ @@ -1288,22 +1308,6 @@ function updateDictionary(targetArray, dictionaryType) { // 字典请求函数 const AddInfo = () => { $router.push('/aftersales/aftersalesWorkOrderAdd'); - // Indexform.value = {}; //清空表单 - // IndexException.value = []; - // DiscoveringNodes.value = []; - // // Indexdialog.value = true; //开启新增弹窗 - // FromDisabled.value = false; //禁用输入框 - // updateDictionary(IndexException.value, 'pc_work_order'); //异常类型 - // updateDictionary(DiscoveringNodes.value, 'pc_discovery_node'); //发现环节 - // getDeptWarehouse({}).then(res => { - // console.log(res, '处理方'); - // res.data.data.forEach(item => { - // warehouseData.value.push({ - // value: item.id, - // label: item.name, - // }); - // }); - // }); }; // 上传图片规则 const beforeAvatarUpload = rawFile => { @@ -1353,7 +1357,6 @@ const ConfirmForm = () => { typesOf: 1, }); }); - // processorEntityList.push(ResponsibleParty); console.log(processorEntityList, 'processorEntityList'); let DataSubmit = { ...Indexform.value }; //定义初始化 @@ -1362,7 +1365,6 @@ const ConfirmForm = () => { delete DataSubmit.processor; //移除多余字段 console.log(DataSubmit, '处理好的表单信息'); console.log(warehouseData.value, 'warehouseData.value'); - Indexdialog.value = false; //关闭表单弹窗 $_submit(DataSubmit).then(res => { if (res.data.code == 200) { @@ -1383,7 +1385,7 @@ const searchHide = () => { // 异常工单号点击查看 const InformationViewing = val => { - console.log(val,'当前行数据'); + console.log(val, '当前行数据'); if (AppealStatusT.value) { // 表示当前在申诉列表 $router.push({ @@ -1405,25 +1407,25 @@ const InformationViewing = val => { return; } // 理赔金额未出 - if(TabPermissions.value==4){ + if (TabPermissions.value == 4) { $router.push({ - // AppealStatusT为真表示是申诉列表 - path: '/aftersales/aftersalesWorkOrderInfo', - query: { - id: val.row.lawoId, - appealID: val.row.id, //只有申诉才需要的参数 - name: val.row.workOrderNumber + '-信息查看', - warehouseId: val.row.warehouseId, - workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 - businessId: val.row.businessId, - ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 - RouteIndexs: TabPermissions.value, //当前记录参数 - Routstate: '', //申诉列表 - AppealReview: val.row.typesOf ? (val.row.typesOf == '0' ? 'true' : 'false') : 'true', //当前只能查看申诉详情信息 - workOrderStatus: val.row.workOrderStatus, //订单状态 - }, - }); - return + // AppealStatusT为真表示是申诉列表 + path: '/aftersales/aftersalesWorkOrderInfo', + query: { + id: val.row.lawoId, + appealID: val.row.id, //只有申诉才需要的参数 + name: val.row.workOrderNumber + '-信息查看', + warehouseId: val.row.warehouseId, + workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 + businessId: val.row.businessId, + ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 + RouteIndexs: TabPermissions.value, //当前记录参数 + Routstate: '', //申诉列表 + AppealReview: val.row.typesOf ? (val.row.typesOf == '0' ? 'true' : 'false') : 'true', //当前只能查看申诉详情信息 + workOrderStatus: val.row.workOrderStatus, //订单状态 + }, + }); + return; } $router.push({ path: '/aftersales/aftersalesWorkOrderInfo', @@ -1441,26 +1443,49 @@ const InformationViewing = val => { // 首页查看详情按钮 const view = val => { console.log(val.row); + if (AppealStatusT.value) { + // 表示当前在申诉列表 + $router.push({ + // AppealStatusT为真表示是申诉列表 + path: '/aftersales/aftersalesWorkOrderInfo', + query: { + id: val.row.workOrderId, + appealID: val.row.id, //只有申诉才需要的参数 + name: val.row.workOrderNumber + '-信息查看', + warehouseId: val.row.warehouseId, + workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 + businessId: val.row.businessId, + ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 + RouteIndexs: TabPermissions.value, //当前记录参数 + Routstate: 'appeal', //申诉列表 + AppealReview: val.row.typesOf == '0' ? 'true' : 'false', //当前只能查看申诉详情信息 + }, + }); + return; + } + + + // 理赔查看 - if(TabPermissions.value==4){ + if (TabPermissions.value == 4) { $router.push({ - // AppealStatusT为真表示是申诉列表 - path: '/aftersales/aftersalesWorkOrderInfo', - query: { - id: val.row.lawoId, - appealID: val.row.id, //只有申诉才需要的参数 - name: val.row.workOrderNumber + '-信息查看', - warehouseId: val.row.warehouseId, - workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 - businessId: val.row.businessId, - ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 - RouteIndexs: TabPermissions.value, //当前记录参数 - Routstate: '', //申诉列表 - AppealReview: val.row.typesOf ? (val.row.typesOf == '0' ? 'true' : 'false') : 'true', //当前只能查看申诉详情信息 - workOrderStatus: val.row.workOrderStatus, //订单状态 - }, - }); - return + // AppealStatusT为真表示是申诉列表 + path: '/aftersales/aftersalesWorkOrderInfo', + query: { + id: val.row.lawoId, + appealID: val.row.id, //只有申诉才需要的参数 + name: val.row.workOrderNumber + '-信息查看', + warehouseId: val.row.warehouseId, + workOrderNumber: val.row.workOrderNumber, //添加异常记录包条码 + businessId: val.row.businessId, + ProcessType: TabPermissions.value == 2 ? '2' : TabPermissions.value == 3 ? '1' : '', //类型 1 待处理 2 已处理 + RouteIndexs: TabPermissions.value, //当前记录参数 + Routstate: '', //申诉列表 + AppealReview: val.row.typesOf ? (val.row.typesOf == '0' ? 'true' : 'false') : 'true', //当前只能查看申诉详情信息 + workOrderStatus: val.row.workOrderStatus, //订单状态 + }, + }); + return; } $router.push({ @@ -1676,45 +1701,46 @@ const appeal = (val, state) => { } }; // 确定理赔金额 -const DetermineClaims=(val)=>{ +const DetermineClaims = val => { console.log(val.row); - let data={ - id:val.row.lawoId, - workOrderStatus:30 - } + let data = { + id: val.row.lawoId, + workOrderStatus: 30, + }; details.loadingObj.list = true; //开启动画加载 - - console.log(data,'处理好的值'); - $_settlementUpdate(data).then(res=>{ - console.log(res); - details.loadingObj.list = false; //关闭动画加载 - if(res.data.code==200){ - tabChenge(TabPermissions.value); - } - }).catch(res=>{ - details.loadingObj.list = false; //关闭动画加载 - }) -} + console.log(data, '处理好的值'); + $_settlementUpdate(data) + .then(res => { + console.log(res); + details.loadingObj.list = false; //关闭动画加载 + if (res.data.code == 200) { + tabChenge(TabPermissions.value); + } + }) + .catch(res => { + details.loadingObj.list = false; //关闭动画加载 + }); +}; // 理赔金额未出编辑操作 -const Resultediting=(val)=>{ - console.log(val.row,'参数'); +const Resultediting = val => { + console.log(val.row, '参数'); // return - console.log(val.row,'理赔金额未出'); + console.log(val.row, '理赔金额未出'); $router.push({ path: '/aftersales/aftersalesWorkOrdermodify', query: { id: val.row.lawoId, - subId:val.row.laprId, + subId: val.row.laprId, name: val.row.workOrderNumber + '-理赔金额未出编辑', - businessId:val.row.businessId, + businessId: val.row.businessId, warehouseId: val.row.warehouseId, - workOrderNumber:val.row.workOrderNumber, - RouterState:'Kfend', - Processingresults:true,//理赔编辑 + workOrderNumber: val.row.workOrderNumber, + RouterState: 'Kfend', + Processingresults: true, //理赔编辑 index: '1', }, }); -} +}; // 工单申诉确认按钮 const Appealbutton = state => { @@ -1791,16 +1817,11 @@ const Appealbutton = state => { appealData.value = {}; //清空当前行申诉数据 if (AppealStatusT.value) { Tableheaderswitching(AppealList); //切换表头 - AppealList.forEach(item => { - //清空搜索记录 - item.values = ''; - }); appealFn(); // 获取申诉列表 } else { data.workOrderStatus = 80; details.query.workOrderStatus = 80; tabValue.value = 6; - empty(); //清空搜索数据 IndexTable({ workOrderStatus: 80 }); } ElMessage({ @@ -1811,69 +1832,72 @@ const Appealbutton = state => { } }; -// 异常类型事件 -const abnormalChange = val => { - console.log(val); - StateType.value = false; - if (val == 1 || val == 2 || val == 3) { - SelectType.value = val; - } else { - StateType.value = true; - } -}; - -// 发现节点事件 -const DiscoveringNodesChange = val => { - groundlineSet.value = false; //干线条件都满足 - if (val == 1 || val == 2 || val == 3 || val == 4 || val == 5) { - groundlineType.value = val; //干线状态 - } else { - groundlineSet.value = true; //展示所有搜索框 - } -}; -// 照片 -const handleRemove = (uploadFile, uploadFiles) => { - console.log(uploadFile, uploadFiles); -}; - -const handlePictureCardPreview = uploadFile => { - dialogImageUrl.value = uploadFile.url; - dialogVisible.value = true; -}; - /** 表格表头输入框搜索 */ const inputsc = (index, row) => { + console.log('调用了表格输入参数'); processRowProperty(index, row, details); details.query[row.prop] = index; - - if (TimeoutStatus.value) { - // 超时列表 - TimeoutHandling(details.query); + // tabChenge( TabPermissions.value,details.query) + DataRendering(TabPermissions.value,details.query) + return + console.log('没有执行'); + if (TabPermissions.value == '4') { + // 理赔金额未出 + settlementclaim(details.query); return; } - if (AppealStatus.value) { + if (AppealStatusT.value && TabPermissions.value == '6') { // 申诉列表 appealFn(details.query); return; } - - if (ClaimStatus.value) { - // 这是理赔搜索 - settlementclaim(details.query); + if (TabPermissions.value == '8') { + // 待回复 + ProcessingPartyFun(details.query); return; } - - if (!ProcessingPartyState.value) { - IndexTable(details.query); //首页初始化信息 - console.log('首页'); - } else { - ProcessingPartyFun(details.query); //处理方信息 - console.log('处理方'); + if (TabPermissions.value == '7') { + TimeoutHandling(details.query); //超时未处理 + return } + + IndexTable(details.query); //首页初始化信息 + + // ======= + + // if (TimeoutStatus.value) { + // // 超时列表 + // TimeoutHandling(details.query); + // return; + // } + + // if (AppealStatus.value) { + // // 申诉列表 + // appealFn(details.query); + // return; + // } + + // if (ClaimStatus.value) { + // // 这是理赔搜索 + // settlementclaim(details.query); + // return; + // } + + // if (!ProcessingPartyState.value) { + // IndexTable(details.query); //首页初始化信息 + // console.log('首页'); + // } else { + // ProcessingPartyFun(details.query); //处理方信息 + // console.log('处理方'); + // } }; // 网页顶部搜索按钮 const searchChange = () => { + + DataRendering(TabPermissions.value,details.query) + return + if (ClaimStatus.value) { // 表示这是理赔查询 settlementclaim(); @@ -1888,17 +1912,28 @@ const searchChange = () => { ProcessingPartyFun(details.query); //处理方信息 } }; -// 清空头部搜索 -const empty = () => { + +const emptyvalues = data => { details.columnList.forEach(item => { item.values = ''; }); }; -const searchChangeS = () => { - console.log(details.columnList); + +// 清空头部搜索条件 +const empty = () => { +// 清空搜索参数 + for (let key in details.query) { + if (key !== 'workOrderStatus') { + delete details.query[key]; + } +} + // let dataList = [columnList, recordList, Claimsfield, AppealList, timeoutList]; details.columnList.forEach(item => { item.values = ''; }); +}; +const searchChangeS = () => { + console.log(details.columnList); details.search = false; //关闭搜索 // tabValue.value = 0; // IndexTable(); //首页初始化信息 @@ -1930,11 +1965,18 @@ const btnsc = val => { /** 表格表头下拉框选择 */ const selectsc = (index, row) => { processRowProperty(index, row, details); + console.log(details, '下拉的参数'); + details.query.workOrderStatus = TabPermissions.value; + + DataRendering(TabPermissions.value,details.query) + return + if (TimeoutStatus.value) { // 超时列表 TimeoutHandling(details.query); return; } + if (AppealStatus.value) { // 申诉列表 appealFn(details.query); @@ -1966,8 +2008,6 @@ const Antidictionary = (val, data) => { }); }; -function onLoad() {} - /** 表格表头复选框选择 */ const selectionChange = list => { console.log(list, '当前选择的数据'); @@ -1977,7 +2017,8 @@ const selectionChange = list => { /** 页码改变执行的回调 */ const currentChange = val => { page.value.currentPage = val; - + DataRendering(TabPermissions.value,details.query) + return // 超时 if (TimeoutStatus.value) { TimeoutHandling(details.query); @@ -2006,6 +2047,8 @@ const currentChange = val => { // 每页多少条 const sizeChange = val => { page.value.pageSize = val; + DataRendering(TabPermissions.value,details.query) + return // 超时 if (TimeoutStatus.value) { TimeoutHandling(details.query); @@ -2118,20 +2161,22 @@ const settlementclaim = val => { ...val, }; console.log(data, '要传递的参数'); - $_listSettlement(data).then(res => { - details.loadingObj.list = false; //关闭动画加载 - console.log(res, '查询理赔数据'); - if(res.data.data){ - if(res.data.data.records.length){ - details.data = res.data.data.records; //数据 - }else{ - details.data=[] + $_listSettlement(data) + .then(res => { + details.loadingObj.list = false; //关闭动画加载 + console.log(res, '查询理赔数据'); + if (res.data.data) { + if (res.data.data.records.length) { + details.data = res.data.data.records; //数据 + } else { + details.data = []; + } + page.value.total = res.data.data.total; } - page.value.total = res.data.data.total; - } - }).catch(res=>{ - details.loadingObj.list = false; //关闭动画加载 - }); + }) + .catch(res => { + details.loadingObj.list = false; //关闭动画加载 + }); }; // 获取申诉列表 const appealFn = val => { @@ -2150,19 +2195,21 @@ const appealFn = val => { identifying: UserPermissions.value != '仓库客服' ? '2' : '1', ...val, }; - $_listAppeal(data).then(res => { - details.loadingObj.list = false; //开启动画加载 - console.log(res, '申诉列表返回值'); + $_listAppeal(data) + .then(res => { + details.loadingObj.list = false; //开启动画加载 + console.log(res, '申诉列表返回值'); - if (res.data.data.records.length) { - details.data = res.data.data.records; - } else { - details.data = []; - } - page.value.total = res.data.data.total; - }).catch(res=>{ - details.loadingObj.list = false; //关闭动画加载 - }); + if (res.data.data.records.length) { + details.data = res.data.data.records; + } else { + details.data = []; + } + page.value.total = res.data.data.total; + }) + .catch(res => { + details.loadingObj.list = false; //关闭动画加载 + }); }; // 申诉列表 @@ -2174,7 +2221,7 @@ const AppealTab = val => { ProcessingPartyState.value = false; //关闭处理方 details.query.workOrderStatus = 80; ArbitrationStatus.value = false; //不可以申请仲裁 - empty(); //清空搜索数据 + // empty(); //清空搜索数据 let data = { ...details.query, }; @@ -2188,7 +2235,7 @@ const AppealTab = val => { Reasonforappeal.value = ''; //清空申诉内容 }; // 申诉列表公共函数 -function AppealListFn() { +function AppealListFn(val) { AppealStatusT.value = true; //申诉列表开启 data.workOrderStatus = ''; console.log(data.workOrderStatus, '当前搜索状态'); @@ -2197,7 +2244,7 @@ function AppealListFn() { //清空搜索记录 item.values = ''; }); - appealFn(); // 获取申诉列表 + appealFn(val); // 获取申诉列表 } // 超时金额修改 @@ -2234,22 +2281,19 @@ function getWinHight() { document.body.clientHeight < document.documentElement.clientHeight ? document.body.clientHeight : document.documentElement.clientHeight; - } else { - // windowHight=(document.body.clientHeight>document.documentElement.clientHeight)?document.body.clientHeight:document.documentElement.clientHeight; } - // return windowHight; return document.documentElement.clientHeight; } -const height = val => { - console.log('执行了计算高度'); - var bodyContent = document.querySelectorAll('.maboxhi'); - const _height = getWinHight(); - // 设置列表的高度 - bodyContent.forEach(val => { - val.style.height = _height - val.getBoundingClientRect().top - val + 'px'; - }); -}; +// const height = val => { +// console.log('执行了计算高度'); +// var bodyContent = document.querySelectorAll('.maboxhi'); +// const _height = getWinHight(); +// // 设置列表的高度 +// bodyContent.forEach(val => { +// val.style.height = _height - val.getBoundingClientRect().top - val + 'px'; +// }); +// }; // 查询超时记录 const TimeoutHandling = val => { timeoutList[3].checkarr = []; //异常类型名称 @@ -2273,81 +2317,194 @@ const TimeoutHandling = val => { }); }; -// 标签栏触发 -const tabChenge = val => { - TabPermissions.value = val; //记录当前点击的菜单 - AppealStatusT.value = false; //申诉列表关闭 +// 数据渲染公共函数 +const DataRendering =(val,input)=>{ + // val:当前是在哪一个菜单下面 + //input:当前传入的搜索参数 + console.log('执行了公共函数'); + if(val !=6){ + AppealStatusT.value = false; //申诉列表关闭 + } console.log(val, '触发了标签栏'); - let data = {}; + let data = { + ...input, //搜索输入框 + }; + if (val == 0) { ProcessingPartyState.value = false; //关闭处理方 - ArbitrationStatus.value = true; //可以以申请仲裁 if (UserPermissions.value == '仓库客服') { + //全部 data.workOrderStatus = 1000; details.query.workOrderStatus = 1000; Tableheaderswitching(columnList); IndexTable(data); - empty(); } else { details.query.workOrderStatus = null; Tableheaderswitching(columnList); IndexTable(); - empty(); - console.log('全部'); } } else if (val == 1) { // 处理中 if (UserPermissions.value == '仓库客服') { data.workOrderStatus = 20; details.query.workOrderStatus = 20; - Tableheaderswitching(columnList); - empty(); - IndexTable(data); } else { data.workOrderStatus = 40; details.query.workOrderStatus = 40; - Tableheaderswitching(columnList); - empty(); - IndexTable(data); } ProcessingPartyState.value = false; //关闭处理方 ArbitrationStatus.value = true; //可以申请仲裁 + Tableheaderswitching(columnList); + IndexTable(data); } else if (val == 2) { - console.log('处理完毕'); + //处理完毕 data.workOrderStatus = 30; details.query.workOrderStatus = 30; + ProcessingPartyState.value = false; //关闭处理方 + ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); + IndexTable(data); + } else if (val == 3) { + // 待处理 + ProcessingPartyState.value = true; //开启处理方 + if (UserPermissions.value != '仓库客服') { + data.workOrderStatus = 500; + details.query.workOrderStatus = 500; + } else { + data.workOrderStatus = 10; + details.query.workOrderStatus = 10; + } + ArbitrationStatus.value = true; //可以申请仲裁 + Tableheaderswitching(columnList); + IndexTable(data); + } else if (val == 4) { + // 理赔金额未出 + ProcessingPartyState.value = false; //关闭处理方 + details.query.workOrderStatus = null; + ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(Claimsfield); //切换表格 + settlementclaim(data); + } else if (val == 5) { + // 仲裁中 + ProcessingPartyState.value = false; //关闭处理方 + data.workOrderStatus = 70; + details.query.workOrderStatus = 70; + ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); //表头切换 + IndexTable(data); + } else if(val == 6 && AppealStatusT.value){ + console.log('申诉列表'); + data.workOrderStatus = null; + details.query.workOrderStatus = null; + AppealListFn(data); //申诉列表函数 + } else if (val == 6) { + // 完结 + ProcessingPartyState.value = false; //关闭处理方 + data.workOrderStatus = 80; + details.query.workOrderStatus = 80; + ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); //表头切换 + IndexTable(data); + var bodyContent = document.querySelectorAll('.maboxhi'); + const _height = getWinHight(); + // 设置列表的高度 + bodyContent.forEach(val => { + val.style.height = _height - val.getBoundingClientRect().top - (65 + 20) + 'px'; + }); + } else if (val == 7) { + // 超时未处理 + ProcessingPartyState.value = false; //关闭处理方 + data.workOrderStatus = null; + details.query.workOrderStatus = null; + ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(timeoutList); //表头切换 + TimeoutHandling(); //调用超时未出理 + } else if (val == 8) { + // 待回复按钮 + if (UserPermissions.value == '仓库客服') { + // 不是仓库客服看不见待回复按钮 + data.workOrderStatus = null; + details.query.workOrderStatus = null; + Tableheaderswitching(columnList); + ProcessingPartyFun(data); + } + } + console.log('执行完毕'); +} + + + +// 标签栏触发 + +const tabChenge = async (val, input) => { + TabPermissions.value = val; //记录当前点击的菜单 + + if(val !=6){ + AppealStatusT.value = false; //申诉列表关闭 + } + console.log(val, '触发了标签栏'); + let data = { + ...input, //搜索输入框 + }; + await empty(); + DataRendering(TabPermissions.value,input) + return + if (val == 0) { + ProcessingPartyState.value = false; //关闭处理方 + ArbitrationStatus.value = true; //可以以申请仲裁 + if (UserPermissions.value == '仓库客服') { + //全部 + data.workOrderStatus = 1000; + details.query.workOrderStatus = 1000; + Tableheaderswitching(columnList); + IndexTable(data); + } else { + details.query.workOrderStatus = null; + Tableheaderswitching(columnList); + IndexTable(); + } + } else if (val == 1) { + // 处理中 + if (UserPermissions.value == '仓库客服') { + data.workOrderStatus = 20; + details.query.workOrderStatus = 20; + } else { + data.workOrderStatus = 40; + details.query.workOrderStatus = 40; + } + ProcessingPartyState.value = false; //关闭处理方 + ArbitrationStatus.value = true; //可以申请仲裁 Tableheaderswitching(columnList); - empty(); IndexTable(data); - // 处理完毕 + } else if (val == 2) { + //处理完毕 + data.workOrderStatus = 30; + details.query.workOrderStatus = 30; ProcessingPartyState.value = false; //关闭处理方 ArbitrationStatus.value = false; //不可以申请仲裁 + Tableheaderswitching(columnList); + IndexTable(data); } else if (val == 3) { // 待处理 - console.log(UserPermissions.value, '当前身份'); - console.log('待处理'); ProcessingPartyState.value = true; //开启处理方 if (UserPermissions.value != '仓库客服') { data.workOrderStatus = 500; details.query.workOrderStatus = 500; - ArbitrationStatus.value = true; //可以申请仲裁 } else { data.workOrderStatus = 10; details.query.workOrderStatus = 10; - ArbitrationStatus.value = true; //可以申请仲裁 } + ArbitrationStatus.value = true; //可以申请仲裁 Tableheaderswitching(columnList); - empty(); IndexTable(data); } else if (val == 4) { - ProcessingPartyState.value = false; //关闭处理方 // 理赔金额未出 + ProcessingPartyState.value = false; //关闭处理方 details.query.workOrderStatus = null; ArbitrationStatus.value = false; //不可以申请仲裁 Tableheaderswitching(Claimsfield); //切换表格 - empty(); - settlementclaim(); + settlementclaim(data); } else if (val == 5) { // 仲裁中 ProcessingPartyState.value = false; //关闭处理方 @@ -2355,19 +2512,20 @@ const tabChenge = val => { details.query.workOrderStatus = 70; ArbitrationStatus.value = false; //不可以申请仲裁 Tableheaderswitching(columnList); //表头切换 - empty(); IndexTable(data); - } else if (val == 6) { + } else if(val == 6 && AppealStatusT.value){ + console.log('申诉列表'); + data.workOrderStatus = null; + details.query.workOrderStatus = null; + AppealListFn(data); //申诉列表函数 + } else if (val == 6) { // 完结 ProcessingPartyState.value = false; //关闭处理方 data.workOrderStatus = 80; details.query.workOrderStatus = 80; ArbitrationStatus.value = false; //不可以申请仲裁 Tableheaderswitching(columnList); //表头切换 - empty(); IndexTable(data); - - console.log('执行了计算高度'); var bodyContent = document.querySelectorAll('.maboxhi'); const _height = getWinHight(); // 设置列表的高度 @@ -2378,22 +2536,21 @@ const tabChenge = val => { // 超时未处理 ProcessingPartyState.value = false; //关闭处理方 data.workOrderStatus = null; - details.query.workOrderStatus = ''; + details.query.workOrderStatus = null; ArbitrationStatus.value = false; //不可以申请仲裁 Tableheaderswitching(timeoutList); //表头切换 - empty(); TimeoutHandling(); //调用超时未出理 } else if (val == 8) { // 待回复按钮 - console.log('待回复'); if (UserPermissions.value == '仓库客服') { - data.workOrderStatus = ''; - details.query.workOrderStatus = ''; + // 不是仓库客服看不见待回复按钮 + data.workOrderStatus = null; + details.query.workOrderStatus = null; Tableheaderswitching(columnList); - empty(); ProcessingPartyFun(data); } } + console.log('执行完毕'); }; /** * 设置列表 -- 固定函数 @@ -2417,12 +2574,13 @@ const showdrawer = _flag => { details.drawerShow = _flag; }; -// 处理方数据公共函数 +// 待回复处理方数据公共函数 const ProcessingPartyFun = val => { + console.log('触发了待回复'); ClaimStatus.value = false; //关闭理赔状态 TimeoutStatus.value = false; //关闭超时 AppealStatus.value = false; //关闭申诉状态 - details.query.workOrderStatus = null; + // details.query.workOrderStatus = null; details.loadingObj.list = true; //开启动画加载 let data = { ...val, @@ -2430,60 +2588,64 @@ const ProcessingPartyFun = val => { console.log(val, 'val接收的参数'); columnList[2].checkarr = []; //重置下拉搜索框 columnList[3].checkarr = []; - data.current = page.value.currentPage; //页码 data.size = page.value.pageSize; //条数 updateDictionary(columnList[2].checkarr, 'pc_work_order'); //异常类型 updateDictionary(columnList[3].checkarr, 'pc_discovery_node'); //发现环节 - $_getProcessor(data).then(res => { - details.loadingObj.list = false; //关闭动画加载 - page.value.total = res.data.data.total; //总页数 - if (res.data.data.records.length) { - res.data.data.records.forEach(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; //安装环节 - } - }); - details.data = res.data.data.records; - console.log(details.data, '存储的数据'); - } else { - details.data = res.data.data.records; //这里是空的 - } - loading.value = false; //关闭加载效果 - }); + $_getProcessor(data) + .then(res => { + details.loadingObj.list = false; //关闭动画加载 + page.value.total = res.data.data.total; //总页数 + if (res.data.data.records.length) { + Statusprocessing(res.data.data.records); + // res.data.data.records.forEach(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; //安装环节 + // } + // }); + details.data = res.data.data.records; + console.log(details.data, '存储的数据'); + } else { + details.data = res.data.data.records; //这里是空的 + } + loading.value = false; //关闭加载效果 + }) + .catch(res => { + loading.value = false; //关闭加载效果 + }); }; // 获取聊天记录 @@ -2608,7 +2770,8 @@ const DetermineStorage = val => { ID = val.row.id; data['assignList'].push(ID); details.loadingObj.list = true; //开启加载效果 - if(UserPermissions.value =='总部客服经理' && TabPermissions.value == '2'){ + if (UserPermissions.value == '总部客服经理' && TabPermissions.value == '1') { + // 完结结果确定 $_updateManagerConfirmed(data) .then(res => { if (res.data.code == 200) { @@ -2625,12 +2788,14 @@ const DetermineStorage = val => { }); // 赔款方 console.log(data, '处理好的值'); - - return + + return; } -// 仓库客服 - if (TabPermissions.value == '2' && UserPermissions.value=='仓库客服' && val.row.workOrderStatus != '30') { - + // 仓库客服 + if ( + TabPermissions.value == '2' && UserPermissions.value == '仓库客服' && val.row.workOrderStatus != '30' + ) { + // 处理结果确定 console.log(data, '处理好的数据'); $_updateWorkOrderStatus(data) .then(res => { @@ -2737,7 +2902,7 @@ const Assignbutton = () => { AssignLoad.value = false; //关闭加载和按钮禁止重复点击 dialogassign.value = false; //关闭指派工单弹窗 console.log(res, '工单指派返回'); - IndexTable(); //首页初始化信息 + tabChenge(TabPermissions.value); if (res.data.code == 200) { ElMessage({ message: res.data.msg, @@ -2785,7 +2950,6 @@ const arbitrate = () => { // 发送请求 $_arbitrate(data).then(res => { console.log(res, '仲裁成功返回值'); - empty(); PagerefreshPublic(); if (res.data.code == 200) { ElMessage({ @@ -2826,7 +2990,6 @@ const DingTalkSubmit = () => { type: 'success', }); dialogDingTalk.value = false; //关闭钉钉号填写弹窗 - empty(); PagerefreshPublic(); //刷新页面 } }); diff --git a/src/views/aftersales/aftersalesWorkOrderAdd.vue b/src/views/aftersales/aftersalesWorkOrderAdd.vue index f5b971ad..cbfef0a5 100644 --- a/src/views/aftersales/aftersalesWorkOrderAdd.vue +++ b/src/views/aftersales/aftersalesWorkOrderAdd.vue @@ -2070,4 +2070,8 @@ const isShowFormItem2 = computed(() => { :deep(.el_inputTop) { margin-bottom: 0 !important; } +:deep(.el-form-item.is-required:not(.is-no-asterisk).asterisk-left > .el-form-item__label:before){ + color: #ff0000; +} + diff --git a/src/views/aftersales/aftersalesWorkOrderInfo.vue b/src/views/aftersales/aftersalesWorkOrderInfo.vue index eafac574..66652bf5 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfo.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfo.vue @@ -1128,6 +1128,8 @@ const onLoad = () => { cld: index + 1, id: item.id, accounting: item.accounting ? item.accounting : '', + warehouseId:item.warehouseId,//仓库 + personResponsibleList:item.compensationPersonnel,//责任人 }); }); } diff --git a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue index 55a7a0c8..b6d3114f 100644 --- a/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderInfoTemp.vue @@ -1,480 +1,484 @@