From 59d3d0c91c365009cd4f113683bfc2030a1fa017 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Sat, 16 Jul 2022 22:26:34 +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/xmMyFocus.js | 2 +- src/views/layout/components/UserInfo.vue | 4 ++-- src/views/mdp/menu/menuDef/MenuDefImport.vue | 6 +++--- src/views/myWork/my/components/MyFocusList.vue | 6 +++--- .../xm/core/components/XmIterationSelect.vue | 4 ++-- .../xm/core/components/XmProductSelect.vue | 2 +- .../xm/core/components/XmProjectSelect.vue | 2 +- .../xmIteration/XmIterationForLinkComplex.vue | 6 ++++-- .../core/xmIteration/XmIterationOverview.vue | 2 +- .../xmIteration/XmIterationOverviewComplex.vue | 14 ++++++++++++-- .../xmProduct/XmProductOverviewComplex.vue | 18 +++++++++++++++++- .../xmProject/XmProjectOverviewComplex.vue | 7 +++++++ 12 files changed, 54 insertions(+), 19 deletions(-) diff --git a/src/api/xm/core/xmMyFocus.js b/src/api/xm/core/xmMyFocus.js index 1590a358..63b3010b 100644 --- a/src/api/xm/core/xmMyFocus.js +++ b/src/api/xm/core/xmMyFocus.js @@ -29,7 +29,7 @@ export const editXmMyFocus = params => { return axios.post(`${base}/xm/core/xmMy //新增一条我关注的项目或者任务 export const addXmMyFocus = params => { - debugger; + localStorage.removeItem('xm-my-focus-list') return axios.post(`${base}/xm/core/xmMyFocus/add`, params); }; diff --git a/src/views/layout/components/UserInfo.vue b/src/views/layout/components/UserInfo.vue index d6d0dae5..fc751590 100644 --- a/src/views/layout/components/UserInfo.vue +++ b/src/views/layout/components/UserInfo.vue @@ -245,7 +245,7 @@ export default { }, toLogin(user) { - debugger; + this.$prompt('请输入密码', '提示', { confirmButtonText: '确定', cancelButtonText: '取消', @@ -256,7 +256,7 @@ export default { authType:'password_display_userid' , grantType:"password" } - debugger; + //userloginid, password,grantType,authType,deptid,userid switchUser(params.userloginid,params.password,params.grantType,params.authType,'',params.userloginid).then(res => { this.phonenoUsersVisible=false; diff --git a/src/views/mdp/menu/menuDef/MenuDefImport.vue b/src/views/mdp/menu/menuDef/MenuDefImport.vue index 4621f0c0..f90a2e4d 100644 --- a/src/views/mdp/menu/menuDef/MenuDefImport.vue +++ b/src/views/mdp/menu/menuDef/MenuDefImport.vue @@ -59,7 +59,7 @@ computed: { 'routersTreeData': function(){ - debugger; + var routers=this.permission_routers.filter(i=>i.meta&&i.meta.title&&!i.hidden); routers.forEach((i,index)=>{ i.rpath=i.path @@ -75,7 +75,7 @@ this.routersTreeDataFill(i.children,i) }) - debugger; + return routers; }, ...mapGetters([ @@ -136,7 +136,7 @@ this.jsonRouters=eval('(' + this.jsonRoutersText + ')'); }, batchImportMenus(){ - debugger; + let routers=this.jsonRouters; if(this.importType=='1'){ try{ diff --git a/src/views/myWork/my/components/MyFocusList.vue b/src/views/myWork/my/components/MyFocusList.vue index 3b6a0b9a..dc06d692 100644 --- a/src/views/myWork/my/components/MyFocusList.vue +++ b/src/views/myWork/my/components/MyFocusList.vue @@ -171,7 +171,7 @@ export default { }, //获取列表 UserFocus 我关注的项目或者任务 getUserFocuss() { - debugger; + let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, @@ -191,7 +191,7 @@ export default { this.load.list = true; myFocusForIndex(params).then((res) => { - debugger; + var tips=res.data.tips; if(tips.isOk){ this.pageInfo.total = res.data.total; @@ -312,7 +312,7 @@ export default { initDicts(this); this.initData() var myFocusList=localStorage.getItem('mdp-sys-user-focus-list') - debugger; + if(myFocusList){ this.userFocuss=JSON.parse(myFocusList) }else{ diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue index e96af793..4b0ad899 100644 --- a/src/views/xm/core/components/XmIterationSelect.vue +++ b/src/views/xm/core/components/XmIterationSelect.vue @@ -376,8 +376,8 @@ }, reloadOne(){ listXmIterationWithState({id:this.editForm.id}).then((res) => { - var tips = res.data.tips; - if(tips.isOk && rea.data.data && res.data.data.length>0){ + var tips = res.data.tips; + if(tips.isOk && res.data.data && res.data.data.length>0){ Object.assign(this.editForm,res.data.data[0]) this.rowClick(this.editForm) } diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue index 4370d99b..3cfa0ad7 100644 --- a/src/views/xm/core/components/XmProductSelect.vue +++ b/src/views/xm/core/components/XmProductSelect.vue @@ -502,7 +502,7 @@ export default { reloadOne() { listXmProductWithState({ id: this.editForm.id }).then((res) => { var tips = res.data.tips; - if (tips.isOk && rea.data.data && res.data.data.length > 0) { + if (tips.isOk && res.data.data && res.data.data.length > 0) { Object.assign(this.editForm, res.data.data[0]); this.rowClick(this.editForm); } diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue index bbc0ddbd..68b993a5 100644 --- a/src/views/xm/core/components/XmProjectSelect.vue +++ b/src/views/xm/core/components/XmProjectSelect.vue @@ -516,7 +516,7 @@ export default { reloadOne() { listXmProject({ id: this.editForm.id }).then((res) => { var tips = res.data.tips; - if (tips.isOk && rea.data.data && res.data.data.length > 0) { + if (tips.isOk && res.data.data && res.data.data.length > 0) { Object.assign(this.editForm, res.data.data[0]); this.rowClick(this.editForm); } diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue index 775c7559..4ec10ac1 100644 --- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue @@ -407,8 +407,10 @@ /**end 自定义函数请在上面加**/ onIterationRowClick(iteration){ - - this.xmIteration=iteration + + this.$nextTick(()=>{ + this.xmIteration=iteration + }) }, onIterationClearSelect(){ diff --git a/src/views/xm/core/xmIteration/XmIterationOverview.vue b/src/views/xm/core/xmIteration/XmIterationOverview.vue index c1289f1f..e5b6a2aa 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverview.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverview.vue @@ -284,7 +284,7 @@ export default { return 100; } }, - xmIterationCpd(){ + xmIterationCpd(){ return this.xmIteration; }, calcXmIterationPstatusStep(){ diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue index 64e74953..324d0077 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue @@ -49,9 +49,9 @@ import util from "@/common/js/util"; // 全局公共库 import { mapGetters } from "vuex"; import XmIterationOverview from './XmIterationOverview.vue'; import XmIterationEdit from './XmIterationEdit.vue'; -import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue'; +import XmIterationMenuMng from '../xmIterationMenu/XmIterationMenuMng.vue'; import { loadTasksToXmIterationState } from '@/api/xm/core/xmIterationState'; - +import { listXmIterationWithState } from "@/api/xm/core/xmIteration"; export default { components: {XmIterationOverview,XmIterationEdit, XmIterationMenuMng }, @@ -75,6 +75,16 @@ export default { loadTasksToXmIterationState({id:this.xmIteration.id}).then(res=>{ this.load.edit=false; var tips =res.data.tips; + if(tips.isOk){ + listXmIterationWithState({id:this.xmIteration.id}).then(res2=>{ + var tips2=res2.data.tips; + if(tips2.isOk && res2.data.data.length>0){ + var data=res2.data.data[0] + Object.assign(this.xmIteration,data); + this.$emit('edit-fields',data) + } + }) + } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }); }, diff --git a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue index 066a8ab0..6f9825a8 100644 --- a/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductOverviewComplex.vue @@ -56,7 +56,7 @@ import { mapGetters } from "vuex"; import XmProductOverview from './XmProductOverview.vue'; import XmProductEdit from './XmProductEdit.vue'; import XmProductProjectLinkMng from '../xmProductProjectLink/XmProductProjectLinkMng.vue'; -import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState'; +import { loadTasksToXmProductState,listXmProductWithState } from '@/api/xm/core/xmProductState'; import { loadTasksToXmMenuState} from '@/api/xm/core/xmMenuState'; import TaskMng from '@/views/mdp/workflow/ru/task/TaskMng'; import ProcinstMng from '@/views//mdp/workflow/hi/procinst/ProcinstMng'; @@ -84,10 +84,26 @@ export default { loadTasksToXmProductState(params).then((res) => { this.load.calcProduct=false; var tips=res.data.tips; + if(tips.isOk){ + this.getProduct(this.xmProduct.id) + } this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error' }); }).catch( err => this.load.calcProduct=false ); }, + getProduct(id){ + listXmProductWithState({id:id}).then(res=>{ + var tips = res.data.tips; + if(tips.isOk){ + Object.assign(this.xmProduct,res.data.data[0]) + localStorage.setItem("xm-product-info-route",JSON.stringify(this.xmProduct)) + this.$emit('edit-fields',this.xmProduct) + this.showInfo=true; + }else{ + + } + }) + }, loadTasksToXmMenuState: function () { this.load.calcMenu=true; diff --git a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue index ee1ed5bf..66fc7523 100644 --- a/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue +++ b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue @@ -90,6 +90,13 @@ export default { loadTasksToXmProjectState(params).then((res) => { this.load.calcProject=false; var tips=res.data.tips; + listXmProject({id:this.selProject.id}).then(res=>{ + var tips = res.data.tips; + if(tips.isOk){ + var selProject=res.data.data[0] + this.onEditFields(selProject) + } + }) this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: tips.isOk?'success':'error'}); }).catch( err => this.load.calcProject=false ); },