admingit/MicroCommunityWeb
1
0
Fork 0
mirror of https://gitee.com/java110/MicroCommunityWeb.git synced 2026-06-12 18:11:00 +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 2023-01-31 15:55:10 +08:00
commit 19c75c09c6
13 changed files with 61 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
public/components/property/editFee/editFee.html
View File

@ -21,21 +21,21 @@
</div>
<div class="form-group row">
<label class="col-sm-2 col-form-label">
<span><vc:i18n name="计费起始时间" namespace="editFee"></vc:i18n></span>
<span><vc:i18n name="应收开始时间" namespace="editFee"></vc:i18n></span>
</label>
<div class="col-sm-10">
<input v-model="editFeeInfo.endTime" type="text"
:placeholder="vc.i18n('必填，请填写计费起始时间','editFee')"
:placeholder="vc.i18n('必填，请填写应收开始时间','editFee')"
class="form-control editFeeEndTime">
</div>
</div>
<div class="form-group row" v-show="editFeeInfo.feeFlag != '1003006'">
<label class="col-sm-2 col-form-label">
<span><vc:i18n name="计费结束时间" namespace="editFee"></vc:i18n></span>
<span><vc:i18n name="应收结束时间" namespace="editFee"></vc:i18n></span>
</label>
<div class="col-sm-10">
<input v-model="editFeeInfo.maxEndTime" type="text"
:placeholder="vc.i18n('必填，请填写计费结束时间','editFee')"
:placeholder="vc.i18n('必填，请填写应收结束时间','editFee')"
class="form-control editFeeMaxEndTime">
</div>
</div>

10
public/components/property/simplifyCarFee/simplifyCarFee.html
View File

@ -43,10 +43,7 @@
<span><vc:i18n name="建账时间" namespace="simplifyCarFee"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="计费起始时间" namespace="simplifyCarFee"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="计费结束时间" namespace="simplifyCarFee"></vc:i18n></span>
<span><vc:i18n name="应收时间段" namespace="simplifyCarFee"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="说明" namespace="simplifyCarFee"></vc:i18n></span>
@ -67,8 +64,7 @@
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center">{{_getEndTime(fee)}}~<br/>{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.feeTypeCd == '888800010015' || fee.feeTypeCd == '888800010016' "
:title="_simplifyCarGetFeeOwnerInfo(fee.feeAttrs)">
<div><span><span><vc:i18n name="上期度数" namespace="simplifyCarFee"></vc:i18n></span></span>：{{fee.preDegrees}}
@ -155,7 +151,7 @@
<div class="row">
<div class="col-sm-5">
<div>
注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束
注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束
</div>
<div>
应收金额 为-1 一般为费用项公式设置出错请检查

8
public/components/property/simplifyCarFee/simplifyCarFee.js
View File

@ -228,8 +228,8 @@
"催缴类型": _feeConfig.billTypeName,
"付费类型": _feeConfig.paymentCd == '1200' ? '预付费' : '后付费',
"缴费周期": _feeConfig.paymentCycle,
"计费起始时间": _feeConfig.startTime,
"计费终止时间": _feeConfig.endTime,
"应收开始时间": _feeConfig.startTime,
"应收结束时间": _feeConfig.endTime,
"公式": _feeConfig.computingFormulaName,
"计费单价": _feeConfig.computingFormula == '2002' ? '-' : _feeConfig.squarePrice,
"附加/固定费用": _feeConfig.additionalAmount,
@ -250,8 +250,8 @@
"费用项": _fee.feeName,
"费用状态": _fee.stateName,
"建账时间": _fee.startTime,
"计费开始时间": $that._getEndTime(_fee),
"计费结束时间": $that._getDeadlineTime(_fee),
"应收开始时间": $that._getEndTime(_fee),
"应收结束时间": $that._getDeadlineTime(_fee),
"批次": _fee.batchId,
};
_fee.feeAttrs.forEach(attr => {

15
public/components/property/simplifyRoomFee/simplifyRoomFee.html
View File

@ -19,7 +19,7 @@
<div class="col-lg-1 padding-lr-xs" v-if="simplifyRoomFeeInfo.roomId">
<select class="custom-select custom-select-sm" v-model="simplifyRoomFeeInfo.state" @change="_changeSimplifyRoomConfigId()">
<option selected value="">{{vc.i18n('请选择状态','simplifyRoomFee')}}</option>
<option value="2008001">{{vc.i18n('收费中','simplifyRoomFee')}}</option>
<option value="2008001">{{vc.i18n('有效','simplifyRoomFee')}}</option>
<option value="2009001">{{vc.i18n('收费结束','simplifyRoomFee')}}</option>
</select>
</div>
@ -77,12 +77,8 @@
<span class="fa fa-info-circle popover-show hand" data-content="费用生成时间"></span>
</th>
<th class="text-center">
<span><vc:i18n name="计费起始时间" namespace="simplifyRoomFee"></vc:i18n></span>
<span class="fa fa-info-circle popover-show-endTime hand" data-content="开始计费的时间，业主已经交缴2022年度物业费，那么这个时间为2023-01-01(业主费用缴到2022年12月31日)"></span>
</th>
<th class="text-center">
<span><vc:i18n name="计费结束时间" namespace="simplifyRoomFee"></vc:i18n></span>
<span class="fa fa-info-circle popover-show-deadlineTime hand" data-content="当前周期内的计费结束时间，基于建账时间计算，是建账时间的缴费周期倍(缴费周期是费用项中设置的)"></span>
<span><vc:i18n name="应收时间段" namespace="simplifyRoomFee"></vc:i18n></span>
<span class="fa fa-info-circle popover-show-endTime hand" data-content="该费用欠费时间段"></span>
</th>
<th class="text-center">
<span><vc:i18n name="说明" namespace="simplifyRoomFee"></vc:i18n></span>
@ -106,8 +102,7 @@
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center">{{_getEndTime(fee)}}~<br/>{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'" :title="_simplifyRoomGetFeeOwnerInfo(fee.feeAttrs)">
<div>
<span>
@ -225,7 +220,7 @@
<div class="row">
<div class="col-sm-5">
<div>
注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束
注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束
</div>
<div>
应收金额 为-1 一般为费用项公式设置出错请检查

8
public/components/property/simplifyRoomFee/simplifyRoomFee.js
View File

@ -303,8 +303,8 @@
"催缴类型": _feeConfig.billTypeName,
"付费类型": _feeConfig.paymentCd == '1200' ? '预付费' : '后付费',
"缴费周期": _feeConfig.paymentCycle,
"计费起始时间": _feeConfig.startTime,
"计费终止时间": _feeConfig.endTime,
"应收开始时间": _feeConfig.startTime,
"应收结束时间": _feeConfig.endTime,
"公式": _feeConfig.computingFormulaName,
"计费单价": _feeConfig.computingFormula == '2002' ? '-' : _feeConfig.squarePrice,
"附加/固定费用": _feeConfig.additionalAmount,
@ -327,8 +327,8 @@
"费用项": _fee.feeName,
"费用状态": _fee.stateName,
"建账时间": _fee.startTime,
"计费开始时间": $that._getEndTime(_fee),
"计费结束时间": $that._getDeadlineTime(_fee),
"应收开始时间": $that._getEndTime(_fee),
"应收结束时间": $that._getDeadlineTime(_fee),
"批次": _fee.batchId,
};
_fee.feeAttrs.forEach(attr => {

8
public/components/property/todayAttendanceDetail/todayAttendanceDetail.html
View File

@ -1,4 +1,4 @@
<div id="todayAttendanceDetailModel" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="todayAttendanceDetailModelLabel" aria-hidden="true">
<div id="todayAttendanceDetailModel" class="modal fade" role="dialog" aria-labelledby="todayAttendanceDetailModelLabel" aria-hidden="true">
<div class="modal-dialog modal-lg">
<div class="modal-content">
<div class="modal-header">
@ -34,10 +34,8 @@
<td class="text-center">{{detail.stateName}}</td>
<td class="text-center">{{detail.checkTime || '未打卡' }} </td>
<td class="text-right ">
<span v-for="_photo in detail.photos">
<img style="width: 60px; height: 60px;" v-bind:src="_photo.url"
v-on:click="openFile(_photo)">
</span>
<img style="width: 60px; height: 60px;" v-if="detail.facePath" v-bind:src="detail.facePath"
v-on:click="openFile(detail)">
</td>
</tr>
</tbody>

2
public/components/property/todayAttendanceDetail/todayAttendanceDetail.js
View File

@ -23,7 +23,7 @@
},
openFile: function (_photo) {
vc.emit('viewImage', 'showImage', {
url: _photo.url
url: _photo.facePath
});
}
}

8
public/pages/property/attendanceLogManage/attendanceLogManage.html
View File

@ -70,6 +70,9 @@
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
<thead>
<tr>
<th class="text-center">
<span><vc:i18n name="人脸" namespace="attendanceLogManage"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="部门名称" namespace="attendanceLogManage"></vc:i18n></span>
</th>
@ -86,6 +89,10 @@
</thead>
<tbody>
<tr v-for="attendance in attendanceLogManageInfo.attendances">
<td class="text-center" style="white-space: nowrap;">
<img style="width: 60px; height: 60px;" class="border-radius" v-if="attendance.facePath" v-bind:src="attendance.facePath" v-on:click="_viewOwnerFace(attendance.facePath)" />
<img style="width: 60px; height: 60px;" class="border-radius" v-else src="/img/noPhoto.jpg" />
</td>
<td class="text-center">{{attendance.departmentName}}</td>
<td class="text-center">{{attendance.staffName}}</td>
<td class="text-center">{{attendance.staffId}}</td>
@ -106,4 +113,5 @@
</div>
</div>
</div>
<vc:create path="common/viewImage"></vc:create>
</div>

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

@ -99,7 +99,12 @@
} else {
vc.component.attendanceLogManageInfo.moreCondition = true;
}
}
},
_viewOwnerFace: function(_url) {
vc.emit('viewImage', 'showImage', {
url: _url
});
},
}
});
})(window.vc);

17
public/pages/property/listCarFee/listCarFee.html
View File

@ -44,10 +44,7 @@
<span><vc:i18n name="建账时间" namespace="listCarFee"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="计费起始时间" namespace="listCarFee"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="计费结束时间" namespace="listCarFee"></vc:i18n></span>
<span><vc:i18n name="应收时间段" namespace="listCarFee"></vc:i18n></span>
</th>
<th class="text-center">
<span><vc:i18n name="说明" namespace="listCarFee"></vc:i18n></span>
@ -69,8 +66,7 @@
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center">{{_getEndTime(fee)}}~<br/>{{_getDeadlineTime(fee)}}</td>
<td class="text-center"
v-if="fee.feeTypeCd == '888800010015' || fee.feeTypeCd == '888800010016' ">
<div>
@ -137,13 +133,8 @@
<!-- 分页 -->
<div class="row">
<div class="col-sm-5">
<div>
<span><vc:i18n name="注意" namespace="listCarFee"></vc:i18n></span>： 计费结束时间 “-” 表示未到计费时间
或 收费已结束
</div>
<div>
<span><vc:i18n name="应收金额" namespace="listCarFee"></vc:i18n></span> 为-1 一般为费用项公式设置出错请检查
</div>
<div> 注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束</div>
<div>应收金额为-1 一般为费用项公式设置出错请检查</div>
</div>
<div class="col-sm-7 float-right">
<vc:create path="frame/pagination"></vc:create>

10
public/pages/property/listContractFee/listContractFee.html
View File

@ -28,8 +28,7 @@
<th class="text-center"><span><vc:i18n name="费用类型" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="应收金额" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="建账时间" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="计费起始时间" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="计费结束时间" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="应收时间段" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="说明" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="状态" namespace="listContractFee"></vc:i18n></span></th>
<th class="text-center"><span><vc:i18n name="操作" namespace="listContractFee"></vc:i18n></span></th>
@ -42,8 +41,7 @@
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center">{{_getEndTime(fee)}}~</br>{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'">
<div><span><vc:i18n name="上期度数" namespace="listContractFee"></vc:i18n></span>：{{fee.preDegrees}}</div>
<div><span><vc:i18n name="本期度数" namespace="listContractFee"></vc:i18n></span>：{{fee.curDegrees}}</div>
@ -84,8 +82,8 @@
<!-- 分页 -->
<div class="row">
<div class="col-sm-5">
<div> <span><vc:i18n name="注意" namespace="listContractFee"></vc:i18n></span>： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</div>
<div> <span><vc:i18n name="应收金额" namespace="listContractFee"></vc:i18n></span> 为-1 一般为费用项公式设置出错请检查</div>
<div> 注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束</div>
<div>应收金额为-1 一般为费用项公式设置出错请检查</div>
</div>
<div class="col-sm-7 float-right">
<vc:create path="frame/pagination"></vc:create>

43
public/pages/property/roomCreateFee/roomCreateFee.html
View File

@ -129,18 +129,8 @@
</span>
</th>
<th class="text-center">
<span>
<span><vc:i18n name="计费起始时间" namespace="listRoomFee"></vc:i18n></span>
</span>
<span class="fa fa-info-circle popover-show-endTime hand" data-content="开始计费的时间，业主已经交缴2022年度物业费，那么这个时间为2023-01-01(业主费用缴到2022年12月31日)">
</span>
</th>
<th class="text-center">
<span>
<span><vc:i18n name="计费结束时间" namespace="listRoomFee"></vc:i18n></span>
</span>
<span class="fa fa-info-circle popover-show-deadlineTime hand" data-content="当前周期内的计费结束时间，基于建账时间计算，是建账时间的缴费周期倍(缴费周期是费用项中设置的)">
</span>
<span><vc:i18n name="应收时间段" namespace="listRoomFee"></vc:i18n></span>
<span class="fa fa-info-circle popover-show-endTime hand" data-content="该费用欠费时间段"></span>
</th>
<th class="text-center">
<span>
@ -168,45 +158,34 @@
<td class="text-center">{{fee.feeTypeCdName}}</td>
<td class="text-center">{{fee.amountOwed}}</td>
<td class="text-center">{{fee.startTime}}</td>
<td class="text-center">{{_getEndTime(fee)}}</td>
<td class="text-center">{{_getDeadlineTime(fee)}}</td>
<td class="text-center">{{_getEndTime(fee)}}~</br>{{_getDeadlineTime(fee)}}</td>
<td class="text-center" v-if="fee.computingFormula == '5005' || fee.computingFormula == '9009'">
<div>
<span>
<span><vc:i18n name="上期度数" namespace="listRoomFee"></vc:i18n></span>
</span>：{{fee.preDegrees}}
：{{fee.preDegrees}}
</div>
<div>
<span>
<span><vc:i18n name="本期度数" namespace="listRoomFee"></vc:i18n></span>
</span>：{{fee.curDegrees}}
：{{fee.curDegrees}}
</div>
<div>
<span>
<span><vc:i18n name="单价" namespace="listRoomFee"></vc:i18n></span>
</span>：{{getOnePrice1(fee)}}
：{{getOnePrice1(fee)}}
</div>
<div>
<span>
<span><vc:i18n name="附加费" namespace="listRoomFee"></vc:i18n></span>
</span>：{{fee.additionalAmount}}
：{{fee.additionalAmount}}
</div>
</td>
<td class="text-center" v-else-if="fee.computingFormula == '6006'">
<div>
<span>
<span><vc:i18n name="用量" namespace="listRoomFee"></vc:i18n></span>
</span>：{{_getAttrValue(fee.feeAttrs,'390006')}}
<span><vc:i18n name="用量" namespace="listRoomFee"></vc:i18n></span>：{{_getAttrValue(fee.feeAttrs,'390006')}}
</div>
<div>
<span>
<span><vc:i18n name="单价" namespace="listRoomFee"></vc:i18n></span>
</span>：{{fee.squarePrice}}
<span><vc:i18n name="单价" namespace="listRoomFee"></vc:i18n></span>：{{fee.squarePrice}}
</div>
<div>
<span>
<span><vc:i18n name="附加费" namespace="listRoomFee"></vc:i18n></span>
</span>：{{fee.additionalAmount}}
<span><vc:i18n name="附加费" namespace="listRoomFee"></vc:i18n></span>：{{fee.additionalAmount}}
</div>
</td>
<td class="text-center" width="150" v-else-if="fee.feeTypeCd == '888800010017'">
@ -293,7 +272,7 @@
<!-- 分页 -->
<div class="row">
<div class="col-sm-5">
<div> 注意： 计费结束时间 “-” 表示未到计费时间 或 收费已结束</div>
<div> 注意： 应收结束时间 “-” 表示未到应收时间 或 收费已结束</div>
<div> 应收金额 为-1 一般为费用项公式设置出错请检查</div>
</div>
<div class="col-sm-7 float-right">

8
public/pages/property/roomCreateFee/roomCreateFee.js
View File

@ -392,8 +392,8 @@
"催缴类型": _feeConfig.billTypeName,
"付费类型": _feeConfig.paymentCd == '1200' ? '预付费' : '后付费',
"缴费周期": _feeConfig.paymentCycle,
"计费起始时间": _feeConfig.startTime,
"计费终止时间": _feeConfig.endTime,
"应收开始时间": _feeConfig.startTime,
"应收结束时间": _feeConfig.endTime,
"公式": _feeConfig.computingFormulaName,
"计费单价": _feeConfig.computingFormula == '2002' ? '-' : _feeConfig.squarePrice,
"附加/固定费用": _feeConfig.additionalAmount,
@ -414,8 +414,8 @@
"费用项": _fee.feeName,
"费用状态": _fee.stateName,
"建账时间": _fee.startTime,
"计费开始时间": $that._getEndTime(_fee),
"计费结束时间": $that._getDeadlineTime(_fee),
"应收开始时间": $that._getEndTime(_fee),
"应收结束时间": $that._getDeadlineTime(_fee),
"批次": _fee.batchId,
};
_fee.feeAttrs.forEach(attr => {