From e3c9bbad3a4b762e830e50cf1b28c1b8e41e44f8 Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Fri, 11 Apr 2025 20:01:39 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E5=93=81=E7=95=AA=E6=B6=88=E8=80=97?= =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=8C=89=E9=92=AE=E9=9A=90=E8=97=8F=EF=BC=8C?= =?UTF-8?q?=E5=8F=91=E7=89=88=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/wms/issueManage/itemcodeConsumeRecord/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/issueManage/itemcodeConsumeRecord/index.vue b/src/views/wms/issueManage/itemcodeConsumeRecord/index.vue index b84f46452..4d84f120d 100644 --- a/src/views/wms/issueManage/itemcodeConsumeRecord/index.vue +++ b/src/views/wms/issueManage/itemcodeConsumeRecord/index.vue @@ -100,7 +100,7 @@ const { getList, setSearchParams } = tableMethods // 列表头部按钮 const HeadButttondata = [ defaultButtons.defaultAddBtn({hasPermi:'wms:itemcodeConsumeRecord:create'}), // 新增 - defaultButtons.defaultImportBtn(null), // 导入 + // defaultButtons.defaultImportBtn(null), // 导入 defaultButtons.defaultExportBtn(null), // 导出 defaultButtons.defaultFreshBtn(null), // 刷新 defaultButtons.defaultFilterBtn(null), // 筛选 From d040244480064a5ed53dfd061e2263b5ea5099ca Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Sat, 12 Apr 2025 14:22:00 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BE=9B=E5=BA=94=E5=95=86=E5=8F=91?= =?UTF-8?q?=E7=A5=A8=E5=9B=9E=E8=BD=AC=E9=9C=80=E6=B1=82=E5=8F=98=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoiceRecordMain/index.vue | 3 ++- .../supplierinvoiceRecordMain.data.ts | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index b2f884a9e..edc601ad3 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -300,7 +300,8 @@ const buttonTableClick = async (val, row) => { basicFormRef.value.formRef.setValues({ reversepostingdate:dayjs().valueOf(), // tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}` - tcCInvoiceRemark:`冲销凭证${row['voucherNumber']}` + tcCInvoiceRemark:`冲销凭证${row['voucherNumber']}`, + tcCInvoiceAllocationRemark:`模具分摊冲销凭证${row['transferNumber']}` }) }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 9520e4ea0..39e07f0b7 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -2017,7 +2017,7 @@ export const SupplierinvoiceRecordMainTransfer = useCrudSchemas(reactive Date: Sat, 12 Apr 2025 14:42:31 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E8=AF=B4=E6=98=8E?= =?UTF-8?q?=EF=BC=8C=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 4 ++-- .../supplierinvoiceRecordMain.data.ts | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index edc601ad3..0015ba127 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -300,8 +300,8 @@ const buttonTableClick = async (val, row) => { basicFormRef.value.formRef.setValues({ reversepostingdate:dayjs().valueOf(), // tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}` - tcCInvoiceRemark:`冲销凭证${row['voucherNumber']}`, - tcCInvoiceAllocationRemark:`模具分摊冲销凭证${row['transferNumber']}` + tcCInvoiceRemark:`冲销凭证${row['voucherNumber']||''}`, + tcCInvoiceAllocationRemark:`模具分摊冲销凭证${row['transferNumber']||''}` }) }) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts index 39e07f0b7..f0062b9f8 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/supplierinvoiceRecordMain.data.ts @@ -700,7 +700,7 @@ export const SupplierinvoiceRecordMain = useCrudSchemas(reactive([ sortTableDefault:11, }, { - label: '说明',//回转说明 + label: '发票说明',//回转说明 field: 'tcCInvoiceRemark', sortTableDefault:11, table: { @@ -1427,12 +1427,12 @@ export const SupplierinvoiceRecordDetailMain = useCrudSchemas(reactive Date: Sat, 12 Apr 2025 21:57:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=8F=91=E7=A5=A8=E5=9B=9E=E8=BD=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRecordMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue index 0015ba127..30261cc3f 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRecordMain/index.vue @@ -301,7 +301,7 @@ const buttonTableClick = async (val, row) => { reversepostingdate:dayjs().valueOf(), // tcCInvoiceRemark:`回转${row['supplierName']}发票 ${row['goldenTaxInvoiceNumber']}` tcCInvoiceRemark:`冲销凭证${row['voucherNumber']||''}`, - tcCInvoiceAllocationRemark:`模具分摊冲销凭证${row['transferNumber']||''}` + tcCInvoiceAllocationRemark:`模具分摊冲销凭证${row['allocationTransferNumber']||''}` }) })