Commit 493b6cf0 by zhaopanyu

zpy

parent 680df6de
...@@ -66,8 +66,8 @@ ...@@ -66,8 +66,8 @@
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row> </el-row>
<el-table :data="achievementList" @selection-change="handleSelectionChange" <el-table :row-style="{ height: '0' }" :cell-style="{ padding: '3px' }" :data="achievementList"
:default-sort="{ prop: 'year', order: 'descending' }"> @selection-change="handleSelectionChange" :default-sort="{ prop: 'year', order: 'descending' }">
<el-table-column type="selection" width="55" align="center" sortable /> <el-table-column type="selection" width="55" align="center" sortable />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="届别" align="center" prop="year" sortable /> <el-table-column label="届别" align="center" prop="year" sortable />
...@@ -97,7 +97,7 @@ ...@@ -97,7 +97,7 @@
<el-table-column label="增量情况" align="center" prop="incrementSituation" sortable /> <el-table-column label="增量情况" align="center" prop="incrementSituation" sortable />
<el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable /> <el-table-column label="有效数情况" align="center" prop="effectiveNumSituation" sortable />
<el-table-column label="其他情况" align="center" prop="other" sortable /> <el-table-column label="其他情况" align="center" prop="other" sortable />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="120"> <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']" <el-button size="mini" type="text" @click="handleUpdate(scope.row)" v-hasPermi="['system:honors:edit']"
v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button> v-if="scope.row.auditState === '1' || scope.row.auditState === '2' || scope.row.auditState === '3'">修改</el-button>
...@@ -545,3 +545,17 @@ export default { ...@@ -545,3 +545,17 @@ export default {
} }
}; };
</script> </script>
<style scoped lang="scss" >
::v-deep .el-input--medium .el-input__inner {
height: 26px;
line-height: 26px;
}
::v-deep .el-dialog__body {
padding: 20px
}
::v-deep .el-dialog:not(.is-fullscreen) {
margin-top: 4vh !important;
}
</style>
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</el-row> </el-row>
<el-table :data="awardsList" @selection-change="handleSelectionChange" <el-table :data="awardsList" @selection-change="handleSelectionChange"
:default-sort="{ prop: 'awardTime', order: 'descending' }"> :default-sort="{ prop: 'awardTime', order: 'descending' }" >
<el-table-column type="selection" width="55" align="center" /> <el-table-column type="selection" width="55" align="center" />
<el-table-column type="index" label="序号" width="55" align="center" sortable /> <el-table-column type="index" label="序号" width="55" align="center" sortable />
<el-table-column label="成长类型" align="center" sortable> <el-table-column label="成长类型" align="center" sortable>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment