From 34fa38272667de1b60e2d0b55fbd4ec456a32efb Mon Sep 17 00:00:00 2001
From: lizilong <lizilong>
Date: Mon, 15 Apr 2024 22:59:58 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AB=8B=E9=A1=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/apply/apply/MainForm.vue            | 23 +++++++++++++++----
 src/views/apply/apply/components/InfoForm.vue | 14 +++++------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/src/views/apply/apply/MainForm.vue b/src/views/apply/apply/MainForm.vue
index febe124b8..fa7d4c7ca 100644
--- a/src/views/apply/apply/MainForm.vue
+++ b/src/views/apply/apply/MainForm.vue
@@ -48,7 +48,10 @@
                 </el-form-item></el-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6">
                 <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-col>
               <el-col :xs="24" :sm="12" :md="8" :lg="6">
                 <el-form-item label="年龄" prop="age">
@@ -277,14 +280,26 @@ const open = async (type: string, id?: number) => {
     formLoading.value = true
     try {
       formData.value = await MainApi.getMain(id)
+      if(formData.value.technicalField){
+        formData.value.technicalField = Number(formData.value.technicalField)
+      }
       if(formData.value.beginDate){
         formData.value.beginDate = Number(formData.value.beginDate)
       }
-       if(formData.value.engagMajor){
-        formData.value.engagMajor =(formData.value.engagMajor).toString()
+      if(formData.value.endDate){
+        formData.value.endDate = Number(formData.value.endDate)
+      }
+      if(formData.value.engagMajor){
+        formData.value.engagMajor =Number(formData.value.engagMajor)
       }
       if(formData.value.major){
-        formData.value.major =(formData.value.major).toString()
+        formData.value.major =Number(formData.value.major)
+      }
+      if(formData.value.gender){
+        formData.value.gender =Number(formData.value.gender)
+      }
+      if(formData.value.education){
+        formData.value.education =Number(formData.value.education)
       }
     } finally {
       formLoading.value = false
diff --git a/src/views/apply/apply/components/InfoForm.vue b/src/views/apply/apply/components/InfoForm.vue
index 998e70a8e..fef4ab700 100644
--- a/src/views/apply/apply/components/InfoForm.vue
+++ b/src/views/apply/apply/components/InfoForm.vue
@@ -28,15 +28,15 @@
       <legend>项目实施目标及考核指标</legend>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :md="12" :lg="12">
-          <el-form-item label="项目实施目标及考核指标-项目目标" prop="objectives">
+          <el-form-item label="项目目标" prop="objectives">
             <el-input v-model="formData.objectives" placeholder="请输入项目实施目标及考核指标-项目目标" type="textarea" :rows="6" />
           </el-form-item> </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12">
-          <el-form-item label="项目实施目标及考核指标-考核指标" prop="evaluation">
+          <el-form-item label="考核指标" prop="evaluation">
             <el-input v-model="formData.evaluation" placeholder="请输入项目实施目标及考核指标-考核指标" type="textarea" :rows="6" />
           </el-form-item> </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12">
-          <el-form-item label="项目实施目标及考核指标-考核指标依据" prop="according">
+          <el-form-item label="考核指标依据" prop="according">
             <el-input v-model="formData.according" placeholder="请输入项目实施目标及考核指标-考核指标依据" type="textarea" :rows="6" />
           </el-form-item> </el-col>
       </el-row>
@@ -45,15 +45,15 @@
       <legend>主要研究内容开发内容</legend>
       <el-row :gutter="20">
         <el-col :xs="24" :sm="12" :md="12" :lg="12">
-          <el-form-item label="主要研究开发内容-主要研究内容" prop="researchContents">
+          <el-form-item label="主要研究内容" prop="researchContents">
             <el-input v-model="formData.researchContents" placeholder="请输入主要研究开发内容-主要研究内容" type="textarea" :rows="6" />
           </el-form-item> </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12">
-          <el-form-item label="主要研究开发内容-技术路线" prop="roadmap">
+          <el-form-item label="技术路线" prop="roadmap">
             <el-input v-model="formData.roadmap" placeholder="请输入主要研究开发内容-技术路线" type="textarea" :rows="6" />
           </el-form-item> </el-col>
         <el-col :xs="24" :sm="12" :md="12" :lg="12">
-          <el-form-item label="主要研究开发内容-创新性" prop="innovation">
+          <el-form-item label="创新性" prop="innovation">
             <el-input v-model="formData.innovation" placeholder="请输入主要研究开发内容-创新性" type="textarea" :rows="6" />
           </el-form-item> </el-col>
 
@@ -121,4 +121,4 @@ const getData = () => {
 }
 
 defineExpose({ validate, getData })
-</script>
\ No newline at end of file
+</script>