chore: 评分专家增加所属机构

src/modules/admin/contest/experts/components/FormDialog.vue

@@ -5,6 +5,7 @@ import { ElMessage } from 'element-plus'
 import { createExpert, updateExpert } from '../api'
 import { useMapStore } from '@/stores/map'
 import { useArea } from '@/composables/useArea'
+import { useGetProjectList } from '@/composables/useGetProjectList'
 
 interface Props {
   data?: Expert
@@ -17,6 +18,8 @@ const emit = defineEmits<{
   (e: 'update:modelValue', visible: boolean): void
 }>()
 
+// 机构列表
+const { organizations } = useGetProjectList()
 // 性别
 const genderList = useMapStore().getMapValuesByKey('system_gender')
 // 职务
@@ -31,7 +34,8 @@ const form = reactive<ExpertCreateParams>({
   position_id: '',
   province: '',
   city: '',
-  area: ''
+  area: '',
+  organization_id: ''
 })
 
 const { provinceList, cityList, countyList, provinceValue, cityValue, countyValue } = useArea(
@@ -47,7 +51,7 @@ watchEffect(() => {
 
 watchEffect(() => {
   if (!props.data) return
-  Object.assign(form, props.data, { position_id: props.data.position.id })
+  Object.assign(form, props.data, { position_id: props.data.position.id, organization_id: props.data.organization.id })
 })
 
 const rules = ref<FormRules>({
@@ -57,7 +61,8 @@ const rules = ref<FormRules>({
   position_id: [{ required: true, message: '请选择职务' }],
   province: [{ required: true, message: '请选择省' }],
   city: [{ required: true, message: '请选择市' }],
-  area: [{ required: true, message: '请选择区/县' }]
+  area: [{ required: true, message: '请选择区/县' }],
+  organization_id: [{ required: true, message: '请选择所属部门/学校' }]
 })
 const isUpdate = $computed(() => {
   return !!props.data?.id
@@ -93,7 +98,12 @@ function handleUpdate() {
 
 <template>
   <el-dialog :title="title" :close-on-click-modal="false" width="600px" @update:modelValue="$emit('update:modelValue')">
-    <el-form ref="formRef" :model="form" :rules="rules" label-width="80px">
+    <el-form ref="formRef" :model="form" :rules="rules" label-width="120px">
+      <el-form-item label="所属部门/学校" prop="organization_id">
+        <el-select v-model="form.organization_id" style="width: 100%" :disabled="isUpdate">
+          <el-option v-for="item in organizations" :key="item.id" :label="item.name" :value="item.id"></el-option>
+        </el-select>
+      </el-form-item>
       <el-form-item label="姓名" prop="name">
         <el-input v-model="form.name" :disabled="isUpdate" />
       </el-form-item>

src/modules/admin/contest/experts/types.ts

@@ -14,6 +14,7 @@ export interface Expert {
   updated_time: string
   position: ExpertPosition
   competition: ExpertCompetition
+  organization: ExpertOrganization
   check_count: 1
 }
 export interface ExpertPosition {
@@ -25,6 +26,10 @@ export interface ExpertCompetition {
   id: string
   name: string
 }
+export interface ExpertOrganization {
+  id: string
+  name: string
+}
 export interface ExpertCreateParams {
   name: string
   mobile: string
@@ -34,6 +39,7 @@ export interface ExpertCreateParams {
   province: string
   city: string
   area: string
+  organization_id: string
 }
 
 export type ExpertUpdateParams = ExpertCreateParams & { id: string }