ww

src/api/index.js

@@ -956,6 +956,11 @@ export default {
             return fetch(`/v1/science-admin/system-parameter-type/deleteById/${params.id}`, params, 'delete', 'json')
         },
     },
+    evaluation: {
+        getEvaluationList (params) {
+            return fetch(`/v1/science-admin/com-evaluation-item/getEvaluationList`, params)
+        },
+    },
     //常用工具
     utils: {
         //直接下载文件，不让浏览器直接打开

src/views/evaluation/talent/components/edit.vue

@@ -11,23 +11,31 @@
         <td class="bg-title">评分</td>
         <td class="bg-title">备注</td>
       </tr>
-      <tr v-for="(item,index) in tableData" :key="'tr1'+index">
-        <td :rowspan="item.row1" v-if="item.row1>0">{{item.title1}}</td>
-        <td :rowspan="item.row2" v-if="item.row2>0">{{item.title2}}</td>
-        <td>{{item.title3}}</td>
-        <td>{{item.standard}}</td>
-        <td></td>
-        <td></td>
+      <tr v-for="(item,index) in scoreList" :key="'scoreList'+index" type="flex" class="row_center">
+        <td :rowspan="item.row1" v-if="item.row1>0">{{item.content1}}</td>
+        <td :rowspan="item.row2" v-if="item.row2>0">{{item.content2}}</td>
+        <td>{{item.content}}</td>
+        <td>{{item.scoreDetail}}</td>
+        <td>
+          <a-form-model-item :prop="'scoreList.' + index + '.detail'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-input v-model="item.detail" style="width: 60%" />
+          </a-form-model-item>
+        </td>
+        <td>
+          <a-form-model-item :prop="'scoreList.' + index + '.count'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-input-number v-model="item.count" :min="0" style="width: 60%" />
+          </a-form-model-item>
+        </td>
         <td style="text-align: center;">
-          <a-form-model-item :prop="'score' + item.order" v-if="item.order==1">
-            <a-input-number v-model="value.score1" :min="0" :max="item.max" style="width: 60%" />
+          <a-form-model-item :prop="'scoreList.' + index + '.score'" :rules="{required: true, message: '*', trigger: 'blur',}">
+            <a-input-number v-model="item.score" :min="0" :max="item.maxScore" style="width: 60%" />
           </a-form-model-item>
         </td>
         <td>{{item.remark}}</td>
       </tr>
       <tr>
         <td colspan="7" class="bg-title" style="text-align: right;">总分：</td>
-        <td style="text-align: left;padding-left: 12px;">{{Count()}}分</td>
+        <td style="text-align: left;padding-left: 12px;">分</td>
       </tr>
     </table>
   </div>
@@ -38,6 +46,12 @@ export default {
   name: "scoreEdit",
   components: {},
   props: {
+    scoreList: {
+      type: Array,
+      default: () => {
+        return []
+      }
+    },
     value: {
       type: Object,
       default () {
@@ -88,28 +102,14 @@ export default {
 
   },
   created () {
-
+    console.log(this.scoreList)
   },
   methods: {
     Count () {
-      var s = 0.0;
-      for (var i = 1; i <= 7; i++) {
-        if (this.value['score' + i]) {
-          s += parseFloat(this.value['score' + i])
-        }
-      }
-      s = s.toFixed(1) * 10 / 10
-      this.value.totalScore = s
-      this.determineType()
-      return s
+
     },
     determineType () {
-      if (this.value.totalScore >= 80)
-        this.value.evaluationType = 1
-      else if (this.value.totalScore < 80 && this.value.totalScore >= 60)
-        this.value.evaluationType = 2
-      else
-        this.value.evaluationType = 3
+
     },
   },
 };

src/views/evaluation/talent/components/score.vue

@@ -12,8 +12,8 @@
           <div v-show="tabsActive==='1'" style="height:100%;">
             <div style="height:calc(100% - 40px);overflow: auto;" ref="main">
               <div class="x_modal_content">
-                <a-form-model ref="form" :model="formData" :rules="rules" class="from-table font-line-space">
-                  <edit v-model="formData" />
+                <a-form-model ref="form" :rules="rules" class="from-table font-line-space">
+                  <edit :scoreList.sync="scoreList" />
                 </a-form-model>
               </div>
             </div>
@@ -135,12 +135,7 @@ export default {
       check: {
         time: 5, title: '我已阅读', count: 5, disabled: false,
       },
-      formData: {
-        id: null, talentId: null, expertId: null, expertName: null,
-        score1: null, score2: null, score3: null, score4: null, score4: null, score5: null, score6: null, score7: null, score8: null, score9: null,
-        score10: null, score11: null, score12: null, score13: null, score14: null, score15: null, score16: null, score17: null,
-        totalScore: null, remark: null, supportState: null,
-      },
+      formData: {},
       rules: {
         score1: { required: true, message: "*", trigger: "blur" },
         score2: { required: true, message: "*", trigger: "blur" },
@@ -185,7 +180,7 @@ export default {
   computed: {
   },
   created () {
-    this.getAssignExpertById()
+    this.getEvaluationList()
     this.countStart()
   },
   methods: {
@@ -198,7 +193,7 @@ export default {
       if (e.target.checked)
         this.check.disabled = false
       else
-        this.check, disabled = true
+        this.check.disabled = true
     },
     loadExpertInfo () {
       this.isShow = true