From 8280e45b2c7bf8304621d6673d5532877f6f8d9e Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Mon, 28 Oct 2024 10:42:52 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArteryPrintTemplate.vue | 75 +++++++++++++++++-- .../TripartiteTransferPrintTemplate.vue | 57 ++++++++++++-- src/utils/print.js | 2 +- 3 files changed, 121 insertions(+), 13 deletions(-) diff --git a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue index fe1c5a41..3380f4ed 100644 --- a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue +++ b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue @@ -132,11 +132,21 @@ {{ index + 1 }} - + {{ value.shipper || '' }} - + {{ value.createTime || '' }} @@ -148,19 +158,38 @@ {{ value.destinationWarehouseName || '' }} - + {{ value.consignee }} - + {{ value.consigneeName }} - + {{ value.consigneeMobile }} - + {{ value.waybillNo }} @@ -262,13 +291,47 @@ renderInfo.value = waybillInfo; const isShowTotal = ref(false); renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(','); + +// 合并起始索引 +let mergeStartIndex = 0; +// 比对值 +let comparisonValue = ''; +renderInfo.value.mainList[0].mergeColumnIndex = 1; + +const handleMerge = (startIndex: number, endIndex: number, data: {}) => { + for (let index = startIndex; index < endIndex; index++) { + const value = data[index]; + + if (index === startIndex) value.mergeColumnIndex = endIndex - startIndex; + else { + value.mergeColumnIndex = 0; + } + } +}; + for (let index = 0; index < renderInfo.value.mainList.length; index++) { const element = renderInfo.value.mainList[index]; + if (index === 0) comparisonValue = element.waybillNo; + totalNum.value += element.smallTotal || 0; totalUnLoadNum.value += element.unloadNum || 0; totalPlanNum.value += element.planNum || 0; + if (element.waybillNo !== comparisonValue) { + // if (index === 1) mergeStartIndex = 1; + comparisonValue = element.waybillNo; + handleMerge(mergeStartIndex, index, renderInfo.value.mainList); + mergeStartIndex = index; + + if (index === renderInfo.value.mainList.length - 1) { + handleMerge(mergeStartIndex, index + 1, renderInfo.value.mainList); + } + // 最后一位特殊处理 + } else if (index === renderInfo.value.mainList.length - 1) { + handleMerge(mergeStartIndex, index + 1, renderInfo.value.mainList); + } + if (element.goodsList && element.goodsList.length > 0) { for (let i = 0; i < element.goodsList.length; i++) { const item = element.goodsList[i]; diff --git a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue index a42c7e42..0e51ce6e 100644 --- a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue +++ b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue @@ -61,17 +61,29 @@ {{ index + 1 }} - {{ value.shipper || '' }} + + {{ value.shipper || '' }} + - {{ value.createTime || '' }} + + {{ value.createTime || '' }} + - {{ value.consignee }} + + {{ value.consignee }} + - {{ value.consigneeName }} + + {{ value.consigneeName }} + - {{ value.consigneeMobile }} + + {{ value.consigneeMobile }} + - {{ value.waybillNo }} + + {{ value.waybillNo }} + {{ value.orderCode }} @@ -141,14 +153,47 @@ renderInfo.value = waybillInfo; /** 是否显示金额统计 */ const isShowTotal = ref(false); +// 合并起始索引 +let mergeStartIndex = 0; +// 比对值 +let comparisonValue = ''; +renderInfo.value.mainList[0].mergeColumnIndex = 1; + +const handleMerge = (startIndex: number, endIndex: number, data: {}) => { + for (let index = startIndex; index < endIndex; index++) { + const value = data[index]; + + if (index === startIndex) value.mergeColumnIndex = endIndex - startIndex; + else { + value.mergeColumnIndex = 0; + } + } +}; + renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(','); for (let index = 0; index < renderInfo.value.mainList.length; index++) { const element = renderInfo.value.mainList[index]; + if (index === 0) comparisonValue = element.waybillNo; + totalNum.value += element.smallTotal || 0; totalUnLoadNum.value += element.unloadNum || 0; totalPlanNum.value += element.planNum || 0; + if (element.waybillNo !== comparisonValue) { + // if (index === 1) mergeStartIndex = 1; + comparisonValue = element.waybillNo; + handleMerge(mergeStartIndex, index, renderInfo.value.mainList); + mergeStartIndex = index; + + if (index === renderInfo.value.mainList.length - 1) { + handleMerge(mergeStartIndex, index + 1, renderInfo.value.mainList); + } + // 最后一位特殊处理 + } else if (index === renderInfo.value.mainList.length - 1) { + handleMerge(mergeStartIndex, index + 1, renderInfo.value.mainList); + } + if (element.goodsList && element.goodsList.length > 0) { for (let i = 0; i < element.goodsList.length; i++) { const item = element.goodsList[i]; diff --git a/src/utils/print.js b/src/utils/print.js index 72e5ee85..24077de9 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -25,7 +25,7 @@ const handleDeliveryPrint = (LODOP, templateData) => { // LODOP.SET_PRINT_STYLE('FontColor', '#000000'); // // 设置打印整宽且不变形 LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '100%'); - LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396, ''); + LODOP.SET_PRINT_PAGESIZE(1, 2160, 1396.5, ''); // // 设置打印后自动关闭 LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); From 810335217470cf6286cbc390789cf801a94aba36 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Mon, 28 Oct 2024 11:33:38 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E8=A3=85=E8=BD=A6?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/option/distribution/TripartiteTransfer.js | 8 ++++---- .../distribution/artery/VehicleStowageDetails.vue | 14 -------------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/src/option/distribution/TripartiteTransfer.js b/src/option/distribution/TripartiteTransfer.js index a0f623ec..27ecad1e 100644 --- a/src/option/distribution/TripartiteTransfer.js +++ b/src/option/distribution/TripartiteTransfer.js @@ -471,7 +471,7 @@ export const detailsColumnList = [ { prop: 'firsts', label: '一级品', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -481,7 +481,7 @@ export const detailsColumnList = [ { prop: 'senconds', label: '二级品', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -491,7 +491,7 @@ export const detailsColumnList = [ { prop: 'thirds', label: '三级品', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -501,7 +501,7 @@ export const detailsColumnList = [ { prop: 'materialName', label: '物料名称', - type: 1, + type: 2, values: '', width: '130', checkarr: [], diff --git a/src/views/distribution/artery/VehicleStowageDetails.vue b/src/views/distribution/artery/VehicleStowageDetails.vue index 064214da..b89a05c4 100644 --- a/src/views/distribution/artery/VehicleStowageDetails.vue +++ b/src/views/distribution/artery/VehicleStowageDetails.vue @@ -181,9 +181,6 @@ > 成本分摊确认 - 导出 @@ -423,13 +420,6 @@ - - - - import('@/components/Tableexportcomponent/Tableexportcomponent.vue') -); import { postCarsLoadDetailInfo, postFindCarsLoadLogs, @@ -515,7 +502,6 @@ const ruleFormRef = ref(); const oldColumnListNode = ref(); const abnormalTableRef = ref(); -const tcTableexport = ref(false); const exportColumnListNode = ref(); // 节点信息 const nodeInfoRef = ref(); From 1fe7c954e4a1316ca05d0b17827b3156e0cd0ed5 Mon Sep 17 00:00:00 2001 From: qb <1191961160@qq.com> Date: Mon, 28 Oct 2024 18:45:42 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B9=B2=E7=BA=BF?= =?UTF-8?q?=E9=83=A8=E5=88=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ArteryPrintTemplate.vue | 215 ++++++++++-------- .../TripartiteTransferPrintTemplate.vue | 96 ++++---- .../distribution/VehicleArrivalManagement.js | 8 +- src/option/distribution/VehicleStowage.js | 8 +- .../artery/TripartiteTransfer.vue | 6 + .../artery/VehicleArrivalManagement.vue | 6 + .../distribution/artery/VehicleStowage.vue | 6 + .../distribution/inventory/BookingNote.vue | 4 +- src/views/waybill/WaybillOrderList.vue | 24 +- 9 files changed, 203 insertions(+), 170 deletions(-) diff --git a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue index 3380f4ed..25ef3009 100644 --- a/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue +++ b/src/components/ArteryPrintTemplate/ArteryPrintTemplate.vue @@ -129,103 +129,116 @@ 小计 - - {{ index + 1 }} - - - {{ value.shipper || '' }} - - - - {{ value.createTime || '' }} - - - - {{ value.departureWarehouseName || '' }} - - - - {{ value.destinationWarehouseName || '' }} - - - - {{ value.consignee }} - - - - {{ value.consigneeName }} - - - - {{ value.consigneeMobile }} - - - - {{ value.waybillNo }} - - - - {{ value.orderCode }} - - - - {{ value.planNum }} - - - - - {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }} - - - - {{ value.smallTotal }} - - - - - - {{ value.unloadNum }} - - - - - - - - + @@ -296,8 +309,6 @@ renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(', let mergeStartIndex = 0; // 比对值 let comparisonValue = ''; -renderInfo.value.mainList[0].mergeColumnIndex = 1; - const handleMerge = (startIndex: number, endIndex: number, data: {}) => { for (let index = startIndex; index < endIndex; index++) { const value = data[index]; @@ -312,8 +323,10 @@ const handleMerge = (startIndex: number, endIndex: number, data: {}) => { for (let index = 0; index < renderInfo.value.mainList.length; index++) { const element = renderInfo.value.mainList[index]; - if (index === 0) comparisonValue = element.waybillNo; - + if (index === 0) { + comparisonValue = element.waybillNo; + element.mergeColumnIndex = 1; + } totalNum.value += element.smallTotal || 0; totalUnLoadNum.value += element.unloadNum || 0; totalPlanNum.value += element.planNum || 0; diff --git a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue index 0e51ce6e..40c210a8 100644 --- a/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue +++ b/src/components/TripartiteTransferPrintTemplate/TripartiteTransferPrintTemplate.vue @@ -58,50 +58,52 @@ - - {{ index + 1 }} - - - {{ value.shipper || '' }} - - - - {{ value.createTime || '' }} - - - - {{ value.consignee }} - - - - {{ value.consigneeName }} - - - - {{ value.consigneeMobile }} - - - - {{ value.waybillNo }} - - - {{ value.orderCode }} - - {{ value.planNum }} - - - - {{ (value.goodsList.find(val => val.goodsName === item) || {}).num || '' }} - - - {{ value.smallTotal }} - - {{ value.smallTotal }} - - {{ value.unloadNum }} - - - + @@ -157,7 +159,6 @@ const isShowTotal = ref(false); let mergeStartIndex = 0; // 比对值 let comparisonValue = ''; -renderInfo.value.mainList[0].mergeColumnIndex = 1; const handleMerge = (startIndex: number, endIndex: number, data: {}) => { for (let index = startIndex; index < endIndex; index++) { @@ -174,7 +175,10 @@ renderInfo.value.endWarehouseNames = renderInfo.value.endWarehouseNames.split(', for (let index = 0; index < renderInfo.value.mainList.length; index++) { const element = renderInfo.value.mainList[index]; - if (index === 0) comparisonValue = element.waybillNo; + if (index === 0) { + comparisonValue = element.waybillNo; + element.mergeColumnIndex = 1; + } totalNum.value += element.smallTotal || 0; totalUnLoadNum.value += element.unloadNum || 0; diff --git a/src/option/distribution/VehicleArrivalManagement.js b/src/option/distribution/VehicleArrivalManagement.js index df08a80d..d6c824a8 100644 --- a/src/option/distribution/VehicleArrivalManagement.js +++ b/src/option/distribution/VehicleArrivalManagement.js @@ -145,7 +145,7 @@ export const columnList = [ { prop: 'driverName', label: '主驾司机', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -165,7 +165,7 @@ export const columnList = [ { prop: 'carNumber', label: '车牌号', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -175,7 +175,7 @@ export const columnList = [ { prop: 'startWarehouseName', label: '起点仓库', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -185,7 +185,7 @@ export const columnList = [ { prop: 'endWarehouseNames', label: '终点仓库', - type: 1, + type: 2, values: '', width: '130', checkarr: [], diff --git a/src/option/distribution/VehicleStowage.js b/src/option/distribution/VehicleStowage.js index 4b30abb8..1db42ef8 100644 --- a/src/option/distribution/VehicleStowage.js +++ b/src/option/distribution/VehicleStowage.js @@ -145,7 +145,7 @@ export const columnList = [ { prop: 'driverName', label: '主驾司机', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -165,7 +165,7 @@ export const columnList = [ { prop: 'carNumber', label: '车牌号', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -175,7 +175,7 @@ export const columnList = [ { prop: 'startWarehouseName', label: '起点仓库', - type: 1, + type: 2, values: '', width: '130', checkarr: [], @@ -185,7 +185,7 @@ export const columnList = [ { prop: 'endWarehouseNames', label: '终点仓库', - type: 1, + type: 2, values: '', width: '130', checkarr: [], diff --git a/src/views/distribution/artery/TripartiteTransfer.vue b/src/views/distribution/artery/TripartiteTransfer.vue index e4011a9e..d5dcf440 100644 --- a/src/views/distribution/artery/TripartiteTransfer.vue +++ b/src/views/distribution/artery/TripartiteTransfer.vue @@ -499,6 +499,12 @@ > + + + + + + diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 407b32df..68ff4330 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -1,3 +1,6 @@ +/** + *全部列表 + */ export const columnList = [ { prop: '', @@ -361,6 +364,3003 @@ export const columnList = [ sortable: false, }, ]; +/** + *待回复列表 + */ +export const columnList8 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *待处理列表 + */ +export const columnList3 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *处理中列表 + */ +export const columnList1 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *理赔金额未出列表 + */ +export const columnList4 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'businessName', + label: '营业部', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'mallName', + label: '商场名称', + type: 2, + values: '', + width: '110', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'workOrderTypeName', + label: '异常类型名称', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + + { + prop: 'resultTypeName', + label: '处理结果名称', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryNodeName', + label: '发现环节', + type: 3, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'resultDescription', + label: '处理结果说明', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'vehicleRoute', + label: '车辆路线', + type: 2, + values: '', + width: '110', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'indemnitor', + label: '赔款方', + type: 3, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reason', + label: '判责原因', + type: 2, + values: '', + width: '110', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'money', + label: '金额', + type: 2, + values: '', + width: '100', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'processNumber', + label: '钉钉流程号', + type: 2, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'workOrderStatusName', + label: '工单状态', + type: 1, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '170', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *处理完毕列表 + */ +export const columnList2 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *客服介入列表 + */ +export const columnList5 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *待审核列表 + */ +export const columnList9 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *完结列表 + */ +export const columnList6 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'workOrderTypeNameS', //workOrderType + label: '异常类型', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', //discoveryNode + label: '发现节点', + type: 3, + values: '', + width: '140', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'packageCode', + // label: '包条码', + // type: 2, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'first', + label: '一级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'secondary', + label: '二级品', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillMall', + label: '运单商场', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'brandName', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerServiceName', + label: '归属客服名称', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalAmount', + label: '赔款金额', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'entryTime', + label: '财务入账时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'operator', + label: '操作人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverGoodsTime', + label: '送货时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'discoveryTime', + label: '发现时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehousingTime', + label: '入库时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'deliveryTime', + label: '配送时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryDriver', + label: '配送司机', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'trainNumber', + label: '车次号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'vehicleRoute', + label: '车辆线路', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'overTime', + label: '完结时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'investigationProcess', + label: '调查经过', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + // { + // prop: 'personResponsible', + // label: '责任人(库内作业环节)', + // type: 2, + // values: '', + // width: '170', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + { + prop: 'processNumber', + label: '钉钉流程号', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'reviewedBy', + label: '审核人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'auditTime', + label: '审核时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'createTime', + label: '录入时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'remarks', + label: '备注', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'createUserName', + label: '操作', + type: 6, + values: '', + width: '130', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *申诉列表 + */ +export const columnList10 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'waybillNumber', + label: '运单号', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderTypeName', + label: '异常类型', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeName', + label: '发现节点', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'typesOfName', + label: '工单状态', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '100', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +/** + *超时列表 + */ +export const columnList7 = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + + { + prop: 'workOrderNumber', + label: '异常工单号', + type: 13, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'workOrderTypeNameS', + label: '异常类型', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'discoveryNodeNameS', + label: '发现节点名称', + type: 3, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'money', + label: '金额', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + { + prop: 'timeout', + label: '超时时间', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + // { + // prop: 'warehouseId', + // label: '仓库ID', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + + { + prop: 'businessName', + label: '处理方名称', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + + // { + // prop: 'businessId', + // label: '处理方ID', + // type: 2, + // values: '', + // width: '130', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + + { + prop: 'remarks', + label: '备注', + type: 2, + values: '', + width: '130', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '120', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; export const recordList = [ { diff --git a/src/option/finance/CustomerSettlement.js b/src/option/finance/CustomerSettlement.js index 49fd9e59..f6ac758a 100644 --- a/src/option/finance/CustomerSettlement.js +++ b/src/option/finance/CustomerSettlement.js @@ -17,7 +17,7 @@ export const columnList = [ { prop: 'balanceOrderNo', label: '结算单号', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -28,7 +28,7 @@ export const columnList = [ { prop: 'brand', label: '品牌', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -39,7 +39,7 @@ export const columnList = [ { prop: 'waybillNo', label: '运单号', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -50,7 +50,7 @@ export const columnList = [ { prop: 'orderCode', label: '订单编号', - type: 1, + type: 2, values: '', width: '150', checkarr: [], diff --git a/src/option/finance/MerchantDepositSlip.js b/src/option/finance/MerchantDepositSlip.js index 3ac69318..7a17d850 100644 --- a/src/option/finance/MerchantDepositSlip.js +++ b/src/option/finance/MerchantDepositSlip.js @@ -17,7 +17,7 @@ export const columnList = [ { prop: 'brand', label: '品牌', - type: 1, + type: 2, values: '', width: '150', checkarr: [], diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index 1bbec9e4..d074aa26 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -27,8 +27,8 @@ export const columnList = [ }, { prop: 'orderCode', - label: '订单编号', - type: 1, + label: '订单自编号', + type: 2, values: '', width: '150', checkarr: [], @@ -50,7 +50,7 @@ export const columnList = [ { prop: 'shipper', label: '发货单位', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -72,7 +72,7 @@ export const columnList = [ { prop: 'destinationWarehouseName', label: '目的仓', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -83,7 +83,7 @@ export const columnList = [ { prop: 'departureWarehouseName', label: '发站仓', - type: 1, + type: 2, values: '', width: '150', checkarr: [], @@ -109,6 +109,261 @@ export const columnList = [ { prop: 'typeServiceName', label: '订单类型', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label:'商配', + value:1 + }, + { + label:'市配', + value:2 + }, + { + label:'自提', + value:3 + }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'openTime', + label: '开单时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'goodsName', + label: '货物品类', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalNum', + label: '总件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalWeight', + label: '总重量', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalVolume', + label: '总体积', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'sysTotalFee', + label: '订单开单价', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'totalFee', + label: '实际费用', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'systemFreightPrice', + label: '开单运费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'freightPrice', + label: '实际运费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'systemPickupPrice', + label: '开单提货费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'pickupPrice', + label: '实际提货费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseServiceFee', + label: '仓储服务费合计', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseFee', + label: '仓储费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseManageFee', + label: '仓储管理费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseSortingFee', + label: '仓储分拣费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'warehouseOperatingFee', + label: '仓储操作费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryServiceFee', + label: '配送费服务费合计', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'systemDeliveryFee', + label: '开单配送费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryFee', + label: '实际配送费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryLoadingFee', + label: '配送装卸费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliverySortingFee', + label: '配送分货费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryUpfloorFee', + label: '配送上楼费', type: 1, values: '', width: '150', @@ -117,6 +372,376 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'deliveryMoveFee', + label: '配送平移费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryOtherFee', + label: '配送其它费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'deliveryCrossingFee', + label: '超区公里费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'installFee', + label: '安装费', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'otherFee', + label: '其他费用', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperPerson', + label: '发货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperMobile', + label: '发货人手机号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'shipperAddress', + label: '发货地址', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'destination', + label: '到站', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneePerson', + label: '收货人', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeMobile', + label: '收货人手机号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consigneeAddress', + label: '收货地址', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'customerTrain', + label: '客户车次', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'cleanObjTypeName', + label: '结算方', + type: 3, + values: '', + width: '150', + checkarr: [ + { label: '工厂', value: 1 }, + { label: '商场', value: 2 }, + { label: '商家个人', value: 3 }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payTypeName', + label: '支付方式', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'payWayName', + label: '付款方式', + type: 3, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signNum', + label: '已签收件数', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signTime', + label: '签收时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'syncFeeStatus', + label: '是否计算价格', + type: 1, + values: '', + width: '150', + checkarr: [ + { label: '是', value: 1 }, + { label: '否', value: 0 }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'syncFeeDate', + label: '计算价格时间', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: '', + label: '操作', + type: 6, + values: '', + width: '120', + checkarr: [], + fixed: 'right', + sortable: false, + }, +]; +export const columnListB = [ + { + prop: '', + label: '复选框', + type: 0, + width: 55, + fixed: true, + }, + { + prop: '', + label: '序号', + type: 12, + values: '', + width: 55, + fixed: true, + }, + { + prop: 'brand', + label: '品牌', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'orderCode', + label: '订单自编号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'waybillNo', + label: '运单号', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: true, + sortable: true, + head: false, + }, + { + prop: 'shipper', + label: '发货单位', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'consignee', + label: '收货单位', + type: 1, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'destinationWarehouseName', + label: '目的仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'departureWarehouseName', + label: '发站仓', + type: 2, + values: '', + width: '150', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'signStatusName', + label: '签收状态', + type: 3, + values: '', + width: '150', + checkarr: [ + { label: '未签收', value: 0 }, + { label: '部分签收', value: 1 }, + { label: '已签收', value: 2 }, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'typeServiceName', + label: '订单类型', + type: 3, + values: '', + width: '150', + checkarr: [ + { + label:'商配1', + value:1 + }, + { + label:'市配', + value:2 + }, + { + label:'自提', + value:3 + }, + ], + fixed: false, + sortable: true, + head: false, + }, { prop: 'openTime', label: '开单时间', @@ -597,7 +1222,6 @@ export const columnList = [ sortable: false, }, ]; - /** 生成对账单 */ export const confirmColumnList = [ { diff --git a/src/views/aftersales/aftersalesWorkOrderTemp.vue b/src/views/aftersales/aftersalesWorkOrderTemp.vue index 009d8e67..fd2be0ef 100644 --- a/src/views/aftersales/aftersalesWorkOrderTemp.vue +++ b/src/views/aftersales/aftersalesWorkOrderTemp.vue @@ -1,5 +1,5 @@