From 6cdf4706f68ac08fe538ce1b91632bb3c25c9f69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 5 Mar 2022 01:22:59 +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/api/xm/core/xmProject.js | 4 + src/views/xm/core/xmProject/XmProjectAdd.vue | 73 ++++++++++++------- src/views/xm/core/xmProject/XmProjectEdit.vue | 9 ++- src/views/xm/core/xmProject/XmProjectMng.vue | 48 +++++++----- .../xm/core/xmProject/XmProjectTplMng.vue | 30 ++++++-- 5 files changed, 107 insertions(+), 57 deletions(-) diff --git a/src/api/xm/core/xmProject.js b/src/api/xm/core/xmProject.js index f1803769..7eb22673 100644 --- a/src/api/xm/core/xmProject.js +++ b/src/api/xm/core/xmProject.js @@ -38,3 +38,7 @@ export const editBudget = params => { return axios.post(`${base}/xm/core/xmProje export const copyTo = params => { return axios.post(`${base}/xm/core/xmProject/copyTo`, params); }; + + +export const createProjectCode = params => { return axios.post(`${base}/xm/core/xmProject/createProjectCode`, params); }; + diff --git a/src/views/xm/core/xmProject/XmProjectAdd.vue b/src/views/xm/core/xmProject/XmProjectAdd.vue index 82c7490c..d3932c3a 100644 --- a/src/views/xm/core/xmProject/XmProjectAdd.vue +++ b/src/views/xm/core/xmProject/XmProjectAdd.vue @@ -2,31 +2,44 @@
- - - - - - - - - - {{i.optionName}} - - - - - {{i.optionName}} - - - - - {{i.optionName}} - + + + + + + + + + + + + + + + + + + + + - - 严格控制预算 注：在项目->计划->任务 每个环节进行严格的预算控制 - + + + 总预算控制 + 项目计划总预算不能大于项目总预算 + + + 项目计划预算控制 + 下级计划总预算不能大于上级计划总预算；每条计划的预算金额必须大于其关联任务的预算合计。 + + + 实际金额控制 + 每条计划实际金额不能大于预算金额;每条计划的预算金额必须大于其关联的任务的实际金额合计。 + + + @@ -139,7 +152,7 @@ import {sn} from '@/common/js/sequence';//全局公共库 import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 - import { addXmProject } from '@/api/xm/core/xmProject'; + import { addXmProject,createProjectCode } from '@/api/xm/core/xmProject'; import { mapGetters } from 'vuex'; import { getGroups } from '@/api/xm/core/xmProjectGroup'; @@ -425,7 +438,15 @@ fillBudgetMarginRateToField:function(){ this.addForm.budgetMarginRate=this.toFixed(this.autoParams.budgetMarginRate,4) }, - + createProjectCode(){ + createProjectCode({}).then(res=>{ + var tips=res.data.tips; + if(tips.isOk){ + this.addForm.code=res.data.data + } + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + }) + } /**end 在上面加自定义方法**/ },//end method components: { diff --git a/src/views/xm/core/xmProject/XmProjectEdit.vue b/src/views/xm/core/xmProject/XmProjectEdit.vue index 8f072801..5d1c80ca 100644 --- a/src/views/xm/core/xmProject/XmProjectEdit.vue +++ b/src/views/xm/core/xmProject/XmProjectEdit.vue @@ -28,14 +28,15 @@ - 控制总预算  注：计划总预算不能大于项目总预算 + + 项目计划总预算不能大于项目总预算 - 计划明细预算控制  注：计划中下级总预算不能大于上级预算。计划明细预算大于任务预算汇总 + 项目计划中：下级计划总预算不能大于上级计划总预算；每条计划的预算金额必须大于其关联任务的预算合计。 - - 计划实际金额控制  注：计划中实际金额不能大于预算金额。任务实际金额不能大于计划预算金额 + + 项目计划中：每条计划实际金额不能大于预算金额;每条计划的预算金额必须大于其关联的任务的实际金额合计。 diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue index cff2768b..ad022a44 100644 --- a/src/views/xm/core/xmProject/XmProjectMng.vue +++ b/src/views/xm/core/xmProject/XmProjectMng.vue @@ -5,10 +5,11 @@ - - - - + + + + + 全部 我参与 我管理 @@ -30,6 +31,7 @@ 选项2 选项3 --> + 更多 - + @@ -213,8 +215,12 @@ - - + + + + 复制为新的模板 @@ -223,7 +229,8 @@ 拷贝计划 拷贝任务 - 拷贝项目组成员 + 拷贝项目组织架构 + 拷贝项目组成员 @@ -248,7 +255,7 @@ //import Sticky from '@/components/Sticky' // 粘性header组件 import config from "@/common/config"; //全局公共库 //import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询 - import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo } from '@/api/xm/core/xmProject'; + import { listXmProject, editStatus, delXmProject, batchDelXmProject,copyTo,createProjectCode } from '@/api/xm/core/xmProject'; import { addXmMyFocus , delXmMyFocus } from '@/api/xm/core/xmMyFocus'; import XmProjectAdd from './XmProjectAdd';//新增界面 import XmProjectEdit from './XmProjectEdit';//修改界面 @@ -336,10 +343,10 @@ dateRanger: [ ], pickerOptions: util.pickerOptions('datarange'), xmProjectCopy:{ - id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGrup:'0' + id:'',name:'',code:'',isTpl:'',copyPhase:'1',copyTask:'1',copyGroup:'1',copyGroupUser:'0' }, copyToVisible:false, - templateVisible:false, + templateVisible:true, /**end 自定义属性请在上面加 请加备注**/ } },//end data @@ -411,13 +418,7 @@ console.log(res.data); this.pageInfo.total = res.data.total; this.pageInfo.count=false; - this.xmProjects = res.data.data; - - if(this.xmProjects==null || this.xmProjects.length==0){ - this.templateVisible=true - }else{ - this.templateVisible=false; - } + this.xmProjects = res.data.data; }else{ this.$notify({showClose: true, message: tips.msg, type: 'error' }); } @@ -725,7 +726,16 @@ this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); }) - }, + }, + createProjectCode(){ + createProjectCode({}).then(res=>{ + var tips=res.data.tips; + if(tips.isOk){ + this.xmProjectCopy.code=res.data.data + } + this.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); + }) + } /**end 自定义函数请在上面加**/ },//end methods diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue index 14925ce7..583f7295 100644 --- a/src/views/xm/core/xmProject/XmProjectTplMng.vue +++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue @@ -7,7 +7,7 @@ - 我的模板 + 我的模板 通过复制快速创建新的项目 @@ -26,8 +26,8 @@ -