Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
2577bab4 2 parents 9a55d43f 4ccdc0a3

Merge branch 'et86-black' into test

Inline Side-by-side
Showing 1 changed file with 7 additions and 41 deletions
...@@ -216,7 +216,7 @@ ...@@ -216,7 +216,7 @@
216 <el-col v-for="item in checkBoxItem.cargoStatus" :span="3" 216 <el-col v-for="item in checkBoxItem.cargoStatus" :span="3"
217 :key="item.id"> 217 :key="item.id">
218 <el-checkbox v-if="item.status === 1" :label="item.chineseName" 218 <el-checkbox v-if="item.status === 1" :label="item.chineseName"
219 - :name="item.chineseName" disabled :key="item.code"> 219 + :name="item.chineseName" :key="item.code">
220 <Tooltips :content="item.chineseName" :refName="item.code"> 220 <Tooltips :content="item.chineseName" :refName="item.code">
221 </Tooltips> 221 </Tooltips>
222 </el-checkbox> 222 </el-checkbox>
...@@ -283,19 +283,6 @@ ...@@ -283,19 +283,6 @@
283 </Tooltips> 283 </Tooltips>
284 </el-checkbox> 284 </el-checkbox>
285 </div> 285 </div>
286 - <!-- <el-row>
287 - <el-col v-for="item in checkBoxItem.handlingCode" :span="2"
288 - :key="item.id">
289 - <el-checkbox
290 - v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
291 - :label="item.chineseName" :name="item.chineseName"
292 - :disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
293 - :key="item.code">
294 - <Tooltips :content="item.chineseName" :refName="item.code">
295 - </Tooltips>
296 - </el-checkbox>
297 - </el-col>
298 - </el-row> -->
299 </el-checkbox-group> 286 </el-checkbox-group>
300 </el-card> 287 </el-card>
301 </el-form-item> 288 </el-form-item>
...@@ -315,12 +302,6 @@ ...@@ -315,12 +302,6 @@
315 </Tooltips> 302 </Tooltips>
316 </el-checkbox> 303 </el-checkbox>
317 </div> 304 </div>
318 - <!-- <el-row>
319 - <el-col v-for="item in checkBoxItem.subCategory" :span="2"
320 - :key="item.id">
321 -
322 - </el-col>
323 - </el-row> -->
324 </el-checkbox-group> 305 </el-checkbox-group>
325 </el-card> 306 </el-card>
326 </el-form-item> 307 </el-form-item>
...@@ -547,11 +528,6 @@ ...@@ -547,11 +528,6 @@
547 </Tooltips> 528 </Tooltips>
548 </el-checkbox> 529 </el-checkbox>
549 </div> 530 </div>
550 - <!-- <el-row>
551 - <el-col v-for="item in checkBoxItem.handlingCode" :span="2" :key="item.id">
552 -
553 - </el-col>
554 - </el-row> -->
555 </el-checkbox-group> 531 </el-checkbox-group>
556 </el-card> 532 </el-card>
557 </el-form-item> 533 </el-form-item>
...@@ -570,18 +546,6 @@ ...@@ -570,18 +546,6 @@
570 </Tooltips> 546 </Tooltips>
571 </el-checkbox> 547 </el-checkbox>
572 </div> 548 </div>
573 - <!-- <el-row>
574 - <el-col v-for="item in checkBoxItem.subCategory" :span="2" :key="item.id">
575 - <el-checkbox
576 - v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
577 - :label="item.chineseName" :name="item.chineseName"
578 - :disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
579 - :key="item.code">
580 - <Tooltips :content="item.chineseName" :refName="item.code">
581 - </Tooltips>
582 - </el-checkbox>
583 - </el-col>
584 - </el-row> -->
585 </el-checkbox-group> 549 </el-checkbox-group>
586 </el-card> 550 </el-card>
587 </el-form-item> 551 </el-form-item>
...@@ -714,7 +678,7 @@ export default { ...@@ -714,7 +678,7 @@ export default {
714 } else { 678 } else {
715 obj.route = this.$route.params.route ? this.$route.params.route : '' 679 obj.route = this.$route.params.route ? this.$route.params.route : ''
716 } 680 }
717 - this.getRouteDimension(obj) 681 + this.getRouteDimension(obj) // 修改时 & 详情时
718 } 682 }
719 } 683 }
720 }, 684 },
...@@ -782,6 +746,7 @@ export default { ...@@ -782,6 +746,7 @@ export default {
782 if(this.$route.params.handle == "updated"){ 746 if(this.$route.params.handle == "updated"){
783 delete obj.flightRoute 747 delete obj.flightRoute
784 } 748 }
749 + // 修改时 & 详情时
785 if (this.$route.params.handle != 'add') { 750 if (this.$route.params.handle != 'add') {
786 findDestinationFltRuleByFlightNo(obj).then(res => { 751 findDestinationFltRuleByFlightNo(obj).then(res => {
787 if (res.code === 200) { 752 if (res.code === 200) {
...@@ -822,7 +787,7 @@ export default { ...@@ -822,7 +787,7 @@ export default {
822 } 787 }
823 } else { 788 } else {
824 //航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度） 789 //航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
825 - this.routeList.forEach(route => { 790 + this.routeList.forEach((route, sub) => {
826 let routeStatus = 1 791 let routeStatus = 1
827 res.data.list.forEach(item => { 792 res.data.list.forEach(item => {
828 if (route.route === item.flightRoute) { 793 if (route.route === item.flightRoute) {
...@@ -839,6 +804,7 @@ export default { ...@@ -839,6 +804,7 @@ export default {
839 flightRoute: route.route, 804 flightRoute: route.route,
840 routePriority: route.routePriority, 805 routePriority: route.routePriority,
841 }) 806 })
807 + this.newRoute(sub)
842 } 808 }
843 }) 809 })
844 } 810 }
...@@ -996,8 +962,8 @@ export default { ...@@ -996,8 +962,8 @@ export default {
996 data.list.forEach(item => { 962 data.list.forEach(item => {
997 if (route.route === item.flightRoute) { 963 if (route.route === item.flightRoute) {
998 routesStatus = 2 964 routesStatus = 2
999 - // item.id = undefined 965 + item.id = undefined
1000 - // item.status = undefined 966 + item.status = undefined
1001 // item.flightRoute = this.infoForm.route 967 // item.flightRoute = this.infoForm.route
1002 // item.routePriority = route.routePriority 968 // item.routePriority = route.routePriority
1003 this.infoForm.list.push(this.dataHandle(item)) 969 this.infoForm.list.push(this.dataHandle(item))
......