From 5d09d7360dc19afeba2c117774bcfea20e917d55 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期日, 22 十二月 2019 12:53:49 +0800
Subject: [PATCH] 优化其他小区添加

---
 WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
index 714de8f..c87ab15 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
@@ -139,14 +139,7 @@
                 });
             },
             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 +151,12 @@
                     return;
                 }
 
+                if (!vc.component.addMachineValidate()) {
+                    vc.message(vc.validate.errInfo);
+
+                    return;
+                }
+
 
                 //涓嶆彁浜ゆ暟鎹皢鏁版嵁 鍥炶皟缁欎睛鍚鐞�
                 if (vc.notNull($props.callBackListener)) {

--
Gitblit v1.8.0