From 2a6d420292809fe90dfe409569fdd042030e3e50 Mon Sep 17 00:00:00 2001 From: leave <> Date: Mon, 26 Oct 2020 14:15:26 +0800 Subject: [PATCH 1/3] no message --- src/api/workbench.js | 2 +- .../workbench/initiateAssessment/index.vue | 110 +++++++++++------- 2 files changed, 70 insertions(+), 42 deletions(-) diff --git a/src/api/workbench.js b/src/api/workbench.js index 7acd798..ba85510 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..07da2a2 100644 --- a/src/views/kpi/workbench/initiateAssessment/index.vue +++ b/src/views/kpi/workbench/initiateAssessment/index.vue @@ -152,12 +152,37 @@ >新建考评组 +
已选择：{{popupData.selectedList.length}}个
+ + 确认发起{{this.formData.mergeType.name}}绩效考核？ + + 确 定 + + @@ -167,6 +192,7 @@ import { getWorkList, sendAssessmentInfo } from '@/api/workbench' export default { data () { return { + dialogSendVisible: false, popupRightTitle: '选择考评组（月度）考核', showChooseList: false, formData: { @@ -181,8 +207,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 +217,10 @@ export default { }, rqAssessmentParameter: { currPage: 1, - pageSize: 20, + pageSize: 100, searchName: '', - totalCount: undefined, - totalPage: undefined + totalCount: 1, + totalPage: 1 } } }, @@ -230,22 +256,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) { @@ -267,34 +305,24 @@ export default { 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 }) } } From 242ec751134f599a4c345795ad3bc9991a41c466 Mon Sep 17 00:00:00 2001 From: leave <> Date: Mon, 26 Oct 2020 14:17:40 +0800 Subject: [PATCH 2/3] no message --- src/views/kpi/workbench/initiateAssessment/index.vue | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue index 07da2a2..4f370cd 100644 --- a/src/views/kpi/workbench/initiateAssessment/index.vue +++ b/src/views/kpi/workbench/initiateAssessment/index.vue @@ -148,7 +148,6 @@ 新建考评组 @@ -279,7 +278,7 @@ export default { } sendAssessmentInfo(para).then(res => { this.dialogSendVisible = false - this.$router.push({ name: 'assessment' }) + // this.$router.push({ name: 'assessment' }) this.$message({ message: '发起考核成功', type: 'success' From abc3de6a57e68344bb22ef2c5d85571cdbd2551e Mon Sep 17 00:00:00 2001 From: leave <> Date: Mon, 26 Oct 2020 14:22:37 +0800 Subject: [PATCH 3/3] no message --- src/views/kpi/workbench/initiateAssessment/index.vue | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/views/kpi/workbench/initiateAssessment/index.vue b/src/views/kpi/workbench/initiateAssessment/index.vue index 4f370cd..d26d9f9 100644 --- a/src/views/kpi/workbench/initiateAssessment/index.vue +++ b/src/views/kpi/workbench/initiateAssessment/index.vue @@ -100,7 +100,7 @@