From ad22d2f9f27326b27e82760d211fcf4d30fd76f0 Mon Sep 17 00:00:00 2001 From: zhaoxuebing <1291173720@qq.com> Date: Wed, 17 Apr 2024 19:04:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=AD=97=E6=AE=B5=E6=95=B4?= =?UTF-8?q?=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 72 ++++++++++++++----- .../supplierinvoiceRequestMain.data.ts | 31 +++++--- 2 files changed, 77 insertions(+), 26 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 1c02f155d..2affd0a1c 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -15,6 +15,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, isSearch: true }, + { + label: '申请单号', + field: 'requestNumber', + sort: 'custom', + table: { + width: 180, + }, + isSearch: true + }, { label: '供应商代码', field: 'supplierCode', @@ -37,6 +46,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '订单号', field: 'poNumber', sort: 'custom', + isTable:false, table: { width: 150 }, @@ -102,15 +112,6 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ precision: 6, } }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 150 - }, - isSearch: true - }, { label: '金额', @@ -238,6 +239,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '业务类型', field:'businessType', sort: 'custom', + isTable:false, + isTableForm:false, table: { width: 150 }, @@ -246,6 +249,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '出库事务类型', field: 'outTransactionType', sort: 'custom', + isTable:false, + isTableForm:false, table: { width: 150 }, @@ -253,6 +258,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '入库事务类型', field: 'inTransactionType', + isTable:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -261,7 +268,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '执行时间', field: 'executeTime', - isTable: true, + isTable:false, + isTableForm:false, formatter: dateFormatter, deatil: { dateFormatter: 'YYYY-MM-DD HH:mm:ss' @@ -274,7 +282,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '生效日期', field: 'activeDate', - isTable: true, + isTable:false, + isTableForm:false, formatter: dateFormatter2, deatil: { dateFormatter: 'YYYY-MM-DD' @@ -287,7 +296,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '申请时间', field: 'requestTime', - isTable: true, + isTable:false, + isTableForm:false, formatter: dateFormatter, deatil: { dateFormatter: 'YYYY-MM-DD HH:mm:ss' @@ -300,7 +310,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '截止时间', field: 'dueTime', - isTable: true, + isTable:false, + isTableForm:false, formatter: dateFormatter, deatil: { dateFormatter: 'YYYY-MM-DD HH:mm:ss' @@ -313,6 +324,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '部门', field: 'departmentCode', + isTable:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -321,6 +334,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '代码', field: 'code', + isTable:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -331,7 +346,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'interfaceType', dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', - isTable: true, + isTable:false, + isTableForm:false, sort: 'custom', table: { width: 150 @@ -341,13 +357,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '是否可用', field: 'available', dictType: DICT_TYPE.TRUE_FALSE, + isTable:false, + isTableForm:false, dictClass: 'string', - isTable: true }, { label: '创建者', field: 'creator', sort: 'custom', + sortDefault:1000, table: { width: 150 }, @@ -356,6 +374,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ label: '创建时间', field: 'createTime', isTable: true, + sortDefault:1001, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -366,8 +385,9 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, }, { - label: '采购审批用户名', + label: '采购审批人', field: 'procurementCreator', + sortDefault:1002, sort: 'custom', table: { width: 150 @@ -377,6 +397,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '采购审批时间', field: 'procurementCreateTime', + sortDefault:1003, isTable: true, formatter: dateFormatter, detail: { @@ -391,6 +412,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '财务审批用户名', field: 'financialCreator', + sortDefault:1004, sort: 'custom', table: { width: 150 @@ -400,6 +422,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '财务审批时间', field: 'financialCreateTime', + sortDefault:1005, isTable: true, formatter: dateFormatter, detail: { @@ -412,9 +435,11 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ isForm: false, }, { - label: '供应商审批用户名', + label: '供应商审批人', field: 'supplierCreator', sort: 'custom', + isTable:false, + isTableForm:false, table: { width: 150 }, @@ -423,7 +448,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ { label: '供应商审批时间', field: 'supplierCreateTime', - isTable: true, + isTable:false, + isTableForm:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -486,11 +512,20 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive { label: '项目编号', field: 'projectCode', + isTable:false, sort: 'custom', table: { width: 150 }, }, + { + label: '采购收货记录单号', + field: 'qadNumber', + sort: 'custom', + table: { + width: 180 + }, + }, { label: '单据类型', field: 'billType', @@ -518,6 +553,7 @@ export const SupplierinvoiceRecordDetail = useCrudSchemas(reactive { label: '单据号', field: 'number', + hiddenInMain:true, sort: 'custom', table: { width: 180 diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 4d8da9203..40a9646c5 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -414,6 +414,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 180 }, + isTable:false, isForm:false, form: { component: 'DatePicker', @@ -457,6 +458,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + sortDefault:1001, isForm: false, }, { @@ -464,6 +466,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( field: 'createTime', isTable: true, formatter: dateFormatter, + sortDefault:1000, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, @@ -480,12 +483,13 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( table: { width: 150 }, + isTable:false, isForm: false, }, { label: '最后更新时间', field: 'updateTime', - isTable: true, + isTable: false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -505,9 +509,10 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, }, { - label: '采购审批用户名', + label: '采购审批人', field: 'procurementCreator', sort: 'custom', + sortDefault:1003, table: { width: 150 }, @@ -517,6 +522,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '采购审批时间', field: 'procurementCreateTime', isTable: true, + sortDefault:1004, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -528,7 +534,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isForm: false, }, { - label: '财务审批用户名', + label: '财务审批人', field: 'financialCreator', sort: 'custom', table: { @@ -540,6 +546,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( label: '财务审批时间', field: 'financialCreateTime', isTable: true, + sortDefault:1005, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -551,18 +558,20 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isForm: false, }, { - label: '供应商审批用户名', + label: '供应商审批人', field: 'supplierCreator', sort: 'custom', + isTable:false, + sortDefault:1006, table: { - width: 150 + width: 180 }, isForm: false, }, { label: '供应商审批时间', field: 'supplierCreateTime', - isTable: true, + isTable:false, formatter: dateFormatter, detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' @@ -680,7 +689,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( isDetail: false, isForm: false, table: { - width: 200, + width: 300, fixed: 'right' }, } @@ -780,6 +789,7 @@ export const SupplierinvoiceRequestDetail = useCrudSchemas(reactive