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 @@ ...@@ -95,9 +95,7 @@
95 </el-input> 95 </el-input>
96 </span> 96 </span>
97 <div class="form-item-error-block"> 97 <div class="form-item-error-block">
98 - <span 98 + <span class="el-form-item__error"></span>
99 - class="el-form-item__error"
100 - ></span>
101 </div> 99 </div>
102 </el-col> 100 </el-col>
103 </el-form-item> 101 </el-form-item>
...@@ -142,9 +140,7 @@ ...@@ -142,9 +140,7 @@
142 </el-input> 140 </el-input>
143 </span> 141 </span>
144 <div class="form-item-error-block"> 142 <div class="form-item-error-block">
145 - <span 143 + <span class="el-form-item__error"></span>
146 - class="el-form-item__error"
147 - ></span>
148 </div> 144 </div>
149 </el-col> 145 </el-col>
150 </el-form-item> 146 </el-form-item>
...@@ -161,9 +157,7 @@ ...@@ -161,9 +157,7 @@
161 @blur="includeUrsa({ index, item, $event })" 157 @blur="includeUrsa({ index, item, $event })"
162 > 158 >
163 </el-input> 159 </el-input>
164 - <span 160 + <span class="el-form-item__error"></span>
165 - class="el-form-item__error"
166 - ></span>
167 </el-form-item> 161 </el-form-item>
168 </el-col> 162 </el-col>
169 <el-col :span="10"> 163 <el-col :span="10">
...@@ -178,9 +172,7 @@ ...@@ -178,9 +172,7 @@
178 > 172 >
179 </el-input> 173 </el-input>
180 <div class="form-item-error-block"> 174 <div class="form-item-error-block">
181 - <span 175 + <span class="el-form-item__error"></span>
182 - class="el-form-item__error"
183 - ></span>
184 </div> 176 </div>
185 </el-form-item> 177 </el-form-item>
186 </el-col> 178 </el-col>
...@@ -197,9 +189,7 @@ ...@@ -197,9 +189,7 @@
197 @blur="minNumOfPieces({ index, item, $event })" 189 @blur="minNumOfPieces({ index, item, $event })"
198 > 190 >
199 </el-input> 191 </el-input>
200 - <span 192 + <span class="el-form-item__error"></span>
201 - class="el-form-item__error"
202 - ></span>
203 </el-col> 193 </el-col>
204 <el-col style="text-align: center" :span="1" 194 <el-col style="text-align: center" :span="1"
205 >-</el-col 195 >-</el-col
...@@ -227,9 +217,7 @@ ...@@ -227,9 +217,7 @@
227 @blur="minWeight({ index, item, $event })" 217 @blur="minWeight({ index, item, $event })"
228 > 218 >
229 </el-input> 219 </el-input>
230 - <span 220 + <span class="el-form-item__error"></span>
231 - class="el-form-item__error"
232 - ></span>
233 </el-col> 221 </el-col>
234 <el-col style="text-align: center" :span="1" 222 <el-col style="text-align: center" :span="1"
235 >-</el-col 223 >-</el-col
...@@ -515,7 +503,7 @@ export default { ...@@ -515,7 +503,7 @@ export default {
515 }, 503 },
516 data() { 504 data() {
517 return { 505 return {
518 - activeNames: [0], // 展开指定项 506 + activeNames: 0, // 展开指定项
519 }; 507 };
520 }, 508 },
521 computed: { 509 computed: {
......
...@@ -185,12 +185,14 @@ export default { ...@@ -185,12 +185,14 @@ export default {
185 ...this.routesInfo[index], 185 ...this.routesInfo[index],
186 ...routeRuleForm, 186 ...routeRuleForm,
187 }; 187 };
188 + if (this.routeList[index].hasOwnProperty("ordinal")) {
189 + mergeObj.routePriority = this.routeList[index].ordinal;
190 + }
188 this.$set(this.routesInfo, index, mergeObj); // 给新增规则赋上默认数据 191 this.$set(this.routesInfo, index, mergeObj); // 给新增规则赋上默认数据
189 }, 192 },
190 // 保存 【新增/修改航线规则设置】 193 // 保存 【新增/修改航线规则设置】
191 saveSubmit(item, index) { 194 saveSubmit(item, index) {
192 item.flightRoute = item.route || item.flightRoute; 195 item.flightRoute = item.route || item.flightRoute;
193 - item.routePriority = ++index; // 作为排序
194 let parmas = JSON.parse(JSON.stringify(item)); 196 let parmas = JSON.parse(JSON.stringify(item));
195 this.returnString(parmas, "cargoType"); 197 this.returnString(parmas, "cargoType");
196 this.returnString(parmas, "typeOfGoods"); 198 this.returnString(parmas, "typeOfGoods");
...@@ -256,7 +258,6 @@ export default { ...@@ -256,7 +258,6 @@ export default {
256 this.hasOwnProperty(data, "handlingCode"); 258 this.hasOwnProperty(data, "handlingCode");
257 this.hasOwnProperty(data, "subCategory"); 259 this.hasOwnProperty(data, "subCategory");
258 this.setattrVal(data); // 设置属性值 260 this.setattrVal(data); // 设置属性值
259 - index--;
260 this.$set(this.routesInfo, index, { 261 this.$set(this.routesInfo, index, {
261 config: true, 262 config: true,
262 ...data, 263 ...data,
......
...@@ -552,6 +552,15 @@ export default { ...@@ -552,6 +552,15 @@ export default {
552 dateRouteList.findIndex((item) => item.route == b.route) 552 dateRouteList.findIndex((item) => item.route == b.route)
553 ); 553 );
554 }); 554 });
555 + result.map((item1) => {
556 + let currentRoute = dateRouteList.findIndex((item2) => {
557 + if (item1.route == item2.route) {
558 + item1.routePriority = item2.routePriority;
559 + }
560 + });
561 + return currentRoute;
562 + });
563 + // 查找对应的航线，把当前的routePriority字段覆盖
555 this.routesInfo = result; 564 this.routesInfo = result;
556 this.pageLoading = false; 565 this.pageLoading = false;
557 } else { 566 } else {
...@@ -626,6 +635,14 @@ export default { ...@@ -626,6 +635,14 @@ export default {
626 item.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";"); 635 item.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";");
627 return item; 636 return item;
628 }); 637 });
638 + dateList.map((item1) => {
639 + let currentRoute = dateRouteList.findIndex((item2) => {
640 + if (item1.route == item2.route) {
641 + item1.routePriority = item2.routePriority;
642 + }
643 + });
644 + return currentRoute;
645 + });
629 // this.defaultRouteData(result) // 默认航线配置信息数据; 646 // this.defaultRouteData(result) // 默认航线配置信息数据;
630 this.routeList = dateRouteList; // 航线优先级 647 this.routeList = dateRouteList; // 航线优先级
631 this.routesInfo = dateList; 648 this.routesInfo = dateList;
...@@ -645,6 +662,14 @@ export default { ...@@ -645,6 +662,14 @@ export default {
645 item.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";"); 662 item.routeSpecifyDateSeq = routeSpecifyDateSeq.join(";");
646 return item; 663 return item;
647 }); 664 });
665 + dateList.map((item1) => {
666 + let currentRoute = dateRouteList.findIndex((item2) => {
667 + if (item1.route == item2.route) {
668 + item1.routePriority = item2.routePriority;
669 + }
670 + });
671 + return currentRoute;
672 + });
648 this.routeList = dateRouteList; // 航线优先级 673 this.routeList = dateRouteList; // 航线优先级
649 this.routesInfo = dateList; 674 this.routesInfo = dateList;
650 this.pageLoading = false; 675 this.pageLoading = false;
......