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

src/components/Hotel/SupplierHandFee.vue

+<style>
+  .SupplierTable td{
+    padding:0 5px;
+    text-align: center!important;
+  }
+</style>
 <template>
   <div class="flexOne SupplierHandeFee">
     <div class="query-box">
       <ul class="user_time_picker">
         <li>
           <span>
-            <em>{{$t('hotel.hotel_StartDate')}}</em>
-            <el-date-picker type="date" v-model="msg.StartDate" :picker-options="pickerBeginDateBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
-          </span>
-        </li>
-        <li>
-          <span>
-            <em>{{$t('hotel.hotel_EndDate')}}</em>
-            <el-date-picker type="date" v-model="msg.EndDate" :picker-options="pickerBeginDateBefore"
-              value-format="yyyy-MM-dd" placeholder></el-date-picker>
+            <em>月份</em>
+            <el-date-picker v-model="msg.QMonthStr" type="month" value-format="yyyy-MM"
+              :placeholder="$t('ground.xuanzenian')">
+            </el-date-picker>
           </span>
         </li>
         <li>
@@ -28,20 +28,24 @@
         </li>
         <li>
           <input type="button" class="hollowFixedBtn" value="查询" @click="getSearch()"> &nbsp;
-          <input type="button" class="normalBtn" value="下载">
+          <input type="button" class="normalBtn" value="下载" @click="DownLoadFile()">
         </li>
       </ul>
     </div>
     <div class="clearfix"></div>
-    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+    <table class="singeRowTable SupplierTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th width="150">做账主体</th>
-        <th width="170">团号</th>
+        <th width="130">做账主体</th>
+        <th width="180">团号</th>
         <th width="150">手配定团号</th>
-        <th width="120">订单人数</th>
-        <th width="120">单价（日元）</th>
-        <th>泊数/日期</th>
-        <th width="170">小计</th>
+        <th width="80">订单人数</th>
+        <th width="100">单价(日元)</th>
+        <th width="300">泊数/日期</th>
+        <th width="120">小计(日元)</th>
+        <th width="100">汇率</th>
+        <th width="100">小计(人民币)</th>
+        <th width="150">单号</th>
+        <th width="80">生成单据</th>
       </tr>
       <tbody v-for="(item,index) in dataList" :key="index">
         <template v-for="(subItem,subIndex) in item.SubList">
@@ -51,12 +55,26 @@
             <td v-if="subIndex==0" :rowspan="item.SubList.length">{{item.DMCNum}}</td>
             <td>{{subItem.GuestNum}}</td>
             <td>{{subItem.UnitPrice}}</td>
-            <td>
+            <td style="text-align:left!important;">
               <span style="color:red;">{{subItem.DayCount}}泊</span>
               <br />
               {{subItem.UseTime}}
             </td>
             <td>{{subItem.SubtotalMoney}}</td>
+            <td>
+              <template v-if="subItem.Frids!=''">{{subItem.Rate}}</template>
+            </td>
+            <td>
+              <template v-if="subItem.Frids!=''"> {{subItem.RMBMoney}}</template>
+            </td>
+            <td>
+              {{subItem.Frids}}
+            </td>
+            <td v-if="subIndex==0" :rowspan="item.SubList.length">
+              <el-tooltip class="item" effect="dark" content="生成单据" placement="top-start">
+                <el-button type="success" icon="el-icon-check" circle @click="CreateSupplierBill(item)"></el-button>
+              </el-tooltip>
+            </td>
           </tr>
         </template>
       </tbody>
@@ -76,9 +94,8 @@
       return {
         //请求
         msg: {
-          StartDate: "2020-01-01",
-          EndDate: "2020-01-31",
-          Supplier: 30,
+          QMonthStr: "",
+          Supplier: 0,
           PageIndex: 1,
           PageSize: 15,
         },
@@ -86,57 +103,70 @@
         currentPage: 1,
         total: 0,
         dataList: [],
-
         //供应商
         SupplierList: [],
-        pickerBeginDateBefore: {
-          disabledDate: time => {
-            if (this.msg.EndDate == null) {
-              return false;
-            } else {
-              let endTime = new Date(this.msg.EndDate)
-              return endTime.getTime() < time.getTime()
-            }
-          }
-        },
-        pickerBeginDateAfter: {
-          disabledDate: time => {
-            let startTime = new Date(this.msg.StartDate)
-            return startTime.getTime() >= time.getTime()
-          }
-        },
       }
     },
     mounted() {
       this.initSupplier();
-      this.getList();
+      //this.getList();
     },
     filters: {},
     methods: {
-      //点击查询
-      getSearch() {
-        var isA, isB, isC
+      //生成手配费单据
+      CreateSupplierBill(item) {
+        var that = this;
+        this.Confirm("是否要生成财务单据?", function () {
+          that.loading = true;
+          that.apipost("dmcstatistics_get_CreateDmcSupplierHotelBillService", {
+              TCID: item.TCIDS,
+              Supplier:that.msg.Supplier,
+              QMonthStr:that.msg.QMonthStr,
+            },
+            res => {
+              that.loading = false;
+              if (res.data.resultCode == 1) {
+                that.Success('生成单据成功!');
+                that.getList();
+              } else {
+                that.Error(res.data.data);
+              }
+            }, null);
+        });    
+      },
+      //报价单下载
+      DownLoadFile() {
+        if (this.msg.QMonthStr == '' || this.msg.QMonthStr == null) {
+          this.Error('请选择月份');
+          return;
+        }
         if (this.msg.Supplier == 0) {
           this.Error('请选择供应商');
-          isA = false
-        } else {
-          isA = true;
-        }
-        if (this.msg.StartDate == '' || this.msg.StartDate == null) {
-          this.Error('请选择开始日期');
-          isB = false
-        } else {
-          isB = true;
+          return;
         }
-        if (this.msg.EndDate == '' || this.msg.EndDate == null) {
-          this.Error('请选择结束日期');
-          isC = false
-        } else {
-          isC = true;
+        var SupplierName = ''
+        this.SupplierList.forEach(x=>{
+          if(this.msg.Supplier==x.ID){
+            SupplierName=x.Name
+          }
+        })
+        var fileName = SupplierName + this.msg.QMonthStr+".xls";
+        this.loading = true;
+        this.GetLocalFile("dmc_get_DowmLoadDmcSupplierHote", this.msg, fileName, res => {
+          this.loading = false;
+        });
+      },
+      //点击查询
+      getSearch() {
+        if (this.msg.QMonthStr == '' || this.msg.QMonthStr == null) {
+          this.Error('请选择月份');
+          return;
         }
-        if (isA && isB && isC) {
-          this.getList();
+        if (this.msg.Supplier == 0) {
+          this.Error('请选择供应商');
+          return;
         }
+        this.getList();
       },
       //获取数据
       getList() {
@@ -146,7 +176,6 @@
           res => {
             this.loading = false;
             if (res.data.resultCode == 1) {
-              console.log(res.data.data.pageData, 'resss');
               this.dataList = res.data.data.pageData;
               this.total = res.data.data.count
             } else {
@@ -163,7 +192,8 @@
       // 获取供应商
       initSupplier() {
         this.apipost("supplier_post_GetAllList", {
-          Type: 1
+          Type: 1,
+          Country: 651, //日本供应商
         }, res => {
           if (res.data.resultCode === 1) {
             this.SupplierList = res.data.data;

src/components/TravelManager/TravelList/oneDayTrip.vue

@@ -901,6 +901,7 @@
               this.queryMsg.TCID = "";
             }
             if (res.data.resultCode == 1) {
+              console.log("res.data.data.pageData",res.data.data.pageData);
               this.queryCommonData.dataList = res.data.data.pageData
               this.queryMsg.total = res.data.data.count
               this.queryMsg.noData = !this.queryMsg.total > 0

src/components/newTravelmanager/oldTravelGroupControl/TravelManager5.vue

@@ -41,9 +41,9 @@
         <TravelNotice ref="TravelNotice" id="fourAnchor" @headCallBack="getNotice" :subArray="NoticeParameters"
           :NoticeData="NoticeData" v-bind:PostConfig="PostConfig" v-bind:AllCityList="AllCityList"
           v-bind:CountryID="PostConfig.CountryID"></TravelNotice>
-
-        <TravelPrice2 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
-          :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid" :TeamType="TeamType"></TravelPrice2>
+        <TravelPrice3 ref="TravelPrice" id="fiveAnchor" @headCallBack="getPrice" :PostDaysTrip="PostDaysTrip"
+          v-if="TeamType==2" :priceList="PriceList" :PostConfig="PostConfig" :modifyTcid="modifyTcid"
+          :TeamType="TeamType"></TravelPrice3>
         <div class="btnFixedDiv">
           <div class="toTop" @click="backTop">
             <i class="iconfont icon-huidaodingbu"></i>
@@ -73,7 +73,7 @@
   import TravelDaysTripDirect from '../oldTravelGroupControl/TravelDaysTrip_Direct'
   import TravelFeature from '../TravelGroupControl/TravelFeature'
   import TravelNotice from '../TravelGroupControl/TravelNotice'
-  import TravelPrice2 from '../TravelGroupControl/TravelPrice2'
+  import TravelPrice3 from '../TravelGroupControl/TravelPrice3'
 
   import TravelMap from '../oldTravelGroupControl/TravelMap'
 
@@ -214,7 +214,7 @@
       TravelDaysTripDirect: TravelDaysTripDirect,
       TravelFeature: TravelFeature,
       TravelNotice: TravelNotice,
-      TravelPrice2: TravelPrice2,
+      TravelPrice3: TravelPrice3,
       TravelMap: TravelMap
     },
     methods: {
@@ -383,6 +383,7 @@
         }
         basicData.TeamType = this.TeamType
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel
+        console.log("basicData",basicData);
         this.apipost(
           'travel_post_SetTravelConfigInfo',
           basicData,

src/components/newTravelmanager/oldTravelGroupControl/trifficTrip.vue

@@ -85,7 +85,7 @@
       <div class="TDplanList TDRightPlan" v-if='subItemObj.childItem.IsUseBus===CheckedVaule'>
         <div class="useCarPlan"><label>{{$t('sm.yongchejihua')}}</label>
           <span v-if="index==0" :class="{'ListCked':subItemObj.childItem.AirportPickUp==1}"
-            @click="changeAirportType(1)">{{AirPickUp}}</span>
+            @click="changeAirportType(1)">接早</span>
           <span v-if="index==DayList.length-1" :class="{'ListCked':subItemObj.childItem.AirportPickUp==2}"
             @click="changeAirportType(2)">{{AirSend}}</span>
         </div>