Merge branch 'func_eccs_2376' into 'master'

Func eccs 2376 就诊时间问题

See merge request !67

src/views/charge-query/index.vue

@@ -311,8 +311,8 @@ export default {
 		},
 		// 选中就诊时间
 		onSelectVisitTime(date, dateString) {
-			this.form.visitTimeStart = dateString[0] + ' 00:00:00';
-			this.form.visitTimeEnd = dateString[1] + ' 23:59:59';
+			this.form.visitTimeStart = dateString[0] ? dateString[0] + ' 00:00:00' : '';
+			this.form.visitTimeEnd = dateString[1] ? dateString[1] + ' 23:59:59' : '';
 			console.log(date, dateString);
 		},
 		// 重置

src/views/charge-query/lpjManageDetail.vue

@@ -109,7 +109,7 @@
         <a-col :sm="24" class="none-label">
           <div class="btn-div flex">
             <div class="total-div flex">
-             <div>
+            <div>
                 <span>总账单数：</span>
                 <span class="blue-text">{{ totalListNum + selectedRowKeys.length }}</span> 条
                 <span :style="{color: 'red'}" v-if="invalidNum > 0">（无效{{ invalidNum }} 条）</span>

src/views/report/returnedMoney.vue

@@ -49,35 +49,16 @@
 						</a-button>
 					</a-form-model-item>
 				</a-col>
-				<a-col :xl="3" :lg="6" :sm="12" class="none-label" style="position: relative; top: 10px;">
-					<a-form-model-item label="账单回款金额合计">
-						<div>
-							共计 <span class="blue-text">{{ ciReceiptTotalVo.totalNum || 0 }}</span> 条
-							<!-- <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" style="position: relative; top: 10px;">
-					<a-form-model-item label="回款金额合计">
-						<div>账单金额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.actualAmountTotal || 0 }}</span></div>
-					</a-form-model-item>
-					
-				</a-col>
-				<a-col :xl="3" :lg="10" :sm="12" class="none-label" style="position: relative; top: 10px;">
-					<a-form-model-item label="回款金额合计">
-						<div>回款金额合计：<span class="blue-text">￥{{ ciReceiptTotalVo.paidAmountEobTotal || 0 }}</span></div>
-					</a-form-model-item>
-					
-				</a-col>
-				<a-col :xl="3" :lg="10" :sm="12" class="none-label" style="position: relative; top: 10px;">
-					<a-form-model-item label="个人欠费合计">
-						<div>个人欠费合计：<span class="red-text">￥{{ ciReceiptTotalVo.arrearsAmountTotal || 0 }}</span></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 class="blue-text">{{ 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>