From 2fbb33c655c8edab050403deef3155ac2c494c07 Mon Sep 17 00:00:00 2001 From: liuxiaoxu <1793812695@qq.com> Date: Fri, 29 Nov 2024 19:57:11 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=20=E5=85=A5=E5=BA=93-=E4=BB=93=E5=BA=93?= =?UTF-8?q?=E3=80=81=E5=85=A5=E5=BA=93-=E9=87=87=E8=B4=AD=E3=80=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E9=80=80=E6=8D=A2=E8=B4=A7=E3=80=81?= =?UTF-8?q?=E5=85=A5=E5=BA=93-=E5=A7=94=E5=A4=96=EF=BC=9B=E6=9A=82?= =?UTF-8?q?=E6=94=B6-=E4=BB=93=E5=BA=93=E3=80=81=E6=9A=82=E6=94=B6-?= =?UTF-8?q?=E9=87=87=E8=B4=AD=E3=80=81=E6=9A=82=E6=94=B6=E3=80=81=E5=A7=94?= =?UTF-8?q?=E5=A4=96=E5=89=8D=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=92=8C=E5=85=B6?= =?UTF-8?q?=E5=AF=B9=E5=BA=94=E7=9A=84=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E9=83=BD=E5=8A=A0=E4=B8=8A=E7=89=A9=E6=96=99=E5=9E=8B?= =?UTF-8?q?=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=8C=E7=89=A9=E6=96=99=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=E5=92=8C=E7=89=A9=E6=96=99=E5=8A=A0=E5=B7=A5=E6=96=B9?= =?UTF-8?q?=E5=BC=8F=E9=83=BD=E5=BC=95=E7=94=A8=E5=AD=97=E6=AE=B5=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouse/storageOrder/storageMakeDetail.html | 5 +++++ .../warehouse/storageOrder/storageOutOrder.html | 6 ++++++ .../warehouse/storageOrder/storageOutOrderDetail.html | 5 +++++ .../warehouse/storageOrder/storagePurchase.html | 11 +++++++++++ .../warehouse/storageOrder/storagePurchaseDetail.html | 11 +++++++++++ .../storageOrder/storagePurchaseWarehouse.html | 10 ++++++++++ .../storageOrder/storagePurchaseWarehouseDetail.html | 10 ++++++++++ .../storageOrder/storageRefundsExchanges.html | 5 +++++ .../storageOrder/storageRefundsExchangesDetail.html | 4 ++++ .../warehouse/storageOrder/temporaryOutOrder.html | 5 +++++ .../storageOrder/temporaryOutOrderDetail.html | 4 ++++ .../warehouse/storageOrder/temporaryPurchase.html | 4 ++++ .../storageOrder/temporaryPurchaseDetail.html | 4 ++++ .../storageOrder/temporaryPurchaseWarehouse.html | 7 +++++-- .../temporaryPurchaseWarehouseDetail.html | 4 ++++ 15 files changed, 93 insertions(+), 2 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html index 21597d30..1920d9c5 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageMakeDetail.html @@ -190,6 +190,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', 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 02acd434..cb3f88c7 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrder.html @@ -115,6 +115,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -211,6 +212,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', 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 d7b97f45..bc09630e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageOutOrderDetail.html @@ -150,6 +150,11 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '描述', align: 'center', 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 ad9847a6..a3bee18f 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchase.html @@ -126,6 +126,11 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchase-edit").validate({ focusCleanup: true @@ -233,6 +238,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -258,6 +266,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { 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 4ee5f345..1ba829e8 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseDetail.html @@ -124,6 +124,11 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchase-edit").validate({ focusCleanup: true @@ -230,6 +235,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -255,6 +263,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { 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 afb90a21..8b6fe56c 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouse.html @@ -124,6 +124,10 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var prefix = ctx + "warehouse/storageOrder"; $("#form-storagePurchaseWarehouse-edit").validate({ focusCleanup: true @@ -231,6 +235,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -256,6 +263,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { 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 14aa1c04..01502a37 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storagePurchaseWarehouseDetail.html @@ -124,6 +124,10 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] + + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; + var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ focusCleanup: true @@ -229,6 +233,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', @@ -254,6 +261,9 @@ { title: '物料加工方式', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html index cae94a8c..d27bdf4b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchanges.html @@ -123,6 +123,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -218,6 +219,10 @@ title: '图片', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', field: 'materialDescribe', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html index c1d2cd23..d87c3f0b 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/storageRefundsExchangesDetail.html @@ -213,6 +213,10 @@ title: '物料图片地址', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', field: 'materialDescribe', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html index a5b58e41..08e90f5e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrder.html @@ -117,6 +117,7 @@ "materialName": item.materialName, "materialType": item.materialType, "materialPhotourl": item.materialPhotourl, + "materialModel": item.materialModel, "materialDescribe": item.materialDescribe, "materialBrand": item.materialBrand, "materialUnit": item.materialUnit, @@ -204,6 +205,10 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '物料描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html index ed76f722..f7d68936 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryOutOrderDetail.html @@ -145,6 +145,10 @@ align: 'center', field: 'materialPhotourl', }, + { + title: '物料型号', + field: 'materialModel', + }, { title: '描述', align: 'center', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html index d129f157..66c1ea0e 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchase.html @@ -128,6 +128,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -232,6 +233,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html index bf17f661..6a701c71 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseDetail.html @@ -128,6 +128,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -231,6 +232,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址', diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html index 6fb67c11..189f1543 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouse.html @@ -122,9 +122,9 @@ var warehouseStorageCode = [[${warehouseStorageOrder.warehouseStorageCode}]] var warehouseCode = [[${warehouseStorageOrder.warehouseCode}]] - var processMethodDatas = [[${@dict.getType('processMethod')}]]; - var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -226,6 +226,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { 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 b4be4347..f2b20c47 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/storageOrder/temporaryPurchaseWarehouseDetail.html @@ -126,6 +126,7 @@ var warehouseDeptTypeDatas = [[${@dict.getType('warehouse_dept_type')}]]; var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/storageOrder"; $("#form-temporaryPurchaseWarehouse-edit").validate({ @@ -228,6 +229,9 @@ { title: '物料类型', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '物料图片地址',