no

src/components/activity/AppActivityExclusive.vue

@@ -51,6 +51,8 @@
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
         <th>团号</th>
+        <th>公司</th>
+        <th>线路</th>
         <th>名称</th>
         <th>状态</th>
         <th>类型</th>
@@ -65,6 +67,8 @@
       </tr>
       <tr v-for="(item,i) in dataList" :key="i">
         <td>{{item.tcid}}</td>
+        <td>{{companyListObj[item.branchId]}}</td>
+        <td>{{LineListObj[item.lineId]}}</td>
         <td>{{item.activityName}}</td>
         <td>
             <span v-if="item.activityStatus==1">正常</span>
@@ -134,6 +138,7 @@
             </el-form-item>
             <el-form-item label="线路" prop="lineId">
                 <el-select :disabled="edittrue" class="multiple_input" filterable v-model="form.lineId"> 
+                    <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>
             </el-form-item>
@@ -264,7 +269,9 @@ export default {
                     let startTime = new Date(this.form.startDate)
                     return startTime.getTime() >= time.getTime()
                 }
-            }
+            },
+            LineListObj:{},
+            companyListObj:{},
         }
     },
     created(){
@@ -295,6 +302,9 @@ export default {
                 res => {
                 if (res.data.resultCode == 1) {
                     this.companyList = res.data.data;
+                    this.companyList.map(item=>{
+                        this.companyListObj[item.Id]=item.BName;
+                    })
                 } else {
                 }
                 },
@@ -408,6 +418,9 @@ export default {
         this.apipost("line_post_GetAllList_V2", {LineDirection: 0}, res => {
           if (res.data.resultCode == 1) {
             this.LineList = res.data.data;
+            this.LineList.map(item=>{
+                this.LineListObj[item.LineID]=item.LineName;
+            })
           }
         });
       },