diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 5314ed1dd..b330cc01c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -99,6 +99,39 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sortTableDefault:5, isSearch: true }, + { + label: '未税差额', + field: 'beforeTaxDiffAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:5, + isForm:false, + isTableForm:false + }, + { + label: '税额差异', + field: 'taxAmountDiff', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:5, + isForm:false, + isTableForm:false + }, + { + label: '价税合计差额', + field: 'totalTaxDiffAmount', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:5, + isForm:false, + isTableForm:false + }, { label: '系统税额', field: 'taxAmount', @@ -335,7 +368,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ value:[], component: 'DatePicker', componentProps: { - valueFormat: 'YYYY-MM-DD', + valueFormat: 'x', + dateFormat: 'YYYY-MM-DD', type: 'daterange', defaultTime: [new Date('1 '), new Date('1 ')] } @@ -614,36 +648,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isForm: false, }, - { - label: '未税差额', - field: 'beforeTaxDiffAmount', - formatter: accountantFormart, - table: { - width: 150 - }, - isForm:false, - isTableForm:false - }, - { - label: '税额差异', - field: 'taxAmountDiff', - formatter: accountantFormart, - table: { - width: 150 - }, - isForm:false, - isTableForm:false - }, - { - label: '价税合计差额', - field: 'totalTaxDiffAmount', - formatter: accountantFormart, - table: { - width: 150 - }, - isForm:false, - isTableForm:false - }, + ])) //表单校验 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 7cb5c65d7..d2935dfe0 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -462,6 +462,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:5, form: { component: 'InputNumber', componentProps: { @@ -478,6 +479,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:5, form: { component: 'InputNumber', componentProps: { @@ -494,6 +496,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:5, isTableForm:false, form: { component: 'InputNumber',