Fedex / imac-vue

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

文本修正，文本域高度限制，代码格式整理

Expand all
Inline Side-by-side
Showing 9 changed files with 142 additions and 386 deletions
...@@ -4,166 +4,70 @@ ...@@ -4,166 +4,70 @@
4 <el-row> 4 <el-row>
5 <el-col :span="6"> 5 <el-col :span="6">
6 <el-form-item label="航班日期从" prop="fltDateStart"> 6 <el-form-item label="航班日期从" prop="fltDateStart">
7 - <el-date-picker 7 + <el-date-picker value-format="yyyy-MM-dd" class="formItem" v-model="queryParams.fltDateStart" type="date"
8 - value-format="yyyy-MM-dd" 8 + placeholder="选择日期">
9 - class="formItem"
10 - v-model="queryParams.fltDateStart"
11 - type="date"
12 - placeholder="选择日期"
13 - >
14 </el-date-picker> 9 </el-date-picker>
15 </el-form-item> 10 </el-form-item>
16 </el-col> 11 </el-col>
17 <el-col :span="6"> 12 <el-col :span="6">
18 <el-form-item label="到" prop="fltDateEnd"> 13 <el-form-item label="到" prop="fltDateEnd">
19 - <el-date-picker 14 + <el-date-picker value-format="yyyy-MM-dd" class="formItem" v-model="queryParams.fltDateEnd" type="date"
20 - value-format="yyyy-MM-dd" 15 + placeholder="选择日期">
21 - class="formItem"
22 - v-model="queryParams.fltDateEnd"
23 - type="date"
24 - placeholder="选择日期"
25 - >
26 </el-date-picker> 16 </el-date-picker>
27 </el-form-item> 17 </el-form-item>
28 </el-col> 18 </el-col>
29 <el-col :span="6"> 19 <el-col :span="6">
30 <el-form-item label="航班号"> 20 <el-form-item label="航班号">
31 - <el-input 21 + <el-input type="textarea" v-model="fltNo" clearable class="formItem" placeholder="AC001;AC002" :rows="1">
32 - type="textarea"
33 - v-model="fltNo"
34 - clearable
35 - class="formItem"
36 - placeholder="AC001;AC002"
37 - rows="1"
38 - >
39 </el-input> 22 </el-input>
40 </el-form-item> 23 </el-form-item>
41 </el-col> 24 </el-col>
42 <el-col :span="6"> 25 <el-col :span="6">
43 <el-form-item label="运单号"> 26 <el-form-item label="运单号">
44 - <el-input 27 + <el-input clearable type="textarea" v-model="queryParams.waybillNo" class="formItem"
45 - clearable 28 + placeholder="请输入运单号（回车间隔）" :rows="1"></el-input>
46 - type="textarea"
47 - v-model="queryParams.waybillNo"
48 - class="formItem"
49 - placeholder="请输入运单号（回车间隔）"
50 - rows="1"
51 - ></el-input>
52 </el-form-item> 29 </el-form-item>
53 </el-col> 30 </el-col>
31 + </el-row>
32 + <el-row>
54 <el-col :span="6"> 33 <el-col :span="6">
55 <el-form-item label="站点"> 34 <el-form-item label="站点">
56 - <el-input 35 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" clearable :rows="1">
57 - type="textarea"
58 - v-model="siteName"
59 - class="formItem"
60 - placeholder="PVG;PEK"
61 - clearable
62 - rows="1"
63 - >
64 </el-input> 36 </el-input>
65 </el-form-item> 37 </el-form-item>
66 </el-col> 38 </el-col>
67 <el-col :span="6"> 39 <el-col :span="6">
68 <el-form-item label="URSA"> 40 <el-form-item label="URSA">
69 - <el-input 41 + <el-input clearable type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1">
70 - clearable
71 - type="textarea"
72 - v-model="ursa"
73 - class="formItem"
74 - placeholder="S_;P_;E2"
75 - rows="1"
76 - >
77 </el-input> 42 </el-input>
78 </el-form-item> 43 </el-form-item>
79 </el-col> 44 </el-col>
80 - <el-col :span="24">
81 - <el-switch
82 - v-model="queryParams.reExport"
83 - active-color="#13ce66"
84 - active-text="重新导出"
85 - style="padding-left: 35px"
86 - >
87 - </el-switch>
88 - </el-col>
89 </el-row> 45 </el-row>
46 + <el-switch v-model="queryParams.reExport" active-color="#13ce66" active-text="重新导出" style="padding-left: 35px">
47 + </el-switch>
90 <div style="margin-top:25px"> 48 <div style="margin-top:25px">
91 - <el-button 49 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
92 - type="primary" 50 + <el-button type="warning" :disabled="tableData.length == 0" v-hasPermi="['base:caExport:export']"
93 - icon="el-icon-search" 51 + @click="xlse()" :loading="downLoadingTip.downloading" icon="el-icon-download" size="mini">{{
94 - size="mini" 52 + downLoadingTip.downloading ? downLoadingTip.tip : "导出"
95 - @click="handleQuery" 53 + }}</el-button>
96 - >搜索</el-button
97 - >
98 - <el-button
99 - type="warning"
100 - :disabled="tableData.length == 0"
101 - @click="xlse()"
102 - :loading="downLoadingTip.downloading"
103 - icon="el-icon-download"
104 - size="mini"
105 - v-hasPermi="['base:caExport:export']"
106 - >{{
107 - downLoadingTip.downloading ? downLoadingTip.tip : "导出"
108 - }}</el-button
109 - >
110 </div> 54 </div>
111 </el-form> 55 </el-form>
112 56
113 - <el-table 57 + <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData">
114 - max-height="500" 58 + <el-table-column label="运单号" align="center" prop="waybillNo" />
115 - highlight-current-row 59 + <el-table-column :show-overflow-tooltip="true" label="品牌描述" align="center" prop="nameDescription" />
116 - border 60 + <el-table-column label="航班日期" align="center" prop="fltDate" />
117 - stripe 61 + <el-table-column label="航班号" align="center" prop="fltNo" width="100" />
118 - v-loading="loading" 62 + <el-table-column label="航班路线" align="center" prop="route" />
119 - :data="tableData" 63 + <el-table-column label="配置航班类型" align="center" prop="kindName" width="130" />
120 - > 64 + <el-table-column label="尺寸" align="center" prop="sizeStr" width="70" />
121 - <el-table-column 65 + <el-table-column label="件数" align="center" prop="qty" width="70" />
122 - label="运单号" 66 + <el-table-column label="实际重量" align="center" prop="actualWeight" width="100" />
123 - align="center" 67 + <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
124 - prop="waybillNo"
125 - />
126 - <el-table-column
127 - :show-overflow-tooltip="true"
128 - label="品牌描述"
129 - align="center"
130 - prop="nameDescription"
131 - />
132 - <el-table-column
133 - label="航班日期"
134 - align="center"
135 - prop="fltDate"
136 - />
137 - <el-table-column label="航班号" align="center" prop="fltNo" width="100"/>
138 - <el-table-column
139 - label="航班路线"
140 - align="center"
141 - prop="route"
142 - />
143 - <el-table-column
144 - label="配置航班类型"
145 - align="center"
146 - prop="kindName"
147 - width="130"
148 - />
149 - <el-table-column label="尺寸" align="center" prop="sizeStr" width="70"/>
150 - <el-table-column label="件数" align="center" prop="qty" width="70"/>
151 - <el-table-column label="实际重量" align="center" prop="actualWeight" width="100"/>
152 - <el-table-column
153 - label="创建时间"
154 - align="center"
155 - prop="createTime"
156 - width="180"
157 - />
158 </el-table> 68 </el-table>
159 - <pagination 69 + <pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
160 - v-show="total > 0" 70 + :page.sync="queryParams.pageNum" :limit.sync="queryParams.limitSize" @pagination="findAllFltData" />
161 - :total="total"
162 - layout=" prev, pager, next, jumper, sizes,total"
163 - :page.sync="queryParams.pageNum"
164 - :limit.sync="queryParams.limitSize"
165 - @pagination="findAllFltData"
166 - />
167 </div> 71 </div>
168 </template> 72 </template>
169 73
...@@ -222,8 +126,9 @@ export default { ...@@ -222,8 +126,9 @@ export default {
222 ); 126 );
223 cargoXlse.cargoExportPreQueryDto.limitStart = 0; 127 cargoXlse.cargoExportPreQueryDto.limitStart = 0;
224 cargoXlse.cargoExportPreQueryDto.limitSize = -1; 128 cargoXlse.cargoExportPreQueryDto.limitSize = -1;
225 - downLoadXlsx("/cargo/excelPre", cargoXlse,'航班预审表') 129 + downLoadXlsx("/cargo/excelPre", cargoXlse, '航班预审表')
226 .then(() => { 130 .then(() => {
131 +
227 this.downLoadingTip.downloading = false; 132 this.downLoadingTip.downloading = false;
228 this.downLoadingTip.tip = ""; 133 this.downLoadingTip.tip = "";
229 this.progress = 100; 134 this.progress = 100;
...@@ -233,7 +138,6 @@ export default { ...@@ -233,7 +138,6 @@ export default {
233 this.downLoadingTip.tip = ""; 138 this.downLoadingTip.tip = "";
234 }); 139 });
235 }, 140 },
236 -
237 /** 搜索按钮操作 */ 141 /** 搜索按钮操作 */
238 handleQuery() { 142 handleQuery() {
239 this.queryParams.pageNum = 1; 143 this.queryParams.pageNum = 1;
...@@ -254,11 +158,11 @@ export default { ...@@ -254,11 +158,11 @@ export default {
254 this.tableData = response.data.list; 158 this.tableData = response.data.list;
255 this.total = response.data.totalCount; 159 this.total = response.data.totalCount;
256 this.loading = false; 160 this.loading = false;
257 - if(response.data.list.length == 0){ 161 + if (response.data.list.length == 0) {
258 this.$message({ 162 this.$message({
259 - message: "未查询到数据", 163 + message: "未查询到数据",
260 - type: "warning", 164 + type: "warning",
261 - }); 165 + });
262 } 166 }
263 } else { 167 } else {
264 this.msgError(response.msg); 168 this.msgError(response.msg);
......
...@@ -84,8 +84,8 @@ ...@@ -84,8 +84,8 @@
84 <el-row> 84 <el-row>
85 <el-col :span="12"> 85 <el-col :span="12">
86 <el-form-item label="航班号" prop="fltNo"> 86 <el-form-item label="航班号" prop="fltNo">
87 - <el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" style="width: 93%" v-model="form.fltNo" 87 + <el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" v-model="form.fltNo" placeholder="请输入航班号"
88 - placeholder="请输入航班号" maxlength="10" /> 88 + maxlength="10" />
89 </el-form-item> 89 </el-form-item>
90 </el-col> 90 </el-col>
91 <el-col :span="12"> 91 <el-col :span="12">
...@@ -95,9 +95,12 @@ ...@@ -95,9 +95,12 @@
95 </el-date-picker> 95 </el-date-picker>
96 </el-form-item> 96 </el-form-item>
97 </el-col> 97 </el-col>
98 + </el-row>
99 + <el-row>
98 <el-col :span="12"> 100 <el-col :span="12">
99 - <el-form-item label="cutOff时间" prop="cutOffTime"> 101 + <el-form-item label="CutOff时间" prop="cutOffTime">
100 - <el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string"> 102 + <el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string" filterable allow-create
103 + default-first-option>
101 <el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item"> 104 <el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
102 </el-option> 105 </el-option>
103 </el-select> 106 </el-select>
...@@ -108,6 +111,8 @@ ...@@ -108,6 +111,8 @@
108 <el-input style="width: 93%" v-model="form.route" placeholder="请输入航班路线" /> 111 <el-input style="width: 93%" v-model="form.route" placeholder="请输入航班路线" />
109 </el-form-item> 112 </el-form-item>
110 </el-col> 113 </el-col>
114 + </el-row>
115 + <el-row>
111 <el-col :span="12"> 116 <el-col :span="12">
112 <el-form-item label="航班种类" prop="kindId"> 117 <el-form-item label="航班种类" prop="kindId">
113 <el-select v-model="form.kindId" placeholder="请选择航班种类"> 118 <el-select v-model="form.kindId" placeholder="请选择航班种类">
...@@ -126,6 +131,8 @@ ...@@ -126,6 +131,8 @@
126 </el-select> 131 </el-select>
127 </el-form-item> 132 </el-form-item>
128 </el-col> 133 </el-col>
134 + </el-row>
135 + <el-row>
129 <el-col :span="12"> 136 <el-col :span="12">
130 <el-form-item label="航班状态" prop="statusId"> 137 <el-form-item label="航班状态" prop="statusId">
131 <el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态"> 138 <el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
...@@ -141,6 +148,8 @@ ...@@ -141,6 +148,8 @@
141 v-model="form.originalWeight"></el-input-number> 148 v-model="form.originalWeight"></el-input-number>
142 </el-form-item> 149 </el-form-item>
143 </el-col> 150 </el-col>
151 + </el-row>
152 + <el-row>
144 <el-col :span="12"> 153 <el-col :span="12">
145 <el-form-item label="额外增重百分比" prop="extraWeightPercent"> 154 <el-form-item label="额外增重百分比" prop="extraWeightPercent">
146 <el-input-number @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比" style="width: 93%" 155 <el-input-number @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比" style="width: 93%"
...@@ -154,6 +163,8 @@ ...@@ -154,6 +163,8 @@
154 </el-switch> 163 </el-switch>
155 </el-form-item> 164 </el-form-item>
156 </el-col> 165 </el-col>
166 + </el-row>
167 + <el-row>
157 <el-col :span="12"> 168 <el-col :span="12">
158 <el-form-item label="是否预审" prop="isNeedRequired"> 169 <el-form-item label="是否预审" prop="isNeedRequired">
159 <el-switch :disabled="true" v-model="form.isNeedRequired" :active-value="1" :inactive-value="0" 170 <el-switch :disabled="true" v-model="form.isNeedRequired" :active-value="1" :inactive-value="0"
...@@ -167,6 +178,8 @@ ...@@ -167,6 +178,8 @@
167 style="width: 93%" v-model="form.highPriceWeightPercent"></el-input-number> 178 style="width: 93%" v-model="form.highPriceWeightPercent"></el-input-number>
168 </el-form-item> 179 </el-form-item>
169 </el-col> 180 </el-col>
181 + </el-row>
182 + <el-row>
170 <el-col :span="12"> 183 <el-col :span="12">
171 <el-form-item label="低价百分比" prop="lowPriceWeightPercent"> 184 <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
172 <el-input-number :disabled="true" placeholder="请输入低价百分比" style="width: 93%" 185 <el-input-number :disabled="true" placeholder="请输入低价百分比" style="width: 93%"
...@@ -179,6 +192,8 @@ ...@@ -179,6 +192,8 @@
179 v-model="form.highAvailableWeight" :precision="2"></el-input-number> 192 v-model="form.highAvailableWeight" :precision="2"></el-input-number>
180 </el-form-item> 193 </el-form-item>
181 </el-col> 194 </el-col>
195 + </el-row>
196 + <el-row>
182 <el-col :span="12"> 197 <el-col :span="12">
183 <el-form-item label="低价可配重量" prop="lowAvailableWeight"> 198 <el-form-item label="低价可配重量" prop="lowAvailableWeight">
184 <el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width: 93%" 199 <el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width: 93%"
...@@ -191,6 +206,8 @@ ...@@ -191,6 +206,8 @@
191 v-model="form.highAllocatedWeight" :precision="2"></el-input-number> 206 v-model="form.highAllocatedWeight" :precision="2"></el-input-number>
192 </el-form-item> 207 </el-form-item>
193 </el-col> 208 </el-col>
209 + </el-row>
210 + <el-row>
194 <el-col :span="12"> 211 <el-col :span="12">
195 <el-form-item label="低价已配重量" prop="lowAllocatedWeight"> 212 <el-form-item label="低价已配重量" prop="lowAllocatedWeight">
196 <el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width: 93%" 213 <el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width: 93%"
...@@ -304,7 +321,7 @@ export default { ...@@ -304,7 +321,7 @@ export default {
304 disabled: true, 321 disabled: true,
305 }, 322 },
306 { 323 {
307 - name: "cutOff时间", 324 + name: "CutOff时间",
308 value: "cutOffTime", 325 value: "cutOffTime",
309 width: "110", 326 width: "110",
310 align: "center", 327 align: "center",
......
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
12 </el-col> 12 </el-col>
13 <el-col :span="6"> 13 <el-col :span="6">
14 <el-form-item label="配载航班号"> 14 <el-form-item label="配载航班号">
15 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true" 15 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
16 clearable></el-input> 16 clearable></el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
...@@ -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="请输入运单号（回车间隔）" 30 + <el-input type="textarea" v-model="formData.waybillNo" class="formItem" placeholder="请输入运单号（回车间隔）" :rows="1"
31 - :autosize="true" clearable></el-input> 31 + 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">
...@@ -51,14 +51,14 @@ ...@@ -51,14 +51,14 @@
51 </el-col> 51 </el-col>
52 <el-col :span="6"> 52 <el-col :span="6">
53 <el-form-item label="URSA"> 53 <el-form-item label="URSA">
54 - <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :autosize="true" clearable> 54 + <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
55 </el-input> 55 </el-input>
56 </el-form-item> 56 </el-form-item>
57 </el-col> 57 </el-col>
58 <el-col :span="6"> 58 <el-col :span="6">
59 <el-form-item label="站点"> 59 <el-form-item label="站点">
60 - <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :autosize="true" 60 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
61 - clearable></el-input> 61 + </el-input>
62 </el-form-item> 62 </el-form-item>
63 </el-col> 63 </el-col>
64 <el-col v-show="formShow"> 64 <el-col v-show="formShow">
......
...@@ -8,78 +8,34 @@ ...@@ -8,78 +8,34 @@
8 >新增菜单</el-button 8 >新增菜单</el-button
9 > 9 >
10 </div> --> 10 </div> -->
11 - <el-table 11 + <el-table :data="data" row-key="id" fit border stripe highlightCurrentRow v-loading="loading" default-expand-all
12 - :data="data" 12 + :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
13 - row-key="id"
14 - fit
15 - border
16 - stripe
17 - highlightCurrentRow
18 - v-loading="loading"
19 - default-expand-all
20 - :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
21 - >
22 <template v-for="(item, index) in tableHeader"> 13 <template v-for="(item, index) in tableHeader">
23 - <el-table-column 14 + <el-table-column v-if="item.value === 'menuType'" :prop="item.value" :label="item.name" :key="index"
24 - v-if="item.value === 'menuType'" 15 + :align="item.align" header-align="center" :width="item.width" :formatter="formatter">
25 - :prop="item.value"
26 - :label="item.name"
27 - :key="index"
28 - :align="item.align"
29 - header-align="center"
30 - showOverflowTooltip
31 - :width="item.width"
32 - :formatter="formatter"
33 - >
34 <template slot-scope="scope"> 16 <template slot-scope="scope">
35 - <el-tag 17 + <el-tag :type="scope.row.menuType === 'B' ? '' : 'success'" disable-transitions>{{ scope.row.menuType ===
36 - :type="scope.row.menuType === 'B' ? '' : 'success'" 18 + "B" ? "按钮" : "菜单"
37 - disable-transitions 19 + }}</el-tag>
38 - >{{ scope.row.menuType === "B" ? "按钮" : "菜单" }}</el-tag
39 - >
40 </template> 20 </template>
41 </el-table-column> 21 </el-table-column>
42 - <el-table-column 22 + <el-table-column v-else :prop="item.value" :label="item.name" :key="index" :align="item.align"
43 - v-else 23 + header-align="center" :width="item.width" :formatter="formatter">
44 - :prop="item.value"
45 - :label="item.name"
46 - :key="index"
47 - :align="item.align"
48 - header-align="center"
49 - showOverflowTooltip
50 - :width="item.width"
51 - :formatter="formatter"
52 - >
53 </el-table-column> 24 </el-table-column>
54 </template> 25 </template>
55 26
56 - <el-table-column 27 + <el-table-column header-align="center" align="center" label="操作" width="auto">
57 - header-align="center"
58 - align="center"
59 - label="操作"
60 - width="auto"
61 - >
62 <template slot-scope="scope"> 28 <template slot-scope="scope">
63 <!-- <el-button type="success" size="mini" @click="buttonClick(scope)">修改</el-button> 29 <!-- <el-button type="success" size="mini" @click="buttonClick(scope)">修改</el-button>
64 <el-button type="primary" size="mini" @click="buttonClick(scope)" 30 <el-button type="primary" size="mini" @click="buttonClick(scope)"
65 >查看</el-button 31 >查看</el-button
66 > --> 32 > -->
67 - <el-button 33 + <el-button :type="scope.row.status == 1 ? 'warning' : 'primary'" v-hasPermi="['system:menu:openClose']"
68 - :type="scope.row.status == 1 ? 'warning' : 'primary'" 34 + size="mini" @click="menuStatus(scope)" v-if="scope.row.menuType == 'C'">{{ scope.row.status == 1 ? "停用菜单" :
69 - v-hasPermi="['system:menu:openClose']" 35 + "启用菜单"
70 - size="mini" 36 + }}</el-button>
71 - @click="menuStatus(scope)" 37 + <el-button type="danger" size="mini" v-hasPermi="['system:menu:delete']" @click="removeMenu(scope)"
72 - v-if="scope.row.menuType == 'C'" 38 + v-if="scope.row.menuType == 'C'">删除菜单</el-button>
73 - >{{ scope.row.status == 1 ? "停用菜单" : "启用菜单" }}</el-button
74 - >
75 - <el-button
76 - type="danger"
77 - size="mini"
78 - v-hasPermi="['system:menu:delete']"
79 - @click="removeMenu(scope)"
80 - v-if="scope.row.menuType == 'C'"
81 - >删除菜单</el-button
82 - >
83 </template> 39 </template>
84 </el-table-column> 40 </el-table-column>
85 </el-table> 41 </el-table>
...@@ -144,7 +100,7 @@ export default { ...@@ -144,7 +100,7 @@ export default {
144 { 100 {
145 name: "菜单名", 101 name: "菜单名",
146 value: "title", 102 value: "title",
147 - width: "200", 103 + width: "",
148 align: "left", 104 align: "left",
149 sorTable: false, 105 sorTable: false,
150 }, 106 },
...@@ -220,9 +176,9 @@ export default { ...@@ -220,9 +176,9 @@ export default {
220 res.data.length > 0 176 res.data.length > 0
221 ? (this.data = res.data) 177 ? (this.data = res.data)
222 : this.$message({ 178 : this.$message({
223 - message: "数据为空", 179 + message: "数据为空",
224 - type: "warning", 180 + type: "warning",
225 - }); 181 + });
226 } else { 182 } else {
227 this.$message({ 183 this.$message({
228 message: res.msg, 184 message: res.msg,
...@@ -275,7 +231,7 @@ export default { ...@@ -275,7 +231,7 @@ export default {
275 data.status = row.row.status == 1 ? "2" : "1"; 231 data.status = row.row.status == 1 ? "2" : "1";
276 this.statusUpdate(data); 232 this.statusUpdate(data);
277 }) 233 })
278 - .catch(() => {}); 234 + .catch(() => { });
279 }, 235 },
280 236
281 //菜单删除 237 //菜单删除
...@@ -291,7 +247,7 @@ export default { ...@@ -291,7 +247,7 @@ export default {
291 data.status = "0"; 247 data.status = "0";
292 this.statusUpdate(data); 248 this.statusUpdate(data);
293 }) 249 })
294 - .catch(() => {}); 250 + .catch(() => { });
295 }, 251 },
296 252
297 formatter(row, column, cellValue, index) { 253 formatter(row, column, cellValue, index) {
......
1 <template> 1 <template>
2 <div class="roleDrawer"> 2 <div class="roleDrawer">
3 - <el-drawer 3 + <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" destroy-on-close
4 - :title="drawerTitle" 4 + :close-on-click-modal="false" :wrapperClosable="false" :show-close="false">
5 - :visible.sync="drawer" 5 + <el-form ref="roleForm" :model="roleForm" label-width="auto" :rules="rules" size="mini" style="margin: 10px">
6 - direction="rtl"
7 - size="40%"
8 - destroy-on-close
9 - :close-on-click-modal="false"
10 - :wrapperClosable="false"
11 - :show-close="false"
12 - >
13 - <el-form
14 - ref="roleForm"
15 - :model="roleForm"
16 - label-width="auto"
17 - :rules="rules"
18 - size="mini"
19 - style="margin: 10px"
20 - >
21 <el-row :gutter="10"> 6 <el-row :gutter="10">
22 <el-col :span="12"> 7 <el-col :span="12">
23 <el-form-item label="角色名:" prop="name"> 8 <el-form-item label="角色名:" prop="name">
24 - <el-input 9 + <el-input placeholder="请输入角色名" v-model.trim="roleForm.name" :disabled="roleFormDisabled"
25 - placeholder="请输入角色名" 10 + v-if="!roleFormDisabled" clearable></el-input>
26 - v-model.trim="roleForm.name"
27 - :disabled="roleFormDisabled"
28 - v-if="!roleFormDisabled"
29 - clearable
30 - ></el-input>
31 <div v-else>{{ roleData.name }}</div> 11 <div v-else>{{ roleData.name }}</div>
32 </el-form-item> 12 </el-form-item>
33 </el-col> 13 </el-col>
34 <el-col :span="24"> 14 <el-col :span="24">
35 <el-form-item label="角色描述:" prop="remark"> 15 <el-form-item label="角色描述:" prop="remark">
36 - <el-input 16 + <el-input v-model="roleForm.remark" type="textarea" placeholder="请输入角色描述" :disabled="roleFormDisabled"
37 - v-model="roleForm.remark" 17 + v-if="!roleFormDisabled" clearable></el-input>
38 - type="textarea"
39 - placeholder="请输入角色描述"
40 - :disabled="roleFormDisabled"
41 - v-if="!roleFormDisabled"
42 - clearable
43 - ></el-input>
44 <div v-else>{{ roleData.remark }}</div> 18 <div v-else>{{ roleData.remark }}</div>
45 </el-form-item> 19 </el-form-item>
46 </el-col> 20 </el-col>
...@@ -58,31 +32,16 @@ ...@@ -58,31 +32,16 @@
58 </el-col> --> 32 </el-col> -->
59 <el-col :span="24"> 33 <el-col :span="24">
60 <el-form-item label="角色权限:" prop="menuIdList"> 34 <el-form-item label="角色权限:" prop="menuIdList">
61 - <el-tree 35 + <el-tree ref="tree" :data="treeData" node-key="id" :props="defaultProps" :show-checkbox="true"
62 - ref="tree" 36 + :default-checked-keys="roleData.menuIds" accordion>
63 - :data="treeData"
64 - node-key="id"
65 - :props="defaultProps"
66 - :show-checkbox="true"
67 - :default-checked-keys="roleData.menuIds"
68 - accordion
69 - >
70 </el-tree> 37 </el-tree>
71 </el-form-item> 38 </el-form-item>
72 </el-col> 39 </el-col>
73 </el-row> 40 </el-row>
74 <el-form-item> 41 <el-form-item>
75 - <el-button 42 + <el-button type="primary" v-if="!roleFormDisabled" size="mini" :loading="loading" @click="submit">提交
76 - type="primary" 43 + </el-button>
77 - v-if="!roleFormDisabled" 44 + <el-button type="primary" size="mini" @click="handleClose">取消</el-button>
78 - size="mini"
79 - :loading="loading"
80 - @click="submit"
81 - >提交</el-button
82 - >
83 - <el-button type="primary" size="mini" @click="handleClose"
84 - >取消</el-button
85 - >
86 </el-form-item> 45 </el-form-item>
87 </el-form> 46 </el-form>
88 </el-drawer> 47 </el-drawer>
...@@ -173,7 +132,7 @@ export default { ...@@ -173,7 +132,7 @@ export default {
173 let formData = {}; 132 let formData = {};
174 this.loading = true; 133 this.loading = true;
175 let arr = []; 134 let arr = [];
176 - arr = this.$refs.tree.getCheckedKeys().filter((item,index)=>{ 135 + arr = this.$refs.tree.getCheckedKeys().filter((item, index) => {
177 return this.$refs.tree.getCheckedKeys().indexOf(item) == index 136 return this.$refs.tree.getCheckedKeys().indexOf(item) == index
178 }) 137 })
179 formData.menuIdList = arr; 138 formData.menuIdList = arr;
...@@ -186,7 +145,7 @@ export default { ...@@ -186,7 +145,7 @@ export default {
186 this.loading = false; 145 this.loading = false;
187 if (res.code === 200) { 146 if (res.code === 200) {
188 this.$message({ 147 this.$message({
189 - message: "操作成功", 148 + message: "操作成功,新增权限需重新登陆后刷新。",
190 type: "success", 149 type: "success",
191 }); 150 });
192 this.$emit("handleClose", false); 151 this.$emit("handleClose", false);
...@@ -224,7 +183,7 @@ export default { ...@@ -224,7 +183,7 @@ export default {
224 data.push(menuItem) 183 data.push(menuItem)
225 if (item.children && item.children.length) { 184 if (item.children && item.children.length) {
226 menuItem.children = this.treeDataInfo(item.children); 185 menuItem.children = this.treeDataInfo(item.children);
227 - menuItem.children.unshift({id:item.id,title:`${item.title}(菜单)`}) 186 + menuItem.children.unshift({ id: item.id, title: `${item.title}(菜单)` })
228 } 187 }
229 }); 188 });
230 return data; 189 return data;
......
1 <template> 1 <template>
2 <div class="userDrawer"> 2 <div class="userDrawer">
3 - <el-drawer 3 + <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" :close-on-click-modal="false"
4 - :title="drawerTitle" 4 + :wrapperClosable="false" :show-close="false">
5 - :visible.sync="drawer" 5 + <el-form ref="userForm" :model="userForm" label-width="auto" :rules="rules" style="margin: 10px">
6 - direction="rtl"
7 - size="40%"
8 - :close-on-click-modal="false"
9 - :wrapperClosable="false"
10 - :show-close="false"
11 - >
12 - <el-form
13 - ref="userForm"
14 - :model="userForm"
15 - label-width="auto"
16 - :rules="rules"
17 - style="margin: 10px"
18 - >
19 <el-row :gutter="10"> 6 <el-row :gutter="10">
20 <el-col :span="12"> 7 <el-col :span="12">
21 <el-form-item label="员工号:" prop="loginName"> 8 <el-form-item label="员工号:" prop="loginName">
22 - <el-input 9 + <el-input placeholder="请输入员工号" v-model.trim="userForm.loginName" v-if="!userFormDisabled"
23 - placeholder="请输入员工号" 10 + :disabled="drawerTitle != '新增用户'" size="small" clearable></el-input>
24 - v-model.trim="userForm.loginName"
25 - v-if="!userFormDisabled"
26 - :disabled="drawerTitle != '新增用户'"
27 - size="small"
28 - clearable
29 - ></el-input>
30 <div v-else>{{ userForm.loginName }}</div> 11 <div v-else>{{ userForm.loginName }}</div>
31 </el-form-item> 12 </el-form-item>
32 </el-col> 13 </el-col>
33 <el-col :span="12"> 14 <el-col :span="12">
34 <el-form-item label="用户姓名:" prop="username"> 15 <el-form-item label="用户姓名:" prop="username">
35 - <el-input 16 + <el-input placeholder="请输入用户姓名" :disabled="userFormDisabled" v-model.trim="userForm.username"
36 - placeholder="请输入用户姓名" 17 + v-if="!userFormDisabled" size="small" clearable></el-input>
37 - :disabled="userFormDisabled"
38 - v-model.trim="userForm.username"
39 - v-if="!userFormDisabled"
40 - size="small"
41 - clearable
42 - ></el-input>
43 <div v-else>{{ userForm.username }}</div> 18 <div v-else>{{ userForm.username }}</div>
44 </el-form-item> 19 </el-form-item>
45 </el-col> 20 </el-col>
46 <el-col :span="24"> 21 <el-col :span="24">
47 - <el-alert 22 + <el-alert title="注意:员工号一但设置就无法更改，请谨慎填写！" type="warning" show-icon size="mini" :closable="false"
48 - title="注意:员工号一但设置就无法更改，请谨慎填写！" 23 + style="width: 400px">
49 - type="warning"
50 - show-icon
51 - size="mini"
52 - :closable="false"
53 - style="width: 400px"
54 - >
55 </el-alert> 24 </el-alert>
56 </el-col> 25 </el-col>
57 <el-col :span="12"> 26 <el-col :span="12">
58 <el-form-item label="手机号:" prop="phone"> 27 <el-form-item label="手机号:" prop="phone">
59 - <el-input 28 + <el-input placeholder="请输入手机号" type="phone" v-model.trim="userForm.phone" :disabled="userFormDisabled"
60 - placeholder="请输入手机号" 29 + v-if="!userFormDisabled" size="small" clearable></el-input>
61 - type="phone"
62 - v-model.trim="userForm.phone"
63 - :disabled="userFormDisabled"
64 - v-if="!userFormDisabled"
65 - size="small"
66 - clearable
67 - ></el-input>
68 <div v-else>{{ userForm.phone }}</div> 30 <div v-else>{{ userForm.phone }}</div>
69 </el-form-item> 31 </el-form-item>
70 </el-col> 32 </el-col>
71 <el-col :span="12"> 33 <el-col :span="12">
72 <el-form-item label="电子邮箱:" prop="email"> 34 <el-form-item label="电子邮箱:" prop="email">
73 - <el-input 35 + <el-input placeholder="请输入电子邮箱" type="email" v-model.trim="userForm.email" :disabled="userFormDisabled"
74 - placeholder="请输入电子邮箱" 36 + v-if="!userFormDisabled" size="small" clearable></el-input>
75 - type="email"
76 - v-model.trim="userForm.email"
77 - :disabled="userFormDisabled"
78 - v-if="!userFormDisabled"
79 - size="small"
80 - clearable
81 - ></el-input>
82 <div v-else>{{ userForm.email }}</div> 37 <div v-else>{{ userForm.email }}</div>
83 </el-form-item> 38 </el-form-item>
84 </el-col> 39 </el-col>
...@@ -104,68 +59,33 @@ ...@@ -104,68 +59,33 @@
104 </el-col> --> 59 </el-col> -->
105 <el-col :span="24"> 60 <el-col :span="24">
106 <el-form-item label="所属口岸:" prop="portName"> 61 <el-form-item label="所属口岸:" prop="portName">
107 - <el-select 62 + <el-select placeholder="请选择口岸" v-model="port" :disabled="userFormDisabled" size="small"
108 - placeholder="请选择口岸" 63 + style="width: 100%" multiple clearable>
109 - v-model="port" 64 + <el-option v-for="item in portNameList" :label="item.englishName" :value="item.englishName"
110 - :disabled="userFormDisabled" 65 + :key="item.id">
111 - size="small"
112 - style="width: 100%"
113 - multiple
114 - clearable
115 - >
116 - <el-option
117 - v-for="item in portNameList"
118 - :label="item.englishName"
119 - :value="item.englishName"
120 - :key="item.id"
121 - >
122 </el-option> 66 </el-option>
123 </el-select> 67 </el-select>
124 </el-form-item> 68 </el-form-item>
125 </el-col> 69 </el-col>
126 <el-col :span="24"> 70 <el-col :span="24">
127 <el-form-item label="所属角色:" prop="roleIds"> 71 <el-form-item label="所属角色:" prop="roleIds">
128 - <el-checkbox-group 72 + <el-checkbox-group v-model="roleid" :disabled="userFormDisabled" @change="change">
129 - v-model="roleid" 73 + <el-checkbox v-for="item in roleList" :label="item.id" :key="item.id">{{ item.name }}</el-checkbox>
130 - :disabled="userFormDisabled"
131 - @change="change"
132 - >
133 - <el-checkbox
134 - v-for="item in roleList"
135 - :label="item.id"
136 - :key="item.id"
137 - >{{ item.name }}</el-checkbox
138 - >
139 </el-checkbox-group> 74 </el-checkbox-group>
140 </el-form-item> 75 </el-form-item>
141 </el-col> 76 </el-col>
142 <el-col :span="24"> 77 <el-col :span="24">
143 <el-form-item label="备注:" prop="remark"> 78 <el-form-item label="备注:" prop="remark">
144 - <el-input 79 + <el-input type="textarea" v-model="userForm.remark" placeholder="备注" :disabled="userFormDisabled"
145 - type="textarea" 80 + v-if="!userFormDisabled" size="small" clearable></el-input>
146 - v-model="userForm.remark"
147 - placeholder="备注"
148 - :disabled="userFormDisabled"
149 - v-if="!userFormDisabled"
150 - size="small"
151 - clearable
152 - ></el-input>
153 <div v-else>{{ userForm.remark }}</div> 81 <div v-else>{{ userForm.remark }}</div>
154 </el-form-item> 82 </el-form-item>
155 </el-col> 83 </el-col>
156 </el-row> 84 </el-row>
157 <el-form-item> 85 <el-form-item>
158 - <el-button 86 + <el-button type="primary" size="mini" v-if="!userFormDisabled" :loading="loading" @click="submit">提交
159 - type="primary" 87 + </el-button>
160 - size="mini" 88 + <el-button type="primary" size="mini" @click="handleClose">取消</el-button>
161 - v-if="!userFormDisabled"
162 - :loading="loading"
163 - @click="submit"
164 - >提交</el-button
165 - >
166 - <el-button type="primary" size="mini" @click="handleClose"
167 - >取消</el-button
168 - >
169 </el-form-item> 89 </el-form-item>
170 </el-form> 90 </el-form>
171 </el-drawer> 91 </el-drawer>
...@@ -231,22 +151,22 @@ export default { ...@@ -231,22 +151,22 @@ export default {
231 trigger: "blur", 151 trigger: "blur",
232 }, 152 },
233 ], 153 ],
234 - phone:[ 154 + phone: [
235 { 155 {
236 - min:11, 156 + min: 11,
237 - max:11, 157 + max: 11,
238 - message:"请输入11位手机号码", 158 + message: "请输入11位手机号码",
239 - trigger:"blur" 159 + trigger: "blur"
240 }, 160 },
241 { 161 {
242 - pattern:/^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/, 162 + pattern: /^(13[0-9]|14[579]|15[0-3,5-9]|16[6]|17[0135678]|18[0-9]|19[89])\d{8}$/,
243 - message:"请输入正确得手机号码" 163 + message: "请输入正确得手机号码"
244 } 164 }
245 ], 165 ],
246 - email:[ 166 + email: [
247 { 167 {
248 - pattern:/^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/, 168 + pattern: /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
249 - message:"请输入正确得电子邮箱" 169 + message: "请输入正确得电子邮箱"
250 } 170 }
251 ] 171 ]
252 }, 172 },
...@@ -266,13 +186,13 @@ export default { ...@@ -266,13 +186,13 @@ export default {
266 if (this.userForm.portName) { 186 if (this.userForm.portName) {
267 this.port = this.userForm.portName; 187 this.port = this.userForm.portName;
268 } 188 }
269 - }else{ 189 + } else {
270 this.loading = false; 190 this.loading = false;
271 } 191 }
272 }, 192 },
273 }, 193 },
274 methods: { 194 methods: {
275 - clearValidate(formName){ 195 + clearValidate(formName) {
276 this.$refs[formName].clearValidate(); 196 this.$refs[formName].clearValidate();
277 }, 197 },
278 change(val) { 198 change(val) {
...@@ -354,11 +274,11 @@ export default { ...@@ -354,11 +274,11 @@ export default {
354 this.loading = false; 274 this.loading = false;
355 console.log(err); 275 console.log(err);
356 }); 276 });
357 - }else{ 277 + } else {
358 this.$message({ 278 this.$message({
359 - message: "口岸不能为空", 279 + message: "口岸不能为空",
360 - type: "warning", 280 + type: "warning",
361 - }); 281 + });
362 } 282 }
363 }, 283 },
364 }, 284 },
......