fix

src/api/index.js

@@ -27,4 +27,5 @@ export default {
   setComments: `/nakadai/evaluation/setComments`,
   getTheLabReportIdUpAndDown: `/nakadai/evaluation/getTheLabReportIdUpAndDown`,
   deleteComments: `/nakadai/evaluation/deleteComments`,
+  assignedPersonnelList: `/nakadai/evaluationAssignments/assignedPersonnelList`,
 }

src/pages/allocationReview/list/index.vue

@@ -200,7 +200,7 @@ export default {
         this.loading = true
         const { pageList } = await this.$post(this.api.reviewSettingsList, {
           ...this.filter,
-          isTimed: this.month === 0 ? 1 : 0,
+          isTimed: this.month === 0 ? 0 : '',
           pageNum: this.page,
           pageSize: this.pageSize,
           platformSource: 0,

src/pages/allocationReview/records/allocation.vue

@@ -20,7 +20,7 @@
         </div>
 
         <div v-show="taskType === 'whole_report'">
-          <People ref="people" />
+          <People ref="people" :key="peopleKey" :row.sync="row" :curRecords.sync="curRecords" />
 
           <Outline :outlines.sync="outlines" />
         </div>
@@ -111,6 +111,7 @@ export default {
       submiting: false,
 
       peopleVisible: false,
+      peopleKey: 1,
       outlineVisible: false,
       curOutlines: [],
     };
@@ -135,6 +136,7 @@ export default {
       // this.checkAllQues = true
       const el = this.$refs.outline
       // el && el.setCheckedKeys(this.allQuesIds)
+      this.peopleKey++
       this.getOutline()
     },
     // 获取试题

src/pages/allocationReview/records/index.vue

@@ -28,14 +28,14 @@
         </li>
         <li>
           <label>评阅状态</label>
-          <el-select v-model="filter.status" clearable placeholder="请选择评阅状态" @change="initData">
+          <el-select v-model="filter.evaluationStatus" clearable placeholder="请选择评阅状态" @change="initData">
-            <el-option v-for="(item, i) in status" :key="i" :label="item.name" :value="item.id"></el-option>
+            <el-option v-for="(item, i) in evaluationStatus" :key="i" :value="item.name"></el-option>
           </el-select>
         </li>
         <li>
           <label>是否完成分配</label>
-          <el-select v-model="filter.status" clearable placeholder="请选择是否完成分配" @change="initData">
+          <el-select v-model="filter.isDistribution" clearable placeholder="请选择是否完成分配" @change="initData">
-            <el-option v-for="(item, i) in status" :key="i" :label="item.name" :value="item.id"></el-option>
+            <el-option v-for="(item, i) in distributions" :key="i" :label="item.name" :value="item.id"></el-option>
           </el-select>
         </li>
         <li>
@@ -124,14 +124,22 @@ export default {
       provinces: [],
       cities: [],
       schools: [],
-      status: [
+      evaluationStatus: [
+        {
+          name: '待评阅'
+        },
+        {
+          name: '已评阅'
+        },
+      ],
+      distributions: [
         {
           id: 1,
-          name: '启用'
+          name: '是'
         },
         {
           id: 0,
-          name: '禁用'
+          name: '否'
         },
       ],
       date: [],
@@ -139,7 +147,8 @@ export default {
         cityId: '',
         provinceId: '',
         realSchoolId: '',
-        status: '',
+        evaluationStatus: '',
+        isDistribution: '',
         keyword: '',
       },
       list: [],

src/pages/allocationReview/records/people.vue

@@ -86,7 +86,7 @@ import Util from '@/libs/util'
 import _ from 'lodash'
 import Decimal from 'decimal.js'
 export default {
-  props: ['dia'],
+  props: ['dia', 'row', 'curRecords'],
   data () {
     return {
       nakadaiDeps: [],
@@ -116,9 +116,33 @@ export default {
   },
   mounted () {
     this.getNakadaiDep()
-    this.getNakadaiUser()
+    this.users.length ? this.getDetail(1) : this.getNakadaiUser(1)
   },
   methods: {
+    // 获取详情
+    async getDetail (init) {
+      if (init === 1) {
+        try {
+          const { row, curRecords } = this
+          if (curRecords.length === 1) {
+            this.checked = []
+            const res = await this.$post(`${this.api.assignedPersonnelList}?evaluationId=${row.evaluationId}&reportId=${curRecords[0].reportId}`)
+            const ids = res.accountIds
+            if (ids && ids.length) {
+              const { users, checked } = this
+              ids.forEach(e => {
+                const cur = users.find(n => n.accountId === e)
+                if (cur) {
+                  cur.check = true
+                  checked.push(cur)
+                }
+              })
+            }
+          }
+          this.loaded = true
+        } catch (e) { }
+      }
+    },
     // 获取中台部门
     async getNakadaiDep () {
       const res = await this.$post(this.api.treeListArch)
@@ -154,7 +178,7 @@ export default {
       this.getNakadaiUser()
     },
     // 查询中台用户
-    async getNakadaiUser () {
+    async getNakadaiUser (init) {
       const { page } = await this.$post(this.api.staffList, {
         type: 1,
         staffArchitectureId: this.curDep.id || '',
@@ -168,6 +192,7 @@ export default {
         e.check = !!checked.find(n => n.accountId === e.accountId)
       })
       this.users = list
+      this.getDetail(init)
     },
 
     // 用户全选回调

src/pages/myReview/list/index.vue

@@ -168,7 +168,7 @@ export default {
         this.loading = true
         const { page } = await this.$post(this.api.myReviewTask, {
           ...this.filter,
-          isTimed: this.month === 0 ? 1 : 0,
+          isTimed: this.month === 0 ? 0 : '',
           pageNum: this.page,
           pageSize: this.pageSize,
         })

src/pages/myReview/theoryReview/index.vue

@@ -355,7 +355,7 @@ export default {
               } else if (type === 'essay') { // 简答题
                 if (!n.userScore) n.userScore = ''
                 if (isNaN(n.reviewScore)) n.reviewScore = ''
-                this.handleEssayScore(n)
+                this.handleIsCorrect(n)
               }
               n.originUserScore = n.reviewScore
               n.newComments = n.comments || ''
@@ -376,8 +376,8 @@ export default {
         this.loading = false
       }
     },
-    // 判断简答题的对错
+    // 判断试题的对错
-    handleEssayScore (n) {
+    handleIsCorrect (n) {
       n.isCorrect = n.reviewScore === '' ? 4 : (n.reviewScore === n.questionScore ? 1 : n.reviewScore ? 3 : 2) // 简答题没有reviewScore则显示待判分， 有则判断是否跟题目分数相同，完全相同是正确，小于则部分正确，0则错误
     },
     scrollToSmooth (position, duration) {
@@ -439,7 +439,7 @@ export default {
         reviewScore: ques.reviewScore,
       }])
       ques.originUserScore = ques.reviewScore
-      this.handleEssayScore(ques)
+      this.handleIsCorrect(ques)
       Util.successMsg('保存成功')
     },
     // 填空题的小空对错点击回调
@@ -455,6 +455,7 @@ export default {
         jsonText: ques.jsonText
       }])
       ques.originUserScore = ques.reviewScore
+      this.handleIsCorrect(ques)
       Util.successMsg('保存成功')
     },
     // 保存评语
@@ -541,7 +542,7 @@ export default {
               reviewScore: n.reviewScore,
             })
             n.originUserScore = n.reviewScore
-            this.handleEssayScore(n)
+            this.handleIsCorrect(n)
           })
         })
         if (params.length) await this.$post(this.api.reviewPaper, params)