version9
4
This commit is contained in:
@@ -6,7 +6,7 @@
|
||||
<h3 class="m-t-none m-b ">
|
||||
<span><vc:i18n name="添加" namespace="addQuestionAnswer"></vc:i18n></span>
|
||||
</h3>
|
||||
<div class="ibox-content">
|
||||
<div class="ibox-content ibox-content-auto-height">
|
||||
<div>
|
||||
<div>
|
||||
<div class="form-group row">
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="ibox-content">
|
||||
<div class="ibox-content ibox-content-auto-height">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" data-page-size="15">
|
||||
<thead>
|
||||
<tr>
|
||||
|
||||
@@ -36,7 +36,12 @@
|
||||
}
|
||||
vc.copyObject(_res.data, $that.indexOwnerRoomInfo);
|
||||
let _dom = document.getElementById('ownerRoomCount');
|
||||
$that._initOwnerEcharts($that.indexOwnerRoomInfo.bindCount, $that.indexOwnerRoomInfo.unbindCount, _dom, vc.i18n('住户信息', 'indexOwnerRoom'), vc.i18n('已注册', 'indexOwnerRoom'), vc.i18n('未注册', 'indexOwnerRoom'), '#4B7AF0', '#E2EDF6');
|
||||
let ownerDataList = [
|
||||
{ value: $that.indexOwnerRoomInfo.bindCount, name: vc.i18n('已注册', 'indexOwnerRoom'), color: '#4B7AF0' },
|
||||
{ value: $that.indexOwnerRoomInfo.unbindRoomCount, name: vc.i18n('未绑定房屋', 'indexOwnerRoom'), color: '#FFD93D' },
|
||||
{ value: $that.indexOwnerRoomInfo.bindRoomCount, name: vc.i18n('已绑定房屋', 'indexOwnerRoom'), color: '#01C36D' }
|
||||
];
|
||||
$that._initOwnerEcharts(ownerDataList, _dom, vc.i18n('住户信息', 'indexOwnerRoom'));
|
||||
},
|
||||
function(errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
@@ -44,7 +49,7 @@
|
||||
}
|
||||
);
|
||||
},
|
||||
_initOwnerEcharts: function(userCount, freeCount, dom, _title, _userCountName, _freeCountName, userColor, freeColor) {
|
||||
_initOwnerEcharts: function(dataList, dom, _title) {
|
||||
let myChart = echarts.init(dom);
|
||||
let option = null;
|
||||
option = {
|
||||
@@ -55,12 +60,12 @@
|
||||
legend: {
|
||||
top: '5%',
|
||||
left: 'right',
|
||||
orient: 'vertical', //垂直显示
|
||||
orient: 'vertical',
|
||||
textStyle: {
|
||||
color: '#9D9D9F' //字体颜色
|
||||
color: '#9D9D9F'
|
||||
},
|
||||
},
|
||||
color: [userColor, freeColor],
|
||||
color: dataList.map(item => item.color),
|
||||
series: [{
|
||||
name: _title,
|
||||
type: 'pie',
|
||||
@@ -80,10 +85,10 @@
|
||||
labelLine: {
|
||||
show: false
|
||||
},
|
||||
data: [
|
||||
{ value: userCount, name: _userCountName },
|
||||
{ value: freeCount, name: _freeCountName }
|
||||
],
|
||||
data: dataList.map(item => ({
|
||||
value: item.value,
|
||||
name: item.name
|
||||
})),
|
||||
}]
|
||||
};
|
||||
if (option && typeof option === "object") {
|
||||
|
||||
@@ -13,7 +13,7 @@
|
||||
},
|
||||
_initMethod: function() {
|
||||
|
||||
|
||||
|
||||
},
|
||||
_initEvent: function() {
|
||||
vc.on('indexRepairComplaint','initData',function(){
|
||||
@@ -41,8 +41,14 @@
|
||||
}
|
||||
vc.copyObject(_res.data, $that.indexRepairComplaintInfo);
|
||||
let _dom = document.getElementById('repairCount');
|
||||
$that._initEcharts($that.indexRepairComplaintInfo.finishCount, $that.indexRepairComplaintInfo.allCount - $that.indexRepairComplaintInfo.finishCount, _dom, vc.i18n('报修信息', 'indexRepairComplaint'), vc.i18n('已处理', 'indexRepairComplaint'), vc.i18n('未处理', 'indexRepairComplaint'), '#4B7AF0', '#E2EDF6');
|
||||
},
|
||||
let repairDataList =[
|
||||
{ value: $that.indexRepairComplaintInfo.waitCount, name: vc.i18n('待派单', 'indexRepairComplaint'), color: '#FF6B6B' },
|
||||
{ value: $that.indexRepairComplaintInfo.doingCount, name: vc.i18n('处理中', 'indexRepairComplaint'), color: '#FFD93D' },
|
||||
{ value: $that.indexRepairComplaintInfo.finishCount, name: vc.i18n('已处理', 'indexRepairComplaint'), color: '#4B7AF0' },
|
||||
];
|
||||
$that._initEcharts(repairDataList, _dom, vc.i18n('报修信息', 'indexRepairComplaint'));
|
||||
|
||||
},
|
||||
function(errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
|
||||
@@ -68,7 +74,11 @@
|
||||
}
|
||||
vc.copyObject(_res.data, $that.indexRepairComplaintInfo);
|
||||
let _complaintCountDom = document.getElementById('complaintCount');
|
||||
$that._initEcharts($that.indexRepairComplaintInfo.finishComplaintCount, $that.indexRepairComplaintInfo.allComplaintCount - $that.indexRepairComplaintInfo.finishComplaintCount, _complaintCountDom, vc.i18n('投诉统计', 'indexRepairComplaint'), vc.i18n('已处理', 'indexRepairComplaint'), vc.i18n('未处理', 'indexRepairComplaint'), '#01C36D', '#E2EDF6');
|
||||
let complaintDataList = [
|
||||
{ value: $that.indexRepairComplaintInfo.waitComplaintCount, name: vc.i18n('处理中', 'indexRepairComplaint'), color: '#FFD93D' },
|
||||
{ value: $that.indexRepairComplaintInfo.finishComplaintCount, name: vc.i18n('已处理', 'indexRepairComplaint'), color: '#01C36D' }
|
||||
];
|
||||
$that._initEcharts(complaintDataList, _complaintCountDom, vc.i18n('投诉统计', 'indexRepairComplaint'));
|
||||
},
|
||||
function(errInfo, error) {
|
||||
console.log('请求失败处理');
|
||||
@@ -76,7 +86,7 @@
|
||||
}
|
||||
);
|
||||
},
|
||||
_initEcharts: function(userCount, freeCount, dom, _title, _userCountName, _freeCountName, userColor, freeColor) {
|
||||
_initEcharts: function (dataList, dom, _title){
|
||||
let myChart = echarts.init(dom);
|
||||
let option = null;
|
||||
option = {
|
||||
@@ -92,7 +102,7 @@
|
||||
color: '#9D9D9F' //字体颜色
|
||||
},
|
||||
},
|
||||
color: [userColor, freeColor],
|
||||
color: dataList.map(item => item.color),
|
||||
series: [{
|
||||
name: _title,
|
||||
type: 'pie',
|
||||
@@ -112,10 +122,10 @@
|
||||
labelLine: {
|
||||
show: false
|
||||
},
|
||||
data: [
|
||||
{ value: userCount, name: _userCountName },
|
||||
{ value: freeCount, name: _freeCountName }
|
||||
],
|
||||
data: dataList.map(item =>({
|
||||
value: item.value,
|
||||
name: item.name
|
||||
}))
|
||||
}]
|
||||
};
|
||||
if (option && typeof option === "object") {
|
||||
|
||||
@@ -95,6 +95,33 @@
|
||||
<label class="col-sm-8 col-form-label">{{payFeeOrderConfirmInfo.remark}}</label>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
<div v-if="payFeeOrderConfirmInfo.TranId " class="row">
|
||||
<label class="col-sm-3 col-form-label">
|
||||
<vc:i18n name="Tran Id:" namespace="payFeeOrderConfirm"></vc:i18n>
|
||||
</label>
|
||||
<!-- 使用img标签展示二维码,src绑定到ABAQRCode变量 -->
|
||||
<!-- <img-->
|
||||
<!-- class="col-sm-8"-->
|
||||
<!-- :src="payFeeOrderConfirmInfo.ABAQRCode "-->
|
||||
<!-- alt="ABA QR Code"-->
|
||||
<!-- style="max-width: 200px; max-height: 200px;"-->
|
||||
<!-- >-->
|
||||
<span
|
||||
v-if="payFeeOrderConfirmInfo.TranId!=null"
|
||||
class="col-sm-8"
|
||||
style="/* 可添加文字样式 */"
|
||||
>
|
||||
{{ payFeeOrderConfirmInfo.TranId }}
|
||||
</span>
|
||||
</div>
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
<div v-if="payFeeOrderConfirmInfo.ABAQRCode " class="row">
|
||||
<label class="col-sm-3 col-form-label">
|
||||
<vc:i18n name="ABA KHQR:" namespace="payFeeOrderConfirm"></vc:i18n>
|
||||
|
||||
@@ -1,90 +1,105 @@
|
||||
<div>
|
||||
<div class="margin-top">
|
||||
<div class="row">
|
||||
<div class="col-sm-5 margin-lr-0 padding-lr-0">
|
||||
<table class="footable table table-stripped " style="margin-top:10px" data-page-size="10">
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center " style="border-bottom: none;">
|
||||
<vc:i18n name="姓名" namespace="reportProficientRoomFee"></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center" style="border-bottom: none;">
|
||||
<vc:i18n name="房号" namespace="reportProficientRoomFee"></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center " style="border-bottom: none;">
|
||||
<vc:i18n name="联系电话" namespace="reportProficientRoomFee"></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center " style="border-bottom: none;">
|
||||
<vc:i18n name="面积" namespace="reportProficientRoomFee"></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center " style="border-bottom: none;">
|
||||
<vc:i18n name="收费类型" namespace="reportProficientRoomFee"></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center " style="border-bottom: none;">
|
||||
<vc:i18n name="费用名称" namespace="reportProficientRoomFee"></vc:i18n>
|
||||
</th>
|
||||
<!--客户当时提供的Excel中未包含该字段,该字段存在歧义 故作下线处理-->
|
||||
<!-- <th class="text-center " style="border-bottom: none;">
|
||||
<span><vc:i18n name="应收金额" namespace="reportProficientRoomFee"></vc:i18n></span>
|
||||
</th> -->
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="fee in reportProficientRoomFeeInfo.fees">
|
||||
<td class="text-center ">{{fee.ownerName}}</td>
|
||||
<td class="text-center ">{{fee.objName}}</td>
|
||||
<td class="text-center ">{{fee.ownerLink}}</td>
|
||||
<td class="text-center">{{fee.builtUpArea}}</td>
|
||||
<td class="text-center ">{{fee.feeTypeCdName}}</td>
|
||||
<td class="text-center ">{{fee.feeName}}</td>
|
||||
<!--客户当时提供的Excel中未包含该字段,该字段存在歧义 故作下线处理-->
|
||||
<!-- <td class="text-center ">{{fee.receivableAmount}}</td> -->
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="6">
|
||||
<ul class="pagination float-right"></ul>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
<div class="col-sm-7 margin-lr-0 padding-lr-0 java110-table-scoll-width">
|
||||
<table class="footable table table-stripped " style="margin-top:10px;" data-page-size="10">
|
||||
<thead>
|
||||
<tr>
|
||||
<th v-for="(item,index) in reportProficientRoomFeeInfo.listColumns" style="width:100px"
|
||||
class="java110-td-scoll-width">{{item}}年
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="fee in reportProficientRoomFeeInfo.fees">
|
||||
<td v-for="(item,index) in reportProficientRoomFeeInfo.listColumns"
|
||||
style="width:100px;cursor: pointer;" @click="_showFeeDetail(fee,item)">
|
||||
{{_getProficientRoomFeeValue(fee.reportFeeYearCollectionDetailDtos,item)}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="20">
|
||||
<ul class="pagination float-right"></ul>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
<div class="col-12 margin-lr-0 padding-lr-0">
|
||||
<div class="table-responsive">
|
||||
<table
|
||||
class="footable table table-stripped"
|
||||
style="margin-top: 10px; width: 100%"
|
||||
data-page-size="10"
|
||||
>
|
||||
<thead>
|
||||
<tr>
|
||||
<th class="text-center" style="border-bottom: none">
|
||||
<vc:i18n
|
||||
name="姓名"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center" style="border-bottom: none">
|
||||
<vc:i18n
|
||||
name="房号"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center" style="border-bottom: none">
|
||||
<vc:i18n
|
||||
name="联系电话"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center" style="border-bottom: none">
|
||||
<vc:i18n
|
||||
name="面积"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center" style="border-bottom: none">
|
||||
<vc:i18n
|
||||
name="收费类型"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n>
|
||||
</th>
|
||||
<th class="text-center" style="border-bottom: none">
|
||||
<vc:i18n
|
||||
name="费用名称"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n>
|
||||
</th>
|
||||
<th
|
||||
v-for="(item,index) in reportProficientRoomFeeInfo.listColumns"
|
||||
class="text-center"
|
||||
style="border-bottom: none"
|
||||
>
|
||||
{{item}}年
|
||||
</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr v-for="fee in reportProficientRoomFeeInfo.fees">
|
||||
<td class="text-center">{{fee.ownerName}}</td>
|
||||
<td class="text-center">{{fee.objName}}</td>
|
||||
<td class="text-center">{{fee.ownerLink}}</td>
|
||||
<td class="text-center">{{fee.builtUpArea}}</td>
|
||||
<td class="text-center">{{fee.feeTypeCdName}}</td>
|
||||
<td class="text-center">{{fee.feeName}}</td>
|
||||
<td
|
||||
v-for="(item,index) in reportProficientRoomFeeInfo.listColumns"
|
||||
style="cursor: pointer"
|
||||
@click="_showFeeDetail(fee,item)"
|
||||
class="text-center"
|
||||
>
|
||||
{{_getProficientRoomFeeValue(fee.reportFeeYearCollectionDetailDtos,item)}}
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
<tfoot>
|
||||
<tr>
|
||||
<td colspan="20">
|
||||
<ul class="pagination float-right"></ul>
|
||||
</td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="col-sm-5">
|
||||
<span><vc:i18n name="没有数据时,确保开启了定时任务" namespace="reportProficientRoomFee"></vc:i18n></span>
|
||||
<span
|
||||
><vc:i18n
|
||||
name="没有数据时,确保开启了定时任务"
|
||||
namespace="reportProficientRoomFee"
|
||||
></vc:i18n
|
||||
></span>
|
||||
</div>
|
||||
<div class="col-sm-7 float-right">
|
||||
<vc:create namespace="reportProficientRoomFee" path="frame/paginationPlus"></vc:create>
|
||||
<vc:create
|
||||
namespace="reportProficientRoomFee"
|
||||
path="frame/paginationPlus"
|
||||
></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<vc:create path="property/viewFeeDetail"></vc:create>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
@@ -69,7 +69,7 @@
|
||||
<div class="margin-top">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny margin-top" data-page-size="15">
|
||||
<thead>
|
||||
<tr>
|
||||
<tr class="margin-top-tr">
|
||||
<th class="text-center">
|
||||
<input type="checkbox" class="i-checks" v-bind:checked="simplifyFeeReceiptInfo.quan == true"
|
||||
@click="checkAllReceipt($event)">
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<div class="margin-top">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
|
||||
<thead>
|
||||
<tr>
|
||||
<tr class="margin-top-tr">
|
||||
<th class="text-center">
|
||||
<vc:i18n name="费用项" namespace="simplifyHisFee"></vc:i18n>
|
||||
</th>
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
<div class="margin-top">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
|
||||
<thead>
|
||||
<tr>
|
||||
<tr class="margin-top-tr">
|
||||
<th class="text-center">
|
||||
<span><vc:i18n name="表类型" namespace="simplifyMeterWaterLog"></vc:i18n></span>
|
||||
</th>
|
||||
|
||||
@@ -80,10 +80,11 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="margin-top" v-show="simplifyRoomFeeInfo.showFlag == 'DEFAULT'">
|
||||
|
||||
<div class="margin-top" v-show="simplifyRoomFeeInfo.showFlag == 'DEFAULT'" style="height: 350px; overflow: auto;">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
|
||||
<thead>
|
||||
<tr>
|
||||
<tr style="position: sticky; top: -5px; z-index: 100; background-color: white;">
|
||||
<th class="text-center">
|
||||
<vc:i18n name="费用项目" namespace="simplifyRoomFee"></vc:i18n>
|
||||
</th>
|
||||
@@ -224,7 +225,8 @@
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<div class="margin-top" v-show="simplifyRoomFeeInfo.showFlag == 'MONTH'">
|
||||
|
||||
<div class="margin-top" v-show="simplifyRoomFeeInfo.showFlag == 'MONTH'" style="height: 350px; overflow: auto;">
|
||||
<table class="footable table table-stripped toggle-arrow-tiny" style="margin-top:10px" data-page-size="10">
|
||||
<thead>
|
||||
<tr>
|
||||
@@ -347,11 +349,18 @@
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-sm-5">
|
||||
<div><vc:i18n name="注意:" namespace="simplifyRoomFee"></vc:i18n></div>
|
||||
<div><vc:i18n name="应收结束时间“-”表示未到应收时间或收费已结束" namespace="simplifyRoomFee"></vc:i18n></div>
|
||||
<div><vc:i18n name="应收金额为-1一般为费用项公式设置出错请检查" namespace="simplifyRoomFee"></vc:i18n></div>
|
||||
<div>
|
||||
<vc:i18n name="注意:" namespace="simplifyRoomFee"></vc:i18n>
|
||||
</div>
|
||||
<div>
|
||||
<vc:i18n name="应收结束时间“-”表示未到应收时间或收费已结束" namespace="simplifyRoomFee"></vc:i18n>
|
||||
</div>
|
||||
<div>
|
||||
<vc:i18n name="应收金额为-1一般为费用项公式设置出错请检查" namespace="simplifyRoomFee"></vc:i18n>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-sm-2">
|
||||
<span>
|
||||
|
||||
Reference in New Issue
Block a user