Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
714a2354 2 parents 79c21da6 724475bc

Merge branch 'test' into uat

Inline Side-by-side
Showing 22 changed files with 235 additions and 85 deletions
...@@ -3,20 +3,20 @@ ...@@ -3,20 +3,20 @@
3 <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small" 3 <el-form ref="form" v-model="formData" class="form-header" label-position="right" label-width="auto" size="small"
4 @submit.native.prevent> 4 @submit.native.prevent>
5 <el-row type="flex" style="flexWrap: wrap !important"> 5 <el-row type="flex" style="flexWrap: wrap !important">
6 - <el-col :span="8"> 6 + <el-col :span="6">
7 <el-form-item label="ACCS原航班日期"> 7 <el-form-item label="ACCS原航班日期">
8 <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期" 8 <el-date-picker class="formItem" type="daterange" range-separator="至" start-placeholder="开始日期"
9 end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable> 9 end-placeholder="结束日期" v-model="fltDate" :value-format="valueFormat" clearable>
10 </el-date-picker> 10 </el-date-picker>
11 </el-form-item> 11 </el-form-item>
12 </el-col> 12 </el-col>
13 - <el-col :span="8"> 13 + <el-col :span="6">
14 <el-form-item label="ACCS原航班号"> 14 <el-form-item label="ACCS原航班号">
15 <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange"> 15 <el-input v-model="fltNo" placeholder="请输入ACCS原航班号" class="formItem" clearable @change="fltNoChange">
16 </el-input> 16 </el-input>
17 </el-form-item> 17 </el-form-item>
18 </el-col> 18 </el-col>
19 - <el-col :span="8"> 19 + <el-col :span="6">
20 <el-form-item label="海关回执状态"> 20 <el-form-item label="海关回执状态">
21 <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable> 21 <el-select placeholder="不限" v-model="formData.customsReceiptStatusId" class="formItem" multiple clearable>
22 <el-option v-for="item in selectData.findConditionData 22 <el-option v-for="item in selectData.findConditionData
...@@ -26,7 +26,7 @@ ...@@ -26,7 +26,7 @@
26 </el-select> 26 </el-select>
27 </el-form-item> 27 </el-form-item>
28 </el-col> 28 </el-col>
29 - <el-col :span="8"> 29 + <el-col :span="6">
30 <el-form-item label="货物状态"> 30 <el-form-item label="货物状态">
31 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable> 31 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" clearable>
32 <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName" 32 <el-option v-for="item in selectData.findConditionData.cargoStatus" :label="item.chineseName"
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
35 </el-select> 35 </el-select>
36 </el-form-item> 36 </el-form-item>
37 </el-col> 37 </el-col>
38 - <el-col :span="8"> 38 + <el-col :span="6">
39 <el-form-item label="ACCSpool"> 39 <el-form-item label="ACCSpool">
40 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable> 40 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
41 <el-option value="Pre-MDE" key="Pre-MDE"> 41 <el-option value="Pre-MDE" key="Pre-MDE">
...@@ -47,7 +47,7 @@ ...@@ -47,7 +47,7 @@
47 </el-select> 47 </el-select>
48 </el-form-item> 48 </el-form-item>
49 </el-col> 49 </el-col>
50 - <el-col :span="8"> 50 + <el-col :span="6">
51 <el-form-item label="申报类别"> 51 <el-form-item label="申报类别">
52 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable> 52 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
53 <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName" 53 <el-option v-for="item in selectData.findConditionData.cargoType" :label="item.chineseName"
...@@ -56,7 +56,7 @@ ...@@ -56,7 +56,7 @@
56 </el-select> 56 </el-select>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
59 - <el-col :span="8"> 59 + <el-col :span="6">
60 <el-form-item label="服务类型"> 60 <el-form-item label="服务类型">
61 <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable> 61 <el-select placeholder="不限" v-model="formData.serviceTypeId" class="formItem" clearable>
62 <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName" 62 <el-option v-for="item in selectData.findConditionData.cargoServiceType" :label="item.chineseName"
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
66 </el-select> 66 </el-select>
67 </el-form-item> 67 </el-form-item>
68 </el-col> 68 </el-col>
69 - <el-col :span="8"> 69 + <el-col :span="6">
70 <el-form-item label="重量区间"> 70 <el-form-item label="重量区间">
71 <el-row> 71 <el-row>
72 <el-col :span="10"> 72 <el-col :span="10">
...@@ -82,7 +82,7 @@ ...@@ -82,7 +82,7 @@
82 </el-row> 82 </el-row>
83 </el-form-item> 83 </el-form-item>
84 </el-col> 84 </el-col>
85 - <el-col :span="8"> 85 + <el-col :span="6">
86 <el-form-item label="件数区间"> 86 <el-form-item label="件数区间">
87 <el-row> 87 <el-row>
88 <el-col :span="10"> 88 <el-col :span="10">
...@@ -98,26 +98,26 @@ ...@@ -98,26 +98,26 @@
98 </el-row> 98 </el-row>
99 </el-form-item> 99 </el-form-item>
100 </el-col> 100 </el-col>
101 - <el-col :span="8"> 101 + <el-col :span="6">
102 <el-form-item label="取件日期"> 102 <el-form-item label="取件日期">
103 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期" 103 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
104 :value-format="valueFormat" clearable> 104 :value-format="valueFormat" clearable>
105 </el-date-picker> 105 </el-date-picker>
106 </el-form-item> 106 </el-form-item>
107 </el-col> 107 </el-col>
108 - <el-col :span="8"> 108 + <el-col :span="6">
109 <el-form-item label="URSA"> 109 <el-form-item label="URSA">
110 <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable> 110 <el-input class="formItem" type="textarea" placeholder="S_;P_;E2" v-model="ursa" :rows="1" clearable>
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
113 </el-col> 113 </el-col>
114 - <el-col :span="8"> 114 + <el-col :span="6">
115 <el-form-item label="始发站"> 115 <el-form-item label="始发站">
116 <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable> 116 <el-input class="formItem" type="textarea" placeholder="PVG;PEK" v-model="siteName" :rows="1" clearable>
117 </el-input> 117 </el-input>
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 - <el-col :span="8"> 120 + <el-col :span="6">
121 <el-form-item> 121 <el-form-item>
122 <template slot="label"> 122 <template slot="label">
123 <div style="display:inline-block">ACCS航线 123 <div style="display:inline-block">ACCS航线
...@@ -134,9 +134,9 @@ ...@@ -134,9 +134,9 @@
134 </el-select> 134 </el-select>
135 </el-form-item> 135 </el-form-item>
136 </el-col> 136 </el-col>
137 - <el-col :span="8"> 137 + <el-col :span="6">
138 <el-form-item label="运单号"> 138 <el-form-item label="运单号">
139 - <el-input class="formItem" type="textarea" :rows="1" placeholder="例: xxx;xxx;" :maxlength="12000" 139 + <el-input class="formItem" type="textarea" :rows="4" placeholder="请输入运单号（回车分割）" :maxlength="12000"
140 v-model="formData.waybillNo" clearable></el-input> 140 v-model="formData.waybillNo" clearable></el-input>
141 </el-form-item> 141 </el-form-item>
142 </el-col> 142 </el-col>
...@@ -282,6 +282,14 @@ export default { ...@@ -282,6 +282,14 @@ export default {
282 if (this.$store.state.tagsView.cachedViews.length == 0) { 282 if (this.$store.state.tagsView.cachedViews.length == 0) {
283 this.select(); 283 this.select();
284 } 284 }
285 + this.$nextTick(()=>{
286 + let height = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
287 + if(height < 300){
288 + this.tableHeight = 300;
289 + }else{
290 + this.tableHeight = height;
291 + }
292 + })
285 }, 293 },
286 activated() { 294 activated() {
287 this.tableSelection = [] 295 this.tableSelection = []
...@@ -303,7 +311,6 @@ export default { ...@@ -303,7 +311,6 @@ export default {
303 this.shiftKey = false; 311 this.shiftKey = false;
304 } 312 }
305 }); 313 });
306 - this.tableHeight = window.innerHeight - this.$refs.form.$el.offsetHeight - 60;
307 }, 314 },
308 methods: { 315 methods: {
309 //查询条件 316 //查询条件
......
...@@ -188,13 +188,16 @@ export default { ...@@ -188,13 +188,16 @@ export default {
188 this.msgSuccess('货物配舱成功') 188 this.msgSuccess('货物配舱成功')
189 this.cleaerForm(); 189 this.cleaerForm();
190 this.$emit("dialogBeforeClose", { close: false, reload: true }); 190 this.$emit("dialogBeforeClose", { close: false, reload: true });
191 - } else if (res.code === 203) { 191 + }
192 + else if (res.code === 203) {
192 this.reallocationFlight(res.msg, 'notInWhite') 193 this.reallocationFlight(res.msg, 'notInWhite')
193 - } else { 194 + }else {
194 this.msgWarning(res.msg) 195 this.msgWarning(res.msg)
195 this.loading = false 196 this.loading = false
196 } 197 }
197 - }); 198 + }).catch(() => {
199 + this.loading = false;
200 + });
198 }).catch(() => { 201 }).catch(() => {
199 this.msgSuccess('配舱已取消') 202 this.msgSuccess('配舱已取消')
200 this.loading = false 203 this.loading = false
......
...@@ -104,9 +104,17 @@ export default { ...@@ -104,9 +104,17 @@ export default {
104 if (this.$store.state.tagsView.cachedViews.length == 0) { 104 if (this.$store.state.tagsView.cachedViews.length == 0) {
105 this.getList(); 105 this.getList();
106 } 106 }
107 + this.$nextTick(()=>{
108 + let height = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
109 + if(height < 300){
110 + this.tableHeight = 300;
111 + }else{
112 + this.tableHeight = height;
113 + }
114 + })
107 }, 115 },
108 mounted() { 116 mounted() {
109 - this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200; 117 +
110 }, 118 },
111 activated() { 119 activated() {
112 this.getList() 120 this.getList()
......
...@@ -247,9 +247,16 @@ export default { ...@@ -247,9 +247,16 @@ export default {
247 if (this.$store.state.tagsView.cachedViews.length == 0) { 247 if (this.$store.state.tagsView.cachedViews.length == 0) {
248 this.findSourceFlightRules(); 248 this.findSourceFlightRules();
249 } 249 }
250 + this.$nextTick(()=>{
251 + let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
252 + if(height < 300){
253 + this.tableHeight = 300;
254 + }else{
255 + this.tableHeight = height;
256 + }
257 + })
250 }, 258 },
251 mounted() { 259 mounted() {
252 - this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 200;
253 }, 260 },
254 activated() { 261 activated() {
255 this.findSourceFlightRules(); 262 this.findSourceFlightRules();
......
...@@ -106,6 +106,14 @@ export default { ...@@ -106,6 +106,14 @@ export default {
106 }, 106 },
107 created() { 107 created() {
108 this.preQuery(1) 108 this.preQuery(1)
109 + this.$nextTick(()=>{
110 + let height = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
111 + if(height < 300){
112 + this.tableHeight = 300;
113 + }else{
114 + this.tableHeight = height;
115 + }
116 + })
109 }, 117 },
110 activated() { 118 activated() {
111 if (this.flightData.length > 0) { 119 if (this.flightData.length > 0) {
...@@ -113,7 +121,6 @@ export default { ...@@ -113,7 +121,6 @@ export default {
113 } 121 }
114 }, 122 },
115 mounted() { 123 mounted() {
116 - this.tableHeight = window.innerHeight - this.$refs.preReviewOptions.offsetHeight - 300;
117 }, 124 },
118 methods: { 125 methods: {
119 //搜索 126 //搜索
......
...@@ -482,6 +482,14 @@ export default { ...@@ -482,6 +482,14 @@ export default {
482 this.findFltConditionData(); 482 this.findFltConditionData();
483 this.findAllFltData(); 483 this.findAllFltData();
484 } 484 }
485 + this.$nextTick(()=>{
486 + let height = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
487 + if(height < 300){
488 + this.tableHeight = 300;
489 + }else{
490 + this.tableHeight = height;
491 + }
492 + })
485 }, 493 },
486 activated() { 494 activated() {
487 this.ids = [] 495 this.ids = []
...@@ -502,7 +510,6 @@ export default { ...@@ -502,7 +510,6 @@ export default {
502 this.shiftKey = false; 510 this.shiftKey = false;
503 } 511 }
504 }); 512 });
505 - this.tableHeight = window.innerHeight - this.$refs.queryForm.$el.offsetHeight - 120;
506 }, 513 },
507 methods: { 514 methods: {
508 //输入航班号后 515 //输入航班号后
......
...@@ -89,10 +89,16 @@ export default { ...@@ -89,10 +89,16 @@ export default {
89 } 89 }
90 }, 90 },
91 created() { 91 created() {
92 - 92 + this.$nextTick(()=>{
93 + let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
94 + if(height < 300){
95 + this.tableHeight = 300;
96 + }else{
97 + this.tableHeight = height;
98 + }
99 + })
93 }, 100 },
94 mounted() { 101 mounted() {
95 - this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
96 this.selection(1) 102 this.selection(1)
97 }, 103 },
98 watch: { 104 watch: {
......
...@@ -89,10 +89,16 @@ export default { ...@@ -89,10 +89,16 @@ export default {
89 } 89 }
90 }, 90 },
91 created() { 91 created() {
92 - 92 + this.$nextTick(()=>{
93 + let height = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
94 + if(height < 300){
95 + this.tableHeight = 300;
96 + }else{
97 + this.tableHeight = height;
98 + }
99 + })
93 }, 100 },
94 mounted() { 101 mounted() {
95 - this.tableHeight = window.innerHeight - this.$refs.goodsStation.$el.offsetHeight - 200;
96 this.selection(1) 102 this.selection(1)
97 }, 103 },
98 watch: { 104 watch: {
......
...@@ -71,9 +71,16 @@ export default { ...@@ -71,9 +71,16 @@ export default {
71 } 71 }
72 }, 72 },
73 created() { 73 created() {
74 + this.$nextTick(()=>{
75 + let height = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
76 + if(height < 300){
77 + this.tableHeight = 300;
78 + }else{
79 + this.tableHeight = height;
80 + }
81 + })
74 }, 82 },
75 mounted() { 83 mounted() {
76 - this.tableHeight = window.innerHeight - this.$refs.goodsStationFlight.$el.offsetHeight - 200;
77 this.selection(1) 84 this.selection(1)
78 }, 85 },
79 watch: { 86 watch: {
......
...@@ -2,38 +2,14 @@ ...@@ -2,38 +2,14 @@
2 <div class="cargoPage"> 2 <div class="cargoPage">
3 <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData"> 3 <el-form ref="cargoForm" class="form-header" label-position="right" label-width="auto" size="small" :model="formData">
4 <el-row type="flex" style="flexWrap: wrap !important"> 4 <el-row type="flex" style="flexWrap: wrap !important">
5 - <el-col :span="8"> 5 + <el-col :span="6">
6 <el-form-item label="配舱航班日期"> 6 <el-form-item label="配舱航班日期">
7 <el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至" 7 <el-date-picker class="formItem" v-model="cargoPlaneTime" type="daterange" range-separator="至"
8 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable> 8 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
9 </el-date-picker> 9 </el-date-picker>
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 - <el-col :span="8"> 12 + <el-col :span="6">
13 - <el-form-item label="运单号">
14 - <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
15 - placeholder="例: xxx;xxx;" :rows="1" :maxlength="12000" clearable></el-input>
16 - </el-form-item>
17 - </el-col>
18 - <el-col :span="8">
19 - <el-form-item label="配载航班号">
20 - <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="1"
21 - clearable @change="planeNoChange"></el-input>
22 - </el-form-item>
23 - </el-col>
24 - <el-col :span="8">
25 - <el-form-item label="URSA">
26 - <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="1" clearable>
27 - </el-input>
28 - </el-form-item>
29 - </el-col>
30 - <el-col :span="8">
31 - <el-form-item label="始发站">
32 - <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="1" clearable>
33 - </el-input>
34 - </el-form-item>
35 - </el-col>
36 - <el-col :span="8">
37 <el-form-item label="海关回执状态"> 13 <el-form-item label="海关回执状态">
38 <el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable 14 <el-select v-model="formData.customsReceiptStatusId" class="formItem" filterable multiple clearable
39 placeholder="不限"> 15 placeholder="不限">
...@@ -44,7 +20,7 @@ ...@@ -44,7 +20,7 @@
44 </el-select> 20 </el-select>
45 </el-form-item> 21 </el-form-item>
46 </el-col> 22 </el-col>
47 - <el-col :span="8"> 23 + <el-col :span="6">
48 <el-form-item label="申报类别"> 24 <el-form-item label="申报类别">
49 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable> 25 <el-select placeholder="不限" v-model="formData.typeId" class="formItem" clearable>
50 <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id" 26 <el-option v-for="item in findConditionData.cargoType" :label="item.chineseName" :value="item.id"
...@@ -53,7 +29,7 @@ ...@@ -53,7 +29,7 @@
53 </el-select> 29 </el-select>
54 </el-form-item> 30 </el-form-item>
55 </el-col> 31 </el-col>
56 - <el-col :span="8"> 32 + <el-col :span="6">
57 <el-form-item label="服务类型"> 33 <el-form-item label="服务类型">
58 <el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限"> 34 <el-select v-model="formData.serviceTypeId" class="formItem" filterable multiple clearable placeholder="不限">
59 <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id" 35 <el-option v-for="item in findConditionData.cargoServiceType" :label="item.chineseName" :value="item.id"
...@@ -63,35 +39,59 @@ ...@@ -63,35 +39,59 @@
63 </el-select> 39 </el-select>
64 </el-form-item> 40 </el-form-item>
65 </el-col> 41 </el-col>
42 + <el-col :span="6">
43 + <el-form-item label="运单号">
44 + <el-input ref='userInfo' type="textarea" v-model="formData.waybillNo" class="formItem"
45 + placeholder="请输入运单号（回车间隔）" :rows="4" :maxlength="12000" clearable></el-input>
46 + </el-form-item>
47 + </el-col>
48 + <el-col :span="6">
49 + <el-form-item label="配载航班号">
50 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" :rows="4"
51 + clearable @change="planeNoChange"></el-input>
52 + </el-form-item>
53 + </el-col>
54 + <el-col :span="6">
55 + <el-form-item label="URSA">
56 + <el-input type="textarea" v-model="ursa" class="formItem" placeholder="S_;P_;E2" :rows="4" clearable>
57 + </el-input>
58 + </el-form-item>
59 + </el-col>
60 + <el-col :span="6">
61 + <el-form-item label="始发站">
62 + <el-input type="textarea" v-model="siteName" class="formItem" placeholder="PVG;PEK" :rows="4" clearable>
63 + </el-input>
64 + </el-form-item>
65 + </el-col>
66 <el-col v-show="formShow"> 66 <el-col v-show="formShow">
67 <el-row type="flex" style="flexWrap: wrap !important"> 67 <el-row type="flex" style="flexWrap: wrap !important">
68 - <el-col :span="8"> 68 + <el-col :span="6">
69 <el-form-item label="ACCS原航班日期"> 69 <el-form-item label="ACCS原航班日期">
70 <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至" 70 <el-date-picker class="formItem" v-model="flightTime" type="daterange" range-separator="至"
71 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable> 71 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
72 </el-date-picker> 72 </el-date-picker>
73 </el-form-item> 73 </el-form-item>
74 </el-col> 74 </el-col>
75 - <el-col :span="8"> 75 + <el-col :span="6">
76 <el-form-item label="ACCS原航班号"> 76 <el-form-item label="ACCS原航班号">
77 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input> 77 <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号" clearable></el-input>
78 </el-form-item> 78 </el-form-item>
79 </el-col> 79 </el-col>
80 - <el-col :span="8"> 80 + <el-col :span="6">
81 <el-form-item label="取件日期"> 81 <el-form-item label="取件日期">
82 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期" 82 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
83 :value-format="valueFormat" clearable> 83 :value-format="valueFormat" clearable>
84 </el-date-picker> 84 </el-date-picker>
85 </el-form-item> 85 </el-form-item>
86 </el-col> 86 </el-col>
87 - <el-col :span="8"> 87 + <el-col :span="6">
88 <el-form-item label="创建日期"> 88 <el-form-item label="创建日期">
89 <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至" 89 <el-date-picker class="formItem" v-model="createDate" type="daterange" range-separator="至"
90 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable> 90 start-placeholder="开始日期" end-placeholder="结束日期" :value-format="valueFormat" clearable>
91 </el-date-picker> 91 </el-date-picker>
92 </el-form-item> 92 </el-form-item>
93 </el-col> 93 </el-col>
94 - <el-col :span="8"> 94 + <el-col :span="6">
95 <el-form-item label="ACCSpool"> 95 <el-form-item label="ACCSpool">
96 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable> 96 <el-select placeholder="不限" v-model="formData.accsPool" class="formItem" clearable>
97 <el-option value="Pre-MDE" key="Pre-MDE"> 97 <el-option value="Pre-MDE" key="Pre-MDE">
...@@ -103,7 +103,7 @@ ...@@ -103,7 +103,7 @@
103 </el-select> 103 </el-select>
104 </el-form-item> 104 </el-form-item>
105 </el-col> 105 </el-col>
106 - <el-col :span="8"> 106 + <el-col :span="6">
107 <el-form-item label="货物状态"> 107 <el-form-item label="货物状态">
108 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable> 108 <el-select placeholder="不限" v-model="formData.statusId" class="formItem" filterable clearable>
109 <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id" 109 <el-option v-for="item in findConditionData.cargoStatus" :label="item.chineseName" :value="item.id"
...@@ -112,7 +112,7 @@ ...@@ -112,7 +112,7 @@
112 </el-select> 112 </el-select>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 - <el-col :span="8"> 115 + <el-col :span="6">
116 <el-form-item label="是否自动"> 116 <el-form-item label="是否自动">
117 <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable> 117 <el-select placeholder="不限" v-model="formData.allocationTypeId" class="formItem" clearable>
118 <el-option label="手动" value="1"> </el-option> 118 <el-option label="手动" value="1"> </el-option>
...@@ -120,7 +120,7 @@ ...@@ -120,7 +120,7 @@
120 </el-select> 120 </el-select>
121 </el-form-item> 121 </el-form-item>
122 </el-col> 122 </el-col>
123 - <el-col :span="8"> 123 + <el-col :span="6">
124 <el-form-item label="配舱状态"> 124 <el-form-item label="配舱状态">
125 <el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable> 125 <el-select placeholder="不限" v-model="formData.hasFlight" class="formItem" clearable>
126 <el-option label="已配" value="1"> </el-option> 126 <el-option label="已配" value="1"> </el-option>
...@@ -128,7 +128,7 @@ ...@@ -128,7 +128,7 @@
128 </el-select> 128 </el-select>
129 </el-form-item> 129 </el-form-item>
130 </el-col> 130 </el-col>
131 - <el-col :span="8"> 131 + <el-col :span="6">
132 <el-form-item> 132 <el-form-item>
133 <template slot="label"> 133 <template slot="label">
134 <div style="display:inline-block">配载航线 134 <div style="display:inline-block">配载航线
...@@ -145,7 +145,7 @@ ...@@ -145,7 +145,7 @@
145 </el-select> 145 </el-select>
146 </el-form-item> 146 </el-form-item>
147 </el-col> 147 </el-col>
148 - <el-col :span="8"> 148 + <el-col :span="6">
149 <el-form-item label="预审状态"> 149 <el-form-item label="预审状态">
150 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple> 150 <el-select v-model="formData.preStatus" placeholder="不限" class="formItem" clearable multiple>
151 <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item" 151 <el-option v-for="item in findConditionData.preQualificationStatus" :label="item == '' ? '非预审' : item"
...@@ -153,10 +153,10 @@ ...@@ -153,10 +153,10 @@
153 </el-select> 153 </el-select>
154 </el-form-item> 154 </el-form-item>
155 </el-col> 155 </el-col>
156 - <el-col :span="8"> 156 + <el-col :span="6">
157 <el-form-item label="发件人账号"> 157 <el-form-item label="发件人账号">
158 <el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem" 158 <el-input ref='userInfo' type="textarea" v-model="formData.shipperAccount" class="formItem"
159 - placeholder="请输入发件人账号（;间隔）" :rows="1" :maxlength="12000" clearable></el-input> 159 + placeholder="请输入发件人账号（;间隔）" :rows="4" :maxlength="12000" clearable></el-input>
160 </el-form-item> 160 </el-form-item>
161 </el-col> 161 </el-col>
162 </el-row> 162 </el-row>
...@@ -368,6 +368,14 @@ export default { ...@@ -368,6 +368,14 @@ export default {
368 this.tableHeader = this.tableHeaders['cargo'] 368 this.tableHeader = this.tableHeaders['cargo']
369 } 369 }
370 this.select(0,'create') 370 this.select(0,'create')
371 + this.$nextTick(()=>{
372 + let height = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50;
373 + if(height < 300){
374 + this.tableHeight = 300;
375 + }else{
376 + this.tableHeight = height;
377 + }
378 + })
371 }, 379 },
372 380
373 activated() { 381 activated() {
...@@ -441,7 +449,6 @@ export default { ...@@ -441,7 +449,6 @@ export default {
441 this.shiftKey = false; 449 this.shiftKey = false;
442 } 450 }
443 }); 451 });
444 - this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 50
445 }, 452 },
446 watch: { 453 watch: {
447 $route: { 454 $route: {
......
...@@ -104,12 +104,19 @@ export default { ...@@ -104,12 +104,19 @@ export default {
104 created() { 104 created() {
105 this.selectData.fltDate = this.nowDate(); 105 this.selectData.fltDate = this.nowDate();
106 this.getFltKindId() 106 this.getFltKindId()
107 + this.$nextTick(()=>{
108 + let height = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350;
109 + if(height < 300){
110 + this.tableHeight = 300;
111 + }else{
112 + this.tableHeight = height;
113 + }
114 + })
107 }, 115 },
108 // activated() { 116 // activated() {
109 // this.getFlight() 117 // this.getFlight()
110 // }, 118 // },
111 mounted() { 119 mounted() {
112 - this.tableHeight = window.innerHeight - this.$refs.card1.$el.offsetHeight - this.$refs.indexForm.$el.offsetHeight - 350
113 this.getFlight() 120 this.getFlight()
114 }, 121 },
115 methods: { 122 methods: {
......
...@@ -97,9 +97,16 @@ export default { ...@@ -97,9 +97,16 @@ export default {
97 }; 97 };
98 }, 98 },
99 created() { 99 created() {
100 + this.$nextTick(()=>{
101 + let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
102 + if(height < 300){
103 + this.tableHeight = 300;
104 + }else{
105 + this.tableHeight = height;
106 + }
107 + })
100 }, 108 },
101 mounted() { 109 mounted() {
102 - this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
103 this.selection(1) 110 this.selection(1)
104 }, 111 },
105 activated() { 112 activated() {
......
...@@ -137,9 +137,16 @@ export default { ...@@ -137,9 +137,16 @@ export default {
137 }, 137 },
138 created() { 138 created() {
139 this.selectOptionData() 139 this.selectOptionData()
140 + this.$nextTick(()=>{
141 + let height = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
142 + if(height < 300){
143 + this.tableHeight = 300;
144 + }else{
145 + this.tableHeight = height;
146 + }
147 + })
140 }, 148 },
141 mounted() { 149 mounted() {
142 - this.tableHeight = window.innerHeight - this.$refs.preMdeSelectForm.$el.offsetHeight - 150;
143 this.select(0) 150 this.select(0)
144 }, 151 },
145 watch: { 152 watch: {
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
3 <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto" 3 <el-form ref="reportForm" class="form-header" :model="formData" label-position="right" label-width="auto"
4 size="small"> 4 size="small">
5 <el-row> 5 <el-row>
6 - <el-col :span="6"> 6 + <el-col :span="5">
7 <el-form-item label="取件日期"> 7 <el-form-item label="取件日期">
8 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期" 8 <el-date-picker class="formItem" v-model="formData.pickUpDate" type="date" placeholder="选择日期"
9 value-format="yyyy-MM-dd" clearable> 9 value-format="yyyy-MM-dd" clearable>
...@@ -106,12 +106,19 @@ export default { ...@@ -106,12 +106,19 @@ export default {
106 this.formData.pickUpDate = this.nowDate() 106 this.formData.pickUpDate = this.nowDate()
107 this.getOption() 107 this.getOption()
108 this.select() 108 this.select()
109 + this.$nextTick(()=>{
110 + let height = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240;
111 + if(height < 300){
112 + this.tableHeight = 300;
113 + }else{
114 + this.tableHeight = height;
115 + }
116 + })
109 }, 117 },
110 activated() { 118 activated() {
111 this.select() 119 this.select()
112 }, 120 },
113 mounted() { 121 mounted() {
114 - this.tableHeight = window.innerHeight - this.$refs.reportForm.$el.offsetHeight - 240
115 }, 122 },
116 methods: { 123 methods: {
117 getOption() { 124 getOption() {
......
...@@ -98,9 +98,16 @@ export default { ...@@ -98,9 +98,16 @@ export default {
98 }; 98 };
99 }, 99 },
100 created() { 100 created() {
101 + this.$nextTick(()=>{
102 + let height = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
103 + if(height < 300){
104 + this.tableHeight = 300;
105 + }else{
106 + this.tableHeight = height;
107 + }
108 + })
101 }, 109 },
102 mounted() { 110 mounted() {
103 - this.tableHeight = window.innerHeight - this.$refs.selectForm.$el.offsetHeight - 170;
104 this.selection(1) 111 this.selection(1)
105 }, 112 },
106 activated() { 113 activated() {
......
...@@ -213,6 +213,14 @@ export default { ...@@ -213,6 +213,14 @@ export default {
213 }, 213 },
214 created() { 214 created() {
215 this.dictNameSelect() 215 this.dictNameSelect()
216 + this.$nextTick(()=>{
217 + let height = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270;
218 + if(height < 300){
219 + this.tableHeight = 300;
220 + }else{
221 + this.tableHeight = height;
222 + }
223 + })
216 }, 224 },
217 activated() { 225 activated() {
218 // if (this.$store.state.tagsView.cachedViews.length > 0) { 226 // if (this.$store.state.tagsView.cachedViews.length > 0) {
...@@ -220,7 +228,7 @@ export default { ...@@ -220,7 +228,7 @@ export default {
220 // } 228 // }
221 }, 229 },
222 mounted() { 230 mounted() {
223 - this.tableHeight = window.innerHeight - this.$refs.dictForm.$el.offsetHeight - 270 231 +
224 }, 232 },
225 filters: { 233 filters: {
226 // 是否为ET86航线 234 // 是否为ET86航线
......
...@@ -84,9 +84,16 @@ export default { ...@@ -84,9 +84,16 @@ export default {
84 if (this.$store.state.tagsView.cachedViews.length == 0) { 84 if (this.$store.state.tagsView.cachedViews.length == 0) {
85 this.selectRoleList(); 85 this.selectRoleList();
86 } 86 }
87 + this.$nextTick(()=>{
88 + let height = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250;
89 + if(height < 300){
90 + this.tableHeight = 300;
91 + }else{
92 + this.tableHeight = height;
93 + }
94 + })
87 }, 95 },
88 mounted() { 96 mounted() {
89 - this.tableHeight = window.innerHeight - this.$refs.selectionRoleForm.$el.offsetHeight - 250
90 }, 97 },
91 activated() { 98 activated() {
92 this.selectRoleList(); 99 this.selectRoleList();
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
3 <el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px" 3 <el-form class="form-header" ref="dictForm" label-width="auto" label-position="left" style="margin-bottom:10px"
4 @submit.native.prevent size="small"> 4 @submit.native.prevent size="small">
5 <el-row> 5 <el-row>
6 - <el-col :span="8"> 6 + <el-col :span="6">
7 <el-form-item label="发件人账号"> 7 <el-form-item label="发件人账号">
8 <el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割" 8 <el-input type="textarea" v-model="selectionData.shipperAccount" placeholder="请输入发件人账号，多个以“;”分割"
9 - maxlength="3000" rows="1" /> 9 + maxlength="3000" rows="4" />
10 </el-form-item> 10 </el-form-item>
11 </el-col> 11 </el-col>
12 </el-row> 12 </el-row>
...@@ -78,9 +78,16 @@ export default { ...@@ -78,9 +78,16 @@ export default {
78 } 78 }
79 }, 79 },
80 created() { 80 created() {
81 + this.$nextTick(()=>{
82 + let height = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250;
83 + if(height < 300){
84 + this.tableHeight = 300;
85 + }else{
86 + this.tableHeight = height;
87 + }
88 + })
81 }, 89 },
82 mounted() { 90 mounted() {
83 - this.tableHeight = window.innerHeight - this.$refs.supserAllocation.$el.offsetHeight - 250
84 this.selection(1) 91 this.selection(1)
85 }, 92 },
86 methods: { 93 methods: {
......
...@@ -111,9 +111,16 @@ export default { ...@@ -111,9 +111,16 @@ export default {
111 if (this.$store.state.tagsView.cachedViews.length == 0) { 111 if (this.$store.state.tagsView.cachedViews.length == 0) {
112 this.selectUser(); 112 this.selectUser();
113 } 113 }
114 + this.$nextTick(()=>{
115 + let height = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
116 + if(height < 300){
117 + this.tableHeight = 300;
118 + }else{
119 + this.tableHeight = height;
120 + }
121 + })
114 }, 122 },
115 mounted() { 123 mounted() {
116 - this.tableHeight = window.innerHeight - this.$refs.selectionUserForm.$el.offsetHeight - 250;
117 }, 124 },
118 activated() { 125 activated() {
119 this.selectUser(); 126 this.selectUser();
......
...@@ -61,10 +61,17 @@ export default { ...@@ -61,10 +61,17 @@ export default {
61 } 61 }
62 }, 62 },
63 created() { 63 created() {
64 - this.selectLog() 64 + this.selectLog()
65 + this.$nextTick(()=>{
66 + let height = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200;
67 + if(height < 300){
68 + this.tableHeight = 300;
69 + }else{
70 + this.tableHeight = height;
71 + }
72 + })
65 }, 73 },
66 mounted() { 74 mounted() {
67 - this.tableHeight = window.innerHeight - this.$refs.archiveDataForm.$el.offsetHeight - 200
68 }, 75 },
69 methods: { 76 methods: {
70 selectLog(val) { 77 selectLog(val) {
......
...@@ -122,6 +122,14 @@ export default { ...@@ -122,6 +122,14 @@ export default {
122 }, 122 },
123 created() { 123 created() {
124 this.selectForm.createTime = this.nowDate(); 124 this.selectForm.createTime = this.nowDate();
125 + this.$nextTick(()=>{
126 + let height = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
127 + if(height < 300){
128 + this.tableHeight = 300;
129 + }else{
130 + this.tableHeight = height;
131 + }
132 + })
125 }, 133 },
126 activated() { 134 activated() {
127 this.selectDMData(); 135 this.selectDMData();
...@@ -130,7 +138,6 @@ export default { ...@@ -130,7 +138,6 @@ export default {
130 this.data = []; 138 this.data = [];
131 }, 139 },
132 mounted() { 140 mounted() {
133 - this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
134 }, 141 },
135 methods: { 142 methods: {
136 //数据查询 143 //数据查询
......
...@@ -104,12 +104,19 @@ export default { ...@@ -104,12 +104,19 @@ export default {
104 created() { 104 created() {
105 this.getModule() 105 this.getModule()
106 this.selectLog(1) 106 this.selectLog(1)
107 + this.$nextTick(()=>{
108 + let height = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240;
109 + if(height < 300){
110 + this.tableHeight = 300;
111 + }else{
112 + this.tableHeight = height;
113 + }
114 + })
107 }, 115 },
108 activated() { 116 activated() {
109 this.selectLog(); 117 this.selectLog();
110 }, 118 },
111 mounted() { 119 mounted() {
112 - this.tableHeight = window.innerHeight - this.$refs.operationLogForm.$el.offsetHeight - 240
113 }, 120 },
114 methods: { 121 methods: {
115 getModule() { 122 getModule() {
......