Merge branch 'developer' of ssh://code.cyweb.top:30033/scj/zhxy/v3/cloud-ui into developer

src/components/DateRangePicker/index.vue

@@ -0,0 +1,83 @@
+<template>
+  <el-form-item :label="label" :required="required" :style="outerStyle">
+    <el-row :gutter="20">
+      <el-col :span="11">
+        <el-form-item :prop="startProp">
+          <slot name="startDatePicker">
+          </slot>
+        </el-form-item>
+      </el-col>
+      <el-col :span="2" class="time-separator">
+        <slot name="separator">
+          <span>{{ separator }}</span>
+        </slot>
+      </el-col>
+      <el-col :span="11">
+        <el-form-item :prop="endProp">
+          <slot name="endDatePicker">
+          </slot>
+        </el-form-item>
+      </el-col>
+    </el-row>
+  </el-form-item>
+</template>
+
+<script setup lang="ts">
+import { computed } from 'vue'
+
+interface Props {
+  label: string
+  startProp: string
+  endProp: string
+  startValue: string
+  endValue: string
+  required?: boolean
+  separator?: string
+  startPlaceholder?: string
+  endPlaceholder?: string
+  outerStyle?: string | Record<string, string>
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  required: false,
+  separator: '至',
+  outerStyle: () => ({})
+})
+
+// 将 outerStyle 字符串或对象转换为样式对象
+const outerStyle = computed(() => {
+  if (typeof props.outerStyle === 'object' && !Array.isArray(props.outerStyle)) {
+    return props.outerStyle
+  }
+  if (typeof props.outerStyle === 'string' && props.outerStyle) {
+    const style: Record<string, string> = {}
+    props.outerStyle.split(';').forEach((rule) => {
+      const [key, value] = rule.split(':').map(s => s.trim())
+      if (key && value) {
+        // 将 kebab-case 转换为 camelCase
+        const camelKey = key.replace(/-([a-z])/g, (g) => g[1].toUpperCase())
+        style[camelKey] = value
+      }
+    })
+    return style
+  }
+  return {}
+})
+</script>
+
+<style lang="scss" scoped>
+.time-separator {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  height: 100%;
+  min-height: 32px;
+  
+  span {
+    color: #909399;
+    font-size: 14px;
+    line-height: 1;
+    display: inline-block;
+  }
+}
+</style>

src/views/recruit/recruitexampeople/index.vue

@@ -27,7 +27,7 @@
     <div class="dialog-content">
       <!-- 时间选择器和操作按钮 -->
       <el-form :inline="true" :model="queryForm">
-          <el-form-item label="审核时间范围：" label-width="110px">
+          <el-form-item label="审核时间范围：">
             <el-time-picker
               is-range
               v-model="form.time1"
@@ -41,7 +41,7 @@
           </el-form-item>
           <el-form-item>
             <el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
-            <el-button type="primary" plain icon="Refresh" @click="resetQuery">重置</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
           </el-form-item>
         </el-form>
         <div class="mb15" v-if="permissions.recruit_recruitexampeople_add">
@@ -71,7 +71,7 @@
             </el-table-column>
             <el-table-column label="姓名" align="center" prop="teacherName" show-overflow-tooltip>
             </el-table-column>
-            <el-table-column label="操作" width="120" align="center" fixed="right">
+            <el-table-column label="操作" align="center" fixed="right">
               <template #default="scope">
                 <el-button
                   v-if="permissions.recruit_recruitexampeople_del"
@@ -212,7 +212,7 @@ const handleSave = async (data: { teacherNo: string; startTime: string; endTime:
 // 删除
 const handleDel = async (row: any) => {
   try {
-    await messageBox.confirm(`是否确认删除ID为${row.id}的记录？`)
+    await messageBox.confirm(`是否确认删除工号为${row.teacherNo}的记录？`)
     await delObj(row.id)
     message.success('删除成功')
     getDataList()

src/views/recruit/recruitplanmajor/detaiform.vue

@@ -26,9 +26,6 @@
       <el-form-item label="专业名称" prop="majorName">
         <el-input v-model="dataForm.majorName" placeholder="专业名称"></el-input>
       </el-form-item>
-<!--      <el-form-item label="专业规范名称" prop="zygfmc">-->
-<!--        <el-input v-model="dataForm.zygfmc" placeholder="专业规范名称"></el-input>-->
-<!--      </el-form-item>-->
       <el-form-item label="所属学院" prop="deptCode">
         <el-select v-model="dataForm.deptCode" filterable placeholder="请选择">
           <el-option
@@ -98,12 +95,10 @@
 <!--        </el-select>-->
 <!--      </el-form-item>-->
       <el-form-item label="排序" prop="sort">
-        <el-input-number :min="0" :max="999" v-model="dataForm.sort" placeholder="排序"
+        <el-input-number :min="0" :max="999" v-model="dataForm.sort" placeholder="排序"></el-input-number>
-                         style="width: 100%"></el-input-number>
       </el-form-item>
       <el-form-item label="备注" prop="remarks">
-        <el-input type="textarea" :rows="3" placeholder="请输入备注信息" v-model="dataForm.remarks"
+        <el-input type="textarea" :rows="3" placeholder="请输入备注信息" v-model="dataForm.remarks"></el-input>
-                  style="width: 100%;margin-top: 10px"></el-input>
       </el-form-item>
     </el-form>
 

src/views/recruit/recruitplanmajor/index.vue

@@ -58,7 +58,7 @@
       <!-- 操作按钮 -->
       <div class="mb15">
         <el-button 
-          v-if="permissions.recruit_recruitplanmajor_add"
+          v-auth="'recruit_recruitplanmajor_add'"
           type="primary"
           icon="FolderAdd"
           @click="addOrUpdateHandle"
@@ -85,7 +85,6 @@
         </el-table-column>
         <el-table-column prop="majorCode" label="专业序号" align="center" show-overflow-tooltip />
         <el-table-column prop="majorName" label="专业名称" align="center" show-overflow-tooltip />
-        <!-- <el-table-column prop="zygfmc" label="专业规范名称" align="center" show-overflow-tooltip /> -->
         <el-table-column prop="deptCode" label="学院" align="center" show-overflow-tooltip>
           <template #default="scope">
             {{ getDeptName(scope.row.deptCode) }}
@@ -93,21 +92,12 @@
         </el-table-column>
         <el-table-column prop="learnYear" label="学制" align="center" width="80" show-overflow-tooltip />
         <el-table-column prop="majorLevel" label="层次" align="center" show-overflow-tooltip />
-        <el-table-column prop="isOrder" label="订单班" align="center" width="80" show-overflow-tooltip>
+        <el-table-column prop="isOrder" label="订单班｜中德班｜联院班" align="center" width="180" show-overflow-tooltip>
           <template #default="scope">
-            {{ getYesNoLabel(scope.row.isOrder) }}
+            {{ getYesNoLabel(scope.row.isOrder) }}｜{{ getYesNoLabel(scope.row.isZd) }}｜{{ getYesNoLabel(scope.row.isUnion) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="isZd" label="中德班" align="center" width="80" show-overflow-tooltip>
-          <template #default="scope">
-            {{ getYesNoLabel(scope.row.isZd) }}
-          </template>
-        </el-table-column>
-        <el-table-column prop="isUnion" label="联院班" align="center" width="80" show-overflow-tooltip>
-          <template #default="scope">
-            {{ getYesNoLabel(scope.row.isUnion) }}
           </template>
         </el-table-column>
+       
         <el-table-column prop="sm" label="色盲不可录" align="center" width="120">
           <template #default="scope">
             <el-switch 
@@ -134,7 +124,7 @@
         <el-table-column label="操作" width="150" align="center" fixed="right">
           <template #default="scope">
             <el-button
-              v-if="permissions.recruit_recruitplanmajor_edit"
+              v-auth="'recruit_recruitplanmajor_edit'"
               type="primary"
               link
               icon="EditPen"
@@ -143,8 +133,8 @@
               修改
             </el-button>
             <el-button
-              v-if="permissions.recruit_recruitplanmajor_del"
+              v-auth="'recruit_recruitplanmajor_del'"
-              type="danger"
+              type="primary"
               link
               icon="Delete"
               @click="deleteHandle(scope.row.id)"
@@ -169,32 +159,17 @@
 </template>
 
 <script setup lang="ts" name="recruitplanmajor">
-import { ref, reactive, computed, onMounted, nextTick, defineAsyncComponent } from 'vue'
+import { ref, reactive, onMounted, nextTick, defineAsyncComponent } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
 import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { useDict } from '/@/hooks/dict'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
-import { fetchList, putObj, delObj,editQuickField } from '/@/api/recruit/recruitstudentplan'
+import { fetchList, delObj, editQuickField } from '/@/api/recruit/recruitstudentplan'
 import { getDeptList } from '/@/api/basic/basicclass'
 import { getMajorNameList } from '/@/api/basic/major'
 
 const TableForm = defineAsyncComponent(() => import('./detaiform.vue'))
 
-// 使用 Pinia store
-const userInfoStore = useUserInfo()
-const { userInfos } = storeToRefs(userInfoStore)
-
-// 创建权限对象
-const permissions = computed(() => {
-  const perms: Record<string, boolean> = {}
-  userInfos.value.authBtnList.forEach((perm: string) => {
-    perms[perm] = true
-  })
-  return perms
-})
-
 // 消息提示 hooks
 const message = useMessage()
 const messageBox = useMessageBox()
@@ -283,7 +258,7 @@ const init = async () => {
     
     getDataList()
   } catch (error) {
-    console.error('初始化失败', error)
+    message.error('初始化失败')
   }
 }
 

src/views/recruit/recruitplanmajor/majorGroupByDept.vue

@@ -1,13 +1,13 @@
 <template>
-	<el-dialog title="招生计划专业调整" append-to-body width="90%" :close-on-click-modal="false" v-model="visible">
+	<el-dialog title="招生计划专业调整" append-to-body width="70%" :close-on-click-modal="false" v-model="visible">
-		<el-form :model="dataForm" ref="dataFormRef" label-width="140px">
+		<el-form :model="dataForm" ref="dataFormRef" class="mb4">
 			<el-form-item label="招生计划名称" prop="groupName">
-				<el-input v-model="dataForm.groupName" placeholder="招生计划名称" disabled></el-input>
+				<el-input v-model="dataForm.groupName" placeholder="招生计划名称" disabled style="width: 200px"></el-input>
 			</el-form-item>
 		</el-form>
 		<el-tabs v-model="activiName" @tab-click="handleChange">
 			<el-tab-pane v-for="item in deptList" :key="item.deptCode" :label="item.deptName" :name="item.deptCode">
-				<div style="margin-top: 20px">
+				<div>
 					<el-table :data="dataList" border stripe v-loading="dataListLoading">
 						<el-table-column prop="majorName" header-align="center" align="center" label="专业">
 							<template #default="scope">
@@ -27,32 +27,6 @@
 							</template>
 						</el-table-column>
 
-						<!--            <el-table-column-->
-						<!--              prop="needStudentNum"-->
-						<!--              header-align="center"-->
-						<!--              align="center"-->
-						<!--              label="控制数"-->
-						<!--              width="180px"-->
-						<!--            >-->
-						<!--              <template #default="scope">-->
-						<!--                <el-input-number style="width: 80%" v-model="scope.row.needStudentNum" :min="0" :max="999"-->
-						<!--                                 @change="updateMajor(scope.row)"></el-input-number>-->
-						<!--              </template>-->
-						<!--            </el-table-column>-->
-
-						<!--            <el-table-column-->
-						<!--              prop="needStudentOverNum"-->
-						<!--              header-align="center"-->
-						<!--              align="center"-->
-						<!--              label="预留"-->
-						<!--              width="180px"-->
-						<!--            >-->
-						<!--              <template #default="scope">-->
-						<!--                <el-input-number style="width: 80%" v-model="scope.row.needStudentOverNum" :min="0" :max="999"-->
-						<!--                                 @change="updateMajor(scope.row)"></el-input-number>-->
-						<!--              </template>-->
-						<!--            </el-table-column>-->
-
 						<el-table-column prop="scoreLine" header-align="center" align="center" label="录取线" width="180px">
 							<template #default="scope">
 								<el-input-number
@@ -69,8 +43,8 @@
 								<el-select
 									v-model="scope.row.degreeOfEducation"
 									placeholder="请选择生源"
-									style="width: 100%; text-align: center"
 									multiple
+									style="display: flex;justify-content: center;align-items: center;"
 									@change="updateMajor(scope.row,'degreeOfEducation')"
 								>
 									<el-option v-for="item in degreeOfEducationList" :key="item.value" :label="item.label" :value="item.value"> </el-option>

src/views/recruit/recruitschoolcode/detaiform.vue

@@ -6,7 +6,7 @@
     v-model="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataFormRef" @keyup.enter="dataFormSubmit" label-width="120px">
       <el-form-item label="招生计划" prop="groupId">
-        <el-select v-model="dataForm.groupId" filterable :disabled="!dataForm.id ? true : false" placeholder="请选择招生计划">
+        <el-select v-model="dataForm.groupId" filterable :disabled="!dataForm.id ? false : true" placeholder="请选择招生计划">
           <el-option
             v-for="item in planList"
             :key="item.id"

src/views/recruit/recruitstudentplangroup/enrolplantemplate-form.vue

@@ -1,8 +1,8 @@
 <template>
   <el-dialog
-    :title="dataForm.id ? '编辑' : '新增'"
+    :title="dataForm.id ? '修改' : '新增'"
     :close-on-click-modal="false"
-    width="600"
+    width="600px"
     v-model="visible">
     <el-form :model="dataForm" :rules="dataRule" ref="dataFormRef" @keyup.enter="dataFormSubmit" label-width="120px">
       <el-form-item label="年份" prop="year">
@@ -18,79 +18,101 @@
         <el-input v-model="dataForm.groupName" placeholder="招生计划名称"></el-input>
       </el-form-item>
 
-      <el-form-item label="报名开始时间" prop="startDate">
+      <date-range-picker
+        label="报名时间"
+        start-prop="startDate"
+        end-prop="endDate"
+        v-model:start-value="dataForm.startDate"
+        v-model:end-value="dataForm.endDate"
+        required
+      >
+        <template #startDatePicker>
           <el-date-picker
             v-model="dataForm.startDate"
-          format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
             value-format="YYYY-MM-DD HH:mm:ss"
             clearable
             :disabled-date="startDateDisabledDate"
             type="datetime"
-          placeholder="请选择报名开始时间"
+            placeholder="请选择开始时间"
+            @change="handleStartDateChange"
           ></el-date-picker>
-      </el-form-item>
+        </template>
-      <el-form-item label="报名截止时间" prop="endDate">
+        <template #endDatePicker>
           <el-date-picker
             v-model="dataForm.endDate"
-          format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
             value-format="YYYY-MM-DD HH:mm:ss"
             clearable
             :disabled-date="endDateDisabledDate"
             type="datetime"
-          placeholder="请选择报名截止时间"
+            placeholder="请选择结束时间"
+            @change="handleEndDateChange"
           ></el-date-picker>
-      </el-form-item>
+        </template>
-      <el-form-item label="维护开始时间" prop="maintenanceStartDate">
+      </date-range-picker>
+      <date-range-picker
+        label="维护时间"
+        start-prop="maintenanceStartDate"
+        end-prop="maintenanceEndDate"
+        v-model:start-value="dataForm.maintenanceStartDate"
+        v-model:end-value="dataForm.maintenanceEndDate"
+        required
+      >
+        <template #startDatePicker>
           <el-date-picker
             v-model="dataForm.maintenanceStartDate"
-          format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
             value-format="YYYY-MM-DD HH:mm:ss"
             clearable
             :disabled-date="maintenanceStartDateDisabledDate"
             type="datetime"
-          placeholder="请选择维护开始时间"
+            placeholder="请选择开始时间"
+            @change="handleMaintenanceStartDateChange"
           ></el-date-picker>
-      </el-form-item>
+        </template>
-      <el-form-item label="维护结束时间" prop="maintenanceEndDate">
+        <template #endDatePicker>
           <el-date-picker
             v-model="dataForm.maintenanceEndDate"
-          format="YYYY-MM-DD HH:mm:ss"
+            format="YYYY-MM-DD"
             value-format="YYYY-MM-DD HH:mm:ss"
             clearable
             :disabled-date="maintenanceEndDateDisabledDate"
             type="datetime"
-          placeholder="请选择维护结束时间"
+            placeholder="请选择结束时间"
+            @change="handleMaintenanceEndDateChange"
           ></el-date-picker>
-      </el-form-item>
+        </template>
+      </date-range-picker>
 
       <el-form-item label="初中生报名" prop="czSignStart">
-        <el-select v-model="dataForm.czSignStart" placeholder="请选择初中生报名">
+        <el-select v-model="dataForm.czSignStart" placeholder="请选择" clearable>
           <el-option
-            v-for="item in yesNoList"
+            v-for="item in yes_no_type"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
+            :value="item.value"
-          </el-option>
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="高中生报名" prop="gzSignStart">
-        <el-select v-model="dataForm.gzSignStart" placeholder="请选择高中生报名">
+        <el-select v-model="dataForm.gzSignStart" placeholder="请选择" clearable>
           <el-option
-            v-for="item in yesNoList"
+            v-for="item in yes_no_type"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
+            :value="item.value"
-          </el-option>
+          />
         </el-select>
       </el-form-item>
       <el-form-item label="技职校报名" prop="jzxSignStart">
-        <el-select v-model="dataForm.jzxSignStart" placeholder="请选择技职校报名">
+        <el-select v-model="dataForm.jzxSignStart" placeholder="请选择" clearable>
           <el-option
-            v-for="item in yesNoList"
+            v-for="item in yes_no_type"
             :key="item.value"
             :label="item.label"
-            :value="item.value">
+            :value="item.value"
-          </el-option>
+          />
         </el-select>
       </el-form-item>
     </el-form>
@@ -105,19 +127,21 @@
 </template>
 
 <script setup lang="ts">
-import { ref, reactive, nextTick } from 'vue'
+import { ref, reactive, nextTick, defineAsyncComponent } from 'vue'
 import { ElNotification } from 'element-plus'
+import { addObj, getObj, putObj } from '/@/api/recruit/recruitstudentplangroup'
 import { useDict } from '/@/hooks/dict'
-import { addObj, getObj, putObj } from '@/api/recruit/recruitstudentplangroup'
+
+const DateRangePicker = defineAsyncComponent(() => import('/@/components/DateRangePicker/index.vue'))
+
+// 使用字典
+const { yes_no_type } = useDict('yes_no_type')
 
 // Emits
 const emit = defineEmits<{
   (e: 'refreshDataList'): void
 }>()
 
-// 字典数据
-const { yes_no_type: yesNoList } = useDict('yes_no_type')
-
 // 表单引用
 const dataFormRef = ref()
 
@@ -163,13 +187,13 @@ const dataRule = {
     { required: true, message: '代办费不能为空', trigger: 'blur' }
   ],
   czSignStart: [
-    { required: true, message: '初中生不能为空', trigger: 'blur' }
+    { required: true, message: '初中生报名不能为空', trigger: 'blur' }
   ],
   gzSignStart: [
-    { required: true, message: '高中生不能为空', trigger: 'blur' }
+    { required: true, message: '高中生报名不能为空', trigger: 'blur' }
   ],
   jzxSignStart: [
-    { required: true, message: '技职校不能为空', trigger: 'blur' }
+    { required: true, message: '技职校报名不能为空', trigger: 'blur' }
   ],
 }
 
@@ -202,6 +226,23 @@ const maintenanceEndDateDisabledDate = (time: Date) => {
   return false
 }
 
+// 处理日期变化事件
+const handleStartDateChange = (val: string) => {
+  dataForm.startDate = val
+}
+
+const handleEndDateChange = (val: string) => {
+  dataForm.endDate = val
+}
+
+const handleMaintenanceStartDateChange = (val: string) => {
+  dataForm.maintenanceStartDate = val
+}
+
+const handleMaintenanceEndDateChange = (val: string) => {
+  dataForm.maintenanceEndDate = val
+}
+
 // 表单提交
 const dataFormSubmit = () => {
   dataFormRef.value?.validate((valid: boolean) => {
@@ -274,7 +315,7 @@ defineExpose({
 })
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
 .dialog-footer {
   text-align: right;
 }

src/views/recruit/recruitstudentplangroup/index.vue

@@ -1,19 +1,3 @@
-<!--
-  -    Copyright (c) 2018-2025, cyweb All rights reserved.
-  -
-  - Redistribution and use in source and binary forms, with or without
-  - modification, are permitted provided that the following conditions are met:
-  -
-  - Redistributions of source code must retain the above copyright notice,
-  - this list of conditions and the following disclaimer.
-  - Redistributions in binary form must reproduce the above copyright
-  - notice, this list of conditions and the following disclaimer in the
-  - documentation and/or other materials provided with the distribution.
-  - Neither the name of the pig4cloud.com developer nor the names of its
-  - contributors may be used to endorse or promote products derived from
-  - this software without specific prior written permission.
-  -
-  -->
 
 <template>
 	<div class="layout-padding">
@@ -31,11 +15,11 @@
 
 			<!-- 操作按钮 -->
 			<div class="mb15">
-				<el-button v-if="permissions.recruit_recruitstudentplangroup_add" type="primary" icon="FolderAdd" @click="addOrUpdateHandle">
+				<el-button v-auth="'recruit_recruitstudentplangroup_add'" type="primary" icon="FolderAdd" @click="addOrUpdateHandle()">
 					新 增
 				</el-button>
-				<el-button v-if="permissions.recruit_recruitexampeople_add" type="primary" plain icon="UserFilled" class="ml10" @click="editExam">
+				<el-button v-auth="'recruit_recruitexampeople_add'" type="primary" plain icon="UserFilled" class="ml10" @click="editExam">
-					审核人员
+					审核人员管理
 				</el-button>
 			</div>
 
@@ -122,18 +106,18 @@
 				<el-table-column label="操作" width="240" align="center" fixed="right">
 					<template #default="scope">
 						<el-button
-							v-if="permissions.recruit_recruitstudentplangroup_edit"
+							v-auth="'recruit_recruitstudentplangroup_edit'"
 							type="primary"
 							link
 							icon="EditPen"
 							@click="addOrUpdateHandle(scope.row.id)"
 						>
-							调整
+							修改
 						</el-button>
-						<el-button v-if="permissions.recruit_recruitstudentplangroup_edit" type="primary" link icon="Switch" @click="majorHandle(scope.row)">
+						<el-button v-auth="'recruit_recruitstudentplangroup_edit'" type="primary" link icon="Switch" @click="majorHandle(scope.row)">
 							专业调整
 						</el-button>
-						<el-button v-if="permissions.recruit_recruitstudentplangroup_del" type="primary" link icon="Delete" @click="deleteHandle(scope.row.id)">
+						<el-button v-auth="'recruit_recruitstudentplangroup_del'" type="primary" link icon="Delete" @click="deleteHandle(scope.row.id)">
 							删除
 						</el-button>
 					</template>
@@ -144,7 +128,7 @@
 			<pagination v-bind="state.pagination" @current-change="currentChangeHandle" @size-change="sizeChangeHandle" />
 
 			<!-- 弹窗, 新增 / 修改 -->
-			<table-form v-if="addOrUpdateVisible" ref="addOrUpdateRef" @refreshDataList="getDataList" />
+			<table-form ref="addOrUpdateRef" @refreshDataList="getDataList" />
 			<major-group-by-dept-form ref="majorGroupByDeptRef" />
 			<exam-people-index v-if="exitExamVisible" ref="examPeopleIndexRef" />
 		</div>
@@ -157,9 +141,7 @@
 </template>
 
 <script setup lang="ts" name="recruitstudentplangroup">
-import { ref, reactive, computed, onMounted, nextTick, defineAsyncComponent } from 'vue';
+import { ref, reactive, onMounted, nextTick, defineAsyncComponent, watch } from 'vue';
-import { storeToRefs } from 'pinia';
-import { useUserInfo } from '/@/stores/userInfo';
 import { BasicTableProps, useTable } from '/@/hooks/table';
 import { useMessage, useMessageBox } from '/@/hooks/message';
 import { delObj, fetchList, putObj, editQuickField } from '/@/api/recruit/recruitstudentplangroup';
@@ -171,19 +153,6 @@ const TableForm = defineAsyncComponent(() => import('./enrolplantemplate-form.vu
 const MajorGroupByDeptForm = defineAsyncComponent(() => import('@/views/recruit/recruitplanmajor/majorGroupByDept.vue'));
 const ExamPeopleIndex = defineAsyncComponent(() => import('@/views/recruit/recruitexampeople/index.vue'));
 
-// 使用 Pinia store
-const userInfoStore = useUserInfo();
-const { userInfos } = storeToRefs(userInfoStore);
-
-// 创建权限对象
-const permissions = computed(() => {
-	const perms: Record<string, boolean> = {};
-	userInfos.value.authBtnList.forEach((perm: string) => {
-		perms[perm] = true;
-	});
-	return perms;
-});
-
 // 消息提示 hooks
 const message = useMessage();
 const messageBox = useMessageBox();
@@ -196,7 +165,6 @@ const majorGroupByDeptRef = ref();
 const examPeopleIndexRef = ref();
 
 // 弹窗状态
-const addOrUpdateVisible = ref(false);
 const exitExamVisible = ref(false);
 const dialogFormVisible = ref(false);
 
@@ -240,12 +208,6 @@ const init = async () => {
 	// 初始化逻辑
 };
 
-// 显示二维码
-const showQrCode = (row: any) => {
-	payQrcode.value = '123';
-	dialogFormVisible.value = true;
-};
-
 // 修改开关
 const changeSm = async (row: any, type: any) => {
 	try {
@@ -271,8 +233,7 @@ const changeSm = async (row: any, type: any) => {
 };
 
 // 新增 / 修改
-const addOrUpdateHandle = (id?: string) => {
+const addOrUpdateHandle = (id: string | null = null) => {
-	addOrUpdateVisible.value = true;
 	nextTick(() => {
 		addOrUpdateRef.value?.init(id);
 	});

src/views/recruit/recruitstudentschool/detaiform.vue

@@ -56,7 +56,7 @@ import { ref, reactive, nextTick } from 'vue'
 import { ElNotification } from 'element-plus'
 import { addObj, areaList, getObj, putObj } from '/@/api/recruit/recruitstudentschool'
 import { getDeptList } from '/@/api/basic/basicclass'
-import { getList } from "@/api/recruit/recruitstudentplangroup"
+import { getList } from '/@/api/recruit/recruitstudentplangroup'
 
 // Emits
 const emit = defineEmits<{

src/views/recruit/recruitstudentschool/index.vue

@@ -86,7 +86,7 @@
             </el-button>
             <el-button
               v-if="permissions.recruit_recruitstudentschool_del"
-              type="danger"
+              type="primary"
               link
               icon="Delete"
               @click="deleteHandle(scope.row.id)"