From 681170f468f99372973c394f964c1c072c8e0cbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=A9=AC=E6=A2=93=E5=BD=AD?= <tianbohe0@163.com>
Date: Tue, 21 Apr 2026 11:42:30 +0800
Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/match/manage/work.vue          | 12 +++++++++---
 src/views/match/points/general/index.vue | 10 ++++++----
 src/views/match/points/unit/index.vue    |  8 ++++----
 src/views/user/record/index.vue          | 12 +-----------
 4 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/views/match/manage/work.vue b/src/views/match/manage/work.vue
index bbc6631..c79d8fe 100644
--- a/src/views/match/manage/work.vue
+++ b/src/views/match/manage/work.vue
@@ -276,6 +276,7 @@
                                 <th class="group-col">参赛组别</th>
                                 <th class="team-col">参赛队伍</th>
                                 <th class="athlete-col">运动员姓名</th>
+                                <th class="unit-col">单位</th>
                                 <th class="session-col">场次</th>
                                 <th class="venue-col">场地</th>
                             </tr>
@@ -294,6 +295,7 @@
                                     <td class="group-cell">{{ item.groupName }}</td>
                                     <td class="team-cell">{{ item.teamName || '-' }}</td>
                                     <td class="athlete-cell">{{ item.athleteName }}</td>
+                                    <td class="unit-cell">{{ item.unitName || '-' }}</td>
                                     <td class="session-cell">{{ item.sessionIndex }}</td>
                                     <td class="venue-cell">{{ item.venueIndex }}</td>
                                 </tr>
@@ -1714,15 +1716,19 @@ defineExpose({
 }
 
 .athlete-col, .athlete-cell {
-    width: 14%;
+    width: 12%;
+}
+
+.unit-col, .unit-cell {
+    width: 16%;
 }
 
 .session-col, .session-cell {
-    width: 7%;
+    width: 6%;
 }
 
 .venue-col, .venue-cell {
-    width: 8%;
+    width: 7%;
 }
 
 /* 成绩与证书页面样式 */
diff --git a/src/views/match/points/general/index.vue b/src/views/match/points/general/index.vue
index 329c6fe..2ea62ae 100644
--- a/src/views/match/points/general/index.vue
+++ b/src/views/match/points/general/index.vue
@@ -1,11 +1,11 @@
 <template>
 	<div class="system-menu-container layout-padding">
 		<ProTable ref="tableRef" :request-api="pointsrecordListGet" @selection-change="handleSelectionChange"
-			:columns="columns" :pagination="true" :tool-button="false" :initParams="initParam" row-key="userId">
+			:columns="columns" :pagination="true" :tool-button="false" :initParam="initParam" row-key="userId">
 
 
 			<template #identityInfo="scope">
-				<el-image style="width: 100px;" :src="scope.row.idCardImageUrl" fit="cover"></el-image>
+				<el-image style="width: 100px;" :src="scope.row.identityInfo" fit="cover"></el-image>
 			</template>
 			<template #action="scope">
 				<el-button v-auth="'user:general:record'" size="small" text type="primary"
@@ -18,7 +18,9 @@
 			<ProTable ref="table" :request-api="pointsDetailApi" :columns="columnsUser" :pagination="true"
 				:tool-button="false" :initParam="initParamUser">
 				<template #points="scope">
-					<el-tag :type="scope.row.points > 0 ? 'success' : 'danger'">{{ scope.row.points }}</el-tag>
+					<span :style="{ color: scope.row.type === 2 ? '#f56c6c' : '#67c23a' }">
+						{{ scope.row.points }}
+					</span>
 				</template>
 			</ProTable>
 			<template #footer>
@@ -75,7 +77,7 @@ const columnsUser = ref([
 			{ label: '消耗', value: 2 },
 		],
 	},
-	{ prop: 'action', label: '操作',search: { el: 'input' }, },
+	{ prop: 'action', label: '赛事',search: { el: 'input' }, },
 	{ prop: 'item', label: '项目',  },
 	{ prop: 'group', label: '组别',  },
 	{ prop: 'points', label: '积分收支',},
diff --git a/src/views/match/points/unit/index.vue b/src/views/match/points/unit/index.vue
index 9a84757..d693ae1 100644
--- a/src/views/match/points/unit/index.vue
+++ b/src/views/match/points/unit/index.vue
@@ -13,7 +13,9 @@
 			<ProTable ref="table" :request-api="pointsDetailApi" :columns="columnsUser" :pagination="true"
 				:tool-button="false" :initParam="initParamUser">
 				<template #points="scope">
-					<el-tag :type="scope.row.points > 0 ? 'success' : 'danger'">{{ scope.row.points }}</el-tag>
+					<span :style="{ color: scope.row.type === 2 ? '#f56c6c' : '#67c23a' }">
+						{{ scope.row.points }}
+					</span>
 				</template>
 			</ProTable>
 			<template #footer>
@@ -71,9 +73,7 @@ const columnsUser = ref([
 			{ label: '消耗', value: 2 },
 		],
 	},
-	{ prop: 'action', label: '操作',search: { el: 'input' }, },
-	{ prop: 'item', label: '项目',  },
-	{ prop: 'group', label: '组别',  },
+	{ prop: 'action', label: '赛事',search: { el: 'input' }, },
 	{ prop: 'participantName', label: '参赛人',},
 	{ prop: 'points', label: '积分收支',},
 	{
diff --git a/src/views/user/record/index.vue b/src/views/user/record/index.vue
index 81959c0..f2788d9 100644
--- a/src/views/user/record/index.vue
+++ b/src/views/user/record/index.vue
@@ -169,13 +169,7 @@
 					<el-date-picker v-model="voucherForm.PayTime" type="datetime" value-format="YYYY-MM-DDTHH:mm:ss"
 						style="width: 100%;" />
 				</el-form-item>
-				<el-form-item label="支付渠道" prop="PayChannel">
-					<el-select v-model="voucherForm.PayChannel" style="width: 100%;">
-						<el-option label="微信" value="微信" />
-						<el-option label="支付宝" value="支付宝" />
-						<el-option label="银行转账" value="银行转账" />
-					</el-select>
-				</el-form-item>
+
 				<el-form-item label="交易流水号">
 					<el-input v-model="voucherForm.TransactionId" placeholder="可选" />
 				</el-form-item>
@@ -915,7 +909,6 @@ const voucherSubmitting = ref(false);
 const voucherForm = reactive({
 	PayAmount: 0,
 	PayTime: '',
-	PayChannel: '微信',
 	TransactionId: '',
 	File: null,
 });
@@ -934,7 +927,6 @@ const voucherRules = reactive({
 		},
 	],
 	PayTime: [{ required: true, message: '请选择支付时间', trigger: 'change' }],
-	PayChannel: [{ required: true, message: '请选择支付渠道', trigger: 'change' }],
 	File: [
 		{
 			validator: (_rule, value, callback) => {
@@ -951,7 +943,6 @@ const openVoucherDialog = (row) => {
 	voucherSubmitting.value = false;
 	voucherForm.PayAmount = 0;
 	voucherForm.PayTime = '';
-	voucherForm.PayChannel = '微信';
 	voucherForm.TransactionId = '';
 	voucherForm.File = null;
 	voucherUploadFileList.value = [];
@@ -975,7 +966,6 @@ const submitVoucher = async () => {
 				File: voucherForm.File,
 				PayAmount: voucherForm.PayAmount,
 				PayTime: voucherForm.PayTime,
-				PayChannel: voucherForm.PayChannel,
 				TransactionId: voucherForm.TransactionId || undefined,
 			};
 			const { succeeded, data } = await usereventrecordVoucherPost(currentRow.value.registrationId, payload);