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

【无】扩展字段接口增加参数parentId



See merge request !933

@@ -124,7 +124,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             var cols = commonCols.resTypeCls[colResType];
             //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=" + resType + "&parentId=" + parentId
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
@@ -271,7 +271,7 @@ layui.define(['laytpl', 'admin', 'form', 'table', 'soulTable', 'sessions', 'comm
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId=" + $("#biz_virtual_platForm_select").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;

@@ -838,7 +838,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'upload', 'admin', 'form',
                 });
             //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=" + resType + "&parentId=" +$("#resManageIndexForm").find("select[name='parentId']").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;

@@ -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=" + "OperatingSystem"
+                url: common.domainName + "/api-web/resource/expand/list?resType=" + "OperatingSystem" + "&parentId=" + $("#biz_res_cluster").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
@@ -595,7 +595,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId=" + $("#biz_res_cluster").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
@@ -722,7 +722,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId=" + $("#biz_res_cluster").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
@@ -862,7 +862,7 @@ layui.define(['tree', 'laypage', 'laytpl', 'admin', 'form', 'table', 'commonCols
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId=" + $("#biz_virtual_platForm_select").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;

@@ -207,7 +207,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
                 }
                 //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=" + resType + "&parentId="+$("#res_cluster").val()
                     , done: function (res) {
                         if (res && res.data ) {
                             let arr=res.data;
@@ -842,7 +842,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId="+$("#res_cluster").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
@@ -1086,7 +1086,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId="+$("#res_cluster").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;
@@ -1257,7 +1257,7 @@ layui.define(['common', 'tree', 'laypage', 'laytpl', 'admin', 'form', 'table', '
             var cols = commonCols.resTypeCls[resType];
             //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=" + resType + "&parentId="+$("#res_cluster").val()
                 , done: function (res) {
                     if (res && res.data ) {
                         let arr=res.data;