[feat]销售管理

销售订单子新增页面、修改页面、详情页面、驳回调整页面、总经理总助审批页面、业务经理审批页面、业务主管审批页面新增型号字段

ruoyi-admin/src/main/resources/templates/system/salesOrder/add.html

@@ -348,6 +348,7 @@
                 {title: '图片',field: 'photoUrl',align: 'center',formatter: function(value, row, index) {return $.table.imageView(value);} },
                 {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}},
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
                 { title: '入库部门',field: 'warehouseDept',align: 'center',
@@ -861,6 +862,7 @@
                         materialType: rowData.materialType,
                         describe: rowData.describe,
                         brand: rowData.brand,
+                        materialModel: rowData.materialModel,
                         unit: rowData.unit,
                         processMethod: rowData.processMethod,
                         photoUrl: rowData.photoUrl,

ruoyi-admin/src/main/resources/templates/system/salesOrder/detail.html

@@ -352,6 +352,7 @@
                 {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} },
                 {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}},
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
                 {title: '半成品类型',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},
@@ -540,6 +541,7 @@
                 materialName: rowData.materialName,
                 materialType: rowData.materialType,
                 describe: rowData.describe,
+                materialModel: rowData.materialModel,
                 brand: rowData.brand,
                 photoUrl: rowData.photoUrl,
                 unit: rowData.unit,

ruoyi-admin/src/main/resources/templates/system/salesOrder/edit.html

@@ -373,6 +373,7 @@
                     }
                 },
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center',
                     formatter: function(value, row, index) {
@@ -725,6 +726,7 @@
                     materialName: rowData[i].materialName,
                     materialType: rowData[i].materialType,
                     describe: rowData[i].describe,
+                    materialModel: rowData[i].materialModel,
                     brand: rowData[i].brand,
                     photoUrl: rowData[i].photoUrl,
                     warehouseDept:rowData[i].warehouseDept,

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskModifyApply.html

@@ -360,6 +360,7 @@
                     }
                 },
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center',
                     formatter: function(value, row, index) {
@@ -593,6 +594,7 @@
                         materialName: rowData.materialName,
                         materialType: rowData.materialType,
                         describe: rowData.describe,
+                        materialModel: rowData.materialModel,
                         brand: rowData.brand,
                         unit: rowData.unit,
                         processMethod: rowData.processMethod,

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwjlVerify.html

@@ -352,6 +352,7 @@
                 {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} },
                 {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}},
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
                 {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskYwzgVerify.html

@@ -351,6 +351,7 @@
                 {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} },
                 {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}},
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
                 {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},

ruoyi-admin/src/main/resources/templates/system/salesOrder/taskZozjVerify.html

@@ -352,6 +352,7 @@
                 {title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);} },
                 {title: '物料类型',field: 'materialType',align: 'center',formatter: function(value, row, index) {return $.table.selectCategoryLabel(materialTypeDatas, value);}},
                 { title: '描述',field: 'describe',align: 'center'},
+                {title: '型号',field: 'materialModel',align: 'center'},
                 {title: '品牌',field: 'brand',align: 'center'},
                 { title: '单位',field: 'unit',align: 'center', formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}},
                 {title: '加工方式',field: 'processMethod',align: 'center',formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}},