From ca524ad56621ef72442a52d48dd56b8fbb2030fd Mon Sep 17 00:00:00 2001
From: fzp <645608524@qq.com>
Date: Mon, 28 Aug 2023 20:43:46 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A5=BF=E6=98=8C=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ReceiveSendFeeManagement/PayFee/list.vue      |  6 +++---
 .../ReceiveSendFeeManagement/PayFee/single.vue    | 15 ++++++++++++++-
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/list.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/list.vue
index 26f38a5d3..7539d6177 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/list.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/list.vue	
@@ -19,13 +19,13 @@
 							<text class="customlist-item-field-title">姓名：</text>
 							{{ item.StuName }}
 						</view>
-						<view class="customlist-item-field">
+						<!-- <view class="customlist-item-field">
 							<text class="customlist-item-field-title">性别：</text>
 							{{ displayListItem(item, 'GenderNo') }} 
-						</view>
+						</view> -->
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">身份证号：</text>
-							{{ item.IdentityCardNo }}
+							{{ item.IdentityCardNo.replace(/^(.{6})(?:\d+)(.{2})$/,"$1**********$2") }}
 						</view>
 						<view class="customlist-item-field">
 							<text class="customlist-item-field-title">缴费年度：</text>
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/single.vue b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/single.vue
index 845d392d4..d2b1eee88 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/single.vue	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/pages/ReceiveSendFeeManagement/PayFee/single.vue	
@@ -3,7 +3,8 @@
 		<l-input v-model="StuInfoFreshData.StuNo" disabled title="学号" placeholder="请填写学号" right/>
 		<l-input v-model="StuInfoFreshData.StuName" disabled title="姓名" placeholder="请填写学号" right />
 		<l-input :value="displayListItem(StuInfoFreshData, 'ClassNo')" disabled title="班级" placeholder="请填写班级" right />
-		<l-input :value="displayListItem(StuInfoFreshData, 'DeptNo')" disabled title="系别" placeholder="请填写系别" right />
+		<!-- <l-input :value="displayListItem(StuInfoFreshData, 'DeptNo')" disabled title="系别" placeholder="请填写系别" right /> -->
+		<l-input :value="displayListItem(StuInfoFreshData, 'MajorNo')" disabled title="专业" right />
 		<l-input :value="StuInfoFreshData.FSYear" disabled title="缴费年度" placeholder="请填写系别" right />
 		<!-- 姓名 StuName 班级 className 系别 deptName  FinaChargesStandardList [缴费项目 ChargeItemName 收费标准 Standard 本次实缴 SJAmount] -->
 		<l-customform-table
@@ -71,6 +72,7 @@ export default{
 			dataSource: {
 				ClassNo:[],
 				DeptNo:[],
+				MajorNo:[],
 				// PayStatus: Object.values(this.GET_GLOBAL('dataDictionary').PayStatus).map(t => ({ value: t.value, text: t.text })),
 				// OnsitePayStatus: Object.values(this.GET_GLOBAL('dataDictionary').OnsitePayStatus).map(t => ({ value: t.value, text: t.text }))
 			},
@@ -91,6 +93,10 @@ export default{
 					type: 'dataItem',
 					dataType: 'dataDictionary'
 				},
+				MajorNo:{
+					type: 'dataItem',
+					dataType: 'dataDictionary'
+				},
 			},
 			
 			StuInfoFreshData:{},
@@ -137,6 +143,13 @@ export default{
 						value: t.deptno
 					}));
 				}),
+				
+				this.FETCH_DATASOURCE('CdMajorInfo').then(data => {
+					this.dataSource.MajorNo = data.data.map(t => ({
+						text: t.majorname,
+						value: t.majorno
+					}));
+				}),
 			
 				() => {}
 			]);