diff --git a/src/api/professional/professionaluser/professionalteacherstationchange.ts b/src/api/professional/professionaluser/professionalteacherstationchange.ts index b83992a..5ce62eb 100644 --- a/src/api/professional/professionaluser/professionalteacherstationchange.ts +++ b/src/api/professional/professionaluser/professionalteacherstationchange.ts @@ -81,3 +81,12 @@ export const putObj = (obj: any) => { }); }; +export const print = (id: string | number) => { + return request({ + url: `/professional/professionalteacherstationchange/print`, + method: 'get', + params: { + id: id + } + }); +}; diff --git a/src/components/AuditState/index.vue b/src/components/AuditState/index.vue index 59c3404..3ec8879 100644 --- a/src/components/AuditState/index.vue +++ b/src/components/AuditState/index.vue @@ -34,7 +34,8 @@ const props = withDefaults(defineProps(), { options: () => [ { value: '1', label: '已通过', type: 'success', icon: 'fa-solid fa-circle-check' , effect:"dark" }, { value: '-2', label: '已驳回', type: 'danger', icon: 'fa-solid fa-circle-xmark', effect:"dark" }, - { value: '0', label: '待审核', type: 'warning', icon: 'fa-regular fa-clock' ,effect:"light" } + { value: '0', label: '待审核', type: 'warning', icon: 'fa-regular fa-clock' ,effect:"light" }, + { value: '10', label: '部门通过', type: 'warning', icon: 'fa-regular fa-clock' ,effect:"dark" } ], showIcon: true, emptyText: '-' diff --git a/src/dept_change.docx b/src/dept_change.docx new file mode 100644 index 0000000..699ad73 Binary files /dev/null and b/src/dept_change.docx differ diff --git a/src/router/route.ts b/src/router/route.ts index 0c53ccc..ad73dbf 100644 --- a/src/router/route.ts +++ b/src/router/route.ts @@ -58,6 +58,15 @@ export const dynamicRoutes: Array = [ isHide: true, }, }, + { + path: '/professional/professionalteacherstationchange/print', + name: 'professionalteacherstationchange.print', + component: () => import('/@/views/professional/professionalteacherstationchange/print.vue'), + meta: { + isHide: true, // 隐藏路由,不在菜单中显示 + isAuth: true // 需要认证,在 layout 中显示 + }, + }, ...dynamicRoutesFlow ]; diff --git a/src/views/professional/professionalqualificationrelation/index.vue b/src/views/professional/professionalqualificationrelation/index.vue index e2ca027..af42797 100644 --- a/src/views/professional/professionalqualificationrelation/index.vue +++ b/src/views/professional/professionalqualificationrelation/index.vue @@ -136,20 +136,36 @@ 通过 + 部门通过 + 驳回 + 部门驳回 + 通过 + 部门通过 + 驳回 + 部门驳回 + 通过 + 部门通过 + 驳回 + 部门驳回 + 通过 + 部门通过 + 驳回 + 部门驳回 + import { ref, reactive, onMounted } from 'vue' import { defineAsyncComponent } from 'vue' +import { useRouter, useRoute } from 'vue-router' import { BasicTableProps, useTable } from '/@/hooks/table' import { fetchList } from '/@/api/professional/professionaluser/professionalteacherstationchange' +const router = useRouter() +const route = useRoute() + const TeacherNameNo = defineAsyncComponent(() => import('/@/components/TeacherNameNo/index.vue')) // 表格引用 @@ -133,7 +137,12 @@ const resetQuery = () => { // 打印部门调令 const doPrint = (row: any) => { - window.open(`/professional/professionalteacherstationchange/print/${row.id}`) + // 直接使用固定路径跳转到 print 页面 + const routeData = router.resolve({ + path: '/professional/professionalteacherstationchange/print', + query: { id: row.id } // 使用 query 参数传递 id + }) + window.open(routeData.href, '_blank') } // 初始化 diff --git a/src/views/professional/professionalteacherstationchange/print.vue b/src/views/professional/professionalteacherstationchange/print.vue new file mode 100644 index 0000000..83686ae --- /dev/null +++ b/src/views/professional/professionalteacherstationchange/print.vue @@ -0,0 +1,515 @@ + + + + + + + + diff --git a/src/views/professional/professionaltitlerelation/index.vue b/src/views/professional/professionaltitlerelation/index.vue index 2b82b73..b038cce 100755 --- a/src/views/professional/professionaltitlerelation/index.vue +++ b/src/views/professional/professionaltitlerelation/index.vue @@ -172,16 +172,30 @@ type="success" link icon="CircleCheck" - v-if="permissions.professional_professionaltitlerelation_exam && scope.row.state === '0'" + v-if="permissions.professional_professionaltitlerelation_exam && scope.row.canExam" @click="changeState(scope.row, 1)">通过 + 部门通过 + 驳回 + 部门驳回 +