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 @@
<el-col v-for="item in checkBoxItem.cargoStatus" :span="3"
:key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" disabled :key="item.code">
:name="item.chineseName" :key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
......@@ -283,19 +283,6 @@
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.handlingCode" :span="2"
:key="item.id">
<el-checkbox
v-if="item.status === 1 || val.handlingCode.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.handlingCode.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</el-col>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -315,12 +302,6 @@
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.subCategory" :span="2"
:key="item.id">
</el-col>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -547,11 +528,6 @@
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.handlingCode" :span="2" :key="item.id">
</el-col>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -570,18 +546,6 @@
</Tooltips>
</el-checkbox>
</div>
<!-- <el-row>
<el-col v-for="item in checkBoxItem.subCategory" :span="2" :key="item.id">
<el-checkbox
v-if="item.status === 1 || val.subCategory.includes(item.chineseName)"
:label="item.chineseName" :name="item.chineseName"
:disabled="val.subCategory.includes(item.chineseName) && item.status == 0"
:key="item.code">
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
</el-col>
</el-row> -->
</el-checkbox-group>
</el-card>
</el-form-item>
......@@ -714,7 +678,7 @@ export default {
} else {
obj.route = this.$route.params.route ? this.$route.params.route : ''
}
this.getRouteDimension(obj)
this.getRouteDimension(obj) // 修改时 & 详情时
}
}
},
......@@ -782,6 +746,7 @@ export default {
if(this.$route.params.handle == "updated"){
delete obj.flightRoute
}
// 修改时 & 详情时
if (this.$route.params.handle != 'add') {
findDestinationFltRuleByFlightNo(obj).then(res => {
if (res.code === 200) {
......@@ -822,7 +787,7 @@ export default {
}
} else {
//航线为空，对应航班或航班+日期下的全部维度（需补全未创建维度）
this.routeList.forEach(route => {
this.routeList.forEach((route, sub) => {
let routeStatus = 1
res.data.list.forEach(item => {
if (route.route === item.flightRoute) {
......@@ -839,6 +804,7 @@ export default {
flightRoute: route.route,
routePriority: route.routePriority,
})
this.newRoute(sub)
}
})
}
......@@ -996,8 +962,8 @@ export default {
data.list.forEach(item => {
if (route.route === item.flightRoute) {
routesStatus = 2
// item.id = undefined
// item.status = undefined
item.id = undefined
item.status = undefined
// item.flightRoute = this.infoForm.route
// item.routePriority = route.routePriority
this.infoForm.list.push(this.dataHandle(item))
......