diff --git a/src/api/workbench.js b/src/api/workbench.js
index a965200..f45320e 100644
--- a/src/api/workbench.js
+++ b/src/api/workbench.js
@@ -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
})
}
diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue
index cc7e191..d26d9f9 100644
--- a/src/views/kpi/workbench/initiateAssessment/index.vue
+++ b/src/views/kpi/workbench/initiateAssessment/index.vue
@@ -100,7 +100,7 @@
+
+
+ 确认发起{{this.formData.mergeType.name}}绩效考核?
+
+
@@ -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
})
}
}