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

fix: 报表人员分组下拉取值修改为staffNo

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

src/views/message/reportmessage/class.ts

@@ -112,7 +112,7 @@ export const toReportMessage = (form: reportMessage, receivedData: finalReportMe
   }));
   form.customUserList.value = receivedData.customUserList.map((user: any) => ({
     id: user.userId,
-    staffNo: user.userNumber,
+    staffNo: user.staffNo,
     realname: user.realname,
   }));
   form.recipientType = receivedData.recipientType;

src/views/system/user/CreateDrawer.vue

@@ -10,7 +10,6 @@
           class="protocal-select"
           filterable
           remote
-          reserve-keyword
           clearable
           :loading="loading"
           :data="staffNoOptions"
@@ -179,12 +178,15 @@
         if (res) {
           loading.value = false;
           staffNoOptions.value = transformTreeData(res, true);
+           /* 保存原始数据，用于选中后将数据返显到表单 */
+          OrganizationSourceData.value = res;
+          /* 选中数据后将部门设置为当前数据的部门 */
+          departmentArr.value = transformTreeData(OrganizationSourceData.value, false);
+        } 
+
+        if (res.length === 0) {
+          departmentArr.value = props.departmentList;
         }
-        /* 保存原始数据，用于选中后将数据返显到表单 */
-        OrganizationSourceData.value = res;
-        /* 选中数据后将部门设置为当前数据的部门 */
-        departmentArr.value = transformTreeData(OrganizationSourceData.value, false);
-        
       });
     } else {
       staffNoOptions.value = [];
@@ -197,6 +199,9 @@
   const staffNoHtmlType = ref<STAFFNO_HTML_TYPE>('SELECT');
   const handleChangeStaff = () => {
     staffNoHtmlType.value = staffNoHtmlType.value === 'INPUT' ? 'SELECT' : 'INPUT';
+    if (staffNoHtmlType.value === 'INPUT') {
+       departmentArr.value = props.departmentList;
+    }
   };
 
   const handleClear = () => {