页面修改

src/components/LeaderManagement/leaderReimbursement.vue

@@ -23,7 +23,7 @@
         <td>{{NewCombinationNum}}</td>
         <td>{{item.FlightDate}}</td>
         <td>{{item.DayNum}}天</td>
-        <td>{{item.TotalSeat}}人</td>
+        <td>{{item.GuestNum}}人</td>
         <td>{{item.LeaderName}}</td>
         <td>{{item.GuideName}}</td>
         <td>

src/components/dmc/manager/dmcTotalTable.vue

@@ -148,6 +148,8 @@
         style="color:#E95252 ;">X</span>
     </div>
     <div style="width: 100%;  overflow-x: auto;padding-bottom: 10px; margin-top: 10px; " class="ownScrollbarStyle">
+      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="currentPage"
+        layout="total,prev, pager, next, jumper" :page-size="msg.pageSize" :total="total"></el-pagination>
       <table border="0" cellspacing="1" cellpadding="0" class="dmcTotalTable" v-loading="loading">
         <tr>
           <th colspan="11">公司通用信息</th>
@@ -257,7 +259,8 @@
               <td>
                 <div class="link">
                   <p v-if='!item.LeaderName' @click="goUrlT('RegistrationList',item.TCID,'报名清单')">配置领队</p>
-                  <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">{{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
+                  <p v-else @click="goUrlT('RegistrationList',item.TCID,'报名清单')">
+                    {{item.LeaderName}}{{getLeaderTypeStr(item.LeaderGuidClass)}}</p>
                 </div>
               </td>
               <td>
@@ -279,7 +282,8 @@
                 </div>
               </td>
               <td>
-                <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadGuestList(item)">旅客名单</a>
+                <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
+                  @click="DownLoadGuestList(item,outItem,index)">旅客名单</a>
               </td>
               <td>
                 <div class="fz16 fbold linkspan">
@@ -330,14 +334,18 @@
                   <span style="color: #4BCA81;" v-if="item.FoodsResult==1">√</span>
                   <span class="colorE95252" v-else>{{item.FoodsResult=='-1'?"x":"O"}}</span>
                 </div>
-                 <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单" @click="DownLoadDinner(item)">餐配下载</a>
+                <a style="text-decoration:underline;cursor:pointer;" title="点击下载旅客名单"
+                  @click="DownLoadDinner(item)">餐配下载</a>
               </td>
 
               <td>
                 <div class="fz16 fbold linkspan">
-                  <span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-if="item.BusResult==1">√</span>
-                  <span class="colorE95252" @click="goUrlBus('BusInfo',item,outItem,'车配信息')" v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
-                  <span @click="GoShoupei(outItem)" style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">车辆信息</span>
+                  <span style="color: #4BCA81;" @click="goUrlBus('BusInfo',item,outItem,'车配信息')"
+                    v-if="item.BusResult==1">√</span>
+                  <span class="colorE95252" @click="goUrlBus('BusInfo',item,outItem,'车配信息')"
+                    v-else>{{item.BusResult=='-1'?"x":"O"}}</span>
+                  <span @click="GoShoupei(outItem)"
+                    style="cursor:pointer;text-decoration:underline;display:block;color:#666;font-size:12px;">车辆信息</span>
                 </div>
               </td>
               <td>
@@ -683,7 +691,7 @@
       commonTeamInfo
     },
     methods: {
-      getLeaderTypeStr: function (clas){
+      getLeaderTypeStr: function (clas) {
         if (clas == 1) {
           return "（同行领队）"
         } else if (clas == 2) {
@@ -694,7 +702,7 @@
         var that = this;
         this.tripTitle = item.Title;
         this.$nextTick(() => {
-          that.$refs.comTeam.GetTrip(item.ConfigID,item.TCID);
+          that.$refs.comTeam.GetTrip(item.ConfigID, item.TCID);
         });
         that.teamVisible = true;
       },
@@ -1033,12 +1041,20 @@
         }, err => {})
       },
       //下载旅客名单
-      DownLoadGuestList(item) {
+      DownLoadGuestList(item, outItem,index) {
         this.loading = true;
+        var nDmcNum=outItem.NewCombinationNum;
+        if(outItem.PriceCommonList.length>1)
+        {
+          var NIndex=index+1;
+          nDmcNum= nDmcNum.replace(/^\s*|\s*$/g,"")+NIndex;
+        }
         //导出报表
         let msg = {
-          TCID: item.TCID
+          TCID: item.TCID,
+          DMCNum:nDmcNum
         };
+        console.log("msg",msg);
         var fileName = "出境名单表.doc";
         if (item.TCNUMS != null) {
           fileName =
@@ -1060,14 +1076,13 @@
           }
         })
       },
-      DownLoadDinner(item)
-      {
+      DownLoadDinner(item) {
         this.loading = true;
         //导出报表
         let msg = {
           TCID: item.TCID,
-          StartDate:item.StartDateStr,
-          DayNum:item.DayNum
+          StartDate: item.StartDateStr,
+          DayNum: item.DayNum
         };
         var fileName = "餐配下载.xls";
         if (item.TCNUMS != null) {