From 975fbb243dbbcfb5ac30288f8df151094c641f93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sun, 15 Jan 2023 16:48:15 +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 --- src/router/routes_xm.js | 5 +- .../core/xmContract/XmContractForProject.vue | 41 +++++++++++++ src/views/xm/core/xmEnvList/XmEnvListMng.vue | 11 ++-- .../xm/core/xmProject/XmProjectBudgetCost.vue | 61 +++++++++---------- src/views/xm/core/xmProject/XmProjectCost.vue | 19 +++--- 5 files changed, 88 insertions(+), 49 deletions(-) create mode 100644 src/views/xm/core/xmContract/XmContractForProject.vue diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 7b89329d..cf5d8ea8 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -36,7 +36,8 @@ export default { meta: { title: '项目管理', icon: 'project' - }, + }, + hidden:true, // leaf: true,//只有一个节点 children: [ { @@ -140,7 +141,7 @@ export default { }, { path: 'contract', - component: _import('xm/core/xmContract/XmContractMng'), + component: _import('xm/core/xmContract/XmContractForProject'), name: 'projectContract', iconCls: 'fa el-icon-menu', meta: { diff --git a/src/views/xm/core/xmContract/XmContractForProject.vue b/src/views/xm/core/xmContract/XmContractForProject.vue new file mode 100644 index 00000000..71c8e494 --- /dev/null +++ b/src/views/xm/core/xmContract/XmContractForProject.vue @@ -0,0 +1,41 @@ + + + + + \ No newline at end of file diff --git a/src/views/xm/core/xmEnvList/XmEnvListMng.vue b/src/views/xm/core/xmEnvList/XmEnvListMng.vue index 3fe4a691..32420eb4 100644 --- a/src/views/xm/core/xmEnvList/XmEnvListMng.vue +++ b/src/views/xm/core/xmEnvList/XmEnvListMng.vue @@ -43,7 +43,7 @@ - + @@ -61,10 +61,9 @@ export default { computed: { ...mapGetters([ - 'userInfo','roles' + 'userInfo','roles','projectInfo','xmProduct' ]) - }, - props:['selProject','xmProduct'], + }, data() { return { filters: { @@ -160,8 +159,8 @@ params.fuzzy = '%'+this.filters.key+'%'; //params.xxx=this.filters.key } - if(this.selProject && this.selProject.id){ - params.projectId=this.selProject.id + if(this.projectInfo && this.projectInfo.id){ + params.projectId=this.projectInfo.id } if(this.xmProduct && this.xmProduct.id){ diff --git a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue index 6830e132..9e5c3cda 100644 --- a/src/views/xm/core/xmProject/XmProjectBudgetCost.vue +++ b/src/views/xm/core/xmProject/XmProjectBudgetCost.vue @@ -6,10 +6,10 @@ - 项目总预算： {{selProjectBudget.planTotalCost}} - 非人力总预算：{{selProjectBudget.planNouserAt}} - 内部人力总预算：{{selProjectBudget.planIuserAt}} - 外购人力总预算：{{selProjectBudget.planOuserAt}} + 项目总预算： {{projectInfoBudget.planTotalCost}} + 非人力总预算：{{projectInfoBudget.planNouserAt}} + 内部人力总预算：{{projectInfoBudget.planIuserAt}} + 外购人力总预算：{{projectInfoBudget.planOuserAt}}
@@ -88,14 +88,14 @@
- - + +
- + - + @@ -112,11 +112,10 @@ import xmBudgetLabor from '../xmBudgetLabor/XmBudgetLaborMng'; import xmBudgetNlabor from '../xmBudgetNlabor/XmBudgetNlaborMng'; - export default { - props: ["selProject"], + export default { computed: { ...mapGetters([ - 'userInfo','roles' + 'userInfo','roles','projectInfo' ]), selYearMonths:function(){ var selYear=this.selYear; @@ -187,8 +186,8 @@ this.listSumXmBudgetNlabor(); } }, - 'selProject': function(selProject){ - this.selProjectBudget=Object.assign({},this.selProject); + 'projectInfo': function(projectInfo){ + this.projectInfoBudget=Object.assign({},this.projectInfo); } }, data() { @@ -206,7 +205,7 @@ showType: "", xmBudgetLabors: [], xmBudgetNlabors: [], - selProjectBudget:{}, + projectInfoBudget:{}, sumXmBudgetLabors:[], xmBudgetLabor:null, fieldName:'', @@ -227,7 +226,7 @@ listSumXmBudgetLabor:function(){ var parmas={ - projectId:this.selProject.id, + projectId:this.projectInfo.id, } listSumXmBudgetLabor(parmas).then(res=>{ this.sumXmBudgetLabors=res.data.data; @@ -236,7 +235,7 @@ listSumXmBudgetNlabor:function(){ var parmas={ - projectId:this.selProject.id, + projectId:this.projectInfo.id, } listSumXmBudgetNlabor(parmas).then(res=>{ this.sumXmBudgetNlabors=res.data.data; @@ -256,38 +255,38 @@ }, /**begin 自定义函数请在下面加**/ // inputChange() { - // this.selProject.planTotalCost = this.selProject.planTotalCost.replace(/[^\d.]/g,"").replace(/^\./g,"").replace(/\.{1,}/g,"."); + // this.projectInfo.planTotalCost = this.projectInfo.planTotalCost.replace(/[^\d.]/g,"").replace(/^\./g,"").replace(/\.{1,}/g,"."); // }, updateBudget() { - if(this.selProject.planTotalCost==undefined){ + if(this.projectInfo.planTotalCost==undefined){ this.$notify({position:'bottom-left',showClose:true,message:"不允许修改", type: 'success'}); return; } - var planTotalCost=this.getFloatValue(this.selProjectBudget.planTotalCost) - var planIuserAt=this.getFloatValue(this.selProjectBudget.planIuserAt) - var planOuserAt=this.getFloatValue(this.selProjectBudget.planOuserAt) - var planNouserAt=this.getFloatValue(this.selProjectBudget.planNouserAt) - this.selProjectBudget.planTotalCost=planIuserAt+planOuserAt+planNouserAt + var planTotalCost=this.getFloatValue(this.projectInfoBudget.planTotalCost) + var planIuserAt=this.getFloatValue(this.projectInfoBudget.planIuserAt) + var planOuserAt=this.getFloatValue(this.projectInfoBudget.planOuserAt) + var planNouserAt=this.getFloatValue(this.projectInfoBudget.planNouserAt) + this.projectInfoBudget.planTotalCost=planIuserAt+planOuserAt+planNouserAt this.$confirm('确定修改项目总预算吗?', '提示', { type: 'warning' }).then(() => { this.load.edit = true; - let params = this.selProjectBudget + let params = this.projectInfoBudget editBudget(params).then((res) => { var tips=res.data.tips; if(tips.isOk){ - this.selProject.planTotalCost=this.selProjectBudget.planTotalCost - this.selProject.planIuserAt=this.selProjectBudget.planIuserAt - this.selProject.planOuserAt=this.selProjectBudget.planOuserAt - this.selProject.planNouserAt=this.selProjectBudget.planNouserAt + this.projectInfo.planTotalCost=this.projectInfoBudget.planTotalCost + this.projectInfo.planIuserAt=this.projectInfoBudget.planIuserAt + this.projectInfo.planOuserAt=this.projectInfoBudget.planOuserAt + this.projectInfo.planNouserAt=this.projectInfoBudget.planNouserAt }else{ - this.selProjectBudget=Object.assign({},this.selProject) + this.projectInfoBudget=Object.assign({},this.projectInfo) } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); this.load.edit = false; }).catch( err => this.load.edut = false ); }).catch(() => { - this.selProjectBudget=Object.assign({},this.selProject) + this.projectInfoBudget=Object.assign({},this.projectInfo) }); }, @@ -309,7 +308,7 @@ this.$nextTick(() => { this.tableHeight = util.calcTableMaxHeight(this.$refs.table.$el); }); - this.selProjectBudget=Object.assign({},this.selProject); + this.projectInfoBudget=Object.assign({},this.projectInfo); } } diff --git a/src/views/xm/core/xmProject/XmProjectCost.vue b/src/views/xm/core/xmProject/XmProjectCost.vue index 8004d5c3..bf3a46c9 100644 --- a/src/views/xm/core/xmProject/XmProjectCost.vue +++ b/src/views/xm/core/xmProject/XmProjectCost.vue @@ -87,14 +87,14 @@
- - + +
- + @@ -110,11 +110,10 @@ import xmCostLabor from '../xmTaskSbillDetail/XmTaskSbillDetailMng'; import xmCostNlabor from '../xmCostNlabor/XmCostNlaborMng'; - export default { - props: ["selProject"], + export default { computed: { ...mapGetters([ - 'laborInfo','roles' + 'laborInfo','roles','projectInfo' ]), selYearMonths:function(){ var selYear=this.selYear; @@ -185,7 +184,7 @@ this.listSumXmCostNlabor(); } }, - 'selProject': function(selProject){ + 'projectInfo': function(projectInfo){ }, 'selYear':function(){ @@ -233,8 +232,8 @@ var params={ bizYear:this.selYear, } - if(this.selProject){ - params.projectId=this.selProject.id + if(this.projectInfo){ + params.projectId=this.projectInfo.id } var func=listSumSamtGroupByUseridBizMonth if(this.rptType==='1'){ @@ -254,7 +253,7 @@ listSumXmCostNlabor:function(){ var parmas={ - projectId:this.selProject.id, + projectId:this.projectInfo.id, } listSumXmCostNlabor(parmas).then(res=>{ if(res.data.tips.isOk){