Browse Source

fix:V4版本人员分组

qindao 1 year ago
parent
commit
339361ac42

+ 4 - 4
src/views/message/persongroup/UserGroup.vue

@@ -149,14 +149,14 @@
   const handleView = (record: Recordable) => {
     drawer.value = true;
     drawerTitle.value = '查看人员分组';
-    getUserGroupDetail(record.userGroupId).then((res) => {
+    getUserGroupDetail(record.id).then((res) => {
       formData.value = res;
     });
   };
   const handleEdit = (record: Recordable) => {
     drawer.value = true;
     drawerTitle.value = '编辑人员分组';
-    getUserGroupDetail(record.userGroupId).then((res) => {
+    getUserGroupDetail(record.id).then((res) => {
       formData.value = res;
     });
   };
@@ -167,7 +167,7 @@
       type: 'warning',
     })
       .then(() => {
-        verifyUserGroup(record.userGroupId).then((res) => {
+        verifyUserGroup(record.id).then((res) => {
           const uniqueRes = Array.from(
             new Map(res.map((item) => [item.messageType, item])).values(),
           ) as any;
@@ -175,7 +175,7 @@
           if (refGroup.value?.length! > 0) {
             errorVisible.value = true;
           } else {
-            deleteUserGroup(record.userGroupId).then(() => {
+            deleteUserGroup(record.id).then(() => {
               ElMessage.success('删除成功');
               getUserGroup();
             });

+ 3 - 3
src/views/message/persongroup/components/GroupBoard.vue

@@ -61,7 +61,7 @@
           <el-option
             v-for="user in selectedUser"
             :key="user.id"
-            :label="user.staffNo + '-' + user.nickname"
+            :label="user.staffNo + '-' + user.realname"
             :value="user"
           >
           </el-option>
@@ -86,7 +86,7 @@
           <el-option
             v-for="user in selectedUser"
             :key="user.id"
-            :label="user.staffNo + '-' + user.nickname"
+            :label="user.staffNo + '-' + user.realname"
             :value="user"
           >
           </el-option>
@@ -170,7 +170,7 @@
     name: '',
     description: '',
     userList: [] as SelectedFilterPersonInfo[],
-    operator: info.value.nickname,
+    operator: info.value.realname,
   });
   const handleCancle = () => {
     dialogVisible.value = false;

+ 9 - 7
src/views/message/persongroup/hook/usePersonGroupFilterList.ts

@@ -22,29 +22,31 @@ export const usePersonGroupFilterList = () => {
   const personFilterParams = ref<QueryPersonFilterParams>({
     pageNumber: 1,
     pageSize: 10,
+    queryParam: {}
   });
   // 查询事件
   const getPersonFilterList = async () => {
     personFilterParams.value = {
       pageNumber: 1,
       pageSize: 10,
+      queryParam: {}
     };
     personFilterParams.value[personFilterType.value.type] = personFilterValue.value;
     const res = await queryPersonFilterList(personFilterParams.value);
     personFilterList.value = res;
     // 如果有返回且搜索到则添加选中标记
-    if (personFilterList.value && personFilterList.value.availableUserDTOS)
-      personFilterList.value.availableUserDTOS = checkPersonList(
-        personFilterList.value.availableUserDTOS,
+    if (personFilterList.value && personFilterList.value.records)
+      personFilterList.value.records = checkPersonList(
+        personFilterList.value.records,
       );
   };
   // 查询翻页事件
   const getNextPersonFilterList = async () => {
     personFilterParams.value.pageNumber++;
     const res = await queryPersonFilterList(personFilterParams.value);
-    res.availableUserDTOS = checkPersonList(res.availableUserDTOS);
-    personFilterList.value!.total = res.total;
-    personFilterList.value!.availableUserDTOS.push(...res.availableUserDTOS);
+    res.records = checkPersonList(res.records);
+    personFilterList.value!.totalRow = res.totalRow;
+    personFilterList.value!.records.push(...res.records);
   };
   // 查询结果
   const personFilterList = ref<QueryPersonFilterListReturn>();
@@ -62,7 +64,7 @@ export const usePersonGroupFilterList = () => {
 
   // 查询结果刷新选中标记
   const refreshPersonFilterCheckedStatus = (personId: number) => {
-    const person = personFilterList.value?.availableUserDTOS.find((item) => item.id === personId);
+    const person = personFilterList.value?.records.find((item) => item.id === personId);
     if (person) person.checked = selectedPersonList.value.some((person) => person.id === personId);
   };