修改

src/components/tradePavilion/signList.vue

@@ -14,59 +14,40 @@
             style="color:#979dad;font-size:14px;position:relative;top:1px"></span>
         </div>
         <div style="float:right;">
-          <el-button style="float:right;margin-top: -5px;" size="small" type="primary"
-            @click="Export()">导出</el-button>
+          <el-button style="float:right;margin-top: -5px;" size="small" type="primary" @click="Export()">导出</el-button>
         </div>
       </div>
-      <el-table :data="tableData" v-loading="loading" border style="width: 100%;margin:20px 0">
-        <el-table-column prop="Id" label="编号" width="100">
+      <el-table :data="tableData" :span-method="objectSpanMethod" v-loading="loading" border
+        style="width: 100%;margin:20px 0">
+        <el-table-column prop="UserName" label="用户名">
         </el-table-column>
-        <el-table-column prop="ActivityName" label="活动名称">
+        <el-table-column prop="CompanyStatusStr" label="状态" width="100">
         </el-table-column>
-        <el-table-column prop="ActivityTypeName" label="活动类型">
+        <el-table-column prop="CompanyName" label="公司">
         </el-table-column>
-        <el-table-column prop="CoverImg" label="封面图">
+        <el-table-column prop="SignUserList" label="所属国籍/省/市">
           <template slot-scope="scope">
-            <el-image title="点击查看大图" style="width:50px;" :src="scope.row.CoverImg"
-              :preview-src-list="scope.row.CoverList"></el-image>
+            {{scope.row.SignUserList[0].CountryInfo}}
           </template>
         </el-table-column>
-        <el-table-column prop="StartTimeStr" label="活动时间">
+        <el-table-column prop="SignUserList" label="联系人">
           <template slot-scope="scope">
-            <span>{{scope.row.StartTimeStr}}</span><br />
-            <span>{{scope.row.EndTimeStr}}</span>
+            {{scope.row.SignUserList[0].LinkMan}}
           </template>
         </el-table-column>
-        <el-table-column prop="SignStartTimeStr" label="报名时间">
+        <el-table-column prop="SignUserList" label="联系电话">
           <template slot-scope="scope">
-            <span>{{scope.row.SignStartTimeStr}}</span><br />
-            <span>{{scope.row.SignEndTimeStr}}</span>
+            {{scope.row.SignUserList[0].LinkTel}}
           </template>
         </el-table-column>
-        <el-table-column prop="ActivityStatusStr" label="活动状态">
-        </el-table-column>
-        <el-table-column prop="JoinNum" label="报名人数">
+        <el-table-column prop="SignUserList" label="性质">
           <template slot-scope="scope">
-            <el-button type="text" @click="dialogTableVisible = true,getItem(scope.row)">
-              {{scope.row.JoinNum}} 人
-            </el-button>
+            {{scope.row.SignUserList[0].Nature}}
           </template>
         </el-table-column>
-        <el-table-column prop="Id" width="200" label="操作">
+        <el-table-column prop="SignUserList" label="公司职务">
           <template slot-scope="scope">
-            <el-tooltip class="item" effect="dark" content="编辑" placement="top">
-              <img @click="EditType(scope.row)" style="width:32px;height:32px" src="../../assets/img/userman/edit.png"
-                alt="">
-            </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="查看报名" placement="top-start">
-              <img @click="delType(scope.row)" style="width:32px;height:32px;margin:0 10px"
-                src="../../assets/img/userman/del.png" alt="">
-            </el-tooltip>
-            <el-tooltip class="item" effect="dark" content="删除" placement="top-start">
-              <img @click="delType(scope.row)" style="width:32px;height:32px;margin:0 10px"
-                src="../../assets/img/userman/del.png" alt="">
-            </el-tooltip>
-
+            {{scope.row.SignUserList[0].Post}}
           </template>
         </el-table-column>
       </el-table>
@@ -83,15 +64,20 @@
         msg: {
           pageIndex: 1,
           pageSize: 10,
+          ActivityId:0
         },
         tableData: [],
         total: 0,
       };
     },
     created() {
+    },
+    mounted() {
+       if (this.$route.query.Id) {
+        this.msg.ActivityId = this.$route.query.Id;
+      }
       this.getList();
     },
-    mounted() {},
     methods: {
       getList() {
         this.loading = true;
@@ -105,9 +91,9 @@
         })
       },
       //导出
-      Export(){
+      Export() {
         this.GetLocalFile(
-          "/api/Trade/DownLoadConsultStatic",this.msg,
+          "/api/Trade/DownLoadConsultStatic", this.msg,
           "活动报名.xls"
         );
       },
@@ -115,6 +101,31 @@
         this.msg.pageIndex = val;
         this.getList();
       },
+      objectSpanMethod({ row,column,rowIndex,columnIndex}) {
+        // console.log(row,'row');
+        // console.log(column,'column');
+        // console.log(rowIndex,'rowIndex');
+        // console.log(columnIndex,'columnIndex');
+        if(columnIndex==0||columnIndex==1||columnIndex==2){
+           return {
+              rowspan: row.RowSpan,
+              colspan: 1
+            };
+        }
+        // if (columnIndex === 0 ||columnIndex === 1||columnIndex === 2) {
+        //   if (rowIndex % 2 === 0) {
+        //     return {
+        //       rowspan: 2,
+        //       colspan: 1
+        //     };
+        //   } else {
+        //     return {
+        //       rowspan: 0,
+        //       colspan: 0
+        //     };
+        //   }
+        // }
+      }
     },
   };