diff --git a/src/option/waybill/WaybillOrderList.js b/src/option/waybill/WaybillOrderList.js index deb4dfd7..c4db4059 100644 --- a/src/option/waybill/WaybillOrderList.js +++ b/src/option/waybill/WaybillOrderList.js @@ -55,6 +55,29 @@ export const columnList = [ fixed: false, sortable: true, }, + { + prop: 'waybillStatusName', + label: '运单状态', + type: 3, + values: '', + width: '130', + checkarr: [ + { label: '未入库', value: '0' }, + { label: '部分入库', value: '10' }, + { label: '入库', value: '20' }, + { label: '部分中转', value: '30' }, + { label: '中转', value: '40' }, + { label: '目的仓部分到达', value: '50' }, + { label: '目的仓到达', value: '60' }, + { label: '配送部分装车', value: '70' }, + { label: '配送装车', value: '80' }, + { label: '部分签收', value: '90' }, + { label: '已签收', value: '100' }, + ], + fixed: false, + isshowSummary: false, + sortable: true, + }, { prop: 'customerTrain', label: '客户车次', @@ -601,29 +624,6 @@ export const columnList = [ isshowSummary: false, sortable: true, }, - { - prop: 'waybillStatusName', - label: '运单状态', - type: 3, - values: '', - width: '130', - checkarr: [ - { label: '未入库', value: '0' }, - { label: '部分入库', value: '10' }, - { label: '入库', value: '20' }, - { label: '部分中转', value: '30' }, - { label: '中转', value: '40' }, - { label: '目的仓部分到达', value: '50' }, - { label: '目的仓到达', value: '60' }, - { label: '配送部分装车', value: '70' }, - { label: '配送装车', value: '80' }, - { label: '部分签收', value: '90' }, - { label: '已签收', value: '100' }, - ], - fixed: false, - isshowSummary: false, - sortable: true, - }, { prop: 'freezeStatusName', label: '是否冻结', @@ -750,17 +750,6 @@ export const columnList = [ isshowSummary: false, sortable: true, }, - { - prop: 'remark', - label: '备注', - type: 2, - values: '', - width: '180', - checkarr: [], - fixed: false, - isshowSummary: false, - sortable: true, - }, /* { prop: 'carrierName', label: '批次号', @@ -858,8 +847,33 @@ export const columnList = [ isshowSummary: false, sortable: true, }, */ - /* { - prop: 'carrierName', + { + prop: 'checkStatusName', + label: '审核状态', + type: 3, + values: '', + width: '130', + checkarr: [ + { label: '待审核', value: '0' }, + { label: '已审核', value: '1' }, + ], + fixed: false, + isshowSummary: false, + sortable: true, + }, + { + prop: 'checkReson', + label: '审核原因', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: false, + sortable: true, + }, + { + prop: 'checkUserName', label: '审核人', type: 1, values: '', @@ -868,9 +882,20 @@ export const columnList = [ fixed: false, isshowSummary: false, sortable: true, - }, */ - /* { - prop: 'carrierName', + }, + { + prop: 'checkRemark', + label: '审核备注', + type: 1, + values: '', + width: '130', + checkarr: [], + fixed: false, + isshowSummary: false, + sortable: true, + }, + { + prop: 'checkTime', label: '审核时间', type: 1, values: '', @@ -879,7 +904,18 @@ export const columnList = [ fixed: false, isshowSummary: false, sortable: true, - }, */ + }, + { + prop: 'remark', + label: '备注', + type: 2, + values: '', + width: '180', + checkarr: [], + fixed: false, + isshowSummary: false, + sortable: true, + }, /* { prop: 'carrierName', label: '承运单号',