优化

src/api/assessment.js

@@ -88,3 +88,12 @@ export function apiAssessManagerChange (query) {
     data: query
   })
 }
+
+//  开始评分
+export function apiAssessManagerToScore (query) {
+  return request({
+    url: '/lz_management/performance/assess/manager/toScore',
+    method: 'post',
+    data: query
+  })
+}

src/components/ChooseInitiate/index.vue

@@ -1,7 +1,6 @@
 <!--  -->
 <template>
   <popup-right
-    v-if="showChooseList"
     @cancel="hundlePopupHide"
     @submit="handleSubmitPopup"
     :title="popupRightTitle"
@@ -30,13 +29,14 @@
         >
           <el-table-column
             type="selection"
+            :selectable="checkSelectable"
             width="40"
             :reserve-selection="true"
           ></el-table-column>
           <el-table-column
             label="全选"
             width="250"
-          ><template slot-scope="scope">{{scope.row.name}}</template></el-table-column>
+          ><template slot-scope="scope"><span>{{scope.row.name}}</span><el-tag style="margin:0 0 0 10px;" v-if="scope.row.score ===0">已开始评分</el-tag></template></el-table-column>
           <el-table-column
             width="80"
             align="right"
@@ -80,6 +80,10 @@ import PopupRight from '@/components/PopupRight'
 import { getWorkList } from '@/api/workbench'
 export default {
   props: {
+    nOSec: {
+      type: Boolean,
+      default: false
+    },
     subumitText: {
       type: String,
       default: '确 定'
@@ -131,6 +135,9 @@ export default {
     console.log('showChooseList: ', this.showChooseList)
   },
   methods: {
+    checkSelectable (row, index) {
+      return !this.nOSec && row.score === 1
+    },
     handlePopupCreat () {
       this.$emit('update:showChooseList', false)
       // 新建考评组
@@ -196,7 +203,6 @@ export default {
           }
         })
       }
-      console.log('showChooseList', newVal, oldVal)
     }
   }
 

src/components/popupMange/index.vue

@@ -126,7 +126,12 @@ export default {
     handleSubmitPopup () {
       this.$emit('cb', {})
     },
-    handleAdd () { },
+    handleAdd () {
+      this.$router.push({
+        name: 'assessment-addPerson',
+        query: this.$route.query
+      })
+    },
     handleDelete () {
       this.$emit('remove')
     }

src/router/kpi_route.js

@@ -88,6 +88,14 @@ export default [
           title: '考核管理',
           isNav: true
         }
+      }, {
+        path: 'addPerson',
+        name: 'assessment-addPerson',
+        component: (resolve) => require(['@/views/kpi/assessment/stepList/addPerson.vue'], resolve),
+        meta: {
+          title: '添加人员',
+          isNav: true
+        }
       },
       {
         path: 'performance',

src/views/kpi/assessment/stepList/addPerson.vue

@@ -0,0 +1,99 @@
+<!--  -->
+<template>
+    <div class="addPerson">
+        <small-nav />
+        <div class="addPerson-content">
+            <el-form ref="form" :model="form" label-width="160px">
+              <el-form-item label="考评员工：">
+                <div v-if="list.list.length>0">
+                 <el-input
+                  @focus="handleChoose"
+                  style="width:300px;cursor: pointer;"
+                  size="small"
+                  :value ="list.title + '等' + list.list.length + '个人'"
+                  readonly>
+                    <i slot="suffix" class="el-input__icon el-icon-edit"></i>
+                </el-input>
+                <i @click="list.list=[]"  style="margin-left:10px;cursor: pointer;" class="el-icon-delete"></i>
+                </div>
+                <el-button size="small" icon="el-icon-plus"  plain @click="handleChoose">选人员</el-button>
+              </el-form-item>
+              <el-form-item>
+                <el-button size="small" type="primary" @click="handleOnSubmit">确定</el-button>
+              </el-form-item>
+            </el-form>
+        </div>
+       <getPersonnel v-if="isSshow" :value.sync='form.staffIds'  :isShow.sync='isSshow' :showDataList.sync='list'/>
+    </div>
+</template>
+
+<script>
+import getPersonnel from '@/components/getPersonnel'
+import SmallNav from '@/components/kpi-layout/SmallNav'
+import { apiAssessManagerChange} from '@/api/assessment'
+export default {
+  data () {
+    return {
+      isSshow: false,
+      list: {
+        list: []
+      },
+      form: {}
+    }
+  },
+  components: {
+    SmallNav,
+    getPersonnel
+  },
+  computed: {},
+  beforeMount () {},
+  mounted () {},
+  methods: {
+    handleChoose () {
+      this.isSshow = true
+    },
+    async handleOnSubmit () {
+      const parmas = {
+        startId: this.$route.query.id,
+        staffIds: this.form.staffIds,
+        confirm: 0,
+        changeType: 0
+      }
+      let res = await apiAssessManagerChange(parmas)
+      if (res.code === 503) {
+        this.$confirm(res.msg, '提示', {
+          confirmButtonText: '确定',
+          cancelButtonText: '取消',
+          type: 'warning'
+        }).then(async () => {
+          parmas.confirm = 1
+          let res1 = await apiAssessManagerChange(parmas)
+          if (res1.code !== 200) return this.$message.error(res1.msg)
+          history.go(-1)
+        }).catch(() => {
+        })
+      } else if (res.code !== 200) {
+        return this.$message.error(res.msg)
+      } else {
+        history.go(-1)
+      }
+    }
+  },
+  watch: {}
+
+}
+
+</script>
+
+<style lang='less' scoped>
+.addPerson{
+  &-content{
+    margin: 30px 0 10px 0;
+    padding: 28px;
+    min-height: 400px;
+    background: #fff;
+    display: flex;
+    flex-wrap: wrap;
+  }
+}
+</style>

src/views/kpi/assessment/stepList/index.vue

@@ -153,6 +153,8 @@
       </div>
     </div>
     <ChooseInitiate
+      :nOSec='true'
+      v-if="showChooseList"
       @cb='handleCallBackChoose'
       subumitText='开始评分'
       popupRightTitle='请选择开始评分的考评组'
@@ -197,7 +199,7 @@ import EvaluationTeamFilter from '@/components/EvaluationTeamFilter'
 import ChooseInitiate from '@/components/ChooseInitiate'
 import popupRemovePerson from '@/components/popupPerson'
 
-import { apiManagerDetail, apiChartList } from '@/api/assessment'
+import { apiManagerDetail, apiChartList, apiAssessManagerToScore } from '@/api/assessment'
 import { getStartsData } from '@/api/report'
 let id = 0
 export default {
@@ -267,8 +269,14 @@ export default {
     await this.handleStartsReq()
   },
   methods: {
-    handleCallBackChoose (item) {
+    async handleCallBackChoose (item) {
-      console.log('item: ', item)
+      if (!item.value) return this.$message.info('请选择考评组！')
+      const params = {
+        evaluationIds: item.value,
+        startId: this.$route.query.id
+      }
+      let res = await apiAssessManagerToScore(params)
+      if (res.code !== 200) return this.$message.error(res.msg)
     },
     submitClick (item) {
       this.params.evaluationIds = item.value