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

2026-01-29 18:22:58 +08:00
parent 874d50a148 682af86d80
commit b422171236
16 changed files with 48 additions and 217 deletions
--- a/src/views/recruit/backSchoolCheckin/statistics.vue
+++ b/src/views/recruit/backSchoolCheckin/statistics.vue
@@ -57,7 +57,7 @@

      <div class="mb15">
        <el-button
-          v-if="permissions.recruit_newstucheckin_statistics_output"
+          v-auth="'recruit_newstucheckin_statistics_output'"
          type="warning"
          plain
          icon="Download"
@@ -97,8 +97,6 @@

 <script setup lang="ts" name="backSchoolCheckin-statistics">
 import { ref, reactive, computed, onMounted } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
 import { useMessage } from '/@/hooks/message'
 import { getDataStatistics } from '/@/api/recruit/newstucheckin'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
@@ -106,19 +104,6 @@ import { getDeptList } from '/@/api/basic/basicclass'
 import { queryAllClass } from '/@/api/basic/basicclass'
 import axios from 'axios'

-// 使用 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()

--- a/src/views/recruit/newstucheckin/statistics.vue
+++ b/src/views/recruit/newstucheckin/statistics.vue
@@ -57,7 +57,7 @@

      <div class="mb15">
        <el-button
-          v-if="permissions.recruit_newstucheckin_statistics_output"
+          v-auth="'recruit_newstucheckin_statistics_output'"
          type="warning"
          plain
          icon="Download"
@@ -96,9 +96,7 @@
 </template>

 <script setup lang="ts" name="newstucheckin-statistics">
-import { ref, reactive, computed, onMounted } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
+import { ref, reactive, onMounted } from 'vue'
 import { useMessage } from '/@/hooks/message'
 import { getDataStatistics } from '/@/api/recruit/newstucheckin'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
@@ -106,19 +104,6 @@ import { getDeptList } from '/@/api/basic/basicclass'
 import { queryAllClass } from '/@/api/basic/basicclass'
 import axios from 'axios'

-// 使用 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()

--- a/src/views/recruit/recruitexampeople/index.vue
+++ b/src/views/recruit/recruitexampeople/index.vue
@@ -44,7 +44,7 @@
            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
          </el-form-item>
        </el-form>
-        <div class="mb15" v-if="permissions.recruit_recruitexampeople_add">
+        <div class="mb15" v-auth="'recruit_recruitexampeople_add'">
          <el-button 
            type="primary" 
            icon="FolderAdd" 
@@ -74,7 +74,7 @@
            <el-table-column label="操作" align="center" width="150px" fixed="right">
              <template #default="scope">
                <el-button
-                  v-if="permissions.recruit_recruitexampeople_del"
+                  v-auth="'recruit_recruitexampeople_del'"
                  type="danger"
                  link
                  icon="Delete"
@@ -107,28 +107,13 @@
 </template>

 <script setup lang="ts" name="recruitexampeople">
-import { ref, reactive, computed, nextTick, defineAsyncComponent } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
+import { ref, reactive, nextTick, defineAsyncComponent } from 'vue'
 import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { addObj, delObj, fetchList } from '/@/api/recruit/recruitexampeople'

 const AddForm = defineAsyncComponent(() => import('./add-form.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()
--- a/src/views/recruit/recruitstudentplan/index.vue
+++ b/src/views/recruit/recruitstudentplan/index.vue
@@ -24,7 +24,7 @@
          <el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
          <el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
        </el-form-item>
-        <el-form-item v-if="permissions.recruit_recruitstudentplan_add">
+        <el-form-item v-auth="'recruit_recruitstudentplan_add'">
          <el-button type="primary" icon="FolderAdd" class="ml10" @click="handleAdd">新增</el-button>
        </el-form-item>
      </el-form>
@@ -60,7 +60,7 @@
        <el-table-column label="操作" width="150" align="center" fixed="right">
          <template #default="scope">
            <el-button
-              v-if="permissions.recruit_recruitstudentplan_edit"
+              v-auth="'recruit_recruitstudentplan_edit'"
              type="primary"
              link
              icon="EditPen"
@@ -69,7 +69,7 @@
              编辑
            </el-button>
            <el-button
-              v-if="permissions.recruit_recruitstudentplan_del"
+              v-auth="'recruit_recruitstudentplan_del'"
              type="danger"
              link
              icon="Delete"
@@ -167,26 +167,11 @@
 </template>

 <script setup lang="ts" name="recruitstudentplan">
-import { ref, reactive, computed } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
+import { ref, reactive } from 'vue'
 import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { addObj, delObj, fetchList, putObj } from '/@/api/recruit/recruitstudentplan'

-// 使用 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()
--- a/src/views/recruit/recruitstudentplandegreeofeducation/index.vue
+++ b/src/views/recruit/recruitstudentplandegreeofeducation/index.vue
@@ -24,7 +24,7 @@
          <el-button type="primary" icon="Search" @click="getDataList">查询</el-button>
          <el-button type="primary" plain icon="Refresh" class="ml10" @click="resetQuery">重置</el-button>
        </el-form-item>
-        <el-form-item v-if="permissions.recruit_recruitstudentplandegreeofeducation_add">
+        <el-form-item v-auth="'recruit_recruitstudentplandegreeofeducation_add'">
          <el-button type="primary" icon="FolderAdd" class="ml10" @click="handleAdd">新增</el-button>
        </el-form-item>
      </el-form>
@@ -48,7 +48,7 @@
        <el-table-column label="操作" width="150" align="center" fixed="right">
          <template #default="scope">
            <el-button
-              v-if="permissions.recruit_recruitstudentplandegreeofeducation_edit"
+              v-auth="'recruit_recruitstudentplandegreeofeducation_edit'"
              type="primary"
              link
              icon="EditPen"
@@ -57,7 +57,7 @@
              编辑
            </el-button>
            <el-button
-              v-if="permissions.recruit_recruitstudentplandegreeofeducation_del"
+              v-auth="'recruit_recruitstudentplandegreeofeducation_del'"
              type="danger"
              link
              icon="Delete"
@@ -113,26 +113,11 @@
 </template>

 <script setup lang="ts" name="recruitstudentplandegreeofeducation">
-import { ref, reactive, computed } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
+import { ref, reactive } from 'vue'
 import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { addObj, delObj, fetchList, putObj } from '/@/api/recruit/recruitstudentplandegreeofeducation'

-// 使用 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()
--- a/src/views/recruit/recruitstudentsignup/update.vue
+++ b/src/views/recruit/recruitstudentsignup/update.vue
@@ -28,7 +28,12 @@
        </el-col>
        <el-col :span="8">
          <el-form-item label="联系人" prop="contactName">
-            <el-select v-model="dataForm.contactName" filterable clearable placeholder="" :disabled="!(permissions.recruit_recruitprestudent_dj_sure || dataForm.auditStatus != '20')">
+            <el-select 
+            v-model="dataForm.contactName" 
+            filterable 
+            clearable 
+            placeholder="" 
+            :disabled="!(auth('recruit_recruitprestudent_dj_sure') || dataForm.auditStatus != '20')">
              <el-option
                v-for="item in contactNameList"
                :key="item.teacherNo"
@@ -193,11 +198,10 @@
 <script setup lang="ts">
 import { ref, reactive, nextTick, computed, onMounted } from 'vue'
 import { Plus } from '@element-plus/icons-vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
 import { useMessage } from '/@/hooks/message'
 import { Session } from '/@/utils/storage'
 import axios from 'axios'
+import { auth } from '/@/utils/authFunction'
 import { getObj, materialExam } from '/@/api/recruit/recruitstudentsignup'
 import { getList } from '/@/api/recruit/recruitstudentplangroup'
 import { queryAllTeacher } from '/@/api/professional/professionaluser/teacherbase'
@@ -207,21 +211,9 @@ const auditStatusList = AUDIT_STATUS_LIST
 // 消息提示 hooks
 const message = useMessage()

-// 使用 Pinia store
-const userInfoStore = useUserInfo()
-const { userInfos } = storeToRefs(userInfoStore)
 const baseUrl = import.meta.env.VITE_API_URL
 const uploadUrl = baseUrl + '/recruit/file/uploadAttachment'

-// 创建权限对象
-const permissions = computed(() => {
-  const perms: Record<string, boolean> = {}
-  userInfos.value.authBtnList.forEach((perm: string) => {
-    perms[perm] = true
-  })
-  return perms
-})
-
 // 请求头
 const headers = computed(() => {
  return {
--- a/src/views/recruit/recruitstudentsignupturnovermoneychange/index.vue
+++ b/src/views/recruit/recruitstudentsignupturnovermoneychange/index.vue
@@ -30,7 +30,7 @@
      <el-row>
        <div>
          <el-button 
-            v-if="permissions.recruit_recruitstudentsignupturnovermoneychange_add"
+            v-auth="'recruit_recruitstudentsignupturnovermoneychange_add'"
            type="primary"
            icon="FolderAdd"
            @click="handleAdd">新 增
@@ -62,7 +62,7 @@
        <el-table-column label="操作" width="150" align="center" fixed="right">
          <template #default="scope">
            <el-button
-              v-if="permissions.recruit_recruitstudentsignupturnovermoneychange_edit"
+              v-auth="'recruit_recruitstudentsignupturnovermoneychange_edit'"
              type="primary"
              link
              icon="EditPen"
@@ -71,7 +71,7 @@
              编辑
            </el-button>
            <el-button
-              v-if="permissions.recruit_recruitstudentsignupturnovermoneychange_del"
+              v-auth="'recruit_recruitstudentsignupturnovermoneychange_del'"
              type="danger"
              link
              icon="Delete"
@@ -97,9 +97,7 @@
 </template>

 <script setup lang="ts" name="recruitstudentsignupturnovermoneychange">
-import { ref, reactive, computed, defineAsyncComponent, nextTick } from 'vue'
-import { storeToRefs } from 'pinia'
-import { useUserInfo } from '/@/stores/userInfo'
+import { ref, reactive, defineAsyncComponent, nextTick } from 'vue'
 import { BasicTableProps, useTable } from '/@/hooks/table'
 import { useMessage, useMessageBox } from '/@/hooks/message'
 import { delObj, fetchList } from '/@/api/recruit/recruitstudentsignupturnovermoneychange'
@@ -107,19 +105,6 @@ import { delObj, fetchList } from '/@/api/recruit/recruitstudentsignupturnovermo
 // 定义组件
 const FormDialog = defineAsyncComponent(() => import('./form.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()