‘解决冲突’

src/components/BusExport.vue

 <style>
     .BusExportTitle{
-        width:800px;
+        width:1000px;
         margin:0 auto;
         text-align: center;
         font-weight: bold;
@@ -11,9 +11,10 @@
         width:100%;
         height:auto;
         margin:auto;
+        position: absolute;
     }
     .Bus_detailTable {
-        width: 800px;
+        width: 1000px;
         font-size: 12px;
         color: #333;
         margin: 10px auto;
@@ -24,7 +25,8 @@
 
     .Bus_detailTable td {
         border: 1px solid #d1d1d1;
-        padding: 3px 10px;
+        padding:0 10px;
+        height:32px;
         font-size:16px;
     }
 
@@ -33,6 +35,7 @@
         border: 1px solid #d1d1d1;
         font-size:16px;
         font-weight:bold;
+        height:32px;
     }
     .txLeft{
         text-align: left;
@@ -46,9 +49,6 @@
     .totalTabal td{
         height:33px;
     }
-    /* body{
-        min-width: 100%!important;
-    } */
 </style>
 
 <template>

src/components/Hotel/HotelProductCalendar.vue

@@ -35,8 +35,8 @@
                 <div :class="stockColor(item.data.InventoryType)" v-if="item.data&&item.month===calendar.data.date">
                     <p><span @click="goUrlA('2', item)" class="text_underLine">价格：{{item.data.CostPrice}}（{{item.data.CurrencyName}}）</span></p>
                     <p><span class="text_underLine" @click="goUrlB(item)">总库存：{{item.data.Inventory}}（间）</span></p>
-                    <!-- <p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
-                    <p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
+                    <p><span class="text_underLine" @click="goUrlHotelTeam(item)">剩余库存：{{item.data.RemainingInventory}}（间）</span></p>
+                    <!-- <p><span>剩余库存：{{item.data.RemainingInventory}}（间）</span></p> -->
                     <p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已使用库存：{{item.data.UseAmount}}（间）</span></p>
                     <p><span v-if="item.data.Inventory!==item.data.RemainingInventory">欠房数量：{{item.data.OweAmount}}（间）</span></p>
                     <p><span v-if="item.data.Inventory!==item.data.RemainingInventory" class="text_underLine">已确定：{{item.data.SureAmount}}（间）</span></p>

src/components/Hotel/HotelsTeam.vue

@@ -215,7 +215,8 @@
             })
             this.apipost('dmcstatistics_post_SetNewHotelOrder',item.CommonReport.HotelList[0],res=>{
                 if(res.data.resultCode==1){
-                    this.Success(res.data.message)
+                    this.Success(res.data.message);
+                    this.getList();
                 }else{
                     this.Error(res.data.message)
                 }

src/components/dmc/manager/dmcTotalTable.vue

@@ -2,6 +2,14 @@
   <div>
     <div class="query-box" style="border-bottom: none;">
       <ul>
+       <li><span><em>线路</em>
+            <el-select v-model="msg.LineId" filterable :placeholder="$t('pub.pleaseSel')" class="w150" @change="getLineTeamList()">
+              <el-option label="不限" :value='0'></el-option>
+              <el-option v-for="item in LineList" :label='item.LineName' :value='item.LineID' :key='item.LineID'>
+              </el-option>
+            </el-select>
+          </span>
+        </li>
         <li><span><em>系列</em>
             <el-select v-model="msg.LineteamId" filterable :placeholder="$t('pub.pleaseSel')" class="w150">
               <el-option label="不限" value='-1'></el-option>
@@ -273,7 +281,7 @@
           pageIndex: 1,
           pageSize: 10,
           SelectType: 6,
-          LineId: 14,
+          LineId: 0,
           LineteamId: "-1",
           PriceStatus: "0",
           //地接团号
@@ -330,7 +338,7 @@
         this.LineTeamList = [];
         this.apipost(
           "team_post_GetList", {
-            lineID: 14,
+            lineID: this.msg.LineId,
             isTOOP: 1
           },
           res => {
@@ -482,8 +490,9 @@
         "-" +
         myDate.getDate();
       this.msg.StartDate = nowDate;
+      this.getLineList();
       this.getList()
-      this.getLineTeamList()
+      //this.getLineTeamList();
     },
   }
 

src/components/dmc/manager/teamReimbursement.vue

@@ -383,7 +383,9 @@
                 <div class="d7">
                   <el-button-group>
                     <el-button @click.native="goUrl('leaderReimbursement',outItem,'用款计划')" type="primary" style="background:#E95252; border-color:#E95252">领队用款</el-button>
-                    <el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
+                    <el-button @click.native="goToExport('leaderPay2',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账
+                    <!-- <el-button @click.native="goUrl('leaderPay',outItem,'领队报账')" type="primary" style="background:#297BEF; border-color:#297BEF">领队报账 -->
+
                     </el-button>
                   </el-button-group>
                 </div>
@@ -562,6 +564,19 @@
           }
         })
       },
+      //跳转打印页面
+      goToExport(path,obj,title){
+        let routeData = this.$router.resolve({
+          name: path,
+          query: {
+            "id": obj.TCIDs,
+            'num': obj.CombinationNum,
+            isUpdate: true,
+          }
+        });
+        window.open(routeData.href, "_blank");
+      },
+
       //翻页
       handleCurrentChange(val) {
         this.queryMsg.pageIndex = val;

src/router/config.js

@@ -66,6 +66,11 @@ export default {
       name: 'BusExport',
       component: resolve => require(['@/components/BusExport'], resolve),
     },
+    {
+      path: '/leaderPay2', //领队报账
+      name: 'leaderPay2',
+      component: resolve => require(['@/components/leaderPay2'], resolve),
+    },
     {
       path: '/index',
       name: 'index',
@@ -1031,7 +1036,8 @@ export default {
               meta: {
                 title: '机票列表'
               },
-            }, {
+            }, 
+            {
               path: '/individualTicket',  //散客机票
               name: 'individualTicket',
               component: resolve => require(['@/components/Ticketing/individualTicket'], resolve),
@@ -1039,14 +1045,15 @@ export default {
                 title: '散客机票'
               },
             },
-            ,{
-              path: '/IndividualTicketOrder',  //散客今日机票订单
-              name: 'IndividualTicketOrder',
-              component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
-              meta: {
-                title: '散客机票今日订单'
-              },
-            },{
+            // ,{
+            //   path: '/IndividualTicketOrder',  //散客今日机票订单
+            //   name: 'IndividualTicketOrder',
+            //   component: resolve => require(['@/components/Ticketing/IndividualTicketOrder'], resolve),
+            //   meta: {
+            //     title: '散客机票今日订单'
+            //   },
+            // },
+            {
               path: '/IndividualTicketOrderDetails',  //散客机票订单详情
               name: 'IndividualTicketOrderDetails',
               component: resolve => require(['@/components/Ticketing/IndividualTicketOrderDetails'], resolve),
@@ -1866,14 +1873,14 @@ export default {
                 title: '机票订单'
               },
             },
-            { // 销售 散卖机票订单
-              path: '/BulkAirTicketOrders',
-              name: 'BulkAirTicketOrders',
-              component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
-              meta: {
-                title: '散卖机票订单'
-              },
-            },
+            // { // 销售 散卖机票订单
+            //   path: '/BulkAirTicketOrders',
+            //   name: 'BulkAirTicketOrders',
+            //   component: resolve => require(['@/components/SalesModule/BulkAirTicketOrders'], resolve),
+            //   meta: {
+            //     title: '散卖机票订单'
+            //   },
+            // },
             
             { // 销售 报名统计
               path: '/enrollTotal',