refactor: 整理配分管理页面逻辑，新增组织信息获取接口

1.  新增用户和部门组织信息获取API接口
2.  重构部门/队室/通道/责任人选择逻辑，使用精准的禁用判断
3.  替换预警页面路由路径，新增部门页面初始化顶级节点
4.  优化员工档案标签显示，重构用户编辑页标签输入组件
5.  注释导入页面部分冗余的导入项

src/api/system/user.js

@@ -152,3 +152,20 @@ export function getDeptUserTree(params) {
     params: params
   })
 }
+//通过用户ID获取用户组织信息
+export function getUserOrgInfo(params) {
+  return request({
+    url: '/system/dept/userOrgInfo',
+    method: 'get',
+    params: params
+  })
+}
+
+//通过部门ID获取部门组织信息及上级链
+export function getDeptOrgInfo(params) {
+  return request({
+    url: '/system/dept/deptOrgInfo',
+    method: 'get',
+    params: params
+  })
+}

src/router/index.js

@@ -91,7 +91,7 @@ export const constantRoutes = [
     meta: { title: '监控中心', icon: 'dashboard', affix: true },
     children: [
       {
-        path: '/warningPage',
+        path: '/index',
         component: () => import('@/views/warningPage'),
         name: 'WarningPage',
         meta: { title: '预警页面', icon: 'dashboard' }

src/views/ledger/import/index.vue

@@ -251,15 +251,15 @@ const importItems = reactive([
     loading: false,
     lastResult: null
   },
-  {
-    key: 'patrolInspection',
-    title: '队室三级质控巡查记录',
-    desc: '队室层级巡查问题记录',
-    icon: 'DocumentChecked',
-    api: importPatrolInspection,
-    loading: false,
-    lastResult: null
-  },
+  // {
+  //   key: 'patrolInspection',
+  //   title: '队室三级质控巡查记录',
+  //   desc: '队室层级巡查问题记录',
+  //   icon: 'DocumentChecked',
+  //   api: importPatrolInspection,
+  //   loading: false,
+  //   lastResult: null
+  // },
   {
     key: 'realtimeInterception',
     title: '实时质控拦截记录',
@@ -350,51 +350,51 @@ const importItems = reactive([
     loading: false,
     lastResult: null
   },
-  {
-    key: 'dailyTraining',
-    title: '日常培训记录',
-    desc: '月度培训任务及完成情况记录',
-    icon: 'Reading',
-    api: importDailyTraining,
-    loading: false,
-    lastResult: null
-  },
-  {
-    key: 'leaderDuty',
-    title: '组长履职情况记录',
-    desc: '队室组长本班点评及问题处置',
-    icon: 'Management',
-    api: importLeaderDuty,
-    loading: false,
-    lastResult: null
-  },
-  {
-    key: 'healthSoldier',
-    title: '健康锐兵',
-    desc: '员工身心健康状况台账记录',
-    icon: 'FirstAidKit',
-    api: importHealthSoldier,
-    loading: false,
-    lastResult: null
-  },
-  {
-    key: 'dormFireSafety',
-    title: '宿舍消防安全专项自查',
-    desc: '宿舍消防隐患自查情况记录',
-    icon: 'House',
-    api: importDormFireSafety,
-    loading: false,
-    lastResult: null
-  },
-  {
-    key: 'trainingIssue',
-    title: '培训台账问题通报',
-    desc: '培训台账发现问题及整改通报',
-    icon: 'Bell',
-    api: importTrainingIssue,
-    loading: false,
-    lastResult: null
-  }
+  // {
+  //   key: 'dailyTraining',
+  //   title: '日常培训记录',
+  //   desc: '月度培训任务及完成情况记录',
+  //   icon: 'Reading',
+  //   api: importDailyTraining,
+  //   loading: false,
+  //   lastResult: null
+  // },
+  // {
+  //   key: 'leaderDuty',
+  //   title: '组长履职情况记录',
+  //   desc: '队室组长本班点评及问题处置',
+  //   icon: 'Management',
+  //   api: importLeaderDuty,
+  //   loading: false,
+  //   lastResult: null
+  // },
+  // {
+  //   key: 'healthSoldier',
+  //   title: '健康锐兵',
+  //   desc: '员工身心健康状况台账记录',
+  //   icon: 'FirstAidKit',
+  //   api: importHealthSoldier,
+  //   loading: false,
+  //   lastResult: null
+  // },
+  // {
+  //   key: 'dormFireSafety',
+  //   title: '宿舍消防安全专项自查',
+  //   desc: '宿舍消防隐患自查情况记录',
+  //   icon: 'House',
+  //   api: importDormFireSafety,
+  //   loading: false,
+  //   lastResult: null
+  // },
+  // {
+  //   key: 'trainingIssue',
+  //   title: '培训台账问题通报',
+  //   desc: '培训台账发现问题及整改通报',
+  //   icon: 'Bell',
+  //   api: importTrainingIssue,
+  //   loading: false,
+  //   lastResult: null
+  // }
 ])
 
 function beforeUpload(file) {

src/views/portraitManagement/employeeProfile/index.vue

@@ -75,7 +75,7 @@
                   <div class="info-item-content">
                     <div class="info-item-label">标签：</div>
                     <div class="info-item-value">
-                      <span class="info-item-tag" v-if="portrait.roleNames">{{ portrait.roleNames }}</span>
+                      <span class="info-item-tag" v-if="portrait.userTags">{{ portrait.userTags }}</span>
                     </div>
                   </div>
                 </div>

src/views/score/event/index.vue

@@ -188,7 +188,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="handleDeptChange">
+                :disabled="form.org !== '1'" @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 +196,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
-                :disabled="form.org < 2" @change="handleTeamChange">
+                :disabled="form.org !== '2'" @change="handleDepartmentChange">
                 <el-option v-for="t in teamOptions" :key="t.id" :label="t.label" :value="t.id" />
               </el-select>
             </el-form-item>
@@ -204,7 +204,7 @@
           <el-col :span="12">
             <el-form-item label="通道/小组" prop="groupId" :rules="rules.groupId">
               <el-select v-model="form.groupId" placeholder="请选择通道/小组" style="width:100%" clearable filterable
-                :disabled="form.org < 3" @change="handleGroupChange">
+                :disabled="form.org !== '3'" @change="handleGroupChange">
                 <el-option v-for="g in groupOptions" :key="g.id" :label="g.label" :value="g.id" />
               </el-select>
             </el-form-item>
@@ -212,7 +212,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
-                :disabled="form.org < 4">
+                :disabled="form.org !== '4'" @change="handlePersonChange">
                 <el-option v-for="p in personOptions" :key="p.userId" :label="p.nickName" :value="p.userId" />
               </el-select>
             </el-form-item>
@@ -250,7 +250,7 @@
 <script setup>
 import { ref, reactive, computed, onMounted, getCurrentInstance } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
-import { listUser } from '@/api/system/user'
+import { listUser, getDeptOrgInfo, getUserOrgInfo } from '@/api/system/user'
 import {
   listScoreEvent, addScoreEvent, updateScoreEvent, delScoreEvent,
   exportScoreEvent, importScoreEvent
@@ -289,13 +289,12 @@ const rules = computed(() => {
   return {
     org: [{ required: true, message: '请选择配分层级', trigger: 'submit' }],
     dimensionId: [{ required: true, message: '请选择维度', trigger: 'submit' }],
-    personName: [{ required: true, message: '请输入责任人', trigger: 'submit' }],
     eventTime: [{ required: true, message: '请选择事件时间', trigger: 'submit' }],
     scoreValue: [{ required: true, message: '请输入分值', trigger: 'submit' }],
-    deptId: ['1', '2', '3', '4'].includes(form.org) ? [{ required: true, message: '请选择部门', trigger: 'submit' }] : [],
-    teamId: ['2', '3', '4'].includes(form.org) ? [{ required: true, message: '请选择队室/班组', trigger: 'submit' }] : [],
-    groupId: ['3', '4'].includes(form.org) ? [{ required: true, message: '请选择通道/小组', trigger: 'submit' }] : [],
-    personId: ['4'].includes(form.org) ? [{ required: true, message: '请选择责任人', trigger: 'submit' }] : [],
+    deptId: form.org === '1' ? [{ required: true, message: '请选择部门', trigger: 'submit' }] : [],
+    teamId: form.org === '2' ? [{ required: true, message: '请选择队室/班组', trigger: 'submit' }] : [],
+    groupId: form.org === '3' ? [{ required: true, message: '请选择通道/小组', trigger: 'submit' }] : [],
+    personId: form.org === '4' ? [{ required: true, message: '请选择责任人', trigger: 'submit' }] : [],
   }
 })
 
@@ -321,56 +320,73 @@ async function handleFormLevelChange() {
   indicatorTree.value = []
   level2Options.value = []; level3Options.value = []; level4Options.value = []
   teamOptions.value = []; groupOptions.value = []; personOptions.value = []
-  const r = await getDimensionAll({ pageNum: 1, pageSize: 100, org: form.org })
+
+  const org = form.org
+  // if (org === '2') {
+  await loadAllTeams()
+  // } else if (org === '3') {
+  await loadAllGroups()
+  // } else if (org === '4') {
+  await loadAllPersons()
+  // }
+
+  const r = await getDimensionAll({ pageNum: 1, pageSize: 100, org })
   dimensionOptions.value = r.data || []
 }
 
+async function loadAllTeams() {
+  const r = await listDept({ deptType: 'MANAGER' })
+  teamOptions.value = (r.data || []).map(d => ({ id: d.deptId, label: d.deptName }))
+}
+
 async function loadDepts() {
   const r = await listDept()
   deptOptions.value = (r.data || []).filter(d => d.deptType === 'BRIGADE')
 }
 
-async function handleDeptChange(deptId, preserve) {
-  if (!preserve) {
-    form.teamId = null; form.groupId = null; form.personId = null
-    groupOptions.value = []; personOptions.value = []
-  }
-  if (deptId) {
-    const r = await deptTreeSelect({ parentId: deptId })
-    teamOptions.value = r.data || []
-    if (preserve && form.teamId) {
-      await handleTeamChange(form.teamId, true)
+async function loadAllGroups() {
+  const r = await listDept({ deptType: 'TEAMS' })
+  groupOptions.value = (r.data || []).map(d => ({ id: d.deptId, label: d.deptName }))
+}
+
+async function loadAllPersons() {
+  const r = await listUser({ pageSize: 9999 })
+  personOptions.value = r.rows || []
+}
+
+function handleBrigadeChange() {
+}
+
+async function handleDepartmentChange(val) {
+  form.deptId = null
+  if (val) {
+    const r = await getDeptOrgInfo({ deptId: val })
+    if (r.data) {
+      form.deptId = r.data.brigadeId
     }
-  } else {
-    teamOptions.value = []
   }
 }
 
-async function handleTeamChange(val, preserve) {
-  if (!preserve) {
-    form.groupId = null; form.personId = null
-    personOptions.value = []
-  }
-  const team = teamOptions.value.find(t => t.id === val)
-  if (team) {
-    const r = await deptTreeSelect({ parentId: team.id })
-    groupOptions.value = r.data || []
-    if (preserve && form.groupId) {
-      await handleGroupChange(form.groupId, true)
+async function handleGroupChange(val) {
+  form.deptId = null; form.teamId = null
+  if (val) {
+    const r = await getDeptOrgInfo({ deptId: val })
+    if (r.data) {
+      form.deptId = r.data.brigadeId
+      form.teamId = r.data.departmentId
     }
-  } else {
-    groupOptions.value = []
   }
 }
 
-async function handleGroupChange(val, preserve) {
-  if (!preserve) form.personId = null
-  const group = groupOptions.value.find(g => g.id === val)
-  if (group) {
-    const r = await listUser({ deptId: group.id })
-    personOptions.value = r.rows || []
-  } else {
-    personOptions.value = []
+async function handlePersonChange(val) {
+  form.deptId = null; form.teamId = null; form.groupId = null
+  if (val) {
+    const r = await getUserOrgInfo({ userId: val })
+    if (r.data) {
+      form.deptId = r.data.deptInfo.brigadeId
+      form.teamId = r.data.deptInfo.departmentId
+      form.groupId = r.data.deptInfo.teamId
+    }
   }
 }
 
@@ -440,14 +456,30 @@ function handleUpdate(row) {
   const record = row?.id ? row : list.value.find(r => r.id === ids.value[0])
   if (record) {
     Object.assign(form, record)
+    const org = String(record.org)
+    form.org = org
+    if (org === '1') {
+      form.deptId = record.deptId || null
+    } else if (org === '2') {
+      loadAllTeams().then(() => {
+        form.teamId = record.teamId || null
+        if (form.teamId) handleDepartmentChange(form.teamId)
+      })
+    } else if (org === '3') {
+      loadAllGroups().then(() => {
+        form.groupId = record.groupId || null
+        if (form.groupId) handleGroupChange(form.groupId)
+      })
+    } else if (org === '4') {
+      loadAllPersons().then(() => {
+        form.personId = record.personId || null
+        if (form.personId) handlePersonChange(form.personId)
+      })
+    }
     if (record.dimensionId) onDimensionChange(record.dimensionId, true)
     if (record.level2Id) onLevel2Change(record.level2Id, true)
     if (record.level3Id) onLevel3Change(record.level3Id, true)
     if (record.level4Id) onLevel4Change(record.level4Id, true)
-    if (record.deptId) handleDeptChange(record.deptId, true)
-    if (record.teamId) handleTeamChange(record.teamId, true)
-    if (record.groupId) handleGroupChange(record.groupId, true)
-
   }
   dialogTitle.value = '修改配分事项'; dialogVisible.value = true
 }

src/views/system/dept/index.vue

@@ -311,4 +311,11 @@ function handleDelete(row) {
 }
 
 getList()
+onMounted(() => {
+    listDept().then(response => {
+    const data = { deptId: 0, deptName: '顶级节点', children: [] }
+    data.children = proxy.handleTree(response.data, "deptId")
+    deptOptions.value.push(data)
+  })
+})
 </script>

src/views/system/user/components/UserInfoEdit.vue

@@ -92,7 +92,14 @@
           </el-col>
           <el-col :span="12">
             <el-form-item label="标签" prop="tags">
-              <el-input v-model="form.tags" placeholder="请输入标签" maxlength="50" />
+              <div class="tag-input-wrap">
+                <el-tag v-for="tag in tagsArray" :key="tag" closable :disable-transitions="false" @close="handleClose(tag)">
+                  {{ tag }}
+                </el-tag>
+                <el-input v-if="inputVisible" ref="tagInputRef" v-model="inputValue" size="small" style="width: 100px"
+                  @keyup.enter="handleInputConfirm" @blur="handleInputConfirm" />
+                <el-button v-else size="small" @click="showInput">+ 新增标签</el-button>
+              </div>
             </el-form-item>
           </el-col>
         </el-row>
@@ -431,6 +438,42 @@ defineProps({
 const userRef = ref(null)
 const form = defineModel('form', ref({}))
 
+const tagsArray = ref([])
+const inputVisible = ref(false)
+const inputValue = ref('')
+const tagInputRef = ref(null)
+
+watch(() => form.value.tags, (val) => {
+  if (val) {
+    tagsArray.value = val.split(',').filter(t => t.trim())
+  } else {
+    tagsArray.value = []
+  }
+}, { immediate: true })
+
+watch(tagsArray, (arr) => {
+  form.value.tags = arr.join(',')
+}, { deep: true })
+
+const handleClose = (tag) => {
+  tagsArray.value = tagsArray.value.filter(t => t !== tag)
+}
+
+const showInput = () => {
+  inputVisible.value = true
+  nextTick(() => {
+    tagInputRef.value?.focus()
+  })
+}
+
+const handleInputConfirm = () => {
+  if (inputValue.value) {
+    tagsArray.value = [...tagsArray.value, inputValue.value]
+  }
+  inputVisible.value = false
+  inputValue.value = ''
+}
+
 // 政治面貌、资质等级、紧急联系人关系、生肖、星座、血型、是否通过政审、学历、性格特征、工作风格、团队配合、关键词、能力表现、人际互动、成长潜力
 const {
   sys_user_political_status,
@@ -546,5 +589,13 @@ defineExpose({
       color: #000;
     }
   }
+
+  .tag-input-wrap {
+    display: flex;
+    flex-wrap: wrap;
+    gap: 6px;
+    align-items: center;
+    width: 100%;
+  }
 }
 </style>