From d3f926b7fce18a6193644100d0406fff203400a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 18 Jul 2021 01:05:00 +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

---
 .../core/xmIteration/XmIterationComplex.vue   |  13 +-
 .../xm/core/xmProduct/XmProductOverview.vue   | 331 ++++++++++++++++++
 src/views/xm/core/xmProject/XmProjectInfo.vue |   6 +-
 ...mplex.vue => XmProjectOverviewComplex.vue} |   0
 src/views/xm/core/xmTask/XmTaskMng.vue        |   3 +-
 5 files changed, 343 insertions(+), 10 deletions(-)
 create mode 100644 src/views/xm/core/xmProduct/XmProductOverview.vue
 rename src/views/xm/core/xmProject/{XmProjectOveriewComplex.vue => XmProjectOverviewComplex.vue} (100%)

diff --git a/src/views/xm/core/xmIteration/XmIterationComplex.vue b/src/views/xm/core/xmIteration/XmIterationComplex.vue
index 1702bb63..7db348bf 100644
--- a/src/views/xm/core/xmIteration/XmIterationComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationComplex.vue
@@ -6,9 +6,13 @@
 			</el-col>  
 			<el-col :span="iterationVisible==true?21:24" >  
 				<el-tabs type="border-card"  :v-model="showPanel" activate-name="iterationOverview" @tab-click="tabClick">  
-					<el-tab-pane label="产品、战略"   name="products">   
-						<span v-show="iterationVisible==true" slot="label" ><i class="el-icon-d-arrow-left" @click.stop="iterationVisible=false"></i> 产品、战略</span>
-						<span v-show="iterationVisible==false" slot="label" ><i class="el-icon-d-arrow-right" @click.stop="iterationVisible=true"></i> 产品、战略</span> 
+					
+					<el-tab-pane label="迭代概览" lazy  name="iterationOverview">
+						<span v-show="iterationVisible==true" slot="label" ><i class="el-icon-d-arrow-left" @click.stop="iterationVisible=false"></i> 迭代概览</span>
+						<span v-show="iterationVisible==false" slot="label" ><i class="el-icon-d-arrow-right" @click.stop="iterationVisible=true"></i> 迭代概览</span> 
+						<xm-iteration-state-show v-show="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-state-show>
+					</el-tab-pane>
+					<el-tab-pane label="产品、战略"   name="products">    
 						<xm-product-mng  v-show="xmIteration && showPanel=='products'"   :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-mng>
 					</el-tab-pane>
 					<el-tab-pane label="故事" lazy name="menus" >  
@@ -20,9 +24,6 @@
 					<el-tab-pane label="缺陷" lazy name="bugs" > 
 						<xm-question-mng v-show="xmIteration && showPanel=='bugs'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
 					</el-tab-pane>
-					<el-tab-pane label="迭代概览" lazy  name="iterationOverview">
-						<xm-iteration-state-show v-show="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-state-show>
-					</el-tab-pane>
 				</el-tabs>
 				<el-row>
 					
diff --git a/src/views/xm/core/xmProduct/XmProductOverview.vue b/src/views/xm/core/xmProduct/XmProductOverview.vue
new file mode 100644
index 00000000..e369c2f5
--- /dev/null
+++ b/src/views/xm/core/xmProduct/XmProductOverview.vue
@@ -0,0 +1,331 @@
+<template>
+	<section>  
+		<el-row > 
+			<!--列表 XmProduct 产品表-->
+			<el-table  ref="table" :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+ 				 <el-table-column prop="productName"  label="产品名称" min-width="150" > 
+					 <template slot="header" slot-scope="scope"> 
+						 产品名称 
+						 <el-popover
+							placement="top-start"
+							title=""
+							width="400"
+							trigger="click" >
+							<el-row>
+								<el-col :span="24" style="padding-top:5px;">
+									<font class="more-label-font">
+										产品查询范围：
+									</font>
+									<el-select size="mini" 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="productId"></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=='productId'" size="mini" v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
+						 			</el-input> 
+								</el-col>
+								 
+								<el-col v-show="!selProject&&filters.queryScope!='productId'" :span="24"  style="padding-top:5px;">
+									<font class="more-label-font">创建时间:</font>  
+									<el-date-picker
+										v-model="dateRanger" 
+										type="daterange"
+										align="right"
+										unlink-panels
+										range-separator="至"
+										start-placeholder="开始日期"
+										end-placeholder="完成日期"
+										value-format="yyyy-MM-dd"
+										:default-time="['00:00:00','23:59:59']"
+										:picker-options="pickerOptions"
+									></el-date-picker>   
+								</el-col>  
+								
+								<el-col  :span="24"  style="padding-top:5px;">
+									<font class="more-label-font">
+										产品名称:
+									</font> 
+									<el-input  size="mini" v-model="filters.key" style="width:100%;"  placeholder="输入产品名字关键字">  
+						 			</el-input> 
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;">
+									<font class="more-label-font">
+										产品经理:
+									</font>  
+									<el-tag v-if="filters.pmUser" closable @click="selectFiltersPmUser" @close="clearFiltersPmUser()">{{filters.pmUser.username}}</el-tag> 
+									<el-button size="mini"  v-else @click="selectFiltersPmUser()">选责任人</el-button>
+									<el-button size="mini"   @click="setFiltersPmUserAsMySelf()">我的</el-button>
+								</el-col>
+								<el-col  :span="24"  style="padding-top:5px;">
+									<el-button type="primary" size="mini" @click="searchXmProducts" >查询</el-button>
+								</el-col>
+							</el-row> 
+							<el-button  slot="reference" size="mini"  icon="el-icon-more" circle></el-button>
+						</el-popover>  
+					 </template>
+					<template slot-scope="scope">
+						<font>{{scope.row.productName}}</font>
+						<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag>
+						
+						<el-tooltip content="产品经理"><el-tag v-if="scope.row.pmUsername">{{scope.row.pmUsername}}</el-tag></el-tooltip>
+						<el-tooltip content="点击统计进度，由任务进度汇总而成"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmProductState( scope.row)"></el-button></el-tooltip>
+
+						</font>
+					</template>
+				</el-table-column>
+				<el-table-column v-if="isSelectProduct==true"  label="操作" width="100" fixed="right"  >
+					<template slot-scope="scope"> 
+						<el-button type="primary" @click="selectedProduct( scope.row,scope.$index)">选择</el-button> 
+					</template>
+				</el-table-column>
+			</el-table>
+			<el-pagination  layout="total, prev, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>  
+		</el-row> 
+			
+			<el-drawer title="选择员工" :visible.sync="selectFiltersPmUserVisible" size="60%" append-to-body>
+				<users-select  @confirm="onFiltersPmUserSelected" ref="usersSelect"></users-select>
+			</el-drawer>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	//import Sticky from '@/components/Sticky' // 粘性header组件
+	//import { listOption } from '@/api/mdp/meta/itemOption';//下拉框数据查询
+	import { listXmProductWithState } from '@/api/xm/core/xmProduct';  
+	import { mapGetters } from 'vuex' 
+	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
+	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState'; 
+
+	
+	export default { 
+		props:['isSelectProduct','selProject','xmIteration'],
+		computed: {
+		    ...mapGetters([
+		      'userInfo','roles'
+		    ])
+		},
+		watch:{
+			xmIteration(){
+				this.getXmProducts();
+			}
+		},
+		data() {
+			const beginDate = new Date();
+			const endDate = new Date();
+			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
+			return {
+				filters: {
+					key: '',
+					queryScope:'compete',
+					id:'',//产品编号
+					pmUser:null,//产品经理
+				},
+				xmProducts: [],//查询结果
+				pageInfo:{//分页数据
+					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
+					pageSize:10,//每页数据
+					count:false,//是否需要重新计算总记录数
+					pageNum:1,//当前页码、从1开始计算
+					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
+					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
+				},
+				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				sels: [],//列表选中数据
+				options:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
+				
+				addFormVisible: false,//新增xmProduct界面是否显示
+				//新增xmProduct界面初始化数据
+				addForm: {
+					id:'',productName:'',branchId:'',remark:''
+				},
+				
+				editFormVisible: false,//编辑界面是否显示
+				//编辑xmProduct界面初始化数据
+				editForm: {
+					id:'',productName:'',branchId:'',remark:''
+				},
+				iterationVisible:false,
+				productStateVisible:false,
+				selectFiltersPmUserVisible:false,
+				tableHeight:300,
+				dateRanger: [
+					util.formatDate.format(beginDate, "yyyy-MM-dd"),
+					util.formatDate.format(endDate, "yyyy-MM-dd")
+				],  
+				pickerOptions:  util.pickerOptions('datarange'),
+				
+				/**begin 自定义属性请在下面加 请加备注**/
+					
+				/**end 自定义属性请在上面加 请加备注**/
+			}
+		},//end data
+		methods: { 
+			handleSizeChange(pageSize) { 
+				this.pageInfo.pageSize=pageSize; 
+				this.getXmProducts();
+			},
+			handleCurrentChange(pageNum) {
+				this.pageInfo.pageNum = pageNum;
+				this.getXmProducts();
+			},
+			// 表格排序 obj.order=ascending/descending,需转化为 asc/desc ; obj.prop=表格中的排序字段,字段驼峰命名
+			sortChange( obj ){
+				var dir='asc';
+				if(obj.order=='ascending'){
+					dir='asc'
+				}else{
+					dir='desc';
+				}
+				if(obj.prop=='xxx'){
+					this.pageInfo.orderFields=['xxx'];
+					this.pageInfo.orderDirs=[dir];
+				}
+				this.getXmProducts();
+			},
+			searchXmProducts(){
+				 this.pageInfo.count=true; 
+				 this.getXmProducts();
+			}, 
+			//获取列表 XmProduct 产品表
+			getXmProducts() {
+				let params = {
+					pageSize: this.pageInfo.pageSize,
+					pageNum: this.pageInfo.pageNum,
+					total: this.pageInfo.total,
+					count:this.pageInfo.count
+				};
+				if(this.pageInfo.orderFields!=null && this.pageInfo.orderFields.length>0){
+					let orderBys=[];
+					for(var i=0;i<this.pageInfo.orderFields.length;i++){ 
+						orderBys.push(this.pageInfo.orderFields[i]+" "+this.pageInfo.orderDirs[i])
+					}  
+					params.orderBy= orderBys.join(",")
+				}
+				if(this.filters.key!==""){
+					params.key="%"+this.filters.key+"%"
+				}else{
+					//params.xxx=xxxxx
+				}
+				if(this.selProject){
+					params.projectId=this.selProject.id
+				}
+				
+				if(this.xmIteration){
+					params.iterationId=this.xmIteration.id
+				}
+				params.queryScope=this.filters.queryScope
+				if(this.filters.queryScope=='productId'){
+					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
+					params.projectId=null;
+				}
+				if(!this.selProject && !this.xmIteration && this.filters.queryScope!='productId'){
+					if(!this.dateRanger || this.dateRanger.length==0){
+						this.$message({showClose: true, message: "创建日期范围不能为空", type: 'error' });
+						return;
+					} 
+					params.ctimeStart=this.dateRanger[0]+" 00:00:00"
+					params.ctimeEnd=this.dateRanger[1]+" 23:59:59"
+				} 
+
+				this.load.list = true;
+				listXmProductWithState(params).then((res) => {
+					var tips=res.data.tips;
+					if(tips.isOk){ 
+						this.pageInfo.total = res.data.total;
+						this.pageInfo.count=false;
+						this.xmProducts = res.data.data;
+					}else{
+						this.$message({showClose: true, message: tips.msg, type: 'error' });
+					} 
+					this.load.list = false;
+				}).catch( err => this.load.list = false );
+			},
+ 
+			//选择行xmProduct
+			selsChange: function (sels) {
+				this.sels = sels;
+			}, 
+			 
+			rowClick: function(row, event, column){
+				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
+			},
+			selectedProduct:function(row){
+				this.$emit('selected',row);
+			},
+			
+			/**begin 自定义函数请在下面加**/
+			clearFiltersPmUser:function(){
+				 this.filters.pmUser=null;
+				  this.searchXmProducts();
+			},			
+			selectFiltersPmUser(){
+				this.selectFiltersPmUserVisible=true;
+			},
+			onFiltersPmUserSelected(users){ 
+				 if(users && users.length>0){
+					 this.filters.pmUser=users[0]
+				 }else{
+					 this.filters.pmUser=null;
+				 }
+				 this.selectFiltersPmUserVisible=false;
+				 this.searchXmProducts();
+			},
+			setFiltersPmUserAsMySelf(){
+				this.filters.pmUser=this.userInfo;
+				this.searchXmProducts();
+			},	   
+			
+			loadTasksToXmProductState: function (row) {  
+				this.load.edit=true;
+				 
+				let params = { productId: row.id };
+				loadTasksToXmProductState(params).then((res) => {
+					this.load.edit=false;
+					var tips=res.data.tips;
+					if(tips.isOk){ 
+						this.pageInfo.count=true;
+						this.getXmProducts();
+					}
+					this.$message({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
+				}).catch( err  => this.load.edit=false ); 
+			},
+		},//end methods
+		components: {  
+			UsersSelect,
+		    //在下面添加其它组件
+		},
+		mounted() { 
+			this.$nextTick(() => {
+				var clientRect=this.$refs.table.$el.getBoundingClientRect();
+				var subHeight=70/1000 * window.innerHeight; 
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight; 
+				this.getXmProducts();
+        	}); 
+		}
+	}
+
+</script>
+
+<style scoped>
+
+.more-label-font{
+	text-align:center;
+	float:left;
+	padding-top:5px;
+}
+.align-right{
+	float: right; 
+}
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index fb6f63ce..e89c43e7 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -141,7 +141,7 @@
 				</el-submenu>
 			</el-menu>
 		   
-		  	<xm-project-overiew-complex v-if="infotype=='项目概览'" :sel-project="selProject"></xm-project-overiew-complex> 
+		  	<xm-project-overview-complex v-if="infotype=='项目概览'" :sel-project="selProject"></xm-project-overview-complex> 
 			 <xm-iteration-complex v-if="infotype=='迭代'" ref="xmIterationMng" :sel-project="selProject" ></xm-iteration-complex>
 			 <xm-product-complex v-if="infotype=='产品'" ref="xmProductComplex" :sel-project="selProject" ></xm-product-complex>
 			 <xm-menu-mng v-if="infotype=='用户故事'" :sel-project="selProject"></xm-menu-mng>
@@ -195,7 +195,7 @@
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';  
 	import XmIterationComplex from '../xmIteration/XmIterationComplex.vue'; 
-	import XmProjectOveriewComplex from './XmProjectOveriewComplex.vue';
+	import XmProjectOverviewComplex from './XmProjectOverviewComplex.vue';
 import XmProductComplex from '../xmProduct/XmProductComplex.vue';
 
 
@@ -417,7 +417,7 @@ import XmProductComplex from '../xmProduct/XmProductComplex.vue';
 			xmTestCaseExecMng,
 			xmProjectGroupSelect,
 			XmIterationComplex, 
-			XmProjectOveriewComplex,
+			XmProjectOverviewComplex,
 			XmProductComplex,
 			//在下面添加其它组件
 		},
diff --git a/src/views/xm/core/xmProject/XmProjectOveriewComplex.vue b/src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
similarity index 100%
rename from src/views/xm/core/xmProject/XmProjectOveriewComplex.vue
rename to src/views/xm/core/xmProject/XmProjectOverviewComplex.vue
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index c1e9fc06..67199e95 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -534,8 +534,9 @@ import XmProjectGroupSelect from '../xmProjectGroup/XmProjectGroupSelect.vue';
 			},
 			'xmProduct':function(){
 				this.filters.product=this.xmProduct;
+				this.getXmTasks(); 
 			}, 
-			xmIteration(){ 
+			xmIteration:function(){ 
 				this.getXmTasks(); 
 			}
 		},