Merge branch 'master-huijiaxu' into 'master'

巡检配置>报表模板管理>sheet页配置>编辑任意一个都报执行脚本异常



See merge request !16

@@ -271,7 +271,9 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
 
         function loadSelect(pollName,dom){
             var url = domainName+'/inspection-report/dataSource/loadSelect?access_token='+accessToken;
-            $.get(url,function (res) {
+            $.ajax({url,
+                async: false,
+                success(res) {
                 $(dom).empty();
                 if(res.success){
                     let html ='';
@@ -284,7 +286,7 @@ layui.define(['table', 'form', 'laydate', 'laytpl','common','sessions','xmSelect
                     }
                     form.render();
                 }
-            })
+            }})
         }
         function loadJLSelect($dom,pid,type){
             $.ajax({