'commit'

WebRoot/view/jrgl/xtgl/index.html

@@ -202,13 +202,10 @@
       window.sub = function (obj) {
         layer.open({
           type: 2,
-          title: '<span style="color: #16BAAA;font-size: 16px">正在为 “' + obj.data.system_name + '” 设置订阅数据关系</span>',
+          title: '订阅',
-          shadeClose: true,
+          shade: 0.1,
-          shade: false,
+          area: ['650px', '400px'],
-          maxmin: false,
+          content: './subscribe.html?system_id=' + obj.data.system_id
-          move: false,
-          area: ['100%', '100%'],
-          content: "./already_sub_system.html?system_id=" + obj.data.system_id
         });
       }
 

WebRoot/view/jrgl/xtgl/subscribe.html

@@ -48,10 +48,9 @@
         <div class="mainBox">
             <div class="main-container">
                 <div class="layui-form-item">
-                    <label class="layui-form-label" style="width: auto !important;">共享表：</label>
+                    <label class="layui-form-label" style="width: auto !important;">订阅系统：</label>
                     <div class="layui-input-inline" id="system" style="width: 455px;"></div>
                 </div>
-
             </div>
         </div>
 
@@ -80,13 +79,7 @@
 
             var systemSelect = xmSelect.render({
                 el: '#system',
-                name: 'system',
+                name: 'subscribe_system_ids',
-                autoRow: true,
-                direction: 'auto',
-                tree: {
-                    show: true,
-                    expandedKeys: [5],
-                },
                 theme: {
                     color: localStorage.getItem("theme-color-color"),
                 },
@@ -96,7 +89,8 @@
                 },
                 data: [],
                 prop: {
-                    value: "id"
+                    value: "system_id",
+                    name: "system_name"
                 }
             });
 
@@ -104,11 +98,10 @@
             $.ajax({
                 type: 'GET',
                 async: false,
-                url: '/QingLong/base/getOrgTypePrincipalshipForTreeTable?bureau_id=' + bureauId,
+                url: '/QingLong/dataShare/listSystem?page=1&limit=100&exclude=' + systemId,
                 success: function (res) {
-                    modifyObject(res.data);
                     systemSelect.update({
-                        data: [res.data]
+                        data: res.data
                     });
                     systemSelect.changeExpandedKeys(true);
                 }
@@ -117,19 +110,11 @@
 
             form.on('submit(save)', function (data) {
                 var _data = {};
-                //获取标签信息
+                _data.system_id = systemId;
-                var buttons = $('#tag button:not(.button-new-tag)');
+                _data.subscribe_system_ids = data.field['subscribe_system_ids'];                
-                var ipArray = [];
-                buttons.each(function () {
-                    var _ip = $(this).html().replace(/<i[^>]*>.*<\/i>/g, '');
-                    ipArray.push(_ip);
-                });
-                var ip = ipArray.join(',');
-                _data['table_names'] = ip;
-                _data['system_id'] = systemId;
 
                 $.ajax({
-                    url: '/QingLong/dataShare/share',
+                    url: '/QingLong/dataShare/subscribe',
                     data: _data,
                     type: 'post',
                     success: function (result) {