diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index ee7350a3c..dde5a0550 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -24,6 +24,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + table: { + width: 180, + }, + isForm: false + }, { label: '订单号', field: 'poNumber', @@ -357,6 +366,98 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ width: 180 }, }, + { + label: '物流审批用户名', + field: 'logisticsCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '物流审批时间', + field: 'logisticsCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '采购审批用户名', + field: 'procurementCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '采购审批时间', + field: 'procurementCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '财务审批用户名', + field: 'financialCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '财务审批时间', + field: 'financialCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '供应商审批用户名', + field: 'supplierCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '供应商审批时间', + field: 'supplierCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, ])) //表单校验 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 4584f1b56..a0ca6e435 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -119,6 +119,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } } }, + { + label: '供应商名称', + field: 'supplierName', + sort: 'custom', + table: { + width: 180, + }, + isForm: false + }, { label: '状态', field: 'status', @@ -495,6 +504,98 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( } }, }, + { + label: '物流审批用户名', + field: 'logisticsCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '物流审批时间', + field: 'logisticsCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '采购审批用户名', + field: 'procurementCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '采购审批时间', + field: 'procurementCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '财务审批用户名', + field: 'financialCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '财务审批时间', + field: 'financialCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, + { + label: '供应商审批用户名', + field: 'supplierCreator', + sort: 'custom', + table: { + width: 150 + }, + isForm: false, + }, + { + label: '供应商审批时间', + field: 'supplierCreateTime', + isTable: true, + formatter: dateFormatter, + detail: { + dateFormat: 'YYYY-MM-DD HH:mm:ss' + }, + sort: 'custom', + table: { + width: 180 + }, + isForm: false, + }, { label: '备注', field: 'remark', @@ -602,7 +703,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 300, + width: 200, fixed: 'right' }, } @@ -905,6 +1006,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive