save

src/components/TravelManager/TravelTeam/chooseCustomer.vue

@@ -45,6 +45,11 @@
             {{scope.row.Address}}
           </template>
         </el-table-column>
+        <el-table-column fixed label="销售" min-width="180">
+          <template slot-scope="scope">
+            {{scope.row.SaleInfoList && scope.row.SaleInfoList.length ?scope.row.SaleInfoList.map(item => item.EmName).join(',') : ''}}
+          </template>
+        </el-table-column>
       </el-table>
       <el-pagination background @current-change="handleCurrentChange" :current-page.sync="qMsg.currentPage"
         layout="total,prev, pager, next, jumper" :page-size="qMsg.pageSize" :total="qMsg.total">

src/components/TravelManager/TravelTeam/editTeamInfo.vue

@@ -832,6 +832,7 @@
               if (tempObj.TravelTeamPartnerList && tempObj.TravelTeamPartnerList.length > 0) {
                 this.friendList = tempObj.TravelTeamPartnerList;
               }
+              console.log('flightList>>>', this.addMsg.flightList)
             } else {
               this.Error(res.data.message);
             }
@@ -890,6 +891,7 @@
             newList.TicketArrivalTime = x.ArrivalTime;
             newList.ID = this.addGoFlight.ID;
             newList.TicketType = 1;
+            newList.IsTransfer = this.addGoFlight.IsTransfer
             this.addMsg.flightList.push(newList);
           }
         });
@@ -915,6 +917,7 @@
             newList.TicketArrivalTime = x.ArrivalTime;
             newList.ID = this.returnTripData.ID;
             newList.TicketType = 2;
+            newList.IsTransfer = this.returnTripData.IsTransfer
             this.addMsg.flightList.push(newList);
           }
         });
@@ -935,11 +938,11 @@
       addAward() {
         this.editForm.TravelTeamFlightList = this.addMsg.flightList;
         this.editForm.TravelTeamPartnerList = this.friendList;
-        this.saveLoading = true;
         if (!this.editForm.TravelTeamPartnerList.length) {
           this.Warning("请选择合作伙伴");
           return;
         }
+        this.saveLoading = true;
         this.apipost(
           "post_SetTeavelTeam",
           this.editForm,

src/components/TravelManager/TravelTeam/travelTeamList.vue

@@ -353,7 +353,7 @@
                       <span v-if="subItem.SaleInfoList && subItem.SaleInfoList.length">
                     <el-popover
     trigger="hover"
-    :content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList[0].EmName : ''"><el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">{{subItem.CustomerName}}</el-tag>
+    :content="subItem.SaleInfoList && subItem.SaleInfoList.length ?subItem.SaleInfoList.map(item => item.EmName).join(',') : ''"><el-tag size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">{{subItem.CustomerName}}</el-tag>
   </el-popover>
                     </span>
                     <el-tag v-else size="mini" slot="reference" style="margin-right:10px;margin-bottom: 10px">{{subItem.CustomerName}}</el-tag>