Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
2601e5bc 1 parent 09c0a12e

【航班配舱设置】新增航线维度-目的地

Inline Side-by-side
Showing 1 changed file with 76 additions and 40 deletions
...@@ -55,9 +55,8 @@ ...@@ -55,9 +55,8 @@
55 <template slot="title"> 55 <template slot="title">
56 <span class="fontWeight">{{ routeItem.route }}</span> 56 <span class="fontWeight">{{ routeItem.route }}</span>
57 </template> 57 </template>
58 - <el-card shadow="always" v-for="(val, idx) in infoForm.list" :key="idx" 58 + <el-card shadow="always" v-for="(val, idx) in infoForm.list" :key="idx" style="min-height:350px">
59 - v-if="val.flightRoute === routeItem.route" style="min-height:350px"> 59 + <div v-if="val.flightRoute === routeItem.route">
60 - <div>
61 <el-empty description="未设置规则！" v-if="!val.isLocation"> 60 <el-empty description="未设置规则！" v-if="!val.isLocation">
62 <el-button type="primary" size="small" @click="newRoute(idx)">新增规则 61 <el-button type="primary" size="small" @click="newRoute(idx)">新增规则
63 </el-button> 62 </el-button>
...@@ -73,32 +72,23 @@ ...@@ -73,32 +72,23 @@
73 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删 72 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">删
74 除 73 除
75 </el-button> 74 </el-button>
76 - <div v-if="(routeSatus.indexOf('flightInformationMaintenance') >= 0)"
77 - style="display: inline-block;">
78 <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span> 75 <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
79 - </div>
80 - <div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)"
81 - style="display: inline-block;">
82 - <span
83 - v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
84 - v-else>普通规则</span>
85 - </div>
86 <el-divider></el-divider> 76 <el-divider></el-divider>
87 <el-col :span="24"> 77 <el-col :span="24">
88 - <el-form-item label="站点"> 78 + <el-form-item label="始发站">
89 <el-col :span="4"> 79 <el-col :span="4">
90 <el-radio-group v-model="val.isLocation" @change="change"> 80 <el-radio-group v-model="val.isLocation" @change="change">
91 - <el-radio label="1">站点包含</el-radio> 81 + <el-radio label="1">包含始发站</el-radio>
92 - <el-radio label="2">站点不包含</el-radio> 82 + <el-radio label="2">不包含始发站</el-radio>
93 </el-radio-group> 83 </el-radio-group>
94 </el-col> 84 </el-col>
95 <el-col :span="10"> 85 <el-col :span="10">
96 <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" 86 <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea"
97 - :rows="4" resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" 87 + :rows="4" resize="none" style="width: 500px" placeholder="始发站之间用回车符分隔"
98 @change="change" @input="change($event)"> 88 @change="change" @input="change($event)">
99 </el-input> 89 </el-input>
100 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" 90 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4"
101 - resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" @change="change" 91 + resize="none" style="width: 500px" placeholder="始发站之间用回车符分隔" @change="change"
102 @input="change($event)"> 92 @input="change($event)">
103 </el-input> 93 </el-input>
104 </el-col> 94 </el-col>
...@@ -291,6 +281,26 @@ ...@@ -291,6 +281,26 @@
291 </el-card> 281 </el-card>
292 </el-form-item> 282 </el-form-item>
293 </el-col> 283 </el-col>
284 + <el-col :span="24">
285 + <el-form-item label="目的地">
286 + <el-col :span="4">
287 + <el-radio-group v-model="val.isDestinationSite" @change="change">
288 + <el-radio label="1">包含目的地</el-radio>
289 + <el-radio label="2">不包含目的地</el-radio>
290 + </el-radio-group>
291 + </el-col>
292 + <el-col :span="10">
293 + <el-input v-if="val.isDestinationSite == '1'" v-model="val.destinationSite" type="textarea"
294 + :rows="4" resize="none" style="width: 500px" placeholder="目的地之间用回车符分隔"
295 + @change="change" @input="change($event)">
296 + </el-input>
297 + <el-input v-else v-model="val.notDestinationSite" type="textarea" :rows="4"
298 + resize="none" style="width: 500px" placeholder="目的地之间用回车符分隔" @change="change"
299 + @input="change($event)">
300 + </el-input>
301 + </el-col>
302 + </el-form-item>
303 + </el-col>
294 </el-row> 304 </el-row>
295 </div> 305 </div>
296 </el-card> 306 </el-card>
...@@ -313,30 +323,23 @@ ...@@ -313,30 +323,23 @@
313 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px" 323 <el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px"
314 @click="del(idx)">删 除 324 @click="del(idx)">删 除
315 </el-button> 325 </el-button>
316 - <div v-if="routeSatus.indexOf('flightInformationMaintenance') >= 0" style="display: inline-block;">
317 <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span> 326 <span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
318 - </div>
319 - <div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)" style="display: inline-block;">
320 - <span
321 - v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
322 - v-else>普通规则</span>
323 - </div>
324 <el-divider></el-divider> 327 <el-divider></el-divider>
325 <el-col :span="24"> 328 <el-col :span="24">
326 - <el-form-item label="站点"> 329 + <el-form-item label="始发站">
327 <el-col :span="4"> 330 <el-col :span="4">
328 <el-radio-group v-model="val.isLocation" @change="change"> 331 <el-radio-group v-model="val.isLocation" @change="change">
329 - <el-radio label="1">站点包含</el-radio> 332 + <el-radio label="1">包含始发站</el-radio>
330 - <el-radio label="2">站点不包含</el-radio> 333 + <el-radio label="2">不包含始发站</el-radio>
331 </el-radio-group> 334 </el-radio-group>
332 </el-col> 335 </el-col>
333 <el-col :span="10"> 336 <el-col :span="10">
334 <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" :rows="4" 337 <el-input v-if="val.isLocation == '1'" v-model="val.location" type="textarea" :rows="4"
335 - resize="none" style="width: 500px" placeholder="站点之间用回车符分隔" @change="change" 338 + resize="none" style="width: 500px" placeholder="始发站之间用回车符分隔" @change="change"
336 @input="change($event)"> 339 @input="change($event)">
337 </el-input> 340 </el-input>
338 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none" 341 <el-input v-else v-model="val.notLocation" type="textarea" :rows="4" resize="none"
339 - style="width: 500px" placeholder="站点之间用回车符分隔" @change="change" 342 + style="width: 500px" placeholder="始发站之间用回车符分隔" @change="change"
340 @input="change($event)"> 343 @input="change($event)">
341 </el-input> 344 </el-input>
342 </el-col> 345 </el-col>
...@@ -435,7 +438,7 @@ ...@@ -435,7 +438,7 @@
435 <el-card shadow="never" style="width: 95%"> 438 <el-card shadow="never" style="width: 95%">
436 <el-checkbox-group v-model="val.puporpuxCode" @change="change"> 439 <el-checkbox-group v-model="val.puporpuxCode" @change="change">
437 <el-row> 440 <el-row>
438 - <el-col :span="2" v-for="item in checkBoxItem.puporpux"> 441 + <el-col :span="2" v-for="item in checkBoxItem.puporpux" :key="item">
439 <el-checkbox 442 <el-checkbox
440 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)" 443 v-if="item.status === 1 || val.puporpuxCode.includes(item.chineseName)"
441 :label="item.chineseName" :name="item.chineseName" 444 :label="item.chineseName" :name="item.chineseName"
...@@ -523,6 +526,26 @@ ...@@ -523,6 +526,26 @@
523 </el-card> 526 </el-card>
524 </el-form-item> 527 </el-form-item>
525 </el-col> 528 </el-col>
529 + <el-col :span="24">
530 + <el-form-item label="目的地">
531 + <el-col :span="4">
532 + <el-radio-group v-model="val.isDestinationSite" @change="change">
533 + <el-radio label="1">包含目的地</el-radio>
534 + <el-radio label="2">不包含目的地</el-radio>
535 + </el-radio-group>
536 + </el-col>
537 + <el-col :span="10">
538 + <el-input v-if="val.isDestinationSite == '1'" v-model="val.destinationSite" type="textarea"
539 + :rows="4" resize="none" style="width: 500px" placeholder="目的地之间用回车符分隔"
540 + @change="change" @input="change($event)">
541 + </el-input>
542 + <el-input v-else v-model="val.notDestinationSite" type="textarea" :rows="4"
543 + resize="none" style="width: 500px" placeholder="目的地之间用回车符分隔" @change="change"
544 + @input="change($event)">
545 + </el-input>
546 + </el-col>
547 + </el-form-item>
548 + </el-col>
526 </el-row> 549 </el-row>
527 </div> 550 </div>
528 </el-card> 551 </el-card>
...@@ -619,6 +642,7 @@ export default { ...@@ -619,6 +642,7 @@ export default {
619 this.infoForm.fltDate = null 642 this.infoForm.fltDate = null
620 this.infoForm.route = null 643 this.infoForm.route = null
621 } 644 }
645 +
622 }, 646 },
623 mounted() { 647 mounted() {
624 this.loading = false 648 this.loading = false
...@@ -664,11 +688,11 @@ export default { ...@@ -664,11 +688,11 @@ export default {
664 this.msgError(res.msg) 688 this.msgError(res.msg)
665 return; 689 return;
666 } 690 }
667 - this.checkBoxItem.cargoType = res.data.cargoType; 691 + this.checkBoxItem.cargoType = res.data.cargoType; //
668 - this.checkBoxItem.cargoStatus = res.data.cargoStatus; 692 + this.checkBoxItem.cargoStatus = res.data.cargoStatus; //
669 - this.checkBoxItem.puporpux = res.data.puporpux; 693 + this.checkBoxItem.puporpux = res.data.puporpux; //
670 this.checkBoxItem.serviceCode = this.dicSort(res.data.serviceCode.sort((a, b) => 694 this.checkBoxItem.serviceCode = this.dicSort(res.data.serviceCode.sort((a, b) =>
671 - a.chineseName.localeCompare(b.chineseName) 695 + a.chineseName.localeCompare(b.chineseName) //
672 )); 696 ));
673 this.checkBoxItem.handlingCode = this.dicSort(this.sorttodo(res.data.handlingCode, "BLANK")); 697 this.checkBoxItem.handlingCode = this.dicSort(this.sorttodo(res.data.handlingCode, "BLANK"));
674 this.checkBoxItem.subCategory = this.dicSort(this.sorttodo(res.data.subCategory, "Blank")); 698 this.checkBoxItem.subCategory = this.dicSort(this.sorttodo(res.data.subCategory, "Blank"));
...@@ -965,12 +989,11 @@ export default { ...@@ -965,12 +989,11 @@ export default {
965 submit(val) { 989 submit(val) {
966 let routeArr = [] 990 let routeArr = []
967 let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val]))) 991 let data = this.setDataHandle(JSON.parse(JSON.stringify(this.infoForm.list[val])))
968 - console.log(data)
969 if (new Number(data.minNumOfPieces) > new Number(data.maxNumOfPieces)) { 992 if (new Number(data.minNumOfPieces) > new Number(data.maxNumOfPieces)) {
970 this.msgWarning('件数前区间不能大于后区间') 993 this.msgWarning('件数前区间不能大于后区间')
971 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) { 994 } else if (new Number(data.minWeight) > new Number(data.maxWeight)) {
972 this.msgWarning('重量前区间不能大于后区间') 995 this.msgWarning('重量前区间不能大于后区间')
973 - } else if (data.handlingCode == '' && data.serviceCode == '' && data.subCategory == '' && data.typeOfGoods == '' && data.puporpuxCode == '' && (!data.location || data.location == '') && data.notLocation == '' && (data.includeUrsa == null || data.includeUrsa == '') && (data.notIncludeUrsa == null || data.notIncludeUrsa == '') && (!data.minNumOfPieces || data.minNumOfPieces == '') && (!data.maxNumOfPieces || data.maxNumOfPieces == '') && (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) { 996 + } else if (data.handlingCode == '' && data.serviceCode == '' && data.subCategory == '' && data.typeOfGoods == '' && data.puporpuxCode == '' && (!data.location || data.location == '') && data.notLocation == '' && (!data.destinationSite || data.destinationSite == '') && data.notDestinationSite == '' && (data.includeUrsa == null || data.notIncludeUrsa == null) && (!data.minNumOfPieces || data.minNumOfPieces == '') && (!data.maxNumOfPieces || data.maxNumOfPieces == '') && (!data.minWeight || data.minWeight == '') && (!data.maxWeight || data.maxWeight == '')) {
974 this.msgWarning('未添加规则信息，请添加后再保存!') 997 this.msgWarning('未添加规则信息，请添加后再保存!')
975 } else { 998 } else {
976 // this.loading = true 999 // this.loading = true
...@@ -1056,6 +1079,7 @@ export default { ...@@ -1056,6 +1079,7 @@ export default {
1056 this.infoForm.list[val].flightRoute = this.routeList[val].route 1079 this.infoForm.list[val].flightRoute = this.routeList[val].route
1057 this.infoForm.list[val].routePriority = this.routeList[val].routePriority 1080 this.infoForm.list[val].routePriority = this.routeList[val].routePriority
1058 this.infoForm.list[val].isLocation = '1' 1081 this.infoForm.list[val].isLocation = '1'
1082 + this.infoForm.list[val].isDestinationSite = '1'
1059 this.infoForm.list[val].typeOfGoods = [] 1083 this.infoForm.list[val].typeOfGoods = []
1060 this.infoForm.list[val].declarationCategory = [] 1084 this.infoForm.list[val].declarationCategory = []
1061 this.infoForm.list[val].puporpuxCode = [] 1085 this.infoForm.list[val].puporpuxCode = []
...@@ -1129,7 +1153,7 @@ export default { ...@@ -1129,7 +1153,7 @@ export default {
1129 }) 1153 })
1130 }).catch(() => { 1154 }).catch(() => {
1131 this.infoForm.list.map((item, idx) => { 1155 this.infoForm.list.map((item, idx) => {
1132 - if (item.isLocation) { 1156 + if (item.isLocation && item.isDestinationSite) {
1133 this.infoForm.list[idx] = this.dataHandle(item) 1157 this.infoForm.list[idx] = this.dataHandle(item)
1134 } 1158 }
1135 }) 1159 })
...@@ -1153,6 +1177,9 @@ export default { ...@@ -1153,6 +1177,9 @@ export default {
1153 val.isLocation = '1' 1177 val.isLocation = '1'
1154 val.location ? val.isLocation = '1' : '' 1178 val.location ? val.isLocation = '1' : ''
1155 val.notLocation ? val.isLocation = '2' : '' 1179 val.notLocation ? val.isLocation = '2' : ''
1180 + val.isDestinationSite = '1'
1181 + val.notDestinationSite ? val.isDestinationSite = '1' : ''
1182 + val.notLocation ? val.isDestinationSite = '2' : ''
1156 val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数 1183 val.maxNumOfPieces == null ? val.maxNumOfPieces = undefined : val.maxNumOfPieces = val.maxNumOfPieces//最大件数
1157 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量 1184 val.maxWeight == null ? val.maxWeight = undefined : val.maxWeight = val.maxWeight//最大重量
1158 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数 1185 val.minNumOfPieces == null ? val.minNumOfPieces = undefined : val.minNumOfPieces = val.minNumOfPieces//最小件数
...@@ -1168,16 +1195,25 @@ export default { ...@@ -1168,16 +1195,25 @@ export default {
1168 //提交数据处理 1195 //提交数据处理
1169 setDataHandle(val) { 1196 setDataHandle(val) {
1170 let obj = {} 1197 let obj = {}
1171 - if (val.isLocation) { 1198 + if (val.isLocation && val.isDestinationSite) {
1172 obj = val 1199 obj = val
1173 obj.isLocation == '1' ? obj.notLocation = '' : obj.location = '' 1200 obj.isLocation == '1' ? obj.notLocation = '' : obj.location = ''
1201 + obj.isDestinationSite == '1' ? obj.notDestinationSite = '' : obj.destinationSite = ''
1202 +
1203 + if (obj.location && obj.location.length != 0) {
1204 + obj.location = obj.location.toUpperCase()
1205 + }
1174 1206
1175 if (obj.notLocation && obj.notLocation.length != 0) { 1207 if (obj.notLocation && obj.notLocation.length != 0) {
1176 obj.notLocation = obj.notLocation.toUpperCase() 1208 obj.notLocation = obj.notLocation.toUpperCase()
1177 } 1209 }
1178 1210
1179 - if (obj.location && obj.location.length != 0) { 1211 + if (obj.destinationSite && obj.destinationSite.length != 0) {
1180 - obj.location = obj.location.toUpperCase() 1212 + obj.destinationSite = obj.destinationSite.toUpperCase()
1213 + }
1214 +
1215 + if (obj.notDestinationSite && obj.notDestinationSite.length != 0) {
1216 + obj.notDestinationSite = obj.notDestinationSite.toUpperCase()
1181 } 1217 }
1182 1218
1183 if (obj.includeUrsa && obj.includeUrsa.length != 0) { 1219 if (obj.includeUrsa && obj.includeUrsa.length != 0) {
......