Fedex / imac-vue

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

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

Inline Side-by-side
Showing 9 changed files with 433 additions and 1124 deletions
1 <template> 1 <template>
2 <div class="cargoAllocation"> 2 <div class="cargoAllocation">
3 - <el-form 3 + <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small">
4 - ref="form"
5 - v-model="formData"
6 - class="form-header"
7 - label-position="right"
8 - label-width="auto"
9 - size="small"
10 - >
11 <el-row type="flex" style="flexWrap: wrap !important"> 4 <el-row type="flex" style="flexWrap: wrap !important">
12 <el-col :span="6"> 5 <el-col :span="6">
13 <el-form-item label="ACCS原航班日期"> 6 <el-form-item label="ACCS原航班日期">
14 - <el-date-picker 7 + <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
15 - class="formItem" 8 + end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
16 - type="daterange"
17 - range-separator="至"
18 - start-placeholder="开始日期"
19 - end-placeholder="结束日期"
20 - v-model="fltDate"
21 - :value-format="valueFormat"
22 - clearable
23 - >
24 </el-date-picker> 9 </el-date-picker>
25 </el-form-item> 10 </el-form-item>
26 </el-col> 11 </el-col>
27 <el-col :span="6"> 12 <el-col :span="6">
28 <el-form-item label="ACCS原航班号"> 13 <el-form-item label="ACCS原航班号">
29 - <el-input 14 + <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable></el-input>
30 - v-model="fltNo"
31 - placeholder="请输入ACCS原航班号"
32 - class="formItem"
33 - clearable
34 - ></el-input>
35 </el-form-item> 15 </el-form-item>
36 </el-col> 16 </el-col>
37 <el-col :span="6"> 17 <el-col :span="6">
38 <el-form-item label="海关回执状态"> 18 <el-form-item label="海关回执状态">
39 - <el-select 19 + <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
40 - placeholder="不限" 20 + <el-option v-for="item in selectData.findConditionData
41 - v-model="formData.customsReceiptStatusId" 21 + .cargoCustomsReturnStatus" :label="item.chineseName" :value="item.id" :key="item.id">
42 - class="formItem"
43 - multiple
44 - clearable
45 - >
46 - <el-option
47 - v-for="item in selectData.findConditionData
48 - .cargoCustomsReturnStatus"
49 - :label="item.chineseName"
50 - :value="item.id"
51 - :key="item.id"
52 - >
53 </el-option> 22 </el-option>
54 </el-select> 23 </el-select>
55 </el-form-item> 24 </el-form-item>
56 </el-col> 25 </el-col>
57 <el-col :span="6"> 26 <el-col :span="6">
58 <el-form-item label="货物状态"> 27 <el-form-item label="货物状态">
59 - <el-select 28 + <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
60 - placeholder="不限" 29 + <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
61 - v-model="formData.statusId" 30 + :value="item.id" :key="item.id">
62 - class="formItem"
63 - clearable
64 - >
65 - <el-option
66 - v-for="item in selectData.findConditionData.cargoStatus"
67 - :label="item.chineseName"
68 - :value="item.id"
69 - :key="item.id"
70 - >
71 </el-option> 31 </el-option>
72 </el-select> 32 </el-select>
73 </el-form-item> 33 </el-form-item>
74 </el-col> 34 </el-col>
75 <el-col :span="6"> 35 <el-col :span="6">
76 <el-form-item label="ACCSpool"> 36 <el-form-item label="ACCSpool">
77 - <el-select 37 + <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
78 - placeholder="不限" 38 + <el-option value="Pre-MDE" key="Pre-MDE">
79 - v-model="formData.accsPool"
80 - class="formItem"
81 - clearable
82 - >
83 - <el-option
84 - value="Pre-MDE"
85 - key="Pre-MDE"
86 - >
87 </el-option> 39 </el-option>
88 - <el-option 40 + <el-option value="OSPR" key="OSPR">
89 - value="OSPR"
90 - key="OSPR"
91 - >
92 </el-option> 41 </el-option>
93 - <el-option 42 + <el-option value="Manifest" key="Manifest">
94 - value="Manifest"
95 - key="Manifest"
96 - >
97 </el-option> 43 </el-option>
98 </el-select> 44 </el-select>
99 </el-form-item> 45 </el-form-item>
100 </el-col> 46 </el-col>
101 <el-col :span="6"> 47 <el-col :span="6">
102 <el-form-item label="运单号"> 48 <el-form-item label="运单号">
103 - <el-input 49 + <el-input class="formItem" type="textarea" placeholder="请输入运单号（回车分割）" :rows="1" v-model="formData.waybillNo"
104 - class="formItem" 50 + clearable></el-input>
105 - type="textarea"
106 - placeholder="请输入运单号（回车分割）"
107 - :autosize="true"
108 - v-model="formData.waybillNo"
109 - clearable
110 - ></el-input>
111 </el-form-item> 51 </el-form-item>
112 </el-col> 52 </el-col>
113 <el-col :span="6"> 53 <el-col :span="6">
114 <el-form-item label="申报类别"> 54 <el-form-item label="申报类别">
115 - <el-select 55 + <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
116 - placeholder="不限" 56 + <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
117 - v-model="formData.typeId" 57 + :value="item.id" :key="item.id">
118 - class="formItem"
119 - clearable
120 - >
121 - <el-option
122 - v-for="item in selectData.findConditionData.cargoType"
123 - :label="item.chineseName"
124 - :value="item.id"
125 - :key="item.id"
126 - >
127 </el-option> 58 </el-option>
128 </el-select> 59 </el-select>
129 </el-form-item> 60 </el-form-item>
130 </el-col> 61 </el-col>
131 <el-col :span="6"> 62 <el-col :span="6">
132 <el-form-item label="服务类型"> 63 <el-form-item label="服务类型">
133 - <el-select 64 + <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
134 - placeholder="不限" 65 + <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
135 - v-model="formData.serviceTypeId" 66 + :value="item.id" :key="item.id">
136 - class="formItem"
137 - clearable
138 - >
139 - <el-option
140 - v-for="item in selectData.findConditionData.cargoServiceType"
141 - :label="item.chineseName"
142 - :value="item.id"
143 - :key="item.id"
144 - >
145 </el-option> 67 </el-option>
146 </el-select> 68 </el-select>
147 </el-form-item> 69 </el-form-item>
148 </el-col> 70 </el-col>
149 <el-col :span="6"> 71 <el-col :span="6">
150 <el-form-item label="URSA"> 72 <el-form-item label="URSA">
151 - <el-input 73 + <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
152 - class="formItem" 74 + </el-input>
153 - type="textarea"
154 - placeholder="S_;P_;E2"
155 - v-model="ursa"
156 - :autosize="true"
157 - clearable
158 - ></el-input>
159 </el-form-item> 75 </el-form-item>
160 </el-col> 76 </el-col>
161 <el-col :span="6"> 77 <el-col :span="6">
162 <el-form-item label="站点"> 78 <el-form-item label="站点">
163 - <el-input 79 + <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
164 - class="formItem" 80 + </el-input>
165 - type="textarea"
166 - placeholder="PVG;PEK"
167 - v-model="siteName"
168 - :autosize="true"
169 - clearable
170 - ></el-input>
171 </el-form-item> 81 </el-form-item>
172 </el-col> 82 </el-col>
173 <el-col :span="6"> 83 <el-col :span="6">
174 <el-form-item label="重量区间"> 84 <el-form-item label="重量区间">
175 - <el-row> 85 + <el-row>
176 - <el-col :span="11" 86 + <el-col :span="11">
177 - ><el-input-number 87 + <el-input-number class="formItem" size="mini" v-model="formData.minWeight" :controls="false" :min="0"
178 - class="formItem" 88 + :precision="2" clearable></el-input-number>
179 - size="mini" 89 + </el-col>
180 - v-model="formData.minWeight"
181 - :controls="false"
182 - :min="0"
183 - :precision="2"
184 - clearable
185 - ></el-input-number
186 - ></el-col>
187 <el-col class="line" :span="2">-</el-col> 90 <el-col class="line" :span="2">-</el-col>
188 - <el-col :span="11" 91 + <el-col :span="11">
189 - ><el-input-number 92 + <el-input-number class="formItem" size="mini" v-model="formData.maxWeight" :controls="false"
190 - class="formItem" 93 + :min="formData.minWeight" :precision="2" clearable></el-input-number>
191 - size="mini" 94 + </el-col>
192 - v-model="formData.maxWeight"
193 - :controls="false"
194 - :min="formData.minWeight"
195 - :precision="2"
196 - clearable
197 - ></el-input-number
198 - ></el-col>
199 </el-row> 95 </el-row>
200 </el-form-item> 96 </el-form-item>
201 </el-col> 97 </el-col>
202 <el-col :span="6"> 98 <el-col :span="6">
203 <el-form-item label="件数区间"> 99 <el-form-item label="件数区间">
204 <el-row> 100 <el-row>
205 - <el-col :span="11" 101 + <el-col :span="11">
206 - ><el-input-number 102 + <el-input-number class="formItem" size="mini" v-model="formData.minNumber" :controls="false" :min="0"
207 - class="formItem" 103 + clearable></el-input-number>
208 - size="mini" 104 + </el-col>
209 - v-model="formData.minNumber" 105 + <el-col class="line" :span="2">-</el-col>
210 - :controls="false" 106 + <el-col :span="11">
211 - :min="0" 107 + <el-input-number class="formItem" size="mini" v-model="formData.maxNumber" :controls="false"
212 - clearable 108 + :min="formData.minNumber" clearable></el-input-number>
213 - ></el-input-number 109 + </el-col>
214 - ></el-col>
215 - <el-col class="line" :span="2">-</el-col>
216 - <el-col :span="11"
217 - ><el-input-number
218 - class="formItem"
219 - size="mini"
220 - v-model="formData.maxNumber"
221 - :controls="false"
222 - :min="formData.minNumber"
223 - clearable
224 - ></el-input-number
225 - ></el-col>
226 </el-row> 110 </el-row>
227 </el-form-item> 111 </el-form-item>
228 </el-col> 112 </el-col>
229 <el-col :span="6"> 113 <el-col :span="6">
230 <el-form-item label="取件日期"> 114 <el-form-item label="取件日期">
231 - <el-date-picker 115 + <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
232 - class="formItem" 116 + :value-format="valueFormat" clearable>
233 - v-model="formData.pickUpDate"
234 - type="date"
235 - placeholder="选择日期"
236 - :value-format="valueFormat"
237 - clearable
238 - >
239 </el-date-picker> 117 </el-date-picker>
240 </el-form-item> 118 </el-form-item>
241 </el-col> 119 </el-col>
242 <el-col :span="24"> 120 <el-col :span="24">
243 <el-form-item label="Handling Code"> 121 <el-form-item label="Handling Code">
244 - <el-empty 122 + <el-empty description="暂无数据" v-if="
245 - description="暂无数据" 123 + !selectData.HandlingCode || selectData.HandlingCode.length == 0
246 - v-if=" 124 + "></el-empty>
247 - !selectData.HandlingCode || selectData.HandlingCode.length == 0
248 - "
249 - ></el-empty>
250 <el-checkbox-group v-model="handingCodes" v-else> 125 <el-checkbox-group v-model="handingCodes" v-else>
251 - <el-checkbox 126 + <el-checkbox v-for="item in selectData.HandlingCode" :label="item.chineseName" v-model="item.englishName"
252 - v-for="item in selectData.HandlingCode" 127 + :key="item.id"></el-checkbox>
253 - :label="item.chineseName"
254 - v-model="item.englishName"
255 - :key="item.id"
256 - ></el-checkbox>
257 </el-checkbox-group> 128 </el-checkbox-group>
258 </el-form-item> 129 </el-form-item>
259 </el-col> 130 </el-col>
260 <el-col :span="24"> 131 <el-col :span="24">
261 <el-form-item label="Sub Category"> 132 <el-form-item label="Sub Category">
262 - <el-empty 133 + <el-empty description="暂无数据" v-if="
263 - description="暂无数据" 134 + !selectData.SubCategory || selectData.SubCategory.length == 0
264 - v-if=" 135 + "></el-empty>
265 - !selectData.SubCategory || selectData.SubCategory.length == 0
266 - "
267 - ></el-empty>
268 <el-checkbox-group v-model="subCategorys" v-else> 136 <el-checkbox-group v-model="subCategorys" v-else>
269 - <el-checkbox 137 + <el-checkbox v-for="item in selectData.SubCategory" :label="item.chineseName" v-model="item.englishName"
270 - v-for="item in selectData.SubCategory" 138 + :key="item.id"></el-checkbox>
271 - :label="item.chineseName"
272 - v-model="item.englishName"
273 - :key="item.id"
274 - ></el-checkbox>
275 </el-checkbox-group> 139 </el-checkbox-group>
276 </el-form-item> 140 </el-form-item>
277 </el-col> 141 </el-col>
278 </el-row> 142 </el-row>
279 <div style="margin: 0 0 0 10px"> 143 <div style="margin: 0 0 0 10px">
280 - <el-button 144 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
281 - type="primary" 145 + <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
282 - icon="el-icon-search" 146 + v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
283 - size="mini" 147 + :disabled="tableData.length <= 0">{{
284 - :loading="loading" 148 + downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
285 - @click="select(0)" 149 + }}</el-button>
286 - >查询</el-button 150 + <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
287 - > 151 + v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
288 - <el-button 152 + :disabled="tableData.length <= 0">{{
289 - :type="downLoadingTip.downloading ? 'warning' : 'primary'" 153 + downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
290 - size="mini" 154 + }}</el-button>
291 - v-hasPermi="['allocation:cargo:export']" 155 + <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
292 - @click="xlsx(0)" 156 + :disabled="tableSelection.length <= 0">添加到航班</el-button>
293 - :loading="downLoadingTip.downloading"
294 - :disabled="tableData.length <= 0"
295 - >{{
296 - downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
297 - }}</el-button
298 - >
299 - <el-button
300 - :type="downLoadingTip.downloading ? 'warning' : 'primary'"
301 - size="mini"
302 - v-hasPermi="['allocation:cargo:export']"
303 - @click="xlsx(1)"
304 - :loading="downLoadingTip.downloading"
305 - :disabled="tableData.length <= 0"
306 - >{{
307 - downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
308 - }}</el-button
309 - >
310 - <el-button
311 - type="primary"
312 - size="mini"
313 - v-hasPermi="['allocation:cargo:allocation']"
314 - @click="addFit"
315 - :disabled="tableSelection.length <= 0"
316 - >添加到航班</el-button
317 - >
318 <div class="tips"> 157 <div class="tips">
319 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 158 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
320 <span>总件数:{{ allQty }}</span> 159 <span>总件数:{{ allQty }}</span>
321 </div> 160 </div>
322 </div> 161 </div>
323 </el-form> 162 </el-form>
324 - <Tables 163 + <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :totalCount="totalCount"
325 - ref="newTables" 164 + :loading="loading" :selection="true" :limitSize="size" :limitStart="formData.limitStart" :page="page"
326 - ductName="cargo" 165 + :shiftKey="shiftKey" :infoShow="false" :height="tableHeight" :pageSizes="[100]" @sizeChange="sizeChange"
327 - :data="tableData" 166 + @tableSelect="tableSelect" @tableSelectAll="tableSelectAll" @currentChange="currentChange"
328 - :headerData="tableHeader" 167 + @sortChange="sortChange"></Tables>
329 - :totalCount="totalCount" 168 + <Dialog :tableData="tableSelection" :dialogVisible="dialogVisible" @dialogBeforeClose="dialogBeforeClose"></Dialog>
330 - :loading="loading"
331 - :selection="true"
332 - :limitSize="size"
333 - :limitStart="formData.limitStart"
334 - :page="page"
335 - :shiftKey="shiftKey"
336 - :infoShow="false"
337 - :height="tableHeight"
338 - :pageSizes="[100]"
339 - @sizeChange="sizeChange"
340 - @tableSelect="tableSelect"
341 - @tableSelectAll="tableSelectAll"
342 - @currentChange="currentChange"
343 - @sortChange="sortChange"
344 - ></Tables>
345 - <Dialog
346 - :tableData="tableSelection"
347 - :dialogVisible="dialogVisible"
348 - @dialogBeforeClose="dialogBeforeClose"
349 - ></Dialog>
350 </div> 169 </div>
351 </template> 170 </template>
352 171
...@@ -384,7 +203,7 @@ export default { ...@@ -384,7 +203,7 @@ export default {
384 handingCodes: null, 203 handingCodes: null,
385 subCategorys: null, 204 subCategorys: null,
386 customsReceiptStatusId: null, 205 customsReceiptStatusId: null,
387 - accsPool:"OSPR" 206 + accsPool: "OSPR"
388 }, //查询数据 207 }, //查询数据
389 tableHeader: [ 208 tableHeader: [
390 { 209 {
...@@ -394,7 +213,7 @@ export default { ...@@ -394,7 +213,7 @@ export default {
394 align: "center", 213 align: "center",
395 sorTable: true, 214 sorTable: true,
396 fixed: false, 215 fixed: false,
397 - disabled:true 216 + disabled: true
398 }, 217 },
399 { 218 {
400 name: "取件日期", 219 name: "取件日期",
...@@ -403,7 +222,7 @@ export default { ...@@ -403,7 +222,7 @@ export default {
403 align: "center", 222 align: "center",
404 sorTable: true, 223 sorTable: true,
405 fixed: false, 224 fixed: false,
406 - disabled:true 225 + disabled: true
407 }, 226 },
408 { 227 {
409 name: "取件扫描号", 228 name: "取件扫描号",
...@@ -412,7 +231,7 @@ export default { ...@@ -412,7 +231,7 @@ export default {
412 align: "center", 231 align: "center",
413 sorTable: true, 232 sorTable: true,
414 fixed: false, 233 fixed: false,
415 - disabled:true 234 + disabled: true
416 }, 235 },
417 { 236 {
418 name: "站点", 237 name: "站点",
...@@ -421,7 +240,7 @@ export default { ...@@ -421,7 +240,7 @@ export default {
421 align: "center", 240 align: "center",
422 sorTable: true, 241 sorTable: true,
423 fixed: false, 242 fixed: false,
424 - disabled:true 243 + disabled: true
425 }, 244 },
426 { 245 {
427 name: "运单号", 246 name: "运单号",
...@@ -430,7 +249,7 @@ export default { ...@@ -430,7 +249,7 @@ export default {
430 align: "center", 249 align: "center",
431 sorTable: true, 250 sorTable: true,
432 fixed: false, 251 fixed: false,
433 - disabled:true 252 + disabled: true
434 }, 253 },
435 { 254 {
436 name: "总单号", 255 name: "总单号",
...@@ -439,7 +258,7 @@ export default { ...@@ -439,7 +258,7 @@ export default {
439 align: "center", 258 align: "center",
440 sorTable: true, 259 sorTable: true,
441 fixed: false, 260 fixed: false,
442 - disabled:true 261 + disabled: true
443 }, 262 },
444 { 263 {
445 name: "服务类型", 264 name: "服务类型",
...@@ -448,7 +267,7 @@ export default { ...@@ -448,7 +267,7 @@ export default {
448 align: "center", 267 align: "center",
449 sorTable: true, 268 sorTable: true,
450 fixed: false, 269 fixed: false,
451 - disabled:true 270 + disabled: true
452 }, 271 },
453 { 272 {
454 name: "服务代码", 273 name: "服务代码",
...@@ -457,7 +276,7 @@ export default { ...@@ -457,7 +276,7 @@ export default {
457 align: "center", 276 align: "center",
458 sorTable: false, 277 sorTable: false,
459 fixed: false, 278 fixed: false,
460 - disabled:true 279 + disabled: true
461 }, 280 },
462 { 281 {
463 name: "URSA", 282 name: "URSA",
...@@ -466,7 +285,7 @@ export default { ...@@ -466,7 +285,7 @@ export default {
466 align: "center", 285 align: "center",
467 sorTable: true, 286 sorTable: true,
468 fixed: false, 287 fixed: false,
469 - disabled:true 288 + disabled: true
470 }, 289 },
471 { 290 {
472 name: "申报类型", 291 name: "申报类型",
...@@ -475,7 +294,7 @@ export default { ...@@ -475,7 +294,7 @@ export default {
475 align: "center", 294 align: "center",
476 sorTable: true, 295 sorTable: true,
477 fixed: false, 296 fixed: false,
478 - disabled:true 297 + disabled: true
479 }, 298 },
480 { 299 {
481 name: "HandlingCode", 300 name: "HandlingCode",
...@@ -484,7 +303,7 @@ export default { ...@@ -484,7 +303,7 @@ export default {
484 align: "center", 303 align: "center",
485 sorTable: true, 304 sorTable: true,
486 fixed: false, 305 fixed: false,
487 - disabled:true 306 + disabled: true
488 }, 307 },
489 { 308 {
490 name: "subcategory", 309 name: "subcategory",
...@@ -493,7 +312,7 @@ export default { ...@@ -493,7 +312,7 @@ export default {
493 align: "center", 312 align: "center",
494 sorTable: true, 313 sorTable: true,
495 fixed: false, 314 fixed: false,
496 - disabled:true 315 + disabled: true
497 }, 316 },
498 { 317 {
499 name: "件数", 318 name: "件数",
...@@ -502,7 +321,7 @@ export default { ...@@ -502,7 +321,7 @@ export default {
502 align: "center", 321 align: "center",
503 sorTable: true, 322 sorTable: true,
504 fixed: false, 323 fixed: false,
505 - disabled:true 324 + disabled: true
506 }, 325 },
507 { 326 {
508 name: "实际重量", 327 name: "实际重量",
...@@ -511,7 +330,7 @@ export default { ...@@ -511,7 +330,7 @@ export default {
511 align: "center", 330 align: "center",
512 sorTable: true, 331 sorTable: true,
513 fixed: false, 332 fixed: false,
514 - disabled:true 333 + disabled: true
515 }, 334 },
516 { 335 {
517 name: "收件人国家代码", 336 name: "收件人国家代码",
...@@ -520,7 +339,7 @@ export default { ...@@ -520,7 +339,7 @@ export default {
520 align: "center", 339 align: "center",
521 sorTable: true, 340 sorTable: true,
522 fixed: false, 341 fixed: false,
523 - disabled:true 342 + disabled: true
524 }, 343 },
525 { 344 {
526 name: "品名描述", 345 name: "品名描述",
...@@ -529,7 +348,7 @@ export default { ...@@ -529,7 +348,7 @@ export default {
529 align: "center", 348 align: "center",
530 sorTable: false, 349 sorTable: false,
531 fixed: false, 350 fixed: false,
532 - disabled:true 351 + disabled: true
533 }, 352 },
534 { 353 {
535 name: "海关回执状态", 354 name: "海关回执状态",
...@@ -538,7 +357,7 @@ export default { ...@@ -538,7 +357,7 @@ export default {
538 align: "center", 357 align: "center",
539 sorTable: true, 358 sorTable: true,
540 fixed: false, 359 fixed: false,
541 - disabled:true 360 + disabled: true
542 }, 361 },
543 { 362 {
544 name: "预审状态", 363 name: "预审状态",
...@@ -547,7 +366,7 @@ export default { ...@@ -547,7 +366,7 @@ export default {
547 align: "center", 366 align: "center",
548 sorTable: true, 367 sorTable: true,
549 fixed: false, 368 fixed: false,
550 - disabled:true 369 + disabled: true
551 }, 370 },
552 { 371 {
553 name: "航班预审意见", 372 name: "航班预审意见",
...@@ -556,7 +375,7 @@ export default { ...@@ -556,7 +375,7 @@ export default {
556 align: "center", 375 align: "center",
557 sorTable: false, 376 sorTable: false,
558 fixed: false, 377 fixed: false,
559 - disabled:true 378 + disabled: true
560 }, 379 },
561 { 380 {
562 name: "货物状态", 381 name: "货物状态",
...@@ -565,7 +384,7 @@ export default { ...@@ -565,7 +384,7 @@ export default {
565 align: "center", 384 align: "center",
566 sorTable: true, 385 sorTable: true,
567 fixed: false, 386 fixed: false,
568 - disabled:true 387 + disabled: true
569 }, 388 },
570 { 389 {
571 name: "终配航班号", 390 name: "终配航班号",
...@@ -574,7 +393,7 @@ export default { ...@@ -574,7 +393,7 @@ export default {
574 align: "center", 393 align: "center",
575 sorTable: true, 394 sorTable: true,
576 fixed: false, 395 fixed: false,
577 - disabled:true 396 + disabled: true
578 }, 397 },
579 { 398 {
580 name: "终配航班日期", 399 name: "终配航班日期",
...@@ -583,7 +402,7 @@ export default { ...@@ -583,7 +402,7 @@ export default {
583 align: "center", 402 align: "center",
584 sorTable: true, 403 sorTable: true,
585 fixed: false, 404 fixed: false,
586 - disabled:true 405 + disabled: true
587 }, 406 },
588 { 407 {
589 name: "二配航班号", 408 name: "二配航班号",
...@@ -592,7 +411,7 @@ export default { ...@@ -592,7 +411,7 @@ export default {
592 align: "center", 411 align: "center",
593 sorTable: true, 412 sorTable: true,
594 fixed: false, 413 fixed: false,
595 - disabled:true 414 + disabled: true
596 }, 415 },
597 { 416 {
598 name: "二配航班日期", 417 name: "二配航班日期",
...@@ -601,7 +420,7 @@ export default { ...@@ -601,7 +420,7 @@ export default {
601 align: "center", 420 align: "center",
602 sorTable: true, 421 sorTable: true,
603 fixed: false, 422 fixed: false,
604 - disabled:true 423 + disabled: true
605 }, 424 },
606 { 425 {
607 name: "预配航班号", 426 name: "预配航班号",
...@@ -610,7 +429,7 @@ export default { ...@@ -610,7 +429,7 @@ export default {
610 align: "center", 429 align: "center",
611 sorTable: true, 430 sorTable: true,
612 fixed: false, 431 fixed: false,
613 - disabled:true 432 + disabled: true
614 }, 433 },
615 { 434 {
616 name: "预配航班日期", 435 name: "预配航班日期",
...@@ -619,7 +438,7 @@ export default { ...@@ -619,7 +438,7 @@ export default {
619 align: "center", 438 align: "center",
620 sorTable: true, 439 sorTable: true,
621 fixed: false, 440 fixed: false,
622 - disabled:true 441 + disabled: true
623 }, 442 },
624 { 443 {
625 name: "ACCS原航班号", 444 name: "ACCS原航班号",
...@@ -628,7 +447,7 @@ export default { ...@@ -628,7 +447,7 @@ export default {
628 align: "center", 447 align: "center",
629 sorTable: true, 448 sorTable: true,
630 fixed: false, 449 fixed: false,
631 - disabled:true 450 + disabled: true
632 }, 451 },
633 { 452 {
634 name: "ACCS原航班日期", 453 name: "ACCS原航班日期",
...@@ -637,7 +456,7 @@ export default { ...@@ -637,7 +456,7 @@ export default {
637 align: "center", 456 align: "center",
638 sorTable: true, 457 sorTable: true,
639 fixed: false, 458 fixed: false,
640 - disabled:true 459 + disabled: true
641 }, 460 },
642 { 461 {
643 name: "ACCS原航线", 462 name: "ACCS原航线",
...@@ -646,7 +465,7 @@ export default { ...@@ -646,7 +465,7 @@ export default {
646 align: "center", 465 align: "center",
647 sorTable: true, 466 sorTable: true,
648 fixed: false, 467 fixed: false,
649 - disabled:true 468 + disabled: true
650 }, 469 },
651 { 470 {
652 name: "是否RDE手工录入", 471 name: "是否RDE手工录入",
...@@ -655,7 +474,7 @@ export default { ...@@ -655,7 +474,7 @@ export default {
655 align: "center", 474 align: "center",
656 sorTable: true, 475 sorTable: true,
657 fixed: false, 476 fixed: false,
658 - disabled:true 477 + disabled: true
659 }, 478 },
660 { 479 {
661 name: "是否自动", 480 name: "是否自动",
...@@ -664,7 +483,7 @@ export default { ...@@ -664,7 +483,7 @@ export default {
664 align: "center", 483 align: "center",
665 sorTable: true, 484 sorTable: true,
666 fixed: false, 485 fixed: false,
667 - disabled:true 486 + disabled: true
668 }, 487 },
669 { 488 {
670 name: "发件人账号", 489 name: "发件人账号",
...@@ -673,7 +492,7 @@ export default { ...@@ -673,7 +492,7 @@ export default {
673 align: "center", 492 align: "center",
674 sorTable: false, 493 sorTable: false,
675 fixed: false, 494 fixed: false,
676 - disabled:true 495 + disabled: true
677 }, 496 },
678 { 497 {
679 name: "发件公司中文名称", 498 name: "发件公司中文名称",
...@@ -682,7 +501,7 @@ export default { ...@@ -682,7 +501,7 @@ export default {
682 align: "center", 501 align: "center",
683 sorTable: false, 502 sorTable: false,
684 fixed: false, 503 fixed: false,
685 - disabled:true 504 + disabled: true
686 }, 505 },
687 { 506 {
688 name: "始发地城市名称", 507 name: "始发地城市名称",
...@@ -691,7 +510,7 @@ export default { ...@@ -691,7 +510,7 @@ export default {
691 align: "center", 510 align: "center",
692 sorTable: false, 511 sorTable: false,
693 fixed: false, 512 fixed: false,
694 - disabled:true 513 + disabled: true
695 }, 514 },
696 { 515 {
697 name: "收件地", 516 name: "收件地",
...@@ -700,7 +519,7 @@ export default { ...@@ -700,7 +519,7 @@ export default {
700 align: "center", 519 align: "center",
701 sorTable: false, 520 sorTable: false,
702 fixed: false, 521 fixed: false,
703 - disabled:true 522 + disabled: true
704 }, 523 },
705 { 524 {
706 name: "尺寸", 525 name: "尺寸",
...@@ -709,7 +528,7 @@ export default { ...@@ -709,7 +528,7 @@ export default {
709 align: "center", 528 align: "center",
710 sorTable: true, 529 sorTable: true,
711 fixed: false, 530 fixed: false,
712 - disabled:true 531 + disabled: true
713 }, 532 },
714 { 533 {
715 name: "大货预审意见（是否可以配置航班）", 534 name: "大货预审意见（是否可以配置航班）",
...@@ -718,7 +537,7 @@ export default { ...@@ -718,7 +537,7 @@ export default {
718 align: "center", 537 align: "center",
719 sorTable: false, 538 sorTable: false,
720 fixed: false, 539 fixed: false,
721 - disabled:true 540 + disabled: true
722 }, 541 },
723 { 542 {
724 name: "大货预审时间", 543 name: "大货预审时间",
...@@ -727,7 +546,7 @@ export default { ...@@ -727,7 +546,7 @@ export default {
727 align: "center", 546 align: "center",
728 sorTable: false, 547 sorTable: false,
729 fixed: false, 548 fixed: false,
730 - disabled:true 549 + disabled: true
731 }, 550 },
732 { 551 {
733 name: "海关回执时间", 552 name: "海关回执时间",
...@@ -736,7 +555,7 @@ export default { ...@@ -736,7 +555,7 @@ export default {
736 align: "center", 555 align: "center",
737 sorTable: true, 556 sorTable: true,
738 fixed: false, 557 fixed: false,
739 - disabled:true 558 + disabled: true
740 }, 559 },
741 { 560 {
742 name: "航班预审时间", 561 name: "航班预审时间",
...@@ -745,7 +564,7 @@ export default { ...@@ -745,7 +564,7 @@ export default {
745 align: "center", 564 align: "center",
746 sorTable: true, 565 sorTable: true,
747 fixed: false, 566 fixed: false,
748 - disabled:true 567 + disabled: true
749 }, 568 },
750 { 569 {
751 name: "创建人", 570 name: "创建人",
...@@ -754,7 +573,7 @@ export default { ...@@ -754,7 +573,7 @@ export default {
754 align: "center", 573 align: "center",
755 sorTable: true, 574 sorTable: true,
756 fixed: false, 575 fixed: false,
757 - disabled:true 576 + disabled: true
758 }, 577 },
759 { 578 {
760 name: "创建时间", 579 name: "创建时间",
...@@ -763,7 +582,7 @@ export default { ...@@ -763,7 +582,7 @@ export default {
763 align: "center", 582 align: "center",
764 sorTable: true, 583 sorTable: true,
765 fixed: false, 584 fixed: false,
766 - disabled:true 585 + disabled: true
767 }, 586 },
768 ], //表头数据 587 ], //表头数据
769 tableData: [], //表格数据 588 tableData: [], //表格数据
...@@ -785,7 +604,7 @@ export default { ...@@ -785,7 +604,7 @@ export default {
785 size: 100, 604 size: 100,
786 allWeight: 0, 605 allWeight: 0,
787 allQty: 0, 606 allQty: 0,
788 - tableHeight:null, 607 + tableHeight: null,
789 dialogVisible: false, 608 dialogVisible: false,
790 shiftKey: false, 609 shiftKey: false,
791 createDate: null, 610 createDate: null,
...@@ -798,14 +617,14 @@ export default { ...@@ -798,14 +617,14 @@ export default {
798 }, 617 },
799 created() { 618 created() {
800 this.seleData(); 619 this.seleData();
801 - if(this.$store.state.tagsView.cachedViews.length == 0){ 620 + if (this.$store.state.tagsView.cachedViews.length == 0) {
802 this.select(); 621 this.select();
803 } 622 }
804 }, 623 },
805 - activated(){ 624 + activated() {
806 this.select(); 625 this.select();
807 }, 626 },
808 - deactivated(){ 627 + deactivated() {
809 this.tableData = [] 628 this.tableData = []
810 }, 629 },
811 mounted() { 630 mounted() {
...@@ -819,7 +638,7 @@ export default { ...@@ -819,7 +638,7 @@ export default {
819 this.shiftKey = false; 638 this.shiftKey = false;
820 } 639 }
821 }); 640 });
822 - this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight-60 641 + this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60
823 }, 642 },
824 methods: { 643 methods: {
825 //查询条件 644 //查询条件
...@@ -829,33 +648,33 @@ export default { ...@@ -829,33 +648,33 @@ export default {
829 if (res.code === 200) { 648 if (res.code === 200) {
830 this.selectData.HandlingCode = res.data.handlingCode; 649 this.selectData.HandlingCode = res.data.handlingCode;
831 this.selectData.SubCategory = res.data.subCategory; 650 this.selectData.SubCategory = res.data.subCategory;
832 - }else{ 651 + } else {
833 this.$message({ 652 this.$message({
834 message: "查询条件不存在", 653 message: "查询条件不存在",
835 type: "warning", 654 type: "warning",
836 }); 655 });
837 } 656 }
838 }) 657 })
839 - .catch(() => {}); 658 + .catch(() => { });
840 659
841 findConditionData() 660 findConditionData()
842 .then((res) => { 661 .then((res) => {
843 if (res.code == 200) { 662 if (res.code == 200) {
844 this.selectData.findConditionData = res.data; 663 this.selectData.findConditionData = res.data;
845 - }else{ 664 + } else {
846 this.$message({ 665 this.$message({
847 message: "查询条件不存在", 666 message: "查询条件不存在",
848 type: "warning", 667 type: "warning",
849 }); 668 });
850 } 669 }
851 }) 670 })
852 - .catch(() => {}); 671 + .catch(() => { });
853 }, 672 },
854 //查询 673 //查询
855 async select(val) { 674 async select(val) {
856 this.loading = true; 675 this.loading = true;
857 this.dataInfo(); 676 this.dataInfo();
858 - if(val === 0){ 677 + if (val === 0) {
859 this.page = 1; 678 this.page = 1;
860 this.formData.page = 1; 679 this.formData.page = 1;
861 } 680 }
...@@ -944,7 +763,7 @@ export default { ...@@ -944,7 +763,7 @@ export default {
944 } 763 }
945 this.formData.page = this.page; 764 this.formData.page = this.page;
946 this.formData.size = this.size; 765 this.formData.size = this.size;
947 - if(this.formData.waybillNo){ 766 + if (this.formData.waybillNo) {
948 this.formData.waybillNo = this.formData.waybillNo.trim(); 767 this.formData.waybillNo = this.formData.waybillNo.trim();
949 } 768 }
950 }, 769 },
...@@ -1005,7 +824,7 @@ export default { ...@@ -1005,7 +824,7 @@ export default {
1005 data = data.sort(this.$refs.newTables.compare(val.prop, val.order)); 824 data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
1006 if (val.order == "descending") { 825 if (val.order == "descending") {
1007 this.tableData = nullData.concat(data); 826 this.tableData = nullData.concat(data);
1008 - } else{ 827 + } else {
1009 this.tableData = data.concat(nullData); 828 this.tableData = data.concat(nullData);
1010 } 829 }
1011 this.tableSelection = [] 830 this.tableSelection = []
...@@ -1014,7 +833,7 @@ export default { ...@@ -1014,7 +833,7 @@ export default {
1014 // item.index = index; 833 // item.index = index;
1015 // }); 834 // });
1016 }, 835 },
1017 - sizeChange(val){ 836 + sizeChange(val) {
1018 this.size = val 837 this.size = val
1019 this.select(0); 838 this.select(0);
1020 }, 839 },
...@@ -1078,18 +897,22 @@ export default { ...@@ -1078,18 +897,22 @@ export default {
1078 margin-top: 10px; 897 margin-top: 10px;
1079 margin-left: 50px; 898 margin-left: 50px;
1080 } 899 }
900 +
1081 .line { 901 .line {
1082 text-align: center; 902 text-align: center;
1083 } 903 }
904 +
1084 .el-empty { 905 .el-empty {
1085 width: 30%; 906 width: 30%;
1086 height: 37px; 907 height: 37px;
1087 padding: 0px; 908 padding: 0px;
1088 line-height: 37px; 909 line-height: 37px;
910 +
1089 .el-empty__image { 911 .el-empty__image {
1090 width: 0px; 912 width: 0px;
1091 height: 0px; 913 height: 0px;
1092 } 914 }
915 +
1093 .el-empty__description { 916 .el-empty__description {
1094 margin-top: 0px; 917 margin-top: 0px;
1095 } 918 }
......
...@@ -5,31 +5,16 @@ ...@@ -5,31 +5,16 @@
5 <el-button size="small" @click="close">返回</el-button> 5 <el-button size="small" @click="close">返回</el-button>
6 </div> 6 </div>
7 <template v-else> 7 <template v-else>
8 - <el-form 8 + <el-form ref="form" :model="form" label-width="200px" size="small" :disabled="disable" :rules="rules">
9 - ref="form"
10 - :model="form"
11 - label-width="200px"
12 - size="small"
13 - :disabled="disable"
14 - :rules="rules"
15 - >
16 <el-row :gutter="20"> 9 <el-row :gutter="20">
17 <el-col :span="12"> 10 <el-col :span="12">
18 <el-form-item label="航班号" prop="purposeOfFlightNo"> 11 <el-form-item label="航班号" prop="purposeOfFlightNo">
19 - <el-input 12 + <el-input v-model.trim="form.purposeOfFlightNo" style="width: 60%" :disabled="nameDisabled"></el-input>
20 - v-model.trim="form.purposeOfFlightNo"
21 - style="width: 60%"
22 - :disabled="nameDisabled"
23 - ></el-input>
24 </el-form-item> 13 </el-form-item>
25 </el-col> 14 </el-col>
26 <el-col :span="12"> 15 <el-col :span="12">
27 <el-form-item label="航班预审" prop="isNeedRequired"> 16 <el-form-item label="航班预审" prop="isNeedRequired">
28 - <el-switch 17 + <el-switch v-model="isNeedRequired" :active-value="1" :inactive-value="0">
29 - v-model="isNeedRequired"
30 - :active-value="1"
31 - :inactive-value="0"
32 - >
33 </el-switch> 18 </el-switch>
34 </el-form-item> 19 </el-form-item>
35 </el-col> 20 </el-col>
...@@ -37,86 +22,45 @@ ...@@ -37,86 +22,45 @@
37 <el-form-item> 22 <el-form-item>
38 <el-row :gutter="20"> 23 <el-row :gutter="20">
39 <el-col :span="6"> 24 <el-col :span="6">
40 - <el-radio v-model="isLocation" label="1" size="mini" 25 + <el-radio v-model="isLocation" label="1" size="mini">站点包含</el-radio>
41 - >站点包含</el-radio 26 + <el-radio v-model="isLocation" label="2" size="mini">站点不包含</el-radio>
42 - >
43 - <el-radio v-model="isLocation" label="2" size="mini"
44 - >站点不包含</el-radio
45 - >
46 </el-col> 27 </el-col>
47 <el-col :span="6"> 28 <el-col :span="6">
48 - <el-alert 29 + <el-alert title="提示：站点之间用回车符分隔" type="warning" show-icon size="mini" :closable="false"
49 - title="提示：站点之间用回车符分隔" 30 + style="height: 30px; width: fit-content">
50 - type="warning"
51 - show-icon
52 - size="mini"
53 - :closable="false"
54 - style="height: 30px; width: fit-content"
55 - >
56 </el-alert> 31 </el-alert>
57 </el-col> 32 </el-col>
58 </el-row> 33 </el-row>
59 </el-form-item> 34 </el-form-item>
60 35
61 <el-form-item label="站点包含" v-show="isLocation == 1"> 36 <el-form-item label="站点包含" v-show="isLocation == 1">
62 - <el-input 37 + <el-input type="textarea" v-model="form.location" :rows="6" resize="none" style="width: 600px"></el-input>
63 - type="textarea"
64 - v-model="form.location"
65 - :rows="6"
66 - resize="none"
67 - style="width: 600px"
68 - ></el-input>
69 </el-form-item> 38 </el-form-item>
70 <el-form-item label="站点不包含" v-show="isLocation == 2"> 39 <el-form-item label="站点不包含" v-show="isLocation == 2">
71 - <el-input 40 + <el-input type="textarea" v-model="form.notLocation" :rows="6" resize="none" style="width: 600px"></el-input>
72 - type="textarea"
73 - v-model="form.notLocation"
74 - :rows="6"
75 - resize="none"
76 - style="width: 600px"
77 - ></el-input>
78 </el-form-item> 41 </el-form-item>
79 42
80 <el-form-item> 43 <el-form-item>
81 - <el-alert 44 + <el-alert title="提示：URSA之间用分号分隔，例：F2;F3;P_" type="warning" show-icon size="mini" :closable="false"
82 - title="提示：URSA之间用分号分隔，例：F2;F3;P_" 45 + style="height: 30px; width: fit-content">
83 - type="warning"
84 - show-icon
85 - size="mini"
86 - :closable="false"
87 - style="height: 30px; width: fit-content"
88 - >
89 </el-alert> 46 </el-alert>
90 </el-form-item> 47 </el-form-item>
91 <el-row :gutter="20"> 48 <el-row :gutter="20">
92 <el-col :span="10"> 49 <el-col :span="10">
93 <el-form-item label="URSA包含"> 50 <el-form-item label="URSA包含">
94 - <el-input 51 + <el-input type="textarea" v-model.trim="form.includeUrsa" :rows="6" resize="none"></el-input>
95 - type="textarea"
96 - v-model.trim="form.includeUrsa"
97 - :rows="6"
98 - resize="none"
99 - ></el-input>
100 </el-form-item> 52 </el-form-item>
101 </el-col> 53 </el-col>
102 <el-col :span="10"> 54 <el-col :span="10">
103 <el-form-item label="URSA不包含"> 55 <el-form-item label="URSA不包含">
104 - <el-input 56 + <el-input type="textarea" v-model.trim="form.notIncludeUrsa" :rows="6" resize="none"></el-input>
105 - type="textarea"
106 - v-model.trim="form.notIncludeUrsa"
107 - :rows="6"
108 - resize="none"
109 - ></el-input>
110 </el-form-item> 57 </el-form-item>
111 </el-col> 58 </el-col>
112 </el-row> 59 </el-row>
113 60
114 <el-form-item label="件数"> 61 <el-form-item label="件数">
115 <el-col :span="3"> 62 <el-col :span="3">
116 - <el-input 63 + <el-input class="numberInput" v-model.trim="minNumOfPieces"></el-input>
117 - class="numberInput"
118 - v-model.trim="minNumOfPieces"
119 - ></el-input>
120 <!-- <el-input-number 64 <!-- <el-input-number
121 v-model="minNumOfPieces" 65 v-model="minNumOfPieces"
122 :precision="0" 66 :precision="0"
...@@ -126,10 +70,7 @@ ...@@ -126,10 +70,7 @@
126 </el-col> 70 </el-col>
127 <el-col style="text-align: center" :span="1">-</el-col> 71 <el-col style="text-align: center" :span="1">-</el-col>
128 <el-col :span="3"> 72 <el-col :span="3">
129 - <el-input 73 + <el-input class="numberInput" v-model.trim="maxNumOfPieces"></el-input>
130 - class="numberInput"
131 - v-model.trim="maxNumOfPieces"
132 - ></el-input>
133 <!-- <el-input-number 74 <!-- <el-input-number
134 v-model=" 75 v-model="
135 form.maxNumOfPieces == 0 76 form.maxNumOfPieces == 0
...@@ -180,10 +121,7 @@ ...@@ -180,10 +121,7 @@
180 <el-checkbox-group v-model="form.typeOfGoods"> 121 <el-checkbox-group v-model="form.typeOfGoods">
181 <el-row> 122 <el-row>
182 <el-col :span="2" v-for="item in cargoType" :key="item.id"> 123 <el-col :span="2" v-for="item in cargoType" :key="item.id">
183 - <el-checkbox 124 + <el-checkbox :label="item.chineseName" :name="item.chineseName">
184 - :label="item.chineseName"
185 - :name="item.chineseName"
186 - >
187 </el-checkbox> 125 </el-checkbox>
188 </el-col> 126 </el-col>
189 </el-row> 127 </el-row>
...@@ -196,11 +134,7 @@ ...@@ -196,11 +134,7 @@
196 <el-checkbox-group v-model="form.declarationCategory"> 134 <el-checkbox-group v-model="form.declarationCategory">
197 <el-row> 135 <el-row>
198 <el-col :span="3" v-for="item in cargoStatus" :key="item.id"> 136 <el-col :span="3" v-for="item in cargoStatus" :key="item.id">
199 - <el-checkbox 137 + <el-checkbox :label="item.chineseName" :name="item.chineseName" disabled></el-checkbox>
200 - :label="item.chineseName"
201 - :name="item.chineseName"
202 - disabled
203 - ></el-checkbox>
204 </el-col> 138 </el-col>
205 </el-row> 139 </el-row>
206 </el-checkbox-group> 140 </el-checkbox-group>
...@@ -212,10 +146,7 @@ ...@@ -212,10 +146,7 @@
212 <el-checkbox-group v-model="form.serviceCode"> 146 <el-checkbox-group v-model="form.serviceCode">
213 <el-row> 147 <el-row>
214 <el-col :span="2" v-for="item in serviceCode" :key="item.id"> 148 <el-col :span="2" v-for="item in serviceCode" :key="item.id">
215 - <el-checkbox 149 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
216 - :label="item.englishName"
217 - :name="item.englishName"
218 - ></el-checkbox>
219 </el-col> 150 </el-col>
220 </el-row> 151 </el-row>
221 </el-checkbox-group> 152 </el-checkbox-group>
...@@ -227,10 +158,7 @@ ...@@ -227,10 +158,7 @@
227 <el-checkbox-group v-model="form.handlingCode"> 158 <el-checkbox-group v-model="form.handlingCode">
228 <el-row> 159 <el-row>
229 <el-col :span="3" v-for="item in handlingCode" :key="item.id"> 160 <el-col :span="3" v-for="item in handlingCode" :key="item.id">
230 - <el-checkbox 161 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
231 - :label="item.englishName"
232 - :name="item.englishName"
233 - ></el-checkbox>
234 </el-col> 162 </el-col>
235 </el-row> 163 </el-row>
236 </el-checkbox-group> 164 </el-checkbox-group>
...@@ -242,10 +170,7 @@ ...@@ -242,10 +170,7 @@
242 <el-checkbox-group v-model="form.subCategory"> 170 <el-checkbox-group v-model="form.subCategory">
243 <el-row> 171 <el-row>
244 <el-col :span="3" v-for="item in subCategory" :key="item.id"> 172 <el-col :span="3" v-for="item in subCategory" :key="item.id">
245 - <el-checkbox 173 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
246 - :label="item.englishName"
247 - :name="item.englishName"
248 - ></el-checkbox>
249 </el-col> 174 </el-col>
250 </el-row> 175 </el-row>
251 </el-checkbox-group> 176 </el-checkbox-group>
...@@ -254,13 +179,8 @@ ...@@ -254,13 +179,8 @@
254 179
255 </el-form> 180 </el-form>
256 <div style="marginleft: 200px"> 181 <div style="marginleft: 200px">
257 - <el-button 182 + <el-button type="primary" size="small" v-if="$route.params.handle != 'detail'" @click="submit('form')"
258 - type="primary" 183 + :loading="btnLoading">
259 - size="small"
260 - v-if="$route.params.handle != 'detail'"
261 - @click="submit('form')"
262 - :loading="btnLoading"
263 - >
264 <span v-if="$route.params.handle === 'add'">添加</span> 184 <span v-if="$route.params.handle === 'add'">添加</span>
265 <span v-else>保存</span> 185 <span v-else>保存</span>
266 </el-button> 186 </el-button>
...@@ -279,7 +199,7 @@ import { ...@@ -279,7 +199,7 @@ import {
279 } from "@/api/destinationFlight"; 199 } from "@/api/destinationFlight";
280 200
281 export default { 201 export default {
282 - name:"", 202 + name: "",
283 data() { 203 data() {
284 return { 204 return {
285 form: { 205 form: {
...@@ -319,9 +239,9 @@ export default { ...@@ -319,9 +239,9 @@ export default {
319 btnLoading: false, 239 btnLoading: false,
320 loading: true, 240 loading: true,
321 isEmpty: false, 241 isEmpty: false,
322 - routeName:"", 242 + routeName: "",
323 - dataId:"", 243 + dataId: "",
324 - handleName:"" 244 + handleName: ""
325 }; 245 };
326 }, 246 },
327 methods: { 247 methods: {
...@@ -361,7 +281,7 @@ export default { ...@@ -361,7 +281,7 @@ export default {
361 this.formHandlingCode = this.form.handlingCode; 281 this.formHandlingCode = this.form.handlingCode;
362 this.formSubCategory = this.form.subCategory; 282 this.formSubCategory = this.form.subCategory;
363 this.form.isNeedRequired = this.isNeedRequired; 283 this.form.isNeedRequired = this.isNeedRequired;
364 - if(this.form.purposeOfFlightNo){ 284 + if (this.form.purposeOfFlightNo) {
365 this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase(); 285 this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
366 } 286 }
367 if (this.isLocation == 1) { 287 if (this.isLocation == 1) {
...@@ -442,7 +362,7 @@ export default { ...@@ -442,7 +362,7 @@ export default {
442 ), 362 ),
443 1 363 1
444 ); 364 );
445 - this.$router.push({name:"FlightAllocConfig"}) 365 + this.$router.push({ name: "FlightAllocConfig" })
446 // this.$router.push( 366 // this.$router.push(
447 // this.$store.state.tagsView.visitedViews[ 367 // this.$store.state.tagsView.visitedViews[
448 // this.$store.state.tagsView.visitedViews.length - 1 368 // this.$store.state.tagsView.visitedViews.length - 1
...@@ -450,15 +370,15 @@ export default { ...@@ -450,15 +370,15 @@ export default {
450 // ); 370 // );
451 }, 371 },
452 372
453 - removes(){ 373 + removes() {
454 - if(this.routeName == "FlightAllocConfigAdd"){ 374 + if (this.routeName == "FlightAllocConfigAdd") {
455 - sessionStorage.setItem("flightAdd","remove") 375 + sessionStorage.setItem("flightAdd", "remove")
456 - }else{ 376 + } else {
457 - sessionStorage.setItem("flightInfo"+this.dataId,"remove") 377 + sessionStorage.setItem("flightInfo" + this.dataId, "remove")
458 } 378 }
459 }, 379 },
460 380
461 - async dictData(){ 381 + async dictData() {
462 allDictData().then((response) => { 382 allDictData().then((response) => {
463 if (response.code != 200) { 383 if (response.code != 200) {
464 this.$message({ 384 this.$message({
...@@ -481,21 +401,21 @@ export default { ...@@ -481,21 +401,21 @@ export default {
481 } 401 }
482 }, 402 },
483 403
484 - beforeDestroy(){ 404 + beforeDestroy() {
485 - if(this.routeName == "FlightAllocConfigAdd"){ 405 + if (this.routeName == "FlightAllocConfigAdd") {
486 - if(sessionStorage.getItem("flightAdd") == "remove"){ 406 + if (sessionStorage.getItem("flightAdd") == "remove") {
487 sessionStorage.removeItem("flightAdd") 407 sessionStorage.removeItem("flightAdd")
488 - }else{ 408 + } else {
489 this.form.isNeedRequired = this.isNeedRequired 409 this.form.isNeedRequired = this.isNeedRequired
490 - sessionStorage.setItem("flightAdd",JSON.stringify(this.form)) 410 + sessionStorage.setItem("flightAdd", JSON.stringify(this.form))
491 } 411 }
492 - }else{ 412 + } else {
493 - if(sessionStorage.getItem("flightInfo"+this.dataId) == "remove"){ 413 + if (sessionStorage.getItem("flightInfo" + this.dataId) == "remove") {
494 - sessionStorage.removeItem("flightInfo"+this.dataId) 414 + sessionStorage.removeItem("flightInfo" + this.dataId)
495 - }else{ 415 + } else {
496 - if(this.handleName == "detail"){ 416 + if (this.handleName == "detail") {
497 this.form.isNeedRequired = this.isNeedRequired 417 this.form.isNeedRequired = this.isNeedRequired
498 - sessionStorage.setItem("flightInfo"+this.dataId,JSON.stringify(this.form)) 418 + sessionStorage.setItem("flightInfo" + this.dataId, JSON.stringify(this.form))
499 } 419 }
500 } 420 }
501 } 421 }
...@@ -514,59 +434,59 @@ export default { ...@@ -514,59 +434,59 @@ export default {
514 if (handle != "add") { 434 if (handle != "add") {
515 this.nameDisabled = true; 435 this.nameDisabled = true;
516 let id = this.$route.params.id; 436 let id = this.$route.params.id;
517 - if(sessionStorage.getItem("flightInfo"+id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail"){ 437 + if (sessionStorage.getItem("flightInfo" + id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail") {
518 this.loading = false 438 this.loading = false
519 - this.form = JSON.parse(sessionStorage.getItem("flightInfo"+this.$route.params.id)) 439 + this.form = JSON.parse(sessionStorage.getItem("flightInfo" + this.$route.params.id))
520 this.isNeedRequired = this.form.isNeedRequired; 440 this.isNeedRequired = this.form.isNeedRequired;
521 - if(this.form.notLocation != null || this.form.notLocation == ""){ 441 + if (this.form.notLocation != null || this.form.notLocation == "") {
522 this.isLocation = "2"; 442 this.isLocation = "2";
523 - }else{ 443 + } else {
524 this.isLocation = "1"; 444 this.isLocation = "1";
525 } 445 }
526 - }else{ 446 + } else {
527 if (isNaN(Number(id))) { 447 if (isNaN(Number(id))) {
528 - findDestinationFltRuleByActualFlight(id).then((response) => { 448 + findDestinationFltRuleByActualFlight(id).then((response) => {
529 - if (response.code != 200) { 449 + if (response.code != 200) {
530 - this.$message({ 450 + this.$message({
531 - showClose: true, 451 + showClose: true,
532 - message: response.msg, 452 + message: response.msg,
533 - type: "error", 453 + type: "error",
534 - }); 454 + });
535 - this.isEmpty = true; 455 + this.isEmpty = true;
536 - } else if (response.data == null) { 456 + } else if (response.data == null) {
537 - this.isEmpty = true; 457 + this.isEmpty = true;
538 - } else {
539 - let info = response.data;
540 - info.typeOfGoods = info.typeOfGoods
541 - ? info.typeOfGoods.split(";")
542 - : [];
543 - info.declarationCategory = info.declarationCategory
544 - ? info.declarationCategory.split(";")
545 - : [];
546 - info.serviceCode = info.serviceCode
547 - ? info.serviceCode.split(";")
548 - : [];
549 - info.handlingCode = info.handlingCode
550 - ? info.handlingCode.split(";")
551 - : [];
552 - info.subCategory = info.subCategory
553 - ? info.subCategory.split(";")
554 - : [];
555 - this.form = info;
556 - if (info.notLocation != null || info.notLocation == "") {
557 - this.isLocation = "2";
558 } else { 458 } else {
559 - this.isLocation = "1"; 459 + let info = response.data;
460 + info.typeOfGoods = info.typeOfGoods
461 + ? info.typeOfGoods.split(";")
462 + : [];
463 + info.declarationCategory = info.declarationCategory
464 + ? info.declarationCategory.split(";")
465 + : [];
466 + info.serviceCode = info.serviceCode
467 + ? info.serviceCode.split(";")
468 + : [];
469 + info.handlingCode = info.handlingCode
470 + ? info.handlingCode.split(";")
471 + : [];
472 + info.subCategory = info.subCategory
473 + ? info.subCategory.split(";")
474 + : [];
475 + this.form = info;
476 + if (info.notLocation != null || info.notLocation == "") {
477 + this.isLocation = "2";
478 + } else {
479 + this.isLocation = "1";
480 + }
481 + this.isNeedRequired = info.isNeedRequired;
560 } 482 }
561 - this.isNeedRequired = info.isNeedRequired; 483 + this.loading = false;
562 - } 484 + }).catch(() => {
563 - this.loading = false;
564 - }).catch(()=>{
565 this.loading = false; 485 this.loading = false;
566 }) 486 })
567 - } else { 487 + } else {
568 - //货物信息 488 + //货物信息
569 - findByFlightId(id).then((response) => { 489 + findByFlightId(id).then((response) => {
570 if (response.code != 200) { 490 if (response.code != 200) {
571 this.$message({ 491 this.$message({
572 showClose: true, 492 showClose: true,
...@@ -602,7 +522,7 @@ export default { ...@@ -602,7 +522,7 @@ export default {
602 this.isNeedRequired = isNeedRequired; 522 this.isNeedRequired = isNeedRequired;
603 } 523 }
604 this.loading = false; 524 this.loading = false;
605 - }).catch(()=>{ 525 + }).catch(() => {
606 this.loading = false; 526 this.loading = false;
607 }) 527 })
608 } 528 }
...@@ -610,13 +530,13 @@ export default { ...@@ -610,13 +530,13 @@ export default {
610 } else { 530 } else {
611 this.loading = false; 531 this.loading = false;
612 } 532 }
613 - if(this.$route.name == "FlightAllocConfigAdd"){ 533 + if (this.$route.name == "FlightAllocConfigAdd") {
614 - if(sessionStorage.getItem("flightAdd")){ 534 + if (sessionStorage.getItem("flightAdd")) {
615 this.form = JSON.parse(sessionStorage.getItem("flightAdd")) 535 this.form = JSON.parse(sessionStorage.getItem("flightAdd"))
616 this.isNeedRequired = this.form.isNeedRequired; 536 this.isNeedRequired = this.form.isNeedRequired;
617 - if(this.form.notLocation != null || this.form.notLocation == ""){ 537 + if (this.form.notLocation != null || this.form.notLocation == "") {
618 this.isLocation = "2"; 538 this.isLocation = "2";
619 - }else{ 539 + } else {
620 this.isLocation = "1"; 540 this.isLocation = "1";
621 } 541 }
622 } 542 }
...@@ -689,7 +609,7 @@ export default { ...@@ -689,7 +609,7 @@ export default {
689 background-color: rgba(255, 255, 255, 0.5); 609 background-color: rgba(255, 255, 255, 0.5);
690 } 610 }
691 611
692 -.el-checkbox__input.is-disabled + span.el-checkbox__label { 612 +.el-checkbox__input.is-disabled+span.el-checkbox__label {
693 color: #303133; 613 color: #303133;
694 } 614 }
695 615
...@@ -700,6 +620,7 @@ export default { ...@@ -700,6 +620,7 @@ export default {
700 .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { 620 .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
701 border-color: #606266; 621 border-color: #606266;
702 } 622 }
623 +
703 .numberInput { 624 .numberInput {
704 input { 625 input {
705 text-align: center; 626 text-align: center;
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true"
4 - class="form-header" 4 + label-position="right" label-width="auto">
5 - :model="queryParams"
6 - ref="queryForm"
7 - size="medium"
8 - :inline="true"
9 - label-position="right"
10 - label-width="auto"
11 - >
12 <el-form-item label="原航班"> 5 <el-form-item label="原航班">
13 - <el-input 6 + <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
14 - type="text"
15 - v-model="upCase"
16 - placeholder="请输入原航班"
17 - clearable
18 - ></el-input>
19 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> --> 7 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
20 </el-form-item> 8 </el-form-item>
21 <el-form-item label="状态" prop="status"> 9 <el-form-item label="状态" prop="status">
22 <el-select v-model="queryParams.status" placeholder="请选择" clearable> 10 <el-select v-model="queryParams.status" placeholder="请选择" clearable>
23 - <el-option 11 + <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
24 - v-for="dict in statusList"
25 - :key="dict.id"
26 - :label="dict.name"
27 - :value="dict.id"
28 - />
29 </el-select> 12 </el-select>
30 </el-form-item> 13 </el-form-item>
31 14
32 <el-form-item> 15 <el-form-item>
33 - <el-button 16 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
34 - type="primary"
35 - icon="el-icon-search"
36 - size="mini"
37 - @click="handleQuery"
38 - >查询原航班配置</el-button
39 - >
40 </el-form-item> 17 </el-form-item>
41 <br /> 18 <br />
42 <el-form-item label="日期" prop="flightDate"> 19 <el-form-item label="日期" prop="flightDate">
43 - <el-date-picker 20 + <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期">
44 - value-format="yyyy-MM-dd"
45 - v-model="queryParams.flightDate"
46 - type="date"
47 - placeholder="选择日期"
48 - >
49 </el-date-picker> 21 </el-date-picker>
50 </el-form-item> 22 </el-form-item>
51 23
52 <el-form-item> 24 <el-form-item>
53 - <el-button 25 + <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
54 - type="primary" 26 + </el-button>&#12288;
55 - icon="el-icon-search"
56 - size="mini"
57 - @click="findSourceFlightAndFlightDate"
58 - >查询实际配载航班 </el-button
59 - >&#12288;
60 <span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span> 27 <span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span>
61 </el-form-item> 28 </el-form-item>
62 <br /> 29 <br />
63 <el-form-item> 30 <el-form-item>
64 - <el-button 31 + <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:rand:add']"
65 - type="primary" 32 + @click="handleAdd">添加规则</el-button>
66 - icon="el-icon-plus" 33 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
67 - size="mini"
68 - v-hasPermi="['allocation:rand:add']"
69 - @click="handleAdd"
70 - >添加规则</el-button
71 - >
72 - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
73 - >重置</el-button
74 - >
75 </el-form-item> 34 </el-form-item>
76 </el-form> 35 </el-form>
77 36
78 - <el-table 37 + <el-table v-loading="loading" height="550" size="small" :data="sourceFlightRulesList" highlight-current-row border
79 - v-loading="loading" 38 + stripe>
80 - height="550"
81 - size="small"
82 - :data="sourceFlightRulesList"
83 - highlight-current-row
84 - border
85 - stripe
86 - >
87 <el-table-column type="index" label="序号" align="center"> 39 <el-table-column type="index" label="序号" align="center">
88 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 40 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
89 </el-table-column> 41 </el-table-column>
90 <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 42 <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
91 - <el-table-column 43 + <el-table-column label="配载航班排序" align="center" prop="flightRank" width="280" />
92 - label="配载航班排序" 44 + <el-table-column label="周期" align="center" prop="dayOfWeek" width="180" />
93 - align="center" 45 + <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
94 - prop="flightRank" 46 + <el-table-column label="开始时间" align="center" prop="startDate" width="100" />
95 - width="280" 47 + <el-table-column label="结束时间" align="center" prop="endDate" width="100" />
96 - /> 48 + <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" />
97 - <el-table-column 49 + <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" />
98 - label="周期" 50 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
99 - align="center"
100 - prop="dayOfWeek"
101 - width="180"
102 - />
103 - <el-table-column
104 - label="状态"
105 - align="center"
106 - prop="status"
107 - :formatter="statusFormat"
108 - />
109 - <el-table-column
110 - label="开始时间"
111 - align="center"
112 - prop="startDate"
113 - width="100"
114 - />
115 - <el-table-column
116 - label="结束时间"
117 - align="center"
118 - prop="endDate"
119 - width="100"
120 - />
121 - <el-table-column
122 - label="最后修改人"
123 - align="center"
124 - prop="updateUserName"
125 - width="100"
126 - />
127 - <el-table-column
128 - label="最后修改时间"
129 - align="center"
130 - prop="updateTime"
131 - width="100"
132 - />
133 - <el-table-column
134 - label="操作"
135 - align="center"
136 - class-name="small-padding fixed-width"
137 - width="180"
138 - fixed="right"
139 - >
140 <template slot-scope="scope"> 51 <template slot-scope="scope">
141 - <el-button 52 + <el-button size="mini" type="text" icon="el-icon-edit" v-hasPermi="['allocation:rand:update']"
142 - size="mini" 53 + @click="handleUpdate(scope.row)">修改</el-button>
143 - type="text" 54 + <el-button size="mini" type="text" icon="el-icon-delete" v-hasPermi="['allocation:rand:delete']"
144 - icon="el-icon-edit" 55 + @click="handleDeleteorPlayorpause(scope.row, 0, '删除')">
145 - v-hasPermi="['allocation:rand:update']" 56 + 删除</el-button>
146 - @click="handleUpdate(scope.row)" 57 + <el-button size="mini" type="text" icon="el-icon-video-play" v-if="scope.row.status == '3'"
147 - >修改</el-button 58 + v-hasPermi="['allocation:rand:openClose']" @click="handleDeleteorPlayorpause(scope.row, 1, '启用')">启用
148 - > 59 + </el-button>
149 - <el-button 60 + <el-button size="mini" type="text" icon="el-icon-video-pause" v-if="scope.row.status != '3'"
150 - size="mini" 61 + v-hasPermi="['allocation:rand:openClose']" @click="handleDeleteorPlayorpause(scope.row, 3, '停用')">停用
151 - type="text" 62 + </el-button>
152 - icon="el-icon-delete"
153 - v-hasPermi="['allocation:rand:delete']"
154 - @click="handleDeleteorPlayorpause(scope.row, 0, '删除')"
155 - >
156 - 删除</el-button
157 - >
158 - <el-button
159 - size="mini"
160 - type="text"
161 - icon="el-icon-video-play"
162 - v-if="scope.row.status == '3'"
163 - v-hasPermi="['allocation:rand:openClose']"
164 - @click="handleDeleteorPlayorpause(scope.row, 1, '启用')"
165 - >启用</el-button
166 - >
167 - <el-button
168 - size="mini"
169 - type="text"
170 - icon="el-icon-video-pause"
171 - v-if="scope.row.status != '3'"
172 - v-hasPermi="['allocation:rand:openClose']"
173 - @click="handleDeleteorPlayorpause(scope.row, 3, '停用')"
174 - >停用</el-button
175 - >
176 </template> 63 </template>
177 </el-table-column> 64 </el-table-column>
178 </el-table> 65 </el-table>
179 66
180 - <pagination 67 + <pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
181 - v-show="total > 0" 68 + :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
182 - :total="total"
183 - layout=" prev, pager, next, jumper, sizes,total"
184 - :page.sync="queryParams.pageNum"
185 - :limit.sync="queryParams.limit"
186 - @pagination="findSourceFlightRules"
187 - />
188 69
189 <!-- 查看目的航班对话框 --> 70 <!-- 查看目的航班对话框 -->
190 - <el-dialog 71 + <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"
191 - title="实际配载航班" 72 + :append-to-body="true">
192 - :visible.sync="openFlightDate"
193 - width="70%"
194 - :close-on-click-modal="false"
195 - :append-to-body="true"
196 - >
197 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate"> 73 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
198 <el-table-column type="index" label="序号" align="center"> 74 <el-table-column type="index" label="序号" align="center">
199 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 75 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
200 </el-table-column> 76 </el-table-column>
201 <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 77 <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
202 - <el-table-column 78 + <el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" />
203 - label="实际配载航班"
204 - align="center"
205 - prop="actualFlight"
206 - width="280"
207 - />
208 <el-table-column label="航班日期" align="center" prop="flightDate" /> 79 <el-table-column label="航班日期" align="center" prop="flightDate" />
209 - <el-table-column 80 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
210 - label="操作"
211 - align="center"
212 - class-name="small-padding fixed-width"
213 - width="200"
214 - >
215 <template slot-scope="scope"> 81 <template slot-scope="scope">
216 - <el-button 82 + <el-button size="mini" type="text" icon="el-icon-edit"
217 - size="mini" 83 + @click="handleClick(scope.row.actualFlight, 'detail')">查看配置维度</el-button>
218 - type="text"
219 - icon="el-icon-edit"
220 - @click="handleClick(scope.row.actualFlight, 'detail')"
221 - >查看配置维度</el-button
222 - >
223 </template> 84 </template>
224 </el-table-column> 85 </el-table-column>
225 </el-table> 86 </el-table>
...@@ -229,45 +90,19 @@ ...@@ -229,45 +90,19 @@
229 </el-dialog> 90 </el-dialog>
230 91
231 <!-- 添加或修改对话框 --> 92 <!-- 添加或修改对话框 -->
232 - <el-dialog 93 + <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
233 - :title="title" 94 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
234 - :visible.sync="open"
235 - width="55%"
236 - :append-to-body="true"
237 - :close-on-click-modal="false"
238 - >
239 - <el-form
240 - ref="form"
241 - :model="form"
242 - :rules="rules"
243 - label-position="right"
244 - label-width="auto"
245 - >
246 <el-row> 95 <el-row>
247 <el-col :span="8"> 96 <el-col :span="8">
248 <el-form-item label="原航班" prop="sourceFlightNo"> 97 <el-form-item label="原航班" prop="sourceFlightNo">
249 - <el-input 98 + <el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" maxlength="10" />
250 - v-model="form.sourceFlightNo"
251 - placeholder="请输入原航班号"
252 - maxlength="10"
253 - />
254 </el-form-item> 99 </el-form-item>
255 </el-col> 100 </el-col>
256 101
257 <el-col :span="8"> 102 <el-col :span="8">
258 <el-form-item label="口岸" prop="portName"> 103 <el-form-item label="口岸" prop="portName">
259 - <el-select 104 + <el-select :disabled="true" v-model="form.portName" size="mini" placeholder="选择口岸">
260 - :disabled="true" 105 + <el-option v-for="item in portNameList" :label="item" :value="item" :key="item">
261 - v-model="form.portName"
262 - size="mini"
263 - placeholder="选择口岸"
264 - >
265 - <el-option
266 - v-for="item in portNameList"
267 - :label="item"
268 - :value="item"
269 - :key="item"
270 - >
271 </el-option> 106 </el-option>
272 </el-select> 107 </el-select>
273 </el-form-item> 108 </el-form-item>
...@@ -276,59 +111,33 @@ ...@@ -276,59 +111,33 @@
276 <el-row> 111 <el-row>
277 <el-col :span="8"> 112 <el-col :span="8">
278 <el-form-item label="有效开始时间" prop="startDate"> 113 <el-form-item label="有效开始时间" prop="startDate">
279 - <el-date-picker 114 + <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
280 - clearable 115 + type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
281 - size="small"
282 - :picker-options="pickerOptionsStart"
283 - v-model="form.startDate"
284 - type="date"
285 - value-format="yyyy-MM-dd"
286 - placeholder="选择开始时间"
287 - >
288 </el-date-picker> 116 </el-date-picker>
289 </el-form-item> 117 </el-form-item>
290 </el-col> 118 </el-col>
291 <el-col :span="12"> 119 <el-col :span="12">
292 <el-form-item label="有效结束时间" prop="endDate"> 120 <el-form-item label="有效结束时间" prop="endDate">
293 - <el-date-picker 121 + <el-date-picker clearable size="small" :picker-options="pickerOptionsEnd" v-model="form.endDate"
294 - clearable 122 + type="date" value-format="yyyy-MM-dd" placeholder="选择结束时间">
295 - size="small"
296 - :picker-options="pickerOptionsEnd"
297 - v-model="form.endDate"
298 - type="date"
299 - value-format="yyyy-MM-dd"
300 - placeholder="选择结束时间"
301 - >
302 </el-date-picker> 123 </el-date-picker>
303 </el-form-item> 124 </el-form-item>
304 </el-col> 125 </el-col>
305 126
306 <el-col :span="24" style="margin-bottom: 5%"> 127 <el-col :span="24" style="margin-bottom: 5%">
307 - <span style="color: #ff4949; margin-left: 10%" 128 + <span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
308 - >提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span 129 + <span
309 - ><br /> 130 + style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span>
310 - <span style="color: #ff4949; margin-left: 10%"
311 - >提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span
312 - >
313 </el-col> 131 </el-col>
314 <el-col :span="24"> 132 <el-col :span="24">
315 <el-form-item label="配载航班" prop="flightRank"> 133 <el-form-item label="配载航班" prop="flightRank">
316 - <el-input 134 + <el-input type="textarea" v-model="form.flightRank" :rows="4"></el-input>
317 - type="textarea"
318 - v-model="form.flightRank"
319 - :rows="4"
320 - ></el-input>
321 </el-form-item> 135 </el-form-item>
322 </el-col> 136 </el-col>
323 <el-col :span="24"> 137 <el-col :span="24">
324 <el-form-item label="周期段"> 138 <el-form-item label="周期段">
325 <el-checkbox-group v-model="dayOfWeek"> 139 <el-checkbox-group v-model="dayOfWeek">
326 - <el-checkbox 140 + <el-checkbox v-for="item in dayOfWeekList" :key="item" :label="item" :name="item"></el-checkbox>
327 - v-for="item in dayOfWeekList"
328 - :key="item"
329 - :label="item"
330 - :name="item"
331 - ></el-checkbox>
332 </el-checkbox-group> 141 </el-checkbox-group>
333 </el-form-item> 142 </el-form-item>
334 </el-col> 143 </el-col>
...@@ -442,19 +251,19 @@ export default { ...@@ -442,19 +251,19 @@ export default {
442 created() { 251 created() {
443 this.queryParams.portName = this.$store.state.user.activePortName; 252 this.queryParams.portName = this.$store.state.user.activePortName;
444 this.portNameList = this.$store.state.user.portNames; 253 this.portNameList = this.$store.state.user.portNames;
445 - if(this.$store.state.tagsView.cachedViews.length == 0){ 254 + if (this.$store.state.tagsView.cachedViews.length == 0) {
446 this.findSourceFlightRules(); 255 this.findSourceFlightRules();
447 } 256 }
448 }, 257 },
449 - activated(){ 258 + activated() {
450 this.findSourceFlightRules(); 259 this.findSourceFlightRules();
451 }, 260 },
452 - deactivated(){ 261 + deactivated() {
453 this.sourceFlightRulesList = [] 262 this.sourceFlightRulesList = []
454 }, 263 },
455 - watch:{ 264 + watch: {
456 - open(val,oldVal){ 265 + open(val, oldVal) {
457 - if(val){ 266 + if (val) {
458 this.queryParams.portName = this.$store.state.user.activePortName; 267 this.queryParams.portName = this.$store.state.user.activePortName;
459 this.form.portName = this.$store.state.user.activePortName; 268 this.form.portName = this.$store.state.user.activePortName;
460 } 269 }
...@@ -544,7 +353,7 @@ export default { ...@@ -544,7 +353,7 @@ export default {
544 this.msgError(response.msg); 353 this.msgError(response.msg);
545 } 354 }
546 }) 355 })
547 - .catch(() => {}); 356 + .catch(() => { });
548 }, 357 },
549 /** 提交按钮 */ 358 /** 提交按钮 */
550 submitForm: function () { 359 submitForm: function () {
......
...@@ -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 },
......