Merge branch 'employeeScreen'

src/views/score/event/index.vue

@@ -157,8 +157,8 @@
       v-model:limit="queryParams.pageSize" @pagination="getList" />
 
     <!-- 新增/修改对话框 -->
-    <el-dialog :title="dialogTitle" v-model="dialogVisible" width="680px" append-to-body>
-      <el-form ref="formRef" :model="form" label-width="100px">
+    <el-dialog :title="dialogTitle" v-model="dialogVisible" width="680px" append-to-body  element-loading-text="加载中...">
+      <el-form ref="formRef" :model="form" label-width="100px" v-loading="dialogLoading">
         <el-row :gutter="16">
           <el-col :span="12">
             <el-form-item label="配分层级" prop="org" :rules="rules.org">
@@ -311,7 +311,7 @@ const { score_level, score_type } = proxy.useDict('score_level', 'score_type')
 
 const loading = ref(false), list = ref([]), total = ref(0), showSearch = ref(true)
 const dateRange = ref([]), queryRef = ref(null), formRef = ref(null)
-const dialogVisible = ref(false), dialogTitle = ref('')
+const dialogVisible = ref(false), dialogTitle = ref(''), dialogLoading = ref(false)
 const single = ref(true), multiple = ref(true), ids = ref([])
 const dimensionOptions = ref([])
 const indicatorTree = ref([])  // 当前维度的指标树（扁平+嵌套）
@@ -322,6 +322,7 @@ const deptOptions = ref([])
 const teamOptions = ref([])
 const groupOptions = ref([])
 const personOptions = ref([])
+const allPersonOptions = ref([]) // 缓存全部人员，避免重复请求
 const queryDeptOptions = ref([])
 const queryTeamOptions = ref([])
 const queryGroupOptions = ref([])
@@ -369,6 +370,7 @@ async function handleLevelChange() {
 }
 
 async function handleFormLevelChange() {
+
   form.dimensionId = null
   form.level2Id = null; form.level2Name = ''; form.level3Id = null; form.level3Name = ''; form.level4Id = null; form.level4Name = ''
   form.deptId = null; form.teamId = null; form.groupId = null; form.personId = null
@@ -388,6 +390,7 @@ async function handleFormLevelChange() {
   // } else if (org === '4') {
   await loadAllPersons()
   // }
+ 
 }
 
 async function loadAllTeams() {
@@ -407,8 +410,9 @@ async function loadAllGroups() {
 
 async function loadAllPersons() {
   const r = await listUser({ pageSize: 9999 })
-
-  personOptions.value = r.rows || []
+  const rows = r.rows || []
+  allPersonOptions.value = rows
+  personOptions.value = rows
 }
 
 async function loadRegions() {
@@ -434,40 +438,65 @@ async function handleFormRegionalChange(val) {
   }
 }
 
-function handleBrigadeChange() {
+async function handleBrigadeChange(val) {
+  
+  form.teamId = null; form.groupId = null; form.personId = null
+  teamOptions.value = []; groupOptions.value = []; personOptions.value = []
+  if (val) {
+    const r = await deptTreeSelect({ parentId: val })
+    teamOptions.value = r.data || []
+  }
+ 
 }
 
 async function handleDepartmentChange(val) {
-  form.deptId = null
+
+  form.groupId = null; form.personId = null
+  groupOptions.value = []; personOptions.value = []
   if (val) {
-    const r = await getDeptOrgInfo({ deptId: val })
-    if (r.data) {
-      form.deptId = r.data.brigadeId
-    }
+    const r = await deptTreeSelect({ parentId: val })
+    groupOptions.value = r.data || []
   }
+  
 }
 
 async function handleGroupChange(val) {
-  form.deptId = null; form.teamId = null
+
+  form.personId = null
+  personOptions.value = []
   if (val) {
-    const r = await getDeptOrgInfo({ deptId: val })
-    if (r.data) {
-      form.deptId = r.data.brigadeId
-      form.teamId = r.data.departmentId
-    }
+    const r = await listUser({ deptId: val, pageSize: 9999 })
+    personOptions.value = r.rows || []
+  } else {
+    personOptions.value = [...allPersonOptions.value]
   }
+ 
 }
 
 async function handlePersonChange(val) {
+  dialogLoading.value = true
   form.deptId = null; form.teamId = null; form.groupId = null
+  teamOptions.value = []; groupOptions.value = []; 
   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
+
+      // 根据部门加载队室/班组选项
+      if (form.deptId) {
+        const r1 = await deptTreeSelect({ parentId: form.deptId })
+        teamOptions.value = r1.data || []
+      }
+      // 根据队室/班组加载通道/小组选项
+      if (form.teamId) {
+        const r2 = await deptTreeSelect({ parentId: form.teamId })
+        groupOptions.value = r2.data || []
+      }
     }
   }
+  dialogLoading.value = false
 }
 
 async function loadQueryDepts() {
@@ -500,7 +529,7 @@ async function handleQueryGroupChange(val) {
   queryParams.personId = null
   const group = queryGroupOptions.value.find(g => g.id === val)
   if (group) {
-    const r = await listUser({ deptId: group.id })
+    const r = await listUser({ deptId: group.id, pageSize: 9999 })
     queryPersonOptions.value = r.rows || []
   } else {
     queryPersonOptions.value = []
@@ -550,6 +579,8 @@ function resetForm() {
 
 function handleAdd() { resetForm(); dialogTitle.value = '新增配分事项'; dialogVisible.value = true }
 async function handleUpdate(row) {
+ 
+  dialogVisible.value = true
   resetForm()
   const record = row?.id ? row : list.value.find(r => r.id === ids.value[0])
   if (record) {
@@ -605,10 +636,12 @@ async function handleUpdate(row) {
     if (record.level3Id) onLevel3Change(record.level3Id, true)
     if (record.level4Id) onLevel4Change(record.level4Id, true)
   }
-  dialogTitle.value = '修改配分事项'; dialogVisible.value = true
+ 
+  dialogTitle.value = '修改配分事项'
 }
 
 async function onDimensionChange(dimId, preserveSelection) {
+  dialogLoading.value = true
   const dim = dimensionOptions.value.find(d => d.id === dimId)
   if (dim) form.dimensionName = dim.name
   const r = await treeIndicator({ dimensionId: dimId, org: form.org })
@@ -617,6 +650,7 @@ async function onDimensionChange(dimId, preserveSelection) {
   if (!preserveSelection) { form.level2Id = null; form.level2Name = ''; form.level3Id = null; form.level3Name = ''; form.level4Id = null; form.level4Name = ''; form.scoreValue = 0 }
   level3Options.value = []; level4Options.value = []
   if (preserveSelection && form.level2Id) onLevel2Change(form.level2Id, true)
+  dialogLoading.value = false
 }
 
 function onLevel2Change(val, preserveSelection) {
@@ -760,6 +794,13 @@ const processPostTree = (nodes, isFirstLevel = true) => {
   })
 }
 
+// 监听通道/小组变化：无值时责任人显示全部人员
+watch(() => form.groupId, (newVal) => {
+  if (!newVal) {
+    personOptions.value = [...allPersonOptions.value]
+  }
+})
+
 onMounted(() => {
   loadDimensions();
   loadDepts();