diff --git a/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.html b/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.html index 2f57344d2..3a626f071 100755 --- a/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.html +++ b/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.html @@ -62,7 +62,7 @@
+ class="form-control editTempCarFeeConfigStartTime">
@@ -71,7 +71,7 @@
+ class="form-control editTempCarFeeConfigEndTime">
diff --git a/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.js b/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.js index 5959724ca..b67a11673 100755 --- a/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.js +++ b/public/components/property/editTempCarFeeConfig/editTempCarFeeConfig.js @@ -16,7 +16,18 @@ } }, _initMethod: function () { - + vc.initDate('editTempCarFeeConfigStartTime', function (_startTime) { + $that.editTempCarFeeConfigInfo.startTime = _startTime; + }); + vc.initDate('editTempCarFeeConfigEndTime', function (_endTime) { + $that.editTempCarFeeConfigInfo.endTime = _endTime; + let start = Date.parse(new Date($that.editTempCarFeeConfigInfo.startTime)) + let end = Date.parse(new Date($that.editTempCarFeeConfigInfo.endTime)) + if (start - end >= 0) { + vc.toast("结束时间必须大于开始时间") + $that.editTempCarFeeConfigInfo.endTime = ''; + } + }); }, _initEvent: function () { vc.on('editTempCarFeeConfig', 'openEditTempCarFeeConfigModal', function (_params) { diff --git a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html index eb1008cbd..faf0a4416 100644 --- a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html +++ b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.html @@ -59,7 +59,12 @@ 单号 {{printPayFeeInfo.receiptNum}} - + + + + 车辆 + {{printPayFeeInfo.carName}} + diff --git a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js index 36ef37827..64a05bee5 100644 --- a/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js +++ b/public/pages/property/printPayFeeXinShiDai/printPayFeeXinShiDai.js @@ -16,7 +16,8 @@ payObjName: '', feeReceipt: [], apply: 'N', - userName:vc.getData('/nav/getUserInfo').name + userName: vc.getData('/nav/getUserInfo').name, + carName: '' }, printFlag: '0' }, @@ -75,6 +76,12 @@ $that._loadReceiptDetail(); + if (_feeReceipt[0].objType == '6666') { + $that.printPayFeeInfo.carName = _feeReceipt[0].objName; + //查询车位对应房屋 + $that._listOwnerCar(_feeReceipt[0].objId); + } + }, function (errInfo, error) { console.log('请求失败处理'); } @@ -153,7 +160,28 @@ _closePage: function () { window.opener = null; window.close(); - } + }, + _listOwnerCar: function (_carId) { + let param = { + params: { + page: 1, + row: 1, + communityId: vc.getCurrentCommunity().communityId, + carId: _carId + } + } + //发送get请求 + vc.http.apiGet('owner.queryOwnerCars', + param, + function (json, res) { + let _json = JSON.parse(json); + let ownerCar = _json.data[0]; + $that.printPayFeeInfo.feeReceipt[0].objName = ownerCar.roomName; + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, } });