Commit 8a1f3d03 authored by 黄奎's avatar 黄奎

页面修改

parent 982f842c
...@@ -17,40 +17,77 @@ ...@@ -17,40 +17,77 @@
<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>
</div> </div>
<el-table :data="tableData" :span-method="objectSpanMethod" v-loading="loading" border <table class="signTable">
style="width: 100%;margin:20px 0"> <thead>
<el-table-column prop="UserName" label="用户名"> <tr>
</el-table-column> <th>
<el-table-column prop="CompanyStatusStr" label="状态" width="100"> 用户昵称
</el-table-column> </th>
<el-table-column prop="CompanyName" label="公司"> <th>
</el-table-column> 认证状态
<el-table-column prop="SignUserList" label="所属国籍/省/市"> </th>
<template slot-scope="scope"> <th>
{{scope.row.SignUserList[0].CountryInfo}} 认证公司
</template> </th>
</el-table-column> <th>
<el-table-column prop="SignUserList" label="联系人"> 认证信息
<template slot-scope="scope"> </th>
{{scope.row.SignUserList[0].LinkMan}} <th>
</template> 公司
</el-table-column> </th>
<el-table-column prop="SignUserList" label="联系电话"> <th>
<template slot-scope="scope"> 性质
{{scope.row.SignUserList[0].LinkTel}} </th>
</template> <th>
</el-table-column> 联系人
<el-table-column prop="SignUserList" label="性质"> </th>
<template slot-scope="scope"> <th>
{{scope.row.SignUserList[0].Nature}} 联系电话
</template> </th>
</el-table-column> <th>
<el-table-column prop="SignUserList" label="公司职务"> 职务
<template slot-scope="scope"> </th>
{{scope.row.SignUserList[0].Post}} <th>
</template> 地址
</el-table-column> </th>
</el-table> </tr>
</thead>
<tbody v-for="(item,index) in tableData" :key="index">
<tr v-for="(sItem,sIndex) in item.SignUserList" :key="sIndex">
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.UserName}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.CompanyStatusStr}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.CompanyName}}
</td>
<td :rowspan="item.SignUserList.length>1?item.SignUserList.length:0" v-if='sIndex==0'>
{{item.AuthName}}
</td>
<td>
{{sItem.CompanyName}}
</td>
<td>
{{sItem.Nature}}
</td>
<td>
{{sItem.LinkMan}}
</td>
<td>
{{sItem.LinkTel}}
</td>
<td>
{{sItem.Post}}
</td>
<td>
{{sItem.CountryInfo}}
</td>
</tr>
</tbody>
</table>
<el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize" <el-pagination style="text-align:right" background @current-change="handleCurrentChange" :page-size="msg.pageSize"
:current-page.sync="msg.pageIndex" layout="total,prev, pager, next" :total="total"> :current-page.sync="msg.pageIndex" layout="total,prev, pager, next" :total="total">
</el-pagination> </el-pagination>
...@@ -64,17 +101,16 @@ ...@@ -64,17 +101,16 @@
msg: { msg: {
pageIndex: 1, pageIndex: 1,
pageSize: 10, pageSize: 10,
ActivityId:0 ActivityId: 0
}, },
tableData: [], tableData: [],
total: 0, total: 0,
}; };
}, },
created() { created() {},
},
mounted() { mounted() {
if (this.$route.query.Id) { if (this.$route.query.Id) {
this.msg.ActivityId = this.$route.query.Id; //this.msg.ActivityId = this.$route.query.Id;
} }
this.getList(); this.getList();
}, },
...@@ -101,36 +137,19 @@ ...@@ -101,36 +137,19 @@
this.msg.pageIndex = val; this.msg.pageIndex = val;
this.getList(); 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
// };
// }
// }
}
},
}; };
</script> </script>
<style> <style>
.signTable {
border-collapse: collapse;
}
.signTable tr td {
border: 1px solid grey;
}
.signList .remark_name { .signList .remark_name {
color: #888888; color: #888888;
font-size: 12px; font-size: 12px;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment