Merge branch 'all-v4-qindao' into 'all-v4'

fix: 添加用户新增反填手机号

See merge request skyeye/skyeye_frontend/skyeye-admin!341

src/utils/findUserByWorkNo.ts

@@ -49,7 +49,7 @@ export function findOrgCodeByWorkNo(nodes: TreeNode[], workNo: string): string |
     if (node.users) {
       const foundUser = node.users.find((user) => user.idtUserWorkNo === workNo);
       if (foundUser) {
-        return node.idtOrgId;
+        return node.deptId;
       }
     }
     if (node.children) {

src/views/message/reportmessage/CustomReport.vue

@@ -101,7 +101,7 @@
             style="width: 326px; padding-bottom: 0px"
             :disabled="disableType.contentDisable"
           >
-            <el-option v-for="item in options" :key="item.userGroupId" :label="item.name" :value="item.userGroupId" />
+            <el-option v-for="item in options" :key="item.id" :label="item.name" :value="item.id" />
           </el-select>
         </el-col>
       </el-form-item>

src/views/message/reportmessage/MonthReport.vue

@@ -64,9 +64,9 @@
         >
           <el-option
             v-for="item in options"
-            :key="item.userGroupId"
+            :key="item.id"
             :label="item.name"
-            :value="item.userGroupId"
+            :value="item.id"
           />
         </el-select>
       </el-col>

src/views/message/reportmessage/WeekReport.vue

@@ -64,9 +64,9 @@
         >
           <el-option
             v-for="item in options"
-            :key="item.userGroupId"
+            :key="item.id"
             :label="item.name"
-            :value="item.userGroupId"
+            :value="item.id"
           />
         </el-select>
       </el-col>

src/views/message/reportmessage/YearReport.vue

@@ -62,9 +62,9 @@
         >
           <el-option
             v-for="item in options"
-            :key="item.userGroupId"
+            :key="item.id"
             :label="item.name"
-            :value="item.userGroupId"
+            :value="item.id"
           />
         </el-select>
       </el-col>

src/views/system/user/CreateDrawer.vue

@@ -191,7 +191,7 @@
     }
   };
   /* 防抖 */
-  const debouncedRemoteMethod = debounce(remoteMethod, 500);
+  const debouncedRemoteMethod = debounce(remoteMethod, 1000);
 
   type STAFFNO_HTML_TYPE = 'INPUT' | 'SELECT';
   const staffNoHtmlType = ref<STAFFNO_HTML_TYPE>('SELECT');
@@ -212,6 +212,7 @@
       formParams.value.staffNo = findUser.idtUserWorkNo;
       formParams.value.username = findUser.idtUserWorkNo;
       formParams.value.roleIdList = JSON.parse(findUser.useTypes);
+      formParams.value.mobile = findUser.idtUserMobile;
       formParams.value.deptId = findOrgCodeByWorkNo(OrganizationSourceData.value, value);
     }
   };
@@ -249,7 +250,7 @@
         addSingleUser(params)
           .then((res) => {
             if (res.code !== ResultEnum.SUCCESS) {
-              return Promise.reject(res.msg);
+              return Promise.reject(res.message);
             }
             emit('change');
             handleReset();
@@ -264,7 +265,7 @@
         updateUser(params)
           .then((res) => {
             if (res.code !== ResultEnum.SUCCESS) {
-              return Promise.reject(res.msg);
+              return Promise.reject(res.message);
             }
             emit('change');
             handleReset();
@@ -292,6 +293,7 @@
       formParams.value.passwordRe = res.password;
       formParams.value.isDisabled = res.isDisabled === DisabledEnum.NO ? true : false;
       isDrawer.value = true;
+      remoteMethod(res.username)
     });
   }