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

Compare commits

base: angelo:22c86db419291a01871603e8170ba512865cc250
Branches Tags
angelo:master
angelo:online
angelo:test
angelo:dev
..
compare: angelo:0142f9a70fcc90bc16ae2d3a8ff970254df0d1eb
Branches Tags
angelo:online
angelo:test
angelo:dev
angelo:master

No commits in common. "22c86db419291a01871603e8170ba512865cc250" and "0142f9a70fcc90bc16ae2d3a8ff970254df0d1eb" have entirely different histories.
22c86db419 ... 0142f9a70f

2 changed files with 8 additions and 12 deletions
Show Stats Expand all files Collapse all files

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

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

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

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