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

src/views/evaluation/components/score.vue

@@ -185,7 +185,8 @@ export default {
         score16: { required: true, message: "*", trigger: "blur" },
         score17: { required: true, message: "*", trigger: "blur" },
         remark: [{ required: true, message: '请填写评审意见', trigger: 'blur' },],
-        supportState: { required: true, message: "*", trigger: "blur" }
+        supportState: { required: true, message: "请选择是否支持立项", trigger: "blur" },
+        evaluationType: { required: true, message: "*", trigger: "blur" },
       },
       projectInfo: {
         projName: '',
@@ -345,6 +346,7 @@ export default {
       }
     },
     submit () {
+      console.log(this.formData)
       this.$refs.form.validate(valid => {
         if (valid) {
           this.loading = true

src/views/evaluation/components/technologyEvalucation.vue

@@ -25,20 +25,30 @@
         <td class="bg-title">评审意见</td>
         <td colspan="4">
           <a-form-model-item prop="remark">
-            <a-textarea placeholder="评审意见" v-model="value.remark" @change="AreaChange()" :maxLength="1000" style="width: 90%; height: 120px; margin-top: 6px" />
+            <a-textarea placeholder="评审意见" v-model="remark" @change="AreaChange()" :maxLength="1000" style="width: 90%; height: 120px; margin-top: 6px" />
           </a-form-model-item>
         </td>
         <td style="text-align: center">总分：{{ totalScore }}分</td>
       </tr>
       <tr>
         <td class="bg-title">是否推荐立项支持</td>
-        <td colspan="5">
-            <a-form-model-item prop="supportState">
-              <a-radio-group v-model="value.supportState">
-                <a-radio :value="1">是</a-radio>
-                <a-radio :value="0">否</a-radio>
-              </a-radio-group>
-            </a-form-model-item>
+        <td colspan="2">
+          <a-form-model-item prop="supportState">
+            <a-radio-group v-model="supportState" @change="supportStateChange">
+              <a-radio :value="1">是</a-radio>
+              <a-radio :value="0">否</a-radio>
+            </a-radio-group>
+          </a-form-model-item>
+        </td>
+        <td class="bg-title">评审结果</td>
+        <td colspan="2">
+          <a-form-model-item prop="evaluationType">
+            <a-radio-group v-model="evaluationType" @change="EcaluationChange">
+              <a-radio :value="1">A类(通过)</a-radio>
+              <a-radio :value="2">B类(修改)</a-radio>
+              <a-radio :value="3">C类(不通过)</a-radio>
+            </a-radio-group>
+          </a-form-model-item>
         </td>
       </tr>
     </table>
@@ -75,6 +85,7 @@ const formData = {
   projName: null,
   projNo: null,
 };
+const plainOptions = ['A', 'B', 'C'];
 
 export default {
   name: "technologyEvalucation",
@@ -88,6 +99,7 @@ export default {
   },
   data() {
     return {
+      
       tableData: [
         { rowspan: 1, oneLevel: "1.意义及必要性(5分)", towLevel: "A：项目实施的意义及必要性（5分）", title1: "重要（4-5分）", title2: "较重要（2-3分）", title3: "一般（0-1分）", score: 5, grade: null, },
         
@@ -114,7 +126,11 @@ export default {
         { rowspan: 0, oneLevel: "7.风险分析（10分）", towLevel: "B：目标实现风险（4分）", title1: "风险小（4分）", title2: "有一定风险（3分）", title3: "风险较大（0分）", score: 4, grade: null, },
       ],
       remark: "",
+      supportState: null,
+      evaluationType: 0,
       totalScore: 0,
+      plainOptions,
+      disabled: true,
     };
   },
   created() {
@@ -135,6 +151,9 @@ export default {
     this.tableData[14].grade = this.value.score15
     this.tableData[15].grade = this.value.score16
     this.tableData[16].grade = this.value.score17
+    this.remark = this.value.remark
+    this.supportState = this.value.supportState
+    this.evaluationType = this.value.evaluationType
     this.calTotalScore()
   },
   methods: {
@@ -153,7 +172,7 @@ export default {
           this.value.score4 = this.tableData[index].grade;
           break;
         case 5:
-          this.value.score4 = this.tableData[index].grade;
+          this.value.score5 = this.tableData[index].grade;
           break;
         case 6:
           this.value.score6 = this.tableData[index].grade;
@@ -194,16 +213,31 @@ export default {
       }
       this.calTotalScore()
     },
-    AreaChange() {
-      this.value.remark = this.remark
-    },
     calTotalScore() {
       this.totalScore = 0;
       this.tableData.forEach((e) => {
         if (e.grade != null) {
           this.totalScore += e.grade;
         }
+        this.DetermineType()
       });
+    },
+    DetermineType() {
+      if (this.totalScore >= 80)
+        this.evaluationType = 1
+      else if (this.totalScore < 80 && this.totalScore >= 60)
+        this.evaluationType = 2
+      else
+        this.evaluationType = 3
+    },
+    AreaChange() {
+      this.value.remark = this.remark
+    },
+    supportStateChange() {
+      this.value.supportState = this.supportState
+    },
+    EcaluationChange() {
+      this.value.evaluationType = this.evaluationType
     }
   },
 };