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

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -90,9 +90,13 @@
             </tr>
             <tr>
               <td width="80" class="txtRightCost">团队标题</td>
-              <td colspan="3">
+              <td width="300">
                 {{postConfig.Title}}
               </td>
+              <td width="80" class="txtRightCost">团队类型</td>
+              <td width="300">
+                {{postConfig.TeamTypeName}}
+              </td>
               <td width="80" class="txtRightCost">行程天数</td>
               <td>
                 {{postConfig.DayNum}}

src/components/TravelManager/TravelNewQuotation/QuotationAduit.vue

@@ -222,6 +222,7 @@
               if (tempData.NightNum && tempData.NightNum > 0) {
                 this.postData.NightNum = tempData.NightNum;
               }
+              this.postData.TeamTypeName = tempData.TeamTypeName;
               this.postData.CustomerName = tempData.CustomerName;
               this.postData.LineName = tempData.LineName;
               this.postData.LtName = tempData.LtName;