diff --git a/src/option/aftersales/vueTvemp.js b/src/option/aftersales/vueTvemp.js index 68ff4330..ed80601c 100644 --- a/src/option/aftersales/vueTvemp.js +++ b/src/option/aftersales/vueTvemp.js @@ -50,17 +50,17 @@ export const columnList = [ sortable: true, head: false, }, - // { - // prop: 'packageCode', - // label: '包条码', - // type: 2, - // values: '', - // width: '150', - // 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: '运单号', @@ -416,17 +416,17 @@ export const columnList8 = [ sortable: true, head: false, }, - // { - // prop: 'packageCode', - // label: '包条码', - // type: 2, - // values: '', - // width: '150', - // 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: '运单号', @@ -782,17 +782,17 @@ export const columnList3 = [ sortable: true, head: false, }, - // { - // prop: 'packageCode', - // label: '包条码', - // type: 2, - // values: '', - // width: '150', - // 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: '运单号', @@ -851,7 +851,7 @@ export const columnList3 = [ { prop: 'workOrderStatusNameS', //workOrderStatus label: '工单状态', - type: 3, + type: 1, values: '', width: '150', checkarr: [], @@ -881,39 +881,39 @@ export const columnList3 = [ 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: '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: '送货时间', @@ -995,17 +995,17 @@ export const columnList3 = [ head: false, }, - { - prop: 'overTime', - label: '完结时间', - type: 1, - 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: '调查经过', @@ -1028,39 +1028,39 @@ export const columnList3 = [ // 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: 'processNumber', + // label: '钉钉流程号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'reviewedBy', + // label: '审核人', + // type: 1, + // 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: '录入时间', @@ -1148,17 +1148,17 @@ export const columnList1 = [ sortable: true, head: false, }, - // { - // prop: 'packageCode', - // label: '包条码', - // type: 2, - // values: '', - // width: '150', - // 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: '运单号', @@ -1217,7 +1217,7 @@ export const columnList1 = [ { prop: 'workOrderStatusNameS', //workOrderStatus label: '工单状态', - type: 3, + type: 1, values: '', width: '150', checkarr: [], @@ -1247,39 +1247,39 @@ export const columnList1 = [ 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: '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: '送货时间', @@ -1361,64 +1361,20 @@ export const columnList1 = [ 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, + // prop: 'overTime', + // label: '完结时间', + // type: 1, // values: '', - // width: '170', + // width: '150', // 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: '审核时间', + prop: 'investigationProcess', + label: '调查经过', type: 1, values: '', width: '150', @@ -1427,6 +1383,50 @@ export const columnList1 = [ 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: '录入时间', @@ -1492,12 +1492,23 @@ export const columnList4 = [ sortable: true, head: false, }, + { + prop: 'workOrderStatusName', + label: '工单状态', + type: 1, + values: '', + width: '120', + checkarr: [], + fixed: false, + sortable: true, + head: false, + }, { prop: 'businessName', label: '营业部', - type: 3, + type: 2, values: '', - width: '100', + width: '130', checkarr: [], fixed: false, sortable: true, @@ -1520,7 +1531,7 @@ export const columnList4 = [ label: '商场名称', type: 2, values: '', - width: '110', + width: '120', checkarr: [], fixed: false, sortable: true, @@ -1531,7 +1542,7 @@ export const columnList4 = [ label: '运单号', type: 2, values: '', - width: '100', + width: '120', checkarr: [], fixed: false, sortable: true, @@ -1540,10 +1551,10 @@ export const columnList4 = [ { prop: 'workOrderTypeName', - label: '异常类型名称', + label: '异常类型', type: 3, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1554,9 +1565,9 @@ export const columnList4 = [ { prop: 'resultTypeName', label: '处理结果名称', - type: 3, + type: 1, values: '', - width: '130', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1568,7 +1579,7 @@ export const columnList4 = [ label: '发现环节', type: 3, values: '', - width: '120', + width: '140', checkarr: [], fixed: false, sortable: true, @@ -1590,7 +1601,7 @@ export const columnList4 = [ label: '车辆路线', type: 2, values: '', - width: '110', + width: '180', checkarr: [], fixed: false, sortable: true, @@ -1599,9 +1610,9 @@ export const columnList4 = [ { prop: 'indemnitor', label: '赔款方', - type: 3, + type: 1, values: '', - width: '100', + width: '130', checkarr: [], fixed: false, sortable: true, @@ -1610,9 +1621,9 @@ export const columnList4 = [ { prop: 'reason', label: '判责原因', - type: 2, + type: 1, values: '', - width: '110', + width: '130', checkarr: [], fixed: false, sortable: true, @@ -1621,7 +1632,7 @@ export const columnList4 = [ { prop: 'money', label: '金额', - type: 2, + type: 1, values: '', width: '100', checkarr: [], @@ -1630,29 +1641,19 @@ export const columnList4 = [ head: false, }, - { - prop: 'processNumber', - label: '钉钉流程号', - type: 2, - values: '', - width: '120', - 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: '操作', @@ -1785,7 +1786,7 @@ export const columnList2 = [ { prop: 'workOrderStatusNameS', //workOrderStatus label: '工单状态', - type: 3, + type: 1, values: '', width: '150', checkarr: [], @@ -1826,17 +1827,17 @@ export const columnList2 = [ sortable: true, head: false, }, - { - prop: 'entryTime', - 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: '操作人', @@ -1920,18 +1921,6 @@ export const columnList2 = [ { prop: 'vehicleRoute', label: '车辆线路', - type: 2, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, - - { - prop: 'overTime', - label: '完结时间', type: 1, values: '', width: '150', @@ -1940,6 +1929,18 @@ export const columnList2 = [ sortable: true, head: false, }, + + // { + // prop: 'overTime', + // label: '完结时间', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, { prop: 'investigationProcess', label: '调查经过', @@ -1962,39 +1963,39 @@ export const columnList2 = [ // 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: 'processNumber', + // label: '钉钉流程号', + // type: 1, + // values: '', + // width: '150', + // checkarr: [], + // fixed: false, + // sortable: true, + // head: false, + // }, + // { + // prop: 'reviewedBy', + // label: '审核人', + // type: 1, + // 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: '录入时间', @@ -2151,7 +2152,7 @@ export const columnList5 = [ { prop: 'workOrderStatusNameS', //workOrderStatus label: '工单状态', - type: 3, + type: 1, values: '', width: '150', checkarr: [], @@ -2814,17 +2815,28 @@ export const columnList6 = [ sortable: true, head: false, }, - // { - // prop: 'packageCode', - // label: '包条码', - // type: 2, - // values: '', - // width: '150', - // checkarr: [], - // fixed: false, - // sortable: true, - // head: false, - // }, + { + prop: 'workOrderStatusNameS', //workOrderStatus + label: '工单状态', + type: 1, + values: '', + width: '150', + 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: '运单号', @@ -2880,17 +2892,7 @@ export const columnList6 = [ sortable: true, head: false, }, - { - prop: 'workOrderStatusNameS', //workOrderStatus - label: '工单状态', - type: 3, - values: '', - width: '150', - checkarr: [], - fixed: false, - sortable: true, - head: false, - }, + { prop: 'brandName', label: '品牌', diff --git a/src/views/distribution/inventory/delivery/distributionStockArticle.vue b/src/views/distribution/inventory/delivery/distributionStockArticle.vue index b1478648..c87f5c38 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticle.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticle.vue @@ -143,7 +143,7 @@ diff --git a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue index 7d770eb5..83444bac 100644 --- a/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue +++ b/src/views/distribution/inventory/delivery/distributionStockArticleDiscuss.vue @@ -96,6 +96,13 @@ @selection="selectionChange" >