Merge branch 'dev'

src/views/MemberManage/_memberList/index.vue

@@ -18,9 +18,15 @@
        <el-button size="default" type="primary" @click="download">导出excel</el-button>
        <div class="area-table">
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
-               <el-table-column prop="name" label="员工" width="360"></el-table-column>
-               <el-table-column prop="main_departmentName" label="部门"></el-table-column>
-               <el-table-column prop="sub_departmentName" label="上级部门"></el-table-column>
+               <el-table-column prop="name" label="员工" width="240"></el-table-column>
+               <el-table-column prop="departmentList" label="部门" width="480">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.departmentList" :key="index">
+                           {{item.departmentName}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
+               <!-- <el-table-column prop="sub_departmentName" label="上级部门"></el-table-column> -->
                <el-table-column prop="tel" label="手机号码"></el-table-column>
                <el-table-column prop="creatAt" label="创建时间"></el-table-column>
            </el-table>

src/views/MemberManage/_pointManage/index.vue

@@ -17,9 +17,14 @@
        <el-button size="default" type="primary" @click="download">导出excel</el-button>
        <div class="area-table">
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
-               <el-table-column prop="name" label="员工" width="360"></el-table-column>
-               <el-table-column prop="main_departmentName" label="部门"></el-table-column>
-               <el-table-column prop="sub_departmentName" label="上级部门"></el-table-column>
+               <el-table-column prop="name" label="员工" width="240"></el-table-column>
+               <el-table-column prop="departmentList" label="部门" width="480">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.departmentList" :key="index">
+                           {{item.departmentName}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
                <el-table-column prop="points" label="积分"></el-table-column>
                <el-table-column prop="action" label="操作" fixed="right" width="240">
                    <template #default="scope">

src/views/QuestManage/_infoCollect/index.vue

@@ -42,7 +42,13 @@
                <el-table-column prop="remarks" label="备注" width="240"></el-table-column>
                <el-table-column prop="taskTitle" label="关联任务" width="240"></el-table-column>
                <el-table-column prop="provideName" label="提交人" width="180"></el-table-column>
-               <el-table-column prop="departmentName" label="部门" width="320"></el-table-column>
+               <el-table-column prop="departmentList" label="部门" width="320">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.departmentList" :key="index">
+                           {{item.departmentName}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
            </el-table>
            <el-pagination
                 v-model:currentPage="pagination.current"

src/views/QuestManage/_transformResult/index.vue

@@ -1,5 +1,5 @@
 <template>
-    <div class="main-content">
+    <div class="main-content" style="width: 83%">
         <h3 class="top-title" style="font-size: 24px">{{transformData.taskTitle}}</h3>
         <el-button size="default" type="primary" @click="download">导出传播效果</el-button>
         <h3 class="top-title" style="margin-top: 32px">传播数据</h3>
@@ -56,7 +56,13 @@
             </el-form>
             <el-table :data="transformList" size="default" border style="width: 1300px">
                 <el-table-column prop="userName" label="员工姓名" width="160"></el-table-column>
-                <el-table-column prop="departmentName" label="部门" width="240"></el-table-column>
+                <el-table-column prop="departmentList" label="部门" width="480">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.departmentList" :key="index">
+                           {{item.departmentName}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
                 <el-table-column prop="playNumSum" label="播放数" width="100"></el-table-column>
                 <el-table-column prop="commendNumSum" label="点赞数" width="100"></el-table-column>
                 <el-table-column prop="collectionNumSum" label="收藏数" width="100"></el-table-column>

src/views/ReviewManage/_accountReview/index.vue

@@ -26,7 +26,13 @@
        <div class="area-table">
            <el-table :data="tableData.data" size="default" border :header-cell-style="{background: '#EEE'}">
                <el-table-column prop="userName" label="申请人" width="200"></el-table-column>
-               <el-table-column prop="departmentName" label="部门" width="280"></el-table-column>
+               <el-table-column prop="departmentList" label="部门" width="320">
+                   <template #default="scope">
+                       <el-tag style="margin-right: 8px" v-for="(item,index) in scope.row.departmentList" :key="index">
+                           {{item.departmentName}}
+                        </el-tag>
+                   </template>
+               </el-table-column>
                <el-table-column prop="platform" label="第三方平台" width="160" :formatter="statusFormatter"></el-table-column>
                <el-table-column prop="account" label="账号" width="200"></el-table-column>
                <el-table-column prop="name" label="昵称" width="200"></el-table-column>