Merge remote-tracking branch 'origin/master'

src/views/hard/xfj/xfj-log/index.vue

@@ -51,6 +51,21 @@
           </template>
         </el-table-column>
         <el-table-column prop="title" label="简介" width="250" show-overflow-tooltip />
+        <el-table-column prop="sourceCardNo" label="卡号转换" width="260">
+          <template #default="{ row }">
+            <template v-if="row.sourceCardNo">
+              <span>{{ row.sourceCardNo }}</span>
+              <template v-if="row.cardConvertType !== 'NONE'">
+                <span class="ml5 mr5">→</span>
+                <span>{{ row.targetCardNo }}</span>
+              </template>
+              <el-tag size="small" :type="row.cardConvertType === 'NONE' ? 'info' : 'warning'" class="ml5">
+                {{ convertTypeMap[row.cardConvertType] || row.cardConvertType }}
+              </el-tag>
+            </template>
+            <span v-else>—</span>
+          </template>
+        </el-table-column>
         <el-table-column prop="headers" label="headers" width="180">
           <template #default="{ row }">
             <preview-json :json="row.headers" />
@@ -91,6 +106,12 @@ import { useDict } from '/@/hooks/dict';
 const { hard_type } = useDict("hard_type")
 // 定义变量内容
 
+// 卡号转换方式码值 → 展示文案,与后端 HardXfjServiceImpl 的常量保持一致
+const convertTypeMap: Record<string, string> = {
+	NONE: '未转换',
+	DECIMAL_UID_REVERSE: '十进制UID反转',
+}
+
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)