diff --git a/src/api/base/invoice-item.js b/src/api/base/invoice-item.js new file mode 100644 index 0000000..1befeb5 --- /dev/null +++ b/src/api/base/invoice-item.js @@ -0,0 +1,31 @@ +import request from '@/axios'; + +export const getList = (current, size, params) => + request({ + url: '/blade-system/invoice-item/list', + method: 'get', + params: { ...params, current, size }, + }); + +export const getAll = () => getList(1, 1000, {}); + +export const getDetail = id => + request({ + url: '/blade-system/invoice-item/detail', + method: 'get', + params: { id }, + }); + +export const submit = row => + request({ + url: '/blade-system/invoice-item/submit', + method: 'post', + data: row, + }); + +export const remove = ids => + request({ + url: '/blade-system/invoice-item/remove', + method: 'post', + params: { ids }, + }); diff --git a/src/api/payment/receiptFlow.js b/src/api/payment/receiptFlow.js index 64cec7b..32ad53b 100644 --- a/src/api/payment/receiptFlow.js +++ b/src/api/payment/receiptFlow.js @@ -12,7 +12,7 @@ export const getSettlementCandidates = (keyword, flowId) => params: { keyword, flowId }, }); export const claim = data => request({ url: `${baseUrl}/claim`, method: 'post', data }); -export const sync = () => request({ url: `${baseUrl}/sync`, method: 'post' }); +export const sync = data => request({ url: `${baseUrl}/sync`, method: 'post', data }); export const claimStatusOptions = [ { label: '未认领', value: 'unclaimed' }, diff --git a/src/option/payment/invoiceApplication.js b/src/option/payment/invoiceApplication.js index 40f8e17..ecfab04 100644 --- a/src/option/payment/invoiceApplication.js +++ b/src/option/payment/invoiceApplication.js @@ -30,5 +30,4 @@ export const invoiceApplicationDetailColumns = [ { prop: 'mileage', label: '里程(KM)', minWidth: 120 }, { prop: 'batchNo', label: '批次号', minWidth: 120 }, { prop: 'freightAmount', label: '运费', minWidth: 120, money: true }, - { prop: 'feeItemsJson', label: '费用项目', minWidth: 180 }, ]; diff --git a/src/views/base/invoice-item.vue b/src/views/base/invoice-item.vue new file mode 100644 index 0000000..8a71a93 --- /dev/null +++ b/src/views/base/invoice-item.vue @@ -0,0 +1,308 @@ + + + + + diff --git a/src/views/payment/bill-ledger-form.vue b/src/views/payment/bill-ledger-form.vue index 717c52d..f7a12be 100644 --- a/src/views/payment/bill-ledger-form.vue +++ b/src/views/payment/bill-ledger-form.vue @@ -195,48 +195,7 @@ - - - - - - - - - - - - - - - - - - + @@ -279,6 +238,7 @@ import { mapGetters } from 'vuex'; import * as api from '@/api/payment/billLedger'; import { getList as getCustomerList } from '@/api/vehicle/customer-archive'; import { getDeptTree } from '@/api/system/dept'; +import VehicleAttachmentTable from '@/components/vehicle-attachment-table/main.vue'; const emptyForm = () => ({ id: null, @@ -302,6 +262,7 @@ const emptyForm = () => ({ export default { name: 'BillLedgerForm', + components: { VehicleAttachmentTable }, data() { return { form: emptyForm(), diff --git a/src/views/payment/bill-payment-form.vue b/src/views/payment/bill-payment-form.vue index 98d4544..570e6b6 100644 --- a/src/views/payment/bill-payment-form.vue +++ b/src/views/payment/bill-payment-form.vue @@ -75,51 +75,7 @@ - - - - - - - - - - - - - - - - - - +
@@ -163,6 +119,11 @@ + + +