Merge branch 'master-mj-yjpeng' into 'master-mj'

fix:工作日志厂商数据加载不出来的问题处理



See merge request !1162

@@ -109,8 +109,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     }
                     }
                 })
                 })
             }*/
             }*/
-            // var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
+             var url = `${domainName}/api-web/bWorkreportGroup/findManufacturerList?accessToken=${accessToken}`;
+/*
             let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
             let url = `${domainName}/mj/sys/conf/getSelect/provider?accessToken=${accessToken}`
+*/
             $.ajax({
             $.ajax({
                 url: url,
                 url: url,
                 success: function (res) {
                 success: function (res) {
@@ -118,8 +120,10 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     var $sel = $("form[name='add-config-form']").find("select[name='manufacturerId']");
                     $sel.append('<option value="">请选择</option>')
                     $sel.append('<option value="">请选择</option>')
                     $.each(selects, function (i, e) {
                     $.each(selects, function (i, e) {
-                        // $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
-                        $sel.append(`<option value="${e.value}"> ${e.label}</option>`)
+                         $sel.append('<option value="' + e.id + '">' + e.manufacturerName + '</option>')
+/*
+                        $sel.append(`<option value="${e.code}"> ${e.label}</option>`)
+*/
                     })
                     })
                     if (data && data.id) {
                     if (data && data.id) {
                         admin.req({
                         admin.req({