1.0.54 邮寄申请加载用户列表、添加部门

src/views/oa/crm/crmMailingApply/edit.vue

@@ -61,6 +61,20 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="部门" prop="deptId">
+              <el-select
+                v-model="form.deptId"
+                placeholder="请选择部门"
+                filterable
+                clearable
+                :disabled="!isFormEditable"
+                style="width: 100%"
+              >
+                <el-option v-for="item in deptList" :key="item.deptId" :label="item.deptName" :value="item.deptId" />
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col :span="12">
             <el-form-item label="省份" prop="province">
               <el-input v-model="form.province" placeholder="例如目的地为山东省，请输入“山东”" :disabled="!isFormEditable" />
@@ -241,8 +255,9 @@ import {
   updateCrmMailingApplySignTime
 } from '@/api/oa/crm/crmMailingApply';
 import { CrmMailingApplyForm } from '@/api/oa/crm/crmMailingApply/types';
-import { listUser } from '@/api/system/user';
+import { getUserList, listUser } from '@/api/system/user';
 import { UserQuery } from '@/api/system/user/types';
+import { allListDept } from '@/api/system/dept';
 import ProjectSelect from '@/components/ProjectSelect/index.vue';
 import { getRuleGenerateCode } from '@/api/system/codeRule';
 import { CodeRuleEnum, FlowCodeEnum } from '@/enums/OAEnum';
@@ -293,6 +308,8 @@ const taskVariables = ref<any>({});
 
 // 用户列表
 const userList = ref<any[]>([]);
+// 部门列表
+const deptList = ref<any[]>([]);
 
 // OSS 上传内部 v-model 中转，避免直接绑定到 form 的字段类型导致TS报错
 const ossFileModel = ref<string | string[] | undefined>(undefined);
@@ -346,14 +363,23 @@ const { form, rules } = toRefs(data);
 /** 加载用户列表 */
 const loadUserList = async () => {
   try {
-    const params: UserQuery = { pageNum: 1, pageSize: 9999 };
+    const res = await getUserList({} as any);
-    const res = await listUser(params);
+    userList.value = res.data;
-    userList.value = res.rows;
   } catch (e) {
     userList.value = [];
   }
 };
 
+/** 加载部门列表 */
+const loadDeptList = async () => {
+  try {
+    const res = await allListDept({ deptCategory: '03' } as any);
+    deptList.value = res.data || [];
+  } catch (e) {
+    deptList.value = [];
+  }
+};
+
 /** 打开项目选择弹窗 */
 const openProjectSelect = () => {
   if (routeParams.value.type === 'view' || routeParams.value.type === 'approval') {
@@ -579,6 +605,7 @@ onMounted(async () => {
   nextTick(async () => {
     proxy?.$modal.loading('正在加载数据，请稍后...');
     await loadUserList();
+    await loadDeptList();
     await loadFormData();
     proxy?.$modal.closeLoading();
   });