From 8311b0ebdd32160a6a9bc0fad923243741bcf788 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Sun, 6 Sep 2020 23:52:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../property/addMeterWater/addMeterWater.js | 3 +
.../editMeterWater/editMeterWater.html | 4 +-
.../property/editMeterWater/editMeterWater.js | 236 ++++++++++--------
.../property/unitSelect2/unitSelect2.js | 3 +
.../meterWaterManage/meterWaterManage.html | 10 +-
5 files changed, 152 insertions(+), 104 deletions(-)
diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index c43581204..e9855e3c8 100644
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -16,6 +16,7 @@
remark: '',
roomId: '',
objId: '',
+ objName: '',
feeTypeCd: '',
feeConfigs: [],
configId: '',
@@ -35,6 +36,7 @@
if (_param.hasOwnProperty("roomId")) {
vc.component.addMeterWaterInfo.roomId = _param.roomId;
vc.component.addMeterWaterInfo.objId = _param.roomId;
+ $that.addMeterWaterInfo.objName = _param.name;
$that._queryPreMeterWater(_param.roomId);
}
});
@@ -258,6 +260,7 @@
remark: '',
roomId: '',
objId: '',
+ objName: '',
feeTypeCd: '',
feeConfigs: [],
configId: '',
diff --git a/public/components/property/editMeterWater/editMeterWater.html b/public/components/property/editMeterWater/editMeterWater.html
index 997341fb4..402588aa0 100644
--- a/public/components/property/editMeterWater/editMeterWater.html
+++ b/public/components/property/editMeterWater/editMeterWater.html
@@ -25,14 +25,14 @@
+ class="form-control editPreReadingTime">
diff --git a/public/components/property/editMeterWater/editMeterWater.js b/public/components/property/editMeterWater/editMeterWater.js
index 113c31797..c08407ee3 100644
--- a/public/components/property/editMeterWater/editMeterWater.js
+++ b/public/components/property/editMeterWater/editMeterWater.js
@@ -1,152 +1,190 @@
-(function(vc,vm){
+(function (vc, vm) {
vc.extends({
- data:{
- editMeterWaterInfo:{
- waterId:'',
-meterType:'',
-preDegrees:'',
-curDegrees:'',
-preReadingTime:'',
-curReadingTime:'',
-remark:'',
+ data: {
+ editMeterWaterInfo: {
+ waterId: '',
+ meterType: '',
+ preDegrees: '',
+ curDegrees: '',
+ preReadingTime: '',
+ curReadingTime: '',
+ remark: '',
}
},
- _initMethod:function(){
-
- },
- _initEvent:function(){
- vc.on('editMeterWater','openEditMeterWaterModal',function(_params){
+ _initMethod: function () {
+ $that._initEditMeterWaterDateInfo();
+ },
+ _initEvent: function () {
+ vc.on('editMeterWater', 'openEditMeterWaterModal', function (_params) {
vc.component.refreshEditMeterWaterInfo();
$('#editMeterWaterModel').modal('show');
- vc.copyObject(_params, vc.component.editMeterWaterInfo );
+ vc.copyObject(_params, vc.component.editMeterWaterInfo);
vc.component.editMeterWaterInfo.communityId = vc.getCurrentCommunity().communityId;
});
},
- methods:{
- editMeterWaterValidate:function(){
- return vc.validate.validate({
- editMeterWaterInfo:vc.component.editMeterWaterInfo
- },{
- 'editMeterWaterInfo.meterType':[
-{
- limit:"required",
- param:"",
- errInfo:"表类型不能为空"
+ methods: {
+ _initEditMeterWaterDateInfo: function () {
+ $('.editPreReadingTime').datetimepicker({
+ language: 'zh-CN',
+ fontAwesome: 'fa',
+ format: 'yyyy-mm-dd hh:ii:ss',
+ initTime: true,
+ initialDate: new Date(),
+ autoClose: 1,
+ todayBtn: true
+
+ });
+ $('.editPreReadingTime').datetimepicker()
+ .on('changeDate', function (ev) {
+ var value = $(".editPreReadingTime").val();
+ vc.component.editMeterWaterInfo.preReadingTime = value;
+ });
+ $('.editCurReadingTime').datetimepicker({
+ language: 'zh-CN',
+ fontAwesome: 'fa',
+ format: 'yyyy-mm-dd hh:ii:ss',
+ initTime: true,
+ initialDate: new Date(),
+ autoClose: 1,
+ todayBtn: true
+ });
+ $('.editCurReadingTime').datetimepicker()
+ .on('changeDate', function (ev) {
+ var value = $(".editCurReadingTime").val();
+ var start = Date.parse(new Date(vc.component.editMeterWaterInfo.preReadingTime))
+ var end = Date.parse(new Date(value))
+ if (start - end >= 0) {
+ vc.toast("计费终止时间必须大于计费起始时间")
+ $(".addCurReadingTime").val('')
+ } else {
+ vc.component.editMeterWaterInfo.curReadingTime = value;
+ }
+ });
+ },
+ editMeterWaterValidate: function () {
+ return vc.validate.validate({
+ editMeterWaterInfo: vc.component.editMeterWaterInfo
+ }, {
+ 'editMeterWaterInfo.meterType': [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "表类型不能为空"
},
- {
- limit:"num",
- param:"",
- errInfo:"表类型错误"
+ {
+ limit: "num",
+ param: "",
+ errInfo: "表类型错误"
},
],
-'editMeterWaterInfo.preDegrees':[
-{
- limit:"required",
- param:"",
- errInfo:"上期度数不能为空"
+ 'editMeterWaterInfo.preDegrees': [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "上期度数不能为空"
},
- {
- limit:"money",
- param:"",
- errInfo:"上期度数格式错误"
+ {
+ limit: "money",
+ param: "",
+ errInfo: "上期度数格式错误"
},
],
-'editMeterWaterInfo.curDegrees':[
-{
- limit:"required",
- param:"",
- errInfo:"本期度数不能为空"
+ 'editMeterWaterInfo.curDegrees': [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "本期度数不能为空"
},
- {
- limit:"money",
- param:"",
- errInfo:"本期度数格式错误"
+ {
+ limit: "money",
+ param: "",
+ errInfo: "本期度数格式错误"
},
],
-'editMeterWaterInfo.preReadingTime':[
-{
- limit:"required",
- param:"",
- errInfo:"上期读表时间不能为空"
+ 'editMeterWaterInfo.preReadingTime': [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "上期读表时间不能为空"
},
- {
- limit:"date",
- param:"",
- errInfo:"格式错误"
+ {
+ limit: "dateTime",
+ param: "",
+ errInfo: "上期读表时间格式错误"
},
],
-'editMeterWaterInfo.curReadingTime':[
-{
- limit:"required",
- param:"",
- errInfo:"本期读表时间不能为空"
+ 'editMeterWaterInfo.curReadingTime': [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "本期读表时间不能为空"
},
- {
- limit:"date",
- param:"",
- errInfo:"格式错误"
+ {
+ limit: "dateTime",
+ param: "",
+ errInfo: "本期读表时间格式错误"
},
],
-'editMeterWaterInfo.remark':[
- {
- limit:"maxLength",
- param:"500",
- errInfo:"备注格式错误"
+ 'editMeterWaterInfo.remark': [
+ {
+ limit: "maxLength",
+ param: "500",
+ errInfo: "备注格式错误"
},
],
-'editMeterWaterInfo.waterId':[
-{
- limit:"required",
- param:"",
- errInfo:"表ID不能为空"
+ 'editMeterWaterInfo.waterId': [
+ {
+ limit: "required",
+ param: "",
+ errInfo: "表ID不能为空"
}]
- });
- },
- editMeterWater:function(){
- if(!vc.component.editMeterWaterValidate()){
+ });
+ },
+ editMeterWater: function () {
+ if (!vc.component.editMeterWaterValidate()) {
vc.toast(vc.validate.errInfo);
- return ;
+ return;
}
vc.http.apiPost(
'meterWater.updateMeterWater',
JSON.stringify(vc.component.editMeterWaterInfo),
{
- emulateJSON:true
- },
- function(json,res){
+ emulateJSON: true
+ },
+ function (json, res) {
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
let _json = JSON.parse(json);
if (_json.code == 0) {
//关闭model
$('#editMeterWaterModel').modal('hide');
- vc.emit('meterWaterManage','listMeterWater',{});
- return ;
+ vc.emit('meterWaterManage', 'listMeterWater', {});
+ return;
}
vc.message(_json.msg);
- },
- function(errInfo,error){
+ },
+ function (errInfo, error) {
console.log('请求失败处理');
vc.message(errInfo);
- });
+ });
},
- refreshEditMeterWaterInfo:function(){
- vc.component.editMeterWaterInfo= {
- waterId:'',
-meterType:'',
-preDegrees:'',
-curDegrees:'',
-preReadingTime:'',
-curReadingTime:'',
-remark:'',
+ refreshEditMeterWaterInfo: function () {
+ vc.component.editMeterWaterInfo = {
+ waterId: '',
+ meterType: '',
+ preDegrees: '',
+ curDegrees: '',
+ preReadingTime: '',
+ curReadingTime: '',
+ remark: '',
}
}
}
});
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);
diff --git a/public/components/property/unitSelect2/unitSelect2.js b/public/components/property/unitSelect2/unitSelect2.js
index f626e76b1..8ecb3be57 100644
--- a/public/components/property/unitSelect2/unitSelect2.js
+++ b/public/components/property/unitSelect2/unitSelect2.js
@@ -104,6 +104,7 @@
console.log('select', evt);
this.unitSelect2Info.unitId = evt.params.data.id;
this.unitSelect2Info.unitName = evt.params.data.text;
+ this.unitSelect2Info.unitNum = evt.params.data.text;
});
$('#unitSelector').on("select2:unselect", function (evt) {
@@ -112,6 +113,8 @@
console.log('unselect', evt);
this.unitSelect2Info.unitId = '-1';
this.unitSelect2Info.unitName = '';
+ this.unitSelect2Info.unitNum = '';
+
});
},
diff --git a/public/pages/property/meterWaterManage/meterWaterManage.html b/public/pages/property/meterWaterManage/meterWaterManage.html
index 9e03694b0..6fd656244 100644
--- a/public/pages/property/meterWaterManage/meterWaterManage.html
+++ b/public/pages/property/meterWaterManage/meterWaterManage.html
@@ -57,12 +57,14 @@