Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
4bdcdb26 1 parent 35f92e54

bug修复

Inline Side-by-side
Showing 9 changed files with 425 additions and 854 deletions
1 -import service from "../utils/request";
2 import request from '@/utils/request' 1 import request from '@/utils/request'
3 2
3 +//航班预审模板下载
4 +/**
5 + * @param
6 + */
4 export function downLoadTemplate(template) { 7 export function downLoadTemplate(template) {
5 return request({ 8 return request({
6 url:'/caPreReviewImport/downLoadTemplate?template=' + template, 9 url:'/caPreReviewImport/downLoadTemplate?template=' + template,
...@@ -9,6 +12,11 @@ export function downLoadTemplate(template) { ...@@ -9,6 +12,11 @@ export function downLoadTemplate(template) {
9 }) 12 })
10 } 13 }
11 14
15 +//预审回执导入
16 +/**
17 + * @param file 文件 *
18 + * @param type 状态 *
19 + */
12 export function importcaPreReview(file, type){ 20 export function importcaPreReview(file, type){
13 let formData = new FormData(); 21 let formData = new FormData();
14 formData.append("file", file); 22 formData.append("file", file);
......
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 2
3 -// 货物查询查询条件数据 3 +//货物查询查询条件数据
4 +/**
5 + * @param
6 + */
4 export function findConditionData(data) { 7 export function findConditionData(data) {
5 return request({ 8 return request({
6 url: '/cargo/findConditionData', 9 url: '/cargo/findConditionData',
...@@ -10,6 +13,9 @@ export function findConditionData(data) { ...@@ -10,6 +13,9 @@ export function findConditionData(data) {
10 } 13 }
11 14
12 //货物查询 15 //货物查询
16 +/**
17 + * @param
18 + */
13 export function findCargoData(data) { 19 export function findCargoData(data) {
14 return request({ 20 return request({
15 url: '/cargo/findCargoData', 21 url: '/cargo/findCargoData',
...@@ -53,3 +59,12 @@ export function downloadExcel(data) { ...@@ -53,3 +59,12 @@ export function downloadExcel(data) {
53 responseType: 'blob', 59 responseType: 'blob',
54 }) 60 })
55 } 61 }
62 +
63 +//释放仓位
64 +export function releaseCargo(data) {
65 + return request({
66 + url: '/cargo/releaseCargo',
67 + method: 'post',
68 + data: data,
69 + })
70 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -31,7 +31,6 @@ export function delFlight(data) { ...@@ -31,7 +31,6 @@ export function delFlight(data) {
31 return request({ 31 return request({
32 url: '/FlightPreserveController/delFlight/'+ data, 32 url: '/FlightPreserveController/delFlight/'+ data,
33 method: 'post' 33 method: 'post'
34 -
35 }) 34 })
36 } 35 }
37 //新增修改 36 //新增修改
...@@ -61,3 +60,12 @@ export function updateStatusBatch(data){ ...@@ -61,3 +60,12 @@ export function updateStatusBatch(data){
61 data: data 60 data: data
62 }) 61 })
63 } 62 }
63 +
64 +//自动推送开关
65 +export function updateAutoPushBatch(data){
66 + return request({
67 + url: '/FlightPreserveController/updateAutoPushBatch',
68 + method: 'post',
69 + data: data
70 + })
71 +}
......
1 -import service from "../utils/request";
2 import request from '@/utils/request' 1 import request from '@/utils/request'
3 2
4 // 查询航班种类 3 // 查询航班种类
......
...@@ -93,6 +93,13 @@ import { praseStrEmpty } from "@/utils/FedEx"; ...@@ -93,6 +93,13 @@ import { praseStrEmpty } from "@/utils/FedEx";
93 // } 93 // }
94 94
95 // 查询用户列表 95 // 查询用户列表
96 +/**
97 + * @param page 页码 *
98 + * @param size 数据长度 *
99 + * @param isValid 用户状态
100 + * @param username 用户名
101 + * @param phone 手机号码
102 + */
96 export function listUser(data) { 103 export function listUser(data) {
97 return request({ 104 return request({
98 url: '/sysUser/getUserList', 105 url: '/sysUser/getUserList',
...@@ -102,6 +109,9 @@ export function listUser(data) { ...@@ -102,6 +109,9 @@ export function listUser(data) {
102 } 109 }
103 110
104 // 查询用户详细 111 // 查询用户详细
112 +/**
113 + * @param id 用户id *
114 + */
105 export function detailUser(userId) { 115 export function detailUser(userId) {
106 return request({ 116 return request({
107 url: '/sysUser/detailUser?id=' + praseStrEmpty(userId), 117 url: '/sysUser/detailUser?id=' + praseStrEmpty(userId),
...@@ -110,6 +120,15 @@ export function detailUser(userId) { ...@@ -110,6 +120,15 @@ export function detailUser(userId) {
110 } 120 }
111 121
112 // 新增用户 122 // 新增用户
123 +/**
124 + * @param loginName 员工号 *
125 + * @param username 用户姓名 *
126 + * @param phone 手机号
127 + * @param email 电子邮箱
128 + * @param portName 所属口岸 *
129 + * @param roleIds 所属角色 *
130 + * @param remark 备注
131 + */
113 export function addOrUpdateUser(data) { 132 export function addOrUpdateUser(data) {
114 return request({ 133 return request({
115 url: '/sysUser/addOrUpdateUser', 134 url: '/sysUser/addOrUpdateUser',
...@@ -119,6 +138,16 @@ export function addOrUpdateUser(data) { ...@@ -119,6 +138,16 @@ export function addOrUpdateUser(data) {
119 } 138 }
120 139
121 // 修改用户状态 140 // 修改用户状态
141 +/**
142 + * @param id 用户id *
143 + * @param loginName 员工号 *
144 + * @param username 用户姓名 *
145 + * @param phone 手机号
146 + * @param email 电子邮箱
147 + * @param portName 所属口岸 *
148 + * @param roleIds 所属角色 *
149 + * @param remark 备注
150 + */
122 export function updateUserStatus(data) { 151 export function updateUserStatus(data) {
123 return request({ 152 return request({
124 url: '/sysUser/updateUserStatus', 153 url: '/sysUser/updateUserStatus',
...@@ -128,6 +157,9 @@ export function updateUserStatus(data) { ...@@ -128,6 +157,9 @@ export function updateUserStatus(data) {
128 } 157 }
129 158
130 //菜单信息 159 //菜单信息
160 +/**
161 + * @param
162 + */
131 export function getAllAuth() { 163 export function getAllAuth() {
132 return request({ 164 return request({
133 url: '/sysMenu/getAllAuth', 165 url: '/sysMenu/getAllAuth',
...@@ -136,6 +168,10 @@ export function getAllAuth() { ...@@ -136,6 +168,10 @@ export function getAllAuth() {
136 } 168 }
137 169
138 //菜单开启关闭 170 //菜单开启关闭
171 +/**
172 + * @param id 菜单id *
173 + * @param status 菜单状态 *
174 + */
139 export function updateStatus(data) { 175 export function updateStatus(data) {
140 return request({ 176 return request({
141 url: '/sysMenu/updateStatus', 177 url: '/sysMenu/updateStatus',
...@@ -145,6 +181,14 @@ export function updateStatus(data) { ...@@ -145,6 +181,14 @@ export function updateStatus(data) {
145 } 181 }
146 182
147 //角色列表 183 //角色列表
184 +/**
185 + * @param name 角色名称
186 + * @param size 数据长度 *
187 + * @param page 页码 *
188 + * @param createStart 创建开始时间
189 + * @param createEnd 创建结束时间
190 + * @param valid 角色状态
191 + */
148 export function getRoleList(data) { 192 export function getRoleList(data) {
149 return request({ 193 return request({
150 url: '/role/getRoleList', 194 url: '/role/getRoleList',
...@@ -154,6 +198,9 @@ export function getRoleList(data) { ...@@ -154,6 +198,9 @@ export function getRoleList(data) {
154 } 198 }
155 199
156 //角色详情 200 //角色详情
201 +/**
202 + * @param id 角色id *
203 + */
157 export function detailRole(id) { 204 export function detailRole(id) {
158 return request({ 205 return request({
159 url: '/role/detailRole?id=' + id, 206 url: '/role/detailRole?id=' + id,
...@@ -162,6 +209,13 @@ export function detailRole(id) { ...@@ -162,6 +209,13 @@ export function detailRole(id) {
162 } 209 }
163 210
164 //新增修改角色 211 //新增修改角色
212 +/**
213 + * @param id 角色id *
214 + * @param name 角色名 *
215 + * @param remark 角色描述
216 + * @param menuIds 角色权限
217 + * @param valid 角色状态
218 + */
165 export function addOrUpdateRole(data) { 219 export function addOrUpdateRole(data) {
166 return request({ 220 return request({
167 url: '/role/addOrUpdateRole', 221 url: '/role/addOrUpdateRole',
...@@ -171,6 +225,10 @@ export function addOrUpdateRole(data) { ...@@ -171,6 +225,10 @@ export function addOrUpdateRole(data) {
171 } 225 }
172 226
173 //角色状态修改 227 //角色状态修改
228 +/**
229 + * @param id 角色id *
230 + * @param valid 角色状态 *
231 + */
174 export function updateRoleStatus(data) { 232 export function updateRoleStatus(data) {
175 return request({ 233 return request({
176 url: '/role/updateRoleStatus', 234 url: '/role/updateRoleStatus',
...@@ -180,6 +238,9 @@ export function updateRoleStatus(data) { ...@@ -180,6 +238,9 @@ export function updateRoleStatus(data) {
180 } 238 }
181 239
182 //口岸列表 240 //口岸列表
241 +/**
242 + * @param
243 + */
183 export function portNameList() { 244 export function portNameList() {
184 return request({ 245 return request({
185 url: '/dictionary/port', 246 url: '/dictionary/port',
...@@ -188,6 +249,9 @@ export function portNameList() { ...@@ -188,6 +249,9 @@ export function portNameList() {
188 } 249 }
189 250
190 //口岸变更 251 //口岸变更
252 +/**
253 + * @param
254 + */
191 export function changeCurrentPort(data) { 255 export function changeCurrentPort(data) {
192 return request({ 256 return request({
193 url: '/sysUser/changeCurrentPort', 257 url: '/sysUser/changeCurrentPort',
......
1 <template> 1 <template>
2 <div class="w-table" :class="{ 'w-table_moving': dragState.dragging }"> 2 <div class="w-table" :class="{ 'w-table_moving': dragState.dragging }">
3 - <el-table 3 + <el-table :ref="tableName" :data="data" :border="border" :stripe="stripe" :size="size" :fit="fit" :indent="indent"
4 - :ref="tableName" 4 + :show-header="showHeader" :height="height" :highlight-current-row="highlightCurrentRow" :lazy="lazy"
5 - :data="data" 5 + :downShiftKey="shiftKey" :limitStart="limitStart" :row-key="rowKey" :default-expand-all="defaultExpandAll"
6 - :border="border" 6 + :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" v-loading="loading"
7 - :stripe="stripe" 7 + :cell-class-name="cellClassName" :header-cell-class-name="headerCellClassName" @sort-change="sortChange"
8 - :size="size" 8 + @select="tableSelect" @select-all="tableSelectAll" @select-change="SelectChange">
9 - :fit="fit"
10 - :indent="indent"
11 - :show-header="showHeader"
12 - :height="height"
13 - :highlight-current-row="highlightCurrentRow"
14 - :lazy="lazy"
15 - :downShiftKey="shiftKey"
16 - :limitStart="limitStart"
17 - :row-key="rowKey"
18 - :default-expand-all="defaultExpandAll"
19 - :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
20 - v-loading="loading"
21 - :cell-class-name="cellClassName"
22 - :header-cell-class-name="headerCellClassName"
23 - @sort-change="sortChange"
24 - @select="tableSelect"
25 - @select-all="tableSelectAll"
26 - @select-change="SelectChange"
27 - >
28 <!-- 复选框 --> 9 <!-- 复选框 -->
29 - <el-table-column 10 + <el-table-column v-if="selection" type="selection" :fixed="true" width="50" align="center"></el-table-column>
30 - v-if="selection"
31 - type="selection"
32 - :fixed="true"
33 - width="50"
34 - align="center"
35 - ></el-table-column>
36 <!-- 序号 --> 11 <!-- 序号 -->
37 <el-table-column type="index" width="50" align="center"></el-table-column> 12 <el-table-column type="index" width="50" align="center"></el-table-column>
38 <template v-for="(item, index) in newHeader"> 13 <template v-for="(item, index) in newHeader">
39 <!-- 自定义插槽 --> 14 <!-- 自定义插槽 -->
40 - <el-table-column 15 + <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
41 - v-if="item.slot" 16 + :fixed="item.fixed" :show-overflow-tooltip="showOverflowTooltip" :sortable="item.sorTable"
42 - :prop="item.value" 17 + :formatter="formatter" header-align="center" :sort-orders="['descending', 'ascending', null]"
43 - :label="item.name" 18 + :slotHeader="slotHeader" :render-header="renderHeader" :key="index">
44 - :width="item.width"
45 - :align="item.align"
46 - :fixed="item.fixed"
47 - :show-overflow-tooltip="showOverflowTooltip"
48 - :sortable="item.sorTable"
49 - :formatter="formatter"
50 - header-align="center"
51 - :sort-orders="['descending', 'ascending', null]"
52 - :slotHeader="slotHeader"
53 - :render-header="renderHeader"
54 - :key="index"
55 - >
56 <template slot-scope="scope"> 19 <template slot-scope="scope">
57 <slot :name="item.value" :row="scope.row"></slot> 20 <slot :name="item.value" :row="scope.row"></slot>
58 </template> 21 </template>
59 </el-table-column> 22 </el-table-column>
60 <!-- 默认数据 --> 23 <!-- 默认数据 -->
61 - <el-table-column 24 + <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width"
62 - v-else 25 + :align="item.align" :fixed="item.fixed" :sortable="item.sorTable" :column-key="index.toString()"
63 - :prop="item.value" 26 + :show-overflow-tooltip="showOverflowTooltip" header-align="center"
64 - :label="item.name" 27 + :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
65 - :index="item.index" 28 + :formatter="formatter" :key="index">
66 - :width="item.width"
67 - :align="item.align"
68 - :fixed="item.fixed"
69 - :sortable="item.sorTable"
70 - :column-key="index.toString()"
71 - :show-overflow-tooltip="showOverflowTooltip"
72 - header-align="center"
73 - :sort-orders="['descending', 'ascending', null]"
74 - :slotHeader="slotHeader"
75 - :render-header="renderHeader"
76 - :formatter="formatter"
77 - :key="index"
78 - >
79 </el-table-column> 29 </el-table-column>
80 </template> 30 </template>
31 + <!-- 末端插槽 -->
81 <slot name="optionColumn"></slot> 32 <slot name="optionColumn"></slot>
82 </el-table> 33 </el-table>
83 <!-- 分页 --> 34 <!-- 分页 -->
84 - <el-pagination 35 + <el-pagination :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum" :page-sizes="pageSizes"
85 - :total="totalCount" 36 + background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange"
86 - :page-size.sync="limitSize" 37 + @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
87 - :current-page.sync="pageNum"
88 - :page-sizes="pageSizes"
89 - background
90 - layout="prev, pager, next, jumper, ->, sizes, total"
91 - class="tablePagination"
92 - @size-change="sizeChange"
93 - @next-click="nextClick"
94 - @prev-click="prevClick"
95 - @current-change="currentChange"
96 - >
97 </el-pagination> 38 </el-pagination>
98 <!-- 表头控制 --> 39 <!-- 表头控制 -->
99 <div class="tableInfo" v-if="infoShow"> 40 <div class="tableInfo" v-if="infoShow">
100 <ul class="tableList" v-show="show"> 41 <ul class="tableList" v-show="show">
101 <el-checkbox-group v-model="checkDisabled"> 42 <el-checkbox-group v-model="checkDisabled">
102 - <li 43 + <li class="flexList" v-for="(item, index) in newHeader" :key="index" :title="item.name">
103 - class="flexList"
104 - v-for="(item, index) in newHeader"
105 - :key="index"
106 - :title="item.name"
107 - >
108 <div> 44 <div>
109 - <el-checkbox 45 + <el-checkbox :label="item.name" @change="newHeader[index].disabled = !item.disabled">{{ item.name }}
110 - :label="item.name" 46 + </el-checkbox>
111 - @change="newHeader[index].disabled = !item.disabled"
112 - >{{ item.name }}</el-checkbox
113 - >
114 </div> 47 </div>
115 </li> 48 </li>
116 </el-checkbox-group> 49 </el-checkbox-group>
117 </ul> 50 </ul>
118 - <el-button 51 + <el-button type="primary" icon="el-icon-edit" size="medium" circle @click="show = !show"></el-button>
119 - type="primary"
120 - icon="el-icon-edit"
121 - size="medium"
122 - circle
123 - @click="show = !show"
124 - ></el-button>
125 </div> 52 </div>
126 </div> 53 </div>
127 </template> 54 </template>
...@@ -302,6 +229,7 @@ export default { ...@@ -302,6 +229,7 @@ export default {
302 }, 229 },
303 }, 230 },
304 methods: { 231 methods: {
232 + //数据长度切换
305 sizeChange(val) { 233 sizeChange(val) {
306 this.$emit("sizeChange", val); 234 this.$emit("sizeChange", val);
307 }, 235 },
...@@ -526,13 +454,17 @@ export default { ...@@ -526,13 +454,17 @@ export default {
526 margin-top: 40px; 454 margin-top: 40px;
527 text-align: right; 455 text-align: right;
528 } 456 }
457 +
529 .w-table { 458 .w-table {
530 height: 100%; 459 height: 100%;
531 - 　.el-table .darg_start { 460 +
461 + .el-table .darg_start {
532 background-color: #f3f3f3; 462 background-color: #f3f3f3;
533 } 463 }
464 +
534 .el-table th { 465 .el-table th {
535 padding: 0; 466 padding: 0;
467 +
536 .virtual { 468 .virtual {
537 position: absolute; 469 position: absolute;
538 display: block; 470 display: block;
...@@ -543,12 +475,14 @@ export default { ...@@ -543,12 +475,14 @@ export default {
543 background: none; 475 background: none;
544 border: none; 476 border: none;
545 } 477 }
478 +
546 &.darg_active_left { 479 &.darg_active_left {
547 .virtual { 480 .virtual {
548 border-left: 2px dotted #666; 481 border-left: 2px dotted #666;
549 z-index: 99; 482 z-index: 99;
550 } 483 }
551 } 484 }
485 +
552 &.darg_active_right { 486 &.darg_active_right {
553 .virtual { 487 .virtual {
554 border-right: 2px dotted #666; 488 border-right: 2px dotted #666;
...@@ -556,6 +490,7 @@ export default { ...@@ -556,6 +490,7 @@ export default {
556 } 490 }
557 } 491 }
558 } 492 }
493 +
559 .thead-cell { 494 .thead-cell {
560 padding: 0; 495 padding: 0;
561 display: inline-flex; 496 display: inline-flex;
...@@ -563,6 +498,7 @@ export default { ...@@ -563,6 +498,7 @@ export default {
563 align-items: left; 498 align-items: left;
564 cursor: pointer; 499 cursor: pointer;
565 overflow: initial; 500 overflow: initial;
501 +
566 &:before { 502 &:before {
567 content: ""; 503 content: "";
568 position: absolute; 504 position: absolute;
...@@ -572,21 +508,25 @@ export default { ...@@ -572,21 +508,25 @@ export default {
572 right: 0; 508 right: 0;
573 } 509 }
574 } 510 }
511 +
575 &.w-table_moving { 512 &.w-table_moving {
576 .el-table th .thead-cell { 513 .el-table th .thead-cell {
577 cursor: move !important; 514 cursor: move !important;
578 } 515 }
516 +
579 .el-table__fixed { 517 .el-table__fixed {
580 cursor: not-allowed; 518 cursor: not-allowed;
581 } 519 }
582 } 520 }
583 } 521 }
522 +
584 .tableInfo { 523 .tableInfo {
585 position: fixed; 524 position: fixed;
586 right: 30px; 525 right: 30px;
587 bottom: 100px; 526 bottom: 100px;
588 z-index: 99999999; 527 z-index: 99999999;
589 } 528 }
529 +
590 .tableList { 530 .tableList {
591 width: 200px; 531 width: 200px;
592 max-height: 500px; 532 max-height: 500px;
...@@ -600,20 +540,24 @@ export default { ...@@ -600,20 +540,24 @@ export default {
600 background: #fff; 540 background: #fff;
601 overflow-y: scroll; 541 overflow-y: scroll;
602 } 542 }
543 +
603 .tableList::-webkit-scrollbar { 544 .tableList::-webkit-scrollbar {
604 width: 4px; 545 width: 4px;
605 height: 4px; 546 height: 4px;
606 } 547 }
548 +
607 .tableList::-webkit-scrollbar-thumb { 549 .tableList::-webkit-scrollbar-thumb {
608 border-radius: 10px; 550 border-radius: 10px;
609 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); 551 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
610 background: rgba(0, 0, 0, 0.2); 552 background: rgba(0, 0, 0, 0.2);
611 } 553 }
554 +
612 .tableList::-webkit-scrollbar-track { 555 .tableList::-webkit-scrollbar-track {
613 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); 556 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
614 border-radius: 0; 557 border-radius: 0;
615 background: rgba(0, 0, 0, 0.2); 558 background: rgba(0, 0, 0, 0.2);
616 } 559 }
560 +
617 .flexList { 561 .flexList {
618 width: 100%; 562 width: 100%;
619 display: flex; 563 display: flex;
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-dialog 3 + <el-dialog title="货物配舱" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 - title="货物配舱" 4 + :append-to-body="true">
5 - width="80%"
6 - :visible.sync="dialogVisible"
7 - :close-on-click-modal="false"
8 - :append-to-body="true"
9 - >
10 <el-divider content-position="left">已选货物信息</el-divider> 5 <el-divider content-position="left">已选货物信息</el-divider>
11 - <el-table 6 + <el-table :data="tableData" size="mini" height="200" max-height="200" border stripe highlight-current-row
12 - :data="tableData" 7 + style="width: 100%">
13 - size="mini"
14 - height="200"
15 - max-height="200"
16 - border
17 - stripe
18 - highlight-current-row
19 - style="width: 100%"
20 - >
21 <el-table-column type="index" label="序号" align="center"> 8 <el-table-column type="index" label="序号" align="center">
22 </el-table-column> 9 </el-table-column>
23 - <el-table-column 10 + <el-table-column v-for="(item, index) in cargoHeader" header-align="center" align="center" :prop="item.value"
24 - v-for="(item, index) in cargoHeader" 11 + :label="item.name" :key="index" :show-overflow-tooltip="true" :formatter="formatter">
25 - header-align="center"
26 - align="center"
27 - :prop="item.value"
28 - :label="item.name"
29 - :key="index"
30 - :show-overflow-tooltip="true"
31 - :formatter="formatter"
32 - >
33 </el-table-column> 12 </el-table-column>
34 </el-table> 13 </el-table>
35 - <el-form 14 + <el-form ref="form" label-position="right" label-width="auto" style="width: 400px; margin: 30px auto"
36 - ref="form" 15 + :model="formData" :rules="rules">
37 - label-position="right"
38 - label-width="auto"
39 - style="width: 400px; margin: 30px auto"
40 - v-model="formData"
41 - >
42 <el-form-item label="航班号" prop="fltNo"> 16 <el-form-item label="航班号" prop="fltNo">
43 - <el-input 17 + <el-input v-model="fltNo" size="medium" placeholder="请输入航班号" maxlength="10" style="width: 350px"></el-input>
44 - v-model="fltNo"
45 - size="medium"
46 - placeholder="请输入航班号"
47 - maxlength="10"
48 - style="width: 350px"
49 - ></el-input>
50 </el-form-item> 18 </el-form-item>
51 <el-form-item label="航班日期:" prop="fltDate"> 19 <el-form-item label="航班日期:" prop="fltDate">
52 - <el-date-picker 20 + <el-date-picker v-model="formData.fltDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"
53 - v-model="formData.fltDate" 21 + size="medium" style="width: 350px">
54 - type="date"
55 - placeholder="选择日期"
56 - value-format="yyyy-MM-dd"
57 - size="medium"
58 - style="width: 350px"
59 - >
60 </el-date-picker> 22 </el-date-picker>
61 </el-form-item> 23 </el-form-item>
62 </el-form> 24 </el-form>
...@@ -118,11 +80,11 @@ export default { ...@@ -118,11 +80,11 @@ export default {
118 { 80 {
119 required: true, 81 required: true,
120 message: "航班日期不能为空", 82 message: "航班日期不能为空",
121 - trigger: "change", 83 + trigger: "blur",
122 }, 84 },
123 ], 85 ],
124 }, 86 },
125 - loading:false, 87 + loading: false,
126 }; 88 };
127 }, 89 },
128 methods: { 90 methods: {
...@@ -136,7 +98,7 @@ export default { ...@@ -136,7 +98,7 @@ export default {
136 }, 98 },
137 //确定配舱 99 //确定配舱
138 submit() { 100 submit() {
139 - this.loading =true; 101 + this.loading = true;
140 let arr = []; 102 let arr = [];
141 this.tableData.forEach((item) => { 103 this.tableData.forEach((item) => {
142 arr.push(item.id); 104 arr.push(item.id);
...@@ -196,7 +158,7 @@ export default { ...@@ -196,7 +158,7 @@ export default {
196 type: "warning", 158 type: "warning",
197 }); 159 });
198 } 160 }
199 - }).catch(()=>{ 161 + }).catch(() => {
200 this.loading = false; 162 this.loading = false;
201 }); 163 });
202 } else { 164 } else {
...@@ -212,11 +174,11 @@ export default { ...@@ -212,11 +174,11 @@ export default {
212 this.$refs['form'].clearValidate(); 174 this.$refs['form'].clearValidate();
213 this.$emit("dialogBeforeClose", { close: false, reload: true }); 175 this.$emit("dialogBeforeClose", { close: false, reload: true });
214 }, 176 },
215 - formatter(row, column, cellValue, index){ 177 + formatter(row, column, cellValue, index) {
216 - if(column.property == "cargoRulesStatus"){ 178 + if (column.property == "cargoRulesStatus") {
217 - if(cellValue == 1){ 179 + if (cellValue == 1) {
218 return "手动" 180 return "手动"
219 - }else{ 181 + } else {
220 return "自动" 182 return "自动"
221 } 183 }
222 } 184 }
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto"
4 - class="form-header" 4 + size="medium">
5 - :model="queryParams"
6 - ref="queryForm"
7 - label-position="right"
8 - label-width="auto"
9 - size="medium"
10 - >
11 <el-row> 5 <el-row>
12 <el-col :span="6"> 6 <el-col :span="6">
13 <el-form-item label="航班日期从" prop="fltDateStart"> 7 <el-form-item label="航班日期从" prop="fltDateStart">
14 - <el-date-picker 8 + <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date"
15 - class="formItem" 9 + placeholder="选择日期">
16 - value-format="yyyy-MM-dd"
17 - v-model="queryParams.fltDateStart"
18 - type="date"
19 - placeholder="选择日期"
20 - >
21 </el-date-picker> 10 </el-date-picker>
22 </el-form-item> 11 </el-form-item>
23 </el-col> 12 </el-col>
24 <el-col :span="6"> 13 <el-col :span="6">
25 <el-form-item label="到" prop="fltDateEnd"> 14 <el-form-item label="到" prop="fltDateEnd">
26 - <el-date-picker 15 + <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date"
27 - class="formItem" 16 + placeholder="选择日期">
28 - value-format="yyyy-MM-dd"
29 - v-model="queryParams.fltDateEnd"
30 - type="date"
31 - placeholder="选择日期"
32 - >
33 </el-date-picker> 17 </el-date-picker>
34 </el-form-item> 18 </el-form-item>
35 </el-col> 19 </el-col>
36 <el-col :span="6"> 20 <el-col :span="6">
37 <el-form-item label="航班号" prop="fltNo"> 21 <el-form-item label="航班号" prop="fltNo">
38 - <el-input 22 + <el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
39 - class="formItem"
40 - v-model="queryParams.fltNo"
41 - placeholder="请输入航班号"
42 - clearable
43 - />
44 </el-form-item> 23 </el-form-item>
45 </el-col> 24 </el-col>
46 <el-col :span="6"> 25 <el-col :span="6">
47 <el-form-item label="航班类型" prop="typeId"> 26 <el-form-item label="航班类型" prop="typeId">
48 - <el-select 27 + <el-select class="formItem" v-model="queryParams.typeId" placeholder="请选择航班类型" clearable>
49 - class="formItem" 28 + <el-option v-for="dict in selectOption.flightTypelist" :key="dict.id" :label="dict.chineseName"
50 - v-model="queryParams.typeId" 29 + :value="dict.id" />
51 - placeholder="请选择航班类型"
52 - clearable
53 - >
54 - <el-option
55 - v-for="dict in selectOption.flightTypelist"
56 - :key="dict.id"
57 - :label="dict.chineseName"
58 - :value="dict.id"
59 - />
60 </el-select> 30 </el-select>
61 </el-form-item> 31 </el-form-item>
62 </el-col> 32 </el-col>
63 <el-col :span="6"> 33 <el-col :span="6">
64 <el-form-item label="航班状态" prop="statusId"> 34 <el-form-item label="航班状态" prop="statusId">
65 - <el-select 35 + <el-select class="formItem" v-model="queryParams.statusId" placeholder="请选择航班状态" clearable>
66 - class="formItem" 36 + <el-option v-for="dict in selectOption.flightStatuslist" :key="dict.id" :label="dict.chineseName"
67 - v-model="queryParams.statusId" 37 + :value="dict.id" />
68 - placeholder="请选择航班状态"
69 - clearable
70 - >
71 - <el-option
72 - v-for="dict in selectOption.flightStatuslist"
73 - :key="dict.id"
74 - :label="dict.chineseName"
75 - :value="dict.id"
76 - />
77 </el-select> 38 </el-select>
78 </el-form-item> 39 </el-form-item>
79 </el-col> 40 </el-col>
80 <el-col :span="6"> 41 <el-col :span="6">
81 <el-form-item label="航班种类" prop="flightKindId"> 42 <el-form-item label="航班种类" prop="flightKindId">
82 - <el-select 43 + <el-select class="formItem" v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable>
83 - class="formItem" 44 + <el-option v-for="dict in selectOption.flightKindlist" :key="dict.id" :label="dict.chineseName"
84 - v-model="queryParams.flightKindId" 45 + :value="dict.id" />
85 - placeholder="请选择航班种类"
86 - clearable
87 - >
88 - <el-option
89 - v-for="dict in selectOption.flightKindlist"
90 - :key="dict.id"
91 - :label="dict.chineseName"
92 - :value="dict.id"
93 - />
94 </el-select> 46 </el-select>
95 </el-form-item> 47 </el-form-item>
96 </el-col> 48 </el-col>
97 </el-row> 49 </el-row>
98 - <el-button 50 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
99 - type="primary" 51 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
100 - icon="el-icon-search" 52 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd" v-hasPermi="['base:flightInfo:add']">
101 - size="mini" 53 + 新增</el-button>
102 - @click="handleQuery" 54 + <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
103 - >搜索</el-button 55 + @click="handleFlightStatus('flightStatus10')" v-hasPermi="['base:flightInfo:open']">自动配舱开启</el-button>
104 - > 56 + <el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
105 - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery" 57 + @click="handleFlightStatus('flightStatus80')" v-hasPermi="['base:flightInfo:close']">自动配舱关闭</el-button>
106 - >重置</el-button 58 + <el-button type="primary" icon="el-icon-circle-check" size="mini" :disabled="ids.length == 0"
107 - > 59 + @click="autoPushBatch('open')" v-hasPermi="['base:flightInfo:autoPushOpen']">自动推送开启</el-button>
108 - <el-button 60 + <el-button type="primary" icon="el-icon-circle-close" size="mini" :disabled="ids.length == 0"
109 - type="primary" 61 + @click="autoPushBatch('close')" v-hasPermi="['base:flightInfo:autoPushClose']">自动推送关闭</el-button>
110 - icon="el-icon-plus" 62 + <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="ids.length == 0" @click="handleDelete"
111 - size="mini" 63 + v-hasPermi="['base:flightInfo:delete']">删除
112 - @click="handleAdd"
113 - v-hasPermi="['base:flightInfo:add']"
114 - >新增</el-button
115 - >
116 - <el-button
117 - type="primary"
118 - icon="el-icon-circle-check"
119 - size="mini"
120 - :disabled="ids.length == 0"
121 - @click="handleFlightStatus('flightStatus10')"
122 - v-hasPermi="['base:flightInfo:open']"
123 - >自动配舱开启</el-button
124 - >
125 - <el-button
126 - type="primary"
127 - icon="el-icon-circle-close"
128 - size="mini"
129 - :disabled="ids.length == 0"
130 - @click="handleFlightStatus('flightStatus80')"
131 - v-hasPermi="['base:flightInfo:close']"
132 - >自动配舱关闭</el-button
133 - >
134 - <el-button
135 - type="primary"
136 - icon="el-icon-circle-check"
137 - size="mini"
138 - :disabled="ids.length == 0"
139 - @click="autoPushBatch('open')"
140 - v-hasPermi="['base:flightInfo:autoPushOpen']"
141 - >自动推送开启</el-button
142 - >
143 - <el-button
144 - type="primary"
145 - icon="el-icon-circle-close"
146 - size="mini"
147 - :disabled="ids.length == 0"
148 - @click="autoPushBatch('close')"
149 - v-hasPermi="['base:flightInfo:autoPushClose']"
150 - >自动推送关闭</el-button
151 - >
152 - <el-button
153 - type="danger"
154 - icon="el-icon-delete"
155 - size="mini"
156 - :disabled="ids.length == 0"
157 - @click="handleDelete"
158 - v-hasPermi="['base:flightInfo:delete']"
159 - >删除
160 </el-button> 64 </el-button>
161 </el-form> 65 </el-form>
162 - <Tables 66 + <Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
163 - ref="flightInfoTable" 67 + :infoData="tableHeader" :selection="true" :totalCount="total" :loading="loading"
164 - ductName="FlightInformation" 68 + :limitSize="queryParams.limitSize" :page="queryParams.pageNum" :shiftKey="shiftKey" :infoShow="false"
165 - :data="findAllFltDatList" 69 + :height="tableHeight" :pageSizes="[20, 30, 40, 50, 100]" @tableSelect="tableSelect"
166 - :headerData="tableHeader" 70 + @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange" @sizeChange="sizeChange">
167 - :infoData="tableHeader"
168 - :selection="true"
169 - :totalCount="total"
170 - :loading="loading"
171 - :limitSize="queryParams.limitSize"
172 - :page="queryParams.pageNum"
173 - :shiftKey="shiftKey"
174 - :infoShow="false"
175 - :height="tableHeight"
176 - :pageSizes="[20, 30, 40, 50, 100]"
177 - @tableSelect="tableSelect"
178 - @tableSelectAll="tableSelectAll"
179 - @currentChange="currentChange"
180 - @sortChange="sortChange"
181 - @sizeChange="sizeChange"
182 - >
183 <template slot="optionColumn"> 71 <template slot="optionColumn">
184 - <el-table-column 72 + <el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
185 - v-if="findAllFltDatList.length > 0" 73 + class-name="small-padding fixed-width" fixed="right">
186 - label="操作"
187 - align="center"
188 - class-name="small-padding fixed-width"
189 - fixed="right"
190 - >
191 <template slot-scope="scope"> 74 <template slot-scope="scope">
192 - <el-button 75 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
193 - size="mini" 76 + v-hasPermi="['base:flightInfo:update']">修改</el-button>
194 - type="text"
195 - icon="el-icon-edit"
196 - @click="handleUpdate(scope.row)"
197 - v-hasPermi="['base:flightInfo:update']"
198 - >修改</el-button
199 - >
200 </template> 77 </template>
201 </el-table-column> 78 </el-table-column>
202 </template> 79 </template>
203 </Tables> 80 </Tables>
204 <!-- 添加或修改对话框 --> 81 <!-- 添加或修改对话框 -->
205 - <el-dialog 82 + <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
206 - :title="title" 83 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
207 - :visible.sync="open"
208 - width="60%"
209 - :close-on-click-modal="false"
210 - :append-to-body="true"
211 - >
212 - <el-form
213 - ref="form"
214 - :model="form"
215 - :rules="rules"
216 - label-position="right"
217 - label-width="auto"
218 - >
219 <el-row> 84 <el-row>
220 <el-col :span="12"> 85 <el-col :span="12">
221 <el-form-item label="航班号" prop="fltNo"> 86 <el-form-item label="航班号" prop="fltNo">
222 - <el-input 87 + <el-input @blur="blurfltNo" :disabled="formdisabled.fltNo" style="width: 93%" v-model="form.fltNo"
223 - @blur="blurfltNo" 88 + placeholder="请输入航班号" maxlength="10" />
224 - :disabled="formdisabled.fltNo"
225 - style="width: 93%"
226 - v-model="form.fltNo"
227 - placeholder="请输入航班号"
228 - maxlength="10"
229 - />
230 </el-form-item> 89 </el-form-item>
231 </el-col> 90 </el-col>
232 <el-col :span="12"> 91 <el-col :span="12">
233 <el-form-item label="航班日期" prop="fltDate"> 92 <el-form-item label="航班日期" prop="fltDate">
234 - <el-date-picker 93 + <el-date-picker :disabled="formdisabled.fltDate" clearable size="small" v-model="form.fltDate" type="date"
235 - :disabled="formdisabled.fltDate" 94 + value-format="yyyy-MM-dd" placeholder="选择航班日期">
236 - clearable
237 - size="small"
238 - v-model="form.fltDate"
239 - type="date"
240 - value-format="yyyy-MM-dd"
241 - placeholder="选择航班日期"
242 - >
243 </el-date-picker> 95 </el-date-picker>
244 </el-form-item> 96 </el-form-item>
245 </el-col> 97 </el-col>
246 <el-col :span="12"> 98 <el-col :span="12">
247 <el-form-item label="cutOff时间" prop="cutOffTime"> 99 <el-form-item label="cutOff时间" prop="cutOffTime">
248 - <el-select 100 + <el-select v-model="form.cutOffTime" clearable placeholder="选择时间" type="string">
249 - v-model="form.cutOffTime" 101 + <el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
250 - clearable
251 - placeholder="选择时间"
252 - type="string"
253 - >
254 - <el-option
255 - v-for="item in selectOption.cutOffTime"
256 - :key="item"
257 - :label="item"
258 - :value="item"
259 - >
260 </el-option> 102 </el-option>
261 </el-select> 103 </el-select>
262 </el-form-item> 104 </el-form-item>
263 </el-col> 105 </el-col>
264 <el-col :span="12"> 106 <el-col :span="12">
265 <el-form-item label="航班路线" prop="route"> 107 <el-form-item label="航班路线" prop="route">
266 - <el-input 108 + <el-input style="width: 93%" v-model="form.route" placeholder="请输入航班路线" />
267 - style="width: 93%"
268 - v-model="form.route"
269 - placeholder="请输入航班路线"
270 - />
271 </el-form-item> 109 </el-form-item>
272 </el-col> 110 </el-col>
273 <el-col :span="12"> 111 <el-col :span="12">
274 <el-form-item label="航班种类" prop="kindId"> 112 <el-form-item label="航班种类" prop="kindId">
275 <el-select v-model="form.kindId" placeholder="请选择航班种类"> 113 <el-select v-model="form.kindId" placeholder="请选择航班种类">
276 - <el-option 114 + <el-option v-for="item in selectOption.flightKindlist" :key="item.id" :label="item.chineseName"
277 - v-for="item in selectOption.flightKindlist" 115 + :value="item.id">
278 - :key="item.id"
279 - :label="item.chineseName"
280 - :value="item.id"
281 - >
282 </el-option> 116 </el-option>
283 </el-select> 117 </el-select>
284 </el-form-item> 118 </el-form-item>
...@@ -286,151 +120,87 @@ ...@@ -286,151 +120,87 @@
286 <el-col :span="12"> 120 <el-col :span="12">
287 <el-form-item label="航班类型" prop="typeId"> 121 <el-form-item label="航班类型" prop="typeId">
288 <el-select v-model="form.typeId" placeholder="请选择航班类型"> 122 <el-select v-model="form.typeId" placeholder="请选择航班类型">
289 - <el-option 123 + <el-option v-for="item in selectOption.flightTypelist" :key="item.id" :label="item.chineseName"
290 - v-for="item in selectOption.flightTypelist" 124 + :value="item.id">
291 - :key="item.id"
292 - :label="item.chineseName"
293 - :value="item.id"
294 - >
295 </el-option> 125 </el-option>
296 </el-select> 126 </el-select>
297 </el-form-item> 127 </el-form-item>
298 </el-col> 128 </el-col>
299 <el-col :span="12"> 129 <el-col :span="12">
300 <el-form-item label="航班状态" prop="statusId"> 130 <el-form-item label="航班状态" prop="statusId">
301 - <el-select 131 + <el-select :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
302 - :disabled="true" 132 + <el-option v-for="item in selectOption.flightStatuslist" :key="item.id" :label="item.chineseName"
303 - v-model="form.statusId" 133 + :value="item.id">
304 - placeholder="请选择航班状态"
305 - >
306 - <el-option
307 - v-for="item in selectOption.flightStatuslist"
308 - :key="item.id"
309 - :label="item.chineseName"
310 - :value="item.id"
311 - >
312 </el-option> 134 </el-option>
313 </el-select> 135 </el-select>
314 </el-form-item> 136 </el-form-item>
315 </el-col> 137 </el-col>
316 <el-col :span="12"> 138 <el-col :span="12">
317 <el-form-item label="原始重量（KG）" prop="originalWeight"> 139 <el-form-item label="原始重量（KG）" prop="originalWeight">
318 - <el-input-number 140 + <el-input-number @change="LowHighAvailable" placeholder="请输入原始重量（KG）" style="width: 93%"
319 - @change="LowHighAvailable" 141 + v-model="form.originalWeight"></el-input-number>
320 - placeholder="请输入原始重量（KG）"
321 - style="width: 93%"
322 - v-model="form.originalWeight"
323 - ></el-input-number>
324 </el-form-item> 142 </el-form-item>
325 </el-col> 143 </el-col>
326 <el-col :span="12"> 144 <el-col :span="12">
327 <el-form-item label="额外增重百分比" prop="extraWeightPercent"> 145 <el-form-item label="额外增重百分比" prop="extraWeightPercent">
328 - <el-input-number 146 + <el-input-number @change="LowHighAvailable" placeholder="请输入额外增重百分比" style="width: 93%"
329 - @change="LowHighAvailable" 147 + v-model="form.extraWeightPercent"></el-input-number>
330 - placeholder="请输入额外增重百分比"
331 - style="width: 93%"
332 - v-model="form.extraWeightPercent"
333 - ></el-input-number>
334 </el-form-item> 148 </el-form-item>
335 </el-col> 149 </el-col>
336 <el-col :span="12"> 150 <el-col :span="12">
337 <el-form-item label="是否开启高低价" prop="highLowPriceFlg"> 151 <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
338 - <el-switch 152 + <el-switch @change="LowHighAvailable" v-model="form.highLowPriceFlg" :active-value="1" :inactive-value="0"
339 - @change="LowHighAvailable" 153 + active-color="#13ce66">
340 - v-model="form.highLowPriceFlg"
341 - :active-value="1"
342 - :inactive-value="0"
343 - active-color="#13ce66"
344 - >
345 </el-switch> 154 </el-switch>
346 </el-form-item> 155 </el-form-item>
347 </el-col> 156 </el-col>
348 <el-col :span="12"> 157 <el-col :span="12">
349 <el-form-item label="是否预审" prop="isNeedRequired"> 158 <el-form-item label="是否预审" prop="isNeedRequired">
350 - <el-switch 159 + <el-switch :disabled="true" v-model="form.isNeedRequired" :active-value="1" :inactive-value="0"
351 - :disabled="true" 160 + active-color="#13ce66">
352 - v-model="form.isNeedRequired"
353 - :active-value="1"
354 - :inactive-value="0"
355 - active-color="#13ce66"
356 - >
357 </el-switch> 161 </el-switch>
358 </el-form-item> 162 </el-form-item>
359 </el-col> 163 </el-col>
360 <el-col :span="12"> 164 <el-col :span="12">
361 <el-form-item label="高价百分比" prop="highPriceWeightPercent"> 165 <el-form-item label="高价百分比" prop="highPriceWeightPercent">
362 - <el-input-number 166 + <el-input-number :disabled="ishighPriceWeightPercent" @change="LowHighAvailable" placeholder="请输入高价百分比"
363 - :disabled="ishighPriceWeightPercent" 167 + style="width: 93%" v-model="form.highPriceWeightPercent"></el-input-number>
364 - @change="LowHighAvailable"
365 - placeholder="请输入高价百分比"
366 - style="width: 93%"
367 - v-model="form.highPriceWeightPercent"
368 - ></el-input-number>
369 </el-form-item> 168 </el-form-item>
370 </el-col> 169 </el-col>
371 <el-col :span="12"> 170 <el-col :span="12">
372 <el-form-item label="低价百分比" prop="lowPriceWeightPercent"> 171 <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
373 - <el-input-number 172 + <el-input-number :disabled="true" placeholder="请输入低价百分比" style="width: 93%"
374 - :disabled="true" 173 + v-model="form.lowPriceWeightPercent"></el-input-number>
375 - placeholder="请输入低价百分比"
376 - style="width: 93%"
377 - v-model="form.lowPriceWeightPercent"
378 - ></el-input-number>
379 </el-form-item> 174 </el-form-item>
380 </el-col> 175 </el-col>
381 <el-col :span="12"> 176 <el-col :span="12">
382 <el-form-item label="高价可配重量" prop="highAvailableWeight"> 177 <el-form-item label="高价可配重量" prop="highAvailableWeight">
383 - <el-input-number 178 + <el-input-number :disabled="true" placeholder="请输入高价可配重量" style="width: 93%"
384 - :disabled="true" 179 + v-model="form.highAvailableWeight" :precision="2"></el-input-number>
385 - placeholder="请输入高价可配重量"
386 - style="width: 93%"
387 - v-model="form.highAvailableWeight"
388 - :precision="2"
389 - ></el-input-number>
390 </el-form-item> 180 </el-form-item>
391 </el-col> 181 </el-col>
392 <el-col :span="12"> 182 <el-col :span="12">
393 <el-form-item label="低价可配重量" prop="lowAvailableWeight"> 183 <el-form-item label="低价可配重量" prop="lowAvailableWeight">
394 - <el-input-number 184 + <el-input-number :disabled="true" placeholder="请输入低价可配重量" style="width: 93%"
395 - :disabled="true" 185 + v-model="form.lowAvailableWeight" :precision="2"></el-input-number>
396 - placeholder="请输入低价可配重量"
397 - style="width: 93%"
398 - v-model="form.lowAvailableWeight"
399 - :precision="2"
400 - ></el-input-number>
401 </el-form-item> 186 </el-form-item>
402 </el-col> 187 </el-col>
403 <el-col :span="12"> 188 <el-col :span="12">
404 <el-form-item label="高价已配重量" prop="highAllocatedWeight"> 189 <el-form-item label="高价已配重量" prop="highAllocatedWeight">
405 - <el-input-number 190 + <el-input-number :disabled="true" placeholder="请输入高价已配重量" style="width: 93%"
406 - :disabled="true" 191 + v-model="form.highAllocatedWeight" :precision="2"></el-input-number>
407 - placeholder="请输入高价已配重量"
408 - style="width: 93%"
409 - v-model="form.highAllocatedWeight"
410 - :precision="2"
411 - ></el-input-number>
412 </el-form-item> 192 </el-form-item>
413 </el-col> 193 </el-col>
414 <el-col :span="12"> 194 <el-col :span="12">
415 <el-form-item label="低价已配重量" prop="lowAllocatedWeight"> 195 <el-form-item label="低价已配重量" prop="lowAllocatedWeight">
416 - <el-input-number 196 + <el-input-number :disabled="true" placeholder="请输入低价已配重量" style="width: 93%"
417 - :disabled="true" 197 + v-model="form.lowAllocatedWeight" :precision="2"></el-input-number>
418 - placeholder="请输入低价已配重量"
419 - style="width: 93%"
420 - v-model="form.lowAllocatedWeight"
421 - :precision="2"
422 - ></el-input-number>
423 </el-form-item> 198 </el-form-item>
424 </el-col> 199 </el-col>
425 <el-col :span="12"> 200 <el-col :span="12">
426 <el-form-item label="已配总重量" prop="alloctedWeight"> 201 <el-form-item label="已配总重量" prop="alloctedWeight">
427 - <el-input-number 202 + <el-input-number :disabled="true" placeholder="请输入已配总重量" style="width: 93%" v-model="form.alloctedWeight"
428 - :disabled="true" 203 + :precision="2"></el-input-number>
429 - placeholder="请输入已配总重量"
430 - style="width: 93%"
431 - v-model="form.alloctedWeight"
432 - :precision="2"
433 - ></el-input-number>
434 </el-form-item> 204 </el-form-item>
435 </el-col> 205 </el-col>
436 </el-row> 206 </el-row>
...@@ -440,21 +210,12 @@ ...@@ -440,21 +210,12 @@
440 <el-button @click="cancel">取 消</el-button> 210 <el-button @click="cancel">取 消</el-button>
441 </div> 211 </div>
442 </el-dialog> 212 </el-dialog>
443 - <el-dialog 213 + <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false"
444 - title="未删除成功航班" 214 + :append-to-body="true">
445 - width="40%"
446 - center
447 - :visible.sync="dialogTableVisible"
448 - :close-on-click-modal="false"
449 - :append-to-body="true"
450 - >
451 <el-table :data="gridData"> 215 <el-table :data="gridData">
452 <el-table-column property="fltNo" label="航班号"></el-table-column> 216 <el-table-column property="fltNo" label="航班号"></el-table-column>
453 <el-table-column property="fltDate" label="航班日期"></el-table-column> 217 <el-table-column property="fltDate" label="航班日期"></el-table-column>
454 - <el-table-column 218 + <el-table-column property="alloctedWeight" label="已配重量"></el-table-column>
455 - property="alloctedWeight"
456 - label="已配重量"
457 - ></el-table-column>
458 </el-table> 219 </el-table>
459 </el-dialog> 220 </el-dialog>
460 </div> 221 </div>
...@@ -841,7 +602,7 @@ export default { ...@@ -841,7 +602,7 @@ export default {
841 created() { 602 created() {
842 //查询条件数据源 603 //查询条件数据源
843 let date = new Date() 604 let date = new Date()
844 - this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth()+1).length>1?(date.getMonth()+1):'0'+(date.getMonth()+1)}-${date.getDate()}` 605 + this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth() + 1).length > 1 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${date.getDate()}`
845 this.findFltConditionData(); 606 this.findFltConditionData();
846 if (this.$store.state.tagsView.cachedViews.length == 0) { 607 if (this.$store.state.tagsView.cachedViews.length == 0) {
847 this.findAllFltData(); 608 this.findAllFltData();
...@@ -1027,7 +788,7 @@ export default { ...@@ -1027,7 +788,7 @@ export default {
1027 this.form, 788 this.form,
1028 "highAvailableWeight", 789 "highAvailableWeight",
1029 (Weight - this.form.alloctedWeight) * 790 (Weight - this.form.alloctedWeight) *
1030 - (this.form.highPriceWeightPercent / 100) 791 + (this.form.highPriceWeightPercent / 100)
1031 ); 792 );
1032 this.$set( 793 this.$set(
1033 this.form, 794 this.form,
...@@ -1050,7 +811,7 @@ export default { ...@@ -1050,7 +811,7 @@ export default {
1050 this.form, 811 this.form,
1051 "highAvailableWeight", 812 "highAvailableWeight",
1052 (Weight - this.form.alloctedWeight) * 813 (Weight - this.form.alloctedWeight) *
1053 - (this.form.highPriceWeightPercent / 100) 814 + (this.form.highPriceWeightPercent / 100)
1054 ); 815 );
1055 } 816 }
1056 } else { 817 } else {
...@@ -1094,7 +855,7 @@ export default { ...@@ -1094,7 +855,7 @@ export default {
1094 Weightall() { 855 Weightall() {
1095 let Weight = 0; 856 let Weight = 0;
1096 if (this.form.extraWeightPercent > 0) { 857 if (this.form.extraWeightPercent > 0) {
1097 - Weight =this.form.originalWeight * (this.form.extraWeightPercent / 100)+this.form.originalWeight; 858 + Weight = this.form.originalWeight * (this.form.extraWeightPercent / 100) + this.form.originalWeight;
1098 } else { 859 } else {
1099 Weight = this.form.originalWeight; 860 Weight = this.form.originalWeight;
1100 } 861 }
...@@ -1126,7 +887,11 @@ export default { ...@@ -1126,7 +887,11 @@ export default {
1126 }, 887 },
1127 /** 删除按钮操作 */ 888 /** 删除按钮操作 */
1128 handleDelete(row) { 889 handleDelete(row) {
1129 - const fIds = this.ids; 890 + let fIds = [];
891 + this.ids.forEach(item => {
892 + fIds.push(item.id)
893 + })
894 + console.log(fIds)
1130 this.$confirm("是否确认删除所选数据?", "警告", { 895 this.$confirm("是否确认删除所选数据?", "警告", {
1131 confirmButtonText: "确定", 896 confirmButtonText: "确定",
1132 cancelButtonText: "取消", 897 cancelButtonText: "取消",
...@@ -1148,12 +913,12 @@ export default { ...@@ -1148,12 +913,12 @@ export default {
1148 .then(() => { 913 .then(() => {
1149 this.dialogTableVisible = true; 914 this.dialogTableVisible = true;
1150 }) 915 })
1151 - .catch(() => {}); 916 + .catch(() => { });
1152 } else { 917 } else {
1153 this.msgSuccess(response.msg); 918 this.msgSuccess(response.msg);
1154 } 919 }
1155 }) 920 })
1156 - .catch(() => {}); 921 + .catch(() => { });
1157 }, 922 },
1158 /** 提交按钮 */ 923 /** 提交按钮 */
1159 submitForm: function () { 924 submitForm: function () {
...@@ -1228,19 +993,19 @@ export default { ...@@ -1228,19 +993,19 @@ export default {
1228 let data = { 993 let data = {
1229 updateIds: [], 994 updateIds: [],
1230 }; 995 };
1231 - this.ids.map(item=>{ 996 + this.ids.map(item => {
1232 - data.status = status; 997 + data.status = status;
1233 - if(status === 'flightStatus80'){ 998 + if (status === 'flightStatus80') {
1234 - if(item.statusName === '已开启'){ 999 + if (item.statusName === '已开启') {
1235 data.updateIds.push(item.id) 1000 data.updateIds.push(item.id)
1236 } 1001 }
1237 - }else{ 1002 + } else {
1238 - if(item.statusName === '已关闭'){ 1003 + if (item.statusName === '已关闭') {
1239 data.updateIds.push(item.id) 1004 data.updateIds.push(item.id)
1240 } 1005 }
1241 } 1006 }
1242 }) 1007 })
1243 - if(data.updateIds.length > 0){ 1008 + if (data.updateIds.length > 0) {
1244 updateStatusBatch(data).then((response) => { 1009 updateStatusBatch(data).then((response) => {
1245 if (response.code === 200) { 1010 if (response.code === 200) {
1246 this.msgSuccess(handle + "成功"); 1011 this.msgSuccess(handle + "成功");
...@@ -1270,20 +1035,20 @@ export default { ...@@ -1270,20 +1035,20 @@ export default {
1270 } 1035 }
1271 } 1036 }
1272 }); 1037 });
1273 - if(data.updateIds.length > 0){ 1038 + if (data.updateIds.length > 0) {
1274 updateAutoPushBatch(data) 1039 updateAutoPushBatch(data)
1275 - .then((res) => { 1040 + .then((res) => {
1276 - if (res.code === 200) { 1041 + if (res.code === 200) {
1277 - this.msgSuccess(`自动推送${msg}成功`); 1042 + this.msgSuccess(`自动推送${msg}成功`);
1278 - this.findAllFltData(); 1043 + this.findAllFltData();
1279 - } else { 1044 + } else {
1280 - this.msgError(res.msg); 1045 + this.msgError(res.msg);
1281 - } 1046 + }
1282 - }) 1047 + })
1283 - .catch(err => { 1048 + .catch(err => {
1284 - this.msgError(err); 1049 + this.msgError(err);
1285 - }); 1050 + });
1286 - }else{ 1051 + } else {
1287 this.msgSuccess(`自动推送${msg}成功`); 1052 this.msgSuccess(`自动推送${msg}成功`);
1288 this.findAllFltData(); 1053 this.findAllFltData();
1289 } 1054 }
...@@ -1316,12 +1081,12 @@ export default { ...@@ -1316,12 +1081,12 @@ export default {
1316 1081
1317 <style> 1082 <style>
1318 .el-table--striped .el-table__body tr.el-table__row--striped.current-row td, 1083 .el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
1319 -.el-table__body tr.current-row > td { 1084 +.el-table__body tr.current-row>td {
1320 background-color: #a0cfff; 1085 background-color: #a0cfff;
1321 } 1086 }
1322 1087
1323 -.el-table--striped .el-table__body tr.hover-row.el-table__row--striped > td, 1088 +.el-table--striped .el-table__body tr.hover-row.el-table__row--striped>td,
1324 -.el-table__body tr.hover-row > td { 1089 +.el-table__body tr.hover-row>td {
1325 background-color: #d9ecff !important; 1090 background-color: #d9ecff !important;
1326 } 1091 }
1327 </style> 1092 </style>
......
1 <template> 1 <template>
2 <div class="cargoPage"> 2 <div class="cargoPage">
3 - <el-form 3 + <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small"
4 - ref="cargoForm" 4 + :model="formData">
5 - class="form-header"
6 - label-position="right"
7 - label-width="auto"
8 - size="small"
9 - :model="formData"
10 - >
11 <el-row type="flex" style="flexWrap: wrap !important"> 5 <el-row type="flex" style="flexWrap: wrap !important">
12 <el-col :span="6"> 6 <el-col :span="6">
13 <el-form-item label="配舱航班日期"> 7 <el-form-item label="配舱航班日期">
14 - <el-date-picker 8 + <el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
15 - class="formItem" 9 + start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
16 - v-model="cargoPlaneTime"
17 - type="daterange"
18 - range-separator="至"
19 - start-placeholder="开始日期"
20 - end-placeholder="结束日期"
21 - :value-format="valueFormat"
22 - clearable
23 - >
24 </el-date-picker> 10 </el-date-picker>
25 </el-form-item> 11 </el-form-item>
26 </el-col> 12 </el-col>
27 <el-col :span="6"> 13 <el-col :span="6">
28 <el-form-item label="配载航班号"> 14 <el-form-item label="配载航班号">
29 - <el-input 15 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"
30 - type="textarea" 16 + clearable></el-input>
31 - v-model="cargoPlaneNo"
32 - class="formItem"
33 - placeholder="AC001;AC002"
34 - :autosize="true"
35 - clearable
36 - ></el-input>
37 </el-form-item> 17 </el-form-item>
38 </el-col> 18 </el-col>
39 <el-col :span="6"> 19 <el-col :span="6">
40 <el-form-item label="海关回执状态"> 20 <el-form-item label="海关回执状态">
41 - <el-select 21 + <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
42 - placeholder="不限" 22 + <el-option v-for="item in findConditionData.cargoCustomsReturnStatus" :label="item.chineseName"
43 - v-model="formData.customsReceiptStatusId" 23 + :value="item.id" :key="item.id">
44 - class="formItem"
45 - multiple
46 - clearable
47 - >
48 - <el-option
49 - v-for="item in findConditionData.cargoCustomsReturnStatus"
50 - :label="item.chineseName"
51 - :value="item.id"
52 - :key="item.id"
53 - >
54 </el-option> 24 </el-option>
55 </el-select> 25 </el-select>
56 </el-form-item> 26 </el-form-item>
57 </el-col> 27 </el-col>
58 <el-col :span="6"> 28 <el-col :span="6">
59 <el-form-item label="运单号"> 29 <el-form-item label="运单号">
60 - <el-input 30 + <el-input type="textarea" v-model="formData.waybillNo" class="formItem" placeholder="请输入运单号（回车间隔）"
61 - type="textarea" 31 + :autosize="true" clearable></el-input>
62 - v-model="formData.waybillNo"
63 - class="formItem"
64 - placeholder="请输入运单号（回车间隔）"
65 - :autosize="true"
66 - clearable
67 - ></el-input>
68 </el-form-item> 32 </el-form-item>
69 </el-col> 33 </el-col>
70 <el-col :span="6"> 34 <el-col :span="6">
71 <el-form-item label="申报类别"> 35 <el-form-item label="申报类别">
72 - <el-select 36 + <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
73 - placeholder="不限" 37 + <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
74 - v-model="formData.typeId" 38 + :key="item.id">
75 - class="formItem"
76 - clearable
77 - >
78 - <el-option
79 - v-for="item in findConditionData.cargoType"
80 - :label="item.chineseName"
81 - :value="item.id"
82 - :key="item.id"
83 - >
84 </el-option> 39 </el-option>
85 </el-select> 40 </el-select>
86 </el-form-item> 41 </el-form-item>
87 - </el-col> 42 + </el-col>
88 <el-col :span="6"> 43 <el-col :span="6">
89 <el-form-item label="服务类型"> 44 <el-form-item label="服务类型">
90 - <el-select 45 + <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" filterable clearable>
91 - placeholder="不限" 46 + <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
92 - v-model="formData.serviceTypeId" 47 + :key="item.id">
93 - class="formItem"
94 - filterable
95 - clearable
96 - >
97 - <el-option
98 - v-for="item in findConditionData.cargoServiceType"
99 - :label="item.chineseName"
100 - :value="item.id"
101 - :key="item.id"
102 - >
103 </el-option> 48 </el-option>
104 </el-select> 49 </el-select>
105 </el-form-item> 50 </el-form-item>
106 </el-col> 51 </el-col>
107 <el-col :span="6"> 52 <el-col :span="6">
108 <el-form-item label="URSA"> 53 <el-form-item label="URSA">
109 - <el-input 54 + <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :autosize="true" clearable>
110 - type="textarea" 55 + </el-input>
111 - v-model="ursa"
112 - class="formItem"
113 - placeholder="S_;P_;E2"
114 - :autosize="true"
115 - clearable
116 - ></el-input>
117 </el-form-item> 56 </el-form-item>
118 </el-col> 57 </el-col>
119 <el-col :span="6"> 58 <el-col :span="6">
120 <el-form-item label="站点"> 59 <el-form-item label="站点">
121 - <el-input 60 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :autosize="true"
122 - type="textarea" 61 + clearable></el-input>
123 - v-model="siteName"
124 - class="formItem"
125 - placeholder="PVG;PEK"
126 - :autosize="true"
127 - clearable
128 - ></el-input>
129 </el-form-item> 62 </el-form-item>
130 </el-col> 63 </el-col>
131 <el-col v-show="formShow"> 64 <el-col v-show="formShow">
132 <el-row type="flex" style="flexWrap: wrap !important"> 65 <el-row type="flex" style="flexWrap: wrap !important">
133 <el-col :span="6"> 66 <el-col :span="6">
134 <el-form-item label="ACCS原航班日期"> 67 <el-form-item label="ACCS原航班日期">
135 - <el-date-picker 68 + <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
136 - class="formItem" 69 + start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
137 - v-model="flightTime"
138 - type="daterange"
139 - range-separator="至"
140 - start-placeholder="开始日期"
141 - end-placeholder="结束日期"
142 - :value-format="valueFormat"
143 - clearable
144 - >
145 </el-date-picker> 70 </el-date-picker>
146 </el-form-item> 71 </el-form-item>
147 </el-col> 72 </el-col>
148 <el-col :span="6"> 73 <el-col :span="6">
149 <el-form-item label="ACCS原航班号"> 74 <el-form-item label="ACCS原航班号">
150 - <el-input 75 + <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
151 - type="text"
152 - v-model="fltNo"
153 - class="formItem"
154 - placeholder="请输入ACCS航班号"
155 - clearable
156 - ></el-input>
157 </el-form-item> 76 </el-form-item>
158 </el-col> 77 </el-col>
159 <el-col :span="6"> 78 <el-col :span="6">
160 <el-form-item label="取件日期"> 79 <el-form-item label="取件日期">
161 - <el-date-picker 80 + <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
162 - class="formItem" 81 + :value-format="valueFormat" clearable>
163 - v-model="formData.pickUpDate"
164 - type="date"
165 - placeholder="选择日期"
166 - :value-format="valueFormat"
167 - clearable
168 - >
169 </el-date-picker> 82 </el-date-picker>
170 </el-form-item> 83 </el-form-item>
171 </el-col> 84 </el-col>
172 <el-col :span="6"> 85 <el-col :span="6">
173 <el-form-item label="创建日期"> 86 <el-form-item label="创建日期">
174 - <el-date-picker 87 + <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
175 - class="formItem" 88 + start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
176 - v-model="createDate"
177 - type="daterange"
178 - range-separator="至"
179 - start-placeholder="开始日期"
180 - end-placeholder="结束日期"
181 - :value-format="valueFormat"
182 - clearable
183 - >
184 </el-date-picker> 89 </el-date-picker>
185 </el-form-item> 90 </el-form-item>
186 </el-col> 91 </el-col>
187 <el-col :span="6"> 92 <el-col :span="6">
188 <el-form-item label="ACCSpool"> 93 <el-form-item label="ACCSpool">
189 - <el-select 94 + <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
190 - placeholder="不限" 95 + <el-option value="Pre-MDE" key="Pre-MDE">
191 - v-model="formData.accsPool" 96 + </el-option>
192 - class="formItem" 97 + <el-option value="OSPR" key="OSPR">
193 - clearable 98 + </el-option>
194 - > 99 + <el-option value="Manifest" key="Manifest">
195 - <el-option 100 + </el-option>
196 - value="Pre-MDE" 101 + </el-select>
197 - key="Pre-MDE"
198 - >
199 - </el-option>
200 - <el-option
201 - value="OSPR"
202 - key="OSPR"
203 - >
204 - </el-option>
205 - <el-option
206 - value="Manifest"
207 - key="Manifest"
208 - >
209 - </el-option>
210 - </el-select>
211 </el-form-item> 102 </el-form-item>
212 </el-col> 103 </el-col>
213 <el-col :span="6"> 104 <el-col :span="6">
214 <el-form-item label="货物状态"> 105 <el-form-item label="货物状态">
215 - <el-select 106 + <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
216 - placeholder="不限" 107 + <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
217 - v-model="formData.statusId" 108 + :key="item.id">
218 - class="formItem"
219 - filterable
220 - clearable
221 - >
222 - <el-option
223 - v-for="item in findConditionData.cargoStatus"
224 - :label="item.chineseName"
225 - :value="item.id"
226 - :key="item.id"
227 - >
228 </el-option> 109 </el-option>
229 </el-select> 110 </el-select>
230 </el-form-item> 111 </el-form-item>
231 </el-col> 112 </el-col>
232 <el-col :span="6"> 113 <el-col :span="6">
233 <el-form-item label="是否自动"> 114 <el-form-item label="是否自动">
234 - <el-select 115 + <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
235 - placeholder="不限"
236 - v-model="formData.allocationTypeId"
237 - class="formItem"
238 - clearable
239 - >
240 <el-option label="手动" value="1"> </el-option> 116 <el-option label="手动" value="1"> </el-option>
241 <el-option label="自动" value="2"> </el-option> 117 <el-option label="自动" value="2"> </el-option>
242 </el-select> 118 </el-select>
...@@ -246,114 +122,42 @@ ...@@ -246,114 +122,42 @@
246 </el-col> 122 </el-col>
247 </el-row> 123 </el-row>
248 <div style="paddingLeft: 10px; marginTop: 20px"> 124 <div style="paddingLeft: 10px; marginTop: 20px">
249 - <el-button 125 + <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
250 - type="primary" 126 + </el-button>
251 - icon="el-icon-search" 127 + <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
252 - size="small" 128 + size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
253 - :loading="tableLoading" 129 + downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
254 - @click="select(0)" 130 + }}</el-button>
255 - >查询</el-button 131 + <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
256 - > 132 + size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
257 - <el-button 133 + downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
258 - v-hasPermi="['base:cargo:export']" 134 + }}</el-button>
259 - :type="downLoadingTip.downloading ? 'warning' : 'primary'" 135 + <el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:export']"
260 - size="small" 136 + @click="release">释放舱位</el-button>
261 - @click="xlse(0)" 137 + <span style="marginLeft: 20px; color: #ffba00">全部导出上限80000条数据</span>
262 - :disabled="tableData.length == 0" 138 + <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
263 - :loading="downLoadingTip.downloading" 139 + :status="progress == 100 ? 'success' : 'warning'"></el-progress>
264 - >{{
265 - downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
266 - }}</el-button
267 - >
268 - <el-button
269 - v-hasPermi="['base:cargo:export']"
270 - :type="downLoadingTip.downloading ? 'warning' : 'primary'"
271 - size="small"
272 - @click="xlse(1)"
273 - :disabled="tableData.length == 0"
274 - :loading="downLoadingTip.downloading"
275 - >{{
276 - downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
277 - }}</el-button
278 - >
279 - <el-button
280 - type="primary"
281 - size="small"
282 - :disabled="selectTable.length==0"
283 - v-hasPermi="['base:cargo:export']"
284 - @click="release"
285 - >释放舱位</el-button
286 - >
287 - <span style="marginLeft: 20px; color: #ffba00"
288 - >全部导出上限80000条数据</span
289 - >
290 - <el-progress
291 - v-if="progress != 0"
292 - class="progress"
293 - :stroke-width="12"
294 - :show-text="true"
295 - :percentage="progress"
296 - :status="progress == 100 ? 'success' : 'warning'"
297 - ></el-progress>
298 <div class="tips"> 140 <div class="tips">
299 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 141 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
300 <span>总件数:{{ allQty }}</span> 142 <span>总件数:{{ allQty }}</span>
301 </div> 143 </div>
302 <div class="formShow" @click="formShow = !formShow"> 144 <div class="formShow" @click="formShow = !formShow">
303 - <i class="el-icon-s-tools"></i 145 + <i class="el-icon-s-tools"></i>{{ formShow ? "收起条件" : "更多条件" }}
304 - >{{ formShow ? "收起条件" : "更多条件" }}
305 </div> 146 </div>
306 </div> 147 </div>
307 </el-form> 148 </el-form>
308 - <Tables 149 + <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :infoData="tableHeader"
309 - ref="newTables" 150 + :selection="true" :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart"
310 - ductName="cargo" 151 + :page="page" :shiftKey="shiftKey" :infoShow="false" :pageSizes="[100]" :height="tableHeight"
311 - :data="tableData" 152 + @sizeChange="sizeChange" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
312 - :headerData="tableHeader" 153 + @currentChange="currentChange" @sortChange="sortChange"></Tables>
313 - :infoData="tableHeader" 154 + <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
314 - :selection="true" 155 + :show-close="false" :append-to-body="true">
315 - :totalCount="totalCount" 156 + <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
316 - :loading="tableLoading"
317 - :limitSize="limitSize"
318 - :limitStart="limitStart"
319 - :page="page"
320 - :shiftKey="shiftKey"
321 - :infoShow="false"
322 - :pageSizes="[100]"
323 - :height="tableHeight"
324 - @sizeChange="sizeChange"
325 - @tableSelect="tableSelect"
326 - @tableSelectAll="tableSelectAll"
327 - @currentChange="currentChange"
328 - @sortChange="sortChange"
329 - ></Tables>
330 - <el-dialog
331 - title="舱位释放结果"
332 - width="80%"
333 - :visible.sync="dialogVisible"
334 - :close-on-click-modal="false"
335 - :show-close="false"
336 - :append-to-body="true"
337 - >
338 - <el-table
339 - :data="selectTable"
340 - size="mini"
341 - border
342 - stripe
343 - highlight-current-row
344 - style="width: 100%"
345 - >
346 <el-table-column type="index" label="序号" align="center"> 157 <el-table-column type="index" label="序号" align="center">
347 </el-table-column> 158 </el-table-column>
348 - <el-table-column 159 + <el-table-column v-for="(item, index) in releaseHeader" header-align="center" align="center" :prop="item.value"
349 - v-for="(item, index) in releaseHeader" 160 + :label="item.name" :key="index" :show-overflow-tooltip="true">
350 - header-align="center"
351 - align="center"
352 - :prop="item.value"
353 - :label="item.name"
354 - :key="index"
355 - :show-overflow-tooltip="true"
356 - >
357 </el-table-column> 161 </el-table-column>
358 </el-table> 162 </el-table>
359 <div slot="footer"> 163 <div slot="footer">
...@@ -364,7 +168,7 @@ ...@@ -364,7 +168,7 @@
364 </template> 168 </template>
365 169
366 <script> 170 <script>
367 -import { findConditionData, findCargoData , releaseCargo } from "@/api/cargoSelect"; 171 +import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
368 import { downLoadXlsx } from "@/utils/zipdownload"; 172 import { downLoadXlsx } from "@/utils/zipdownload";
369 import { upCase } from "@/utils/FedEx"; 173 import { upCase } from "@/utils/FedEx";
370 174
...@@ -408,7 +212,7 @@ export default { ...@@ -408,7 +212,7 @@ export default {
408 align: "center", 212 align: "center",
409 sorTable: true, 213 sorTable: true,
410 fixed: false, 214 fixed: false,
411 - disabled:true, 215 + disabled: true,
412 }, 216 },
413 { 217 {
414 name: "取件日期", 218 name: "取件日期",
...@@ -417,7 +221,7 @@ export default { ...@@ -417,7 +221,7 @@ export default {
417 align: "center", 221 align: "center",
418 sorTable: true, 222 sorTable: true,
419 fixed: false, 223 fixed: false,
420 - disabled:true 224 + disabled: true
421 }, 225 },
422 { 226 {
423 name: "取件扫描号", 227 name: "取件扫描号",
...@@ -426,7 +230,7 @@ export default { ...@@ -426,7 +230,7 @@ export default {
426 align: "center", 230 align: "center",
427 sorTable: true, 231 sorTable: true,
428 fixed: false, 232 fixed: false,
429 - disabled:true 233 + disabled: true
430 }, 234 },
431 { 235 {
432 name: "站点", 236 name: "站点",
...@@ -435,7 +239,7 @@ export default { ...@@ -435,7 +239,7 @@ export default {
435 align: "center", 239 align: "center",
436 sorTable: true, 240 sorTable: true,
437 fixed: false, 241 fixed: false,
438 - disabled:true 242 + disabled: true
439 }, 243 },
440 { 244 {
441 name: "运单号", 245 name: "运单号",
...@@ -444,7 +248,7 @@ export default { ...@@ -444,7 +248,7 @@ export default {
444 align: "center", 248 align: "center",
445 sorTable: true, 249 sorTable: true,
446 fixed: false, 250 fixed: false,
447 - disabled:true 251 + disabled: true
448 }, 252 },
449 { 253 {
450 name: "总单号", 254 name: "总单号",
...@@ -453,7 +257,7 @@ export default { ...@@ -453,7 +257,7 @@ export default {
453 align: "center", 257 align: "center",
454 sorTable: true, 258 sorTable: true,
455 fixed: false, 259 fixed: false,
456 - disabled:true 260 + disabled: true
457 }, 261 },
458 { 262 {
459 name: "服务类型", 263 name: "服务类型",
...@@ -462,7 +266,7 @@ export default { ...@@ -462,7 +266,7 @@ export default {
462 align: "center", 266 align: "center",
463 sorTable: true, 267 sorTable: true,
464 fixed: false, 268 fixed: false,
465 - disabled:true 269 + disabled: true
466 }, 270 },
467 { 271 {
468 name: "服务代码", 272 name: "服务代码",
...@@ -471,7 +275,7 @@ export default { ...@@ -471,7 +275,7 @@ export default {
471 align: "center", 275 align: "center",
472 sorTable: false, 276 sorTable: false,
473 fixed: false, 277 fixed: false,
474 - disabled:true 278 + disabled: true
475 }, 279 },
476 { 280 {
477 name: "URSA", 281 name: "URSA",
...@@ -480,7 +284,7 @@ export default { ...@@ -480,7 +284,7 @@ export default {
480 align: "center", 284 align: "center",
481 sorTable: true, 285 sorTable: true,
482 fixed: false, 286 fixed: false,
483 - disabled:true 287 + disabled: true
484 }, 288 },
485 { 289 {
486 name: "推送状态", 290 name: "推送状态",
...@@ -489,7 +293,7 @@ export default { ...@@ -489,7 +293,7 @@ export default {
489 align: "center", 293 align: "center",
490 sorTable: true, 294 sorTable: true,
491 fixed: false, 295 fixed: false,
492 - disabled:true 296 + disabled: true
493 }, 297 },
494 { 298 {
495 name: "释放状态", 299 name: "释放状态",
...@@ -498,7 +302,7 @@ export default { ...@@ -498,7 +302,7 @@ export default {
498 align: "center", 302 align: "center",
499 sorTable: true, 303 sorTable: true,
500 fixed: false, 304 fixed: false,
501 - disabled:true 305 + disabled: true
502 }, 306 },
503 { 307 {
504 name: "申报类型", 308 name: "申报类型",
...@@ -507,7 +311,7 @@ export default { ...@@ -507,7 +311,7 @@ export default {
507 align: "center", 311 align: "center",
508 sorTable: true, 312 sorTable: true,
509 fixed: false, 313 fixed: false,
510 - disabled:true 314 + disabled: true
511 }, 315 },
512 { 316 {
513 name: "HandlingCode", 317 name: "HandlingCode",
...@@ -516,7 +320,7 @@ export default { ...@@ -516,7 +320,7 @@ export default {
516 align: "center", 320 align: "center",
517 sorTable: true, 321 sorTable: true,
518 fixed: false, 322 fixed: false,
519 - disabled:true 323 + disabled: true
520 }, 324 },
521 { 325 {
522 name: "subcategory", 326 name: "subcategory",
...@@ -525,7 +329,7 @@ export default { ...@@ -525,7 +329,7 @@ export default {
525 align: "center", 329 align: "center",
526 sorTable: true, 330 sorTable: true,
527 fixed: false, 331 fixed: false,
528 - disabled:true 332 + disabled: true
529 }, 333 },
530 { 334 {
531 name: "件数", 335 name: "件数",
...@@ -534,7 +338,7 @@ export default { ...@@ -534,7 +338,7 @@ export default {
534 align: "center", 338 align: "center",
535 sorTable: true, 339 sorTable: true,
536 fixed: false, 340 fixed: false,
537 - disabled:true 341 + disabled: true
538 }, 342 },
539 { 343 {
540 name: "实际重量", 344 name: "实际重量",
...@@ -543,7 +347,7 @@ export default { ...@@ -543,7 +347,7 @@ export default {
543 align: "center", 347 align: "center",
544 sorTable: true, 348 sorTable: true,
545 fixed: false, 349 fixed: false,
546 - disabled:true 350 + disabled: true
547 }, 351 },
548 { 352 {
549 name: "收件人国家代码", 353 name: "收件人国家代码",
...@@ -552,7 +356,7 @@ export default { ...@@ -552,7 +356,7 @@ export default {
552 align: "center", 356 align: "center",
553 sorTable: true, 357 sorTable: true,
554 fixed: false, 358 fixed: false,
555 - disabled:true 359 + disabled: true
556 }, 360 },
557 { 361 {
558 name: "品名描述", 362 name: "品名描述",
...@@ -561,7 +365,7 @@ export default { ...@@ -561,7 +365,7 @@ export default {
561 align: "center", 365 align: "center",
562 sorTable: false, 366 sorTable: false,
563 fixed: false, 367 fixed: false,
564 - disabled:true 368 + disabled: true
565 }, 369 },
566 { 370 {
567 name: "海关回执状态", 371 name: "海关回执状态",
...@@ -570,7 +374,7 @@ export default { ...@@ -570,7 +374,7 @@ export default {
570 align: "center", 374 align: "center",
571 sorTable: true, 375 sorTable: true,
572 fixed: false, 376 fixed: false,
573 - disabled:true 377 + disabled: true
574 }, 378 },
575 { 379 {
576 name: "预审状态", 380 name: "预审状态",
...@@ -579,7 +383,7 @@ export default { ...@@ -579,7 +383,7 @@ export default {
579 align: "center", 383 align: "center",
580 sorTable: true, 384 sorTable: true,
581 fixed: false, 385 fixed: false,
582 - disabled:true 386 + disabled: true
583 }, 387 },
584 { 388 {
585 name: "航班预审意见", 389 name: "航班预审意见",
...@@ -588,7 +392,7 @@ export default { ...@@ -588,7 +392,7 @@ export default {
588 align: "center", 392 align: "center",
589 sorTable: false, 393 sorTable: false,
590 fixed: false, 394 fixed: false,
591 - disabled:true 395 + disabled: true
592 }, 396 },
593 { 397 {
594 name: "AccsPool", 398 name: "AccsPool",
...@@ -597,7 +401,7 @@ export default { ...@@ -597,7 +401,7 @@ export default {
597 align: "center", 401 align: "center",
598 sorTable: true, 402 sorTable: true,
599 fixed: false, 403 fixed: false,
600 - disabled:true 404 + disabled: true
601 }, 405 },
602 { 406 {
603 name: "货物状态", 407 name: "货物状态",
...@@ -606,7 +410,7 @@ export default { ...@@ -606,7 +410,7 @@ export default {
606 align: "center", 410 align: "center",
607 sorTable: true, 411 sorTable: true,
608 fixed: false, 412 fixed: false,
609 - disabled:true 413 + disabled: true
610 }, 414 },
611 { 415 {
612 name: "终配航班号", 416 name: "终配航班号",
...@@ -615,7 +419,7 @@ export default { ...@@ -615,7 +419,7 @@ export default {
615 align: "center", 419 align: "center",
616 sorTable: true, 420 sorTable: true,
617 fixed: false, 421 fixed: false,
618 - disabled:true 422 + disabled: true
619 }, 423 },
620 { 424 {
621 name: "终配航班日期", 425 name: "终配航班日期",
...@@ -624,7 +428,7 @@ export default { ...@@ -624,7 +428,7 @@ export default {
624 align: "center", 428 align: "center",
625 sorTable: true, 429 sorTable: true,
626 fixed: false, 430 fixed: false,
627 - disabled:true 431 + disabled: true
628 }, 432 },
629 { 433 {
630 name: "二配航班号", 434 name: "二配航班号",
...@@ -633,7 +437,7 @@ export default { ...@@ -633,7 +437,7 @@ export default {
633 align: "center", 437 align: "center",
634 sorTable: true, 438 sorTable: true,
635 fixed: false, 439 fixed: false,
636 - disabled:true 440 + disabled: true
637 }, 441 },
638 { 442 {
639 name: "二配航班日期", 443 name: "二配航班日期",
...@@ -642,7 +446,7 @@ export default { ...@@ -642,7 +446,7 @@ export default {
642 align: "center", 446 align: "center",
643 sorTable: true, 447 sorTable: true,
644 fixed: false, 448 fixed: false,
645 - disabled:true 449 + disabled: true
646 }, 450 },
647 { 451 {
648 name: "预配航班号", 452 name: "预配航班号",
...@@ -651,7 +455,7 @@ export default { ...@@ -651,7 +455,7 @@ export default {
651 align: "center", 455 align: "center",
652 sorTable: true, 456 sorTable: true,
653 fixed: false, 457 fixed: false,
654 - disabled:true 458 + disabled: true
655 }, 459 },
656 { 460 {
657 name: "预配航班日期", 461 name: "预配航班日期",
...@@ -660,7 +464,7 @@ export default { ...@@ -660,7 +464,7 @@ export default {
660 align: "center", 464 align: "center",
661 sorTable: true, 465 sorTable: true,
662 fixed: false, 466 fixed: false,
663 - disabled:true 467 + disabled: true
664 }, 468 },
665 { 469 {
666 name: "ACCS原航班号", 470 name: "ACCS原航班号",
...@@ -669,7 +473,7 @@ export default { ...@@ -669,7 +473,7 @@ export default {
669 align: "center", 473 align: "center",
670 sorTable: true, 474 sorTable: true,
671 fixed: false, 475 fixed: false,
672 - disabled:true 476 + disabled: true
673 }, 477 },
674 { 478 {
675 name: "ACCS原航班日期", 479 name: "ACCS原航班日期",
...@@ -678,7 +482,7 @@ export default { ...@@ -678,7 +482,7 @@ export default {
678 align: "center", 482 align: "center",
679 sorTable: true, 483 sorTable: true,
680 fixed: false, 484 fixed: false,
681 - disabled:true 485 + disabled: true
682 }, 486 },
683 { 487 {
684 name: "ACCS原航线", 488 name: "ACCS原航线",
...@@ -687,7 +491,7 @@ export default { ...@@ -687,7 +491,7 @@ export default {
687 align: "center", 491 align: "center",
688 sorTable: true, 492 sorTable: true,
689 fixed: false, 493 fixed: false,
690 - disabled:true 494 + disabled: true
691 }, 495 },
692 { 496 {
693 name: "是否RDE手工录入", 497 name: "是否RDE手工录入",
...@@ -696,7 +500,7 @@ export default { ...@@ -696,7 +500,7 @@ export default {
696 align: "center", 500 align: "center",
697 sorTable: true, 501 sorTable: true,
698 fixed: false, 502 fixed: false,
699 - disabled:true 503 + disabled: true
700 }, 504 },
701 { 505 {
702 name: "是否自动", 506 name: "是否自动",
...@@ -705,7 +509,7 @@ export default { ...@@ -705,7 +509,7 @@ export default {
705 align: "center", 509 align: "center",
706 sorTable: true, 510 sorTable: true,
707 fixed: false, 511 fixed: false,
708 - disabled:true 512 + disabled: true
709 }, 513 },
710 { 514 {
711 name: "发件人账号", 515 name: "发件人账号",
...@@ -714,7 +518,7 @@ export default { ...@@ -714,7 +518,7 @@ export default {
714 align: "center", 518 align: "center",
715 sorTable: false, 519 sorTable: false,
716 fixed: false, 520 fixed: false,
717 - disabled:true 521 + disabled: true
718 }, 522 },
719 { 523 {
720 name: "发件公司中文名称", 524 name: "发件公司中文名称",
...@@ -723,7 +527,7 @@ export default { ...@@ -723,7 +527,7 @@ export default {
723 align: "center", 527 align: "center",
724 sorTable: false, 528 sorTable: false,
725 fixed: false, 529 fixed: false,
726 - disabled:true 530 + disabled: true
727 }, 531 },
728 { 532 {
729 name: "始发地城市名称", 533 name: "始发地城市名称",
...@@ -732,7 +536,7 @@ export default { ...@@ -732,7 +536,7 @@ export default {
732 align: "center", 536 align: "center",
733 sorTable: false, 537 sorTable: false,
734 fixed: false, 538 fixed: false,
735 - disabled:true 539 + disabled: true
736 }, 540 },
737 { 541 {
738 name: "收件地", 542 name: "收件地",
...@@ -741,7 +545,7 @@ export default { ...@@ -741,7 +545,7 @@ export default {
741 align: "center", 545 align: "center",
742 sorTable: false, 546 sorTable: false,
743 fixed: false, 547 fixed: false,
744 - disabled:true 548 + disabled: true
745 }, 549 },
746 { 550 {
747 name: "尺寸", 551 name: "尺寸",
...@@ -750,7 +554,7 @@ export default { ...@@ -750,7 +554,7 @@ export default {
750 align: "center", 554 align: "center",
751 sorTable: true, 555 sorTable: true,
752 fixed: false, 556 fixed: false,
753 - disabled:true 557 + disabled: true
754 }, 558 },
755 { 559 {
756 name: "大货预审意见（是否可以配置航班）", 560 name: "大货预审意见（是否可以配置航班）",
...@@ -759,7 +563,7 @@ export default { ...@@ -759,7 +563,7 @@ export default {
759 align: "center", 563 align: "center",
760 sorTable: false, 564 sorTable: false,
761 fixed: false, 565 fixed: false,
762 - disabled:true 566 + disabled: true
763 }, 567 },
764 { 568 {
765 name: "大货预审时间", 569 name: "大货预审时间",
...@@ -768,7 +572,7 @@ export default { ...@@ -768,7 +572,7 @@ export default {
768 align: "center", 572 align: "center",
769 sorTable: false, 573 sorTable: false,
770 fixed: false, 574 fixed: false,
771 - disabled:true 575 + disabled: true
772 }, 576 },
773 { 577 {
774 name: "海关回执时间", 578 name: "海关回执时间",
...@@ -777,7 +581,7 @@ export default { ...@@ -777,7 +581,7 @@ export default {
777 align: "center", 581 align: "center",
778 sorTable: true, 582 sorTable: true,
779 fixed: false, 583 fixed: false,
780 - disabled:true 584 + disabled: true
781 }, 585 },
782 { 586 {
783 name: "航班预审时间", 587 name: "航班预审时间",
...@@ -786,7 +590,7 @@ export default { ...@@ -786,7 +590,7 @@ export default {
786 align: "center", 590 align: "center",
787 sorTable: true, 591 sorTable: true,
788 fixed: false, 592 fixed: false,
789 - disabled:true 593 + disabled: true
790 }, 594 },
791 { 595 {
792 name: "创建人", 596 name: "创建人",
...@@ -795,7 +599,7 @@ export default { ...@@ -795,7 +599,7 @@ export default {
795 align: "center", 599 align: "center",
796 sorTable: true, 600 sorTable: true,
797 fixed: false, 601 fixed: false,
798 - disabled:true 602 + disabled: true
799 }, 603 },
800 { 604 {
801 name: "创建时间", 605 name: "创建时间",
...@@ -804,10 +608,10 @@ export default { ...@@ -804,10 +608,10 @@ export default {
804 align: "center", 608 align: "center",
805 sorTable: true, 609 sorTable: true,
806 fixed: false, 610 fixed: false,
807 - disabled:true 611 + disabled: true
808 }, 612 },
809 ], //表头数据 613 ], //表头数据
810 - releaseHeader:[ 614 + releaseHeader: [
811 { 615 {
812 type: "", 616 type: "",
813 name: "提示信息", 617 name: "提示信息",
...@@ -816,7 +620,7 @@ export default { ...@@ -816,7 +620,7 @@ export default {
816 align: "center", 620 align: "center",
817 sorTable: true, 621 sorTable: true,
818 fixed: false, 622 fixed: false,
819 - disabled:true 623 + disabled: true
820 }, 624 },
821 { 625 {
822 type: "", 626 type: "",
...@@ -826,7 +630,7 @@ export default { ...@@ -826,7 +630,7 @@ export default {
826 align: "center", 630 align: "center",
827 sorTable: true, 631 sorTable: true,
828 fixed: false, 632 fixed: false,
829 - disabled:true 633 + disabled: true
830 }, 634 },
831 { 635 {
832 type: "", 636 type: "",
...@@ -836,7 +640,7 @@ export default { ...@@ -836,7 +640,7 @@ export default {
836 align: "center", 640 align: "center",
837 sorTable: true, 641 sorTable: true,
838 fixed: false, 642 fixed: false,
839 - disabled:true 643 + disabled: true
840 }, 644 },
841 { 645 {
842 type: "", 646 type: "",
...@@ -846,7 +650,7 @@ export default { ...@@ -846,7 +650,7 @@ export default {
846 align: "center", 650 align: "center",
847 sorTable: true, 651 sorTable: true,
848 fixed: false, 652 fixed: false,
849 - disabled:true 653 + disabled: true
850 }, 654 },
851 { 655 {
852 type: "", 656 type: "",
...@@ -856,7 +660,7 @@ export default { ...@@ -856,7 +660,7 @@ export default {
856 align: "center", 660 align: "center",
857 sorTable: true, 661 sorTable: true,
858 fixed: false, 662 fixed: false,
859 - disabled:true 663 + disabled: true
860 }, 664 },
861 { 665 {
862 type: "", 666 type: "",
...@@ -866,7 +670,7 @@ export default { ...@@ -866,7 +670,7 @@ export default {
866 align: "center", 670 align: "center",
867 sorTable: true, 671 sorTable: true,
868 fixed: false, 672 fixed: false,
869 - disabled:true 673 + disabled: true
870 }, 674 },
871 { 675 {
872 type: "", 676 type: "",
...@@ -876,11 +680,11 @@ export default { ...@@ -876,11 +680,11 @@ export default {
876 align: "center", 680 align: "center",
877 sorTable: true, 681 sorTable: true,
878 fixed: false, 682 fixed: false,
879 - disabled:true 683 + disabled: true
880 } 684 }
881 ], 685 ],
882 findConditionData: {}, //货物查询条件 686 findConditionData: {}, //货物查询条件
883 - tableData:[], //表格数据 687 + tableData: [], //表格数据
884 allWeight: 0, 688 allWeight: 0,
885 allQty: 0, 689 allQty: 0,
886 shiftKey: false, 690 shiftKey: false,
...@@ -900,8 +704,8 @@ export default { ...@@ -900,8 +704,8 @@ export default {
900 limitSize: 100, //无限制-1 704 limitSize: 100, //无限制-1
901 page: 1, 705 page: 1,
902 progress: 0, 706 progress: 0,
903 - tableHeight:null, 707 + tableHeight: null,
904 - dialogVisible:false, 708 + dialogVisible: false,
905 formShow: true, //菜单隐藏 709 formShow: true, //菜单隐藏
906 }; 710 };
907 }, 711 },
...@@ -920,16 +724,16 @@ export default { ...@@ -920,16 +724,16 @@ export default {
920 }, 724 },
921 725
922 activated() { 726 activated() {
923 - if(this.$store.state.tagsView.cachedViews.length > 0 ){ 727 + if (this.$store.state.tagsView.cachedViews.length > 0) {
924 - this.$store.state.tagsView.cachedViews.forEach(item=>{ 728 + this.$store.state.tagsView.cachedViews.forEach(item => {
925 - if(item === 'QueryCargo'){ 729 + if (item === 'QueryCargo') {
926 - this.totalCount>0?this.select():'' 730 + this.totalCount > 0 ? this.select() : ''
927 } 731 }
928 }) 732 })
929 } 733 }
930 }, 734 },
931 735
932 - deactivated(){ 736 + deactivated() {
933 this.tableData = [] 737 this.tableData = []
934 }, 738 },
935 739
...@@ -944,11 +748,11 @@ export default { ...@@ -944,11 +748,11 @@ export default {
944 this.shiftKey = false; 748 this.shiftKey = false;
945 } 749 }
946 }); 750 });
947 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-50 751 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
948 }, 752 },
949 - watch:{ 753 + watch: {
950 - formShow(val,oldVal){ 754 + formShow(val, oldVal) {
951 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-120 755 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
952 } 756 }
953 }, 757 },
954 methods: { 758 methods: {
...@@ -997,46 +801,46 @@ export default { ...@@ -997,46 +801,46 @@ export default {
997 this.cargoTotal(); 801 this.cargoTotal();
998 }, 802 },
999 //释放仓位 803 //释放仓位
1000 - release(){ 804 + release() {
1001 let idList = [] 805 let idList = []
1002 this.selectTable.map(item => { 806 this.selectTable.map(item => {
1003 item.msg = '' 807 item.msg = ''
1004 idList.push(item.id) 808 idList.push(item.id)
1005 }) 809 })
1006 - releaseCargo(idList).then(res=>{ 810 + releaseCargo(idList).then(res => {
1007 - if(res.code === 200){ 811 + if (res.code === 200) {
1008 this.$message({ 812 this.$message({
1009 message: res.msg, 813 message: res.msg,
1010 type: "success", 814 type: "success",
1011 }); 815 });
1012 - }else if(res.code === 201){ 816 + } else if (res.code === 201) {
1013 this.selectTable.map(item => { 817 this.selectTable.map(item => {
1014 - res.data['success'].map(val=>{ 818 + res.data['success'].map(val => {
1015 - val === item.id ? item.msg = item.msg+'操作成功,正在释放中。' : '' 819 + val === item.id ? item.msg = item.msg + '操作成功,正在释放中。' : ''
1016 }) 820 })
1017 - res.data['accsPoolFlase'].map(val=>{ 821 + res.data['accsPoolFlase'].map(val => {
1018 - val === item.id ? item.msg = item.msg+'accs pool状态不正确。' : '' 822 + val === item.id ? item.msg = item.msg + 'accs pool状态不正确。' : ''
1019 }) 823 })
1020 - res.data['existReleasing'].map(val=>{ 824 + res.data['existReleasing'].map(val => {
1021 - val === item.id ? item.msg = item.msg+'已经在释放，请勿重复释放。' : '' 825 + val === item.id ? item.msg = item.msg + '已经在释放，请勿重复释放。' : ''
1022 }) 826 })
1023 - res.data['noFlight'].map(val=>{ 827 + res.data['noFlight'].map(val => {
1024 - val === item.id ? item.msg = item.msg+'无配载航班。' : '' 828 + val === item.id ? item.msg = item.msg + '无配载航班。' : ''
1025 }) 829 })
1026 }) 830 })
1027 this.dialogVisible = true 831 this.dialogVisible = true
1028 - }else{ 832 + } else {
1029 this.$message({ 833 this.$message({
1030 message: res.msg, 834 message: res.msg,
1031 type: "warning", 835 type: "warning",
1032 }); 836 });
1033 } 837 }
1034 - }).catch(err=>{ 838 + }).catch(err => {
1035 console.log(err) 839 console.log(err)
1036 }) 840 })
1037 }, 841 },
1038 //关闭弹窗 842 //关闭弹窗
1039 - close(){ 843 + close() {
1040 this.dialogVisible = false 844 this.dialogVisible = false
1041 this.selectTable = [] 845 this.selectTable = []
1042 this.select() 846 this.select()
...@@ -1134,7 +938,7 @@ export default { ...@@ -1134,7 +938,7 @@ export default {
1134 item.index = index; 938 item.index = index;
1135 }); 939 });
1136 }, 940 },
1137 - sizeChange(val){ 941 + sizeChange(val) {
1138 this.limitSize = val 942 this.limitSize = val
1139 this.select(0); 943 this.select(0);
1140 }, 944 },
...@@ -1184,7 +988,7 @@ export default { ...@@ -1184,7 +988,7 @@ export default {
1184 } 988 }
1185 } 989 }
1186 }, 990 },
1187 - formatter(){} 991 + formatter() { }
1188 }, 992 },
1189 computed: { 993 computed: {
1190 fltNo: { 994 fltNo: {
...@@ -1231,11 +1035,13 @@ export default { ...@@ -1231,11 +1035,13 @@ export default {
1231 margin-top: 10px; 1035 margin-top: 10px;
1232 margin-left: 50px; 1036 margin-left: 50px;
1233 } 1037 }
1038 +
1234 .progress { 1039 .progress {
1235 width: 200px; 1040 width: 200px;
1236 display: inline-block; 1041 display: inline-block;
1237 margin: 0 0 0 20px; 1042 margin: 0 0 0 20px;
1238 } 1043 }
1044 +
1239 .formShow { 1045 .formShow {
1240 width: max-content; 1046 width: max-content;
1241 height: 48px; 1047 height: 48px;
......