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

src/components/TravelContractNew.vue

@@ -1655,9 +1655,10 @@
         let WalArr = [];
         if (this.VoluntaryArr.length > 0) {
           this.VoluntaryArr.forEach(x => {
-            if (x.IsShow == 0) {
-              VolArr.push(x);
-            }
+            // if (x.IsShow == 0) {
+            //   VolArr.push(x);
+            // }
+            VolArr.push(x);
           })
           if (VolArr.length > 0) {
             this.CtObj.shopProtocol = JSON.stringify(VolArr);
@@ -1667,9 +1668,10 @@
         }
         if (this.WillingPayArr.length > 0) {
           this.WillingPayArr.forEach(x => {
-            if (x.IsShow == 0) {
-              WalArr.push(x);
-            }
+            // if (x.IsShow == 0) {
+            //   WalArr.push(x);
+            // }
+            WalArr.push(x);
           })
           if (WalArr.length > 0) {
             this.CtObj.payProtocol = JSON.stringify(WalArr);

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -472,18 +472,18 @@
                   {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
                 </td>
                 <td colspan="2">
-                  <template v-if="postConfig.LineId==14||postConfig.LineId==118">
-                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
-                  </template>
-                  <template v-else-if="postConfig.LineId==168">
-                    {{getLocalTotalMoney(subItem.PeopleNumber)}}
-                  </template>
-                  <template v-else-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
-                    {{teamPrice.SingleDMCPrice}}
-                  </template>
-                  <template v-else>
-                    {{subItem.SubtotalMoney}}
-                  </template>
+                   <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
+                      {{teamPrice.SingleDMCPrice}}
+                    </template>
+                    <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
+                      {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                    </template>
+                    <template v-else-if="postConfig.LineId==168">
+                      {{getLocalTotalMoney(subItem.PeopleNumber)}}
+                    </template>
+                    <template v-else>
+                      {{subItem.SubtotalMoney}}
+                    </template>
                 </td>
                 <td colspan="2">
                   {{subItem.TotalMoney}}

src/components/TravelManager/TravelNewQuotation/CostNewPriceCC.vue

@@ -380,15 +380,15 @@
                   {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
                 </td>
                 <td colspan="2">
-                  <template v-if="postConfig.LineId==14||postConfig.LineId==118">
+                  <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
+                    {{teamPrice.SingleDMCPrice}}
+                  </template>
+                  <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
                     {{getLocalTotalMoney(subItem.PeopleNumber)}}
                   </template>
                   <template v-else-if="postConfig.LineId==168">
                     {{getLocalTotalMoney(subItem.PeopleNumber)}}
                   </template>
-                  <template v-else-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
-                    {{teamPrice.SingleDMCPrice}}
-                  </template>
                   <template v-else>
                     {{subItem.SubtotalMoney}}
                   </template>

src/components/TravelManager/TravelNewQuotation/CostNewPriceForm.vue

@@ -195,16 +195,16 @@
               </td>
               <td>
                 <el-input type='text' v-model="subItem.HotelCostPrice" class="w70"
-                  @keyup.native="checkPrice(subItem,'HotelCostPrice')" placeholder="酒店价格"></el-input>
+                  @keyup.native="checkPrice(subItem,'HotelCostPrice'),getchange(1)" placeholder="酒店价格"></el-input>
               </td>
               <td>
                 <el-input type='text' v-model="subItem.BusCostPrice" class="w70"
-                  @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()" placeholder="车资">
+                  @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange(1)" placeholder="车资">
                 </el-input>
               </td>
               <td>
                 <el-input type='text' v-model="subItem.PassFee" class="w70"
-                  @keyup.native="checkPrice(subItem,'PassFee'),getchange()" placeholder="过路费、请车费">
+                  @keyup.native="checkPrice(subItem,'PassFee'),getchange(1)" placeholder="过路费、请车费">
                 </el-input>
               </td>
               <td>
@@ -222,29 +222,29 @@
                 早:<el-input type="text"
                   :disabled="(subItem.ContainDinnerType==1||subItem.ContainDinnerType==3)?true:false"
                   v-model='subItem.BreakfastCostPrice' class="w70"
-                  @keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange()"></el-input>
+                  @keyup.native="checkPrice(subItem,'BreakfastCostPrice'),getchange(1)"></el-input>
                 <br />
                 午:<el-input type="text" v-model='subItem.LunchCostPrice' class="w70"
-                  @keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange()"></el-input>
+                  @keyup.native="checkPrice(subItem,'LunchCostPrice'),getchange(1)"></el-input>
                 <br />
                 晚:<el-input type="text"
                   :disabled="(subItem.ContainDinnerType==2||subItem.ContainDinnerType==3)?true:false"
                   v-model='subItem.DinnerCostPrice' class="w70"
-                  @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
+                  @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange(1)"></el-input>
               </td>
               <td>
                 <el-input type='text' v-model="subItem.TicketName" style="width:120px;" placeholder="景点名称"></el-input>
               </td>
               <td>
                 <el-input type='text' v-model="subItem.ScenicCostPrice" class="w70"
-                  @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange()" placeholder="景点价格"></el-input>
+                  @keyup.native="checkPrice(subItem,'ScenicCostPrice'),getchange(1)" placeholder="景点价格"></el-input>
               </td>
               <td>
                 <el-input type="text" v-model='subItem.OtherName' class="w70" placeholder="杂支名称"></el-input>
               </td>
               <td>
                 <el-input type="text" v-model='subItem.OtherPrice' class="w70"
-                  @keyup.native="checkPrice(subItem,'OtherPrice'),getchange()"></el-input>
+                  @keyup.native="checkPrice(subItem,'OtherPrice'),getchange(1)"></el-input>
               </td>
             </tr>
           </template>
@@ -369,8 +369,8 @@
             </td>
             <td>
               <el-form-item label="单地接">
-                <el-input v-model="teamPrice.SingleDMCPrice" @keyup.native="checkPrice(teamPrice,'SingleDMCPrice'),getchange()"
-                  class="w70">
+                <el-input v-model="teamPrice.SingleDMCPrice"
+                  @keyup.native="checkInteger(teamPrice,'SingleDMCPrice'),getchange()" class="w70">
                 </el-input>
               </el-form-item>
             </td>
@@ -465,7 +465,7 @@
                 地接成本<br />(人民币)
               </td>
               <td colspan="2">
-                成本<br />[地接成本(人民币)+其它成本(人民币)小计+单地接]
+                成本<br />[单地接+其它成本(人民币)小计]
               </td>
               <td>
                 同业销售价格
@@ -504,7 +504,10 @@
                     {{getLocalJpyTotalMoney(subItem.PeopleNumber)}}
                   </td>
                   <td>
-                    <template v-if="postConfig.LineId==14||postConfig.LineId==118">
+                    <template v-if="teamPrice&&teamPrice.SingleDMCPrice&&teamPrice.SingleDMCPrice>0">
+                      {{teamPrice.SingleDMCPrice}}
+                    </template>
+                    <template v-else-if="postConfig.LineId==14||postConfig.LineId==118">
                       {{getLocalTotalMoney(subItem.PeopleNumber)}}
                     </template>
                     <template v-else-if="postConfig.LineId==168">
@@ -514,7 +517,7 @@
                       <!-- <el-input v-model="subItem.SubtotalMoney" @keyup.native="checkPrice(subItem,'SubtotalMoney')"
                         class="w70">
                       </el-input> -->
-                      {{teamPrice.SingleDMCPrice}}
+                      {{subItem.SubtotalMoney}}
                     </template>
                   </td>
                   <td colspan="2">
@@ -928,10 +931,9 @@
           var jpyotherPrice = 0;
           var SingleDMCPrice = 0;
           if (that.teamPrice && that.teamPrice.SingleDMCPrice) {
-            console.log("1111");
             SingleDMCPrice = Number(that.teamPrice.SingleDMCPrice);
           }
-          x.TotalMoney = (trip + otherPrice + SingleDMCPrice).toFixed(0);
+          x.TotalMoney = (otherPrice + SingleDMCPrice).toFixed(0);
           x.JPYTotalMoney = (jpyTrip + jpyotherPrice).toFixed(2);
         });
       },
@@ -954,7 +956,8 @@
         var otherPrice = Number(this.getDayXiaoJi(9, 2)) / PeopleNumber; //其它费用
         var busFee = Number(this.getDayXiaoJi(2, 2)) / PeopleNumber; //车费
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
-        return totalMoney.toFixed(2);
+        totalMoney = totalMoney.toFixed(2);
+        return totalMoney;
       },
       //获取地接项目报价(日元)
       getLocalJpyTotalMoney(PeopleNumber) {
@@ -970,8 +973,11 @@
         totalMoney = busFee + hotelPrice + sencePrice + canPrice + otherPrice;
         return totalMoney.toFixed(2);
       },
-      getchange() {
+      getchange(type) {
         this.getSubtotalMoney();
+        if (type && type == 1) {
+          this.teamPrice.SingleDMCPrice = this.getLocalTotalMoney(1);
+        }
       },
       //员工列表
       getEmployeeList() {