Merge branch 'func_eccs_2376' into test

src/assets/style/common.less

@@ -1049,3 +1049,11 @@ button::-moz-focus-inner {
 .p-r() {
     position: relative;
 }
+
+.blue-text{
+    color: #2B63FF;
+}
+
+.red-text{
+    color: red;
+}

src/views/charge-query/index.vue

@@ -88,12 +88,9 @@
 					</a-form-model-item>
 				</a-col>
 				<a-col :xl="6" :lg="3" :sm="3">
-					<!-- <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> -->
-
+          <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">

src/views/customer/info/index.vue

@@ -252,7 +252,4 @@ export default {
 .ant-btn .icon-class {
   .mg-r(10);
 }
-.red-text{
-  color: red;
-}
 </style>

src/views/report/returnedMoney.vue

@@ -51,7 +51,10 @@
 				</a-col>
 				<a-col :xl="4" :lg="6" :sm="12" class="none-label">
 					<a-form-model-item label="账单回款金额合计">
-						<div>共计{{ ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</div>
+						<div>
+							共计{{ ciReceiptTotalVo.totalNum || 0 }}条
+							<span v-if="ciReceiptTotalVo.invalidNum">，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</span>	
+						</div>
 
 					</a-form-model-item>
 					
@@ -114,7 +117,10 @@ export default {
 			{ title: '账单编号', dataIndex: 'receiptNo', width: 120 },
 			{ title: '账单日期', dataIndex: 'receiptDate', width: 120 },
 			{ title: '收银', dataIndex: 'receiptTellerName', width: 120 },
-			{ title: '账单金额', dataIndex: 'actualAmount', width: 120 },
+			{ 
+				title: '账单金额', dataIndex: 'actualAmount', width: 120, 
+				// customRender: val => <span class="blue-text">{val}</span> 
+			},
 			{ title: '回款金额', dataIndex: 'paidAmountEob', width: 120 },
 			{
 				title: '个人欠费',

src/views/verification/collectionDetail.vue

@@ -144,7 +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>
+						<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>
 						<a-tabs type="card" v-model="activeKey1">
 							<a-tab-pane v-for="pane in panes1" :key="pane.key" :tab="pane.title">
 								<div>