diff --git a/public/components/property/addProxyFee/addProxyFee.js b/public/components/property/addProxyFee/addProxyFee.js index bd7759bc8..fb798d68e 100755 --- a/public/components/property/addProxyFee/addProxyFee.js +++ b/public/components/property/addProxyFee/addProxyFee.js @@ -17,7 +17,7 @@ configId: '', ownerName: '', objType: '3333', - startTime: vc.dateFormat(new Date()), + startTime: (new Date()), endTime: vc.addMonthDate(new Date(), 1) } }, diff --git a/public/components/property/addRoomView/addRoomView.html b/public/components/property/addRoomView/addRoomView.html deleted file mode 100755 index caaea060d..000000000 --- a/public/components/property/addRoomView/addRoomView.html +++ /dev/null @@ -1,143 +0,0 @@ -
-
-
-
-
- -
-
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
- -
-
-
- -
- -
-
-
-
- -
- -
-
-
-
-
-
diff --git a/public/components/property/addRoomView/addRoomView.js b/public/components/property/addRoomView/addRoomView.js deleted file mode 100755 index 2e252967e..000000000 --- a/public/components/property/addRoomView/addRoomView.js +++ /dev/null @@ -1,181 +0,0 @@ -(function (vc) { - vc.extends({ - propTypes: { - callBackListener: vc.propTypes.string, - //父组件名称 - callBackFunction: vc.propTypes.string //父组件监听方法 - }, - data: { - addRoomViewInfo: { - flowComponent: 'addRoomView', - roomNum: '', - layer: '', - section: '0', - apartment: '', - apartment1: '', - apartment2: '', - builtUpArea: '', - feeCoefficient: '1.00', - state: '2002', - remark: '', - roomSubType: '110', - roomArea: '', - roomRent: '0', - communityId: vc.getCurrentCommunity().communityId, - attrs: [], - roomSubTypes: [] - } - }, - watch: { - addRoomViewInfo: { - deep: true, - handler: function () { - vc.component.saveAddRoomInfo(); - } - } - }, - _initMethod: function () { - $that._loadRoomAttrSpec(); - //与字典表关联 - vc.getDict('building_room', "room_sub_type", function (_data) { - vc.component.addRoomViewInfo.roomSubTypes = _data; - }); - }, - _initEvent: function () { - vc.on('addRoomViewInfo', 'onIndex', - function (_index) { - vc.component.addRoomViewInfo.index = _index; - }); - }, - methods: { - addRoomValidate() { - vc.component.addRoomViewInfo.apartment = vc.component.addRoomViewInfo.apartment1 + vc.component.addRoomViewInfo.apartment2; - return vc.validate.validate({ - addRoomViewInfo: vc.component.addRoomViewInfo - }, { - 'addRoomViewInfo.roomNum': [{ - limit: "required", - param: "", - errInfo: "房屋编号不能为空" - }, - { - limit: "maxLength", - param: "64", - errInfo: "房屋编号长度不能超过64位" - }, - ], - 'addRoomViewInfo.layer': [{ - limit: "required", - param: "", - errInfo: "房屋楼层不能为空" - }], - 'addRoomViewInfo.apartment': [{ - limit: "required", - param: "", - errInfo: "房屋户型不能为空" - }, - { - limit: "maxLength", - param: "50", - errInfo: "房屋户型不能大于50" - }, - ], - 'addRoomViewInfo.builtUpArea': [{ - limit: "required", - param: "", - errInfo: "建筑面积不能为空" - }, - { - limit: "money", - param: "", - errInfo: "建筑面积错误，如 300.00" - }, - ], - 'addRoomViewInfo.roomArea': [{ - limit: "required", - param: "", - errInfo: "室内面积不能为空" - }, - { - limit: "money", - param: "", - errInfo: "室内面积错误，如 300.00" - }, - ], - 'addRoomViewInfo.feeCoefficient': [{ - limit: "required", - param: "", - errInfo: "算费系数不能为空" - }, - { - limit: "money", - param: "", - errInfo: "算费系数错误，如 300.00" - } - ], - 'addRoomViewInfo.state': [{ - limit: "required", - param: "", - errInfo: "房屋状态不能为空" - }, - { - limit: "maxLength", - param: "12", - errInfo: "房屋状态 不能超过12位" - }, - ], - 'addRoomViewInfo.roomSubType': [{ - limit: "required", - param: "", - errInfo: "房屋类型不能为空" - }], - 'addRoomViewInfo.remark': [{ - limit: "maxLength", - param: "200", - errInfo: "备注内容不能超过200" - }], - }); - }, - _loadRoomAttrSpec: function () { - $that.addRoomViewInfo.attrs = []; - vc.getAttrSpec('building_room_attr', function (data) { - data.forEach(item => { - item.value = ''; - if (item.specShow == 'Y') { - item.values = []; - $that._loadAttrValue(item.specCd, item.values); - $that.addRoomViewInfo.attrs.push(item); - } - console.log('attrs : ', $that.addRoomViewInfo.attrs); - }); - }); - }, - _loadAttrValue: function (_specCd, _values) { - vc.getAttrValue(_specCd, function (data) { - data.forEach(item => { - if (item.valueShow == 'Y') { - _values.push(item); - } - }); - }); - }, - saveAddRoomInfo: function () { - if (vc.component.addRoomValidate()) { - // 验证attr必填项 - let msg = ''; - vc.component.addRoomViewInfo.attrs.forEach((item) => { - if (item.required == 'Y' && item.value == "") { - msg = item.specHoldplace; - } - }) - if (msg) { - return; - } - //侦听回传 - vc.emit($props.callBackListener, $props.callBackFunction, vc.component.addRoomViewInfo); - return; - } - } - } - }); -})(window.vc); \ No newline at end of file diff --git a/public/pages/owner/roomBindOwner/roomBindOwner.html b/public/pages/owner/roomBindOwner/roomBindOwner.html new file mode 100644 index 000000000..c4f5f559e --- /dev/null +++ b/public/pages/owner/roomBindOwner/roomBindOwner.html @@ -0,0 +1,81 @@ +
+
+
+
+
+
+ + + +
+
+ +
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+
+ + +
+
+ +
+
+ + +
\ No newline at end of file diff --git a/public/pages/owner/roomBindOwner/roomBindOwner.js b/public/pages/owner/roomBindOwner/roomBindOwner.js new file mode 100644 index 000000000..3398f3517 --- /dev/null +++ b/public/pages/owner/roomBindOwner/roomBindOwner.js @@ -0,0 +1,134 @@ +(function (vc) { + + vc.extends({ + data: { + roomBindOwnerInfo: { + roomId: '', + roomName: '', + ownerId: '', + ownerName: '', + state:'2001', + stateTime: vc.dateFormat(new Date().getTime()), + endTime: '2050-01-01', + } + }, + _initMethod: function () { + $that.roomBindOwnerInfo.roomId = vc.getParam('roomId'); + $that.listRoom(vc.getParam('roomId')); + $that.roomBindOwnerInfo.startTime = vc.dateFormat(new Date().getTime()); + vc.initDate('addStartTime', function (_value) { + $that.roomBindOwnerInfo.startTime = _value; + }); + vc.initDate('addEndTime', function (_value) { + $that.roomBindOwnerInfo.endTime = _value; + }); + }, + _initEvent: function () { + vc.on('roomBindOwner', 'chooseOwner', function (_owner) { + $that.roomBindOwnerInfo.ownerName = _owner.name; + $that.roomBindOwnerInfo.ownerId = _owner.ownerId; + }); + }, + methods: { + roomBindOwnerValidate() { + return vc.validate.validate({ + roomBindOwnerInfo: vc.component.roomBindOwnerInfo + }, { + 'roomBindOwnerInfo.ownerId': [{ + limit: "required", + param: "", + errInfo: "业主不能为空" + } + ], + 'roomBindOwnerInfo.roomId': [{ + limit: "required", + param: "", + errInfo: "房屋不能为空" + }], + 'roomBindOwnerInfo.startTime': [{ + limit: "required", + param: "", + errInfo: "开始时间不能为空" + }], + 'roomBindOwnerInfo.endTime': [{ + limit: "required", + param: "", + errInfo: "结束时间不能为空" + }], + }); + }, + saveRoomBindOwnerInfo: function () { + if (!vc.component.roomBindOwnerValidate()) { + vc.toast(vc.validate.errInfo); + return; + } + vc.component.roomBindOwnerInfo.communityId = vc.getCurrentCommunity().communityId; + vc.http.apiPost( + '/room.sellRoom', + JSON.stringify(vc.component.roomBindOwnerInfo), { + emulateJSON: true + }, + function (json, res) { + let _json = JSON.parse(json); + if (_json.code == 0) { + //关闭model + vc.toast('提交成功'); + $that._goBack(); + return; + } + vc.toast(_json.msg); + }, + function (errInfo, error) { + console.log('请求失败处理'); + + vc.toast(errInfo); + + }); + }, + clearAddHandoverInfo: function () { + vc.component.roomBindOwnerInfo = { + roomId: '', + roomName: '', + ownerId: '', + ownerName: '', + state:'2001', + stateTime: vc.dateFormat(new Date().getTime()), + endTime: '2050-01-01', + }; + }, + _goBack: function () { + vc.goBack(); + }, + _openChooseOwner: function () { + vc.emit('searchOwner', 'openSearchOwnerModel', {}); + }, + listRoom: function (_roomId) { + var param = { + params: { + page: 1, + row: 1, + roomId: _roomId, + communityId: vc.getCurrentCommunity().communityId + } + }; + //发送get请求 + vc.http.apiGet('/room.queryRooms', + param, + function (json, res) { + let listRoomData = JSON.parse(json); + let _room = listRoomData.rooms[0]; + + $that.roomBindOwnerInfo.roomId = _room.roomId; + $that.roomBindOwnerInfo.roomName = _room.floorNum+'-'+_room.unitNum+'-'+_room.roomNum; + + }, + function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + + } + }); + +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/addRoomBinding/addRoomBinding.html b/public/pages/property/addRoomBinding/addRoomBinding.html deleted file mode 100755 index 74ac85ec1..000000000 --- a/public/pages/property/addRoomBinding/addRoomBinding.html +++ /dev/null @@ -1,37 +0,0 @@ -
-
-
-
- -
- - -
-
- - -
-
- - -
-
-
-
- - - -
-
-
diff --git a/public/pages/property/addRoomBinding/addRoomBinding.js b/public/pages/property/addRoomBinding/addRoomBinding.js deleted file mode 100755 index 749251ac1..000000000 --- a/public/pages/property/addRoomBinding/addRoomBinding.js +++ /dev/null @@ -1,99 +0,0 @@ -/** - 入驻小区 - **/ -(function (vc) { - vc.extends({ - data: { - addRoomBindingInfo: { - $step: {}, - index: 0, - infos: [] - } - }, - _initMethod: function () { - vc.component._initStep(); - }, - _initEvent: function () { - vc.on("addRoomBinding", "notify", function (_info) { - _info.communityId = vc.getCurrentCommunity().communityId; - vc.component.addRoomBindingInfo.infos[vc.component.addRoomBindingInfo.index] = _info; - }); - }, - methods: { - _initStep: function () { - vc.component.addRoomBindingInfo.$step = $("#step"); - vc.component.addRoomBindingInfo.$step.step({ - index: 0, - time: 500, - title: ["选择楼", "选择单元", "添加房屋"] - }); - vc.component.addRoomBindingInfo.index = vc.component.addRoomBindingInfo.$step.getIndex(); - }, - _prevStep: function () { - vc.component.addRoomBindingInfo.$step.prevStep(); - vc.component.addRoomBindingInfo.index = vc.component.addRoomBindingInfo.$step.getIndex(); - vc.emit('viewFloorInfo', 'onIndex', vc.component.addRoomBindingInfo.index); - vc.emit('viewUnitInfo', 'onIndex', vc.component.addRoomBindingInfo.index); - vc.emit('addRoomView', 'onIndex', vc.component.addRoomBindingInfo.index); - }, - _nextStep: function () { - var _currentData = vc.component.addRoomBindingInfo.infos[vc.component.addRoomBindingInfo.index]; - if (_currentData == null || _currentData == undefined) { - vc.toast("请选择或填写必选信息"); - return; - } - vc.component.addRoomBindingInfo.$step.nextStep(); - vc.component.addRoomBindingInfo.index = vc.component.addRoomBindingInfo.$step.getIndex(); - vc.emit('viewFloorInfo', 'onIndex', vc.component.addRoomBindingInfo.index); - vc.emit('viewUnitInfo', 'onIndex', vc.component.addRoomBindingInfo.index); - vc.emit('addRoomView', 'onIndex', vc.component.addRoomBindingInfo.index); - }, - _finishStep: function () { - var _currentData = vc.component.addRoomBindingInfo.infos[vc.component.addRoomBindingInfo.index]; - if ('' == vc.component.addRoomViewInfo.unitPrice || null == vc.component.addRoomViewInfo.unitPrice) { - vc.component.addRoomViewInfo.unitPrice = '0'; - } - if (_currentData == null || _currentData == undefined) { - vc.toast("请选择或填写必选信息"); - return; - } - if (parseInt(vc.component.viewUnitInfo.layerCount) < parseInt(vc.component.addRoomViewInfo.layer)) { - vc.toast('楼层不可超过' + vc.component.viewUnitInfo.layerCount); - return; - } - var param = { - data: vc.component.addRoomBindingInfo.infos - } - vc.http.apiPost( - '/room.addRoomBinding', - JSON.stringify(param), { - emulateJSON: true - }, - function (json, res) { - let _tmpResJson = JSON.parse(json); - if (_tmpResJson.code == 0) { - //关闭model - vc.goBack(); - vc.toast("添加成功"); - return; - } else { - vc.toast(_tmpResJson.msg); - } - }, - function (errInfo, error) { - console.log('请求失败处理'); - vc.toast(errInfo); - }); - }, - _getFloorName: function () { - var _tmpInfos = vc.component.addRoomBindingInfo.infos; - for (var _tmpIndex = 0; _tmpIndex < _tmpInfos.length; _tmpIndex++) { - if (_tmpInfos[_tmpIndex].flowComponent == 'viewFloorInfo') { - return _tmpInfos[_tmpIndex].floorName; - } - } - return ""; - } - } - }); -})(window.vc); \ No newline at end of file diff --git a/public/pages/property/addRoomView/addRoomView.html b/public/pages/property/addRoomView/addRoomView.html new file mode 100644 index 000000000..2ec914628 --- /dev/null +++ b/public/pages/property/addRoomView/addRoomView.html @@ -0,0 +1,201 @@ +
+
+
+
+
+ + + +
+
+ +
+
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+ +
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+ +
+ +
+
+
+ +
+ +
+
+ +
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+ +
+ +
+
+
+
+
+
+ + +
+
+
+ + + + +
\ No newline at end of file diff --git a/public/pages/property/addRoomView/addRoomView.js b/public/pages/property/addRoomView/addRoomView.js new file mode 100644 index 000000000..87da5edd7 --- /dev/null +++ b/public/pages/property/addRoomView/addRoomView.js @@ -0,0 +1,242 @@ +(function (vc) { + vc.extends({ + data: { + addRoomViewInfo: { + roomNum: '', + layer: '', + section: '0', + apartment: '10102', + builtUpArea: '', + feeCoefficient: '1.00', + state: '2002', + remark: '', + roomSubType: '110', + roomArea: '', + roomRent: '0', + unitPrice:'0', + floorId:'', + unitId:'', + ownerId:'', + ownerName:'', + communityId: vc.getCurrentCommunity().communityId, + attrs: [], + roomSubTypes: [], + floors:[], + units:[] + } + }, + _initMethod: function () { + $that._loadRoomAttrSpec(); + //与字典表关联 + vc.getDict('building_room', "room_sub_type", function (_data) { + vc.component.addRoomViewInfo.roomSubTypes = _data; + }); + $that._loadFloor(); + }, + _initEvent: function () { + vc.on('addRoomView', 'chooseOwner', function (_owner) { + $that.addRoomViewInfo.ownerName = _owner.name; + $that.addRoomViewInfo.ownerId = _owner.ownerId; + }); + }, + methods: { + addRoomValidate() { + return vc.validate.validate({ + addRoomViewInfo: vc.component.addRoomViewInfo + }, { + 'addRoomViewInfo.roomNum': [{ + limit: "required", + param: "", + errInfo: "房屋编号不能为空" + }, + { + limit: "maxLength", + param: "64", + errInfo: "房屋编号长度不能超过64位" + }, + ], + 'addRoomViewInfo.layer': [{ + limit: "required", + param: "", + errInfo: "房屋楼层不能为空" + }], + 'addRoomViewInfo.apartment': [{ + limit: "required", + param: "", + errInfo: "房屋户型不能为空" + }, + { + limit: "maxLength", + param: "50", + errInfo: "房屋户型不能大于50" + }, + ], + 'addRoomViewInfo.builtUpArea': [{ + limit: "required", + param: "", + errInfo: "建筑面积不能为空" + }, + { + limit: "money", + param: "", + errInfo: "建筑面积错误，如 300.00" + }, + ], + 'addRoomViewInfo.roomArea': [{ + limit: "required", + param: "", + errInfo: "室内面积不能为空" + }, + { + limit: "money", + param: "", + errInfo: "室内面积错误，如 300.00" + }, + ], + 'addRoomViewInfo.feeCoefficient': [{ + limit: "required", + param: "", + errInfo: "算费系数不能为空" + }, + { + limit: "money", + param: "", + errInfo: "算费系数错误，如 300.00" + } + ], + 'addRoomViewInfo.state': [{ + limit: "required", + param: "", + errInfo: "房屋状态不能为空" + }, + { + limit: "maxLength", + param: "12", + errInfo: "房屋状态 不能超过12位" + }, + ], + 'addRoomViewInfo.roomSubType': [{ + limit: "required", + param: "", + errInfo: "房屋类型不能为空" + }], + 'addRoomViewInfo.remark': [{ + limit: "maxLength", + param: "200", + errInfo: "备注内容不能超过200" + }], + }); + }, + _loadRoomAttrSpec: function () { + $that.addRoomViewInfo.attrs = []; + vc.getAttrSpec('building_room_attr', function (data) { + data.forEach(item => { + item.value = ''; + if (item.specShow == 'Y') { + item.values = []; + $that._loadAttrValue(item.specCd, item.values); + $that.addRoomViewInfo.attrs.push(item); + } + console.log('attrs : ', $that.addRoomViewInfo.attrs); + }); + }); + }, + _loadAttrValue: function (_specCd, _values) { + vc.getAttrValue(_specCd, function (data) { + data.forEach(item => { + if (item.valueShow == 'Y') { + _values.push(item); + } + }); + }); + }, + saveAddRoomInfo: function () { + let msg = ''; + vc.component.addRoomViewInfo.attrs.forEach((item) => { + if (item.required == 'Y' && item.value == "") { + msg = item.specHoldplace; + } + }) + if (msg) { + vc.toast(msg); + return; + } + if (!vc.component.addRoomValidate()) { + vc.toast(vc.validate.errInfo); + return; + } + vc.http.apiPost( + '/room.saveRoom', + JSON.stringify($that.addRoomViewInfo), { + emulateJSON: true + }, + function (json, res) { + let _tmpResJson = JSON.parse(json); + if (_tmpResJson.code == 0) { + //关闭model + vc.goBack(); + vc.toast("添加成功"); + return; + } else { + vc.toast(_tmpResJson.msg); + } + }, + function (errInfo, error) { + console.log('请求失败处理'); + vc.toast(errInfo); + }); + }, + _goBack:function(){ + vc.goBack(); + }, + _openChooseOwner: function () { + vc.emit('searchOwner', 'openSearchOwnerModel', {}); + }, + _loadFloor:function(){ + let param = { + params:{ + page:1, + row:300, + communityId:vc.getCurrentCommunity().communityId + } + } + //发送get请求 + vc.http.apiGet('/floor.queryFloors', + param, + function(json, res) { + let listFloorData = JSON.parse(json); + $that.addRoomViewInfo.floors = listFloorData.apiFloorDataVoList; + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _loadUnit:function(){ + if(!$that.addRoomViewInfo.floorId){ + return ; + } + + let param = { + params:{ + page:1, + row:300, + communityId:vc.getCurrentCommunity().communityId, + floorId:$that.addRoomViewInfo.floorId + } + } + //发送get请求 + vc.http.apiGet('/unit.queryUnits', + param, + function(json, res) { + let listFloorData = JSON.parse(json); + $that.addRoomViewInfo.units = listFloorData; + }, + function(errInfo, error) { + console.log('请求失败处理'); + } + ); + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/hireParkingSpace1.0/hireParkingSpace.html b/public/pages/property/hireParkingSpace1.0/hireParkingSpace.html deleted file mode 100644 index 5ae0fa66b..000000000 --- a/public/pages/property/hireParkingSpace1.0/hireParkingSpace.html +++ /dev/null @@ -1,36 +0,0 @@ -
-
-
-
- -
- - - -
-
- - -
-
- - -
-
-
-
- - - -
-
-
\ No newline at end of file diff --git a/public/pages/property/hireParkingSpace1.0/hireParkingSpace.js b/public/pages/property/hireParkingSpace1.0/hireParkingSpace.js deleted file mode 100644 index 35d7d3b11..000000000 --- a/public/pages/property/hireParkingSpace1.0/hireParkingSpace.js +++ /dev/null @@ -1,97 +0,0 @@ -/** - 入驻小区 - **/ -(function (vc) { - vc.extends({ - data: { - hireParkingSpaceInfo: { - $step: {}, - index: 0, - infos: [], - } - }, - _initMethod: function () { - vc.component._initStep(); - }, - _initEvent: function () { - vc.on("hireParkingSpace", "notify", function (_info) { - vc.component.hireParkingSpaceInfo.infos[vc.component.hireParkingSpaceInfo.index] = _info; - /*if(vc.component.hireParkingSpaceInfo.index == 0){ - vc.emit('searchRoom','listenerFloorInfo',_info); - }*/ - }); - }, - methods: { - _initStep: function () { - vc.component.hireParkingSpaceInfo.$step = $("#step"); - vc.component.hireParkingSpaceInfo.$step.step({ - index: 0, - time: 500, - title: ["选择车位", "业主信息", "车辆信息"] - }); - vc.component.hireParkingSpaceInfo.index = vc.component.hireParkingSpaceInfo.$step.getIndex(); - }, - _prevStep: function () { - vc.component.hireParkingSpaceInfo.$step.prevStep(); - vc.component.hireParkingSpaceInfo.index = vc.component.hireParkingSpaceInfo.$step.getIndex(); - vc.emit('viewSelectParkingSpace', 'onIndex', vc.component.hireParkingSpaceInfo.index); - vc.emit('viewOwnerInfo', 'onIndex', vc.component.hireParkingSpaceInfo.index); - vc.emit('addCar', 'onIndex', vc.component.hireParkingSpaceInfo.index); - vc.emit('parkingSpaceFee', 'onIndex', vc.component.hireParkingSpaceInfo.index); - if (vc.component.hireParkingSpaceInfo.index == 1) { - vc.emit('viewOwnerInfo', 'callBackOwnerInfo', {}); - } - }, - _nextStep: function () { - var _currentData = vc.component.hireParkingSpaceInfo.infos[vc.component.hireParkingSpaceInfo.index]; - if (_currentData == null || _currentData == undefined) { - vc.toast("请选择或填写必选信息"); - return; - } - vc.component.hireParkingSpaceInfo.$step.nextStep(); - vc.component.hireParkingSpaceInfo.index = vc.component.hireParkingSpaceInfo.$step.getIndex(); - vc.emit('viewSelectParkingSpace', 'onIndex', vc.component.hireParkingSpaceInfo.index); - vc.emit('viewOwnerInfo', 'onIndex', vc.component.hireParkingSpaceInfo.index); - vc.emit('addCar', 'onIndex', vc.component.hireParkingSpaceInfo.index); - vc.emit('parkingSpaceFee', 'onIndex', vc.component.hireParkingSpaceInfo.index); - if (vc.component.hireParkingSpaceInfo.index == 1) { - vc.emit('viewOwnerInfo', 'callBackOwnerInfo', {}); - } - }, - _finishStep: function () { - var _currentData = vc.component.hireParkingSpaceInfo.infos[vc.component.hireParkingSpaceInfo.index]; - if (_currentData == null || _currentData == undefined) { - vc.toast("请选择或填写必选信息"); - return; - } - let _infos = vc.component.hireParkingSpaceInfo.infos - let param = _infos[2]; - param.communityId = vc.getCurrentCommunity().communityId; - param.ownerId = _infos[1].ownerId; - param.psId = _infos[0].psId; - vc.http.apiPost( - 'owner.saveOwnerCar', - JSON.stringify(param), { - emulateJSON: true - }, - function (json, res) { - json = JSON.parse(json); - if (res.status == 200 && json.code == 0) { - vc.toast("请记得收费哦！"); - //关闭model - //vc.jumpToPage("/#/pages/property/listOwnerCar"); - vc.goBack(); - return; - } else { - vc.toast(json.msg); - } - }, - function (errInfo, error) { - console.log('请求失败处理'); - vc.toast(errInfo); - } - ); - } - } - }); -})(window.vc); \ No newline at end of file diff --git a/public/pages/property/room/room.html b/public/pages/property/room/room.html index 7924dfbaf..bf627b14b 100755 --- a/public/pages/property/room/room.html +++ b/public/pages/property/room/room.html @@ -326,12 +326,27 @@ +
+ +
+
+ +
+ + + diff --git a/public/pages/property/room/room.js b/public/pages/property/room/room.js index 688a61ce5..8527b1060 100755 --- a/public/pages/property/room/room.js +++ b/public/pages/property/room/room.js @@ -129,7 +129,7 @@ ); }, _openAddRoom: function() { - vc.jumpToPage("/#/pages/property/addRoomBinding"); + vc.jumpToPage("/#/pages/property/addRoomView"); }, _openEditRoomModel: function(_room) { vc.emit('editRoom', 'openEditRoomModal', _room); @@ -408,7 +408,12 @@ _viewRoomContracts:function(_room){ vc.emit('roomContracts', 'openRoomContractModel',_room); }, - + _toRoomBindOwner:function(_room){ + vc.jumpToPage('/#/pages/owner/roomBindOwner?roomId='+_room.roomId); + }, + _toRoomUnBindOwner:function(_room){ + vc.jumpToPage('/#/pages/property/deleteOwnerRoom?ownerId='+_room.ownerId); + } } }); })(window.vc); \ No newline at end of file