页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -216,7 +216,7 @@
                 {{OtherPrice.AirTicketMoeny}}
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="中段机票">
                 {{OtherPrice.InlandAirTicketMoney}}
               </el-form-item>
@@ -231,7 +231,7 @@
                 {{teamPrice.UnionPrice}}
               </el-form-item>
             </td>
-            <td colspan="5" rowspan="2">
+            <td colspan="6" rowspan="2">
               小计(机票+中段机票+税金+联运+领队导游分摊+过夜+签证+保险):
               <br />{{getCostTotalMoney()}}
             </td>
@@ -242,7 +242,7 @@
                 {{OtherPrice.AirTicketShareMoney}}
               </el-form-item>
             </td>
-            <td colspan="2">
+            <td>
               <el-form-item label="过夜">
                 {{teamPrice.NightPrice}}
               </el-form-item>
@@ -273,13 +273,14 @@
               </el-form-item>
             </td>
             <td colspan="2">
-              <el-form-item label="儿童占床">
-                {{teamPrice.ChildNeedPrice}}
+              <el-form-item label="儿童不占床">
+                {{teamPrice.ChildNoNeedPrice}}
               </el-form-item>
+
             </td>
             <td colspan="2">
-              <el-form-item label="儿童不占床">
-                {{teamPrice.ChildNoNeedPrice}}
+              <el-form-item label="儿童占床">
+                {{teamPrice.ChildNeedPrice}}
               </el-form-item>
             </td>
             <td colspan="6">
@@ -289,6 +290,19 @@
             </td>
           </tr>
           <tr>
+            <td colspan="2">
+              <el-form-item label="主OP">
+                {{postConfig.OPName}}
+              </el-form-item>
+            </td>
+            <td colspan="3">
+              <el-form-item label="助理OP：">
+                <template v-if="postConfig.Assistantlist&&postConfig.Assistantlist.length>0">
+                  <span v-for="(subItem,subIndex) in postConfig.Assistantlist" :key="subIndex"
+                    style="padding-left:3px;">{{subItem.Name}}</span>
+                </template>
+              </el-form-item>
+            </td>
             <td colspan="2">
               <el-form-item label="付款方式">
                 <template v-if="postConfig.SaleOfferPayType==1">
@@ -302,7 +316,7 @@
                 </template>
               </el-form-item>
             </td>
-            <td colspan="11">
+            <td colspan="6">
               附件: <template v-if="teamPrice.ContractArray&& teamPrice.ContractArray.length>0">
                 <template v-for="(subItem,subIndex) in teamPrice.ContractArray">
                   <a style="margin-left:20px;color:blue;cursor:pointer;" target="_blank" :key="subIndex"

src/components/TravelManager/TravelNewQuotation/priceDialog.vue

@@ -180,6 +180,8 @@
           ManagerAduitDate: "", //欧洲线审核日期
           ManagerAduitName: "", //欧洲线审核人员
           ManagerAduitStatus: 0, //欧洲线审核状态(1-通过，2-驳回)
+          OPName: "", //主OP
+          AssistantList: [], //助理OP
         },
         dayCostPriceList: [], //报价列表
 
@@ -340,6 +342,12 @@
                   if (offerObj.ManagerAduitStatus) {
                     this.postData.ManagerAduitStatus = offerObj.ManagerAduitStatus;
                   }
+                  if (offerObj.OPName && offerObj.OPName != '') {
+                    this.postData.OPName = offerObj.OPName;
+                  }
+                  if (offerObj.AssistantList && offerObj.AssistantList.length > 0) {
+                    this.postData.Assistantlist = offerObj.AssistantList;
+                  }
                 }
 
                 this.currentData = tempData.OfferArray.find(item => item.IsDefault);