From ede031380dd6369d727370e503eda5636e631039 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 10 Jul 2022 17:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/xmProject/XmProjectDetail.vue | 6 +++- src/views/xm/core/xmProject/XmProjectEdit.vue | 18 +++++++--- src/views/xm/core/xmProject/XmProjectInfo.vue | 33 +++++++++---------- .../xm/core/xmProject/XmProjectInfoRoute.vue | 7 +++- .../xmProject/XmProjectOverviewComplex.vue | 9 +++-- 5 files changed, 47 insertions(+), 26 deletions(-) diff --git a/src/views/xm/core/xmProject/XmProjectDetail.vue b/src/views/xm/core/xmProject/XmProjectDetail.vue index b076c94d..31c0aeb6 100644 --- a/src/views/xm/core/xmProject/XmProjectDetail.vue +++ b/src/views/xm/core/xmProject/XmProjectDetail.vue @@ -1,7 +1,7 @@ @@ -34,6 +34,10 @@ this.editFormVisible=true; this.$emit("submit",params); }, + onEditFields(row){ + Object.assign(this.selProject,row) + this.$emit("edit-fields",row); + } /**end 自定义函数请在上面加**/ },//end methods components: { diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index 0f38fe07..e389605c 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -69,6 +69,11 @@ + + + + + @@ -80,7 +85,10 @@ 项目计划总预算大于项目总预算后将无法添加新的计划任务，进行项目预算变更后方可继续添加计划任务。 - 总预算超出   元将进入预警清单 + 总预算超出   元将进入预警清单 + + + 预算金额超出   元的任务将被禁止保存 每条计划实际金额不能大于预算金额; 任务的实际金额合计不能大于与任务关联的上级计划的预算。 @@ -468,10 +476,10 @@ }, //编辑界面数据 XmProject xm_project editForm: { - id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:6,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',workType:'',wtype:'',earlyAmt:0,budgetEarly:'0',phaseActCtrl:'0' + id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:6,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',workType:'',wtype:'',earlyAmt:0,budgetEarly:'0',phaseActCtrl:'0',maxTaskAmt:0, }, editFormBak: { - id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:6,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',workType:'',wtype:'',earlyAmt:0,budgetEarly:'0',phaseActCtrl:'0' + id:'',code:'',name:'',xmType:'',startTime:'',endTime:'',urgent:'',priority:'',description:'',createUserid:'',createUsername:'',createTime:'',assess:'',assessRemarks:'',status:'',branchId:'',planTotalCost:0,bizProcInstId:'',bizFlowState:'',taxRate:6,planNouserAt:0,planIuserAt:0,planOuserAt:0,locked:'',baseTime:'',baseRemark:'',baselineId:'',planWorkload:0,totalReceivables:0,budgetMarginRate:13,contractAmt:0,planIuserPrice:85,planOuserPrice:100,planOuserCnt:1,planIuserCnt:1,planWorkingHours:0,planIuserWorkload:0,planOuserWorkload:0,budgetCtrl:'0',admUserid:'',admUsername:'',pmUserid:'',pmUsername:'',assUserid:'',assUsername:'',workType:'',wtype:'',earlyAmt:0,budgetEarly:'0',phaseActCtrl:'0',maxTaskAmt:0, }, /**begin 在下面加自定义属性,记得补上面的一个逗号**/ xmGroups:[], @@ -842,8 +850,10 @@ editXmProjectSomeFields(params).then(res=>{ var tips = res.data.tips; if(tips.isOk){ - this.$emit('edit-fields',params) + Object.assign(row,params) + Object.assign(this.selProject,row) + this.$emit('edit-fields',row) this.editFormBak=Object.assign({},row) }else{ Object.assign(this.editForm,this.editFormBak) diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue index ad6bf836..919741e1 100644 --- a/src/views/xm/core/xmProject/XmProjectInfo.vue +++ b/src/views/xm/core/xmProject/XmProjectInfo.vue @@ -168,7 +168,7 @@ 需求管理 - 项目立项 + 设为立项中 需求管理 @@ -180,7 +180,7 @@ 创建团队 创建计划 预算管理 - 进入实施 + 立项申请 合同管理 @@ -228,7 +228,7 @@ 财务结算 - 转入售后 + 转入售后 财务结算 @@ -257,6 +257,7 @@ v-if="infotype == '项目概览'" :sel-project="selProject" @submit="afterEditSubmit" + @edit-fields="onEditFields" > - - + > 0){ - this.$router.back(); - }else{ - this.$router.push({path:'/xm/core/xmProject/XmProjectMng'}) - } + if(this.historyLength>0){ + this.$router.back(); + }else{ + this.$router.push({path:'/xm/core/xmProject/XmProjectMng'}) + } }, + + onEditFields(row){ + Object.assign(this.selProject,row) + this.$emit("edit-fields",row); + } }, //end methods components: { xmTaskMng, diff --git a/src/views/xm/core/xmProject/XmProjectInfoRoute.vue b/src/views/xm/core/xmProject/XmProjectInfoRoute.vue index b9760a5c..a6831697 100644 --- a/src/views/xm/core/xmProject/XmProjectInfoRoute.vue +++ b/src/views/xm/core/xmProject/XmProjectInfoRoute.vue @@ -1,6 +1,6 @@ @@ -60,6 +60,11 @@ } }) + }, + onEditFields(row){ + Object.assign(this.selProject,row) + this.$emit('edit-fields',row) + localStorage.setItem("xm-project-info-route",JSON.stringify(row)) } diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue index b94bc5ad..2b762a1b 100644 --- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue @@ -23,7 +23,7 @@ - + @@ -113,7 +113,12 @@ export default { this.afterEditSubmit(selProject) } }) - } + }, + + onEditFields(row){ + Object.assign(this.selProject,row) + this.$emit("edit-fields",row); + } }, mounted() {