[fix]

工程管理 bom信息
修改添加bom页面select2下拉框绑定数据方法；
修改bom列表字段显示效果，按审核状态不同颜色不同；

工程管理 物料信息
修改物料列表字段显示效果，按审核状态不同颜色不同；

ruoyi-admin/src/main/resources/templates/erp/bom/add.html

@@ -192,19 +192,14 @@
                         if(res.code==0){
                             var resultList = res.data;
                             console.log(resultList);
-                            // for(var i= 0, len=resultList.length;i<len;i++){
-                            //     var option = resultList[i];
-                            //     option.id = resultList[i]["materialNo"];
-                            //     option.text = resultList[i]["materialNo"];
-                            //     options.push(option);
-                            // }
+                            for(var i= 0, len=resultList.length;i<len;i++){
+                                var option = resultList[i];
+                                option.id = resultList[i]["materialNo"];
+                                option.text = resultList[i]["materialNo"];
+                                options.push(option);
+                            }
                             return {
-                                results: resultList.map(function (item) {
-                                    return {
-                                        id: item.materialNo,
-                                        text: item.materialNo
-                                    };
-                                })
+                               results: options
                             }
                         };
                         return {

ruoyi-admin/src/main/resources/templates/erp/bom/bom.html

@@ -146,23 +146,88 @@
                     checkbox: true
                 },
                 { title: '主键ID',field: 'id',visible: false},
-                { title: 'bom号',field: 'bomNo', sortable: true,},
-                { title: '料号',field: 'materialNo', sortable: true,},
-                { title: '物料名称',field: 'materialName', sortable: true,},
-                {title: '描述',field: 'describe'},
-                { title: '品牌',field: 'brand', sortable: true,},
+                { title: 'bom号',field: 'bomNo', sortable: true,
+                    formatter: function(value, row, index) {
+                    if(row.auditStatus=="0"){
+                        return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
+                { title: '料号',field: 'materialNo', sortable: true,
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
+                { title: '物料名称',field: 'materialName', sortable: true,
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
+                {title: '描述',field: 'describe',
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
+                { title: '品牌',field: 'brand', sortable: true,
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
                 {title: '半成品类型',field: 'processMethod',
-                    formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
+                    formatter: function(value, row, index) {
+                    var showvalue = $.table.selectDictLabel(processMethodDatas, value);
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (showvalue ? showvalue : "-") + '</span>';
+                        }
+                }
+                },
+                { title: '单位',field: 'unit',
+                    formatter: function(value, row, index) {
+                        // var showvalue = $.table.selectDictLabel(sysUnitClassDatas, value);
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
+                { title: '图片',field: 'photoUrl',
+                    formatter: function(value, row, index) {
+                        var showvalue = $.table.imageView(value);
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (showvalue ? showvalue : "-") + '</span>';
+                        }
+                    // return ;
+                }
                 },
-                { title: '单位',field: 'unit'},
-                { title: '图片',field: 'photoUrl',formatter: function(value, row, index) {return $.table.imageView(value);}},
                 { title: '<span style="color: red;">申请人</span>',field: 'applyUserName',
                     formatter: function(value, row, index) {return '<span style="color: red;">' + (value ? value : "-") + '</span>';}
                 },
-                { title: '申请时间',field: 'applyTime',sortable: true,},
-                {title: '上次更新时间',field: 'updateTime',},
+                { title: '申请时间',field: 'applyTime',sortable: true,
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
+                {title: '上次更新时间',field: 'updateTime',
+                    formatter: function(value, row, index) {
+                        if(row.auditStatus=="0"){
+                            return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                        }
+                    }
+                },
                 { title: '当前状态',field: 'taskName',align: 'center',
                     formatter: function(value, row, index) {
+                        if(row.auditStatus!="1"){
+                            return '<span class="badge badge-danger">' + value + '</span>';
+                        }
                         return '<span class="badge badge-primary">' + value + '</span>';
                     }
                 },

ruoyi-admin/src/main/resources/templates/erp/material/material.html

@@ -133,26 +133,81 @@
                 columns: [
                     {checkbox: true},
                     {title: '主键ID',field: 'id',visible: false},
-                    {title: '料号',field: 'materialNo',},
-                    {title: '物料名称',field: 'materialName',},
-                    {title: '描述',field: 'describe',},
-                    {title: '品牌',field: 'brand',},
+                    {title: '料号',field: 'materialNo',
+                        formatter: function(value, row, index) {
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                        }
+                    },
+                    {title: '物料名称',field: 'materialName',
+                        formatter: function(value, row, index) {
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                        }
+                    },
+                    {title: '描述',field: 'describe',
+                        formatter: function(value, row, index) {
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                        }
+                    },
+                    {title: '品牌',field: 'brand',
+                        formatter: function(value, row, index) {
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                        }
+                    },
                     {title: '半成品类型',field: 'processMethod',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(processMethodDatas, value);}
+                        formatter: function(value, row, index) {
+                            var showvalue = $.table.selectDictLabel(processMethodDatas, value);
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (showvalue ? showvalue : "-") + '</span>';
+                            }
+                         }
                     },
                     {title: '单位',field: 'unit',
-                        formatter: function(value, row, index) {return $.table.selectDictLabel(sysUnitClassDatas, value);}
+                        formatter: function(value, row, index) {
+                            // var showvalue = $.table.selectDictLabel(sysUnitClassDatas, value);
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                    }
                     },
                     {title: '图片',field: 'photoUrl',
-                        formatter: function(value, row, index) {return $.table.imageView(value);}
+                        formatter: function(value, row, index) {
+                            var showvalue = $.table.imageView(value);
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (showvalue ? showvalue : "-") + '</span>';
+                            }
+                    }
                     },
                     {title: '<span style="color: red;">申请人</span>',field: 'applyUserName',
                         formatter: function(value, row, index) {return '<span style="color: red;">' + (value ? value : "-") + '</span>';}
                     },
-                    {title: '申请时间',field: 'applyTime',},
-                    {title: '上次更新时间',field: 'updateTime',},
+                    {title: '申请时间',field: 'applyTime',
+                        formatter: function(value, row, index) {
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                        }
+                    },
+                    {title: '上次更新时间',field: 'updateTime',
+                        formatter: function(value, row, index) {
+                            if(row.auditStatus=="0"){
+                                return '<span style="color: red;">' + (value ? value : "-") + '</span>';
+                            }
+                        }
+                    },
                     {title: '当前状态',field: 'taskName',align: 'center',
-                        formatter: function(value, row, index) {return '<span class="badge badge-primary">' + value + '</span>';}
+                        formatter: function(value, row, index) {
+                        if(row.auditStatus!="1"){
+                            return '<span class="badge badge-danger">' + value + '</span>';
+                        }
+                        return '<span class="badge badge-primary">' + value + '</span>';}
                     },
                     {title: '流程实例ID',field: 'instanceId',visible: false},
                     {title: '流程提交实例ID',field: 'submitInstanceId',visible: false},