Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
d997e4e1 1 parent d5c665a3

组件参数修正，样式修改，文本域限制长度

Expand all
Inline Side-by-side
Showing 8 changed files with 139 additions and 279 deletions
...@@ -4,6 +4,18 @@ ...@@ -4,6 +4,18 @@
4 */ 4 */
5 5
6 /** 基础通用 **/ 6 /** 基础通用 **/
7 + .wid100 {
8 + width: 100% !important;
9 + }
10 +
11 + .wid90 {
12 + width: 90% !important;
13 + }
14 +
15 + .wid80 {
16 + width: 80% !important;
17 + }
18 +
7 .pt5 { 19 .pt5 {
8 padding-top: 5px; 20 padding-top: 5px;
9 } 21 }
...@@ -103,7 +115,7 @@ ...@@ -103,7 +115,7 @@
103 115
104 .formItem { 116 .formItem {
105 width: 100%; 117 width: 100%;
106 - // max-width: 310px; 118 + // max-width: 300px;
107 } 119 }
108 } 120 }
109 121
......
...@@ -189,3 +189,51 @@ aside { ...@@ -189,3 +189,51 @@ aside {
189 .multiselect--active { 189 .multiselect--active {
190 z-index: 1000 !important; 190 z-index: 1000 !important;
191 } 191 }
192 +
193 +
194 +.el-table__body-wrapper {
195 + &::-webkit-scrollbar {
196 + height: 10px;
197 + width: 10px;
198 + }
199 +
200 + &::-webkit-scrollbar-track {
201 + background-color: #fff;
202 + }
203 +
204 + &::-webkit-scrollbar-thumb {
205 + background-color: #ccc;
206 + }
207 +
208 + &::-webkit-scrollbar-thumb:hover {
209 + background-color: #409eff;
210 + }
211 +}
212 +
213 +// 解决表格固定列问题
214 +.el-table__fixed,
215 +.el-table__fixed-right {
216 + height: calc(100% - 7px) !important;
217 + box-shadow: -5px -2px 10px rgba(0, 0, 0, .12) !important;
218 +
219 + .el-table__fixed-body-wrapper {
220 + height: calc(100% - 36px) !important;
221 + }
222 +}
223 +
224 +// 当表格没有滚动条时
225 +.el-table__body-wrapper.is-scrolling-none~.el-table__fixed-right {
226 + height: 100% !important;
227 + bottom: 0 !important;
228 + box-shadow: none !important;
229 +}
230 +
231 +// 当表格有纵向滚动条时
232 +.el-table--scrollable-y .el-table__fixed-right {
233 + right: 7px !important;
234 +}
235 +
236 +// 当表格只有横向滚动条，没有纵向滚动条时
237 +.el-table--scrollable-x:not(.el-table--scrollable-y) .el-table__fixed-right {
238 + right: 0 !important;
239 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -36,20 +36,6 @@ ...@@ -36,20 +36,6 @@
36 background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange" 36 background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange"
37 @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange"> 37 @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
38 </el-pagination> 38 </el-pagination>
39 - <!-- 表头控制 -->
40 - <div class="tableInfo" v-if="infoShow">
41 - <ul class="tableList" v-show="show">
42 - <el-checkbox-group v-model="checkDisabled">
43 - <li class="flexList" v-for="(item, index) in newHeader" :key="index" :title="item.name">
44 - <div>
45 - <el-checkbox :label="item.name" @change="newHeader[index].disabled = !item.disabled">{{ item.name }}
46 - </el-checkbox>
47 - </div>
48 - </li>
49 - </el-checkbox-group>
50 - </ul>
51 - <el-button type="primary" icon="el-icon-edit" size="medium" circle @click="show = !show"></el-button>
52 - </div>
53 </div> 39 </div>
54 </template> 40 </template>
55 41
...@@ -175,10 +161,6 @@ export default { ...@@ -175,10 +161,6 @@ export default {
175 type: Boolean, 161 type: Boolean,
176 default: false, 162 default: false,
177 }, 163 },
178 - infoShow: {
179 - type: Boolean,
180 - default: true,
181 - },
182 }, 164 },
183 inheritAttrs: false, 165 inheritAttrs: false,
184 data() { 166 data() {
...@@ -346,82 +328,13 @@ export default { ...@@ -346,82 +328,13 @@ export default {
346 "div", 328 "div",
347 { 329 {
348 class: ["thead-cell"], 330 class: ["thead-cell"],
349 - on: {
350 - mousedown: ($event) => {
351 - this.handleMouseDown($event, column);
352 - },
353 - mousemove: ($event) => {
354 - this.handleMouseMove($event, column);
355 - },
356 - },
357 }, 331 },
358 [ 332 [
359 // 添加 <a> 用于显示表头 label 333 // 添加 <a> 用于显示表头 label
360 - createElement("a", column.label), 334 + createElement("div", column.label),
361 - // 添加一个空标签用于显示拖动动画
362 - createElement("span", {
363 - class: ["virtual"],
364 - }),
365 ] 335 ]
366 ); 336 );
367 }, 337 },
368 - // 按下鼠标开始拖动
369 - handleMouseDown(e, column) {
370 - this.dragState.dragging = true;
371 - this.dragState.start = parseInt(column.columnKey);
372 - // 给拖动时的虚拟容器添加宽高
373 - let table = document.getElementsByClassName("w-table")[0];
374 - let virtual = document.getElementsByClassName("virtual");
375 - for (let item of virtual) {
376 - item.style.height = table.clientHeight - 1 + "px";
377 - item.style.width = item.parentElement.parentElement.clientWidth + "px";
378 - }
379 - document.addEventListener("mouseup", this.handleMouseUp);
380 - },
381 - // 鼠标放开结束拖动
382 - handleMouseUp() {
383 - this.dragColumn(this.dragState);
384 - // 初始化拖动状态
385 - this.dragState = {
386 - start: -9,
387 - end: -9,
388 - dragging: false,
389 - direction: undefined,
390 - };
391 - document.removeEventListener("mouseup", this.handleMouseUp);
392 - },
393 - // 拖动中
394 - handleMouseMove(e, column) {
395 - if (this.dragState.dragging) {
396 - let index = parseInt(column.columnKey); // 记录起始列
397 - if (index - this.dragState.start !== 0) {
398 - this.dragState.direction =
399 - index - this.dragState.start < 0 ? "left" : "right"; // 判断拖动方向
400 - this.dragState.end = parseInt(column.columnKey);
401 - } else {
402 - this.dragState.direction = undefined;
403 - }
404 - } else {
405 - return false;
406 - }
407 - },
408 - // 拖动易位
409 - dragColumn({ start, end, direction }) {
410 - let tempData = [];
411 - let left = direction === "left";
412 - let min = left ? end : start - 1;
413 - let max = left ? start + 1 : end;
414 - for (let i = 0; i < this.newHeader.length; i++) {
415 - if (i === end) {
416 - tempData.push(this.newHeader[start]);
417 - } else if (i > min && i < max) {
418 - tempData.push(this.newHeader[left ? i - 1 : i + 1]);
419 - } else {
420 - tempData.push(this.newHeader[i]);
421 - }
422 - }
423 - this.newHeader = tempData;
424 - },
425 headerCellClassName({ column, columnIndex }) { 338 headerCellClassName({ column, columnIndex }) {
426 let active = 339 let active =
427 columnIndex - 1 === this.dragState.end 340 columnIndex - 1 === this.dragState.end
...@@ -467,31 +380,6 @@ export default { ...@@ -467,31 +380,6 @@ export default {
467 380
468 .el-table th { 381 .el-table th {
469 padding: 0; 382 padding: 0;
470 -
471 - .virtual {
472 - position: absolute;
473 - display: block;
474 - width: 0;
475 - height: 0;
476 - top: 0px;
477 - left: 0px;
478 - background: none;
479 - border: none;
480 - }
481 -
482 - &.darg_active_left {
483 - .virtual {
484 - border-left: 2px dotted #666;
485 - z-index: 99;
486 - }
487 - }
488 -
489 - &.darg_active_right {
490 - .virtual {
491 - border-right: 2px dotted #666;
492 - z-index: 99;
493 - }
494 - }
495 } 383 }
496 384
497 .thead-cell { 385 .thead-cell {
......
...@@ -46,8 +46,8 @@ ...@@ -46,8 +46,8 @@
46 </el-col> 46 </el-col>
47 <el-col :span="6"> 47 <el-col :span="6">
48 <el-form-item label="运单号"> 48 <el-form-item label="运单号">
49 - <el-input class="formItem" type="textarea" placeholder="请输入运单号（回车分割）" :rows="1" v-model="formData.waybillNo" 49 + <el-input class="formItem" type="textarea" placeholder="请输入运单号（回车分割）" :rows="1" :maxlength="12000"
50 - clearable></el-input> 50 + v-model="formData.waybillNo" clearable></el-input>
51 </el-form-item> 51 </el-form-item>
52 </el-col> 52 </el-col>
53 <el-col :span="6"> 53 <el-col :span="6">
...@@ -162,9 +162,8 @@ ...@@ -162,9 +162,8 @@
162 </el-form> 162 </el-form>
163 <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :totalCount="totalCount" 163 <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :totalCount="totalCount"
164 :loading="loading" :selection="true" :limitSize="size" :limitStart="formData.limitStart" :page="page" 164 :loading="loading" :selection="true" :limitSize="size" :limitStart="formData.limitStart" :page="page"
165 - :shiftKey="shiftKey" :infoShow="false" :height="tableHeight" :pageSizes="[100]" @sizeChange="sizeChange" 165 + :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[100]" @sizeChange="sizeChange" @tableSelect="tableSelect"
166 - @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange" 166 + @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"></Tables>
167 - @sortChange="sortChange"></Tables>
168 <Dialog :tableData="tableSelection" :dialogVisible="dialogVisible" @dialogBeforeClose="dialogBeforeClose"></Dialog> 167 <Dialog :tableData="tableSelection" :dialogVisible="dialogVisible" @dialogBeforeClose="dialogBeforeClose"></Dialog>
169 </div> 168 </div>
170 </template> 169 </template>
......
1 <template> 1 <template>
2 <div class="cargoPage"> 2 <div class="cargoPage">
3 - <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" 3 + <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="medium"
4 :model="formData"> 4 :model="formData">
5 <el-row type="flex" style="flexWrap: wrap !important"> 5 <el-row type="flex" style="flexWrap: wrap !important">
6 <el-col :span="6"> 6 <el-col :span="6">
...@@ -27,8 +27,8 @@ ...@@ -27,8 +27,8 @@
27 </el-col> 27 </el-col>
28 <el-col :span="6"> 28 <el-col :span="6">
29 <el-form-item label="运单号"> 29 <el-form-item label="运单号">
30 - <el-input type="textarea" v-model="formData.waybillNo" class="formItem" placeholder="请输入运单号（回车间隔）" :rows="1" 30 + <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
31 - clearable></el-input> 31 + placeholder="请输入运单号（回车间隔）" :rows="1" :maxlength="12000" clearable></el-input>
32 </el-form-item> 32 </el-form-item>
33 </el-col> 33 </el-col>
34 <el-col :span="6"> 34 <el-col :span="6">
...@@ -156,8 +156,8 @@ ...@@ -156,8 +156,8 @@
156 </el-form> 156 </el-form>
157 <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :infoData="tableHeader" 157 <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :infoData="tableHeader"
158 :selection="true" :order="true" :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" 158 :selection="true" :order="true" :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize"
159 - :limitStart="limitStart" :page="page" :shiftKey="shiftKey" :infoShow="false" :pageSizes="[100]" 159 + :limitStart="limitStart" :page="page" :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight"
160 - :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" 160 + @sizeChange="sizeChange" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
161 @currentChange="currentChange" @sortChange="sortChange"></Tables> 161 @currentChange="currentChange" @sortChange="sortChange"></Tables>
162 <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" 162 <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
163 :show-close="false" :append-to-body="true"> 163 :show-close="false" :append-to-body="true">
...@@ -1029,7 +1029,7 @@ export default { ...@@ -1029,7 +1029,7 @@ export default {
1029 }; 1029 };
1030 </script> 1030 </script>
1031 1031
1032 -<style scoped> 1032 +<style lang="scss" scoped>
1033 .tips { 1033 .tips {
1034 display: inline-block; 1034 display: inline-block;
1035 color: #606266; 1035 color: #606266;
......
...@@ -4,24 +4,13 @@ ...@@ -4,24 +4,13 @@
4 <el-row :gutter="50"> 4 <el-row :gutter="50">
5 <el-col :span="6"> 5 <el-col :span="6">
6 <el-form-item label="角色名称"> 6 <el-form-item label="角色名称">
7 - <el-input 7 + <el-input v-model="formData.name" placeholder="请输入角色名称" clearable></el-input>
8 - v-model="formData.name"
9 - placeholder="请输入角色名称"
10 - clearable
11 - ></el-input>
12 </el-form-item> 8 </el-form-item>
13 </el-col> 9 </el-col>
14 <el-col :span="6"> 10 <el-col :span="6">
15 <el-form-item label="创建时间"> 11 <el-form-item label="创建时间">
16 - <el-date-picker 12 + <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
17 - v-model="createTime" 13 + end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
18 - type="daterange"
19 - range-separator="至"
20 - start-placeholder="开始日期"
21 - end-placeholder="结束日期"
22 - value-format="yyyy-MM-dd"
23 - clearable
24 - >
25 </el-date-picker> 14 </el-date-picker>
26 </el-form-item> 15 </el-form-item>
27 </el-col> 16 </el-col>
...@@ -36,63 +25,31 @@ ...@@ -36,63 +25,31 @@
36 </el-row> 25 </el-row>
37 </el-form> 26 </el-form>
38 <div style="margin:20px"> 27 <div style="margin:20px">
39 - <el-button 28 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="selectRoleList(0)">搜索
40 - type="primary" 29 + </el-button>
41 - icon="el-icon-search" 30 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']">新增角色
42 - size="mini" 31 + </el-button>
43 - :loading="tableLoading"
44 - @click="selectRoleList(0)"
45 - >搜索</el-button
46 - >
47 - <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']"
48 - >新增角色</el-button
49 - >
50 </div> 32 </div>
51 - <Tables 33 + <Tables ductName="role" :data="data" :headerData="tableHeader" :infoData="tableHeader" :totalCount="total"
52 - ductName="role" 34 + :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
53 - :data="data" 35 + height="600" @sizeChange="sizeChange" @currentChange="currentChange">
54 - :headerData="tableHeader"
55 - :infoData="tableHeader"
56 - :totalCount="total"
57 - :limitSize="formData.size"
58 - :page="formData.page"
59 - :infoShow="false"
60 - :pageSizes="[20,30,40,50]"
61 - :loading="tableLoading"
62 - height="600"
63 - @sizeChange="sizeChange"
64 - @currentChange="currentChange"
65 - >
66 <template slot="optionColumn"> 36 <template slot="optionColumn">
67 <el-table-column header-align="center" align="center" label="操作"> 37 <el-table-column header-align="center" align="center" label="操作">
68 <template slot-scope="scope"> 38 <template slot-scope="scope">
69 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" 39 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
70 - >查看</el-button 40 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改
71 - > 41 + </el-button>
72 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']" 42 + <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
73 - >修改</el-button 43 + v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }}
74 - > 44 + </el-button>
75 - <el-button 45 + <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']">删除角色
76 - :type="scope.row.valid == 1 ? 'warning' : 'primary'" 46 + </el-button>
77 - size="mini"
78 - v-hasPermi="['system:role:openClose']"
79 - @click="roleStatus(scope)"
80 - >{{ scope.row.valid == 1 ? "停用" : "启用" }}</el-button
81 - >
82 - <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']"
83 - >删除角色</el-button
84 - >
85 </template> 47 </template>
86 </el-table-column> 48 </el-table-column>
87 </template> 49 </template>
88 </Tables> 50 </Tables>
89 - <Drawer 51 + <Drawer :drawer="drawer" :drawerTitle="drawerTitle" :roleFormDisabled="roleFormDisabled" :roleData="roleData"
90 - :drawer="drawer" 52 + @handleClose="handleClose"></Drawer>
91 - :drawerTitle="drawerTitle"
92 - :roleFormDisabled="roleFormDisabled"
93 - :roleData="roleData"
94 - @handleClose="handleClose"
95 - ></Drawer>
96 </div> 53 </div>
97 </template> 54 </template>
98 55
...@@ -105,7 +62,7 @@ import { ...@@ -105,7 +62,7 @@ import {
105 updateRoleStatus, 62 updateRoleStatus,
106 } from "@/api/system/user.js"; 63 } from "@/api/system/user.js";
107 export default { 64 export default {
108 - name:"RoleConfig", 65 + name: "RoleConfig",
109 components: { 66 components: {
110 Drawer, 67 Drawer,
111 }, 68 },
...@@ -127,7 +84,7 @@ export default { ...@@ -127,7 +84,7 @@ export default {
127 width: "150px", 84 width: "150px",
128 align: "center", 85 align: "center",
129 sorTable: false, 86 sorTable: false,
130 - disabled:true 87 + disabled: true
131 }, 88 },
132 { 89 {
133 name: "角色状态", 90 name: "角色状态",
...@@ -135,7 +92,7 @@ export default { ...@@ -135,7 +92,7 @@ export default {
135 width: "150px", 92 width: "150px",
136 align: "center", 93 align: "center",
137 sorTable: false, 94 sorTable: false,
138 - disabled:true 95 + disabled: true
139 }, 96 },
140 { 97 {
141 name: "创建人", 98 name: "创建人",
...@@ -143,7 +100,7 @@ export default { ...@@ -143,7 +100,7 @@ export default {
143 width: "150px", 100 width: "150px",
144 align: "center", 101 align: "center",
145 sorTable: false, 102 sorTable: false,
146 - disabled:true 103 + disabled: true
147 }, 104 },
148 { 105 {
149 name: "创建时间", 106 name: "创建时间",
...@@ -151,7 +108,7 @@ export default { ...@@ -151,7 +108,7 @@ export default {
151 width: "150px", 108 width: "150px",
152 align: "center", 109 align: "center",
153 sorTable: false, 110 sorTable: false,
154 - disabled:true 111 + disabled: true
155 }, 112 },
156 { 113 {
157 name: "修改时间", 114 name: "修改时间",
...@@ -159,7 +116,7 @@ export default { ...@@ -159,7 +116,7 @@ export default {
159 width: "150px", 116 width: "150px",
160 align: "center", 117 align: "center",
161 sorTable: false, 118 sorTable: false,
162 - disabled:true 119 + disabled: true
163 }, 120 },
164 { 121 {
165 name: "备注", 122 name: "备注",
...@@ -167,7 +124,7 @@ export default { ...@@ -167,7 +124,7 @@ export default {
167 width: "400px", 124 width: "400px",
168 align: "center", 125 align: "center",
169 sorTable: false, 126 sorTable: false,
170 - disabled:true 127 + disabled: true
171 }, 128 },
172 ], //表头数据 129 ], //表头数据
173 roleData: {}, //角色详情 130 roleData: {}, //角色详情
...@@ -180,20 +137,20 @@ export default { ...@@ -180,20 +137,20 @@ export default {
180 }; 137 };
181 }, 138 },
182 created() { 139 created() {
183 - if(this.$store.state.tagsView.cachedViews.length == 0){ 140 + if (this.$store.state.tagsView.cachedViews.length == 0) {
184 this.selectRoleList(); 141 this.selectRoleList();
185 } 142 }
186 }, 143 },
187 - activated(){ 144 + activated() {
188 this.selectRoleList(); 145 this.selectRoleList();
189 }, 146 },
190 - deactivated(){ 147 + deactivated() {
191 this.data = [] 148 this.data = []
192 }, 149 },
193 methods: { 150 methods: {
194 //角色列表 151 //角色列表
195 selectRoleList(val) { 152 selectRoleList(val) {
196 - if(val == 0){ 153 + if (val == 0) {
197 this.formData.page = 1 154 this.formData.page = 1
198 } 155 }
199 this.tableLoading = true; 156 this.tableLoading = true;
...@@ -328,7 +285,7 @@ export default { ...@@ -328,7 +285,7 @@ export default {
328 } 285 }
329 }); 286 });
330 }) 287 })
331 - .catch(() => {}); 288 + .catch(() => { });
332 } else { 289 } else {
333 this.$message({ 290 this.$message({
334 message: res.msg, 291 message: res.msg,
...@@ -347,7 +304,7 @@ export default { ...@@ -347,7 +304,7 @@ export default {
347 this.formData.page = val.page; 304 this.formData.page = val.page;
348 this.selectRoleList(); 305 this.selectRoleList();
349 }, 306 },
350 - sizeChange(val){ 307 + sizeChange(val) {
351 this.formData.size = val; 308 this.formData.size = val;
352 this.selectRoleList() 309 this.selectRoleList()
353 } 310 }
......
...@@ -4,20 +4,12 @@ ...@@ -4,20 +4,12 @@
4 <el-row :gutter="50"> 4 <el-row :gutter="50">
5 <el-col :span="6"> 5 <el-col :span="6">
6 <el-form-item label="用户姓名"> 6 <el-form-item label="用户姓名">
7 - <el-input 7 + <el-input placeholder="请输入用户名称" v-model="formData.username" clearable></el-input>
8 - placeholder="请输入用户名称"
9 - v-model="formData.username"
10 - clearable
11 - ></el-input>
12 </el-form-item> 8 </el-form-item>
13 </el-col> 9 </el-col>
14 <el-col :span="6"> 10 <el-col :span="6">
15 <el-form-item label="手机号码"> 11 <el-form-item label="手机号码">
16 - <el-input 12 + <el-input placeholder="请输入手机号码" v-model="formData.phone" clearable></el-input>
17 - placeholder="请输入手机号码"
18 - v-model="formData.phone"
19 - clearable
20 - ></el-input>
21 </el-form-item> 13 </el-form-item>
22 </el-col> 14 </el-col>
23 <el-col :span="6"> 15 <el-col :span="6">
...@@ -31,70 +23,34 @@ ...@@ -31,70 +23,34 @@
31 </el-row> 23 </el-row>
32 </el-form> 24 </el-form>
33 <div style="margin:20px"> 25 <div style="margin:20px">
34 - <el-button 26 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="selectUser(0)">搜索
35 - type="primary" 27 + </el-button>
36 - icon="el-icon-search" 28 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']">新增用户
37 - size="mini" 29 + </el-button>
38 - :loading="loading"
39 - @click="selectUser(0)"
40 - >搜索</el-button
41 - >
42 - <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']"
43 - >新增用户</el-button
44 - >
45 </div> 30 </div>
46 - <Tables 31 + <Tables ductName="user" :data="data" :headerData="tableHeader" :limitSize="formData.size" :totalCount="total"
47 - ductName="user" 32 + :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" height="600" @sizeChange="sizeChange"
48 - :data="data" 33 + @currentChange="currentChange">
49 - :headerData="tableHeader"
50 - :limitSize="formData.size"
51 - :totalCount="total"
52 - :loading="loading"
53 - :page="formData.page"
54 - :infoShow="false"
55 - :pageSizes="[20,30,40,50]"
56 - height="600"
57 - @sizeChange="sizeChange"
58 - @currentChange="currentChange"
59 - >
60 <template slot="optionColumn"> 34 <template slot="optionColumn">
61 - <el-table-column 35 + <el-table-column header-align="center" align="center" width="auto" label="操作">
62 - header-align="center"
63 - align="center"
64 - width="auto"
65 - label="操作"
66 - >
67 <template slot-scope="scope"> 36 <template slot-scope="scope">
68 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" 37 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
69 - >查看</el-button 38 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改
70 - > 39 + </el-button>
71 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']"
72 - >修改</el-button
73 - >
74 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow" 40 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow"
75 >修改密码</el-button 41 >修改密码</el-button
76 > --> 42 > -->
77 - <el-button 43 + <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
78 - :type="scope.row.isValid == 1 ? 'warning' : 'primary'" 44 + v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ scope.row.isValid == 1 ? "停用" : "启用"
79 - size="mini" 45 + }}</el-button>
80 - v-hasPermi="['system:user:openClose']" 46 + <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
81 - @click="userStatus(scope)" 47 + </el-button>
82 - >{{ scope.row.isValid == 1 ? "停用" : "启用" }}</el-button
83 - >
84 - <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']"
85 - >删除用户</el-button
86 - >
87 </template> 48 </template>
88 </el-table-column> 49 </el-table-column>
89 </template> 50 </template>
90 </Tables> 51 </Tables>
91 - <Drawer 52 + <Drawer :drawer="drawer" :drawerTitle="drawerTitle" :userFormDisabled="userFormDisabled" :userData="userData"
92 - :drawer="drawer" 53 + @handleClose="handleClose"></Drawer>
93 - :drawerTitle="drawerTitle"
94 - :userFormDisabled="userFormDisabled"
95 - :userData="userData"
96 - @handleClose="handleClose"
97 - ></Drawer>
98 <!-- <el-dialog 54 <!-- <el-dialog
99 title="修改密码" 55 title="修改密码"
100 :visible.sync="passwordShow" 56 :visible.sync="passwordShow"
...@@ -154,7 +110,7 @@ export default { ...@@ -154,7 +110,7 @@ export default {
154 width: "150px", 110 width: "150px",
155 align: "center", 111 align: "center",
156 sorTable: false, 112 sorTable: false,
157 - disabled:true 113 + disabled: true
158 }, 114 },
159 { 115 {
160 name: "用户姓名", 116 name: "用户姓名",
...@@ -162,7 +118,7 @@ export default { ...@@ -162,7 +118,7 @@ export default {
162 width: "150px", 118 width: "150px",
163 align: "center", 119 align: "center",
164 sorTable: false, 120 sorTable: false,
165 - disabled:true 121 + disabled: true
166 }, 122 },
167 { 123 {
168 name: "所属口岸", 124 name: "所属口岸",
...@@ -170,7 +126,7 @@ export default { ...@@ -170,7 +126,7 @@ export default {
170 width: "150px", 126 width: "150px",
171 align: "center", 127 align: "center",
172 sortable: false, 128 sortable: false,
173 - disabled:true 129 + disabled: true
174 }, 130 },
175 { 131 {
176 name: "所属角色", 132 name: "所属角色",
...@@ -178,7 +134,7 @@ export default { ...@@ -178,7 +134,7 @@ export default {
178 width: "150px", 134 width: "150px",
179 align: "center", 135 align: "center",
180 sorTable: false, 136 sorTable: false,
181 - disabled:true 137 + disabled: true
182 }, 138 },
183 { 139 {
184 name: "电子邮箱", 140 name: "电子邮箱",
...@@ -186,7 +142,7 @@ export default { ...@@ -186,7 +142,7 @@ export default {
186 width: "150px", 142 width: "150px",
187 align: "center", 143 align: "center",
188 sorTable: false, 144 sorTable: false,
189 - disabled:true 145 + disabled: true
190 }, 146 },
191 { 147 {
192 name: "用户状态", 148 name: "用户状态",
...@@ -194,7 +150,7 @@ export default { ...@@ -194,7 +150,7 @@ export default {
194 width: "100px", 150 width: "100px",
195 align: "center", 151 align: "center",
196 sorTable: false, 152 sorTable: false,
197 - disabled:true, 153 + disabled: true,
198 }, 154 },
199 { 155 {
200 name: "修改时间", 156 name: "修改时间",
...@@ -202,7 +158,7 @@ export default { ...@@ -202,7 +158,7 @@ export default {
202 width: "150px", 158 width: "150px",
203 align: "center", 159 align: "center",
204 sorTable: false, 160 sorTable: false,
205 - disabled:true 161 + disabled: true
206 }, 162 },
207 { 163 {
208 name: "备注", 164 name: "备注",
...@@ -210,7 +166,7 @@ export default { ...@@ -210,7 +166,7 @@ export default {
210 width: "150px", 166 width: "150px",
211 align: "center", 167 align: "center",
212 sorTable: false, 168 sorTable: false,
213 - disabled:true 169 + disabled: true
214 }, 170 },
215 ], //表头数据 171 ], //表头数据
216 userData: {}, //用户详情 172 userData: {}, //用户详情
...@@ -224,20 +180,20 @@ export default { ...@@ -224,20 +180,20 @@ export default {
224 }; 180 };
225 }, 181 },
226 created() { 182 created() {
227 - if(this.$store.state.tagsView.cachedViews.length == 0){ 183 + if (this.$store.state.tagsView.cachedViews.length == 0) {
228 this.selectUser(); 184 this.selectUser();
229 } 185 }
230 }, 186 },
231 - activated(){ 187 + activated() {
232 this.selectUser(); 188 this.selectUser();
233 }, 189 },
234 - deactivated(){ 190 + deactivated() {
235 this.data = [] 191 this.data = []
236 }, 192 },
237 methods: { 193 methods: {
238 //用户列表 194 //用户列表
239 selectUser(val) { 195 selectUser(val) {
240 - if(val == 0){ 196 + if (val == 0) {
241 this.formData.page = 1 197 this.formData.page = 1
242 } 198 }
243 this.loading = true; 199 this.loading = true;
...@@ -270,7 +226,7 @@ export default { ...@@ -270,7 +226,7 @@ export default {
270 if (res.code === 200) { 226 if (res.code === 200) {
271 this.userData = res.data; 227 this.userData = res.data;
272 this.userData.portName 228 this.userData.portName
273 - ?this.userData.portName=this.userData.portName.split(",") 229 + ? this.userData.portName = this.userData.portName.split(",")
274 : ''; 230 : '';
275 } else { 231 } else {
276 this.$message({ 232 this.$message({
...@@ -376,7 +332,7 @@ export default { ...@@ -376,7 +332,7 @@ export default {
376 this.selectUser(); 332 this.selectUser();
377 }, 333 },
378 334
379 - sizeChange(val){ 335 + sizeChange(val) {
380 this.formData.size = val; 336 this.formData.size = val;
381 this.selectUser() 337 this.selectUser()
382 } 338 }
......