退出登录跳转统一登录平台&检验方案支持doc&点击项目跳转验证

yudao-ui-admin-vue3/src/layout/components/UserInfo/src/UserInfo.vue

@@ -43,7 +43,18 @@ const loginOut = async () => {
     })
     await userStore.loginOut()
     tagsViewStore.delAllViews()
-    replace('/login?redirect=/index')
+    // 优先跳转到CAS统一登录平台，未配置则回退到系统登录页
+    const casLoginUrl = import.meta.env.VITE_CAS_LOGIN_URL
+    if (casLoginUrl) {
+      const serviceUrl = import.meta.env.VITE_CAS_SERVICE_URL
+      if (serviceUrl) {
+        window.location.href = `${casLoginUrl}?service=${encodeURIComponent(serviceUrl)}`
+      } else {
+        window.location.href = casLoginUrl
+      }
+    } else {
+      replace('/login?redirect=/index')
+    }
   } catch {}
 }
 const toProfile = async () => {

yudao-ui-admin-vue3/src/layout/components/UserInfo/src/components/LockPage.vue

@@ -54,7 +54,18 @@ async function goLogin() {
   tagsViewStore.delAllViews()
   // resetRouter() // 重置静态路由表
   lockStore.resetLockInfo()
-  replace('/login')
+  // 优先跳转到CAS统一登录平台，未配置则回退到系统登录页
+  const casLoginUrl = import.meta.env.VITE_CAS_LOGIN_URL
+  if (casLoginUrl) {
+    const serviceUrl = import.meta.env.VITE_CAS_SERVICE_URL
+    if (serviceUrl) {
+      window.location.href = `${casLoginUrl}?service=${encodeURIComponent(serviceUrl)}`
+    } else {
+      window.location.href = casLoginUrl
+    }
+  } else {
+    replace('/login')
+  }
 }
 
 function handleShowForm(show = false) {

yudao-ui-admin-vue3/src/views/pressure2/boilerReportPreparationList/BoilerReportList.vue

@@ -40,6 +40,7 @@ import {
   PressureTaskOrderTaskStatus
 } from '@/utils/constants'
 import {useUserStore} from "@/store/modules/user";
+import {BoilerTaskOrderApi} from "@/api/pressure2/boilertaskorder";
 
 interface ReportItem {
   id: string
@@ -82,7 +83,7 @@ const getStatusColor = (status: number): string => {
   return statusMap[status] || '#A7D78B'
 }
 
-const handleClick = (row, item: ReportItem) => {
+const handleClick = async (row, item: ReportItem) => {
   if (row.isClaim === false) {
     return
   }
@@ -91,6 +92,13 @@ const handleClick = (row, item: ReportItem) => {
     return
   }
 
+  // 校验是否有完成审核审批的检验方案
+  const res = await BoilerTaskOrderApi.checkSchemeStatus(row.id)
+  if (!res) {
+    ElMessage.warning('请先完成检验方案的审核审批')
+    return
+  }
+
   //判断报告编制时是否有结束检验日期
   if (row.taskStatus >= PressureTaskOrderTaskStatus.REPORT_INPUT){
     if (!row.endCheckDate) {

yudao-ui-admin-vue3/src/views/pressure2/boilerReportPreparationList/index.vue

@@ -631,7 +631,14 @@ const resetQuery = () => {
 }
 
 // 修改后的编辑/查看详情操作
-const handleEdit = (row: Record<string, any>) => {
+const handleEdit = async(row: Record<string, any>) => {
+
+  // 校验是否有完成审核审批的检验方案
+  const res = await BoilerTaskOrderApi.checkSchemeStatus(row.id)
+  if (!res) {
+    ElMessage.warning('请先完成检验方案的审核审批')
+    return
+  }
 
   //判断报告编制时是否有结束检验日期
   if (row.taskStatus >= PressureTaskOrderTaskStatus.REPORT_INPUT){

yudao-ui-admin-vue3/src/views/pressure2/boilertaskorder/components/AddInspectionplanDetail.vue

@@ -230,7 +230,7 @@ const handleSuccess = (info) => {
 
 const uploadRef = ref()
 const fileList = ref<UploadFile[]>([]) // 文件列表
-const accept = '.docx,.pdf'
+const accept = '.doc,.docx,.pdf'
 const fileLoading = ref(false) // 表单的加载中
 
 // 获取文件类型

yudao-ui-admin-vue3/src/views/pressure2/pipeReportPreparationList/PipeReportList.vue

@@ -39,7 +39,7 @@ import { WarningFilled } from '@element-plus/icons-vue'
 import {
   PressureTaskOrderTaskStatus
 } from '@/utils/constants'
-import {PipeTaskOrderOrderItemVO} from "@/api/pressure2/pipetaskorder";
+import {PipeTaskOrderApi, PipeTaskOrderOrderItemVO} from "@/api/pressure2/pipetaskorder";
 import {useUserStore} from "@/store/modules/user";
 
 interface ReportItem {
@@ -83,7 +83,7 @@ const getStatusColor = (status: number): string => {
   return statusMap[status] || '#A7D78B'
 }
 
-const handleClick = (row, item: ReportItem) => {
+const handleClick = async (row, item: ReportItem) => {
   if (row.isClaim === false) {
     return
   }
@@ -92,6 +92,13 @@ const handleClick = (row, item: ReportItem) => {
     return
   }
 
+  // 校验是否有完成审核审批的检验方案
+  const res = await PipeTaskOrderApi.checkSchemeStatus(row.orderId)
+  if (!res) {
+    ElMessage.warning('请先完成检验方案的审核审批')
+    return
+  }
+
   //判断报告编制时是否有结束检验日期
   if (row.taskStatus >= PressureTaskOrderTaskStatus.REPORT_INPUT){
     if (!row.endCheckDate) {

yudao-ui-admin-vue3/src/views/pressure2/pipeReportPreparationList/index.vue

@@ -694,7 +694,14 @@ const resetQuery = () => {
 }
 
 // 修改后的编辑/查看详情操作
-const handleEdit = (row: Record<string, any>) => {
+const handleEdit = async(row: Record<string, any>) => {
+
+  // 校验是否有完成审核审批的检验方案
+  const res = await PipeTaskOrderApi.checkSchemeStatus(row.orderId)
+  if (!res) {
+    ElMessage.warning('请先完成检验方案的审核审批')
+    return
+  }
 
   //判断报告编制时是否有结束检验日期
   if (row.taskStatus >= PressureTaskOrderTaskStatus.REPORT_INPUT){

yudao-ui-admin-vue3/src/views/pressure2/pipetaskorder/components/AddInspectionplanDetail.vue

@@ -221,7 +221,7 @@ const handleSuccess = (info) => {
 
 const uploadRef = ref()
 const fileList = ref<UploadFile[]>([]) // 文件列表
-const accept = '.docx,.pdf'
+const accept = '.doc,.docx,.pdf'
 const fileLoading = ref(false) // 表单的加载中
 
 const showFileUrl = computed(() => {

yudao-ui-admin-vue3/types/env.d.ts

@@ -27,6 +27,8 @@ interface ImportMetaEnv {
   readonly VITE_GOVIEW_URL: string
   readonly VITE_SPREADJS_LICENSE_KEY: string
   readonly VITE_SPREADJS_DESIGNER_KEY: string
+  readonly VITE_CAS_LOGIN_URL: string
+  readonly VITE_CAS_SERVICE_URL: string
 }
 
 declare global {