diff --git a/public/components/property/addCar/addCar.html b/public/components/property/addCar/addCar.html index ea44d4fcf..ba50a1d63 100644 --- a/public/components/property/addCar/addCar.html +++ b/public/components/property/addCar/addCar.html @@ -62,7 +62,7 @@
- +
diff --git a/public/components/property/addCar/addCar.js b/public/components/property/addCar/addCar.js index 4c172c348..5f0cddc0d 100644 --- a/public/components/property/addCar/addCar.js +++ b/public/components/property/addCar/addCar.js @@ -15,7 +15,7 @@ carBrand:'', carType:'', carColor:'', - carRemark:"", + remark:"", startTime:'', endTime:'', carNumType:'' diff --git a/public/components/property/editCar/editCar.js b/public/components/property/editCar/editCar.js index 49f5f2449..48c16b3e6 100644 --- a/public/components/property/editCar/editCar.js +++ b/public/components/property/editCar/editCar.js @@ -127,6 +127,7 @@ }, _submitEditCarInfo: function () { if (!vc.component.editCarValidate()) { + vc.toast(vc.validate.errInfo); return; } diff --git a/public/pages/property/carAddParkingSpace/carAddParkingSpace.html b/public/pages/property/carAddParkingSpace/carAddParkingSpace.html new file mode 100644 index 000000000..fae4f9384 --- /dev/null +++ b/public/pages/property/carAddParkingSpace/carAddParkingSpace.html @@ -0,0 +1,61 @@ +
+ + +
+ + +
+
+
+
+
+
车辆信息
+
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+
+
+ +
+
+ +
\ No newline at end of file diff --git a/public/pages/property/carAddParkingSpace/carAddParkingSpace.js b/public/pages/property/carAddParkingSpace/carAddParkingSpace.js new file mode 100644 index 000000000..555591c54 --- /dev/null +++ b/public/pages/property/carAddParkingSpace/carAddParkingSpace.js @@ -0,0 +1,160 @@ +/** + 入驻小区 +**/ +(function (vc) { + vc.extends({ + data: { + carAddParkingSpaceInfo: { + carNum: '', + remark: "", + startTime: '', + endTime: '', + carId: '', + communityId: vc.getCurrentCommunity().communityId, + psId: '' + } + }, + _initMethod: function () { + $that.carAddParkingSpaceInfo.carId = vc.getParam('carId'); + $that._loadCarInfo(); + $that._initDateInfo(); + }, + + _initEvent: function () { + vc.on("carAddParkingSpace", "notify", function (_info) { + $that.carAddParkingSpaceInfo.psId = _info.psId; + }); + }, + methods: { + _initDateInfo: function () { + $('.startTime').datetimepicker({ + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd hh:ii:ss', + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + + }); + $('.startTime').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".startTime").val(); + vc.component.carAddParkingSpaceInfo.startTime = value; + }); + $('.endTime').datetimepicker({ + language: 'zh-CN', + fontAwesome: 'fa', + format: 'yyyy-mm-dd hh:ii:ss', + initTime: true, + initialDate: new Date(), + autoClose: 1, + todayBtn: true + }); + $('.endTime').datetimepicker() + .on('changeDate', function (ev) { + var value = $(".endTime").val(); + var start = Date.parse(new Date(vc.component.carAddParkingSpaceInfo.startTime)) + var end = Date.parse(new Date(value)) + if (start - end >= 0) { + vc.toast("结租时间必须大于起租时间") + $(".endTime").val('') + } else { + vc.component.carAddParkingSpaceInfo.endTime = value; + } + }); + }, + _validate: function () { + return vc.validate.validate({ + carAddParkingSpaceInfo: vc.component.carAddParkingSpaceInfo + }, { + + 'carAddParkingSpaceInfo.carNum': [ + { + limit: "required", + param: "", + errInfo: "车牌号不能为空" + }, + { + limit: "maxin", + param: "2,12", + errInfo: "车牌号不正确" + } + ], + 'carAddParkingSpaceInfo.startTime': [ + { + limit: "required", + param: "", + errInfo: "起租时间不能为空" + } + ], + 'carAddParkingSpaceInfo.endTime': [ + { + limit: "required", + param: "", + errInfo: "结租时间不能为空" + } + ], + 'carAddParkingSpaceInfo.psId': [ + { + limit: "required", + param: "", + errInfo: "车位不能为空" + } + ] + }); + }, + + _loadCarInfo: function () { + var param = { + params: { + page: 1, + row: 1, + communityId: vc.getCurrentCommunity().communityId, + carId: $that.carAddParkingSpaceInfo.carId + } + } + + //发送get请求 + vc.http.apiGet('owner.queryOwnerCars', + param, + function (json, res) { + var _json = JSON.parse(json); + let data = _json.data[0]; + data.psId = ''; + vc.copyObject(data, $that.carAddParkingSpaceInfo); + }, function (errInfo, error) { + console.log('请求失败处理'); + } + ); + }, + _submit: function () { + if (!$that._validate()) { + vc.toast(vc.validate.errInfo); + return; + } + + vc.http.apiPost( + 'owner.carAddParkingSpace', + JSON.stringify($that.carAddParkingSpaceInfo), + { + emulateJSON: true + }, + function (json, res) { + if (res.status == 200) { + vc.toast("请记得收费哦！"); + //关闭model + vc.jumpToPage("/admin.html#/pages/property/listOwnerCar"); + return; + } + vc.toast(json); + }, + function (errInfo, error) { + console.log('请求失败处理'); + + vc.toast(errInfo); + }); + } + } + }); +})(window.vc); \ No newline at end of file diff --git a/public/pages/property/listOwnerCar/listOwnerCar.html b/public/pages/property/listOwnerCar/listOwnerCar.html index e1a0dcef7..9cd016a5c 100644 --- a/public/pages/property/listOwnerCar/listOwnerCar.html +++ b/public/pages/property/listOwnerCar/listOwnerCar.html @@ -118,10 +118,14 @@ {{car.stateName}} -
+
+
+ +
diff --git a/public/pages/property/listOwnerCar/listOwnerCar.js b/public/pages/property/listOwnerCar/listOwnerCar.js index e60e96ce9..8a143c4e2 100644 --- a/public/pages/property/listOwnerCar/listOwnerCar.js +++ b/public/pages/property/listOwnerCar/listOwnerCar.js @@ -98,6 +98,9 @@ vc.toast(errInfo); }); + }, + _addCarParkingSpace: function (_car) { + vc.jumpToPage('/admin.html#/pages/property/carAddParkingSpace?carId=' + _car.carId); } } })