優化單元通知房屋時的bug

WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js

@@ -139,14 +139,6 @@
                 });
             },
             saveMachineInfo: function () {
-                if (!vc.component.addMachineValidate()) {
-                    vc.message(vc.validate.errInfo);
-
-                    return;
-                }
-
-                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
-
                 if (vc.component.addMachineInfo.locationTypeCd != '2000' && vc.component.addMachineInfo.locationTypeCd != '3000') { //大门时直接写 小区ID
                     vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.communityId;
                 } else if (vc.component.addMachineInfo.locationTypeCd == '2000') {
@@ -158,6 +150,16 @@
                     return;
                 }
 
+                if (!vc.component.addMachineValidate()) {
+                    vc.message(vc.validate.errInfo);
+
+                    return;
+                }
+
+                vc.component.addMachineInfo.communityId = vc.getCurrentCommunity().communityId;
+
+
+
 
                 //不提交数据将数据 回调给侦听处理
                 if (vc.notNull($props.callBackListener)) {

WebService/src/main/resources/components/roomPackage/room-select2/roomSelect2.js

@@ -30,7 +30,7 @@
            /* $('#'+$props.parentModal).on('show.bs.modal', function () {
                  vc.component._initUnitSelect2();
             })*/
-           vc.on('roomSelect2', "transferUnit",function (_param) {
+           vc.on('roomSelect2', "transferRoom",function (_param) {
                 vc.copyObject(_param, vc.component.roomSelect2Info);
            });
         },

WebService/src/main/resources/components/unitPackage/unit-select2/unitSelect2.js

@@ -19,7 +19,7 @@
                 deep: true,
                 handler:function(){
                     vc.emit($props.callBackListener,$props.callBackFunction,vc.component.unitSelect2Info);
-                    vc.emit('roomSelect2', "transferUnit" ,vc.component.floorSelect2Info);
+                    vc.emit('roomSelect2', "transferRoom" ,vc.component.unitSelect2Info);
                 }
             }
         },