From 807e8aed95b265f1f8964090f3e8fd7d3d55ab1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Mon, 14 Oct 2024 15:38:20 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BB=93=E5=BA=93=E7=AE=A1=E7=90=86=20?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E5=8D=95=20=E5=8E=BB=E9=99=A4=E5=A7=94?= =?UTF-8?q?=E5=A4=96=E5=8D=95=E5=85=A5=E5=BA=93=E3=80=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AF=A6=E6=83=85=EF=BC=9B=E9=87=87=E8=B4=AD=E5=8D=95=E5=85=A5?= =?UTF-8?q?=E5=BA=93=E3=80=81=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85=EF=BC=9B?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E5=8D=95=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E3=80=81=E4=BB=93=E5=BA=93=E5=85=A5=E5=BA=93=E8=AF=A6=E6=83=85?= =?UTF-8?q?=EF=BC=9B=E9=87=87=E8=B4=AD=E5=8D=95=E4=BB=93=E5=BA=93=E6=9A=82?= =?UTF-8?q?=E6=94=B6=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E7=9A=84=E6=9A=82?= =?UTF-8?q?=E6=94=B6=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5=E6=98=BE=E7=A4=BA?= =?UTF-8?q?=E6=95=88=E6=9E=9C=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/storageOrder/storageOutOrder.html | 5 ++++- .../warehouse/storageOrder/storageOutOrderDetail.html | 6 ++++-- .../warehouse/storageOrder/storagePurchase.html | 7 +++++-- .../warehouse/storageOrder/storagePurchaseDetail.html | 10 +++++++++- .../storageOrder/storagePurchaseWarehouse.html | 6 ++++-- .../storageOrder/storagePurchaseWarehouseDetail.html | 6 ++++-- .../storageOrder/temporaryPurchaseWarehouseDetail.html | 5 ++++- 7 files changed, 34 insertions(+), 11 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html index e46e7e18..3cb0cbd2 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html @@ -221,6 +221,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '品质已合格数', @@ -241,16 +242,18 @@ }, { - title: '暂收合格数', + title: '暂收数量', field: 'temporaryQualifiedNum', }, { title: '暂收备注', field: 'temporaryRemark', + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }, { title: '入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html index b85f6ae8..2f5f03e2 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html @@ -176,6 +176,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '品质已合格数', @@ -196,17 +197,18 @@ }, { - title: '暂收合格数', + title: '暂收数量', field: 'temporaryQualifiedNum', }, { title: '暂收备注', field: 'temporaryRemark', - editable: true + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }, { title: '入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html index 7ac82fa1..618651f6 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html @@ -259,6 +259,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '已入库数', @@ -275,16 +276,18 @@ }, { - title: '暂收合格数', + title: '暂收数量', field: 'temporaryQualifiedNum' }, { title: '暂收备注', - field: 'temporaryRemark' + field: 'temporaryRemark', + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }, { title: '入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html index eeee6a18..aeb95505 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html @@ -249,6 +249,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '已入库数', @@ -266,15 +267,22 @@ { title: '暂收合格数', + field: 'temporaryQualifiedNum', + visible: false, + }, + { + title: '暂收数量', field: 'temporaryQualifiedNum' }, { title: '暂收备注', - field: 'temporaryRemark' + field: 'temporaryRemark', + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }, { title: '入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html index f448d48b..ed74906d 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html @@ -250,6 +250,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '品质已合格数', @@ -270,17 +271,18 @@ }, { - title: '暂收合格数', + title: '暂收数量', field: 'temporaryQualifiedNum', }, { title: '暂收备注', field: 'temporaryRemark', - editable: true + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }, { title: '入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html index 2da83149..dff9a9b2 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html @@ -249,6 +249,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '品质已合格数', @@ -269,17 +270,18 @@ }, { - title: '暂收合格数', + title: '暂收数量', field: 'temporaryQualifiedNum', }, { title: '暂收备注', field: 'temporaryRemark', - editable: true + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }, { title: '入库数', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html index 9b5db316..b99437e9 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html @@ -260,6 +260,7 @@ { title: '暂收已合格数', field: 'temporaryHasQualifiedNum', + visible: false, }, { title: '品质已合格数', @@ -280,16 +281,18 @@ }, { - title: '暂收合格数', + title: '暂收数量', field: 'temporaryQualifiedNum', }, { title: '暂收备注', field: 'temporaryRemark', + visible: false, }, { title: '暂收报告', field: 'temporaryReportUrl', + visible: false, }] });