合团调整

src/components/dmc/manager/tripsManager.vue

@@ -404,6 +404,7 @@
     font-size: 12px;
     border: 1px solid #E5E5E5;
   }
+
 </style>
 <template>
   <div>
@@ -415,7 +416,8 @@
               <em>{{$t('advmanager.v_line')}}</em>
               <el-select v-model="queryMsg.LineId" class="w150" :placeholder="$t('pub.pleaseSel')"
                 @change="getLineTeamList(queryMsg.LineId,true)" filterable>
-                <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID" :key="item.LineID">
+                <el-option v-for="item in queryCommonData.LineList" :label="item.LineName" :value="item.LineID"
+                  :key="item.LineID">
                 </el-option>
               </el-select>
             </span>
@@ -440,10 +442,9 @@
           <li>
             <span>
               <em>{{$t('scen.sc_ftTime')}}</em>
-              <!-- <el-date-picker class="w150" type="date" v-model="queryMsg.StartGroupDate"
-                :picker-options="pickerBeginDateBefore" value-format="yyyy-MM-dd" placeholder></el-date-picker> -->
-                <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate" :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
-                <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
+              <DateLimit :clearable="false" :StartGroupDate="queryMsg.StartGroupDate"
+                :EndGroupDate="queryMsg.EndGroupDate" @change="(date)=> queryMsg.StartGroupDate = date"></DateLimit>
+              <el-date-picker class="w150" type="date" v-model="queryMsg.EndGroupDate"
                 :picker-options="pickerBeginDateAfter" value-format="yyyy-MM-dd" placeholder></el-date-picker>
             </span>
           </li>
@@ -481,10 +482,12 @@
           </li>
         </ul>
       </div>
+      <el-pagination background @current-change="handleCurrentChange" :current-page.sync="queryMsg.currentPage"
+        layout="total,prev, pager, next, jumper" :page-size="queryMsg.pageSize" :total="queryMsg.total"></el-pagination>
       <table class="TravelControlListTable TravelQueryList" v-loading="loading">
         <tbody v-for="(outItem,i) in queryCommonData.dataList" :key="i">
           <template v-for="(item,index) in outItem.TravelPriceList">
-            <tr height="40">
+            <tr height="40" :key="`a_`+index">
               <td align="center" width="80" v-if="index==0" :rowspan="outItem.TravelPriceList.length*3">
                 <label>
                   <input :value="outItem.TCIDs" style="vertical-align: middle;" v-model="ArrList"
@@ -494,7 +497,7 @@
               </td>
               <td colspan="5" style="padding-left: 30px;">{{item.Title}}</td>
             </tr>
-            <tr>
+            <tr :key="`b_`+index">
               <td width="20%">
                 <div class="TCL-TCNUM">{{item.OutBranchName}}</div>
                 <div class="TCL-TCNUM">{{item.TCNUM}}</div>
@@ -598,7 +601,8 @@
                   </p>
                   <p>
                     <span>{{$t('ground.cantuan')}}</span>
-                    <span>{{item.JoinNum+item.SingleGroupNum}}</span>  <span class="TCL-redType" v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
+                    <span>{{item.JoinNum+item.SingleGroupNum}}</span> <span class="TCL-redType"
+                      v-if="item.OrderLeaderGuestNum>=1">+{{item.OrderLeaderGuestNum}}</span>{{$t('Operation.Op_people')}}
                   </p>
                   <p>
                     <span>{{$t('MarketingActi.free')}}</span>
@@ -619,7 +623,7 @@
                 </div>
               </td>
             </tr>
-            <tr height="40">
+            <tr height="40" :key="`c_`+index">
               <td colspan="5" style="padding-left: 30px;">
                 <div>{{$t('fnc.beizhu')}}：{{item.OPRemark}}</div>
                 <div v-if="item.DmcRemarkLast">{{$t('Operation.Op_dijieRemark')}}：{{item.DmcRemarkLast.DMCRemark}}</div>
@@ -771,21 +775,21 @@
         this.apipost("line_post_GetList", {}, res => {
           if (res.data.resultCode == 1) {
             let lineArr = res.data.data;
-            this.queryCommonData.LineList=[];
-            lineArr.forEach(x=>{
-              if(x.LineID==14||x.LineID==90){
+            this.queryCommonData.LineList = [];
+            lineArr.forEach(x => {
+              if (x.LineID == 14 || x.LineID == 90) {
                 this.queryCommonData.LineList.push(x);
               }
             })
             let obj = {
-              LineName:this.$t('pub.unlimitedSel'),
-              LineID:0
+              LineName: this.$t('pub.unlimitedSel'),
+              LineID: 0
             }
             this.queryCommonData.LineList.unshift(obj);
           }
         });
       },
-       //获取系列列表
+      //获取系列列表
       getLineTeamList(lineId, isDefault) {
         //查询线路名
         if (isDefault) {
@@ -864,7 +868,7 @@
     mounted() {
       this.getLineList();
       this.getCompanyList();
-      this.getLineTeamList(0,true);
+      this.getLineTeamList(0, true);
     },
     created() {
       var myDate = new Date();