guhongwei 4 năm trước cách đây
mục cha
commit
84b7de8336

+ 3 - 1
src/views/adminCenter/adminCate/dataInfo.vue

@@ -60,7 +60,9 @@ export default {
     return {
       form: {
         // 基本信息
-        basic: {},
+        basic: {
+          achieve_type: [],
+        },
         // 信息简介
         brief: {},
         // 参加人员

+ 66 - 38
src/views/adminCenter/adminCate/infoParts/two.vue

@@ -59,6 +59,9 @@
                     </el-col>
                     <el-col :span="9" class="right1_one">
                       {{ form.basic.apply_nature }}
+                      <!-- <el-radio-group v-model="form.basic.apply_nature">
+                        <el-radio v-for="(i, index) in apply_natureList" :key="index" :label="i.name">{{ i.name }}</el-radio>
+                      </el-radio-group> -->
                     </el-col>
                     <el-col :span="3" class="right1_one">
                       隶属
@@ -136,13 +139,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_name }}
+                            {{ form.research[0] ? form.research[0].research_name : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].gender }}
+                            {{ form.research[0] ? form.research[0].gender : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -150,13 +153,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].education }}
+                            {{ form.research[0] ? form.research[0].education : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].degree }}
+                            {{ form.research[0] ? form.research[0].degree : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -164,13 +167,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].zw }}
+                            {{ form.research[0] ? form.research[0].zw : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[0] ? form.research[0].position : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -178,7 +181,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_company }}
+                            {{ form.research[0] ? form.research[0].research_company : '暂无' }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -189,7 +192,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].birth }}
+                          {{ form.research[0] ? form.research[0].birth : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -197,7 +200,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].card }}
+                          {{ form.research[0] ? form.research[0].card : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -205,7 +208,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].phone }}
+                          {{ form.research[0] ? form.research[0].phone : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -213,7 +216,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].email }}
+                          {{ form.research[0] ? form.research[0].email : '暂无' }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -229,13 +232,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].research_name }}
+                            {{ form.research[1] ? form.research[1].research_name : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].gender }}
+                            {{ form.research[1] ? form.research[1].gender : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -243,13 +246,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].education }}
+                            {{ form.research[1] ? form.research[1].education : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].degree }}
+                            {{ form.research[1] ? form.research[1].degree : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -257,13 +260,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].zw }}
+                            {{ form.research[1] ? form.research[1].zw : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].position }}
+                            {{ form.research[1] ? form.research[1].position : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -271,7 +274,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[1].research_company }}
+                            {{ form.research[1] ? form.research[1].research_company : '暂无' }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -282,7 +285,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].birth }}
+                          {{ form.research[1] ? form.research[1].birth : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -290,7 +293,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].card }}
+                          {{ form.research[1] ? form.research[1].card : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -298,7 +301,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].phone }}
+                          {{ form.research[1] ? form.research[1].phone : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -306,7 +309,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].email }}
+                          {{ form.research[1] ? form.research[1].email : '暂无' }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -322,13 +325,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].research_name }}
+                            {{ form.research[2] ? form.research[2].research_name : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].gender }}
+                            {{ form.research[2] ? form.research[2].gender : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -336,13 +339,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].education }}
+                            {{ form.research[2] ? form.research[2].education : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].degree }}
+                            {{ form.research[2] ? form.research[2].degree : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -350,13 +353,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].zw }}
+                            {{ form.research[2] ? form.research[2].zw : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].position }}
+                            {{ form.research[2] ? form.research[2].position : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -364,7 +367,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[2].research_company }}
+                            {{ form.research[2] ? form.research[2].research_company : '暂无' }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -375,7 +378,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].birth }}
+                          {{ form.research[2] ? form.research[2].birth : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -383,7 +386,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].card }}
+                          {{ form.research[2] ? form.research[2].card : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -391,7 +394,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].phone }}
+                          {{ form.research[2] ? form.research[2].phone : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -399,7 +402,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].email }}
+                          {{ form.research[2] ? form.research[2].email : '暂无' }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -421,10 +424,14 @@
                 </el-col>
                 <el-col :span="20" class="right">
                   <el-col :span="24" class="right1">
-                    {{ form.basic.achieve_type }}
+                    <el-checkbox-group v-model="form.basic.achieve_type">
+                      <el-checkbox v-for="(i, index) in achieve_typeList" :key="index" :label="i.name" :name="i.name"></el-checkbox>
+                    </el-checkbox-group>
                   </el-col>
                   <el-col :span="24" class="right1">
-                    {{ form.basic.achieve_form }}
+                    <el-radio-group v-model="form.basic.achieve_form">
+                      <el-radio v-for="(i, index) in achieve_formList" :key="index" :label="i.name">{{ i.name }}</el-radio>
+                    </el-radio-group>
                   </el-col>
                 </el-col>
               </el-col>
@@ -523,7 +530,14 @@
                   成果的影响及作用
                 </el-col>
                 <el-col :span="20" class="right">
-                  {{ form.basic.achieve_form }}
+                  <el-radio-group v-model="form.basic.achieve_influence">
+                    <el-radio label="形成自主研发能力">形成自主研发能力</el-radio>
+                    <el-radio label="突破关键技术">突破关键技术</el-radio>
+                    <el-radio label="试点示范">试点示范</el-radio>
+                    <el-radio label="规模生产">规模生产</el-radio>
+                    <el-radio label="推广应用">推广应用</el-radio>
+                    <el-radio label="其他">其他</el-radio>
+                  </el-radio-group>
                 </el-col>
               </el-col>
             </el-col>
@@ -535,6 +549,7 @@
 </template>
 
 <script>
+const { achievetype, achieveform, applynature, objective, stage } = require('@common/src/store/achieve/achieveType');
 import htmlToPdf from '@/unit/htmlToPdf.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
@@ -544,7 +559,11 @@ export default {
   },
   components: {},
   data: function() {
-    return {};
+    return {
+      apply_natureList: applynature,
+      achieve_typeList: achievetype,
+      achieve_formList: achieveform,
+    };
   },
   created() {},
   methods: {},
@@ -769,7 +788,7 @@ export default {
           }
           .right {
             .right1 {
-              padding: 18px;
+              padding: 12px 18px;
               font-size: 12px;
               font-weight: bold;
               color: #000;
@@ -781,6 +800,12 @@ export default {
             }
           }
         }
+        /deep/.el-radio {
+          color: #000;
+        }
+        /deep/.el-checkbox {
+          color: #000;
+        }
       }
       .seven {
         border-bottom: 1px solid #000;
@@ -928,6 +953,9 @@ export default {
             font-weight: bold;
           }
         }
+        /deep/.el-radio {
+          color: #000;
+        }
       }
     }
   }

+ 45 - 59
src/views/adminCenter/adminCate/parts/two.vue

@@ -59,12 +59,7 @@
                     </el-col>
                     <el-col :span="9" class="right1_two">
                       <el-radio-group v-model="form.basic.apply_nature">
-                        <el-radio label="独立科研机构">独立科研机构</el-radio>
-                        <el-radio label="大专院校">大专院校</el-radio>
-                        <el-radio label="医疗机构">医疗机构</el-radio>
-                        <el-radio label="企业">企业</el-radio>
-                        <el-radio label="其他机构">其他机构</el-radio>
-                        <el-radio label="自然人">自然人</el-radio>
+                        <el-radio v-for="(i, index) in apply_natureList" :key="index" :label="i.name">{{ i.name }}</el-radio>
                       </el-radio-group>
                     </el-col>
                     <el-col :span="3" class="right1_one">
@@ -147,13 +142,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_name }}
+                            {{ form.research[0] ? form.research[0].research_name : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].gender }}
+                            {{ form.research[0] ? form.research[0].gender : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -161,13 +156,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].education }}
+                            {{ form.research[0] ? form.research[0].education : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].degree }}
+                            {{ form.research[0] ? form.research[0].degree : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -175,13 +170,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].zw }}
+                            {{ form.research[0] ? form.research[0].zw : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[0].position }}
+                            {{ form.research[0] ? form.research[0].position : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -189,7 +184,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[0].research_company }}
+                            {{ form.research[0] ? form.research[0].research_company : '暂无' }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -200,7 +195,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].birth }}
+                          {{ form.research[0] ? form.research[0].birth : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -208,7 +203,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].card }}
+                          {{ form.research[0] ? form.research[0].card : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -216,7 +211,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].phone }}
+                          {{ form.research[0] ? form.research[0].phone : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -224,7 +219,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[0].email }}
+                          {{ form.research[0] ? form.research[0].email : '暂无' }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -240,13 +235,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].research_name }}
+                            {{ form.research[1] ? form.research[1].research_name : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].gender }}
+                            {{ form.research[1] ? form.research[1].gender : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -254,13 +249,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].education }}
+                            {{ form.research[1] ? form.research[1].education : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].degree }}
+                            {{ form.research[1] ? form.research[1].degree : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -268,13 +263,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].zw }}
+                            {{ form.research[1] ? form.research[1].zw : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[1].position }}
+                            {{ form.research[1] ? form.research[1].position : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -282,7 +277,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[1].research_company }}
+                            {{ form.research[1] ? form.research[1].research_company : '暂无' }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -293,7 +288,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].birth }}
+                          {{ form.research[1] ? form.research[1].birth : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -301,7 +296,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].card }}
+                          {{ form.research[1] ? form.research[1].card : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -309,7 +304,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].phone }}
+                          {{ form.research[1] ? form.research[1].phone : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -317,7 +312,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[1].email }}
+                          {{ form.research[1] ? form.research[1].email : '暂无' }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -333,13 +328,13 @@
                             姓名
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].research_name }}
+                            {{ form.research[2] ? form.research[2].research_name : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             性别
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].gender }}
+                            {{ form.research[2] ? form.research[2].gender : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -347,13 +342,13 @@
                             学历
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].education }}
+                            {{ form.research[2] ? form.research[2].education : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             学位
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].degree }}
+                            {{ form.research[2] ? form.research[2].degree : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -361,13 +356,13 @@
                             职务
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].zw }}
+                            {{ form.research[2] ? form.research[2].zw : '暂无' }}
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one ">
                             职称
                           </el-col>
                           <el-col :span="6" class="right1_oneright1_one textOver">
-                            {{ form.research[2].position }}
+                            {{ form.research[2] ? form.research[2].position : '暂无' }}
                           </el-col>
                         </el-col>
                         <el-col :span="24" class="right1_oneright1">
@@ -375,7 +370,7 @@
                             工作单位
                           </el-col>
                           <el-col :span="18" class="right1_oneright1_one textOver">
-                            {{ form.research[2].research_company }}
+                            {{ form.research[2] ? form.research[2].research_company : '暂无' }}
                           </el-col>
                         </el-col>
                       </el-col>
@@ -386,7 +381,7 @@
                           出生
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].birth }}
+                          {{ form.research[2] ? form.research[2].birth : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -394,7 +389,7 @@
                           身份证号
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].card }}
+                          {{ form.research[2] ? form.research[2].card : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -402,7 +397,7 @@
                           电话
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].phone }}
+                          {{ form.research[2] ? form.research[2].phone : '暂无' }}
                         </el-col>
                       </el-col>
                       <el-col :span="24" class="right1_two1">
@@ -410,7 +405,7 @@
                           邮箱
                         </el-col>
                         <el-col :span="18" class="right1_two1right textOver">
-                          {{ form.research[2].email }}
+                          {{ form.research[2] ? form.research[2].email : '暂无' }}
                         </el-col>
                       </el-col>
                     </el-col>
@@ -432,27 +427,13 @@
                 </el-col>
                 <el-col :span="20" class="right">
                   <el-col :span="24" class="right1">
-                    <el-radio-group v-model="form.basic.achieve_type">
-                      <el-radio label="发明专利">发明专利</el-radio>
-                      <el-radio label="实用新型专利">实用新型专利</el-radio>
-                      <el-radio label="软件著作权">软件著作权</el-radio>
-                      <el-radio label="出版著作">出版著作</el-radio>
-                      <el-radio label="论文">论文</el-radio>
-                      <el-radio label="其他">其他</el-radio>
-                    </el-radio-group>
+                    <el-checkbox-group v-model="form.basic.achieve_type">
+                      <el-checkbox v-for="(i, index) in achieve_typeList" :key="index" :label="i.name" name="type"></el-checkbox>
+                    </el-checkbox-group>
                   </el-col>
                   <el-col :span="24" class="right1">
                     <el-radio-group v-model="form.basic.achieve_form">
-                      <el-radio label="新技术">新技术</el-radio>
-                      <el-radio label="新工艺">新工艺</el-radio>
-                      <el-radio label="新产品">新产品</el-radio>
-                      <el-radio label="新材料">新材料</el-radio>
-                      <el-radio label="新装备">新装备</el-radio>
-                      <el-radio label="农业,生物新品种">农业,生物新品种</el-radio>
-                      <el-radio label="矿产新品种">矿产新品种</el-radio>
-                      <el-radio label="论文">论文</el-radio>
-                      <el-radio label="著作">著作</el-radio>
-                      <el-radio label="其他">其他</el-radio>
+                      <el-radio v-for="(i, index) in achieve_formList" :key="index" :label="i.name">{{ i.name }}</el-radio>
                     </el-radio-group>
                   </el-col>
                 </el-col>
@@ -552,7 +533,7 @@
                   成果的影响及作用
                 </el-col>
                 <el-col :span="20" class="right">
-                  <el-radio-group v-model="form.basic.achieve_form">
+                  <el-radio-group v-model="form.basic.achieve_influence">
                     <el-radio label="形成自主研发能力">形成自主研发能力</el-radio>
                     <el-radio label="突破关键技术">突破关键技术</el-radio>
                     <el-radio label="试点示范">试点示范</el-radio>
@@ -576,6 +557,7 @@
 </template>
 
 <script>
+const { achievetype, achieveform, applynature, objective, stage } = require('@common/src/store/achieve/achieveType');
 import htmlToPdf from '@/unit/htmlToPdf.js';
 import { mapState, createNamespacedHelpers } from 'vuex';
 export default {
@@ -585,7 +567,11 @@ export default {
   },
   components: {},
   data: function() {
-    return {};
+    return {
+      apply_natureList: applynature,
+      achieve_typeList: achievetype,
+      achieve_formList: achieveform,
+    };
   },
   created() {},
   methods: {

+ 25 - 17
src/views/adminCenter/adminExamine/parts/basic.vue

@@ -8,7 +8,7 @@
               成果编号:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_num }}
+              {{ info.achieve_num || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -16,7 +16,7 @@
               成果名称:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_name }}
+              {{ info.achieve_name || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -24,7 +24,7 @@
               成果类别:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_type }}
+              {{ info.achieve_type || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -32,7 +32,7 @@
               成果形式:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_form }}
+              {{ info.achieve_form || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -40,7 +40,7 @@
               成果取得时间:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.achieve_date }}
+              {{ info.achieve_date || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -48,7 +48,15 @@
               申请人:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.apply_personal }}
+              {{ info.apply_personal || '暂无' }}
+            </el-col>
+          </el-col>
+          <el-col :span="24" class="short">
+            <el-col :span="3" class="shortText">
+              申请人电话:
+            </el-col>
+            <el-col :span="21" class="shortInfo textOver">
+              {{ info.apply_phone || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -64,7 +72,7 @@
               地址:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.address }}
+              {{ info.address || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -72,7 +80,7 @@
               申请单位/申请人属性:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.apply_nature }}
+              {{ info.apply_nature || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -80,7 +88,7 @@
               联系人:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.contacts }}
+              {{ info.contacts || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -88,7 +96,7 @@
               联系电话:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.phone }}
+              {{ info.phone || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -96,7 +104,7 @@
               邮箱:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.email }}
+              {{ info.email || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -104,7 +112,7 @@
               传真:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.fax }}
+              {{ info.fax || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -112,7 +120,7 @@
               评价目的:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.objective }}
+              {{ info.objective || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -120,7 +128,7 @@
               成果所处阶段:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.stage }}
+              {{ info.stage || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -128,7 +136,7 @@
               经济效益产值:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.output }}
+              {{ info.output || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -136,7 +144,7 @@
               经济效益利润:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.profit }}
+              {{ info.profit || '暂无' }}
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
@@ -144,7 +152,7 @@
               经济效益税收:
             </el-col>
             <el-col :span="21" class="shortInfo textOver">
-              {{ info.revenue }}
+              {{ info.revenue || '暂无' }}
             </el-col>
           </el-col>
         </el-col>

+ 24 - 31
src/views/adminCenter/adminExamine/parts/detailed.vue

@@ -5,7 +5,7 @@
         <el-col :span="24" class="one">
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              研究工作报告(必备)
+              1.工作报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
               <el-link :underline="false" type="primary" v-if="getProp('work_report.url')" :href="getProp('work_report.url')">文件下载</el-link>
@@ -14,7 +14,7 @@
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              研究技术报告(必备)
+              2.技术报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
               <el-link :underline="false" type="primary" v-if="getProp('techol_report.url')" :href="getProp('techol_report.url')">文件下载</el-link>
@@ -23,100 +23,93 @@
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              经济效益分析(必备)
+              3.国内外对比报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('benefit.url')" :href="getProp('benefit.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('compare_report.url')" :href="getProp('compare_report.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              科技查新报告(科技项目成果,必备)
+              4.经济效益分析(必备)
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('science_report.url')" :href="getProp('science_report.url')">文件下载</el-link>
-              <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
-            </el-col>
-          </el-col>
-          <el-col :span="24" class="short">
-            <el-col :span="22" class="shortText">
-              法律价值评估报告(专利成果,必备)
-            </el-col>
-            <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('assess_report.url')" :href="getProp('assess_report.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('benefit.url')" :href="getProp('benefit.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              推广应用证明(两家以上应用单位,必备)
+              5.科技查新报告(必备)
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('app_prove.url')" :href="getProp('app_prove.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('science_report.url')" :href="getProp('science_report.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              成果技术汇报PPT(必备)
+              6.技术检测报告
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('techol_ppt.url')" :href="getProp('techol_ppt.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('techol_detect_report.url')" :href="getProp('techol_detect_report.url')"
+                >文件下载</el-link
+              >
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              检测报告(根据项目需要提供)
+              7.用户证明
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('testing_report.url')" :href="getProp('testing_report.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('user_prove.url')" :href="getProp('user_prove.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              质量标准(检测报告所依据的标准,企业标准,行业标准,国家标准,国际标准)
+              8.专利证书
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('quality.url')" :href="getProp('quality.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('patent_cert.url')" :href="getProp('patent_cert.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              与本成果相关的授权专利证书
+              9.软著
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('patent.url')" :href="getProp('patent.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('software_copyright.url')" :href="getProp('software_copyright.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              特殊行业需要提供的相应证明材料
+              10.论文
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('special.url')" :href="getProp('special.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('treatise.url')" :href="getProp('treatise.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              项目经费预算书
+              11.工法
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('budget.url')" :href="getProp('budget.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('gf.url')" :href="getProp('gf.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>
           <el-col :span="24" class="short">
             <el-col :span="22" class="shortText">
-              项目经费决算书
+              12.企业标准等证明材料
             </el-col>
             <el-col :span="2" class="shortText">
-              <el-link :underline="false" type="primary" v-if="getProp('final.url')" :href="getProp('final.url')">文件下载</el-link>
+              <el-link :underline="false" type="primary" v-if="getProp('company_standard.url')" :href="getProp('company_standard.url')">文件下载</el-link>
               <el-link v-else :disabled="true" :underline="false">暂无文件</el-link>
             </el-col>
           </el-col>

+ 2 - 2
src/views/userCenter/common/certDetail.vue

@@ -45,7 +45,7 @@
                 </el-col>
               </el-col>
             </article>
-            <article>
+            <!-- <article>
               <el-col :span="24" class="num">
                 证书编号<span>{{ info.basic.achieve_num }}</span>
               </el-col>
@@ -80,7 +80,7 @@
                   <el-col :span="24" class="left">(盖章)</el-col>
                 </el-col>
               </el-col>
-            </article>
+            </article> -->
           </div>
         </el-col>
       </el-col>