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

src/components/FinancialModule/addReceivablesDocuments.vue

@@ -990,7 +990,7 @@ export default {
                     }
                     if (x.Type===4){
                       AccList.forEach(y=>{
-                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池'){
+                        if(y.Name === '公社资金池' || y.Name === '水口资金池' || y.Name === '橡胶资金池' || y.Name=='地接部专户'){
                           newAccList.push(y)
                         }
                       })

src/components/TravelManager/TravelList/RegistrationList.vue

@@ -1404,35 +1404,7 @@
               <p class="fz12 over_ellipsis" style="width: 90%;">领队控位</p>
             </td>
             <td>
-              <!-- <el-popover style='padding: 0;' width="470" trigger="click"> -->
-                <!-- <div class="personNolayer">
-                  <p>
-                    <span>成人：{{item.ManNum}}人</span>
-                    <span>儿童：{{item.ChirdNum}}人</span>
-                    <span>老人：{{item.OldPeopleNum}}人</span>
-                    <span>婴儿：{{item.BabyNum}}人</span>
-                    <span>单地接：{{item.AirticketNum}}人</span>
-                  </p>
-                  <table border="0" cellspacing="1" cellpadding="1">
-                    <tr>
-                      <th>姓名</th>
-                      <th>护照</th>
-                      <th>性别</th>
-                      <th>年龄</th>
-                      <th width="110">联系电话</th>
-                    </tr>
-                    <tr v-if='item.GuestList.length>0' v-for="(item2,index2) in item.GuestList" :key="index2">
-                      <td>{{item2.userName}}</td>
-                      <td>{{item2.passportNo}}</td>
-                      <td>{{item2.sexStr}}</td>
-                      <td>{{item2.age}}</td>
-                      <td>{{item2.mobilePhone}}</td>
-                    </tr>
-                    <tr v-if='item.GuestList.length==0'>
-                      <td colspan="5" align="center">暂无数据</td>
-                    </tr>
-                  </table>
-                </div> -->
+
                 <span v-if='item.GuestNumStatus==1' style="color:#1AA86B; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
                 <span v-if='item.GuestNumStatus==2' style="color:#E95252; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
                 <span v-if='item.GuestNumStatus==3' style="color:#666; " class="personNo nowrap" slot="reference">{{item.GuestNum}}/{{item.YSeatNum>0? item.YSeatNum+'Y ':''}}{{item.ESeatNum>0? item.ESeatNum+'E ':''}}{{item.FSeatNum>0? item.FSeatNum+'F ':''}}</span>
@@ -1506,6 +1478,7 @@
                 <el-tooltip effect="dark" content="更多" placement="top-start" style="float:left">
                   <el-popover width='100' trigger="hover">
                     <div class="groupTourOrder_more">
+                      <div @click="goToPassenger(item)">旅客名单</div>
                       <div @click="toTrip(item)">出团通知书({{SetNoticeMsg.OutNotice==1?'OK':'暂定'}})</div>
                       <div v-if="userId==1" @click="getSalerInfo(item)">修改业务员</div>
                       <div @click='zhuanLoading = true,OPRemarkMsg.OrderId = item.OrderId'>OP备注</div>
@@ -3975,6 +3948,23 @@ import updateSalesMan from "../../commonPage/updateSalesMan.vue";
             tab: "团队收支明细"
           }
         });
+      },
+      //跳转到旅客名单
+      goToPassenger(item)
+      {
+        //passengerSaleList?id=11468&tcid=732&tcnum=NRT3U07190101A&isOrder=1&blank=y&tab=旅客名单
+        this.$router.push({
+          name: "passengerSaleList",
+          query: {
+            id: item.OrderId,
+            tcid:  this.msg.TCID,
+            tcnum:this.ConfigData.Config.TCNUM,
+            isOrder:1,
+            blank: "y",
+            tab: "旅客名单"
+          }
+        });
+
       }
     },
     mounted() {

src/router/config.js

@@ -2357,7 +2357,14 @@ export default {
               meta: {
                 title: '年度营收报表'
               },
-            }, { // 销售   制作广告
+            }, {
+              path: '/JumpReport',
+              name: 'JumpReport',
+              component: resolve => require(['@/components/FinancialModule/JumpReport'], resolve),
+              meta: {
+                title: '单据明细'
+              },
+            },{ // 销售   制作广告
               path: '/advert',
               name: 'advert',
               component: resolve => require(['@/components/SalesModule/advert'], resolve),