Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
e6586fb8 1 parent 69bb45a6

modify

Inline Side-by-side
Showing 2 changed files with 60 additions and 40 deletions
......@@ -439,7 +439,7 @@
type="primary"
size="small"
:disabled="pageName"
@click="addRouteRule(index)"
@click="addRouteRule(item, index)"
>新增规则</el-button
>
</el-empty>
......@@ -607,8 +607,8 @@ export default {
this.$emit("subCategory", arr);
},
// 新增规则
addRouteRule(index) {
this.$emit("addRlue", index);
addRouteRule(item, index) {
this.$emit("addRlue", item, index);
},
// 保存
saveSubmit(item, index) {
......
......@@ -4,9 +4,18 @@
<!-- 航线设置规则信息查询条件 -->
<el-row style="padding: 0 50px">
<el-col>
<yl-form ref="ruleForm" :formConfig="formConfig" :queryForm="queryForm" :inline="false" formWidth="auto"
@blur="blurEvent">
<route-draggable :routeList="routeList" :dragOptions="dragOptions"></route-draggable>
<yl-form
ref="ruleForm"
:formConfig="formConfig"
:queryForm="queryForm"
:inline="false"
formWidth="auto"
@blur="blurEvent"
>
<route-draggable
:routeList="routeList"
:dragOptions="dragOptions"
></route-draggable>
</yl-form>
</el-col>
</el-row>
......@@ -16,14 +25,34 @@
<el-divider content-position="left">航线维度设置</el-divider>
</el-col>
<el-col>
<route-info ref="routeInfo" :routesInfo="routesInfo" :cargoType="cargoType" :cargoStatus="cargoStatus"
:puporpux="puporpux" :serviceCode="serviceCode" :handlingCode="handlingCode" :subCategory="subCategory"
:status="getRouter" :loading="loading" @addRlue="addRlue" @save="saveSubmit" @onOff="onOffSubmit"
@delete="deleteSubmit" @locRadio="locRadio" @dessiteRadio="dessiteRadio" @locationBur="locationBur"
@notLocationBur="notLocationBur" @destinationSiteBur="destinationSiteBur"
@notDestinationSiteBur="notDestinationSiteBur" @includeUrsaBur="includeUrsaBur"
@notIncludeUrsaBur="notIncludeUrsaBur" @minNumOfPiecesBur="minNumOfPiecesBur"
@maxNumOfPiecesBur="maxNumOfPiecesBur" @minWeightBur="minWeightBur" @maxWeightBur="maxWeightBur">
<route-info
ref="routeInfo"
:routesInfo="routesInfo"
:cargoType="cargoType"
:cargoStatus="cargoStatus"
:puporpux="puporpux"
:serviceCode="serviceCode"
:handlingCode="handlingCode"
:subCategory="subCategory"
:status="getRouter"
:loading="loading"
@addRlue="addRlue"
@save="saveSubmit"
@onOff="onOffSubmit"
@delete="deleteSubmit"
@locRadio="locRadio"
@dessiteRadio="dessiteRadio"
@locationBur="locationBur"
@notLocationBur="notLocationBur"
@destinationSiteBur="destinationSiteBur"
@notDestinationSiteBur="notDestinationSiteBur"
@includeUrsaBur="includeUrsaBur"
@notIncludeUrsaBur="notIncludeUrsaBur"
@minNumOfPiecesBur="minNumOfPiecesBur"
@maxNumOfPiecesBur="maxNumOfPiecesBur"
@minWeightBur="minWeightBur"
@maxWeightBur="maxWeightBur"
>
</route-info>
</el-col>
</el-row>
......@@ -98,7 +127,7 @@ export default {
// 只负责接收参数和接口调用
this.queryCondition(parmas);
},
mounted() { },
mounted() {},
methods: {
// 航班信息维护查询
queryFindAllFltDataApi(parmas) {
......@@ -109,7 +138,7 @@ export default {
this.flightRouteList = data.list;
}
})
.catch((error) => { });
.catch((error) => {});
},
// 【通过航班号查询航线】
getQueryRouteByFltNo(parmas) {
......@@ -124,12 +153,13 @@ export default {
const routes = [];
if (isEtesRoute.length) {
isEtesRoute.map((item) => {
item.routePriority = item.ordinal;
routes.push({
config: false,
fltNo: item.fltNo,
route: item.route,
etesRule: item.isEtesRoute,
routePriority: item.ordinal,
routePriority: item.routePriority,
});
});
} else {
......@@ -143,7 +173,7 @@ export default {
}
}
})
.catch(() => { });
.catch(() => {});
},
// 航班号输入框失焦事件
blurEvent({ purposeOfFlightNo }) {
......@@ -154,36 +184,26 @@ export default {
this.queryForm.purposeOfFlightNo = this.upCase(purposeOfFlightNo);
},
// 新增规则
addRlue(index) {
addRlue(item, index) {
let currentRoute = this.routeList.filter(
(val) => val.route == item.route
);
// 如果当前航班号的航线下没有数据，新增规则给默认数据
routeRuleForm.purposeOfFlightNo = this.$route.query.purposeOfFlightNo;
this.setattrVal(routeRuleForm);
const mergeObj = {
...this.routesInfo[index],
...routeRuleForm,
};
if (this.$route.query.dataStatus == "add") {
// mergeObj.routePriority = this.routeList[index].routePriority;
routeRuleForm.routePriority = currentRoute[0].routePriority;
let routeSpecifyDateSeq = [];
if (this.routeList.length) {
this.routeList.map((item) => {
routeSpecifyDateSeq.push(item.route);
});
}
mergeObj.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";");
console.log(this.routeList)
console.log(this.routesInfo)
// this.routeList.map((item1) => {
// let currentRoute = this.routesInfo.findIndex((item2) => {
// if (item1.route == item2.route) {
// item2.routePriority = item1.routePriority;
// }
// });
// return currentRoute;
// });
}
routeRuleForm.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";");
this.setattrVal(routeRuleForm);
const mergeObj = {
...this.routesInfo[index],
...routeRuleForm,
};
this.$set(this.routesInfo, index, mergeObj); // 给新增规则赋上默认数据
console.log(this.routesInfo)
},
// 保存 【新增/修改航线规则设置】
saveSubmit(item, index) {
......@@ -329,7 +349,7 @@ export default {
.then((res) => {
const { code, msg, data } = res;
if (code == 200) {
console.log(item)
console.log(item);
this.$set(this.routesInfo, index, {
route: item.flightRoute,
config: false,
......