Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
bdd78b87 1 parent 6d633279

删除无用代码

Inline Side-by-side
Showing 8 changed files with 65 additions and 345 deletions
...@@ -6,34 +6,33 @@ ...@@ -6,34 +6,33 @@
6 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading" 6 :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading"
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" :fixed="true" 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"></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 newHeader"> 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 - <!-- 末端插槽 -->
32 <slot name="optionColumn"></slot> 32 <slot name="optionColumn"></slot>
33 </el-table> 33 </el-table>
34 - <!-- 分页 --> 34 + <el-pagination v-if="pagination" :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum"
35 - <el-pagination :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum" :page-sizes="pageSizes" 35 + :page-sizes="pageSizes" background :layout="layout" class="tablePagination" @size-change="sizeChange"
36 - background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange"
37 @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange"> 36 @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
38 </el-pagination> 37 </el-pagination>
39 </div> 38 </div>
...@@ -47,8 +46,11 @@ export default { ...@@ -47,8 +46,11 @@ export default {
47 props: { 46 props: {
48 //dom名称 47 //dom名称
49 tableName: { type: String, default: "tables" }, 48 tableName: { type: String, default: "tables" },
49 + ductName: {
50 + type: String,
51 + default: null
52 + },
50 //表格数据 53 //表格数据
51 - ductName: { type: String, default: null },
52 data: { 54 data: {
53 type: Array, 55 type: Array,
54 default() { 56 default() {
...@@ -161,13 +163,19 @@ export default { ...@@ -161,13 +163,19 @@ export default {
161 type: Boolean, 163 type: Boolean,
162 default: false, 164 default: false,
163 }, 165 },
166 + pagination: {
167 + type: Boolean,
168 + default: true
169 + },
170 + layout: {
171 + type: String,
172 + default: 'prev, pager, next, jumper, ->, sizes, total'
173 + }
164 }, 174 },
165 inheritAttrs: false, 175 inheritAttrs: false,
166 data() { 176 data() {
167 return { 177 return {
168 - newHeader: this.headerData,
169 selectTable: [], 178 selectTable: [],
170 - checkDisabled: [],
171 pageNum: 1, 179 pageNum: 1,
172 start: -1, 180 start: -1,
173 show: false, 181 show: false,
...@@ -185,33 +193,25 @@ export default { ...@@ -185,33 +193,25 @@ export default {
185 // align: "center", 193 // align: "center",
186 // sorTable: false, 194 // sorTable: false,
187 // fixed:false, 195 // fixed:false,
188 - // disabled:true,
189 // }, 196 // },
190 }; 197 };
191 }, 198 },
192 - created() {
193 - this.newHeader.map((item) => {
194 - this.checkDisabled.push(item.name);
195 - });
196 - },
197 watch: { 199 watch: {
198 page() { 200 page() {
199 this.pageNum = this.page; 201 this.pageNum = this.page;
200 }, 202 },
201 data() { 203 data() {
204 + if (this.selection) {
202 this.data.forEach((item, index) => { 205 this.data.forEach((item, index) => {
203 item.index = index; 206 item.index = index;
204 }); 207 });
208 + }
205 this.$nextTick(() => { 209 this.$nextTick(() => {
206 this.$refs.tables.doLayout(); 210 this.$refs.tables.doLayout();
207 }); 211 });
208 }, 212 },
209 - headerData(val, oldVal) {
210 - this.newHeader = val;
211 - },
212 }, 213 },
213 methods: { 214 methods: {
214 - //数据长度切换
215 sizeChange(val) { 215 sizeChange(val) {
216 this.$emit("sizeChange", val); 216 this.$emit("sizeChange", val);
217 }, 217 },
...@@ -239,6 +239,12 @@ export default { ...@@ -239,6 +239,12 @@ export default {
239 }); 239 });
240 scrollTo(0, 800); 240 scrollTo(0, 800);
241 }, 241 },
242 + //连续序号
243 + indexAdd(index) {
244 + const page = this.pageNum // 当前页码
245 + const pagesize = this.limitSize // 每页条数
246 + return index + 1 + (page - 1) * pagesize
247 + },
242 //表格多选，shift连续选择 248 //表格多选，shift连续选择
243 tableSelect(selection, row) { 249 tableSelect(selection, row) {
244 let end = row.index; 250 let end = row.index;
...@@ -343,16 +349,19 @@ export default { ...@@ -343,16 +349,19 @@ export default {
343 let start = columnIndex - 1 === this.dragState.start ? `darg_start` : ""; 349 let start = columnIndex - 1 === this.dragState.start ? `darg_start` : "";
344 return `${active} ${start}`; 350 return `${active} ${start}`;
345 }, 351 },
352 +
346 cellClassName({ column, columnIndex }) { 353 cellClassName({ column, columnIndex }) {
347 return columnIndex - 1 === this.dragState.start ? `darg_start` : ""; 354 return columnIndex - 1 === this.dragState.start ? `darg_start` : "";
348 }, 355 },
349 //数据格式化 356 //数据格式化
350 formatter(row, column, cellValue, index) { 357 formatter(row, column, cellValue, index) {
358 + if (dictLabels[this.ductName]) {
351 if (dictLabels[this.ductName][column.property]) { 359 if (dictLabels[this.ductName][column.property]) {
352 if (dictLabels[this.ductName][column.property][cellValue]) { 360 if (dictLabels[this.ductName][column.property][cellValue]) {
353 return dictLabels[this.ductName][column.property][cellValue]; 361 return dictLabels[this.ductName][column.property][cellValue];
354 } 362 }
355 } 363 }
364 + }
356 if (column.property == "roleNames") { 365 if (column.property == "roleNames") {
357 return cellValue.toString(); 366 return cellValue.toString();
358 } 367 }
...@@ -367,7 +376,7 @@ export default { ...@@ -367,7 +376,7 @@ export default {
367 376
368 <style lang="scss"> 377 <style lang="scss">
369 .tablePagination { 378 .tablePagination {
370 - margin-top: 40px; 379 + margin-top: 10px;
371 text-align: right; 380 text-align: right;
372 } 381 }
373 382
...@@ -380,6 +389,31 @@ export default { ...@@ -380,6 +389,31 @@ export default {
380 389
381 .el-table th { 390 .el-table th {
382 padding: 0; 391 padding: 0;
392 +
393 + .virtual {
394 + position: absolute;
395 + display: block;
396 + width: 0;
397 + height: 0;
398 + top: 0px;
399 + left: 0px;
400 + background: none;
401 + border: none;
402 + }
403 +
404 + &.darg_active_left {
405 + .virtual {
406 + border-left: 2px dotted #666;
407 + z-index: 99;
408 + }
409 + }
410 +
411 + &.darg_active_right {
412 + .virtual {
413 + border-right: 2px dotted #666;
414 + z-index: 99;
415 + }
416 + }
383 } 417 }
384 418
385 .thead-cell { 419 .thead-cell {
...@@ -387,7 +421,6 @@ export default { ...@@ -387,7 +421,6 @@ export default {
387 display: inline-flex; 421 display: inline-flex;
388 flex-direction: column; 422 flex-direction: column;
389 align-items: left; 423 align-items: left;
390 - cursor: pointer;
391 overflow: initial; 424 overflow: initial;
392 425
393 &:before { 426 &:before {
...@@ -411,13 +444,6 @@ export default { ...@@ -411,13 +444,6 @@ export default {
411 } 444 }
412 } 445 }
413 446
414 -.tableInfo {
415 - position: fixed;
416 - right: 30px;
417 - bottom: 100px;
418 - z-index: 99999999;
419 -}
420 -
421 .tableList { 447 .tableList {
422 width: 200px; 448 width: 200px;
423 max-height: 500px; 449 max-height: 500px;
...@@ -448,12 +474,5 @@ export default { ...@@ -448,12 +474,5 @@ export default {
448 border-radius: 0; 474 border-radius: 0;
449 background: rgba(0, 0, 0, 0.2); 475 background: rgba(0, 0, 0, 0.2);
450 } 476 }
451 -
452 -.flexList {
453 - width: 100%;
454 - display: flex;
455 - height: 20px;
456 - line-height: 20px;
457 -}
458 </style> 477 </style>
459 478
......
...@@ -211,8 +211,6 @@ export default { ...@@ -211,8 +211,6 @@ export default {
211 width: "100", 211 width: "100",
212 align: "center", 212 align: "center",
213 sorTable: true, 213 sorTable: true,
214 - fixed: false,
215 - disabled: true
216 }, 214 },
217 { 215 {
218 name: "取件日期", 216 name: "取件日期",
...@@ -220,8 +218,6 @@ export default { ...@@ -220,8 +218,6 @@ export default {
220 width: "120", 218 width: "120",
221 align: "center", 219 align: "center",
222 sorTable: true, 220 sorTable: true,
223 - fixed: false,
224 - disabled: true
225 }, 221 },
226 { 222 {
227 name: "取件扫描号", 223 name: "取件扫描号",
...@@ -229,8 +225,6 @@ export default { ...@@ -229,8 +225,6 @@ export default {
229 width: "120", 225 width: "120",
230 align: "center", 226 align: "center",
231 sorTable: true, 227 sorTable: true,
232 - fixed: false,
233 - disabled: true
234 }, 228 },
235 { 229 {
236 name: "站点", 230 name: "站点",
...@@ -238,8 +232,6 @@ export default { ...@@ -238,8 +232,6 @@ export default {
238 width: "80", 232 width: "80",
239 align: "center", 233 align: "center",
240 sorTable: true, 234 sorTable: true,
241 - fixed: false,
242 - disabled: true
243 }, 235 },
244 { 236 {
245 name: "运单号", 237 name: "运单号",
...@@ -247,8 +239,6 @@ export default { ...@@ -247,8 +239,6 @@ export default {
247 width: "120", 239 width: "120",
248 align: "center", 240 align: "center",
249 sorTable: true, 241 sorTable: true,
250 - fixed: false,
251 - disabled: true
252 }, 242 },
253 { 243 {
254 name: "总单号", 244 name: "总单号",
...@@ -256,8 +246,6 @@ export default { ...@@ -256,8 +246,6 @@ export default {
256 width: "120", 246 width: "120",
257 align: "center", 247 align: "center",
258 sorTable: true, 248 sorTable: true,
259 - fixed: false,
260 - disabled: true
261 }, 249 },
262 { 250 {
263 name: "服务类型", 251 name: "服务类型",
...@@ -265,17 +253,12 @@ export default { ...@@ -265,17 +253,12 @@ export default {
265 width: "100", 253 width: "100",
266 align: "center", 254 align: "center",
267 sorTable: true, 255 sorTable: true,
268 - fixed: false,
269 - disabled: true
270 }, 256 },
271 { 257 {
272 name: "服务代码", 258 name: "服务代码",
273 value: "serviceCode", 259 value: "serviceCode",
274 width: "100", 260 width: "100",
275 align: "center", 261 align: "center",
276 - sorTable: false,
277 - fixed: false,
278 - disabled: true
279 }, 262 },
280 { 263 {
281 name: "URSA", 264 name: "URSA",
...@@ -283,8 +266,6 @@ export default { ...@@ -283,8 +266,6 @@ export default {
283 width: "100", 266 width: "100",
284 align: "center", 267 align: "center",
285 sorTable: true, 268 sorTable: true,
286 - fixed: false,
287 - disabled: true
288 }, 269 },
289 { 270 {
290 name: "申报类型", 271 name: "申报类型",
...@@ -292,8 +273,6 @@ export default { ...@@ -292,8 +273,6 @@ export default {
292 width: "100", 273 width: "100",
293 align: "center", 274 align: "center",
294 sorTable: true, 275 sorTable: true,
295 - fixed: false,
296 - disabled: true
297 }, 276 },
298 { 277 {
299 name: "HandlingCode", 278 name: "HandlingCode",
...@@ -301,8 +280,6 @@ export default { ...@@ -301,8 +280,6 @@ export default {
301 width: "150", 280 width: "150",
302 align: "center", 281 align: "center",
303 sorTable: true, 282 sorTable: true,
304 - fixed: false,
305 - disabled: true
306 }, 283 },
307 { 284 {
308 name: "subcategory", 285 name: "subcategory",
...@@ -310,8 +287,6 @@ export default { ...@@ -310,8 +287,6 @@ export default {
310 width: "140", 287 width: "140",
311 align: "center", 288 align: "center",
312 sorTable: true, 289 sorTable: true,
313 - fixed: false,
314 - disabled: true
315 }, 290 },
316 { 291 {
317 name: "件数", 292 name: "件数",
...@@ -319,8 +294,6 @@ export default { ...@@ -319,8 +294,6 @@ export default {
319 width: "80", 294 width: "80",
320 align: "center", 295 align: "center",
321 sorTable: true, 296 sorTable: true,
322 - fixed: false,
323 - disabled: true
324 }, 297 },
325 { 298 {
326 name: "实际重量", 299 name: "实际重量",
...@@ -328,8 +301,6 @@ export default { ...@@ -328,8 +301,6 @@ export default {
328 width: "100", 301 width: "100",
329 align: "center", 302 align: "center",
330 sorTable: true, 303 sorTable: true,
331 - fixed: false,
332 - disabled: true
333 }, 304 },
334 { 305 {
335 name: "收件人国家代码", 306 name: "收件人国家代码",
...@@ -337,17 +308,12 @@ export default { ...@@ -337,17 +308,12 @@ export default {
337 width: "150", 308 width: "150",
338 align: "center", 309 align: "center",
339 sorTable: true, 310 sorTable: true,
340 - fixed: false,
341 - disabled: true
342 }, 311 },
343 { 312 {
344 name: "品名描述", 313 name: "品名描述",
345 value: "nameDescription", 314 value: "nameDescription",
346 width: "100", 315 width: "100",
347 align: "center", 316 align: "center",
348 - sorTable: false,
349 - fixed: false,
350 - disabled: true
351 }, 317 },
352 { 318 {
353 name: "海关回执状态", 319 name: "海关回执状态",
...@@ -355,8 +321,6 @@ export default { ...@@ -355,8 +321,6 @@ export default {
355 width: "140", 321 width: "140",
356 align: "center", 322 align: "center",
357 sorTable: true, 323 sorTable: true,
358 - fixed: false,
359 - disabled: true
360 }, 324 },
361 { 325 {
362 name: "预审状态", 326 name: "预审状态",
...@@ -364,17 +328,12 @@ export default { ...@@ -364,17 +328,12 @@ export default {
364 width: "100", 328 width: "100",
365 align: "center", 329 align: "center",
366 sorTable: true, 330 sorTable: true,
367 - fixed: false,
368 - disabled: true
369 }, 331 },
370 { 332 {
371 name: "航班预审意见", 333 name: "航班预审意见",
372 value: "caPretrialOpinion", 334 value: "caPretrialOpinion",
373 width: "120", 335 width: "120",
374 align: "center", 336 align: "center",
375 - sorTable: false,
376 - fixed: false,
377 - disabled: true
378 }, 337 },
379 { 338 {
380 name: "货物状态", 339 name: "货物状态",
...@@ -382,8 +341,6 @@ export default { ...@@ -382,8 +341,6 @@ export default {
382 width: "100", 341 width: "100",
383 align: "center", 342 align: "center",
384 sorTable: true, 343 sorTable: true,
385 - fixed: false,
386 - disabled: true
387 }, 344 },
388 { 345 {
389 name: "终配航班号", 346 name: "终配航班号",
...@@ -391,8 +348,6 @@ export default { ...@@ -391,8 +348,6 @@ export default {
391 width: "120", 348 width: "120",
392 align: "center", 349 align: "center",
393 sorTable: true, 350 sorTable: true,
394 - fixed: false,
395 - disabled: true
396 }, 351 },
397 { 352 {
398 name: "终配航班日期", 353 name: "终配航班日期",
...@@ -400,8 +355,6 @@ export default { ...@@ -400,8 +355,6 @@ export default {
400 width: "140", 355 width: "140",
401 align: "center", 356 align: "center",
402 sorTable: true, 357 sorTable: true,
403 - fixed: false,
404 - disabled: true
405 }, 358 },
406 { 359 {
407 name: "二配航班号", 360 name: "二配航班号",
...@@ -409,8 +362,6 @@ export default { ...@@ -409,8 +362,6 @@ export default {
409 width: "120", 362 width: "120",
410 align: "center", 363 align: "center",
411 sorTable: true, 364 sorTable: true,
412 - fixed: false,
413 - disabled: true
414 }, 365 },
415 { 366 {
416 name: "二配航班日期", 367 name: "二配航班日期",
...@@ -418,8 +369,6 @@ export default { ...@@ -418,8 +369,6 @@ export default {
418 width: "150", 369 width: "150",
419 align: "center", 370 align: "center",
420 sorTable: true, 371 sorTable: true,
421 - fixed: false,
422 - disabled: true
423 }, 372 },
424 { 373 {
425 name: "预配航班号", 374 name: "预配航班号",
...@@ -427,8 +376,6 @@ export default { ...@@ -427,8 +376,6 @@ export default {
427 width: "120", 376 width: "120",
428 align: "center", 377 align: "center",
429 sorTable: true, 378 sorTable: true,
430 - fixed: false,
431 - disabled: true
432 }, 379 },
433 { 380 {
434 name: "预配航班日期", 381 name: "预配航班日期",
...@@ -436,8 +383,6 @@ export default { ...@@ -436,8 +383,6 @@ export default {
436 width: "150", 383 width: "150",
437 align: "center", 384 align: "center",
438 sorTable: true, 385 sorTable: true,
439 - fixed: false,
440 - disabled: true
441 }, 386 },
442 { 387 {
443 name: "ACCS原航班号", 388 name: "ACCS原航班号",
...@@ -445,8 +390,6 @@ export default { ...@@ -445,8 +390,6 @@ export default {
445 width: "150", 390 width: "150",
446 align: "center", 391 align: "center",
447 sorTable: true, 392 sorTable: true,
448 - fixed: false,
449 - disabled: true
450 }, 393 },
451 { 394 {
452 name: "ACCS原航班日期", 395 name: "ACCS原航班日期",
...@@ -454,8 +397,6 @@ export default { ...@@ -454,8 +397,6 @@ export default {
454 width: "150", 397 width: "150",
455 align: "center", 398 align: "center",
456 sorTable: true, 399 sorTable: true,
457 - fixed: false,
458 - disabled: true
459 }, 400 },
460 { 401 {
461 name: "ACCS原航线", 402 name: "ACCS原航线",
...@@ -463,8 +404,6 @@ export default { ...@@ -463,8 +404,6 @@ export default {
463 width: "140", 404 width: "140",
464 align: "center", 405 align: "center",
465 sorTable: true, 406 sorTable: true,
466 - fixed: false,
467 - disabled: true
468 }, 407 },
469 { 408 {
470 name: "是否RDE手工录入", 409 name: "是否RDE手工录入",
...@@ -472,8 +411,6 @@ export default { ...@@ -472,8 +411,6 @@ export default {
472 width: "170", 411 width: "170",
473 align: "center", 412 align: "center",
474 sorTable: true, 413 sorTable: true,
475 - fixed: false,
476 - disabled: true
477 }, 414 },
478 { 415 {
479 name: "是否自动", 416 name: "是否自动",
...@@ -481,44 +418,30 @@ export default { ...@@ -481,44 +418,30 @@ export default {
481 width: "100", 418 width: "100",
482 align: "center", 419 align: "center",
483 sorTable: true, 420 sorTable: true,
484 - fixed: false,
485 - disabled: true
486 }, 421 },
487 { 422 {
488 name: "发件人账号", 423 name: "发件人账号",
489 value: "shipperAccount", 424 value: "shipperAccount",
490 width: "120", 425 width: "120",
491 align: "center", 426 align: "center",
492 - sorTable: false,
493 - fixed: false,
494 - disabled: true
495 }, 427 },
496 { 428 {
497 name: "发件公司中文名称", 429 name: "发件公司中文名称",
498 value: "shipperCompany", 430 value: "shipperCompany",
499 width: "150", 431 width: "150",
500 align: "center", 432 align: "center",
501 - sorTable: false,
502 - fixed: false,
503 - disabled: true
504 }, 433 },
505 { 434 {
506 name: "始发地城市名称", 435 name: "始发地城市名称",
507 value: "originCity", 436 value: "originCity",
508 width: "130", 437 width: "130",
509 align: "center", 438 align: "center",
510 - sorTable: false,
511 - fixed: false,
512 - disabled: true
513 }, 439 },
514 { 440 {
515 name: "收件地", 441 name: "收件地",
516 value: "destinationSiteName", 442 value: "destinationSiteName",
517 width: "90", 443 width: "90",
518 align: "center", 444 align: "center",
519 - sorTable: false,
520 - fixed: false,
521 - disabled: true
522 }, 445 },
523 { 446 {
524 name: "尺寸", 447 name: "尺寸",
...@@ -526,26 +449,18 @@ export default { ...@@ -526,26 +449,18 @@ export default {
526 width: "80", 449 width: "80",
527 align: "center", 450 align: "center",
528 sorTable: true, 451 sorTable: true,
529 - fixed: false,
530 - disabled: true
531 }, 452 },
532 { 453 {
533 name: "大货预审意见（是否可以配置航班）", 454 name: "大货预审意见（是否可以配置航班）",
534 value: "bigPretrialOpinion", 455 value: "bigPretrialOpinion",
535 width: "250", 456 width: "250",
536 align: "center", 457 align: "center",
537 - sorTable: false,
538 - fixed: false,
539 - disabled: true
540 }, 458 },
541 { 459 {
542 name: "大货预审时间", 460 name: "大货预审时间",
543 value: "bigPretrialTime", 461 value: "bigPretrialTime",
544 width: "120", 462 width: "120",
545 align: "center", 463 align: "center",
546 - sorTable: false,
547 - fixed: false,
548 - disabled: true
549 }, 464 },
550 { 465 {
551 name: "海关回执时间", 466 name: "海关回执时间",
...@@ -553,8 +468,6 @@ export default { ...@@ -553,8 +468,6 @@ export default {
553 width: "150", 468 width: "150",
554 align: "center", 469 align: "center",
555 sorTable: true, 470 sorTable: true,
556 - fixed: false,
557 - disabled: true
558 }, 471 },
559 { 472 {
560 name: "航班预审时间", 473 name: "航班预审时间",
...@@ -562,8 +475,6 @@ export default { ...@@ -562,8 +475,6 @@ export default {
562 width: "150", 475 width: "150",
563 align: "center", 476 align: "center",
564 sorTable: true, 477 sorTable: true,
565 - fixed: false,
566 - disabled: true
567 }, 478 },
568 { 479 {
569 name: "创建人", 480 name: "创建人",
...@@ -571,8 +482,6 @@ export default { ...@@ -571,8 +482,6 @@ export default {
571 width: "90", 482 width: "90",
572 align: "center", 483 align: "center",
573 sorTable: true, 484 sorTable: true,
574 - fixed: false,
575 - disabled: true
576 }, 485 },
577 { 486 {
578 name: "创建时间", 487 name: "创建时间",
...@@ -580,8 +489,6 @@ export default { ...@@ -580,8 +489,6 @@ export default {
580 width: "100", 489 width: "100",
581 align: "center", 490 align: "center",
582 sorTable: true, 491 sorTable: true,
583 - fixed: false,
584 - disabled: true
585 }, 492 },
586 ], //表头数据 493 ], //表头数据
587 tableData: [], //表格数据 494 tableData: [], //表格数据
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
17 </div> 17 </div>
18 <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" 18 <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small"
19 border> 19 border>
20 - <el-table-column label="行号" prop="line" fixed width="50" align="center"> 20 + <el-table-column label="行号" prop="line" width="50" align="center">
21 </el-table-column> 21 </el-table-column>
22 - <el-table-column label="错误信息" prop="errorMessage" fixed width="300"> 22 + <el-table-column label="错误信息" prop="errorMessage" width="300">
23 <template slot-scope="scope"> 23 <template slot-scope="scope">
24 <div v-for="(m, key) in scope.row.errorMessage" :key="key"> 24 <div v-for="(m, key) in scope.row.errorMessage" :key="key">
25 {{ m }} 25 {{ m }}
......
...@@ -24,9 +24,9 @@ ...@@ -24,9 +24,9 @@
24 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span> 24 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
25 </div> 25 </div>
26 <el-table ref="filterTable" :data="tableData" style="margin-top: 20px" size="small" border> 26 <el-table ref="filterTable" :data="tableData" style="margin-top: 20px" size="small" border>
27 - <el-table-column label="行号" prop="line" fixed width="50" align="center"> 27 + <el-table-column label="行号" prop="line" width="50" align="center">
28 </el-table-column> 28 </el-table-column>
29 - <el-table-column label="错误信息" prop="errorMessage" fixed width="200"> 29 + <el-table-column label="错误信息" prop="errorMessage" width="200">
30 <template slot-scope="scope"> 30 <template slot-scope="scope">
31 <div v-for="(m, key) in scope.row.errorMessage" :key="key"> 31 <div v-for="(m, key) in scope.row.errorMessage" :key="key">
32 {{ m }} 32 {{ m }}
......
...@@ -307,234 +307,156 @@ export default { ...@@ -307,234 +307,156 @@ export default {
307 value: "fltDate", 307 value: "fltDate",
308 width: "100", 308 width: "100",
309 align: "center", 309 align: "center",
310 - sorTable: false,
311 - fixed: false,
312 - disabled: true,
313 }, 310 },
314 { 311 {
315 name: "航班起飞时间", 312 name: "航班起飞时间",
316 value: "takeOffTime", 313 value: "takeOffTime",
317 width: "120", 314 width: "120",
318 align: "center", 315 align: "center",
319 - sorTable: false,
320 - fixed: false,
321 - disabled: true,
322 }, 316 },
323 { 317 {
324 name: "CutOff时间", 318 name: "CutOff时间",
325 value: "cutOffTime", 319 value: "cutOffTime",
326 width: "110", 320 width: "110",
327 align: "center", 321 align: "center",
328 - sorTable: false,
329 - fixed: false,
330 - disabled: true,
331 }, 322 },
332 { 323 {
333 name: "航班号", 324 name: "航班号",
334 value: "fltNo", 325 value: "fltNo",
335 width: "100", 326 width: "100",
336 align: "center", 327 align: "center",
337 - sorTable: false,
338 - fixed: false,
339 - disabled: true,
340 }, 328 },
341 { 329 {
342 name: "航班路线", 330 name: "航班路线",
343 value: "route", 331 value: "route",
344 width: "140", 332 width: "140",
345 align: "center", 333 align: "center",
346 - sorTable: false,
347 - fixed: false,
348 - disabled: true,
349 }, 334 },
350 { 335 {
351 name: "航班类型", 336 name: "航班类型",
352 value: "typeName", 337 value: "typeName",
353 width: "100", 338 width: "100",
354 align: "center", 339 align: "center",
355 - sorTable: false,
356 - fixed: false,
357 - disabled: true,
358 }, 340 },
359 { 341 {
360 name: "航班种类", 342 name: "航班种类",
361 value: "flightKindName", 343 value: "flightKindName",
362 width: "100", 344 width: "100",
363 align: "center", 345 align: "center",
364 - sorTable: false,
365 - fixed: false,
366 - disabled: true,
367 }, 346 },
368 { 347 {
369 name: "航班状态", 348 name: "航班状态",
370 value: "statusName", 349 value: "statusName",
371 width: "100", 350 width: "100",
372 align: "center", 351 align: "center",
373 - sorTable: false,
374 - fixed: false,
375 - disabled: true,
376 }, 352 },
377 { 353 {
378 name: "是否自动推送", 354 name: "是否自动推送",
379 value: "pushDateSwitch", 355 value: "pushDateSwitch",
380 width: "120", 356 width: "120",
381 align: "center", 357 align: "center",
382 - sorTable: false,
383 - fixed: false,
384 - disabled: true,
385 }, 358 },
386 { 359 {
387 name: "总重量", 360 name: "总重量",
388 value: "totalWeight", 361 value: "totalWeight",
389 width: "90", 362 width: "90",
390 align: "center", 363 align: "center",
391 - sorTable: false,
392 - fixed: false,
393 - disabled: true,
394 }, 364 },
395 { 365 {
396 name: "原始重量（KG）", 366 name: "原始重量（KG）",
397 value: "originalWeight", 367 value: "originalWeight",
398 width: "120", 368 width: "120",
399 align: "center", 369 align: "center",
400 - sorTable: false,
401 - fixed: false,
402 - disabled: true,
403 }, 370 },
404 { 371 {
405 name: "已配重量", 372 name: "已配重量",
406 value: "alloctedWeight", 373 value: "alloctedWeight",
407 width: "90", 374 width: "90",
408 align: "center", 375 align: "center",
409 - sorTable: false,
410 - fixed: false,
411 - disabled: true,
412 }, 376 },
413 { 377 {
414 name: "是否需要预审", 378 name: "是否需要预审",
415 value: "needRequired", 379 value: "needRequired",
416 width: "130", 380 width: "130",
417 align: "center", 381 align: "center",
418 - sorTable: false,
419 - fixed: false,
420 - disabled: true,
421 }, 382 },
422 { 383 {
423 name: "是否开启高低价", 384 name: "是否开启高低价",
424 value: "highLowPriceFlg", 385 value: "highLowPriceFlg",
425 width: "140", 386 width: "140",
426 align: "center", 387 align: "center",
427 - sorTable: false,
428 - fixed: false,
429 - disabled: true,
430 }, 388 },
431 { 389 {
432 name: "是否限制一票一件", 390 name: "是否限制一票一件",
433 value: "ticketToPiece", 391 value: "ticketToPiece",
434 width: "140", 392 width: "140",
435 align: "center", 393 align: "center",
436 - sorTable: false,
437 - fixed: false,
438 - disabled: true,
439 }, 394 },
440 { 395 {
441 name: "额外增重百分比", 396 name: "额外增重百分比",
442 value: "extraWeightPercent", 397 value: "extraWeightPercent",
443 width: "140", 398 width: "140",
444 align: "center", 399 align: "center",
445 - sorTable: false,
446 - fixed: false,
447 - disabled: true,
448 }, 400 },
449 { 401 {
450 name: "高价百分比", 402 name: "高价百分比",
451 value: "highPriceWeightPercent", 403 value: "highPriceWeightPercent",
452 width: "120", 404 width: "120",
453 align: "center", 405 align: "center",
454 - sorTable: false,
455 - fixed: false,
456 - disabled: true,
457 }, 406 },
458 { 407 {
459 name: "低价百分比", 408 name: "低价百分比",
460 value: "lowPriceWeightPercent", 409 value: "lowPriceWeightPercent",
461 width: "120", 410 width: "120",
462 align: "center", 411 align: "center",
463 - sorTable: false,
464 - fixed: false,
465 - disabled: true,
466 }, 412 },
467 { 413 {
468 name: "总体积(cm³)", 414 name: "总体积(cm³)",
469 value: "totalVolume", 415 value: "totalVolume",
470 width: "100", 416 width: "100",
471 align: "center", 417 align: "center",
472 - sorTable: false,
473 - fixed: false,
474 - disabled: true,
475 }, 418 },
476 { 419 {
477 name: "已配体积(cm³)", 420 name: "已配体积(cm³)",
478 value: "alloctedVolume", 421 value: "alloctedVolume",
479 width: "120", 422 width: "120",
480 align: "center", 423 align: "center",
481 - sorTable: false,
482 - fixed: false,
483 - disabled: true,
484 }, 424 },
485 { 425 {
486 name: "航班优先级", 426 name: "航班优先级",
487 value: "priorityName", 427 value: "priorityName",
488 width: "100", 428 width: "100",
489 align: "center", 429 align: "center",
490 - sorTable: false,
491 - fixed: false,
492 - disabled: true,
493 }, 430 },
494 { 431 {
495 name: "配舱优先级", 432 name: "配舱优先级",
496 value: "priorityRuleName", 433 value: "priorityRuleName",
497 width: "100", 434 width: "100",
498 align: "center", 435 align: "center",
499 - sorTable: false,
500 - fixed: false,
501 - disabled: true,
502 }, 436 },
503 { 437 {
504 name: "创建人", 438 name: "创建人",
505 value: "createUserName", 439 value: "createUserName",
506 width: "90", 440 width: "90",
507 align: "center", 441 align: "center",
508 - sorTable: false,
509 - fixed: false,
510 - disabled: true,
511 }, 442 },
512 { 443 {
513 name: "创建时间", 444 name: "创建时间",
514 value: "createTime", 445 value: "createTime",
515 width: "100", 446 width: "100",
516 align: "center", 447 align: "center",
517 - sorTable: false,
518 - fixed: false,
519 - disabled: true,
520 }, 448 },
521 { 449 {
522 name: "最后修改人", 450 name: "最后修改人",
523 value: "lastModifyUserName", 451 value: "lastModifyUserName",
524 width: "120", 452 width: "120",
525 align: "center", 453 align: "center",
526 - sorTable: false,
527 - fixed: false,
528 - disabled: true,
529 }, 454 },
530 { 455 {
531 name: "最后修改时间", 456 name: "最后修改时间",
532 value: "lastModifyTime", 457 value: "lastModifyTime",
533 width: "120", 458 width: "120",
534 align: "center", 459 align: "center",
535 - sorTable: false,
536 - fixed: false,
537 - disabled: true,
538 }, 460 },
539 ], 461 ],
540 //删除失败数据 462 //删除失败数据
......
...@@ -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,8 +276,6 @@ export default { ...@@ -292,8 +276,6 @@ 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: "推送状态",
...@@ -301,8 +283,6 @@ export default { ...@@ -301,8 +283,6 @@ export default {
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: {}, //用户详情
......