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

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"]:checked+label::before {
+    content: "\2713";
+    background-color: #e95252;
+  }
+
+  .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"]:disabled+label::before {
+    background-color: gray;
+    box-shadow: none;
+    color: #555;
+  }
+  .BilldownLoadCommon table td{
+    text-align: left;
+  }
 </style>
 <template>
   <div class="flexOne quoTation">
@@ -159,7 +195,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">
@@ -172,7 +207,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>
@@ -191,6 +226,54 @@
     <el-dialog custom-class='ComTeamPlan_info_box' :title="tripTitle" :visible.sync="outerVisible" center>
       <commonTeamInfo ref="comDialog"></commonTeamInfo>
     </el-dialog>
+
+    <!-- 下载弹窗 -->
+    <el-dialog custom-class='w450' title="报价单下载" :visible.sync="downloadBill" center>
+      <div class="BilldownLoadCommon">
+        <table style="width:380px;margin-left:44px;" border="0" cellspacing="0" cellpadding="0">
+          <tr>
+            <th colspan="2" style="height:50px;">
+              <span style="margin-left:-60px;">{{$t('salesModule.ChoiceNeed')}}</span>
+            </th>
+          </tr>
+          <tbody>
+            <tr height="36">
+              <td width="50%"><input id="IsShowTripPrice" type="checkbox" v-model="downLoadMsg.IsShowTripPrice" /><label
+                  for="IsShowTripPrice">行程报价<br />(房、餐、车、门票)</label></td>
+              <td width="50%"><input id="IsShowTraffic" type="checkbox" v-model="downLoadMsg.IsShowTraffic" /><label
+                  for="IsShowTraffic">内陆段交通部分</label></td>
+            </tr>
+            <tr height="36">
+              <td><input id="IsShowZaZhi" type="checkbox" v-model="downLoadMsg.IsShowZaZhi" /><label
+                  for="IsShowZaZhi">杂支部分</label></td>
+              <td><input id="IsShowOtherZhichu" type="checkbox" v-model="downLoadMsg.IsShowOtherZhichu" /><label
+                  for="IsShowOtherZhichu">其他支出</label></td>
+            </tr>
+            <tr height="36">
+              <td><input id="IsShowShouRu" type="checkbox" v-model="downLoadMsg.IsShowShouRu" /><label
+                  for="IsShowShouRu">收入</label></td>
+              <td><input id="IsShowTuanFuFee" type="checkbox" v-model="downLoadMsg.IsShowTuanFuFee" /><label
+                  for="IsShowTuanFuFee">团负费</label></td>
+            </tr>
+            <tr height="36">
+              <td><input id="IsShowLeaderFenTan" type="checkbox" v-model="downLoadMsg.IsShowLeaderFenTan" /><label
+                  for="IsShowLeaderFenTan">领队分摊</label></td>
+              <td><input id="IsShowCost" type="checkbox" v-model="downLoadMsg.IsShowCost" /><label
+                  for="IsShowCost">成本统计</label></td>
+            </tr>
+            <tr height="36">
+              <td><input id="IsShowOtherPrice" type="checkbox" v-model="downLoadMsg.IsShowOtherPrice" /><label
+                  for="IsShowOtherPrice">其他定价</label></td>
+            </tr>
+          </tbody>
+          <tr height="66">
+            <td colspan="2" style="text-align:center;">
+              <input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')" @click="DownLoadFile()" />
+            </td>
+          </tr>
+        </table>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -253,7 +336,22 @@
         SalesPriceList: [],
         CostList: [],
         outerVisible: false,
-        tripTitle: ""
+        tripTitle: "",
+        downloadBill: false,
+        //下载参数
+        downLoadMsg: {
+          ID: 0,
+          FileName: "",
+          IsShowTripPrice: true, //行程报价
+          IsShowTraffic: false, //交通价格
+          IsShowZaZhi: false, //杂支部分
+          IsShowOtherZhichu: false, //其他支出
+          IsShowShouRu: false, //收入部分
+          IsShowTuanFuFee: false, //团负费
+          IsShowLeaderFenTan: false, //领队分摊
+          IsShowCost: false, //成本统计
+          IsShowOtherPrice: false, //其他定价
+        },
       };
     },
     components: {
@@ -459,7 +557,7 @@
         });
       },
       //开团或修改
-      goToOpenTravel(path,item) {
+      goToOpenTravel(path, item) {
         if (item.ID > 0) {
           this.$router.push({
             name: path,
@@ -467,7 +565,7 @@
               configId: item.ID,
               openState: item.OpenState,
               isOffer: 1,
-              offerId:item.OfferId,
+              offerId: item.OfferId,
               blank: 'y'
             }
           });
@@ -477,12 +575,9 @@
           });
         }
       },
-      //报价单下载
-      DownLoadFile(item) {
-        this.loading = true;
-        var newMsg = {
-          ID: item.ID
-        };
+      //显示下载弹窗
+      showDownLoad(item) {
+        this.downLoadMsg.ID = item.ID;
         var fileName = "";
         if (item.CustomerName) {
           fileName += "【" + item.CustomerName + "】";
@@ -492,7 +587,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;
         });
       },