Merge remote-tracking branch 'origin/stable' into stable

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

@@ -299,11 +299,11 @@
         </template>
       </el-table-column>
       <el-table-column label="检验部门" align="center" prop="deptName" min-width="120px" />
-      <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">
-        <template #default="scope">
-          {{ PressureBoilerCheckTypeMap[scope.row.checkType] }}
-        </template>
-      </el-table-column>
+<!--      <el-table-column label="检验性质" align="center" prop="checkType" min-width="120px">-->
+<!--        <template #default="scope">-->
+<!--          {{ PressureBoilerCheckTypeMap[scope.row.checkType] }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <el-table-column label="检验时间" align="center" prop="checkDate" min-width="120px">
         <template #default="scope">
           {{ formatArrayDate(scope.row.checkDate) }}

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

@@ -214,6 +214,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { EquipBoilerSchedulingApi, BoilerTaskItem, BoilerPlanSchedulingCalendarVO } from '@/api/pressure2/equipboilerscheduling'
 import dayjs from 'dayjs'
 import PlanDetail from './detail.vue'
+import { useUserStore } from '@/store/modules/user'
 
 // 设备类型常量
 const EQUIP_TYPES = {
@@ -242,10 +243,12 @@ const getStatusText = (taskItem): string => {
   return statusMap[Number(status)] || '未知'
 }
 
+const userStore = useUserStore()
+
 // 查询参数
 const queryParams = ref({
   planDate: [] as string[],
-  relateDepartment: undefined as string | undefined,
+  relateDepartment: userStore.user.deptId,
   type: '100',
 })
 
@@ -387,7 +390,8 @@ const resetQuery = () => {
   const endDate = dayjs().endOf('month').format('YYYY-MM-DD')
   queryParams.value = {
     type: '100',
-    planDate: [startDate, endDate]
+    planDate: [startDate, endDate],
+    relateDepartment: userStore.user.deptId
   } as any;
   handleQuery()
 }