From 309d11d46d19f63ff948470089bf89464cd01e41 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 28 Mar 2022 02:44:41 +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

---
 .../xm/core/components/XmProductSelect.vue    |  6 +--
 .../xm/core/xmIteration/XmIterationMng.vue    | 26 +---------
 src/views/xm/core/xmMenu/XmMenuAdd.vue        |  9 ++--
 src/views/xm/core/xmMenu/XmMenuMng.vue        | 47 +++++++++----------
 .../xm/core/xmQuestion/XmQuestionAdd.vue      |  1 +
 .../xm/core/xmQuestion/XmQuestionEdit.vue     | 23 +++++----
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  2 +-
 7 files changed, 46 insertions(+), 68 deletions(-)

diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 86a7a7d2..92e914a8 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -195,10 +195,10 @@
 					params.key="%"+this.filters.key+"%"
 				}
 				if(this.linkProjectId){
-					params.projectId=this.linkProjectId
+					params.linkProjectId=this.linkProjectId
 				}
-				if(this.iterationId){
-					params.iterationId=this.iterationId
+				if(this.linkIterationId){
+					params.linkIterationId=this.linkIterationId
 				}
 				if(this.filters.id){
 					params.id=this.filters.id
diff --git a/src/views/xm/core/xmIteration/XmIterationMng.vue b/src/views/xm/core/xmIteration/XmIterationMng.vue
index 35941730..c0619684 100644
--- a/src/views/xm/core/xmIteration/XmIterationMng.vue
+++ b/src/views/xm/core/xmIteration/XmIterationMng.vue
@@ -1,14 +1,6 @@
 <template>
 	<section class="page-container padding border">
 		<el-row>
-      		<el-checkbox v-model="gstcVisible"  class="hidden-md-and-down">甘特图</el-checkbox>
-
-			<el-select  v-model="filters.queryScope"  placeholder="迭代查询范围">
-				<el-option :label="userInfo.branchName+'机构下所有的迭代'" value="branchId"></el-option>
-				<el-option label="我相关的迭代" value="compete"></el-option>
-				<el-option label="按迭代编号精确查找" value="iterationId"></el-option>
-				<el-option label="后台智能匹配" value=""></el-option>
-			</el-select>
 			<el-input v-if="filters.queryScope=='iterationId'"  v-model="filters.id" style="width:20%;"  placeholder="输入迭代编号" @keyup.enter.native="searchXmProducts"> </el-input>
 			<el-date-picker v-if="filters.queryScope!='iterationId'" v-model="dateRangerOnline" type="daterange" align="right" unlink-panels range-separator="至"
 				start-placeholder="上线日期" end-placeholder="上线日期" value-format="yyyy-MM-dd HH:mm:ss"
@@ -25,18 +17,6 @@
 				trigger="click" >
 				<el-divider content-position="left"><strong>查询条件</strong></el-divider>
 				<el-row>
-
-					<el-col :span="24" style="padding-top:5px;">
-						<font class="more-label-font">
-							迭代查询范围：
-						</font>
-						<el-select  v-model="filters.queryScope" style="width:100%;"   placeholder="迭代查询范围">
-							<el-option :label="userInfo.branchName+'机构下所有的迭代'" value="branchId"></el-option>
-							<el-option label="我相关的迭代" value="compete"></el-option>
-							<el-option label="按迭代编号精确查找" value="iterationId"></el-option>
-							<el-option label="后台智能匹配" value=""></el-option>
-						</el-select>
-					</el-col>
 					<el-col  :span="24"  style="padding-top:5px;">
 						<el-input  v-if="filters.queryScope=='iterationId'"  v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
 						</el-input>
@@ -59,12 +39,8 @@
 					<el-col :span="24" style="padding-top:5px;">
 							<font class="more-label-font">迭代名称:</font><el-input  v-model="filters.key" style="width: 60%;" placeholder="模糊查询"></el-input>
 					</el-col>
-					<el-col :span="24" style="padding-top:5px;">
-							<el-tag>默认只能查询本人创建的迭代、本人作为需求责任人参与的迭代</el-tag>
-					</el-col>
-					<el-col :span="24" style="padding-top:5px;">
+					<el-col :span="24" style="padding-top:10px;">
 						<el-button  type="primary" icon="el-icon-search" @click="getXmIterations">查询</el-button>
-						<el-checkbox v-model="gstcVisible">甘特图</el-checkbox>
 					</el-col>
 				</el-row>
  				<el-button  slot="reference" icon="el-icon-more"></el-button>
diff --git a/src/views/xm/core/xmMenu/XmMenuAdd.vue b/src/views/xm/core/xmMenu/XmMenuAdd.vue
index 1c8add06..e24aca40 100644
--- a/src/views/xm/core/xmMenu/XmMenuAdd.vue
+++ b/src/views/xm/core/xmMenu/XmMenuAdd.vue
@@ -224,6 +224,9 @@
 				}else{
 					this.addFOrm.dclass=this.xmMenu.dclass
 				}
+				
+				this.addForm.mmUserid=this.userInfo.userid
+				this.addForm.mmUsername=this.userInfo.username
 	      	}
 	      } 
 	    },
@@ -267,11 +270,7 @@
 				if(this.addForm.productId==null){
 					this.$notify({showClose: true, message: '请选择产品/或者上级需求进行新增', type:'error' }); 
 					return;
-				}
-				if(this.parentMenu && this.parentMenu.ntype=="0"){
-					 this.$notify({showClose: true, message: '需求池下不能再建立子需求', type:'error' }); 
-					return;
-				}
+				} 
 				this.$refs.addForm.validate((valid) => {
 					if (valid) {
 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 611f98c6..c35cb970 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -5,15 +5,8 @@
 					<el-row>
 						<xm-product-select ref="xmProductSelect1" style="display:inline;" v-if="!xmProduct && !xmIteration"   :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear-select="onProductClearSelect"></xm-product-select>
 
-						<xm-it-select v-if="!xmIteration || !xmIteration.id" style="display:inline;" :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="selProject?selProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
-					    </xm-it-select>
-
-						<el-select  v-model="filters.taskFilterType" placeholder="已分配任务的需求？" clearable v-if="selProject &&selProject.id">
-							<el-option   value="not-join-any-project"  label="未分配过任务的需求"></el-option>
-							<el-option   value="join-any-project"  label="已分配过任务的需求"></el-option>
-							<el-option   value="not-join-curr-project"  :label="'未分配任务到项目【'+selProject.name+'】'" v-if="selProject && selProject.id"></el-option>
-							<el-option   value="join-curr-project"  :label="'已分配任务到项目【'+selProject.name+'】'"  v-if="selProject && selProject.id"></el-option>
-						</el-select>
+						<xm-iteration-select v-if="!xmIteration || !xmIteration.id" style="display:inline;" :auto-select="false"  :product-id="filters.product?filters.product.id:null" :link-project-id="selProject?selProject.id:null"   placeholder="迭代"  @row-click="onIterationSelected" @clear="onIterationClearSelect">
+					    </xm-iteration-select>
 						<el-select v-if=" !selProject || !selProject.id"  v-model="filters.iterationFilterType" placeholder="加入过迭代？" clearable>
 							<el-option   value="not-join-any-iteration"  label="未加入过迭代"></el-option>
 							<el-option   value="join-any-iteration"  label="已加入过迭代"></el-option>
@@ -183,7 +176,7 @@
 						</span>
 					 </el-row>
 					<el-row class="padding-top">
-						<el-table :cell-style="cellStyleCalc" :header-cell-style="cellStyleCalc" :row-style="{height:'60px'}" lazy :load="loadXmMenusLazy" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
+						<el-table :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc" :row-style="{height:'60px'}" lazy :load="loadXmMenusLazy" stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children', hasChildren: 'childrenCnt'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
 							<el-table-column sortable type="selection" width="40"></el-table-column>
 
 							<el-table-column prop="menuName" label="需求名称" min-width="300" fixed="left">
@@ -288,7 +281,12 @@
 							</el-table-column>
 							<el-table-column prop="iterationName" label="迭代" width="150" show-overflow-tooltip sortable>
 								<template slot-scope="scope">
+									<div class="cell-text"> 
 										{{scope.row.iterationName}}
+									</div>
+									<span class="cell-bar">
+										 <xm-iteration-select  style="display:inline;" :auto-select="false"  :product-id="scope.row.productId"    placeholder="迭代"  @row-click="editXmMenuSomeFields(scope.row,'iterationId',$event)"></xm-iteration-select>
+									</span>
 								</template>
 							</el-table-column>
 
@@ -429,7 +427,7 @@
 	import XmTaskList from '../xmTask/XmTaskList';
 	import XmTaskMng from '../xmTask/XmTaskMng';
 	import XmTaskListForMenu from '../xmTask/XmTaskListForMenu';
-	import  XmItSelect from '@/views/xm/core/components/XmIterationSelect.vue';//修改界面
+	import  XmIterationSelect from '@/views/xm/core/components/XmIterationSelect.vue';//修改界面
 	import  XmMenuWorkload from '@/views/xm/core/components/XmMenuWorkload';//修改界面
 	import  XmTableConfig from '@/views/xm/core/components/XmTableConfig';//修改界面
 	import  XmGroupDialog from '@/views/xm/core/xmGroup/XmGroupDialog';//修改界面
@@ -440,7 +438,7 @@
 
 	import {sn} from '@/common/js/sequence'
 
-	import { mapGetters } from 'vuex'
+	import { mapGetters } from 'vuex' 
 
 	export default {
 		props:['selProject','xmIteration','xmProduct','disabledMng'],
@@ -466,7 +464,6 @@
 					this.getXmMenus()
 			},
 			selProject:function(){
-				this.filters.taskFilterType='join-curr-project'
 				this.getXmMenus();
 			}
     	},
@@ -549,7 +546,7 @@
 				maps:new Map(),
 				linkIterationPopoverVisible:false,
  				/**begin 自定义属性请在下面加 请加备注**/
-
+				expandRowKeysCpd:[],
 				/**end 自定义属性请在上面加 请加备注**/
 			}
 		},//end data
@@ -739,7 +736,8 @@
 			},
 			showSubAdd:function(row){
 				this.editForm=row
-				this.parentMenu=row
+				this.parentMenu=row 
+				this.expandRowKeysCpd.push(row.pmenuId);
 				this.addForm.productId=row.productId
 				if(this.filters.product && row.productId==this.filters.product.id){
 					this.addForm.productName=this.filters.product.productName
@@ -751,16 +749,18 @@
 			showProdcutAdd:function(){
 				this.$refs.xmProductMng.showAdd();
 			},
-			afterAddSubmit(row){
+			afterAddSubmit(row){ 
 				this.addFormVisible=false;
-				this.pageInfo.count=true;
+				this.pageInfo.count=true; 
+				//this.getXmMenus(); 
+				treeTool.reloadAllChildren(this.$refs.table,this.maps,[row,{...this.parentMenu}],'pmenuId',this.loadXmMenusLazy) 
+				
 				this.parentMenu=null;
-				this.getXmMenus();
-				treeTool.reloadChildren(this.$refs.table,this.maps,row.pmenuId,'pmenuId',this.loadXmMenusLazy)
+				
 			},
 			afterEditSubmit(row){
 				this.editFormVisible=false;
-				this.getXmMenus();
+				//this.getXmMenus();
 				treeTool.reloadChildren(this.$refs.table,this.maps,row.pmenuId,'pmenuId',this.loadXmMenusLazy)
 			},
 			//选择行xmMenu
@@ -1294,11 +1294,11 @@
 			UsersSelect,
 			XmMenuMngBatch,
 		    TagDialog,
-			XmMenuSelect,
-			XmItSelect,
+			XmMenuSelect, 
 			XmMenuWorkload,
 			XmTableConfig,
 			XmGroupDialog,
+			XmIterationSelect,
 		    //在下面添加其它组件
 		},
 		mounted() {
@@ -1309,9 +1309,6 @@
 			if(this.xmProduct && this.xmProduct.id){
 				this.productVisible=false;
 			}
-			if(this.selProject && this.selProject.id){
-				this.filters.taskFilterType='join-curr-project'
-			}
 
 			if(this.xmIteration && this.xmIteration.id){
 				this.filters.iterationFilterType='join-curr-iteration'
diff --git a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
index 86872e2e..c7313a61 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionAdd.vue
@@ -253,6 +253,7 @@
 					attachment: [],
 					repRate:'',
 					verNum:'',
+					bugReason:'',
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				fileVisible: true,
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 67ab98ed..f3ace78b 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -88,12 +88,11 @@
 						
 						<el-row> 
 								<el-col :span="12">
-									<el-form-item label="缺陷类别" prop="bugType">
-										<el-select v-model="editForm.bugType" placeholder="请选择缺陷类别">
-											<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+									<el-form-item label="原因分析" prop="bugReason">
+										<el-select v-model="editForm.bugReason" placeholder="请选择原因">
+											<el-option v-for="(i,index) in dicts['bugReason']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
 										</el-select> 
 									</el-form-item>
-									
 								</el-col>
 								
 								<el-col :span="12">
@@ -108,10 +107,11 @@
 						
 						<el-row> 
 								<el-col :span="12">
-									<el-form-item label="提出时间" prop="createTime">
-										 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="editForm.createTime"></el-date-picker>
-									</el-form-item>
-									
+									<el-form-item label="缺陷类别" prop="bugType">
+										<el-select v-model="editForm.bugType" placeholder="请选择缺陷类别">
+											<el-option v-for="(i,index) in dicts['bugType']" :label="i.name" :value="i.id" :key="index">{{i.name}}</el-option>
+										</el-select> 
+									</el-form-item>  
 								</el-col>
 								
 								<el-col :span="12">
@@ -289,7 +289,12 @@
 				//新增界面数据 xm_question
 				editForm: {
 					id:'',name:'',projectId:'',projectName:'',taskId:'',taskName:'',endTime:'',askUserid:'',askUsername:'',handlerUserid:'',handlerUsername:'',priority:'',solution:'',processTime:'',receiptMessage:'',receiptTime:'',description:'',createUserid:'',createUsername:'',createTime:'',bugStatus:'',receiptMessage:'',
-					attachment: [],iterationId:'',iterationName:'',productId:'',
+					iterationId:'',iterationName:'',productId:'',
+					qtype:'',
+					attachment: [],
+					repRate:'',
+					verNum:'',
+					bugReason:'',
 				},
 				/**begin 在下面加自定义属性,记得补上面的一个逗号**/
 				fileVisible: true,
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index 88665dc6..126de020 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -1,7 +1,7 @@
 <template>
 	<section class="padding">
 			<el-row>
-				<xm-product-select v-if="!xmProduct" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear-select="clearProduct"></xm-product-select>
+				<xm-product-select v-if="!xmProduct&&!xmIteration" style="display:inline;" :auto-select="false" :link-project-id="selProject?selProject.id:null" @row-click="onProductSelected" @clear-select="clearProduct"></xm-product-select>
 			  	<xm-project-select v-if="!selProject" style="display:inline;" ref="xmProjectSelect" :auto-select="false" :link-product-id="xmProduct?xmProduct.id:null" @row-click="onProjectConfirm" @clear-select="clearProject"></xm-project-select>
 
 				  <el-select v-model="filters.bugStatus" placeholder="状态" style="width:100px;"  clearable @change="changeBugStatus">