Elements-SY

Merge branch 'fix-issues' into uat

...@@ -818,6 +818,10 @@ export default { ...@@ -818,6 +818,10 @@ export default {
818 }, 818 },
819 /** 修改按钮操作 */ 819 /** 修改按钮操作 */
820 handleUpdate(row) { 820 handleUpdate(row) {
821 + if(row.statusName == "已删除"){
822 + this.msgError("已删除不可操作");
823 + return
824 + }
821 this.reset(); 825 this.reset();
822 this.findFltConditionData(); 826 this.findFltConditionData();
823 this.perStatus(row.fltNo) 827 this.perStatus(row.fltNo)
...@@ -873,6 +877,10 @@ export default { ...@@ -873,6 +877,10 @@ export default {
873 }, 877 },
874 //查看航班维度 878 //查看航班维度
875 goFlightAllocConfig(val) { 879 goFlightAllocConfig(val) {
880 + if(val.statusName == "已删除"){
881 + this.msgError("已删除不可操作");
882 + return
883 + }
876 let obj = { 884 let obj = {
877 id: ' ', 885 id: ' ',
878 handle: 'updated', 886 handle: 'updated',
...@@ -1002,6 +1010,7 @@ export default { ...@@ -1002,6 +1010,7 @@ export default {
1002 }, 1010 },
1003 //取消按钮 1011 //取消按钮
1004 cancel() { 1012 cancel() {
1013 + this.routeError = false
1005 this.routeList = [] 1014 this.routeList = []
1006 this.ishighPriceWeightPercent = true 1015 this.ishighPriceWeightPercent = true
1007 this.routeMultiple = false 1016 this.routeMultiple = false
......
...@@ -173,7 +173,7 @@ export default { ...@@ -173,7 +173,7 @@ export default {
173 { 173 {
174 required: true, 174 required: true,
175 message: "航线不能为空", 175 message: "航线不能为空",
176 - trigger: "change", 176 + trigger: ["change", "blur"],
177 }, 177 },
178 ], 178 ],
179 groupAllWeight: [ 179 groupAllWeight: [
...@@ -307,4 +307,4 @@ export default { ...@@ -307,4 +307,4 @@ export default {
307 } 307 }
308 </script> 308 </script>
309 309
310 -<style lang="scss" scoped></style>
...\ No newline at end of file ...\ No newline at end of file
310 +<style lang="scss" scoped></style>
......