From 25b587695138e830c8d99c21b4fba1ad02602583 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 2 Jul 2025 16:23:05 +0800 Subject: [PATCH 1/4] =?UTF-8?q?YT-2802:=E4=BE=9B=E5=BA=94=E5=95=86?= =?UTF-8?q?=E5=8F=91=E7=A5=A8=E7=94=B3=E8=AF=B7=20=E8=B4=A2=E5=8A=A1?= =?UTF-8?q?=E9=A9=B3=E5=9B=9E=20=E5=BC=B9=E5=87=BA=E6=A1=86=20=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E6=98=BE=E7=A4=BA=E4=BE=9B=E5=BA=94=E5=95=86=E5=90=8D?= =?UTF-8?q?=E7=A7=B0=EF=BC=8C=E9=98=B2=E6=AD=A2=E7=94=A8=E6=88=B7=E9=A9=B3?= =?UTF-8?q?=E5=9B=9E=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierinvoice/supplierinvoiceRequestMain/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue index 8c7c56aeb..4f881e4f6 100644 --- a/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue +++ b/src/views/wms/supplierManage/supplierinvoice/supplierinvoiceRequestMain/index.vue @@ -1392,7 +1392,8 @@ const handleInvoiceSentOut = async (id: number) => { } const resonSubmit = async (val, row) => { - ElMessageBox.prompt(t('ts.请输入驳回原因'), t('ts.提示'), { + ElMessageBox.prompt('请输入驳回原因:'+row.supplierName, t('ts.提示'), { + //ElMessageBox.prompt(t('ts.请输入驳回原因'), t('ts.提示'), { confirmButtonText: t('common.ok'), cancelButtonText: t('common.cancel'), inputPattern: /^[\s\S]*.*\S[\s\S]*$/, // 判断非空，且非空格 From 94e5c9a767624f3281701dad1c2280dff2d0624b Mon Sep 17 00:00:00 2001 From: "YEJIAXING-PC\\lenovo" <591141169@qq.com> Date: Wed, 2 Jul 2025 16:27:53 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E5=A2=9E=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasePlanMain/purchasePlanMain.data.ts | 45 ++++++++++--------- 1 file changed, 23 insertions(+), 22 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts index 189da07ad..5572b48bf 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/purchasePlanMain.data.ts @@ -792,6 +792,28 @@ export const PurchasePlanDetail = useCrudSchemas( tableForm: { disabled: true } + }, + { + label: '箱数', + field: 'boxQty', + sort: 'custom', + sortSearchDefault: 9, + sortTableDefault: 21, + table: { + width: 150 + }, + tableForm: { + type: 'InputNumber', + min: 0, + precision: 0 + }, + form: { + component: 'InputNumber', + componentProps: { + min: 0, + precision: 0 + } + } }, { label: '计划采购数量', @@ -986,28 +1008,7 @@ export const PurchasePlanDetail = useCrudSchemas( disabled: true } }, - { - label: '箱数', - field: 'boxQty', - sort: 'custom', - sortSearchDefault: 9, - sortTableDefault: 21, - table: { - width: 150 - }, - tableForm: { - type: 'InputNumber', - min: 0, - precision: 0 - }, - form: { - component: 'InputNumber', - componentProps: { - min: 0, - precision: 0 - } - } - }, + // { // label: '订单数量', From 9388ed9b28f05d0f00b31ebebf41e9128be76308 Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Wed, 2 Jul 2025 17:01:25 +0800 Subject: [PATCH 3/4] =?UTF-8?q?YT-2720:=E3=80=90=E8=A6=81=E8=B4=A7?= =?UTF-8?q?=E9=A2=84=E6=B5=8B-=E8=AE=A1=E5=88=92=E5=91=98=E3=80=91?= =?UTF-8?q?=E8=8F=9C=E5=8D=95=E7=9A=84=E6=89=8B=E5=8A=A8=E6=8B=89=E5=8F=96?= =?UTF-8?q?=EF=BC=8C=E6=94=B9=E4=B8=BA=E9=80=9A=E8=BF=87kettle=E6=8B=89?= =?UTF-8?q?=E5=8F=96QAD=E7=9A=84=E6=95=B0=E6=8D=AE=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E8=BF=99=E4=B8=AA=E6=8C=89=E9=92=AE=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=8F=90=E7=A4=BA=EF=BC=9A=E6=AD=A3=E5=9C=A8=E6=8B=89=E5=8F=96?= =?UTF-8?q?=E6=95=B0=E6=8D=AE=EF=BC=8C=E9=A2=84=E8=AE=A1=E9=9C=80=E8=A6=81?= =?UTF-8?q?=2020-30=20=E5=88=86=E9=92=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/demandforecastingMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index d459dde9b..d38c9fd93 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -440,7 +440,7 @@ const updateDemandforecaste = async ()=>{ try { let res = await DemandforecastingMainApi.updateDemandforecaste(submitData) console.log('更新结果',res) - message.success(t('同步要货预测数据需要等第一段时间才能同步完毕!')) + message.success(t('正在拉取数据，预计需要 20-30 分钟!')) getList() } finally{ //tableObject.loading = false From fc7c2d200b151822bbb0d649d871d161ba2bf0ae Mon Sep 17 00:00:00 2001 From: songguoqiang Date: Fri, 4 Jul 2025 08:57:46 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=A8=A1=E5=85=B7=E5=88=86=E6=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index acc7b60eb..af19b3c2e 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -101,8 +101,8 @@ moldTaxAmountDiff: Math.round((Number(alreadyMoldUntaxedAmount) - Number(allAmountNum.moldUntaxedAmount))* 100) / 100, // 主数据已分摊价税合计=已分摊模具未税金额+已分摊模具税额 alreadyMoldTaxTotal: Math.round((Number(alreadyMoldUntaxedAmount) + Number(alreadyMoldTaxAmount))* 100) / 100, - // 主数据模具税额差异 alreadyMoldTaxAmount = 模具税额 - 已分摊模具税额 - moldTaxAmountDifference: Math.round((Number(allAmountNum.moldTaxAmount) - Number(alreadyMoldTaxAmount))* 100) / 100, + // 主数据模具税额差异 alreadyMoldTaxAmount = 已分摊模具税额 - 模具税额 + moldTaxAmountDifference: Math.round((Number(alreadyMoldTaxAmount) - Number(allAmountNum.moldTaxAmount))* 100) / 100, } formRef.value.setValues(sumObject) } @@ -196,8 +196,8 @@ const onChange =async (field, cur, formRefParams)=>{ moldTaxAmountDiff: allAmountNum.moldTaxAmountDiff, // 主数据已分摊价税合计=已分摊模具未税金额+已分摊模具税额 alreadyMoldTaxTotal: allAmountNum.alreadyMoldTaxTotal, - // 主数据模具税额差异 alreadyMoldTaxAmount = 模具税额 - 已分摊模具税额 - moldTaxAmountDifference: Math.round((Number(allAmountNum.moldTaxAmount) - Number(allAmountNum.alreadyMoldTaxAmount))* 100) / 100, + // 主数据模具税额差异 alreadyMoldTaxAmount = 已分摊模具税额-模具税额 + moldTaxAmountDifference: Math.round((Number(allAmountNum.alreadyMoldTaxAmount) - Number(allAmountNum.moldTaxAmount))* 100) / 100, }) } } else if (field == 'invoiceType') {