Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/api/system/user/index.ts

src/api/system/user/index.ts

@@ -116,4 +116,15 @@ export function examineUser(data) {
   console.log('data=>', data)
 
   return request.put({ url: '/system/user/user_audit', data })
+  return request.put({url: '/system/user/user_audit', data})
+}
+
+// 专管员列表
+export const getEnterpriseManager = () => {
+  return request.get({ url: '/system/user/enterprise_manager_list' })
+}
+
+// 发布列表
+export const deptByMenu = () => {
+  return request.get({ url: '/system/user/deptByMenu' })
 }

src/views/enterprises/index.vue

@@ -162,6 +162,8 @@ import { getStrDictOptions, DICT_TYPE, getDictLabel } from '@/utils/dict'
 import { dateFormatter } from '@/utils/formatTime'
 import download from '@/utils/download'
 import { EnterprisesApi, EnterprisesVO } from '@/api/enterprises'
+import { getEnterpriseManager } from '@/api/system/user'
+
 import { TagLibraryApi } from '@/api/system/taglibrary'
 import {Search} from "@element-plus/icons-vue";
 /** 企业 列表 */
@@ -247,6 +249,11 @@ const getTypList = async () => {
 }
 
 getTypList()
+
+const getUserList = async () => {
+  // awitgetEnterpriseManager
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()

src/views/system/user/UserForm.vue

@@ -28,17 +28,6 @@
             />
             
           </el-form-item>
-
-          <el-form-item label="管理区域" prop="deptId">
-            <el-select v-model="formData.area" placeholder="请选择"  multiple>
-              <el-option
-                v-for="dict in getIntDictOptions(DICT_TYPE.ENTERPRISES_AREA)"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              />
-            </el-select>
-          </el-form-item>
         </el-col>
       </el-row>
       <el-row>

src/views/task/index.vue

@@ -32,11 +32,11 @@
         </el-form-item>
 
         <el-form-item label="" prop="taskType">
-          <el-select v-model="queryParams.taskType" placeholder="请选择任务类型" clearable>
+          <el-select v-model="queryParams.deptId" placeholder="请选择发布部门" clearable>
             <el-option
-              v-for="dict in taskTypeList"
+              v-for="dict in createDeptList"
               :key="dict.id"
-              :label="dict.tagName"
+              :label="dict.name"
               :value="dict.id"
             />
           </el-select>
@@ -153,6 +153,7 @@ import download from '@/utils/download'
 import { TaskInfoApi, TaskInfoVO } from '@/api/system/taskinfo'
 import TaskInfoForm from './TaskInfoForm.vue'
 import { TagLibraryApi } from '@/api/system/taglibrary'
+import { deptByMenu } from '@/api/system/user'
 
 /** 任务表，用于存储所有的任务信息，任务可由不同用户创建并管理。 列表 */
 defineOptions({ name: 'TaskList' })
@@ -182,7 +183,8 @@ const queryParams = reactive({
   parentType: undefined,
   taskStep: undefined,
   taskTotal: undefined,
-  selectWeek: undefined
+  selectWeek: undefined,
+  deptId: undefined
 })
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
@@ -274,9 +276,16 @@ const handleExport = async () => {
   }
 }
 
+const createDeptList = ref()
+const getCreateDept = async () => {
+  const data = await deptByMenu()
+  createDeptList.value = data
+}
+
 /** 初始化 **/
 onMounted(() => {
   getList()
+  getCreateDept()
 })
 </script>
 <style scoped lang="scss">