From ca590975a471a8ea0e3802a7fe051636aee635e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=99=93=E8=BF=AA?= <2596750866@qq.com> Date: Fri, 29 Nov 2024 17:14:37 +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=87=BA=E5=BA=93=E5=8D=95=20=E4=BF=AE=E6=94=B9=E7=94=9F?= =?UTF-8?q?=E4=BA=A7=E9=A2=86=E6=96=99=E5=87=BA=E5=BA=93=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=EF=BC=8C=E8=AE=BE?= =?UTF-8?q?=E7=BD=AE=E5=88=97=E5=B1=85=E4=B8=AD=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=B3=A8=E8=A7=A3=EF=BC=8C=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=9E=8B=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B=20=E4=BF=AE?= =?UTF-8?q?=E6=94=B9=E9=94=80=E5=94=AE=E8=AE=A2=E5=8D=95=E5=87=BA=E5=BA=93?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=92=8C=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=EF=BC=8C=E8=AE=BE=E7=BD=AE=E5=88=97=E5=B1=85=E4=B8=AD=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AD=97=E5=85=B8=E6=B3=A8=E8=A7=A3=EF=BC=8C?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=9E=8B=E5=8F=B7=E5=AD=97=E6=AE=B5=EF=BC=9B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../warehouseOutOrder/makeOutWarehouse.html | 32 ++++++++++++----- .../makeOutWarehouseDetail.html | 32 +++++++++++++---- .../warehouseOutOrder/salesOutWarehouse.html | 35 ++++++++++++++++--- .../salesOutWarehouseDetail.html | 35 ++++++++++++++++--- 4 files changed, 110 insertions(+), 24 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouse.html index 6b0576c5..8cad04e2 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouse.html @@ -59,7 +59,8 @@ var warehouseOutOrder = [[${warehouseOutOrder}]]; - + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/warehouseOutOrder"; $("#form-makeOutWarehouse-edit").validate({ focusCleanup: true @@ -111,9 +112,7 @@ showToggle: false, showColumns: false, pagination: false, // 设置不分页 - columns: [{ - checkbox: true - }, + columns: [ { title: '出库单详情ID', field: 'outOrderDetailId', @@ -128,41 +127,57 @@ { title: '料号', field: 'materialNo', + align: 'center', }, { title: '图片', + align: 'center', field: 'materialPhotourl', }, { title: '物料名称', + align: 'center', field: 'materialName', }, { title: '物料类型', + align: 'center', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '描述', + align: 'center', field: 'materialDescribe', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '品牌', + align: 'center', field: 'materialBrand', }, { title: '单位', + align: 'center', field: 'materialUnit', }, { title: '加工方式', + align: 'center', field: 'materialProcessMethod', - }, - { - title: '订单数量', - field: 'makeNum', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { title: '已出库数', + align: 'center', field: 'hasOutOrderSum', }, { @@ -171,6 +186,7 @@ }, { title: '实际出库数', + align: 'center', field: 'actualOutOrderSum', editable: { validate: function(value) { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouseDetail.html index 9942dee2..e9125ca7 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/makeOutWarehouseDetail.html @@ -58,6 +58,8 @@ var warehouseOutOrder = [[${warehouseOutOrder}]]; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/warehouseOutOrder"; $("#form-makeOutWarehouse-edit").validate({ @@ -110,9 +112,7 @@ showToggle: false, showColumns: false, pagination: false, // 设置不分页 - columns: [{ - checkbox: true - }, + columns: [ { title: '出库单详情ID', field: 'outOrderDetailId', @@ -127,49 +127,67 @@ { title: '料号', field: 'materialNo', + align: 'center', }, { title: '图片', + align: 'center', field: 'materialPhotourl', }, { title: '物料名称', + align: 'center', field: 'materialName', }, { title: '物料类型', + align: 'center', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } }, { title: '描述', + align: 'center', field: 'materialDescribe', }, + { + title: '型号', + align: 'center', + field: 'materialModel', + }, { title: '品牌', + align: 'center', field: 'materialBrand', }, { title: '单位', + align: 'center', field: 'materialUnit', }, { title: '加工方式', + align: 'center', field: 'materialProcessMethod', - }, - { - title: '订单数量', - field: 'makeNum', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { title: '已出库数', + align: 'center', field: 'hasOutOrderSum', }, { title: '申请出库数', + align: 'center', field: 'applyOutOrderSum', }, { title: '实际出库数', + align: 'center', field: 'actualOutOrderSum', } ] diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html index 1e24df69..bc9775a9 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouse.html @@ -103,7 +103,8 @@ var warehouseOutOrder = [[${warehouseOutOrder}]]; - + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/warehouseOutOrder"; @@ -194,54 +195,78 @@ { title: '料号', + align: 'center', field: 'materialNo', }, - { - title: '图片', - field: 'materialPhotourl', - }, { title: '物料名称', + align: 'center', field: 'materialName', }, + { + title: '图片', + align: 'center', + field: 'materialPhotourl', + }, { title: '物料类型', + align: 'center', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } + }, + { + title: '型号', + align: 'center', + field: 'materialModel', }, { title: '描述', + align: 'center', field: 'materialDescribe', }, { title: '品牌', + align: 'center', field: 'materialBrand', }, { title: '单位', + align: 'center', field: 'materialUnit', }, { title: '加工方式', + align: 'center', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { title: '订单数量', + align: 'center', field: 'makeNum', }, { title: '已出库数', + align: 'center', field: 'hasOutOrderSum', }, { title: '申请出库数', + align: 'center', field: 'applyOutOrderSum', }, { title: '准备出库数', + align: 'center', field: 'prepareOutOrderSum', }, { title: '实际出库数', + align: 'center', field: 'actualOutOrderSum', editable: { validate: function(value) { diff --git a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html index d4c68fd1..17c4e719 100644 --- a/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html +++ b/ruoyi-admin/src/main/resources/templates/warehouse/warehouseOutOrder/salesOutWarehouseDetail.html @@ -103,6 +103,8 @@ var warehouseOutOrder = [[${warehouseOutOrder}]]; + var processMethodDatas = [[${@dict.getType('processMethod')}]]; + var materialTypeDatas = [[${@category.getChildByCode('materialType')}]]; var prefix = ctx + "warehouse/warehouseOutOrder"; @@ -195,53 +197,78 @@ { title: '料号', field: 'materialNo', - }, - { - title: '图片', - field: 'materialPhotourl', + align: 'center', }, { title: '物料名称', + align: 'center', field: 'materialName', }, + { + title: '图片', + field: 'materialPhotourl', + align: 'center', + + }, { title: '物料类型', + align: 'center', field: 'materialType', + formatter: function(value, row, index) { + return $.table.selectCategoryLabel(materialTypeDatas, value); + } + }, + { + title: '型号', + align: 'center', + field: 'materialModel', }, { title: '描述', + align: 'center', field: 'materialDescribe', }, { title: '品牌', + align: 'center', field: 'materialBrand', }, { title: '单位', + align: 'center', field: 'materialUnit', }, { title: '加工方式', + align: 'center', field: 'materialProcessMethod', + formatter: function(value, row, index) { + return $.table.selectDictLabel(processMethodDatas, value); + } }, { title: '订单数量', + align: 'center', field: 'makeNum', }, { title: '已出库数', + align: 'center', field: 'hasOutOrderSum', }, { title: '申请出库数', + align: 'center', field: 'applyOutOrderSum', }, { title: '准备出库数', + align: 'center', field: 'prepareOutOrderSum', }, { title: '实际出库数', + align: 'center', field: 'actualOutOrderSum', } ]