diff --git a/src/api/assessment.js b/src/api/assessment.js index cf9218a..b73eedd 100644 --- a/src/api/assessment.js +++ b/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 + }) +} diff --git a/src/components/EvaluationTeamFilter/index.vue b/src/components/EvaluationTeamFilter/index.vue index b3fcbc3..4c71ffa 100644 --- a/src/components/EvaluationTeamFilter/index.vue +++ b/src/components/EvaluationTeamFilter/index.vue @@ -2,7 +2,7 @@
@@ -15,6 +15,7 @@ prefix-icon="el-icon-search" v-model="searchName" @change="handleSearchChange" + clearable placeholder="搜索考评组" size="small" > @@ -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: [{ - 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: '' - }], + tableList: [], 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) { - if (newVal !== oldVal && newVal) { - this.handleDataList() - } - } + // dialogVisible (newVal, oldVal) { + // if (newVal) { + // 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(paraDic).then(res => { + apiGetEvaluationTeamList(Object.assign({}, this.pageInfo, this.filtersDic)).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) - this.handleCancel() + const obj = { + 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%; diff --git a/src/components/getPersonnel/index.vue b/src/components/getPersonnel/index.vue index dc7fa3e..1df5172 100644 --- a/src/components/getPersonnel/index.vue +++ b/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) - this.$emit('update:showDataList', params) - this.$emit('update:isShow', false) + console.log(this.$listeners) + if (this.$listeners.cb) { + 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 => { diff --git a/src/components/kpi-layout/SmallNav.vue b/src/components/kpi-layout/SmallNav.vue index ea2dbd7..03699fc 100644 --- a/src/components/kpi-layout/SmallNav.vue +++ b/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; diff --git a/src/style/common.less b/src/style/common.less index 007167b..5b69392 100644 --- a/src/style/common.less +++ b/src/style/common.less @@ -18,6 +18,16 @@ color: #b1b1b1; } +.comonTitle { + font-size: 20px; + color: #52575b; +} + +.comonPrompt { + font-size: 14px; + color: #9b9b9b; +} + .common-main { background-color: white; padding: 40px 20px; diff --git a/src/utils/elementConfig.js b/src/utils/elementConfig.js index 1b55bb4..865f3a0 100644 --- a/src/utils/elementConfig.js +++ b/src/utils/elementConfig.js @@ -32,7 +32,8 @@ import { TabPane, Menu, MenuItem, - Loading + Loading, + Image } from 'element-ui' Vue.prototype.$loading = Loading @@ -71,3 +72,4 @@ Vue.use(DropdownItem) Vue.use(Cascader) Vue.use(Menu) Vue.use(MenuItem) +Vue.use(Image) diff --git a/src/views/kpi/assessment/goals/index.vue b/src/views/kpi/assessment/goals/index.vue index a023e5b..89ad3f6 100644 --- a/src/views/kpi/assessment/goals/index.vue +++ b/src/views/kpi/assessment/goals/index.vue @@ -9,8 +9,8 @@ departmentName:obj.departmentName }"/>
- 暂存 - 提交 + 暂存 + 提交
@@ -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 diff --git a/src/views/kpi/assessment/homeList/index.vue b/src/views/kpi/assessment/homeList/index.vue index db304cd..92d9d1e 100644 --- a/src/views/kpi/assessment/homeList/index.vue +++ b/src/views/kpi/assessment/homeList/index.vue @@ -56,7 +56,7 @@ @click="handlePush(scope.row.id)" type="text" size="small"> - 编 辑 + 查 看 + + + + + diff --git a/src/views/kpi/assessment/performance/index.vue b/src/views/kpi/assessment/performance/index.vue index 2dace9d..0bc4638 100644 --- a/src/views/kpi/assessment/performance/index.vue +++ b/src/views/kpi/assessment/performance/index.vue @@ -25,11 +25,7 @@ departmentName:obj.departmentName }" />
- 制定目标 +
@@ -92,7 +88,7 @@ :obj='obj' />
-
+
记录
@@ -134,11 +130,20 @@ :key="index" v-for="(i,index) in form.item.flowDetailRespList" > - {{i}} + +
+ 未确认 + +
+
+ 跳过 + 转交 +
-
@@ -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 () { - this.$router.push({ - name: 'assessment-goals', - query: { - id: this.$route.query.id - } + // 跳过 + handleJump (item) { + console.log('item: ', item) + this.$confirm('确认跳过该人员?', '提示', { + confirmButtonText: '确定', + 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; diff --git a/src/views/kpi/assessment/stepList/index.vue b/src/views/kpi/assessment/stepList/index.vue index f453b39..dd71b8a 100644 --- a/src/views/kpi/assessment/stepList/index.vue +++ b/src/views/kpi/assessment/stepList/index.vue @@ -16,7 +16,7 @@
{{formTitle}} - 选择考评组 + {{params.evaluationIds?params.title:'选择考评组'}}
@@ -98,13 +98,7 @@
- -
-
- {{i.staffName}} -
-
- + @@ -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: { - showRight: false - }, + dialogVisible: false, form: { isShowPersonnel: false, personnelList: { @@ -135,8 +129,8 @@ export default { 'evaluationIds': '', 'flowProcess': null, 'pageSize': 5, - // 'staffIds': '', - // 'staffName': '', + 'staffIds': '', + '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}, { - 'currPage': 1, - 'pageSize': 999 - })) - if (res.code !== 200) { - this.rightList = [] - return - } - this.rightList = res.data.list - this.kaopingFrom.showRight = true + this.dialogVisible = 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() diff --git a/src/views/kpi/set/authority/index.vue b/src/views/kpi/set/authority/index.vue new file mode 100644 index 0000000..b79cfbe --- /dev/null +++ b/src/views/kpi/set/authority/index.vue @@ -0,0 +1,147 @@ + + + + diff --git a/src/views/kpi/set/index.vue b/src/views/kpi/set/index.vue index a8660c9..f3ececc 100644 --- a/src/views/kpi/set/index.vue +++ b/src/views/kpi/set/index.vue @@ -13,14 +13,14 @@
- 默认值设置 +