From 8ad90f9a7c2a26acd9642bbdb159633beec2821a Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 6 Sep 2024 09:15:53 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E9=A2=84=E6=B5=8B=E5=88=86=E9=A1=B5=E7=9A=84=E6=97=B6=E5=80=99?= =?UTF-8?q?=EF=BC=8C=E5=A4=B4=E9=83=A8=E6=8E=A5=E5=8F=A3=E5=88=B7=E6=96=B0?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/demandforecastingMain/index.vue | 5 ++++- .../supplierdeliver/demandforecastingSupplierMain/index.vue | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 9db63afdf..d36758d0f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -122,7 +122,10 @@ const { tableObject, tableMethods } = useTable({ // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - +watch(()=>tableObject.currentPage,async ()=>{ + tableObjectHead.currentPage = tableObject.currentPage + updateDateTableColumns() +}) // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出 diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue index e2a1bf390..49eb20d07 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingSupplierMain/index.vue @@ -130,7 +130,10 @@ const { tableObject, tableMethods } = useTable({ // 获得表格的各种操作 const { getList, setSearchParams } = tableMethods - +watch(()=>tableObject.currentPage,async ()=>{ + tableObjectHead.currentPage = tableObject.currentPage + updateDateTableColumns() +}) // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultExportBtn({hasPermi:'wms:demandforecasting-main:export'}), // 导出 From 6b49371d22bcbe52fcd5f168dada9478e26f7df3 Mon Sep 17 00:00:00 2001 From: yufei_wang <2267742828@qq.com> Date: Fri, 6 Sep 2024 10:10:20 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E7=94=B3=E8=AF=B7--=E6=96=B0=E5=8A=A0=E4=B8=89?= =?UTF-8?q?=E4=B8=AA=E5=AD=97=E6=AE=B5hella=E4=BB=A3=E7=A0=81=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/index.vue | 12 +++++ .../supplierinvoiceRecordMain.data.ts | 9 ++++ .../supplierinvoiceRequestMain/index.vue | 19 +++++++- .../supplierinvoiceRequestMain.data.ts | 47 ++++++++++++++++++- .../index.vue | 12 +++++ ...pplierinvoiceRequestMainDifference.data.ts | 9 ++++ 6 files changed, 104 insertions(+), 4 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index d60e64faf..ff49c7c11 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -138,6 +138,18 @@ :apiPage="SupplierinvoiceRecordDetailApi.getSupplierinvoiceRecordDeatilPage" @buttonBaseClick="detailButtonBaseClick" > + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 3183fa5b7..459b0be99 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -1218,6 +1218,9 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts index 060b95ccd..becf3987b 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/supplierinvoiceRequestMain.data.ts @@ -434,7 +434,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( // } // }, { - label: '折扣金额', + label: '返利未税金额', field: 'discountAmount1', formatter: accountantFormart, table: { @@ -470,6 +470,40 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( }, isTableForm:false, }, + { + label: '返利税额', + field: 'rebateTax', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:4, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + isTableForm:false, + }, + { + label: '返利价税合计', + field: 'rebateTotal', + formatter: accountantFormart, + table: { + width: 150 + }, + sortTableDefault:4, + form: { + component: 'InputNumber', + componentProps: { + precision: 2, + disabled: true, + } + }, + isTableForm:false, + }, { label: '发票税额', field: 'totalTaxAmount', @@ -579,7 +613,7 @@ export const SupplierinvoiceRequestMain = useCrudSchemas(reactive( precision: 2, disabled: true, } - }, + } }, // { @@ -1473,6 +1507,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive + + + + + + diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts index 5bdc5ec06..93482a5c1 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMainDifference/supplierinvoiceRequestMainDifference.data.ts @@ -1489,6 +1489,9 @@ export const SupplierinvoiceRequestDetailMain = useCrudSchemas(reactive