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

src/assets/utils/AuthCode.js

@@ -31,5 +31,6 @@ var AuthCode = {
     S_Travel_AirLoss:'S_Travel_AirLoss', //设为损失
     S_CheckAllOrder:'s_CheckAllOrder', //查看所有订单
     F_EditDeleteGuest:"F_EditDeleteGuest",//修改删除旅客和名单权限
+    LookPlatformAccountPwd:"LookPlatformAccountPwd",//查看平台账户密码权限
 };
 export default AuthCode;
\ No newline at end of file

src/components/FinancialModule/PlatformAccountExamine.vue

+<template>
+  <div>
+    <PlatformAccount :pagesTitle="pagesTitle"></PlatformAccount>
+  </div>
+</template>
+<script>
+  import PlatformAccount from './PlatformAccount/index.vue';
+  export default {
+    components: { PlatformAccount },
+    data() {
+      return {
+        pagesTitle:'平台账户',
+      };
+    },
+    methods: {
+
+    }
+  };
+
+</script>
+<style scoped>
+
+
+</style>

src/components/LeaderManagement/leaderReimbursement.vue

@@ -804,7 +804,6 @@
       </span>
     </p>
     <table class="leaderReimbursementTable" border="0" cellspacing="1" cellpadding="0">
-
       <tr>
         <th width="10%">单号</th>
         <th width="10%">费用说明</th>
@@ -923,9 +922,13 @@
                 </span>
               </p>
               <el-input class="w300" v-if="leadr.LeaderGetPrice < leadr.PlanPrice" type="number"
-                v-model="leadr.LeaderGetPriceT"></el-input>
+                v-model="leadr.LeaderGetPriceT" @input="changePrice"></el-input>
+
+              <el-input class="w300" style="display:none;" type="number" v-model="leadr.LeaderGetPriceT"
+                @input="changePrice"></el-input>
             </template>
           </div>
+          <span style="color:red;font-weight:bold;">合团的请分别领款!</span>
         </td>
         <td>
           <p v-for="(subItem, subIndex) in item.FinanceIds"><span class="cursorpointer text-decoration"
@@ -1055,7 +1058,6 @@
     </div>
   </div>
 </template>
-
 <script>
   import commonHotelInfo from "../commonPage/commonHotelInfo.vue";
   import {
@@ -1131,6 +1133,9 @@
       commonHotelInfo
     },
     methods: {
+      changePrice() {
+        this.$forceUpdate();
+      },
       getTips(x) {
         let title = `付款账号：${x.AccountNumber},原币：${String(x.WBMoney)}`
         let text = []
@@ -1219,7 +1224,6 @@
         let TCIDARR = []
         let id = [];
         if (this.msgList && this.msgList.length > 0 && this.msgList[0].LineId == this.myLineId) {
-
           if (_orderSource === 1 && _type === 2) {
             id = [94]
           } else if (_orderSource === 2 && _type === 2) {
@@ -1232,7 +1236,6 @@
             id = [97]
           }
         } else {
-
           // _orderSource 1 酒店   2餐厅   5 车资
           if (_orderSource === 1 && _type === 2) {
             id = [51, 52, 245, 246, 255]
@@ -1474,7 +1477,7 @@
         if (obj.LineId == this.LineId) {
           id = [98, 99];
         } else {
-          id = [43, 48,56, 53, 245, 246];
+          id = [43, 48, 56, 53, 245, 246];
           // if (obj.OutBranchId === 0) {
           //   id = [43, 48, 245, 246];
           // } else {
@@ -2128,7 +2131,6 @@
         }
         return this.moneyFormat(money)
       },
-
     },
     mounted() {
       this.isUpdate = this.$route.query.isUpdate;
@@ -2346,7 +2348,6 @@
     padding: 10px;
   }
 
-  /* tr._t_head th{border-top: 1px solid #e5e5e5;} */
   tr._item_list td:first-child {
     border-left: 1px solid #e5e5e5;
   }

src/components/confirmationOrderDownLoadNew.vue

@@ -52,7 +52,7 @@
         text-align: center;
         border-radius: 4px;
         cursor: pointer;
-        margin-left: 20px;" @click="toPDF_2023(orderMsg.startDate + orderMsg.lineteamName+orderMsg.dayNum+'日游')">
+        margin-left: 20px;" @click="toPDF_2023()">
           {{orderId>0?"出团通知书下载":"行程下载"}}
         </div>
         <div class="el-dropdown-link" style="height: 30px;
@@ -531,10 +531,14 @@
         })
       },
       // 生成pdf
-      toPDF_2023: function (title) {
+      toPDF_2023: function () {
         this.pdfLoading = true;
         let urlObj = this.domainManager();
         let msg = this.getPostMsg();
+        var title = "";
+        if (this.dataAll && this.dataAll.title) {
+          title = this.dataAll.title;
+        }
         var fileName = title + "_2023.pdf";
         if (this.orderId && this.orderId > 0) {
           //出团通知书下载

src/components/leaderPay2.vue

@@ -847,12 +847,12 @@
             </p>
           </td>
           <td width="80" class="_zhidan">
-            <input v-if="TimeXiao" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
-            <input v-else-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
+            <!-- <input v-if="TimeXiao" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)"> -->
+            <input v-if="dataList.LeaderApply && dataList.LeaderApply.Status && dataList.LeaderApply.Status==2"
               type="button" value="地接费结算制单" style="" class="leader2Btn" @click="goZhiDan(item)">
             <span v-else style="color:red">请在APP中提交实际用款详情信息</span>
 
-            <input style="display:none;" type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
+            <input  type="button" value="地接费结算制单" class="leader2Btn" @click="goZhiDan(item)">
             <input style="margin-top:15px" v-if="item.FinanceIds && item.FinanceIds.length>0" type="button" value="退款制单"
               class="leader2Btn" @click="gofzZd(item)">
           </td>

src/components/newTravelmanager/TravelGroupControl/TravelManager2.vue

@@ -463,7 +463,6 @@
         }
         basicData.TeamType = this.TeamType;
         basicData.IsUpdateHotel = this.PostConfig.IsUpdateHotel;
-        console.log("travel_post_SetTravelConfigInfo", basicData);
         this.isSubmit = false;
         this.apipost(
           "travel_post_SetTravelConfigInfo",
@@ -705,7 +704,6 @@
             "travel_get_GetTravelConfigMakeInfo",
             msg,
             res => {
-              console.log("travel_get_GetTravelConfigMakeInfo", res.data);
               if (res.data.resultCode == 1) {
                 var tempData = res.data.data;
                 if (tempData.Feature != null) {

src/components/scenicSpot/reservation/OrderList.vue

@@ -1197,7 +1197,7 @@
       },
       OrderList: {
         handler(val, oldVal) {
-          console.log(val, '------');
+          
         }
       }
     },

src/router/config.js

@@ -3834,6 +3834,13 @@ export default {
               meta: {
                 title: '平台账户'
               },
+            },{ //财务 审核平台账户
+              path: '/PlatformAccountExamine',
+              name: 'PlatformAccountExamine',
+              component: resolve => require(['@/components/FinancialModule/PlatformAccountExamine'], resolve),
+              meta: {
+                title: '审核平台账户'
+              },
             }, { //财务 现金账户
               path: '/CashAccount',
               name: 'CashAccount',