Merge branch 'master' of http://gitlab.oytour.com/luochao/superman

src/components/TravelManager/TravelTeam/editTeamInfo.vue

@@ -184,6 +184,14 @@
     color: #e95252;
   }
 
+  ._add_info {
+    margin-top: 12px;
+    padding: 0 12px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
 </style>
 <template>
   <div class="travelTeamInfo">
@@ -477,7 +485,7 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <el-button @click="submit" type="primary">
+            <el-button @click="submit" type="primary" :loading="saveLoading">
               保存
             </el-button>
           </el-col>
@@ -561,7 +569,7 @@
           flightList: [],
         },
         addGoFlight: {},
-        list: [],
+       
         AirportNameList: [],
         BackAirportNameList: [],
         airlineList: [],
@@ -612,12 +620,15 @@
           ID: 0,
           AirLineID: "",
         },
+        saveLoading: false, //保存loading
       };
     },
-    mounted() {
+    created() {
       this.customers = []
       this.initAirlines();
       this.getCustomerList();
+    },
+    mounted() {
       if (this.Q_GTeamId) {
         this.getDetail(this.Q_GTeamId);
       }
@@ -682,9 +693,9 @@
                 item["disabled"] = false;
                 item.Address = item.Address.split(",").join("");
               });
-              this.datainfo = res.data.data;
-              this.list = res.data.data.pages.pageData;
-              this.total = res.data.data.pages.count;
+ 
+              this.friendList = res.data.data.pages.pageData;
+           
             } else {
               this.$message.error(res.data.message);
             }
@@ -748,7 +759,7 @@
         });
         this.addGoFlight.FlightDate = "";
         this.addGoFlight.FlightId = "";
-        this.addGoFlight.AirLineID = 0;
+        this.addGoFlight.AirLineID = "";
       },
       //添加回程
       addFlightReturn() {
@@ -772,7 +783,7 @@
         });
         this.returnTripData.FlightDate = "";
         this.returnTripData.FlightId = "";
-        this.returnTripData.AirLineID = 0;
+        this.returnTripData.AirLineID = "";
       },
       submit() {
         //提交创建、修改表单
@@ -792,6 +803,7 @@
             CustomerId: item.ID
           };
         });
+        this.saveLoading = true;
         // if (!this.editForm.TravelTeamPartnerList.length) {
         //   this.Warning("请选择合作伙伴");
         //   return;
@@ -819,15 +831,18 @@
           "post_SetTeavelTeam",
           this.editForm,
           (res) => {
+            this.saveLoading = false;
             if (res.data.resultCode == 1) {
               this.Success("添加成功");
-              //刷新页面
+              //关闭弹窗并刷新页面
               this.$emit("success");
             } else {
               this.$message.error(res.data.message);
             }
           },
-          (err) => {}
+          (err) => {
+            this.saveLoading = false;
+          }
         );
       },
       //删除航班