Merge branch 'stable' of http://39.98.153.250:9080/yudao/yudao-admin-yiqun into stable

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

@@ -278,7 +278,7 @@
       <el-table-column label="操作" align="center" min-width="150px" fixed="right">
         <template #default="scope">
           <div class="flex flex-col gap-1">
-            <el-button link type="primary" @click="handleEdit(scope.row.id)"> 编制报告 </el-button>
+            <el-button link type="primary" @click="handleEdit(scope.row)"> 编制报告 </el-button>
           </div>
         </template>
       </el-table-column>
@@ -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/boilerchecker/AuditCheckRecord.vue

@@ -584,29 +584,34 @@ import ReportListUploadModal from '@/views/pressure2/boilerchecker/components/re
         // 查询主报告下的所有子报告
         const getSubReportList = await handleCheckoutAllSubReport()
         if(getSubReportList === false) return
-        if(!getSubReportList || !getSubReportList?.length) {
 
-          //handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
-          ElMessage.success('通过成功')
-          emits('update')
-          handleClose()
-
-        } else {
-
-          // 查询未办结的报告列表
-          const unFinishList = getSubReportList.filter(report => report.taskStatus !== PressureCheckerMyTaskStatus.CANCELLATION && report.taskStatus !== PressureCheckerMyTaskStatus.REPORT_END)
-
-          if(!unFinishList.length) {
-            // 没有未办结的子报告，可以提交审核
-            handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
-          } else {
-            // 存在未办结的子报告，关闭校核页面
-            ElMessage.success('通过成功')
-            emits('update')
-            handleClose()
-          }
+        ElMessage.success('通过成功')
+        emits('update')
+        handleClose()
 
-        }
+        // if(!getSubReportList || !getSubReportList?.length) {
+        //
+        //   //handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
+        //   ElMessage.success('通过成功')
+        //   emits('update')
+        //   handleClose()
+        //
+        // } else {
+        //
+        //   // // 查询未办结的报告列表
+        //   // const unFinishList = getSubReportList.filter(report => report.taskStatus !== PressureCheckerMyTaskStatus.CANCELLATION && report.taskStatus !== PressureCheckerMyTaskStatus.REPORT_END)
+        //
+        //   // if(!unFinishList.length) {
+        //   //   // 没有未办结的子报告，可以提交审核
+        //   //   handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
+        //   // } else {
+        //   //   // 存在未办结的子报告，关闭校核页面
+        //   //   ElMessage.success('通过成功')
+        //   //   emits('update')
+        //   //   handleClose()
+        //   // }
+        //
+        // }
       } else {
         ElMessage.error('出错啦!')
       }

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/pipechecker/AuditCheckRecord.vue

@@ -544,29 +544,34 @@ import ReportListUploadModal from '@/views/pressure2/pipechecker/components/repo
         // 查询主报告下的所有子报告
         const getSubReportList = await handleCheckoutAllSubReport()
         if(getSubReportList === false) return
-        if(!getSubReportList || !getSubReportList?.length) {
 
-          //handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
-          ElMessage.success('通过成功')
-          emits('update')
-          handleClose()
-
-        } else {
-
-          // 查询未办结的报告列表
-          const unFinishList = getSubReportList.filter(report => report.taskStatus !== PressureCheckerMyTaskStatus.CANCELLATION && report.taskStatus !== PressureCheckerMyTaskStatus.REPORT_END)
-
-          if(!unFinishList.length) {
-            // 没有未办结的子报告，可以提交审核
-            handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
-          } else {
-            // 存在未办结的子报告，关闭校核页面
-            ElMessage.success('通过成功')
-            emits('update')
-            handleClose()
-          }
+        ElMessage.success('通过成功')
+        emits('update')
+        handleClose()
 
-        }
+        // if(!getSubReportList || !getSubReportList?.length) {
+        //
+        //   //handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
+        //   ElMessage.success('通过成功')
+        //   emits('update')
+        //   handleClose()
+        //
+        // } else {
+        //
+        //   // 查询未办结的报告列表
+        //   const unFinishList = getSubReportList.filter(report => report.taskStatus !== PressureCheckerMyTaskStatus.CANCELLATION && report.taskStatus !== PressureCheckerMyTaskStatus.REPORT_END)
+        //
+        //   if(!unFinishList.length) {
+        //     // 没有未办结的子报告，可以提交审核
+        //     handleSubmitToApproval('该设备所有子报告已办结，是否提交至报告审核？')
+        //   } else {
+        //     // 存在未办结的子报告，关闭校核页面
+        //     ElMessage.success('通过成功')
+        //     emits('update')
+        //     handleClose()
+        //   }
+        //
+        // }
       } else {
         ElMessage.error('出错啦!')
       }

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 {