bug整改

src/main/resources/views/platform/zhgh/club/common/clubUserJoin.js

@@ -18,7 +18,7 @@ const clubUserJoin = {
                         {{viewData.sex}}
                     </el-descriptions-item>
                     <el-descriptions-item label="出生年月">
-                        {{viewData.birthday}}
+                        {{$moment(viewData.birthday).format('YYYY-MM-DD')}}
                     </el-descriptions-item>
                     <el-descriptions-item label="联系电话">
                         {{viewData.mobile}}

src/main/resources/views/platform/zhgh/club/join/schoolUnionApproval/index.html

@@ -16,7 +16,7 @@ layout("/layouts/platform.html"){
                         @change="doSearch"
                     ></el-date-picker>
                 </search-item>
-                <search-item label="关键字">
+                <search-item label="姓名/工号">
                     <el-input clearable placeholder="请输入姓名或者工号查询" v-model="pageForm.searchKeyword"></el-input>
                 </search-item>
                 <search-item label="所属工会">

src/main/resources/views/platform/zhgh/dayofficework/article/mine/index.html

@@ -25,6 +25,11 @@ layout("/layouts/platform.html"){
                 <el-table-column prop="userName" label="投稿人姓名"></el-table-column>
                 <el-table-column prop="unitName" label="投稿人单位"></el-table-column>
                 <el-table-column prop="unionName" label="投稿人工会"></el-table-column>
+                <el-table-column v-if="tableData.some(row => row.clubName)" label="投稿人协会">
+                    <template slot-scope="{row}">
+                        <span>{{ row.clubName }}</span>
+                    </template>
+                </el-table-column>
                 <el-table-column prop="submitTime" label="投稿时间"></el-table-column>
                 <el-table-column prop="taskName" label="当前节点"></el-table-column>
                 <el-table-column prop="instanceState" label="流程状态">

src/main/resources/views/platform/zhgh/staffmanage/member/statistics/comprehensive/index.html

@@ -202,6 +202,7 @@ layout("/layouts/platform.html"){
 				pageForm.memberTypes = JSON.stringify(this.pageForm.memberTypes)
 				pageForm.personTypes = JSON.stringify(this.pageForm.personTypes)
 				pageForm.userStates = JSON.stringify(this.pageForm.userStates)
+				pageForm.age = JSON.stringify(this.pageForm.age)
 				const data = this.tableColumns.filter(item => this.checkedFields.includes(item.prop)).map(item => {
 					return {prop: item.prop, label: item.label}
 				})

src/main/resources/views/platform/zhghh5/club/common/clubUserJoin.js

@@ -9,7 +9,7 @@ const clubUserJoin = {
                         <van-cell title="姓名">{{ viewData.userName }}</van-cell>
                         <van-cell title="工号">{{ viewData.loginName }}</van-cell>
                         <van-cell title="性别">{{ viewData.sex }}</van-cell>
-                        <van-cell title="出生年月">{{ viewData.birthday }}</van-cell>
+                        <van-cell title="出生年月">{{$moment(viewData.birthday).format('YYYY-MM-DD')}}</van-cell>
                         <van-cell title="联系电话">{{ viewData.mobile }}</van-cell>
                         <van-cell title="电子信箱">{{ viewData.email }}</van-cell>
                         <van-cell title="分工会">{{ viewData.unionName }}</van-cell>