admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-02-25 14:17:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunityWeb

Browse Source
This commit is contained in:
java110 2020-09-08 08:37:32 +08:00
commit 11ea9ad601
4 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/components/property/addMeterWater/addMeterWater.html
View File

@ -28,14 +28,14 @@
</select>
</div>
</div>
<div class="form-group row">
<div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
<label class="col-sm-2 col-form-label">楼栋</label>
<div class="col-sm-10">
<vc:create path="property/floorSelect2" parentModal="addMeterWaterModel" namespace="addMeterWater">
</vc:create>
</div>
</div>
<div class="form-group row">
<div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
<label class="col-sm-2 col-form-label">单元</label>
<div class="col-sm-10">
<vc:create path="property/unitSelect2" parentModal="addMeterWaterModel"
@ -43,7 +43,7 @@
</vc:create>
</div>
</div>
<div class="form-group row">
<div class="form-group row" v-show="addMeterWaterInfo.hasRoom == false">
<label class="col-sm-2 col-form-label">房屋</label>
<div class="col-sm-10">
<vc:create path="property/roomSelect2" parentModal="addMeterWaterModel"
@ -51,6 +51,13 @@
</vc:create>
</div>
</div>
<div class="form-group row" v-show="addMeterWaterInfo.hasRoom == true">
<label class="col-sm-2 col-form-label">房屋</label>
<div class="col-sm-10">
<input v-model="addMeterWaterInfo.objName" type="text" disabled="disabled" placeholder="必填，请填写房屋"
class="form-control ">
</div>
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">上期度数</label>
<div class="col-sm-10">

18
public/components/property/addMeterWater/addMeterWater.js
View File

@ -20,14 +20,22 @@
feeTypeCd: '',
feeConfigs: [],
configId: '',
objType: '1001'
objType: '1001',
hasRoom: false
}
},
_initMethod: function () {
$that._initAddMeterWaterDateInfo();
},
_initEvent: function () {
vc.on('addMeterWater', 'openAddMeterWaterModal', function () {
vc.on('addMeterWater', 'openAddMeterWaterModal', function (_param) {
if (_param.hasOwnProperty('roomId')) {
$that.addMeterWaterInfo.hasRoom =true;
$that.addMeterWaterInfo.roomId = _param.roomId;
$that.addMeterWaterInfo.objId = _param.roomId;
$that.addMeterWaterInfo.objName = _param.roomName;
$that._queryPreMeterWater(_param.roomId);
}
$('#addMeterWaterModel').modal('show');
});
@ -189,7 +197,8 @@
$('#addMeterWaterModel').modal('hide');
vc.component.clearAddMeterWaterInfo();
vc.emit('meterWaterManage', 'listMeterWater', {});
vc.emit('listRoomFee','notify', {});
return;
}
vc.message(_json.msg);
@ -264,7 +273,8 @@
feeTypeCd: '',
feeConfigs: [],
configId: '',
objType: '1001'
objType: '1001',
hasRoom: false
};
}

7
public/pages/property/listRoomFee/listRoomFee.html
View File

@ -5,6 +5,10 @@
<div class="ibox-title">
<h5>{{listRoomCreateFeeInfo.roomName}}费用</h5>
<div class="ibox-tools" style="top:10px;">
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openAddMeterWaterModal()">
水电抄表
</button>
<button type="button" class="btn btn-primary btn-sm" style="margin-left:10px"
v-on:click="_openRoomCreateFeeAddModal()">
创建费用
@ -93,4 +97,7 @@
<vc:create path="property/deleteFee"></vc:create>
<vc:create path="property/editFee"></vc:create>
<vc:create path="property/roomCreateFeeAdd"></vc:create>
<vc:create path="property/addMeterWater" callBackListener="" callBackFunction=""></vc:create>
</div>

7
public/pages/property/listRoomFee/listRoomFee.js
View File

@ -107,6 +107,13 @@
room:$that.listRoomCreateFeeInfo
});
},
_openAddMeterWaterModal: function () {
vc.emit('addMeterWater', 'openAddMeterWaterModal', {
roomId:$that.listRoomCreateFeeInfo.roomId,
roomName:$that.listRoomCreateFeeInfo.roomName,
});
},
}
});