From 055aa5dcede312bf5aa139caf26869bc1c954e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 20 Jul 2021 13:39:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/routes_xm.js | 3 +- .../xm/core/xmProduct/XmProductAllMng.vue | 47 +++++++++++++++++++ src/views/xm/core/xmProduct/XmProductMng.vue | 16 +++---- 3 files changed, 57 insertions(+), 9 deletions(-) create mode 100644 src/views/xm/core/xmProduct/XmProductAllMng.vue diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js index 0babb3fa..c34efd98 100644 --- a/src/router/routes_xm.js +++ b/src/router/routes_xm.js @@ -99,7 +99,8 @@ export default { }, // leaf: true,//只有一个节点 children: [ - + { path: 'xmProduct/XmProductAllMng', component: _import('xm/core/xmProduct/XmProductAllMng'), name: 'XmProductAllMng', meta: { title: '产品总览' }}, + { path: 'xmProduct/XmProductMng', component: _import('xm/core/xmProduct/XmProductMng'), name: 'XmProductMng', meta: { title: '产品管理' }}, { path: 'xmMenu/XmMenuMng', component: _import('xm/core/xmMenu/XmMenuMng'), name: 'XmMenuMng', meta: { title: '故事管理' }}, diff --git a/src/views/xm/core/xmProduct/XmProductAllMng.vue b/src/views/xm/core/xmProduct/XmProductAllMng.vue new file mode 100644 index 00000000..4a3f7d0e --- /dev/null +++ b/src/views/xm/core/xmProduct/XmProductAllMng.vue @@ -0,0 +1,47 @@ + + + + + \ No newline at end of file diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue index df96fd93..01db4ce7 100644 --- a/src/views/xm/core/xmProduct/XmProductMng.vue +++ b/src/views/xm/core/xmProduct/XmProductMng.vue @@ -106,9 +106,9 @@ - + - +
{{p.productName}}
@@ -142,12 +142,12 @@ - + - - - + + + @@ -311,7 +311,7 @@ import XmProductSelect from './XmProductSelect.vue'; pickerOptions: util.pickerOptions('datarange'), projectVisible:false, productSelectVisible:false, - showType:true, + showType:false, /**begin 自定义属性请在下面加 请加备注**/ /**end 自定义属性请在上面加 请加备注**/ From 770149e870b7030509dbc4a353adbea53e523b4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Tue, 20 Jul 2021 15:47:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xm/core/xmIteration/XmIterationMng.vue | 59 ++--- .../XmIterationOverviewComplex.vue | 10 +- src/views/xm/core/xmProduct/XmProductMng.vue | 246 +++++++++--------- 3 files changed, 152 insertions(+), 163 deletions(-) diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue index 0491758d..60305388 100644 --- a/src/views/xm/core/xmIteration/XmIterationMng.vue +++ b/src/views/xm/core/xmIteration/XmIterationMng.vue @@ -1,15 +1,15 @@ - 迭代计划 + 迭代计划 查询条件 - - + + 迭代查询范围： @@ -40,9 +40,9 @@ - - - + + + 上线时间: @@ -67,16 +67,10 @@ 查询 - 甘特图 + 甘特图 - 更多操作 - - - 将更多迭代加入产品{{xmProduct.productName}} - - - + @@ -101,8 +95,7 @@ @@ -123,11 +116,11 @@ - + - + @@ -173,8 +166,8 @@ import XmIterationSelect from './XmIterationSelect.vue'; data() { const beginDate = new Date(); const endDate = new Date(); - beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); - endDate.setTime(endDate.getTime() + 3600 * 1000 * 24 * 7 * 4 * 3 ); + beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 3 ); + endDate.setTime(endDate.getTime() + 3600 * 1000 * 24 * 7 * 4 * 3 ); return { filters: { key: '', @@ -272,7 +265,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count:this.pageInfo.count - }; + }; if(!this.dateRangerOnline || this.dateRangerOnline.length==0){ this.$message({showClose: true, message: "上线日期范围不能为空", type: 'error' }); return; @@ -295,16 +288,16 @@ import XmIterationSelect from './XmIterationSelect.vue'; } if(this.menuId){ params.menuId=this.menuId - } + } if( !this.menuId && !this.xmProduct && !this.selProject){ - params.queryScope=this.filters.queryScope + params.queryScope=this.filters.queryScope if(this.filters.queryScope=='iterationId'){ if(!this.filters.id){ this.$message({showClose: true, message:"您选择了按迭代编号精确查找模式，请输入迭代编号", type: 'error' }); return; } params.id=this.filters.id - + } if(this.filters.queryScope=="branchId"){ params.branchId=this.userInfo.branchId @@ -313,7 +306,7 @@ import XmIterationSelect from './XmIterationSelect.vue'; params.onlineTimeStart=this.dateRangerOnline[0]+" 00:00:00" params.onlineTimeEnd=this.dateRangerOnline[1]+" 23:59:59" } - + } this.load.list = true; listXmIterationWithState(params).then((res) => { @@ -354,14 +347,14 @@ import XmIterationSelect from './XmIterationSelect.vue'; this.pageInfo.count=true; if(this.xmProduct){//如果是产品试图界面添加的迭代，直接添加产品与迭代的关联关系 this.onXmIterationSelect(xmIteration); - }else{ + }else{ this.getXmIterations(); - } + } }, afterEditSubmit(){ this.editFormVisible=false; }, - + //进入info界面 intoInfo(row) { this.editForm = row; @@ -506,14 +499,14 @@ import XmIterationSelect from './XmIterationSelect.vue'; }).then(()=>{ addXmIterationProductLink({iterationId:xmIteration.id,productId:xmProduct.id}).then(res=>{ var tips =res.data.tips; - if(tips.isOk){ + if(tips.isOk){ this.getXmIterations(); } this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error'}); }) }) }, - doDelXmIterationProductLink(row){ + doDelXmIterationProductLink(row){ var xmIteration=row; var xmProduct=this.xmProduct; this.$confirm('确认将产品【'+xmProduct.productName+'】与迭代【'+xmIteration.iterationName+'】进行脱钩吗？脱钩后，产品与迭代互相查看不到对方信息。', '提示', { diff --git a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue index 61ce8f6d..1234f385 100644 --- a/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue +++ b/src/views/xm/core/xmIteration/XmIterationOverviewComplex.vue @@ -9,8 +9,10 @@ 配置可见产品 + + + 配置可见故事 -