From b1b52d61acedccd6fdd58b32dcd04ebf14a96f38 Mon Sep 17 00:00:00 2001
From: wuxw <928255095@qq.com>
Date: 星期三, 19 二月 2020 13:43:03 +0800
Subject: [PATCH] Merge branch 'master' of https://github.com/java110/MicroCommunity
---
WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js | 31 ++++++++++++++++++++++---------
1 files changed, 22 insertions(+), 9 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..93dbdd3 100644
--- a/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
+++ b/WebService/src/main/resources/components/machinePackage/add-machine/addMachine.js
@@ -23,7 +23,8 @@
roomId: '',
locationTypeCd: '',
locationObjId: '',
- roomName: ''
+ roomName: '',
+ direction:''
}
},
_initMethod: function () {
@@ -91,6 +92,19 @@
errInfo: "璁惧绫诲瀷鏍煎紡閿欒"
},
],
+ 'addMachineInfo.direction':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璁惧鏂瑰悜涓嶈兘涓虹┖"
+ },
+ {
+ limit: "num",
+ param: "",
+ errInfo: "璁惧鏂瑰悜鏍煎紡閿欒"
+ },
+ ],
'addMachineInfo.authCode':
[
{
@@ -139,14 +153,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') {
@@ -155,6 +162,12 @@
vc.component.addMachineInfo.locationObjId = vc.component.addMachineInfo.roomId;
} else {
vc.toast("璁惧浣嶇疆鍊奸敊璇�");
+ return;
+ }
+
+ if (!vc.component.addMachineValidate()) {
+ vc.toast(vc.validate.errInfo);
+
return;
}
@@ -202,7 +215,7 @@
authCode: '',
machineIp: '',
machineMac: '',
-
+ direction:''
};
},
_initAddMachineData: function () {
--
Gitblit v1.8.0