独生子女父母退休bug修改

src/main/java/com/budwk/app/zhgh/staffbenefit/dsznfmtx/controller/DsznfmtxSchoolAuditController.java

@@ -53,7 +53,7 @@ public class DsznfmtxSchoolAuditController {
 
     @At
     @ApiOperation("分页查询")
-    @SaCheckPermission(value = {"dsznfmtx.unionAudit", "h5.dsznfmtx.unionAudit"}, mode = SaMode.OR)
+    @SaCheckPermission(value = {"dsznfmtx.schoolAudit", "h5.dsznfmtx.schoolAudit"}, mode = SaMode.OR)
     public Result pageData(PageForm pageForm,
                            boolean approval,
                            Integer year,

src/main/resources/views/platform/zhgh/dayofficework/cadreTraining/schoolAudit/index.html

@@ -170,7 +170,7 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/apply/index.html

@@ -4,7 +4,7 @@ layout("/layouts/platform.html"){
 <div id="app" v-cloak>
     <el-card shadow="never">
         <snaker-start slot="header" label="申请表单" define_key="DSZNFMTX"></snaker-start>
-        <el-form :model="formData" ref="formRef" :rules="formRules" label-suffix="：" label-width="120px">
+        <el-form :model="formData" ref="formRef" :rules="formRules" label-suffix="：" label-width="170px">
             <!-- 将表单项按两列重新排列 -->
             <el-row :gutter="20">
                 <el-col :span="12">
@@ -106,20 +106,21 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-col>
                 <el-col :span="12">
-                    <el-form-item label="独生子女光荣证号" prop="childrenGraceNumber">
+                    <el-form-item label="办证机关" prop="office">
-                        <el-input type="text" v-model="formData.childrenGraceNumber"
+                        <el-input type="text" v-model="formData.office"
-                                  placeholder="请输入独生子女光荣证号"></el-input>
+                                  placeholder="请输入办证机关"></el-input>
                     </el-form-item>
                 </el-col>
             </el-row>
 
             <el-row :gutter="20">
                 <el-col :span="12">
-                    <el-form-item label="办证机关" prop="office">
+                    <el-form-item label="独生子女光荣证号" prop="childrenGraceNumber">
-                        <el-input type="text" v-model="formData.office"
+                        <el-input type="text" v-model="formData.childrenGraceNumber"
-                                  placeholder="请输入办证机关"></el-input>
+                                  placeholder="请输入独生子女光荣证号"></el-input>
                     </el-form-item>
                 </el-col>
+
             </el-row>
 
             <!-- 以下项目保持单独一行 -->
@@ -349,6 +350,7 @@ layout("/layouts/platform.html"){
                         unionName: union.name,
                         sex: sex,
                         birthday: birthday,
+                        loverSex: sex === '男' ? '女' : '男'
                     }
                 }
             }

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/mine/index.html

@@ -34,7 +34,7 @@ layout("/layouts/platform.html"){
                         <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onEdit(row)" size="mini" type="primary">编辑</el-button>
                         <el-button v-if="row.canRevoke" @click="onRevoke(row)" size="mini" type="danger">撤回
                         </el-button>
-                        <el-button @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
+                        <el-button v-if="row.taskKey === 'startTask' || !row.instanceId" @click="onDelete(row.id)" size="mini" type="danger">删除</el-button>
                     </template>
                 </el-table-column>
             </el-table>

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/schoolAudit/index.html

@@ -173,7 +173,7 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/dsznfmtx/unionAudit/index.html

@@ -18,6 +18,7 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </search-item>
+                <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
                 <search-item label="工会名称">
                     <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
                                placeholder="请选择工会名称" clearable>
@@ -38,6 +39,7 @@ layout("/layouts/platform.html"){
                         ></el-option>
                     </el-select>
                 </search-item>
+                </template>
             </search>
         </el-card>
         <el-card shadow="never">
@@ -150,7 +152,7 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.pageData()
@@ -181,10 +183,23 @@ layout("/layouts/platform.html"){
         },
         created() {
             this.pageData()
-            //工会查询
+            // 根据用户角色加载相应的工会和单位数据
-            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
-            //单位查询
+                this.$businessTool.listUnion().then((data) => {
-            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+                    this.unionOptions = data || []
+                })
+                this.$businessTool.listUnit().then((data) => {
+                    this.unitOptions = data || []
+                })
+            } else if (this.$auth.hasRole("BRANCH_UNION_CHAIRMAN")) {
+                const userUnionId = this.$store.state.user.union.id
+                this.$businessTool.listUnion(userUnionId).then((data) => {
+                    this.unionOptions = data ? [data] : []
+                })
+                this.$businessTool.listUnit(userUnionId).then((data) => {
+                    this.unitOptions = data || []
+                })
+            }
         }
     })
 </script>

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/schoolAudit/index.html

@@ -151,7 +151,7 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.pageData()

src/main/resources/views/platform/zhgh/staffbenefit/maternityLeave/unionAudit/index.html

@@ -18,26 +18,28 @@ layout("/layouts/platform.html"){
                         <el-option label="女" value="女"></el-option>
                     </el-select>
                 </search-item>
-                <search-item label="工会名称">
+                <template v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN', 'BRANCH_UNION_CHAIRMAN'])">
-                    <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
+                    <search-item label="工会名称">
-                               placeholder="请选择工会名称" clearable>
+                        <el-select v-model="pageForm.unionId" @change="doSearch" style="width: 100%"
-                        <el-option v-for="item in unionOptions"
+                                   placeholder="请选择工会名称" clearable>
-                                   :value="item.id"
+                            <el-option v-for="item in unionOptions"
-                                   :key="item.id"
+                                       :value="item.id"
-                                   :label="item.name"
+                                       :key="item.id"
-                        ></el-option>
+                                       :label="item.name"
-                    </el-select>
+                            ></el-option>
-                </search-item>
+                        </el-select>
-                <search-item label="单位名称">
+                    </search-item>
-                    <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
+                    <search-item label="单位名称">
-                               placeholder="请选择单位名称" clearable>
+                        <el-select v-model="pageForm.unitId" @change="doSearch" style="width: 100%"
-                        <el-option v-for="item in unitOptions"
+                                   placeholder="请选择单位名称" clearable>
-                                   :value="item.id"
+                            <el-option v-for="item in unitOptions"
-                                   :key="item.id"
+                                       :value="item.id"
-                                   :label="item.name"
+                                       :key="item.id"
-                        ></el-option>
+                                       :label="item.name"
-                    </el-select>
+                            ></el-option>
-                </search-item>
+                        </el-select>
+                    </search-item>
+                </template>
             </search>
         </el-card>
         <el-card shadow="never">
@@ -151,7 +153,7 @@ layout("/layouts/platform.html"){
                     cancelButtonText: "取消",
                     type: "warning"
                 }).then(() => {
-                    this.$axios.post("/flow/common/revokeTask", {taskId: row.startTaskId}).then((res) => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then((res) => {
                         if (res.code === 0) {
                             this.$message.success(res.msg)
                             this.pageData()
@@ -182,10 +184,23 @@ layout("/layouts/platform.html"){
         },
         created() {
             this.pageData()
-            //工会查询
+            // 根据用户角色加载相应的工会和单位数据
-            this.$businessTool.listUnion().then((res) => (this.unionOptions = res))
+            if (this.$auth.hasRoleOr(["SYSADMIN", "SCHOOL_UNION_ADMIN"])) {
-            //单位查询
+                this.$businessTool.listUnion().then((data) => {
-            this.$businessTool.listUnit().then((res) => (this.unitOptions = res))
+                    this.unionOptions = data || []
+                })
+                this.$businessTool.listUnit().then((data) => {
+                    this.unitOptions = data || []
+                })
+            } else if (this.$auth.hasRole("BRANCH_UNION_CHAIRMAN")) {
+                const userUnionId = this.$store.state.user.union.id
+                this.$businessTool.listUnion(userUnionId).then((data) => {
+                    this.unionOptions = data ? [data] : []
+                })
+                this.$businessTool.listUnit(userUnionId).then((data) => {
+                    this.unitOptions = data || []
+                })
+            }
         }
     })
 </script>

src/main/resources/views/platform/zhghh5/dayofficework/unionReimburse/review/index.html

@@ -49,6 +49,10 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
         </template>
     </table-list>
 
@@ -116,6 +120,22 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: '温馨提示',
+                    message: '您确定要撤回吗？',
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => {
+                        if (res.code === 0) {
+                            this.$toast.success("提交成功")
+                            this.doSearch()
+                            this.infoShow = false
+                        }
+                    })
+                }).catch(() => {
+                    // on cancel
+                });
+            },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({

src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/schoolAudit/index.html

@@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
         </template>
     </table-list>
 
@@ -185,6 +189,22 @@ layout("/layouts/platform_h5.html"){
                     console.error('获取申请数据失败:', error);
                 });
             },
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: '温馨提示',
+                    message: '您确定要撤回吗？',
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => {
+                        if (res.code === 0) {
+                            this.$toast.success("提交成功")
+                            this.doSearch()
+                            this.infoShow = false
+                        }
+                    })
+                }).catch(() => {
+                    // on cancel
+                });
+            },
 
             // 执行任务操作
             executeTaskAction(val) {

src/main/resources/views/platform/zhghh5/staffbenefit/dsznfmtx/unionAudit/index.html

@@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
         </template>
     </table-list>
 
@@ -108,6 +112,22 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: '温馨提示',
+                    message: '您确定要撤回吗？',
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => {
+                        if (res.code === 0) {
+                            this.$toast.success("提交成功")
+                            this.doSearch()
+                            this.infoShow = false
+                        }
+                    })
+                }).catch(() => {
+                    // on cancel
+                });
+            },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({

src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/schoolAudit/index.html

@@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
         </template>
     </table-list>
 
@@ -108,6 +112,22 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: '温馨提示',
+                    message: '您确定要撤回吗？',
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => {
+                        if (res.code === 0) {
+                            this.$toast.success("提交成功")
+                            this.doSearch()
+                            this.infoShow = false
+                        }
+                    })
+                }).catch(() => {
+                    // on cancel
+                });
+            },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({

src/main/resources/views/platform/zhghh5/staffbenefit/maternityLeave/unionAudit/index.html

@@ -41,6 +41,10 @@ layout("/layouts/platform_h5.html"){
                 <i class="fa fa-edit"></i>
                 <span>审核</span>
             </div>
+            <div class="action-btn delete" v-if="row.canRevoke" @click="onRevoke(row)">
+                <i class="fa fa-undo"></i>
+                <span>撤回</span>
+            </div>
         </template>
     </table-list>
 
@@ -108,6 +112,22 @@ layout("/layouts/platform_h5.html"){
             }
         },
         methods: {
+            onRevoke(row) {
+                this.$dialog.confirm({
+                    title: '温馨提示',
+                    message: '您确定要撤回吗？',
+                }).then(() => {
+                    this.$axios.post("/flow/common/revokeTask", {taskId: row.taskId}).then(res => {
+                        if (res.code === 0) {
+                            this.$toast.success("提交成功")
+                            this.doSearch()
+                            this.infoShow = false
+                        }
+                    })
+                }).catch(() => {
+                    // on cancel
+                });
+            },
             handleTaskAction(val) {
                 this.$refs.formRef.validate().then(() => {
                     this.$dialog.confirm({