Merge branch 'func_eccs_2376' into test

src/views/charge-query/index.vue

@@ -87,11 +87,6 @@
 						</a-select>
 					</a-form-model-item>
 				</a-col>
-				<a-col :xl="6" :lg="3" :sm="3">
-          <div class="residue-amount">未清余额合计:{{ ciReceiptTotalVo.residueBackAmount || 0 }} (共计{{
-						ciReceiptTotalVo.totalNum || 0 }}条<span v-if="ciReceiptTotalVo.invalidNum">，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</span>) 
-          </div>
-				</a-col>
 				<a-col :xl="6" :lg="3" :sm="3" class="none-label">
 					<a-form-model-item label="button">
 						<!-- <a-button>更新数据</a-button> -->
@@ -108,7 +103,13 @@
 						</a-button>
 					</a-form-model-item>
 				</a-col>
+        <a-col :xl="24" :lg="24" :sm="24">
+          <div class="residue-amount">未清余额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.residueBackAmount || 0 }} </span> (共计<span class="blue-text"> {{
+						ciReceiptTotalVo.totalNum || 0 }} </span>条<span v-if="ciReceiptTotalVo.invalidNum">，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</span>) 
+          </div>
+				</a-col>
 			</a-row>
+      <a-row></a-row>
 		</a-form-model>
 
 		<!-- table -->
@@ -394,6 +395,6 @@ export default {
 .residue-amount {
 	color: rgba(0, 0, 0, 0.65);
 	font-size: 14px;
-	.mg-t(48);
-
+	// .mg-t(48);
+  margin: 0 0 10px;
 }</style>

src/views/charge-query/lpjManageDetail.vue

@@ -111,12 +111,12 @@
             <div class="total-div flex">
             <div>
                 <span>总账单数：</span>
-                <span>{{ totalListNum + selectedRowKeys.length }}</span>个
-                <span :style="{color: 'red'}" v-if="invalidNum > 0">（无效{{ invalidNum }}个）</span>
+                <span class="blue-text">{{ totalListNum + selectedRowKeys.length }}</span> 条
+                <span :style="{color: 'red'}" v-if="invalidNum > 0">（无效{{ invalidNum }} 条）</span>
               </div>
               <div>
                 <span>理赔金额合计：</span>
-                <span>{{ totalAmount }}</span>元
+                <span class="blue-text">￥{{ totalAmount }}</span>
                 <span :style="{color: 'red'}" v-if="invalidActualAmount > 0">（无效{{ invalidActualAmount }}元）</span>
               </div>  
             </div>

src/views/report/returnedMoney.vue

@@ -49,35 +49,16 @@
 						</a-button>
 					</a-form-model-item>
 				</a-col>
-				<a-col :xl="4" :lg="6" :sm="12" class="none-label">
-					<a-form-model-item label="账单回款金额合计">
-						<div>
-							共计{{ ciReceiptTotalVo.totalNum || 0 }}条
-							<span v-if="ciReceiptTotalVo.invalidNum">，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</span>	
-						</div>
-
-					</a-form-model-item>
-					
-				</a-col>
-				<a-col :xl="3" :lg="10" :sm="12" class="none-label">
-					<a-form-model-item label="回款金额合计">
-						<div>账单金额合计:{{ ciReceiptTotalVo.actualAmountTotal || 0 }}</div>
-					</a-form-model-item>
-					
-				</a-col>
-				<a-col :xl="3" :lg="10" :sm="12" class="none-label">
-					<a-form-model-item label="回款金额合计">
-						<div>回款金额合计:{{ ciReceiptTotalVo.paidAmountEobTotal || 0 }}</div>
-					</a-form-model-item>
-					
-				</a-col>
-				<a-col :xl="3" :lg="10" :sm="12" class="none-label">
-					<a-form-model-item label="个人欠费合计">
-						<div>个人欠费合计:{{ ciReceiptTotalVo.arrearsAmountTotal || 0 }}</div>
-					</a-form-model-item>
-					
-				</a-col>
 			</a-row>
+			<div style="display: flex; margin-bottom: 14px;">
+				<div style="margin-right: 40px;">
+					共计 <span class="blue-text">{{ ciReceiptTotalVo.totalNum || 0 }}</span> 条
+					<!-- <span v-if="ciReceiptTotalVo.invalidNum">，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</span>	 -->
+				</div>
+				<div style="margin-right: 40px;">账单金额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.actualAmountTotal || 0 }}</span></div>
+				<div style="margin-right: 40px;">回款金额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.paidAmountEobTotal || 0 }}</span></div>
+				<div style="margin-right: 40px;">个人欠费合计：<span class="red-text">￥{{ ciReceiptTotalVo.arrearsAmountTotal || 0 }}</span></div>
+			</div>
 		</a-form-model>
 
 		<!-- table -->

src/views/verification/collectionDetail.vue

@@ -130,7 +130,8 @@
 							</a-col>
 							<a-col :lg="6" :sm="12">
 								<a-form-model-item label="本次账单回款金额合计">
-									<div>{{ ciReceiptTotalVo.backAmountTotal || 0 }}</div>
+									<!-- <div class="blue-text">{{ ciReceiptTotalVo.backAmountTotal || 0 }}</div> -->
+									<div class="blue-text">{{ form.backAmountCny - residueBackAmount || 0 }}</div>
 								</a-form-model-item>
 								
 							</a-col>
@@ -144,7 +145,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).length || 0 }}</span> 条</span></div>
+						<div class="checked-count">已勾选账单：<span class="blue-text">{{ selectedRowKeys.length || 0 }}</span> 条<span v-if="selectedRows.filter(v=> v.status == 2).length != 0">，其中：无效 <span style="color: red;">{{ selectedRows.filter(v=> v.status == 2).length || 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>
@@ -1106,7 +1107,7 @@ export default {
 }
 .checked-count{
 	position: absolute;
-	top: 8px;
-	left: 400px;
+	top: 14px;
+	left: 210px;
 }
 </style>