From df255984672d1cf61e4a25e8c64b9bc295bc970e Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: Thu, 30 Jun 2022 09:04:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BC=80=E5=8F=91=E5=88=9B=E5=BB=BA=E8=B4=B9?=
=?UTF-8?q?=E7=94=A8=E9=A1=B5=E9=9D=A2=20=E4=BC=98=E5=8C=96=E5=AE=8C?=
=?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../property/addMeterWater/addMeterWater.js | 2 +-
.../property/addProxyFee/addProxyFee.js | 68 +++++++++----------
.../property/deleteFee/deleteFee.js | 2 +-
.../components/property/editFee/editFee.html | 2 +-
public/components/property/editFee/editFee.js | 5 +-
.../property/finishFee/finishFee.js | 51 +++++++-------
.../roomCreateFeeAdd/roomCreateFeeAdd.js | 2 +-
.../tempImportRoomFee/tempImportRoomFee.js | 2 +-
.../pages/property/listRoomFee/listRoomFee.js | 12 ++--
.../property/roomCreateFee/roomCreateFee.js | 4 ++
10 files changed, 77 insertions(+), 73 deletions(-)
diff --git a/public/components/property/addMeterWater/addMeterWater.js b/public/components/property/addMeterWater/addMeterWater.js
index 0e1742c50..bfa569d7a 100755
--- a/public/components/property/addMeterWater/addMeterWater.js
+++ b/public/components/property/addMeterWater/addMeterWater.js
@@ -218,7 +218,7 @@
$('#addMeterWaterModel').modal('hide');
vc.component.clearAddMeterWaterInfo();
vc.emit('meterWaterManage', 'listMeterWater', {});
- vc.emit('listRoomFee', 'notify', {});
+ vc.emit('roomCreateFee', 'notify', {});
vc.emit('listParkingSpaceFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
vc.emit('simplifyCarFee', 'notify', {});
diff --git a/public/components/property/addProxyFee/addProxyFee.js b/public/components/property/addProxyFee/addProxyFee.js
index 78756ee67..10a1c2a95 100755
--- a/public/components/property/addProxyFee/addProxyFee.js
+++ b/public/components/property/addProxyFee/addProxyFee.js
@@ -1,4 +1,4 @@
-(function (vc) {
+(function(vc) {
vc.extends({
propTypes: {
callBackListener: vc.propTypes.string, //父组件名称
@@ -21,11 +21,11 @@
endTime: vc.addMonthDate(new Date(), 1)
}
},
- _initMethod: function () {
- vc.initDate('proxyFeeStartTime', function (_startTime) {
+ _initMethod: function() {
+ vc.initDate('proxyFeeStartTime', function(_startTime) {
$that.addProxyFeeInfo.startTime = _startTime;
});
- vc.initDate('proxyFeeEndTime', function (_endTime) {
+ vc.initDate('proxyFeeEndTime', function(_endTime) {
$that.addProxyFeeInfo.endTime = _endTime;
let start = Date.parse(new Date($that.addProxyFeeInfo.startTime))
let end = Date.parse(new Date($that.addProxyFeeInfo.endTime))
@@ -35,8 +35,8 @@
}
});
},
- _initEvent: function () {
- vc.on('addProxyFee', 'openAddProxyFeeModal', function (_param) {
+ _initEvent: function() {
+ vc.on('addProxyFee', 'openAddProxyFeeModal', function(_param) {
if (_param.hasOwnProperty("objType")) {
$that.addProxyFeeInfo.objType = _param.objType;
}
@@ -53,10 +53,10 @@
addProxyFeeInfo: vc.component.addProxyFeeInfo
}, {
'addProxyFeeInfo.amount': [{
- limit: "required",
- param: "",
- errInfo: "金额不能为空"
- },
+ limit: "required",
+ param: "",
+ errInfo: "金额不能为空"
+ },
{
limit: "money",
param: "",
@@ -64,10 +64,10 @@
},
],
'addProxyFeeInfo.consumption': [{
- limit: "required",
- param: "",
- errInfo: "用量不能为空"
- },
+ limit: "required",
+ param: "",
+ errInfo: "用量不能为空"
+ },
{
limit: "money",
param: "",
@@ -85,10 +85,10 @@
errInfo: "费用必填"
}],
'addProxyFeeInfo.startTime': [{
- limit: "required",
- param: "",
- errInfo: "开始时间不能为空"
- },
+ limit: "required",
+ param: "",
+ errInfo: "开始时间不能为空"
+ },
{
limit: "date",
param: "",
@@ -96,10 +96,10 @@
},
],
'addProxyFeeInfo.endTime': [{
- limit: "required",
- param: "",
- errInfo: "结束时间不能为空"
- },
+ limit: "required",
+ param: "",
+ errInfo: "结束时间不能为空"
+ },
{
limit: "date",
param: "",
@@ -108,7 +108,7 @@
],
});
},
- saveProxyInfo: function () {
+ saveProxyInfo: function() {
if (!vc.component.addProxyFeeValidate()) {
vc.toast(vc.validate.errInfo);
return;
@@ -125,30 +125,30 @@
JSON.stringify(vc.component.addProxyFeeInfo), {
emulateJSON: true
},
- function (json, res) {
+ function(json, res) {
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
let _json = JSON.parse(json);
if (_json.code == 0) {
//关闭model
$('#addProxyFeeModel').modal('hide');
vc.component.clearAddProxyFeeInfo();
- vc.emit('listRoomFee', 'notify', {});
+ vc.emit('roomCreateFee', 'notify', {});
vc.emit('listParkingSpaceFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
vc.toast(_json.msg);
return;
}
},
- function (errInfo, error) {
+ function(errInfo, error) {
console.log('请求失败处理');
vc.message(errInfo);
});
},
- _changeProxyFeeConfig: function () {
+ _changeProxyFeeConfig: function() {
$that.addProxyFeeInfo.amount = '';
$that.addProxyFeeInfo.consumption = '';
},
- _changeProxyFeeTypeCd: function (_feeTypeCd) {
+ _changeProxyFeeTypeCd: function(_feeTypeCd) {
$that.addProxyFeeInfo.amount = '';
$that.addProxyFeeInfo.consumption = '';
var param = {
@@ -163,15 +163,15 @@
};
//发送get请求
vc.http.get('roomCreateFeeAdd', 'list', param,
- function (json, res) {
+ function(json, res) {
var _feeConfigManageInfo = JSON.parse(json);
vc.component.addProxyFeeInfo.feeConfigs = _feeConfigManageInfo.feeConfigs;
},
- function (errInfo, error) {
+ function(errInfo, error) {
console.log('请求失败处理');
});
},
- clearAddProxyFeeInfo: function () {
+ clearAddProxyFeeInfo: function() {
vc.component.addProxyFeeInfo = {
amount: '',
consumption: '',
@@ -188,7 +188,7 @@
endTime: vc.addMonthDate(new Date(), 1)
};
},
- _getConfig: function () {
+ _getConfig: function() {
let _feeConfigs = $that.addProxyFeeInfo.feeConfigs;
let _config = null;
_feeConfigs.forEach(item => {
@@ -198,7 +198,7 @@
});
return _config;
},
- _changeAmount: function () {
+ _changeAmount: function() {
let _config = $that._getConfig();
let _amount = $that.addProxyFeeInfo.amount;
if (_config == null) {
@@ -216,7 +216,7 @@
let _consumption = (_amount - _config.additionalAmount) / _config.squarePrice;
$that.addProxyFeeInfo.consumption = _consumption.toFixed(2);
},
- _changeConsumption: function () {
+ _changeConsumption: function() {
let _config = $that._getConfig();
let _consumption = $that.addProxyFeeInfo.consumption;
if (_config == null) {
diff --git a/public/components/property/deleteFee/deleteFee.js b/public/components/property/deleteFee/deleteFee.js
index 169f6c9ae..cf0bb00ab 100755
--- a/public/components/property/deleteFee/deleteFee.js
+++ b/public/components/property/deleteFee/deleteFee.js
@@ -32,7 +32,7 @@
if (_json.code == 0) {
//关闭model
$('#deleteFeeModel').modal('hide');
- vc.emit('listRoomFee', 'notify', {});
+ vc.emit('roomCreateFee', 'notify', {});
vc.emit('listParkingSpaceFee', 'notify', {});
vc.emit('listContractFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
diff --git a/public/components/property/editFee/editFee.html b/public/components/property/editFee/editFee.html
index 0a72e6475..6f6cb8e00 100755
--- a/public/components/property/editFee/editFee.html
+++ b/public/components/property/editFee/editFee.html
@@ -39,7 +39,7 @@
diff --git a/public/components/property/editFee/editFee.js b/public/components/property/editFee/editFee.js
index e64591be4..5c6a48b64 100755
--- a/public/components/property/editFee/editFee.js
+++ b/public/components/property/editFee/editFee.js
@@ -19,6 +19,7 @@
_initEvent: function() {
vc.on('editFee', 'openEditFeeModal',
function(_fee) {
+ $that.clearAddFeeConfigInfo();
vc.copyObject(_fee, $that.editFeeInfo);
if (_fee.startTime.indexOf(":") == -1) {
$that.editFeeInfo.startTime = $that.editFeeInfo.startTime + " 00:00:00";
@@ -69,7 +70,7 @@
vc.component.editFeeInfo.endTime = value;
}
});
- vc.initDate('rateStartTime', function(_endTime) {
+ vc.initDate('editRoomRateStartTime', function(_endTime) {
$that.editFeeInfo.rateStartTime = _endTime;
let start = Date.parse(new Date($that.editFeeInfo.startTime))
let end = Date.parse(new Date($that.editFeeInfo.rateStartTime))
@@ -139,7 +140,7 @@
//关闭model
$('#editFeeModel').modal('hide');
vc.component.clearAddFeeConfigInfo();
- vc.emit('listRoomFee', 'notify', {});
+ vc.emit('roomCreateFee', 'notify', {});
vc.emit('listParkingSpaceFee', 'notify', {});
vc.emit('listContractFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
diff --git a/public/components/property/finishFee/finishFee.js b/public/components/property/finishFee/finishFee.js
index 26b7098c0..8c23fc23c 100755
--- a/public/components/property/finishFee/finishFee.js
+++ b/public/components/property/finishFee/finishFee.js
@@ -1,54 +1,53 @@
-(function(vc,vm){
+(function(vc, vm) {
vc.extends({
- data:{
- finishFeeInfo:{
+ data: {
+ finishFeeInfo: {
}
},
- _initMethod:function(){
+ _initMethod: function() {
- },
- _initEvent:function(){
- vc.on('finishFee','openFinishFeeModal',function(_params){
+ },
+ _initEvent: function() {
+ vc.on('finishFee', 'openFinishFeeModal', function(_params) {
vc.component.finishFeeInfo = _params;
$('#finishFeeModel').modal('show');
});
},
- methods:{
- finishFee:function(){
- vc.component.finishFeeInfo.communityId=vc.getCurrentCommunity().communityId;
+ methods: {
+ finishFee: function() {
+ vc.component.finishFeeInfo.communityId = vc.getCurrentCommunity().communityId;
vc.http.apiPost(
'fee.finishFee',
- JSON.stringify(vc.component.finishFeeInfo),
- {
- emulateJSON:true
- },
- function(json,res){
+ JSON.stringify(vc.component.finishFeeInfo), {
+ emulateJSON: true
+ },
+ function(json, res) {
//vm.menus = vm.refreshMenuActive(JSON.parse(json),0);
- if(res.status == 200){
+ if (res.status == 200) {
//关闭model
$('#finishFeeModel').modal('hide');
- vc.emit('listRoomFee','notify',{});
- vc.emit('listParkingSpaceFee','notify',{});
- vc.emit('simplifyRoomFee', 'notify',{});
- vc.emit('simplifyCarFee', 'notify',{});
+ vc.emit('roomCreateFee', 'notify', {});
+ vc.emit('listParkingSpaceFee', 'notify', {});
+ vc.emit('simplifyRoomFee', 'notify', {});
+ vc.emit('simplifyCarFee', 'notify', {});
vc.toast("结束费用成功");
- return ;
+ return;
}
vc.toast(json);
- },
- function(errInfo,error){
+ },
+ function(errInfo, error) {
console.log('请求失败处理');
vc.toast(json);
- });
+ });
},
- closeFinishFeeModel:function(){
+ closeFinishFeeModel: function() {
$('#finishFeeModel').modal('hide');
}
}
});
-})(window.vc,window.vc.component);
+})(window.vc, window.vc.component);
\ No newline at end of file
diff --git a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
index 406a34d65..d4c0db65f 100755
--- a/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
+++ b/public/components/property/roomCreateFeeAdd/roomCreateFeeAdd.js
@@ -197,7 +197,7 @@
var _json = JSON.parse(json);
$('#roomCreateFeeAddModel').modal('hide');
$that.clearRoomCreateFeeAddData();
- vc.emit('listRoomFee', 'notify', {});
+ vc.emit('roomCreateFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
if (_json.hasOwnProperty('code') && _json.code != 0) {
vc.toast(_json.msg);
diff --git a/public/components/property/tempImportRoomFee/tempImportRoomFee.js b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
index 0c5ae3df5..288a4b85f 100755
--- a/public/components/property/tempImportRoomFee/tempImportRoomFee.js
+++ b/public/components/property/tempImportRoomFee/tempImportRoomFee.js
@@ -143,7 +143,7 @@
if (_json.code == 0) {
//关闭model
$('#tempImportRoomFeeModel').modal('hide');
- vc.emit('listRoomFee', 'notify', {});
+ vc.emit('roomCreateFee', 'notify', {});
vc.emit('simplifyRoomFee', 'notify', {});
vc.emit('listContractFee', 'notify', {});
}
diff --git a/public/pages/property/listRoomFee/listRoomFee.js b/public/pages/property/listRoomFee/listRoomFee.js
index d97eabab9..808f89fe1 100755
--- a/public/pages/property/listRoomFee/listRoomFee.js
+++ b/public/pages/property/listRoomFee/listRoomFee.js
@@ -118,11 +118,11 @@
room: $that.listRoomCreateFeeInfo
});
},
- _openRoomCreateFeeComboModal:function(){
- vc.jumpToPage('/#/pages/property/createFeeByCombo?payerObjId='
- +$that.listRoomCreateFeeInfo.roomId
- +"&payerObjName="+$that.listRoomCreateFeeInfo.roomName
- +"&payerObjType=3333")
+ _openRoomCreateFeeComboModal: function() {
+ vc.jumpToPage('/#/pages/property/createFeeByCombo?payerObjId=' +
+ $that.listRoomCreateFeeInfo.roomId +
+ "&payerObjName=" + $that.listRoomCreateFeeInfo.roomName +
+ "&payerObjType=3333")
},
_openAddMeterWaterModal: function() {
vc.emit('addMeterWater', 'openAddMeterWaterModal', {
@@ -188,7 +188,7 @@
$that.listRoomCreateFeeInfo.roomName = listRoomData.rooms[0].floorNum + "-" + listRoomData.rooms[0].roomNum;
}
// 换存搜索条件
- vc.emit('listRoomFee', 'notify', {})
+ vc.emit('roomCreateFee', 'notify', {});
},
function(errInfo, error) {
console.log('请求失败处理');
diff --git a/public/pages/property/roomCreateFee/roomCreateFee.js b/public/pages/property/roomCreateFee/roomCreateFee.js
index 4bb063251..26f752318 100755
--- a/public/pages/property/roomCreateFee/roomCreateFee.js
+++ b/public/pages/property/roomCreateFee/roomCreateFee.js
@@ -62,6 +62,10 @@
$that.updateCurrentPage(_currentPage);
vc.component.listRoom(_currentPage, DEFAULT_ROW);
});
+
+ vc.on('roomCreateFee', 'notify', function() {
+ vc.component._loadListRoomCreateFeeInfo(DEFAULT_PAGE, DEFAULT_ROW);
+ })
},
methods: {
_openRoomCreateFeeAddModal: function(_room, _isMore) {