From fc4ae41785732cecfcc359baaa3b91a404c02aa0 Mon Sep 17 00:00:00 2001
From: zhangrui <zr15972328402@163.com>
Date: Thu, 9 Apr 2026 16:00:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BD=93=E6=A3=80=E7=AE=A1=E7=90=86bug?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../HealthCheckupListController.java          |  3 ++
 .../healthCheckup/listMange/index.html        |  7 ++--
 .../healthCheckup/statisticsSingle/index.html | 38 +++++++++++++++----
 3 files changed, 38 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
index 36b9075f..3f3a6dd2 100644
--- a/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
+++ b/src/main/java/com/budwk/app/zhgh/dayofficework/healthCheckup/controller/HealthCheckupListController.java
@@ -191,6 +191,9 @@ public class HealthCheckupListController {
     @SLog(type = "healthCheckup", tag = "体检管理", msg = "管理员编辑了一条选择记录")
     @SaCheckPermission("healthCheckup.list.mange")
     public Result doEditHealthCheckupData(String subjectId, String campus, String projectId, String userId, String bz) {
+        if(!AuthUtil.hasRoleOr(RoleConstant.SYSADMIN.name())) {
+            return Result.error("您没有操作此按钮的权限");
+        }
         //查询用户符合哪个套餐
         List<HealthCheckupProjectSubjectMoney> list = healthCheckupProjectService.dao().query(HealthCheckupProjectSubjectMoney.class,
                 Cnd.where(HealthCheckupProjectSubjectMoney::getSubjectId, "=", subjectId));
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
index 6921432c..88933263 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/listMange/index.html
@@ -137,12 +137,13 @@ layout("/layouts/platform.html"){
                                      fixed="right">
                         <template slot-scope="{row}">
                             <el-button @click="openEditHealthCheckup(row)" size="mini"
-                                       :disabled="row.isAudit" type="primary">
+                                       v-if="$auth.hasRoleOr(['SYSADMIN'])"
+                                       type="primary">
                                 编辑
                             </el-button>
 	                        <el-button @click="doDelete(row.headId)" size="mini"
-	                                   v-if="$auth.hasPermissionOr(['healthCheckup.list.delete'])"
-	                                   :disabled="row.isAudit" type="danger">
+	                                   v-if="$auth.hasPermissionOr(['healthCheckup.list.delete']) && $auth.hasRoleOr(['SYSADMIN'])"
+	                                   type="danger">
 		                        删除
 	                        </el-button>
                         </template>
diff --git a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html
index c90fd72a..5a5d9121 100644
--- a/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html
+++ b/src/main/resources/views/platform/zhgh/dayofficework/healthCheckup/statisticsSingle/index.html
@@ -74,12 +74,12 @@ layout("/layouts/platform.html"){
                                          type="primary"
                                          v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">管理员代选择
                               </el-button>-->
-                            <el-button @click="selectOptionByLastYear"
-                                       icon="el-icon-printer"
-                                       size="small"
-                                       type="primary"
-                                       v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">一键选择去年数据
-                            </el-button>
+<!--                            <el-button @click="openLastYear"-->
+<!--                                       icon="el-icon-printer"-->
+<!--                                       size="small"-->
+<!--                                       type="primary"-->
+<!--                                       v-if="$auth.hasRoleOr(['SYSADMIN', 'SCHOOL_UNION_ADMIN'])">一键选择去年数据-->
+<!--                            </el-button>-->
                             <el-button @click="msgNotSelect"
                                        icon="el-icon-printer"
                                        size="small"
@@ -226,6 +226,26 @@ layout("/layouts/platform.html"){
             <el-button @click="doSelectByAdmin" type="primary" :loading="loading">提交</el-button>
         </el-row>
     </el-dialog>
+	
+	<el-dialog :visible.sync="selectLastYearProject" title="选择去年项目"
+	           width="35%">
+		<el-form label-position="right" label-width="120px">
+			<el-form-item label="体检项目">
+				<el-select style="width: 100%" v-model="noSelectOptionId">
+					<el-option :key="item.id" :label="item.optionName" :value="item.id"
+					           v-for="item in projectSubjectOptions"></el-option>
+				</el-select>
+			</el-form-item>
+		</el-form>
+		<el-row justify="end" type="flex">
+			<el-button @click="selectLastYearProject=false">取消</el-button>
+			<el-button @click="selectOptionByLastYear" type="primary" :loading="loading">提交</el-button>
+		</el-row>
+	</el-dialog>
+	
+	
+	
+	
 </div>
 
 <script>
@@ -262,6 +282,7 @@ layout("/layouts/platform.html"){
                 noSelectOptionId: null,
                 campus: null,
                 loading: false,
+	            selectLastYearProject: false,
             }
         },
         methods: {
@@ -506,7 +527,10 @@ layout("/layouts/platform.html"){
                     }
                 });
                 return sums;
-            }
+            },
+	        openLastYear(){
+		        this.selectLastYearProject = true;
+	        }
         },
         async created() {
             this.init()