[fix]

仓库管理 出库单
修改生产领料出库页面和详情页面，设置列居中，添加字典注解，添加型号字段；
修改销售订单出库页面和详情页面，设置列居中，添加字典注解，添加型号字段；

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) {

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',
                 }
             ]

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) {

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',
                 }
             ]