diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index d9f4fc3d..0bc59f8e 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -10,7 +10,7 @@ - +
@@ -45,7 +45,7 @@ :default-time="['00:00:00','23:59:59']" :picker-options="pickerOptions" > - 参考工时{{autoParams.planWorkingHours}}小时,工作日{{autoParams.weekday}}天 填充工时 + 参考工时{{autoParams.weekday*8}}小时,工作日{{autoParams.weekday}}天 @@ -88,28 +88,25 @@ - 内购： 参考{{this.toFixed(autoParams.planInnerUserAt)}}元，{{this.toFixed(autoParams.planInnerUserAt/10000)}}万元 - 外购： 参考{{this.toFixed(autoParams.planOutUserAt)}}元，{{this.toFixed(autoParams.planOutUserAt/10000)}}万元 - 非人力： 参考{{this.toFixed(autoParams.planNouserAt)}}元，{{this.toFixed( autoParams.planNouserAt/10000)}}万元 + 内购： {{this.toFixed(autoParams.planInnerUserAt/10000)}}万元 + 外购： {{this.toFixed(autoParams.planOutUserAt/10000)}}万元 + 非人力： {{this.toFixed( autoParams.planNouserAt/10000)}}万元 - 合计： 参考{{this.toFixed(autoParams.planTotalCost)}}元，{{this.toFixed(autoParams.planTotalCost/10000)}}万元 - 填充 - + 合计： {{this.toFixed(autoParams.planTotalCost/10000)}}万元 + - 预计收款总额： 参考{{this.toFixed(autoParams.totalReceivables)}}元，{{this.toFixed(autoParams.totalReceivables/10000)}}万元 - 合同总金额 ： 参考{{this.toFixed(autoParams.contractAmt)}}元，{{this.toFixed(autoParams.contractAmt/10000)}}万元 - 填充 - + 预计收款总额： {{this.toFixed(autoParams.totalReceivables/10000)}}万元 + 合同总金额 ： {{this.toFixed(autoParams.contractAmt/10000)}}万元 + 税率： 考核标准毛利率： 当前毛利率为：{{toFixed(parseFloat2(autoParams.currentBudgetMarginRate)*100,2)}}% - 填充 - + @@ -117,16 +114,16 @@
- - 提交 - 基本信息修改申请 - 延期申请 - 立项申请 - 结项申请 - 预算变更申请 - 项目暂停申请 - 项目重新启动申请 - + + 提交 + 基本信息修改申请 + 延期申请 + 立项申请 + 结项申请 + 预算变更申请 + 项目暂停申请 + 项目重新启动申请 + @@ -258,7 +255,7 @@ }else{ return 0; } - } + }, }, props:['selProject','visible'], watch: { @@ -277,6 +274,55 @@ }, 'totalReceivables':function(){ //this.editForm.budgetMarginRate=this.toFixed((this.editForm.totalReceivables-this.editForm.planTotalCost)/this.editForm.totalReceivables,4) + }, + autoParams(){ + this.fillPlanWorkingHoursToField() + this.fillPlanCostAtToField(); + this.fillTotalReceivablesToField(); + this.fillBudgetMarginRateToField() + }, + + editForm:{ + handler(newValue, oldValue) { + this.$notify.closeAll(); + this.changeTips=[]; + if(this.selProject.planWorkingHours!=this.editForm.planWorkingHours){ + var distance=this.selProject.planWorkingHours-this.editForm.planWorkingHours + var operType=distance>0?"-":"+"; + this.changeTips.push("预计总工期: "+ this.selProject.planWorkingHours+" > " +this.editForm.planWorkingHours+"   "+operType+Math.abs(distance)+"小时"); + } + if(this.selProject.planTotalCost!=this.editForm.planTotalCost){ + var distance=this.selProject.planTotalCost-this.editForm.planTotalCost + var operType=distance>0?"-":"+"; + this.changeTips.push("预计总成本: "+ this.selProject.planTotalCost+" > " +this.editForm.planTotalCost+"   "+operType+Math.abs(distance)+"元"); + } + if(this.selProject.budgetMarginRate!=this.editForm.budgetMarginRate){ + var distance=this.selProject.budgetMarginRate-this.editForm.budgetMarginRate + var operType=distance>0?"-":"+"; + this.changeTips.push("毛利率: "+ this.selProject.budgetMarginRate+" > " +this.editForm.budgetMarginRate+"   "+operType+Math.abs(distance)+"%"); + } + if(this.selProject.totalReceivables!=this.editForm.totalReceivables){ + var distance=this.selProject.totalReceivables-this.editForm.totalReceivables + var operType=distance>0?"-":"+"; + this.changeTips.push("预计总收款: "+ this.selProject.totalReceivables+" > " +this.editForm.totalReceivables+"   "+operType+Math.abs(distance)+"元"); + } + if(this.selProject.contractAmt!=this.editForm.contractAmt){ + var distance=this.selProject.contractAmt-this.editForm.contractAmt + var operType=distance>0?"-":"+"; + this.changeTips.push("合同金额: "+ this.selProject.contractAmt+" > " +this.editForm.contractAmt+"   "+operType+Math.abs(distance)+"元"); + } + + if(this.changeTips.length==0){ + return; + } + 　　　　　　this.$notify({ + title: '修改过的数据', + dangerouslyUseHTMLString: true, + message: ''+this.changeTips.join("
"), + duration: 0 + }); + 　　　　}, + 　　　　deep: true } }, data() { @@ -326,6 +372,7 @@ ], pickerOptions: util.pickerOptions('datarange'), activateName:'planWorkload', + changeTips:[],//变化日志列表 /**end 在上面加自定义属性**/ }//end return },//end data diff --git a/src/views/xm/core/xmProject/XmProjectOveriewComplex.vue b/src/views/xm/core/xmProject/XmProjectOveriewComplex.vue index 974a6b14..7b5cc2f1 100644 --- a/src/views/xm/core/xmProject/XmProjectOveriewComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectOveriewComplex.vue @@ -61,10 +61,10 @@ - + 迭代计划评审 - + 迭代上线申请 diff --git a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue index 3dd6cedf..bc3e71b9 100644 --- a/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue +++ b/src/views/xm/core/xmProjectPhase/XmProjectPhaseAdd.vue @@ -1,5 +1,5 @@