首页跳转加上用户条件

yudao-ui-admin-vue3/src/views/Home/Index.vue

@@ -194,6 +194,7 @@ import dayJs from 'dayjs'
 
 import { useRouter } from 'vue-router'
 const router = useRouter()
+const userStore = useUserStore()
 
 const msgTypeMap = {
   1: '系统公告',
@@ -216,7 +217,7 @@ const todoList = ref([
     equipType: 'boiler',
     iconUrl: jhpqIcon,
     task: 0,
-    routerName: 'BoilerCheckerTaskList'
+    routerName: 'BoilerCheckerTaskList',
   },
   {
     title: '检验录入',
@@ -224,7 +225,7 @@ const todoList = ref([
     equipType: 'boiler',
     iconUrl: jhdtIcon,
     task: 0,
-    routerName: 'BoilerMyTask'
+    routerName: 'BoilerMyTask',
   },
   {
     title: '报告编制',
@@ -248,7 +249,7 @@ const todoList = ref([
     equipType: 'pipe',
     iconUrl: jhpqIcon,
     task: 0,
-    routerName: 'PipeCheckerTaskList'
+    routerName: 'PipeCheckerTaskList',
   },
   {
     title: '检验录入',
@@ -256,7 +257,7 @@ const todoList = ref([
     equipType: 'pipe',
     iconUrl: jhdtIcon,
     task: 0,
-    routerName: 'PipeMyTask'
+    routerName: 'PipeMyTask',
   },
   {
     title: '报告编制',
@@ -464,7 +465,7 @@ const quickAccessList = ref([
     routerUrl: ''
   }
 ])
-const userStore = useUserStore()
+
 const handleRouteTo = (item: any) => {
   const { id } = userStore.getUser
 
@@ -477,7 +478,7 @@ const handleRouteTo = (item: any) => {
   if (item.routerName) {
     // 特殊处理任务单跳转：默认带上 inspectorIds 和 taskStatusList 参数
     const query: any = {
-      //bpmUserId: id,
+      searchUserId: id,
       ...(item.routerQuery || {})
     }
 

yudao-ui-admin-vue3/src/views/Home/components/RiskAlertCard.vue

@@ -32,7 +32,7 @@
               v-for="item in myStats"
               :key="item.checkType"
               class="status-tag cursor-pointer"
-              @click.stop="handleClick(item.checkType, item.equipCodes)"
+              @click.stop="handleClick(item.checkType, item.equipCodes,1)"
             >
               <span class="status-label">{{ item.checkTypeName }}</span>
               <span class="status-count">{{ item.count }}</span>
@@ -78,7 +78,7 @@
                   v-for="item in child.checkTypeStats"
                   :key="item.checkType"
                   class="status-tag cursor-pointer"
-                  @click.stop="handleClick(item.checkType, item.equipCodes)"
+                  @click.stop="handleClick(item.checkType, item.equipCodes,2)"
                 >
                   <span class="status-label">{{ item.checkTypeName }}</span>
                   <span class="status-count">{{ item.count }}</span>
@@ -157,14 +157,23 @@ const onDeptChange = (val: string | null) => {
   }
 }
 
-const handleClick = (checkType: number, equipCodes: string[]) => {
+const handleClick = (checkType: number, equipCodes: string[], type: number) => {
+  const { id } = userStore.getUser
   sessionStorage.setItem('riskAlertEquipCodes', JSON.stringify(equipCodes))
   sessionStorage.setItem('riskAlertCheckType', String(checkType))
   sessionStorage.setItem('riskAlertEquipType', props.equipType)
   if (props.equipType === 'boiler') {
-    router.push({ name: 'BoilerMyTask', query: { from: 'riskAlert' } })
+    if (type == 1){
+      router.push({ name: 'BoilerMyTask', query: { from: 'riskAlert',searchUserId: id} })
+    }else if (type == 2){
+      router.push({ name: 'BoilerMyTask', query: { from: 'riskAlert'} })
+    }
   } else {
-    router.push({ name: 'PipeMyTask', query: { from: 'riskAlert' } })
+    if (type == 1){
+      router.push({ name: 'PipeMyTask', query: { from: 'riskAlert',searchUserId: id } })
+    }else if (type == 2){
+      router.push({ name: 'PipeMyTask', query: { from: 'riskAlert' } })
+    }
   }
 }
 

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

@@ -585,7 +585,7 @@
   }
 
   onMounted(async () => {
-    const { unitName, filterCancel, bpmUserId } = route.query as Recordable
+    const { unitName, filterCancel, searchUserId } = route.query as Recordable
     if(unitName){
       searchFormData.value.unitName = unitName
     }
@@ -593,8 +593,8 @@
       const otherStatus = getOrderStatus.value.filter(x => x.value != filterCancel).map(i=>`${i.value}`)
       searchFormData.value.status = otherStatus
     }
-     if(bpmUserId){
-      searchFormData.value.bpmUserId = bpmUserId
+     if(searchUserId){
+      searchFormData.value.bpmUserId = searchUserId
     }
     
     // 获取部门列表

yudao-ui-admin-vue3/src/views/pressure2/acceptorder/pipeIndex.vue

@@ -584,7 +584,7 @@
   }
 
   onMounted(async () => {
-    const { unitName, filterCancel, bpmUserId } = route.query as Recordable
+    const { unitName, filterCancel, searchUserId } = route.query as Recordable
     if(unitName){
       searchFormData.value.unitName = unitName
     }
@@ -592,8 +592,8 @@
       const otherStatus = getOrderStatus.value.filter(x => x.value != filterCancel).map(i=>`${i.value}`)
       searchFormData.value.status = otherStatus
     }
-     if(bpmUserId){
-      searchFormData.value.bpmUserId = bpmUserId
+     if(searchUserId){
+      searchFormData.value.bpmUserId = searchUserId
     }
     
     // 获取部门列表

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

@@ -737,11 +737,11 @@ const handleUserConfirm = () => {
 }
 //------------------------------------
 const { emitter } = useEmitt()
-const { bpmUserId } = route.query as Recordable
-if (bpmUserId) {
+const { searchUserId } = route.query as Recordable
+if (searchUserId) {
   taskStatus.value = 'reportInput'
-  taskStatusQueryParams[unref(taskStatus)].mainCheckerStrIds = [bpmUserId]
-  taskStatusQueryParams[unref(taskStatus)].taskStatus = '520'
+  taskStatusQueryParams[unref(taskStatus)].mainCheckerStrIds = [searchUserId]
+  // taskStatusQueryParams[unref(taskStatus)].checkUserStrIds = [searchUserId]
 }
 /** 初始化 **/
 onMounted(() => {

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/BoilerAuditInspectionCommentsNotice.vue

@@ -465,9 +465,9 @@ const handleCloseAuditDetail = () => {
 
 const smartTableRef = ref<SmartInstanceExpose>()
 onMounted(() => {
-  const { bpmUserId } = route.query
-  if (bpmUserId && PressureReportType['SUGGUESTION'] !== unref(getReportType)) {
-    searchFormData.value.bpmUserId = bpmUserId
+  const { searchUserId } = route.query
+  if (searchUserId && PressureReportType['SUGGUESTION'] !== unref(getReportType)) {
+    searchFormData.value.bpmUserId = searchUserId
   }
   smartTableRef.value?.setSearchForm(searchFormData.value)
   getAuditListByReportType()

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/myTask.vue

@@ -1133,14 +1133,24 @@ const onPageNoChange = (val) => {
 watch(
   () => route.path,
   async () => {
-    if (route.path === '/gljy/my-task/boiler') {
-      await getList()
-    }
+    // if (route.path === '/gljy/my-task/boiler') {
+    //   await getList()
+    // }
   }
 )
 
 /** 初始化 **/
 onMounted(() => {
+  const { searchUserId,from } = route.query
+  if (searchUserId) {
+    queryParams.checkUserIds = [searchUserId as string]
+  }
+  if (from && from == "riskAlert"){
+    queryParams.checkType =  sessionStorage.getItem('riskAlertCheckType')
+    if (searchUserId) {
+      queryParams.checkUserIds = [searchUserId as string]
+    }
+  }
   getList()
   emitter.on('refresh-my-task-boiler', () => {
     getList()

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/recordCheck.vue

@@ -83,7 +83,7 @@
           v-model="queryParams.checkUserStrIds"
           readonly
           clearable
-          placeholder="请选择校核人"
+          placeholder="请选择检验员"
           multiple
           popper-class="user-select-popper"
           @click.stop.prevent="() => handleOpenUserDialog(recheckStrIdsOpts, 'checkUserStrIds')"
@@ -658,13 +658,11 @@ watch(() => route.path, async () => {
 
 /** 初始化 */
 onMounted(() => {
-  const { bpmUserId } = route.query
-  if (bpmUserId) {
-    // queryParams.checkUserStrIds = [bpmUserId as string]
+  const { searchUserId } = route.query
+  if (searchUserId) {
     queryParams.checkUserStrIds = []
-    queryParams.recheckStrIds = [bpmUserId as string]
+    queryParams.recheckStrIds = [searchUserId as string]
     queryParams.managerStrIds = []
-    // queryParams.status = '510'
   }
   getList()
 })

yudao-ui-admin-vue3/src/views/pressure2/boilerchecker/task.vue

@@ -297,7 +297,13 @@
 import { ref, reactive, onMounted, computed } from 'vue'
 import { formatArrayDate } from '@/utils/formatTime'
 import { BoilerTaskOrderApi, BoilerTaskOrderVO } from '@/api/pressure2/boilertaskorder'
-import { PressureBoilerCheckTypeMap, PressureFeeTypeMap, PressureTaskOrderTaskStatusMap, PressureTaskOrderTaskStatus } from '@/utils/constants'
+import {
+  PressureBoilerCheckTypeMap,
+  PressureFeeTypeMap,
+  PressureTaskOrderTaskStatusMap,
+  PressureTaskOrderTaskStatus,
+  PressureReportType
+} from '@/utils/constants'
 import {ElMessageBox, ElMessage, ElTable} from 'element-plus'
 import { useRouter } from 'vue-router'
 // 在script部分
@@ -312,6 +318,7 @@ const userOptions = ref([])
 const userSearchLoading = ref(false)
 
 const router = useRouter()
+const route = useRoute()
 const tableRef = ref<InstanceType<typeof ElTable>>()
 const selectedRows = ref<BoilerTaskOrderVO[]>([]) // 选中的行
 const userStore = useUserStore()
@@ -646,6 +653,10 @@ const handleSelectionChange = (selection: BoilerTaskOrderVO[]) => {
 
 /** 初始化 **/
 onMounted(() => {
+  const { searchUserId } = route.query
+  if (searchUserId) {
+    queryParams.checkUserIds = [searchUserId as string]
+  }
   getList()
 })
 </script>

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

@@ -518,9 +518,9 @@ const handleViewModifyContent = (row: any) => {
   }
 }
 
-const { bpmUserId } = route.query as Recordable
-if (bpmUserId) {
-  queryParams.bpmUserId = bpmUserId
+const { searchUserId } = route.query as Recordable
+if (searchUserId) {
+  queryParams.bpmUserId = searchUserId
 }
 /** 初始化 **/
 onMounted(() => {

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

@@ -800,11 +800,11 @@ const handleUserConfirm = () => {
 }
 //------------------------------------
 const { emitter } = useEmitt()
-const { bpmUserId } = route.query as Recordable
-if (bpmUserId) {
+const { searchUserId } = route.query as Recordable
+if (searchUserId) {
   taskStatus.value = 'reportInput'
-  taskStatusQueryParams[unref(taskStatus)].mainCheckerStrIds = [bpmUserId]
-  taskStatusQueryParams[unref(taskStatus)].taskStatus = '520'
+  taskStatusQueryParams[unref(taskStatus)].mainCheckerStrIds = [searchUserId]
+  // taskStatusQueryParams[unref(taskStatus)].checkUserStrIds = [searchUserId]
 }
 /** 初始化 **/
 onMounted(() => {

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/PipeAuditInspectionCommentsNotice.vue

@@ -525,9 +525,9 @@ const handleCloseAuditDetail = () => {
 
 const smartTableRef = ref<SmartInstanceExpose>()
 onMounted(() => {
-  const { bpmUserId } = route.query
-  if (bpmUserId && PressureReportType['SUGGUESTION'] !== unref(getReportType)) {
-    searchFormData.value.bpmUserId = bpmUserId
+  const { searchUserId } = route.query
+  if (searchUserId && PressureReportType['SUGGUESTION'] !== unref(getReportType)) {
+    searchFormData.value.bpmUserId = searchUserId
   }
   smartTableRef.value?.setSearchForm(searchFormData.value)
   getAuditListByReportType()

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/myTask.vue

@@ -1067,13 +1067,23 @@ const onPageNoChange = (val) => {
 }
 
 watch(() => route.path, async () => {
-  if (route.path === '/gdjy/my-task/pipe') {
-    await getList()
-  }
+  // if (route.path === '/gdjy/my-task/pipe') {
+  //   await getList()
+  // }
 })
 
 /** 初始化 **/
 onMounted(() => {
+  const { searchUserId,from } = route.query
+  if (searchUserId) {
+    queryParams.checkUserIds = [searchUserId as string]
+  }
+  if (from && from == "riskAlert"){
+    queryParams.checkType =  sessionStorage.getItem('riskAlertCheckType')
+    if (searchUserId) {
+      queryParams.checkUserIds = [searchUserId as string]
+    }
+  }
   getList()
   emitter.on('refresh-my-task-pipe', ()=> {
     getList();

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/recordCheck.vue

@@ -668,13 +668,11 @@ watch(() => route.path, async () => {
 
 /** 初始化 */
 onMounted(() => {
-  const { bpmUserId } = route.query
-  if (bpmUserId) {
-    // queryParams.checkUserStrIds = [bpmUserId as string]
+  const { searchUserId } = route.query
+  if (searchUserId) {
     queryParams.checkUserStrIds = []
-    queryParams.recheckStrIds = [bpmUserId as string]
+    queryParams.recheckStrIds = [searchUserId as string]
     queryParams.managerStrIds = []
-    // queryParams.status = '510'
   }
   getList()
 })

yudao-ui-admin-vue3/src/views/pressure2/pipechecker/task.vue

@@ -365,6 +365,7 @@ import DeptSelect from '@/views/pressure2/pipescheduling/components/DeptSelect.v
 const userOptions = ref([])
 const userSearchLoading = ref(false)
 
+const route = useRoute()
 const router = useRouter()
 const tableRef = ref<InstanceType<typeof ElTable>>()
 const selectedRows = ref<PipeTaskOrderVO[]>([]) // 选中的行
@@ -777,6 +778,10 @@ const handleSelectionChange = (selection: PipeTaskOrderVO[]) => {
 
 /** 初始化 **/
 onMounted(() => {
+  const { searchUserId } = route.query
+  if (searchUserId) {
+    queryParams.checkUserIds = [searchUserId as string]
+  }
   getList()
 })
 </script>

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

@@ -518,9 +518,9 @@ const handleViewModifyContent = (row: any) => {
   }
 }
 
-const { bpmUserId } = route.query as Recordable
-if (bpmUserId) {
-  queryParams.bpmUserId = bpmUserId
+const { searchUserId } = route.query as Recordable
+if (searchUserId) {
+  queryParams.bpmUserId = searchUserId
 }
 /** 初始化 **/
 onMounted(() => {