Merge branch 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui into v_1.0.0

* 'v_1.0.0' of http://gitlab.ldxinyong.com/enterpriseManagement/digitization-ui:
  优化
  优化
  有哈
  优化

src/api/assessment.js

@@ -53,3 +53,12 @@ export function apiResultGetDetail (query) {
     params: query
   })
 }
+
+// 保存绩效详情-
+export function apiSaveDetail (query) {
+  return request({
+    url: '/lz_management/user/lzresultrecord/saveDetail',
+    method: 'post',
+    data: query
+  })
+}

src/components/EvaluationTeamFilter/index.vue

@@ -2,7 +2,7 @@
   <div class="team-filter commonFont">
     <el-dialog
       title="考评组筛选"
-      :visible.sync="dialogVisible"
+      :visible="true"
       :before-close="handleCancel"
       width="920"
     >
@@ -15,6 +15,7 @@
             prefix-icon="el-icon-search"
             v-model="searchName"
             @change="handleSearchChange"
+            clearable
             placeholder="搜索考评组"
             size="small"
           ></el-input>
@@ -112,6 +113,10 @@ export default {
       type: Boolean,
       default: false
     },
+    value: {
+      type: String,
+      deafult: () => ''
+    },
     filtersDic: {
       type: Object,
       default: () => {
@@ -123,24 +128,11 @@ export default {
   data () {
     return {
       searchName: '',
-      tableList: [{
+      tableList: [],
-        copyId: 0,
-        counts: 53,
-        depIds: '154322459',
-        gmtCreate: '2020-10-26 11:22:01',
-        gmtModified: '2020-10-27 14:30:47',
-        id: 57,
-        isDelete: 0,
-        managerIds: '380',
-        name: '1231',
-        outIds: '322,379,380,387,388,389,391,410,825',
-        score: 0,
-        staffIds: ''
-      }],
       seleactedList: [],
       pageInfo: {
         currPage: 1,
-        pageSize: 1,
+        pageSize: 500,
         totalCount: 1,
         totalPage: 1
       }
@@ -149,27 +141,41 @@ export default {
   created () {
   },
   mounted () {
+    this.$nextTick(() => {
+      this.handleDataList()
+    })
   },
   watch: {
-    dialogVisible (newVal, oldVal) {
+    // dialogVisible (newVal, oldVal) {
-      if (newVal !== oldVal && newVal) {
+    //   if (newVal) {
-        this.handleDataList()
+    //     if (this.filtersDic.currPage === undefined || !this.filtersDic.currPage) {
-      }
+    //       this.filtersDic['currPage'] = this.pageInfo.currPage
-    }
+    //     }
+    //     if (this.filtersDic.pageSize === undefined || !this.filtersDic.pageSize) {
+    //       this.filtersDic['pageSize'] = this.pageInfo.pageSize
+    //     }
+    //     this.handleDataList()
+    //   }
+    // }
   },
   methods: {
     handleDataList () {
-      let paraDic = Object.assign(this.pageInfo, this.filtersDic)
+      apiGetEvaluationTeamList(Object.assign({}, this.pageInfo, this.filtersDic)).then(res => {
-      apiGetEvaluationTeamList(paraDic).then(res => {
         this.pageInfo.currPage = res.data.currPage
         this.pageInfo.totalCount = res.data.totalCount
         this.pageInfo.totalPage = res.data.totalPage
         this.tableList = res.data.list
+
+        this.$nextTick(() => {
+          this.tableList.map(i => {
+            if (this.value.includes(String(i.id))) {
+              this.$refs.refChooseTable.toggleRowSelection(i, true)
+            }
+          })
+        })
+        // this.$ref.refChooseTable.toggleRowSelection()
       })
     },
-    // handleGetRowStyle () {
-    //   return { 'height': '44px' }
-    // },
     handleSearchChange () {
       // 搜索
       this.filtersDic['name'] = this.searchName
@@ -191,8 +197,16 @@ export default {
       this.$emit('close')
     },
     handleSubmit () {
-      this.$emit('submitClick', this.seleactedList)
+      const obj = {
-      this.handleCancel()
+        value: '',
+        title: ''
+      }
+      this.seleactedList.sort((a, b) => a.id - b.id).map(i => {
+        obj.value += i.id + ','
+      })
+      obj.value = obj.value.substring(obj.value.length - 1, 0)
+      obj.title = this.seleactedList.length > 0 ? (this.seleactedList[0].name + '等' + this.seleactedList.length + '个考评组') : ''
+      this.$emit('submitClick', obj)
     },
     handleSelectionChange (val) {
       this.seleactedList = val
@@ -229,6 +243,7 @@ export default {
   &-content {
     width: 100%;
     height: 425px;
+    padding: 20px 0;
     border-bottom: 1 solid @borderColor;
     &-left {
       height: 100%;

src/components/getPersonnel/index.vue

@@ -68,6 +68,10 @@
 import bbb from './a'
 export default {
   props: {
+    len: {
+      type: Number,
+      default: 99999
+    },
     isShow: {
       TYPE: Boolean,
       default: () => false
@@ -224,10 +228,19 @@ export default {
         }
         return item
       }, [])
+      if (this.len < arr.length) {
+        this.$message.info('人数最多只能选择' + this.len + '人')
+        return
+      }
       const params = this.$personlGetForm(arr)
-      this.$emit('update:value', params.value)
+      console.log(this.$listeners)
-      this.$emit('update:showDataList', params)
+      if (this.$listeners.cb) {
-      this.$emit('update:isShow', false)
+        this.$emit('cb', params)
+      } else {
+        this.$emit('update:value', params.value)
+        this.$emit('update:showDataList', params)
+        this.$emit('update:isShow', false)
+      }
     },
     handleGetPerson (list = this.tags, getList = []) {
       list.map(i => {

src/components/kpi-layout/SmallNav.vue

@@ -53,6 +53,9 @@ export default {
     color: #aaaaaa;
     cursor: pointer;
   }
+  &-back:hover{
+    color: @fontBlue;
+  }
   &-title{
     padding: 0 10px;
     position: relative;

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

@@ -9,8 +9,8 @@
                 departmentName:obj.departmentName
               }"/>
               <div>
-                <el-button size='small' plain>暂存</el-button>
+                <el-button size='small' @click="handleSaveDetail()" plain>暂存</el-button>
-                 <el-button size='small' type="primary">提交</el-button>
+                <el-button size='small' type="primary"  >提交</el-button>
               </div>
           </div>
           <div class="goals-content-tabbar">
@@ -107,7 +107,7 @@ import InfoHeader from '@/components/InfoHeader'
 import PopupRight from '@/components/PopupRight'
 import draggable from 'vuedraggable'
 import {getDimensions} from '@/api/data'
-import { apiResultGetDetail } from '@/api/assessment'
+import { apiResultGetDetail, apiSaveDetail } from '@/api/assessment'
 export default {
   data () {
     return {
@@ -160,6 +160,15 @@ export default {
     this.handleGetTbale()
   },
   methods: {
+    async handleSaveDetail (params = this.obj) {
+      let res = await apiSaveDetail(params)
+      if (res.code !== 200) {
+        this.$message.error = res.msg
+        return
+      }
+      this.handleGetTbale()
+      console.log('res: ', res)
+    },
     // 获取维度类型
     async handleGetDimensions () {
       try {
@@ -220,7 +229,7 @@ export default {
     handleFilter (item) {
       return item ? item.filter(i => !i.isDelete) : []
     },
-    async handleGetTbale (id = 226) {
+    async handleGetTbale (id = this.$route.query.id) {
       let res = await apiResultGetDetail({id})
       if (res.code !== 200) return
       this.obj = res.data

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

@@ -56,7 +56,7 @@
                @click="handlePush(scope.row.id)"
               type="text"
               size="small">
-              编 辑
+              查 看
             </el-button>
             <el-button
               @click="handleDelete(scope.row.id)"

src/views/kpi/assessment/performance/components/UseButton/index.vue

@@ -0,0 +1,55 @@
+<!--  -->
+<template>
+    <div>
+      <el-button
+            size="mini"
+            @click="handleZhiding"
+            type="primary"
+          >制定目标</el-button>
+           <getPersonnel :len='1' @cb='cb' v-if="isShowPersonnel" :value.sync='staffIds'  :isShow.sync='isShowPersonnel' :showDataList.sync='personnelList'/>
+    </div>
+</template>
+
+<script>
+import getPersonnel from '@/components/getPersonnel'
+export default {
+  data () {
+    return {
+      isShowPersonnel: false,
+      staffIds: '',
+      personnelList: {
+        list: []
+      }
+    }
+  },
+  components: {
+    getPersonnel
+  },
+  computed: {},
+  beforeMount () {},
+  mounted () {},
+  methods: {
+    cb (info) {
+      console.log(info)
+    },
+    // 制定目标
+    handleZhiding () {
+      this.isShowPersonnel = true
+      return
+      this.$router.push({
+        name: 'assessment-goals',
+        query: {
+          id: 267 || this.$route.query.id
+        }
+      })
+    }
+  },
+  watch: {}
+
+}
+
+</script>
+
+<style lang='' scoped>
+
+</style>

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

@@ -25,11 +25,7 @@
                 departmentName:obj.departmentName
                 }" />
         <div class="performance-content-title-right">
-          <el-button
+          <UseButton />
-            size="mini"
-            @click="handleZhiding"
-            type="primary"
-          >制定目标</el-button>
         </div>
       </div>
       <div class="performance-content-center">
@@ -92,7 +88,7 @@
           :obj='obj'
         />
       </div>
-      <div class="performance-content-jilu">
+      <div v-if="!formList.resultCommentList" class="performance-content-jilu">
         <div class="performance-content-jilu-title commonFont">
           记录
         </div>
@@ -134,11 +130,20 @@
           :key="index"
           v-for="(i,index) in form.item.flowDetailRespList"
         >
-          {{i}}
+          <InfoHeader :obj="{
+                name:i.staffName,
+                departmentName:i.departName
+                }"/>
+          <div class="chooseManage-item-center">
+            <el-tag size="mini" type="warning">未确认</el-tag>
+            <!-- <el-tag>已跳过</el-tag>
+            <el-tag type="success">已确认</el-tag> -->
+          </div>
+          <div>
+            <el-button size="mini" @click="handleJump(i)"  type="primary" plain>跳过</el-button>
+             <el-button size="mini"  type="primary" plain>转交</el-button>
+          </div>
         </div>
-        <!-- <div v-for="i in rightList" :key="i.id" class="chooseManage-item" >
-                  <el-checkbox :true-label='1' :false-label='0' :disabled='i.isDisable===1' :checked='i.isDisable===1' v-model='i.isSelect'></el-checkbox><span class='commonFont' style="margin:0 0 0 10px;">{{i.staffName}} </span>
-              </div> -->
       </div>
     </popup-right>
   </div>
@@ -148,6 +153,8 @@
 import SmallNav from '@/components/kpi-layout/SmallNav'
 import InfoHeader from '@/components/InfoHeader'
 import PopupRight from '@/components/PopupRight'
+import UseButton from './components/UseButton'
+
 import { apiResultRecordDetail, apiResultGetDetail } from '@/api/assessment'
 import tables from './components/table'
 
@@ -187,7 +194,8 @@ export default {
     SmallNav,
     InfoHeader,
     PopupRight,
-    tables
+    tables,
+    UseButton
   },
   computed: {},
   beforeMount () { },
@@ -196,16 +204,26 @@ export default {
     this.handleGetTbale()
   },
   methods: {
-    // 制定目标
+    // 跳过
-    handleZhiding () {
+    handleJump (item) {
-      this.$router.push({
+      console.log('item: ', item)
-        name: 'assessment-goals',
+      this.$confirm('确认跳过该人员?', '提示', {
-        query: {
+        confirmButtonText: '确定',
-          id: this.$route.query.id
+        cancelButtonText: '取消',
-        }
+        type: 'warning'
+      }).then(() => {
+        this.$message({
+          type: 'success',
+          message: '删除成功!'
+        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
       })
     },
-    async handleGetTbale (id = 226) {
+    async handleGetTbale (id = 267) {
       let res = await apiResultGetDetail({ id })
       this.obj = res.data
       console.log('res: ', res)
@@ -223,7 +241,7 @@ export default {
     },
     async handleList () {
       // resultRecordId = == this.$route.query.id
-      let res = await apiResultRecordDetail({ resultRecordId: 215 })
+      let res = await apiResultRecordDetail({ resultRecordId: 267 })
       if (res.code !== 200) return
       for (let i in res.data.flowRecordList) {
         if (res.data.flowRecordList[i].status !== 1) {
@@ -249,8 +267,15 @@ export default {
 .performance {
   overflow: auto;
   .chooseManage-item {
-    padding: 24px 0;
+    // padding: 24px 0;
     border-bottom: 1px solid @borderColor;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    &-center{
+      min-width: 200px;
+      .center()
+    }
   }
   &-content {
     padding: 28px;

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

@@ -16,7 +16,7 @@
             <div class="step-content-top">
               <div class="step-content-top-left">
                 <el-button size="small"  @click="handleChoose" plain>{{formTitle}}<i style="margin-left:10px;" class="el-icon-arrow-down"></i></el-button>
-                <el-button size="small" @click="handleKaoping" plain>选择考评组<i style="margin-left:10px;" class="el-icon-arrow-down"></i></el-button>
+                <el-button size="small" @click="handleKaoping" plain>{{params.evaluationIds?params.title:'选择考评组'}}<i style="margin-left:10px;" class="el-icon-arrow-down"></i></el-button>
                 <el-input clearable @change="handleChangeInput" @keyup.enter="handleChangeInput"    size="small" style="margin-left:10px;" v-model="params.name"  prefix-icon="el-icon-search" placeholder="请输入姓名搜索"></el-input>
               </div>
               <div class="step-content-top-right">
@@ -98,13 +98,7 @@
               </div>
             </div>
          </div>
-         <popup-right v-if="kaopingFrom.showRight" @cancel='handleCancel' @submit="handleSubmit" title="考评组筛选">
+         <EvaluationTeamFilter v-if="dialogVisible" :value='params.evaluationIds' :filtersDic="{startId: this.params.startId }" :dialogVisible.sync='dialogVisible' @submitClick='submitClick' @close='dialogVisible = false'/>
-            <div slot="content" class="chooseManage">
-              <div v-for="i in rightList" :key="i.id" class="chooseManage-item" >
-                  <el-checkbox :true-label='1' :false-label='0' :disabled='i.isDisable===1' :checked='i.isDisable===1' v-model='i.isSelect'></el-checkbox><span class='commonFont' style="margin:0 0 0 10px;">{{i.staffName}} </span>
-              </div>
-            </div>
-          </popup-right>
          <getPersonnel v-if="form.isShowPersonnel" :value.sync='params.staffIds'  :isShow.sync='form.isShowPersonnel' :showDataList.sync='form.personnelList'/>
     </div>
 </template>
@@ -113,6 +107,8 @@
 import SmallNav from '@/components/kpi-layout/SmallNav'
 import getPersonnel from '@/components/getPersonnel'
 import PopupRight from '@/components/PopupRight'
+import EvaluationTeamFilter from '@/components/EvaluationTeamFilter'
+
 import { apiManagerDetail, apiChartList } from '@/api/assessment'
 import {getWorkList} from '@/api/workbench'
 import { getStartsData } from '@/api/report'
@@ -120,9 +116,7 @@ let id = 0
 export default {
   data () {
     return {
-      kaopingFrom: {
+      dialogVisible: false,
-        showRight: false
-      },
       form: {
         isShowPersonnel: false,
         personnelList: {
@@ -135,8 +129,8 @@ export default {
         'evaluationIds': '',
         'flowProcess': null,
         'pageSize': 5,
-        // 'staffIds': '',
+        'staffIds': '',
-        // 'staffName': '',
+        'staffName': '',
         'startId': 10
       },
       key: 0,
@@ -163,7 +157,8 @@ export default {
   components: {
     SmallNav,
     getPersonnel,
-    PopupRight
+    PopupRight,
+    EvaluationTeamFilter
   },
   computed: {
     formTitle () {
@@ -176,18 +171,16 @@ export default {
     await this.handleStartsReq()
   },
   methods: {
+    submitClick (item) {
+      this.params.evaluationIds = item.value
+      this.params.title = item.title
+      this.params.currPage = 1
+      this.handleGetListContent()
+      this.dialogVisible = false
+    },
     // 获取考评组
     async handleKaoping () {
-      let res = await getWorkList(Object.assign({}, {startId: this.params.startId}, {
+      this.dialogVisible = true
-        'currPage': 1,
-        'pageSize': 999
-      }))
-      if (res.code !== 200) {
-        this.rightList = []
-        return
-      }
-      this.rightList = res.data.list
-      this.kaopingFrom.showRight = true
     },
     handleLook (id) {
       // this.handleKaoping()
@@ -206,6 +199,7 @@ export default {
       this.handleGetListContent()
     },
     async handleGetListContent (params = this.params) {
+      console.log('params: ', params)
       let res = await apiManagerDetail(params)
       if (res.code !== 200) return
       this.tableData = res.data.list
@@ -245,7 +239,12 @@ export default {
     },
     async handleChange (item) {
       this.params.startId = item[1]
-      // await this.handleGetChartList(Object.assign({}, this.params, {startId: item[1]}))
+      this.$router.replace({
+        name: 'assessment-stepList',
+        query: {
+          id: item[1]
+        }
+      })
       this.params.currPage = 1
       this.params.startId = item[1]
       await this.handleGetChartList()

src/views/kpi/workbench/assessmentGroup/edit/components/ApprovalList.vue

@@ -25,6 +25,7 @@
               <el-radio-group v-model="itemInfo.isActive">
                 <el-radio :label="1">主管（指定一级）</el-radio>
                 <el-radio :label="0">指定成员</el-radio>
+                 <el-radio :label="-1">被考核人自己</el-radio>
               </el-radio-group>
               <div v-if="itemInfo.isActive!==0 && itemInfo.isActive!==-1" style="padding:30px 0 0 20px;">
                 <span>被考评人的</span>
@@ -42,7 +43,7 @@
                 <span style="font-size:14px;padding:0 0 0 10px;">{{itemInfo.name}}</span>
               </div>
                <getpersonl v-if="itemInfo.isShow" :value.sync='itemInfo.optIds'  :isShow.sync='itemInfo.isShow' :showDataList.sync='itemInfo.list'/>
-              <div style="padding:20px 0 0 0 ">
+              <div v-if="itemInfo.isActive!==-1" style="padding:20px 0 0 0 ">
                 <span>当执行人为多人时的处理方式：</span>
                 <div style="padding:10px 0 0 20px">
                   <el-radio-group v-model="itemInfo.stepType">
@@ -132,7 +133,7 @@ export default {
       list = list.map(i => {
         i.isShow = false
         i = Object.assign({}, this.handleOptType(i), i)
-        i.isActive = i.optType === 0 ? 0 : 1
+        i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
         i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
           j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
           return j
@@ -157,6 +158,7 @@ export default {
         return obj
       }
       if (i.optType === -1) {
+        obj.name = '被考核人'
         return obj
       } else {
         obj.name = this.options.filter(j => j.id === i.optType)[0].name
@@ -231,10 +233,10 @@ export default {
       n.map(i => {
         i.roleIds = ''
         i.roleDtos.map(j => {
-          if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
+          if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
         })
         i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
-        i.optType = i.isActive === 0 ? 0 : i.optType
+        i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
       })
       console.log('n: ', n)
       this.$emit('update:info', this.list)
@@ -248,27 +250,25 @@ export default {
     list: {
       deep: true,
       handler (n, o) {
-        this.handleIsEmit(n)
+        this.handleIsEmit(JSON.parse(JSON.stringify(n)))
       }
     },
     itemInfo: {
       deep: true,
       handler (n, o) {
-        console.log('nxcq: ', n)
+        const arr = n
-        if (n.isActive !== 0) {
+        console.log('arr: ', arr)
-          if (n.optType === 0 && n.optType !== -1) {
+        if (arr.isActive !== 0 && arr.isActive !== -1) {
-            n.name = this.options.filter(i => i.id === n.optType)[0].name
+          if (arr.optType < 1) arr.optType = 1
-            n.optType = 1
+          arr.name = this.options.filter(i => i.id === arr.optType)[0].name
-          }
+        } else if (arr.isActive === 0) {
-          if (n.optType === -1) {
+          if (arr.list) {
-            n.name = '考核人员自己'
+            arr.name = this.handleTitle(arr.list)
+          } else {
+            arr.name = '未指定成员'
           }
         } else {
-          if (n.list) {
+          arr.name = '被考核人自己'
-            n.name = this.handleTitle(n.list)
-          } else {
-            n.name = '未指定成员'
-          }
         }
         // n.roleIds = ''
         // n.roleDtos.map(i => {

src/views/kpi/workbench/assessmentGroup/edit/components/ConfirmList.vue

@@ -25,6 +25,7 @@
               <el-radio-group v-model="itemInfo.isActive">
                 <el-radio :label="1">主管（指定一级）</el-radio>
                 <el-radio :label="0">指定成员</el-radio>
+                <el-radio :label="-1">被考核人自己</el-radio>
               </el-radio-group>
               <div v-if="itemInfo.isActive!==0 && itemInfo.isActive!==-1" style="padding:30px 0 0 20px;">
                 <span>被考评人的</span>
@@ -42,7 +43,7 @@
                 <span style="font-size:14px;padding:0 0 0 10px;">{{itemInfo.name}}</span>
               </div>
                <getpersonl v-if="itemInfo.isShow" :value.sync='itemInfo.optIds'  :isShow.sync='itemInfo.isShow' :showDataList.sync='itemInfo.list'/>
-              <div style="padding:20px 0 0 0 ">
+              <div v-if="itemInfo.isActive !== -1" style="padding:20px 0 0 0 ">
                 <span>当执行人为多人时的处理方式：</span>
                 <div style="padding:10px 0 0 20px">
                   <el-radio-group v-model="itemInfo.stepType">
@@ -137,7 +138,8 @@ export default {
       list = list.map(i => {
         i.isShow = false
         i = Object.assign({}, this.handleOptType(i), i)
-        i.isActive = i.optType === 0 ? 0 : 1
+        console.log('i: ', i)
+        i.isActive = (i.optType === 0 || i.optType === -1) ? i.optType : 1
         i.roleDtos = JSON.parse(JSON.stringify(this.roleDtos)).map(j => {
           j.checked = i.roleIds ? i.roleIds.includes(String(j.id)) : false
           return j
@@ -162,6 +164,7 @@ export default {
         return obj
       }
       if (i.optType === -1) {
+        obj.name = '被考核人'
         return obj
       } else {
         obj.name = this.options.filter(j => j.id === i.optType)[0].name
@@ -239,10 +242,10 @@ export default {
         arr = arr.map(i => {
           i.roleIds = ''
           i.roleDtos.map(j => {
-            if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
+            if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
           })
           i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
-          i.optType = i.isActive === 0 ? 0 : i.optType
+          i.optType = (i.isActive === 0 || i.isActive === -1) ? i.isActive : i.optType
           return i
         })
         console.log('arr: ', arr)
@@ -266,15 +269,17 @@ export default {
       handler (n, o) {
         const arr = n
         console.log('arr: ', arr)
-        if (arr.isActive !== 0) {
+        if (arr.isActive !== 0 && arr.isActive !== -1) {
-          if (arr.optType === 0) arr.optType = 1
+          if (arr.optType < 1) arr.optType = 1
           arr.name = this.options.filter(i => i.id === arr.optType)[0].name
-        } else {
+        } else if (arr.isActive === 0) {
           if (arr.list) {
             arr.name = this.handleTitle(arr.list)
           } else {
             arr.name = '未指定成员'
           }
+        } else {
+          arr.name = '被考核人自己'
         }
         // this.$emit('update:info', this.list)
         // n.roleIds = ''

src/views/kpi/workbench/assessmentGroup/edit/components/ScoreList.vue

@@ -239,7 +239,7 @@ export default {
       n.map(i => {
         i.roleIds = ''
         i.roleDtos.map(j => {
-          if (j.type !== 1 && j.checked) i.roleIds += j.id + ','
+          if (j.type !== 1 && j.checked) i.roleIds += j.roleId + ','
         })
         i.roleIds = i.roleIds.substring(0, i.roleIds.length - 1)
       })

src/views/kpi/workbench/assessmentGroup/edit/components/process.vue

@@ -36,8 +36,7 @@ import Perform from './Perform'
 import Entry from './Entry'
 import Score from './Score'
 import Approval from './Approval'
-import {getByFlowManagerId, saveDetailProcs} from '@/api/workbench'
+import {getByFlowManagerId} from '@/api/workbench'
-console.log('saveDetailProcs: ', saveDetailProcs)
 export default {
   props: ['processInfo'],
   data () {

src/views/kpi/workbench/assessmentGroup/edit/index.vue

@@ -22,7 +22,6 @@ import basis from './components/basis'
 import process from './components/process'
 import templateSet from './components/templateSet'
 import {saveBaseSet, saveTemSet, saveDetailProcs} from '@/api/workbench'
-console.log('saveDetailProcs: ', saveDetailProcs)
 
 export default {
   data () {

src/views/kpi/workbench/todo/index.vue

@@ -149,7 +149,7 @@ export default {
       this.handleGetList()
     },
     handleRowClick (row) {
-      this.$router.push({ name: 'assessment-stepList', query: { id: row.recordId } })
+      this.$router.push({ name: 'assessment-performance', query: { id: row.recordId } })
     }
   },
   watch: {}