From ecdac8a738f254db2b2ea28cbe3248f7a6a7eb2b Mon Sep 17 00:00:00 2001
From: mrzcc <121184950@qq.com>
Date: 星期五, 06 三月 2020 16:18:27 +0800
Subject: [PATCH] 优化采购申请组件
---
WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js | 85 +++++++++++++++++++++++++++++-------------
1 files changed, 58 insertions(+), 27 deletions(-)
diff --git a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js
index b8a48d5..1145866 100644
--- a/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js
+++ b/WebService/src/main/resources/components/machinePackage/edit-machine/editMachine.js
@@ -19,7 +19,9 @@
roomId: '',
locationTypeCd: '',
locationObjId: '',
- roomNum: ''
+ roomNum: '',
+ machineUrl: '',
+ direction:''
}
},
@@ -31,36 +33,37 @@
vc.component.refreshEditMachineInfo();
$('#editMachineModel').modal('show');
vc.copyObject(_params, vc.component.editMachineInfo);
+ vc.component._initMachineUrl();
//鏍规嵁浣嶇疆绫诲瀷 浼犺緭鏁版嵁
if (vc.component.editMachineInfo.locationTypeCd == '2000') {
- vc.emit('editMachine','floorSelect2','setFloor',{
- floorId:vc.component.editMachineInfo.floorId,
- floorNum:vc.component.editMachineInfo.floorNum
+ vc.emit('editMachine', 'floorSelect2', 'setFloor', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum
});
- vc.emit('editMachine','unitSelect2','setUnit',{
- floorId:vc.component.editMachineInfo.floorId,
- floorNum:vc.component.editMachineInfo.floorNum,
- unitId:vc.component.editMachineInfo.unitId,
- unitNum:vc.component.editMachineInfo.unitNum,
+ vc.emit('editMachine', 'unitSelect2', 'setUnit', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum,
+ unitId: vc.component.editMachineInfo.unitId,
+ unitNum: vc.component.editMachineInfo.unitNum,
});
} else if (vc.component.editMachineInfo.locationTypeCd == '3000') {
- vc.emit('editMachine','floorSelect2','setFloor',{
- floorId:vc.component.editMachineInfo.floorId,
- floorNum:vc.component.editMachineInfo.floorNum
+ vc.emit('editMachine', 'floorSelect2', 'setFloor', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum
});
- vc.emit('editMachine','unitSelect2','setUnit',{
- floorId:vc.component.editMachineInfo.floorId,
- floorNum:vc.component.editMachineInfo.floorNum,
- unitId:vc.component.editMachineInfo.unitId,
- unitNum:vc.component.editMachineInfo.unitNum,
+ vc.emit('editMachine', 'unitSelect2', 'setUnit', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum,
+ unitId: vc.component.editMachineInfo.unitId,
+ unitNum: vc.component.editMachineInfo.unitNum,
});
- vc.emit('editMachine','roomSelect2','setRoom',{
- floorId:vc.component.editMachineInfo.floorId,
- floorNum:vc.component.editMachineInfo.floorNum,
- unitId:vc.component.editMachineInfo.unitId,
- unitNum:vc.component.editMachineInfo.unitNum,
- roomId:vc.component.editMachineInfo.roomId,
- roomNum:vc.component.editMachineInfo.roomNum,
+ vc.emit('editMachine', 'roomSelect2', 'setRoom', {
+ floorId: vc.component.editMachineInfo.floorId,
+ floorNum: vc.component.editMachineInfo.floorNum,
+ unitId: vc.component.editMachineInfo.unitId,
+ unitNum: vc.component.editMachineInfo.unitNum,
+ roomId: vc.component.editMachineInfo.roomId,
+ roomNum: vc.component.editMachineInfo.roomNum,
});
}
vc.component.editMachineInfo.communityId = vc.getCurrentCommunity().communityId;
@@ -75,12 +78,25 @@
vc.component.editMachineInfo.unitId = _param.unitId;
}
- if(_param.hasOwnProperty("roomId")){
+ if (_param.hasOwnProperty("roomId")) {
vc.component.editMachineInfo.roomId = _param.roomId;
}
});
},
methods: {
+ _initMachineUrl: function () {
+ var sysInfo = vc.getData("_sysInfo");
+ if (sysInfo == null) {
+ return;
+ }
+
+ var apiUrl = sysInfo.apiUrl + "/api/machineTranslate.machineHeartbeart?communityId="
+ + vc.getCurrentCommunity().communityId + "&transaction_id=-1&req_time=20181113225612&user_id=-1"
+ + "&app_id=" + vc.component.editMachineInfo.machineTypeCd;
+ vc.component.editMachineInfo.machineUrl = apiUrl;
+
+
+ },
editMachineValidate: function () {
return vc.validate.validate({
editMachineInfo: vc.component.editMachineInfo
@@ -123,6 +139,19 @@
errInfo: "璁惧绫诲瀷鏍煎紡閿欒"
},
],
+ 'editMachineInfo.direction':
+ [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "璁惧鏂瑰悜涓嶈兘涓虹┖"
+ },
+ {
+ limit: "num",
+ param: "",
+ errInfo: "璁惧鏂瑰悜鏍煎紡閿欒"
+ },
+ ],
'editMachineInfo.authCode':
[
{
@@ -192,7 +221,7 @@
return;
}
if (!vc.component.editMachineValidate()) {
- vc.message(vc.validate.errInfo);
+ vc.toast(vc.validate.errInfo);
return;
}
@@ -237,7 +266,9 @@
roomId: '',
locationTypeCd: '',
locationObjId: '',
- roomNum: ''
+ roomNum: '',
+ machineUrl: '',
+ direction:''
}
}
--
Gitblit v1.8.0