Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
a6879f56 1 parent 131c33a4

version:1.2.0,货物查询增加释放仓位功能，航班信息查询增加cutoff字段，bug修复

Inline Side-by-side
Showing 31 changed files with 1588 additions and 2557 deletions
1 import request from '@/utils/request' 1 import request from '@/utils/request'
2 2
3 +//航班预审模板下载
4 +/**
5 + * @param
6 + */
3 export function downLoadTemplate(template) { 7 export function downLoadTemplate(template) {
4 return request({ 8 return request({
5 url:'/caPreReviewImport/downLoadTemplate?template=' + template, 9 url:'/caPreReviewImport/downLoadTemplate?template=' + template,
...@@ -8,6 +12,11 @@ export function downLoadTemplate(template) { ...@@ -8,6 +12,11 @@ export function downLoadTemplate(template) {
8 }) 12 })
9 } 13 }
10 14
15 +//预审回执导入
16 +/**
17 + * @param file 文件 *
18 + * @param type 状态 *
19 + */
11 export function importcaPreReview(file, type){ 20 export function importcaPreReview(file, type){
12 let formData = new FormData(); 21 let formData = new FormData();
13 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
......
...@@ -27,11 +27,13 @@ export function findFltById(data) { ...@@ -27,11 +27,13 @@ export function findFltById(data) {
27 }) 27 })
28 } 28 }
29 //删除航班 29 //删除航班
30 +/**
31 + * @param data id List *
32 + */
30 export function delFlight(data) { 33 export function delFlight(data) {
31 return request({ 34 return request({
32 - url: '/FlightPreserveController/delFlight/'+ data, 35 + url: '/FlightPreserveController/delFlight/' + data,
33 method: 'post' 36 method: 'post'
34 -
35 }) 37 })
36 } 38 }
37 //新增修改 39 //新增修改
...@@ -54,10 +56,19 @@ export function findFltCommonConf(data) { ...@@ -54,10 +56,19 @@ export function findFltCommonConf(data) {
54 }) 56 })
55 } 57 }
56 58
57 -export function updateStatusBatch(data){ 59 +export function updateStatusBatch(data) {
58 return request({ 60 return request({
59 url: '/FlightPreserveController/updateStatusBatch', 61 url: '/FlightPreserveController/updateStatusBatch',
60 method: 'post', 62 method: 'post',
61 data: data 63 data: data
62 }) 64 })
63 } 65 }
66 +
67 +//自动推送开关
68 +export function updateAutoPushBatch(data) {
69 + return request({
70 + url: '/FlightPreserveController/updateAutoPushBatch',
71 + method: 'post',
72 + data: data
73 + })
74 +}
......
1 +import request from '@/utils/request'
2 +
3 +// DM数据查询
4 +/**
5 + * @param createTime 创建时间 *
6 + * @param fltNo 航班号
7 + * @param fltDate 航班日期
8 + * @param status 状态
9 + * @param portName 口岸名称
10 + * @param page 页数 *
11 + * @param size 数据长度
12 + */
13 +export function getDmDataList(data) {
14 + return request({
15 + url: '/dmDataLog/getDmDataList',
16 + method: 'post',
17 + data: data
18 + })
19 +}
...\ No newline at end of file ...\ No newline at end of file
...@@ -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 let ductLabels = { 1 let ductLabels = {
2 + "cargo": {//货物查询
2 "cargoRulesStatus": { 3 "cargoRulesStatus": {
3 "1": "手动", 4 "1": "手动",
4 "2": "自动" 5 "2": "自动"
5 }, 6 },
7 + "releasing": {
8 + "1": "正在释放"
9 + },
10 + "cargoAllocationDataStatus": {
11 + "已推送": "已推送",
12 + "不推送": "不推送",
13 + "已配": " ",
14 + "待推送": "待推送",
15 + "手动配舱": ' ',
16 + "已释放": ' ',
17 + "原航班配舱": ' ',
18 + "顺位配舱": ' ',
19 + },
20 + },
21 + "menu": {//菜单设置
6 "menuType": { 22 "menuType": {
7 "M": "菜单", 23 "M": "菜单",
8 "C": "菜单", 24 "C": "菜单",
...@@ -12,14 +28,20 @@ let ductLabels = { ...@@ -12,14 +28,20 @@ let ductLabels = {
12 "1": "启用", 28 "1": "启用",
13 "2": "停用", 29 "2": "停用",
14 }, 30 },
31 + },
32 + "role": {//角色设置
15 "valid": { 33 "valid": {
16 "1": "启用", 34 "1": "启用",
17 "2": "关闭", 35 "2": "关闭",
18 }, 36 },
37 + },
38 + "user": {//用户设置
19 "isValid": { 39 "isValid": {
20 "1": "启用", 40 "1": "启用",
21 "2": "关闭", 41 "2": "关闭",
22 }, 42 },
43 + },
44 + "FlightInformation": {//航班信息维护
23 "ticketToPiece": { 45 "ticketToPiece": {
24 "1": "是", 46 "1": "是",
25 "0": "否", 47 "0": "否",
...@@ -29,10 +51,25 @@ let ductLabels = { ...@@ -29,10 +51,25 @@ let ductLabels = {
29 "0": "否", 51 "0": "否",
30 }, 52 },
31 "highLowPriceFlg": { 53 "highLowPriceFlg": {
32 - "1": "启用", 54 + "1": "开启",
33 "0": "未开启", 55 "0": "未开启",
56 + },
57 + "pushDateSwitch": {
58 + "1": "是",
59 + "2": "否",
60 + },
61 + },
62 + "logDmData": {//DM数据
63 + "status": {
64 + "0": "未处理",
65 + "1": "已处理",
66 + "2": "无需处理",
67 + "3": "处理失败",
68 + "4": "校验不通过",
69 + "5": "数据不能被多次处理",
70 + "9": "处理中",
71 + },
34 } 72 }
35 -
36 } 73 }
37 74
38 export default ductLabels; 75 export default ductLabels;
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -4,61 +4,90 @@ ...@@ -4,61 +4,90 @@
4 */ 4 */
5 5
6 /** 基础通用 **/ 6 /** 基础通用 **/
7 -.pt5 { 7 + .wid100 {
8 + width: 100% !important;
9 + }
10 +
11 + .wid90 {
12 + width: 90% !important;
13 + }
14 +
15 + .wid80 {
16 + width: 80% !important;
17 + }
18 +
19 + .pt5 {
8 padding-top: 5px; 20 padding-top: 5px;
9 -} 21 + }
10 -.pr5 { 22 +
23 + .pr5 {
11 padding-right: 5px; 24 padding-right: 5px;
12 -} 25 + }
13 -.pb5 { 26 +
27 + .pb5 {
14 padding-bottom: 5px; 28 padding-bottom: 5px;
15 -} 29 + }
16 -.mt5 { 30 +
31 + .mt5 {
17 margin-top: 5px; 32 margin-top: 5px;
18 -} 33 + }
19 -.mr5 { 34 +
35 + .mr5 {
20 margin-right: 5px; 36 margin-right: 5px;
21 -} 37 + }
22 -.mb5 { 38 +
39 + .mb5 {
23 margin-bottom: 5px; 40 margin-bottom: 5px;
24 -} 41 + }
25 -.mb8 { 42 +
43 + .mb8 {
26 margin-bottom: 8px; 44 margin-bottom: 8px;
27 -} 45 + }
28 -.ml5 { 46 +
47 + .ml5 {
29 margin-left: 5px; 48 margin-left: 5px;
30 -} 49 + }
31 -.mt10 { 50 +
51 + .mt10 {
32 margin-top: 10px; 52 margin-top: 10px;
33 -} 53 + }
34 -.mr10 { 54 +
55 + .mr10 {
35 margin-right: 10px; 56 margin-right: 10px;
36 -} 57 + }
37 -.mb10 { 58 +
59 + .mb10 {
38 margin-bottom: 10px; 60 margin-bottom: 10px;
39 -} 61 + }
40 -.ml0 { 62 +
63 + .ml0 {
41 margin-left: 10px; 64 margin-left: 10px;
42 -} 65 + }
43 -.mt20 { 66 +
67 + .mt20 {
44 margin-top: 20px; 68 margin-top: 20px;
45 -} 69 + }
46 -.mr20 { 70 +
71 + .mr20 {
47 margin-right: 20px; 72 margin-right: 20px;
48 -} 73 + }
49 -.mb20 { 74 +
75 + .mb20 {
50 margin-bottom: 20px; 76 margin-bottom: 20px;
51 -} 77 + }
52 -.m20 { 78 +
79 + .m20 {
53 margin-left: 20px; 80 margin-left: 20px;
54 -} 81 + }
55 82
56 -.el-dialog:not(.is-fullscreen){ 83 + .el-dialog:not(.is-fullscreen) {
57 margin-top: 6vh !important; 84 margin-top: 6vh !important;
58 -} 85 + }
86 +
87 + .el-table {
59 88
60 -.el-table { 89 + .el-table__header-wrapper,
61 - .el-table__header-wrapper, .el-table__fixed-header-wrapper { 90 + .el-table__fixed-header-wrapper {
62 th { 91 th {
63 word-break: break-word; 92 word-break: break-word;
64 background-color: #f8f8f9; 93 background-color: #f8f8f9;
...@@ -67,160 +96,162 @@ ...@@ -67,160 +96,162 @@
67 font-size: 13px; 96 font-size: 13px;
68 } 97 }
69 } 98 }
99 +
70 .el-table__body-wrapper { 100 .el-table__body-wrapper {
71 - .el-button [class*="el-icon-"] + span { 101 + .el-button [class*="el-icon-"]+span {
72 margin-left: 1px; 102 margin-left: 1px;
73 } 103 }
74 } 104 }
75 -} 105 + }
106 +
107 + /** 表单布局 **/
108 + .form-header {
109 + font-size: 15px;
110 + color: #6379bb;
111 + border-bottom: 1px solid #ddd;
112 + margin: 8px 10px 25px 10px;
113 + padding-top: 15px;
114 + padding-bottom: 5px;
76 115
77 -/** 表单布局 **/
78 -.form-header {
79 - font-size:15px;
80 - color:#6379bb;
81 - border-bottom:1px solid #ddd;
82 - margin:8px 10px 25px 10px;
83 - padding-top:15px;
84 - padding-bottom:5px;
85 .formItem { 116 .formItem {
86 - width: 100%; 117 + width: 90%;
87 - // max-width: 310px; 118 + // max-width: 300px;
119 + }
88 } 120 }
89 -}
90 121
91 -/** 表格布局 **/ 122 + /** 表格布局 **/
92 -.pagination-container { 123 + .pagination-container {
93 position: relative; 124 position: relative;
94 height: 25px; 125 height: 25px;
95 margin-bottom: 10px; 126 margin-bottom: 10px;
96 margin-top: 15px; 127 margin-top: 15px;
97 padding: 10px 20px !important; 128 padding: 10px 20px !important;
98 -} 129 + }
99 130
100 -/* tree border */ 131 + /* tree border */
101 -.tree-border { 132 + .tree-border {
102 margin-top: 5px; 133 margin-top: 5px;
103 border: 1px solid #e5e6e7; 134 border: 1px solid #e5e6e7;
104 background: #FFFFFF none; 135 background: #FFFFFF none;
105 - border-radius:4px; 136 + border-radius: 4px;
106 -} 137 + }
107 138
108 -.pagination-container .el-pagination { 139 + .pagination-container .el-pagination {
109 right: 0; 140 right: 0;
110 position: absolute; 141 position: absolute;
111 -} 142 + }
112 143
113 -.el-table .fixed-width .el-button--mini { 144 + .el-table .fixed-width .el-button--mini {
114 padding-left: 0; 145 padding-left: 0;
115 padding-right: 0; 146 padding-right: 0;
116 width: inherit; 147 width: inherit;
117 -} 148 + }
118 149
119 -.el-tree-node__content > .el-checkbox { 150 + .el-tree-node__content>.el-checkbox {
120 margin-right: 8px; 151 margin-right: 8px;
121 -} 152 + }
122 153
123 -.list-group-striped > .list-group-item { 154 + .list-group-striped>.list-group-item {
124 border-left: 0; 155 border-left: 0;
125 border-right: 0; 156 border-right: 0;
126 border-radius: 0; 157 border-radius: 0;
127 padding-left: 0; 158 padding-left: 0;
128 padding-right: 0; 159 padding-right: 0;
129 -} 160 + }
130 161
131 -.list-group { 162 + .list-group {
132 padding-left: 0px; 163 padding-left: 0px;
133 list-style: none; 164 list-style: none;
134 -} 165 + }
135 166
136 -.list-group-item { 167 + .list-group-item {
137 border-bottom: 1px solid #e7eaec; 168 border-bottom: 1px solid #e7eaec;
138 border-top: 1px solid #e7eaec; 169 border-top: 1px solid #e7eaec;
139 margin-bottom: -1px; 170 margin-bottom: -1px;
140 padding: 11px 0px; 171 padding: 11px 0px;
141 font-size: 13px; 172 font-size: 13px;
142 -} 173 + }
143 174
144 -.pull-right { 175 + .pull-right {
145 float: right !important; 176 float: right !important;
146 -} 177 + }
147 178
148 -.el-card__header { 179 + .el-card__header {
149 padding: 14px 15px 7px; 180 padding: 14px 15px 7px;
150 min-height: 40px; 181 min-height: 40px;
151 -} 182 + }
152 183
153 -.el-card__body { 184 + .el-card__body {
154 padding: 15px 20px 20px 20px; 185 padding: 15px 20px 20px 20px;
155 -} 186 + }
156 187
157 -.card-box { 188 + .card-box {
158 padding-right: 15px; 189 padding-right: 15px;
159 padding-left: 15px; 190 padding-left: 15px;
160 margin-bottom: 10px; 191 margin-bottom: 10px;
161 -} 192 + }
162 193
163 -/* button color */ 194 + /* button color */
164 -.el-button--cyan.is-active, 195 + .el-button--cyan.is-active,
165 -.el-button--cyan:active { 196 + .el-button--cyan:active {
166 background: #20B2AA; 197 background: #20B2AA;
167 border-color: #20B2AA; 198 border-color: #20B2AA;
168 color: #FFFFFF; 199 color: #FFFFFF;
169 -} 200 + }
170 201
171 -.el-button--cyan:focus, 202 + .el-button--cyan:focus,
172 -.el-button--cyan:hover { 203 + .el-button--cyan:hover {
173 background: #48D1CC; 204 background: #48D1CC;
174 border-color: #48D1CC; 205 border-color: #48D1CC;
175 color: #FFFFFF; 206 color: #FFFFFF;
176 -} 207 + }
177 208
178 -.el-button--cyan { 209 + .el-button--cyan {
179 background-color: #20B2AA; 210 background-color: #20B2AA;
180 border-color: #20B2AA; 211 border-color: #20B2AA;
181 color: #FFFFFF; 212 color: #FFFFFF;
182 -} 213 + }
183 214
184 -/* text color */ 215 + /* text color */
185 -.text-navy { 216 + .text-navy {
186 color: #1ab394; 217 color: #1ab394;
187 -} 218 + }
188 219
189 -.text-primary { 220 + .text-primary {
190 color: inherit; 221 color: inherit;
191 -} 222 + }
192 223
193 -.text-success { 224 + .text-success {
194 color: #1c84c6; 225 color: #1c84c6;
195 -} 226 + }
196 227
197 -.text-info { 228 + .text-info {
198 color: #23c6c8; 229 color: #23c6c8;
199 -} 230 + }
200 231
201 -.text-warning { 232 + .text-warning {
202 color: #f8ac59; 233 color: #f8ac59;
203 -} 234 + }
204 235
205 -.text-danger { 236 + .text-danger {
206 color: #ed5565; 237 color: #ed5565;
207 -} 238 + }
208 239
209 -.text-muted { 240 + .text-muted {
210 color: #888888; 241 color: #888888;
211 -} 242 + }
212 243
213 -/* image */ 244 + /* image */
214 -.img-circle { 245 + .img-circle {
215 border-radius: 50%; 246 border-radius: 50%;
216 -} 247 + }
217 248
218 -.img-lg { 249 + .img-lg {
219 width: 120px; 250 width: 120px;
220 height: 120px; 251 height: 120px;
221 -} 252 + }
222 253
223 -.avatar-upload-preview { 254 + .avatar-upload-preview {
224 position: absolute; 255 position: absolute;
225 top: 50%; 256 top: 50%;
226 transform: translate(50%, -50%); 257 transform: translate(50%, -50%);
...@@ -229,16 +260,20 @@ ...@@ -229,16 +260,20 @@
229 border-radius: 50%; 260 border-radius: 50%;
230 box-shadow: 0 0 4px #ccc; 261 box-shadow: 0 0 4px #ccc;
231 overflow: hidden; 262 overflow: hidden;
232 -} 263 + }
233 264
234 -/* 拖拽列样式 */ 265 + /* 拖拽列样式 */
235 -.sortable-ghost{ 266 + .sortable-ghost {
236 opacity: .8; 267 opacity: .8;
237 - color: #fff!important; 268 + color: #fff !important;
238 - background: #42b983!important; 269 + background: #42b983 !important;
239 -} 270 + }
240 271
241 -.top-right-btn { 272 + .top-right-btn {
242 position: relative; 273 position: relative;
243 float: right; 274 float: right;
244 -} 275 + }
276 +
277 + .dialogColumn .el-tooltip {
278 + white-space: pre-line !important;
279 + }
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -189,3 +189,51 @@ aside { ...@@ -189,3 +189,51 @@ aside {
189 .multiselect--active { 189 .multiselect--active {
190 z-index: 1000 !important; 190 z-index: 1000 !important;
191 } 191 }
192 +
193 +
194 +.el-table__body-wrapper {
195 + &::-webkit-scrollbar {
196 + height: 10px;
197 + width: 10px;
198 + }
199 +
200 + &::-webkit-scrollbar-track {
201 + background-color: #fff;
202 + }
203 +
204 + &::-webkit-scrollbar-thumb {
205 + background-color: #ccc;
206 + }
207 +
208 + &::-webkit-scrollbar-thumb:hover {
209 + background-color: #409eff;
210 + }
211 +}
212 +
213 +// 解决表格固定列问题
214 +.el-table__fixed,
215 +.el-table__fixed-right {
216 + height: calc(100% - 7px) !important;
217 + box-shadow: -5px -2px 10px rgba(0, 0, 0, .12) !important;
218 +
219 + .el-table__fixed-body-wrapper {
220 + height: calc(100% - 36px) !important;
221 + }
222 +}
223 +
224 +// 当表格没有滚动条时
225 +.el-table__body-wrapper.is-scrolling-none~.el-table__fixed-right {
226 + height: 100% !important;
227 + bottom: 0 !important;
228 + box-shadow: none !important;
229 +}
230 +
231 +// 当表格有纵向滚动条时
232 +.el-table--scrollable-y .el-table__fixed-right {
233 + right: 7px !important;
234 +}
235 +
236 +// 当表格只有横向滚动条，没有纵向滚动条时
237 +.el-table--scrollable-x:not(.el-table--scrollable-y) .el-table__fixed-right {
238 + right: 0 !important;
239 +}
...\ No newline at end of file ...\ No newline at end of file
......
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" 9 + <!-- 复选框 -->
10 - :indent="indent" 10 + <el-table-column v-if="selection" type="selection" :fixed="true" width="50" align="center"></el-table-column>
11 - :show-header="showHeader" 11 + <!-- 序号 -->
12 - :height="height" 12 + <el-table-column type="index" width="50" align="center"></el-table-column>
13 - :highlight-current-row="highlightCurrentRow" 13 + <template v-for="(item, index) in newHeader">
14 - :lazy="lazy" 14 + <!-- 自定义插槽 -->
15 - :downShiftKey="shiftKey" 15 + <el-table-column v-if="item.slot" :prop="item.value" :label="item.name" :width="item.width" :align="item.align"
16 - :limitStart="limitStart" 16 + :fixed="item.fixed" :show-overflow-tooltip="showOverflowTooltip" :sortable="item.sorTable"
17 - :row-key="rowKey" 17 + :formatter="formatter" header-align="center" :sort-orders="['descending', 'ascending', null]"
18 - :default-expand-all="defaultExpandAll" 18 + :slotHeader="slotHeader" :render-header="renderHeader" :key="index">
19 - :tree-props="{ children: 'children', hasChildren: 'hasChildren' }" 19 + <template slot-scope="scope">
20 - v-loading="loading" 20 + <slot :name="item.value" :row="scope.row"></slot>
21 - @sort-change="sortChange" 21 + </template>
22 - @select="tableSelect"
23 - @select-all="tableSelectAll"
24 - @select-change="SelectChange"
25 - >
26 - <el-table-column
27 - v-for="(item, index) in newHeader"
28 - :type="item.type"
29 - :prop="item.value"
30 - :label="item.name"
31 - :width="item.width"
32 - :align="item.align"
33 - :fixed="item.fixed"
34 - :column-key="index.toString()"
35 - :show-overflow-tooltip="showOverflowTooltip"
36 - :sortable="item.sorTable"
37 - :formatter="formatter"
38 - header-align="center"
39 - :sort-orders="['descending', 'ascending', null]"
40 - :slotHeader="slotHeader"
41 - :render-header="renderHeader"
42 - :key="index"
43 - v-if="item.disabled"
44 - >
45 - <!-- <template slot-scope="scope">
46 - <exSlot
47 - v-if="item.render"
48 - :render="item.render"
49 - :row="scope.row"
50 - :index="scope.$index"
51 - :column="item"
52 - ></exSlot>
53 - <span v-else>{{ scope.row[item.value] || "" }}</span>
54 - </template> -->
55 </el-table-column> 22 </el-table-column>
56 - <slot></slot> 23 + <!-- 默认数据 -->
24 + <el-table-column v-else :prop="item.value" :label="item.name" :index="item.index" :width="item.width"
25 + :align="item.align" :fixed="item.fixed" :sortable="item.sorTable" :column-key="index.toString()"
26 + :show-overflow-tooltip="showOverflowTooltip" header-align="center"
27 + :sort-orders="['descending', 'ascending', null]" :slotHeader="slotHeader" :render-header="renderHeader"
28 + :formatter="formatter" :key="index">
29 + </el-table-column>
30 + </template>
31 + <!-- 末端插槽 -->
32 + <slot name="optionColumn"></slot>
57 </el-table> 33 </el-table>
58 - <el-pagination 34 + <!-- 分页 -->
59 - :total="totalCount" 35 + <el-pagination :total="totalCount" :page-size.sync="limitSize" :current-page.sync="pageNum" :page-sizes="pageSizes"
60 - :page-size.sync="limitSize" 36 + background layout="prev, pager, next, jumper, ->, sizes, total" class="tablePagination" @size-change="sizeChange"
61 - :current-page.sync="pageNum" 37 + @next-click="nextClick" @prev-click="prevClick" @current-change="currentChange">
62 - background
63 - layout="prev, pager, next, jumper, ->, sizes, total"
64 - class="tablePagination"
65 - @size-change="sizeChange"
66 - @next-click="nextClick"
67 - @prev-click="prevClick"
68 - @current-change="currentChange"
69 - >
70 </el-pagination> 38 </el-pagination>
71 - <div class="tableInfo" v-if="infoShow">
72 - <ul class="tableList" v-show="show">
73 - <el-checkbox-group v-model="checkDisabled">
74 - <li
75 - class="flexList"
76 - v-for="(item, index) in newHeader"
77 - :key="index"
78 - v-if="!item.type"
79 - :title="item.name"
80 - >
81 - <div>
82 - <el-checkbox
83 - :label="item.name"
84 - @change="newHeader[index].disabled = !item.disabled"
85 - >{{ item.name }}</el-checkbox
86 - >
87 - </div>
88 - </li>
89 - </el-checkbox-group>
90 - </ul>
91 - <el-button
92 - type="primary"
93 - icon="el-icon-edit"
94 - size="medium"
95 - circle
96 - @click="show = !show"
97 - ></el-button>
98 - </div>
99 </div> 39 </div>
100 </template> 40 </template>
101 41
102 <script> 42 <script>
103 -let exSlot = {
104 - fucntional: true,
105 - props: {
106 - row: Object,
107 - render: Function,
108 - index: [Number, String],
109 - column: {
110 - type: Object,
111 - default: null,
112 - },
113 - },
114 - render: (h, data) => {
115 - console.log(data);
116 - if (data) {
117 - const params = {
118 - row: data.props.row,
119 - index: data.props.index,
120 - };
121 - if (data.props.column) params.column = data.props.column;
122 - return data.props.render(h, params);
123 - }
124 - },
125 -};
126 import dictLabels from "../../assets/languages/dictLabels.js"; 43 import dictLabels from "../../assets/languages/dictLabels.js";
127 import { scrollTo } from "@/utils/scroll-to"; 44 import { scrollTo } from "@/utils/scroll-to";
128 export default { 45 export default {
129 name: "Table", 46 name: "Table",
130 - components: {
131 - exSlot,
132 - },
133 props: { 47 props: {
134 //dom名称 48 //dom名称
135 tableName: { type: String, default: "tables" }, 49 tableName: { type: String, default: "tables" },
136 //表格数据 50 //表格数据
51 + ductName: { type: String, default: null },
137 data: { 52 data: {
138 type: Array, 53 type: Array,
139 default() { 54 default() {
...@@ -158,9 +73,13 @@ export default { ...@@ -158,9 +73,13 @@ export default {
158 default: "mini", 73 default: "mini",
159 }, 74 },
160 height: { 75 height: {
161 - type: [String,Number], 76 + type: [String, Number],
162 default: "400", 77 default: "400",
163 }, 78 },
79 + selection: {
80 + type: Boolean,
81 + default: false,
82 + },
164 fit: { 83 fit: {
165 type: Boolean, 84 type: Boolean,
166 default: true, 85 default: true,
...@@ -207,10 +126,10 @@ export default { ...@@ -207,10 +126,10 @@ export default {
207 type: Number, 126 type: Number,
208 default: 1, 127 default: 1,
209 }, 128 },
210 - // pageSizes:{ 129 + pageSizes: {
211 - // type:Array, 130 + type: Array,
212 - // default:[10, 20, 30, 40, 50, 100] 131 + default: [10, 20, 30, 40, 50, 100],
213 - // }, 132 + },
214 //每页长度 133 //每页长度
215 limitSize: { 134 limitSize: {
216 type: Number, 135 type: Number,
...@@ -242,10 +161,6 @@ export default { ...@@ -242,10 +161,6 @@ export default {
242 type: Boolean, 161 type: Boolean,
243 default: false, 162 default: false,
244 }, 163 },
245 - infoShow:{
246 - type:Boolean,
247 - default:false,
248 - }
249 }, 164 },
250 inheritAttrs: false, 165 inheritAttrs: false,
251 data() { 166 data() {
...@@ -264,7 +179,6 @@ export default { ...@@ -264,7 +179,6 @@ export default {
264 }, 179 },
265 //表头数据格式 180 //表头数据格式
266 // { 181 // {
267 - // type: "",
268 // name: "", 182 // name: "",
269 // value: "", 183 // value: "",
270 // width: "", 184 // width: "",
...@@ -288,17 +202,18 @@ export default { ...@@ -288,17 +202,18 @@ export default {
288 this.data.forEach((item, index) => { 202 this.data.forEach((item, index) => {
289 item.index = index; 203 item.index = index;
290 }); 204 });
291 - this.$nextTick(()=>{ 205 + this.$nextTick(() => {
292 - this.$refs.tables.doLayout() 206 + this.$refs.tables.doLayout();
293 - }) 207 + });
294 }, 208 },
295 headerData(val, oldVal) { 209 headerData(val, oldVal) {
296 this.newHeader = val; 210 this.newHeader = val;
297 }, 211 },
298 }, 212 },
299 methods: { 213 methods: {
300 - sizeChange(val){ 214 + //数据长度切换
301 - this.$emit("sizeChange",val) 215 + sizeChange(val) {
216 + this.$emit("sizeChange", val);
302 }, 217 },
303 //下一页 218 //下一页
304 nextClick() { 219 nextClick() {
...@@ -413,108 +328,37 @@ export default { ...@@ -413,108 +328,37 @@ export default {
413 "div", 328 "div",
414 { 329 {
415 class: ["thead-cell"], 330 class: ["thead-cell"],
416 - // on: {
417 - // mousedown: ($event) => {
418 - // this.handleMouseDown($event, column);
419 - // },
420 - // mousemove: ($event) => {
421 - // this.handleMouseMove($event, column);
422 - // },
423 - // },
424 }, 331 },
425 [ 332 [
426 // 添加 <a> 用于显示表头 label 333 // 添加 <a> 用于显示表头 label
427 - createElement("a", column.label), 334 + createElement("div", column.label),
428 - // 添加一个空标签用于显示拖动动画
429 - createElement("span", {
430 - class: ["virtual"],
431 - }),
432 ] 335 ]
433 ); 336 );
434 }, 337 },
435 - 338 + headerCellClassName({ column, columnIndex }) {
436 - // 按下鼠标开始拖动 339 + let active =
437 - // handleMouseDown(e, column) { 340 + columnIndex - 1 === this.dragState.end
438 - // this.dragState.dragging = true; 341 + ? `darg_active_${this.dragState.direction}`
439 - // this.dragState.start = parseInt(column.columnKey); 342 + : "";
440 - // // 给拖动时的虚拟容器添加宽高 343 + let start = columnIndex - 1 === this.dragState.start ? `darg_start` : "";
441 - // let table = document.getElementsByClassName("w-table")[0]; 344 + return `${active} ${start}`;
442 - // let virtual = document.getElementsByClassName("virtual"); 345 + },
443 - // for (let item of virtual) { 346 + cellClassName({ column, columnIndex }) {
444 - // item.style.height = table.clientHeight - 1 + "px"; 347 + return columnIndex - 1 === this.dragState.start ? `darg_start` : "";
445 - // item.style.width = item.parentElement.parentElement.clientWidth + "px"; 348 + },
446 - // }
447 - // document.addEventListener("mouseup", this.handleMouseUp);
448 - // },
449 -
450 - // 鼠标放开结束拖动
451 - // handleMouseUp() {
452 - // this.dragColumn(this.dragState);
453 - // // 初始化拖动状态
454 - // this.dragState = {
455 - // start: -9,
456 - // end: -9,
457 - // dragging: false,
458 - // direction: undefined,
459 - // };
460 - // document.removeEventListener("mouseup", this.handleMouseUp);
461 - // },
462 -
463 - // 拖动中
464 - // handleMouseMove(e, column) {
465 - // if (this.dragState.dragging) {
466 - // let index = parseInt(column.columnKey); // 记录起始列
467 - // if (index - this.dragState.start !== 0) {
468 - // this.dragState.direction =
469 - // index - this.dragState.start < 0 ? "left" : "right"; // 判断拖动方向
470 - // this.dragState.end = parseInt(column.columnKey);
471 - // } else {
472 - // this.dragState.direction = undefined;
473 - // }
474 - // } else {
475 - // return false;
476 - // }
477 - // },
478 -
479 - // 拖动易位
480 - // dragColumn({ start, end, direction }) {
481 - // let tempData = [];
482 - // let left = direction === "left";
483 - // let min = left ? end : start - 1;
484 - // let max = left ? start + 1 : end;
485 - // for (let i = 0; i < this.newHeader.length; i++) {
486 - // if (i === end) {
487 - // tempData.push(this.newHeader[start]);
488 - // } else if (i > min && i < max) {
489 - // tempData.push(this.newHeader[left ? i - 1 : i + 1]);
490 - // } else {
491 - // tempData.push(this.newHeader[i]);
492 - // }
493 - // }
494 - // this.newHeader = tempData;
495 - // },
496 - // headerCellClassName({ column, columnIndex }) {
497 - // let active =
498 - // columnIndex - 1 === this.dragState.end
499 - // ? `darg_active_${this.dragState.direction}`
500 - // : "";
501 - // let start = columnIndex - 1 === this.dragState.start ? `darg_start` : "";
502 - // return `${active} ${start}`;
503 - // },
504 -
505 - // cellClassName({ column, columnIndex }) {
506 - // return columnIndex - 1 === this.dragState.start ? `darg_start` : "";
507 - // },
508 //数据格式化 349 //数据格式化
509 formatter(row, column, cellValue, index) { 350 formatter(row, column, cellValue, index) {
510 - if (dictLabels[column.property]) { 351 + if (dictLabels[this.ductName][column.property]) {
511 - if (dictLabels[column.property][cellValue]) { 352 + if (dictLabels[this.ductName][column.property][cellValue]) {
512 - return dictLabels[column.property][cellValue]; 353 + return dictLabels[this.ductName][column.property][cellValue];
513 } 354 }
514 } 355 }
515 if (column.property == "roleNames") { 356 if (column.property == "roleNames") {
516 return cellValue.toString(); 357 return cellValue.toString();
517 } 358 }
359 + if (column.property == 'flightIdImac') {
360 + return cellValue == null ? '未配' : '已配'
361 + }
518 return cellValue; 362 return cellValue;
519 }, 363 },
520 }, 364 },
...@@ -526,36 +370,18 @@ export default { ...@@ -526,36 +370,18 @@ export default {
526 margin-top: 40px; 370 margin-top: 40px;
527 text-align: right; 371 text-align: right;
528 } 372 }
373 +
529 .w-table { 374 .w-table {
530 - height:100%; 375 + height: 100%;
531 - 　.el-table .darg_start { 376 +
377 + .el-table .darg_start {
532 background-color: #f3f3f3; 378 background-color: #f3f3f3;
533 } 379 }
380 +
534 .el-table th { 381 .el-table th {
535 padding: 0; 382 padding: 0;
536 - .virtual {
537 - position: absolute;
538 - display: block;
539 - width: 0;
540 - height: 0;
541 - top: 0px;
542 - left: 0px;
543 - background: none;
544 - border: none;
545 - }
546 - &.darg_active_left {
547 - .virtual {
548 - border-left: 2px dotted #666;
549 - z-index: 99;
550 - }
551 - }
552 - &.darg_active_right {
553 - .virtual {
554 - border-right: 2px dotted #666;
555 - z-index: 99;
556 - }
557 - }
558 } 383 }
384 +
559 .thead-cell { 385 .thead-cell {
560 padding: 0; 386 padding: 0;
561 display: inline-flex; 387 display: inline-flex;
...@@ -563,6 +389,7 @@ export default { ...@@ -563,6 +389,7 @@ export default {
563 align-items: left; 389 align-items: left;
564 cursor: pointer; 390 cursor: pointer;
565 overflow: initial; 391 overflow: initial;
392 +
566 &:before { 393 &:before {
567 content: ""; 394 content: "";
568 position: absolute; 395 position: absolute;
...@@ -572,21 +399,25 @@ export default { ...@@ -572,21 +399,25 @@ export default {
572 right: 0; 399 right: 0;
573 } 400 }
574 } 401 }
402 +
575 &.w-table_moving { 403 &.w-table_moving {
576 .el-table th .thead-cell { 404 .el-table th .thead-cell {
577 cursor: move !important; 405 cursor: move !important;
578 } 406 }
407 +
579 .el-table__fixed { 408 .el-table__fixed {
580 cursor: not-allowed; 409 cursor: not-allowed;
581 } 410 }
582 } 411 }
583 } 412 }
413 +
584 .tableInfo { 414 .tableInfo {
585 position: fixed; 415 position: fixed;
586 right: 30px; 416 right: 30px;
587 bottom: 100px; 417 bottom: 100px;
588 z-index: 99999999; 418 z-index: 99999999;
589 } 419 }
420 +
590 .tableList { 421 .tableList {
591 width: 200px; 422 width: 200px;
592 max-height: 500px; 423 max-height: 500px;
...@@ -600,20 +431,24 @@ export default { ...@@ -600,20 +431,24 @@ export default {
600 background: #fff; 431 background: #fff;
601 overflow-y: scroll; 432 overflow-y: scroll;
602 } 433 }
434 +
603 .tableList::-webkit-scrollbar { 435 .tableList::-webkit-scrollbar {
604 width: 4px; 436 width: 4px;
605 height: 4px; 437 height: 4px;
606 } 438 }
439 +
607 .tableList::-webkit-scrollbar-thumb { 440 .tableList::-webkit-scrollbar-thumb {
608 border-radius: 10px; 441 border-radius: 10px;
609 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); 442 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
610 background: rgba(0, 0, 0, 0.2); 443 background: rgba(0, 0, 0, 0.2);
611 } 444 }
445 +
612 .tableList::-webkit-scrollbar-track { 446 .tableList::-webkit-scrollbar-track {
613 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); 447 -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2);
614 border-radius: 0; 448 border-radius: 0;
615 background: rgba(0, 0, 0, 0.2); 449 background: rgba(0, 0, 0, 0.2);
616 } 450 }
451 +
617 .flexList { 452 .flexList {
618 width: 100%; 453 width: 100%;
619 display: flex; 454 display: flex;
......
1 <template> 1 <template>
2 <div class="navbar"> 2 <div class="navbar">
3 - <hamburger 3 + <hamburger id="hamburger-container" :is-active="sidebar.opened" class="hamburger-container"
4 - id="hamburger-container" 4 + @toggleClick="toggleSideBar" />
5 - :is-active="sidebar.opened" 5 + <breadcrumb id="breadcrumb-container" class="breadcrumb-container" v-if="!topNav" />
6 - class="hamburger-container"
7 - @toggleClick="toggleSideBar"
8 - />
9 - <breadcrumb
10 - id="breadcrumb-container"
11 - class="breadcrumb-container"
12 - v-if="!topNav"
13 - />
14 <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" /> 6 <top-nav id="topmenu-container" class="topmenu-container" v-if="topNav" />
15 7
16 <div class="right-menu"> 8 <div class="right-menu">
17 <template v-if="device !== 'mobile'"> </template> 9 <template v-if="device !== 'mobile'"> </template>
18 - <el-select 10 + <el-select v-model="portName" size="mini" style="width: 120px; top: -17px; right: 7px" placeholder="选择口岸">
19 - v-model="portName" 11 + <el-option v-for="item in portNameList" :label="item" :value="item" :key="item">
20 - size="mini"
21 - style="width: 120px; top: -17px; right: 7px"
22 - placeholder="选择口岸"
23 - >
24 - <el-option
25 - v-for="item in portNameList"
26 - :label="item"
27 - :value="item"
28 - :key="item"
29 - >
30 </el-option> 12 </el-option>
31 </el-select> 13 </el-select>
32 - <el-dropdown 14 + <el-dropdown class="avatar-container right-menu-item hover-effect" trigger="click">
33 - class="avatar-container right-menu-item hover-effect"
34 - trigger="click"
35 - >
36 <div class="userName-wrapper"> 15 <div class="userName-wrapper">
37 <!-- <img :src="avatar" class="user-avatar" /> --> 16 <!-- <img :src="avatar" class="user-avatar" /> -->
38 - <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎！{{userName}}</span> 17 + <span><i class="el-icon-user-solid" style="color:#1890ff"></i>欢迎！{{ userName }}</span>
39 </div> 18 </div>
40 <el-dropdown-menu slot="dropdown"> 19 <el-dropdown-menu slot="dropdown">
41 <el-dropdown-item @click.native="logout"> 20 <el-dropdown-item @click.native="logout">
...@@ -57,11 +36,12 @@ ...@@ -57,11 +36,12 @@
57 </template> 36 </template>
58 37
59 <script> 38 <script>
60 -import { mapGetters } from "vuex"; 39 +import { mapGetters } from "vuex"
61 -import Breadcrumb from "@/components/Breadcrumb"; 40 +import Breadcrumb from "@/components/Breadcrumb"
62 -import TopNav from "@/components/TopNav"; 41 +import TopNav from "@/components/TopNav"
63 -import Hamburger from "@/components/Hamburger"; 42 +import Hamburger from "@/components/Hamburger"
64 import { removeToken } from '@/utils/auth' 43 import { removeToken } from '@/utils/auth'
44 +import settings from "@/settings"
65 45
66 export default { 46 export default {
67 components: { 47 components: {
...@@ -71,7 +51,7 @@ export default { ...@@ -71,7 +51,7 @@ export default {
71 }, 51 },
72 data() { 52 data() {
73 return { 53 return {
74 - userName:"", 54 + userName: "",
75 portNameList: [], 55 portNameList: [],
76 locale: "zh", 56 locale: "zh",
77 }; 57 };
...@@ -111,20 +91,20 @@ export default { ...@@ -111,20 +91,20 @@ export default {
111 this.$store.dispatch('tagsView/delAllCachedViews') 91 this.$store.dispatch('tagsView/delAllCachedViews')
112 this.$store.dispatch('tagsView/delAllVisitedViews') 92 this.$store.dispatch('tagsView/delAllVisitedViews')
113 // location.reload(); 93 // location.reload();
114 - if(this.$route.path != '/index'){ 94 + if (this.$route.path != '/index') {
115 this.$router.push('/index') 95 this.$router.push('/index')
116 } 96 }
117 } else { 97 } else {
118 this.$confirm(res.msg, "提示", { 98 this.$confirm(res.msg, "提示", {
119 type: "warning", 99 type: "warning",
120 - }).then(()=>{ 100 + }).then(() => {
121 // location.reload(); 101 // location.reload();
122 - if(this.$route.path != '/index'){ 102 + if (this.$route.path != '/index') {
123 this.$router.push('/index') 103 this.$router.push('/index')
124 } 104 }
125 - }).catch(()=>{ 105 + }).catch(() => {
126 // location.reload(); 106 // location.reload();
127 - if(this.$route.path != '/index'){ 107 + if (this.$route.path != '/index') {
128 this.$router.push('/index') 108 this.$router.push('/index')
129 } 109 }
130 }); 110 });
...@@ -148,7 +128,7 @@ export default { ...@@ -148,7 +128,7 @@ export default {
148 }).then(() => { 128 }).then(() => {
149 this.$store.dispatch("LogOut").then(() => { 129 this.$store.dispatch("LogOut").then(() => {
150 removeToken() 130 removeToken()
151 - window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转 131 + window.location.href = settings.logoutURL;//wsso系统跳转
152 }); 132 });
153 }); 133 });
154 }, 134 },
...@@ -225,16 +205,19 @@ export default { ...@@ -225,16 +205,19 @@ export default {
225 text-align: center; 205 text-align: center;
226 margin-right: 15px; 206 margin-right: 15px;
227 font-weight: 700; 207 font-weight: 700;
228 - i{ 208 +
209 + i {
229 display: inline-block; 210 display: inline-block;
230 height: 50px; 211 height: 50px;
231 - margin-right:5px; 212 + margin-right: 5px;
232 font-size: 24px; 213 font-size: 24px;
233 line-height: 50px; 214 line-height: 50px;
234 } 215 }
216 +
235 .userName-wrapper { 217 .userName-wrapper {
236 position: relative; 218 position: relative;
237 - font-size:14px; 219 + font-size: 14px;
220 +
238 .user-avatar { 221 .user-avatar {
239 cursor: pointer; 222 cursor: pointer;
240 width: 40px; 223 width: 40px;
......
...@@ -2,6 +2,7 @@ import router from './router' ...@@ -2,6 +2,7 @@ import router from './router'
2 import store from './store' 2 import store from './store'
3 import { Message } from 'element-ui' 3 import { Message } from 'element-ui'
4 import { getToken, setToken, removeToken } from '@/utils/auth' 4 import { getToken, setToken, removeToken } from '@/utils/auth'
5 +import settings from "@/settings"
5 6
6 7
7 const whiteList = ['/login', '/auth-redirect', '/bind', '/register'] 8 const whiteList = ['/login', '/auth-redirect', '/bind', '/register']
...@@ -24,7 +25,7 @@ router.beforeEach((to, from, next) => { ...@@ -24,7 +25,7 @@ router.beforeEach((to, from, next) => {
24 Message.error(err) 25 Message.error(err)
25 store.dispatch('LogOut').then(() => { 26 store.dispatch('LogOut').then(() => {
26 // next({ path: '/' }) 27 // next({ path: '/' })
27 - window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转 28 + window.location.href = settings.logoutURL;//wsso系统跳转
28 }) 29 })
29 }) 30 })
30 } else { 31 } else {
...@@ -44,7 +45,7 @@ router.beforeEach((to, from, next) => { ...@@ -44,7 +45,7 @@ router.beforeEach((to, from, next) => {
44 // 在免登录白名单，直接进入 45 // 在免登录白名单，直接进入
45 next() 46 next()
46 } else { 47 } else {
47 - window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转 48 + window.location.href = settings.logoutURL;//wsso系统跳转
48 } 49 }
49 } 50 }
50 51
......
1 import Vue from 'vue' 1 import Vue from 'vue'
2 import Router from 'vue-router' 2 import Router from 'vue-router'
3 +import settings from "@/settings"
3 4
4 Vue.use(Router) 5 Vue.use(Router)
5 6
...@@ -92,5 +93,5 @@ export default new Router({ ...@@ -92,5 +93,5 @@ export default new Router({
92 mode: 'history', // 去掉url中的# 93 mode: 'history', // 去掉url中的#
93 scrollBehavior: () => ({ y: 0 }), 94 scrollBehavior: () => ({ y: 0 }),
94 routes: constantRoutes, 95 routes: constantRoutes,
95 - base: '/imacuat' 96 + base: settings.routerBase
96 }) 97 })
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -40,7 +40,23 @@ module.exports = { ...@@ -40,7 +40,23 @@ module.exports = {
40 errorLog: 'production', 40 errorLog: 'production',
41 41
42 /** 42 /**
43 + * logout
44 + */
45 + logoutURL: 'https://test-myapps.secure.fedex.com/purpleid/signout/',
46 +
47 + /**
48 + * 后端接口
49 + */
50 + baseURL: `https://imacuat.zmd.apac.fedex.com/iMAC`,
51 + downLoadURL: `https://imacuat.zmd.apac.fedex.com/iMAC`,//下载、导出地址
52 +
53 + /**
54 + * 项目存放地址
55 + */
56 + routerBase: '/imacuat',
57 +
58 + /**
43 * 版本号 59 * 版本号
44 */ 60 */
45 - version:'version：1.1.0' 61 + version: 'version：1.3.0'
46 } 62 }
......
1 //import Cookies from 'js-cookie' 1 //import Cookies from 'js-cookie'
2 2
3 -const TokenKey = 'Admin-Token' 3 +const TokenKey = 'iMac-Token'
4 4
5 export function getToken() { 5 export function getToken() {
6 //return Cookies.get(TokenKey) 6 //return Cookies.get(TokenKey)
......
1 import axios from 'axios' 1 import axios from 'axios'
2 -import { Message,MessageBox } from 'element-ui' 2 +import { Message, MessageBox } from 'element-ui'
3 import store from '@/store' 3 import store from '@/store'
4 -import { getToken,setToken } from '@/utils/auth' 4 +import { getToken, setToken } from '@/utils/auth'
5 import errorCode from '@/utils/errorCode' 5 import errorCode from '@/utils/errorCode'
6 +import settings from "@/settings"
6 7
7 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' 8 axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8'
8 // 创建axios实例 9 // 创建axios实例
9 const service = axios.create({ 10 const service = axios.create({
10 // axios中请求配置有baseURL选项，表示请求URL公共部分 11 // axios中请求配置有baseURL选项，表示请求URL公共部分
11 - //baseURL: process.env.VUE_APP_BASE_API, 12 + baseURL: settings.baseURL,
12 - // baseURL: `http://47.103.140.98:7001/iMAC`,
13 - baseURL: 'https://imacuat.zmd.apac.fedex.com/iMAC',
14 - // baseURL: 'http://192.168.1.133:7001/iMAC',
15 - // baseURL: 'http://192.168.1.133:7001/iMAC',//生产
16 13
17 // 超时 14 // 超时
18 timeout: 30000, 15 timeout: 30000,
...@@ -54,7 +51,7 @@ service.interceptors.request.use(config => { ...@@ -54,7 +51,7 @@ service.interceptors.request.use(config => {
54 51
55 // 响应拦截器 52 // 响应拦截器
56 service.interceptors.response.use(res => { 53 service.interceptors.response.use(res => {
57 - if(res.headers['token']){ 54 + if (res.headers['token']) {
58 setToken(decodeURIComponent(res.headers['token'])) 55 setToken(decodeURIComponent(res.headers['token']))
59 } 56 }
60 // 未设置状态码则默认成功状态 57 // 未设置状态码则默认成功状态
...@@ -69,8 +66,7 @@ service.interceptors.response.use(res => { ...@@ -69,8 +66,7 @@ service.interceptors.response.use(res => {
69 ).then(() => { 66 ).then(() => {
70 store.dispatch('LogOut').then(() => { 67 store.dispatch('LogOut').then(() => {
71 // location.href = '/'; 68 // location.href = '/';
72 - window.location.href = "https://test-myapps.secure.fedex.com/purpleid/signout/";//wsso系统跳转 69 + window.location.href = settings.logoutURL;//wsso系统跳转
73 - // testsso.ute.apac.fedex.com/iMAC
74 }) 70 })
75 }); 71 });
76 } else if (code === 403) { 72 } else if (code === 403) {
......
1 import axios from 'axios' 1 import axios from 'axios'
2 import { getToken } from '@/utils/auth' 2 import { getToken } from '@/utils/auth'
3 +import settings from "@/settings"
3 4
4 const mimeMap = { 5 const mimeMap = {
5 xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 6 xlsx: 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet',
6 zip: 'application/zip' 7 zip: 'application/zip'
7 } 8 }
8 -const baseUrl = 'https://imacuat.zmd.apac.fedex.com/iMAC' //uat服务器 9 +const baseUrl = settings.downLoadURL //uat服务器
9 -// const baseUrl = 'http://47.103.140.98:7001/iMAC' //阿里云服务器
10 -// const baseUrl = 'http://192.168.1.133:7001/iMAC' //测试服务器
11 -// const baseUrl = 'http://192.168.1.133:7001/iMAC' //生产
12 10
13 export function downLoadZip(str, filename) { 11 export function downLoadZip(str, filename) {
14 var url = baseUrl + str 12 var url = baseUrl + str
...@@ -27,7 +25,7 @@ export function downLoadZip(str, filename) { ...@@ -27,7 +25,7 @@ export function downLoadZip(str, filename) {
27 * @param {*} res blob响应内容 25 * @param {*} res blob响应内容
28 * @param {String} mimeType MIME类型 26 * @param {String} mimeType MIME类型
29 */ 27 */
30 - export function resolveBlob(res, mimeType) { 28 +export function resolveBlob(res, mimeType) {
31 const aLink = document.createElement('a') 29 const aLink = document.createElement('a')
32 var blob = new Blob([res], { type: mimeType }) 30 var blob = new Blob([res], { type: mimeType })
33 // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名; 31 // //从response的headers中获取filename, 后端response.setHeader("Content-disposition", "attachment; filename=xxxx.docx") 设置的文件名;
...@@ -44,33 +42,33 @@ export function downLoadZip(str, filename) { ...@@ -44,33 +42,33 @@ export function downLoadZip(str, filename) {
44 } 42 }
45 43
46 // excel导出请求 44 // excel导出请求
47 -export function downLoadXlsx(str, data,fileName) { 45 +export function downLoadXlsx(str, data, fileName) {
48 var url = baseUrl + str 46 var url = baseUrl + str
49 - return new Promise((resolve,reject)=>{ 47 + return new Promise((resolve, reject) => {
50 axios({ 48 axios({
51 method: 'post', 49 method: 'post',
52 url: url, 50 url: url,
53 data: data, 51 data: data,
54 - timeout:500000, 52 + timeout: 500000,
55 responseType: 'blob', 53 responseType: 'blob',
56 headers: { 'Authorization': decodeURIComponent(getToken()) } 54 headers: { 'Authorization': decodeURIComponent(getToken()) }
57 // headers: { 'Authorization': decodeURIComponent(getToken()) } 55 // headers: { 'Authorization': decodeURIComponent(getToken()) }
58 //uat环境token需要做url解码处理 56 //uat环境token需要做url解码处理
59 }).then(res => { 57 }).then(res => {
60 if (res.status === 200) { 58 if (res.status === 200) {
61 - downLoadExcal(res,fileName) 59 + downLoadExcal(res, fileName)
62 } 60 }
63 resolve(res) 61 resolve(res)
64 - }).catch((err)=>{ 62 + }).catch((err) => {
65 reject(err) 63 reject(err)
66 }) 64 })
67 }) 65 })
68 } 66 }
69 67
70 //excel导出下载 68 //excel导出下载
71 -export function downLoadExcal(val,filename) { 69 +export function downLoadExcal(val, filename) {
72 const aLink = document.createElement('a') 70 const aLink = document.createElement('a')
73 - const fileName = filename+".xlsx" 71 + const fileName = filename + ".xlsx"
74 aLink.href = URL.createObjectURL(val.data) 72 aLink.href = URL.createObjectURL(val.data)
75 aLink.setAttribute('download', fileName) // 设置下载文件名称 73 aLink.setAttribute('download', fileName) // 设置下载文件名称
76 document.body.appendChild(aLink) 74 document.body.appendChild(aLink)
...@@ -81,7 +79,7 @@ export function downLoadExcal(val,filename) { ...@@ -81,7 +79,7 @@ export function downLoadExcal(val,filename) {
81 //航班预审导出 79 //航班预审导出
82 export function cargoXlsxPre(str, data) { 80 export function cargoXlsxPre(str, data) {
83 var url = baseUrl + str 81 var url = baseUrl + str
84 - return new Promise((resolve,reject)=>{ 82 + return new Promise((resolve, reject) => {
85 axios({ 83 axios({
86 method: 'post', 84 method: 'post',
87 url: url, 85 url: url,
...@@ -93,7 +91,7 @@ export function cargoXlsxPre(str, data) { ...@@ -93,7 +91,7 @@ export function cargoXlsxPre(str, data) {
93 cargoTableXlsxPre(res) 91 cargoTableXlsxPre(res)
94 } 92 }
95 resolve() 93 resolve()
96 - }).catch((err)=>{ 94 + }).catch((err) => {
97 reject(err) 95 reject(err)
98 }) 96 })
99 }) 97 })
......
1 <template> 1 <template>
2 <div class="cargoAllocation"> 2 <div class="cargoAllocation">
3 - <el-form 3 + <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small">
4 - ref="form"
5 - v-model="formData"
6 - class="form-header"
7 - label-position="right"
8 - label-width="auto"
9 - size="small"
10 - >
11 <el-row type="flex" style="flexWrap: wrap !important"> 4 <el-row type="flex" style="flexWrap: wrap !important">
12 <el-col :span="6"> 5 <el-col :span="6">
13 <el-form-item label="ACCS原航班日期"> 6 <el-form-item label="ACCS原航班日期">
14 - <el-date-picker 7 + <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
15 - class="formItem" 8 + end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
16 - type="daterange"
17 - range-separator="至"
18 - start-placeholder="开始日期"
19 - end-placeholder="结束日期"
20 - v-model="fltDate"
21 - :value-format="valueFormat"
22 - clearable
23 - >
24 </el-date-picker> 9 </el-date-picker>
25 </el-form-item> 10 </el-form-item>
26 </el-col> 11 </el-col>
27 <el-col :span="6"> 12 <el-col :span="6">
28 <el-form-item label="ACCS原航班号"> 13 <el-form-item label="ACCS原航班号">
29 - <el-input 14 + <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable></el-input>
30 - v-model="fltNo"
31 - placeholder="请输入ACCS原航班号"
32 - class="formItem"
33 - clearable
34 - ></el-input>
35 </el-form-item> 15 </el-form-item>
36 </el-col> 16 </el-col>
37 <el-col :span="6"> 17 <el-col :span="6">
38 <el-form-item label="海关回执状态"> 18 <el-form-item label="海关回执状态">
39 - <el-select 19 + <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
40 - placeholder="不限" 20 + <el-option v-for="item in selectData.findConditionData
41 - v-model="formData.customsReceiptStatusId" 21 + .cargoCustomsReturnStatus" :label="item.chineseName" :value="item.id" :key="item.id">
42 - class="formItem"
43 - multiple
44 - clearable
45 - >
46 - <el-option
47 - v-for="item in selectData.findConditionData
48 - .cargoCustomsReturnStatus"
49 - :label="item.chineseName"
50 - :value="item.id"
51 - :key="item.id"
52 - >
53 </el-option> 22 </el-option>
54 </el-select> 23 </el-select>
55 </el-form-item> 24 </el-form-item>
56 </el-col> 25 </el-col>
57 <el-col :span="6"> 26 <el-col :span="6">
58 <el-form-item label="货物状态"> 27 <el-form-item label="货物状态">
59 - <el-select 28 + <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
60 - placeholder="不限" 29 + <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
61 - v-model="formData.statusId" 30 + :value="item.id" :key="item.id">
62 - class="formItem" 31 + </el-option>
63 - clearable 32 + </el-select>
64 - > 33 + </el-form-item>
65 - <el-option 34 + </el-col>
66 - v-for="item in selectData.findConditionData.cargoStatus" 35 + <el-col :span="6">
67 - :label="item.chineseName" 36 + <el-form-item label="ACCSpool">
68 - :value="item.id" 37 + <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
69 - :key="item.id" 38 + <el-option value="Pre-MDE" key="Pre-MDE">
70 - > 39 + </el-option>
40 + <el-option value="OSPR" key="OSPR">
41 + </el-option>
42 + <el-option value="Manifest" key="Manifest">
71 </el-option> 43 </el-option>
72 </el-select> 44 </el-select>
73 </el-form-item> 45 </el-form-item>
74 </el-col> 46 </el-col>
75 <el-col :span="6"> 47 <el-col :span="6">
76 <el-form-item label="运单号"> 48 <el-form-item label="运单号">
77 - <el-input 49 + <el-input class="formItem" type="textarea" placeholder="请输入运单号（回车分割）" :rows="1" :maxlength="12000"
78 - class="formItem" 50 + v-model="formData.waybillNo" clearable></el-input>
79 - type="textarea"
80 - placeholder="请输入运单号（回车分割）"
81 - :autosize="true"
82 - v-model="formData.waybillNo"
83 - clearable
84 - ></el-input>
85 </el-form-item> 51 </el-form-item>
86 </el-col> 52 </el-col>
87 <el-col :span="6"> 53 <el-col :span="6">
88 <el-form-item label="申报类别"> 54 <el-form-item label="申报类别">
89 - <el-select 55 + <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
90 - placeholder="不限" 56 + <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
91 - v-model="formData.typeId" 57 + :value="item.id" :key="item.id">
92 - class="formItem"
93 - clearable
94 - >
95 - <el-option
96 - v-for="item in selectData.findConditionData.cargoType"
97 - :label="item.chineseName"
98 - :value="item.id"
99 - :key="item.id"
100 - >
101 </el-option> 58 </el-option>
102 </el-select> 59 </el-select>
103 </el-form-item> 60 </el-form-item>
104 </el-col> 61 </el-col>
105 <el-col :span="6"> 62 <el-col :span="6">
106 <el-form-item label="服务类型"> 63 <el-form-item label="服务类型">
107 - <el-select 64 + <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
108 - placeholder="不限" 65 + <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
109 - v-model="formData.serviceTypeId" 66 + :value="item.id" :key="item.id">
110 - class="formItem"
111 - clearable
112 - >
113 - <el-option
114 - v-for="item in selectData.findConditionData.cargoServiceType"
115 - :label="item.chineseName"
116 - :value="item.id"
117 - :key="item.id"
118 - >
119 </el-option> 67 </el-option>
120 </el-select> 68 </el-select>
121 </el-form-item> 69 </el-form-item>
122 </el-col> 70 </el-col>
123 <el-col :span="6"> 71 <el-col :span="6">
124 <el-form-item label="URSA"> 72 <el-form-item label="URSA">
125 - <el-input 73 + <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
126 - class="formItem" 74 + </el-input>
127 - type="textarea"
128 - placeholder="S_;P_;E2"
129 - v-model="ursa"
130 - :autosize="true"
131 - clearable
132 - ></el-input>
133 </el-form-item> 75 </el-form-item>
134 </el-col> 76 </el-col>
135 <el-col :span="6"> 77 <el-col :span="6">
136 <el-form-item label="站点"> 78 <el-form-item label="站点">
137 - <el-input 79 + <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
138 - class="formItem" 80 + </el-input>
139 - type="textarea"
140 - placeholder="PVG;PEK"
141 - v-model="siteName"
142 - :autosize="true"
143 - clearable
144 - ></el-input>
145 </el-form-item> 81 </el-form-item>
146 </el-col> 82 </el-col>
147 <el-col :span="6"> 83 <el-col :span="6">
148 <el-form-item label="重量区间"> 84 <el-form-item label="重量区间">
149 <el-row> 85 <el-row>
150 - <el-col :span="11" 86 + <el-col :span="11">
151 - ><el-input-number 87 + <el-input-number class="formItem" size="mini" v-model="formData.minWeight" :controls="false" :min="0"
152 - class="formItem" 88 + :precision="2" clearable></el-input-number>
153 - size="mini" 89 + </el-col>
154 - v-model="formData.minWeight"
155 - :controls="false"
156 - :min="0"
157 - :precision="2"
158 - ></el-input-number
159 - ></el-col>
160 <el-col class="line" :span="2">-</el-col> 90 <el-col class="line" :span="2">-</el-col>
161 - <el-col :span="11" 91 + <el-col :span="11">
162 - ><el-input-number 92 + <el-input-number class="formItem" size="mini" v-model="formData.maxWeight" :controls="false"
163 - class="formItem" 93 + :min="formData.minWeight" :precision="2" clearable></el-input-number>
164 - size="mini" 94 + </el-col>
165 - v-model="formData.maxWeight"
166 - :controls="false"
167 - :min="formData.minWeight"
168 - :precision="2"
169 - ></el-input-number
170 - ></el-col>
171 </el-row> 95 </el-row>
172 </el-form-item> 96 </el-form-item>
173 </el-col> 97 </el-col>
174 <el-col :span="6"> 98 <el-col :span="6">
175 <el-form-item label="件数区间"> 99 <el-form-item label="件数区间">
176 <el-row> 100 <el-row>
177 - <el-col :span="11" 101 + <el-col :span="11">
178 - ><el-input-number 102 + <el-input-number class="formItem" size="mini" v-model="formData.minNumber" :controls="false" :min="0"
179 - class="formItem" 103 + clearable></el-input-number>
180 - size="mini" 104 + </el-col>
181 - v-model="formData.minNumber"
182 - :controls="false"
183 - :min="0"
184 - ></el-input-number
185 - ></el-col>
186 <el-col class="line" :span="2">-</el-col> 105 <el-col class="line" :span="2">-</el-col>
187 - <el-col :span="11" 106 + <el-col :span="11">
188 - ><el-input-number 107 + <el-input-number class="formItem" size="mini" v-model="formData.maxNumber" :controls="false"
189 - class="formItem" 108 + :min="formData.minNumber" clearable></el-input-number>
190 - size="mini" 109 + </el-col>
191 - v-model="formData.maxNumber"
192 - :controls="false"
193 - :min="formData.minNumber"
194 - ></el-input-number
195 - ></el-col>
196 </el-row> 110 </el-row>
197 </el-form-item> 111 </el-form-item>
198 </el-col> 112 </el-col>
199 <el-col :span="6"> 113 <el-col :span="6">
200 <el-form-item label="取件日期"> 114 <el-form-item label="取件日期">
201 - <el-date-picker 115 + <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
202 - class="formItem" 116 + :value-format="valueFormat" clearable>
203 - v-model="formData.pickUpDate"
204 - type="date"
205 - placeholder="选择日期"
206 - :value-format="valueFormat"
207 - clearable
208 - >
209 </el-date-picker> 117 </el-date-picker>
210 </el-form-item> 118 </el-form-item>
211 </el-col> 119 </el-col>
212 <el-col :span="24"> 120 <el-col :span="24">
213 <el-form-item label="Handling Code"> 121 <el-form-item label="Handling Code">
214 - <el-empty 122 + <el-empty description="暂无数据" v-if="
215 - description="暂无数据"
216 - v-if="
217 !selectData.HandlingCode || selectData.HandlingCode.length == 0 123 !selectData.HandlingCode || selectData.HandlingCode.length == 0
218 - " 124 + "></el-empty>
219 - ></el-empty>
220 <el-checkbox-group v-model="handingCodes" v-else> 125 <el-checkbox-group v-model="handingCodes" v-else>
221 - <el-checkbox 126 + <el-checkbox v-for="item in selectData.HandlingCode" :label="item.chineseName" v-model="item.englishName"
222 - v-for="item in selectData.HandlingCode" 127 + :key="item.id"></el-checkbox>
223 - :label="item.chineseName"
224 - v-model="item.englishName"
225 - :key="item.id"
226 - ></el-checkbox>
227 </el-checkbox-group> 128 </el-checkbox-group>
228 </el-form-item> 129 </el-form-item>
229 </el-col> 130 </el-col>
230 <el-col :span="24"> 131 <el-col :span="24">
231 <el-form-item label="Sub Category"> 132 <el-form-item label="Sub Category">
232 - <el-empty 133 + <el-empty description="暂无数据" v-if="
233 - description="暂无数据"
234 - v-if="
235 !selectData.SubCategory || selectData.SubCategory.length == 0 134 !selectData.SubCategory || selectData.SubCategory.length == 0
236 - " 135 + "></el-empty>
237 - ></el-empty>
238 <el-checkbox-group v-model="subCategorys" v-else> 136 <el-checkbox-group v-model="subCategorys" v-else>
239 - <el-checkbox 137 + <el-checkbox v-for="item in selectData.SubCategory" :label="item.chineseName" v-model="item.englishName"
240 - v-for="item in selectData.SubCategory" 138 + :key="item.id"></el-checkbox>
241 - :label="item.chineseName"
242 - v-model="item.englishName"
243 - :key="item.id"
244 - ></el-checkbox>
245 </el-checkbox-group> 139 </el-checkbox-group>
246 </el-form-item> 140 </el-form-item>
247 </el-col> 141 </el-col>
248 </el-row> 142 </el-row>
249 <div style="margin: 0 0 0 10px"> 143 <div style="margin: 0 0 0 10px">
250 - <el-button 144 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="select(0)">查询</el-button>
251 - type="primary" 145 + <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
252 - icon="el-icon-search" 146 + v-hasPermi="['allocation:cargo:export']" @click="xlsx(0)" :loading="downLoadingTip.downloading"
253 - size="mini" 147 + :disabled="tableData.length <= 0">{{
254 - :loading="loading"
255 - @click="select(0)"
256 - >查询</el-button
257 - >
258 - <el-button
259 - :type="downLoadingTip.downloading ? 'warning' : 'primary'"
260 - size="mini"
261 - v-hasPermi="['allocation:cargo:export']"
262 - @click="xlsx(0)"
263 - :loading="downLoadingTip.downloading"
264 - :disabled="tableData.length <= 0"
265 - >{{
266 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果" 148 downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
267 - }}</el-button 149 + }}</el-button>
268 - > 150 + <el-button :type="downLoadingTip.downloading ? 'warning' : 'primary'" size="mini"
269 - <el-button 151 + v-hasPermi="['allocation:cargo:export']" @click="xlsx(1)" :loading="downLoadingTip.downloading"
270 - :type="downLoadingTip.downloading ? 'warning' : 'primary'" 152 + :disabled="tableData.length <= 0">{{
271 - size="mini"
272 - v-hasPermi="['allocation:cargo:export']"
273 - @click="xlsx(1)"
274 - :loading="downLoadingTip.downloading"
275 - :disabled="tableData.length <= 0"
276 - >{{
277 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果" 153 downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
278 - }}</el-button 154 + }}</el-button>
279 - > 155 + <el-button type="primary" size="mini" v-hasPermi="['allocation:cargo:allocation']" @click="addFit"
280 - <el-button 156 + :disabled="tableSelection.length <= 0">添加到航班</el-button>
281 - type="primary"
282 - size="mini"
283 - v-hasPermi="['allocation:cargo:allocation']"
284 - @click="addFit"
285 - :disabled="tableSelection.length <= 0"
286 - >添加到航班</el-button
287 - >
288 <div class="tips"> 157 <div class="tips">
289 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 158 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
290 <span>总件数:{{ allQty }}</span> 159 <span>总件数:{{ allQty }}</span>
291 </div> 160 </div>
292 </div> 161 </div>
293 </el-form> 162 </el-form>
294 - <Tables 163 + <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :totalCount="totalCount"
295 - ref="newTables" 164 + :loading="loading" :selection="true" :limitSize="size" :limitStart="formData.limitStart" :page="page"
296 - :data="tableData" 165 + :shiftKey="shiftKey" :height="tableHeight" :pageSizes="[100]" @sizeChange="sizeChange" @tableSelect="tableSelect"
297 - :headerData="tableHeader" 166 + @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"></Tables>
298 - :totalCount="totalCount" 167 + <Dialog :tableData="tableSelection" :dialogVisible="dialogVisible" @dialogBeforeClose="dialogBeforeClose"></Dialog>
299 - :loading="loading"
300 - :limitSize="size"
301 - :limitStart="formData.limitStart"
302 - :page="page"
303 - :shiftKey="shiftKey"
304 - :infoShow="false"
305 - :height="tableHeight"
306 - @tableSelect="tableSelect"
307 - @tableSelectAll="tableSelectAll"
308 - @currentChange="currentChange"
309 - @sortChange="sortChange"
310 - ></Tables>
311 - <Dialog
312 - :tableData="tableSelection"
313 - :dialogVisible="dialogVisible"
314 - @dialogBeforeClose="dialogBeforeClose"
315 - ></Dialog>
316 </div> 168 </div>
317 </template> 169 </template>
318 170
...@@ -350,447 +202,386 @@ export default { ...@@ -350,447 +202,386 @@ export default {
350 handingCodes: null, 202 handingCodes: null,
351 subCategorys: null, 203 subCategorys: null,
352 customsReceiptStatusId: null, 204 customsReceiptStatusId: null,
205 + accsPool: "OSPR"
353 }, //查询数据 206 }, //查询数据
354 tableHeader: [ 207 tableHeader: [
355 { 208 {
356 - type: "selection",
357 - name: "",
358 - value: "",
359 - width: "50",
360 - align: "center",
361 - sorTable: false,
362 - fixed: true,
363 - disabled:true
364 - },
365 - {
366 - type: "index",
367 - name: "",
368 - value: "",
369 - width: "50",
370 - align: "center",
371 - sorTable: false,
372 - fixed: false,
373 - disabled:true
374 - },
375 - {
376 - type: "",
377 name: "口岸代码", 209 name: "口岸代码",
378 value: "portName", 210 value: "portName",
379 width: "100", 211 width: "100",
380 align: "center", 212 align: "center",
381 sorTable: true, 213 sorTable: true,
382 fixed: false, 214 fixed: false,
383 - disabled:true 215 + disabled: true
384 }, 216 },
385 { 217 {
386 - type: "",
387 name: "取件日期", 218 name: "取件日期",
388 value: "pickUpDate", 219 value: "pickUpDate",
389 width: "120", 220 width: "120",
390 align: "center", 221 align: "center",
391 sorTable: true, 222 sorTable: true,
392 fixed: false, 223 fixed: false,
393 - disabled:true 224 + disabled: true
394 }, 225 },
395 { 226 {
396 - type: "",
397 name: "取件扫描号", 227 name: "取件扫描号",
398 value: "pickUpScanNo", 228 value: "pickUpScanNo",
399 width: "120", 229 width: "120",
400 align: "center", 230 align: "center",
401 sorTable: true, 231 sorTable: true,
402 fixed: false, 232 fixed: false,
403 - disabled:true 233 + disabled: true
404 }, 234 },
405 { 235 {
406 - type: "",
407 name: "站点", 236 name: "站点",
408 value: "siteName", 237 value: "siteName",
409 width: "80", 238 width: "80",
410 align: "center", 239 align: "center",
411 sorTable: true, 240 sorTable: true,
412 fixed: false, 241 fixed: false,
413 - disabled:true 242 + disabled: true
414 }, 243 },
415 { 244 {
416 - type: "",
417 name: "运单号", 245 name: "运单号",
418 value: "waybillNo", 246 value: "waybillNo",
419 width: "120", 247 width: "120",
420 align: "center", 248 align: "center",
421 sorTable: true, 249 sorTable: true,
422 fixed: false, 250 fixed: false,
423 - disabled:true 251 + disabled: true
424 }, 252 },
425 { 253 {
426 - type: "",
427 name: "总单号", 254 name: "总单号",
428 value: "totalWaybillNo", 255 value: "totalWaybillNo",
429 width: "120", 256 width: "120",
430 align: "center", 257 align: "center",
431 sorTable: true, 258 sorTable: true,
432 fixed: false, 259 fixed: false,
433 - disabled:true 260 + disabled: true
434 }, 261 },
435 { 262 {
436 - type: "",
437 name: "服务类型", 263 name: "服务类型",
438 value: "serviceTypeName", 264 value: "serviceTypeName",
439 width: "100", 265 width: "100",
440 align: "center", 266 align: "center",
441 sorTable: true, 267 sorTable: true,
442 fixed: false, 268 fixed: false,
443 - disabled:true 269 + disabled: true
444 }, 270 },
445 { 271 {
446 - type: "",
447 name: "服务代码", 272 name: "服务代码",
448 value: "serviceCode", 273 value: "serviceCode",
449 width: "100", 274 width: "100",
450 align: "center", 275 align: "center",
451 sorTable: false, 276 sorTable: false,
452 fixed: false, 277 fixed: false,
453 - disabled:true 278 + disabled: true
454 }, 279 },
455 { 280 {
456 - type: "",
457 name: "URSA", 281 name: "URSA",
458 value: "ursa", 282 value: "ursa",
459 width: "100", 283 width: "100",
460 align: "center", 284 align: "center",
461 sorTable: true, 285 sorTable: true,
462 fixed: false, 286 fixed: false,
463 - disabled:true 287 + disabled: true
464 }, 288 },
465 { 289 {
466 - type: "",
467 name: "申报类型", 290 name: "申报类型",
468 value: "typeName", 291 value: "typeName",
469 width: "100", 292 width: "100",
470 align: "center", 293 align: "center",
471 sorTable: true, 294 sorTable: true,
472 fixed: false, 295 fixed: false,
473 - disabled:true 296 + disabled: true
474 }, 297 },
475 { 298 {
476 - type: "",
477 name: "HandlingCode", 299 name: "HandlingCode",
478 value: "handingCode", 300 value: "handingCode",
479 width: "150", 301 width: "150",
480 align: "center", 302 align: "center",
481 sorTable: true, 303 sorTable: true,
482 fixed: false, 304 fixed: false,
483 - disabled:true 305 + disabled: true
484 }, 306 },
485 { 307 {
486 - type: "",
487 name: "subcategory", 308 name: "subcategory",
488 value: "subCategory", 309 value: "subCategory",
489 width: "140", 310 width: "140",
490 align: "center", 311 align: "center",
491 sorTable: true, 312 sorTable: true,
492 fixed: false, 313 fixed: false,
493 - disabled:true 314 + disabled: true
494 }, 315 },
495 { 316 {
496 - type: "",
497 name: "件数", 317 name: "件数",
498 value: "qty", 318 value: "qty",
499 width: "80", 319 width: "80",
500 align: "center", 320 align: "center",
501 sorTable: true, 321 sorTable: true,
502 fixed: false, 322 fixed: false,
503 - disabled:true 323 + disabled: true
504 }, 324 },
505 { 325 {
506 - type: "",
507 name: "实际重量", 326 name: "实际重量",
508 value: "actualWeight", 327 value: "actualWeight",
509 width: "100", 328 width: "100",
510 align: "center", 329 align: "center",
511 sorTable: true, 330 sorTable: true,
512 fixed: false, 331 fixed: false,
513 - disabled:true 332 + disabled: true
514 }, 333 },
515 { 334 {
516 - type: "",
517 name: "收件人国家代码", 335 name: "收件人国家代码",
518 value: "consigneeCountry", 336 value: "consigneeCountry",
519 width: "150", 337 width: "150",
520 align: "center", 338 align: "center",
521 sorTable: true, 339 sorTable: true,
522 fixed: false, 340 fixed: false,
523 - disabled:true 341 + disabled: true
524 }, 342 },
525 { 343 {
526 - type: "",
527 name: "品名描述", 344 name: "品名描述",
528 value: "nameDescription", 345 value: "nameDescription",
529 width: "100", 346 width: "100",
530 align: "center", 347 align: "center",
531 sorTable: false, 348 sorTable: false,
532 fixed: false, 349 fixed: false,
533 - disabled:true 350 + disabled: true
534 }, 351 },
535 { 352 {
536 - type: "",
537 name: "海关回执状态", 353 name: "海关回执状态",
538 value: "customsReceiptStatusName", 354 value: "customsReceiptStatusName",
539 width: "140", 355 width: "140",
540 align: "center", 356 align: "center",
541 sorTable: true, 357 sorTable: true,
542 fixed: false, 358 fixed: false,
543 - disabled:true 359 + disabled: true
544 }, 360 },
545 { 361 {
546 - type: "",
547 name: "预审状态", 362 name: "预审状态",
548 value: "preQualificationStatus", 363 value: "preQualificationStatus",
549 width: "100", 364 width: "100",
550 align: "center", 365 align: "center",
551 sorTable: true, 366 sorTable: true,
552 fixed: false, 367 fixed: false,
553 - disabled:true 368 + disabled: true
554 }, 369 },
555 { 370 {
556 - type: "",
557 name: "航班预审意见", 371 name: "航班预审意见",
558 value: "caPretrialOpinion", 372 value: "caPretrialOpinion",
559 width: "120", 373 width: "120",
560 align: "center", 374 align: "center",
561 sorTable: false, 375 sorTable: false,
562 fixed: false, 376 fixed: false,
563 - disabled:true 377 + disabled: true
564 }, 378 },
565 { 379 {
566 - type: "",
567 name: "货物状态", 380 name: "货物状态",
568 value: "statusName", 381 value: "statusName",
569 width: "100", 382 width: "100",
570 align: "center", 383 align: "center",
571 sorTable: true, 384 sorTable: true,
572 fixed: false, 385 fixed: false,
573 - disabled:true 386 + disabled: true
574 }, 387 },
575 { 388 {
576 - type: "",
577 name: "终配航班号", 389 name: "终配航班号",
578 value: "finalFlightNo", 390 value: "finalFlightNo",
579 width: "120", 391 width: "120",
580 align: "center", 392 align: "center",
581 sorTable: true, 393 sorTable: true,
582 fixed: false, 394 fixed: false,
583 - disabled:true 395 + disabled: true
584 }, 396 },
585 { 397 {
586 - type: "",
587 name: "终配航班日期", 398 name: "终配航班日期",
588 value: "finalFlightTime", 399 value: "finalFlightTime",
589 width: "140", 400 width: "140",
590 align: "center", 401 align: "center",
591 sorTable: true, 402 sorTable: true,
592 fixed: false, 403 fixed: false,
593 - disabled:true 404 + disabled: true
594 }, 405 },
595 { 406 {
596 - type: "",
597 name: "二配航班号", 407 name: "二配航班号",
598 value: "twoMatchFlightNo", 408 value: "twoMatchFlightNo",
599 width: "120", 409 width: "120",
600 align: "center", 410 align: "center",
601 sorTable: true, 411 sorTable: true,
602 fixed: false, 412 fixed: false,
603 - disabled:true 413 + disabled: true
604 }, 414 },
605 { 415 {
606 - type: "",
607 name: "二配航班日期", 416 name: "二配航班日期",
608 value: "twoMatchFlightTime", 417 value: "twoMatchFlightTime",
609 width: "150", 418 width: "150",
610 align: "center", 419 align: "center",
611 sorTable: true, 420 sorTable: true,
612 fixed: false, 421 fixed: false,
613 - disabled:true 422 + disabled: true
614 }, 423 },
615 { 424 {
616 - type: "",
617 name: "预配航班号", 425 name: "预配航班号",
618 value: "preplanFlightNo", 426 value: "preplanFlightNo",
619 width: "120", 427 width: "120",
620 align: "center", 428 align: "center",
621 sorTable: true, 429 sorTable: true,
622 fixed: false, 430 fixed: false,
623 - disabled:true 431 + disabled: true
624 }, 432 },
625 { 433 {
626 - type: "",
627 name: "预配航班日期", 434 name: "预配航班日期",
628 value: "preplanFlightTime", 435 value: "preplanFlightTime",
629 width: "150", 436 width: "150",
630 align: "center", 437 align: "center",
631 sorTable: true, 438 sorTable: true,
632 fixed: false, 439 fixed: false,
633 - disabled:true 440 + disabled: true
634 }, 441 },
635 { 442 {
636 - type: "",
637 name: "ACCS原航班号", 443 name: "ACCS原航班号",
638 value: "fltNoAccs", 444 value: "fltNoAccs",
639 width: "150", 445 width: "150",
640 align: "center", 446 align: "center",
641 sorTable: true, 447 sorTable: true,
642 fixed: false, 448 fixed: false,
643 - disabled:true 449 + disabled: true
644 }, 450 },
645 { 451 {
646 - type: "",
647 name: "ACCS原航班日期", 452 name: "ACCS原航班日期",
648 value: "fltDateAccs", 453 value: "fltDateAccs",
649 width: "150", 454 width: "150",
650 align: "center", 455 align: "center",
651 sorTable: true, 456 sorTable: true,
652 fixed: false, 457 fixed: false,
653 - disabled:true 458 + disabled: true
654 }, 459 },
655 { 460 {
656 - type: "",
657 name: "ACCS原航线", 461 name: "ACCS原航线",
658 value: "accsFlightRoute", 462 value: "accsFlightRoute",
659 width: "140", 463 width: "140",
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 - type: "",
667 name: "是否RDE手工录入", 470 name: "是否RDE手工录入",
668 value: "manualRde", 471 value: "manualRde",
669 width: "170", 472 width: "170",
670 align: "center", 473 align: "center",
671 sorTable: true, 474 sorTable: true,
672 fixed: false, 475 fixed: false,
673 - disabled:true 476 + disabled: true
674 }, 477 },
675 { 478 {
676 - type: "",
677 name: "是否自动", 479 name: "是否自动",
678 value: "cargoRulesStatus", 480 value: "cargoRulesStatus",
679 width: "100", 481 width: "100",
680 align: "center", 482 align: "center",
681 sorTable: true, 483 sorTable: true,
682 fixed: false, 484 fixed: false,
683 - disabled:true 485 + disabled: true
684 }, 486 },
685 { 487 {
686 - type: "",
687 name: "发件人账号", 488 name: "发件人账号",
688 value: "shipperAccount", 489 value: "shipperAccount",
689 width: "120", 490 width: "120",
690 align: "center", 491 align: "center",
691 sorTable: false, 492 sorTable: false,
692 fixed: false, 493 fixed: false,
693 - disabled:true 494 + disabled: true
694 }, 495 },
695 { 496 {
696 - type: "",
697 name: "发件公司中文名称", 497 name: "发件公司中文名称",
698 value: "shipperCompany", 498 value: "shipperCompany",
699 width: "150", 499 width: "150",
700 align: "center", 500 align: "center",
701 sorTable: false, 501 sorTable: false,
702 fixed: false, 502 fixed: false,
703 - disabled:true 503 + disabled: true
704 }, 504 },
705 { 505 {
706 - type: "",
707 name: "始发地城市名称", 506 name: "始发地城市名称",
708 value: "originCity", 507 value: "originCity",
709 width: "130", 508 width: "130",
710 align: "center", 509 align: "center",
711 sorTable: false, 510 sorTable: false,
712 fixed: false, 511 fixed: false,
713 - disabled:true 512 + disabled: true
714 }, 513 },
715 { 514 {
716 - type: "",
717 name: "收件地", 515 name: "收件地",
718 value: "destinationSiteName", 516 value: "destinationSiteName",
719 width: "90", 517 width: "90",
720 align: "center", 518 align: "center",
721 sorTable: false, 519 sorTable: false,
722 fixed: false, 520 fixed: false,
723 - disabled:true 521 + disabled: true
724 }, 522 },
725 { 523 {
726 - type: "",
727 name: "尺寸", 524 name: "尺寸",
728 value: "sizeStr", 525 value: "sizeStr",
729 width: "80", 526 width: "80",
730 align: "center", 527 align: "center",
731 sorTable: true, 528 sorTable: true,
732 fixed: false, 529 fixed: false,
733 - disabled:true 530 + disabled: true
734 }, 531 },
735 { 532 {
736 - type: "",
737 name: "大货预审意见（是否可以配置航班）", 533 name: "大货预审意见（是否可以配置航班）",
738 value: "bigPretrialOpinion", 534 value: "bigPretrialOpinion",
739 width: "250", 535 width: "250",
740 align: "center", 536 align: "center",
741 sorTable: false, 537 sorTable: false,
742 fixed: false, 538 fixed: false,
743 - disabled:true 539 + disabled: true
744 }, 540 },
745 { 541 {
746 - type: "",
747 name: "大货预审时间", 542 name: "大货预审时间",
748 value: "bigPretrialTime", 543 value: "bigPretrialTime",
749 width: "120", 544 width: "120",
750 align: "center", 545 align: "center",
751 sorTable: false, 546 sorTable: false,
752 fixed: false, 547 fixed: false,
753 - disabled:true 548 + disabled: true
754 }, 549 },
755 { 550 {
756 - type: "",
757 name: "海关回执时间", 551 name: "海关回执时间",
758 value: "customsReceiptTime", 552 value: "customsReceiptTime",
759 width: "150", 553 width: "150",
760 align: "center", 554 align: "center",
761 sorTable: true, 555 sorTable: true,
762 fixed: false, 556 fixed: false,
763 - disabled:true 557 + disabled: true
764 }, 558 },
765 { 559 {
766 - type: "",
767 name: "航班预审时间", 560 name: "航班预审时间",
768 value: "caPretrialTime", 561 value: "caPretrialTime",
769 width: "150", 562 width: "150",
770 align: "center", 563 align: "center",
771 sorTable: true, 564 sorTable: true,
772 fixed: false, 565 fixed: false,
773 - disabled:true 566 + disabled: true
774 }, 567 },
775 { 568 {
776 - type: "",
777 name: "创建人", 569 name: "创建人",
778 value: "createUserName", 570 value: "createUserName",
779 width: "90", 571 width: "90",
780 align: "center", 572 align: "center",
781 sorTable: true, 573 sorTable: true,
782 fixed: false, 574 fixed: false,
783 - disabled:true 575 + disabled: true
784 }, 576 },
785 { 577 {
786 - type: "",
787 name: "创建时间", 578 name: "创建时间",
788 value: "createTime", 579 value: "createTime",
789 width: "100", 580 width: "100",
790 align: "center", 581 align: "center",
791 sorTable: true, 582 sorTable: true,
792 fixed: false, 583 fixed: false,
793 - disabled:true 584 + disabled: true
794 }, 585 },
795 ], //表头数据 586 ], //表头数据
796 tableData: [], //表格数据 587 tableData: [], //表格数据
...@@ -812,7 +603,7 @@ export default { ...@@ -812,7 +603,7 @@ export default {
812 size: 100, 603 size: 100,
813 allWeight: 0, 604 allWeight: 0,
814 allQty: 0, 605 allQty: 0,
815 - tableHeight:null, 606 + tableHeight: null,
816 dialogVisible: false, 607 dialogVisible: false,
817 shiftKey: false, 608 shiftKey: false,
818 createDate: null, 609 createDate: null,
...@@ -825,13 +616,16 @@ export default { ...@@ -825,13 +616,16 @@ export default {
825 }, 616 },
826 created() { 617 created() {
827 this.seleData(); 618 this.seleData();
828 - if(this.$store.state.tagsView.cachedViews.length == 0){ 619 + if (this.$store.state.tagsView.cachedViews.length == 0) {
829 this.select(); 620 this.select();
830 } 621 }
831 }, 622 },
832 - activated(){ 623 + activated() {
833 this.select(); 624 this.select();
834 }, 625 },
626 + deactivated() {
627 + this.tableData = []
628 + },
835 mounted() { 629 mounted() {
836 window.addEventListener("keydown", (code) => { 630 window.addEventListener("keydown", (code) => {
837 if (code.keyCode === 16 && code.shiftKey) { 631 if (code.keyCode === 16 && code.shiftKey) {
...@@ -843,7 +637,7 @@ export default { ...@@ -843,7 +637,7 @@ export default {
843 this.shiftKey = false; 637 this.shiftKey = false;
844 } 638 }
845 }); 639 });
846 - this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight-60 640 + this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60
847 }, 641 },
848 methods: { 642 methods: {
849 //查询条件 643 //查询条件
...@@ -853,33 +647,33 @@ export default { ...@@ -853,33 +647,33 @@ export default {
853 if (res.code === 200) { 647 if (res.code === 200) {
854 this.selectData.HandlingCode = res.data.handlingCode; 648 this.selectData.HandlingCode = res.data.handlingCode;
855 this.selectData.SubCategory = res.data.subCategory; 649 this.selectData.SubCategory = res.data.subCategory;
856 - }else{ 650 + } else {
857 this.$message({ 651 this.$message({
858 message: "查询条件不存在", 652 message: "查询条件不存在",
859 type: "warning", 653 type: "warning",
860 }); 654 });
861 } 655 }
862 }) 656 })
863 - .catch(() => {}); 657 + .catch(() => { });
864 658
865 findConditionData() 659 findConditionData()
866 .then((res) => { 660 .then((res) => {
867 if (res.code == 200) { 661 if (res.code == 200) {
868 this.selectData.findConditionData = res.data; 662 this.selectData.findConditionData = res.data;
869 - }else{ 663 + } else {
870 this.$message({ 664 this.$message({
871 message: "查询条件不存在", 665 message: "查询条件不存在",
872 type: "warning", 666 type: "warning",
873 }); 667 });
874 } 668 }
875 }) 669 })
876 - .catch(() => {}); 670 + .catch(() => { });
877 }, 671 },
878 //查询 672 //查询
879 async select(val) { 673 async select(val) {
880 this.loading = true; 674 this.loading = true;
881 this.dataInfo(); 675 this.dataInfo();
882 - if(val === 0){ 676 + if (val === 0) {
883 this.page = 1; 677 this.page = 1;
884 this.formData.page = 1; 678 this.formData.page = 1;
885 } 679 }
...@@ -968,7 +762,7 @@ export default { ...@@ -968,7 +762,7 @@ export default {
968 } 762 }
969 this.formData.page = this.page; 763 this.formData.page = this.page;
970 this.formData.size = this.size; 764 this.formData.size = this.size;
971 - if(this.formData.waybillNo){ 765 + if (this.formData.waybillNo) {
972 this.formData.waybillNo = this.formData.waybillNo.trim(); 766 this.formData.waybillNo = this.formData.waybillNo.trim();
973 } 767 }
974 }, 768 },
...@@ -1029,7 +823,7 @@ export default { ...@@ -1029,7 +823,7 @@ export default {
1029 data = data.sort(this.$refs.newTables.compare(val.prop, val.order)); 823 data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
1030 if (val.order == "descending") { 824 if (val.order == "descending") {
1031 this.tableData = nullData.concat(data); 825 this.tableData = nullData.concat(data);
1032 - } else{ 826 + } else {
1033 this.tableData = data.concat(nullData); 827 this.tableData = data.concat(nullData);
1034 } 828 }
1035 this.tableSelection = [] 829 this.tableSelection = []
...@@ -1038,7 +832,7 @@ export default { ...@@ -1038,7 +832,7 @@ export default {
1038 // item.index = index; 832 // item.index = index;
1039 // }); 833 // });
1040 }, 834 },
1041 - sizeChange(val){ 835 + sizeChange(val) {
1042 this.size = val 836 this.size = val
1043 this.select(0); 837 this.select(0);
1044 }, 838 },
...@@ -1091,9 +885,6 @@ export default { ...@@ -1091,9 +885,6 @@ export default {
1091 }, 885 },
1092 }, 886 },
1093 }, 887 },
1094 - deactivated(){
1095 - this.tableData = []
1096 - },
1097 }; 888 };
1098 </script> 889 </script>
1099 890
...@@ -1105,18 +896,22 @@ export default { ...@@ -1105,18 +896,22 @@ export default {
1105 margin-top: 10px; 896 margin-top: 10px;
1106 margin-left: 50px; 897 margin-left: 50px;
1107 } 898 }
899 +
1108 .line { 900 .line {
1109 text-align: center; 901 text-align: center;
1110 } 902 }
903 +
1111 .el-empty { 904 .el-empty {
1112 width: 30%; 905 width: 30%;
1113 height: 37px; 906 height: 37px;
1114 padding: 0px; 907 padding: 0px;
1115 line-height: 37px; 908 line-height: 37px;
909 +
1116 .el-empty__image { 910 .el-empty__image {
1117 width: 0px; 911 width: 0px;
1118 height: 0px; 912 height: 0px;
1119 } 913 }
914 +
1120 .el-empty__description { 915 .el-empty__description {
1121 margin-top: 0px; 916 margin-top: 0px;
1122 } 917 }
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form 3 + <el-form :inline="true" :model="queryParams" class="form-header" size="medium" label-position="right"
4 - :inline="true" 4 + label-width="auto">
5 - :model="queryParams"
6 - class="form-header"
7 - size="medium"
8 - label-position="right"
9 - label-width="auto"
10 - >
11 <el-form-item label="航班号"> 5 <el-form-item label="航班号">
12 - <el-input 6 + <el-input v-model.trim="purposeOfFlightNo" placeholder="航班号" @keyup.enter.native="getList" clearable></el-input>
13 - v-model.trim="purposeOfFlightNo"
14 - placeholder="航班号"
15 - @keyup.enter.native="getList"
16 - clearable
17 - ></el-input>
18 </el-form-item> 7 </el-form-item>
19 <el-form-item label="状态"> 8 <el-form-item label="状态">
20 <el-select v-model="queryParams.status" placeholder="状态" clearable> 9 <el-select v-model="queryParams.status" placeholder="状态" clearable>
...@@ -23,45 +12,21 @@ ...@@ -23,45 +12,21 @@
23 </el-select> 12 </el-select>
24 </el-form-item> 13 </el-form-item>
25 <el-form-item> 14 <el-form-item>
26 - <el-button 15 + <el-button type="primary" icon="el-icon-search" @click="getList" size="mini">查询</el-button>
27 - type="primary"
28 - icon="el-icon-search"
29 - @click="getList"
30 - size="mini"
31 - >查询</el-button
32 - >
33 </el-form-item> 16 </el-form-item>
34 <div> 17 <div>
35 - <el-button 18 + <el-button style="margin-bottom: 20px" type="primary" icon="el-icon-plus" size="mini"
36 - style="margin-bottom: 20px" 19 + v-hasPermi="['allocation:alloc:add']" @click="
37 - type="primary"
38 - icon="el-icon-plus"
39 - size="mini"
40 - v-hasPermi="['allocation:alloc:add']"
41 - @click="
42 $router.push({ 20 $router.push({
43 name: 'FlightAllocConfigAdd', 21 name: 'FlightAllocConfigAdd',
44 params: { handle: 'add' }, 22 params: { handle: 'add' },
45 }) 23 })
46 - " 24 + ">添加</el-button>
47 - >添加</el-button
48 - >
49 </div> 25 </div>
50 </el-form> 26 </el-form>
51 27
52 - <el-table 28 + <el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe>
53 - :data="flyList" 29 + <el-table-column prop="purposeOfFlightNo" label="航班号" align="center"></el-table-column>
54 - v-loading="loading"
55 - size="small"
56 - highlight-current-row
57 - border
58 - stripe
59 - >
60 - <el-table-column
61 - prop="purposeOfFlightNo"
62 - label="航班号"
63 - align="center"
64 - ></el-table-column>
65 30
66 <el-table-column prop="status" label="状态" align="center"> 31 <el-table-column prop="status" label="状态" align="center">
67 <template slot-scope="scope"> 32 <template slot-scope="scope">
...@@ -80,62 +45,22 @@ ...@@ -80,62 +45,22 @@
80 45
81 <el-table-column label="操作" prop="id" align="center"> 46 <el-table-column label="操作" prop="id" align="center">
82 <template slot-scope="scope"> 47 <template slot-scope="scope">
83 - <el-button 48 + <el-button type="text" size="mini" icon="el-icon-view" @click="handleClick(scope.row.id, 'detail')">查看
84 - type="text" 49 + </el-button>
85 - size="mini" 50 + <el-button type="text" size="mini" icon="el-icon-edit" v-hasPermi="['allocation:alloc:update']"
86 - icon="el-icon-view" 51 + @click="handleClick(scope.row.id, 'update')">修改</el-button>
87 - @click="handleClick(scope.row.id, 'detail')" 52 + <el-button type="text" size="mini" icon="el-icon-delete" v-hasPermi="['allocation:alloc:delete']"
88 - >查看</el-button 53 + @click="del(scope.row.id, scope.row.status)">删除</el-button>
89 - > 54 + <el-button type="text" size="mini" icon="el-icon-video-pause" v-hasPermi="['allocation:alloc:openClose']"
90 - <el-button 55 + @click="changeStatus(scope.row.id, 3)" v-if="scope.row.status == '1'">停用</el-button>
91 - type="text" 56 + <el-button type="text" size="mini" icon="el-icon-video-play" v-hasPermi="['allocation:alloc:openClose']"
92 - size="mini" 57 + @click="changeStatus(scope.row.id, 1)" v-else>启用</el-button>
93 - icon="el-icon-edit"
94 - v-hasPermi="['allocation:alloc:update']"
95 - @click="handleClick(scope.row.id, 'update')"
96 - >修改</el-button
97 - >
98 - <el-button
99 - type="text"
100 - size="mini"
101 - icon="el-icon-delete"
102 - v-hasPermi="['allocation:alloc:delete']"
103 - @click="del(scope.row.id, scope.row.status)"
104 - >删除</el-button
105 - >
106 - <el-button
107 - type="text"
108 - size="mini"
109 - icon="el-icon-video-pause"
110 - v-hasPermi="['allocation:alloc:openClose']"
111 - @click="changeStatus(scope.row.id, 3)"
112 - v-if="scope.row.status == '1'"
113 - >停用</el-button
114 - >
115 - <el-button
116 - type="text"
117 - size="mini"
118 - icon="el-icon-video-play"
119 - v-hasPermi="['allocation:alloc:openClose']"
120 - @click="changeStatus(scope.row.id, 1)"
121 - v-else
122 - >启用</el-button
123 - >
124 </template> 58 </template>
125 </el-table-column> 59 </el-table-column>
126 </el-table> 60 </el-table>
127 - <el-pagination 61 + <el-pagination @size-change="getList" @current-change="getList" :current-page.sync="curPage"
128 - @size-change="getList" 62 + :page-sizes="[10, 20, 30, 40]" :page-size.sync="limit" layout="prev, pager, next, jumper, sizes, total"
129 - @current-change="getList" 63 + :total="total" background :hide-on-single-page="true" style="margin-top: 40px; text-align: right">
130 - :current-page.sync="curPage"
131 - :page-sizes="[10, 20, 30, 40]"
132 - :page-size.sync="limit"
133 - layout="prev, pager, next, jumper, sizes, total"
134 - :total="total"
135 - background
136 - :hide-on-single-page="true"
137 - style="margin-top: 40px; text-align: right"
138 - >
139 </el-pagination> 64 </el-pagination>
140 </div> 65 </div>
141 </template> 66 </template>
...@@ -165,14 +90,14 @@ export default { ...@@ -165,14 +90,14 @@ export default {
165 }; 90 };
166 }, 91 },
167 created() { 92 created() {
168 - if(this.$store.state.tagsView.cachedViews.length == 0){ 93 + if (this.$store.state.tagsView.cachedViews.length == 0) {
169 this.getList(); 94 this.getList();
170 } 95 }
171 }, 96 },
172 - activated(){ 97 + activated() {
173 this.getList() 98 this.getList()
174 }, 99 },
175 - deactivated(){ 100 + deactivated() {
176 this.flyList = [] 101 this.flyList = []
177 }, 102 },
178 methods: { 103 methods: {
...@@ -228,7 +153,7 @@ export default { ...@@ -228,7 +153,7 @@ export default {
228 }); 153 });
229 this.getList(); 154 this.getList();
230 }) 155 })
231 - .catch(() => {}); 156 + .catch(() => { });
232 }); 157 });
233 } 158 }
234 }, 159 },
...@@ -249,7 +174,7 @@ export default { ...@@ -249,7 +174,7 @@ export default {
249 this.msgSuccess(tip + "成功"); 174 this.msgSuccess(tip + "成功");
250 } 175 }
251 }) 176 })
252 - .catch(() => {}); 177 + .catch(() => { });
253 }); 178 });
254 }, 179 },
255 }, 180 },
......
...@@ -5,31 +5,16 @@ ...@@ -5,31 +5,16 @@
5 <el-button size="small" @click="close">返回</el-button> 5 <el-button size="small" @click="close">返回</el-button>
6 </div> 6 </div>
7 <template v-else> 7 <template v-else>
8 - <el-form 8 + <el-form ref="form" :model="form" label-width="200px" size="small" :disabled="disable" :rules="rules">
9 - ref="form"
10 - :model="form"
11 - label-width="200px"
12 - size="small"
13 - :disabled="disable"
14 - :rules="rules"
15 - >
16 <el-row :gutter="20"> 9 <el-row :gutter="20">
17 <el-col :span="12"> 10 <el-col :span="12">
18 <el-form-item label="航班号" prop="purposeOfFlightNo"> 11 <el-form-item label="航班号" prop="purposeOfFlightNo">
19 - <el-input 12 + <el-input v-model.trim="form.purposeOfFlightNo" style="width: 60%" :disabled="nameDisabled"></el-input>
20 - v-model.trim="form.purposeOfFlightNo"
21 - style="width: 60%"
22 - :disabled="nameDisabled"
23 - ></el-input>
24 </el-form-item> 13 </el-form-item>
25 </el-col> 14 </el-col>
26 <el-col :span="12"> 15 <el-col :span="12">
27 <el-form-item label="航班预审" prop="isNeedRequired"> 16 <el-form-item label="航班预审" prop="isNeedRequired">
28 - <el-switch 17 + <el-switch v-model="isNeedRequired" :active-value="1" :inactive-value="0">
29 - v-model="isNeedRequired"
30 - :active-value="1"
31 - :inactive-value="0"
32 - >
33 </el-switch> 18 </el-switch>
34 </el-form-item> 19 </el-form-item>
35 </el-col> 20 </el-col>
...@@ -37,86 +22,45 @@ ...@@ -37,86 +22,45 @@
37 <el-form-item> 22 <el-form-item>
38 <el-row :gutter="20"> 23 <el-row :gutter="20">
39 <el-col :span="6"> 24 <el-col :span="6">
40 - <el-radio v-model="isLocation" label="1" size="mini" 25 + <el-radio v-model="isLocation" label="1" size="mini">站点包含</el-radio>
41 - >站点包含</el-radio 26 + <el-radio v-model="isLocation" label="2" size="mini">站点不包含</el-radio>
42 - >
43 - <el-radio v-model="isLocation" label="2" size="mini"
44 - >站点不包含</el-radio
45 - >
46 </el-col> 27 </el-col>
47 <el-col :span="6"> 28 <el-col :span="6">
48 - <el-alert 29 + <el-alert title="提示：站点之间用回车符分隔" type="warning" show-icon size="mini" :closable="false"
49 - title="提示：站点之间用回车符分隔" 30 + style="height: 30px; width: fit-content">
50 - type="warning"
51 - show-icon
52 - size="mini"
53 - :closable="false"
54 - style="height: 30px; width: fit-content"
55 - >
56 </el-alert> 31 </el-alert>
57 </el-col> 32 </el-col>
58 </el-row> 33 </el-row>
59 </el-form-item> 34 </el-form-item>
60 35
61 <el-form-item label="站点包含" v-show="isLocation == 1"> 36 <el-form-item label="站点包含" v-show="isLocation == 1">
62 - <el-input 37 + <el-input type="textarea" v-model="form.location" :rows="6" resize="none" style="width: 600px"></el-input>
63 - type="textarea"
64 - v-model="form.location"
65 - :rows="6"
66 - resize="none"
67 - style="width: 600px"
68 - ></el-input>
69 </el-form-item> 38 </el-form-item>
70 <el-form-item label="站点不包含" v-show="isLocation == 2"> 39 <el-form-item label="站点不包含" v-show="isLocation == 2">
71 - <el-input 40 + <el-input type="textarea" v-model="form.notLocation" :rows="6" resize="none" style="width: 600px"></el-input>
72 - type="textarea"
73 - v-model="form.notLocation"
74 - :rows="6"
75 - resize="none"
76 - style="width: 600px"
77 - ></el-input>
78 </el-form-item> 41 </el-form-item>
79 42
80 <el-form-item> 43 <el-form-item>
81 - <el-alert 44 + <el-alert title="提示：URSA之间用分号分隔，例：F2;F3;P_" type="warning" show-icon size="mini" :closable="false"
82 - title="提示：URSA之间用分号分隔，例：F2;F3;P_" 45 + style="height: 30px; width: fit-content">
83 - type="warning"
84 - show-icon
85 - size="mini"
86 - :closable="false"
87 - style="height: 30px; width: fit-content"
88 - >
89 </el-alert> 46 </el-alert>
90 </el-form-item> 47 </el-form-item>
91 <el-row :gutter="20"> 48 <el-row :gutter="20">
92 <el-col :span="10"> 49 <el-col :span="10">
93 <el-form-item label="URSA包含"> 50 <el-form-item label="URSA包含">
94 - <el-input 51 + <el-input type="textarea" v-model.trim="form.includeUrsa" :rows="6" resize="none"></el-input>
95 - type="textarea"
96 - v-model.trim="form.includeUrsa"
97 - :rows="6"
98 - resize="none"
99 - ></el-input>
100 </el-form-item> 52 </el-form-item>
101 </el-col> 53 </el-col>
102 <el-col :span="10"> 54 <el-col :span="10">
103 <el-form-item label="URSA不包含"> 55 <el-form-item label="URSA不包含">
104 - <el-input 56 + <el-input type="textarea" v-model.trim="form.notIncludeUrsa" :rows="6" resize="none"></el-input>
105 - type="textarea"
106 - v-model.trim="form.notIncludeUrsa"
107 - :rows="6"
108 - resize="none"
109 - ></el-input>
110 </el-form-item> 57 </el-form-item>
111 </el-col> 58 </el-col>
112 </el-row> 59 </el-row>
113 60
114 <el-form-item label="件数"> 61 <el-form-item label="件数">
115 <el-col :span="3"> 62 <el-col :span="3">
116 - <el-input 63 + <el-input class="numberInput" v-model.trim="minNumOfPieces"></el-input>
117 - class="numberInput"
118 - v-model.trim="minNumOfPieces"
119 - ></el-input>
120 <!-- <el-input-number 64 <!-- <el-input-number
121 v-model="minNumOfPieces" 65 v-model="minNumOfPieces"
122 :precision="0" 66 :precision="0"
...@@ -126,10 +70,7 @@ ...@@ -126,10 +70,7 @@
126 </el-col> 70 </el-col>
127 <el-col style="text-align: center" :span="1">-</el-col> 71 <el-col style="text-align: center" :span="1">-</el-col>
128 <el-col :span="3"> 72 <el-col :span="3">
129 - <el-input 73 + <el-input class="numberInput" v-model.trim="maxNumOfPieces"></el-input>
130 - class="numberInput"
131 - v-model.trim="maxNumOfPieces"
132 - ></el-input>
133 <!-- <el-input-number 74 <!-- <el-input-number
134 v-model=" 75 v-model="
135 form.maxNumOfPieces == 0 76 form.maxNumOfPieces == 0
...@@ -180,10 +121,7 @@ ...@@ -180,10 +121,7 @@
180 <el-checkbox-group v-model="form.typeOfGoods"> 121 <el-checkbox-group v-model="form.typeOfGoods">
181 <el-row> 122 <el-row>
182 <el-col :span="2" v-for="item in cargoType" :key="item.id"> 123 <el-col :span="2" v-for="item in cargoType" :key="item.id">
183 - <el-checkbox 124 + <el-checkbox :label="item.chineseName" :name="item.chineseName">
184 - :label="item.chineseName"
185 - :name="item.chineseName"
186 - >
187 </el-checkbox> 125 </el-checkbox>
188 </el-col> 126 </el-col>
189 </el-row> 127 </el-row>
...@@ -196,11 +134,7 @@ ...@@ -196,11 +134,7 @@
196 <el-checkbox-group v-model="form.declarationCategory"> 134 <el-checkbox-group v-model="form.declarationCategory">
197 <el-row> 135 <el-row>
198 <el-col :span="3" v-for="item in cargoStatus" :key="item.id"> 136 <el-col :span="3" v-for="item in cargoStatus" :key="item.id">
199 - <el-checkbox 137 + <el-checkbox :label="item.chineseName" :name="item.chineseName" disabled></el-checkbox>
200 - :label="item.chineseName"
201 - :name="item.chineseName"
202 - disabled
203 - ></el-checkbox>
204 </el-col> 138 </el-col>
205 </el-row> 139 </el-row>
206 </el-checkbox-group> 140 </el-checkbox-group>
...@@ -212,10 +146,7 @@ ...@@ -212,10 +146,7 @@
212 <el-checkbox-group v-model="form.serviceCode"> 146 <el-checkbox-group v-model="form.serviceCode">
213 <el-row> 147 <el-row>
214 <el-col :span="2" v-for="item in serviceCode" :key="item.id"> 148 <el-col :span="2" v-for="item in serviceCode" :key="item.id">
215 - <el-checkbox 149 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
216 - :label="item.englishName"
217 - :name="item.englishName"
218 - ></el-checkbox>
219 </el-col> 150 </el-col>
220 </el-row> 151 </el-row>
221 </el-checkbox-group> 152 </el-checkbox-group>
...@@ -227,10 +158,7 @@ ...@@ -227,10 +158,7 @@
227 <el-checkbox-group v-model="form.handlingCode"> 158 <el-checkbox-group v-model="form.handlingCode">
228 <el-row> 159 <el-row>
229 <el-col :span="3" v-for="item in handlingCode" :key="item.id"> 160 <el-col :span="3" v-for="item in handlingCode" :key="item.id">
230 - <el-checkbox 161 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
231 - :label="item.englishName"
232 - :name="item.englishName"
233 - ></el-checkbox>
234 </el-col> 162 </el-col>
235 </el-row> 163 </el-row>
236 </el-checkbox-group> 164 </el-checkbox-group>
...@@ -242,10 +170,7 @@ ...@@ -242,10 +170,7 @@
242 <el-checkbox-group v-model="form.subCategory"> 170 <el-checkbox-group v-model="form.subCategory">
243 <el-row> 171 <el-row>
244 <el-col :span="3" v-for="item in subCategory" :key="item.id"> 172 <el-col :span="3" v-for="item in subCategory" :key="item.id">
245 - <el-checkbox 173 + <el-checkbox :label="item.englishName" :name="item.englishName"></el-checkbox>
246 - :label="item.englishName"
247 - :name="item.englishName"
248 - ></el-checkbox>
249 </el-col> 174 </el-col>
250 </el-row> 175 </el-row>
251 </el-checkbox-group> 176 </el-checkbox-group>
...@@ -254,13 +179,8 @@ ...@@ -254,13 +179,8 @@
254 179
255 </el-form> 180 </el-form>
256 <div style="marginleft: 200px"> 181 <div style="marginleft: 200px">
257 - <el-button 182 + <el-button type="primary" size="small" v-if="$route.params.handle != 'detail'" @click="submit('form')"
258 - type="primary" 183 + :loading="btnLoading">
259 - size="small"
260 - v-if="$route.params.handle != 'detail'"
261 - @click="submit('form')"
262 - :loading="btnLoading"
263 - >
264 <span v-if="$route.params.handle === 'add'">添加</span> 184 <span v-if="$route.params.handle === 'add'">添加</span>
265 <span v-else>保存</span> 185 <span v-else>保存</span>
266 </el-button> 186 </el-button>
...@@ -279,7 +199,7 @@ import { ...@@ -279,7 +199,7 @@ import {
279 } from "@/api/destinationFlight"; 199 } from "@/api/destinationFlight";
280 200
281 export default { 201 export default {
282 - name:"", 202 + name: "",
283 data() { 203 data() {
284 return { 204 return {
285 form: { 205 form: {
...@@ -319,9 +239,9 @@ export default { ...@@ -319,9 +239,9 @@ export default {
319 btnLoading: false, 239 btnLoading: false,
320 loading: true, 240 loading: true,
321 isEmpty: false, 241 isEmpty: false,
322 - routeName:"", 242 + routeName: "",
323 - dataId:"", 243 + dataId: "",
324 - handleName:"" 244 + handleName: ""
325 }; 245 };
326 }, 246 },
327 methods: { 247 methods: {
...@@ -361,7 +281,7 @@ export default { ...@@ -361,7 +281,7 @@ export default {
361 this.formHandlingCode = this.form.handlingCode; 281 this.formHandlingCode = this.form.handlingCode;
362 this.formSubCategory = this.form.subCategory; 282 this.formSubCategory = this.form.subCategory;
363 this.form.isNeedRequired = this.isNeedRequired; 283 this.form.isNeedRequired = this.isNeedRequired;
364 - if(this.form.purposeOfFlightNo){ 284 + if (this.form.purposeOfFlightNo) {
365 this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase(); 285 this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
366 } 286 }
367 if (this.isLocation == 1) { 287 if (this.isLocation == 1) {
...@@ -442,7 +362,7 @@ export default { ...@@ -442,7 +362,7 @@ export default {
442 ), 362 ),
443 1 363 1
444 ); 364 );
445 - this.$router.push({name:"FlightAllocConfig"}) 365 + this.$router.push({ name: "FlightAllocConfig" })
446 // this.$router.push( 366 // this.$router.push(
447 // this.$store.state.tagsView.visitedViews[ 367 // this.$store.state.tagsView.visitedViews[
448 // this.$store.state.tagsView.visitedViews.length - 1 368 // this.$store.state.tagsView.visitedViews.length - 1
...@@ -450,30 +370,30 @@ export default { ...@@ -450,30 +370,30 @@ export default {
450 // ); 370 // );
451 }, 371 },
452 372
453 - removes(){ 373 + removes() {
454 - if(this.routeName == "FlightAllocConfigAdd"){ 374 + if (this.routeName == "FlightAllocConfigAdd") {
455 - sessionStorage.setItem("flightAdd","remove") 375 + sessionStorage.setItem("flightAdd", "remove")
456 - }else{ 376 + } else {
457 - sessionStorage.setItem("flightInfo"+this.dataId,"remove") 377 + sessionStorage.setItem("flightInfo" + this.dataId, "remove")
458 } 378 }
459 }, 379 },
460 }, 380 },
461 381
462 - beforeDestroy(){ 382 + beforeDestroy() {
463 - if(this.routeName == "FlightAllocConfigAdd"){ 383 + if (this.routeName == "FlightAllocConfigAdd") {
464 - if(sessionStorage.getItem("flightAdd") == "remove"){ 384 + if (sessionStorage.getItem("flightAdd") == "remove") {
465 sessionStorage.removeItem("flightAdd") 385 sessionStorage.removeItem("flightAdd")
466 - }else{ 386 + } else {
467 this.form.isNeedRequired = this.isNeedRequired 387 this.form.isNeedRequired = this.isNeedRequired
468 - sessionStorage.setItem("flightAdd",JSON.stringify(this.form)) 388 + sessionStorage.setItem("flightAdd", JSON.stringify(this.form))
469 } 389 }
470 - }else{ 390 + } else {
471 - if(sessionStorage.getItem("flightInfo"+this.dataId) == "remove"){ 391 + if (sessionStorage.getItem("flightInfo" + this.dataId) == "remove") {
472 - sessionStorage.removeItem("flightInfo"+this.dataId) 392 + sessionStorage.removeItem("flightInfo" + this.dataId)
473 - }else{ 393 + } else {
474 - if(this.handleName == "detail"){ 394 + if (this.handleName == "detail") {
475 this.form.isNeedRequired = this.isNeedRequired 395 this.form.isNeedRequired = this.isNeedRequired
476 - sessionStorage.setItem("flightInfo"+this.dataId,JSON.stringify(this.form)) 396 + sessionStorage.setItem("flightInfo" + this.dataId, JSON.stringify(this.form))
477 } 397 }
478 } 398 }
479 } 399 }
...@@ -510,16 +430,16 @@ export default { ...@@ -510,16 +430,16 @@ export default {
510 if (handle != "add") { 430 if (handle != "add") {
511 this.nameDisabled = true; 431 this.nameDisabled = true;
512 let id = this.$route.params.id; 432 let id = this.$route.params.id;
513 - if(sessionStorage.getItem("flightInfo"+id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail"){ 433 + if (sessionStorage.getItem("flightInfo" + id) && this.$route.name == "FlightAllocConfigInfo" && handle != "detail") {
514 this.loading = false 434 this.loading = false
515 - this.form = JSON.parse(sessionStorage.getItem("flightInfo"+this.$route.params.id)) 435 + this.form = JSON.parse(sessionStorage.getItem("flightInfo" + this.$route.params.id))
516 this.isNeedRequired = this.form.isNeedRequired; 436 this.isNeedRequired = this.form.isNeedRequired;
517 - if(this.form.notLocation != null || this.form.notLocation == ""){ 437 + if (this.form.notLocation != null || this.form.notLocation == "") {
518 this.isLocation = "2"; 438 this.isLocation = "2";
519 - }else{ 439 + } else {
520 this.isLocation = "1"; 440 this.isLocation = "1";
521 } 441 }
522 - }else{ 442 + } else {
523 if (isNaN(Number(id))) { 443 if (isNaN(Number(id))) {
524 findDestinationFltRuleByActualFlight(id).then((response) => { 444 findDestinationFltRuleByActualFlight(id).then((response) => {
525 if (response.code != 200) { 445 if (response.code != 200) {
...@@ -557,7 +477,7 @@ export default { ...@@ -557,7 +477,7 @@ export default {
557 this.isNeedRequired = info.isNeedRequired; 477 this.isNeedRequired = info.isNeedRequired;
558 } 478 }
559 this.loading = false; 479 this.loading = false;
560 - }).catch(()=>{ 480 + }).catch(() => {
561 this.loading = false; 481 this.loading = false;
562 }) 482 })
563 } else { 483 } else {
...@@ -598,7 +518,7 @@ export default { ...@@ -598,7 +518,7 @@ export default {
598 this.isNeedRequired = isNeedRequired; 518 this.isNeedRequired = isNeedRequired;
599 } 519 }
600 this.loading = false; 520 this.loading = false;
601 - }).catch(()=>{ 521 + }).catch(() => {
602 this.loading = false; 522 this.loading = false;
603 }) 523 })
604 } 524 }
...@@ -606,13 +526,13 @@ export default { ...@@ -606,13 +526,13 @@ export default {
606 } else { 526 } else {
607 this.loading = false; 527 this.loading = false;
608 } 528 }
609 - if(this.$route.name == "FlightAllocConfigAdd"){ 529 + if (this.$route.name == "FlightAllocConfigAdd") {
610 - if(sessionStorage.getItem("flightAdd")){ 530 + if (sessionStorage.getItem("flightAdd")) {
611 this.form = JSON.parse(sessionStorage.getItem("flightAdd")) 531 this.form = JSON.parse(sessionStorage.getItem("flightAdd"))
612 this.isNeedRequired = this.form.isNeedRequired; 532 this.isNeedRequired = this.form.isNeedRequired;
613 - if(this.form.notLocation != null || this.form.notLocation == ""){ 533 + if (this.form.notLocation != null || this.form.notLocation == "") {
614 this.isLocation = "2"; 534 this.isLocation = "2";
615 - }else{ 535 + } else {
616 this.isLocation = "1"; 536 this.isLocation = "1";
617 } 537 }
618 } 538 }
...@@ -685,7 +605,7 @@ export default { ...@@ -685,7 +605,7 @@ export default {
685 background-color: rgba(255, 255, 255, 0.5); 605 background-color: rgba(255, 255, 255, 0.5);
686 } 606 }
687 607
688 -.el-checkbox__input.is-disabled + span.el-checkbox__label { 608 +.el-checkbox__input.is-disabled+span.el-checkbox__label {
689 color: #303133; 609 color: #303133;
690 } 610 }
691 611
...@@ -696,6 +616,7 @@ export default { ...@@ -696,6 +616,7 @@ export default {
696 .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner { 616 .el-checkbox__input.is-disabled.is-checked .el-checkbox__inner {
697 border-color: #606266; 617 border-color: #606266;
698 } 618 }
619 +
699 .numberInput { 620 .numberInput {
700 input { 621 input {
701 text-align: center; 622 text-align: center;
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true"
4 - class="form-header" 4 + label-position="right" label-width="auto">
5 - :model="queryParams"
6 - ref="queryForm"
7 - size="medium"
8 - :inline="true"
9 - label-position="right"
10 - label-width="auto"
11 - >
12 <el-form-item label="原航班"> 5 <el-form-item label="原航班">
13 - <el-input 6 + <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
14 - type="text"
15 - v-model="upCase"
16 - placeholder="请输入原航班"
17 - clearable
18 - ></el-input>
19 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> --> 7 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
20 </el-form-item> 8 </el-form-item>
21 <el-form-item label="状态" prop="status"> 9 <el-form-item label="状态" prop="status">
22 <el-select v-model="queryParams.status" placeholder="请选择" clearable> 10 <el-select v-model="queryParams.status" placeholder="请选择" clearable>
23 - <el-option 11 + <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
24 - v-for="dict in statusList"
25 - :key="dict.id"
26 - :label="dict.name"
27 - :value="dict.id"
28 - />
29 </el-select> 12 </el-select>
30 </el-form-item> 13 </el-form-item>
31 14
32 <el-form-item> 15 <el-form-item>
33 - <el-button 16 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
34 - type="primary"
35 - icon="el-icon-search"
36 - size="mini"
37 - @click="handleQuery"
38 - >查询原航班配置</el-button
39 - >
40 </el-form-item> 17 </el-form-item>
41 <br /> 18 <br />
42 <el-form-item label="日期" prop="flightDate"> 19 <el-form-item label="日期" prop="flightDate">
43 - <el-date-picker 20 + <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.flightDate" type="date" placeholder="选择日期">
44 - value-format="yyyy-MM-dd"
45 - v-model="queryParams.flightDate"
46 - type="date"
47 - placeholder="选择日期"
48 - >
49 </el-date-picker> 21 </el-date-picker>
50 </el-form-item> 22 </el-form-item>
51 23
52 <el-form-item> 24 <el-form-item>
53 - <el-button 25 + <el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
54 - type="primary" 26 + </el-button>&#12288;
55 - icon="el-icon-search"
56 - size="mini"
57 - @click="findSourceFlightAndFlightDate"
58 - >查询实际配载航班 </el-button
59 - >&#12288;
60 <span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span> 27 <span style="color:#ff4949">注：原航班+日期查询该日期的航班实际情况</span>
61 </el-form-item> 28 </el-form-item>
62 <br /> 29 <br />
63 <el-form-item> 30 <el-form-item>
64 - <el-button 31 + <el-button type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:rand:add']"
65 - type="primary" 32 + @click="handleAdd">添加规则</el-button>
66 - icon="el-icon-plus" 33 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
67 - size="mini"
68 - v-hasPermi="['allocation:rand:add']"
69 - @click="handleAdd"
70 - >添加规则</el-button
71 - >
72 - <el-button icon="el-icon-refresh" size="mini" @click="resetQuery"
73 - >重置</el-button
74 - >
75 </el-form-item> 34 </el-form-item>
76 </el-form> 35 </el-form>
77 36
78 - <el-table 37 + <el-table v-loading="loading" height="550" size="small" :data="sourceFlightRulesList" highlight-current-row border
79 - v-loading="loading" 38 + stripe>
80 - height="550"
81 - size="small"
82 - :data="sourceFlightRulesList"
83 - highlight-current-row
84 - border
85 - stripe
86 - >
87 <el-table-column type="index" label="序号" align="center"> 39 <el-table-column type="index" label="序号" align="center">
88 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 40 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
89 </el-table-column> 41 </el-table-column>
90 <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 42 <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
91 - <el-table-column 43 + <el-table-column label="配载航班排序" align="center" prop="flightRank" width="280" />
92 - label="配载航班排序" 44 + <el-table-column label="周期" align="center" prop="dayOfWeek" width="180" />
93 - align="center" 45 + <el-table-column label="状态" align="center" prop="status" :formatter="statusFormat" />
94 - prop="flightRank" 46 + <el-table-column label="开始时间" align="center" prop="startDate" width="100" />
95 - width="280" 47 + <el-table-column label="结束时间" align="center" prop="endDate" width="100" />
96 - /> 48 + <el-table-column label="最后修改人" align="center" prop="updateUserName" width="100" />
97 - <el-table-column 49 + <el-table-column label="最后修改时间" align="center" prop="updateTime" width="100" />
98 - label="周期" 50 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="180" fixed="right">
99 - align="center"
100 - prop="dayOfWeek"
101 - width="180"
102 - />
103 - <el-table-column
104 - label="状态"
105 - align="center"
106 - prop="status"
107 - :formatter="statusFormat"
108 - />
109 - <el-table-column
110 - label="开始时间"
111 - align="center"
112 - prop="startDate"
113 - width="100"
114 - />
115 - <el-table-column
116 - label="结束时间"
117 - align="center"
118 - prop="endDate"
119 - width="100"
120 - />
121 - <el-table-column
122 - label="最后修改人"
123 - align="center"
124 - prop="updateUserName"
125 - width="100"
126 - />
127 - <el-table-column
128 - label="最后修改时间"
129 - align="center"
130 - prop="updateTime"
131 - width="100"
132 - />
133 - <el-table-column
134 - label="操作"
135 - align="center"
136 - class-name="small-padding fixed-width"
137 - width="180"
138 - fixed="right"
139 - >
140 <template slot-scope="scope"> 51 <template slot-scope="scope">
141 - <el-button 52 + <el-button size="mini" type="text" icon="el-icon-edit" v-hasPermi="['allocation:rand:update']"
142 - size="mini" 53 + @click="handleUpdate(scope.row)">修改</el-button>
143 - type="text" 54 + <el-button size="mini" type="text" icon="el-icon-delete" v-hasPermi="['allocation:rand:delete']"
144 - icon="el-icon-edit" 55 + @click="handleDeleteorPlayorpause(scope.row, 0, '删除')">
145 - v-hasPermi="['allocation:rand:update']" 56 + 删除</el-button>
146 - @click="handleUpdate(scope.row)" 57 + <el-button size="mini" type="text" icon="el-icon-video-play" v-if="scope.row.status == '3'"
147 - >修改</el-button 58 + v-hasPermi="['allocation:rand:openClose']" @click="handleDeleteorPlayorpause(scope.row, 1, '启用')">启用
148 - > 59 + </el-button>
149 - <el-button 60 + <el-button size="mini" type="text" icon="el-icon-video-pause" v-if="scope.row.status != '3'"
150 - size="mini" 61 + v-hasPermi="['allocation:rand:openClose']" @click="handleDeleteorPlayorpause(scope.row, 3, '停用')">停用
151 - type="text" 62 + </el-button>
152 - icon="el-icon-delete"
153 - v-hasPermi="['allocation:rand:delete']"
154 - @click="handleDeleteorPlayorpause(scope.row, 0, '删除')"
155 - >
156 - 删除</el-button
157 - >
158 - <el-button
159 - size="mini"
160 - type="text"
161 - icon="el-icon-video-play"
162 - v-if="scope.row.status == '3'"
163 - v-hasPermi="['allocation:rand:openClose']"
164 - @click="handleDeleteorPlayorpause(scope.row, 1, '启用')"
165 - >启用</el-button
166 - >
167 - <el-button
168 - size="mini"
169 - type="text"
170 - icon="el-icon-video-pause"
171 - v-if="scope.row.status != '3'"
172 - v-hasPermi="['allocation:rand:openClose']"
173 - @click="handleDeleteorPlayorpause(scope.row, 3, '停用')"
174 - >停用</el-button
175 - >
176 </template> 63 </template>
177 </el-table-column> 64 </el-table-column>
178 </el-table> 65 </el-table>
179 66
180 - <pagination 67 + <pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
181 - v-show="total > 0" 68 + :page.sync="queryParams.pageNum" :limit.sync="queryParams.limit" @pagination="findSourceFlightRules" />
182 - :total="total"
183 - layout=" prev, pager, next, jumper, sizes,total"
184 - :page.sync="queryParams.pageNum"
185 - :limit.sync="queryParams.limit"
186 - @pagination="findSourceFlightRules"
187 - />
188 69
189 <!-- 查看目的航班对话框 --> 70 <!-- 查看目的航班对话框 -->
190 - <el-dialog 71 + <el-dialog title="实际配载航班" :visible.sync="openFlightDate" width="70%" :close-on-click-modal="false"
191 - title="实际配载航班" 72 + :append-to-body="true">
192 - :visible.sync="openFlightDate"
193 - width="70%"
194 - :close-on-click-modal="false"
195 - :append-to-body="true"
196 - >
197 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate"> 73 <el-table v-loading="loadingFlightDate" :data="sourceFlightAndFlightDate">
198 <el-table-column type="index" label="序号" align="center"> 74 <el-table-column type="index" label="序号" align="center">
199 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 75 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
200 </el-table-column> 76 </el-table-column>
201 <el-table-column label="原航班" align="center" prop="sourceFlightNo" /> 77 <el-table-column label="原航班" align="center" prop="sourceFlightNo" />
202 - <el-table-column 78 + <el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" />
203 - label="实际配载航班"
204 - align="center"
205 - prop="actualFlight"
206 - width="280"
207 - />
208 <el-table-column label="航班日期" align="center" prop="flightDate" /> 79 <el-table-column label="航班日期" align="center" prop="flightDate" />
209 - <el-table-column 80 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
210 - label="操作"
211 - align="center"
212 - class-name="small-padding fixed-width"
213 - width="200"
214 - >
215 <template slot-scope="scope"> 81 <template slot-scope="scope">
216 - <el-button 82 + <el-button size="mini" type="text" icon="el-icon-edit"
217 - size="mini" 83 + @click="handleClick(scope.row.actualFlight, 'detail')">查看配置维度</el-button>
218 - type="text"
219 - icon="el-icon-edit"
220 - @click="handleClick(scope.row.actualFlight, 'detail')"
221 - >查看配置维度</el-button
222 - >
223 </template> 84 </template>
224 </el-table-column> 85 </el-table-column>
225 </el-table> 86 </el-table>
...@@ -229,45 +90,19 @@ ...@@ -229,45 +90,19 @@
229 </el-dialog> 90 </el-dialog>
230 91
231 <!-- 添加或修改对话框 --> 92 <!-- 添加或修改对话框 -->
232 - <el-dialog 93 + <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
233 - :title="title" 94 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
234 - :visible.sync="open"
235 - width="55%"
236 - :append-to-body="true"
237 - :close-on-click-modal="false"
238 - >
239 - <el-form
240 - ref="form"
241 - :model="form"
242 - :rules="rules"
243 - label-position="right"
244 - label-width="auto"
245 - >
246 <el-row> 95 <el-row>
247 <el-col :span="8"> 96 <el-col :span="8">
248 <el-form-item label="原航班" prop="sourceFlightNo"> 97 <el-form-item label="原航班" prop="sourceFlightNo">
249 - <el-input 98 + <el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" maxlength="10" />
250 - v-model="form.sourceFlightNo"
251 - placeholder="请输入原航班号"
252 - maxlength="10"
253 - />
254 </el-form-item> 99 </el-form-item>
255 </el-col> 100 </el-col>
256 101
257 <el-col :span="8"> 102 <el-col :span="8">
258 <el-form-item label="口岸" prop="portName"> 103 <el-form-item label="口岸" prop="portName">
259 - <el-select 104 + <el-select :disabled="true" v-model="form.portName" size="mini" placeholder="选择口岸">
260 - :disabled="true" 105 + <el-option v-for="item in portNameList" :label="item" :value="item" :key="item">
261 - v-model="form.portName"
262 - size="mini"
263 - placeholder="选择口岸"
264 - >
265 - <el-option
266 - v-for="item in portNameList"
267 - :label="item"
268 - :value="item"
269 - :key="item"
270 - >
271 </el-option> 106 </el-option>
272 </el-select> 107 </el-select>
273 </el-form-item> 108 </el-form-item>
...@@ -276,59 +111,33 @@ ...@@ -276,59 +111,33 @@
276 <el-row> 111 <el-row>
277 <el-col :span="8"> 112 <el-col :span="8">
278 <el-form-item label="有效开始时间" prop="startDate"> 113 <el-form-item label="有效开始时间" prop="startDate">
279 - <el-date-picker 114 + <el-date-picker clearable size="small" :picker-options="pickerOptionsStart" v-model="form.startDate"
280 - clearable 115 + type="date" value-format="yyyy-MM-dd" placeholder="选择开始时间">
281 - size="small"
282 - :picker-options="pickerOptionsStart"
283 - v-model="form.startDate"
284 - type="date"
285 - value-format="yyyy-MM-dd"
286 - placeholder="选择开始时间"
287 - >
288 </el-date-picker> 116 </el-date-picker>
289 </el-form-item> 117 </el-form-item>
290 </el-col> 118 </el-col>
291 <el-col :span="12"> 119 <el-col :span="12">
292 <el-form-item label="有效结束时间" prop="endDate"> 120 <el-form-item label="有效结束时间" prop="endDate">
293 - <el-date-picker 121 + <el-date-picker clearable size="small" :picker-options="pickerOptionsEnd" v-model="form.endDate"
294 - clearable 122 + type="date" value-format="yyyy-MM-dd" placeholder="选择结束时间">
295 - size="small"
296 - :picker-options="pickerOptionsEnd"
297 - v-model="form.endDate"
298 - type="date"
299 - value-format="yyyy-MM-dd"
300 - placeholder="选择结束时间"
301 - >
302 </el-date-picker> 123 </el-date-picker>
303 </el-form-item> 124 </el-form-item>
304 </el-col> 125 </el-col>
305 126
306 <el-col :span="24" style="margin-bottom: 5%"> 127 <el-col :span="24" style="margin-bottom: 5%">
307 - <span style="color: #ff4949; margin-left: 10%" 128 + <span style="color: #ff4949; margin-left: 10%">提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span><br />
308 - >提示:配载航班之间请用分号分隔【符号不区分中英文】,例:CA1053;C7433</span 129 + <span
309 - ><br /> 130 + style="color: #ff4949; margin-left: 10%">提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span>
310 - <span style="color: #ff4949; margin-left: 10%"
311 - >提示:如果需要设置配载航班延迟或提前可以直接在目的航斑后加减【+-】天数。如:CA1053+1;CZ433-1</span
312 - >
313 </el-col> 131 </el-col>
314 <el-col :span="24"> 132 <el-col :span="24">
315 <el-form-item label="配载航班" prop="flightRank"> 133 <el-form-item label="配载航班" prop="flightRank">
316 - <el-input 134 + <el-input type="textarea" v-model="form.flightRank" :rows="4"></el-input>
317 - type="textarea"
318 - v-model="form.flightRank"
319 - :rows="4"
320 - ></el-input>
321 </el-form-item> 135 </el-form-item>
322 </el-col> 136 </el-col>
323 <el-col :span="24"> 137 <el-col :span="24">
324 <el-form-item label="周期段"> 138 <el-form-item label="周期段">
325 <el-checkbox-group v-model="dayOfWeek"> 139 <el-checkbox-group v-model="dayOfWeek">
326 - <el-checkbox 140 + <el-checkbox v-for="item in dayOfWeekList" :key="item" :label="item" :name="item"></el-checkbox>
327 - v-for="item in dayOfWeekList"
328 - :key="item"
329 - :label="item"
330 - :name="item"
331 - ></el-checkbox>
332 </el-checkbox-group> 141 </el-checkbox-group>
333 </el-form-item> 142 </el-form-item>
334 </el-col> 143 </el-col>
...@@ -442,19 +251,19 @@ export default { ...@@ -442,19 +251,19 @@ export default {
442 created() { 251 created() {
443 this.queryParams.portName = this.$store.state.user.activePortName; 252 this.queryParams.portName = this.$store.state.user.activePortName;
444 this.portNameList = this.$store.state.user.portNames; 253 this.portNameList = this.$store.state.user.portNames;
445 - if(this.$store.state.tagsView.cachedViews.length == 0){ 254 + if (this.$store.state.tagsView.cachedViews.length == 0) {
446 this.findSourceFlightRules(); 255 this.findSourceFlightRules();
447 } 256 }
448 }, 257 },
449 - activated(){ 258 + activated() {
450 this.findSourceFlightRules(); 259 this.findSourceFlightRules();
451 }, 260 },
452 - deactivated(){ 261 + deactivated() {
453 this.sourceFlightRulesList = [] 262 this.sourceFlightRulesList = []
454 }, 263 },
455 - watch:{ 264 + watch: {
456 - open(val,oldVal){ 265 + open(val, oldVal) {
457 - if(val){ 266 + if (val) {
458 this.queryParams.portName = this.$store.state.user.activePortName; 267 this.queryParams.portName = this.$store.state.user.activePortName;
459 this.form.portName = this.$store.state.user.activePortName; 268 this.form.portName = this.$store.state.user.activePortName;
460 } 269 }
...@@ -544,7 +353,7 @@ export default { ...@@ -544,7 +353,7 @@ export default {
544 this.msgError(response.msg); 353 this.msgError(response.msg);
545 } 354 }
546 }) 355 })
547 - .catch(() => {}); 356 + .catch(() => { });
548 }, 357 },
549 /** 提交按钮 */ 358 /** 提交按钮 */
550 submitForm: function () { 359 submitForm: function () {
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 - <el-form 3 + <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
4 - class="form-header"
5 - :model="queryParams"
6 - label-position="right"
7 - label-width="auto"
8 - size="medium"
9 - >
10 <el-row> 4 <el-row>
11 <el-col :span="6"> 5 <el-col :span="6">
12 <el-form-item label="航班日期从" prop="fltDateStart"> 6 <el-form-item label="航班日期从" prop="fltDateStart">
13 - <el-date-picker 7 + <el-date-picker value-format="yyyy-MM-dd" class="formItem" v-model="queryParams.fltDateStart" type="date"
14 - value-format="yyyy-MM-dd" 8 + placeholder="选择日期">
15 - class="formItem"
16 - v-model="queryParams.fltDateStart"
17 - type="date"
18 - placeholder="选择日期"
19 - >
20 </el-date-picker> 9 </el-date-picker>
21 </el-form-item> 10 </el-form-item>
22 </el-col> 11 </el-col>
23 <el-col :span="6"> 12 <el-col :span="6">
24 <el-form-item label="到" prop="fltDateEnd"> 13 <el-form-item label="到" prop="fltDateEnd">
25 - <el-date-picker 14 + <el-date-picker value-format="yyyy-MM-dd" class="formItem" v-model="queryParams.fltDateEnd" type="date"
26 - value-format="yyyy-MM-dd" 15 + placeholder="选择日期">
27 - class="formItem"
28 - v-model="queryParams.fltDateEnd"
29 - type="date"
30 - placeholder="选择日期"
31 - >
32 </el-date-picker> 16 </el-date-picker>
33 </el-form-item> 17 </el-form-item>
34 </el-col> 18 </el-col>
35 <el-col :span="6"> 19 <el-col :span="6">
36 <el-form-item label="航班号"> 20 <el-form-item label="航班号">
37 - <el-input 21 + <el-input type="textarea" v-model="fltNo" clearable class="formItem" placeholder="AC001;AC002" :rows="1">
38 - type="textarea"
39 - v-model="fltNo"
40 - clearable
41 - class="formItem"
42 - placeholder="AC001;AC002"
43 - rows="1"
44 - >
45 </el-input> 22 </el-input>
46 </el-form-item> 23 </el-form-item>
47 </el-col> 24 </el-col>
48 <el-col :span="6"> 25 <el-col :span="6">
49 <el-form-item label="运单号"> 26 <el-form-item label="运单号">
50 - <el-input 27 + <el-input clearable type="textarea" v-model="queryParams.waybillNo" class="formItem"
51 - clearable 28 + placeholder="请输入运单号（回车间隔）" :rows="1"></el-input>
52 - type="textarea"
53 - v-model="queryParams.waybillNo"
54 - class="formItem"
55 - placeholder="请输入运单号（回车间隔）"
56 - rows="1"
57 - ></el-input>
58 </el-form-item> 29 </el-form-item>
59 </el-col> 30 </el-col>
31 + </el-row>
32 + <el-row>
60 <el-col :span="6"> 33 <el-col :span="6">
61 <el-form-item label="站点"> 34 <el-form-item label="站点">
62 - <el-input 35 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" clearable :rows="1">
63 - type="textarea"
64 - v-model="siteName"
65 - class="formItem"
66 - placeholder="PVG;PEK"
67 - clearable
68 - rows="1"
69 - >
70 </el-input> 36 </el-input>
71 </el-form-item> 37 </el-form-item>
72 </el-col> 38 </el-col>
73 <el-col :span="6"> 39 <el-col :span="6">
74 <el-form-item label="URSA"> 40 <el-form-item label="URSA">
75 - <el-input 41 + <el-input clearable type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1">
76 - clearable
77 - type="textarea"
78 - v-model="ursa"
79 - class="formItem"
80 - placeholder="S_;P_;E2"
81 - rows="1"
82 - >
83 </el-input> 42 </el-input>
84 </el-form-item> 43 </el-form-item>
85 </el-col> 44 </el-col>
86 - <el-col :span="24">
87 - <el-switch
88 - v-model="queryParams.reExport"
89 - active-color="#13ce66"
90 - active-text="重新导出"
91 - style="padding-left: 35px"
92 - >
93 - </el-switch>
94 - </el-col>
95 </el-row> 45 </el-row>
96 - <div style="margin-top: 25px"> 46 + <el-switch v-model="queryParams.reExport" active-color="#13ce66" active-text="重新导出" style="padding-left: 35px">
97 - <el-button 47 + </el-switch>
98 - type="primary" 48 + <div style="margin-top:25px">
99 - icon="el-icon-search" 49 + <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
100 - size="mini" 50 + <el-button type="warning" :disabled="tableData.length == 0" v-hasPermi="['base:caExport:export']"
101 - @click="handleQuery" 51 + @click="xlse()" :loading="downLoadingTip.downloading" icon="el-icon-download" size="mini">{{
102 - >搜索</el-button
103 - >
104 - <el-button
105 - type="warning"
106 - :disabled="tableData.length == 0"
107 - @click="xlse()"
108 - :loading="downLoadingTip.downloading"
109 - icon="el-icon-download"
110 - size="mini"
111 - v-hasPermi="['base:caExport:export']"
112 - >{{
113 downLoadingTip.downloading ? downLoadingTip.tip : "导出" 52 downLoadingTip.downloading ? downLoadingTip.tip : "导出"
114 - }}</el-button 53 + }}</el-button>
115 - >
116 </div> 54 </div>
117 </el-form> 55 </el-form>
118 56
119 - <el-table 57 + <el-table max-height="500" highlight-current-row border stripe v-loading="loading" :data="tableData">
120 - max-height="500" 58 + <el-table-column label="运单号" align="center" prop="waybillNo" />
121 - highlight-current-row 59 + <el-table-column :show-overflow-tooltip="true" label="品牌描述" align="center" prop="nameDescription" />
122 - border 60 + <el-table-column label="航班日期" align="center" prop="fltDate" />
123 - stripe 61 + <el-table-column label="航班号" align="center" prop="fltNo" width="100" />
124 - v-loading="loading" 62 + <el-table-column label="航班路线" align="center" prop="route" />
125 - :data="tableData" 63 + <el-table-column label="配置航班类型" align="center" prop="kindName" width="130" />
126 - > 64 + <el-table-column label="尺寸" align="center" prop="sizeStr" width="70" />
127 - <el-table-column 65 + <el-table-column label="件数" align="center" prop="qty" width="70" />
128 - label="运单号" 66 + <el-table-column label="实际重量" align="center" prop="actualWeight" width="100" />
129 - align="center" 67 + <el-table-column label="创建时间" align="center" prop="createTime" width="180" />
130 - prop="waybillNo"
131 - width="150"
132 - />
133 - <el-table-column
134 - :show-overflow-tooltip="true"
135 - label="品牌描述"
136 - align="center"
137 - prop="nameDescription"
138 - width="150"
139 - />
140 - <el-table-column
141 - label="航班日期"
142 - align="center"
143 - prop="fltDate"
144 - width="150"
145 - />
146 - <el-table-column label="航班号" align="center" prop="fltNo" />
147 - <el-table-column
148 - label="航班路线"
149 - align="center"
150 - prop="route"
151 - width="150"
152 - />
153 - <el-table-column
154 - label="配置航班类型"
155 - align="center"
156 - prop="kindName"
157 - width="130"
158 - />
159 - <el-table-column label="尺寸" align="center" prop="sizeStr" />
160 - <el-table-column label="件数" align="center" prop="qty" />
161 - <el-table-column label="实际重量" align="center" prop="actualWeight" />
162 - <el-table-column
163 - label="创建时间"
164 - align="center"
165 - prop="createTime"
166 - width="180"
167 - />
168 </el-table> 68 </el-table>
169 - <pagination 69 + <pagination v-show="total > 0" :total="total" layout=" prev, pager, next, jumper, sizes,total"
170 - v-show="total > 0" 70 + :page.sync="queryParams.pageNum" :limit.sync="queryParams.limitSize" @pagination="findAllFltData" />
171 - :total="total"
172 - layout=" prev, pager, next, jumper, sizes,total"
173 - :page.sync="queryParams.pageNum"
174 - :limit.sync="queryParams.limitSize"
175 - @pagination="findAllFltData"
176 - />
177 </div> 71 </div>
178 </template> 72 </template>
179 73
...@@ -221,7 +115,6 @@ export default { ...@@ -221,7 +115,6 @@ export default {
221 rules: {}, 115 rules: {},
222 }; 116 };
223 }, 117 },
224 - created() {},
225 methods: { 118 methods: {
226 // 导出表格 119 // 导出表格
227 xlse() { 120 xlse() {
...@@ -233,8 +126,9 @@ export default { ...@@ -233,8 +126,9 @@ export default {
233 ); 126 );
234 cargoXlse.cargoExportPreQueryDto.limitStart = 0; 127 cargoXlse.cargoExportPreQueryDto.limitStart = 0;
235 cargoXlse.cargoExportPreQueryDto.limitSize = -1; 128 cargoXlse.cargoExportPreQueryDto.limitSize = -1;
236 - downLoadXlsx("/cargo/excelPre", cargoXlse,'航班预审表') 129 + downLoadXlsx("/cargo/excelPre", cargoXlse, '航班预审表')
237 .then(() => { 130 .then(() => {
131 +
238 this.downLoadingTip.downloading = false; 132 this.downLoadingTip.downloading = false;
239 this.downLoadingTip.tip = ""; 133 this.downLoadingTip.tip = "";
240 this.progress = 100; 134 this.progress = 100;
...@@ -244,7 +138,6 @@ export default { ...@@ -244,7 +138,6 @@ export default {
244 this.downLoadingTip.tip = ""; 138 this.downLoadingTip.tip = "";
245 }); 139 });
246 }, 140 },
247 -
248 /** 搜索按钮操作 */ 141 /** 搜索按钮操作 */
249 handleQuery() { 142 handleQuery() {
250 this.queryParams.pageNum = 1; 143 this.queryParams.pageNum = 1;
...@@ -265,6 +158,12 @@ export default { ...@@ -265,6 +158,12 @@ export default {
265 this.tableData = response.data.list; 158 this.tableData = response.data.list;
266 this.total = response.data.totalCount; 159 this.total = response.data.totalCount;
267 this.loading = false; 160 this.loading = false;
161 + if (response.data.list.length == 0) {
162 + this.$message({
163 + message: "未查询到数据",
164 + type: "warning",
165 + });
166 + }
268 } else { 167 } else {
269 this.msgError(response.msg); 168 this.msgError(response.msg);
270 } 169 }
......
...@@ -15,7 +15,8 @@ ...@@ -15,7 +15,8 @@
15 <div style="font-size: 12px; font-weight: 700"> 15 <div style="font-size: 12px; font-weight: 700">
16 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span> 16 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
17 </div> 17 </div>
18 - <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border> 18 + <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small"
19 + border>
19 <el-table-column label="行号" prop="line" fixed width="50" align="center"> 20 <el-table-column label="行号" prop="line" fixed width="50" align="center">
20 </el-table-column> 21 </el-table-column>
21 <el-table-column label="错误信息" prop="errorMessage" fixed width="300"> 22 <el-table-column label="错误信息" prop="errorMessage" fixed width="300">
...@@ -38,12 +39,12 @@ ...@@ -38,12 +39,12 @@
38 </template> 39 </template>
39 40
40 <script> 41 <script>
41 - import { 42 +import {
42 downLoadTemplate, 43 downLoadTemplate,
43 importcaPreReview, 44 importcaPreReview,
44 - } from "@/api/caPreReviewImport"; 45 +} from "@/api/caPreReviewImport";
45 - export default { 46 +export default {
46 - name:"CAPreReviewImport", 47 + name: "CAPreReviewImport",
47 data() { 48 data() {
48 return { 49 return {
49 // 遮罩层 50 // 遮罩层
...@@ -81,9 +82,9 @@ ...@@ -81,9 +82,9 @@
81 uploadExcel(option) { 82 uploadExcel(option) {
82 //上传excel 83 //上传excel
83 const file = option.file; 84 const file = option.file;
84 - this.loading=true; 85 + this.loading = true;
85 importcaPreReview(file, this.form.type).then((res) => { 86 importcaPreReview(file, this.form.type).then((res) => {
86 - this.loading=false; 87 + this.loading = false;
87 if (res.code != 200) { 88 if (res.code != 200) {
88 if (res.code == 603) { 89 if (res.code == 603) {
89 this.$alert(res.msg, "提示", { 90 this.$alert(res.msg, "提示", {
...@@ -115,19 +116,16 @@ ...@@ -115,19 +116,16 @@
115 this.uploadExcel(file); 116 this.uploadExcel(file);
116 }, 117 },
117 }, 118 },
118 - created() { 119 +};
119 -
120 - },
121 - };
122 </script> 120 </script>
123 <style rel="stylesheet/scss" lang="scss"> 121 <style rel="stylesheet/scss" lang="scss">
124 - .upload-demo { 122 +.upload-demo {
125 float: right; 123 float: right;
126 - } 124 +}
127 125
128 - .el-upload-list { 126 +.el-upload-list {
129 display: inline-block; 127 display: inline-block;
130 margin-left: 10px; 128 margin-left: 10px;
131 vertical-align: top; 129 vertical-align: top;
132 - } 130 +}
133 </style> 131 </style>
......
...@@ -3,47 +3,27 @@ ...@@ -3,47 +3,27 @@
3 <el-form :inline="true" :model="form" class="demo-form-inline" size="small"> 3 <el-form :inline="true" :model="form" class="demo-form-inline" size="small">
4 <el-form-item label="航班种类"> 4 <el-form-item label="航班种类">
5 <el-select v-model="form.type" placeholder="航班种类"> 5 <el-select v-model="form.type" placeholder="航班种类">
6 - <el-option 6 + <el-option v-for="item in flightType" :key="item.id" :label="item.englishName" :value="item.code">{{
7 - v-for="item in flightType" 7 + item.englishName
8 - :key="item.id" 8 + }}</el-option>
9 - :label="item.englishName"
10 - :value="item.code"
11 - >{{ item.englishName }}</el-option
12 - >
13 </el-select> 9 </el-select>
14 </el-form-item> 10 </el-form-item>
15 <el-form-item> 11 <el-form-item>
16 - <el-upload 12 + <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel"
17 - action="/flightInfoImport/importFlight" 13 + :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
18 - name="file" 14 + class="upload-demo" v-hasPermi="['base:flightImport:importFlight']">
19 - :http-request="uploadExcel"
20 - :on-remove="handleRemove"
21 - :limit="1"
22 - :on-exceed="handleExceed"
23 - :file-list="fileList"
24 - accept=".xlsx"
25 - class="upload-demo"
26 - v-hasPermi="['base:flightImport:importFlight']"
27 - >
28 <el-button type="primary">点击上传</el-button> 15 <el-button type="primary">点击上传</el-button>
29 </el-upload> 16 </el-upload>
30 </el-form-item> 17 </el-form-item>
31 <el-form-item> 18 <el-form-item>
32 - <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']" 19 + <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']">下载模板
33 - >下载模板</el-button 20 + </el-button>
34 - >
35 </el-form-item> 21 </el-form-item>
36 </el-form> 22 </el-form>
37 <div style="font-size: 12px; font-weight: 700"> 23 <div style="font-size: 12px; font-weight: 700">
38 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span> 24 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
39 </div> 25 </div>
40 - <el-table 26 + <el-table ref="filterTable" :data="tableData" style="margin-top: 20px" size="small" border>
41 - ref="filterTable"
42 - :data="tableData"
43 - style="width: 100%; margin-top: 20px"
44 - size="small"
45 - border
46 - >
47 <el-table-column label="行号" prop="line" fixed width="50" align="center"> 27 <el-table-column label="行号" prop="line" fixed width="50" align="center">
48 </el-table-column> 28 </el-table-column>
49 <el-table-column label="错误信息" prop="errorMessage" fixed width="200"> 29 <el-table-column label="错误信息" prop="errorMessage" fixed width="200">
...@@ -54,14 +34,8 @@ ...@@ -54,14 +34,8 @@
54 </template> 34 </template>
55 </el-table-column> 35 </el-table-column>
56 <el-table-column v-if="tableData.length == 0"></el-table-column> 36 <el-table-column v-if="tableData.length == 0"></el-table-column>
57 - <el-table-column 37 + <el-table-column v-for="(value, key) in this.tableData[0]" :key="key"
58 - v-for="(value, key) in this.tableData[0]" 38 + v-if="key != 'errorMessage' && key != 'line'" :label="key" :prop="key"></el-table-column>
59 - :key="key"
60 - v-if="key != 'errorMessage' && key != 'line'"
61 - :label="key"
62 - :prop="key"
63 - width="120"
64 - ></el-table-column>
65 </el-table> 39 </el-table>
66 </div> 40 </div>
67 </template> 41 </template>
...@@ -172,11 +146,11 @@ export default { ...@@ -172,11 +146,11 @@ export default {
172 }, 146 },
173 }; 147 };
174 </script> 148 </script>
175 -
176 <style rel="stylesheet/scss" lang="scss"> 149 <style rel="stylesheet/scss" lang="scss">
177 .upload-demo { 150 .upload-demo {
178 float: right; 151 float: right;
179 } 152 }
153 +
180 .el-upload-list { 154 .el-upload-list {
181 display: inline-block; 155 display: inline-block;
182 margin-left: 10px; 156 margin-left: 10px;
......
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="danger"
118 - icon="el-icon-delete"
119 - size="mini"
120 - :disabled="multiple"
121 - @click="handleDelete"
122 - v-hasPermi="['base:flightInfo:delete']"
123 - >删除
124 </el-button> 64 </el-button>
125 - <el-button
126 - type="primary"
127 - icon="el-icon-circle-check"
128 - size="mini"
129 - :disabled="multiple"
130 - @click="handleFlightStatus('flightStatus10')"
131 - v-hasPermi="['base:flightInfo:open']"
132 - >自动配舱开启</el-button
133 - >
134 - <el-button
135 - type="primary"
136 - icon="el-icon-circle-close"
137 - size="mini"
138 - :disabled="multiple"
139 - @click="handleFlightStatus('flightStatus80')"
140 - v-hasPermi="['base:flightInfo:close']"
141 - >自动配舱关闭</el-button
142 - >
143 </el-form> 65 </el-form>
144 - <Tables 66 + <Tables ref="flightInfoTable" ductName="FlightInformation" :data="findAllFltDatList" :headerData="tableHeader"
145 - ref="flightInfoTable" 67 + :infoData="tableHeader" :order="true" :selection="true" :totalCount="total" :loading="loading"
146 - :data="findAllFltDatList" 68 + :limitSize="queryParams.limitSize" :page="queryParams.pageNum" :shiftKey="shiftKey" :height="tableHeight"
147 - :headerData="tableHeader" 69 + :pageSizes="[20, 30, 40, 50, 100]" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
148 - :infoData="tableHeader" 70 + @currentChange="currentChange" @sortChange="sortChange" @sizeChange="sizeChange">
149 - :totalCount="total" 71 + <template slot="optionColumn">
150 - :loading="loading" 72 + <el-table-column v-if="findAllFltDatList.length > 0" label="操作" align="center"
151 - :limitSize="queryParams.limitSize" 73 + class-name="small-padding fixed-width" fixed="right">
152 - :page="queryParams.pageNum"
153 - :shiftKey="shiftKey"
154 - :infoShow="false"
155 - :height="tableHeight"
156 - @tableSelect="tableSelect"
157 - @tableSelectAll="tableSelectAll"
158 - @currentChange="currentChange"
159 - @sortChange="sortChange"
160 - @sizeChange="sizeChange"
161 - >
162 - <template>
163 - <el-table-column
164 - v-if="findAllFltDatList.length > 0"
165 - label="操作"
166 - align="center"
167 - class-name="small-padding fixed-width"
168 - fixed="right"
169 - >
170 <template slot-scope="scope"> 74 <template slot-scope="scope">
171 - <el-button 75 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
172 - size="mini" 76 + v-hasPermi="['base:flightInfo:update']">修改</el-button>
173 - type="text"
174 - icon="el-icon-edit"
175 - @click="handleUpdate(scope.row)"
176 - v-hasPermi="['base:flightInfo:update']"
177 - >修改</el-button
178 - >
179 </template> 77 </template>
180 </el-table-column> 78 </el-table-column>
181 </template> 79 </template>
182 </Tables> 80 </Tables>
183 <!-- 添加或修改对话框 --> 81 <!-- 添加或修改对话框 -->
184 - <el-dialog 82 + <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
185 - :title="title" 83 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
186 - :visible.sync="open"
187 - width="60%"
188 - :close-on-click-modal="false"
189 - :append-to-body="true"
190 - >
191 - <el-form
192 - ref="form"
193 - :model="form"
194 - :rules="rules"
195 - label-position="right"
196 - label-width="auto"
197 - >
198 <el-row> 84 <el-row>
199 <el-col :span="12"> 85 <el-col :span="12">
200 <el-form-item label="航班号" prop="fltNo"> 86 <el-form-item label="航班号" prop="fltNo">
201 - <el-input 87 + <el-input class="wid80" @blur="blurfltNo" :disabled="formdisabled.fltNo" v-model="form.fltNo"
202 - @blur="blurfltNo" 88 + placeholder="请输入航班号" maxlength="10" />
203 - :disabled="formdisabled.fltNo"
204 - style="width: 93%"
205 - v-model="form.fltNo"
206 - placeholder="请输入航班号"
207 - maxlength="10"
208 - />
209 </el-form-item> 89 </el-form-item>
210 </el-col> 90 </el-col>
211 <el-col :span="12"> 91 <el-col :span="12">
212 <el-form-item label="航班日期" prop="fltDate"> 92 <el-form-item label="航班日期" prop="fltDate">
213 - <el-date-picker 93 + <el-date-picker class="wid80" :disabled="formdisabled.fltDate" clearable size="small"
214 - :disabled="formdisabled.fltDate" 94 + v-model="form.fltDate" type="date" value-format="yyyy-MM-dd" placeholder="选择航班日期">
215 - clearable
216 - size="small"
217 - v-model="form.fltDate"
218 - type="date"
219 - value-format="yyyy-MM-dd"
220 - placeholder="选择航班日期"
221 - >
222 </el-date-picker> 95 </el-date-picker>
223 </el-form-item> 96 </el-form-item>
224 </el-col> 97 </el-col>
98 + </el-row>
99 + <el-row>
100 + <el-col :span="12">
101 + <el-form-item label="CutOff时间" prop="cutOffTime">
102 + <el-select class="wid80" v-model="form.cutOffTime" clearable placeholder="选择时间(hh:mm:ss)" type="string"
103 + filterable allow-create default-first-option>
104 + <el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
105 + </el-option>
106 + </el-select>
107 + </el-form-item>
108 + </el-col>
225 <el-col :span="12"> 109 <el-col :span="12">
226 <el-form-item label="航班路线" prop="route"> 110 <el-form-item label="航班路线" prop="route">
227 - <el-input 111 + <el-input class="wid80" v-model="form.route" placeholder="请输入航班路线" />
228 - style="width: 93%"
229 - v-model="form.route"
230 - placeholder="请输入航班路线"
231 - />
232 </el-form-item> 112 </el-form-item>
233 </el-col> 113 </el-col>
114 + </el-row>
115 + <el-row>
234 <el-col :span="12"> 116 <el-col :span="12">
235 <el-form-item label="航班种类" prop="kindId"> 117 <el-form-item label="航班种类" prop="kindId">
236 - <el-select v-model="form.kindId" placeholder="请选择航班种类"> 118 + <el-select class="wid80" v-model="form.kindId" placeholder="请选择航班种类">
237 - <el-option 119 + <el-option v-for="item in selectOption.flightKindlist" :key="item.id" :label="item.chineseName"
238 - v-for="item in selectOption.flightKindlist" 120 + :value="item.id">
239 - :key="item.id"
240 - :label="item.chineseName"
241 - :value="item.id"
242 - >
243 </el-option> 121 </el-option>
244 </el-select> 122 </el-select>
245 </el-form-item> 123 </el-form-item>
246 </el-col> 124 </el-col>
247 <el-col :span="12"> 125 <el-col :span="12">
248 <el-form-item label="航班类型" prop="typeId"> 126 <el-form-item label="航班类型" prop="typeId">
249 - <el-select v-model="form.typeId" placeholder="请选择航班类型"> 127 + <el-select class="wid80" v-model="form.typeId" placeholder="请选择航班类型">
250 - <el-option 128 + <el-option v-for="item in selectOption.flightTypelist" :key="item.id" :label="item.chineseName"
251 - v-for="item in selectOption.flightTypelist" 129 + :value="item.id">
252 - :key="item.id"
253 - :label="item.chineseName"
254 - :value="item.id"
255 - >
256 </el-option> 130 </el-option>
257 </el-select> 131 </el-select>
258 </el-form-item> 132 </el-form-item>
259 </el-col> 133 </el-col>
134 + </el-row>
135 + <el-row>
260 <el-col :span="12"> 136 <el-col :span="12">
261 <el-form-item label="航班状态" prop="statusId"> 137 <el-form-item label="航班状态" prop="statusId">
262 - <el-select 138 + <el-select class="wid80" :disabled="true" v-model="form.statusId" placeholder="请选择航班状态">
263 - :disabled="true" 139 + <el-option v-for="item in selectOption.flightStatuslist" :key="item.id" :label="item.chineseName"
264 - v-model="form.statusId" 140 + :value="item.id">
265 - placeholder="请选择航班状态"
266 - >
267 - <el-option
268 - v-for="item in selectOption.flightStatuslist"
269 - :key="item.id"
270 - :label="item.chineseName"
271 - :value="item.id"
272 - >
273 </el-option> 141 </el-option>
274 </el-select> 142 </el-select>
275 </el-form-item> 143 </el-form-item>
276 </el-col> 144 </el-col>
277 <el-col :span="12"> 145 <el-col :span="12">
278 <el-form-item label="原始重量（KG）" prop="originalWeight"> 146 <el-form-item label="原始重量（KG）" prop="originalWeight">
279 - <el-input-number 147 + <el-input-number class="wid80" @change="LowHighAvailable" :precision="0" placeholder="请输入原始重量（KG）"
280 - @change="LowHighAvailable" 148 + v-model="form.originalWeight"></el-input-number>
281 - placeholder="请输入原始重量（KG）"
282 - style="width: 93%"
283 - v-model="form.originalWeight"
284 - ></el-input-number>
285 </el-form-item> 149 </el-form-item>
286 </el-col> 150 </el-col>
151 + </el-row>
152 + <el-row>
287 <el-col :span="12"> 153 <el-col :span="12">
288 <el-form-item label="额外增重百分比" prop="extraWeightPercent"> 154 <el-form-item label="额外增重百分比" prop="extraWeightPercent">
289 - <el-input-number 155 + <el-input-number class="wid80" @change="LowHighAvailable" :precision="0" placeholder="请输入额外增重百分比"
290 - @change="LowHighAvailable" 156 + v-model="form.extraWeightPercent"></el-input-number>
291 - placeholder="请输入额外增重百分比"
292 - style="width: 93%"
293 - v-model="form.extraWeightPercent"
294 - ></el-input-number>
295 </el-form-item> 157 </el-form-item>
296 </el-col> 158 </el-col>
297 <el-col :span="12"> 159 <el-col :span="12">
298 <el-form-item label="是否开启高低价" prop="highLowPriceFlg"> 160 <el-form-item label="是否开启高低价" prop="highLowPriceFlg">
299 - <el-switch 161 + <el-switch class="wid80" @change="LowHighAvailable" v-model="form.highLowPriceFlg" :active-value="1"
300 - @change="LowHighAvailable" 162 + :inactive-value="0" active-color="#13ce66">
301 - v-model="form.highLowPriceFlg"
302 - :active-value="1"
303 - :inactive-value="0"
304 - active-color="#13ce66"
305 - >
306 </el-switch> 163 </el-switch>
307 </el-form-item> 164 </el-form-item>
308 </el-col> 165 </el-col>
166 + </el-row>
167 + <el-row>
309 <el-col :span="12"> 168 <el-col :span="12">
310 <el-form-item label="是否预审" prop="isNeedRequired"> 169 <el-form-item label="是否预审" prop="isNeedRequired">
311 - <el-switch 170 + <el-switch class="wid80" :disabled="true" v-model="form.isNeedRequired" :active-value="1"
312 - :disabled="true" 171 + :inactive-value="0" active-color="#13ce66">
313 - v-model="form.isNeedRequired"
314 - :active-value="1"
315 - :inactive-value="0"
316 - active-color="#13ce66"
317 - >
318 </el-switch> 172 </el-switch>
319 </el-form-item> 173 </el-form-item>
320 </el-col> 174 </el-col>
321 <el-col :span="12"> 175 <el-col :span="12">
322 <el-form-item label="高价百分比" prop="highPriceWeightPercent"> 176 <el-form-item label="高价百分比" prop="highPriceWeightPercent">
323 - <el-input-number 177 + <el-input-number class="wid80" :disabled="ishighPriceWeightPercent" @change="LowHighAvailable"
324 - :disabled="ishighPriceWeightPercent" 178 + placeholder="请输入高价百分比" v-model="form.highPriceWeightPercent"></el-input-number>
325 - @change="LowHighAvailable"
326 - placeholder="请输入高价百分比"
327 - style="width: 93%"
328 - v-model="form.highPriceWeightPercent"
329 - ></el-input-number>
330 </el-form-item> 179 </el-form-item>
331 </el-col> 180 </el-col>
181 + </el-row>
182 + <el-row>
332 <el-col :span="12"> 183 <el-col :span="12">
333 <el-form-item label="低价百分比" prop="lowPriceWeightPercent"> 184 <el-form-item label="低价百分比" prop="lowPriceWeightPercent">
334 - <el-input-number 185 + <el-input-number class="wid80" :disabled="true" placeholder="请输入低价百分比"
335 - :disabled="true" 186 + v-model="form.lowPriceWeightPercent"></el-input-number>
336 - placeholder="请输入低价百分比"
337 - style="width: 93%"
338 - v-model="form.lowPriceWeightPercent"
339 - ></el-input-number>
340 </el-form-item> 187 </el-form-item>
341 </el-col> 188 </el-col>
342 <el-col :span="12"> 189 <el-col :span="12">
343 <el-form-item label="高价可配重量" prop="highAvailableWeight"> 190 <el-form-item label="高价可配重量" prop="highAvailableWeight">
344 - <el-input-number 191 + <el-input-number class="wid80" :disabled="true" placeholder="请输入高价可配重量" v-model="form.highAvailableWeight"
345 - :disabled="true" 192 + :precision="2"></el-input-number>
346 - placeholder="请输入高价可配重量"
347 - style="width: 93%"
348 - v-model="form.highAvailableWeight"
349 - :precision="2"
350 - ></el-input-number>
351 </el-form-item> 193 </el-form-item>
352 </el-col> 194 </el-col>
195 + </el-row>
196 + <el-row>
353 <el-col :span="12"> 197 <el-col :span="12">
354 <el-form-item label="低价可配重量" prop="lowAvailableWeight"> 198 <el-form-item label="低价可配重量" prop="lowAvailableWeight">
355 - <el-input-number 199 + <el-input-number class="wid80" :disabled="true" placeholder="请输入低价可配重量" v-model="form.lowAvailableWeight"
356 - :disabled="true" 200 + :precision="2"></el-input-number>
357 - placeholder="请输入低价可配重量"
358 - style="width: 93%"
359 - v-model="form.lowAvailableWeight"
360 - :precision="2"
361 - ></el-input-number>
362 </el-form-item> 201 </el-form-item>
363 </el-col> 202 </el-col>
364 <el-col :span="12"> 203 <el-col :span="12">
365 <el-form-item label="高价已配重量" prop="highAllocatedWeight"> 204 <el-form-item label="高价已配重量" prop="highAllocatedWeight">
366 - <el-input-number 205 + <el-input-number class="wid80" :disabled="true" placeholder="请输入高价已配重量" v-model="form.highAllocatedWeight"
367 - :disabled="true" 206 + :precision="2"></el-input-number>
368 - placeholder="请输入高价已配重量"
369 - style="width: 93%"
370 - v-model="form.highAllocatedWeight"
371 - :precision="2"
372 - ></el-input-number>
373 </el-form-item> 207 </el-form-item>
374 </el-col> 208 </el-col>
209 + </el-row>
210 + <el-row>
375 <el-col :span="12"> 211 <el-col :span="12">
376 <el-form-item label="低价已配重量" prop="lowAllocatedWeight"> 212 <el-form-item label="低价已配重量" prop="lowAllocatedWeight">
377 - <el-input-number 213 + <el-input-number class="wid80" :disabled="true" placeholder="请输入低价已配重量" v-model="form.lowAllocatedWeight"
378 - :disabled="true" 214 + :precision="2"></el-input-number>
379 - placeholder="请输入低价已配重量"
380 - style="width: 93%"
381 - v-model="form.lowAllocatedWeight"
382 - :precision="2"
383 - ></el-input-number>
384 </el-form-item> 215 </el-form-item>
385 </el-col> 216 </el-col>
386 <el-col :span="12"> 217 <el-col :span="12">
387 <el-form-item label="已配总重量" prop="alloctedWeight"> 218 <el-form-item label="已配总重量" prop="alloctedWeight">
388 - <el-input-number 219 + <el-input-number class="wid80" :disabled="true" placeholder="请输入已配总重量" v-model="form.alloctedWeight"
389 - :disabled="true" 220 + :precision="2"></el-input-number>
390 - placeholder="请输入已配总重量"
391 - style="width: 93%"
392 - v-model="form.alloctedWeight"
393 - :precision="2"
394 - ></el-input-number>
395 </el-form-item> 221 </el-form-item>
396 </el-col> 222 </el-col>
397 </el-row> 223 </el-row>
...@@ -401,21 +227,12 @@ ...@@ -401,21 +227,12 @@
401 <el-button @click="cancel">取 消</el-button> 227 <el-button @click="cancel">取 消</el-button>
402 </div> 228 </div>
403 </el-dialog> 229 </el-dialog>
404 - <el-dialog 230 + <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible" :close-on-click-modal="false"
405 - title="未删除成功航班" 231 + :append-to-body="true">
406 - width="40%"
407 - center
408 - :visible.sync="dialogTableVisible"
409 - :close-on-click-modal="false"
410 - :append-to-body="true"
411 - >
412 <el-table :data="gridData"> 232 <el-table :data="gridData">
413 <el-table-column property="fltNo" label="航班号"></el-table-column> 233 <el-table-column property="fltNo" label="航班号"></el-table-column>
414 <el-table-column property="fltDate" label="航班日期"></el-table-column> 234 <el-table-column property="fltDate" label="航班日期"></el-table-column>
415 - <el-table-column 235 + <el-table-column property="alloctedWeight" label="已配重量"></el-table-column>
416 - property="alloctedWeight"
417 - label="已配重量"
418 - ></el-table-column>
419 </el-table> 236 </el-table>
420 </el-dialog> 237 </el-dialog>
421 </div> 238 </div>
...@@ -430,6 +247,7 @@ import { ...@@ -430,6 +247,7 @@ import {
430 saveOrUpdate, 247 saveOrUpdate,
431 findFltCommonConf, 248 findFltCommonConf,
432 updateStatusBatch, 249 updateStatusBatch,
250 + updateAutoPushBatch,
433 } from "@/api/findAllFltData"; 251 } from "@/api/findAllFltData";
434 export default { 252 export default {
435 name: "FlightInformationMaintenance", 253 name: "FlightInformationMaintenance",
...@@ -485,27 +303,6 @@ export default { ...@@ -485,27 +303,6 @@ export default {
485 //表头 303 //表头
486 tableHeader: [ 304 tableHeader: [
487 { 305 {
488 - type: "selection",
489 - name: "",
490 - value: "",
491 - width: "50",
492 - align: "center",
493 - sorTable: false,
494 - fixed: true,
495 - disabled: true,
496 - },
497 - {
498 - type: "index",
499 - name: "",
500 - value: "",
501 - width: "50",
502 - align: "center",
503 - sorTable: false,
504 - fixed: false,
505 - disabled: true,
506 - },
507 - {
508 - type: "",
509 name: "航班日期", 306 name: "航班日期",
510 value: "fltDate", 307 value: "fltDate",
511 width: "100", 308 width: "100",
...@@ -515,7 +312,6 @@ export default { ...@@ -515,7 +312,6 @@ export default {
515 disabled: true, 312 disabled: true,
516 }, 313 },
517 { 314 {
518 - type: "",
519 name: "航班起飞时间", 315 name: "航班起飞时间",
520 value: "takeOffTime", 316 value: "takeOffTime",
521 width: "120", 317 width: "120",
...@@ -525,7 +321,15 @@ export default { ...@@ -525,7 +321,15 @@ export default {
525 disabled: true, 321 disabled: true,
526 }, 322 },
527 { 323 {
528 - type: "", 324 + name: "CutOff时间",
325 + value: "cutOffTime",
326 + width: "110",
327 + align: "center",
328 + sorTable: false,
329 + fixed: false,
330 + disabled: true,
331 + },
332 + {
529 name: "航班号", 333 name: "航班号",
530 value: "fltNo", 334 value: "fltNo",
531 width: "100", 335 width: "100",
...@@ -535,7 +339,6 @@ export default { ...@@ -535,7 +339,6 @@ export default {
535 disabled: true, 339 disabled: true,
536 }, 340 },
537 { 341 {
538 - type: "",
539 name: "航班路线", 342 name: "航班路线",
540 value: "route", 343 value: "route",
541 width: "140", 344 width: "140",
...@@ -545,7 +348,6 @@ export default { ...@@ -545,7 +348,6 @@ export default {
545 disabled: true, 348 disabled: true,
546 }, 349 },
547 { 350 {
548 - type: "",
549 name: "航班类型", 351 name: "航班类型",
550 value: "typeName", 352 value: "typeName",
551 width: "100", 353 width: "100",
...@@ -555,7 +357,6 @@ export default { ...@@ -555,7 +357,6 @@ export default {
555 disabled: true, 357 disabled: true,
556 }, 358 },
557 { 359 {
558 - type: "",
559 name: "航班种类", 360 name: "航班种类",
560 value: "flightKindName", 361 value: "flightKindName",
561 width: "100", 362 width: "100",
...@@ -565,7 +366,6 @@ export default { ...@@ -565,7 +366,6 @@ export default {
565 disabled: true, 366 disabled: true,
566 }, 367 },
567 { 368 {
568 - type: "",
569 name: "航班状态", 369 name: "航班状态",
570 value: "statusName", 370 value: "statusName",
571 width: "100", 371 width: "100",
...@@ -575,7 +375,15 @@ export default { ...@@ -575,7 +375,15 @@ export default {
575 disabled: true, 375 disabled: true,
576 }, 376 },
577 { 377 {
578 - type: "", 378 + name: "是否自动推送",
379 + value: "pushDateSwitch",
380 + width: "120",
381 + align: "center",
382 + sorTable: false,
383 + fixed: false,
384 + disabled: true,
385 + },
386 + {
579 name: "总重量", 387 name: "总重量",
580 value: "totalWeight", 388 value: "totalWeight",
581 width: "90", 389 width: "90",
...@@ -585,7 +393,6 @@ export default { ...@@ -585,7 +393,6 @@ export default {
585 disabled: true, 393 disabled: true,
586 }, 394 },
587 { 395 {
588 - type: "",
589 name: "原始重量（KG）", 396 name: "原始重量（KG）",
590 value: "originalWeight", 397 value: "originalWeight",
591 width: "120", 398 width: "120",
...@@ -595,39 +402,35 @@ export default { ...@@ -595,39 +402,35 @@ export default {
595 disabled: true, 402 disabled: true,
596 }, 403 },
597 { 404 {
598 - type: "", 405 + name: "已配重量",
599 - name: "总体积(cm³)", 406 + value: "alloctedWeight",
600 - value: "totalVolume", 407 + width: "90",
601 - width: "100",
602 align: "center", 408 align: "center",
603 sorTable: false, 409 sorTable: false,
604 fixed: false, 410 fixed: false,
605 disabled: true, 411 disabled: true,
606 }, 412 },
607 { 413 {
608 - type: "", 414 + name: "是否需要预审",
609 - name: "是否限制一票一件", 415 + value: "needRequired",
610 - value: "ticketToPiece", 416 + width: "130",
611 - width: "140",
612 align: "center", 417 align: "center",
613 sorTable: false, 418 sorTable: false,
614 fixed: false, 419 fixed: false,
615 disabled: true, 420 disabled: true,
616 }, 421 },
617 { 422 {
618 - type: "", 423 + name: "是否开启高低价",
619 - name: "是否需要预审", 424 + value: "highLowPriceFlg",
620 - value: "needRequired", 425 + width: "140",
621 - width: "130",
622 align: "center", 426 align: "center",
623 sorTable: false, 427 sorTable: false,
624 fixed: false, 428 fixed: false,
625 disabled: true, 429 disabled: true,
626 }, 430 },
627 { 431 {
628 - type: "", 432 + name: "是否限制一票一件",
629 - name: "是否开启高地价", 433 + value: "ticketToPiece",
630 - value: "highLowPriceFlg",
631 width: "140", 434 width: "140",
632 align: "center", 435 align: "center",
633 sorTable: false, 436 sorTable: false,
...@@ -635,7 +438,6 @@ export default { ...@@ -635,7 +438,6 @@ export default {
635 disabled: true, 438 disabled: true,
636 }, 439 },
637 { 440 {
638 - type: "",
639 name: "额外增重百分比", 441 name: "额外增重百分比",
640 value: "extraWeightPercent", 442 value: "extraWeightPercent",
641 width: "140", 443 width: "140",
...@@ -645,7 +447,6 @@ export default { ...@@ -645,7 +447,6 @@ export default {
645 disabled: true, 447 disabled: true,
646 }, 448 },
647 { 449 {
648 - type: "",
649 name: "高价百分比", 450 name: "高价百分比",
650 value: "highPriceWeightPercent", 451 value: "highPriceWeightPercent",
651 width: "120", 452 width: "120",
...@@ -655,7 +456,6 @@ export default { ...@@ -655,7 +456,6 @@ export default {
655 disabled: true, 456 disabled: true,
656 }, 457 },
657 { 458 {
658 - type: "",
659 name: "低价百分比", 459 name: "低价百分比",
660 value: "lowPriceWeightPercent", 460 value: "lowPriceWeightPercent",
661 width: "120", 461 width: "120",
...@@ -665,17 +465,15 @@ export default { ...@@ -665,17 +465,15 @@ export default {
665 disabled: true, 465 disabled: true,
666 }, 466 },
667 { 467 {
668 - type: "", 468 + name: "总体积(cm³)",
669 - name: "已配重量", 469 + value: "totalVolume",
670 - value: "alloctedWeight", 470 + width: "100",
671 - width: "90",
672 align: "center", 471 align: "center",
673 sorTable: false, 472 sorTable: false,
674 fixed: false, 473 fixed: false,
675 disabled: true, 474 disabled: true,
676 }, 475 },
677 { 476 {
678 - type: "",
679 name: "已配体积(cm³)", 477 name: "已配体积(cm³)",
680 value: "alloctedVolume", 478 value: "alloctedVolume",
681 width: "120", 479 width: "120",
...@@ -685,7 +483,6 @@ export default { ...@@ -685,7 +483,6 @@ export default {
685 disabled: true, 483 disabled: true,
686 }, 484 },
687 { 485 {
688 - type: "",
689 name: "航班优先级", 486 name: "航班优先级",
690 value: "priorityName", 487 value: "priorityName",
691 width: "100", 488 width: "100",
...@@ -695,7 +492,6 @@ export default { ...@@ -695,7 +492,6 @@ export default {
695 disabled: true, 492 disabled: true,
696 }, 493 },
697 { 494 {
698 - type: "",
699 name: "配舱优先级", 495 name: "配舱优先级",
700 value: "priorityRuleName", 496 value: "priorityRuleName",
701 width: "100", 497 width: "100",
...@@ -705,7 +501,6 @@ export default { ...@@ -705,7 +501,6 @@ export default {
705 disabled: true, 501 disabled: true,
706 }, 502 },
707 { 503 {
708 - type: "",
709 name: "创建人", 504 name: "创建人",
710 value: "createUserName", 505 value: "createUserName",
711 width: "90", 506 width: "90",
...@@ -715,7 +510,6 @@ export default { ...@@ -715,7 +510,6 @@ export default {
715 disabled: true, 510 disabled: true,
716 }, 511 },
717 { 512 {
718 - type: "",
719 name: "创建时间", 513 name: "创建时间",
720 value: "createTime", 514 value: "createTime",
721 width: "100", 515 width: "100",
...@@ -725,7 +519,6 @@ export default { ...@@ -725,7 +519,6 @@ export default {
725 disabled: true, 519 disabled: true,
726 }, 520 },
727 { 521 {
728 - type: "",
729 name: "最后修改人", 522 name: "最后修改人",
730 value: "lastModifyUserName", 523 value: "lastModifyUserName",
731 width: "120", 524 width: "120",
...@@ -735,7 +528,6 @@ export default { ...@@ -735,7 +528,6 @@ export default {
735 disabled: true, 528 disabled: true,
736 }, 529 },
737 { 530 {
738 - type: "",
739 name: "最后修改时间", 531 name: "最后修改时间",
740 value: "lastModifyTime", 532 value: "lastModifyTime",
741 width: "120", 533 width: "120",
...@@ -804,10 +596,6 @@ export default { ...@@ -804,10 +596,6 @@ export default {
804 sourceFlightAndFlightDate: [], 596 sourceFlightAndFlightDate: [],
805 //高价百分比是否打开 597 //高价百分比是否打开
806 ishighPriceWeightPercent: true, 598 ishighPriceWeightPercent: true,
807 - //非单个禁用
808 - //single: true,
809 - //非多个禁用
810 - multiple: true,
811 //遮罩层 599 //遮罩层
812 loading: false, 600 loading: false,
813 //遮罩层 601 //遮罩层
...@@ -830,6 +618,8 @@ export default { ...@@ -830,6 +618,8 @@ export default {
830 }, 618 },
831 created() { 619 created() {
832 //查询条件数据源 620 //查询条件数据源
621 + let date = new Date()
622 + this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${(date.getDate()) > 9 ? date.getDate() : '0' + (date.getDate())}`
833 this.findFltConditionData(); 623 this.findFltConditionData();
834 if (this.$store.state.tagsView.cachedViews.length == 0) { 624 if (this.$store.state.tagsView.cachedViews.length == 0) {
835 this.findAllFltData(); 625 this.findAllFltData();
...@@ -838,8 +628,8 @@ export default { ...@@ -838,8 +628,8 @@ export default {
838 activated() { 628 activated() {
839 this.findAllFltData(); 629 this.findAllFltData();
840 }, 630 },
841 - deactivated(){ 631 + deactivated() {
842 - this.findAllFltDatList = [] 632 + this.findAllFltDatList = [];
843 }, 633 },
844 mounted() { 634 mounted() {
845 window.addEventListener("keydown", (code) => { 635 window.addEventListener("keydown", (code) => {
...@@ -853,7 +643,7 @@ export default { ...@@ -853,7 +643,7 @@ export default {
853 } 643 }
854 }); 644 });
855 this.tableHeight = 645 this.tableHeight =
856 - window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 150; 646 + window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
857 }, 647 },
858 methods: { 648 methods: {
859 //输入航班号后 649 //输入航班号后
...@@ -949,7 +739,6 @@ export default { ...@@ -949,7 +739,6 @@ export default {
949 /** 航班信息维护查询*/ 739 /** 航班信息维护查询*/
950 findAllFltData() { 740 findAllFltData() {
951 this.ids = []; 741 this.ids = [];
952 - this.multiple = true;
953 this.loading = true; 742 this.loading = true;
954 if (this.queryParams.pageNum > 1) { 743 if (this.queryParams.pageNum > 1) {
955 this.queryParams.limitStart = 744 this.queryParams.limitStart =
...@@ -997,9 +786,9 @@ export default { ...@@ -997,9 +786,9 @@ export default {
997 //原始重量 786 //原始重量
998 this.formdisabled.originalWeight = false; 787 this.formdisabled.originalWeight = false;
999 }, 788 },
1000 - //计算高地价可配 789 + //计算高低价可配
1001 LowHighAvailable() { 790 LowHighAvailable() {
1002 - //判断是否开启高地价 791 + //判断是否开启高低价
1003 if (this.form.highLowPriceFlg) { 792 if (this.form.highLowPriceFlg) {
1004 this.ishighPriceWeightPercent = false; 793 this.ishighPriceWeightPercent = false;
1005 let Weight = 0; 794 let Weight = 0;
...@@ -1014,15 +803,15 @@ export default { ...@@ -1014,15 +803,15 @@ export default {
1014 if (this.form.highPriceWeightPercent >= 0) { 803 if (this.form.highPriceWeightPercent >= 0) {
1015 this.$set( 804 this.$set(
1016 this.form, 805 this.form,
1017 - "lowPriceWeightPercent",
1018 - 100 - this.form.highPriceWeightPercent
1019 - );
1020 - this.$set(
1021 - this.form,
1022 "highAvailableWeight", 806 "highAvailableWeight",
1023 (Weight - this.form.alloctedWeight) * 807 (Weight - this.form.alloctedWeight) *
1024 (this.form.highPriceWeightPercent / 100) 808 (this.form.highPriceWeightPercent / 100)
1025 ); 809 );
810 + this.$set(
811 + this.form,
812 + "lowPriceWeightPercent",
813 + 100 - this.form.highPriceWeightPercent
814 + );
1026 // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100) 815 // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
1027 } else if ( 816 } else if (
1028 this.title == "修改航班信息" && 817 this.title == "修改航班信息" &&
...@@ -1083,9 +872,7 @@ export default { ...@@ -1083,9 +872,7 @@ export default {
1083 Weightall() { 872 Weightall() {
1084 let Weight = 0; 873 let Weight = 0;
1085 if (this.form.extraWeightPercent > 0) { 874 if (this.form.extraWeightPercent > 0) {
1086 - Weight = 875 + Weight = this.form.originalWeight * (this.form.extraWeightPercent / 100) + this.form.originalWeight;
1087 - this.form.originalWeight +
1088 - this.form.originalWeight * (this.form.extraWeightPercent / 100);
1089 } else { 876 } else {
1090 Weight = this.form.originalWeight; 877 Weight = this.form.originalWeight;
1091 } 878 }
...@@ -1104,12 +891,12 @@ export default { ...@@ -1104,12 +891,12 @@ export default {
1104 findFltById(row).then((response) => { 891 findFltById(row).then((response) => {
1105 if (response.code == 200) { 892 if (response.code == 200) {
1106 this.form = response.data; 893 this.form = response.data;
1107 - //是否开启高地价 894 + //是否开启高低价
1108 // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false; 895 // this.form.highLowPriceFlg = this.form.highLowPriceFlg === 1 ? true : false;
1109 //是否预审 896 //是否预审
1110 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false; 897 // this.form.isNeedRequired = this.form.isNeedRequired === 1 ? true : false;
1111 - // 计算高地价可配 898 + // 计算高低价可配
1112 - this.LowHighAvailable(); 899 + // this.LowHighAvailable();
1113 } else { 900 } else {
1114 this.msgError(response.msg); 901 this.msgError(response.msg);
1115 } 902 }
...@@ -1117,7 +904,11 @@ export default { ...@@ -1117,7 +904,11 @@ export default {
1117 }, 904 },
1118 /** 删除按钮操作 */ 905 /** 删除按钮操作 */
1119 handleDelete(row) { 906 handleDelete(row) {
1120 - const fIds = this.ids; 907 + let fIds = [];
908 + this.ids.forEach(item => {
909 + fIds.push(item.id)
910 + })
911 + console.log(fIds)
1121 this.$confirm("是否确认删除所选数据?", "警告", { 912 this.$confirm("是否确认删除所选数据?", "警告", {
1122 confirmButtonText: "确定", 913 confirmButtonText: "确定",
1123 cancelButtonText: "取消", 914 cancelButtonText: "取消",
...@@ -1139,12 +930,12 @@ export default { ...@@ -1139,12 +930,12 @@ export default {
1139 .then(() => { 930 .then(() => {
1140 this.dialogTableVisible = true; 931 this.dialogTableVisible = true;
1141 }) 932 })
1142 - .catch(() => {}); 933 + .catch(() => { });
1143 } else { 934 } else {
1144 this.msgSuccess(response.msg); 935 this.msgSuccess(response.msg);
1145 } 936 }
1146 }) 937 })
1147 - .catch(() => {}); 938 + .catch(() => { });
1148 }, 939 },
1149 /** 提交按钮 */ 940 /** 提交按钮 */
1150 submitForm: function () { 941 submitForm: function () {
...@@ -1174,10 +965,12 @@ export default { ...@@ -1174,10 +965,12 @@ export default {
1174 this.$message.warning("已删除的航班无法修改"); 965 this.$message.warning("已删除的航班无法修改");
1175 return; 966 return;
1176 } 967 }
1177 - //是否开启高地价 968 + //是否开启高低价
1178 // formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0; 969 // formdata.highLowPriceFlg = formdata.highLowPriceFlg ? 1 : 0;
1179 //是否预审 970 //是否预审
1180 // formdata.isNeedRequired = formdata.isNeedRequired ? 1 : 0; 971 // formdata.isNeedRequired = formdata.isNeedRequired ? 1 : 0;
972 + //总重量更新
973 + // formdata.totalWeight = this.Weightall()
1181 //处理数据 974 //处理数据
1182 saveOrUpdate(formdata).then((response) => { 975 saveOrUpdate(formdata).then((response) => {
1183 if (response.code === 200) { 976 if (response.code === 200) {
...@@ -1216,14 +1009,22 @@ export default { ...@@ -1216,14 +1009,22 @@ export default {
1216 //批量开启/关闭航班 1009 //批量开启/关闭航班
1217 handleFlightStatus(status) { 1010 handleFlightStatus(status) {
1218 let handle = status == "flightStatus80" ? "关闭" : "开启"; 1011 let handle = status == "flightStatus80" ? "关闭" : "开启";
1219 - if (this.ids.length == 0) { 1012 + let data = {
1220 - this.msgError("请选择批量" + handle + "的航班"); 1013 + updateIds: [],
1221 - return; 1014 + };
1222 - } 1015 + this.ids.map(item => {
1223 - let data = {};
1224 data.status = status; 1016 data.status = status;
1225 - data.updateIds = this.ids; 1017 + if (status === 'flightStatus80') {
1226 - 1018 + if (item.statusName === '已开启') {
1019 + data.updateIds.push(item.id)
1020 + }
1021 + } else {
1022 + if (item.statusName === '已关闭') {
1023 + data.updateIds.push(item.id)
1024 + }
1025 + }
1026 + })
1027 + if (data.updateIds.length > 0) {
1227 updateStatusBatch(data).then((response) => { 1028 updateStatusBatch(data).then((response) => {
1228 if (response.code === 200) { 1029 if (response.code === 200) {
1229 this.msgSuccess(handle + "成功"); 1030 this.msgSuccess(handle + "成功");
...@@ -1232,16 +1033,52 @@ export default { ...@@ -1232,16 +1033,52 @@ export default {
1232 this.msgError(response.msg); 1033 this.msgError(response.msg);
1233 } 1034 }
1234 }); 1035 });
1036 + }
1037 + },
1038 + //自动推送开关
1039 + autoPushBatch(status) {
1040 + let msg = status == "open" ? "开启" : "关闭";
1041 + let data = {
1042 + updateIds: [],
1043 + };
1044 + this.ids.map((item) => {
1045 + if (status === "open") {
1046 + data.status = "1";
1047 + if (item.pushDateSwitch != "1") {
1048 + data.updateIds.push(item.id);
1049 + }
1050 + } else if (status === "close") {
1051 + data.status = "2";
1052 + if (item.pushDateSwitch != "2") {
1053 + data.updateIds.push(item.id);
1054 + }
1055 + }
1056 + });
1057 + if (data.updateIds.length > 0) {
1058 + updateAutoPushBatch(data)
1059 + .then((res) => {
1060 + if (res.code === 200) {
1061 + this.msgSuccess(`自动推送${msg}成功`);
1062 + this.findAllFltData();
1063 + } else {
1064 + this.msgError(res.msg);
1065 + }
1066 + })
1067 + .catch(err => {
1068 + this.msgError(err);
1069 + });
1070 + } else {
1071 + this.msgSuccess(`自动推送${msg}成功`);
1072 + this.findAllFltData();
1073 + }
1235 }, 1074 },
1236 //多选框选中数据 1075 //多选框选中数据
1237 tableSelect(val) { 1076 tableSelect(val) {
1238 - this.ids = val.selection.map((item) => item.id); 1077 + this.ids = val.selection;
1239 - this.multiple = !val.selection.length;
1240 }, 1078 },
1241 //全选 1079 //全选
1242 tableSelectAll(val) { 1080 tableSelectAll(val) {
1243 - this.ids = val.selection.map((item) => item.id); 1081 + this.ids = val;
1244 - this.multiple = !val.selection.length;
1245 }, 1082 },
1246 //分页 1083 //分页
1247 currentChange(val) { 1084 currentChange(val) {
...@@ -1263,12 +1100,12 @@ export default { ...@@ -1263,12 +1100,12 @@ export default {
1263 1100
1264 <style> 1101 <style>
1265 .el-table--striped .el-table__body tr.el-table__row--striped.current-row td, 1102 .el-table--striped .el-table__body tr.el-table__row--striped.current-row td,
1266 -.el-table__body tr.current-row > td { 1103 +.el-table__body tr.current-row>td {
1267 background-color: #a0cfff; 1104 background-color: #a0cfff;
1268 } 1105 }
1269 1106
1270 -.el-table--striped .el-table__body tr.hover-row.el-table__row--striped > td, 1107 +.el-table--striped .el-table__body tr.hover-row.el-table__row--striped>td,
1271 -.el-table__body tr.hover-row > td { 1108 +.el-table__body tr.hover-row>td {
1272 background-color: #d9ecff !important; 1109 background-color: #d9ecff !important;
1273 } 1110 }
1274 </style> 1111 </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="medium"
4 - ref="cargoForm" 4 + :model="formData">
5 - class="form-header" 5 + <el-row type="flex" style="flexWrap: wrap !important">
6 - label-position="right"
7 - label-width="auto"
8 - size="small"
9 - :model="formData"
10 - >
11 - <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 - >
23 </el-date-picker> 10 </el-date-picker>
24 </el-form-item> 11 </el-form-item>
25 </el-col> 12 </el-col>
26 <el-col :span="6"> 13 <el-col :span="6">
27 <el-form-item label="配载航班号"> 14 <el-form-item label="配载航班号">
28 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :autosize="true"></el-input> 15 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
16 + clearable></el-input>
29 </el-form-item> 17 </el-form-item>
30 </el-col> 18 </el-col>
31 <el-col :span="6"> 19 <el-col :span="6">
32 <el-form-item label="海关回执状态"> 20 <el-form-item label="海关回执状态">
33 - <el-select 21 + <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
34 - placeholder="不限" 22 + <el-option v-for="item in findConditionData.cargoCustomsReturnStatus" :label="item.chineseName"
35 - v-model="formData.customsReceiptStatusId" 23 + :value="item.id" :key="item.id">
36 - class="formItem"
37 - multiple
38 - clearable
39 - >
40 - <el-option
41 - v-for="item in findConditionData.cargoCustomsReturnStatus"
42 - :label="item.chineseName"
43 - :value="item.id"
44 - :key="item.id"
45 - >
46 </el-option> 24 </el-option>
47 </el-select> 25 </el-select>
48 </el-form-item> 26 </el-form-item>
49 </el-col> 27 </el-col>
50 <el-col :span="6"> 28 <el-col :span="6">
51 <el-form-item label="运单号"> 29 <el-form-item label="运单号">
52 - <el-input 30 + <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
53 - type="textarea" 31 + placeholder="请输入运单号（回车间隔）" :rows="1" :maxlength="12000" clearable></el-input>
54 - v-model="formData.waybillNo"
55 - class="formItem"
56 - placeholder="请输入运单号（回车间隔）"
57 - :autosize="true"
58 - ></el-input>
59 </el-form-item> 32 </el-form-item>
60 </el-col> 33 </el-col>
61 <el-col :span="6"> 34 <el-col :span="6">
62 <el-form-item label="申报类别"> 35 <el-form-item label="申报类别">
63 - <el-select 36 + <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
64 - placeholder="不限" 37 + <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
65 - v-model="formData.typeId" 38 + :key="item.id">
66 - class="formItem"
67 - clearable
68 - >
69 - <el-option
70 - v-for="item in findConditionData.cargoType"
71 - :label="item.chineseName"
72 - :value="item.id"
73 - :key="item.id"
74 - >
75 </el-option> 39 </el-option>
76 </el-select> 40 </el-select>
77 </el-form-item> 41 </el-form-item>
78 </el-col> 42 </el-col>
79 <el-col :span="6"> 43 <el-col :span="6">
80 <el-form-item label="服务类型"> 44 <el-form-item label="服务类型">
81 - <el-select 45 + <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" filterable clearable>
82 - placeholder="不限" 46 + <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
83 - v-model="formData.serviceTypeId" 47 + :key="item.id">
84 - class="formItem"
85 - filterable
86 - clearable
87 - >
88 - <el-option
89 - v-for="item in findConditionData.cargoServiceType"
90 - :label="item.chineseName"
91 - :value="item.id"
92 - :key="item.id"
93 - >
94 </el-option> 48 </el-option>
95 </el-select> 49 </el-select>
96 </el-form-item> 50 </el-form-item>
97 </el-col> 51 </el-col>
98 <el-col :span="6"> 52 <el-col :span="6">
99 <el-form-item label="URSA"> 53 <el-form-item label="URSA">
100 - <el-input 54 + <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
101 - type="textarea" 55 + </el-input>
102 - v-model="ursa"
103 - class="formItem"
104 - placeholder="S_;P_;E2"
105 - :autosize="true"
106 - ></el-input>
107 </el-form-item> 56 </el-form-item>
108 </el-col> 57 </el-col>
109 <el-col :span="6"> 58 <el-col :span="6">
110 <el-form-item label="站点"> 59 <el-form-item label="站点">
111 - <el-input 60 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
112 - type="textarea" 61 + </el-input>
113 - v-model="siteName"
114 - class="formItem"
115 - placeholder="PVG;PEK"
116 - :autosize="true"
117 - ></el-input>
118 </el-form-item> 62 </el-form-item>
119 </el-col> 63 </el-col>
120 - <el-col :span="24" v-show="formShow"> 64 + <el-col v-show="formShow">
121 - <el-row type="flex" style="flexWrap: wrap!important"> 65 + <el-row type="flex" style="flexWrap: wrap !important">
122 <el-col :span="6"> 66 <el-col :span="6">
123 <el-form-item label="ACCS原航班日期"> 67 <el-form-item label="ACCS原航班日期">
124 - <el-date-picker 68 + <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
125 - class="formItem" 69 + start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
126 - v-model="flightTime"
127 - type="daterange"
128 - range-separator="至"
129 - start-placeholder="开始日期"
130 - end-placeholder="结束日期"
131 - :value-format="valueFormat"
132 - >
133 </el-date-picker> 70 </el-date-picker>
134 </el-form-item> 71 </el-form-item>
135 </el-col> 72 </el-col>
136 <el-col :span="6"> 73 <el-col :span="6">
137 <el-form-item label="ACCS原航班号"> 74 <el-form-item label="ACCS原航班号">
138 - <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input> 75 + <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
139 </el-form-item> 76 </el-form-item>
140 </el-col> 77 </el-col>
141 <el-col :span="6"> 78 <el-col :span="6">
142 <el-form-item label="取件日期"> 79 <el-form-item label="取件日期">
143 - <el-date-picker 80 + <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
144 - v-model="formData.pickUpDate" 81 + :value-format="valueFormat" clearable>
145 - type="date"
146 - placeholder="选择日期"
147 - :value-format="valueFormat"
148 - >
149 </el-date-picker> 82 </el-date-picker>
150 </el-form-item> 83 </el-form-item>
151 </el-col> 84 </el-col>
152 <el-col :span="6"> 85 <el-col :span="6">
153 <el-form-item label="创建日期"> 86 <el-form-item label="创建日期">
154 - <el-date-picker 87 + <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
155 - class="formItem" 88 + start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
156 - v-model="createDate"
157 - type="daterange"
158 - range-separator="至"
159 - start-placeholder="开始日期"
160 - end-placeholder="结束日期"
161 - :value-format="valueFormat"
162 - >
163 </el-date-picker> 89 </el-date-picker>
164 </el-form-item> 90 </el-form-item>
165 </el-col> 91 </el-col>
166 <el-col :span="6"> 92 <el-col :span="6">
93 + <el-form-item label="ACCSpool">
94 + <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
95 + <el-option value="Pre-MDE" key="Pre-MDE">
96 + </el-option>
97 + <el-option value="OSPR" key="OSPR">
98 + </el-option>
99 + <el-option value="Manifest" key="Manifest">
100 + </el-option>
101 + </el-select>
102 + </el-form-item>
103 + </el-col>
104 + <el-col :span="6">
167 <el-form-item label="货物状态"> 105 <el-form-item label="货物状态">
168 - <el-select 106 + <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
169 - placeholder="不限" 107 + <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
170 - v-model="formData.statusId" 108 + :key="item.id">
171 - class="formItem"
172 - filterable
173 - clearable
174 - >
175 - <el-option
176 - v-for="item in findConditionData.cargoStatus"
177 - :label="item.chineseName"
178 - :value="item.id"
179 - :key="item.id"
180 - >
181 </el-option> 109 </el-option>
182 </el-select> 110 </el-select>
183 </el-form-item> 111 </el-form-item>
184 </el-col> 112 </el-col>
185 <el-col :span="6"> 113 <el-col :span="6">
186 <el-form-item label="是否自动"> 114 <el-form-item label="是否自动">
187 - <el-select 115 + <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
188 - placeholder="不限" 116 + <el-option label="手动" value="1"> </el-option>
189 - v-model="formData.allocationTypeId" 117 + <el-option label="自动" value="2"> </el-option>
190 - class="formItem" 118 + </el-select>
191 - clearable 119 + </el-form-item>
192 - > 120 + </el-col>
193 - <el-option 121 + <el-col :span="6">
194 - label="手动" 122 + <el-form-item label="配舱状态">
195 - value="1" 123 + <el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
196 - > 124 + <el-option label="已配" value="1"> </el-option>
197 - </el-option> 125 + <el-option label="未配" value="0"> </el-option>
198 - <el-option
199 - label="自动"
200 - value="2"
201 - >
202 - </el-option>
203 </el-select> 126 </el-select>
204 </el-form-item> 127 </el-form-item>
205 </el-col> 128 </el-col>
206 </el-row> 129 </el-row>
207 </el-col> 130 </el-col>
208 </el-row> 131 </el-row>
209 - <div style="paddingLeft: 10px;marginTop:20px"> 132 + <div style="paddingLeft: 10px; marginTop: 20px">
210 - <el-button 133 + <el-button type="primary" icon="el-icon-search" size="small" :loading="tableLoading" @click="select(0)">查询
211 - type="primary" 134 + </el-button>
212 - icon="el-icon-search" 135 + <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
213 - size="small" 136 + size="small" @click="xlse(0)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
214 - :loading="tableLoading" 137 + downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
215 - @click="select(0)" 138 + }}</el-button>
216 - >查询</el-button 139 + <el-button v-hasPermi="['base:cargo:export']" :type="downLoadingTip.downloading ? 'warning' : 'primary'"
217 - > 140 + size="small" @click="xlse(1)" :disabled="tableData.length == 0" :loading="downLoadingTip.downloading">{{
218 - <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']" 141 + downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
219 - >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button 142 + }}</el-button>
220 - > 143 + <el-button type="primary" size="small" :disabled="selectTable.length == 0" v-hasPermi="['base:cargo:release']"
221 - <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading" v-hasPermi="['base:cargo:export']" 144 + @click="release">释放舱位</el-button>
222 - >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button 145 + <span style="marginLeft: 20px; color: #ffba00">全部导出上限80000条数据</span>
223 - > 146 + <el-progress v-if="progress != 0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress"
224 - <span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span> 147 + :status="progress == 100 ? 'success' : 'warning'"></el-progress>
225 - <el-progress v-if="progress!=0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress>
226 <div class="tips"> 148 <div class="tips">
227 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 149 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
228 <span>总件数:{{ allQty }}</span> 150 <span>总件数:{{ allQty }}</span>
229 </div> 151 </div>
230 - <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div> 152 + <div class="formShow" @click="formShow = !formShow">
153 + <i class="el-icon-s-tools"></i>{{ formShow ? "收起条件" : "更多条件" }}
154 + </div>
231 </div> 155 </div>
232 </el-form> 156 </el-form>
233 - <Tables 157 + <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :infoData="tableHeader"
234 - ref="newTables" 158 + :selection="true" :order="true" :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize"
235 - :data="tableData" 159 + :limitStart="limitStart" :page="page" :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight"
236 - :headerData="tableHeader" 160 + @sizeChange="sizeChange" @tableSelect="tableSelect" @tableSelectAll="tableSelectAll"
237 - :totalCount="totalCount" 161 + @currentChange="currentChange" @sortChange="sortChange"></Tables>
238 - :loading="tableLoading" 162 + <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
239 - :limitSize="limitSize" 163 + :show-close="false" :append-to-body="true">
240 - :limitStart="limitStart" 164 + <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
241 - :page="page" 165 + <el-table-column type="index" label="序号" align="center">
242 - :shiftKey="shiftKey" 166 + </el-table-column>
243 - :height="tableHeight" 167 + <el-table-column v-for="(item, index) in releaseHeader" header-align="center" :align="item.align"
244 - @tableSelect="tableSelect" 168 + :prop="item.value" :label="item.name" :width="item.width" :key="index" :show-overflow-tooltip="true">
245 - @tableSelectAll="tableSelectAll" 169 + </el-table-column>
246 - @currentChange="currentChange" 170 + </el-table>
247 - @sortChange="sortChange" 171 + <div slot="footer">
248 - ></Tables> 172 + <el-button type="primary" @click="close">确 定</el-button>
173 + </div>
174 + </el-dialog>
249 </div> 175 </div>
250 </template> 176 </template>
251 177
252 <script> 178 <script>
253 -import { findConditionData, findCargoData } from "@/api/cargoSelect"; 179 +import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
254 import { downLoadXlsx } from "@/utils/zipdownload"; 180 import { downLoadXlsx } from "@/utils/zipdownload";
255 -import { upCase } from "@/utils/FedEx" 181 +import { upCase } from "@/utils/FedEx";
256 182
257 export default { 183 export default {
258 - name:"QueryCargo", 184 + name: "QueryCargo",
259 data() { 185 data() {
260 return { 186 return {
261 formData: { 187 formData: {
...@@ -266,6 +192,7 @@ export default { ...@@ -266,6 +192,7 @@ export default {
266 createTimeStart: null, 192 createTimeStart: null,
267 createTimeEnd: null, 193 createTimeEnd: null,
268 pickUpDate: null, 194 pickUpDate: null,
195 + hasFlight: null,
269 waybillNo: "", 196 waybillNo: "",
270 siteName: "", 197 siteName: "",
271 fltNo: "", 198 fltNo: "",
...@@ -280,454 +207,478 @@ export default { ...@@ -280,454 +207,478 @@ export default {
280 dataSources: "", 207 dataSources: "",
281 customsReceiptStatusId: null, 208 customsReceiptStatusId: null,
282 big: null, 209 big: null,
283 - cargoPlaneNo:null, 210 + cargoPlaneNo: null,
284 - cargoPlaneStart:null, 211 + cargoPlaneStart: null,
285 - cargoPlaneEnd:null, 212 + cargoPlaneEnd: null,
286 limitStart: 1, 213 limitStart: 1,
287 - limitSize:100, 214 + limitSize: 100,
288 }, //表单数据 215 }, //表单数据
289 tableHeader: [ 216 tableHeader: [
290 { 217 {
291 - type: "selection",
292 - name: "",
293 - value: "",
294 - width: "50",
295 - align: "center",
296 - sorTable: false,
297 - fixed: true,
298 - disabled:true
299 - },
300 - {
301 - type: "index",
302 - name: "",
303 - value: "",
304 - width: "50",
305 - align: "center",
306 - sorTable: false,
307 - fixed: false,
308 - disabled:true
309 - },
310 - {
311 - type: "",
312 name: "口岸代码", 218 name: "口岸代码",
313 value: "portName", 219 value: "portName",
314 - width: "120", 220 + width: "100",
315 align: "center", 221 align: "center",
316 sorTable: true, 222 sorTable: true,
317 fixed: false, 223 fixed: false,
318 - disabled:true 224 + disabled: true,
319 }, 225 },
320 { 226 {
321 - type: "",
322 name: "取件日期", 227 name: "取件日期",
323 value: "pickUpDate", 228 value: "pickUpDate",
324 width: "120", 229 width: "120",
325 align: "center", 230 align: "center",
326 sorTable: true, 231 sorTable: true,
327 fixed: false, 232 fixed: false,
328 - disabled:true 233 + disabled: true
329 }, 234 },
330 { 235 {
331 - type: "",
332 name: "取件扫描号", 236 name: "取件扫描号",
333 value: "pickUpScanNo", 237 value: "pickUpScanNo",
334 width: "120", 238 width: "120",
335 align: "center", 239 align: "center",
336 sorTable: true, 240 sorTable: true,
337 fixed: false, 241 fixed: false,
338 - disabled:true 242 + disabled: true
339 }, 243 },
340 { 244 {
341 - type: "",
342 name: "站点", 245 name: "站点",
343 value: "siteName", 246 value: "siteName",
344 width: "80", 247 width: "80",
345 align: "center", 248 align: "center",
346 sorTable: true, 249 sorTable: true,
347 fixed: false, 250 fixed: false,
348 - disabled:true 251 + disabled: true
349 }, 252 },
350 { 253 {
351 - type: "",
352 name: "运单号", 254 name: "运单号",
353 value: "waybillNo", 255 value: "waybillNo",
354 - width: "150", 256 + width: "120",
355 align: "center", 257 align: "center",
356 sorTable: true, 258 sorTable: true,
357 fixed: false, 259 fixed: false,
358 - disabled:true 260 + disabled: true
359 }, 261 },
360 { 262 {
361 - type: "",
362 name: "总单号", 263 name: "总单号",
363 value: "totalWaybillNo", 264 value: "totalWaybillNo",
364 - width: "150", 265 + width: "120",
365 align: "center", 266 align: "center",
366 sorTable: true, 267 sorTable: true,
367 fixed: false, 268 fixed: false,
368 - disabled:true 269 + disabled: true
369 }, 270 },
370 { 271 {
371 - type: "",
372 name: "服务类型", 272 name: "服务类型",
373 value: "serviceTypeName", 273 value: "serviceTypeName",
374 width: "100", 274 width: "100",
375 align: "center", 275 align: "center",
376 sorTable: true, 276 sorTable: true,
377 fixed: false, 277 fixed: false,
378 - disabled:true 278 + disabled: true
379 }, 279 },
380 { 280 {
381 - type: "",
382 name: "服务代码", 281 name: "服务代码",
383 value: "serviceCode", 282 value: "serviceCode",
384 - width: "90", 283 + width: "100",
385 align: "center", 284 align: "center",
386 sorTable: false, 285 sorTable: false,
387 fixed: false, 286 fixed: false,
388 - disabled:true 287 + disabled: true
389 }, 288 },
390 { 289 {
391 - type: "",
392 name: "URSA", 290 name: "URSA",
393 value: "ursa", 291 value: "ursa",
394 width: "100", 292 width: "100",
395 align: "center", 293 align: "center",
396 sorTable: true, 294 sorTable: true,
397 fixed: false, 295 fixed: false,
398 - disabled:true 296 + disabled: true
297 + },
298 + {
299 + name: "推送状态",
300 + value: "cargoAllocationDataStatus",
301 + width: "100",
302 + align: "center",
303 + sorTable: true,
304 + fixed: false,
305 + disabled: true
306 + },
307 + {
308 + name: "配舱状态",
309 + value: "flightIdImac",
310 + width: "100",
311 + align: "center",
312 + sorTable: true,
313 + fixed: false,
314 + disabled: true
315 + },
316 + {
317 + name: "释放状态",
318 + value: "releasing",
319 + width: "100",
320 + align: "center",
321 + sorTable: true,
322 + fixed: false,
323 + disabled: true
399 }, 324 },
400 { 325 {
401 - type: "",
402 name: "申报类型", 326 name: "申报类型",
403 value: "typeName", 327 value: "typeName",
404 width: "100", 328 width: "100",
405 align: "center", 329 align: "center",
406 sorTable: true, 330 sorTable: true,
407 fixed: false, 331 fixed: false,
408 - disabled:true 332 + disabled: true
333 + },
334 + {
335 + name: "ACCSpool",
336 + value: "accsPool",
337 + width: "120",
338 + align: "center",
339 + sorTable: true,
340 + fixed: false,
341 + disabled: true
409 }, 342 },
410 { 343 {
411 - type: "",
412 name: "HandlingCode", 344 name: "HandlingCode",
413 value: "handingCode", 345 value: "handingCode",
414 width: "150", 346 width: "150",
415 align: "center", 347 align: "center",
416 sorTable: true, 348 sorTable: true,
417 fixed: false, 349 fixed: false,
418 - disabled:true 350 + disabled: true
419 }, 351 },
420 { 352 {
421 - type: "",
422 name: "subcategory", 353 name: "subcategory",
423 value: "subCategory", 354 value: "subCategory",
424 - width: "150", 355 + width: "140",
425 align: "center", 356 align: "center",
426 sorTable: true, 357 sorTable: true,
427 fixed: false, 358 fixed: false,
428 - disabled:true 359 + disabled: true
429 }, 360 },
430 { 361 {
431 - type: "",
432 name: "件数", 362 name: "件数",
433 value: "qty", 363 value: "qty",
434 width: "80", 364 width: "80",
435 align: "center", 365 align: "center",
436 sorTable: true, 366 sorTable: true,
437 fixed: false, 367 fixed: false,
438 - disabled:true 368 + disabled: true
439 }, 369 },
440 { 370 {
441 - type: "",
442 name: "实际重量", 371 name: "实际重量",
443 value: "actualWeight", 372 value: "actualWeight",
444 width: "100", 373 width: "100",
445 align: "center", 374 align: "center",
446 sorTable: true, 375 sorTable: true,
447 fixed: false, 376 fixed: false,
448 - disabled:true 377 + disabled: true
449 }, 378 },
450 { 379 {
451 - type: "",
452 name: "收件人国家代码", 380 name: "收件人国家代码",
453 value: "consigneeCountry", 381 value: "consigneeCountry",
454 width: "150", 382 width: "150",
455 align: "center", 383 align: "center",
456 sorTable: true, 384 sorTable: true,
457 fixed: false, 385 fixed: false,
458 - disabled:true 386 + disabled: true
459 }, 387 },
460 { 388 {
461 - type: "",
462 name: "品名描述", 389 name: "品名描述",
463 value: "nameDescription", 390 value: "nameDescription",
464 width: "100", 391 width: "100",
465 align: "center", 392 align: "center",
466 sorTable: false, 393 sorTable: false,
467 fixed: false, 394 fixed: false,
468 - disabled:true 395 + disabled: true
469 }, 396 },
470 { 397 {
471 - type: "",
472 name: "海关回执状态", 398 name: "海关回执状态",
473 value: "customsReceiptStatusName", 399 value: "customsReceiptStatusName",
474 width: "140", 400 width: "140",
475 align: "center", 401 align: "center",
476 sorTable: true, 402 sorTable: true,
477 fixed: false, 403 fixed: false,
478 - disabled:true 404 + disabled: true
479 }, 405 },
480 { 406 {
481 - type: "",
482 name: "预审状态", 407 name: "预审状态",
483 value: "preQualificationStatus", 408 value: "preQualificationStatus",
484 width: "100", 409 width: "100",
485 align: "center", 410 align: "center",
486 sorTable: true, 411 sorTable: true,
487 fixed: false, 412 fixed: false,
488 - disabled:true 413 + disabled: true
489 }, 414 },
490 { 415 {
491 - type: "",
492 name: "航班预审意见", 416 name: "航班预审意见",
493 value: "caPretrialOpinion", 417 value: "caPretrialOpinion",
494 - width: "140", 418 + width: "120",
495 align: "center", 419 align: "center",
496 sorTable: false, 420 sorTable: false,
497 fixed: false, 421 fixed: false,
498 - disabled:true 422 + disabled: true
499 }, 423 },
500 { 424 {
501 - type: "",
502 name: "货物状态", 425 name: "货物状态",
503 value: "statusName", 426 value: "statusName",
504 width: "100", 427 width: "100",
505 align: "center", 428 align: "center",
506 sorTable: true, 429 sorTable: true,
507 fixed: false, 430 fixed: false,
508 - disabled:true 431 + disabled: true
509 }, 432 },
510 { 433 {
511 - type: "",
512 name: "终配航班号", 434 name: "终配航班号",
513 value: "finalFlightNo", 435 value: "finalFlightNo",
514 - width: "130", 436 + width: "120",
515 align: "center", 437 align: "center",
516 sorTable: true, 438 sorTable: true,
517 fixed: false, 439 fixed: false,
518 - disabled:true 440 + disabled: true
519 }, 441 },
520 { 442 {
521 - type: "",
522 name: "终配航班日期", 443 name: "终配航班日期",
523 value: "finalFlightTime", 444 value: "finalFlightTime",
524 - width: "150", 445 + width: "140",
525 align: "center", 446 align: "center",
526 sorTable: true, 447 sorTable: true,
527 fixed: false, 448 fixed: false,
528 - disabled:true 449 + disabled: true
529 }, 450 },
530 { 451 {
531 - type: "",
532 name: "二配航班号", 452 name: "二配航班号",
533 value: "twoMatchFlightNo", 453 value: "twoMatchFlightNo",
534 - width: "130", 454 + width: "120",
535 align: "center", 455 align: "center",
536 sorTable: true, 456 sorTable: true,
537 fixed: false, 457 fixed: false,
538 - disabled:true 458 + disabled: true
539 }, 459 },
540 { 460 {
541 - type: "",
542 name: "二配航班日期", 461 name: "二配航班日期",
543 value: "twoMatchFlightTime", 462 value: "twoMatchFlightTime",
544 width: "150", 463 width: "150",
545 align: "center", 464 align: "center",
546 sorTable: true, 465 sorTable: true,
547 fixed: false, 466 fixed: false,
548 - disabled:true 467 + disabled: true
549 }, 468 },
550 { 469 {
551 - type: "",
552 name: "预配航班号", 470 name: "预配航班号",
553 value: "preplanFlightNo", 471 value: "preplanFlightNo",
554 - width: "130", 472 + width: "120",
555 align: "center", 473 align: "center",
556 sorTable: true, 474 sorTable: true,
557 fixed: false, 475 fixed: false,
558 - disabled:true 476 + disabled: true
559 }, 477 },
560 { 478 {
561 - type: "",
562 name: "预配航班日期", 479 name: "预配航班日期",
563 value: "preplanFlightTime", 480 value: "preplanFlightTime",
564 width: "150", 481 width: "150",
565 align: "center", 482 align: "center",
566 sorTable: true, 483 sorTable: true,
567 fixed: false, 484 fixed: false,
568 - disabled:true 485 + disabled: true
569 }, 486 },
570 { 487 {
571 - type: "",
572 name: "ACCS原航班号", 488 name: "ACCS原航班号",
573 value: "fltNoAccs", 489 value: "fltNoAccs",
574 - width: "140", 490 + width: "150",
575 align: "center", 491 align: "center",
576 sorTable: true, 492 sorTable: true,
577 fixed: false, 493 fixed: false,
578 - disabled:true 494 + disabled: true
579 }, 495 },
580 { 496 {
581 - type: "",
582 name: "ACCS原航班日期", 497 name: "ACCS原航班日期",
583 value: "fltDateAccs", 498 value: "fltDateAccs",
584 width: "150", 499 width: "150",
585 align: "center", 500 align: "center",
586 sorTable: true, 501 sorTable: true,
587 fixed: false, 502 fixed: false,
588 - disabled:true 503 + disabled: true
589 }, 504 },
590 { 505 {
591 - type: "",
592 name: "ACCS原航线", 506 name: "ACCS原航线",
593 value: "accsFlightRoute", 507 value: "accsFlightRoute",
594 - width: "150", 508 + width: "140",
595 align: "center", 509 align: "center",
596 sorTable: true, 510 sorTable: true,
597 fixed: false, 511 fixed: false,
598 - disabled:true 512 + disabled: true
599 }, 513 },
600 { 514 {
601 - type: "",
602 name: "是否RDE手工录入", 515 name: "是否RDE手工录入",
603 value: "manualRde", 516 value: "manualRde",
604 width: "170", 517 width: "170",
605 align: "center", 518 align: "center",
606 sorTable: true, 519 sorTable: true,
607 fixed: false, 520 fixed: false,
608 - disabled:true 521 + disabled: true
609 }, 522 },
610 { 523 {
611 - type: "",
612 name: "是否自动", 524 name: "是否自动",
613 value: "cargoRulesStatus", 525 value: "cargoRulesStatus",
614 width: "100", 526 width: "100",
615 align: "center", 527 align: "center",
616 sorTable: true, 528 sorTable: true,
617 fixed: false, 529 fixed: false,
618 - disabled:true 530 + disabled: true
619 }, 531 },
620 { 532 {
621 - type: "",
622 name: "发件人账号", 533 name: "发件人账号",
623 value: "shipperAccount", 534 value: "shipperAccount",
624 - width: "150", 535 + width: "120",
625 align: "center", 536 align: "center",
626 sorTable: false, 537 sorTable: false,
627 fixed: false, 538 fixed: false,
628 - disabled:true 539 + disabled: true
629 }, 540 },
630 { 541 {
631 - type: "",
632 name: "发件公司中文名称", 542 name: "发件公司中文名称",
633 value: "shipperCompany", 543 value: "shipperCompany",
634 width: "150", 544 width: "150",
635 align: "center", 545 align: "center",
636 sorTable: false, 546 sorTable: false,
637 fixed: false, 547 fixed: false,
638 - disabled:true 548 + disabled: true
639 }, 549 },
640 { 550 {
641 - type: "",
642 name: "始发地城市名称", 551 name: "始发地城市名称",
643 value: "originCity", 552 value: "originCity",
644 - width: "150", 553 + width: "130",
645 align: "center", 554 align: "center",
646 sorTable: false, 555 sorTable: false,
647 fixed: false, 556 fixed: false,
648 - disabled:true 557 + disabled: true
649 }, 558 },
650 { 559 {
651 - type: "",
652 name: "收件地", 560 name: "收件地",
653 value: "destinationSiteName", 561 value: "destinationSiteName",
654 width: "90", 562 width: "90",
655 align: "center", 563 align: "center",
656 sorTable: false, 564 sorTable: false,
657 fixed: false, 565 fixed: false,
658 - disabled:true 566 + disabled: true
659 }, 567 },
660 { 568 {
661 - type: "",
662 name: "尺寸", 569 name: "尺寸",
663 value: "sizeStr", 570 value: "sizeStr",
664 width: "80", 571 width: "80",
665 align: "center", 572 align: "center",
666 sorTable: true, 573 sorTable: true,
667 fixed: false, 574 fixed: false,
668 - disabled:true 575 + disabled: true
669 }, 576 },
670 { 577 {
671 - type: "",
672 name: "大货预审意见（是否可以配置航班）", 578 name: "大货预审意见（是否可以配置航班）",
673 value: "bigPretrialOpinion", 579 value: "bigPretrialOpinion",
674 width: "250", 580 width: "250",
675 align: "center", 581 align: "center",
676 sorTable: false, 582 sorTable: false,
677 fixed: false, 583 fixed: false,
678 - disabled:true 584 + disabled: true
679 }, 585 },
680 { 586 {
681 - type: "",
682 name: "大货预审时间", 587 name: "大货预审时间",
683 value: "bigPretrialTime", 588 value: "bigPretrialTime",
684 - width: "150", 589 + width: "120",
685 align: "center", 590 align: "center",
686 sorTable: false, 591 sorTable: false,
687 fixed: false, 592 fixed: false,
688 - disabled:true 593 + disabled: true
689 }, 594 },
690 { 595 {
691 - type: "",
692 name: "海关回执时间", 596 name: "海关回执时间",
693 value: "customsReceiptTime", 597 value: "customsReceiptTime",
694 width: "150", 598 width: "150",
695 align: "center", 599 align: "center",
696 sorTable: true, 600 sorTable: true,
697 fixed: false, 601 fixed: false,
698 - disabled:true 602 + disabled: true
699 }, 603 },
700 { 604 {
701 - type: "",
702 name: "航班预审时间", 605 name: "航班预审时间",
703 value: "caPretrialTime", 606 value: "caPretrialTime",
704 width: "150", 607 width: "150",
705 align: "center", 608 align: "center",
706 sorTable: true, 609 sorTable: true,
707 fixed: false, 610 fixed: false,
708 - disabled:true 611 + disabled: true
709 }, 612 },
710 { 613 {
711 - type: "",
712 name: "创建人", 614 name: "创建人",
713 value: "createUserName", 615 value: "createUserName",
714 width: "90", 616 width: "90",
715 align: "center", 617 align: "center",
716 sorTable: true, 618 sorTable: true,
717 fixed: false, 619 fixed: false,
718 - disabled:true 620 + disabled: true
719 }, 621 },
720 { 622 {
721 - type: "",
722 name: "创建时间", 623 name: "创建时间",
723 value: "createTime", 624 value: "createTime",
724 - width: "120", 625 + width: "100",
725 align: "center", 626 align: "center",
726 sorTable: true, 627 sorTable: true,
727 fixed: false, 628 fixed: false,
728 - disabled:true 629 + disabled: true
729 }, 630 },
730 ], //表头数据 631 ], //表头数据
632 + releaseHeader: [
633 + {
634 + name: "提示信息",
635 + value: "msg",
636 + width: "550",
637 + align: "center",
638 + },
639 + {
640 + name: "口岸代码",
641 + value: "portName",
642 + width: "",
643 + align: "center",
644 + },
645 + {
646 + name: "运单号",
647 + value: "waybillNo",
648 + width: "",
649 + align: "center",
650 + },
651 + {
652 + name: "释放状态",
653 + value: "releasing",
654 + width: "",
655 + align: "center",
656 + },
657 + {
658 + name: "ACCSpool",
659 + value: "accsPool",
660 + width: "",
661 + align: "center",
662 + },
663 + {
664 + name: "货物状态",
665 + value: "statusName",
666 + width: "",
667 + align: "center",
668 + },
669 + {
670 + name: "ACCS原航班号",
671 + value: "fltNoAccs",
672 + width: "",
673 + align: "center",
674 + },
675 + {
676 + name: "ACCS原航班日期",
677 + value: "fltDateAccs",
678 + width: "",
679 + align: "center",
680 + },
681 + ],
731 findConditionData: {}, //货物查询条件 682 findConditionData: {}, //货物查询条件
732 tableData: [], //表格数据 683 tableData: [], //表格数据
733 allWeight: 0, 684 allWeight: 0,
...@@ -735,22 +686,23 @@ export default { ...@@ -735,22 +686,23 @@ export default {
735 shiftKey: false, 686 shiftKey: false,
736 valueFormat: "yyyy-MM-dd", 687 valueFormat: "yyyy-MM-dd",
737 tableLoading: false, 688 tableLoading: false,
738 - downLoadingTip:{ 689 + downLoadingTip: {
739 - tip:"", 690 + tip: "",
740 - downloading:false, 691 + downloading: false,
741 - }, 692 + }, //导出状态
742 totalCount: 0, 693 totalCount: 0,
743 selectTable: [], 694 selectTable: [],
744 flightTime: [], 695 flightTime: [],
745 prepalyFlightTime: [], 696 prepalyFlightTime: [],
746 - cargoPlaneTime:[], 697 + cargoPlaneTime: [],
747 createDate: [], 698 createDate: [],
748 limitStart: 1, 699 limitStart: 1,
749 limitSize: 100, //无限制-1 700 limitSize: 100, //无限制-1
750 - page:1, 701 + page: 1,
751 - progress:0, 702 + progress: 0,
752 - tableHeight:null, 703 + tableHeight: null,
753 - formShow:true, 704 + dialogVisible: false,
705 + formShow: true, //菜单隐藏
754 }; 706 };
755 }, 707 },
756 created() { 708 created() {
...@@ -768,16 +720,16 @@ export default { ...@@ -768,16 +720,16 @@ export default {
768 }, 720 },
769 721
770 activated() { 722 activated() {
771 - if(this.$store.state.tagsView.cachedViews.length > 0 ){ 723 + if (this.$store.state.tagsView.cachedViews.length > 0) {
772 - this.$store.state.tagsView.cachedViews.forEach(item=>{ 724 + this.$store.state.tagsView.cachedViews.forEach(item => {
773 - if(item === 'QueryCargo'){ 725 + if (item === 'QueryCargo') {
774 - this.totalCount>0?this.select():'' 726 + this.totalCount > 0 ? this.select() : ''
775 } 727 }
776 }) 728 })
777 } 729 }
778 }, 730 },
779 731
780 - deactivated(){ 732 + deactivated() {
781 this.tableData = [] 733 this.tableData = []
782 }, 734 },
783 735
...@@ -792,9 +744,13 @@ export default { ...@@ -792,9 +744,13 @@ export default {
792 this.shiftKey = false; 744 this.shiftKey = false;
793 } 745 }
794 }); 746 });
795 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight-80 747 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
748 + },
749 + watch: {
750 + formShow(val, oldVal) {
751 + this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
752 + }
796 }, 753 },
797 -
798 methods: { 754 methods: {
799 clear() { 755 clear() {
800 this.$refs.cargoForm.resetFields(); 756 this.$refs.cargoForm.resetFields();
...@@ -806,12 +762,13 @@ export default { ...@@ -806,12 +762,13 @@ export default {
806 this.allQty = 0; 762 this.allQty = 0;
807 this.tableLoading = true; 763 this.tableLoading = true;
808 this.dataInfo(); 764 this.dataInfo();
809 - if(val === 0){ 765 + if (val === 0) {
810 this.formData.limitStart = 1; 766 this.formData.limitStart = 1;
811 this.limitStart = 1; 767 this.limitStart = 1;
812 this.page = 1; 768 this.page = 1;
813 } 769 }
814 - findCargoData(this.formData).then((res) => { 770 + findCargoData(this.formData)
771 + .then((res) => {
815 if (res.code == 200) { 772 if (res.code == 200) {
816 this.tableData = res.data.list; 773 this.tableData = res.data.list;
817 this.totalCount = res.data.totalCount; 774 this.totalCount = res.data.totalCount;
...@@ -832,136 +789,200 @@ export default { ...@@ -832,136 +789,200 @@ export default {
832 }); 789 });
833 } 790 }
834 this.tableLoading = false; 791 this.tableLoading = false;
835 - }).catch(()=>{ 792 + })
793 + .catch(() => {
836 this.tableLoading = false; 794 this.tableLoading = false;
837 }); 795 });
838 this.$refs.newTables.clearTable(); 796 this.$refs.newTables.clearTable();
839 this.cargoTotal(); 797 this.cargoTotal();
840 }, 798 },
799 + //释放仓位
800 + release() {
801 + let idList = []
802 + this.selectTable.map(item => {
803 + item.msg = ''
804 + idList.push(item.id)
805 + })
806 + releaseCargo(idList).then(res => {
807 + if (res.code === 200) {
808 + this.$message({
809 + message: res.msg,
810 + type: "success",
811 + });
812 + } else if (res.code === 201) {
813 + this.selectTable.map(item => {
814 + res.data['success'].map(val => {
815 + val === item.id ? item.msg = item.msg + '操作成功,正在释放中。' : ''
816 + })
817 + res.data['accsPoolFlase'].map(val => {
818 + val === item.id ? item.msg = item.msg + 'Manifest状态不能释放。' : ''
819 + })
820 + res.data['existReleasing'].map(val => {
821 + val === item.id ? item.msg = item.msg + '正在释放中，请勿重复释放。' : ''
822 + })
823 + res.data['noFlight'].map(val => {
824 + val === item.id ? item.msg = item.msg + '已释放仓位。' : ''
825 + })
826 + res.data['pushFalse'].map(val => {
827 + console.log(item)
828 + val === item.id ? item.msg = item.msg + '该货物配舱结果已回推ACCS，不能释放。' : ''
829 + })
830 + })
831 + this.dialogVisible = true
832 + } else {
833 + this.$message({
834 + message: res.msg,
835 + type: "warning",
836 + });
837 + }
838 + }).catch(err => {
839 + console.log(err)
840 + })
841 + },
842 + //关闭弹窗
843 + close() {
844 + this.dialogVisible = false
845 + this.selectTable = []
846 + this.select()
847 + },
841 //数据初始化 848 //数据初始化
842 - dataInfo(){ 849 + dataInfo() {
843 - if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){ 850 + if (
851 + this.formData.customsReceiptStatusId != null &&
852 + this.formData.customsReceiptStatusId.length < 1
853 + ) {
844 this.formData.customsReceiptStatusId = null; 854 this.formData.customsReceiptStatusId = null;
845 } 855 }
846 if (this.createDate != null && this.createDate.length > 0) { 856 if (this.createDate != null && this.createDate.length > 0) {
847 this.formData.createTimeStart = this.createDate[0]; 857 this.formData.createTimeStart = this.createDate[0];
848 this.formData.createTimeEnd = this.createDate[1]; 858 this.formData.createTimeEnd = this.createDate[1];
849 - }else{ 859 + } else {
850 this.formData.createTimeStart = null; 860 this.formData.createTimeStart = null;
851 this.formData.createTimeEnd = null; 861 this.formData.createTimeEnd = null;
852 } 862 }
853 if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) { 863 if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
854 this.formData.prematchFltDateStart = this.prepalyFlightTime[0]; 864 this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
855 this.formData.prematchFltDateEnd = this.prepalyFlightTime[1]; 865 this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
856 - }else{ 866 + } else {
857 - this.formData.prematchFltDateStart =""; 867 + this.formData.prematchFltDateStart = "";
858 this.formData.prematchFltDateEnd = ""; 868 this.formData.prematchFltDateEnd = "";
859 } 869 }
860 if (this.flightTime != null && this.flightTime.length > 0) { 870 if (this.flightTime != null && this.flightTime.length > 0) {
861 this.formData.fltDateStart = this.flightTime[0]; 871 this.formData.fltDateStart = this.flightTime[0];
862 this.formData.fltDateEnd = this.flightTime[1]; 872 this.formData.fltDateEnd = this.flightTime[1];
863 - }else{ 873 + } else {
864 this.formData.fltDateStart = ""; 874 this.formData.fltDateStart = "";
865 this.formData.fltDateEnd = ""; 875 this.formData.fltDateEnd = "";
866 } 876 }
867 - if(this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0){ 877 + if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) {
868 this.formData.cargoPlaneStart = this.cargoPlaneTime[0]; 878 this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
869 this.formData.cargoPlaneEnd = this.cargoPlaneTime[1]; 879 this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
870 - }else{ 880 + } else {
871 this.formData.cargoPlaneStart = null; 881 this.formData.cargoPlaneStart = null;
872 this.formData.cargoPlaneEnd = null; 882 this.formData.cargoPlaneEnd = null;
873 } 883 }
874 - if(this.formData.waybillNo){ 884 + if (this.formData.waybillNo) {
875 this.formData.waybillNo = this.formData.waybillNo.trim(); 885 this.formData.waybillNo = this.formData.waybillNo.trim();
876 } 886 }
887 + if (this.formData.hasFlight == "") {
888 + this.formData.hasFlight = null
889 + }
877 this.formData.limitStart = this.limitStart; 890 this.formData.limitStart = this.limitStart;
878 this.formData.limitSize = 100; 891 this.formData.limitSize = 100;
879 }, 892 },
880 //总和 893 //总和
881 - cargoTotal(){ 894 + cargoTotal() {
882 this.allWeight = 0; 895 this.allWeight = 0;
883 this.allQty = 0; 896 this.allQty = 0;
884 - if(this.selectTable.length > 0){ 897 + if (this.selectTable.length > 0) {
885 - this.selectTable.forEach(item=>{ 898 + this.selectTable.forEach((item) => {
886 this.allWeight = this.allWeight + item.actualWeight; 899 this.allWeight = this.allWeight + item.actualWeight;
887 this.allQty = this.allQty + item.qty; 900 this.allQty = this.allQty + item.qty;
888 - }) 901 + });
889 this.allWeight = this.allWeight.toFixed(2); 902 this.allWeight = this.allWeight.toFixed(2);
890 this.allQty = this.allQty.toFixed(); 903 this.allQty = this.allQty.toFixed();
891 } 904 }
892 }, 905 },
893 //表格多选 906 //表格多选
894 - tableSelect(val){ 907 + tableSelect(val) {
895 this.selectTable = val.selection; 908 this.selectTable = val.selection;
896 this.cargoTotal(); 909 this.cargoTotal();
897 }, 910 },
898 //表格全选 911 //表格全选
899 - tableSelectAll(val){ 912 + tableSelectAll(val) {
900 this.selectTable = val; 913 this.selectTable = val;
901 this.cargoTotal(); 914 this.cargoTotal();
902 }, 915 },
903 //分页 916 //分页
904 - currentChange(val){ 917 + currentChange(val) {
905 this.formData.limitStart = val.start; 918 this.formData.limitStart = val.start;
906 this.limitStart = val.start; 919 this.limitStart = val.start;
907 this.page = val.page; 920 this.page = val.page;
908 - this.select() 921 + this.select();
909 }, 922 },
910 //排序 923 //排序
911 - sortChange(val){ 924 + sortChange(val) {
912 - let data = [] 925 + let data = [];
913 - let nullData = [] 926 + let nullData = [];
914 - this.tableData.forEach(item=>{ 927 + this.tableData.forEach((item) => {
915 - if(item[val.prop]){ 928 + if (item[val.prop]) {
916 - data.push(item) 929 + data.push(item);
917 - }else{ 930 + } else {
918 - nullData.push(item) 931 + nullData.push(item);
919 } 932 }
920 - }) 933 + });
921 - data = data.sort(this.$refs.newTables.compare(val.prop,val.order)) 934 + data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
922 - if(val.order != "ascending"){ 935 + if (val.order != "ascending") {
923 - this.tableData = nullData.concat(data) 936 + this.tableData = nullData.concat(data);
924 - }else{ 937 + } else {
925 - this.tableData = data.concat(nullData) 938 + this.tableData = data.concat(nullData);
926 } 939 }
927 this.tableData.forEach((item, index = 0) => { 940 this.tableData.forEach((item, index = 0) => {
928 item.index = index; 941 item.index = index;
929 }); 942 });
930 }, 943 },
944 + sizeChange(val) {
945 + this.limitSize = val
946 + this.select(0);
947 + },
931 // 导出表格 948 // 导出表格
932 xlse(page) { 949 xlse(page) {
933 this.progress = 1; 950 this.progress = 1;
934 this.downLoadingTip.downloading = true; 951 this.downLoadingTip.downloading = true;
935 - let cargoXlse = {title:"货物导出表",cargoConditionDto:{}}; 952 + let cargoXlse = { title: "货物导出表", cargoConditionDto: {} };
936 this.dataInfo(); 953 this.dataInfo();
937 cargoXlse.cargoConditionDto = this.formData; 954 cargoXlse.cargoConditionDto = this.formData;
938 cargoXlse.cargoConditionDto.limitSize = this.limitSize; 955 cargoXlse.cargoConditionDto.limitSize = this.limitSize;
939 956
940 if (page == 0) { 957 if (page == 0) {
941 - this.downLoadingTip.tip = "正在导出本页结果集" 958 + this.downLoadingTip.tip = "正在导出本页结果集";
942 cargoXlse.cargoConditionDto.limitStart = this.limitStart; 959 cargoXlse.cargoConditionDto.limitStart = this.limitStart;
943 - downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{ 960 + downLoadXlsx("/cargo/excel", cargoXlse, "货物表")
961 + .then(() => {
944 this.downLoadingTip.downloading = false; 962 this.downLoadingTip.downloading = false;
945 - this.downLoadingTip.tip = "" 963 + this.downLoadingTip.tip = "";
946 this.progress = 100; 964 this.progress = 100;
947 - }).catch(()=>{ 965 + })
966 + .catch(() => {
948 this.downLoadingTip.downloading = false; 967 this.downLoadingTip.downloading = false;
949 this.downLoadingTip.tip = ""; 968 this.downLoadingTip.tip = "";
950 - }) 969 + });
951 } else { 970 } else {
952 - if(this.totalCount < 80000){ 971 + if (this.totalCount < 80000) {
953 - this.downLoadingTip.tip = "正在导出全部结果集请耐心等待" 972 + this.downLoadingTip.tip = "正在导出全部结果集请耐心等待";
954 cargoXlse.cargoConditionDto.limitStart = 0; 973 cargoXlse.cargoConditionDto.limitStart = 0;
955 cargoXlse.cargoConditionDto.limitSize = -1; 974 cargoXlse.cargoConditionDto.limitSize = -1;
956 - downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{ 975 + downLoadXlsx("/cargo/excel", cargoXlse, "货物表")
976 + .then(() => {
957 this.downLoadingTip.downloading = false; 977 this.downLoadingTip.downloading = false;
958 - this.downLoadingTip.tip = "" 978 + this.downLoadingTip.tip = "";
959 this.progress = 100; 979 this.progress = 100;
960 - }).catch(()=>{
961 - this.downLoadingTip.downloading = false;
962 - this.downLoadingTip.tip = ""
963 }) 980 })
964 - }else{ 981 + .catch(() => {
982 + this.downLoadingTip.downloading = false;
983 + this.downLoadingTip.tip = "";
984 + });
985 + } else {
965 this.downLoadingTip.downloading = false; 986 this.downLoadingTip.downloading = false;
966 this.$message({ 987 this.$message({
967 message: "导出数据量过大，请不要超过8万条", 988 message: "导出数据量过大，请不要超过8万条",
...@@ -996,19 +1017,19 @@ export default { ...@@ -996,19 +1017,19 @@ export default {
996 this.formData.ursa = upCase(val); 1017 this.formData.ursa = upCase(val);
997 }, 1018 },
998 }, 1019 },
999 - cargoPlaneNo:{ 1020 + cargoPlaneNo: {
1000 get: function () { 1021 get: function () {
1001 return this.formData.cargoPlaneNo; 1022 return this.formData.cargoPlaneNo;
1002 }, 1023 },
1003 set: function (val) { 1024 set: function (val) {
1004 this.formData.cargoPlaneNo = upCase(val); 1025 this.formData.cargoPlaneNo = upCase(val);
1005 }, 1026 },
1006 - } 1027 + },
1007 }, 1028 },
1008 }; 1029 };
1009 </script> 1030 </script>
1010 1031
1011 -<style scoped> 1032 +<style lang="scss" scoped>
1012 .tips { 1033 .tips {
1013 display: inline-block; 1034 display: inline-block;
1014 color: #606266; 1035 color: #606266;
...@@ -1016,19 +1037,21 @@ export default { ...@@ -1016,19 +1037,21 @@ export default {
1016 margin-top: 10px; 1037 margin-top: 10px;
1017 margin-left: 50px; 1038 margin-left: 50px;
1018 } 1039 }
1019 -.progress{ 1040 +
1020 - width:200px; 1041 +.progress {
1042 + width: 200px;
1021 display: inline-block; 1043 display: inline-block;
1022 - margin:0 0 0 20px; 1044 + margin: 0 0 0 20px;
1023 } 1045 }
1024 -.formShow{ 1046 +
1047 +.formShow {
1025 width: max-content; 1048 width: max-content;
1026 - height:48px; 1049 + height: 48px;
1027 line-height: 48px; 1050 line-height: 48px;
1028 font-weight: 900; 1051 font-weight: 900;
1029 color: rgb(64, 158, 255); 1052 color: rgb(64, 158, 255);
1030 font-size: 14px; 1053 font-size: 14px;
1031 float: right; 1054 float: right;
1032 - margin-right:20px; 1055 + margin-right: 20px;
1033 } 1056 }
1034 </style> 1057 </style>
...\ No newline at end of file ...\ No newline at end of file
......
1 <template> 1 <template>
2 <div class="menuDrawer"> 2 <div class="menuDrawer">
3 - <el-dialog 3 + <el-dialog :title="drawerTitle" width="50%" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 - :title="drawerTitle" 4 + :append-to-body="true">
5 - width="50%" 5 + <el-form ref="userForm" :model="menuForm" :disabled="menuFormDisabled" :rules="rules" label-width="auto"
6 - :visible.sync="dialogVisible" 6 + style="margin: 10px">
7 - :close-on-click-modal="false"
8 - :append-to-body="true"
9 - >
10 - <el-form
11 - ref="userForm"
12 - :model="menuForm"
13 - :disabled="menuFormDisabled"
14 - :rules="rules"
15 - label-width="auto"
16 - style="margin: 10px"
17 - >
18 <el-row> 7 <el-row>
19 <el-col :span="12"> 8 <el-col :span="12">
20 <el-form-item label="菜单名称" prop=""> 9 <el-form-item label="菜单名称" prop="">
...@@ -48,12 +37,8 @@ ...@@ -48,12 +37,8 @@
48 </el-col> 37 </el-col>
49 <el-col :span="24"> 38 <el-col :span="24">
50 <el-form-item label="菜单状态" prop=""> 39 <el-form-item label="菜单状态" prop="">
51 - <el-switch 40 + <el-switch v-model="menuData.menuStatus" active-color="#13ce66" inactive-color="#ff4949"
52 - v-model="menuData.menuStatus" 41 + :disabled="menuFormDisabled"></el-switch>
53 - active-color="#13ce66"
54 - inactive-color="#ff4949"
55 - :disabled="menuFormDisabled"
56 - ></el-switch>
57 </el-form-item> 42 </el-form-item>
58 </el-col> 43 </el-col>
59 <el-col :span="24"> 44 <el-col :span="24">
...@@ -114,15 +99,15 @@ export default { ...@@ -114,15 +99,15 @@ export default {
114 data() { 99 data() {
115 return { 100 return {
116 menuForm: {}, 101 menuForm: {},
117 - rules:{} 102 + rules: {}
118 }; 103 };
119 }, 104 },
120 updated() { 105 updated() {
121 this.menuForm = this.menuData; 106 this.menuForm = this.menuData;
122 }, 107 },
123 - watch:{ 108 + watch: {
124 - dialogVisible(val,oldVal){ 109 + dialogVisible(val, oldVal) {
125 - if(val){ 110 + if (val) {
126 this.menuForm = this.menuData; 111 this.menuForm = this.menuData;
127 } 112 }
128 } 113 }
...@@ -134,7 +119,7 @@ export default { ...@@ -134,7 +119,7 @@ export default {
134 selected(val) { 119 selected(val) {
135 console.log(val); 120 console.log(val);
136 }, 121 },
137 - submit() {}, 122 + submit() { },
138 }, 123 },
139 }; 124 };
140 </script> 125 </script>
......
...@@ -8,78 +8,34 @@ ...@@ -8,78 +8,34 @@
8 >新增菜单</el-button 8 >新增菜单</el-button
9 > 9 >
10 </div> --> 10 </div> -->
11 - <el-table 11 + <el-table :data="data" row-key="id" fit border stripe highlightCurrentRow v-loading="loading" default-expand-all
12 - :data="data" 12 + :tree-props="{ children: 'children', hasChildren: 'hasChildren' }">
13 - row-key="id"
14 - fit
15 - border
16 - stripe
17 - highlightCurrentRow
18 - v-loading="loading"
19 - default-expand-all
20 - :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
21 - >
22 <template v-for="(item, index) in tableHeader"> 13 <template v-for="(item, index) in tableHeader">
23 - <el-table-column 14 + <el-table-column v-if="item.value === 'menuType'" :prop="item.value" :label="item.name" :key="index"
24 - v-if="item.value === 'menuType'" 15 + :align="item.align" header-align="center" showOverflowTooltip :width="item.width" :formatter="formatter">
25 - :prop="item.value"
26 - :label="item.name"
27 - :key="index"
28 - :align="item.align"
29 - header-align="center"
30 - showOverflowTooltip
31 - :width="item.width"
32 - :formatter="formatter"
33 - >
34 <template slot-scope="scope"> 16 <template slot-scope="scope">
35 - <el-tag 17 + <el-tag :type="scope.row.menuType === 'B' ? '' : 'success'" disable-transitions>{{ scope.row.menuType ===
36 - :type="scope.row.menuType === 'B' ? '' : 'success'" 18 + "B" ? "按钮" : "菜单"
37 - disable-transitions 19 + }}</el-tag>
38 - >{{ scope.row.menuType === "B" ? "按钮" : "菜单" }}</el-tag
39 - >
40 </template> 20 </template>
41 </el-table-column> 21 </el-table-column>
42 - <el-table-column 22 + <el-table-column v-else :prop="item.value" :label="item.name" :key="index" :align="item.align"
43 - v-else 23 + header-align="center" showOverflowTooltip :width="item.width" :formatter="formatter">
44 - :prop="item.value"
45 - :label="item.name"
46 - :key="index"
47 - :align="item.align"
48 - header-align="center"
49 - showOverflowTooltip
50 - :width="item.width"
51 - :formatter="formatter"
52 - >
53 </el-table-column> 24 </el-table-column>
54 </template> 25 </template>
55 26
56 - <el-table-column 27 + <el-table-column header-align="center" align="center" label="操作" width="auto">
57 - header-align="center"
58 - align="center"
59 - label="操作"
60 - width="auto"
61 - >
62 <template slot-scope="scope"> 28 <template slot-scope="scope">
63 <!-- <el-button type="success" size="mini" @click="buttonClick(scope)">修改</el-button> 29 <!-- <el-button type="success" size="mini" @click="buttonClick(scope)">修改</el-button>
64 <el-button type="primary" size="mini" @click="buttonClick(scope)" 30 <el-button type="primary" size="mini" @click="buttonClick(scope)"
65 >查看</el-button 31 >查看</el-button
66 > --> 32 > -->
67 - <el-button 33 + <el-button :type="scope.row.status == 1 ? 'warning' : 'primary'" v-hasPermi="['system:menu:openClose']"
68 - :type="scope.row.status == 1 ? 'warning' : 'primary'" 34 + size="mini" @click="menuStatus(scope)" v-if="scope.row.menuType == 'C'">{{ scope.row.status == 1 ? "停用菜单" :
69 - v-hasPermi="['system:menu:openClose']" 35 + "启用菜单"
70 - size="mini" 36 + }}</el-button>
71 - @click="menuStatus(scope)" 37 + <el-button type="danger" size="mini" v-hasPermi="['system:menu:delete']" @click="removeMenu(scope)"
72 - v-if="scope.row.menuType == 'C'" 38 + v-if="scope.row.menuType == 'C'">删除菜单</el-button>
73 - >{{ scope.row.status == 1 ? "停用菜单" : "启用菜单" }}</el-button
74 - >
75 - <el-button
76 - type="danger"
77 - size="mini"
78 - v-hasPermi="['system:menu:delete']"
79 - @click="removeMenu(scope)"
80 - v-if="scope.row.menuType == 'C'"
81 - >删除菜单</el-button
82 - >
83 </template> 39 </template>
84 </el-table-column> 40 </el-table-column>
85 </el-table> 41 </el-table>
...@@ -144,7 +100,7 @@ export default { ...@@ -144,7 +100,7 @@ export default {
144 { 100 {
145 name: "菜单名", 101 name: "菜单名",
146 value: "title", 102 value: "title",
147 - width: "200", 103 + width: "",
148 align: "left", 104 align: "left",
149 sorTable: false, 105 sorTable: false,
150 }, 106 },
...@@ -275,7 +231,7 @@ export default { ...@@ -275,7 +231,7 @@ export default {
275 data.status = row.row.status == 1 ? "2" : "1"; 231 data.status = row.row.status == 1 ? "2" : "1";
276 this.statusUpdate(data); 232 this.statusUpdate(data);
277 }) 233 })
278 - .catch(() => {}); 234 + .catch(() => { });
279 }, 235 },
280 236
281 //菜单删除 237 //菜单删除
...@@ -291,13 +247,13 @@ export default { ...@@ -291,13 +247,13 @@ export default {
291 data.status = "0"; 247 data.status = "0";
292 this.statusUpdate(data); 248 this.statusUpdate(data);
293 }) 249 })
294 - .catch(() => {}); 250 + .catch(() => { });
295 }, 251 },
296 252
297 formatter(row, column, cellValue, index) { 253 formatter(row, column, cellValue, index) {
298 - if (dictLabels[column.property]) { 254 + if (dictLabels["menu"][column.property]) {
299 - if (dictLabels[column.property][cellValue]) { 255 + if (dictLabels["menu"][column.property][cellValue]) {
300 - return dictLabels[column.property][cellValue]; 256 + return dictLabels["menu"][column.property][cellValue];
301 } 257 }
302 } 258 }
303 return cellValue; 259 return cellValue;
......
1 <template> 1 <template>
2 <div class="roleDrawer"> 2 <div class="roleDrawer">
3 - <el-drawer 3 + <el-drawer :title="drawerTitle" :visible.sync="drawer" direction="rtl" size="40%" destroy-on-close
4 - :title="drawerTitle" 4 + :close-on-click-modal="false" :wrapperClosable="false" :show-close="false">
5 - :visible.sync="drawer" 5 + <el-form ref="roleForm" :model="roleForm" label-width="auto" :rules="rules" size="mini" style="margin: 10px">
6 - direction="rtl"
7 - size="40%"
8 - destroy-on-close
9 - :close-on-click-modal="false"
10 - :wrapperClosable="false"
11 - :show-close="false"
12 - >
13 - <el-form
14 - ref="roleForm"
15 - :model="roleForm"
16 - label-width="auto"
17 - :rules="rules"
18 - size="mini"
19 - style="margin: 10px"
20 - >
21 <el-row :gutter="10"> 6 <el-row :gutter="10">
22 <el-col :span="12"> 7 <el-col :span="12">
23 <el-form-item label="角色名:" prop="name"> 8 <el-form-item label="角色名:" prop="name">
24 - <el-input 9 + <el-input placeholder="请输入角色名" v-model.trim="roleForm.name" :disabled="roleFormDisabled"
25 - placeholder="请输入角色名" 10 + v-if="!roleFormDisabled" clearable></el-input>
26 - v-model.trim="roleForm.name"
27 - :disabled="roleFormDisabled"
28 - v-if="!roleFormDisabled"
29 - clearable
30 - ></el-input>
31 <div v-else>{{ roleData.name }}</div> 11 <div v-else>{{ roleData.name }}</div>
32 </el-form-item> 12 </el-form-item>
33 </el-col> 13 </el-col>
34 <el-col :span="24"> 14 <el-col :span="24">
35 <el-form-item label="角色描述:" prop="remark"> 15 <el-form-item label="角色描述:" prop="remark">
36 - <el-input 16 + <el-input v-model="roleForm.remark" type="textarea" placeholder="请输入角色描述" :disabled="roleFormDisabled"
37 - v-model="roleForm.remark" 17 + v-if="!roleFormDisabled" clearable></el-input>
38 - type="textarea"
39 - placeholder="请输入角色描述"
40 - :disabled="roleFormDisabled"
41 - v-if="!roleFormDisabled"
42 - clearable
43 - ></el-input>
44 <div v-else>{{ roleData.remark }}</div> 18 <div v-else>{{ roleData.remark }}</div>
45 </el-form-item> 19 </el-form-item>
46 </el-col> 20 </el-col>
...@@ -58,31 +32,16 @@ ...@@ -58,31 +32,16 @@
58 </el-col> --> 32 </el-col> -->
59 <el-col :span="24"> 33 <el-col :span="24">
60 <el-form-item label="角色权限:" prop="menuIdList"> 34 <el-form-item label="角色权限:" prop="menuIdList">
61 - <el-tree 35 + <el-tree ref="tree" :data="treeData" node-key="id" :props="defaultProps" :show-checkbox="true"
62 - ref="tree" 36 + :default-checked-keys="roleData.menuIds" accordion>
63 - :data="treeData"
64 - node-key="id"
65 - :props="defaultProps"
66 - :show-checkbox="true"
67 - :default-checked-keys="roleData.menuIds"
68 - accordion
69 - >
70 </el-tree> 37 </el-tree>
71 </el-form-item> 38 </el-form-item>
72 </el-col> 39 </el-col>
73 </el-row> 40 </el-row>
74 <el-form-item> 41 <el-form-item>
75 - <el-button 42 + <el-button type="primary" v-if="!roleFormDisabled" size="mini" :loading="loading" @click="submit">提交
76 - type="primary" 43 + </el-button>
77 - v-if="!roleFormDisabled" 44 + <el-button type="primary" size="mini" @click="handleClose">取消</el-button>
78 - size="mini"
79 - :loading="loading"
80 - @click="submit"
81 - >提交</el-button
82 - >
83 - <el-button type="primary" size="mini" @click="handleClose"
84 - >取消</el-button
85 - >
86 </el-form-item> 45 </el-form-item>
87 </el-form> 46 </el-form>
88 </el-drawer> 47 </el-drawer>
...@@ -173,7 +132,7 @@ export default { ...@@ -173,7 +132,7 @@ export default {
173 let formData = {}; 132 let formData = {};
174 this.loading = true; 133 this.loading = true;
175 let arr = []; 134 let arr = [];
176 - arr = this.$refs.tree.getCheckedKeys().filter((item,index)=>{ 135 + arr = this.$refs.tree.getCheckedKeys().filter((item, index) => {
177 return this.$refs.tree.getCheckedKeys().indexOf(item) == index 136 return this.$refs.tree.getCheckedKeys().indexOf(item) == index
178 }) 137 })
179 formData.menuIdList = arr; 138 formData.menuIdList = arr;
...@@ -186,7 +145,7 @@ export default { ...@@ -186,7 +145,7 @@ export default {
186 this.loading = false; 145 this.loading = false;
187 if (res.code === 200) { 146 if (res.code === 200) {
188 this.$message({ 147 this.$message({
189 - message: "操作成功", 148 + message: "操作成功,新增权限需重新登陆后刷新。",
190 type: "success", 149 type: "success",
191 }); 150 });
192 this.$emit("handleClose", false); 151 this.$emit("handleClose", false);
...@@ -224,7 +183,7 @@ export default { ...@@ -224,7 +183,7 @@ export default {
224 data.push(menuItem) 183 data.push(menuItem)
225 if (item.children && item.children.length) { 184 if (item.children && item.children.length) {
226 menuItem.children = this.treeDataInfo(item.children); 185 menuItem.children = this.treeDataInfo(item.children);
227 - menuItem.children.unshift({id:item.id,title:`${item.title}(菜单)`}) 186 + menuItem.children.unshift({ id: item.id, title: `${item.title}(菜单)` })
228 } 187 }
229 }); 188 });
230 return data; 189 return data;
......
...@@ -4,24 +4,13 @@ ...@@ -4,24 +4,13 @@
4 <el-row :gutter="50"> 4 <el-row :gutter="50">
5 <el-col :span="6"> 5 <el-col :span="6">
6 <el-form-item label="角色名称"> 6 <el-form-item label="角色名称">
7 - <el-input 7 + <el-input v-model="formData.name" placeholder="请输入角色名称" clearable></el-input>
8 - v-model="formData.name"
9 - placeholder="请输入角色名称"
10 - clearable
11 - ></el-input>
12 </el-form-item> 8 </el-form-item>
13 </el-col> 9 </el-col>
14 <el-col :span="6"> 10 <el-col :span="6">
15 <el-form-item label="创建时间"> 11 <el-form-item label="创建时间">
16 - <el-date-picker 12 + <el-date-picker v-model="createTime" type="daterange" range-separator="至" start-placeholder="开始日期"
17 - v-model="createTime" 13 + end-placeholder="结束日期" value-format="yyyy-MM-dd" clearable>
18 - type="daterange"
19 - range-separator="至"
20 - start-placeholder="开始日期"
21 - end-placeholder="结束日期"
22 - value-format="yyyy-MM-dd"
23 - clearable
24 - >
25 </el-date-picker> 14 </el-date-picker>
26 </el-form-item> 15 </el-form-item>
27 </el-col> 16 </el-col>
...@@ -36,61 +25,31 @@ ...@@ -36,61 +25,31 @@
36 </el-row> 25 </el-row>
37 </el-form> 26 </el-form>
38 <div style="margin:20px"> 27 <div style="margin:20px">
39 - <el-button 28 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="tableLoading" @click="selectRoleList(0)">搜索
40 - type="primary" 29 + </el-button>
41 - icon="el-icon-search" 30 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']">新增角色
42 - size="mini" 31 + </el-button>
43 - :loading="tableLoading"
44 - @click="selectRoleList(0)"
45 - >搜索</el-button
46 - >
47 - <el-button type="primary" icon="el-icon-plus" size="mini" @click="addRole" v-hasPermi="['system:role:add']"
48 - >新增角色</el-button
49 - >
50 </div> 32 </div>
51 - <Tables 33 + <Tables ductName="role" :data="data" :headerData="tableHeader" :infoData="tableHeader" :totalCount="total"
52 - :data="data" 34 + :limitSize="formData.size" :page="formData.page" :pageSizes="[20, 30, 40, 50]" :loading="tableLoading"
53 - :headerData="tableHeader" 35 + height="600" @sizeChange="sizeChange" @currentChange="currentChange">
54 - :infoData="tableHeader" 36 + <template slot="optionColumn">
55 - :totalCount="total"
56 - :limitSize="formData.size"
57 - :page="formData.page"
58 - :pageSizes="[20,30,40,50]"
59 - :loading="tableLoading"
60 - height="600"
61 - @sizeChange="sizeChange"
62 - @currentChange="currentChange"
63 - >
64 - <template>
65 <el-table-column header-align="center" align="center" label="操作"> 37 <el-table-column header-align="center" align="center" label="操作">
66 <template slot-scope="scope"> 38 <template slot-scope="scope">
67 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" 39 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
68 - >查看</el-button 40 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']">修改
69 - > 41 + </el-button>
70 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:role:update']" 42 + <el-button :type="scope.row.valid == 1 ? 'warning' : 'primary'" size="mini"
71 - >修改</el-button 43 + v-hasPermi="['system:role:openClose']" @click="roleStatus(scope)">{{ scope.row.valid == 1 ? "停用" : "启用" }}
72 - > 44 + </el-button>
73 - <el-button 45 + <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']">删除角色
74 - :type="scope.row.valid == 1 ? 'warning' : 'primary'" 46 + </el-button>
75 - size="mini"
76 - v-hasPermi="['system:role:openClose']"
77 - @click="roleStatus(scope)"
78 - >{{ scope.row.valid == 1 ? "停用" : "启用" }}</el-button
79 - >
80 - <el-button type="danger" size="mini" @click="removeRole(scope)" v-hasPermi="['system:role:delete']"
81 - >删除角色</el-button
82 - >
83 </template> 47 </template>
84 </el-table-column> 48 </el-table-column>
85 </template> 49 </template>
86 </Tables> 50 </Tables>
87 - <Drawer 51 + <Drawer :drawer="drawer" :drawerTitle="drawerTitle" :roleFormDisabled="roleFormDisabled" :roleData="roleData"
88 - :drawer="drawer" 52 + @handleClose="handleClose"></Drawer>
89 - :drawerTitle="drawerTitle"
90 - :roleFormDisabled="roleFormDisabled"
91 - :roleData="roleData"
92 - @handleClose="handleClose"
93 - ></Drawer>
94 </div> 53 </div>
95 </template> 54 </template>
96 55
...@@ -103,7 +62,7 @@ import { ...@@ -103,7 +62,7 @@ import {
103 updateRoleStatus, 62 updateRoleStatus,
104 } from "@/api/system/user.js"; 63 } from "@/api/system/user.js";
105 export default { 64 export default {
106 - name:"RoleConfig", 65 + name: "RoleConfig",
107 components: { 66 components: {
108 Drawer, 67 Drawer,
109 }, 68 },
...@@ -120,67 +79,52 @@ export default { ...@@ -120,67 +79,52 @@ export default {
120 data: [], //表格数据 79 data: [], //表格数据
121 tableHeader: [ 80 tableHeader: [
122 { 81 {
123 - type: "index",
124 - name: "",
125 - value: "",
126 - width: "",
127 - align: "center",
128 - sorTable: false,
129 - disabled:true
130 - },
131 - {
132 - type: "",
133 name: "角色名称", 82 name: "角色名称",
134 value: "name", 83 value: "name",
135 width: "150px", 84 width: "150px",
136 align: "center", 85 align: "center",
137 sorTable: false, 86 sorTable: false,
138 - disabled:true 87 + disabled: true
139 }, 88 },
140 { 89 {
141 - type: "",
142 name: "角色状态", 90 name: "角色状态",
143 value: "valid", 91 value: "valid",
144 width: "150px", 92 width: "150px",
145 align: "center", 93 align: "center",
146 sorTable: false, 94 sorTable: false,
147 - disabled:true 95 + disabled: true
148 }, 96 },
149 { 97 {
150 - type: "",
151 name: "创建人", 98 name: "创建人",
152 value: "createUserName", 99 value: "createUserName",
153 width: "150px", 100 width: "150px",
154 align: "center", 101 align: "center",
155 sorTable: false, 102 sorTable: false,
156 - disabled:true 103 + disabled: true
157 }, 104 },
158 { 105 {
159 - type: "",
160 name: "创建时间", 106 name: "创建时间",
161 value: "createTime", 107 value: "createTime",
162 width: "150px", 108 width: "150px",
163 align: "center", 109 align: "center",
164 sorTable: false, 110 sorTable: false,
165 - disabled:true 111 + disabled: true
166 }, 112 },
167 { 113 {
168 - type: "",
169 name: "修改时间", 114 name: "修改时间",
170 value: "updateTime", 115 value: "updateTime",
171 width: "150px", 116 width: "150px",
172 align: "center", 117 align: "center",
173 sorTable: false, 118 sorTable: false,
174 - disabled:true 119 + disabled: true
175 }, 120 },
176 { 121 {
177 - type: "",
178 name: "备注", 122 name: "备注",
179 value: "remark", 123 value: "remark",
180 width: "400px", 124 width: "400px",
181 align: "center", 125 align: "center",
182 sorTable: false, 126 sorTable: false,
183 - disabled:true 127 + disabled: true
184 }, 128 },
185 ], //表头数据 129 ], //表头数据
186 roleData: {}, //角色详情 130 roleData: {}, //角色详情
...@@ -193,20 +137,20 @@ export default { ...@@ -193,20 +137,20 @@ export default {
193 }; 137 };
194 }, 138 },
195 created() { 139 created() {
196 - if(this.$store.state.tagsView.cachedViews.length == 0){ 140 + if (this.$store.state.tagsView.cachedViews.length == 0) {
197 this.selectRoleList(); 141 this.selectRoleList();
198 } 142 }
199 }, 143 },
200 - activated(){ 144 + activated() {
201 this.selectRoleList(); 145 this.selectRoleList();
202 }, 146 },
203 - deactivated(){ 147 + deactivated() {
204 this.data = [] 148 this.data = []
205 }, 149 },
206 methods: { 150 methods: {
207 //角色列表 151 //角色列表
208 selectRoleList(val) { 152 selectRoleList(val) {
209 - if(val == 0){ 153 + if (val == 0) {
210 this.formData.page = 1 154 this.formData.page = 1
211 } 155 }
212 this.tableLoading = true; 156 this.tableLoading = true;
...@@ -341,7 +285,7 @@ export default { ...@@ -341,7 +285,7 @@ export default {
341 } 285 }
342 }); 286 });
343 }) 287 })
344 - .catch(() => {}); 288 + .catch(() => { });
345 } else { 289 } else {
346 this.$message({ 290 this.$message({
347 message: res.msg, 291 message: res.msg,
...@@ -360,7 +304,7 @@ export default { ...@@ -360,7 +304,7 @@ export default {
360 this.formData.page = val.page; 304 this.formData.page = val.page;
361 this.selectRoleList(); 305 this.selectRoleList();
362 }, 306 },
363 - sizeChange(val){ 307 + sizeChange(val) {
364 this.formData.size = val; 308 this.formData.size = val;
365 this.selectRoleList() 309 this.selectRoleList()
366 } 310 }
......
...@@ -4,20 +4,12 @@ ...@@ -4,20 +4,12 @@
4 <el-row :gutter="50"> 4 <el-row :gutter="50">
5 <el-col :span="6"> 5 <el-col :span="6">
6 <el-form-item label="用户姓名"> 6 <el-form-item label="用户姓名">
7 - <el-input 7 + <el-input placeholder="请输入用户名称" v-model="formData.username" clearable></el-input>
8 - placeholder="请输入用户名称"
9 - v-model="formData.username"
10 - clearable
11 - ></el-input>
12 </el-form-item> 8 </el-form-item>
13 </el-col> 9 </el-col>
14 <el-col :span="6"> 10 <el-col :span="6">
15 <el-form-item label="手机号码"> 11 <el-form-item label="手机号码">
16 - <el-input 12 + <el-input placeholder="请输入手机号码" v-model="formData.phone" clearable></el-input>
17 - placeholder="请输入手机号码"
18 - v-model="formData.phone"
19 - clearable
20 - ></el-input>
21 </el-form-item> 13 </el-form-item>
22 </el-col> 14 </el-col>
23 <el-col :span="6"> 15 <el-col :span="6">
...@@ -31,68 +23,34 @@ ...@@ -31,68 +23,34 @@
31 </el-row> 23 </el-row>
32 </el-form> 24 </el-form>
33 <div style="margin:20px"> 25 <div style="margin:20px">
34 - <el-button 26 + <el-button type="primary" icon="el-icon-search" size="mini" :loading="loading" @click="selectUser(0)">搜索
35 - type="primary" 27 + </el-button>
36 - icon="el-icon-search" 28 + <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']">新增用户
37 - size="mini" 29 + </el-button>
38 - :loading="loading"
39 - @click="selectUser(0)"
40 - >搜索</el-button
41 - >
42 - <el-button type="primary" icon="el-icon-plus" size="mini" @click="addUser" v-hasPermi="['system:user:add']"
43 - >新增用户</el-button
44 - >
45 </div> 30 </div>
46 - <Tables 31 + <Tables ductName="user" :data="data" :headerData="tableHeader" :limitSize="formData.size" :totalCount="total"
47 - :data="data" 32 + :loading="loading" :page="formData.page" :pageSizes="[20, 30, 40, 50]" height="600" @sizeChange="sizeChange"
48 - :headerData="tableHeader" 33 + @currentChange="currentChange">
49 - :limitSize="formData.size" 34 + <template slot="optionColumn">
50 - :totalCount="total" 35 + <el-table-column header-align="center" align="center" width="auto" label="操作">
51 - :loading="loading"
52 - :page="formData.page"
53 - :pageSizes="[20,30,40,50]"
54 - height="600"
55 - @sizeChange="sizeChange"
56 - @currentChange="currentChange"
57 - >
58 - <template>
59 - <el-table-column
60 - header-align="center"
61 - align="center"
62 - width="auto"
63 - label="操作"
64 - >
65 <template slot-scope="scope"> 36 <template slot-scope="scope">
66 - <el-button type="primary" size="mini" @click="buttonClick(scope, 0)" 37 + <el-button type="primary" size="mini" @click="buttonClick(scope, 0)">查看</el-button>
67 - >查看</el-button 38 + <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']">修改
68 - > 39 + </el-button>
69 - <el-button type="primary" size="mini" @click="buttonClick(scope, 1)" v-hasPermi="['system:user:update']"
70 - >修改</el-button
71 - >
72 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow" 40 <!-- <el-button type="primary" size="mini" @click="passwordShow = !passwordShow"
73 >修改密码</el-button 41 >修改密码</el-button
74 > --> 42 > -->
75 - <el-button 43 + <el-button :type="scope.row.isValid == 1 ? 'warning' : 'primary'" size="mini"
76 - :type="scope.row.isValid == 1 ? 'warning' : 'primary'" 44 + v-hasPermi="['system:user:openClose']" @click="userStatus(scope)">{{ scope.row.isValid == 1 ? "停用" : "启用"
77 - size="mini" 45 + }}</el-button>
78 - v-hasPermi="['system:user:openClose']" 46 + <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']">删除用户
79 - @click="userStatus(scope)" 47 + </el-button>
80 - >{{ scope.row.isValid == 1 ? "停用" : "启用" }}</el-button
81 - >
82 - <el-button type="danger" size="mini" @click="removeUser(scope)" v-hasPermi="['system:user:delete']"
83 - >删除用户</el-button
84 - >
85 </template> 48 </template>
86 </el-table-column> 49 </el-table-column>
87 </template> 50 </template>
88 </Tables> 51 </Tables>
89 - <Drawer 52 + <Drawer :drawer="drawer" :drawerTitle="drawerTitle" :userFormDisabled="userFormDisabled" :userData="userData"
90 - :drawer="drawer" 53 + @handleClose="handleClose"></Drawer>
91 - :drawerTitle="drawerTitle"
92 - :userFormDisabled="userFormDisabled"
93 - :userData="userData"
94 - @handleClose="handleClose"
95 - ></Drawer>
96 <!-- <el-dialog 54 <!-- <el-dialog
97 title="修改密码" 55 title="修改密码"
98 :visible.sync="passwordShow" 56 :visible.sync="passwordShow"
...@@ -147,85 +105,68 @@ export default { ...@@ -147,85 +105,68 @@ export default {
147 }, //查询条件 105 }, //查询条件
148 tableHeader: [ 106 tableHeader: [
149 { 107 {
150 - type: "index",
151 - name: "",
152 - value: "",
153 - width: "",
154 - align: "center",
155 - sorTable: false,
156 - disabled:true
157 - },
158 - {
159 - type: "",
160 name: "员工号", 108 name: "员工号",
161 value: "loginName", 109 value: "loginName",
162 width: "150px", 110 width: "150px",
163 align: "center", 111 align: "center",
164 sorTable: false, 112 sorTable: false,
165 - disabled:true 113 + disabled: true
166 }, 114 },
167 { 115 {
168 - type: "",
169 name: "用户姓名", 116 name: "用户姓名",
170 value: "username", 117 value: "username",
171 width: "150px", 118 width: "150px",
172 align: "center", 119 align: "center",
173 sorTable: false, 120 sorTable: false,
174 - disabled:true 121 + disabled: true
175 }, 122 },
176 { 123 {
177 - type: "",
178 name: "所属口岸", 124 name: "所属口岸",
179 value: "portName", 125 value: "portName",
180 width: "150px", 126 width: "150px",
181 align: "center", 127 align: "center",
182 sortable: false, 128 sortable: false,
183 - disabled:true 129 + disabled: true
184 }, 130 },
185 { 131 {
186 - type: "",
187 name: "所属角色", 132 name: "所属角色",
188 value: "roleNames", 133 value: "roleNames",
189 width: "150px", 134 width: "150px",
190 align: "center", 135 align: "center",
191 sorTable: false, 136 sorTable: false,
192 - disabled:true 137 + disabled: true
193 }, 138 },
194 { 139 {
195 - type: "",
196 name: "电子邮箱", 140 name: "电子邮箱",
197 value: "email", 141 value: "email",
198 width: "150px", 142 width: "150px",
199 align: "center", 143 align: "center",
200 sorTable: false, 144 sorTable: false,
201 - disabled:true 145 + disabled: true
202 }, 146 },
203 { 147 {
204 - type: "",
205 name: "用户状态", 148 name: "用户状态",
206 value: "isValid", 149 value: "isValid",
207 width: "100px", 150 width: "100px",
208 align: "center", 151 align: "center",
209 sorTable: false, 152 sorTable: false,
210 - disabled:true 153 + disabled: true,
211 }, 154 },
212 { 155 {
213 - type: "",
214 name: "修改时间", 156 name: "修改时间",
215 value: "updateTime", 157 value: "updateTime",
216 width: "150px", 158 width: "150px",
217 align: "center", 159 align: "center",
218 sorTable: false, 160 sorTable: false,
219 - disabled:true 161 + disabled: true
220 }, 162 },
221 { 163 {
222 - type: "",
223 name: "备注", 164 name: "备注",
224 value: "remark", 165 value: "remark",
225 width: "150px", 166 width: "150px",
226 align: "center", 167 align: "center",
227 sorTable: false, 168 sorTable: false,
228 - disabled:true 169 + disabled: true
229 }, 170 },
230 ], //表头数据 171 ], //表头数据
231 userData: {}, //用户详情 172 userData: {}, //用户详情
...@@ -239,20 +180,20 @@ export default { ...@@ -239,20 +180,20 @@ export default {
239 }; 180 };
240 }, 181 },
241 created() { 182 created() {
242 - if(this.$store.state.tagsView.cachedViews.length == 0){ 183 + if (this.$store.state.tagsView.cachedViews.length == 0) {
243 this.selectUser(); 184 this.selectUser();
244 } 185 }
245 }, 186 },
246 - activated(){ 187 + activated() {
247 this.selectUser(); 188 this.selectUser();
248 }, 189 },
249 - deactivated(){ 190 + deactivated() {
250 this.data = [] 191 this.data = []
251 }, 192 },
252 methods: { 193 methods: {
253 //用户列表 194 //用户列表
254 selectUser(val) { 195 selectUser(val) {
255 - if(val == 0){ 196 + if (val == 0) {
256 this.formData.page = 1 197 this.formData.page = 1
257 } 198 }
258 this.loading = true; 199 this.loading = true;
...@@ -285,7 +226,7 @@ export default { ...@@ -285,7 +226,7 @@ export default {
285 if (res.code === 200) { 226 if (res.code === 200) {
286 this.userData = res.data; 227 this.userData = res.data;
287 this.userData.portName 228 this.userData.portName
288 - ?this.userData.portName=this.userData.portName.split(",") 229 + ? this.userData.portName = this.userData.portName.split(",")
289 : ''; 230 : '';
290 } else { 231 } else {
291 this.$message({ 232 this.$message({
...@@ -391,7 +332,7 @@ export default { ...@@ -391,7 +332,7 @@ export default {
391 this.selectUser(); 332 this.selectUser();
392 }, 333 },
393 334
394 - sizeChange(val){ 335 + sizeChange(val) {
395 this.formData.size = val; 336 this.formData.size = val;
396 this.selectUser() 337 this.selectUser()
397 } 338 }
......
...@@ -17,7 +17,7 @@ module.exports = { ...@@ -17,7 +17,7 @@ module.exports = {
17 // 部署生产环境和开发环境下的URL。 17 // 部署生产环境和开发环境下的URL。
18 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上 18 // 默认情况下，Vue CLI 会假设你的应用是被部署在一个域名的根路径上
19 // 例如 https://www.FedEx.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.FedEx.vip/admin/，则设置 baseUrl 为 /admin/。 19 // 例如 https://www.FedEx.vip/。如果应用被部署在一个子路径上，你就需要用这个选项指定这个子路径。例如，如果你的应用被部署在 https://www.FedEx.vip/admin/，则设置 baseUrl 为 /admin/。
20 - publicPath: process.env.NODE_ENV === "production" ? "/imacuat/" : "/", 20 + publicPath: process.env.NODE_ENV === "production" ? defaultSettings.routerBase : "/",
21 // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist） 21 // 在npm run build 或 yarn build 时 ，生成文件的目录名称（要和baseUrl的生产环境路径一致）（默认dist）
22 outputDir: 'dist', 22 outputDir: 'dist',
23 // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下） 23 // 用于放置生成的静态资源 (js、css、img、fonts) 的；（项目打包之后，静态资源会放在这个文件夹下）
...@@ -34,10 +34,7 @@ module.exports = { ...@@ -34,10 +34,7 @@ module.exports = {
34 proxy: { 34 proxy: {
35 // detail: https://cli.vuejs.org/config/#devserver-proxy 35 // detail: https://cli.vuejs.org/config/#devserver-proxy
36 [process.env.VUE_APP_BASE_API]: { 36 [process.env.VUE_APP_BASE_API]: {
37 - target: `https://imacuat.zmd.apac.fedex.com/iMAC`, 37 + target: defaultSettings.baseURL,
38 - // target: `http://47.103.140.98:7001/iMAC`,
39 - // target: `http://192.168.1.134:18080`,
40 - // target: `http://47.103.140.98:7001/IMAC2`, //生产
41 changeOrigin: true, 38 changeOrigin: true,
42 pathRewrite: { 39 pathRewrite: {
43 ['^' + process.env.VUE_APP_BASE_API]: '' 40 ['^' + process.env.VUE_APP_BASE_API]: ''
......