Merge branch 'master' into zzd

ruoyi-lddy/src/main/resources/templates/staffChange/reception.html

@@ -50,9 +50,10 @@
         focusCleanup: true
     });
     function nanotubesById() {
+        var height = parent.document.body.clientHeight-50
         parent.layer.open({
             type: 2,
-            area: ['500px', '800px'],
+            area: ['500px', height+'px'],
             fix: false,
             //关闭遮罩
             shade:0.3,
@@ -90,7 +91,6 @@
             $.modal.alertError("请选择流入地党支部！");
             return {"code": 1, "msg": "请选择流入地党支部！"};
         }
-        debugger
         if(type==0){
             $.modal.confirm("确认要将<strong>" + name + "</strong>纳管到<strong>" + $("#deptName").val() + "</strong>吗?", function () {
                 var data = {"staffChangeId": $("#staffChangeId").val(), "nanotubes": "1", "flowDeptId": $("#deptId").val(), "flowDeptIn": $("#deptId").val()};

ruoyi-lddy/src/main/resources/templates/staffChange/staffChangAdd.html

@@ -642,7 +642,7 @@
         var lrd = body.find('#administrativeRegion').val()
         if (lrd.slice(0, 3) != staff_administrativeRegion.slice(0, 3)) {
             //alert("跨省")
-        } else if (lrd.slice(3, 6) != staff_administrativeRegion.slice(3, 6)) {
+        } else if (lrd.slice(3,6) != staff_administrativeRegion.slice(3,6)) {
             //alert("跨市")
             $("#flowStatus").val('2')
         } else if (lrd.slice(6) != staff_administrativeRegion.slice(6)) {
@@ -748,7 +748,7 @@
         //console.log(lrd+"=="+staff_administrativeRegion)
         if (lrd.slice(0, 3) != staff_administrativeRegion.slice(0, 3)) {
             //alert("跨省")
-        } else if (lrd.slice(3, 6) != staff_administrativeRegion.slice(3, 6)) {
+        } else if (lrd.slice(3,6) != staff_administrativeRegion.slice(3,6)) {
             //alert("跨市")
             $("#flowStatus").val('2')
         } else if (lrd.slice(6) != staff_administrativeRegion.slice(6)) {