Merge branch 'func_eccs_2250' into test

src/views/report/returnedMoney.vue

@@ -107,8 +107,22 @@ export default {
 			{ title: '收银', dataIndex: 'receiptTellerName', width: 120 },
 			{ title: '账单金额', dataIndex: 'actualAmount', width: 120 },
 			{ title: '回款金额', dataIndex: 'paidAmountEob', width: 120 },
-			{ title: '个人欠费', dataIndex: 'arrearsAmount', width: 120 },
-			{ title: '备注', dataIndex: 'remark', width: 180 },
+			{
+				title: '个人欠费',
+				dataIndex: 'arrearsAmount',
+				width: 120,
+				customRender: (val) => {
+					return <span style="color: red;">{val}</span>;
+				}
+			},
+			{
+				title: '备注',
+				dataIndex: 'remark',
+				width: 180,
+				customRender: (val) => {
+					return <span style="color: red;">{val}</span>;
+				}
+			},
 			{ title: '回款日期', dataIndex: 'eobBackDate', width: 120 },
 			{ title: '回款编号', dataIndex: 'backMoneyNo', width: 120 },
 			{ title: 'EOB号', dataIndex: 'eobNo', width: 120 },

src/views/verification/collectionDetail.vue

@@ -384,13 +384,19 @@ export default {
 					title: '个人欠费',
 					dataIndex: 'arrearsAmountShow',
 					ellipsis: true,
-					width: 150
+					width: 150,
+					customRender: (val) => {
+						return <span style="color: red;">{val}</span>;
+					}
 				},
 				{
 					title: '备注',
 					dataIndex: 'remark',
 					ellipsis: true,
-					width: 200
+					width: 200,
+					customRender: (val) => {
+						return <span style="color: red;">{val}</span>;
+					}
 				},
 				{
 					title: '未清余额',
@@ -430,7 +436,7 @@ export default {
 							<a-popover title="备注" trigger="click">
 								<template slot="content">
 									<a-textarea
-										class="remark_inp"
+										class="remark_inp red_inp"
 										v-model={row.remark}
 										auto-size={{ minRows: 3, maxRows: 5 }}
 										allow-clear
@@ -439,7 +445,7 @@ export default {
 								</template>
 								<a-tooltip>
 									<template slot="title">{row.remark}</template>
-									<a-input v-model={row.remark} allow-clear disabled={!this.isEdit} />
+									<a-input class="red_inp" v-model={row.remark} allow-clear disabled={!this.isEdit} />
 								</a-tooltip>
 							</a-popover>
 						) : (
@@ -470,6 +476,7 @@ export default {
 				customRender: (val, row) => {
 					return (
 						<a-input-number
+							class="red_inp"
 							v-model={row.arrearsAmount}
 							allow-clear
 							disabled={!this.isEdit}
@@ -969,4 +976,9 @@ export default {
 .remark_inp {
 	width: 300px;
 }
+.red_inp {
+	::v-deep .ant-input {
+		color: red;
+	}
+}
 </style>