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

src/views/evaluation/components/economy.vue

@@ -119,10 +119,10 @@
         <td>附加项</td>
         <td>审计或科技计划项目检验情况</td>
         <td>申报单位所承担科技计划项目在接受审计中期评估、“双随机一公开”等工作中的情况。</td>
-        <td colspan="3">未发现问题，则该指标不适用;发现问题的，每涉及一个项目扣3分</td>
+        <td colspan="3">未发现问题，则该指标不适用;发现问题的，每涉及一个项目扣3分<br /><span style="color: red;">(注：本项填负数)</span></td>
         <td style="text-align: center;">
           <a-form-model-item :prop="'additionalScore'">
-            <a-input-number v-model="value.additionalScore" :max="0" style="width: 60%" />
+            <a-input-number v-model="value.additionalScore" :max="0" :step="-3" style="width: 60%" />
           </a-form-model-item>
         </td>
       </tr>

src/views/evaluation/components/score.vue

@@ -196,12 +196,13 @@ export default {
         score18: { required: true, message: "*", trigger: "blur" },
         score19: { required: true, message: "*", trigger: "blur" },
         remark: [{ required: true, message: '请填写评审意见', trigger: 'blur' },],
-        supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
-        evaluationType: { required: true, message: "*", trigger: "blur" },
         score18: { required: true, message: "*", trigger: "blur" },
         score19: { required: true, message: "*", trigger: "blur" },
+        // applyFunding: { required: true, message: "*", trigger: "blur" },
         additionalScore: { required: true, message: "*", trigger: "blur" },
         recommendFunding: { required: true, message: "*", trigger: "blur" },
+        supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
+        evaluationType: { required: true, message: "*", trigger: "blur" },
       },
       projectInfo: {
         projName: '',
@@ -323,21 +324,6 @@ export default {
         this.$emit('close', 'error')
       })
     },
-    scoreCount () {
-      let total = 0.0
-      if (!!this.formData.projectBasis)
-        total = (total * 100 + this.formData.projectBasis * 100) / 100
-      if (!!this.formData.academicValue)
-        total = (total * 100 + this.formData.academicValue * 100) / 100
-      if (!!this.formData.innovation)
-        total = (total * 100 + this.formData.innovation * 100) / 100
-      if (!!this.formData.researchPlan)
-        total = (total * 100 + this.formData.researchPlan * 100) / 100
-      if (!!this.formData.expectedResults)
-        total = (total * 100 + this.formData.expectedResults * 100) / 100
-      this.formData.totalScore = total
-      return total
-    },
     callback (key) {
       this.tabsActive = key
     },