fix : 修复需求上报下拉框数据

src/views/project-demand/summary/add.vue

@@ -56,7 +56,7 @@
           <el-form-item label="项目类型" prop="projectType">
             <el-select v-model="formData.projectType" placeholder="请选择项目类型" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('project_type')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -66,15 +66,21 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="研发主体" prop="rdSubject">
-            <el-input v-model="formData.rdSubject" placeholder="请输入研发主体" clearable></el-input>
+            <el-select v-model="formData.rdSubject" placeholder="请选择研发主体" clearable filterable>
+              <el-option
+                  v-for="item in cacheStore.getDict('rd_subject')"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+              />
+            </el-select>
           </el-form-item>
         </el-col>
-
         <el-col :span="12">
           <el-form-item label="出资类型" prop="investmentType">
             <el-select v-model="formData.investmentType" placeholder="请选择出资类型" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('invest_type')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -86,7 +92,7 @@
           <el-form-item label="项目影响" prop="projectImpact">
             <el-select v-model="formData.projectImpact" placeholder="请选择项目影响" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('project_impact')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -98,7 +104,7 @@
           <el-form-item label="所属业务板块" prop="businessSegment">
             <el-select v-model="formData.businessSegment" placeholder="请选择所属业务板块" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('business_segment')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -110,7 +116,7 @@
           <el-form-item label="预期成果形式" prop="resultForm">
             <el-select v-model="formData.resultForm" placeholder="请选择预期成果形式" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('result_form')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -122,7 +128,7 @@
           <el-form-item label="预期技术标准制定" prop="technicalStandard">
             <el-select v-model="formData.technicalStandard" placeholder="请选择预期技术标准制定" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('technical_standard')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -132,33 +138,25 @@
         </el-col>
         <el-col :span="12">
           <el-form-item label="产学研联合" prop="industryUniversityResearch">
-            <el-select v-model="formData.industryUniversityResearch" placeholder="请选择产学研联合" clearable filterable>
+            <el-radio-group v-model="formData.industryUniversityResearch">
-              <el-option
+              <el-radio :label="0">是</el-radio>
-                  v-for="item in cacheStore.getDict('todo_type')"
+              <el-radio :label="1">否</el-radio>
-                  :key="item.value"
+            </el-radio-group>
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="开展政府申报" prop="governmentDeclaration">
-            <el-select v-model="formData.governmentDeclaration" placeholder="请选择开展政府申报" clearable filterable>
+            <el-radio-group v-model="formData.governmentDeclaration">
-              <el-option
+              <el-radio :label="0">是</el-radio>
-                  v-for="item in cacheStore.getDict('todo_type')"
+              <el-radio :label="1">否</el-radio>
-                  :key="item.value"
+            </el-radio-group>
-                  :label="item.label"
-                  :value="item.value"
-              />
-            </el-select>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="知识产权状况" prop="intellectualProperty">
             <el-select v-model="formData.intellectualProperty" placeholder="请选择知识产权状况" clearable filterable>
               <el-option
-                  v-for="item in cacheStore.getDict('todo_type')"
+                  v-for="item in cacheStore.getDict('intellectual_property')"
                   :key="item.value"
                   :label="item.label"
                   :value="item.value"
@@ -166,6 +164,9 @@
             </el-select>
           </el-form-item>
         </el-col>
+        <el-col :span="24">
+          <baseTitle title="预期知识产权"></baseTitle>
+        </el-col>
         <el-col :span="6">
           <el-form-item label="发明专利(项)" prop="inventionPatent">
             <el-input v-model="formData.inventionPatent" clearable></el-input>
@@ -257,7 +258,10 @@ const deploymentId = ref()
 const showTable = ref(true)
 const otherFileList = ref([])
 const file = ref({})
-const formData = ref({})
+const formData = ref({
+  industryUniversityResearch:0,
+  governmentDeclaration:0,
+})
 const rules = reactive({
   projectName: [{required: true, message: '请输入名称', trigger: 'blur'}],
   specialFund: [{required: true, message: '请选择专项资金', trigger: 'blur'}],
@@ -339,43 +343,43 @@ const handleSubmit = async (instance) => {
   otherFileList.value.forEach(item => {
     otherFiles.push(getFileParam(item))
   })
-  let params = {
-    "specialFund": "2",
-    "projectName": "重新提交全流程测试2024520",
-    "startTime": "2024-05-24 00:00:00",
-    "endTime": "2024-05-29 00:00:00",
-    "projectType": "3",
-    "investmentType": "3",
-    "businessSegment": "2",
-    "technicalStandard": "2",
-    "governmentDeclaration": "2",
-    "inventionPatent": "3",
-    "newPatent": "3",
-    "economicEstimate": "3",
-    "other": "3",
-    "copyright": "3",
-    "softwareCopyright": "3",
-    "industryUniversityResearch": "2",
-    "intellectualProperty": "00",
-    "resultForm": "3",
-    "projectImpact": "3",
-    "rdSubject": "3",
-    // "affiliatedCompanyId": formData.value.affiliatedCompanyId,
-    "serviceDescription": "3",
-    "contentDescription": "3",
-    "specialFundAmount": "3",
-    deploymentId: deploymentId.value,
-    "singleFile": singleFile,
-    "fileList": otherFiles,
-    "requirementId":route.query.id
-  }
   // let params = {
-  //   ...formData.value,
+  //   "specialFund": "2",
+  //   "projectName": "重新提交全流程测试2024520",
+  //   "startTime": "2024-05-24 00:00:00",
+  //   "endTime": "2024-05-29 00:00:00",
+  //   "projectType": "3",
+  //   "investmentType": "3",
+  //   "businessSegment": "2",
+  //   "technicalStandard": "2",
+  //   "governmentDeclaration": 0,
+  //   "inventionPatent": "3",
+  //   "newPatent": "3",
+  //   "economicEstimate": "3",
+  //   "other": "3",
+  //   "copyright": "3",
+  //   "softwareCopyright": "3",
+  //   "industryUniversityResearch": 0,
+  //   "intellectualProperty": "00",
+  //   "resultForm": "3",
+  //   "projectImpact": "3",
+  //   "rdSubject": "3",
+  //   // "affiliatedCompanyId": formData.value.affiliatedCompanyId,
+  //   "serviceDescription": "3",
+  //   "contentDescription": "3",
+  //   "specialFundAmount": "3",
   //   deploymentId: deploymentId.value,
-  //   fileList: otherFiles,
+  //   "singleFile": singleFile,
-  //   singleFile: singleFile,
+  //   "fileList": otherFiles,
-  //   requirementId: route.query.id
+  //   "requirementId":route.query.id
   // }
+  let params = {
+    ...formData.value,
+    deploymentId: deploymentId.value,
+    fileList: otherFiles,
+    singleFile: singleFile,
+    requirementId: route.query.id
+  }
   let res = await requirementReported(params)
   ElNotification({
     title: '提示',

src/views/tool/dict/index.vue

@@ -385,7 +385,7 @@ const restDataForm = () => {
     state: "1",
     // isDefault:0,
     isType: true,
-    theme: 'dark',
+    theme: 'plain',
     listClass: 'primary',
   };
 };