wulin/management_UI
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
熊成强 2020-10-26 18:16:54 +08:00
commit 35da2c6fd1
2 changed files with 72 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/workbench.js
View File

@ -75,7 +75,7 @@ export function saveDetailProcs (query) {
export function sendAssessmentInfo (query) {
return request({
url: '/lz_management/flowStart/save',
method: 'post',
method: 'POST',
data: query
})
}

117
src/views/kpi/workbench/initiateAssessment/index.vue
View File

@ -100,7 +100,7 @@
<div>
<popup-right
v-if="showChooseList"
@cancel='handleCancelPopup'
@cancel='showChooseList = false'
@submit="handleSubmitPopup"
:title="popupRightTitle"
class="popup"
@ -148,16 +148,40 @@
<el-button
@click="handlePopupCreat"
type="text"
plain
>新建考评组</el-button>
</div>
</div>
<el-pagination
:hide-on-single-page="true"
:current-page.sync="rqAssessmentParameter.currPage"
:page-size="rqAssessmentParameter.pageSize"
:total="rqAssessmentParameter.totalCount"
:page-count="rqAssessmentParameter.totalPage"
@current-change="handleCurrentChange"
layout="total, prev, pager, next, jumper"
></el-pagination>
</div>
<div
slot="footer-left"
class="popup-footer-left"
>已选择：{{popupData.selectedList.length}}个</div>
</popup-right>
<el-dialog
title="发起考核"
:visible.sync="dialogSendVisible"
width="30%"
>
<span>确认发起{{this.formData.mergeType.name}}绩效考核？</span>
<span
slot="footer"
class="dialog-footer"
>
<el-button
type="primary"
@click="handleDialogSend"
>确 定</el-button>
</span>
</el-dialog>
</div>
</div>
</template>
@ -167,6 +191,7 @@ import { getWorkList, sendAssessmentInfo } from '@/api/workbench'
export default {
data () {
return {
dialogSendVisible: false,
popupRightTitle: '选择考评组（月度）考核',
showChooseList: false,
formData: {
@ -181,8 +206,8 @@ export default {
formRules: {
cycleTimeType: [{ required: true, message: '请选择周期类型', trigger: 'blur' }],
rangDate: [{ required: true, message: '请选择时间周期', trigger: 'change' }],
assessmentList: [{ type: 'array', required: true, message: '请选择周期类型', trigger: 'change' }],
'mergeType.name': [{ required: true, message: '请选择周期类型', trigger: 'blur' }]
assessmentList: [{ type: 'array', required: true, message: '请选择参与考评组', trigger: 'change' }],
'mergeType.name': [{ required: true, message: '请填写新建考核名称', trigger: 'blur' }]
},
popupData: {
@ -191,10 +216,10 @@ export default {
},
rqAssessmentParameter: {
currPage: 1,
pageSize: 20,
pageSize: 100,
searchName: '',
totalCount: undefined,
totalPage: undefined
totalCount: 1,
totalPage: 1
}
}
},
@ -230,22 +255,34 @@ export default {
handleSubmit () {
console.log('提交')
this.$refs['formData'].validate((val) => {
this.dialogSendVisible = val
console.log('1111111111111111')
const groupIdList = this.formData.assessmentList.map((item, index) => {
return item.id
})
},
handleDialogSend () {
// 发起考核
const groupIdList = this.formData.assessmentList.map((item, index) => {
return item.id
})
let para = {
cycleType: this.formData.cycleTimeType,
groupIds: '24',
// groupIds: groupIdList.join(),
name: this.formData.mergeType.name
}
if (this.formData.cycleTimeType === 0) {
para['startTime'] = this.$format(this.formData.rangDate, 'yyyy-MM-dd hh:mm:ss')
} else {
para['startTime'] = this.$format(this.formData.rangDate[0], 'yyyy-MM-dd hh:mm:ss')
para['endTime'] = this.$format(this.formData.rangDate[1], 'yyyy-MM-dd hh:mm:ss')
}
sendAssessmentInfo(para).then(res => {
this.dialogSendVisible = false
// this.$router.push({ name: 'assessment' })
this.$message({
message: '发起考核成功',
type: 'success'
})
let para = {
cycleType: this.formData.cycleTimeType,
groupIds: groupIdList.join(),
name: this.formData.mergeType.name
}
if (this.formData.cycleTimeType === 0) {
para['gmtCreate'] = this.formData.rangDate
} else {
para['gmtCreate'] = this.formData.rangDate[0]
para['endTime'] = this.formData.rangDate[1]
}
console.log('提交', groupIdList.join())
})
},
handlePopupSearchChange (val) {
@ -260,41 +297,29 @@ export default {
handlePopupCreat () {
this.showChooseList = false
// 新建考评组
},
handleCancelPopup () {
this.showChooseList = false
this.$router.push({ name: 'workbench-edit-group' })
},
handleSubmitPopup () {
this.showChooseList = false
const list = this.popupData.selectedList
let newList = []
for (let index = 0; index < 20; index++) {
for (let index = 0; index < list.length; index++) {
const element = list[index]
newList.push(element)
}
}
this.formData.assessmentList = newList
// this.formData.assessmentList = this.popupData.selectedList
this.formData.assessmentList = this.popupData.selectedList
},
handleCurrentChange (val) {
this.handleGainAssessmentGroupList(val)
},
// 获取数据
handleGainAssessmentGroupList () {
handleGainAssessmentGroupList (currPage) {
currPage = currPage > 0 ? currPage : this.rqAssessmentParameter.currPage
let para = {
pageSize: this.rqAssessmentParameter.pageSize,
currPage: this.rqAssessmentParameter.currPage,
currPage: currPage,
name: this.rqAssessmentParameter.searchName
}
getWorkList({}).then(res => {
const currPage = res.currPage
let newList = []
for (let index = 0; index < 20; index++) {
for (let index = 0; index < res.list.length; index++) {
const element = res.list[index]
newList.push(element)
}
}
this.popupData.tableList = newList
console.log(res)
getWorkList(para).then(res => {
this.rqAssessmentParameter.totalPage = res.totalPage
this.rqAssessmentParameter.totalCount = res.totalCount
this.currPage = res.currPage
this.popupData.tableList = res.list
})
}
}