'commit'

WebRoot/view/jrgl/sync/dwpp/list_w.html

@@ -82,6 +82,7 @@
                     cols: [[
                         { title: '序号', unresize: true, align: 'center', width: "5%", type: 'numbers' },
                         { title: '单位名称', unresize: true, align: 'center', field: 'org_name' },
+                        { title: '单位类型', unresize: true, align: 'center', field: 'bureau_type_name', width: "20%" },
                         { title: '操作', unresize: true, align: 'center', width: "10%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',
@@ -89,8 +90,8 @@
                 });
             }
 
-            table.on('tool(data-table)', function (obj) {                
-                if (obj.event === 'shoudongMatch') {                    
+            table.on('tool(data-table)', function (obj) {
+                if (obj.event === 'shoudongMatch') {
                     window.shoudongMatch(obj);
                 }
             });

WebRoot/view/jrgl/sync/dwpp/list_y.html

@@ -75,6 +75,7 @@
                     cols: [[
                         { title: '序号', unresize: true, align: 'center', width: "5%", type: 'numbers' },
                         { title: '单位名称', unresize: true, align: 'center', field: 'org_name' },
+                        { title: '单位类型', unresize: true, align: 'center', field: 'bureau_type_name', width: "20%" },
                         { title: '操作', unresize: true, align: 'center', width: "10%", toolbar: '#table-bar' }
                     ]],
                     skin: 'line',
@@ -90,25 +91,38 @@
 
             window.unMatch = function (obj) {
                 var orgId = obj.data.org_id;
-                $.ajax({
-                    url: "/QingLong/collect/disMatchBureau?org_id",
-                    async: false,
-                    type: 'GET',
-                    success: function (res) {
-
-
-                    },
-                    error: function (xhr, status, error) {
-                        layer.msg("出现异常！", {
-                            icon: 2,
-                            time: 1000
-                        });
-                    }
-                });
-
-
-                console.log(obj);
-                refresh();
+                layer.confirm('确定要取消匹配吗？', {
+                    icon: 3,
+                    title: '提示'
+                }, function (index) {
+                    $.ajax({
+                        url: "/QingLong/collect/disMatchBureau",
+                        async: false,
+                        type: 'POST',
+                        data: { "org_id": orgId },
+                        success: function (res) {
+                            if (res.success) {
+                                layer.msg("取消匹配成功！", {
+                                    icon: 1,
+                                    time: 1300
+                                }, function () {
+                                    refresh();
+                                });
+                            } else {
+                                layer.msg(res.message, {
+                                    icon: 2,
+                                    time: 2000
+                                });
+                            }
+                        },
+                        error: function (xhr, status, error) {
+                            layer.msg("出现异常！", {
+                                icon: 2,
+                                time: 1000
+                            });
+                        }
+                    });
+                });               
             }
 
             window.refresh = function (param) {