From ae5fe7f768ffbd251a130bb5ee32a2f75bf8aa8a Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Mon, 1 Jul 2024 16:45:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain.data.ts | 121 +++++++++++++----- .../supplierinvoiceRequestMain/index.vue | 1 + .../supplierinvoiceRequestMain.data.ts | 50 +++++++- 3 files changed, 136 insertions(+), 36 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 1501942e8..36cd58443 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -82,16 +82,16 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ } } }, - { - label: '申请单号', - field: 'requestNumber', - sort: 'custom', - table: { - width: 180, - }, - isTable: false, - isSearch: true - }, + // { + // label: '申请单号', + // field: 'requestNumber', + // sort: 'custom', + // table: { + // width: 180, + // }, + // isTable: false, + // isSearch: true + // }, { label: '订单号', field: 'poNumber', @@ -262,6 +262,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ table: { width: 150 }, + isDetail:false, isTable: false, form: { component: 'InputNumber', @@ -272,6 +273,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'adjustingTaxAmount', formatter: accountantFormart, sort: 'custom', + isDetail:false, table: { width: 150 }, @@ -342,26 +344,35 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, - sortTableDefault:4, - sort: 'custom', - table: { - width: 180 + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } }, - }, - { - label: '采购审批人', - field: 'procurementCreatorName', + sortTableDefault:4, sort: 'custom', table: { width: 180 }, - isTable:true, - isDetail: false, - isTableForm: false, - isForm:false, - isSearch:false, - sortTableDefault:10 }, + // { + // label: '采购审批人', + // field: 'procurementCreatorName', + // sort: 'custom', + // table: { + // width: 180 + // }, + // isTable:true, + // isDetail: true, + // isTableForm: false, + // isForm:false, + // isSearch:false, + // sortTableDefault:10 + // }, { label: '过账日期', field: 'postingDate', @@ -369,6 +380,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, isTable: true, sortTableDefault:6, sort: 'custom', @@ -404,6 +424,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sort: 'custom', isTable:false, isTableForm:false, + isDetail:false, table: { width: 150 }, @@ -414,6 +435,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sort: 'custom', isTable:false, isTableForm:false, + isDetail:false, table: { width: 150 }, @@ -423,6 +445,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'inTransactionType', isTable:false, isTableForm:false, + isDetail:false, sort: 'custom', table: { width: 150 @@ -499,6 +522,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ field: 'code', isTable:false, isTableForm:false, + isDetail:false, sort: 'custom', table: { width: 150 @@ -510,6 +534,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ dictType: DICT_TYPE.INTERFACE_TYPE, dictClass: 'string', isTable:false, + isDetail:false, isTableForm:false, sort: 'custom', table: { @@ -549,16 +574,30 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ }, }, { - label: '采购审批人代码', - field: 'procurementCreator', - sortTableDefault:1002, + label: '采购审批人', + field: 'procurementCreatorName', sort: 'custom', table: { - width: 150 + width: 180 }, - isTable: false, - isForm: false, + isTable:true, + isDetail: true, + isTableForm: false, + isForm:false, + isSearch:false, + sortTableDefault:10 }, + // { + // label: '采购审批人代码', + // field: 'procurementCreator', + // sortTableDefault:1002, + // sort: 'custom', + // table: { + // width: 150 + // }, + // isTable: false, + // isForm: false, + // }, { label: '采购审批时间', field: 'procurementCreateTime', @@ -568,6 +607,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, sort: 'custom', table: { width: 180 @@ -593,6 +641,15 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, sort: 'custom', table: { width: 180 @@ -624,8 +681,8 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ // isDetail:false, // }, { - label: '供应商审批人代码', - field: 'supplierCreator', + label: '供应商审批人', + field: 'supplierCreatorName', sort: 'custom', isTable:false, isTableForm:false, diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index ffa39066f..269f1367e 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -788,6 +788,7 @@ const handleImport = () => { const formFinanceRef = ref() const handleFinanceApp = async (row) => { row.postingDate = dayjs().valueOf() + row.voucherNumberRemark = '收到'+row.supplierName+'发票'+row.goldenTaxInvoiceNumber formFinanceRef.value.open('update', row,null,'财务通过','财务通过') } diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index e4ab779b8..a493d1bdc 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -783,6 +783,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, sort: 'custom', table: { width: 180 @@ -832,6 +841,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, sort: 'custom', table: { width: 180 @@ -843,6 +861,21 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( field: 'supplierCreator', sort: 'custom', isTable:false, + isTable:false, + isDetail:false, + sortTableDefault:1006, + table: { + width: 180 + }, + isForm: false, + }, + { + label: '供应商审批人', + field: 'supplierCreatorName', + sort: 'custom', + isTable:false, + isTable:false, + isDetail:true, sortTableDefault:1006, table: { width: 180 @@ -857,6 +890,15 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( detail: { dateFormat: 'YYYY-MM-DD HH:mm:ss' }, + form:{ + component: 'DatePicker', + componentProps: { + style: {width:'100%'}, + type: 'datetime', + dateFormat: 'YYYY-MM-DD HH:mm:ss',//YYYY-MM-DD + valueFormat: 'x',//数据转成时间戳 + } + }, sort: 'custom', table: { width: 180 @@ -1065,7 +1107,7 @@ export const SupplierinvoiceRequestFinance = useCrudSchemas(reactive