From 5f44de30e0d6705a346bfe3fc4e6a049f18cf855 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 22 Apr 2022 16:55:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=B7=A5=E6=97=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/xm/core/xmTaskWorkload.js | 3 + src/views/xm/core/xmTask/XmTaskAdd.vue | 14 +++ src/views/xm/core/xmTask/XmTaskEdit.vue | 15 +++ .../xm/core/xmTaskSbill/XmTaskSbillEdit.vue | 113 ++++++++++++------ .../xm/core/xmTaskSbill/XmTaskSbillMng.vue | 80 ++++++------- .../core/xmTaskWorkload/XmTaskWorkloadMng.vue | 90 +++++++------- 6 files changed, 186 insertions(+), 129 deletions(-) diff --git a/src/api/xm/core/xmTaskWorkload.js b/src/api/xm/core/xmTaskWorkload.js index 59a5b299..3bd4ce44 100644 --- a/src/api/xm/core/xmTaskWorkload.js +++ b/src/api/xm/core/xmTaskWorkload.js @@ -39,4 +39,7 @@ export const editXmTaskWorkloadSomeFields = params => { return axios.post(`${bas export const listProjectWorkloadSetDay = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listProjectWorkloadSetDay`, { params: params }); }; export const listProjectWorkloadSetMonth = params => { return axios.get(`${base}/xm/core/xmTaskWorkload/listProjectWorkloadSetMonth`, { params: params }); }; +export const batchSetSbillIdNull = params => { return axios.post(`${base}/xm/core/xmTaskWorkload/batchSetSbillIdNull`, params); }; + + diff --git a/src/views/xm/core/xmTask/XmTaskAdd.vue b/src/views/xm/core/xmTask/XmTaskAdd.vue index 51de9a79..01b3e1dd 100644 --- a/src/views/xm/core/xmTask/XmTaskAdd.vue +++ b/src/views/xm/core/xmTask/XmTaskAdd.vue @@ -407,6 +407,18 @@ addSubmit: function () { this.$refs.addForm.validate((valid) => { if (valid) { + if(this.addForm.oshare==='1'){ + if(this.addForm.shareFee>1000){ + this.$notify({position:'bottom-left',showClose:true,message:'分享佣金不能超过1000元',type: 'error'}) + return; + }else if( !this.addForm.budgetAt){ + this.$notify({position:'bottom-left',showClose:true,message:'请先设置预算金额',type: 'error'}) + return; + }else if(this.addForm.shareFee/this.addForm.budgetAt>0.05){ + this.$notify({position:'bottom-left',showClose:true,message:'分享佣金不能超过预算金额的5%',type: 'error'}) + return; + } + } this.$confirm('确认提交吗？', '提示', {}).then(() => { let params = Object.assign({}, this.addForm); if(this.budgetDateRanger.length>=2){ @@ -417,6 +429,8 @@ params.actStartTime=this.actDateRanger[0] params.actEndTime=this.actDateRanger[1] } + + addTask(params).then((res) => { this.load.add=false var tips=res.data.tips; diff --git a/src/views/xm/core/xmTask/XmTaskEdit.vue b/src/views/xm/core/xmTask/XmTaskEdit.vue index d8523615..f37f2d54 100644 --- a/src/views/xm/core/xmTask/XmTaskEdit.vue +++ b/src/views/xm/core/xmTask/XmTaskEdit.vue @@ -616,6 +616,21 @@ import XmMenuEdit from '../xmMenu/XmMenuEdit.vue'; }else if(fieldName==='dateRange'){ params.startTime=$event[0] params.endTime=$event[1] + }else if(fieldName==='shareFee'){ + if($event>1000){ + this.editForm.shareFee=this.xmTask.shareFee + this.$notify({position:'bottom-left',showClose:true,message:'分享佣金不能超过1000元',type: 'error'}) + return; + }else if(!this.editForm.budgetAt){ + this.editForm.shareFee=this.xmTask.shareFee + this.$notify({position:'bottom-left',showClose:true,message:'请先设置预算金额',type: 'error'}) + return; + }else if(this.editForm.shareFee/this.editForm.budgetAt>0.05){ + this.editForm.shareFee=this.xmTask.shareFee + this.$notify({position:'bottom-left',showClose:true,message:'分享佣金不能超过预算金额的5%',type: 'error'}) + return; + } + params.shareFee=$event }else{ params[fieldName]=$event } diff --git a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue index 4e97e1d1..62ef6d0a 100644 --- a/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue +++ b/src/views/xm/core/xmTaskSbill/XmTaskSbillEdit.vue @@ -1,43 +1,79 @@