fix:查询厂商机房调用cmdb

@@ -17,7 +17,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var currSelect = 0;
         var dateLimit = ""
         var createTime = "month"
-
+        var manufactureArr = [];
 
         //日期范围选择
         laydate.render({
@@ -143,11 +143,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 }, {
                     field: 'upgradePerson', title: '升级人', align: 'center',
                 },{
-                    field: 'manufacturerName', title: '升级人单位', align: 'center',templet: function (d) {
+                    field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                         if(d.manufacturerId == '0'){
-                            return '其他';
+                            return d.manufacturerOther;
                         }else {
-                            return d.manufacturerName;
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
                         }
                     }
                 },{
@@ -215,11 +221,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 }, {
                     field: 'upgradePerson', title: '升级人', align: 'center',
                 },{
-                    field: 'manufacturerName', title: '升级人单位', align: 'center',templet: function (d) {
+                    field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                         if(d.manufacturerId == '0'){
-                            return '其他';
+                            return d.manufacturerOther;
                         }else {
-                            return d.manufacturerName;
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
                         }
                     }
                 },{
@@ -272,11 +284,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 form.render("select");
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=升级单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    manufactureArr.push(obj);
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-bizupgrade-group').html(options);

@@ -116,11 +116,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-upgradeadd-group').html(options);

@@ -245,21 +245,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
         // 初始化下拉框
         function loadSelect() {
             admin.req({
-                url: domainName + '/api-web/machineRoom/getMachineRoomInfo'
+                url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
             }).done(function (response) {
                 var options = "<option value=''>=归属机房=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.machineRoomId + "'>" + v.machineRoomName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 $('#slt-staffadd-machine').html(options);
                 form.render();
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-staffadd-group').html(options);

@@ -14,7 +14,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var orgChart = echarts.init(document.getElementById('chart-devicehitch-report'));
         var dateLimit = "";
         var  createTime = "month";
-
+        var machineArr = [];
         //日期范围选择
         laydate.render({
             elem: '#hitchdateLimit'
@@ -113,7 +113,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     field: 'title', title: '维修单编号', align: 'center',width:100,
                     templet: '<div><span data-id="{{d.id}}"  class="layui-table-link view-devicehitch-title" >{{d.title}}</span></div>'
                 }, {
-                    field: 'machineRoomName', title: '机房', align: 'center',width:100
+                    field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
+                        if(machineArr && machineArr.length>0){
+                            $.each(machineArr, function (i, v) {
+                                if(d.machineRoomId==v.id) {
+                                    return v.name;
+                                }
+                            })
+                        }
+                    }
                 }, {
                     field: 'deviceTypeName', title: '设备类型', align: 'center',width:88
                 }, {

@@ -121,22 +121,22 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
             });
             admin.req({
-                url: domainName + '/api-web/machineRoom/getMachineRoomInfo'
+                url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
             }).done(function (response) {
                 var options = "<option value=''>=归属机房=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.machineRoomId + "'>" + v.machineRoomName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 $('#slt-devicehitch-machine').html(options);
                 form.render();
                 fromAssignment()
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-discoverMfId-group').html(options);

@@ -319,11 +319,11 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 form.render("select");
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=运维单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-emergency-group').html(options);

@@ -175,11 +175,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 form.render("select");
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=运维公司=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-emergencyadd-group').html(options);

@@ -17,7 +17,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var currSelect = 0;
         var dateLimit = ""
         var createTime = "month"
-
+        var manufactureArr = [];
+        var machineArr = [];
 
         //日期范围选择
         laydate.render({
@@ -125,14 +126,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 limit: common.limit,
                 limits: common.limits,
                 even: true,
-                cols: [[ {type: 'checkbox'},{
-                    field: 'machineRoomName', title: '机房', align: 'center',
+                cols: [[
+                    {type: 'checkbox'},{
+                    field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
+                        if(machineArr && machineArr.length>0){
+                            $.each(machineArr, function (i, v) {
+                                if(d.machineRoomId==v.id){}
+                                return v.name;
+                            })
+                        }
+                    }
                 }, {
                     field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                         if(d.manufacturerId == '0'){
                             return d.manufacturerOther;
                         }else {
-                            return d.manufacturerName;
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id){}
+                                    return v.name;
+                                })
+                            }
                         }
                     }
                 }, {
@@ -216,13 +230,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 limits: common.limits,
                 even: true,
                 cols: [[ {type: 'checkbox'},{
-                    field: 'machineRoomName', title: '机房', align: 'center',
+                    field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
+                        if(machineArr && machineArr.length>0){
+                            $.each(machineArr, function (i, v) {
+                                if(d.machineRoomId==v.id) {
+                                    return v.name;
+                                }
+                            })
+                        }
+                    }
                 }, {
                     field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                         if(d.manufacturerId == '0'){
                             return d.manufacturerOther;
                         }else {
-                            return d.manufacturerName;
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
                         }
                     }
                 }, {
@@ -312,16 +340,32 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         // 加载查询条件下拉框
         function loadConditionSelect() {
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    manufactureArr.push(obj);
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-staff-group').html(options);
                 form.render();
             });
+            admin.req({
+                url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
+            }).done(function (response) {
+                var options = "<option value=''>=归属机房=</option>";
+                $.each(response.data, function (i, v) {
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    machineArr.push(obj);
+                });
+            });
         }
 
         $("#device-export-excel").on('click', function () {

@@ -12,7 +12,8 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var accessToken = localStorage.getItem("accessToken");
         var domainName = common.domainName;
         var timeChart = echarts.init(document.getElementById('chart-time-record'));
-
+        var manufactureArr = [];
+        var machineArr = [];
         var dateLimit = ""
         var createTime = "month"
 
@@ -108,13 +109,27 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 even: true,
                 cols: [[
                     {type: 'checkbox'},{
-                    field: 'machineRoomName', title: '机房', align: 'center',
+                    field: 'machineRoomName', title: '机房', align: 'center',templet: function (d) {
+                            if(machineArr && machineArr.length>0){
+                                $.each(machineArr, function (i, v) {
+                                    if(d.machineRoomId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
+                        }
                 }, {
                     field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                         if(d.manufacturerId == '0'){
                             return d.manufacturerOther;
                         }else {
-                            return d.manufacturerName;
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
                         }
                     }
                 }, {
@@ -197,16 +212,32 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         // 加载查询条件下拉框
         function loadConditionSelect() {
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    manufactureArr.push(obj);
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-staff-group').html(options);
                 form.render();
             });
+            admin.req({
+                url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
+            }).done(function (response) {
+                var options = "<option value=''>=归属机房=</option>";
+                $.each(response.data, function (i, v) {
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    machineArr.push(obj);
+                });
+            });
         }
 
 

@@ -16,6 +16,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var  createTime = "month";
         var manufacturerId = "";
         var extraWorker="";
+        var manufactureArr = [];
         //日期范围选择
         laydate.render({
             elem: '#extradateLimit'
@@ -114,11 +115,17 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 }, {
                     field: 'extraWorker', title: '加班人', align: 'center'
                 }, {
-                    field: 'manufacturerId', title: '单位', align: 'center',templet: function (d) {
+                    field: 'manufacturerName', title: '工作单位', align: 'center',templet: function (d) {
                         if(d.manufacturerId == '0'){
                             return d.manufacturerOther;
                         }else {
-                            return d.manufacturerName;
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
                         }
                     }
                 }, {
@@ -185,11 +192,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         // 加载查询条件下拉框
         function loadConditionSelect() {
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
-                var options = "<option value=''>=工作单位=</option>";
+                var options = "<option value=''>=单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    manufactureArr.push(obj);
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-extra-group').html(options);

@@ -109,11 +109,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
         // 初始化下拉框
         function loadSelect() {
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-extraAdd-org').html(options);

@@ -109,7 +109,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     }
                 })
             }*/
-             var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
+             var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0&accessToken=${accessToken}`;
 /*
             let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
 */
@@ -120,7 +120,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     $sel.append('<option value="">请选择</option>')
                     $.each(selects, function (i, e) {
-                         $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
+                         $sel.append('<option value="' + e.id + '">' + e.shortName + '</option>')
 /*
                         $sel.append(`<option value="${e.code}"> ${e.label}</option>`)
 */

@@ -14,7 +14,8 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
         // var accessToken = session.getToken()['access_token']
         var accessToken = common.getMjToken();
         let theirTypeOptions = [];
-
+        let manufactureArr = [];
+        loadConditionSelect();
         // initGroupSelect()
 
         //回车搜索
@@ -80,7 +81,17 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
             cols: [[
                 {type: 'checkbox'},
                 {field: 'name', title: '配置名称', align: 'center', width: 150,},
-                {field: 'manufacturerName', title: '所属厂商', align: 'center', width: 150,},
+                {
+                    field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
+                        if(manufactureArr && manufactureArr.length>0){
+                            $.each(manufactureArr, function (i, v) {
+                                if(d.manufacturerId==v.id) {
+                                    return v.name;
+                                }
+                            })
+                        }
+                    }
+                    },
                 {
                     field: 'theirType', title: '所属类型', align: 'center', width: 150,
                     templet: function (d) {
@@ -227,6 +238,18 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions'], function
                 }
             })
         }
+        function loadConditionSelect() {
+            admin.req({
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
+            }).done(function (response) {
+                $.each(response.data, function (i, v) {
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    manufactureArr.push(obj);
+                });
+            });
+        }
 
         // 所属类型表单赋值
         function fromTheirType() {

@@ -187,21 +187,21 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
         // 初始化下拉框
         function loadSelect() {
             admin.req({
-                url: domainName + '/api-web/machineRoom/getMachineRoomInfo'
+                url: domainName + '/cmdb-CI/cmdbci/findList?page=1&limit=20&objId=2BB920718F284CB38A2911BFAE5A97D'
             }).done(function (response) {
                 var options = "<option value=''>=归属机房=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.machineRoomId + "'>" + v.machineRoomName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 $('#slt-staffadd-machine').html(options);
                 form.render();
             });
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=工作单位=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
                 });
                 options += "<option value='0'>其他</option>";
                 $('#slt-staffadd-group').html(options);

@@ -20,6 +20,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         var urlRepType = ''
         var manufacturerId = ''
         var reportDetailTable;
+        var manufactureArr = [];
         getUrlType()
 
         /*        $.each($("button.date"), function (i, e) {
@@ -262,7 +263,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                 }, {
                     field: 'createUserNickName', title: '汇报人', align: 'center',
                 }, {
-                    field: 'manufacturerName', title: '厂商', align: 'center',
+                    field: 'manufacturerName', title: '厂商', align: 'center',templet: function (d) {
+                            if(manufactureArr && manufactureArr.length>0){
+                                $.each(manufactureArr, function (i, v) {
+                                    if(d.manufacturerId==v.id) {
+                                        return v.name;
+                                    }
+                                })
+                            }
+                    }
                 }, {
                     field: 'createTime', title: '上报时间', align: 'center',
                 }]],
@@ -313,12 +322,15 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
         // 加载查询条件下拉框
         function loadConditionSelect() {
             admin.req({
-                url: domainName + '/api-web/bWorkreportGroup/findManufacturerList'
+                url: domainName + '/cmdb-CI/supplier/list?page=1&limit=10&supplierType=0'
             }).done(function (response) {
                 var options = "<option value=''>=选择厂商=</option>";
                 $.each(response.data, function (i, v) {
-                    options += "<option value='" + v.id + "'>" + v.manufacturerName + "</option>"
-                });
+                    options += "<option value='" + v.id + "'>" + v.shortName + "</option>"
+                    var obj = {};
+                    obj[id] = v.id;
+                    obj[name] = v.shortName;
+                    manufactureArr.push(obj);                });
                 $('#slt-workreport-group').html(options);
                 if (manufacturerId != '') {
                     $('#slt-workreport-group').val(manufacturerId)
@@ -916,7 +928,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
                     field: 'readCount', title: '已报数量', align: 'center'
                 }, {
                     field: 'needReport', title: '未报数量', align: 'center', style: 'color:red', templet: function (d) {
-                        return d.needReport - d.readCount
+                        return d.needReport - d.readCount;
                     }
                 }]],
             })