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/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index b0ca10cd..64ab86a7 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -99,7 +99,7 @@
{{p.name}}
-
{{p.code}} {{formatProjectStatus(p.status)}} +
{{p.code}} {{formatProjectStatus(dicts,'projectStatus',p.status)}} 删除 复制 统计 @@ -203,13 +203,7 @@ @@ -414,6 +408,7 @@ } },//end data methods: { + ...util, handleSizeChange(pageSize) { this.pageInfo.pageSize=pageSize; this.getXmProjects(); @@ -873,7 +868,7 @@ this.filters.productName=this.$route.params.productName; } this.$nextTick(() => { - initSimpleDicts('all',['projectType','priority','projectStatus']).then(res=>{ + initSimpleDicts('all',['projectType','priority','projectStatus','bizFlowState']).then(res=>{ this.dicts=res.data.data; }) this.maxTableHeight = this.source == 'GZT' ? this.maxTableHeight : util.calcTableMaxHeight(this.$refs.table.$el); 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 @@