From 5677292fd2982a9bbea10bab1abaa9df28feab63 Mon Sep 17 00:00:00 2001
From: 15210398771 <dalzlong@163.com>
Date: Sun, 14 Apr 2024 17:07:39 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E8=A1=A8=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dict.ts | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/src/utils/dict.ts b/src/utils/dict.ts
index cc1774b32..888ff33c0 100644
--- a/src/utils/dict.ts
+++ b/src/utils/dict.ts
@@ -123,8 +123,14 @@ export enum DICT_TYPE {
   SYSTEM_MAIL_SEND_STATUS = 'system_mail_send_status',
   SYSTEM_NOTIFY_TEMPLATE_TYPE = 'system_notify_template_type',
   SYSTEM_SOCIAL_TYPE = 'system_social_type',
+  SYSTEM_EDUCATION = "education", // 学历
+  SYSTEM_MAJOR = "major", //专业
 
-  // ========== INFRA 模块 ==========
+  // ==========  所属技术领域  ==========
+  TECHNICAL_FIELD = "technical_field",
+  APPLY_UNIT_TYPE = "apply_unit_type"  //立项-单位类型
+
+ /* // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING = 'infra_boolean_string',
   INFRA_JOB_STATUS = 'infra_job_status',
   INFRA_JOB_LOG_STATUS = 'infra_job_log_status',
@@ -207,5 +213,8 @@ export enum DICT_TYPE {
 
   // ========== ERP - 企业资源计划模块  ==========
   ERP_AUDIT_STATUS = 'erp_audit_status', // ERP 审批状态
-  ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type' // 库存明细的业务类型
+  ERP_STOCK_RECORD_BIZ_TYPE = 'erp_stock_record_biz_type', // 库存明细的业务类型*/
+
+
+
 }

From 3618a600cd2063946ad8a484c302ac3005dc78d9 Mon Sep 17 00:00:00 2001
From: 15210398771 <dalzlong@163.com>
Date: Sun, 14 Apr 2024 17:07:59 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=A6=96=E9=A1=B5?=
 =?UTF-8?q?=E5=AD=97=E5=85=B8=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apply/apply/MainForm.vue | 48 ++++++++++++++++++++++++++----
 1 file changed, 42 insertions(+), 6 deletions(-)

diff --git a/src/views/apply/apply/MainForm.vue b/src/views/apply/apply/MainForm.vue
index 3582771b5..1dfce3fe5 100644
--- a/src/views/apply/apply/MainForm.vue
+++ b/src/views/apply/apply/MainForm.vue
@@ -14,7 +14,14 @@
         <el-input v-model="formData.name" placeholder="请输入项目名称" />
       </el-form-item>
       <el-form-item label="所属技术领域" prop="technicalField">
-        <el-input v-model="formData.technicalField" placeholder="请输入所属技术领域" />
+        <el-select v-model="formData.technicalField" clearable placeholder="请选择所属技术领域">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.TECHNICAL_FIELD)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="年度" prop="year">
         <el-input v-model="formData.year" placeholder="请输入年度" />
@@ -37,19 +44,47 @@
         <el-input v-model="formData.director" placeholder="请输入负责人姓名" />
       </el-form-item>
       <el-form-item label="负责人性别" prop="gender">
-        <el-input v-model="formData.gender" placeholder="请输入负责人性别" />
+        <el-select v-model="formData.gender" clearable placeholder="请选择负责人性别">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_USER_SEX)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="年龄" prop="age">
         <el-input v-model="formData.age" placeholder="请输入年龄" />
       </el-form-item>
       <el-form-item label="学历" prop="education">
-        <el-input v-model="formData.education" placeholder="请输入学历" />
+        <el-select v-model="formData.education" clearable placeholder="请选择学历">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_EDUCATION)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="所学专业" prop="major">
-        <el-input v-model="formData.major" placeholder="请输入所学专业" />
+        <el-select v-model="formData.major" clearable placeholder="请选择所学专业">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_MAJOR)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="从事专业" prop="engagMajor">
-        <el-input v-model="formData.engagMajor" placeholder="请输入从事专业" />
+        <el-select v-model="formData.engagMajor" clearable placeholder="请选择从事专业">
+          <el-option
+            v-for="dict in getIntDictOptions(DICT_TYPE.SYSTEM_MAJOR)"
+            :key="dict.value"
+            :label="dict.label"
+            :value="dict.value"
+          />
+        </el-select>
       </el-form-item>
       <el-form-item label="职务（职称）" prop="position">
         <el-input v-model="formData.position" placeholder="请输入职务（职称）" />
@@ -162,6 +197,7 @@ import UnitsForm from './components/UnitsForm.vue'
 import ParticipantForm from './components/ParticipantForm.vue'
 import PlanForm from './components/PlanForm.vue'
 import FundsForm from './components/FundsForm.vue'
+import {DICT_TYPE, getIntDictOptions} from "@/utils/dict";
 
 /** 立项申请主 表单 */
 defineOptions({ name: 'MainForm' })
@@ -346,4 +382,4 @@ const resetForm = () => {
   }
   formRef.value?.resetFields()
 }
-</script>
\ No newline at end of file
+</script>