Fedex / imac-vue

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

bug修复

Expand all
Inline Side-by-side
Showing 9 changed files with 159 additions and 159 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 }
......