From edabc739e150edc866a60d209c86375f2407b682 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 5 Dec 2024 16:04:56 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=88=E8=AE=A1=E5=8D=95=E4=BB=B7?= =?UTF-8?q?=E5=B0=8F=E6=95=B0=E4=BD=8D=E6=95=B0,=E4=BB=B7=E7=A8=8E?= =?UTF-8?q?=E5=90=88=E8=AE=A1=E9=87=91=E9=A2=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CustomerSaleInvoiceBasicForm.vue | 2 +- .../customerSaleInvoiceRequestMain.data.ts | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue index f18f93699..13c428949 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/CustomerSaleInvoiceBasicForm.vue @@ -77,7 +77,7 @@ // 主数据税额 taxAmount:mainTaxAmount, // 主数据价税合计金额：mainAdTaxAmount =未税金额+税额 - adTaxAmount:mainBeforeTaxAmount+mainTaxAmount + adTaxAmount:(parseFloat(mainBeforeTaxAmount) + mainTaxAmount).toFixed(2) } formRef.value.setValues(sumObject) } diff --git a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts index 87d32b5a1..40678adff 100644 --- a/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts +++ b/src/views/wms/deliversettlementManage/customerSaleInvoiceRequestMain/customerSaleInvoiceRequestMain.data.ts @@ -447,12 +447,14 @@ export const CustomerSaleInvoiceDetail = useCrudSchemas(reactive([ form: { component: 'InputNumber', componentProps: { - disabled: true + disabled: true, + precision: 5 } }, tableForm: { disabled: true, type: 'InputNumber', + precision: 5 } }, { From 31668a9f2cf735dc15bfae4ce72a1052cfce2ad2 Mon Sep 17 00:00:00 2001 From: songguoqiang <765017469@qq.com> Date: Fri, 6 Dec 2024 14:28:59 +0800 Subject: [PATCH 2/2] =?UTF-8?q?YT-1388:=E9=A1=BA=E5=BC=95=E6=94=B6?= =?UTF-8?q?=E8=B4=A7=E8=AE=B0=E5=BD=95=E3=80=81=E7=9B=B4=E7=BA=B3=E5=93=81?= =?UTF-8?q?=E6=94=B6=E8=B4=A7=E8=AE=B0=E5=BD=95=E9=A1=B5=E9=9D=A2=E5=AD=97?= =?UTF-8?q?=E6=AE=B5=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchasereceiptRecordMain.data.ts | 18 +++++++++--------- .../purchasereceiptRecordMain.data.ts | 18 +++++++++--------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 30bd3f3e8..7b3cc3d58 100644 --- a/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/amvpurchasereceipt/amvPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -411,15 +411,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, - { - label: '发货数量', - field: 'shippedQty', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:12, - }, + // { + // label: '发货数量', + // field: 'shippedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:12, + // }, { label: '收货数量', field: 'qty', diff --git a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts index 30bd3f3e8..7b3cc3d58 100644 --- a/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts +++ b/src/views/wms/purchasereceiptManage/jispurchasereceipt/jisPurchasereceiptRecordMain/purchasereceiptRecordMain.data.ts @@ -411,15 +411,15 @@ export const PurchasereceiptRecordMain = useCrudSchemas(reactive([ }, sortTableDefault:12, }, - { - label: '发货数量', - field: 'shippedQty', - sort: 'custom', - table: { - width: 150 - }, - sortTableDefault:12, - }, + // { + // label: '发货数量', + // field: 'shippedQty', + // sort: 'custom', + // table: { + // width: 150 + // }, + // sortTableDefault:12, + // }, { label: '收货数量', field: 'qty',