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

src/views/evaluation/components/score.vue

@@ -11,38 +11,40 @@
           <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"/>
-                <technology-evalucation v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>                
+                <economy  v-model="formData" v-if="formData.expertType == 2"/>
                 <div v-else>
-                  <a-row type="flex">
-                    <a-col :span="4" class="bg-gray">
-                      <div class="special-middle" style="text-align:center!important;">
-                        <div>评审意见 </div>
-                      </div>
-                    </a-col>
-                    <a-col :span="20">
-                      <div>
-                        <a-form-model-item prop="remark">
-                          <a-textarea placeholder="评审意见" v-model="formData.remark" :maxLength="1000" style="width: 80%; height: 120px; margin-top: 6px" />
+                  <technology-evalucation  v-if="totalFunding >= 50" v-model="formData"></technology-evalucation>                
+                  <div v-else>
+                    <a-row type="flex">
+                      <a-col :span="4" class="bg-gray">
+                        <div class="special-middle" style="text-align:center!important;">
+                          <div>评审意见 </div>
+                        </div>
+                      </a-col>
+                      <a-col :span="20">
+                        <div>
+                          <a-form-model-item prop="remark">
+                            <a-textarea placeholder="评审意见" v-model="formData.remark" :maxLength="1000" style="width: 80%; height: 120px; margin-top: 6px" />
+                          </a-form-model-item>
+                        </div>
+                      </a-col>
+                    </a-row>
+                    <a-row type="flex">
+                      <a-col :span="4" class="bg-gray">
+                        <div class="special-middle" style="text-align:center!important;">
+                          <div>是否推荐立项支持 </div>
+                        </div>
+                      </a-col>
+                      <a-col :span="20">
+                        <a-form-model-item prop="supportState">
+                          <a-radio-group v-model="formData.supportState">
+                            <a-radio :value="1">是</a-radio>
+                            <a-radio :value="0">否</a-radio>
+                          </a-radio-group>
                         </a-form-model-item>
-                      </div>
-                    </a-col>
-                  </a-row>
-                  <a-row type="flex">
-                    <a-col :span="4" class="bg-gray">
-                      <div class="special-middle" style="text-align:center!important;">
-                        <div>是否推荐立项支持 </div>
-                      </div>
-                    </a-col>
-                    <a-col :span="20">
-                      <a-form-model-item prop="supportState">
-                        <a-radio-group v-model="formData.supportState">
-                          <a-radio :value="1">是</a-radio>
-                          <a-radio :value="0">否</a-radio>
-                        </a-radio-group>
-                      </a-form-model-item>
-                    </a-col>
-                  </a-row>
+                      </a-col>
+                    </a-row>
+                  </div>
                 </div>
               </a-form-model>
             </div>