angelo
/
web-zk-admin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev' of 47.94.45.65:angelo/web-zk-admin into test

This commit is contained in:
woody 2025-10-10 11:55:14 +08:00
parent 0142f9a70f 036d9bd65a
commit 22c86db419
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/configManage/walletConfig/xfpz.vue
View File

@ -35,6 +35,7 @@
align="center" align="center"
prop="specialAreaVal" prop="specialAreaVal"
:label="'所属专区'" :label="'所属专区'"
width="140"
/> />
<el-table-column <el-table-column
align="center" align="center"
@ -55,17 +56,20 @@
align="center" align="center"
prop="effectiveDate" prop="effectiveDate"
:label="'生效日期'" :label="'生效日期'"
width="180"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="creationTime" prop="creationTime"
:label="'创建日期'" :label="'创建日期'"
width="180"
/> />
<el-table-column <el-table-column
align="center" align="center"
prop="time" prop="time"
:label="'操作'" :label="'操作'"
fixed="right" fixed="right"
width="110"
> >
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button

16
src/views/information/member/index.vue
View File

@ -319,7 +319,13 @@
:label="'会员姓名'" :label="'会员姓名'"
width="180" width="180"
/> />
<el-table-column
v-if="allTxt.pkAwardsVal"
align="center"
prop="pkAwardsVal"
:label="$t('荣誉奖衔')"
width="160"
/>
<el-table-column <el-table-column
v-if="allTxt.phone" v-if="allTxt.phone"
align="center" align="center"
@ -341,13 +347,7 @@
:label="'推荐姓名'" :label="'推荐姓名'"
width="180" width="180"
/> />
<el-table-column
v-if="allTxt.pkAwardsVal"
align="center"
prop="pkAwardsVal"
:label="$t('荣誉奖衔')"
width="160"
/>
<el-table-column <el-table-column
v-if="allTxt.orderSourceVal" v-if="allTxt.orderSourceVal"
align="center" align="center"