Merge branch 'master' of http://gitlab.yiboshi.com/XuJun/yn-science-front

src/views/evaluation/components/score.vue

@@ -11,7 +11,8 @@
           <div v-show="tabsActive==='1'" style="height:100%;">
             <div style="height:calc(100% - 40px);overflow: auto;">
               <a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
-                <economy  v-model="formData" v-if="false"/>
+                <economy  v-model="formData" v-if="formData.expertType == 2"/>
+                <div v-else>
                   <technology-evalucation  v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>                
                   <div v-else>
                     <a-row type="flex">
@@ -44,6 +45,7 @@
                       </a-col>
                     </a-row>
                   </div>
+                </div>
               </a-form-model>
             </div>
             <div style="height:40px;width:100%;text-align:center;padding:4px 0px;background: #fafafa;border:1px solid #e8e8e8; border-width: 0px 1px 1px 1px;border-style: solid;border-color: #e8e8e8;">