王勇 / dispatch_sys_vue · 提交

转到一个项目

作者 王勇
提交 7d56fff33642651fc4927e5c0f42f7d415b03a98 1 个父辈 1a85a74a

修改列表框，样式

内嵌 并排对比
正在显示 6 个修改的文件 包含 69 行增加 和 68 行删除
@@ -46,27 +46,25 @@ @@ -46,27 +46,25 @@
46 </el-select> 46 </el-select>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 -  
50 - <el-button type="primary" style="margin-left: 50px"  
51 - @click="getDispatchNodeList">查询调度记录  
52 - </el-button>  
53 - <el-button type="success" style="margin-left: 15px" @click="dispatchFormVisible = true">  
54 - 我要调度车辆  
55 - </el-button>  
56 - 49 + <el-button type="primary" style="margin-left: 50px"
  50 + @click="getDispatchNodeList">查询调度记录
  51 + </el-button>
  52 + <el-button type="success" style="margin-left: 15px" @click="dispatchFormVisible = true">
  53 + 我要调度车辆
  54 + </el-button>
57 </el-form-item> 55 </el-form-item>
58 </el-form> 56 </el-form>
59 <el-row style="margin-top: 20px;"> 57 <el-row style="margin-top: 20px;">
60 -  
61 </el-row> 58 </el-row>
62 </div> 59 </div>
63 <!--调度记录列表区域--> 60 <!--调度记录列表区域-->
64 <div style="margin-top: 20px;"> 61 <div style="margin-top: 20px;">
65 - <el-table :data="DispatchNoteList" stripe highlight-current-row v-loading="listLoading" element-loading-text="拼命加载中">  
66 - <el-table-column type="index"></el-table-column>  
67 - <el-table-column label="用户名称" prop="userName" width="100"></el-table-column>  
68 - <el-table-column label="联系方式" prop="userMobile" width="120"></el-table-column>  
69 - <el-table-column label="状态" prop="status" width="120"> 62 + <el-table :data="DispatchNoteList" border stripe highlight-current-row v-loading="listLoading"
  63 + element-loading-text="拼命加载中">
  64 + <el-table-column type="index" align="center"></el-table-column>
  65 + <el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column>
  66 + <el-table-column label="联系方式" prop="userMobile" align="center" width="120"></el-table-column>
  67 + <el-table-column label="状态" prop="status" align="center" width="120">
70 <template slot-scope="scope"> 68 <template slot-scope="scope">
71 <span v-if="scope.row.status ==='1'">完成状态</span> 69 <span v-if="scope.row.status ==='1'">完成状态</span>
72 <span v-if="scope.row.status ==='2'">执行状态</span> 70 <span v-if="scope.row.status ==='2'">执行状态</span>
@@ -74,7 +72,7 @@ @@ -74,7 +72,7 @@
74 <span v-if="scope.row.status ==='4'">待执行状态</span> 72 <span v-if="scope.row.status ==='4'">待执行状态</span>
75 </template> 73 </template>
76 </el-table-column> 74 </el-table-column>
77 - <el-table-column label="业务类型" prop="dispatchType" width="120"> 75 + <el-table-column label="业务类型" prop="dispatchType" align="center" width="120">
78 <template slot-scope="scope"> 76 <template slot-scope="scope">
79 <span v-if="scope.row.dispatchType ==='1'">进站送货</span> 77 <span v-if="scope.row.dispatchType ==='1'">进站送货</span>
80 <span v-if="scope.row.dispatchType ==='2'">出站提货</span> 78 <span v-if="scope.row.dispatchType ==='2'">出站提货</span>
@@ -82,8 +80,9 @@ @@ -82,8 +80,9 @@
82 <span v-if="scope.row.dispatchType ==='4'">货物流转</span> 80 <span v-if="scope.row.dispatchType ==='4'">货物流转</span>
83 </template> 81 </template>
84 </el-table-column> 82 </el-table-column>
85 - <el-table-column label="车牌号码" prop="licensePlateNumber" width="120"></el-table-column>  
86 - <el-table-column label="车辆类型" prop="vehicleType" width="120"> 83 + <el-table-column label="车牌号码" prop="licensePlateNumber" align="center"
  84 + width="120"></el-table-column>
  85 + <el-table-column label="车辆类型" prop="vehicleType" align="center" width="120">
87 <template slot-scope="scope"> 86 <template slot-scope="scope">
88 <span v-if="scope.row.vehicleType ==='1'">重型货车</span> 87 <span v-if="scope.row.vehicleType ==='1'">重型货车</span>
89 <span v-if="scope.row.vehicleType ==='2'">中型货车</span> 88 <span v-if="scope.row.vehicleType ==='2'">中型货车</span>
@@ -93,7 +92,7 @@ @@ -93,7 +92,7 @@
93 <span v-if="scope.row.vehicleType ==='6'">叉车</span> 92 <span v-if="scope.row.vehicleType ==='6'">叉车</span>
94 </template> 93 </template>
95 </el-table-column> 94 </el-table-column>
96 - <el-table-column label="场站位置" prop="station" width="120"> 95 + <el-table-column label="场站位置" prop="station" align="center" width="120">
97 <template slot-scope="scope"> 96 <template slot-scope="scope">
98 <span v-if="scope.row.station ==='1'">西货站</span> 97 <span v-if="scope.row.station ==='1'">西货站</span>
99 <span v-if="scope.row.station ==='2'">综保区</span> 98 <span v-if="scope.row.station ==='2'">综保区</span>
@@ -101,10 +100,10 @@ @@ -101,10 +100,10 @@
101 <span v-if="scope.row.station ==='4'">快邮</span> 100 <span v-if="scope.row.station ==='4'">快邮</span>
102 </template> 101 </template>
103 </el-table-column> 102 </el-table-column>
104 - <el-table-column label="创建时间" prop="gmtCreate" width="160"></el-table-column>  
105 - <el-table-column label="开始时间" prop="beginTime" width="160"></el-table-column>  
106 - <el-table-column label="完成时间" prop="endTime" width="160"></el-table-column>  
107 - <el-table-column label="操作" width="220px" fixed="right"> 103 + <el-table-column label="创建时间" prop="gmtCreate" align="center" width="160"></el-table-column>
  104 + <el-table-column label="开始时间" prop="beginTime" align="center" width="160"></el-table-column>
  105 + <el-table-column label="完成时间" prop="endTime" align="center" width="160"></el-table-column>
  106 + <el-table-column label="操作" width="220px" fixed="right" align="center">
108 <template slot-scope="scope"> 107 <template slot-scope="scope">
109 <!--查看按钮--> 108 <!--查看按钮-->
110 <el-tooltip effect="dark" content="查看" placement="top-start" :enterable="false"> 109 <el-tooltip effect="dark" content="查看" placement="top-start" :enterable="false">
@@ -115,7 +114,7 @@ @@ -115,7 +114,7 @@
115 <!--取消调度按钮--> 114 <!--取消调度按钮-->
116 <el-tooltip effect="dark" content="取消调度" placement="top-start" :enterable="false"> 115 <el-tooltip effect="dark" content="取消调度" placement="top-start" :enterable="false">
117 <el-button type="danger" icon="el-icon-delete" size="mini" 116 <el-button type="danger" icon="el-icon-delete" size="mini"
118 - :disabled="scope.row.endTime" 117 + :disabled="scope.row.endTime!==''&&scope.row.endTime!==null"
119 @click="cancelDispatch(scope.row)" :loading="cancelLoading">取消调度 118 @click="cancelDispatch(scope.row)" :loading="cancelLoading">取消调度
120 </el-button> 119 </el-button>
121 </el-tooltip> 120 </el-tooltip>
@@ -127,9 +126,9 @@ @@ -127,9 +126,9 @@
127 <el-pagination 126 <el-pagination
128 @size-change="handleSizeChange" 127 @size-change="handleSizeChange"
129 @current-change="handleCurrentChange" 128 @current-change="handleCurrentChange"
130 - :current-page="queryInfo.pageNum"  
131 - :page-sizes="[10,20,30,50]"  
132 - :page-size="queryInfo.pageSize" 129 + :current-page="this.queryInfo.pageNum"
  130 + :page-sizes="[3,5,10,20,30,50]"
  131 + :page-size="this.queryInfo.pageSize"
133 layout="total, sizes, prev, pager, next, jumper" 132 layout="total, sizes, prev, pager, next, jumper"
134 :total="total"> 133 :total="total">
135 </el-pagination> 134 </el-pagination>
@@ -541,7 +540,7 @@ @@ -541,7 +540,7 @@
541 * 监听pageSize改变的事件 540 * 监听pageSize改变的事件
542 */ 541 */
543 handleSizeChange(newSize) { 542 handleSizeChange(newSize) {
544 - this.queryInfo.pagesize = newSize; 543 + this.queryInfo.pageSize = newSize;
545 //刷新调度记录列表 544 //刷新调度记录列表
546 this.getDispatchNodeList(); 545 this.getDispatchNodeList();
547 }, 546 },
@@ -549,7 +548,7 @@ @@ -549,7 +548,7 @@
549 * 监听当前页码值改变的事件 548 * 监听当前页码值改变的事件
550 */ 549 */
551 handleCurrentChange(newPage) { 550 handleCurrentChange(newPage) {
552 - this.queryInfo.pagenum = newPage; 551 + this.queryInfo.pageNum = newPage;
553 //刷新调度记录列表 552 //刷新调度记录列表
554 this.getDispatchNodeList(); 553 this.getDispatchNodeList();
555 }, 554 },
@@ -570,7 +569,7 @@ @@ -570,7 +569,7 @@
570 this.listLoading = false; 569 this.listLoading = false;
571 this.$message.error(error.toString()); 570 this.$message.error(error.toString());
572 }); 571 });
573 - if (res.code !== '200'){ 572 + if (res.code !== '200') {
574 this.listLoading = false; 573 this.listLoading = false;
575 return this.$message.error('获取车辆调度列表失败'); 574 return this.$message.error('获取车辆调度列表失败');
576 } 575 }
@@ -61,11 +61,12 @@ @@ -61,11 +61,12 @@
61 </div> 61 </div>
62 <!--调度记录列表区域--> 62 <!--调度记录列表区域-->
63 <div style="margin-top: 20px;"> 63 <div style="margin-top: 20px;">
64 - <el-table :data="DispatchNoteList" stripe v-loading="listLoading" element-loading-text="拼命加载中">  
65 - <el-table-column type="index"></el-table-column>  
66 - <el-table-column label="用户名称" prop="userName" width="100"></el-table-column>  
67 - <el-table-column label="联系方式" prop="userMobile" width="120"></el-table-column>  
68 - <el-table-column label="状态" prop="status" width="120"> 64 + <el-table :data="DispatchNoteList" border stripe v-loading="listLoading"
  65 + element-loading-text="拼命加载中">
  66 + <el-table-column type="index" align="center"></el-table-column>
  67 + <el-table-column label="用户名称" prop="userName" align="center" width="100"></el-table-column>
  68 + <el-table-column label="联系方式" prop="userMobile" align="center" width="120"></el-table-column>
  69 + <el-table-column label="状态" prop="status" align="center" width="120">
69 <template slot-scope="scope"> 70 <template slot-scope="scope">
70 <span v-if="scope.row.status ==='1'">完成状态</span> 71 <span v-if="scope.row.status ==='1'">完成状态</span>
71 <span v-if="scope.row.status ==='2'">执行状态</span> 72 <span v-if="scope.row.status ==='2'">执行状态</span>
@@ -73,7 +74,7 @@ @@ -73,7 +74,7 @@
73 <span v-if="scope.row.status ==='4'">待执行状态</span> 74 <span v-if="scope.row.status ==='4'">待执行状态</span>
74 </template> 75 </template>
75 </el-table-column> 76 </el-table-column>
76 - <el-table-column label="业务类型" prop="dispatchType" width="120"> 77 + <el-table-column label="业务类型" align="center" prop="dispatchType" width="120">
77 <template slot-scope="scope"> 78 <template slot-scope="scope">
78 <span v-if="scope.row.dispatchType ==='1'">进站送货</span> 79 <span v-if="scope.row.dispatchType ==='1'">进站送货</span>
79 <span v-if="scope.row.dispatchType ==='2'">出站提货</span> 80 <span v-if="scope.row.dispatchType ==='2'">出站提货</span>
@@ -81,9 +82,15 @@ @@ -81,9 +82,15 @@
81 <span v-if="scope.row.dispatchType ==='4'">货物流转</span> 82 <span v-if="scope.row.dispatchType ==='4'">货物流转</span>
82 </template> 83 </template>
83 </el-table-column> 84 </el-table-column>
84 - <el-table-column label="创建时间" prop="gmtCreate" width="160"></el-table-column>  
85 - <el-table-column label="车牌号" prop="licensePlateNumber" width="120"></el-table-column>  
86 - <el-table-column label="车辆类型" prop="vehicleType" width="120"> 85 + <el-table-column label="场站位置" align="center" prop="station" width="120">
  86 + <template slot-scope="scope">
  87 + <span v-if="scope.row.station ==='1'">西货站</span>
  88 + <span v-if="scope.row.station ==='2'">综保区</span>
  89 + <span v-if="scope.row.station ==='3'">军投</span>
  90 + <span v-if="scope.row.station ==='4'">快邮</span>
  91 + </template>
  92 + </el-table-column>
  93 + <el-table-column label="车辆类型" align="center" prop="vehicleType" width="120">
87 <template slot-scope="scope"> 94 <template slot-scope="scope">
88 <span v-if="scope.row.vehicleType ==='1'">重型货车</span> 95 <span v-if="scope.row.vehicleType ==='1'">重型货车</span>
89 <span v-if="scope.row.vehicleType ==='2'">中型货车</span> 96 <span v-if="scope.row.vehicleType ==='2'">中型货车</span>
@@ -93,16 +100,11 @@ @@ -93,16 +100,11 @@
93 <span v-if="scope.row.vehicleType ==='6'">叉车</span> 100 <span v-if="scope.row.vehicleType ==='6'">叉车</span>
94 </template> 101 </template>
95 </el-table-column> 102 </el-table-column>
96 - <el-table-column label="场站位置" prop="station" width="120">  
97 - <template slot-scope="scope">  
98 - <span v-if="scope.row.station ==='1'">西货站</span>  
99 - <span v-if="scope.row.station ==='2'">综保区</span>  
100 - <span v-if="scope.row.station ==='3'">军投</span>  
101 - <span v-if="scope.row.station ==='4'">快邮</span>  
102 - </template>  
103 - </el-table-column>  
104 - <el-table-column label="开始时间" prop="beginTime" width="160"></el-table-column>  
105 - <el-table-column label="完成时间" prop="endTime" width="160"></el-table-column> 103 + <el-table-column label="车牌号" prop="licensePlateNumber" align="center"
  104 + width="120"></el-table-column>
  105 + <el-table-column label="创建时间" prop="gmtCreate" align="center" width="160"></el-table-column>
  106 + <el-table-column label="开始时间" prop="beginTime" align="center" width="160"></el-table-column>
  107 + <el-table-column label="完成时间" prop="endTime" align="center" width="160"></el-table-column>
106 <el-table-column label="操作" width="230px" align="center" fixed="right"> 108 <el-table-column label="操作" width="230px" align="center" fixed="right">
107 <template slot-scope="scope"> 109 <template slot-scope="scope">
108 <!--编辑按钮--> 110 <!--编辑按钮-->
@@ -124,8 +126,8 @@ @@ -124,8 +126,8 @@
124 <el-tooltip effect="dark" content="开始任务" placement="top-start" :enterable="false" 126 <el-tooltip effect="dark" content="开始任务" placement="top-start" :enterable="false"
125 style="margin-left: 1px;"> 127 style="margin-left: 1px;">
126 <el-button type="warning" icon="el-icon-star-off" size="mini" 128 <el-button type="warning" icon="el-icon-star-off" size="mini"
127 - style="margin-top: 1px;"  
128 - :disabled="scope.row.beginTime || scope.row.endTime" 129 + style="margin-top: 3px;"
  130 + :disabled="scope.row.beginTime!=='' || scope.row.endTime!==''"
129 :loading="beginLoading" 131 :loading="beginLoading"
130 @click="startDispatch(scope.$index,scope.row)">开始任务 132 @click="startDispatch(scope.$index,scope.row)">开始任务
131 </el-button> 133 </el-button>
@@ -134,7 +136,7 @@ @@ -134,7 +136,7 @@
134 <el-tooltip effect="dark" content="结束任务" placement="top-start" :enterable="false" 136 <el-tooltip effect="dark" content="结束任务" placement="top-start" :enterable="false"
135 style="margin-left: 1px;"> 137 style="margin-left: 1px;">
136 <el-button type="info" icon="el-icon-message" size="mini" 138 <el-button type="info" icon="el-icon-message" size="mini"
137 - :disabled="scope.row.endTime" 139 + :disabled="scope.row.endTime!==''&&scope.row.endTime!==null"
138 :loading="endLoading" 140 :loading="endLoading"
139 @click="completeDispatch(scope.$index,scope.row)">结束任务 141 @click="completeDispatch(scope.$index,scope.row)">结束任务
140 </el-button> 142 </el-button>
@@ -149,7 +151,7 @@ @@ -149,7 +151,7 @@
149 @size-change="handleSizeChange" 151 @size-change="handleSizeChange"
150 @current-change="handleCurrentChange" 152 @current-change="handleCurrentChange"
151 :current-page="queryInfo.pageNum" 153 :current-page="queryInfo.pageNum"
152 - :page-sizes="[10,20,30,50]" 154 + :page-sizes="[10,15,20,50]"
153 :page-size="queryInfo.pageSize" 155 :page-size="queryInfo.pageSize"
154 layout="total, sizes, prev, pager, next, jumper" 156 layout="total, sizes, prev, pager, next, jumper"
155 :total="total"> 157 :total="total">
@@ -728,9 +730,9 @@ @@ -728,9 +730,9 @@
728 /** 730 /**
729 * 管理员端，手动，开始调度任务 731 * 管理员端，手动，开始调度任务
730 */ 732 */
731 - async startDispatch(index,row) { 733 + async startDispatch(index, row) {
732 //开启加载 734 //开启加载
733 - this.beginLoading=true; 735 + this.beginLoading = true;
734 const {data: res} = await startTask(row).catch(error => { 736 const {data: res} = await startTask(row).catch(error => {
735 this.beginLoading = false; 737 this.beginLoading = false;
736 this.$message.error(error.toString()); 738 this.$message.error(error.toString());
@@ -747,7 +749,7 @@ @@ -747,7 +749,7 @@
747 /** 749 /**
748 * 管理员端，手动，完成调度任务 750 * 管理员端，手动，完成调度任务
749 */ 751 */
750 - async completeDispatch(index,row) { 752 + async completeDispatch(index, row) {
751 //开启加载 753 //开启加载
752 this.endLoading = true; 754 this.endLoading = true;
753 const {data: res} = await completeTask(row).catch(error => { 755 const {data: res} = await completeTask(row).catch(error => {
@@ -775,13 +777,13 @@ @@ -775,13 +777,13 @@
775 }, 777 },
776 //监听pageSize改变的事件 778 //监听pageSize改变的事件
777 handleSizeChange(newSize) { 779 handleSizeChange(newSize) {
778 - this.queryInfo.pagesize = newSize; 780 + this.queryInfo.pageSize = newSize;
779 //刷新车辆调度记录列表 781 //刷新车辆调度记录列表
780 this.getDispatchNodeList(); 782 this.getDispatchNodeList();
781 }, 783 },
782 //监听当前页码值改变的事件 784 //监听当前页码值改变的事件
783 handleCurrentChange(newPage) { 785 handleCurrentChange(newPage) {
784 - this.queryInfo.pagenum = newPage; 786 + this.queryInfo.pageNum = newPage;
785 //刷新车辆调度记录列表 787 //刷新车辆调度记录列表
786 this.getDispatchNodeList(); 788 this.getDispatchNodeList();
787 }, 789 },
@@ -90,7 +90,7 @@ @@ -90,7 +90,7 @@
90 @size-change="handleSizeChange" 90 @size-change="handleSizeChange"
91 @current-change="handleCurrentChange" 91 @current-change="handleCurrentChange"
92 :current-page="queryInfo.pageNum" 92 :current-page="queryInfo.pageNum"
93 - :page-sizes="[10,20,30,50]" 93 + :page-sizes="[1,2,10,20,30,50]"
94 :page-size="queryInfo.pageSize" 94 :page-size="queryInfo.pageSize"
95 layout="total, sizes, prev, pager, next, jumper" 95 layout="total, sizes, prev, pager, next, jumper"
96 :total="total"> 96 :total="total">
@@ -541,7 +541,7 @@ @@ -541,7 +541,7 @@
541 * 监听pageSize改变的事件 541 * 监听pageSize改变的事件
542 */ 542 */
543 handleSizeChange(newSize) { 543 handleSizeChange(newSize) {
544 - this.queryInfo.pagesize = newSize; 544 + this.queryInfo.pageSize = newSize;
545 //刷新驾驶员信息列表 545 //刷新驾驶员信息列表
546 this.getDriverInfoList(); 546 this.getDriverInfoList();
547 }, 547 },
@@ -549,7 +549,7 @@ @@ -549,7 +549,7 @@
549 * 监听当前页码值改变的事件 549 * 监听当前页码值改变的事件
550 */ 550 */
551 handleCurrentChange(newPage) { 551 handleCurrentChange(newPage) {
552 - this.queryInfo.pagenum = newPage; 552 + this.queryInfo.pageNum = newPage;
553 //刷新驾驶员信息列表 553 //刷新驾驶员信息列表
554 this.getDriverInfoList(); 554 this.getDriverInfoList();
555 }, 555 },
@@ -105,7 +105,7 @@ @@ -105,7 +105,7 @@
105 @size-change="handleSizeChange" 105 @size-change="handleSizeChange"
106 @current-change="handleCurrentChange" 106 @current-change="handleCurrentChange"
107 :current-page="queryInfo.pageNum" 107 :current-page="queryInfo.pageNum"
108 - :page-sizes="[10,20,30,50]" 108 + :page-sizes="[3,6,10,20,30,50]"
109 :page-size="queryInfo.pageSize" 109 :page-size="queryInfo.pageSize"
110 layout="total, sizes, prev, pager, next, jumper" 110 layout="total, sizes, prev, pager, next, jumper"
111 :total="total"> 111 :total="total">
@@ -575,7 +575,7 @@ @@ -575,7 +575,7 @@
575 * 监听pageSize改变的事件 575 * 监听pageSize改变的事件
576 */ 576 */
577 handleSizeChange(newSize) { 577 handleSizeChange(newSize) {
578 - this.queryInfo.pagesize = newSize; 578 + this.queryInfo.pageSize = newSize;
579 //刷新车辆信息列表 579 //刷新车辆信息列表
580 this.getVehicleInfoList(); 580 this.getVehicleInfoList();
581 581
@@ -584,7 +584,7 @@ @@ -584,7 +584,7 @@
584 * 监听当前页码值改变的事件 584 * 监听当前页码值改变的事件
585 */ 585 */
586 handleCurrentChange(newPage) { 586 handleCurrentChange(newPage) {
587 - this.queryInfo.pagenum = newPage; 587 + this.queryInfo.pageNum = newPage;
588 //刷新车辆信息列表 588 //刷新车辆信息列表
589 this.getVehicleInfoList(); 589 this.getVehicleInfoList();
590 }, 590 },
@@ -41,11 +41,11 @@ @@ -41,11 +41,11 @@
41 </el-table-column> 41 </el-table-column>
42 <el-table-column prop="mqcode" label="海关通道编号" min-width="150" > 42 <el-table-column prop="mqcode" label="海关通道编号" min-width="150" >
43 </el-table-column> 43 </el-table-column>
44 - <el-table-column label="操作" min-width="260"> 44 + <el-table-column label="操作" min-width="230" fixed="right" align="center">
45 <template slot-scope="scope"> 45 <template slot-scope="scope">
46 - <el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button> 46 + <el-button type="primary" size="small" @click="handleAdd(scope.$index, scope.row)">新增下级</el-button>
47 <el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button> 47 <el-button size="small" @click="setPerm(scope.$index, scope.row)">设置权限</el-button>
48 - <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 48 + <el-button style="margin-top: 5px;" size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
49 <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button> 49 <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button>
50 </template> 50 </template>
51 </el-table-column> 51 </el-table-column>
@@ -563,4 +563,4 @@ @@ -563,4 +563,4 @@
563 563
564 <style scoped> 564 <style scoped>
565 565
566 -</style>  
  566 +</style>
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 </el-table-column> 45 </el-table-column>
46 <el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable> 46 <el-table-column prop="state" label="启用" width="100" :formatter="formatState" sortable>
47 </el-table-column> 47 </el-table-column>
48 - <el-table-column label="操作" width="250"> 48 + <el-table-column label="操作" width="250" fixed="right" align="center">
49 <template slot-scope="scope"> 49 <template slot-scope="scope">
50 <el-button size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button> 50 <el-button size="small" @click="roleEdit(scope.$index, scope.row)">角色配置</el-button>
51 <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button> 51 <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>