Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
5f83c839 1 parent b3f20ed8

modify

Inline Side-by-side
Showing 3 changed files with 17 additions and 12 deletions
...@@ -12,7 +12,12 @@ ...@@ -12,7 +12,12 @@
12 } 12 }
13 } 13 }
14 } 14 }
15 - 15 +@mixin mariginBottom($pixe: 4px) {
16 + margin-bottom: $pixe;
17 +}
18 +.btn-mg {
19 + @include mariginBottom()
20 +}
16 .blue-btn { 21 .blue-btn {
17 @include colorBtn($blue) 22 @include colorBtn($blue)
18 } 23 }
......
...@@ -34,15 +34,15 @@ ...@@ -34,15 +34,15 @@
34 :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading" 34 :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
35 :height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange"> 35 :height="tableHeight" @sizeChange="sizeChange" @currentChange="currentChange">
36 <template slot="optionColumn"> 36 <template slot="optionColumn">
37 - <el-table-column header-align="center" align="left" label="操作" min-width="210px"> 37 + <el-table-column header-align="center" align="center" label="操作" min-width="210px">
38 <template slot-scope="scope"> 38 <template slot-scope="scope">
39 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button> 39 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" class="btn-mg">查看</el-button>
40 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改 40 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']" class="btn-mg">修改
41 </el-button> 41 </el-button>
42 <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini" 42 <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
43 - v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }} 43 + v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)" class="btn-mg">{{ scope.row.valid == 1 ? "停用" : "启用" }}
44 </el-button> 44 </el-button>
45 - <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" style="margin-top: 5px;margin-left: 0;">删除角色 45 + <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']" class="btn-mg">删除角色
46 </el-button> 46 </el-button>
47 </template> 47 </template>
48 </el-table-column> 48 </el-table-column>
......
...@@ -32,19 +32,19 @@ ...@@ -32,19 +32,19 @@
32 :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight" 32 :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :height="tableHeight"
33 @sizeChange="sizeChange" @currentChange="currentChange"> 33 @sizeChange="sizeChange" @currentChange="currentChange">
34 <template slot="optionColumn"> 34 <template slot="optionColumn">
35 - <el-table-column header-align="center" align="left" min-width="210px" label="操作"> 35 + <el-table-column header-align="center" align="center" min-width="210px" label="操作">
36 <template slot-scope="scope"> 36 <template slot-scope="scope">
37 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button> 37 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" class="btn-mg">查看</el-button>
38 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改 38 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']" class="btn-mg">修改
39 </el-button> 39 </el-button>
40 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow" 40 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow"
41 >修改密码</el-button 41 >修改密码</el-button
42 > --> 42 > -->
43 <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini" 43 <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
44 - v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ 44 + v-hasPermi="['system:user:openClose']" @click="userStatus(scope)" class="btn-mg">{{
45 scope.row.isValid == 1 ? "停用" : "启用" 45 scope.row.isValid == 1 ? "停用" : "启用"
46 }}</el-button> 46 }}</el-button>
47 - <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户 47 + <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']" class="btn-mg">删除用户
48 </el-button> 48 </el-button>
49 </template> 49 </template>
50 </el-table-column> 50 </el-table-column>
...@@ -253,6 +253,6 @@ export default { ...@@ -253,6 +253,6 @@ export default {
253 }; 253 };
254 </script> 254 </script>
255 255
256 -<style> 256 +<style lang="scss" scoped>
257 257
258 </style> 258 </style>
......