diff --git a/src/option/finance/ReconciliationDepositSlip.js b/src/option/finance/ReconciliationDepositSlip.js index 05962d15..8638b3d6 100644 --- a/src/option/finance/ReconciliationDepositSlip.js +++ b/src/option/finance/ReconciliationDepositSlip.js @@ -130,30 +130,30 @@ export const columnList = [ sortable: true, head: false, }, - { - 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: '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: '开单时间', diff --git a/src/option/finance/WaybillAudit.js b/src/option/finance/WaybillAudit.js index 7842d58c..c713bb7f 100644 --- a/src/option/finance/WaybillAudit.js +++ b/src/option/finance/WaybillAudit.js @@ -876,6 +876,36 @@ export const columnList = [ sortable: true, head: false, }, + { + prop: 'payStatusName', + label: '收款状态', + type: 1, + values: '', + width: '150', + checkarr: [ + {label: '未收款', value: '10'}, + // {label: '部分收款', value: '20'}, + {label: '已收款', value: '30'}, + ], + fixed: false, + sortable: true, + head: false, + }, + { + prop: 'settlementStatusName', + label: '结算状态', + type: 1, + values: '', + width: '150', + checkarr: [ + {label: '未结算', value: '10'}, + // {label: '部分结算', value: '20'}, + {label: '已结算', value: '30'}, + ], + fixed: false, + sortable: true, + head: false, + }, { prop: '', label: '操作', diff --git a/src/views/finance/ReconciliationDepositSlip.vue b/src/views/finance/ReconciliationDepositSlip.vue index 72b4b0be..70ca43e5 100644 --- a/src/views/finance/ReconciliationDepositSlip.vue +++ b/src/views/finance/ReconciliationDepositSlip.vue @@ -607,7 +607,7 @@ const handleConfirm = async () => { const handleJiesuan = async () => { if (details.selectionList.length === 0) return ElMessage.warning('请选择需要确认的数据'); - ElMessageBox.confirm('是否确认对账单?', '提示', { + ElMessageBox.confirm('是否确认结算?', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', type: 'warning', diff --git a/src/views/finance/WaybillAudit.vue b/src/views/finance/WaybillAudit.vue index 2def481e..3309133b 100644 --- a/src/views/finance/WaybillAudit.vue +++ b/src/views/finance/WaybillAudit.vue @@ -375,6 +375,13 @@ const onLoad = async () => { if (code !== 200) return; details.data = data.records; + for (let i = 0; i < details.data .length; i++) { + const value = details.data [i]; + + !value.payStatus && (value.payStatus = '10') + !value.settlementStatus && (value.settlementStatus = '10') + } + details.page.total = data.total; handleTranslationDataSeclect(details.data, details.columnList); return res.data;