Merge branch 'employeeScreen'

src/views/portraitManagement/employeeProfile/index.vue

@@ -341,12 +341,11 @@ const searchHandler = (query) => {
 const goToWarningPage = () => {
   if (currentQuery.value) {
     router.push({
-      path: '/index',
-      query: { id: currentQuery.value.id },
-   
+      path: '/score/event',
+      query: { id: currentQuery.value.id, startDate: currentQuery.value.beginTime, endDate: currentQuery.value.endTime },
     })
   } else {
-    router.push('/index')
+    router.push('/score/event')
   }
 }
 

src/views/score/event/index.vue

@@ -15,20 +15,19 @@
       </el-form-item>
       <el-form-item label="队室/班组" prop="teamId">
         <el-select v-model="queryParams.teamId" placeholder="请选择队室/班组" style="width:150px" clearable filterable
-          :disabled="queryParams.org < 2" @change="handleQueryTeamChange">
+          @change="handleQueryTeamChange">
           <el-option v-for="t in queryTeamOptions" :key="t.id" :label="t.label" :value="t.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="通道/小组" prop="groupId">
         <el-select v-model="queryParams.groupId" placeholder="请选择通道/小组" style="width:150px" clearable filterable
-          :disabled="queryParams.org < 3" @change="handleQueryGroupChange">
+          @change="handleQueryGroupChange">
           <el-option v-for="g in queryGroupOptions" :key="g.id" :label="g.label" :value="g.id" />
         </el-select>
       </el-form-item>
       <el-form-item label="责任人" prop="personId">
-        <el-select v-model="queryParams.personId" placeholder="请选择责任人" style="width:150px" clearable filterable
-          :disabled="queryParams.org < 4">
-          <el-option v-for="p in queryPersonOptions" :key="p.userId" :label="p.nickName" :value="p.userId" />
+        <el-select v-model="queryParams.personId" placeholder="请选择责任人" style="width:150px" clearable filterable>
+          <el-option v-for="p in searchPersonOptions" :key="p.userId" :label="p.nickName" :value="p.userId" />
         </el-select>
       </el-form-item>
       <el-form-item label="维度" prop="dimensionId">
@@ -188,7 +187,7 @@
           <el-col :span="12">
             <el-form-item label="部门名称" prop="deptId" :rules="rules.deptId">
               <el-select v-model="form.deptId" placeholder="请选择部门" style="width:100%" clearable filterable
-                 @change="handleBrigadeChange">
+                @change="handleBrigadeChange">
                 <el-option v-for="d in deptOptions" :key="d.deptId" :label="d.deptName" :value="d.deptId" />
               </el-select>
             </el-form-item>
@@ -196,7 +195,7 @@
           <el-col :span="12">
             <el-form-item label="队室/班组" prop="teamId" :rules="rules.teamId">
               <el-select v-model="form.teamId" placeholder="请选择队室/班组" style="width:100%" clearable filterable
-                 @change="handleDepartmentChange">
+                @change="handleDepartmentChange">
                 <el-option v-for="t in teamOptions" :key="t.id" :label="t.label" :value="t.id" />
               </el-select>
             </el-form-item>
@@ -212,7 +211,7 @@
           <el-col :span="12">
             <el-form-item label="责任人" prop="personId" :rules="rules.personId">
               <el-select v-model="form.personId" placeholder="请选择责任人" style="width:100%" clearable filterable
-                 @change="handlePersonChange">
+                @change="handlePersonChange">
                 <el-option v-for="p in personOptions" :key="p.userId" :label="p.nickName" :value="p.userId" />
               </el-select>
             </el-form-item>
@@ -248,8 +247,9 @@
 </template>
 
 <script setup>
-import { ref, reactive, computed, onMounted, getCurrentInstance } from 'vue'
+import { ref, reactive, computed, watch, onMounted, getCurrentInstance } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
+import { useRoute } from 'vue-router'
 import { listUser, getDeptOrgInfo, getUserOrgInfo } from '@/api/system/user'
 import {
   listScoreEvent, addScoreEvent, updateScoreEvent, delScoreEvent,
@@ -298,7 +298,13 @@ const rules = computed(() => {
   }
 })
 
-
+// 搜索表单责任人选项：未选择部门/班组/小组时使用全量人员，否则使用过滤后的人员
+const searchPersonOptions = computed(() => {
+  if (queryParams.deptId || queryParams.teamId || queryParams.groupId) {
+    return queryPersonOptions.value
+  }
+  return personOptions.value
+})
 
 async function loadDimensions() {
   const r = await allDimension()
@@ -437,7 +443,21 @@ function getList() {
 function handleQuery() { queryParams.pageNum = 1; getList() }
 function resetQuery() {
   dateRange.value = []
-  queryParams.deptId = null; queryParams.teamId = null; queryParams.groupId = null; queryParams.personId = null
+  Object.assign(queryParams, { 
+    pageNum: 1, 
+    pageSize: 10, 
+    personId: null, 
+    personName: '', 
+    deptId: null, 
+    deptName: '', 
+    teamId: null, 
+    teamName: '', 
+    groupId: null, 
+    groupName: '', 
+    dimensionId: null, 
+    sourceType: '', 
+    org: '' 
+  })
   queryTeamOptions.value = []; queryGroupOptions.value = []; queryPersonOptions.value = []
   queryRef.value?.resetFields()
   handleQuery()
@@ -580,5 +600,24 @@ async function handleImportFile(file) {
   }
 }
 
-onMounted(() => { loadDimensions(); loadDepts(); loadQueryDepts(); getList() })
+const route = useRoute()
+
+let isInit = true
+
+// 监听路由参数，从员工画像跳转时回填查询条件
+watch(() => route.query, (query) => {
+  if (query.id) {
+    queryParams.personId = Number(query.id)
+  }
+  if (query.startDate && query.endDate) {
+    dateRange.value = [query.startDate, query.endDate]
+  }
+  // 非初始化时（即路由参数后续变化），主动刷新数据
+  if (!isInit && (query.id || query.startDate || query.endDate)) {
+    handleQuery()
+  }
+  isInit = false
+}, { immediate: true })
+
+onMounted(() => { loadDimensions(); loadDepts(); loadQueryDepts(); loadAllPersons(); getList() })
 </script>

src/views/warningPage/index.vue

@@ -28,20 +28,18 @@
                     <el-date-picker v-model="endDate" type="date" placeholder="结束日期" style="width: 150px;" />
 
                 </div>
-                <el-popover trigger="click" placement="bottom" :width="480" ref="treePopoverRef">
-                    <template #reference>
-                        <el-input v-model="selectedOrgLabel" placeholder="组织架构/员工" clearable style="width: 480px;"
-                            @clear="handleTreeClear" />
-                    </template>
-                    <el-tree
-                        :data="cascadeOptions"
-                        :props="treeProps"
-                        node-key="value"
-                        highlight-current
-                        :current-node-key="selectedOrg"
-                        @node-click="handleTreeNodeClick"
-                    />
-                </el-popover>
+                <el-tree-select
+                    v-model="selectedOrg"
+                    :data="cascadeOptions"
+                    :props="{ label: 'label', value: 'value', children: 'children' }"
+                    node-key="value"
+                    placeholder="组织架构/员工"
+                    clearable
+                    filterable
+                    check-strictly
+                    style="width: 480px;"
+                    @change="fetchWarningData"
+                />
             </div>
             <div class="filter-group">
                 <el-select v-model="selectedAlertLevel" placeholder="预警等级" clearable style="width: 250px;">
@@ -157,9 +155,6 @@ const startDate = ref(null)
 const endDate = ref(null)
 const selectedAlertLevel = ref('')
 const selectedOrg = ref('')
-const selectedOrgLabel = ref('')
-const treePopoverRef = ref(null)
-const treeProps = { label: 'label', children: 'children' }
 const cascadeOptions = ref([])
 
 const summaryCards = ref([
@@ -255,31 +250,6 @@ const getSelectedInfo = (selectedValue) => {
     return findNodeByValue(cascadeOptions.value, selectedValue)
 }
 
-const handleTreeNodeClick = (data) => {
-    selectedOrg.value = data.value
-    selectedOrgLabel.value = data.label
-    treePopoverRef.value?.hide()
-    fetchWarningData()
-}
-
-const handleTreeClear = () => {
-    selectedOrg.value = ''
-    selectedOrgLabel.value = ''
-    fetchWarningData()
-}
-
-const findNodeLabelByValue = (nodes, value) => {
-    if (!nodes) return ''
-    for (const node of nodes) {
-        if (node.value === value) return node.label
-        if (node.children) {
-            const found = findNodeLabelByValue(node.children, value)
-            if (found) return found
-        }
-    }
-    return ''
-}
-
 const filteredEmployees = computed(() => {
     let result = employeesData.value.ledgerWarningDetailItemList
 
@@ -445,7 +415,7 @@ watch(activeRange, () => {
 
 watch(cascadeOptions, (val) => {
     if (val.length && selectedOrg.value) {
-        selectedOrgLabel.value = findNodeLabelByValue(val, selectedOrg.value)
+        fetchWarningData()
     }
 })
 
@@ -453,11 +423,9 @@ watch(cascadeOptions, (val) => {
 watch(() => route.query, (query) => {
     const { id } = query
     if (id) {
-        selectedOrg.value = id
-        selectedOrgLabel.value = findNodeLabelByValue(cascadeOptions.value, id)
+        selectedOrg.value =Number(id)
     } else {
         selectedOrg.value = ''
-        selectedOrgLabel.value = ''
     }
     fetchWarningData()
 }, { immediate: true })