Merge branch 'master-500-dev-lushangqing' into 'master-500-dev'

【无】业务视图时点击操作系统报错



See merge request !889

@@ -79,6 +79,11 @@ layui.define(['table', 'form', 'admin', 'layer', 'common', 'sessions', 'treeTabl
                         '<button data-code="{{d.ddicCode}}" class="layui-btn layui-btn-xs layui-btn-normal link-ddic-delete" lay-tips="删除"><i class="layui-icon">&#xe640;</i></button>' +
                         '</div>'
                 }]],
+                //lsq 增加排序
+                initSort: {
+                    field: 'ddicSort',// 需要排序的字段
+                    type: 'asc' //排序方式
+                },
                 done: function (res) {
                     // 点击名称编辑事件
                     $('.link-ddic-edit').click(function () {

@@ -443,7 +443,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
             });
             //start lsq 根据资源类型resType获取动态添加的列表字段 2022-08-05
             admin.req({
-                url: common.domainName + "/api-web/resource/expand/list?resType=" + resType
+                url: common.domainName + "/api-web/resource/expand/list?resType=" + "OperatingSystem"
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;