From 45b87f51d89ddfae20ecc7780a44c1f6a7cf549d Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Wed, 19 Jun 2024 18:40:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91=E7=A5=A8?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 81 ++++++++++++++++--- .../supplierinvoiceRequestMain.data.ts | 47 +++++++++-- 2 files changed, 109 insertions(+), 19 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 033dd7188..306e6f951 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -42,7 +42,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 180, }, - sortTableDefault:2, + isTable:false, + sortTableDefault:6, isForm: false }, @@ -52,7 +53,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, dictClass: 'string', isTable: true, - sortTableDefault:10, + sortTableDefault:8, isForm:false, sort: 'custom', table: { @@ -73,6 +74,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 180, }, + isTable: false, isSearch: true }, { @@ -85,12 +87,13 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, }, { - label: '发票号',//金税票号 + label: '金税票号',//金税票号 field: 'goldenTaxInvoiceNumber', sort: 'custom', table: { width: 150 }, + sortTableDefault:9, isSearch: true }, { @@ -100,17 +103,19 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:4, form: { component: 'InputNumber', } }, { - label: '价税合计',//税后金额 + label: '税后金额',//税后金额 field: 'afterTaxAmount', sort: 'custom', table: { width: 150 }, + sortTableDefault:5, form: { component: 'InputNumber', } @@ -122,6 +127,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:3, form: { component: 'InputNumber', } @@ -132,6 +138,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', componentProps: { @@ -153,6 +160,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + sortTableDefault:7, form: { component: 'InputNumber', } @@ -167,6 +175,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -178,6 +187,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -189,6 +199,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', } @@ -207,6 +218,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ precision: 6, } }, + isTable: false, tableForm: { type: 'InputNumber', min: 0, @@ -219,6 +231,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, form: { component: 'InputNumber', componentProps: { @@ -244,18 +257,37 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, }, { - label: '发票时间', + label: '开票日期', field: 'invoiceTime', isTable: true, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + sortTableDefault:10, sort: 'custom', table: { width: 180 }, }, + { + label: '采购审批人', + field: 'procurementCreatorName', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable:true, + isDetail: false, + isTableForm: false, + isForm:false, + isSearch:false, + sortTableDefault:11 + }, { label: '过账日期', field: 'postingDate', @@ -263,6 +295,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + isTable: false, sort: 'custom', table: { width: 180 @@ -399,6 +432,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'creator', sort: 'custom', sortTableDefault:1000, + isTable: false, table: { width: 150 }, @@ -406,7 +440,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '创建时间', field: 'createTime', - isTable: true, + isTable: false, sortTableDefault:1001, formatter: dateFormatter, detail: { @@ -425,12 +459,13 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isTable: false, isForm: false, }, { label: '采购审批时间', field: 'procurementCreateTime', - sortTableDefault:1003, + sortTableDefault:12, isTable: true, formatter: dateFormatter, detail: { @@ -443,19 +478,19 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '财务审批人代码', - field: 'financialCreator', - sortTableDefault:1004, + label: '财务审批人', + field: 'financialCreatorName', sort: 'custom', table: { width: 150 }, + sortTableDefault:13, isForm: false, }, { label: '财务审批时间', field: 'financialCreateTime', - sortTableDefault:1005, + sortTableDefault:14, isTable: true, formatter: dateFormatter, detail: { @@ -467,6 +502,30 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isForm: false, }, + { + label: '采购驳回原因', + field: 'purchaseRejectCause', + table: { + width: 180 + }, + sortTableDefault:15, + isTable: true, + isSearch: false, + isForm: false, + isDetail:false, + }, + { + label: '财务驳回原因', + field: 'financeRejectCause', + table: { + width: 180 + }, + sortTableDefault:16, + isTable: true, + isSearch: false, + isForm: false, + isDetail:false, + }, { label: '供应商审批人代码', field: 'supplierCreator', diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 02a2f836b..bb95948c3 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -198,12 +198,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( dictType: DICT_TYPE.SUPPLIERINVOICE_REQUEST_STATUS, dictClass: 'string', isTable: true, - sortTableDefault:10, isForm:false, sort: 'custom', table: { width: 150 }, + sortTableDefault:6, isSearch: true, form: { value: '1', @@ -219,6 +219,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:5, form: { component: 'InputNumber', componentProps: { @@ -238,6 +239,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( field: 'taxRate', dictType: DICT_TYPE.TAX_RATE_DICT, dictClass: 'string', + sortTableDefault:3, isTable: true, sort: 'custom', table: { @@ -251,6 +253,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:3, form: { component: 'InputNumber', componentProps: { @@ -272,6 +275,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortTableDefault:3, form: { component: 'InputNumber', componentProps: { @@ -318,6 +322,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', componentProps: { @@ -336,6 +341,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', componentProps: { @@ -355,6 +361,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, form: { component: 'InputNumber', componentProps: { @@ -373,6 +380,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150, }, + sortTableDefault:7, form:{ componentProps: { maxlength:23, @@ -390,7 +398,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, }, { - label: '发票日期', + label: '开票日期', field: 'invoiceTime', formatter: dateFormatter, detail: { @@ -400,6 +408,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + sortTableDefault:8, form: { component: 'DatePicker', componentProps: { @@ -410,6 +419,24 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, }, + { + label: '采购审批人', + field: 'procurementCreatorName', + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isTable:true, + isDetail: false, + isTableForm: false, + isForm:false, + isSearch:false, + sortTableDefault:9 + }, { label: '过账日期', field: 'postingDate', @@ -421,6 +448,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + isTable:false, form: { component: 'DatePicker', componentProps: { @@ -485,13 +513,14 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, sortTableDefault:1001, isForm: false, }, { label: '创建时间', field: 'createTime', - isTable: true, + isTable:false, formatter: dateFormatter, sortTableDefault:1000, detail: { @@ -536,7 +565,6 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, }, - { label: '采购价格审批人', field: 'procurementCreator', @@ -545,7 +573,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( width: 150 }, isForm: true, - isTable:true, + isTable:false, form: { component: 'Select', api: () => procurementCreators.list, @@ -578,7 +606,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '采购审批时间', field: 'procurementCreateTime', isTable: true, - sortTableDefault:1004, + sortTableDefault:10, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -591,11 +619,12 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, { label: '财务审批人', - field: 'financialCreator', + field: 'financialCreatorName', sort: 'custom', table: { width: 150 }, + sortTableDefault:11, isForm: false, }, { @@ -604,6 +633,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + sortTableDefault:14, isTable: true, isSearch: false, isForm: false, @@ -615,6 +645,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + sortTableDefault:15, isTable: true, isSearch: false, isForm: false, @@ -624,7 +655,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '财务审批时间', field: 'financialCreateTime', isTable: true, - sortTableDefault:1005, + sortTableDefault:12, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss'