Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
5e4dea0a 1 parent 5677a771

删除无用代码，样式更新

Inline Side-by-side
Showing 8 changed files with 28 additions and 341 deletions
...@@ -7,16 +7,6 @@ let ductLabels = { ...@@ -7,16 +7,6 @@ let ductLabels = {
7 "releasing": { 7 "releasing": {
8 "1": "正在释放" 8 "1": "正在释放"
9 }, 9 },
10 - // "cargoAllocationDataStatus": {
11 - // "已推送": "已推送",
12 - // "不推送": "不推送",
13 - // "已配": " ",
14 - // "待推送": "待推送",
15 - // "手动配舱": ' ',
16 - // "已释放": ' ',
17 - // "原航班配舱": ' ',
18 - // "顺位配舱": ' ',
19 - // },
20 }, 10 },
21 "menu": {//菜单设置 11 "menu": {//菜单设置
22 "menuType": { 12 "menuType": {
......
...@@ -80,9 +80,9 @@ ...@@ -80,9 +80,9 @@
80 margin-left: 20px; 80 margin-left: 20px;
81 } 81 }
82 82
83 - .el-dialog:not(.is-fullscreen) { 83 +// .el-dialog:not(.is-fullscreen) {
84 - margin-top: 6vh !important; 84 +// margin-top: 6vh !important;
85 - } 85 +// }
86 86
87 .el-table { 87 .el-table {
88 88
......
...@@ -7,31 +7,32 @@ ...@@ -7,31 +7,32 @@
7 :cell-class-name="cellClassName" :header-cell-class-name="headerCellClassName" @sort-change="sortChange" 7 :cell-class-name="cellClassName" :header-cell-class-name="headerCellClassName" @sort-change="sortChange"
8 @select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange"> 8 @select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange">
9 <!-- 多选框 --> 9 <!-- 多选框 -->
10 - <el-table-column v-if="selection" type="selection" width="50" align="center"></el-table-column> 10 + <el-table-column v-if="selection" type="selection" width="50" align="center" :fixed="true"></el-table-column>
11 <!-- 序号 --> 11 <!-- 序号 -->
12 <el-table-column type="index" width="50" align="center" :index="indexAdd"></el-table-column> 12 <el-table-column type="index" width="50" align="center" :index="indexAdd"></el-table-column>
13 <template v-for="(item, index) in headerData"> 13 <template v-for="(item, index) in headerData">
14 <!-- 自定义插槽 --> 14 <!-- 自定义插槽 -->
15 <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align" 15 <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
16 - :fixed="item.fixed" :show-overflow-tooltip="showOverflowTooltip" :sortable="item.sorTable" 16 + :fixed="item.fixed ? item.fixed : false" :show-overflow-tooltip="showOverflowTooltip"
17 - :formatter="formatter" header-align="center" :sort-orders="['descending', 'ascending', null]" 17 + :sortable="item.sorTable ? true : false" :formatter="formatter" header-align="center"
18 - :slotHeader="slotHeader" :render-header="renderHeader" :key="index"> 18 + :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
19 + :key="index">
19 <template slot-scope="scope"> 20 <template slot-scope="scope">
20 <slot :name="item.value" :row="scope.row"></slot> 21 <slot :name="item.value" :row="scope.row"></slot>
21 </template> 22 </template>
22 </el-table-column> 23 </el-table-column>
23 <!-- 默认数据 --> 24 <!-- 默认数据 -->
24 <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width" 25 <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width"
25 - :align="item.align" :fixed="item.fixed" :sortable="item.sorTable" :column-key="index.toString()" 26 + :align="item.align" :fixed="item.fixed ? item.fixed : false" :sortable="item.sorTable ? true : false"
26 - :show-overflow-tooltip="showOverflowTooltip" header-align="center" 27 + :column-key="index.toString()" :show-overflow-tooltip="showOverflowTooltip" header-align="center"
27 :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader" 28 :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
28 :formatter="formatter" :key="index"> 29 :formatter="formatter" :key="index">
29 </el-table-column> 30 </el-table-column>
30 </template> 31 </template>
31 <slot name="optionColumn"></slot> 32 <slot name="optionColumn"></slot>
32 </el-table> 33 </el-table>
33 - <el-pagination :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum" :page-sizes="pageSizes" 34 + <el-pagination v-if="pagination" :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum"
34 - background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange" 35 + :page-sizes="pageSizes" background :layout="layout" class="tablePagination" @size-change="sizeChange"
35 @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange"> 36 @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
36 </el-pagination> 37 </el-pagination>
37 </div> 38 </div>
...@@ -47,7 +48,7 @@ export default { ...@@ -47,7 +48,7 @@ export default {
47 tableName: { type: String, default: "tables" }, 48 tableName: { type: String, default: "tables" },
48 ductName: { 49 ductName: {
49 type: String, 50 type: String,
50 - default: '' 51 + default: null
51 }, 52 },
52 //表格数据 53 //表格数据
53 data: { 54 data: {
...@@ -162,6 +163,14 @@ export default { ...@@ -162,6 +163,14 @@ export default {
162 type: Boolean, 163 type: Boolean,
163 default: false, 164 default: false,
164 }, 165 },
166 + pagination: {
167 + type: Boolean,
168 + default: true
169 + },
170 + layout: {
171 + type: String,
172 + default: 'prev, pager, next, jumper, ->, sizes, total'
173 + }
165 }, 174 },
166 inheritAttrs: false, 175 inheritAttrs: false,
167 data() { 176 data() {
...@@ -184,7 +193,6 @@ export default { ...@@ -184,7 +193,6 @@ export default {
184 // align: "center", 193 // align: "center",
185 // sorTable: false, 194 // sorTable: false,
186 // fixed:false, 195 // fixed:false,
187 - // disabled:true,
188 // }, 196 // },
189 }; 197 };
190 }, 198 },
...@@ -347,9 +355,11 @@ export default { ...@@ -347,9 +355,11 @@ export default {
347 }, 355 },
348 //数据格式化 356 //数据格式化
349 formatter(row, column, cellValue, index) { 357 formatter(row, column, cellValue, index) {
350 - if (dictLabels[this.ductName][column.property]) { 358 + if (dictLabels[this.ductName]) {
351 - if (dictLabels[this.ductName][column.property][cellValue]) { 359 + if (dictLabels[this.ductName][column.property]) {
352 - return dictLabels[this.ductName][column.property][cellValue]; 360 + if (dictLabels[this.ductName][column.property][cellValue]) {
361 + return dictLabels[this.ductName][column.property][cellValue];
362 + }
353 } 363 }
354 } 364 }
355 if (column.property == "roleNames") { 365 if (column.property == "roleNames") {
...@@ -366,7 +376,7 @@ export default { ...@@ -366,7 +376,7 @@ export default {
366 376
367 <style lang="scss"> 377 <style lang="scss">
368 .tablePagination { 378 .tablePagination {
369 - margin-top: 40px; 379 + margin-top: 10px;
370 text-align: right; 380 text-align: right;
371 } 381 }
372 382
...@@ -411,7 +421,6 @@ export default { ...@@ -411,7 +421,6 @@ export default {
411 display: inline-flex; 421 display: inline-flex;
412 flex-direction: column; 422 flex-direction: column;
413 align-items: left; 423 align-items: left;
414 - cursor: pointer;
415 overflow: initial; 424 overflow: initial;
416 425
417 &:before { 426 &:before {
...@@ -435,13 +444,6 @@ export default { ...@@ -435,13 +444,6 @@ export default {
435 } 444 }
436 } 445 }
437 446
438 -.tableInfo {
439 - position: fixed;
440 - right: 30px;
441 - bottom: 100px;
442 - z-index: 99999999;
443 -}
444 -
445 .tableList { 447 .tableList {
446 width: 200px; 448 width: 200px;
447 max-height: 500px; 449 max-height: 500px;
...@@ -472,12 +474,5 @@ export default { ...@@ -472,12 +474,5 @@ export default {
472 border-radius: 0; 474 border-radius: 0;
473 background: rgba(0, 0, 0, 0.2); 475 background: rgba(0, 0, 0, 0.2);
474 } 476 }
475 -
476 -.flexList {
477 - width: 100%;
478 - display: flex;
479 - height: 20px;
480 - line-height: 20px;
481 -}
482 </style> 477 </style>
483 478
......
...@@ -216,8 +216,6 @@ export default { ...@@ -216,8 +216,6 @@ export default {
216 width: "100", 216 width: "100",
217 align: "center", 217 align: "center",
218 sorTable: true, 218 sorTable: true,
219 - fixed: false,
220 - disabled: true
221 }, 219 },
222 { 220 {
223 name: "取件日期", 221 name: "取件日期",
...@@ -225,8 +223,6 @@ export default { ...@@ -225,8 +223,6 @@ export default {
225 width: "120", 223 width: "120",
226 align: "center", 224 align: "center",
227 sorTable: true, 225 sorTable: true,
228 - fixed: false,
229 - disabled: true
230 }, 226 },
231 { 227 {
232 name: "取件扫描号", 228 name: "取件扫描号",
...@@ -234,8 +230,6 @@ export default { ...@@ -234,8 +230,6 @@ export default {
234 width: "120", 230 width: "120",
235 align: "center", 231 align: "center",
236 sorTable: true, 232 sorTable: true,
237 - fixed: false,
238 - disabled: true
239 }, 233 },
240 { 234 {
241 name: "站点", 235 name: "站点",
...@@ -243,8 +237,6 @@ export default { ...@@ -243,8 +237,6 @@ export default {
243 width: "80", 237 width: "80",
244 align: "center", 238 align: "center",
245 sorTable: true, 239 sorTable: true,
246 - fixed: false,
247 - disabled: true
248 }, 240 },
249 { 241 {
250 name: "运单号", 242 name: "运单号",
...@@ -252,8 +244,6 @@ export default { ...@@ -252,8 +244,6 @@ export default {
252 width: "120", 244 width: "120",
253 align: "center", 245 align: "center",
254 sorTable: true, 246 sorTable: true,
255 - fixed: false,
256 - disabled: true
257 }, 247 },
258 { 248 {
259 name: "总单号", 249 name: "总单号",
...@@ -261,8 +251,6 @@ export default { ...@@ -261,8 +251,6 @@ export default {
261 width: "120", 251 width: "120",
262 align: "center", 252 align: "center",
263 sorTable: true, 253 sorTable: true,
264 - fixed: false,
265 - disabled: true
266 }, 254 },
267 { 255 {
268 name: "服务类型", 256 name: "服务类型",
...@@ -270,17 +258,12 @@ export default { ...@@ -270,17 +258,12 @@ export default {
270 width: "100", 258 width: "100",
271 align: "center", 259 align: "center",
272 sorTable: true, 260 sorTable: true,
273 - fixed: false,
274 - disabled: true
275 }, 261 },
276 { 262 {
277 name: "服务代码", 263 name: "服务代码",
278 value: "serviceCode", 264 value: "serviceCode",
279 width: "100", 265 width: "100",
280 align: "center", 266 align: "center",
281 - sorTable: false,
282 - fixed: false,
283 - disabled: true
284 }, 267 },
285 { 268 {
286 name: "URSA", 269 name: "URSA",
...@@ -288,8 +271,6 @@ export default { ...@@ -288,8 +271,6 @@ export default {
288 width: "100", 271 width: "100",
289 align: "center", 272 align: "center",
290 sorTable: true, 273 sorTable: true,
291 - fixed: false,
292 - disabled: true
293 }, 274 },
294 { 275 {
295 name: "申报类型", 276 name: "申报类型",
...@@ -297,8 +278,6 @@ export default { ...@@ -297,8 +278,6 @@ export default {
297 width: "100", 278 width: "100",
298 align: "center", 279 align: "center",
299 sorTable: true, 280 sorTable: true,
300 - fixed: false,
301 - disabled: true
302 }, 281 },
303 { 282 {
304 name: "HandlingCode", 283 name: "HandlingCode",
...@@ -306,8 +285,6 @@ export default { ...@@ -306,8 +285,6 @@ export default {
306 width: "150", 285 width: "150",
307 align: "center", 286 align: "center",
308 sorTable: true, 287 sorTable: true,
309 - fixed: false,
310 - disabled: true
311 }, 288 },
312 { 289 {
313 name: "subcategory", 290 name: "subcategory",
...@@ -315,8 +292,6 @@ export default { ...@@ -315,8 +292,6 @@ export default {
315 width: "140", 292 width: "140",
316 align: "center", 293 align: "center",
317 sorTable: true, 294 sorTable: true,
318 - fixed: false,
319 - disabled: true
320 }, 295 },
321 { 296 {
322 name: "件数", 297 name: "件数",
...@@ -324,8 +299,6 @@ export default { ...@@ -324,8 +299,6 @@ export default {
324 width: "80", 299 width: "80",
325 align: "center", 300 align: "center",
326 sorTable: true, 301 sorTable: true,
327 - fixed: false,
328 - disabled: true
329 }, 302 },
330 { 303 {
331 name: "实际重量", 304 name: "实际重量",
...@@ -333,8 +306,6 @@ export default { ...@@ -333,8 +306,6 @@ export default {
333 width: "100", 306 width: "100",
334 align: "center", 307 align: "center",
335 sorTable: true, 308 sorTable: true,
336 - fixed: false,
337 - disabled: true
338 }, 309 },
339 { 310 {
340 name: "收件人国家代码", 311 name: "收件人国家代码",
...@@ -342,17 +313,12 @@ export default { ...@@ -342,17 +313,12 @@ export default {
342 width: "150", 313 width: "150",
343 align: "center", 314 align: "center",
344 sorTable: true, 315 sorTable: true,
345 - fixed: false,
346 - disabled: true
347 }, 316 },
348 { 317 {
349 name: "品名描述", 318 name: "品名描述",
350 value: "nameDescription", 319 value: "nameDescription",
351 width: "100", 320 width: "100",
352 align: "center", 321 align: "center",
353 - sorTable: false,
354 - fixed: false,
355 - disabled: true
356 }, 322 },
357 { 323 {
358 name: "海关回执状态", 324 name: "海关回执状态",
...@@ -360,8 +326,6 @@ export default { ...@@ -360,8 +326,6 @@ export default {
360 width: "140", 326 width: "140",
361 align: "center", 327 align: "center",
362 sorTable: true, 328 sorTable: true,
363 - fixed: false,
364 - disabled: true
365 }, 329 },
366 { 330 {
367 name: "预审状态", 331 name: "预审状态",
...@@ -369,8 +333,6 @@ export default { ...@@ -369,8 +333,6 @@ export default {
369 width: "100", 333 width: "100",
370 align: "center", 334 align: "center",
371 sorTable: true, 335 sorTable: true,
372 - fixed: false,
373 - disabled: true
374 }, 336 },
375 { 337 {
376 name: "航班预审意见", 338 name: "航班预审意见",
...@@ -378,8 +340,6 @@ export default { ...@@ -378,8 +340,6 @@ export default {
378 width: "120", 340 width: "120",
379 align: "center", 341 align: "center",
380 sorTable: false, 342 sorTable: false,
381 - fixed: false,
382 - disabled: true
383 }, 343 },
384 { 344 {
385 name: "货物状态", 345 name: "货物状态",
...@@ -387,8 +347,6 @@ export default { ...@@ -387,8 +347,6 @@ export default {
387 width: "100", 347 width: "100",
388 align: "center", 348 align: "center",
389 sorTable: true, 349 sorTable: true,
390 - fixed: false,
391 - disabled: true
392 }, 350 },
393 { 351 {
394 name: "终配航班号", 352 name: "终配航班号",
...@@ -396,8 +354,6 @@ export default { ...@@ -396,8 +354,6 @@ export default {
396 width: "120", 354 width: "120",
397 align: "center", 355 align: "center",
398 sorTable: true, 356 sorTable: true,
399 - fixed: false,
400 - disabled: true
401 }, 357 },
402 { 358 {
403 name: "终配航班日期", 359 name: "终配航班日期",
...@@ -405,8 +361,6 @@ export default { ...@@ -405,8 +361,6 @@ export default {
405 width: "140", 361 width: "140",
406 align: "center", 362 align: "center",
407 sorTable: true, 363 sorTable: true,
408 - fixed: false,
409 - disabled: true
410 }, 364 },
411 { 365 {
412 name: "二配航班号", 366 name: "二配航班号",
...@@ -414,8 +368,6 @@ export default { ...@@ -414,8 +368,6 @@ export default {
414 width: "120", 368 width: "120",
415 align: "center", 369 align: "center",
416 sorTable: true, 370 sorTable: true,
417 - fixed: false,
418 - disabled: true
419 }, 371 },
420 { 372 {
421 name: "二配航班日期", 373 name: "二配航班日期",
...@@ -423,8 +375,6 @@ export default { ...@@ -423,8 +375,6 @@ export default {
423 width: "150", 375 width: "150",
424 align: "center", 376 align: "center",
425 sorTable: true, 377 sorTable: true,
426 - fixed: false,
427 - disabled: true
428 }, 378 },
429 { 379 {
430 name: "预配航班号", 380 name: "预配航班号",
...@@ -432,8 +382,6 @@ export default { ...@@ -432,8 +382,6 @@ export default {
432 width: "120", 382 width: "120",
433 align: "center", 383 align: "center",
434 sorTable: true, 384 sorTable: true,
435 - fixed: false,
436 - disabled: true
437 }, 385 },
438 { 386 {
439 name: "预配航班日期", 387 name: "预配航班日期",
...@@ -441,8 +389,6 @@ export default { ...@@ -441,8 +389,6 @@ export default {
441 width: "150", 389 width: "150",
442 align: "center", 390 align: "center",
443 sorTable: true, 391 sorTable: true,
444 - fixed: false,
445 - disabled: true
446 }, 392 },
447 { 393 {
448 name: "ACCS原航班号", 394 name: "ACCS原航班号",
...@@ -450,8 +396,6 @@ export default { ...@@ -450,8 +396,6 @@ export default {
450 width: "150", 396 width: "150",
451 align: "center", 397 align: "center",
452 sorTable: true, 398 sorTable: true,
453 - fixed: false,
454 - disabled: true
455 }, 399 },
456 { 400 {
457 name: "ACCS原航班日期", 401 name: "ACCS原航班日期",
...@@ -459,8 +403,6 @@ export default { ...@@ -459,8 +403,6 @@ export default {
459 width: "150", 403 width: "150",
460 align: "center", 404 align: "center",
461 sorTable: true, 405 sorTable: true,
462 - fixed: false,
463 - disabled: true
464 }, 406 },
465 { 407 {
466 name: "ACCS原航线", 408 name: "ACCS原航线",
...@@ -468,8 +410,6 @@ export default { ...@@ -468,8 +410,6 @@ export default {
468 width: "140", 410 width: "140",
469 align: "center", 411 align: "center",
470 sorTable: true, 412 sorTable: true,
471 - fixed: false,
472 - disabled: true
473 }, 413 },
474 { 414 {
475 name: "是否RDE手工录入", 415 name: "是否RDE手工录入",
...@@ -477,8 +417,6 @@ export default { ...@@ -477,8 +417,6 @@ export default {
477 width: "170", 417 width: "170",
478 align: "center", 418 align: "center",
479 sorTable: true, 419 sorTable: true,
480 - fixed: false,
481 - disabled: true
482 }, 420 },
483 { 421 {
484 name: "是否自动", 422 name: "是否自动",
...@@ -486,44 +424,30 @@ export default { ...@@ -486,44 +424,30 @@ export default {
486 width: "100", 424 width: "100",
487 align: "center", 425 align: "center",
488 sorTable: true, 426 sorTable: true,
489 - fixed: false,
490 - disabled: true
491 }, 427 },
492 { 428 {
493 name: "发件人账号", 429 name: "发件人账号",
494 value: "shipperAccount", 430 value: "shipperAccount",
495 width: "120", 431 width: "120",
496 align: "center", 432 align: "center",
497 - sorTable: false,
498 - fixed: false,
499 - disabled: true
500 }, 433 },
501 { 434 {
502 name: "发件公司中文名称", 435 name: "发件公司中文名称",
503 value: "shipperCompany", 436 value: "shipperCompany",
504 width: "150", 437 width: "150",
505 align: "center", 438 align: "center",
506 - sorTable: false,
507 - fixed: false,
508 - disabled: true
509 }, 439 },
510 { 440 {
511 name: "始发地城市名称", 441 name: "始发地城市名称",
512 value: "originCity", 442 value: "originCity",
513 width: "130", 443 width: "130",
514 align: "center", 444 align: "center",
515 - sorTable: false,
516 - fixed: false,
517 - disabled: true
518 }, 445 },
519 { 446 {
520 name: "收件地", 447 name: "收件地",
521 value: "destinationSiteName", 448 value: "destinationSiteName",
522 width: "90", 449 width: "90",
523 align: "center", 450 align: "center",
524 - sorTable: false,
525 - fixed: false,
526 - disabled: true
527 }, 451 },
528 { 452 {
529 name: "尺寸", 453 name: "尺寸",
...@@ -531,26 +455,18 @@ export default { ...@@ -531,26 +455,18 @@ export default {
531 width: "80", 455 width: "80",
532 align: "center", 456 align: "center",
533 sorTable: true, 457 sorTable: true,
534 - fixed: false,
535 - disabled: true
536 }, 458 },
537 { 459 {
538 name: "大货预审意见（是否可以配置航班）", 460 name: "大货预审意见（是否可以配置航班）",
539 value: "bigPretrialOpinion", 461 value: "bigPretrialOpinion",
540 width: "250", 462 width: "250",
541 align: "center", 463 align: "center",
542 - sorTable: false,
543 - fixed: false,
544 - disabled: true
545 }, 464 },
546 { 465 {
547 name: "大货预审时间", 466 name: "大货预审时间",
548 value: "bigPretrialTime", 467 value: "bigPretrialTime",
549 width: "120", 468 width: "120",
550 align: "center", 469 align: "center",
551 - sorTable: false,
552 - fixed: false,
553 - disabled: true
554 }, 470 },
555 { 471 {
556 name: "海关回执时间", 472 name: "海关回执时间",
...@@ -558,8 +474,6 @@ export default { ...@@ -558,8 +474,6 @@ export default {
558 width: "150", 474 width: "150",
559 align: "center", 475 align: "center",
560 sorTable: true, 476 sorTable: true,
561 - fixed: false,
562 - disabled: true
563 }, 477 },
564 { 478 {
565 name: "航班预审时间", 479 name: "航班预审时间",
...@@ -567,8 +481,6 @@ export default { ...@@ -567,8 +481,6 @@ export default {
567 width: "150", 481 width: "150",
568 align: "center", 482 align: "center",
569 sorTable: true, 483 sorTable: true,
570 - fixed: false,
571 - disabled: true
572 }, 484 },
573 { 485 {
574 name: "创建人", 486 name: "创建人",
...@@ -576,8 +488,6 @@ export default { ...@@ -576,8 +488,6 @@ export default {
576 width: "90", 488 width: "90",
577 align: "center", 489 align: "center",
578 sorTable: true, 490 sorTable: true,
579 - fixed: false,
580 - disabled: true
581 }, 491 },
582 { 492 {
583 name: "创建时间", 493 name: "创建时间",
...@@ -585,8 +495,6 @@ export default { ...@@ -585,8 +495,6 @@ export default {
585 width: "100", 495 width: "100",
586 align: "center", 496 align: "center",
587 sorTable: true, 497 sorTable: true,
588 - fixed: false,
589 - disabled: true
590 }, 498 },
591 ], //表头数据 499 ], //表头数据
592 tableData: [], //表格数据 500 tableData: [], //表格数据
......
...@@ -308,234 +308,156 @@ export default { ...@@ -308,234 +308,156 @@ export default {
308 value: "fltDate", 308 value: "fltDate",
309 width: "100", 309 width: "100",
310 align: "center", 310 align: "center",
311 - sorTable: false,
312 - fixed: false,
313 - disabled: true,
314 }, 311 },
315 { 312 {
316 name: "航班起飞时间", 313 name: "航班起飞时间",
317 value: "takeOffTime", 314 value: "takeOffTime",
318 width: "120", 315 width: "120",
319 align: "center", 316 align: "center",
320 - sorTable: false,
321 - fixed: false,
322 - disabled: true,
323 }, 317 },
324 { 318 {
325 name: "CutOff时间", 319 name: "CutOff时间",
326 value: "cutOffTime", 320 value: "cutOffTime",
327 width: "110", 321 width: "110",
328 align: "center", 322 align: "center",
329 - sorTable: false,
330 - fixed: false,
331 - disabled: true,
332 }, 323 },
333 { 324 {
334 name: "航班号", 325 name: "航班号",
335 value: "fltNo", 326 value: "fltNo",
336 width: "100", 327 width: "100",
337 align: "center", 328 align: "center",
338 - sorTable: false,
339 - fixed: false,
340 - disabled: true,
341 }, 329 },
342 { 330 {
343 name: "航班路线", 331 name: "航班路线",
344 value: "route", 332 value: "route",
345 width: "140", 333 width: "140",
346 align: "center", 334 align: "center",
347 - sorTable: false,
348 - fixed: false,
349 - disabled: true,
350 }, 335 },
351 { 336 {
352 name: "航班类型", 337 name: "航班类型",
353 value: "typeName", 338 value: "typeName",
354 width: "100", 339 width: "100",
355 align: "center", 340 align: "center",
356 - sorTable: false,
357 - fixed: false,
358 - disabled: true,
359 }, 341 },
360 { 342 {
361 name: "航班种类", 343 name: "航班种类",
362 value: "flightKindName", 344 value: "flightKindName",
363 width: "100", 345 width: "100",
364 align: "center", 346 align: "center",
365 - sorTable: false,
366 - fixed: false,
367 - disabled: true,
368 }, 347 },
369 { 348 {
370 name: "航班状态", 349 name: "航班状态",
371 value: "statusName", 350 value: "statusName",
372 width: "100", 351 width: "100",
373 align: "center", 352 align: "center",
374 - sorTable: false,
375 - fixed: false,
376 - disabled: true,
377 }, 353 },
378 { 354 {
379 name: "是否自动推送", 355 name: "是否自动推送",
380 value: "pushDateSwitch", 356 value: "pushDateSwitch",
381 width: "120", 357 width: "120",
382 align: "center", 358 align: "center",
383 - sorTable: false,
384 - fixed: false,
385 - disabled: true,
386 }, 359 },
387 { 360 {
388 name: "总重量", 361 name: "总重量",
389 value: "totalWeight", 362 value: "totalWeight",
390 width: "90", 363 width: "90",
391 align: "center", 364 align: "center",
392 - sorTable: false,
393 - fixed: false,
394 - disabled: true,
395 }, 365 },
396 { 366 {
397 name: "原始重量（KG）", 367 name: "原始重量（KG）",
398 value: "originalWeight", 368 value: "originalWeight",
399 width: "120", 369 width: "120",
400 align: "center", 370 align: "center",
401 - sorTable: false,
402 - fixed: false,
403 - disabled: true,
404 }, 371 },
405 { 372 {
406 name: "已配重量", 373 name: "已配重量",
407 value: "alloctedWeight", 374 value: "alloctedWeight",
408 width: "90", 375 width: "90",
409 align: "center", 376 align: "center",
410 - sorTable: false,
411 - fixed: false,
412 - disabled: true,
413 }, 377 },
414 { 378 {
415 name: "总体积(cm³)", 379 name: "总体积(cm³)",
416 value: "totalVolume", 380 value: "totalVolume",
417 width: "100", 381 width: "100",
418 align: "center", 382 align: "center",
419 - sorTable: false,
420 - fixed: false,
421 - disabled: true,
422 }, 383 },
423 { 384 {
424 name: "已配体积(cm³)", 385 name: "已配体积(cm³)",
425 value: "alloctedVolume", 386 value: "alloctedVolume",
426 width: "120", 387 width: "120",
427 align: "center", 388 align: "center",
428 - sorTable: false,
429 - fixed: false,
430 - disabled: true,
431 }, 389 },
432 { 390 {
433 name: "是否需要预审", 391 name: "是否需要预审",
434 value: "needRequired", 392 value: "needRequired",
435 width: "130", 393 width: "130",
436 align: "center", 394 align: "center",
437 - sorTable: false,
438 - fixed: false,
439 - disabled: true,
440 }, 395 },
441 { 396 {
442 name: "是否开启高低价", 397 name: "是否开启高低价",
443 value: "highLowPriceFlg", 398 value: "highLowPriceFlg",
444 width: "140", 399 width: "140",
445 align: "center", 400 align: "center",
446 - sorTable: false,
447 - fixed: false,
448 - disabled: true,
449 }, 401 },
450 { 402 {
451 name: "是否限制一票一件", 403 name: "是否限制一票一件",
452 value: "ticketToPiece", 404 value: "ticketToPiece",
453 width: "140", 405 width: "140",
454 align: "center", 406 align: "center",
455 - sorTable: false,
456 - fixed: false,
457 - disabled: true,
458 }, 407 },
459 { 408 {
460 name: "额外增重百分比", 409 name: "额外增重百分比",
461 value: "extraWeightPercent", 410 value: "extraWeightPercent",
462 width: "140", 411 width: "140",
463 align: "center", 412 align: "center",
464 - sorTable: false,
465 - fixed: false,
466 - disabled: true,
467 }, 413 },
468 { 414 {
469 name: "高价百分比", 415 name: "高价百分比",
470 value: "highPriceWeightPercent", 416 value: "highPriceWeightPercent",
471 width: "120", 417 width: "120",
472 align: "center", 418 align: "center",
473 - sorTable: false,
474 - fixed: false,
475 - disabled: true,
476 }, 419 },
477 { 420 {
478 name: "低价百分比", 421 name: "低价百分比",
479 value: "lowPriceWeightPercent", 422 value: "lowPriceWeightPercent",
480 width: "120", 423 width: "120",
481 align: "center", 424 align: "center",
482 - sorTable: false,
483 - fixed: false,
484 - disabled: true,
485 }, 425 },
486 { 426 {
487 name: "航班优先级", 427 name: "航班优先级",
488 value: "priorityName", 428 value: "priorityName",
489 width: "100", 429 width: "100",
490 align: "center", 430 align: "center",
491 - sorTable: false,
492 - fixed: false,
493 - disabled: true,
494 }, 431 },
495 { 432 {
496 name: "配舱优先级", 433 name: "配舱优先级",
497 value: "priorityRuleName", 434 value: "priorityRuleName",
498 width: "100", 435 width: "100",
499 align: "center", 436 align: "center",
500 - sorTable: false,
501 - fixed: false,
502 - disabled: true,
503 }, 437 },
504 { 438 {
505 name: "创建人", 439 name: "创建人",
506 value: "createUserName", 440 value: "createUserName",
507 width: "90", 441 width: "90",
508 align: "center", 442 align: "center",
509 - sorTable: false,
510 - fixed: false,
511 - disabled: true,
512 }, 443 },
513 { 444 {
514 name: "创建时间", 445 name: "创建时间",
515 value: "createTime", 446 value: "createTime",
516 width: "100", 447 width: "100",
517 align: "center", 448 align: "center",
518 - sorTable: false,
519 - fixed: false,
520 - disabled: true,
521 }, 449 },
522 { 450 {
523 name: "最后修改人", 451 name: "最后修改人",
524 value: "lastModifyUserName", 452 value: "lastModifyUserName",
525 width: "120", 453 width: "120",
526 align: "center", 454 align: "center",
527 - sorTable: false,
528 - fixed: false,
529 - disabled: true,
530 }, 455 },
531 { 456 {
532 name: "最后修改时间", 457 name: "最后修改时间",
533 value: "lastModifyTime", 458 value: "lastModifyTime",
534 width: "120", 459 width: "120",
535 align: "center", 460 align: "center",
536 - sorTable: false,
537 - fixed: false,
538 - disabled: true,
539 }, 461 },
540 ], 462 ],
541 //删除失败数据 463 //删除失败数据
......
...@@ -220,8 +220,6 @@ export default { ...@@ -220,8 +220,6 @@ export default {
220 width: "100", 220 width: "100",
221 align: "center", 221 align: "center",
222 sorTable: true, 222 sorTable: true,
223 - fixed: false,
224 - disabled: true,
225 }, 223 },
226 { 224 {
227 name: "取件日期", 225 name: "取件日期",
...@@ -229,8 +227,6 @@ export default { ...@@ -229,8 +227,6 @@ export default {
229 width: "120", 227 width: "120",
230 align: "center", 228 align: "center",
231 sorTable: true, 229 sorTable: true,
232 - fixed: false,
233 - disabled: true
234 }, 230 },
235 { 231 {
236 name: "取件扫描号", 232 name: "取件扫描号",
...@@ -238,8 +234,6 @@ export default { ...@@ -238,8 +234,6 @@ export default {
238 width: "120", 234 width: "120",
239 align: "center", 235 align: "center",
240 sorTable: true, 236 sorTable: true,
241 - fixed: false,
242 - disabled: true
243 }, 237 },
244 { 238 {
245 name: "站点", 239 name: "站点",
...@@ -247,8 +241,6 @@ export default { ...@@ -247,8 +241,6 @@ export default {
247 width: "80", 241 width: "80",
248 align: "center", 242 align: "center",
249 sorTable: true, 243 sorTable: true,
250 - fixed: false,
251 - disabled: true
252 }, 244 },
253 { 245 {
254 name: "运单号", 246 name: "运单号",
...@@ -256,8 +248,6 @@ export default { ...@@ -256,8 +248,6 @@ export default {
256 width: "120", 248 width: "120",
257 align: "center", 249 align: "center",
258 sorTable: true, 250 sorTable: true,
259 - fixed: false,
260 - disabled: true
261 }, 251 },
262 { 252 {
263 name: "总单号", 253 name: "总单号",
...@@ -265,8 +255,6 @@ export default { ...@@ -265,8 +255,6 @@ export default {
265 width: "120", 255 width: "120",
266 align: "center", 256 align: "center",
267 sorTable: true, 257 sorTable: true,
268 - fixed: false,
269 - disabled: true
270 }, 258 },
271 { 259 {
272 name: "服务类型", 260 name: "服务类型",
...@@ -274,8 +262,6 @@ export default { ...@@ -274,8 +262,6 @@ export default {
274 width: "100", 262 width: "100",
275 align: "center", 263 align: "center",
276 sorTable: true, 264 sorTable: true,
277 - fixed: false,
278 - disabled: true
279 }, 265 },
280 { 266 {
281 name: "服务代码", 267 name: "服务代码",
...@@ -283,8 +269,6 @@ export default { ...@@ -283,8 +269,6 @@ export default {
283 width: "100", 269 width: "100",
284 align: "center", 270 align: "center",
285 sorTable: false, 271 sorTable: false,
286 - fixed: false,
287 - disabled: true
288 }, 272 },
289 { 273 {
290 name: "URSA", 274 name: "URSA",
...@@ -292,17 +276,13 @@ export default { ...@@ -292,17 +276,13 @@ export default {
292 width: "100", 276 width: "100",
293 align: "center", 277 align: "center",
294 sorTable: true, 278 sorTable: true,
295 - fixed: false,
296 - disabled: true
297 }, 279 },
298 { 280 {
299 name: "推送状态", 281 name: "推送状态",
300 - value: "cargoPushStatus", 282 + value: "cargoAllocationDataStatus",
301 width: "100", 283 width: "100",
302 align: "center", 284 align: "center",
303 sorTable: true, 285 sorTable: true,
304 - fixed: false,
305 - disabled: true
306 }, 286 },
307 { 287 {
308 name: "配舱状态", 288 name: "配舱状态",
...@@ -310,8 +290,6 @@ export default { ...@@ -310,8 +290,6 @@ export default {
310 width: "100", 290 width: "100",
311 align: "center", 291 align: "center",
312 sorTable: true, 292 sorTable: true,
313 - fixed: false,
314 - disabled: true
315 }, 293 },
316 { 294 {
317 name: "释放状态", 295 name: "释放状态",
...@@ -319,8 +297,6 @@ export default { ...@@ -319,8 +297,6 @@ export default {
319 width: "100", 297 width: "100",
320 align: "center", 298 align: "center",
321 sorTable: true, 299 sorTable: true,
322 - fixed: false,
323 - disabled: true
324 }, 300 },
325 { 301 {
326 name: "申报类型", 302 name: "申报类型",
...@@ -328,8 +304,6 @@ export default { ...@@ -328,8 +304,6 @@ export default {
328 width: "100", 304 width: "100",
329 align: "center", 305 align: "center",
330 sorTable: true, 306 sorTable: true,
331 - fixed: false,
332 - disabled: true
333 }, 307 },
334 { 308 {
335 name: "ACCSpool", 309 name: "ACCSpool",
...@@ -337,8 +311,6 @@ export default { ...@@ -337,8 +311,6 @@ export default {
337 width: "120", 311 width: "120",
338 align: "center", 312 align: "center",
339 sorTable: true, 313 sorTable: true,
340 - fixed: false,
341 - disabled: true
342 }, 314 },
343 { 315 {
344 name: "HandlingCode", 316 name: "HandlingCode",
...@@ -346,8 +318,6 @@ export default { ...@@ -346,8 +318,6 @@ export default {
346 width: "150", 318 width: "150",
347 align: "center", 319 align: "center",
348 sorTable: true, 320 sorTable: true,
349 - fixed: false,
350 - disabled: true
351 }, 321 },
352 { 322 {
353 name: "subcategory", 323 name: "subcategory",
...@@ -355,8 +325,6 @@ export default { ...@@ -355,8 +325,6 @@ export default {
355 width: "140", 325 width: "140",
356 align: "center", 326 align: "center",
357 sorTable: true, 327 sorTable: true,
358 - fixed: false,
359 - disabled: true
360 }, 328 },
361 { 329 {
362 name: "件数", 330 name: "件数",
...@@ -364,8 +332,6 @@ export default { ...@@ -364,8 +332,6 @@ export default {
364 width: "80", 332 width: "80",
365 align: "center", 333 align: "center",
366 sorTable: true, 334 sorTable: true,
367 - fixed: false,
368 - disabled: true
369 }, 335 },
370 { 336 {
371 name: "实际重量", 337 name: "实际重量",
...@@ -373,8 +339,6 @@ export default { ...@@ -373,8 +339,6 @@ export default {
373 width: "100", 339 width: "100",
374 align: "center", 340 align: "center",
375 sorTable: true, 341 sorTable: true,
376 - fixed: false,
377 - disabled: true
378 }, 342 },
379 { 343 {
380 name: "收件人国家代码", 344 name: "收件人国家代码",
...@@ -382,17 +346,12 @@ export default { ...@@ -382,17 +346,12 @@ export default {
382 width: "150", 346 width: "150",
383 align: "center", 347 align: "center",
384 sorTable: true, 348 sorTable: true,
385 - fixed: false,
386 - disabled: true
387 }, 349 },
388 { 350 {
389 name: "品名描述", 351 name: "品名描述",
390 value: "nameDescription", 352 value: "nameDescription",
391 width: "100", 353 width: "100",
392 align: "center", 354 align: "center",
393 - sorTable: false,
394 - fixed: false,
395 - disabled: true
396 }, 355 },
397 { 356 {
398 name: "海关回执状态", 357 name: "海关回执状态",
...@@ -400,8 +359,6 @@ export default { ...@@ -400,8 +359,6 @@ export default {
400 width: "140", 359 width: "140",
401 align: "center", 360 align: "center",
402 sorTable: true, 361 sorTable: true,
403 - fixed: false,
404 - disabled: true
405 }, 362 },
406 { 363 {
407 name: "预审状态", 364 name: "预审状态",
...@@ -409,17 +366,12 @@ export default { ...@@ -409,17 +366,12 @@ export default {
409 width: "100", 366 width: "100",
410 align: "center", 367 align: "center",
411 sorTable: true, 368 sorTable: true,
412 - fixed: false,
413 - disabled: true
414 }, 369 },
415 { 370 {
416 name: "航班预审意见", 371 name: "航班预审意见",
417 value: "caPretrialOpinion", 372 value: "caPretrialOpinion",
418 width: "120", 373 width: "120",
419 align: "center", 374 align: "center",
420 - sorTable: false,
421 - fixed: false,
422 - disabled: true
423 }, 375 },
424 { 376 {
425 name: "货物状态", 377 name: "货物状态",
...@@ -427,8 +379,6 @@ export default { ...@@ -427,8 +379,6 @@ export default {
427 width: "100", 379 width: "100",
428 align: "center", 380 align: "center",
429 sorTable: true, 381 sorTable: true,
430 - fixed: false,
431 - disabled: true
432 }, 382 },
433 { 383 {
434 name: "终配航班号", 384 name: "终配航班号",
...@@ -436,8 +386,6 @@ export default { ...@@ -436,8 +386,6 @@ export default {
436 width: "120", 386 width: "120",
437 align: "center", 387 align: "center",
438 sorTable: true, 388 sorTable: true,
439 - fixed: false,
440 - disabled: true
441 }, 389 },
442 { 390 {
443 name: "终配航班日期", 391 name: "终配航班日期",
...@@ -445,8 +393,6 @@ export default { ...@@ -445,8 +393,6 @@ export default {
445 width: "140", 393 width: "140",
446 align: "center", 394 align: "center",
447 sorTable: true, 395 sorTable: true,
448 - fixed: false,
449 - disabled: true
450 }, 396 },
451 { 397 {
452 name: "二配航班号", 398 name: "二配航班号",
...@@ -454,8 +400,6 @@ export default { ...@@ -454,8 +400,6 @@ export default {
454 width: "120", 400 width: "120",
455 align: "center", 401 align: "center",
456 sorTable: true, 402 sorTable: true,
457 - fixed: false,
458 - disabled: true
459 }, 403 },
460 { 404 {
461 name: "二配航班日期", 405 name: "二配航班日期",
...@@ -463,8 +407,6 @@ export default { ...@@ -463,8 +407,6 @@ export default {
463 width: "150", 407 width: "150",
464 align: "center", 408 align: "center",
465 sorTable: true, 409 sorTable: true,
466 - fixed: false,
467 - disabled: true
468 }, 410 },
469 { 411 {
470 name: "预配航班号", 412 name: "预配航班号",
...@@ -472,8 +414,6 @@ export default { ...@@ -472,8 +414,6 @@ export default {
472 width: "120", 414 width: "120",
473 align: "center", 415 align: "center",
474 sorTable: true, 416 sorTable: true,
475 - fixed: false,
476 - disabled: true
477 }, 417 },
478 { 418 {
479 name: "预配航班日期", 419 name: "预配航班日期",
...@@ -481,8 +421,6 @@ export default { ...@@ -481,8 +421,6 @@ export default {
481 width: "150", 421 width: "150",
482 align: "center", 422 align: "center",
483 sorTable: true, 423 sorTable: true,
484 - fixed: false,
485 - disabled: true
486 }, 424 },
487 { 425 {
488 name: "ACCS原航班号", 426 name: "ACCS原航班号",
...@@ -490,8 +428,6 @@ export default { ...@@ -490,8 +428,6 @@ export default {
490 width: "150", 428 width: "150",
491 align: "center", 429 align: "center",
492 sorTable: true, 430 sorTable: true,
493 - fixed: false,
494 - disabled: true
495 }, 431 },
496 { 432 {
497 name: "ACCS原航班日期", 433 name: "ACCS原航班日期",
...@@ -499,8 +435,6 @@ export default { ...@@ -499,8 +435,6 @@ export default {
499 width: "150", 435 width: "150",
500 align: "center", 436 align: "center",
501 sorTable: true, 437 sorTable: true,
502 - fixed: false,
503 - disabled: true
504 }, 438 },
505 { 439 {
506 name: "ACCS原航线", 440 name: "ACCS原航线",
...@@ -508,8 +442,6 @@ export default { ...@@ -508,8 +442,6 @@ export default {
508 width: "140", 442 width: "140",
509 align: "center", 443 align: "center",
510 sorTable: true, 444 sorTable: true,
511 - fixed: false,
512 - disabled: true
513 }, 445 },
514 { 446 {
515 name: "是否RDE手工录入", 447 name: "是否RDE手工录入",
...@@ -517,8 +449,6 @@ export default { ...@@ -517,8 +449,6 @@ export default {
517 width: "170", 449 width: "170",
518 align: "center", 450 align: "center",
519 sorTable: true, 451 sorTable: true,
520 - fixed: false,
521 - disabled: true
522 }, 452 },
523 { 453 {
524 name: "是否自动", 454 name: "是否自动",
...@@ -526,44 +456,30 @@ export default { ...@@ -526,44 +456,30 @@ export default {
526 width: "100", 456 width: "100",
527 align: "center", 457 align: "center",
528 sorTable: true, 458 sorTable: true,
529 - fixed: false,
530 - disabled: true
531 }, 459 },
532 { 460 {
533 name: "发件人账号", 461 name: "发件人账号",
534 value: "shipperAccount", 462 value: "shipperAccount",
535 width: "120", 463 width: "120",
536 align: "center", 464 align: "center",
537 - sorTable: false,
538 - fixed: false,
539 - disabled: true
540 }, 465 },
541 { 466 {
542 name: "发件公司中文名称", 467 name: "发件公司中文名称",
543 value: "shipperCompany", 468 value: "shipperCompany",
544 width: "150", 469 width: "150",
545 align: "center", 470 align: "center",
546 - sorTable: false,
547 - fixed: false,
548 - disabled: true
549 }, 471 },
550 { 472 {
551 name: "始发地城市名称", 473 name: "始发地城市名称",
552 value: "originCity", 474 value: "originCity",
553 width: "130", 475 width: "130",
554 align: "center", 476 align: "center",
555 - sorTable: false,
556 - fixed: false,
557 - disabled: true
558 }, 477 },
559 { 478 {
560 name: "收件地", 479 name: "收件地",
561 value: "destinationSiteName", 480 value: "destinationSiteName",
562 width: "90", 481 width: "90",
563 align: "center", 482 align: "center",
564 - sorTable: false,
565 - fixed: false,
566 - disabled: true
567 }, 483 },
568 { 484 {
569 name: "尺寸", 485 name: "尺寸",
...@@ -571,26 +487,18 @@ export default { ...@@ -571,26 +487,18 @@ export default {
571 width: "80", 487 width: "80",
572 align: "center", 488 align: "center",
573 sorTable: true, 489 sorTable: true,
574 - fixed: false,
575 - disabled: true
576 }, 490 },
577 { 491 {
578 name: "大货预审意见（是否可以配置航班）", 492 name: "大货预审意见（是否可以配置航班）",
579 value: "bigPretrialOpinion", 493 value: "bigPretrialOpinion",
580 width: "250", 494 width: "250",
581 align: "center", 495 align: "center",
582 - sorTable: false,
583 - fixed: false,
584 - disabled: true
585 }, 496 },
586 { 497 {
587 name: "大货预审时间", 498 name: "大货预审时间",
588 value: "bigPretrialTime", 499 value: "bigPretrialTime",
589 width: "120", 500 width: "120",
590 align: "center", 501 align: "center",
591 - sorTable: false,
592 - fixed: false,
593 - disabled: true
594 }, 502 },
595 { 503 {
596 name: "海关回执时间", 504 name: "海关回执时间",
...@@ -598,8 +506,6 @@ export default { ...@@ -598,8 +506,6 @@ export default {
598 width: "150", 506 width: "150",
599 align: "center", 507 align: "center",
600 sorTable: true, 508 sorTable: true,
601 - fixed: false,
602 - disabled: true
603 }, 509 },
604 { 510 {
605 name: "航班预审时间", 511 name: "航班预审时间",
...@@ -607,8 +513,6 @@ export default { ...@@ -607,8 +513,6 @@ export default {
607 width: "150", 513 width: "150",
608 align: "center", 514 align: "center",
609 sorTable: true, 515 sorTable: true,
610 - fixed: false,
611 - disabled: true
612 }, 516 },
613 { 517 {
614 name: "创建人", 518 name: "创建人",
...@@ -616,8 +520,6 @@ export default { ...@@ -616,8 +520,6 @@ export default {
616 width: "90", 520 width: "90",
617 align: "center", 521 align: "center",
618 sorTable: true, 522 sorTable: true,
619 - fixed: false,
620 - disabled: true
621 }, 523 },
622 { 524 {
623 name: "创建时间", 525 name: "创建时间",
...@@ -625,8 +527,6 @@ export default { ...@@ -625,8 +527,6 @@ export default {
625 width: "100", 527 width: "100",
626 align: "center", 528 align: "center",
627 sorTable: true, 529 sorTable: true,
628 - fixed: false,
629 - disabled: true
630 }, 530 },
631 ], //表头数据 531 ], //表头数据
632 releaseHeader: [ 532 releaseHeader: [
......
...@@ -83,48 +83,36 @@ export default { ...@@ -83,48 +83,36 @@ export default {
83 value: "name", 83 value: "name",
84 width: "150px", 84 width: "150px",
85 align: "center", 85 align: "center",
86 - sorTable: false,
87 - disabled: true
88 }, 86 },
89 { 87 {
90 name: "角色状态", 88 name: "角色状态",
91 value: "valid", 89 value: "valid",
92 width: "150px", 90 width: "150px",
93 align: "center", 91 align: "center",
94 - sorTable: false,
95 - disabled: true
96 }, 92 },
97 { 93 {
98 name: "创建人", 94 name: "创建人",
99 value: "createUserName", 95 value: "createUserName",
100 width: "150px", 96 width: "150px",
101 align: "center", 97 align: "center",
102 - sorTable: false,
103 - disabled: true
104 }, 98 },
105 { 99 {
106 name: "创建时间", 100 name: "创建时间",
107 value: "createTime", 101 value: "createTime",
108 width: "150px", 102 width: "150px",
109 align: "center", 103 align: "center",
110 - sorTable: false,
111 - disabled: true
112 }, 104 },
113 { 105 {
114 name: "修改时间", 106 name: "修改时间",
115 value: "updateTime", 107 value: "updateTime",
116 width: "150px", 108 width: "150px",
117 align: "center", 109 align: "center",
118 - sorTable: false,
119 - disabled: true
120 }, 110 },
121 { 111 {
122 name: "备注", 112 name: "备注",
123 value: "remark", 113 value: "remark",
124 width: "400px", 114 width: "400px",
125 align: "center", 115 align: "center",
126 - sorTable: false,
127 - disabled: true
128 }, 116 },
129 ], //表头数据 117 ], //表头数据
130 roleData: {}, //角色详情 118 roleData: {}, //角色详情
......
...@@ -109,64 +109,48 @@ export default { ...@@ -109,64 +109,48 @@ export default {
109 value: "loginName", 109 value: "loginName",
110 width: "150px", 110 width: "150px",
111 align: "center", 111 align: "center",
112 - sorTable: false,
113 - disabled: true
114 }, 112 },
115 { 113 {
116 name: "用户姓名", 114 name: "用户姓名",
117 value: "username", 115 value: "username",
118 width: "150px", 116 width: "150px",
119 align: "center", 117 align: "center",
120 - sorTable: false,
121 - disabled: true
122 }, 118 },
123 { 119 {
124 name: "所属口岸", 120 name: "所属口岸",
125 value: "portName", 121 value: "portName",
126 width: "150px", 122 width: "150px",
127 align: "center", 123 align: "center",
128 - sortable: false,
129 - disabled: true
130 }, 124 },
131 { 125 {
132 name: "所属角色", 126 name: "所属角色",
133 value: "roleNames", 127 value: "roleNames",
134 width: "150px", 128 width: "150px",
135 align: "center", 129 align: "center",
136 - sorTable: false,
137 - disabled: true
138 }, 130 },
139 { 131 {
140 name: "电子邮箱", 132 name: "电子邮箱",
141 value: "email", 133 value: "email",
142 width: "150px", 134 width: "150px",
143 align: "center", 135 align: "center",
144 - sorTable: false,
145 - disabled: true
146 }, 136 },
147 { 137 {
148 name: "用户状态", 138 name: "用户状态",
149 value: "isValid", 139 value: "isValid",
150 width: "100px", 140 width: "100px",
151 align: "center", 141 align: "center",
152 - sorTable: false,
153 - disabled: true,
154 }, 142 },
155 { 143 {
156 name: "修改时间", 144 name: "修改时间",
157 value: "updateTime", 145 value: "updateTime",
158 width: "150px", 146 width: "150px",
159 align: "center", 147 align: "center",
160 - sorTable: false,
161 - disabled: true
162 }, 148 },
163 { 149 {
164 name: "备注", 150 name: "备注",
165 value: "remark", 151 value: "remark",
166 width: "150px", 152 width: "150px",
167 align: "center", 153 align: "center",
168 - sorTable: false,
169 - disabled: true
170 }, 154 },
171 ], //表头数据 155 ], //表头数据
172 userData: {}, //用户详情 156 userData: {}, //用户详情
......