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

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -933,9 +933,9 @@
 
   .GO_Contract {
     color: blue;
-    display: block;
+    display: inline-block;
     cursor: pointer;
-    max-width: 200px;
+    margin-right:20px;
   }
   .RegistrationList .leftSetInfo,.RegistrationList .GO_TPright{
     float:left;
@@ -1880,6 +1880,7 @@
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         设置额外金额</div>
                       <div @click="SetShouSunClick(item.OrderId,item.GuestNum)">设置收损金额</div>
+                      
                       <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
                       <div @click='deleteItem(item)'>删除</div>
                     </div>
@@ -1911,8 +1912,16 @@
               <!--                <span>暂无名单</span>-->
               <!--              </p>-->
               <span>房间信息：{{item.OrderGuestHouseStr}}</span>
-              <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
-              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span>
+              <div v-if="item.ContractNum.length==0">
+                <span class="GO_Contract" @click="goContract(item,{})">领取合同</span>
+              </div>
+              <div v-else>
+                <span v-for="sItem in item.ContractNum" class="GO_Contract" @click="goContract(item,sItem)">
+                    {{sItem.Client_Name+''+sItem.ContractNum}}
+                </span>
+              </div>
+              <!-- <span v-if="item.ContractNum==''" class="GO_Contract" @click="goContract(item)">领取合同</span>
+              <span v-else class="GO_Contract" @click="goContract(item)">{{item.ContractNum}}</span> -->
             </td>
           </tr>
           <tr>
@@ -2182,6 +2191,7 @@
                           @click='EwMsg.OrderId = childItem.OrderId, EwMsg.ExtraRewardMoney = childItem.ExtraRewardMoney,EwMsg.ExtraDeductMoney=childItem.ExtraDeductMoney, OrderMoneyDialog = true'>
                           设置额外金额</div>
                         <div @click="SetShouSunClick(childItem.OrderId, childItem.GuestNum)">设置收损金额</div>
+                        <div v-if="childItem.IsChargeLossOrders==1" @click="setChargeLoss(childItem)">恢复收损单</div>
                         <div @click="lianyunFY(childItem)">联运返佣</div>
                         <div @click="ZhuiJiaTuanKuan(childItem.OrderId)" v-if="RBBranchId == 0">追加团款</div>
                         <div @click="importNameOrder(childItem.OrderId)" v-if="OrderDataList.OtherOrderList.length == 1 && subItem.List.length == 1">导入旅客名单</div>
@@ -2246,8 +2256,14 @@
                       style="text-decoration:underline;color:blue;cursor:pointer" v-for="(id,i) in childItem.TipFrId"
                       :key="i">{{id}}</span>
                   </span>
-                  <span v-if="childItem.ContractNum==''" class="GO_Contract" @click="goContract(childItem)">领取合同</span>
-                  <span v-else class="GO_Contract" @click="goContract(childItem)">{{childItem.ContractNum}}</span>
+                  <div v-if="childItem.ContractNum.length==0">
+                    <span class="GO_Contract" @click="goContract(childItem,{})">领取合同</span>
+                  </div>
+                  <div v-else>
+                    <span v-for="sItem in childItem.ContractNum" class="GO_Contract" @click="goContract(childItem,sItem)">
+                        {{sItem.Client_Name+''+sItem.ContractNum}}
+                    </span>
+                  </div>
                 </div>
               </td>
             </tr>
@@ -2554,6 +2570,8 @@
                         @click='EwMsg.OrderId = item.OrderId, EwMsg.ExtraRewardMoney = item.ExtraRewardMoney,EwMsg.ExtraDeductMoney=item.ExtraDeductMoney, OrderMoneyDialog = true'>
                         设置额外金额</div>
                       <div @click="SetShouSunClick(item.OrderId, item.GuestNum)">设置收损金额</div>
+
+                      
                       <div @click="ZhuiJiaTuanKuan(item.OrderId)" v-if="RBBranchId == 0">追加团款</div>
                       <div @click="importNameOrder(item.OrderId)">导入旅客名单</div>
                       <div v-if="item.OrderState=='2'||item.OrderState=='3'" @click='deleteItem(item)'>删除</div>
@@ -3426,6 +3444,33 @@
       commonShouSun: commonShouSun
     },
     methods: {
+      setChargeLoss(obj){
+        console.log("obj",obj)
+        this.$confirm("确定恢复收损单", "提示", {
+            confirmButtonText: "确定",
+            cancelButtonText: "取消",
+            type: "warning"
+          })
+          .then(() => {
+            this.apipost(
+              "sellorder_post_RemoveChargeLossOrders", {
+                OrderId: obj.OrderId
+              },
+              res => {
+                if (res.data.resultCode == 1) {
+                  this.$message.success("操作成功！");
+                  this.getList();
+                } else {
+                  this.$message.error(res.data.message);
+                }
+              },
+              err => {}
+            );
+          })
+          .catch(() => {
+            this.$message.info("取消！");
+          });
+      },
       //上传
       handleAvatarSuccess(res, file) {
         if (res.resultCode == 1) {
@@ -5305,28 +5350,29 @@
 
       },
       //跳转至领取合同
-      goContract(item) {
-        if (item.ContractNum) {
-          let routeData = this.$router.resolve({
-            name: 'TravelContractDetail',
-            query: {
-              TCID: item.TCID,
-              orderID: item.OrderId,
-              blank: 'y'
-            }
-          })
-          window.open(routeData.href, '_blank')
-        } else {
+      goContract(item,sItem) {
+        // if (item.ContractNum) {
+        //   let routeData = this.$router.resolve({
+        //     name: 'TravelContractDetail',
+        //     query: {
+        //       TCID: item.TCID,
+        //       orderID: item.OrderId,
+        //       blank: 'y'
+        //     }
+        //   })
+        //   window.open(routeData.href, '_blank')
+        // } else {
           let routeData = this.$router.resolve({
             name: 'TravelContractNew',
             query: {
               TCID: item.TCID,
+              guestId:sItem.GuestId,
               orderID: item.OrderId,
               blank: 'y'
             }
           })
           window.open(routeData.href, '_blank')
-        }
+        // }
       },
       Discount(TCID) {
         this.SpecialOffer = true

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -9,17 +9,22 @@
   .CostNewPrice .CP_halfWi {
     width: 45%;
   }
-
+  .CostNewPrice .QuotationFirstDiv1{
+    padding-top:30px;
+  }
+  .CostNewPrice .QuotationFirstDiv1 .el-form-item__content .el-select{
+    width: calc(100% - 100px);
+  } 
 </style>
 
 <template>
   <div>
     <div class="CostNewPrice clearfix CP_Div">
       <el-form>
-        <div class="QuotationFirstDiv">
+        <div class="QuotationFirstDiv1">
           <el-row :gutter="40">
             <el-col :span="12">
-              <el-form-item label="线路">
+              <el-form-item label="线路" label-width="100px">
                 <el-select v-model="postConfig.LineId" :placeholder="$t('pub.pleaseSel')"
                   @change="getLineTeamList(postConfig.LineId)" filterable>
                   <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
@@ -29,7 +34,7 @@
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="系列">
+              <el-form-item label="系列" label-width="100px">
                 <el-select v-model="postConfig.LineteamId" :placeholder="$t('pub.pleaseSel')" filterable>
                   <el-option :label="$t('pub.unlimitedSel')" :value='0'></el-option>
                   <el-option v-for="item in LineTeamList" :label='item.LtName' :value='item.LtID' :key='item.LtID'>
@@ -40,14 +45,14 @@
           </el-row>
           <el-row>
             <el-col :span="24">
-              <el-form-item label="团队标题">
-                <el-input v-model="postConfig.Title" type="textarea" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
+              <el-form-item label="团队标题" label-width="100px">
+                <el-input v-model="postConfig.Title" type="textarea" style="width:94%" :autosize="{minRows: 1, maxRows: 2 }" resize="none"
                   placeholder="请填写团队标题" maxlength="200"></el-input>
               </el-form-item>
             </el-col>
           </el-row>
           <div class="seat-box">
-            <div class="left">座位</div>
+            <div class="left" style="float:left;margin:6px 0 0 64px;">座位</div>
             <div class="right">
               <el-row :gutter="20">
                 <el-col :span="6">
@@ -58,7 +63,7 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="5">
                   <el-form-item prop="CSeat">
                     <el-input placeholder="人数" v-model="postConfig.CSeat" maxlength="2"
                       @keyup.native="checkInteger(postConfig,'CSeat')">
@@ -66,7 +71,7 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="5">
                   <el-form-item prop="FSeat">
                     <el-input placeholder="人数" v-model="postConfig.FSeat" maxlength="2"
                       @keyup.native="checkInteger(postConfig,'FSeat')">
@@ -74,7 +79,7 @@
                     </el-input>
                   </el-form-item>
                 </el-col>
-                <el-col :span="6">
+                <el-col :span="5">
                   <el-form-item>
                     <el-input placeholder="人数" v-model="postConfig.LowNum" maxlength="2">
                       <template slot="prepend">最低成团人数</template>
@@ -85,7 +90,7 @@
             </div>
           </div>
           <div class="seat-box">
-            <div class="left">行程天数</div>
+            <div class="left" style="float:left;margin:6px 0 0 34px;">行程天数</div>
             <div class="right">
               <el-row :gutter="20">
                 <el-col :span="6">
@@ -94,10 +99,6 @@
                       @keyup.native="checkInteger(postConfig,'DayNum');createDayTripPrice()" maxlength="2">
                       <template slot="append">天</template>
                     </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="6">
-                  <el-form-item>
                     <el-input class="w120 LowNum" v-model="postConfig.NightNum"
                       @keyup.native="checkInteger(postConfig,'NightNum')" maxlength="2">
                       <template slot="append">晚</template>
@@ -129,11 +130,11 @@
           <tr>
             <td class="CP_comBack">汇率</td>
             <td v-for='item in CostCurrencyList'>
-              <el-input class="w80" v-model='item.ExchangeRate' @keyup.native="checkRate(item,'ExchangeRate')">
+              <el-input class="w80" v-model='item.ExchangeRate' @keyup.native="checkRate(item,'ExchangeRate'),getchange()">
               </el-input>
             </td>
             <td>
-              <el-input class="w100" v-model='queryMsg.RateInput' @keyup.native="checkRate(queryMsg,'RateInput')">
+              <el-input class="w100" v-model='queryMsg.RateInput' @keyup.native="checkRate(queryMsg,'RateInput'),getchange()">
               </el-input>
             </td>
           </tr>
@@ -145,13 +146,13 @@
               <el-input class="w80" v-model='item.PeopleNumber' @keyup.native="checkInteger(item,'PeopleNumber')">
               </el-input>
               <span>
-                <i class="iconfont icon-quxiao" @click="DeletePNumber(index)"></i>
+                <i class="iconfont icon-quxiao" @click="DeletePNumber(index),getchange()"></i>
               </span>
             </td>
             <td width="150">
               <el-form-item>
                 <el-input class="w80" v-model='queryMsg.PeopleNumber'
-                  @keyup.native="checkInteger(queryMsg,'PeopleNumber')"></el-input>
+                  @keyup.native="checkInteger(queryMsg,'PeopleNumber'),getchange()"></el-input>
               </el-form-item>
               <div class="AS_addPeoNumer">
                 <i class="iconfont icon-img_haha" @click="addPeoNunber"></i>
@@ -163,23 +164,22 @@
             <td v-if="checkExists(item.CurrencyId)" v-for="childItem in getCurrencyNumberList(item.CurrencyId)">
               <el-form-item>
                 <el-input class="w80" v-model='childItem.Money'
-                  @keyup.native="checkPrice(childItem,'Money',true),ReCalc()"></el-input>
+                  @keyup.native="checkPrice(childItem,'Money',true),getchange()"></el-input>
               </el-form-item>
             </td>
             <td>
-
             </td>
           </tr>
         </table>
 
         <table class="CostPriceTable">
           <tr>
-            <th rowspan="2" width='100'>Day</th>
-            <th rowspan="2" width='100'>行程大点</th>
+            <th rowspan="2" width='80'>Day</th>
+            <th rowspan="2" width='200'>行程大点</th>
             <th rowspan="2" width="200">币种</th>
-            <th rowspan="2" width='220'>酒店</th>
+            <th rowspan="2" width='200'>酒店</th>
             <th rowspan="2" width='200'>车</th>
-            <th rowspan="2" width='220'>门票</th>
+            <th rowspan="2" width='200'>门票</th>
             <th colspan="3" width='200'>餐</th>
           </tr>
           <tr>
@@ -207,25 +207,25 @@
                 @keyup.native="checkPrice(subItem,'HotelCostPrice')"></el-input>
             </td>
             <td>
-              <el-input type='text' v-model="subItem.BusCostPrice" @keyup.native="checkPrice(subItem,'BusCostPrice')">
+              <el-input type='text' v-model="subItem.BusCostPrice" @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
               </el-input>
             </td>
             <td>
               <el-input type='text' v-model="subItem.ScenicCostPrice"
-                @keyup.native="checkPrice(subItem,'ScenicCostPrice')"></el-input>
+                @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()"></el-input>
             </td>
             <td>
               <el-input type="text" v-model='subItem.BreakfastCostPrice'
-                @keyup.native="checkPrice(subItem,'BreakfastCostPrice')">
+                @keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()">
               </el-input>
             </td>
             <td>
               <el-input type="text" v-model='subItem.LunchCostPrice'
-                @keyup.native="checkPrice(subItem,'LunchCostPrice')"></el-input>
+                @keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
             </td>
             <td>
               <el-input type="text" v-model='subItem.DinnerCostPrice'
-                @keyup.native="checkPrice(subItem,'DinnerCostPrice')"></el-input>
+                @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
             </td>
           </tr>
         </table>
@@ -247,7 +247,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.InlandAirTicketMoney"
-                  @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'InlandAirTicketMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -267,7 +267,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.InlandShipTicketMoney"
-                  @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'InlandShipTicketMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -287,7 +287,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.InlandTrainTicketMoney"
-                  @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'InlandTrainTicketMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -300,7 +300,7 @@
             <td colspan='3'>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.VisaMoney"
-                  @keyup.native="checkPrice(OtherPrice,'VisaMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'VisaMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -310,7 +310,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.SafeMoney"
-                  @keyup.native="checkPrice(OtherPrice,'SafeMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'SafeMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -320,7 +320,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.LeaderTripMoney"
-                  @keyup.native="checkPrice(OtherPrice,'LeaderTripMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'LeaderTripMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -330,7 +330,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.DriverGuideMoney"
-                  @keyup.native="checkPrice(OtherPrice,'DriverGuideMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'DriverGuideMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -343,7 +343,7 @@
             <td colspan='3'>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.SalesCommissionMoney"
-                  @keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -353,7 +353,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.OfficeCommissionMoney"
-                  @keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -365,7 +365,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.AirTicketMoeny"
-                  @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'AirTicketMoeny'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -378,7 +378,7 @@
             <td colspan='3'>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.TripMoney"
-                  @keyup.native="checkPrice(OtherPrice,'TripMoney',true)"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'TripMoney',true),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -388,7 +388,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.GuidePeopleMoney"
-                  @keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'GuidePeopleMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
           </tr>
@@ -419,7 +419,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.AirTicketShareMoney"
-                  @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'AirTicketShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td v-for="item in CostNumberList" :key="item.subCode">
@@ -431,7 +431,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.TicketShareMoney"
-                  @keyup.native="checkPrice(OtherPrice,'TicketShareMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'TicketShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td v-for="item in CostNumberList" :key="item.subCode">
@@ -443,7 +443,7 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.SingleRoomShareMoney"
-                  @keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
             <td v-for="item in CostNumberList" :key="item.subCode">
@@ -455,25 +455,31 @@
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.InlandTrafficShareMoney"
-                  @keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'InlandTrafficShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
-
+            <td v-for="item in CostNumberList" :key="item.subCode">
+              {{item.InlandTrafficMoney}}
+            </td>
           </tr>
           <tr>
             <td>杂费</td>
             <td>
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.OtherShareMoney"
-                  @keyup.native="checkPrice(OtherPrice,'OtherShareMoney')"></el-input>
+                  @keyup.native="checkPrice(OtherPrice,'OtherShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
-
+            <td v-for="item in CostNumberList" :key="item.subCode">
+              {{item.OtherMoney}}
+            </td>
           </tr>
           <tr>
             <td>小计</td>
             <td></td>
-
+            <td v-for="item in CostNumberList" :key="item.subCode">
+              {{item.SubtotalMoney}}
+            </td>
           </tr>
         </table>
         <div class="Cost_Line"></div>
@@ -483,14 +489,17 @@
             <td width='250' rowspan="2" class="CP_comBack">
               人数统计
             </td>
-
+            <td v-for="item in CostNumberList" :key="item.subCode" class="CP_comBack">
+              {{item.PeopleNumber}}+1
+            </td>
           </tr>
           <tr>
-
+            <td v-for="item in CostNumberList" :key="item.subCode">
+              {{item.TotalMoney}}
+            </td>
           </tr>
         </table>
       </el-form>
-
     </div>
   </div>
 </template>
@@ -524,6 +533,16 @@
         // );
         // this.$emit("headCallBack", this.OfferCostPriceObj);
       },
+      //获取汇率
+      getCurrencyMoney(currencyId) {
+        let currency = 0.0;
+        this.CostCurrencyList.forEach(x => {
+          if (x.CurrencyId == currencyId) {
+            currency = x.ExchangeRate;
+          }
+        });
+        return currency;
+      },
       //判断币种是否相等
       checkExists(CurrencyId) {
         var flag = false;
@@ -534,6 +553,47 @@
         });
         return flag;
       },
+      //获取不同人数组合价
+      getCurrencyNumberTotalMoney(peopleNumber) {
+        let totalMoney = 0.0;
+        this.CurrencyNumberListExt.forEach(x => {
+          x.currencyNumberList.forEach(y => {
+            if (peopleNumber === y.PeopleNumber) {
+              totalMoney +=
+                this.getConvertMoney(y.Money) *
+                this.getCurrencyMoney(y.CurrencyId);
+            }
+          });
+        });
+        return totalMoney;
+      },
+      //获取主成本价
+      getCostTotalMoney() {
+        let totalMoney =
+          this.getConvertMoney(this.OtherPrice.InlandAirTicketMoney) *
+          this.getCurrencyMoney(
+            this.OtherPrice.InlandAirTicketCurrency
+          ) +
+          this.getConvertMoney(this.OtherPrice.InlandShipTicketMoney) *
+          this.getCurrencyMoney(
+            this.OtherPrice.InlandShipTicketCurrency
+          ) +
+          this.getConvertMoney(this.OtherPrice.InlandTrainTicketMoney) *
+          this.getCurrencyMoney(
+            this.OtherPrice.InlandTrainTicketCurrency
+          ) +
+          this.getConvertMoney(this.OtherPrice.DriverGuideMoney) +
+          this.getConvertMoney(this.OtherPrice.LeaderTripMoney) +
+          this.getConvertMoney(this.OtherPrice.OfficeCommissionMoney) +
+          this.getConvertMoney(this.OtherPrice.SafeMoney) +
+          this.getConvertMoney(this.OtherPrice.SalesCommissionMoney) +
+          this.getConvertMoney(this.OtherPrice.TripMoney) +
+          this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) +
+          this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
+          this.getConvertMoney(this.OtherPrice.KBMoney) +
+          this.getConvertMoney(this.OtherPrice.VisaMoney);
+        return totalMoney;
+      },
       //获取系列列表
       getLineTeamList(lineId) {
         this.postConfig.LineteamId = 0;
@@ -711,13 +771,85 @@
           err => {}
         );
       },
+      //计算总价
+      getSubtotalMoney() {
+        let that = this;
+        this.CostNumberList.forEach(x => {
+          x.SubtotalMoney = (
+            this.getConvertMoney(x.AirTicketMoney) +
+            this.getConvertMoney(x.TicketMoney) +
+            this.getConvertMoney(x.SingleRoomMoney) +
+            this.getConvertMoney(x.InlandTrafficMoney) +
+            this.getConvertMoney(x.OtherMoney)
+          ).toFixed(2);
+
+          x.TotalMoney = (
+            that.getLocalTotalMoney() +
+            that.getCostTotalMoney() +
+            this.getConvertMoney(x.SubtotalMoney) +
+            this.getCurrencyNumberTotalMoney(x.PeopleNumber)
+          ).toFixed(2);
+        });
+      },
+      //价格转换器
+      getConvertMoney(value) {
+        if (value === "" || value === undefined || value === null) {
+          value = 0.0;
+        }
+        return parseFloat(value);
+      },
+      //获取地接项目报价
+      getLocalTotalMoney() {
+        let totalMoney = 0.0;
+        this.dayCostPrice.forEach(x => {
+          let subTotalMoney = 0.0;
+          subTotalMoney =
+            (this.getConvertMoney(x.HotelCostPrice) +
+              this.getConvertMoney(x.BusCostPrice) +
+              this.getConvertMoney(x.ScenicCostPrice) +
+              this.getConvertMoney(x.BreakfastCostPrice) +
+              this.getConvertMoney(x.LunchCostPrice) +
+              this.getConvertMoney(x.DinnerCostPrice)) *
+            this.getCurrencyMoney(x.CurrencyId);
+          totalMoney += subTotalMoney;
+        });
+        return totalMoney;
+      },
+      //计算领队分摊
+      getLeaderShare() {
+        let that = this;
+        var AirTicketShareMoney = this.OtherPrice.AirTicketShareMoney;
+        var TicketShareMoney = this.OtherPrice.TicketShareMoney;
+        var SingleRoomShareMoney = this.OtherPrice.SingleRoomShareMoney;
+        var InlandTrafficShareMoney = this.OtherPrice.InlandTrafficShareMoney;
+        var OtherShareMoney = this.OtherPrice.OtherShareMoney;
+        this.CostNumberList.forEach(x => {
+          x.AirTicketMoney = (AirTicketShareMoney / x.PeopleNumber).toFixed(2);
+          x.TicketMoney = (TicketShareMoney / x.PeopleNumber).toFixed(2);
+          x.SingleRoomMoney = (SingleRoomShareMoney / x.PeopleNumber).toFixed(2);
+          x.InlandTrafficMoney = (InlandTrafficShareMoney / x.PeopleNumber).toFixed(2);
+          x.OtherMoney = (OtherShareMoney / x.PeopleNumber).toFixed(2);
+        });
+      },
+      getchange()
+      {
+          this.getLeaderShare();
+          this.getSubtotalMoney();
+      }
     },
     mounted() {
       this.getAllCurrency();
-
     },
     created() {},
-    watch: {}
+    watch: {
+      CostNumberList: {
+        handler: function (val, oldVal) {
+          console.log("111");
+          this.getchange()
+        },
+        deep: true
+      },
+    },
   };
 
 </script>