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

src/components/LeaderManagement/leaderReimbursement.vue

@@ -37,12 +37,13 @@
     </table>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
       <tr>
-        <th colspan="16" class="bgwhite">车辆使用</th>
+        <th colspan="17" class="bgwhite">车辆使用</th>
       </tr>
       <tr class="title">
         <th width="100">使用时间</th>
         <th width="80">司机姓名</th>
         <th width="80">司机电话</th>
+         <th width="80">车辆大小</th>
         <th width="100">车配号</th>
         <th width="100">车辆号</th>
         <th width="60">用车方式</th>
@@ -61,6 +62,7 @@
         <td>{{item.PlanDateStr}}</td>
         <td>{{item.DriverName}}</td>
         <td>{{item.DriverTel}}</td>
+        <td>{{item.BusPriceUseNum?item.BusPriceUseNum+"座":""}}</td>
         <td>{{item.BusCode}}</td>
         <td>{{item.BusNum}}</td>
         <td>

src/components/Restaurant/RestaurantSalesBoard.vue

@@ -212,6 +212,7 @@
         </li>
         <li style="margin-right:50px;">
           <button class="normalBtn" type="button" @click="GetHoltelInventory()">{{$t('pub.searchBtn')}}</button>
+          <button class="normalBtn" type="button" @click="DownLoadDinnerSalesBoard()" style="display:none;">下载</button>
         </li>
       </ul>
     </div>
@@ -385,7 +386,23 @@
           err => {}
         );
       },
-     
+      //下载餐厅统计
+      DownLoadDinnerSalesBoard() {
+        if (this.msg.DiningID <= 0) {
+          this.Info("请选择餐厅!");
+          return;
+        }
+        this.msg.loading = true;
+        let qMsg = {
+          queryMsg: this.msg,
+          uid: this.getLocalStorage().EmployeeId
+        };
+        let fileName = "餐厅下载" + this.$commonUtils.getCurrentDate() + ".xls";
+        this.GetLocalFile("dinner_get_downloadDinnerSalesBoard", qMsg, fileName,
+          res => {
+            this.msg.loading = false;
+          });
+      }
     },
     mounted() {
       //初始化日历

src/components/dmc/manager/dmcTotalTable.vue

@@ -283,7 +283,7 @@
               </td>
               <td>
                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
-                  @click="DownLoadGuestList(item,outItem,index)">旅客名单</a>
+                  @click="DownLoadGuestList(item,outItem,index)">出境名单</a>
               </td>
               <td>
                 <div class="fz16 fbold linkspan">

src/components/leaderPay2.vue

@@ -1091,7 +1091,7 @@ export default {
       }, null)
     },
     goZhiDan: function(obj) { 
-      let id = [59];
+      let id = [59,63];
       let TCIDARR = [obj.TCIDS];
       let orderObj = {
         OrderID: 0,

src/components/personalCenter/index.vue

@@ -102,6 +102,7 @@
           <div class="per-tab">
             <table>
               <thead>
+                <th>别名</th>
                 <th>户名</th>
                 <th>开户行</th>
                 <th>账号</th>
@@ -112,6 +113,7 @@
               </thead>
               <tbody>
                 <tr v-for="(item, index) in rList" :key="index">
+                  <td class="bold">{{item.Alias}}</td>
                   <td class="blue bold">{{item.AccountName}}</td>
                   <td class="bold">{{item.OpeningBank}}</td>
                   <td>{{item.BackNo | PNumber}}</td>
@@ -292,7 +294,6 @@ export default {
         this.RLoading=true;
         this.apipost('Financial_post_GetFinanceRemittanceClaimPageList', msg, res => {
             this.RLoading=false;
-            console.log("res",res)
             if(res.data.resultCode == 1) {
                 this.rList = res.data.data.pageData;
             } else {

src/components/systemManagement/Manfunds.vue

@@ -190,6 +190,7 @@
           
            <table class="po_content singeRowTable" style="border:1px solid #E6E6E6;" cellspacing="0" cellpadding="0" v-loading="loading">
                 <tr>
+                    <th>别名</th>
                     <th>户名</th>
                     <th>开户行</th>
                     <th>账号</th>
@@ -203,6 +204,7 @@
                     <th>操作</th>
                 </tr>
                 <tr v-for="(item,index) in DataList" :key="index">
+                    <td>{{item.Alias}}</td>
                     <td>{{item.AccountName}}</td>
                     <td>{{item.OpeningBank}}</td>
                     <td>{{item.BackNo}}</td>

src/components/systemManagement/Maninfo.vue

@@ -187,7 +187,7 @@
                     <th>支</th>
                 </tr>
                 <tr v-for="(item,index) in DataList" :key="index">
-                    <td>{{item.OpeningBank}}</td>
+                    <td>{{item.Alias}}</td>
                     <td>{{item.AccountName}}</td>
                     <td>{{item.OpeningBank}}</td>
                     <td>{{item.BackNo | PNumber}}</td>