Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
fd669bd8 1 parent b164ef7c

modify

Inline Side-by-side
Showing 3 changed files with 35 additions and 21 deletions
......@@ -95,9 +95,7 @@
</el-input>
</span>
<div class="form-item-error-block">
<span
class="el-form-item__error"
></span>
<span class="el-form-item__error"></span>
</div>
</el-col>
</el-form-item>
......@@ -142,9 +140,7 @@
</el-input>
</span>
<div class="form-item-error-block">
<span
class="el-form-item__error"
></span>
<span class="el-form-item__error"></span>
</div>
</el-col>
</el-form-item>
......@@ -161,9 +157,7 @@
@blur="includeUrsa({ index, item, $event })"
>
</el-input>
<span
class="el-form-item__error"
></span>
<span class="el-form-item__error"></span>
</el-form-item>
</el-col>
<el-col :span="10">
......@@ -178,9 +172,7 @@
>
</el-input>
<div class="form-item-error-block">
<span
class="el-form-item__error"
></span>
<span class="el-form-item__error"></span>
</div>
</el-form-item>
</el-col>
......@@ -197,9 +189,7 @@
@blur="minNumOfPieces({ index, item, $event })"
>
</el-input>
<span
class="el-form-item__error"
></span>
<span class="el-form-item__error"></span>
</el-col>
<el-col style="text-align: center" :span="1"
>-</el-col
......@@ -227,9 +217,7 @@
@blur="minWeight({ index, item, $event })"
>
</el-input>
<span
class="el-form-item__error"
></span>
<span class="el-form-item__error"></span>
</el-col>
<el-col style="text-align: center" :span="1"
>-</el-col
......@@ -515,7 +503,7 @@ export default {
},
data() {
return {
activeNames: [0], // 展开指定项
activeNames: 0, // 展开指定项
};
},
computed: {
......
......@@ -185,12 +185,14 @@ export default {
...this.routesInfo[index],
...routeRuleForm,
};
if (this.routeList[index].hasOwnProperty("ordinal")) {
mergeObj.routePriority = this.routeList[index].ordinal;
}
this.$set(this.routesInfo, index, mergeObj); // 给新增规则赋上默认数据
},
// 保存 【新增/修改航线规则设置】
saveSubmit(item, index) {
item.flightRoute = item.route || item.flightRoute;
item.routePriority = ++index; // 作为排序
let parmas = JSON.parse(JSON.stringify(item));
this.returnString(parmas, "cargoType");
this.returnString(parmas, "typeOfGoods");
......@@ -256,7 +258,6 @@ export default {
this.hasOwnProperty(data, "handlingCode");
this.hasOwnProperty(data, "subCategory");
this.setattrVal(data); // 设置属性值
index--;
this.$set(this.routesInfo, index, {
config: true,
...data,
......
......@@ -552,6 +552,15 @@ export default {
dateRouteList.findIndex((item) => item.route == b.route)
);
});
result.map((item1) => {
let currentRoute = dateRouteList.findIndex((item2) => {
if (item1.route == item2.route) {
item1.routePriority = item2.routePriority;
}
});
return currentRoute;
});
// 查找对应的航线，把当前的routePriority字段覆盖
this.routesInfo = result;
this.pageLoading = false;
} else {
......@@ -626,6 +635,14 @@ export default {
item.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";");
return item;
});
dateList.map((item1) => {
let currentRoute = dateRouteList.findIndex((item2) => {
if (item1.route == item2.route) {
item1.routePriority = item2.routePriority;
}
});
return currentRoute;
});
// this.defaultRouteData(result) // 默认航线配置信息数据;
this.routeList = dateRouteList; // 航线优先级
this.routesInfo = dateList;
......@@ -645,6 +662,14 @@ export default {
item.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";");
return item;
});
dateList.map((item1) => {
let currentRoute = dateRouteList.findIndex((item2) => {
if (item1.route == item2.route) {
item1.routePriority = item2.routePriority;
}
});
return currentRoute;
});
this.routeList = dateRouteList; // 航线优先级
this.routesInfo = dateList;
this.pageLoading = false;
......