Compare commits

..

No commits in common. "8cc04a5b352c42c15db407eee68a581ef20cd917" and "8d4af194e7946a74a67a799aa04d839e141a1c8b" have entirely different histories.

3 changed files with 4 additions and 6 deletions
src/views
classMessage/cardOverdueList
xgf/licensed_server/components

View File

@ -70,7 +70,6 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="page-btn-group"> <div class="page-btn-group">
<div></div>
<pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" /> <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
</div> </div>
</div> </div>

View File

@ -1,8 +1,7 @@
<template> <template>
<div> <keep-alive exclude="CorpUserList">
<CardOverdueList v-show="activeName==='CardOverdueList'" /> <component :is="activeName" />
<CorpUserList v-if="activeName==='corpUserList'" /> </keep-alive>
</div>
</template> </template>
<script> <script>

View File

@ -101,7 +101,7 @@
<el-table-column :formatter="(row) => formatDictionaryLabel(row, '0')" prop="EMPLOYMENT_FORM" label="用工形式" /> <el-table-column :formatter="(row) => formatDictionaryLabel(row, '0')" prop="EMPLOYMENT_FORM" label="用工形式" />
<el-table-column :formatter="(row) => formatDictionaryLabel(row, '1')" prop="SELECT_FORM" label="选取形式" /> <el-table-column :formatter="(row) => formatDictionaryLabel(row, '1')" prop="SELECT_FORM" label="选取形式" />
<el-table-column prop="ruserCount" label="持证人员数"/> <el-table-column prop="ruserCount" label="持证人员数"/>
<el-table-column prop="specialUserCount" label="证书数"/> <el-table-column prop="userCount" label="证书数"/>
<el-table-column label="操作" align="left" width="110"> <el-table-column label="操作" align="left" width="110">
<template slot-scope="{row}"> <template slot-scope="{row}">
<el-button type="success" icon="el-icon-view" size="mini" @click="toCorpUserPage(row.CORPINFO_ID)"></el-button> <el-button type="success" icon="el-icon-view" size="mini" @click="toCorpUserPage(row.CORPINFO_ID)"></el-button>