فهرست منبع

fix: 修复筛选账号查询,返回所有数据

qindao 1 سال پیش
والد
کامیت
4d0df844a5

+ 8 - 4
src/api/message/alarm-config.ts

@@ -36,10 +36,14 @@ export interface UserGroupVOItem {
 }
 
 export interface CustomUserItem {
-  userId: number;
-  userLoginName: string;
-  userNickname: string;
-  userNumber: string;
+  /*id */
+  id: number;
+  /*用户姓名 */
+  realname: string;
+  /*工号 */
+  staffNo: string;
+  /*登录账号 */
+  username: string;
 }
 
 export const queryAvailableViolationTypes = () => {

+ 1 - 1
src/types/log/constants.ts

@@ -149,7 +149,7 @@ export const queryTypeSelect = [
     label: '姓名',
   },
   {
-    value: 'account',
+    value: 'userName',
     label: '账号',
   },
 ];

+ 11 - 7
src/views/message/components/PushObject.vue

@@ -114,10 +114,14 @@
   const userInfo = ref<boolean>(false);
   const disabled = ref<boolean>(false);
   export interface customUserList {
-    userId: number;
-    userLoginName: string;
-    userNickname: string;
-    userNumber: string;
+    /*id */
+    id: number;
+    /*用户姓名 */
+    realname: string;
+    /*工号 */
+    staffNo: string;
+    /*登录账号 */
+    username: string;
   }
   export interface userGroupVOList {
     userGroupId: number;
@@ -218,9 +222,9 @@
   };
   const formatCustomUserList = (customList: customUserList[]): SelectedFilterPersonInfo[] => {
      return customList.map((item) => ({
-        id: item.userId,
-        staffNo: item.userNumber,
-        realname: item.userNickname,
+        id: item.id,
+        staffNo: item.staffNo,
+        realname: item.realname,
       }));
   };
   defineExpose({

+ 5 - 5
src/views/message/reportmessage/class.ts

@@ -111,13 +111,13 @@ export const toReportMessage = (form: reportMessage, receivedData: finalReportMe
   form.userGroupList = receivedData.userGroupList?.map((user: any) => user.id);
   form.designatedUserList = receivedData.designatedUserList.map((user: any) => ({
     id: user.userId,
-    staffNo: user.userNumber,
-    realname: user.userNickname,
+    staffNo: user.staffNo,
+    realname: user.realname,
   }));
   form.customUserList.value = receivedData.customUserList.map((user: any) => ({
     id: user.userId,
     staffNo: user.userNumber,
-    realname: user.userNickname,
+    realname: user.realname,
   }));
   form.recipientType = receivedData.recipientType;
   form.customPushConfigList = [];
@@ -147,8 +147,8 @@ export const toReportMessage = (form: reportMessage, receivedData: finalReportMe
       tempconfig['customUserList'] = config.customUserList.map((user: any) => {
         return {
           id: user.userId,
-          staffNo: user.userNumber,
-          nickname: user.userNickname,
+          staffNo: user.staffNo,
+          nickname: user.realname,
         };
       });
       tempconfig['userGroupList'] = config.userGroupList?.map((user: any) => user.id);