页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -810,12 +810,11 @@
           </tr>
           <tr>
             <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
-              计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入+团负费+领队分摊+地接报价*汇率
+              计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率
             </td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">人数统计
-
             </td>
             <td class="CP_ComTitle2">成本价</td>
             <td class="CP_ComTitle2" colspan="2">销售价格</td>
@@ -832,6 +831,78 @@
               <el-input type="textarea" v-model="item.CostRemark"></el-input>
             </td>
           </tr>
+          <tr>
+            <td colspan="12"></td>
+          </tr>
+          <tr>
+            <td class="CP_ComTitle2">
+              婴儿
+            </td>
+            <td class="CP_ComTitle2" colspan="2">
+              单地接
+            </td>
+            <td class="CP_ComTitle2" colspan="2">
+              儿童占床
+            </td>
+            <td class="CP_ComTitle2" colspan="2">
+              儿童不占床
+            </td>
+            <td class="CP_ComTitle2">
+              儿童附加费
+            </td>
+            <td class="CP_ComTitle2">
+              老人附加费
+            </td>
+            <td class="CP_ComTitle2">
+              签证费
+            </td>
+            <td class="CP_ComTitle2">
+              单房差
+            </td>
+          </tr>
+          <tr>
+            <td>
+              <el-input placeholder="" v-model="teamPrice.BabyPrice" @keyup.native="checkInteger(teamPrice,'BabyPrice')"
+                class="w100">
+              </el-input>
+            </td>
+            <td colspan="2">
+              <el-input placeholder="" v-model="teamPrice.SingleDMCPrice"
+                @keyup.native="checkPrice(teamPrice,'SingleDMCPrice')" class="w100">
+              </el-input>
+            </td>
+            <td colspan="2">
+              <el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
+                @keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w100">
+              </el-input>
+            </td>
+            <td colspan="2">
+              <el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
+                @keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w100">
+              </el-input>
+            </td>
+            <td>
+              <el-input placeholder="" v-model="teamPrice.BabyChargePrice"
+                @keyup.native="checkPrice(teamPrice,'BabyChargePrice')" class="w100">
+              </el-input>
+            </td>
+            <td>
+              <el-input placeholder="" v-model="teamPrice.OldManChargePrice"
+                @keyup.native="checkInteger(teamPrice,'OldManChargePrice')" class="w100">
+              </el-input>
+            </td>
+            <td>
+              <el-input placeholder="" v-model="teamPrice.VisaPrice" @keyup.native="checkPrice(teamPrice,'VisaPrice')"
+                class="w100">
+              </el-input>
+            </td>
+            <td>
+              <el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
+                @keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w100">
+              </el-input>
+            </td>
+
+          </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
             <td colspan="11">
@@ -847,7 +918,7 @@
 <script>
   export default {
     props: ["postConfig", "OtherPrice", "dayCostPrice", "LineList", "CostNumberList", "CurrencyNumberListExt",
-      "CostCurrencyList"
+      "CostCurrencyList", "teamPrice"
     ],
     data() {
       return {
@@ -1055,13 +1126,13 @@
           ) +
           this.getConvertMoney(this.OtherPrice.SalesCommissionMoney) +
           this.getConvertMoney(this.OtherPrice.TripMoney) +
-          this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) +
-         
+          this.getConvertMoney(this.OtherPrice.GuidePeopleMoney) -
           this.getConvertMoney(this.OtherPrice.KBMoney) +
           this.getConvertMoney(this.OtherPrice.VisaMoney) * this.getCurrencyMoney(
             this.OtherPrice.VisaMoneyCurrencyId
           );
-          // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
+        //KBMoney[团负费用减法]
+        // this.getConvertMoney(this.OtherPrice.AirTicketMoeny) +
         return totalMoney;
       },
       //获取系列列表
@@ -1266,10 +1337,10 @@
             that.getConvertMoney(x.OtherMoney)
           ).toFixed(0);
           //房餐车景点价格
-          var trip= Number(that.getLocalTotalMoney(x.PeopleNumber));
+          var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
           //其他价格
-          var otherPrice= Number(that.getCostTotalMoney()) 
-          x.TotalMoney = ( trip+otherPrice+
+          var otherPrice = Number(that.getCostTotalMoney())
+          x.TotalMoney = (trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           ).toFixed(0);
           // + that.getCurrencyNumberTotalMoney(x.PeopleNumber)

src/components/TravelManager/TravelNewQuotation/DirectNewQuotation.vue

@@ -116,10 +116,12 @@
           <div class="singlePrice clearfix">
             <CostNewPrice ref="CostNewPrice" :postConfig="postConfig" :OtherPrice="otherPrice"
               :dayCostPrice="dayCostPrice" :LineList="LineList" :CostCurrencyList="CostCurrencyList"
-              :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"></CostNewPrice>
+              :CostNumberList="CostNumberList" :CurrencyNumberListExt="CurrencyNumberListExt"
+              :teamPrice="teamPrice"
+              ></CostNewPrice>
           </div>
         </div>
-        <div class="DirectRightPrice" style="margin-left:20px; display:none">
+        <div class="DirectRightPrice" style="margin-left:20px; display:none;">
           <div class="dingjiaDiv">
             <span class="TMTitle"><i></i>定价</span>
             &nbsp;&nbsp;&nbsp;&nbsp;
@@ -179,53 +181,11 @@
                   <template slot="prepend">直客</template>
                 </el-input>
               </el-form-item>
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.BabyPrice"
-                  @keyup.native="checkInteger(teamPrice,'BabyPrice')" class="w200 ComSeat">
-                  <template slot="prepend">婴儿</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.SingleDMCPrice"
-                  @keyup.native="checkPrice(teamPrice,'SingleDMCPrice')" class="w200 ComSeat">
-                  <template slot="prepend">单地接</template>
-                </el-input>
-              </el-form-item>
             </div>
           </div>
           <div class="clearfix" v-show="IsShow">
             <div class="Dleftname">增收</div>
             <div class="DrightList" style="width:900px;">
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.ChildNeedPrice"
-                  @keyup.native="checkInteger(teamPrice,'ChildNeedPrice')" class="w200 ComSeat">
-                  <template slot="prepend">儿童占床</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.BabyChargePrice"
-                  @keyup.native="checkPrice(teamPrice,'BabyChargePrice')" class="w200 ComSeat">
-                  <template slot="prepend">儿童附加费</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.OldManChargePrice"
-                  @keyup.native="checkInteger(teamPrice,'OldManChargePrice')" class="w200 ComSeat">
-                  <template slot="prepend">老人附加费</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.VisaPrice" @keyup.native="checkPrice(teamPrice,'VisaPrice')"
-                  class="w200 ComSeat">
-                  <template slot="prepend">签证费</template>
-                </el-input>
-              </el-form-item>
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
-                  @keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w200 ComSeat">
-                  <template slot="prepend">单房差</template>
-                </el-input>
-              </el-form-item>
               <el-form-item>
                 <el-input placeholder="" v-model="teamPrice.SafeMoney" @keyup.native="checkPrice(teamPrice,'SafeMoney')"
                   class="w200 ComSeat">
@@ -243,13 +203,6 @@
           <div class="clearfix" v-show="IsShow">
             <div class="Dleftname">减免</div>
             <div class="DrightList">
-              <el-form-item>
-                <el-input placeholder="" v-model="teamPrice.ChildNoNeedPrice"
-                  @keyup.native="checkInteger(teamPrice,'ChildNoNeedPrice')" class="w200 ComSeat">
-                  <template slot="prepend">儿童不占床</template>
-                </el-input>
-              </el-form-item>
-
               <el-form-item style="display:none;">
                 <el-input placeholder="" v-model="teamPrice.RebatePrice"
                   @keyup.native="checkPrice(teamPrice,'RebatePrice')" class="w200 ComSeat">
@@ -262,7 +215,6 @@
                   <template slot="prepend">早鸟优惠</template>
                 </el-input>
               </el-form-item>
-
               <el-form-item>
                 <el-input placeholder="" v-model="teamPrice.BackVisaPrice"
                   @keyup.native="checkPrice(teamPrice,'BackVisaPrice')" class="w200 ComSeat">

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

 <style>
   @import "../../../assets/css/newTravelManager.css";
-  .BilldownLoadCommon input[type="checkbox"] + label::before {
-        content: "\A0";
-        display: inline-block;
-        width: 15px;
-        height: 15px;
-        margin-right: 5px;
-        border-radius: 4px;
-        background-color: white;
-        text-indent: .15em;
-        line-height: 15px;
-        color: white;
-        border: 1px solid #e95252;
+
+  .BilldownLoadCommon input[type="checkbox"]+label::before {
+    content: "\A0";
+    display: inline-block;
+    width: 15px;
+    height: 15px;
+    margin-right: 5px;
+    border-radius: 4px;
+    background-color: white;
+    text-indent: .15em;
+    line-height: 15px;
+    color: white;
+    border: 1px solid #e95252;
   }
-  .BilldownLoadCommon input[type="checkbox"]:checked + label::before {
-      content: "\2713";
-      background-color: #e95252;
+
+  .BilldownLoadCommon input[type="checkbox"]:checked+label::before {
+    content: "\2713";
+    background-color: #e95252;
   }
-  .BilldownLoadCommon input[type="checkbox"]{
-      position: absolute;
-      clip: rect(0, 0, 0, 0);
+
+  .BilldownLoadCommon input[type="checkbox"] {
+    position: absolute;
+    clip: rect(0, 0, 0, 0);
   }
-  .BilldownLoadCommon input[type="checkbox"]:focus + label::before {
-      box-shadow: none;
+
+  .BilldownLoadCommon input[type="checkbox"]:focus+label::before {
+    box-shadow: none;
+  }
+
+  .BilldownLoadCommon input[type="checkbox"]:disabled+label::before {
+    background-color: gray;
+    box-shadow: none;
+    color: #555;
   }
-  .BilldownLoadCommon input[type="checkbox"]:disabled + label::before {
-      background-color: gray;
-      box-shadow: none;
-      color: #555;
-	}
 
 </style>
 <template>
@@ -188,7 +193,6 @@
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
               </span>
-
               <span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
@@ -201,7 +205,7 @@
                   <i class="iconfont icon-shanchu"></i>
                 </el-tooltip>
               </span>
-              <span style="background:#85ce61; " class="opbd" @click="DownLoadFile(item)">
+              <span style="background:#85ce61; " class="opbd" @click="showDownLoad(item)">
                 <el-tooltip class="item" effect="dark" content="下载" placement="top-start" popper-class="max-w250">
                   <i class="iconfont icon-bb-xiazai"></i>
                 </el-tooltip>
@@ -232,32 +236,25 @@
           </tr>
           <tbody>
             <tr height="36">
-              <td width="50%"><input id="vshowA" type="checkbox" /><label for="vshowA">{{$t('fnc.jcxinxi')}}</label></td>
-              <td width="50%"><input id="vshowB" type="checkbox" /><label for="vshowB">{{$t('salesModule.FlighInfo')}}</label></td>
-            </tr>
-            <tr height="36">
-              <td><input id="vshowC" type="checkbox" /><label for="vshowC">{{$t('salesModule.TripSpecial')}}</label></td>
-              <td><input id="vshowD" type="checkbox" /><label for="vshowD">{{$t('salesModule.TripAP')}}</label></td>
+              <td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label for="IsShowTripPrice">行程报价<br/>(房、餐、车、门票)</label></td>
+              <td width="50%"><input id="vshowB" type="checkbox" /><label for="vshowB">内陆段交通部分</label></td>
             </tr>
             <tr height="36">
-              <td><input id="vshowE" type="checkbox" /><label for="vshowE">{{$t('fnc.fyshuoming')}}</label></td>
-              <td><input id="vshowF" type="checkbox" /><label for="vshowF">{{$t('salesModule.ShoppDetail')}}</label></td>
+              <td><input id="vshowC" type="checkbox" /><label for="vshowC">杂支部分</label></td>
+              <td><input id="vshowD" type="checkbox" /><label for="vshowD">其他支出</label></td>
             </tr>
             <tr height="36">
-              <td><input id="vshowG" type="checkbox" /><label for="vshowG">{{$t('salesModule.OrderKnow')}}</label></td>
-              <td><input id="vshowH" type="checkbox" /><label for="vshowH">{{$t('salesModule.VisaInfo')}}</label></td>
+              <td><input id="vshowE" type="checkbox" /><label for="vshowE">收入</label></td>
+              <td><input id="vshowF" type="checkbox" /><label for="vshowF">团付费</label></td>
             </tr>
             <tr height="36">
-              <td><input id="vshowI" type="checkbox" /><label for="vshowI">{{$t('salesModule.THBZ')}}</label></td>
-              <td><input id="vshowJ" type="checkbox" /><label for="vshowJ">{{$t('salesModule.YXBS')}}</label></td>
-            </tr>
-            <tr height="36">
-              <td><input id="vshowK" type="checkbox" /><label for="vshowK">{{$t('salesModule.JDTP')}}</label></td>
+              <td><input id="vshowE" type="checkbox" /><label for="vshowE">领队分摊</label></td>
+              <td><input id="vshowF" type="checkbox" /><label for="vshowF">成本统计</label></td>
             </tr>
           </tbody>
           <tr height="66">
             <td colspan="2" align="center">
-              <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" />
+              <input type="button" class="normalBtn" :value="$t('pub.sureBtn')" @click="DownLoadFile()" />
             </td>
           </tr>
         </table>
@@ -326,7 +323,13 @@
         CostList: [],
         outerVisible: false,
         tripTitle: "",
-        downloadBill:false
+        downloadBill: false,
+        //下载参数
+        downLoadMsg: {
+          ID: 0,
+          FileName:"",
+          IsShowTripPrice:true,//行程报价
+        },
       };
     },
     components: {
@@ -532,7 +535,7 @@
         });
       },
       //开团或修改
-      goToOpenTravel(path,item) {
+      goToOpenTravel(path, item) {
         if (item.ID > 0) {
           this.$router.push({
             name: path,
@@ -540,7 +543,7 @@
               configId: item.ID,
               openState: item.OpenState,
               isOffer: 1,
-              offerId:item.OfferId,
+              offerId: item.OfferId,
               blank: 'y'
             }
           });
@@ -550,13 +553,9 @@
           });
         }
       },
-      //报价单下载
-      DownLoadFile(item) {
-        // this.downloadBill=true;
-        this.loading = true;
-        var newMsg = {
-          ID: item.ID
-        };
+      //显示下载弹窗
+      showDownLoad(item) {
+        this.downLoadMsg.ID=item.ID;
         var fileName = "";
         if (item.CustomerName) {
           fileName += "【" + item.CustomerName + "】";
@@ -566,7 +565,14 @@
           fileName += "【" + item.LineName + "】";
         }
         fileName += "成本下载.xls";
-        this.GetLocalFile("quotation_get_DownLoadQuotation", newMsg, fileName, res => {
+        this.downLoadMsg.FileName=fileName;
+        this.downloadBill = true;
+      },
+      //报价单下载
+      DownLoadFile() {
+        this.downloadBill=false;
+        this.loading = true;
+        this.GetLocalFile("quotation_get_DownLoadQuotation", this.downLoadMsg, this.downLoadMsg.FileName, res => {
           this.loading = false;
         });
       },