营收报表新增条件

src/components/FinancialModule/ReportForm/TeamRevenueReport.vue

@@ -442,7 +442,7 @@ tr._item_list td:last-child {
           </el-col>
           <el-col :span="4">
             <el-form-item label="线路：">
-              <el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId)">
+              <el-select filterable v-model="msg.LineId" @change="getLineTeamList(msg.LineId,-1),getLinePlaceList(msg.LineId)">
                 <el-option :value="0" label="不限"></el-option>
                 <el-option
                   v-for="item in LineList"
@@ -453,6 +453,19 @@ tr._item_list td:last-child {
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="4">
+            <el-form-item label="目的地">
+              <el-select filterable v-model="msg.PlaceId" @change="getLineTeamList(msg.LineId,msg.PlaceId)">
+                <el-option :value="0" label="不限"></el-option>
+                <el-option
+                  v-for="(item,index) in PlaceList"
+                  :label="item.PlaceName"
+                  :value="item.PlaceID"
+                  :key="index+1000"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="4">
             <el-form-item label="系列：">
               <el-select filterable v-model="msg.LineTeamId" class>
@@ -521,15 +534,16 @@ tr._item_list td:last-child {
                 <el-option value="0" label="否"></el-option>
               </el-select>
             </el-form-item>
-          </el-col>     
-          <el-col  :span="4">
+          </el-col>   
+          <el-col :span="4" v-if="userId==1||userId==5">
+              <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
+              <el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
+            </el-col>    
+          <el-col :span="5">
             <p v-if="UpdateStaus==1">正在更新,更新开始时间 {{UpdateStartTime}}</p>
             <p v-if="UpdateStaus==2">上次更新时间 {{UpdateStartTime}}</p>
             </el-col>  
-            <el-col :span="6" v-if="userId==1||userId==5">
-              <el-button @click="msg.Is_Open=0,SetTravelClose()" type="danger" size="small" round :loading="btnloading">开启团队收支</el-button>
-              <el-button @click="msg.Is_Open=1,SetTravelClose()" type="danger" size="small" round :loading="btnloading">关闭团队收支</el-button>
-            </el-col>     
+               
           
         </el-row>
       </el-form>
@@ -1415,6 +1429,7 @@ export default {
       AALloading: false,
       BranchStatus:true,
       shujuType:false,
+      PlaceList:[],
     };
   },
   created() {
@@ -1463,6 +1478,36 @@ export default {
     this.getPageList();
   },
   methods: {
+     //获取目的地列表
+      getLinePlaceList(lineId) {
+        let msg = {
+          lineID: lineId,
+        }
+        this.apipost('team_post_GetLinePlace', msg, res => {
+          if (res.data.resultCode == 1) {
+            this.PlaceList = res.data.data;
+          }
+        })
+      },
+      getLineTeamList(lineId,PlaceId) { 
+        
+        
+       //获取系列列表
+      this.apipost(
+        "team_post_GetList",
+        {
+          lineID: lineId,
+          placeID:PlaceId,
+          isTOOP: 1
+        },
+        res => {
+          if (res.data.resultCode == 1) {
+            this.msg.LineTeamId = "-1";
+            this.LineTeamList = res.data.data;
+          }
+        }
+      );
+    },
     SetTravelClose(){
       this.btnloading=true;
       this.apipost(
@@ -2016,23 +2061,8 @@ export default {
         }
       );
     },
-    getLineTeamList(lineId) {
-      //获取系列列表
-      this.LineTeamList = [];
-      this.apipost(
-        "team_post_GetList",
-        {
-          lineID: lineId,
-          isTOOP: 1
-        },
-        res => {
-          if (res.data.resultCode == 1) {
-            this.msg.LineTeamId = "-1";
-            this.LineTeamList = res.data.data;
-          }
-        }
-      );
-    },
+
+    
     getLineList() {
       // 获取线路
       this.apipost("line_post_GetAllList", {}, res => {

src/components/TravelManager/TravelList/SalesTravelCoupomPlanList.vue

@@ -45,7 +45,7 @@
 				
 			</tr>
 			<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
-                <td><span @click="goUrl('TravelControlListSale',item.tcnum)" class="underline">{{item.tcnum}}({{item.tcid}})</span></td>	
+                <td><span @click="goUrl('TravelControlListSale',item.tcnum)" class="underline">({{item.tcid}}) {{item.tcnum}}</span></td>	
                 <td>{{item.planIntroduce}}</td>		
                 <td>{{item.travelTitle}}</td>
                 <td>

src/components/activity/FreelineManagement.vue

@@ -560,13 +560,16 @@
                 <div class="TCL_remarkTitle">OP对内备注：</div>
                 <div class="TCL_Content">{{item.OPInnerRemark}}</div>
               </div>
-              <div v-if="item.PriceTagList.length>0" class="clearfix TCL-redType">
-                <div class="TCL_remarkTitle">标签：</div>
-                <div class="TCL_Content" v-for="(tag,index) in item.PriceTagList" :key="index">
-                  <span style="margin-right:6px">{{tag.content}}</span>
-                </div>
+            </div>
+            <div v-if="item.PriceTagList.length>0" class="TC_remarkContent">
+                <div  class="clearfix TCL-redType">
+                  <div class="TCL_remarkTitle">标签：</div>
+                  <div class="TCL_Content" v-for="(tag,index) in item.PriceTagList" :key="index">
+                    <span style="margin-right:6px">{{tag.Content}}</span>
+                  </div>
               </div>
             </div>
+            
           </li>
         </ul>
         <div class="noData" v-show="queryMsg.noData">{{$t('system.content_noData')}}</div>

src/components/activity/TravelCoupomPlanList.vue

@@ -40,14 +40,21 @@
                 <th>部门名称</th>
 				<th>销售姓名</th>
                 <th>公司名称</th>
+                <th>行程简介</th>
+                <th>团期标题</th>
+                <th>方案价格</th>
                 <th>采用状态</th>
 				
 			</tr>
 			<tr v-for="(item,index) in DataList" :key="index" v-loading='loading'>
-                <td><span @click="goUrl('TravelControlListSale',item.tcnum)" class="underline">{{item.tcnum}}({{item.tcid}})</span></td>		
+                <td><span @click="goUrl('TravelControlListSale',item.tcnum)" class="underline">({{item.tcid}}) {{item.tcnum}}</span></td>		
 				<td>{{item.departmentName}}</td>
 				<td>{{item.salseName}}</td>
                 <td>{{item.companyName}}</td>
+                <td>{{item.planIntroduce}}</td>
+                <td>{{item.travelTitle}}</td>
+                <td>{{item.planPrice}}</td>
+                
                 <td>
                     <span v-if="item.planUseStatus==1">未采用</span>
                     <span v-if="item.planUseStatus==2">采用</span>
@@ -103,6 +110,7 @@ import moment from "moment"
                     this.loading = false;
                     if (res.data.resultCode === 1) {
                     this.DataList = res.data.data.pageData;
+                    console.log("this.DataList",this.DataList)
                     this.total= res.data.data.count;
                     } else {
                     this.Error(res.data.message)