From 1b30167ef53467cd4690dcce681cd71c1043775b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Wed, 1 Feb 2023 01:23:14 +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/styles/mdp.scss | 12 ++ .../xm/core/components/XmIterationSelect.vue | 37 +++- .../xm/core/components/XmProductSelect.vue | 52 ++++-- .../xm/core/components/XmProjectSelect.vue | 37 ++-- src/views/xm/core/xmMenu/XmEpicFeatures.vue | 174 ++++++++++-------- .../xm/core/xmMenu/XmEpicFeaturesSelect.vue | 17 +- src/views/xm/core/xmMenu/XmMenuBox.vue | 22 +-- src/views/xm/core/xmMenu/XmMenuMng.vue | 37 ++-- .../xmProduct/XmProductForLinkComplex.vue | 49 +++-- 9 files changed, 263 insertions(+), 174 deletions(-) diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss index b089a295..72c7d0f2 100644 --- a/src/styles/mdp.scss +++ b/src/styles/mdp.scss @@ -284,6 +284,18 @@ table tr.hover-row{ .cell-text{ display:none; } +} +.lg-text{ + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + max-width:250px; +} +.sm-text{ + text-overflow: ellipsis; + overflow: hidden; + white-space: nowrap; + max-width:200px; } /** *解决表格固定列无法滚动问题 diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue index e07cec69..5a52940e 100644 --- a/src/views/xm/core/components/XmIterationSelect.vue +++ b/src/views/xm/core/components/XmIterationSelect.vue @@ -1,6 +1,6 @@ - + - + + + - @@ -175,6 +189,9 @@ xmMenusTreeData() { let xmMenus = JSON.parse(JSON.stringify(this.xmMenus || [])); + if(this.filters.key){ + xmMenus=xmMenus.filter(k=>k.menuName.indexOf(this.filters.key)>=0) + } let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId"); return xmMenusTreeData; }, @@ -209,8 +226,8 @@ xmMenus: [],//查询结果 pageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 - pageSize:100,//每页数据 - count:true,//是否需要重新计算总记录数 + pageSize:500,//每页数据 + count:false,//是否需要重新计算总记录数 pageNum:1,//当前页码、从1开始计算 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] @@ -522,6 +539,7 @@ }); }, unselectRow(){ + this.$refs.table.clearSelection() this.editForm=null; this.$emit('row-click',null) this.$refs.table.setCurrentRow(); diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue index 117a2f9a..b6ca5c59 100644 --- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue +++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue @@ -78,8 +78,7 @@ let xmMenusTreeData = treeTool.translateDataToTree(xmMenus,"pmenuId","menuId"); return xmMenusTreeData; }, - toSearchCpd(){ - debugger; + toSearchCpd(){ var key={iterationId:'',projectId:'',productId:''}; if(this.xmIteration&&this.xmIteration.id){ key.iterationId=this.xmIteration.id @@ -137,8 +136,8 @@ xmMenus: [],//查询结果 pageInfo:{//分页数据 total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。 - pageSize:100,//每页数据 - count:true,//是否需要重新计算总记录数 + pageSize:500,//每页数据 + count:false,//是否需要重新计算总记录数 pageNum:1,//当前页码、从1开始计算 orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段 orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc'] @@ -202,7 +201,7 @@ this.getXmMenus(); }, searchXmMenus(){ - this.pageInfo.count=true; + //this.pageInfo.count=true; this.getXmMenus(); }, getParams(params){ @@ -291,10 +290,10 @@ //获取列表 XmMenu xm_project_menu getXmMenus() { let params = { - pageSize: this.pageInfo.pageSize, - pageNum: this.pageInfo.pageNum, - total: this.pageInfo.total, - count:this.pageInfo.count + //pageSize: this.pageInfo.pageSize, + //pageNum: this.pageInfo.pageNum, + //total: this.pageInfo.total, + //count:this.pageInfo.count }; //this.xmMenus=[] if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){ diff --git a/src/views/xm/core/xmMenu/XmMenuBox.vue b/src/views/xm/core/xmMenu/XmMenuBox.vue index ece5dcad..c799f937 100644 --- a/src/views/xm/core/xmMenu/XmMenuBox.vue +++ b/src/views/xm/core/xmMenu/XmMenuBox.vue @@ -1,25 +1,23 @@ - - - - - - + + - - + + + + @@ -391,16 +390,16 @@ - + append-to-body + title="选择上级需求" + :visible.sync="parentMenuVisible" + size="60%" + :close-on-click-modal="false" + > + diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue index 60ff35e4..e22baed6 100644 --- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue +++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue @@ -1,24 +1,30 @@