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

src/components/FinancialModule/MonthlyCostStatement/TravelItinerary.vue

+<style scoped>
+  /deep/.el-table th.el-table__cell {
+    background-color: #E6E6E6;
+  }
+
+</style>
+
+<template>
+  <div class="page_fnDm page_RecPayQuery" @keyup.enter="resetPageIndex()">
+    <div class="query-box" style="margin-bottom: 0px;">
+      <el-form class="_info_box clearfix" label-width="110px">
+        <el-row style="padding:15px 20px 0 0;">
+            <el-col :span="5">
+              <el-form-item label="出团月份">
+                <el-date-picker class="h34" v-model="missionDate" @change="timeAdd()" type="monthrange" value-format="yyyy-MM">
+                </el-date-picker>
+              </el-form-item>
+            </el-col>
+        </el-row>
+      </el-form>
+      <ul class="clearfix">
+        <li class="hight_query">
+          <button class="hollowFixedBtn" @click="resetPageIndex()">{{$t('pub.searchBtn')}}</button>
+          <!-- <button class="normalBtn" @click="method5()">{{$t('visa.v_daochu')}}</button>           -->
+        </li>
+      </ul>
+    </div>
+    <div class="_fnDm_content" v-loading='loading'>
+      <el-table ref="multipleTable" :data="DataList" tooltip-effect="dark" style="width: 100%" row-key="FrID">        
+
+        <el-table-column prop="StartDate" label="月份" width="100">
+          <template slot-scope="scope">
+            {{scope.row.StartDate}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="AccountAlias" label="平台别名" width="260" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.AccountAlias}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="CardNum" label="卡号" width="260" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{scope.row.CardNum}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="TotalMoney" label="累计付款" width="260">
+          <template slot-scope="scope">
+            {{scope.row.TotalMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="InvoiceMoney" label="发票金额" width="260">
+          <template slot-scope="scope">
+            {{scope.row.InvoiceMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="ItineraryMoney" label="行程单金额" width="260">
+          <template slot-scope="scope">
+            {{scope.row.ItineraryMoney}}
+          </template>
+        </el-table-column>
+        <el-table-column prop="SurplusMoney" label="差额" width="260">
+          <template slot-scope="scope">
+            {{scope.row.SurplusMoney}}
+          </template>
+        </el-table-column>
+        
+        <el-table-column prop="" label="操作" show-overflow-tooltip>
+          <template slot-scope="scope">
+            <i class="el-icon-edit" style="cursor: pointer;" @click="showEdit(scope.row)"></i>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div style="padding-bottom:15px">
+        <el-pagination background @size-change="handleSizeChange" @current-change="handleCurrentChanges"
+          layout="total,sizes,prev, pager, next, jumper" :page-sizes="[100,200,300,400,500]" :page-size="msg.pageSize"
+          :current-page.sync="currentPage" :total='total'>
+        </el-pagination>
+      </div>
+    </div>
+
+
+    <el-dialog :title="addMsg.AccountAlias" :visible.sync="dialogFormVisible" width="400px" :close-on-click-modal="false">
+      <el-form :model="addMsg">
+        <el-form-item label="发票金额" label-width="120px">
+          <el-input v-model="addMsg.InvoiceMoney" autocomplete="off"></el-input>
+        </el-form-item>
+        <el-form-item label="行程单额" label-width="120px">
+          <el-input v-model="addMsg.ItineraryMoney" autocomplete="off"></el-input>
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="dialogFormVisible = false">取 消</el-button>
+        <el-button type="primary" @click="submitMoney()">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+<script>
+  import Vue from 'vue'
+  export default {
+    data() {
+      return {
+        msg: {
+          pageIndex: 1,
+          pageSize: 100,
+          StartDate: '',
+          EndDate: '',
+          EmployeeId: '',
+        },
+        DataList: [],
+        missionDate: [],
+        loading: false,        
+        currentPage: 1,
+        total: 0,
+        dialogFormVisible:false,
+        addMsg:{
+          AccountAlias:'',
+          StartDate:'',
+          ClientAccountId:0,
+          InvoiceMoney:0,
+          ItineraryMoney:0
+        }
+      }
+    },
+    created() {
+      if (this.$route.query.pageIndex) {
+        this.msg.pageIndex = this.$route.query.pageIndex;
+      }
+      var now = new Date();
+      let sDate = now.getFullYear()+'-'+ now.getMonth();
+      let eDate = sDate;
+      
+      this.missionDate = [sDate, eDate];
+      this.msg.StartDate = sDate;
+      this.msg.EndDate = eDate;
+    },
+    mounted() {
+      let userInfo = this.getLocalStorage();
+      this.msg.EmployeeId = userInfo.EmployeeId;
+      this.getPageList();
+    },
+    methods: {
+      // 单据详情
+      openDetails(FrID) {
+        let query = {
+          id: FrID,
+          blank: "y",
+        };
+        this.$router.push({
+          path: "/FinancialDocumentsDetail",
+          query
+        });
+      },
+      handleSizeChange(val) {
+        this.msg.pageSize = val
+        this.msg.pageIndex = 1;
+        this.getPageList();
+      },
+      handleCurrentChanges(val) {
+        this.msg.pageIndex = val;
+        this.getPageList();
+      },
+      getPageList() { // 获取列表数据
+        this.loading = true;
+        this.apipost('Financial_post_GetAirTravelItineraryPageList', this.msg, res => {
+          if (res.data.resultCode == 1) {
+            this.total = res.data.data.count;
+            if (this.total == 0) {
+              this.DataList = [];
+            } else {
+              this.DataList = res.data.data.pageData;
+            }
+            this.loading = false;
+          } else {
+            this.loading = false;
+            this.$message.error(res.data.message);
+          }
+          this.currentPage = parseInt(this.msg.pageIndex);
+        }, err => {})
+      },
+      method5: function () {
+        if (!this.msg.CreateBy) this.msg.CreateBy = 0;
+        let time = this.getBeforeDate(0, new Date().Format("yyyy-MM-dd"))
+        var fileName = `凭证编号${time}.xls`;
+        this.GetLocalFile("Financial_post_GetAccountVoucherNumberListToExcel", this.msg, fileName);
+      },
+      timeAdd() { // 日期格式
+          if (!this.missionDate) {
+            this.msg.StartDate = '';
+            this.msg.EndDate = '';
+            return
+          }
+          this.msg.StartDate = this.missionDate[0];
+          this.msg.EndDate = this.missionDate[1];
+      },
+      handleCurrentChange(val) { //翻页
+        this.msg.pageIndex = val;
+        this.getPageList();
+      },
+      resetPageIndex() { // 重置页码
+        this.msg.pageIndex = 1;
+        this.currentPage = 1;
+
+        this.getPageList()
+      },
+      showEdit(row){
+        this.addMsg.AccountAlias =row.AccountAlias;
+        this.addMsg.StartDate=row.StartDate;
+        this.addMsg.ClientAccountId=row.ClientAccountId;
+        this.addMsg.InvoiceMoney=row.InvoiceMoney;
+        this.addMsg.ItineraryMoney=row.ItineraryMoney;
+        this.dialogFormVisible=true;
+      },
+      submitMoney(){
+        this.apipost(
+            "Financial_post_SetAirTravelItinerary",
+            this.addMsg,
+            res => {
+              if (res.data.resultCode == 1) {
+                this.$message.success(res.data.message);
+                this.dialogFormVisible = false;
+                this.getPageList();
+              } else {
+                this.Error(res.data.message);
+              }
+              this.dialogFormVisible = false
+            },
+            err => {}
+          );
+      }
+    }
+  }
+
+</script>

src/components/Hotel/roomReservationsDetails.vue

@@ -844,22 +844,20 @@
         }, res => {
           if (res.data.resultCode == 1) {
             var objData = res.data.data;
+            var tipStr = "";
             //库存不够
             if (objData.isOverStock == 0) {
               if (objData.list && objData.list.length > 0) {
-                var str = "";
                 objData.list.forEach((cItem, cIndex) => {
-                  str += (cIndex == 0 ? "" : ",") + cItem.TCNUM + this.$t('objFill.shiyongle') + cItem
+                  tipStr += (cIndex == 0 ? "" : ",") + cItem.TCNUM + this.$t('objFill.shiyongle') + cItem
                     .LastUseNum + this.$t(
                       'hotel.hotel_room');
                 });
-                if (str != "") {
-                  this.Info(str);
               }
             }
+            if (tipStr != "") {
+              this.Info(tipStr);
             }
-            //库存充足或没有酒店库存的情况
-            else if (objData.isOverStock == 1 || objData.isOverStock == -1) {
             var tempOrderObj = this.dataList[this.findex].HotelOrderList[this.childIndex];
             if (tempOrderObj) {
               tempOrderObj.Address = ckedObj.Address;
@@ -889,9 +887,6 @@
             //关闭组件
             this.$refs[str][0].doClose();
           }
-          } else {
-            this.Error(this.$t('ground.qingqiucanscw'));
-          }
         }, err => {})
       },
       //酒店报价

src/components/LeaderManagement/leaderReimbursement.vue

@@ -52,7 +52,6 @@
     <p class="teamRevenueExpenditureTitle">
       {{$t('MarketingActi.car')}}
       <span class="fr" style="margin-top: -8px;">
-        
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
@@ -574,9 +573,9 @@
         <th width="80">{{$t('objFill.mianfeirenshu')}}</th>
         <th width="">{{$t('fnc.danjia')}}</th>
         <th width="">{{$t('objFill.jingexj')}}</th>
-        <th width="">{{$t('hotel.hotel_commission')}})</th>
+        <th width="">{{$t('hotel.hotel_commission')}}</th>
         <th width="">{{$t('fnc.a_zongjine')}}</th>
-        <th width="">{{$t('hotel.hotel_payType')}})</th>
+        <th width="">{{$t('hotel.hotel_payType')}}</th>
         <th width="">{{$t('hotel.hotel_Currency')}}</th>
         <th width="100">{{$t('pub.pubRemark')}}</th>
         <th width="110">{{$t('objFill.costdocument')}}</th>
@@ -1460,7 +1459,10 @@
       //用款计划下载
       downloadMoneyPlan() {
         var fileName = "test";
-        fileName += ".xls"
+        if (this.NewCombinationNum) {
+          fileName = this.NewCombinationNum;
+        }
+        fileName += "用款计划表.xls"
         this.loading = true;
         let userInfo = this.getLocalStorage();
         this.GetLocalFile("dmcstatistics_post_NewDownLoadGroupLeaderUserMoneyPlan", {
@@ -2348,7 +2350,7 @@
                     tempShowPrice = Math.round(tempShowPrice / 10000) * 10000;
 
                   } else {
-                    tempShowPrice =tempShowPrice;
+                    tempShowPrice = tempShowPrice;
                   }
                   //未领取，日本线 *0.95 在精确到万
                   if (isreceive == 0) {

src/components/Restaurant/bookDinnerStatisticsDetails.vue

@@ -9,6 +9,7 @@
     z-index: 10;
     border: 1px solid #d1d1d1;
   }
+
 </style>
 <template>
   <div>
@@ -46,8 +47,8 @@
             <th width="200">{{$t('ground.xiugaict')}}</th>
             <th width="80">{{$t('ground.leibie')}}</th>
             <th width="70">{{$t('ground.zongrenshu')}}</th>
-            <th width="70">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
-            <th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}</th>
+            <th width="100">{{$t('ground.yongcanren')}}<br />{{$t('advmanager.v_type')}}</th>
+            <th width="70">{{$t('commonPickUp.Pick_Ding')}}<br />{{$t('admin.admin_personNumber')}}/桌数</th>
             <th width="120">{{$t('Operation.Op_price')}}</th>
             <th width="90">{{$t('ground.mianrenshu')}}</th>
             <th width="90">{{$t('hotel.hotel_commission')}}</th>
@@ -61,10 +62,10 @@
           <template v-for="(item,index) in dinnerList">
             <template v-for="(subItem,subIndex) in item.DiningSummaryList">
               <tr v-for="(childItem,childIndex) in subItem.DiningPriceList" :key="`d_`+index+subIndex+childIndex">
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   {{item.UseTimeStr}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   <table class="dinnerTable">
                     <tr>
                       <td colspan="2">
@@ -93,13 +94,11 @@
                     </tr>
                   </table>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
-                  <el-select style="display:none;" class='w160 sel' v-model='subItem.NewDiningID' filterable
-                    :placeholder="$t('pub.pleaseSel')" @visible-change='getDingList(item)'
-                    @change='sendValue(subItem,item)'>
-                    <el-option v-for='itemHotel in item.DinnerList' :label='itemHotel.RealName' :value='itemHotel.ID'
-                      :key='itemHotel.ID'></el-option>
-                  </el-select>
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
+                  <template v-if="LineId==90">
+                    <el-input class='w100' v-model='subItem.BookName' type="text"></el-input>
+                  </template>
+                  <template v-else>
                     <template v-if="subItem.NewDiningRealName">
                       <span style="color:green">{{subItem.NewDiningRealName}}</span><br />
                     </template>
@@ -115,6 +114,7 @@
                         {{$t('ground.cantingxuanz')}}
                       </el-button>
                     </el-popover>
+                  </template>
                   <template v-if="subItem.DinnerOfferPrice&&subItem.DinnerOfferPrice>0">
                     <br />
                     <span style="font-weight:bold;font-size:14px;">{{$t('objFill.baojiacanting')}}:<font
@@ -136,17 +136,22 @@
                       </font></span>
                   </template>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   {{subItem.UseDinnerTypeStr}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="3" style="display:none;">
-                  {{subItem.MealName}}
-                </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   {{subItem.UseAccount}}
                 </td>
                 <td>
+                  <template v-if="LineId==90">
+                    <el-select v-model="subItem.BookStyle" :placeholder="$t('pub.pleaseSel')" class='w135 sel'>
+                      <el-option :value="0" label="按人数预定"></el-option>
+                      <el-option :value="1" label="按桌预定"></el-option>
+                    </el-select>
+                  </template>
+                  <template v-else>
                     {{personStrToWord(childItem.PeopleType)}}
+                  </template>
                 </td>
                 <td>
                   <template v-if="EditBtn||LineId==90">
@@ -183,13 +188,13 @@
                 <td>
                   {{(childItem.UsePeopleNum-childItem.Discount)*childItem.PeoplePrice}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   {{subItem.TotalPrice}}
                   <template v-if="subItem.NewTotalPrice">
                     <br /><span style="color:red;">{{subItem.NewTotalPrice}}</span>
                   </template>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   <table class="dinnerTable">
                     <tr>
                       <td width="70" style="text-align:right;">{{$t('hotel.hotel_Currency')}}：</td>
@@ -222,7 +227,7 @@
                         </el-select>
                       </td>
                     </tr>
-                    <tr>
+                    <tr v-if="LineId!=90">
                       <td width="60" style="text-align:right;">
                         {{$t('ground.dingcanfangs')}}：
                       </td>
@@ -249,7 +254,7 @@
                       </td>
                     </tr>
                     <template v-if="subItem.OrderState==1">
-                      <tr>
+                      <tr v-if="LineId!=90">
                         <td width="60" style="text-align:right;">
                           {{$t('salesModule.SureTime')}}：
                         </td>
@@ -259,7 +264,7 @@
                           </el-date-picker>
                         </td>
                       </tr>
-                      <tr>
+                      <tr v-if="LineId!=90">
                         <td width="60" style="text-align:right;">
                           {{$t('objFill.yuyuetime')}}：
                         </td>
@@ -289,7 +294,7 @@
                         <el-input class='w135' v-model='subItem.PayTypeTCNUM' type="text"></el-input>
                       </td>
                     </tr>
-                    <tr>
+                    <tr v-if="LineId!=90">
                       <td width="60" style="text-align:right;">
                         {{$t('ground.dingtuanhao')}}:
                       </td>
@@ -299,7 +304,7 @@
                     </tr>
                   </table>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.DiningPriceList.length">
                   <table class="dinnerTable">
                     <tr>
                       <td width="80" style="text-align:right;">{{$t('pub.pubRemark')}}：</td>
@@ -307,14 +312,6 @@
                         <el-input type='textarea' rows="6" class='w120' v-model='subItem.Remarks'></el-input>
                       </td>
                     </tr>
-                    <tr style="display:none;">
-                      <td width="80" style="text-align:right;">
-                        {{$t('ground.canpeibz')}}：
-                      </td>
-                      <td style="text-align:left;">
-                        <el-input type='textarea' rows="2" class='w120' v-model='subItem.DinnerRemark'></el-input>
-                      </td>
-                    </tr>
                   </table>
                 </td>
               </tr>

src/components/scenicSpot/admissionStatisticsDetails.vue

@@ -8,6 +8,7 @@
     top: 0;
     z-index: 10;
   }
+
 </style>
 <template>
   <div>
@@ -59,10 +60,10 @@
           <template v-for="(item,index) in DataList">
             <template v-for="(subItem,subIndex) in item.ScenicStatisticsList">
               <tr v-for="(childItem,childIndex) in subItem.TicketPriceList" :key="`s_`+index+subIndex+childIndex">
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                   {{item.UseTimeStr}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                   <table class="scenicTable">
                     <tr>
                       <td colspan="2" style="text-align:left;padding-left:8px;">
@@ -108,7 +109,7 @@
                     </span>
                   </template>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                   {{subItem.UseAccount}}
                 </td>
                 <td>
@@ -154,10 +155,10 @@
                     <span v-if='childItem.DiscountPrice!=0'>{{childItem.DiscountPrice}}%</span>
                   </template>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                   {{subItem.TotalPrice}}
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                   <table class="scenicTable">
                     <tr>
                       <td width="60" style="text-align:right;">
@@ -196,7 +197,7 @@
                     </tr>
                   </table>
                 </td>
-                <td v-if="childIndex==0" :rowspan="3">
+                <td v-if="childIndex==0" :rowspan="subItem.TicketPriceList.length">
                   <el-input type='textarea' rows="4" class='w170' v-model='subItem.Remarks'></el-input>
                 </td>
               </tr>
@@ -261,13 +262,26 @@
       }
     },
     methods: {
-      personStrToWord(str) {
-        if (str == 1)
-          return this.$t('objFill.darens')[0]
-        if (str == 2)
-          return this.$t('objFill.darens')[1]
-        if (str == 3)
-          return this.$t('objFill.xiaoren')
+      personStrToWord(PeopleType) {
+        var resultStr = "";
+        if (this.LineId == 90) {
+          if (PeopleType == 1) {
+            resultStr = "门票";
+          } else if (PeopleType == 2) {
+            resultStr = "小交通";
+          } else if (PeopleType == 3) {
+            resultStr = "";
+          }
+        } else {
+          if (PeopleType == 1) {
+            resultStr = this.$t('objFill.darens')[0];
+          } else if (PeopleType == 2) {
+            resultStr = this.$t('objFill.darens')[1];
+          } else if (PeopleType == 3) {
+            resultStr = this.$t('objFill.xiaoren');
+          }
+        }
+        return resultStr;
       },
       //页面跳转[小写]
       goUrlT(path, obj, title) {
@@ -329,6 +343,7 @@
           this.loading = false;
           if (res.data.resultCode == 1) {
             this.DataList = res.data.data.ScenicList;
+
             this.IsOperation = res.data.data.IsOperation;
             this.calculationPrice();
           } else {
@@ -398,7 +413,6 @@
       this.GuestNum = this.$route.query.GuestNum;
       this.getList();
       this.getCurrencyList();
-
       let height = window.innerHeight - 65 - 55;
       this.boxHeight = height;
     },

src/router/config.js

@@ -4346,6 +4346,14 @@ export default {
                 title: '凭证编号查询'
               },
             },
+            { //财务 团队发票/行程单维护
+              path: '/TravelItinerary',
+              name: 'TravelItinerary',
+              component: resolve => require(['@/components/FinancialModule/MonthlyCostStatement/TravelItinerary'], resolve),
+              meta: {
+                title: '机票行程单'
+              },
+            },
             { //财务 财务单据 帮收帮付公司
               path: '/HelpBranch',
               name: 'HelpBranch',