diff --git a/src/main/java/com/budwk/app/base/sms/impl/SmsWhcpServiceImpl.java b/src/main/java/com/budwk/app/base/sms/impl/SmsWhcpServiceImpl.java
index d32ad96..4491839 100644
--- a/src/main/java/com/budwk/app/base/sms/impl/SmsWhcpServiceImpl.java
+++ b/src/main/java/com/budwk/app/base/sms/impl/SmsWhcpServiceImpl.java
@@ -54,7 +54,7 @@ public class SmsWhcpServiceImpl implements SmsService {
         json.put("password", SecureUtil.md5(SecureUtil.md5("Whszyxy123") + tKey));
         json.put("tKey", tKey + "");
         json.put("mobile", mobile);
-        json.put("content", "【智慧工会】" + content);
+        json.put("content", "智慧工会：" + content);
 
         log.info("【log】调用短信消息接口，请求参数：{}", Json.toJson(json));
         String result = HttpRequest.post(urls)
diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
index 98aea8f..626ecd4 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/message/strategy/impl/SmsMessageSendStrategy.java
@@ -37,7 +37,7 @@ public class SmsMessageSendStrategy implements GlobalMessageSendStrategy {
 
     @Override
     public boolean isEnabled() {
-        return true;
+        return false;
     }
 
     @Override
diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java
index 24b993b..3e49f46 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplyBranchUnionApprovalController.java
@@ -78,6 +78,7 @@ public class MemberApplyBranchUnionApprovalController {
                     info.personType,
                     info.applyDateTime,
                     info.sign,
+                    info.nativePlace,
                     ins.id AS instanceId,
                     ins.businessNo,
                     ins.state instanceState,
@@ -125,7 +126,7 @@ public class MemberApplyBranchUnionApprovalController {
         } else {
             cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
         }
-        cnd.groupBy("t.id");
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
diff --git a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java
index eb5377c..0c9c4bc 100644
--- a/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java
+++ b/src/main/java/com/budwk/app/zhgh/staffmanage/member/controller/apply/MemberApplySchoolUnionApprovalController.java
@@ -93,6 +93,7 @@ public class MemberApplySchoolUnionApprovalController {
                     info.origin,
                     info.applyDateTime,
                     info.sign,
+                     info.nativePlace,
                     ins.id AS instanceId,
                     ins.businessNo,
                     ins.state instanceState,
@@ -138,7 +139,7 @@ public class MemberApplySchoolUnionApprovalController {
         } else {
             cnd.orderBy("info." + pageForm.getPageOrderName(), PageUtil.getOrder(pageForm.getPageOrderBy()));
         }
-        cnd.groupBy("t.id");
+        cnd.groupBy("info.id");
         sql.setCondition(cnd);
         Pagination<NutMap> pagination = memberApplyRecordService.listPageMap(pageForm.getPageNumber(), pageForm.getPageSize(), sql);
         return Result.success(pagination);
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
index f994cf0..ee4bd11 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/branchunionapproval/index.html
@@ -2,93 +2,98 @@
 layout("/layouts/platform.html"){
 #-->
 <div id="app" v-cloak>
-	<guava ref="guava">
-		<el-card shadow="never">
-			<common-query ref="commonQueryRef" @search="search"></common-query>
-		</el-card>
-		<el-card shadow="never" class="mt10">
-			<table-tool label="申请列表">
-				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
-					<el-radio-button label="true">已审核</el-radio-button>
-					<el-radio-button label="false">未审核</el-radio-button>
-				</el-radio-group>
-			</table-tool>
-			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
-				<el-table-column
-						:index="indexMethod"
-						align="center"
-						header-align="center"
-						label="序号"
-						type="index"
-						width="80px"
-				></el-table-column>
-				<el-table-column
-						:label="column.label"
-						:prop="column.prop"
-						:sortable="column.sortable"
-						:width="column.width"
-						header-align="center"
-						min-width="100px"
-						show-overflow-tooltip
-						v-for="column in tableColumns"
-				>
-					<template scope="{row}" v-if="column.prop=='loginname'">
-						<el-link @click="openView(row)" type="primary">{{row.loginname}}</el-link>
-					</template>
-					<template scope="{row}" v-else-if="column.prop=='sign'">
-						<el-image v-if="row.sign" :src="row.sign" style="height: 60px"></el-image>
-						<el-tag type="warning" v-else>暂无</el-tag>
-					</template>
-					<template scope="{row}" v-else-if="column.prop=='instanceState'">
-						<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
-						          size="small"></enum-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作" fixed="right" width="200px">
-					<template scope="{row}">
-						<el-button size="mini" type="primary" @click="openView(row)">
-							查看
-						</el-button>
-						<el-button v-if="row.taskState === 10" @click="openApproval(row)" size="mini" type="primary">
-							审核
-						</el-button>
-						<el-button v-if="row.canRevoke" @click="openRevoke(row)" size="mini" type="danger">
-							撤回
-						</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<!--#include("/layouts/pagination.html"){}#-->
-		</el-card>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <common-query ref="commonQueryRef" @search="search"></common-query>
+        </el-card>
+        <el-card shadow="never" class="mt10">
+            <table-tool label="申请列表">
+                <el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
+                    <el-radio-button label="true">已审核</el-radio-button>
+                    <el-radio-button label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id"
+                      style="width: 100%">
+                <el-table-column
+                    :index="indexMethod"
+                    align="center"
+                    header-align="center"
+                    label="序号"
+                    type="index"
+                    width="80px"
+                ></el-table-column>
+                <el-table-column
+                    :label="column.label"
+                    :prop="column.prop"
+                    :sortable="column.sortable"
+                    :width="column.width"
+                    header-align="center"
+                    min-width="100px"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='loginname'">
+                        <el-link @click="openView(row)" type="primary">{{row.loginname}}</el-link>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='sign'">
+                        <el-image v-if="row.sign" :src="row.sign" style="height: 60px"></el-image>
+                        <el-tag type="warning" v-else>暂无</el-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">
+                            查看
+                        </el-button>
+                        <el-button v-if="row.taskState === 10" @click="openApproval(row)" size="mini" type="primary">
+                            审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="openRevoke(row)" size="mini" type="danger">
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
 
-		<template #edit>
-			<info ref="infoRef">
-				<div v-if="showApprovalForm">
-					<div class="process-title">
-						{{formData.taskName}}
-					</div>
-					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
-					         class="flow-task-form">
-						<el-form-item label="审批意见" prop="tf_opinion"
-						              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-							<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
-						</el-form-item>
-					</el-form>
-					<el-row type="flex" justify="end">
-						<el-button @click="$refs.guava.index()" size="small">取消</el-button>
-						<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
-						<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
-						<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
-					</el-row>
-				</div>
-			</info>
-		</template>
+        <template #edit>
+            <info ref="infoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="0" label-suffix="："
+                             class="flow-task-form">
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                        <el-form-item prop="tf_sign"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <pc-signature v-model="formData.tf_sign"></pc-signature>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </info>
+        </template>
 
-	</guava>
+    </guava>
 </div>
 <script nonce="${cspNonce!}">
-	<!--#include("../common/info.js"){}#-->
-	<!--#include("../common/commonQuery.js"){}#-->
+    <!--#include("../common/info.js"){}#-->
+    <!--#include("../common/commonQuery.js"){}#-->
     new Vue({
         el: "#app",
         store,
@@ -103,88 +108,93 @@ layout("/layouts/platform.html"){
                     { prop: "userName", label: "姓名", sortable: true },
                     { prop: "userState", label: "在职状态", sortable: true },
                     // { prop: "personType", label: "教职工类别", sortable: true },
-	                { prop: "preparedBy", label: "编制类别", sortable: true },
-	                { prop: "unionName", label: "所属工会", sortable: true },
+                    { prop: "nativePlace", label: "籍贯", sortable: true },
+                    // { prop: "preparedBy", label: "编制类别", sortable: true },
+                    { prop: "unionName", label: "所属工会", sortable: true },
                     { prop: "unitName", label: "所属单位", sortable: true },
-	                // { prop: "sign", label: "签字" },
-	                { prop: "curTaskName", label: "当前节点" },
-	                { prop: "instanceState", label: "流程状态" }
+                    // { prop: "sign", label: "签字" },
+                    { prop: "curTaskName", label: "当前节点" },
+                    { prop: "instanceState", label: "流程状态" }
                 ],
 
-	            // 审核相关
-	            showApprovalForm: false,
-	            formData: {
-		            tf_opinion: ""
-	            },
+                // 审核相关
+                showApprovalForm: false,
+                formData: {
+                    tf_opinion: ""
+                }
             }
         },
         components: {
-	        'info': INFO,
-	        'common-query': COMMON_QUERY,
+            "info": INFO,
+            "common-query": COMMON_QUERY
         },
         methods: {
-	        openView(row) {
-		        this.$refs.guava.edit(()=>{
-			        this.showApprovalForm = false
-			        this.$refs.infoRef.onOpen(row)
-		        })
+            openView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
+                })
             },
             openApproval(row) {
-	            this.$refs.guava.edit(()=>{
-		            this.showApprovalForm = true
-		            this.formData = {
-			            processTaskId: row.taskId,
-			            taskName: row.curTaskName
-		            }
-		            this.$refs.infoRef.onOpen(row)
-	            })
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(val) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要提交吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            const loading = createLoading()
+                            this.$axios.post("/flow/common/executeTask", {
+                                data: JSON.stringify({
+                                    ...this.formData,
+                                    submitType: val
+                                })
+                            }).then((res) => {
+                                if (res.code === 0) {
+                                    this.$refs.guava.index()
+                                    this.$message.success(res.msg)
+                                    this.doSearch()
+                                }
+                            }).finally(() => {
+                                loading.close()
+                            })
+                        })
+                    }
+                })
             },
-	        handleTaskAction(val) {
-		        this.$confirm("您确定要提交吗？", "提示", {
-			        confirmButtonText: "确定",
-			        cancelButtonText: "取消",
-			        type: "warning"
-		        }).then(() => {
-					const loading = createLoading()
-			        this.$axios.post("/flow/common/executeTask", {
-				        data: JSON.stringify({
-					        ...this.formData,
-					        submitType: val
-				        })
-			        }).then((res) => {
-				        if (res.code === 0) {
-					        this.$refs.guava.index()
-					        this.$message.success(res.msg)
-					        this.doSearch()
-				        }
-			        }).finally(() => {
-				        loading.close()
-			        })
-		        })
-	        },
             openRevoke(row) {
-	            this.$confirm("您确定要撤回吗？", "提示", {
-		            confirmButtonText: "确定",
-		            cancelButtonText: "取消",
-		            type: "info"
-	            }).then(() => {
-					const loading = createLoading()
-		            this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
-			            if (res.code === 0) {
-				            this.$message.success(res.msg)
-				            this.doSearch()
-			            }
-		            }).finally(()=>{
-						loading.close()
-					})
-	            })
+                this.$confirm("您确定要撤回吗？", "提示", {
+                    confirmButtonText: "确定",
+                    cancelButtonText: "取消",
+                    type: "info"
+                }).then(() => {
+                    const loading = createLoading()
+                    this.$axios.post("/flow/common/revokeTask", { taskId: row.taskId }).then((res) => {
+                        if (res.code === 0) {
+                            this.$message.success(res.msg)
+                            this.doSearch()
+                        }
+                    }).finally(() => {
+                        loading.close()
+                    })
+                })
             },
-	        search(pageForm){
-		        if (pageForm) {
-			        this.pageForm = {...this.pageForm, ...pageForm}
-		        }
-		        this.doSearch()
-	        },
+            search(pageForm) {
+                if (pageForm) {
+                    this.pageForm = { ...this.pageForm, ...pageForm }
+                }
+                this.doSearch()
+            }
         },
         created() {
             this.pageData()
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
index 653ebb8..d14d34d 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/common/info.js
@@ -16,22 +16,22 @@ const INFO = {
 			    
 			    <el-descriptions-item label="学历">{{ viewData.education }}</el-descriptions-item>
 			    <el-descriptions-item label="学位">{{ viewData.academicDegree }}</el-descriptions-item>
-			    <el-descriptions-item label="党政职务">{{ viewData.position }}</el-descriptions-item>
+			    <el-descriptions-item label="籍贯">{{ viewData.nativePlace }}</el-descriptions-item>
 			    
 			    <el-descriptions-item label="工作单位">{{ viewData.unitName }}</el-descriptions-item>
 			    <el-descriptions-item label="所属工会">{{ viewData.unionName }}</el-descriptions-item>
+			    <el-descriptions-item label="岗位名称">{{ viewData.jobCategory }}</el-descriptions-item>
 <!--			    <el-descriptions-item label="所属校区">{{ viewData.campus }}</el-descriptions-item>-->
 			    
 			    <el-descriptions-item label="身份证号码">{{ viewData.idCard }}</el-descriptions-item>
 			    <el-descriptions-item label="联系电话">{{ viewData.mobile }}</el-descriptions-item>
 <!--			    <el-descriptions-item label="电子邮箱">{{ viewData.email }}</el-descriptions-item>-->
 			    
-			    <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>
+<!--			    <el-descriptions-item label="在职状态">{{ viewData.userState }}</el-descriptions-item>-->
 <!--			    <el-descriptions-item label="教职工类别">{{ viewData.personType }}</el-descriptions-item>-->
-			    <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>
+<!--			    <el-descriptions-item label="编制类别">{{ viewData.preparedBy }}</el-descriptions-item>-->
 			    <el-descriptions-item label="婚姻状况">{{ viewData.marriage }}</el-descriptions-item>
                 <el-descriptions-item label="入职时间">{{ viewData.arrivalAtSchoolDate }}</el-descriptions-item>
-                <el-descriptions-item></el-descriptions-item>
                 <el-descriptions-item label="家庭住址" :span="3">{{ viewData.homeAddress }}</el-descriptions-item>
                 
 			    
@@ -101,8 +101,12 @@ const INFO = {
 					    </template>
 					    
 					    <el-descriptions-item label="办理意见" :span="3" v-if="!task.ext.isFirstTaskNode">{{
-						    task.taskFormData.opinion }}
+						    task.taskFormData.tf_opinion }}
 					    </el-descriptions-item>
+                        <el-descriptions-item label="签字信息" :span="3" v-if="!task.ext.isFirstTaskNode">
+                            <el-image :src="task.taskFormData.tf_sign"
+                                      class="signature-image"></el-image>
+                        </el-descriptions-item>
 				    </el-descriptions>
 			    </div>
 		    </template>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
index 1ed94e3..eaa84c5 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/mine/index.html
@@ -86,7 +86,7 @@ layout("/layouts/platform.html"){
 					{ prop: "userName", label: "姓名", sortable: true },
 					{ prop: "userState", label: "在职状态", sortable: true },
 					// { prop: "personType", label: "教职工类别", sortable: true },
-					{ prop: "preparedBy", label: "编制类别", sortable: true },
+					{ prop: "nativePlace", label: "籍贯", sortable: true },
 					{ prop: "unionName", label: "所属工会", sortable: true },
 					{ prop: "unitName", label: "所属单位", sortable: true },
 					// { prop: "sign", label: "签字" },
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
index b85f072..f6ba705 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/schoolunionapproval/index.html
@@ -2,111 +2,116 @@
 layout("/layouts/platform.html"){
 #-->
 <div id="app" v-cloak>
-	<guava ref="guava">
-		<el-card shadow="never">
-			<common-query ref="commonQueryRef" @search="search"></common-query>
-		</el-card>
+    <guava ref="guava">
+        <el-card shadow="never">
+            <common-query ref="commonQueryRef" @search="search"></common-query>
+        </el-card>
 
-		<el-card shadow="never" class="mt10">
-			<table-tool label="申请列表">
-				<el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
-					<el-radio-button label="true">已审核</el-radio-button>
-					<el-radio-button label="false">未审核</el-radio-button>
-				</el-radio-group>
-			</table-tool>
-			<el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id" style="width: 100%">
-				<el-table-column
-						:index="indexMethod"
-						align="center"
-						header-align="center"
-						label="序号"
-						type="index"
-						width="80px"
-				></el-table-column>
-				<el-table-column
-						:label="column.label"
-						:prop="column.prop"
-						:sortable="column.sortable"
-						:width="column.width"
-						header-align="center"
-						min-width="100px"
-						show-overflow-tooltip
-						v-for="column in tableColumns"
-				>
-					<template scope="{row}" v-if="column.prop=='loginname'">
-						<el-link @click="openView(row)" type="primary">{{row.loginname}}</el-link>
-					</template>
-					<template scope="{row}" v-else-if="column.prop=='sign'">
-						<el-image v-if="row.sign" :src="row.sign" style="height: 60px"></el-image>
-						<el-tag type="warning" v-else>暂无</el-tag>
-					</template>
-					<template scope="{row}" v-else-if="column.prop=='instanceState'">
-						<enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
-						          size="small"></enum-tag>
-					</template>
-				</el-table-column>
-				<el-table-column label="操作" fixed="right" width="200px">
-					<template scope="{row}">
-						<el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
-						<el-button v-if="row.taskState === 10" @click="openApproval(row)" size="mini" type="primary">
-							审核
-						</el-button>
-						<el-button v-if="row.canRevoke" @click="openRevoke(row.taskId)" size="mini" type="danger">
-							撤回
-						</el-button>
-					</template>
-				</el-table-column>
-			</el-table>
-			<!--#include("/layouts/pagination.html"){}#-->
-		</el-card>
+        <el-card shadow="never" class="mt10">
+            <table-tool label="申请列表">
+                <el-radio-group @change="doSearch" class="mr5" size="small" v-model="pageForm.audit">
+                    <el-radio-button label="true">已审核</el-radio-button>
+                    <el-radio-button label="false">未审核</el-radio-button>
+                </el-radio-group>
+            </table-tool>
+            <el-table :data="tableData" :size="tableSize" @sort-change="pageOrder" ref="table" row-key="id"
+                      style="width: 100%">
+                <el-table-column
+                    :index="indexMethod"
+                    align="center"
+                    header-align="center"
+                    label="序号"
+                    type="index"
+                    width="80px"
+                ></el-table-column>
+                <el-table-column
+                    :label="column.label"
+                    :prop="column.prop"
+                    :sortable="column.sortable"
+                    :width="column.width"
+                    header-align="center"
+                    min-width="100px"
+                    show-overflow-tooltip
+                    v-for="column in tableColumns"
+                >
+                    <template scope="{row}" v-if="column.prop=='loginname'">
+                        <el-link @click="openView(row)" type="primary">{{row.loginname}}</el-link>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='sign'">
+                        <el-image v-if="row.sign" :src="row.sign" style="height: 60px"></el-image>
+                        <el-tag type="warning" v-else>暂无</el-tag>
+                    </template>
+                    <template scope="{row}" v-else-if="column.prop=='instanceState'">
+                        <enum-tag :value="row.instanceState" name="ProcessInstanceStateEnum" label_key="message"
+                                  size="small"></enum-tag>
+                    </template>
+                </el-table-column>
+                <el-table-column label="操作" fixed="right" width="200px">
+                    <template scope="{row}">
+                        <el-button size="mini" type="primary" @click="openView(row)">查看</el-button>
+                        <el-button v-if="row.taskState === 10" @click="openApproval(row)" size="mini" type="primary">
+                            审核
+                        </el-button>
+                        <el-button v-if="row.canRevoke" @click="openRevoke(row.taskId)" size="mini" type="danger">
+                            撤回
+                        </el-button>
+                    </template>
+                </el-table-column>
+            </el-table>
+            <!--#include("/layouts/pagination.html"){}#-->
+        </el-card>
 
-		<template #edit>
-			<info ref="infoRef">
-				<div v-if="showApprovalForm">
-					<div class="process-title">
-						{{formData.taskName}}
-					</div>
-					<el-form :model="formData" ref="formRef" :rules="formRules" label-width="130px" label-suffix="：">
-						<el-row :gutter="20" v-if="formData.origin === 'HMC'">
-							<el-col :span="12">
-								<el-form-item label="分配工会关系" prop="tf_allocation_unionId"
-								              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-									<el-select clearable filterable placeholder="请选择工会" style="width: 100%;"
-									           @change="assignmentUnionName"
-									           v-model="formData.tf_allocation_unionId">
-										<el-option :key="item.id" :label="item.name" :value="item.id"
-										           v-for="item in unions"></el-option>
-									</el-select>
-								</el-form-item>
-							</el-col>
+        <template #edit>
+            <info ref="infoRef">
+                <div v-if="showApprovalForm">
+                    <div class="process-title">
+                        {{formData.taskName}}
+                    </div>
+                    <el-form :model="formData" ref="formRef" :rules="formRules" label-width="130px" label-suffix="：">
+                        <el-row :gutter="20" v-if="formData.origin === 'HMC'">
+                            <el-col :span="12">
+                                <el-form-item label="分配工会关系" prop="tf_allocation_unionId"
+                                              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                                    <el-select clearable filterable placeholder="请选择工会" style="width: 100%;"
+                                               @change="assignmentUnionName"
+                                               v-model="formData.tf_allocation_unionId">
+                                        <el-option :key="item.id" :label="item.name" :value="item.id"
+                                                   v-for="item in unions"></el-option>
+                                    </el-select>
+                                </el-form-item>
+                            </el-col>
 
-							<el-col :span="12">
-								<el-form-item label="当前所在工会" prop="tf_self_unionName">
-									<el-input v-model="formData.tf_self_unionName" readonly></el-input>
-								</el-form-item>
-							</el-col>
-						</el-row>
+                            <el-col :span="12">
+                                <el-form-item label="当前所在工会" prop="tf_self_unionName">
+                                    <el-input v-model="formData.tf_self_unionName" readonly></el-input>
+                                </el-form-item>
+                            </el-col>
+                        </el-row>
 
-						<el-form-item label="审批意见" prop="tf_opinion"
-						              :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
-							<user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
-						</el-form-item>
-					</el-form>
-					<el-row type="flex" justify="end">
-						<el-button @click="$refs.guava.index()" size="small">取消</el-button>
-						<el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
-						<el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
-						<el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
-					</el-row>
-				</div>
-			</info>
-		</template>
+                        <el-form-item label="审批意见" prop="tf_opinion"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <user-opinion-textarea v-model="formData.tf_opinion"></user-opinion-textarea>
+                        </el-form-item>
+                        <el-form-item prop="tf_sign" label="签字"
+                                      :rules="[{required:true,message:'必填',trigger:['change','blur']}]">
+                            <pc-signature v-model="formData.tf_sign"></pc-signature>
+                        </el-form-item>
+                    </el-form>
+                    <el-row type="flex" justify="end">
+                        <el-button @click="$refs.guava.index()" size="small">取消</el-button>
+                        <el-button @click="handleTaskAction(6)" size="small" type="info">退回到发起人</el-button>
+                        <el-button @click="handleTaskAction(2)" size="small" type="danger">拒绝申请</el-button>
+                        <el-button @click="handleTaskAction(1)" size="small" type="primary">同意申请</el-button>
+                    </el-row>
+                </div>
+            </info>
+        </template>
 
-	</guava>
+    </guava>
 </div>
 <script nonce="${cspNonce!}">
-	<!--#include("../common/info.js"){}#-->
-	<!--#include("../common/commonQuery.js"){}#-->
+    <!--#include("../common/info.js"){}#-->
+    <!--#include("../common/commonQuery.js"){}#-->
     new Vue({
         el: "#app",
         store,
@@ -120,78 +125,83 @@ layout("/layouts/platform.html"){
                     { prop: "loginName", label: "工号", sortable: true },
                     { prop: "userName", label: "姓名", sortable: true },
                     { prop: "userState", label: "在职状态", sortable: true },
-                    { prop: "personType", label: "教职工类别", sortable: true },
-	                { prop: "preparedBy", label: "编制类别", sortable: true },
-	                { prop: "unionName", label: "所属工会", sortable: true },
+                    { prop: "nativePlace", label: "籍贯", sortable: true },
+                    // { prop: "personType", label: "教职工类别", sortable: true },
+                    // { prop: "preparedBy", label: "编制类别", sortable: true },
+                    { prop: "unionName", label: "所属工会", sortable: true },
                     { prop: "unitName", label: "所属单位", sortable: true },
-	                { prop: "sign", label: "签字" },
+                    // { prop: "sign", label: "签字" },
                     { prop: "curTaskName", label: "当前节点" },
-	                { prop: "instanceState", label: "流程状态" }
+                    { prop: "instanceState", label: "流程状态" }
                 ],
 
-	            // 审核相关
-	            showApprovalForm: false,
-	            formData: {
-		            tf_opinion: ""
-	            },
-	            unions: [],
+                // 审核相关
+                showApprovalForm: false,
+                formData: {
+                    tf_opinion: ""
+                },
+                unions: []
             }
         },
         components: {
-	        'info': INFO,
-	        'common-query': COMMON_QUERY,
+            "info": INFO,
+            "common-query": COMMON_QUERY
         },
         methods: {
-	        openView(row) {
-		        this.$refs.guava.edit(()=>{
-			        this.showApprovalForm = false
-			        this.$refs.infoRef.onOpen(row)
-		        })
-	        },
-	        openApproval(row) {
-		        this.$refs.guava.edit(()=>{
-			        this.showApprovalForm = true
-			        this.formData = {
-				        origin: row.origin,
-				        processTaskId: row.taskId,
-				        taskName: row.curTaskName
-			        }
-					if (row.origin === "HMC") {
-						this.$set(this.formData, "tf_self_unionName", this.$store.state.user.union.name)
-					}
-			        this.$refs.infoRef.onOpen(row)
-		        })
-	        },
-	        handleTaskAction(val) {
-		        this.$confirm("您确定要提交吗？", "提示", {
-			        confirmButtonText: "确定",
-			        cancelButtonText: "取消",
-			        type: "warning"
-		        }).then(() => {
-					const loading = createLoading()
-			        this.$axios.post("/flow/common/executeTask", {
-				        data: JSON.stringify({
-					        ...this.formData,
-					        submitType: val
-				        })
-			        }).then((res) => {
-				        if (res.code === 0) {
-					        this.$refs.guava.index()
-					        this.$message.success(res.msg)
-					        this.doSearch()
-				        }
-			        }).finally(() => {
-				        loading.close()
-			        })
-		        })
-	        },
+            openView(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = false
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            openApproval(row) {
+                this.$refs.guava.edit(() => {
+                    this.showApprovalForm = true
+                    this.formData = {
+                        origin: row.origin,
+                        processTaskId: row.taskId,
+                        taskName: row.curTaskName
+                    }
+                    if (row.origin === "HMC") {
+                        this.$set(this.formData, "tf_self_unionName", this.$store.state.user.union.name)
+                    }
+                    this.$refs.infoRef.onOpen(row)
+                })
+            },
+            handleTaskAction(val) {
+                this.$refs.formRef.validate((valid) => {
+                    if (valid) {
+                        this.$confirm("您确定要提交吗？", "提示", {
+                            confirmButtonText: "确定",
+                            cancelButtonText: "取消",
+                            type: "warning"
+                        }).then(() => {
+                            const loading = createLoading()
+                            this.$axios.post("/flow/common/executeTask", {
+                                data: JSON.stringify({
+                                    ...this.formData,
+                                    submitType: val
+                                })
+                            }).then((res) => {
+                                if (res.code === 0) {
+                                    this.$refs.guava.index()
+                                    this.$message.success(res.msg)
+                                    this.doSearch()
+                                }
+                            }).finally(() => {
+                                loading.close()
+                            })
+                        })
+                    }
+                })
+            },
             openRevoke(taskId) {
                 this.$confirm("您确定要撤回吗？", "提示", {
                     confirmButtonText: "确定",
                     cancelButtonText: "取消",
                     type: "info"
                 }).then(() => {
-					const loading = createLoading()
+                    const loading = createLoading()
                     this.$axios.post("/flow/common/revokeTask", { taskId }).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
@@ -202,23 +212,23 @@ layout("/layouts/platform.html"){
                     })
                 })
             },
-	        search(pageForm){
-		        if (pageForm) {
-			        this.pageForm = {...this.pageForm, ...pageForm}
-		        }
-		        this.doSearch()
-	        },
-	        // 分配工会名称
-	        assignmentUnionName(val) {
-		        const union = this.unions.find(item => item.id === val)
-		        this.$set(this.formData, "tf_allocation_unionName", union.name)
-	        },
+            search(pageForm) {
+                if (pageForm) {
+                    this.pageForm = { ...this.pageForm, ...pageForm }
+                }
+                this.doSearch()
+            },
+            // 分配工会名称
+            assignmentUnionName(val) {
+                const union = this.unions.find(item => item.id === val)
+                this.$set(this.formData, "tf_allocation_unionName", union.name)
+            }
         },
         created() {
-			this.pageData()
-	        this.$businessTool.listUnion().then(data => {
-		        this.unions = data
-	        })
+            this.pageData()
+            this.$businessTool.listUnion().then(data => {
+                this.unions = data
+            })
         }
     })
 </script>
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
index c902dba..30e2c1a 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html
@@ -60,9 +60,9 @@ layout("/layouts/platform.html"){
                                      code="USER_ACADEMIC_DEGREE"></dict-select>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item label="党政职务">
-                    <el-form-item prop="position">
-                        <el-input v-model="formData.position" placeholder="请输入党政职务"
+                <el-descriptions-item label="籍贯">
+                    <el-form-item prop="nativePlace">
+                        <el-input v-model="formData.nativePlace" placeholder="请输入籍贯"
                                   maxlength="50"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
@@ -90,24 +90,31 @@ layout("/layouts/platform.html"){
                         </el-descriptions-item>-->
 
 
-                <el-descriptions-item label="在职状态">
+                <el-descriptions-item label="岗位名称">
+                    <el-form-item prop="jobCategory">
+                        <el-input v-model="formData.jobCategory" placeholder="请输入岗位名称"
+                                  maxlength="50"></el-input>
+                    </el-form-item>
+                </el-descriptions-item>
+
+               <!-- <el-descriptions-item label="在职状态">
                     <el-form-item prop="userState">
                         <dict-select v-model="formData.userState" code="USER_STATE"
                                      disabled style="width: 100%"></dict-select>
                     </el-form-item>
-                </el-descriptions-item>
+                </el-descriptions-item>-->
                 <!--<el-descriptions-item label="教职工类别">
                     <el-form-item prop="personType">
                         <dict-select v-model="formData.personType" code="USER_PERSON_TYPE"
                                       style="width: 100%"></dict-select>
                     </el-form-item>
                 </el-descriptions-item>-->
-                <el-descriptions-item label="编制类别">
+                <!--<el-descriptions-item label="编制类别">
                     <el-form-item prop="preparedBy">
                         <dict-select v-model="formData.preparedBy" code="USER_PREPARED_BY_TYPE"
                                      disabled style="width: 100%"></dict-select>
                     </el-form-item>
-                </el-descriptions-item>
+                </el-descriptions-item>-->
                 <el-descriptions-item label="婚姻状况">
                     <el-form-item prop="marriage" label="婚姻状况">
                         <dict-select v-model="formData.marriage" code="USER_MARRIAGE"
@@ -133,7 +140,6 @@ layout("/layouts/platform.html"){
                                   disabled maxlength="50"></el-input>
                     </el-form-item>
                 </el-descriptions-item>
-                <el-descriptions-item></el-descriptions-item>
                 <el-descriptions-item label="家庭住址" :span="3">
                     <el-form-item prop="homeAddress" label="家庭住址">
                         <el-input v-model="formData.homeAddress" placeholder="请输入家庭住址" maxlength="90"></el-input>
@@ -219,11 +225,11 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
-                <!--				<el-descriptions-item label="签字" :span="3">-->
-                <!--					<el-form-item prop="sign">-->
-                <!--						<pc-signature v-model="formData.sign"></pc-signature>-->
-                <!--					</el-form-item>-->
-                <!--				</el-descriptions-item>-->
+                <el-descriptions-item label="签字" :span="3">
+                    <el-form-item prop="sign">
+                        <pc-signature v-model="formData.sign"></pc-signature>
+                    </el-form-item>
+                </el-descriptions-item>
             </el-descriptions>
         </el-form>
         <el-row type="flex" justify="end" class="mt20">
@@ -256,7 +262,9 @@ layout("/layouts/platform.html"){
                     personalData: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                     specialty: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
                     marriage: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
-                    arrivalAtSchoolDate: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
+                    arrivalAtSchoolDate: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    nativePlace: [{ required: true, message: "必填", trigger: ["change", "blur"] }],
+                    jobCategory: [{ required: true, message: "必填", trigger: ["change", "blur"] }]
                     /*email: [
                         {
                             validator: (rule, value, callback) => {
diff --git a/src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index.html b/src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index.html
index 8f8990b..475c876 100644
--- a/src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index.html
+++ b/src/main/resources/views/platform/zhgh/staffmanage/member/info/board/index.html
@@ -89,7 +89,7 @@ layout("/layouts/platform.html"){
     .content-left {
         grid-column: 1 / 4;
         display: grid;
-        grid-template-rows: 1fr 1fr;
+        /*grid-template-rows: 1fr 1fr;*/
         gap: 20px;
         min-height: 0;
     }
@@ -332,10 +332,10 @@ layout("/layouts/platform.html"){
                     <div class="chart-container" id="personTypeMemberChart" v-loading="loading.personTypeMember"></div>
                 </div>-->
                 <!-- 在职类型图表 -->
-                <div class="card">
+               <!-- <div class="card">
                     <div class="card-title">人员类型统计</div>
                     <div class="chart-container" id="userStateMemberChart" v-loading="loading.userStateMember"></div>
-                </div>
+                </div>-->
             </div>
 
             <!-- 右侧表格区域 -->
@@ -622,8 +622,8 @@ layout("/layouts/platform.html"){
                             // X轴配置
                             xAxis: {
                                 label: {
-                                    autoHide: true,
-                                    autoRotate: false,
+                                    autoHide: false,
+                                    autoRotate: true,
                                     style: {
                                         fill: '#666',
                                         fontSize: 12