Merge branch 'master-mj-yuanjinpeng' into 'master-mj'

fix: 基础环境管理，厂商列表改为运维厂商加设备厂商



See merge request !1247

@@ -315,7 +315,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.bizTypeSelect("slt-bizupgrade-biz", function () {
                 form.render("select");
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 async: false,

@@ -115,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                 form.render("select");
 
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -280,7 +280,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'laydate'
                     form.render();
                 }
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -142,7 +142,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
                     fromAssignment();
                 }
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -361,7 +361,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.bizTypeSelect("slt-emergency-biz", function () {
                 form.render("select");
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 async: false,

@@ -174,7 +174,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
             common.bizTypeSelect("slt-biz-add", function () {
                 form.render("select");
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -398,7 +398,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
 
         // 加载查询条件下拉框
         function loadConditionSelect() {
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 async: false,

@@ -242,7 +242,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
 
         // 加载查询条件下拉框
         function loadConditionSelect() {
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 async: false,

@@ -208,7 +208,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
 
         // 加载查询条件下拉框
         function loadConditionSelect() {
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 async: false,

@@ -115,7 +115,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'xmSelect
 
         // 初始化下拉框
         function loadSelect() {
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -241,7 +241,7 @@ layui.define(['table', 'form', 'sessions', 'admin', 'common', 'echarts', 'laydat
             common.bizTypeSelect("slt-recoveryverify-biz", function () {
                 form.render("select");
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -234,7 +234,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                 form.render("select");
                 fromAssignment()
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {

@@ -206,7 +206,7 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'commonDetail','sessi
                     form.render();
                 }
             });
-            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&supplierType=0&accessToken=${accessToken}`;
+            var url = `${domainName}/cmdb-CI/supplier/list?page=1&limit=20&accessToken=${accessToken}`;
             $.ajax({
                 url: url,
                 success: function (res) {