Merge branch 'func_eccs_2376' into 'test'

Func eccs 2376

See merge request !65

src/views/charge-query/index.vue

@@ -88,9 +88,11 @@
 					</a-form-model-item>
 				</a-col>
 				<a-col :xl="6" :lg="3" :sm="3">
-					<a-form-model-item :label="` 未清余额合计 `">
-						<div>未清余额合计:{{ ciReceiptTotalVo.residueBackAmount || 0 }}(共计{{ ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条)</div>
-					</a-form-model-item>
+					<!-- <a-form-model-item :label="`  `"> -->
+					<div class="residue-amount">未清余额合计:{{ ciReceiptTotalVo.residueBackAmount || 0 }}(共计{{
+						ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum ||
+		0 }}</span> 条)</div>
+					<!-- </a-form-model-item> -->
 
 				</a-col>
 				<a-col :xl="6" :lg="3" :sm="3" class="none-label">
@@ -391,4 +393,10 @@ export default {
 .ant-btn .icon-class {
 	.mg-r(10);
 }
-</style>
+
+.residue-amount {
+	color: rgba(0, 0, 0, 0.65);
+	font-size: 14px;
+	.mg-t(48);
+
+}</style>

src/views/charge-query/lpjManageDetail.vue

@@ -110,7 +110,7 @@
           <div class="btn-div flex">
             <div class="total-div flex">
              <div>
-                <span>总帐单数：</span>
+                <span>总账单数：</span>
                 <span>{{ totalListNum + selectedRowKeys.length }}</span>个
                 <span :style="{color: 'red'}" v-if="invalidNum > 0">（无效{{ invalidNum }}个）</span>
               </div>

src/views/verification/collectionDetail.vue

@@ -129,8 +129,8 @@
 								</a-form-model-item>
 							</a-col>
 							<a-col :lg="6" :sm="12">
-								<a-form-model-item label="回款金额统计">
-									<div>{{ ciReceiptTotalVo.backAmountTotal || 0 }}(共计{{ ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条)</div>
+								<a-form-model-item label="本次账单回款金额合计">
+									<div>{{ ciReceiptTotalVo.backAmountTotal || 0 }}</div>
 								</a-form-model-item>
 								
 							</a-col>
@@ -144,6 +144,7 @@
 				</a-form-model>
 				<template v-if="activeKey === '1'">
 					<div class="bill-content">
+						<div class="checked-count">已勾选账单:{{ selectedRowKeys.length || 0 }}条<span v-if="selectedRows.filter(v=> v.status == 2).length != 0">，其中：无效 <span style="color: red;">{{ selectedRows.filter(v=> v.status == 2) || 0 }}</span> 条</span></div>
 						<a-tabs type="card" v-model="activeKey1">
 							<a-tab-pane v-for="pane in panes1" :key="pane.key" :tab="pane.title">
 								<div>
@@ -1058,6 +1059,7 @@ export default {
 	overflow-y: auto;
 	overflow-x: hidden;
 	padding-right: 12px;
+	position: relative;
 	::v-deep {
 		.ant-form-item {
 			margin-right: 0;
@@ -1102,4 +1104,9 @@ export default {
 		height: calc(100vh - 400px);
 	}
 }
+.checked-count{
+	position: absolute;
+	top: 8px;
+	left: 400px;
+}
 </style>