Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
44230041 1 parent 394b578f

bug修复

Inline Side-by-side
Showing 11 changed files with 1023 additions and 628 deletions
1 let ductLabels = { 1 let ductLabels = {
2 "cargoRulesStatus":{ 2 "cargoRulesStatus":{
3 - "1":"自动", 3 + "1":"手动",
4 - "2":"手动" 4 + "2":"自动"
5 } 5 }
6 } 6 }
7 7
......
...@@ -80,6 +80,7 @@ ...@@ -80,6 +80,7 @@
80 color:#6379bb; 80 color:#6379bb;
81 border-bottom:1px solid #ddd; 81 border-bottom:1px solid #ddd;
82 margin:8px 10px 25px 10px; 82 margin:8px 10px 25px 10px;
83 + padding-top:15px;
83 padding-bottom:5px; 84 padding-bottom:5px;
84 .formItem { 85 .formItem {
85 width: 100%; 86 width: 100%;
......
...@@ -30,8 +30,8 @@ ...@@ -30,8 +30,8 @@
30 :fixed="item.fixed" 30 :fixed="item.fixed"
31 :show-overflow-tooltip="showOverflowTooltip" 31 :show-overflow-tooltip="showOverflowTooltip"
32 :sortable="item.sorTable" 32 :sortable="item.sorTable"
33 - header-align="center"
34 :formatter="formatter" 33 :formatter="formatter"
34 + header-align="center"
35 :slotHeader="slotHeader" 35 :slotHeader="slotHeader"
36 :key="index" 36 :key="index"
37 > 37 >
...@@ -188,7 +188,6 @@ export default { ...@@ -188,7 +188,6 @@ export default {
188 this.newHeader = this.headerData; 188 this.newHeader = this.headerData;
189 }, 189 },
190 mounted() { 190 mounted() {
191 -
192 }, 191 },
193 methods: { 192 methods: {
194 nextClick() { 193 nextClick() {
...@@ -218,7 +217,11 @@ export default { ...@@ -218,7 +217,11 @@ export default {
218 this.selectTable.push(this.data[i]); 217 this.selectTable.push(this.data[i]);
219 } 218 }
220 } else if (selection.includes(this.data[row.index])) { 219 } else if (selection.includes(this.data[row.index])) {
221 - for (i = this.start + 1; i <= end; i++) { 220 + if(!selection.includes(this.data[this.start])){
221 + this.$refs.tables.toggleRowSelection(this.data[this.start], true);
222 + this.selectTable.push(this.data[this.start]);
223 + }
224 + for (i = this.start+1; i <= this.start+sum; i++) {
222 this.$refs.tables.toggleRowSelection(this.data[i], true); 225 this.$refs.tables.toggleRowSelection(this.data[i], true);
223 this.selectTable.push(this.data[i]); 226 this.selectTable.push(this.data[i]);
224 } 227 }
...@@ -254,7 +257,9 @@ export default { ...@@ -254,7 +257,9 @@ export default {
254 this.selectTable = [] 257 this.selectTable = []
255 this.$refs.tables.clearSelection() 258 this.$refs.tables.clearSelection()
256 }, 259 },
257 - // itemChange(val) {}, 260 + itemChange(val) {
261 + console.log(val)
262 + },
258 // checkChange(val) { 263 // checkChange(val) {
259 // console.log(val); 264 // console.log(val);
260 // }, 265 // },
......
1 <template> 1 <template>
2 <div class="cargoAllocation"> 2 <div class="cargoAllocation">
3 - <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small"> 3 + <el-form
4 + ref="form"
5 + v-model="formData"
6 + v-show="formShow"
7 + class="form-header"
8 + label-position="right"
9 + label-width="auto"
10 + size="small"
11 + >
4 <el-row type="flex" style="flexWrap: wrap !important"> 12 <el-row type="flex" style="flexWrap: wrap !important">
5 <el-col :span="6"> 13 <el-col :span="6">
6 <el-form-item label="ACCS原航班日期"> 14 <el-form-item label="ACCS原航班日期">
...@@ -17,34 +25,25 @@ ...@@ -17,34 +25,25 @@
17 </el-form-item> 25 </el-form-item>
18 </el-col> 26 </el-col>
19 <el-col :span="6"> 27 <el-col :span="6">
20 - <el-form-item label="申报类别"> 28 + <el-form-item label="ACCS原航班号">
21 - <el-select 29 + <el-input
22 - placeholder="不限" 30 + v-model="fltNo"
23 - v-model="formData.typeId" 31 + placeholder="请输入ACCS原航班号"
24 class="formItem" 32 class="formItem"
25 clearable 33 clearable
26 - > 34 + ></el-input>
27 - <el-option
28 - v-for="item in selectData.findConditionData.cargoType"
29 - :label="item.chineseName"
30 - :value="item.id"
31 - :key="item.id"
32 - >
33 - </el-option>
34 - </el-select>
35 </el-form-item> 35 </el-form-item>
36 </el-col> 36 </el-col>
37 - <!-- <el-col :span="6"> 37 + <el-col :span="6">
38 - <el-form-item label="海关回执状态"> 38 + <el-form-item label="货物状态">
39 <el-select 39 <el-select
40 placeholder="不限" 40 placeholder="不限"
41 - v-model="formData.customsReceiptStatusId" 41 + v-model="formData.statusId"
42 class="formItem" 42 class="formItem"
43 - multiple
44 clearable 43 clearable
45 > 44 >
46 <el-option 45 <el-option
47 - v-for="item in selectData.findConditionData.cargoCustomsReturnStatus" 46 + v-for="item in selectData.findConditionData.cargoStatus"
48 :label="item.chineseName" 47 :label="item.chineseName"
49 :value="item.id" 48 :value="item.id"
50 :key="item.id" 49 :key="item.id"
...@@ -52,17 +51,28 @@ ...@@ -52,17 +51,28 @@
52 </el-option> 51 </el-option>
53 </el-select> 52 </el-select>
54 </el-form-item> 53 </el-form-item>
55 - </el-col> --> 54 + </el-col>
56 <el-col :span="6"> 55 <el-col :span="6">
57 - <el-form-item label="货物状态"> 56 + <el-form-item label="运单号">
57 + <el-input
58 + class="formItem"
59 + type="textarea"
60 + placeholder="请输入运单号（回车分割）"
61 + v-model="formData.waybillNo"
62 + rows="1"
63 + ></el-input>
64 + </el-form-item>
65 + </el-col>
66 + <el-col :span="6">
67 + <el-form-item label="申报类别">
58 <el-select 68 <el-select
59 placeholder="不限" 69 placeholder="不限"
60 - v-model="formData.statusId" 70 + v-model="formData.typeId"
61 class="formItem" 71 class="formItem"
62 clearable 72 clearable
63 > 73 >
64 <el-option 74 <el-option
65 - v-for="item in selectData.findConditionData.cargoStatus" 75 + v-for="item in selectData.findConditionData.cargoType"
66 :label="item.chineseName" 76 :label="item.chineseName"
67 :value="item.id" 77 :value="item.id"
68 :key="item.id" 78 :key="item.id"
...@@ -72,18 +82,6 @@ ...@@ -72,18 +82,6 @@
72 </el-form-item> 82 </el-form-item>
73 </el-col> 83 </el-col>
74 <el-col :span="6"> 84 <el-col :span="6">
75 - <el-form-item label="航班类型">
76 - <el-select
77 - placeholder="不限"
78 - v-model="formData.kindToAllocFlightId"
79 - class="formItem"
80 - clearable
81 - >
82 - <el-option v-for="item in selectData.fltTypes" :label="item.chineseName" v-model="item.id" :key="item.id"> </el-option>
83 - </el-select>
84 - </el-form-item>
85 - </el-col>
86 - <el-col :span="6">
87 <el-form-item label="服务类型"> 85 <el-form-item label="服务类型">
88 <el-select 86 <el-select
89 placeholder="不限" 87 placeholder="不限"
...@@ -102,27 +100,6 @@ ...@@ -102,27 +100,6 @@
102 </el-form-item> 100 </el-form-item>
103 </el-col> 101 </el-col>
104 <el-col :span="6"> 102 <el-col :span="6">
105 - <el-form-item label="ACCS原航班号">
106 - <el-input
107 - v-model="fltNo"
108 - placeholder="请输入ACCS原航班号"
109 - class="formItem"
110 - clearable
111 - ></el-input>
112 - </el-form-item>
113 - </el-col>
114 - <el-col :span="6">
115 - <el-form-item label="运单号">
116 - <el-input
117 - class="formItem"
118 - type="textarea"
119 - placeholder="请输入运单号（回车分割）"
120 - v-model="formData.waybillNo"
121 - rows="1"
122 - ></el-input>
123 - </el-form-item>
124 - </el-col>
125 - <el-col :span="6">
126 <el-form-item label="URSA"> 103 <el-form-item label="URSA">
127 <el-input 104 <el-input
128 class="formItem" 105 class="formItem"
...@@ -146,18 +123,70 @@ ...@@ -146,18 +123,70 @@
146 </el-col> 123 </el-col>
147 <el-col :span="6"> 124 <el-col :span="6">
148 <el-form-item label="重量区间"> 125 <el-form-item label="重量区间">
149 - <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.minWeight" :controls="false"></el-input-number></el-col> 126 + <el-col :span="11"
127 + ><el-input-number
128 + class="formItem"
129 + size="mini"
130 + v-model="formData.minWeight"
131 + :controls="false"
132 + :min="0"
133 + :precision="2"
134 + ></el-input-number
135 + ></el-col>
150 <el-col class="line" :span="2">-</el-col> 136 <el-col class="line" :span="2">-</el-col>
151 - <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.maxWeight" :controls="false"></el-input-number></el-col> 137 + <el-col :span="11"
138 + ><el-input-number
139 + class="formItem"
140 + size="mini"
141 + v-model="formData.maxWeight"
142 + :controls="false"
143 + :min="formData.minWeight"
144 + :precision="2"
145 + ></el-input-number
146 + ></el-col>
152 </el-form-item> 147 </el-form-item>
153 </el-col> 148 </el-col>
154 <el-col :span="6"> 149 <el-col :span="6">
155 <el-form-item label="件数区间"> 150 <el-form-item label="件数区间">
156 - <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.minNumber" :controls="false"></el-input-number></el-col> 151 + <el-col :span="11"
152 + ><el-input-number
153 + class="formItem"
154 + size="mini"
155 + v-model="formData.minNumber"
156 + :controls="false"
157 + :min="0"
158 + ></el-input-number
159 + ></el-col>
157 <el-col class="line" :span="2">-</el-col> 160 <el-col class="line" :span="2">-</el-col>
158 - <el-col :span="11"><el-input-number class="formItem" size="mini" v-model="formData.maxNumber" :controls="false"></el-input-number></el-col> 161 + <el-col :span="11"
162 + ><el-input-number
163 + class="formItem"
164 + size="mini"
165 + v-model="formData.maxNumber"
166 + :controls="false"
167 + :min="formData.minNumber"
168 + ></el-input-number
169 + ></el-col>
159 </el-form-item> 170 </el-form-item>
160 </el-col> 171 </el-col>
172 + <!-- <el-col :span="6">
173 + <el-form-item label="航班类型">
174 + <el-select
175 + placeholder="不限"
176 + v-model="formData.kindToAllocFlightId"
177 + class="formItem"
178 + clearable
179 + >
180 + <el-option
181 + v-for="item in selectData.fltTypes"
182 + :label="item.chineseName"
183 + v-model="item.id"
184 + :key="item.id"
185 + >
186 + </el-option>
187 + </el-select>
188 + </el-form-item>
189 + </el-col> -->
161 <el-col :span="6"> 190 <el-col :span="6">
162 <el-form-item label="取件日期"> 191 <el-form-item label="取件日期">
163 <el-date-picker 192 <el-date-picker
...@@ -169,19 +198,65 @@ ...@@ -169,19 +198,65 @@
169 </el-date-picker> 198 </el-date-picker>
170 </el-form-item> 199 </el-form-item>
171 </el-col> 200 </el-col>
201 + <el-col :span="6">
202 + <el-form-item label="口岸代码">
203 + <el-input
204 + v-model="portName"
205 + placeholder="请输入口岸代码"
206 + class="formItem"
207 + clearable
208 + ></el-input>
209 + </el-form-item>
210 + </el-col>
211 + <el-col :span="6">
212 + <el-form-item label="海关回执状态">
213 + <el-select
214 + placeholder="不限"
215 + v-model="formData.customsReceiptStatusId"
216 + class="formItem"
217 + multiple
218 + clearable
219 + >
220 + <el-option
221 + v-for="item in selectData.findConditionData
222 + .cargoCustomsReturnStatus"
223 + :label="item.chineseName"
224 + :value="item.id"
225 + :key="item.id"
226 + >
227 + </el-option>
228 + </el-select>
229 + </el-form-item>
230 + </el-col>
172 <el-col :span="24"> 231 <el-col :span="24">
173 <el-form-item label="Handling Code"> 232 <el-form-item label="Handling Code">
174 - <el-empty description="暂无数据" v-if="selectData.HandlingCode.length == 0"></el-empty> 233 + <el-empty
234 + description="暂无数据"
235 + v-if="!selectData.HandlingCode || selectData.HandlingCode.length == 0"
236 + ></el-empty>
175 <el-checkbox-group v-model="handingCodes" v-else> 237 <el-checkbox-group v-model="handingCodes" v-else>
176 - <el-checkbox v-for="item in selectData.HandlingCode" :label="item.chineseName" v-model="item.englishName" :key="item.id"></el-checkbox> 238 + <el-checkbox
239 + v-for="item in selectData.HandlingCode"
240 + :label="item.chineseName"
241 + v-model="item.englishName"
242 + :key="item.id"
243 + ></el-checkbox>
177 </el-checkbox-group> 244 </el-checkbox-group>
178 </el-form-item> 245 </el-form-item>
179 </el-col> 246 </el-col>
180 <el-col :span="24"> 247 <el-col :span="24">
181 <el-form-item label="Sub Category"> 248 <el-form-item label="Sub Category">
182 - <el-empty description="暂无数据" v-if="selectData.SubCategory.length == 0"></el-empty> 249 + <el-empty
250 + description="暂无数据"
251 + v-if="!selectData.SubCategory || selectData.SubCategory.length == 0"
252 + ></el-empty>
183 <el-checkbox-group v-model="subCategorys" v-else> 253 <el-checkbox-group v-model="subCategorys" v-else>
184 - <el-checkbox v-for="item in selectData.SubCategory" :label="item.chineseName" v-model="item.englishName" :key="item.id"></el-checkbox> 254 + <el-checkbox
255 + v-for="item in selectData.SubCategory"
256 + :label="item.chineseName"
257 + v-model="item.englishName"
258 + :key="item.id"
259 + ></el-checkbox>
185 </el-checkbox-group> 260 </el-checkbox-group>
186 </el-form-item> 261 </el-form-item>
187 </el-col> 262 </el-col>
...@@ -196,20 +271,24 @@ ...@@ -196,20 +271,24 @@
196 >查询</el-button 271 >查询</el-button
197 > 272 >
198 <el-button 273 <el-button
199 - :type="downLoadingTip.downloading?'warning':'primary'" 274 + :type="downLoadingTip.downloading ? 'warning' : 'primary'"
200 size="mini" 275 size="mini"
201 - @click="xlse(0)" 276 + @click="xlsx(0)"
202 :loading="downLoadingTip.downloading" 277 :loading="downLoadingTip.downloading"
203 :disabled="tableData.length <= 0" 278 :disabled="tableData.length <= 0"
204 - >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button 279 + >{{
280 + downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
281 + }}</el-button
205 > 282 >
206 <el-button 283 <el-button
207 - :type="downLoadingTip.downloading?'warning':'primary'" 284 + :type="downLoadingTip.downloading ? 'warning' : 'primary'"
208 size="mini" 285 size="mini"
209 - @click="xlse(1)" 286 + @click="xlsx(1)"
210 :loading="downLoadingTip.downloading" 287 :loading="downLoadingTip.downloading"
211 :disabled="tableData.length <= 0" 288 :disabled="tableData.length <= 0"
212 - >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button 289 + >{{
290 + downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
291 + }}</el-button
213 > 292 >
214 <el-button 293 <el-button
215 type="primary" 294 type="primary"
...@@ -233,7 +312,7 @@ ...@@ -233,7 +312,7 @@
233 :limitSize="size" 312 :limitSize="size"
234 :limitStart="formData.limitStart" 313 :limitStart="formData.limitStart"
235 :shiftKey="shiftKey" 314 :shiftKey="shiftKey"
236 - height="450" 315 + height="350"
237 @tableSelect="tableSelect" 316 @tableSelect="tableSelect"
238 @tableSelectAll="tableSelectAll" 317 @tableSelectAll="tableSelectAll"
239 @currentChange="currentChange" 318 @currentChange="currentChange"
...@@ -252,7 +331,7 @@ import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect"; ...@@ -252,7 +331,7 @@ import { findConditionData, findCargoAllocationData } from "@/api/cargoSelect";
252 import { allDictData } from "@/api/destinationFlight"; 331 import { allDictData } from "@/api/destinationFlight";
253 import { findFltConditionDataApi } from "@/api/findAllFltData"; 332 import { findFltConditionDataApi } from "@/api/findAllFltData";
254 import { downLoadXlsx } from "@/utils/zipdownload"; 333 import { downLoadXlsx } from "@/utils/zipdownload";
255 -import { upCase } from "@/utils/FedEx" 334 +import { upCase } from "@/utils/FedEx";
256 335
257 export default { 336 export default {
258 components: { 337 components: {
...@@ -261,23 +340,25 @@ export default { ...@@ -261,23 +340,25 @@ export default {
261 data() { 340 data() {
262 return { 341 return {
263 formData: { 342 formData: {
264 - fltDateStart:null, 343 + fltDateStart: null,
265 - fltDateEnd:null, 344 + fltDateEnd: null,
266 - typeId:null, 345 + typeId: null,
267 - statusId:null, 346 + portName:null,
268 - kindToAllocFlightId:null, 347 + statusId: null,
269 - serviceTypeId:null, 348 + kindToAllocFlightId: null,
270 - waybillNo:null, 349 + serviceTypeId: null,
271 - fltNo:null, 350 + waybillNo: null,
272 - ursaList:null, 351 + fltNo: null,
273 - siteNameList:null, 352 + ursaList: null,
274 - minWeight:null, 353 + siteNameList: null,
275 - maxWeight:null, 354 + minWeight: undefined,
276 - minNumber:null, 355 + maxWeight: undefined,
277 - maxNumber:null, 356 + minNumber: undefined,
278 - pickUpDate:null, 357 + maxNumber: undefined,
279 - handingCodes:null, 358 + pickUpDate: null,
280 - subCategorys:null, 359 + handingCodes: null,
360 + subCategorys: null,
361 + customsReceiptStatusId: null,
281 }, //查询数据 362 }, //查询数据
282 tableHeader: [ 363 tableHeader: [
283 { 364 {
...@@ -288,7 +369,7 @@ export default { ...@@ -288,7 +369,7 @@ export default {
288 align: "center", 369 align: "center",
289 sorTable: false, 370 sorTable: false,
290 slot: null, 371 slot: null,
291 - fixed:true, 372 + fixed: true,
292 }, 373 },
293 { 374 {
294 type: "index", 375 type: "index",
...@@ -298,7 +379,7 @@ export default { ...@@ -298,7 +379,7 @@ export default {
298 align: "center", 379 align: "center",
299 sorTable: false, 380 sorTable: false,
300 slot: null, 381 slot: null,
301 - fixed:false, 382 + fixed: false,
302 }, 383 },
303 { 384 {
304 type: "", 385 type: "",
...@@ -306,9 +387,9 @@ export default { ...@@ -306,9 +387,9 @@ export default {
306 value: "portName", 387 value: "portName",
307 width: "150", 388 width: "150",
308 align: "center", 389 align: "center",
309 - sorTable: false, 390 + sorTable: true,
310 slot: null, 391 slot: null,
311 - fixed:false, 392 + fixed: false,
312 }, 393 },
313 { 394 {
314 type: "", 395 type: "",
...@@ -316,9 +397,9 @@ export default { ...@@ -316,9 +397,9 @@ export default {
316 value: "pickUpDate", 397 value: "pickUpDate",
317 width: "150", 398 width: "150",
318 align: "center", 399 align: "center",
319 - sorTable: false, 400 + sorTable: true,
320 slot: null, 401 slot: null,
321 - fixed:false, 402 + fixed: false,
322 }, 403 },
323 { 404 {
324 type: "", 405 type: "",
...@@ -326,9 +407,9 @@ export default { ...@@ -326,9 +407,9 @@ export default {
326 value: "pickUpScanNo", 407 value: "pickUpScanNo",
327 width: "150", 408 width: "150",
328 align: "center", 409 align: "center",
329 - sorTable: false, 410 + sorTable: true,
330 slot: null, 411 slot: null,
331 - fixed:false, 412 + fixed: false,
332 }, 413 },
333 { 414 {
334 type: "", 415 type: "",
...@@ -336,9 +417,9 @@ export default { ...@@ -336,9 +417,9 @@ export default {
336 value: "siteName", 417 value: "siteName",
337 width: "150", 418 width: "150",
338 align: "center", 419 align: "center",
339 - sorTable: false, 420 + sorTable: true,
340 slot: null, 421 slot: null,
341 - fixed:false, 422 + fixed: false,
342 }, 423 },
343 { 424 {
344 type: "", 425 type: "",
...@@ -346,9 +427,9 @@ export default { ...@@ -346,9 +427,9 @@ export default {
346 value: "waybillNo", 427 value: "waybillNo",
347 width: "150", 428 width: "150",
348 align: "center", 429 align: "center",
349 - sorTable: false, 430 + sorTable: true,
350 slot: null, 431 slot: null,
351 - fixed:false, 432 + fixed: false,
352 }, 433 },
353 { 434 {
354 type: "", 435 type: "",
...@@ -356,9 +437,9 @@ export default { ...@@ -356,9 +437,9 @@ export default {
356 value: "totalWaybillNo", 437 value: "totalWaybillNo",
357 width: "150", 438 width: "150",
358 align: "center", 439 align: "center",
359 - sorTable: false, 440 + sorTable: true,
360 slot: null, 441 slot: null,
361 - fixed:false, 442 + fixed: false,
362 }, 443 },
363 { 444 {
364 type: "", 445 type: "",
...@@ -366,9 +447,9 @@ export default { ...@@ -366,9 +447,9 @@ export default {
366 value: "serviceTypeName", 447 value: "serviceTypeName",
367 width: "150", 448 width: "150",
368 align: "center", 449 align: "center",
369 - sorTable: false, 450 + sorTable: true,
370 slot: null, 451 slot: null,
371 - fixed:false, 452 + fixed: false,
372 }, 453 },
373 { 454 {
374 type: "", 455 type: "",
...@@ -376,9 +457,9 @@ export default { ...@@ -376,9 +457,9 @@ export default {
376 value: "ursa", 457 value: "ursa",
377 width: "150", 458 width: "150",
378 align: "center", 459 align: "center",
379 - sorTable: false, 460 + sorTable: true,
380 slot: null, 461 slot: null,
381 - fixed:false, 462 + fixed: false,
382 }, 463 },
383 { 464 {
384 type: "", 465 type: "",
...@@ -386,9 +467,9 @@ export default { ...@@ -386,9 +467,9 @@ export default {
386 value: "typeName", 467 value: "typeName",
387 width: "150", 468 width: "150",
388 align: "center", 469 align: "center",
389 - sorTable: false, 470 + sorTable: true,
390 slot: null, 471 slot: null,
391 - fixed:false, 472 + fixed: false,
392 }, 473 },
393 { 474 {
394 type: "", 475 type: "",
...@@ -396,9 +477,9 @@ export default { ...@@ -396,9 +477,9 @@ export default {
396 value: "handingCode", 477 value: "handingCode",
397 width: "150", 478 width: "150",
398 align: "center", 479 align: "center",
399 - sorTable: false, 480 + sorTable: true,
400 slot: null, 481 slot: null,
401 - fixed:false, 482 + fixed: false,
402 }, 483 },
403 { 484 {
404 type: "", 485 type: "",
...@@ -406,9 +487,9 @@ export default { ...@@ -406,9 +487,9 @@ export default {
406 value: "subCategory", 487 value: "subCategory",
407 width: "150", 488 width: "150",
408 align: "center", 489 align: "center",
409 - sorTable: false, 490 + sorTable: true,
410 slot: null, 491 slot: null,
411 - fixed:false, 492 + fixed: false,
412 }, 493 },
413 { 494 {
414 type: "", 495 type: "",
...@@ -416,9 +497,9 @@ export default { ...@@ -416,9 +497,9 @@ export default {
416 value: "qty", 497 value: "qty",
417 width: "150", 498 width: "150",
418 align: "center", 499 align: "center",
419 - sorTable: false, 500 + sorTable: true,
420 slot: null, 501 slot: null,
421 - fixed:false, 502 + fixed: false,
422 }, 503 },
423 { 504 {
424 type: "", 505 type: "",
...@@ -426,9 +507,9 @@ export default { ...@@ -426,9 +507,9 @@ export default {
426 value: "actualWeight", 507 value: "actualWeight",
427 width: "150", 508 width: "150",
428 align: "center", 509 align: "center",
429 - sorTable: false, 510 + sorTable: true,
430 slot: null, 511 slot: null,
431 - fixed:false, 512 + fixed: false,
432 }, 513 },
433 { 514 {
434 type: "", 515 type: "",
...@@ -436,9 +517,9 @@ export default { ...@@ -436,9 +517,9 @@ export default {
436 value: "consigneeCountry", 517 value: "consigneeCountry",
437 width: "150", 518 width: "150",
438 align: "center", 519 align: "center",
439 - sorTable: false, 520 + sorTable: true,
440 slot: null, 521 slot: null,
441 - fixed:false, 522 + fixed: false,
442 }, 523 },
443 { 524 {
444 type: "", 525 type: "",
...@@ -448,7 +529,7 @@ export default { ...@@ -448,7 +529,7 @@ export default {
448 align: "center", 529 align: "center",
449 sorTable: false, 530 sorTable: false,
450 slot: null, 531 slot: null,
451 - fixed:false, 532 + fixed: false,
452 }, 533 },
453 { 534 {
454 type: "", 535 type: "",
...@@ -456,9 +537,9 @@ export default { ...@@ -456,9 +537,9 @@ export default {
456 value: "customsReceiptStatusName", 537 value: "customsReceiptStatusName",
457 width: "150", 538 width: "150",
458 align: "center", 539 align: "center",
459 - sorTable: false, 540 + sorTable: true,
460 slot: null, 541 slot: null,
461 - fixed:false, 542 + fixed: false,
462 }, 543 },
463 { 544 {
464 type: "", 545 type: "",
...@@ -466,9 +547,9 @@ export default { ...@@ -466,9 +547,9 @@ export default {
466 value: "preQualificationStatus", 547 value: "preQualificationStatus",
467 width: "150", 548 width: "150",
468 align: "center", 549 align: "center",
469 - sorTable: false, 550 + sorTable: true,
470 slot: null, 551 slot: null,
471 - fixed:false, 552 + fixed: false,
472 }, 553 },
473 { 554 {
474 type: "", 555 type: "",
...@@ -478,7 +559,7 @@ export default { ...@@ -478,7 +559,7 @@ export default {
478 align: "center", 559 align: "center",
479 sorTable: false, 560 sorTable: false,
480 slot: null, 561 slot: null,
481 - fixed:false, 562 + fixed: false,
482 }, 563 },
483 { 564 {
484 type: "", 565 type: "",
...@@ -486,9 +567,9 @@ export default { ...@@ -486,9 +567,9 @@ export default {
486 value: "statusName", 567 value: "statusName",
487 width: "150", 568 width: "150",
488 align: "center", 569 align: "center",
489 - sorTable: false, 570 + sorTable: true,
490 slot: null, 571 slot: null,
491 - fixed:false, 572 + fixed: false,
492 }, 573 },
493 { 574 {
494 type: "", 575 type: "",
...@@ -496,9 +577,9 @@ export default { ...@@ -496,9 +577,9 @@ export default {
496 value: "finalFlightNo", 577 value: "finalFlightNo",
497 width: "150", 578 width: "150",
498 align: "center", 579 align: "center",
499 - sorTable: false, 580 + sorTable: true,
500 slot: null, 581 slot: null,
501 - fixed:false, 582 + fixed: false,
502 }, 583 },
503 { 584 {
504 type: "", 585 type: "",
...@@ -506,9 +587,9 @@ export default { ...@@ -506,9 +587,9 @@ export default {
506 value: "finalFlightTime", 587 value: "finalFlightTime",
507 width: "150", 588 width: "150",
508 align: "center", 589 align: "center",
509 - sorTable: false, 590 + sorTable: true,
510 slot: null, 591 slot: null,
511 - fixed:false, 592 + fixed: false,
512 }, 593 },
513 { 594 {
514 type: "", 595 type: "",
...@@ -516,9 +597,9 @@ export default { ...@@ -516,9 +597,9 @@ export default {
516 value: "twoMatchFlightNo", 597 value: "twoMatchFlightNo",
517 width: "150", 598 width: "150",
518 align: "center", 599 align: "center",
519 - sorTable: false, 600 + sorTable: true,
520 slot: null, 601 slot: null,
521 - fixed:false, 602 + fixed: false,
522 }, 603 },
523 { 604 {
524 type: "", 605 type: "",
...@@ -526,9 +607,9 @@ export default { ...@@ -526,9 +607,9 @@ export default {
526 value: "twoMatchFlightTime", 607 value: "twoMatchFlightTime",
527 width: "150", 608 width: "150",
528 align: "center", 609 align: "center",
529 - sorTable: false, 610 + sorTable: true,
530 slot: null, 611 slot: null,
531 - fixed:false, 612 + fixed: false,
532 }, 613 },
533 { 614 {
534 type: "", 615 type: "",
...@@ -536,9 +617,9 @@ export default { ...@@ -536,9 +617,9 @@ export default {
536 value: "preplanFlightNo", 617 value: "preplanFlightNo",
537 width: "150", 618 width: "150",
538 align: "center", 619 align: "center",
539 - sorTable: false, 620 + sorTable: true,
540 slot: null, 621 slot: null,
541 - fixed:false, 622 + fixed: false,
542 }, 623 },
543 { 624 {
544 type: "", 625 type: "",
...@@ -546,9 +627,9 @@ export default { ...@@ -546,9 +627,9 @@ export default {
546 value: "preplanFlightTime", 627 value: "preplanFlightTime",
547 width: "150", 628 width: "150",
548 align: "center", 629 align: "center",
549 - sorTable: false, 630 + sorTable: true,
550 slot: null, 631 slot: null,
551 - fixed:false, 632 + fixed: false,
552 }, 633 },
553 { 634 {
554 type: "", 635 type: "",
...@@ -556,9 +637,9 @@ export default { ...@@ -556,9 +637,9 @@ export default {
556 value: "fltNoAccs", 637 value: "fltNoAccs",
557 width: "150", 638 width: "150",
558 align: "center", 639 align: "center",
559 - sorTable: false, 640 + sorTable: true,
560 slot: null, 641 slot: null,
561 - fixed:false, 642 + fixed: false,
562 }, 643 },
563 { 644 {
564 type: "", 645 type: "",
...@@ -566,9 +647,9 @@ export default { ...@@ -566,9 +647,9 @@ export default {
566 value: "fltDateAccs", 647 value: "fltDateAccs",
567 width: "150", 648 width: "150",
568 align: "center", 649 align: "center",
569 - sorTable: false, 650 + sorTable: true,
570 slot: null, 651 slot: null,
571 - fixed:false, 652 + fixed: false,
572 }, 653 },
573 { 654 {
574 type: "", 655 type: "",
...@@ -576,19 +657,19 @@ export default { ...@@ -576,19 +657,19 @@ export default {
576 value: "accsFlightRoute", 657 value: "accsFlightRoute",
577 width: "150", 658 width: "150",
578 align: "center", 659 align: "center",
579 - sorTable: false, 660 + sorTable: true,
580 slot: null, 661 slot: null,
581 - fixed:false, 662 + fixed: false,
582 }, 663 },
583 { 664 {
584 type: "", 665 type: "",
585 name: "是否RDE手工录入", 666 name: "是否RDE手工录入",
586 value: "manualRde", 667 value: "manualRde",
587 - width: "150", 668 + width: "170",
588 align: "center", 669 align: "center",
589 - sorTable: false, 670 + sorTable: true,
590 slot: null, 671 slot: null,
591 - fixed:false, 672 + fixed: false,
592 }, 673 },
593 { 674 {
594 type: "", 675 type: "",
...@@ -596,9 +677,9 @@ export default { ...@@ -596,9 +677,9 @@ export default {
596 value: "cargoRulesStatus", 677 value: "cargoRulesStatus",
597 width: "150", 678 width: "150",
598 align: "center", 679 align: "center",
599 - sorTable: false, 680 + sorTable: true,
600 slot: null, 681 slot: null,
601 - fixed:false, 682 + fixed: false,
602 }, 683 },
603 { 684 {
604 type: "", 685 type: "",
...@@ -608,7 +689,7 @@ export default { ...@@ -608,7 +689,7 @@ export default {
608 align: "center", 689 align: "center",
609 sorTable: false, 690 sorTable: false,
610 slot: null, 691 slot: null,
611 - fixed:false, 692 + fixed: false,
612 }, 693 },
613 { 694 {
614 type: "", 695 type: "",
...@@ -618,7 +699,7 @@ export default { ...@@ -618,7 +699,7 @@ export default {
618 align: "center", 699 align: "center",
619 sorTable: false, 700 sorTable: false,
620 slot: null, 701 slot: null,
621 - fixed:false, 702 + fixed: false,
622 }, 703 },
623 { 704 {
624 type: "", 705 type: "",
...@@ -628,7 +709,7 @@ export default { ...@@ -628,7 +709,7 @@ export default {
628 align: "center", 709 align: "center",
629 sorTable: false, 710 sorTable: false,
630 slot: null, 711 slot: null,
631 - fixed:false, 712 + fixed: false,
632 }, 713 },
633 { 714 {
634 type: "", 715 type: "",
...@@ -638,7 +719,7 @@ export default { ...@@ -638,7 +719,7 @@ export default {
638 align: "center", 719 align: "center",
639 sorTable: false, 720 sorTable: false,
640 slot: null, 721 slot: null,
641 - fixed:false, 722 + fixed: false,
642 }, 723 },
643 { 724 {
644 type: "", 725 type: "",
...@@ -646,9 +727,9 @@ export default { ...@@ -646,9 +727,9 @@ export default {
646 value: "sizeStr", 727 value: "sizeStr",
647 width: "150", 728 width: "150",
648 align: "center", 729 align: "center",
649 - sorTable: false, 730 + sorTable: true,
650 slot: null, 731 slot: null,
651 - fixed:false, 732 + fixed: false,
652 }, 733 },
653 { 734 {
654 type: "", 735 type: "",
...@@ -658,7 +739,7 @@ export default { ...@@ -658,7 +739,7 @@ export default {
658 align: "center", 739 align: "center",
659 sorTable: false, 740 sorTable: false,
660 slot: null, 741 slot: null,
661 - fixed:false, 742 + fixed: false,
662 }, 743 },
663 { 744 {
664 type: "", 745 type: "",
...@@ -668,7 +749,7 @@ export default { ...@@ -668,7 +749,7 @@ export default {
668 align: "center", 749 align: "center",
669 sorTable: false, 750 sorTable: false,
670 slot: null, 751 slot: null,
671 - fixed:false, 752 + fixed: false,
672 }, 753 },
673 { 754 {
674 type: "", 755 type: "",
...@@ -676,9 +757,9 @@ export default { ...@@ -676,9 +757,9 @@ export default {
676 value: "customsReceiptTime", 757 value: "customsReceiptTime",
677 width: "150", 758 width: "150",
678 align: "center", 759 align: "center",
679 - sorTable: false, 760 + sorTable: true,
680 slot: null, 761 slot: null,
681 - fixed:false, 762 + fixed: false,
682 }, 763 },
683 { 764 {
684 type: "", 765 type: "",
...@@ -686,9 +767,9 @@ export default { ...@@ -686,9 +767,9 @@ export default {
686 value: "caPretrialTime", 767 value: "caPretrialTime",
687 width: "150", 768 width: "150",
688 align: "center", 769 align: "center",
689 - sorTable: false, 770 + sorTable: true,
690 slot: null, 771 slot: null,
691 - fixed:false, 772 + fixed: false,
692 }, 773 },
693 { 774 {
694 type: "", 775 type: "",
...@@ -696,9 +777,9 @@ export default { ...@@ -696,9 +777,9 @@ export default {
696 value: "createUserName", 777 value: "createUserName",
697 width: "150", 778 width: "150",
698 align: "center", 779 align: "center",
699 - sorTable: false, 780 + sorTable: true,
700 slot: null, 781 slot: null,
701 - fixed:false, 782 + fixed: false,
702 }, 783 },
703 { 784 {
704 type: "", 785 type: "",
...@@ -706,78 +787,87 @@ export default { ...@@ -706,78 +787,87 @@ export default {
706 value: "createTime", 787 value: "createTime",
707 width: "150", 788 width: "150",
708 align: "center", 789 align: "center",
709 - sorTable: false, 790 + sorTable: true,
710 slot: null, 791 slot: null,
711 - fixed:false, 792 + fixed: false,
712 }, 793 },
713 ], //表头数据 794 ], //表头数据
714 tableData: [], //表格数据 795 tableData: [], //表格数据
715 tableSelection: [], //选中数据 796 tableSelection: [], //选中数据
716 - selectData:{ 797 + selectData: {
717 findConditionData: [], 798 findConditionData: [],
718 - fltTypes:[], 799 + fltTypes: [],
719 HandlingCode: [], 800 HandlingCode: [],
720 SubCategory: [], 801 SubCategory: [],
721 - },//查询条件 802 + }, //查询条件
722 - fltDate:[], 803 + fltDate: [],
723 - ursaList:'', 804 + ursaList: "",
724 - siteNameList:'', 805 + siteNameList: "",
725 - handingCodes:[], 806 + handingCodes: [],
726 - subCategorys:[], 807 + subCategorys: [],
727 valueFormat: "yyyy-MM-dd", 808 valueFormat: "yyyy-MM-dd",
728 totalCount: 0, 809 totalCount: 0,
729 - page:1, 810 + page: 1,
730 - size:100, 811 + size: 100,
731 allWeight: 0, 812 allWeight: 0,
732 allQty: 0, 813 allQty: 0,
733 dialogVisible: false, 814 dialogVisible: false,
734 shiftKey: false, 815 shiftKey: false,
735 createDate: null, 816 createDate: null,
736 loading: false, 817 loading: false,
737 - downLoadingTip:{ 818 + formShow:true,
738 - tip:"", 819 + downLoadingTip: {
820 + tip: "",
739 downloading: false, 821 downloading: false,
740 }, 822 },
741 }; 823 };
742 }, 824 },
743 created() { 825 created() {
744 //查询条件 826 //查询条件
745 - allDictData().then(res=>{ 827 + new Promise((resolve, reject) => {
746 - if(res.code === 200){ 828 + let obj = {};
747 - this.selectData.SubCategory = res.data.subCategory; 829 + findFltConditionDataApi()
748 - this.selectData.HandlingCode = res.data.handlingCode; 830 + .then((res) => {
749 - }else{ 831 + if (res.code === 200) {
750 - this.$message({ 832 + obj.flightType = res.data.flightType;
751 - message: "查询条件不存在", 833 + } else {
752 - type: "warning", 834 + reject(res.msg);
753 - });
754 } 835 }
755 }) 836 })
837 + .catch(() => {});
756 838
757 - findFltConditionDataApi().then(res=>{ 839 + allDictData()
758 - if(res.code === 200){ 840 + .then((res) => {
759 - this.selectData.fltTypes = res.data.flightType 841 + if (res.code === 200) {
760 - }else{ 842 + obj.HandlingCode = res.data.handlingCode;
761 - this.$message({ 843 + obj.SubCategory = res.data.subCategory;
762 - message: "查询条件不存在", 844 + } else {
763 - type: "warning", 845 + reject(res.msg);
764 - });
765 } 846 }
766 }) 847 })
848 + .catch(() => {});
767 849
768 - findConditionData().then((res) => { 850 + findConditionData()
851 + .then((res) => {
769 if (res.code == 200) { 852 if (res.code == 200) {
770 - this.selectData.findConditionData = res.data; 853 + obj.findConditionData = res.data;
771 } else { 854 } else {
855 + reject(res.msg);
856 + }
857 + resolve(obj)
858 + })
859 + .catch(() => {});
860 + this.select();
861 + }).then(res=>{
862 + this.selectData = res
863 + }).catch((err) => {
772 this.$message({ 864 this.$message({
773 message: "查询条件不存在", 865 message: "查询条件不存在",
774 type: "warning", 866 type: "warning",
775 }); 867 });
776 - } 868 + });
777 - })
778 - this.select();
779 }, 869 },
780 - mounted(){ 870 + mounted() {
781 // this.selectData.HandlingCode.forEach((item,index)=>{ 871 // this.selectData.HandlingCode.forEach((item,index)=>{
782 // if(item.id === 108093){ 872 // if(item.id === 108093){
783 // this.selectData.HandlingCode.unshift(this.HandlingCode.splice(index,1)[0]) 873 // this.selectData.HandlingCode.unshift(this.HandlingCode.splice(index,1)[0])
...@@ -797,7 +887,7 @@ export default { ...@@ -797,7 +887,7 @@ export default {
797 methods: { 887 methods: {
798 select() { 888 select() {
799 this.loading = true; 889 this.loading = true;
800 - this.dataInfo() 890 + this.dataInfo();
801 findCargoAllocationData(this.formData) 891 findCargoAllocationData(this.formData)
802 .then((res) => { 892 .then((res) => {
803 this.loading = false; 893 this.loading = false;
...@@ -805,9 +895,9 @@ export default { ...@@ -805,9 +895,9 @@ export default {
805 this.tableData = res.data.list; 895 this.tableData = res.data.list;
806 if (res.data.list.length > 0) { 896 if (res.data.list.length > 0) {
807 this.totalCount = res.data.total; 897 this.totalCount = res.data.total;
808 - this.tableData.forEach((item,index = 0)=>{ 898 + this.tableData.forEach((item, index = 0) => {
809 - item.index = index 899 + item.index = index;
810 - }) 900 + });
811 } else { 901 } else {
812 this.$message({ 902 this.$message({
813 message: "未查询到数据", 903 message: "未查询到数据",
...@@ -825,105 +915,115 @@ export default { ...@@ -825,105 +915,115 @@ export default {
825 this.loading = false; 915 this.loading = false;
826 }); 916 });
827 }, 917 },
828 - cargoTotal(){ 918 + cargoTotal() {
829 this.allWeight = 0; 919 this.allWeight = 0;
830 this.allQty = 0; 920 this.allQty = 0;
831 - if(this.tableSelection.length > 0){ 921 + if (this.tableSelection.length > 0) {
832 - this.tableSelection.forEach(item=>{ 922 + this.tableSelection.forEach((item) => {
833 this.allWeight = this.allWeight + item.actualWeight; 923 this.allWeight = this.allWeight + item.actualWeight;
834 this.allQty = this.allQty + item.qty; 924 this.allQty = this.allQty + item.qty;
835 - }) 925 + });
836 this.allWeight = this.allWeight.toFixed(); 926 this.allWeight = this.allWeight.toFixed();
837 this.allQty = this.allQty.toFixed(); 927 this.allQty = this.allQty.toFixed();
838 } 928 }
839 }, 929 },
840 - dataInfo(){ 930 + dataInfo() {
841 this.formData.ursaList = null; 931 this.formData.ursaList = null;
842 this.formData.siteNameList = null; 932 this.formData.siteNameList = null;
843 this.formData.handingCodes = null; 933 this.formData.handingCodes = null;
844 this.formData.subCategorys = null; 934 this.formData.subCategorys = null;
845 - if(this.handingCodes.length > 0 ){ 935 + if (this.handingCodes.length > 0) {
846 this.formData.handingCodes = this.handingCodes; 936 this.formData.handingCodes = this.handingCodes;
847 } 937 }
848 - if(this.subCategorys.length > 0){ 938 + if (this.subCategorys.length > 0) {
849 this.formData.subCategorys = this.subCategorys; 939 this.formData.subCategorys = this.subCategorys;
850 } 940 }
851 - if(this.formData.minWeight === 0){ 941 + if (this.formData.minWeight === 0) {
852 - this.formData.minWeight = null; 942 + this.formData.minWeight = undefined;
853 } 943 }
854 - if(this.formData.maxWeight === 0){ 944 + if (this.formData.maxWeight === 0) {
855 - this.formData.maxWeight = null; 945 + this.formData.maxWeight = undefined;
856 } 946 }
857 - if(this.formData.minNumber === 0){ 947 + if (this.formData.minNumber === 0) {
858 - this.formData.minNumber = null; 948 + this.formData.minNumber = undefined;
859 } 949 }
860 - if(this.formData.maxNumber === 0){ 950 + if (this.formData.maxNumber === 0) {
861 - this.formData.maxNumber = null; 951 + this.formData.maxNumber = undefined;
862 } 952 }
863 - if(this.ursaList && this.ursaList != ''){ 953 + if (this.ursaList && this.ursaList != "") {
864 - this.formData.ursaList = this.ursaList.split(';' || '') 954 + this.formData.ursaList = this.ursaList.split(";" || "");
865 } 955 }
866 - if(this.siteNameList && this.siteNameList != ''){ 956 + if (this.siteNameList && this.siteNameList != "") {
867 - this.formData.siteNameList = this.siteNameList.split(';' || '') 957 + this.formData.siteNameList = this.siteNameList.split(";" || "");
868 } 958 }
869 - if(this.fltDate && this.fltDate.length > 0){ 959 + if (this.fltDate && this.fltDate.length > 0) {
870 this.formData.fltDateStart = this.fltDate[0]; 960 this.formData.fltDateStart = this.fltDate[0];
871 this.formData.fltDateEnd = this.fltDate[1]; 961 this.formData.fltDateEnd = this.fltDate[1];
872 - }else{ 962 + } else {
873 this.formData.fltDateStart = null; 963 this.formData.fltDateStart = null;
874 this.formData.fltDateEnd = null; 964 this.formData.fltDateEnd = null;
875 } 965 }
966 + if (
967 + this.formData.customsReceiptStatusId != null &&
968 + this.formData.customsReceiptStatusId.length < 1
969 + ) {
970 + this.formData.customsReceiptStatusId = null;
971 + }
876 this.formData.page = this.page; 972 this.formData.page = this.page;
877 this.formData.size = this.size; 973 this.formData.size = this.size;
878 }, 974 },
879 - xlse(val) { 975 + xlsx(val) {
880 this.downLoadingTip.downloading = true; 976 this.downLoadingTip.downloading = true;
881 - this.dataInfo() 977 + this.dataInfo();
882 - if(val === 0){ 978 + if (val === 0) {
883 - this.downLoadingTip.tip = '正在导出本页结果集'; 979 + this.downLoadingTip.tip = "正在导出本页结果集";
884 - downLoadXlsx('/cargo/allocationExcel',this.formData,'手动配舱表').then(res=>{ 980 + downLoadXlsx("/cargo/allocationExcel", this.formData, "手动配舱表")
885 - this.downLoadingTip.downloading = false; 981 + .then((res) => {
886 - }).catch(err=>{
887 this.downLoadingTip.downloading = false; 982 this.downLoadingTip.downloading = false;
888 - console.log(err)
889 }) 983 })
890 - }else{ 984 + .catch((err) => {
891 - this.downLoadingTip.tip = '正在导出全部结果集请耐心等待'; 985 + this.downLoadingTip.downloading = false;
986 + console.log(err);
987 + });
988 + } else {
989 + this.downLoadingTip.tip = "正在导出全部结果集请耐心等待";
892 this.formData.page = null; 990 this.formData.page = null;
893 this.formData.size = null; 991 this.formData.size = null;
894 - downLoadXlsx('/cargo/allocationExcel',this.formData,'手动配舱表').then(res=>{ 992 + downLoadXlsx("/cargo/allocationExcel", this.formData, "手动配舱表")
895 - this.downLoadingTip.downloading = false; 993 + .then((res) => {
896 - }).catch(err=>{
897 this.downLoadingTip.downloading = false; 994 this.downLoadingTip.downloading = false;
898 - console.log(err)
899 }) 995 })
996 + .catch((err) => {
997 + this.downLoadingTip.downloading = false;
998 + console.log(err);
999 + });
900 } 1000 }
901 }, 1001 },
902 tableSelect(val) { 1002 tableSelect(val) {
903 - this.tableSelection = val.selection 1003 + this.tableSelection = val.selection;
904 - this.cargoTotal() 1004 + this.cargoTotal();
905 }, 1005 },
906 - tableSelectAll(val){ 1006 + tableSelectAll(val) {
907 - this.tableSelection = val 1007 + this.tableSelection = val;
908 - this.cargoTotal() 1008 + this.cargoTotal();
909 }, 1009 },
910 - currentChange(val){ 1010 + currentChange(val) {
911 this.formData.limitStart = val.start; 1011 this.formData.limitStart = val.start;
912 this.page = val.page; 1012 this.page = val.page;
913 - this.select() 1013 + this.select();
914 }, 1014 },
915 addFit() { 1015 addFit() {
916 let open = true; 1016 let open = true;
917 - this.tableSelection.forEach(item=>{ 1017 + this.tableSelection.forEach((item) => {
918 - if(item.statusId != 107966){ 1018 + if (item.statusId != 107966) {
919 open = false; 1019 open = false;
920 } 1020 }
921 - }) 1021 + });
922 - if(open){ 1022 + if (open) {
923 this.dialogVisible = open; 1023 this.dialogVisible = open;
924 - }else{ 1024 + } else {
925 this.$message({ 1025 this.$message({
926 - message: "此类型货物不可配舱", 1026 + message: "包含不可手动配舱货物",
927 type: "warning", 1027 type: "warning",
928 }); 1028 });
929 this.tableSelection = []; 1029 this.tableSelection = [];
...@@ -933,7 +1033,7 @@ export default { ...@@ -933,7 +1033,7 @@ export default {
933 }, 1033 },
934 dialogBeforeClose(val) { 1034 dialogBeforeClose(val) {
935 this.dialogVisible = val.close; 1035 this.dialogVisible = val.close;
936 - if(val.reload){ 1036 + if (val.reload) {
937 this.tableSelection = []; 1037 this.tableSelection = [];
938 this.$refs.newTables.clearTable(); 1038 this.$refs.newTables.clearTable();
939 this.cargoTotal(); 1039 this.cargoTotal();
...@@ -966,6 +1066,14 @@ export default { ...@@ -966,6 +1066,14 @@ export default {
966 this.siteNameList = upCase(val); 1066 this.siteNameList = upCase(val);
967 }, 1067 },
968 }, 1068 },
1069 + portName: {
1070 + get: function () {
1071 + return this.formData.portName;
1072 + },
1073 + set: function (val) {
1074 + this.formData.portName = upCase(val);
1075 + },
1076 + },
969 }, 1077 },
970 }; 1078 };
971 </script> 1079 </script>
...@@ -976,22 +1084,22 @@ export default { ...@@ -976,22 +1084,22 @@ export default {
976 color: #606266; 1084 color: #606266;
977 font-size: 14px; 1085 font-size: 14px;
978 margin-top: 10px; 1086 margin-top: 10px;
979 - margin-left:50px; 1087 + margin-left: 50px;
980 } 1088 }
981 -.line{ 1089 +.line {
982 text-align: center; 1090 text-align: center;
983 } 1091 }
984 -.el-empty{ 1092 +.el-empty {
985 - width:30%; 1093 + width: 30%;
986 - height:37px; 1094 + height: 37px;
987 - padding:0px; 1095 + padding: 0px;
988 line-height: 37px; 1096 line-height: 37px;
989 - .el-empty__image{ 1097 + .el-empty__image {
990 width: 0px; 1098 width: 0px;
991 - height:0px; 1099 + height: 0px;
992 } 1100 }
993 - .el-empty__description{ 1101 + .el-empty__description {
994 - margin-top:0px; 1102 + margin-top: 0px;
995 } 1103 }
996 } 1104 }
997 </style> 1105 </style>
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -67,7 +67,7 @@ ...@@ -67,7 +67,7 @@
67 67
68 <script> 68 <script>
69 import { allocationFlight } from "@/api/cargoSelect"; 69 import { allocationFlight } from "@/api/cargoSelect";
70 -import { MessageBox } from 'element-ui' 70 +import { MessageBox } from "element-ui";
71 export default { 71 export default {
72 props: { 72 props: {
73 dialogVisible: { 73 dialogVisible: {
...@@ -82,10 +82,10 @@ export default { ...@@ -82,10 +82,10 @@ export default {
82 data() { 82 data() {
83 return { 83 return {
84 formData: { 84 formData: {
85 - ids:[], 85 + ids: [],
86 fltNo: undefined, 86 fltNo: undefined,
87 - fltDate:undefined, 87 + fltDate: undefined,
88 - overweight:false 88 + overweight: false,
89 }, 89 },
90 cargoHeader: [ 90 cargoHeader: [
91 { name: "口岸代码", value: "portName" }, 91 { name: "口岸代码", value: "portName" },
...@@ -96,101 +96,101 @@ export default { ...@@ -96,101 +96,101 @@ export default {
96 { name: "URSA", value: "ursa" }, 96 { name: "URSA", value: "ursa" },
97 { name: "实际重量", value: "actualWeight" }, 97 { name: "实际重量", value: "actualWeight" },
98 { name: "件数", value: "qty" }, 98 { name: "件数", value: "qty" },
99 + { name: "ACCS原航班号", value: "fltNoAccs" },
100 + { name: "ACCS原航班日期", value: "fltDateAccs" },
99 { name: "品名描述", value: "nameDescription" }, 101 { name: "品名描述", value: "nameDescription" },
100 { name: "是否自动", value: "cargoRulesStatus" }, 102 { name: "是否自动", value: "cargoRulesStatus" },
101 { name: "创建人", value: "createUserName" }, 103 { name: "创建人", value: "createUserName" },
102 { name: "创建时间", value: "createTime" }, 104 { name: "创建时间", value: "createTime" },
103 ], 105 ],
104 - fltHeader: [ 106 + rules: {
105 - { name: "航班日期", value: "fltDate" }, 107 + fltNo: [
106 - { name: "航班号", value: "fltNo" }, 108 + {
107 - { name: "航班路线", value: "route" },
108 - { name: "航班类型", value: "typeName" },
109 - { name: "总重量", value: "totalWeight" },
110 - { name: "额外增重百分比", value: "extraWeightPercent" },
111 - { name: "已配重量", value: "alloctedWeight" },
112 - { name: "配舱优先级", value: "priorityRuleName" },
113 - { name: "是否开启高地价", value: "highLowPriceFlg" },
114 - { name: "航班起飞时间", value: "takeOffTime" },
115 - { name: "创建人", value: "createUserName" },
116 - { name: "创建时间", value: "createTime" },
117 - ],
118 - rules:{
119 - fltNo: [{
120 required: true, 109 required: true,
121 message: "航班号不能为空", 110 message: "航班号不能为空",
122 - trigger: "blur" 111 + trigger: "blur",
123 - }], 112 + },
124 - fltDate: [{ 113 + ],
114 + fltDate: [
115 + {
125 required: true, 116 required: true,
126 message: "航班日期不能为空", 117 message: "航班日期不能为空",
127 - trigger: "change" 118 + trigger: "change",
128 - }], 119 + },
129 - } 120 + ],
121 + },
130 }; 122 };
131 }, 123 },
132 methods: { 124 methods: {
133 - cleaerForm(){ 125 + cleaerForm() {
134 - this.formData={ 126 + this.formData = {
135 - ids:[], 127 + ids: [],
136 fltNo: undefined, 128 fltNo: undefined,
137 - fltDate:undefined, 129 + fltDate: undefined,
138 - overweight:false 130 + overweight: false,
139 - } 131 + };
140 }, 132 },
141 //确定配舱 133 //确定配舱
142 submit() { 134 submit() {
143 let arr = []; 135 let arr = [];
144 - this.tableData.forEach(item => { 136 + this.tableData.forEach((item) => {
145 - arr.push(item.id) 137 + arr.push(item.id);
146 }); 138 });
147 this.formData.ids = arr; 139 this.formData.ids = arr;
148 - if(this.formData.fltNo && this.formData.fltDate){ 140 + if (this.formData.fltNo && this.formData.fltDate) {
149 - allocationFlight(this.formData).then(res=>{//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg 141 + allocationFlight(this.formData).then((res) => {
150 - if(res.code === 200){ 142 + //code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
143 + if (res.code === 200) {
151 this.$message({ 144 this.$message({
152 message: "货物配舱成功", 145 message: "货物配舱成功",
153 type: "success", 146 type: "success",
154 }); 147 });
155 - }else if(res.code === 202){ 148 + this.cleaerForm();
156 - MessageBox.confirm('航班配重已满，是否继续配舱？', '提示', { 149 + this.$emit("dialogBeforeClose", { close: false, reload: true });
157 - confirmButtonText: '确定', 150 + } else if (res.code === 202) {
158 - cancelButtonText: '取消', 151 + MessageBox.confirm(res.msg, "提示", {
159 - type: 'warning' 152 + confirmButtonText: "确定",
160 - } 153 + cancelButtonText: "取消",
161 - ).then(() => { 154 + type: "warning",
162 - this.formData.overweight = true;//确定继续overweight变为true再次请求接口 155 + })
163 - allocationFlight(this.formData).then(res=>{ 156 + .then(() => {
164 - if(res.code === 200){ 157 + this.formData.overweight = true; //确定继续overweight变为true再次请求接口
158 + allocationFlight(this.formData).then((res) => {
159 + if (res.code === 200) {
165 this.$message({ 160 this.$message({
166 message: "货物配舱成功", 161 message: "货物配舱成功",
167 type: "success", 162 type: "success",
168 }); 163 });
169 - }else{ 164 + } else {
170 this.$message({ 165 this.$message({
171 message: res.msg, 166 message: res.msg,
172 type: "warning", 167 type: "warning",
173 }); 168 });
174 } 169 }
170 + });
171 + this.cleaerForm();
172 + this.$emit("dialogBeforeClose", { close: false, reload: true });
175 }) 173 })
176 - this.cleaerForm() 174 + .catch(() => {
177 - this.$emit("dialogBeforeClose", {close:false,reload:true}); 175 + //取消 取消当前配舱
178 - }).catch(() => {//取消 取消当前配舱
179 this.$message({ 176 this.$message({
180 message: "配舱已取消", 177 message: "配舱已取消",
181 type: "success", 178 type: "success",
182 }); 179 });
183 - this.cleaerForm() 180 + this.cleaerForm();
184 - this.$emit("dialogBeforeClose", {close:false,reload:false}); 181 + this.$emit("dialogBeforeClose", {
182 + close: false,
183 + reload: false,
184 + });
185 }); 185 });
186 - }else{ 186 + } else {
187 this.$message({ 187 this.$message({
188 message: res.msg, 188 message: res.msg,
189 type: "warning", 189 type: "warning",
190 }); 190 });
191 } 191 }
192 - }) 192 + });
193 - }else{ 193 + } else {
194 this.$message({ 194 this.$message({
195 message: "航班号或航班日期不能为空", 195 message: "航班号或航班日期不能为空",
196 type: "warning", 196 type: "warning",
...@@ -198,8 +198,8 @@ export default { ...@@ -198,8 +198,8 @@ export default {
198 } 198 }
199 }, 199 },
200 dialogBeforeClose() { 200 dialogBeforeClose() {
201 - this.cleaerForm() 201 + this.cleaerForm();
202 - this.$emit("dialogBeforeClose", {close:false,reload:false}); 202 + this.$emit("dialogBeforeClose", { close: false, reload: false });
203 }, 203 },
204 }, 204 },
205 computed: { 205 computed: {
......
1 <template> 1 <template>
2 - <div style="margin: 40px" class="app-container"> 2 + <div>
3 <el-form 3 <el-form
4 :inline="true" 4 :inline="true"
5 :model="queryParams" 5 :model="queryParams"
6 - class="demo-form-inline" 6 + class="form-header"
7 - size="small" 7 + size="medium"
8 + label-position="right"
9 + label-width="auto"
8 > 10 >
9 <el-form-item label="航班号"> 11 <el-form-item label="航班号">
10 <el-input 12 <el-input
...@@ -28,7 +30,7 @@ ...@@ -28,7 +30,7 @@
28 >查询</el-button 30 >查询</el-button
29 > 31 >
30 </el-form-item> 32 </el-form-item>
31 - </el-form> 33 + <div>
32 <el-button 34 <el-button
33 style="margin-bottom: 20px" 35 style="margin-bottom: 20px"
34 type="primary" 36 type="primary"
...@@ -37,7 +39,9 @@ ...@@ -37,7 +39,9 @@
37 @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })" 39 @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
38 >添加</el-button 40 >添加</el-button
39 > 41 >
40 - <el-table :data="flyList" v-loading="loading" size="small"> 42 + </div>
43 + </el-form>
44 + <el-table :data="flyList" v-loading="loading" size="small" highlight-current-row border stripe>
41 <el-table-column 45 <el-table-column
42 prop="purposeOfFlightNo" 46 prop="purposeOfFlightNo"
43 label="航班号" 47 label="航班号"
...@@ -208,9 +212,13 @@ export default { ...@@ -208,9 +212,13 @@ export default {
208 .then(function () { 212 .then(function () {
209 return enableOrDisable(id, status); 213 return enableOrDisable(id, status);
210 }) 214 })
211 - .then(() => { 215 + .then((res) => {
216 + if (res.code != 200){
217 + this.msgError(res.msg);
218 + }else {
212 this.getList(); 219 this.getList();
213 this.msgSuccess(tip + "成功"); 220 this.msgSuccess(tip + "成功");
221 + }
214 }) 222 })
215 .catch(function () {}); 223 .catch(function () {});
216 }, 224 },
......
...@@ -62,16 +62,16 @@ ...@@ -62,16 +62,16 @@
62 form.minNumOfPieces == 0 62 form.minNumOfPieces == 0
63 ? (form.minNumOfPieces = undefined) 63 ? (form.minNumOfPieces = undefined)
64 : form.minNumOfPieces 64 : form.minNumOfPieces
65 - " :precision="0" :controls="false" style="width: 100%"></el-input-number> 65 + " :precision="0" :controls="false" style="width: 100%" :min="1"></el-input-number>
66 </el-col> 66 </el-col>
67 <el-col style="text-align: center" :span="1">-</el-col> 67 <el-col style="text-align: center" :span="1">-</el-col>
68 <el-col :span="3"> 68 <el-col :span="3">
69 <!-- <el-input v-model="form.maxNumOfPieces"></el-input> --> 69 <!-- <el-input v-model="form.maxNumOfPieces"></el-input> -->
70 <el-input-number v-model=" 70 <el-input-number v-model="
71 form.maxNumOfPieces == 0 71 form.maxNumOfPieces == 0
72 - ? (form.maxNumOfPieces = undefined) 72 + ? form.maxNumOfPieces=undefined
73 : form.maxNumOfPieces 73 : form.maxNumOfPieces
74 - " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces + 1"></el-input-number> 74 + " :precision="0" :controls="false" style="width: 100%" :min="form.minNumOfPieces"></el-input-number>
75 </el-col> 75 </el-col>
76 </el-form-item> 76 </el-form-item>
77 77
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 form.minWeight == 0 82 form.minWeight == 0
83 ? (form.minWeight = undefined) 83 ? (form.minWeight = undefined)
84 : form.minWeight 84 : form.minWeight
85 - " :precision="2" :controls="false" style="width: 100%"></el-input-number> 85 + " :precision="2" :controls="false" style="width: 100%" :min="0.01"></el-input-number>
86 </el-col> 86 </el-col>
87 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col> 87 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
88 <el-col style="text-align: center" :span="1">-</el-col> 88 <el-col style="text-align: center" :span="1">-</el-col>
...@@ -92,7 +92,7 @@ ...@@ -92,7 +92,7 @@
92 form.maxWeight == 0 92 form.maxWeight == 0
93 ? (form.maxWeight = undefined) 93 ? (form.maxWeight = undefined)
94 : form.maxWeight 94 : form.maxWeight
95 - " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight + 0.01"></el-input-number> 95 + " :precision="2" :controls="false" style="width: 100%" :min="form.minWeight"></el-input-number>
96 </el-col> 96 </el-col>
97 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col> 97 <el-col :span="1" style="text-align: center"><span>Kg</span></el-col>
98 </el-form-item> 98 </el-form-item>
...@@ -398,10 +398,10 @@ ...@@ -398,10 +398,10 @@
398 info.subCategory.split(";") : 398 info.subCategory.split(";") :
399 []; 399 [];
400 this.form = info; 400 this.form = info;
401 - if (info.location != null || info.location == "") { 401 + if (info.notLocation != null || info.notLocation == "") {
402 - this.isLocation = "1";
403 - } else {
404 this.isLocation = "2"; 402 this.isLocation = "2";
403 + } else {
404 + this.isLocation = "1";
405 } 405 }
406 this.isNeedRequired = info.isNeedRequired; 406 this.isNeedRequired = info.isNeedRequired;
407 } 407 }
...@@ -435,10 +435,10 @@ ...@@ -435,10 +435,10 @@
435 info.subCategory.split(";") : 435 info.subCategory.split(";") :
436 []; 436 [];
437 this.form = info; 437 this.form = info;
438 - if (info.location != null || info.location == "") { 438 + if (info.notLocation != null || info.notLocation == "") {
439 - this.isLocation = "1";
440 - } else {
441 this.isLocation = "2"; 439 this.isLocation = "2";
440 + } else {
441 + this.isLocation = "1";
442 } 442 }
443 let isNeedRequired = response.data.isNeedRequired; 443 let isNeedRequired = response.data.isNeedRequired;
444 this.form.isNeedRequired = isNeedRequired; 444 this.form.isNeedRequired = isNeedRequired;
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 - <el-form :model="queryParams" ref="queryForm" :inline="true"> 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" size="medium" :inline="true" label-position="right" label-width="auto">
4 4
5 <el-form-item label="原航班"> 5 <el-form-item label="原航班">
6 - <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable class="formItem"></el-input> 6 + <el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable></el-input>
7 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> --> 7 <!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
8 </el-form-item> 8 </el-form-item>
9 <el-form-item label="状态" prop="status"> 9 <el-form-item label="状态" prop="status">
10 - <el-select v-model="queryParams.status" placeholder="请选择" clearable size="small"> 10 + <el-select v-model="queryParams.status" placeholder="请选择" clearable>
11 <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" /> 11 <el-option v-for="dict in statusList" :key="dict.id" :label="dict.name" :value="dict.id" />
12 </el-select> 12 </el-select>
13 13
...@@ -30,15 +30,13 @@ ...@@ -30,15 +30,13 @@
30 </el-form-item> 30 </el-form-item>
31 <br /> 31 <br />
32 <el-form-item> 32 <el-form-item>
33 - <el-col :span="1.5">
34 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button> 33 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">添加规则</el-button>
35 - </el-col> 34 + <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
36 - &#12288; <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
37 </el-form-item> 35 </el-form-item>
38 </el-form> 36 </el-form>
39 37
40 38
41 - <el-table v-loading="loading" :data="sourceFlightRulesList"> 39 + <el-table v-loading="loading" height="550" :data="sourceFlightRulesList" highlight-current-row border stripe>
42 <el-table-column type="index" label="序号" align="center"> 40 <el-table-column type="index" label="序号" align="center">
43 <template slot-scope="scope">{{ scope.$index + 1 }}</template> 41 <template slot-scope="scope">{{ scope.$index + 1 }}</template>
44 </el-table-column> 42 </el-table-column>
...@@ -92,7 +90,7 @@ ...@@ -92,7 +90,7 @@
92 90
93 <!-- 添加或修改对话框 --> 91 <!-- 添加或修改对话框 -->
94 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false"> 92 <el-dialog :title="title" :visible.sync="open" width="55%" :append-to-body="true" :close-on-click-modal="false">
95 - <el-form ref="form" :model="form" :rules="rules" label-width="100px"> 93 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
96 <el-row> 94 <el-row>
97 <el-col :span="10"> 95 <el-col :span="10">
98 <el-form-item label="原航班" prop="sourceFlightNo"> 96 <el-form-item label="原航班" prop="sourceFlightNo">
...@@ -219,7 +217,7 @@ ...@@ -219,7 +217,7 @@
219 rules: { 217 rules: {
220 sourceFlightNo: [{ 218 sourceFlightNo: [{
221 required: true, 219 required: true,
222 - message: "原航班号不能为空", 220 + message: "ACCS原航班号不能为空",
223 trigger: "blur" 221 trigger: "blur"
224 }], 222 }],
225 flightRank: [{ 223 flightRank: [{
...@@ -361,7 +359,7 @@ ...@@ -361,7 +359,7 @@
361 //校验原航班号非空 359 //校验原航班号非空
362 if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this 360 if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
363 .queryParams.sourceFlightNo.trim() === '') { 361 .queryParams.sourceFlightNo.trim() === '') {
364 - this.$message.warning("原航班号为空"); 362 + this.$message.warning("ACCS原航班号为空");
365 return 363 return
366 } 364 }
367 //校验原日期非空 365 //校验原日期非空
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium"> 3 <el-form class="form-header" :model="queryParams" label-position="right" label-width="auto" size="medium">
4 <el-row> 4 <el-row>
5 <el-col :span="6"> 5 <el-col :span="6">
......
1 <template> 1 <template>
2 - <div class="app-container"> 2 + <div>
3 - <el-form :model="queryParams" ref="queryForm" :inline="true" label-width="90px"> 3 + <el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto" size="medium">
4 <el-row> 4 <el-row>
5 - <el-col :span="8"> 5 + <el-col :span="6">
6 -
7 <el-form-item label="航班日期从" prop="fltDateStart"> 6 <el-form-item label="航班日期从" prop="fltDateStart">
8 - <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期"> 7 + <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateStart" type="date" placeholder="选择日期">
9 </el-date-picker> 8 </el-date-picker>
10 </el-form-item> 9 </el-form-item>
11 </el-col> 10 </el-col>
12 11
13 - <el-col :span="8"> 12 + <el-col :span="6">
14 <el-form-item label="到" prop="fltDateEnd"> 13 <el-form-item label="到" prop="fltDateEnd">
15 - <el-date-picker value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期"> 14 + <el-date-picker class="formItem" value-format="yyyy-MM-dd" v-model="queryParams.fltDateEnd" type="date" placeholder="选择日期">
16 </el-date-picker> 15 </el-date-picker>
17 </el-form-item> 16 </el-form-item>
18 </el-col> 17 </el-col>
19 18
20 - <el-col :span="8"> 19 + <el-col :span="6">
21 <el-form-item label="航班号" prop="fltNo"> 20 <el-form-item label="航班号" prop="fltNo">
22 - <el-input v-model="queryParams.fltNo" placeholder="请输入航班号" clearable size="small" /> 21 + <el-input class="formItem" v-model="queryParams.fltNo" placeholder="请输入航班号" clearable />
23 </el-form-item> 22 </el-form-item>
24 </el-col> 23 </el-col>
25 24
26 - </el-row> 25 + <el-col :span="6">
27 - <el-row>
28 - <el-col :span="8">
29 <el-form-item label="航班类型" prop="typeId"> 26 <el-form-item label="航班类型" prop="typeId">
30 - <el-select v-model="queryParams.typeId" placeholder="请选择航班类型" clearable size="small"> 27 + <el-select class="formItem" v-model="queryParams.typeId" placeholder="请选择航班类型" clearable>
31 <el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" /> 28 <el-option v-for="dict in flightTypelist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
32 </el-select> 29 </el-select>
33 </el-form-item> 30 </el-form-item>
34 </el-col> 31 </el-col>
35 32
36 - <el-col :span="8"> 33 + <el-col :span="6">
37 <el-form-item label="航班状态" prop="statusId"> 34 <el-form-item label="航班状态" prop="statusId">
38 - <el-select v-model="queryParams.statusId" placeholder="请选择航班状态" clearable size="small"> 35 + <el-select class="formItem" v-model="queryParams.statusId" placeholder="请选择航班状态" clearable>
39 <el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" /> 36 <el-option v-for="dict in flightStatuslist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
40 </el-select> 37 </el-select>
41 </el-form-item> 38 </el-form-item>
42 </el-col> 39 </el-col>
43 40
44 - <el-col :span="8"> 41 + <el-col :span="6">
45 <el-form-item label="航班种类" prop="flightKindId"> 42 <el-form-item label="航班种类" prop="flightKindId">
46 - <el-select v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable size="small"> 43 + <el-select class="formItem" v-model="queryParams.flightKindId" placeholder="请选择航班种类" clearable>
47 <el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" /> 44 <el-option v-for="dict in flightKindlist" :key="dict.id" :label="dict.chineseName" :value="dict.id" />
48 </el-select> 45 </el-select>
49 </el-form-item> 46 </el-form-item>
...@@ -51,14 +48,11 @@ ...@@ -51,14 +48,11 @@
51 48
52 </el-row> 49 </el-row>
53 50
54 - <br />
55 - <el-form-item>
56 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 51 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
57 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 52 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
58 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> 53 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
59 - <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">航班开启</el-button> 54 + <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button>
60 - <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">航班关闭</el-button> 55 + <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button>
61 - </el-form-item>
62 </el-form> 56 </el-form>
63 <!-- <el-row :gutter="10" class="mb8"> 57 <!-- <el-row :gutter="10" class="mb8">
64 <el-col :span="1.5"> 58 <el-col :span="1.5">
...@@ -132,7 +126,7 @@ ...@@ -132,7 +126,7 @@
132 126
133 <!-- 添加或修改对话框 --> 127 <!-- 添加或修改对话框 -->
134 <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true"> 128 <el-dialog :title="title" :visible.sync="open" width="60%" :close-on-click-modal="false" :append-to-body="true">
135 - <el-form ref="form" :model="form" :rules="rules" label-width="130px"> 129 + <el-form ref="form" :model="form" :rules="rules" label-position="right" label-width="auto">
136 <el-row> 130 <el-row>
137 <el-col :span="12"> 131 <el-col :span="12">
138 <el-form-item label="航班号" prop="fltNo"> 132 <el-form-item label="航班号" prop="fltNo">
...@@ -547,7 +541,6 @@ ...@@ -547,7 +541,6 @@
547 }, 541 },
548 //计算高地价可配 542 //计算高地价可配
549 LowHighAvailable() { 543 LowHighAvailable() {
550 -
551 //判断是否开启高地价 544 //判断是否开启高地价
552 if (this.form.highLowPriceFlg) { 545 if (this.form.highLowPriceFlg) {
553 this.ishighPriceWeightPercent=false; 546 this.ishighPriceWeightPercent=false;
...@@ -562,21 +555,33 @@ ...@@ -562,21 +555,33 @@
562 this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form 555 this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
563 .highPriceWeightPercent / 100)); 556 .highPriceWeightPercent / 100));
564 // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100) 557 // this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
565 - } else { 558 + }else if(this.title == "修改航班信息" && this.form.highPriceWeightPercent > 0){
559 + if(this.form.highAvailableWeight){
560 + this.$set(this.form, 'highAvailableWeight', this.form.highAvailableWeight)
561 + }else{
562 + this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
563 + .highPriceWeightPercent / 100));
564 + }
565 + }else {
566 this.$set(this.form, "highAvailableWeight", 0); 566 this.$set(this.form, "highAvailableWeight", 0);
567 // this.form.HighAvailableWeight = 0; 567 // this.form.HighAvailableWeight = 0;
568 } 568 }
569 //低价可配 569 //低价可配
570 if (this.form.lowPriceWeightPercent > 0) { 570 if (this.form.lowPriceWeightPercent > 0) {
571 -
572 this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form 571 this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
573 .highAvailableWeight); 572 .highAvailableWeight);
574 //this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight; 573 //this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight;
575 - } else { 574 + }else if(this.title == "修改航班信息" && this.form.lowPriceWeightPercent > 0){
575 + if(this.form.lowAvailableWeight){
576 + this.$set(this.form, 'lowAvailableWeight', this.form.lowAvailableWeight)
577 + }else{
578 + this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
579 + .highAvailableWeight);
580 + }
581 + }else {
576 this.$set(this.form, "lowAvailableWeight", 0); 582 this.$set(this.form, "lowAvailableWeight", 0);
577 // this.form.lowAvailableWeight = 0; 583 // this.form.lowAvailableWeight = 0;
578 } 584 }
579 -
580 }else{ 585 }else{
581 this.ishighPriceWeightPercent=true; 586 this.ishighPriceWeightPercent=true;
582 } 587 }
...@@ -587,7 +592,7 @@ ...@@ -587,7 +592,7 @@
587 let Weight = 0; 592 let Weight = 0;
588 if (this.form.extraWeightPercent > 0) { 593 if (this.form.extraWeightPercent > 0) {
589 Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100) 594 Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
590 - } else { 595 + }else {
591 Weight = this.form.originalWeight; 596 Weight = this.form.originalWeight;
592 } 597 }
593 return Weight; 598 return Weight;
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
3 <el-form 3 <el-form
4 ref="cargoForm" 4 ref="cargoForm"
5 class="form-header" 5 class="form-header"
6 - size="small"
7 - :model="formData"
8 label-position="top" 6 label-position="top"
9 label-width="auto" 7 label-width="auto"
10 - style="margin: 10px; width: 100%" 8 + size="small"
9 + :model="formData"
11 > 10 >
12 <el-row type="flex" style="flexWrap: wrap!important"> 11 <el-row type="flex" style="flexWrap: wrap!important">
13 <el-col :span="6"> 12 <el-col :span="6">
14 - <el-form-item label="配舱航班日期:"> 13 + <el-form-item label="配舱航班日期">
15 <el-date-picker 14 <el-date-picker
16 class="formItem" 15 class="formItem"
17 v-model="cargoPlaneTime" 16 v-model="cargoPlaneTime"
...@@ -25,12 +24,12 @@ ...@@ -25,12 +24,12 @@
25 </el-form-item> 24 </el-form-item>
26 </el-col> 25 </el-col>
27 <el-col :span="6"> 26 <el-col :span="6">
28 - <el-form-item label="配载航班号:"> 27 + <el-form-item label="配载航班号">
29 <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input> 28 <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input>
30 </el-form-item> 29 </el-form-item>
31 </el-col> 30 </el-col>
32 <el-col :span="6"> 31 <el-col :span="6">
33 - <el-form-item label="海关回执状态:"> 32 + <el-form-item label="海关回执状态">
34 <el-select 33 <el-select
35 placeholder="不限" 34 placeholder="不限"
36 v-model="formData.customsReceiptStatusId" 35 v-model="formData.customsReceiptStatusId"
...@@ -49,7 +48,7 @@ ...@@ -49,7 +48,7 @@
49 </el-form-item> 48 </el-form-item>
50 </el-col> 49 </el-col>
51 <el-col :span="6"> 50 <el-col :span="6">
52 - <el-form-item label="运单号:"> 51 + <el-form-item label="运单号">
53 <el-input 52 <el-input
54 type="textarea" 53 type="textarea"
55 v-model="formData.waybillNo" 54 v-model="formData.waybillNo"
...@@ -60,7 +59,7 @@ ...@@ -60,7 +59,7 @@
60 </el-form-item> 59 </el-form-item>
61 </el-col> 60 </el-col>
62 <el-col :span="6"> 61 <el-col :span="6">
63 - <el-form-item label="申报类别:"> 62 + <el-form-item label="申报类别">
64 <el-select 63 <el-select
65 placeholder="不限" 64 placeholder="不限"
66 v-model="formData.typeId" 65 v-model="formData.typeId"
...@@ -78,7 +77,7 @@ ...@@ -78,7 +77,7 @@
78 </el-form-item> 77 </el-form-item>
79 </el-col> 78 </el-col>
80 <el-col :span="6"> 79 <el-col :span="6">
81 - <el-form-item label="服务类型:"> 80 + <el-form-item label="服务类型">
82 <el-select 81 <el-select
83 placeholder="不限" 82 placeholder="不限"
84 v-model="formData.serviceTypeId" 83 v-model="formData.serviceTypeId"
...@@ -97,7 +96,7 @@ ...@@ -97,7 +96,7 @@
97 </el-form-item> 96 </el-form-item>
98 </el-col> 97 </el-col>
99 <el-col :span="6"> 98 <el-col :span="6">
100 - <el-form-item label="URSA:"> 99 + <el-form-item label="URSA">
101 <el-input 100 <el-input
102 type="textarea" 101 type="textarea"
103 v-model="ursa" 102 v-model="ursa"
...@@ -108,7 +107,7 @@ ...@@ -108,7 +107,7 @@
108 </el-form-item> 107 </el-form-item>
109 </el-col> 108 </el-col>
110 <el-col :span="6"> 109 <el-col :span="6">
111 - <el-form-item label="站点:"> 110 + <el-form-item label="站点">
112 <el-input 111 <el-input
113 type="textarea" 112 type="textarea"
114 v-model="siteName" 113 v-model="siteName"
...@@ -126,7 +125,7 @@ ...@@ -126,7 +125,7 @@
126 </template> 125 </template>
127 <el-row type="flex" style="flexWrap: wrap!important"> 126 <el-row type="flex" style="flexWrap: wrap!important">
128 <el-col :span="6"> 127 <el-col :span="6">
129 - <el-form-item label="ACCS原航班日期:"> 128 + <el-form-item label="ACCS原航班日期">
130 <el-date-picker 129 <el-date-picker
131 class="formItem" 130 class="formItem"
132 v-model="flightTime" 131 v-model="flightTime"
...@@ -140,13 +139,14 @@ ...@@ -140,13 +139,14 @@
140 </el-form-item> 139 </el-form-item>
141 </el-col> 140 </el-col>
142 <el-col :span="6"> 141 <el-col :span="6">
143 - <el-form-item label="ACCS原航班号:"> 142 + <el-form-item label="ACCS原航班号">
144 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input> 143 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
145 </el-form-item> 144 </el-form-item>
146 </el-col> 145 </el-col>
147 <el-col :span="6"> 146 <el-col :span="6">
148 - <el-form-item label="取件日期:"> 147 + <el-form-item label="取件日期">
149 <el-date-picker 148 <el-date-picker
149 + class="formItem"
150 v-model="formData.pickUpDate" 150 v-model="formData.pickUpDate"
151 type="date" 151 type="date"
152 placeholder="选择日期" 152 placeholder="选择日期"
...@@ -156,7 +156,7 @@ ...@@ -156,7 +156,7 @@
156 </el-form-item> 156 </el-form-item>
157 </el-col> 157 </el-col>
158 <el-col :span="6"> 158 <el-col :span="6">
159 - <el-form-item label="创建日期:"> 159 + <el-form-item label="创建日期">
160 <el-date-picker 160 <el-date-picker
161 class="formItem" 161 class="formItem"
162 v-model="createDate" 162 v-model="createDate"
...@@ -170,7 +170,7 @@ ...@@ -170,7 +170,7 @@
170 </el-form-item> 170 </el-form-item>
171 </el-col> 171 </el-col>
172 <el-col :span="6"> 172 <el-col :span="6">
173 - <el-form-item label="货物状态:"> 173 + <el-form-item label="货物状态">
174 <el-select 174 <el-select
175 placeholder="不限" 175 placeholder="不限"
176 v-model="formData.statusId" 176 v-model="formData.statusId"
...@@ -189,7 +189,7 @@ ...@@ -189,7 +189,7 @@
189 </el-form-item> 189 </el-form-item>
190 </el-col> 190 </el-col>
191 <el-col :span="6"> 191 <el-col :span="6">
192 - <el-form-item label="是否自动:"> 192 + <el-form-item label="是否自动">
193 <el-select 193 <el-select
194 placeholder="不限" 194 placeholder="不限"
195 v-model="formData.allocationTypeId" 195 v-model="formData.allocationTypeId"
...@@ -209,6 +209,18 @@ ...@@ -209,6 +209,18 @@
209 </el-select> 209 </el-select>
210 </el-form-item> 210 </el-form-item>
211 </el-col> 211 </el-col>
212 + <!-- <el-col :span="6">
213 + <el-form-item label="口岸代码">
214 + <el-select
215 + placeholder="不限"
216 + v-model="formData.portName"
217 + class="formItem"
218 + clearable
219 + >
220 +
221 + </el-select>
222 + </el-form-item>
223 + </el-col> -->
212 </el-row> 224 </el-row>
213 </el-collapse-item> 225 </el-collapse-item>
214 </el-collapse> 226 </el-collapse>
...@@ -240,44 +252,20 @@ ...@@ -240,44 +252,20 @@
240 </div> 252 </div>
241 </div> 253 </div>
242 </el-form> 254 </el-form>
243 - <el-table 255 + <Tables
244 - ref="cargoTable" 256 + ref="newTables"
245 :data="tableData" 257 :data="tableData"
246 - v-loading="tableLoading" 258 + :headerData="tableHeader"
247 - highlight-current-row border stripe 259 + :totalCount="totalCount"
260 + :loading="tableLoading"
261 + :limitSize="limitSize"
262 + :limitStart="limitStart"
263 + :shiftKey="shiftKey"
248 height="430" 264 height="430"
249 - size="mini" 265 + @tableSelect="tableSelect"
250 - @select="cheacked" 266 + @tableSelectAll="tableSelectAll"
251 - @select-all="selectAll" 267 + @currentChange="currentChange"
252 - > 268 + ></Tables>
253 - <el-table-column type="selection" width="55" fixed align="center"> </el-table-column>
254 - <el-table-column type="index" label="序号" align="center">
255 - <template slot-scope="scope">{{ scope.$index + 1 }}</template>
256 - </el-table-column>
257 - <el-table-column
258 - v-for="item in tableHeader"
259 - :prop="item.value"
260 - :label="item.name"
261 - :key="item.name"
262 - header-align="center"
263 - align="center"
264 - :show-overflow-tooltip="true"
265 - :width="item.value=='bigPretrialOpinion'?'300':'170'"
266 - :formatter="formatter"
267 - sortable
268 - >
269 - </el-table-column>
270 - </el-table>
271 - <el-pagination
272 - :total="totalCount"
273 - :page-size.sync="limitSize"
274 - background
275 - style="marginTop: 40px; textAlign: right"
276 - @next-click="nextClick"
277 - @prev-click="prevClick"
278 - @current-change="currentChange"
279 - >
280 - </el-pagination>
281 </div> 269 </div>
282 </template> 270 </template>
283 271
...@@ -315,59 +303,446 @@ export default { ...@@ -315,59 +303,446 @@ export default {
315 cargoPlaneNo:null, 303 cargoPlaneNo:null,
316 cargoPlaneStart:null, 304 cargoPlaneStart:null,
317 cargoPlaneEnd:null, 305 cargoPlaneEnd:null,
306 + limitStart: 1,
307 + limitSize:100,
318 }, //表单数据 308 }, //表单数据
319 tableHeader: [ 309 tableHeader: [
320 - { name: "口岸代码", value: "portName" },
321 - { name: "取件日期", value: "pickUpDate" },
322 - { name: "取件扫描号", value: "pickUpScanNo" },
323 - { name: "站点", value: "siteName" },
324 - { name: "运单号", value: "waybillNo" },
325 - { name: "服务类型", value: "serviceTypeName" },
326 - { name: "URSA", value: "ursa" },
327 - { name: "申报类型", value: "typeName" },
328 - { name: "HandlingCode", value: "handingCode" },
329 - { name: "subcategory", value: "subCategory" },
330 - { name: "件数", value: "qty" },
331 - { name: "实际重量", value: "actualWeight" },
332 - { name: "收件人国家代码", value: "consigneeCountry" },
333 - { name: "品名描述", value: "nameDescription" },
334 - { name: "海关回执状态", value: "customsReceiptStatusName" },
335 - { name: "总单号", value: "totalWaybillNo" },
336 - { name: "预审状态", value: "preQualificationStatus" },
337 - { name: "航班预审意见", value: "caPretrialOpinion" },
338 - { name: "货物状态", value: "statusName" },
339 - { name: "终配航班号", value: "finalFlightNo" },
340 - { name: "终配航班日期", value: "finalFlightTime" },
341 - { name: "二配航班号", value: "twoMatchFlightNo" },
342 - { name: "二配航班日期", value: "twoMatchFlightTime" },
343 - { name: "预配航班号", value: "preplanFlightNo" },
344 - { name: "预配航班日期", value: "preplanFlightTime" },
345 - { name: "ACCS原航班号", value: "fltNoAccs" },
346 - { name: "ACCS原航班日期", value: "fltDateAccs" },
347 - { name: "ACCS原航线", value: "accsFlightRoute" },
348 - { name: "是否RDE手工录入", value: "manualRde" },
349 - { name: "是否自动", value: "cargoRulesStatus" },
350 - { name: "发件人账号", value: "shipperAccount" },
351 - { name: "发件公司中文名称", value: "shipperCompany" },
352 - { name: "始发地城市名称", value: "originCity" },
353 - { name: "收件地", value: "destinationSiteName" },
354 - { name: "尺寸", value: "sizeStr" },
355 { 310 {
311 + type: "selection",
312 + name: "",
313 + value: "",
314 + width: "50",
315 + align: "center",
316 + sorTable: false,
317 + slot: null,
318 + fixed:true,
319 + },
320 + {
321 + type: "index",
322 + name: "",
323 + value: "",
324 + width: "50",
325 + align: "center",
326 + sorTable: false,
327 + slot: null,
328 + fixed:false,
329 + },
330 + {
331 + type: "",
332 + name: "口岸代码",
333 + value: "portName",
334 + width: "150",
335 + align: "center",
336 + sorTable: true,
337 + slot: null,
338 + fixed:false,
339 + },
340 + {
341 + type: "",
342 + name: "取件日期",
343 + value: "pickUpDate",
344 + width: "150",
345 + align: "center",
346 + sorTable: true,
347 + slot: null,
348 + fixed:false,
349 + },
350 + {
351 + type: "",
352 + name: "取件扫描号",
353 + value: "pickUpScanNo",
354 + width: "150",
355 + align: "center",
356 + sorTable: true,
357 + slot: null,
358 + fixed:false,
359 + },
360 + {
361 + type: "",
362 + name: "站点",
363 + value: "siteName",
364 + width: "150",
365 + align: "center",
366 + sorTable: true,
367 + slot: null,
368 + fixed:false,
369 + },
370 + {
371 + type: "",
372 + name: "运单号",
373 + value: "waybillNo",
374 + width: "150",
375 + align: "center",
376 + sorTable: true,
377 + slot: null,
378 + fixed:false,
379 + },
380 + {
381 + type: "",
382 + name: "总单号",
383 + value: "totalWaybillNo",
384 + width: "150",
385 + align: "center",
386 + sorTable: true,
387 + slot: null,
388 + fixed:false,
389 + },
390 + {
391 + type: "",
392 + name: "服务类型",
393 + value: "serviceTypeName",
394 + width: "150",
395 + align: "center",
396 + sorTable: true,
397 + slot: null,
398 + fixed:false,
399 + },
400 + {
401 + type: "",
402 + name: "URSA",
403 + value: "ursa",
404 + width: "150",
405 + align: "center",
406 + sorTable: true,
407 + slot: null,
408 + fixed:false,
409 + },
410 + {
411 + type: "",
412 + name: "申报类型",
413 + value: "typeName",
414 + width: "150",
415 + align: "center",
416 + sorTable: true,
417 + slot: null,
418 + fixed:false,
419 + },
420 + {
421 + type: "",
422 + name: "HandlingCode",
423 + value: "handingCode",
424 + width: "150",
425 + align: "center",
426 + sorTable: true,
427 + slot: null,
428 + fixed:false,
429 + },
430 + {
431 + type: "",
432 + name: "subcategory",
433 + value: "subCategory",
434 + width: "150",
435 + align: "center",
436 + sorTable: true,
437 + slot: null,
438 + fixed:false,
439 + },
440 + {
441 + type: "",
442 + name: "件数",
443 + value: "qty",
444 + width: "150",
445 + align: "center",
446 + sorTable: true,
447 + slot: null,
448 + fixed:false,
449 + },
450 + {
451 + type: "",
452 + name: "实际重量",
453 + value: "actualWeight",
454 + width: "150",
455 + align: "center",
456 + sorTable: true,
457 + slot: null,
458 + fixed:false,
459 + },
460 + {
461 + type: "",
462 + name: "收件人国家代码",
463 + value: "consigneeCountry",
464 + width: "150",
465 + align: "center",
466 + sorTable: true,
467 + slot: null,
468 + fixed:false,
469 + },
470 + {
471 + type: "",
472 + name: "品名描述",
473 + value: "nameDescription",
474 + width: "150",
475 + align: "center",
476 + sorTable: false,
477 + slot: null,
478 + fixed:false,
479 + },
480 + {
481 + type: "",
482 + name: "海关回执状态",
483 + value: "customsReceiptStatusName",
484 + width: "150",
485 + align: "center",
486 + sorTable: true,
487 + slot: null,
488 + fixed:false,
489 + },
490 + {
491 + type: "",
492 + name: "预审状态",
493 + value: "preQualificationStatus",
494 + width: "150",
495 + align: "center",
496 + sorTable: true,
497 + slot: null,
498 + fixed:false,
499 + },
500 + {
501 + type: "",
502 + name: "航班预审意见",
503 + value: "caPretrialOpinion",
504 + width: "150",
505 + align: "center",
506 + sorTable: false,
507 + slot: null,
508 + fixed:false,
509 + },
510 + {
511 + type: "",
512 + name: "货物状态",
513 + value: "statusName",
514 + width: "150",
515 + align: "center",
516 + sorTable: true,
517 + slot: null,
518 + fixed:false,
519 + },
520 + {
521 + type: "",
522 + name: "终配航班号",
523 + value: "finalFlightNo",
524 + width: "150",
525 + align: "center",
526 + sorTable: true,
527 + slot: null,
528 + fixed:false,
529 + },
530 + {
531 + type: "",
532 + name: "终配航班日期",
533 + value: "finalFlightTime",
534 + width: "150",
535 + align: "center",
536 + sorTable: true,
537 + slot: null,
538 + fixed:false,
539 + },
540 + {
541 + type: "",
542 + name: "二配航班号",
543 + value: "twoMatchFlightNo",
544 + width: "150",
545 + align: "center",
546 + sorTable: true,
547 + slot: null,
548 + fixed:false,
549 + },
550 + {
551 + type: "",
552 + name: "二配航班日期",
553 + value: "twoMatchFlightTime",
554 + width: "150",
555 + align: "center",
556 + sorTable: true,
557 + slot: null,
558 + fixed:false,
559 + },
560 + {
561 + type: "",
562 + name: "预配航班号",
563 + value: "preplanFlightNo",
564 + width: "150",
565 + align: "center",
566 + sorTable: true,
567 + slot: null,
568 + fixed:false,
569 + },
570 + {
571 + type: "",
572 + name: "预配航班日期",
573 + value: "preplanFlightTime",
574 + width: "150",
575 + align: "center",
576 + sorTable: true,
577 + slot: null,
578 + fixed:false,
579 + },
580 + {
581 + type: "",
582 + name: "ACCS原航班号",
583 + value: "fltNoAccs",
584 + width: "150",
585 + align: "center",
586 + sorTable: true,
587 + slot: null,
588 + fixed:false,
589 + },
590 + {
591 + type: "",
592 + name: "ACCS原航班日期",
593 + value: "fltDateAccs",
594 + width: "150",
595 + align: "center",
596 + sorTable: true,
597 + slot: null,
598 + fixed:false,
599 + },
600 + {
601 + type: "",
602 + name: "ACCS原航线",
603 + value: "accsFlightRoute",
604 + width: "150",
605 + align: "center",
606 + sorTable: true,
607 + slot: null,
608 + fixed:false,
609 + },
610 + {
611 + type: "",
612 + name: "是否RDE手工录入",
613 + value: "manualRde",
614 + width: "170",
615 + align: "center",
616 + sorTable: true,
617 + slot: null,
618 + fixed:false,
619 + },
620 + {
621 + type: "",
622 + name: "是否自动",
623 + value: "cargoRulesStatus",
624 + width: "150",
625 + align: "center",
626 + sorTable: true,
627 + slot: null,
628 + fixed:false,
629 + },
630 + {
631 + type: "",
632 + name: "发件人账号",
633 + value: "shipperAccount",
634 + width: "150",
635 + align: "center",
636 + sorTable: false,
637 + slot: null,
638 + fixed:false,
639 + },
640 + {
641 + type: "",
642 + name: "发件公司中文名称",
643 + value: "shipperCompany",
644 + width: "150",
645 + align: "center",
646 + sorTable: false,
647 + slot: null,
648 + fixed:false,
649 + },
650 + {
651 + type: "",
652 + name: "始发地城市名称",
653 + value: "originCity",
654 + width: "150",
655 + align: "center",
656 + sorTable: false,
657 + slot: null,
658 + fixed:false,
659 + },
660 + {
661 + type: "",
662 + name: "收件地",
663 + value: "destinationSiteName",
664 + width: "150",
665 + align: "center",
666 + sorTable: false,
667 + slot: null,
668 + fixed:false,
669 + },
670 + {
671 + type: "",
672 + name: "尺寸",
673 + value: "sizeStr",
674 + width: "150",
675 + align: "center",
676 + sorTable: true,
677 + slot: null,
678 + fixed:false,
679 + },
680 + {
681 + type: "",
356 name: "大货预审意见（是否可以配置航班）", 682 name: "大货预审意见（是否可以配置航班）",
357 value: "bigPretrialOpinion", 683 value: "bigPretrialOpinion",
684 + width: "300",
685 + align: "center",
686 + sorTable: false,
687 + slot: null,
688 + fixed:false,
689 + },
690 + {
691 + type: "",
692 + name: "大货预审时间",
693 + value: "bigPretrialTime",
694 + width: "150",
695 + align: "center",
696 + sorTable: false,
697 + slot: null,
698 + fixed:false,
699 + },
700 + {
701 + type: "",
702 + name: "海关回执时间",
703 + value: "customsReceiptTime",
704 + width: "150",
705 + align: "center",
706 + sorTable: true,
707 + slot: null,
708 + fixed:false,
709 + },
710 + {
711 + type: "",
712 + name: "航班预审时间",
713 + value: "caPretrialTime",
714 + width: "150",
715 + align: "center",
716 + sorTable: true,
717 + slot: null,
718 + fixed:false,
719 + },
720 + {
721 + type: "",
722 + name: "创建人",
723 + value: "createUserName",
724 + width: "150",
725 + align: "center",
726 + sorTable: true,
727 + slot: null,
728 + fixed:false,
729 + },
730 + {
731 + type: "",
732 + name: "创建时间",
733 + value: "createTime",
734 + width: "150",
735 + align: "center",
736 + sorTable: true,
737 + slot: null,
738 + fixed:false,
358 }, 739 },
359 - { name: "大货预审时间", value: "bigPretrialTime" },
360 - { name: "海关回执时间", value: "customsReceiptTime" },
361 - { name: "航班预审时间", value: "caPretrialTime" },
362 - { name: "创建人", value: "createUserName" },
363 - { name: "创建时间", value: "createTime" },
364 ], //表头数据 740 ], //表头数据
365 findConditionData: {}, //货物查询条件 741 findConditionData: {}, //货物查询条件
366 tableData: [], //表格数据 742 tableData: [], //表格数据
367 allWeight: 0, 743 allWeight: 0,
368 allQty: 0, 744 allQty: 0,
369 shiftKey: false, 745 shiftKey: false,
370 - start: -1,
371 valueFormat: "yyyy-MM-dd", 746 valueFormat: "yyyy-MM-dd",
372 tableLoading: false, 747 tableLoading: false,
373 downLoadingTip:{ 748 downLoadingTip:{
...@@ -380,10 +755,10 @@ export default { ...@@ -380,10 +755,10 @@ export default {
380 prepalyFlightTime: [], 755 prepalyFlightTime: [],
381 cargoPlaneTime:[], 756 cargoPlaneTime:[],
382 createDate: [], 757 createDate: [],
383 - limitStart: 0, 758 + limitStart: 1,
384 limitSize: 100, //无限制-1 759 limitSize: 100, //无限制-1
760 + page:1,
385 progress:0, 761 progress:0,
386 - selecetALL:false,
387 }; 762 };
388 }, 763 },
389 764
...@@ -423,41 +798,8 @@ export default { ...@@ -423,41 +798,8 @@ export default {
423 this.tableData = []; 798 this.tableData = [];
424 this.allWeight = 0; 799 this.allWeight = 0;
425 this.allQty = 0; 800 this.allQty = 0;
426 - this.checks()
427 this.tableLoading = true; 801 this.tableLoading = true;
428 - if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){ 802 + this.dataInfo();
429 - this.formData.customsReceiptStatusId = null;
430 - }
431 - if (this.createDate != null && this.createDate.length > 0) {
432 - this.formData.createTimeStart = this.createDate[0];
433 - this.formData.createTimeEnd = this.createDate[1];
434 - }else{
435 - this.formData.createTimeStart = null;
436 - this.formData.createTimeEnd = null;
437 - }
438 - if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
439 - this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
440 - this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
441 - }else{
442 - this.formData.prematchFltDateStart ="";
443 - this.formData.prematchFltDateEnd = "";
444 - }
445 - if (this.flightTime != null && this.flightTime.length > 0) {
446 - this.formData.fltDateStart = this.flightTime[0];
447 - this.formData.fltDateEnd = this.flightTime[1];
448 - }else{
449 - this.formData.fltDateStart = "";
450 - this.formData.fltDateEnd = "";
451 - }
452 - if(this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0){
453 - this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
454 - this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
455 - }else{
456 - this.formData.cargoPlaneStart = null;
457 - this.formData.cargoPlaneEnd = null;
458 - }
459 - this.formData.limitStart = this.limitStart;
460 - this.formData.limitSize = this.limitSize;
461 findCargoData(this.formData).then((res) => { 803 findCargoData(this.formData).then((res) => {
462 if (res.code == 200) { 804 if (res.code == 200) {
463 if (res.data.list.length > 0) { 805 if (res.data.list.length > 0) {
...@@ -482,103 +824,10 @@ export default { ...@@ -482,103 +824,10 @@ export default {
482 }).catch(()=>{ 824 }).catch(()=>{
483 this.tableLoading = false; 825 this.tableLoading = false;
484 }); 826 });
827 + this.$refs.newTables.clearTable();
828 + this.cargoTotal();
485 }, 829 },
486 - //全选反选 830 + dataInfo(){
487 - checks(rows) {
488 - if (rows && !this.selecetALL) {
489 - rows.forEach((row) => {
490 - this.$refs.cargoTable.toggleRowSelection(row);
491 - this.allQty = row.qty + this.allQty;
492 - this.allWeight = row.actualWeight + this.allWeight;
493 - });
494 - this.selecetALL = true;
495 - this.allWeight = this.allWeight.toFixed(1);
496 - this.allQty = this.allQty.toFixed(0);
497 - } else {
498 - this.$refs.cargoTable.clearSelection();
499 - this.allWeight = 0;
500 - this.allQty = 0;
501 - this.selecetALL = false;
502 - }
503 - },
504 - selectAll(selection){
505 - if(selection.length > 0){
506 - selection.forEach(item => {
507 - this.allWeight = item.actualWeight + this.allWeight;
508 - this.allQty = item.qty + this.allQty;
509 - })
510 - this.allWeight = this.allWeight.toFixed(1);
511 - this.allQty = this.allQty.toFixed(0);
512 - }else{
513 - this.allWeight = 0;
514 - this.allQty = 0;
515 - }
516 -
517 - },
518 - //下一页
519 - nextClick() {
520 - this.limitStart = this.limitStart + 100;
521 - },
522 - //上一页
523 - prevClick() {
524 - this.limitStart = this.limitStart - 100;
525 - },
526 - //指定页数
527 - currentChange(page) {
528 - this.limitStart = (page - 1) * 100;
529 - this.select();
530 - },
531 - //表单项选中操作
532 - cheacked(sl, row) {
533 - let end = row.index;
534 - if(this.shiftKey){
535 - const sum = Math.abs(this.start - end);
536 - const min = Math.min(this.start, end);
537 - let i ;
538 - if(this.start === -1 && sl.includes(this.tableData[row.index])){
539 - for(i=0; i < sum; i++){
540 - this.$refs.cargoTable.toggleRowSelection(this.tableData[i], true);
541 - this.selectTable.push(this.tableData[i]);
542 - }
543 - }else if(sl.includes(this.tableData[row.index])){
544 - for(i = this.start+1; i <= end; i++){
545 - this.$refs.cargoTable.toggleRowSelection(this.tableData[i], true);
546 - this.selectTable.push(this.tableData[i]);
547 - }
548 - }else if(!sl.includes(this.tableData[row.index])){
549 - this.selectTable.splice(end-1,sum + 1);
550 - for(i = end ; i <= this.start ; i++){
551 - this.$refs.cargoTable.toggleRowSelection(this.tableData[i], false);
552 - }
553 - }
554 - this.start = end;
555 - }else{
556 - this.start = end;
557 - if(sl.includes(this.tableData[end])){
558 - this.selectTable.push(row);
559 - }else{
560 - for(let i =0; i <this.selectTable.length; i++){
561 - if(this.selectTable[i].index == row.index){
562 - this.selectTable.splice(i,1);
563 - }
564 - }
565 - }
566 - }
567 -
568 - this.allWeight = 0;
569 - this.allQty = 0;
570 - for (let i = 0; i < this.selectTable.length; i++) {
571 - this.allWeight = this.allWeight + this.selectTable[i].actualWeight;
572 - this.allQty = this.allQty + this.selectTable[i].qty;
573 - }
574 - this.allQty = this.allQty.toFixed(0);
575 - this.allWeight = this.allWeight.toFixed(1);
576 - },
577 - // 导出表格
578 - xlse(page) {
579 - this.progress = 1;
580 - this.downLoadingTip.downloading = true;
581 - let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
582 if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){ 831 if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
583 this.formData.customsReceiptStatusId = null; 832 this.formData.customsReceiptStatusId = null;
584 } 833 }
...@@ -610,26 +859,58 @@ export default { ...@@ -610,26 +859,58 @@ export default {
610 this.formData.cargoPlaneStart = null; 859 this.formData.cargoPlaneStart = null;
611 this.formData.cargoPlaneEnd = null; 860 this.formData.cargoPlaneEnd = null;
612 } 861 }
862 + },
863 + cargoTotal(){
864 + this.allWeight = 0;
865 + this.allQty = 0;
866 + if(this.selectTable.length > 0){
867 + this.selectTable.forEach(item=>{
868 + this.allWeight = this.allWeight + item.actualWeight;
869 + this.allQty = this.allQty + item.qty;
870 + })
871 + this.allWeight = this.allWeight.toFixed();
872 + this.allQty = this.allQty.toFixed();
873 + }
874 + },
875 + tableSelect(val){
876 + this.selectTable = val.selection;
877 + this.cargoTotal();
878 + },
879 + tableSelectAll(val){
880 + this.selectTable = val;
881 + this.cargoTotal();
882 + },
883 + currentChange(val){
884 + this.formData.limitStart = val.start;
885 + this.page = val.page;
886 + this.select()
887 + },
888 + // 导出表格
889 + xlse(page) {
890 + this.progress = 1;
891 + this.downLoadingTip.downloading = true;
892 + let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
893 + this.dataInfo();
613 cargoXlse.cargoConditionDto = this.formData; 894 cargoXlse.cargoConditionDto = this.formData;
614 cargoXlse.cargoConditionDto.limitSize = this.limitSize; 895 cargoXlse.cargoConditionDto.limitSize = this.limitSize;
615 896
616 if (page == 0) { 897 if (page == 0) {
617 this.downLoadingTip.tip = "正在导出本页结果集" 898 this.downLoadingTip.tip = "正在导出本页结果集"
618 cargoXlse.cargoConditionDto.limitStart = this.limitStart; 899 cargoXlse.cargoConditionDto.limitStart = this.limitStart;
619 - downLoadXlsx("/cargo/excel",cargoXlse,"货物查询表").then(()=>{ 900 + downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
620 this.downLoadingTip.downloading = false; 901 this.downLoadingTip.downloading = false;
621 this.downLoadingTip.tip = "" 902 this.downLoadingTip.tip = ""
622 this.progress = 100; 903 this.progress = 100;
623 }).catch(()=>{ 904 }).catch(()=>{
624 this.downLoadingTip.downloading = false; 905 this.downLoadingTip.downloading = false;
625 - this.downLoadingTip.tip = "" 906 + this.downLoadingTip.tip = "";
626 }) 907 })
627 } else { 908 } else {
628 if(this.totalCount < 80000){ 909 if(this.totalCount < 80000){
629 - this.downLoadingTip.tip = "正在导出全部结果集" 910 + this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
630 cargoXlse.cargoConditionDto.limitStart = 0; 911 cargoXlse.cargoConditionDto.limitStart = 0;
631 cargoXlse.cargoConditionDto.limitSize = -1; 912 cargoXlse.cargoConditionDto.limitSize = -1;
632 - downLoadXlsx("/cargo/excel",cargoXlse,"货物查询表").then(()=>{ 913 + downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
633 this.downLoadingTip.downloading = false; 914 this.downLoadingTip.downloading = false;
634 this.downLoadingTip.tip = "" 915 this.downLoadingTip.tip = ""
635 this.progress = 100; 916 this.progress = 100;
...@@ -640,23 +921,12 @@ export default { ...@@ -640,23 +921,12 @@ export default {
640 }else{ 921 }else{
641 this.downLoadingTip.downloading = false; 922 this.downLoadingTip.downloading = false;
642 this.$message({ 923 this.$message({
643 - message: "数据量过大无法导出", 924 + message: "导出数据量过大，请不要超过10W条",
644 type: "warning", 925 type: "warning",
645 }); 926 });
646 } 927 }
647 } 928 }
648 }, 929 },
649 - //表格格式化
650 - formatter(row,column,cellValue,index){
651 - if(column.property=="cargoRulesStatus"){
652 - if(cellValue == 1){
653 - return cellValue = "手动"
654 - }else if(cellValue == 2){
655 - return cellValue = "自动"
656 - }
657 - }
658 - return cellValue
659 - }
660 }, 930 },
661 computed: { 931 computed: {
662 fltNo: { 932 fltNo: {
......