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/4] =?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/4] =?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', From 3b8fddabc5054583b2e06f335b06e87a1fcfbafa Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Fri, 6 Dec 2024 14:41:11 +0800 Subject: [PATCH 3/4] =?UTF-8?q?YT-1590=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5?= =?UTF-8?q?=E5=BA=93=EF=BC=8C=E5=88=B0=E5=BA=93=E4=BD=8D=E5=A4=8D=E5=88=B6?= =?UTF-8?q?=E7=B2=98=E8=B4=B4=E6=97=B6=E7=B3=BB=E7=BB=9F=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E9=87=8D=E5=A4=8D=EF=BC=8C=E9=80=9A=E8=BF=87=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=98=AF=E4=B8=8D=E4=BC=9A=E6=8F=90=E7=A4=BA?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../unplannedreceiptRequestMain.data.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts index d6d1806f3..4a6ed02ac 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/unplannedreceiptRequestMain.data.ts @@ -1050,6 +1050,7 @@ export const UnplannedreceiptRequestDetail = useCrudSchemas(reactive Date: Fri, 6 Dec 2024 14:59:11 +0800 Subject: [PATCH 4/4] =?UTF-8?q?YT-1593=E8=A6=81=E8=B4=A7=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E6=98=8E=E7=BB=86=E6=96=B0=E5=A2=9E=E5=8A=9F=E8=83=BD=E5=8E=BB?= =?UTF-8?q?=E6=8E=89=EF=BC=88=E4=BB=BB=E4=BD=95=E7=8A=B6=E6=80=81=E9=83=BD?= =?UTF-8?q?=E4=B8=8D=E8=83=BD=E6=96=B0=E5=A2=9E=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../supplierdeliver/purchasePlanMain/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue index ad01b90e2..4939b511f 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/purchasePlanMain/index.vue @@ -90,7 +90,7 @@ :detailButtonIsShowAddStatusArray="['1','3','4','5','6']" :detailButtonIsShowEdit="detailData.type == 'SCHEDULE'&& detailData.status != 4" :detailButtonIsShowDelete="detailData.type == 'SCHEDULE'&& detailData.status != 4" - :detailButtonIsShowAdd="detailData.type == 'SCHEDULE'&& detailData.status != 4" + :detailButtonIsShowAdd="false" addHasPermi="wms:purchase-plan-main:create" editHasPermi="wms:purchase-plan-main:update" deleteHasPermi="wms:purchase-plan-main:delete"