From 8f344398bf704645376f474ea4f59d669bad2636 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 15 Nov 2023 11:47:35 +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

---
 .../mdp-ui/mdp-select-table/Index.vue         |  37 +-
 .../xm/core/components/XmIterationSelect.vue  | 540 +++-------------
 .../xm/core/components/XmProductSelect.vue    | 581 ++----------------
 .../xm/core/components/XmProjectSelect.vue    | 579 ++---------------
 4 files changed, 211 insertions(+), 1526 deletions(-)

diff --git a/src/components/mdp-ui/mdp-select-table/Index.vue b/src/components/mdp-ui/mdp-select-table/Index.vue
index 7c269608..f64fa660 100644
--- a/src/components/mdp-ui/mdp-select-table/Index.vue
+++ b/src/components/mdp-ui/mdp-select-table/Index.vue
@@ -1,10 +1,12 @@
 <template> 
   <span> 
     <span v-if="showStyle=='origin'" :title="title||placeholder||emptyText">
-      <el-select :size="size" :multiple="multiple" :placeholder="placeholder" :disabled="disabled" :style="{width:width?width+'':'auto'}" class="my-select" ref="selectRef" v-model="myVal" @change="onChange" :clearable="clearable" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">
+      <el-select :size="size" :multiple="multiple" :placeholder="placeholder" :disabled="disabled" :style="{width:width?width+'':'auto'}" class="my-select" ref="selectRef" v-model="myVal" @change="onChange" :clearable="clearable" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('clear',$event)" @click="$emit('click',$event)">
           <slot> 
               <el-option disabled value="" style="margin-bottom:5px;">
-                <el-row><el-button @click.stop="$refs['tableDialog'].open()" icon="el-icon-search">更多数据</el-button> </el-row>
+                <slot name="toolbar">
+                    <el-row><el-button @click.stop="$refs['tableDialog'].open()" icon="el-icon-search">更多数据</el-button> </el-row>
+                </slot>
               </el-option>
               <el-option class="avatar-container" v-for="(option,index) in optionsCpd" :key="index" :value="option[props['id']]" :label="option[props['name']]">  
               
@@ -72,11 +74,13 @@
         </span>
         <span class="field-oper" :class="{disabled:disabled===true,enabled:disabled!==true,hidden:true}">
           <slot name="oper">
-            <el-select  :multiple="multiple" :size="size" :style="{width:width?width+'':'auto'}" class="my-select" ref="selectRef" v-model="myVal" @change="onChange" :clearable="clearable" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('blur',$event)" @click="$emit('click',$event)">
+            <el-select  :multiple="multiple" :size="size" :style="{width:width?width+'':'auto'}" class="my-select" ref="selectRef" v-model="myVal" @change="onChange" :clearable="clearable" @visible-change="$emit('visible-change',$event)" @focus="$emit('focus',$event)" @blur="$emit('blur',$event)" @clear="$emit('clear',$event)" @click="$emit('click',$event)">
                 <slot>
                     <el-option disabled value="" style="margin-bottom:5px;">
-                      <el-row><el-button @click.stop="$refs['tableDialog'].open()" icon="el-icon-search">更多数据</el-button> </el-row>
-                    </el-option> 
+                      <slot name="toolbar">
+                          <el-row><el-button @click.stop="$refs['tableDialog'].open()" icon="el-icon-search">更多数据</el-button> </el-row>
+                      </slot>
+                     </el-option> 
                     <el-option class="avatar-container" v-for="(option,index) in optionsCpd" :key="index" :value="option[props['id']]" :label="option[props['name']]">  
                     
                       <div class="avatar-wrapper">
@@ -94,7 +98,7 @@
     </span> 
     <mdp-dialog ref="tableDialog" title="选择数据" width="80%">
         <template v-slot="{visible,data,dialog}">
-           <mdp-table :multiple="multiple" sub-op-type="select" :visible="visible" :crud-apis="{list:loadFun}" :props="props" :column-cfgs="columnConfigs" @select="onTableDataSelect"> 
+           <mdp-table :multiple="multiple" sub-op-type="select" :params="params" :visible="visible" :crud-apis="{list:loadFun}" :props="props" :column-cfgs="columnConfigs" @select="onTableDataSelect"> 
           </mdp-table>
         </template>
       </mdp-dialog>
@@ -130,7 +134,7 @@
       columnCfgs:{
         type:Array,
         default:null,
-      }
+      },
     },
     data(){
       return { 
@@ -151,7 +155,13 @@
         if(!tableDataCacheList){
           tableDataCacheList=[] 
         }
-        var notExists=datas.filter(d=>!tableDataCacheList.some(c=>c[this.props['id']]==d[this.props['id']]))
+        var dataArr=[]
+        if(!datas instanceof Array){
+          dataArr=datas
+        }else{
+          dataArr=[datas]
+        }
+        var notExists=dataArr.filter(d=>!tableDataCacheList.some(c=>c[this.props['id']]==d[this.props['id']]))
         tableDataCacheList.push(...notExists)
         tableDataCacheMap.set(this.codeKey,tableDataCacheList)
       },
@@ -180,6 +190,7 @@
             var notExistsVals=mVals.filter(v=>!this.item.options.some(k=>k[this.props['id']]==v))
             if(notExistsVals && notExistsVals.length>0){
               var params={pageSize:10,pageNum:1}
+              Object.assign(params,this.params)
               params[this.props['id']]="$IN"+notExistsVals.join(",")
               this.loadFun(params).then(res=>{
                 var tips = res.data.tips
@@ -189,6 +200,16 @@
                 }
               })
             }
+        }else{
+          var params={pageSize:10,pageNum:1}
+          Object.assign(params,this.params)
+           this.loadFun(params).then(res=>{
+            var tips = res.data.tips
+            if(tips.isOk && res.data.data.length>0){
+              this.item.options.push(...res.data.data)
+              this.setCacheList(res.data.data)
+            }
+          })
         }
       },
       onTableDataSelect(tableDatas){
diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index 67cfae55..8625d1cd 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -1,476 +1,76 @@
-<template>
-	<section>
-		<el-popover
-			placement="bottom"
-			width="400"
-			v-model="iterationVisible"
-			trigger="manual" >
-			<el-row>
-				<el-button
-				type="text"
-				icon="el-icon-refresh"
-				@click="refreshSelect"
-				title="重新从后台刷新数据回来"
-				>刷新</el-button>
-
-				<el-button
-					@click="addIterationVisible = true"
-					icon="el-icon-plus"
-					type="text"
-					>创建迭代</el-button>&nbsp;&nbsp;
-				<el-popover
-					placement="top-start"
-					title="更多条件、操作"
-					v-model="moreVisible"
-					width="500"
-					trigger="manual" >
-					<el-button  type="text" style="float:right;margin-top:-40px;"  @click="moreVisible=false" icon="el-icon-close">关闭</el-button>
-
-					<el-divider></el-divider>
-
-
-						<el-row>
-							<font class="more-label-font"> 迭代管理员: </font>
-              <mdp-select-user label="选择迭代管理员" v-model="filters.adminUserid"></mdp-select-user>
-						</el-row>
-						<el-row>
-							<font class="more-label-font">迭代编号:</font><el-input  v-model="filters.id"  style="width:200px;"  placeholder="输入迭代编号" clearable>
-							</el-input>
-						</el-row>
-						<el-row>
-								<font class="more-label-font">迭代名称:</font><el-input  v-model="filters.key" style="width:200px;" placeholder="模糊查询" clearable></el-input>
-						</el-row>
-
-						<el-row>
-							<font class="more-label-font">上线时间:</font>
-							<el-date-picker
-								v-model="dateRangerOnline"
-								type="daterange"
-								align="right"
-								unlink-panels
-								range-separator="至"
-								start-placeholder="开始日期"
-								end-placeholder="完成日期"
-								value-format="yyyy-MM-dd HH:mm:ss"
-								:default-time="['00:00:00','23:59:59']"
-								:picker-options="pickerOptions"
-							></el-date-picker>
-						</el-row>
-						<el-row>
-							<el-button style="float:right;" type="primary" icon="el-icon-search" @click="searchXmIterations">查询</el-button>
-						</el-row>
-					<el-button type="text" slot="reference" @click="moreVisible=!moreVisible"  icon="el-icon-search">更多条件</el-button>
-				</el-popover>
-				<el-button type="text" @click="close" style="float:right;" icon="el-icon-close">关闭</el-button>
-			</el-row>
-			<el-row
-        v-if="load.list == false && (!xmIterations || xmIterations.length == 0)"
-      >
-        <el-row v-if="linkProjectId">
-          <el-row
-            >没有查到与项目【{{
-              linkProjectId
-            }}】关联的迭代,您可以尝试&nbsp;&nbsp;
-            <el-button
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshSelect"
-              title="重新从后台刷新数据回来"
-              >刷新</el-button
-            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
-              @click="addIterationVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建迭代</el-button
-            >
-            ，并自动关联项目【{{
-              linkProjectId
-            }}】。
-          </el-row>
-        </el-row>
-        <el-row v-else>
-          <el-row
-            >没有查到相关迭代,您可以尝试&nbsp;&nbsp;
-            <el-button
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshSelect"
-              title="重新从后台刷新数据回来"
-              >刷新</el-button
-            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
-              @click="addIterationVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建迭代</el-button
-            >
-          </el-row>
-        </el-row>
-      </el-row>
-			<el-row>
-				<el-table ref="table" height="100px" v-adaptive="{bottomOffset:50}" :data="xmIterations" row-key="id"    @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
- 					<el-table-column prop="iterationName" label="迭代" >
-						<template slot-scope="scope">
-							<div class="icon" style="background-color:#409eff"><i class="el-icon-connection" ></i></div>{{scope.row.iterationName}}  <font   :color="calcFinishRate(scope.row)==100?'green':'#FF8C00'">{{calcFinishRate(scope.row)}}%</font>
-							<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="clearSelectIteration()" title="取消选中状态" icon="el-icon-circle-close"></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>
-			<div slot="reference" @click="referenceClick">
-				<slot name="reference" v-bind:iteration="editForm">
-					<div class="title">
-						<slot name="title"  v-bind:iteration="editForm">
-							<el-link title="点击选中迭代"   type="primary"  icon="el-icon-connection">
-								<div class="res-text hidden-md-and-down">
-									{{
-										editForm&&editForm.id?editForm.iterationName:'选择迭代'
-									}}
-									</div>
-
-									<div class="res-text hidden-lg-and-up">
-									{{
-										editForm&&editForm.id?editForm.iterationName:'选择迭代'
-									}}
-									</div>
-							</el-link>
-							 <el-button type="text" size="mini" title="取消选中状态" circle plain  v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelectIteration"></el-button>&nbsp;
-							</slot>
-					</div>
-				</slot>
-			</div>
-		</el-popover>
-
-
-        <el-dialog append-to-body :visible.sync="addIterationVisible" width="70%">
-          <xm-iteration-add op-type="add"
+<template> 
+<span>
+   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" placeholder="选择迭代" :props="{id:'id',name:'iterationName'}" :load-fun="listXmIterationWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
+      <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建迭代</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多迭代</el-button></el-row>
+   </mdp-select-table> 
+   
+   <mdp-dialog ref="addDialog">
+    <template v-slot="visible,data,dialog">
+      <xm-iteration-add op-type="add"
             :xm-product="productId?{ id: productId, name: '' }:null"
-			:sel-project="linkProjectId?{id:linkProjectId,name:''}:null"
-            @cancel="addIterationVisible = false"
+			      :sel-project="linkProjectId?{id:linkProjectId,name:''}:null"
+            @cancel="dialog.close()"
             @submit="afterAddSubmit"
           >
           </xm-iteration-add>
-        </el-dialog>
-	</section>
-</template>
-
-<script>
-	import util from '@/common/js/util';//全局公共库
-	import config from '@/common/config';//全局公共库
-
-	import { listXmIteration,listXmIterationWithState, delXmIteration, batchDelXmIteration } from '@/api/xm/core/xmIteration';
-	import {  loadTasksToXmIterationState } from '@/api/xm/core/xmIterationState';
-
-	import { mapGetters } from 'vuex'
-
-
-	import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
-
-	export default {
-		computed: {
-		    ...mapGetters([
-		      'userInfo','roles'
-			]),
-		},
-		props:['clearable', 'productId', 'linkProjectId','autoSelect'],
-		watch:{
-			productId:function(){
-				this.initData();
-			},
-			linkProjectId:function(){
-				this.initData();
-			}
-		},
-		data() {
-			const beginDate = new Date();
-			const endDate = new Date();
-			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
-			endDate.setTime(endDate.getTime() + 3600 * 1000 * 24 * 7 * 4 * 12 );
-			return {
-				filters: {
-					key: '',
-					queryScope:'',//迭代查询范围 iterationId\branchId\compete\''
-					id:'',//迭代编号
-					adminUserid:'',
-					adminUsername:'',
-				},
-				pickerOptions:  util.getPickerOptions('datarange'),
-				dateRangerOnline: [
-				],//上线时间选择范围
-				xmIterations: [],//查询结果
-				pageInfo:{//分页数据
-					total:0,//服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-					pageSize:10,//每页数据
-					count:true,//是否需要重新计算总记录数
-					pageNum:1,//当前页码、从1开始计算
-					orderFields:[],//排序列 如 ['sex','student_id']，必须为数据库字段
-					orderDirs:[]//升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-				},
-				load:{ list: false, edit: false, del: false, add: false },//查询中...
-				sels: [],//列表选中数据
-				dicts:{
-					//sex:[],
-				},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
- 				//新增xmIteration界面初始化数据
-				addForm: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',
-				},
-				//编辑xmIteration界面初始化数据
-				editForm: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',
-				},
-
-				editFormInit: {
-					id:'',branchId:'',iterationName:'',startTime:'',endTime:'',onlineTime:'',pid:'',adminUserid:'',adminUsername:'',ctime:'',budgetCost:'',budgetWorkload:'',distBudgetCost:'',distBudgetWorkload:'',actCost:'',actWorkload:'',actStaffNum:'',seqNo:'',
-				},
-				/**begin 自定义属性请在下面加 请加备注**/
-				maxTableHeight:300,
-				iterationVisible:false,
-				moreVisible:false,
-				hadInit:false,
-				addIterationVisible:false,
-				/**end 自定义属性请在上面加 请加备注**/
-			}
-		},//end data
-		methods: {
-			handleSizeChange(pageSize) {
-				this.pageInfo.pageSize=pageSize;
-				this.getXmIterations();
-			},
-			handleCurrentChange(pageNum) {
-				this.pageInfo.pageNum = pageNum;
-				this.getXmIterations();
-			},
-			// 表格排序 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.getXmIterations();
-			},
-			searchXmIterations(){
-				 this.pageInfo.count=true;
-				 this.getXmIterations();
-			},
-			//获取列表 XmIteration 迭代定义
-			getXmIterations() {
-				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+"%"
-				}
-				if(this.productId){
-					params.productId=this.productId
-				}
-
-				if(this.linkProjectId){
-					params.linkProjectId=this.linkProjectId
-				}
-				if(this.filters.adminUserid){
-					params.adminUserid=this.filters.adminUserid
-				}
-				if(this.dateRangerOnline && this.dateRangerOnline.length==2){
-					params.onlineTimeStart=this.dateRangerOnline[0]
-					params.onlineTimeEnd=this.dateRangerOnline[1]
-				}
-				this.load.list = true;
-				listXmIterationWithState(params).then((res) => {
-					var tips=res.data.tips;
-					if(tips.isOk){
-						this.pageInfo.total = res.data.total;
-						this.pageInfo.count=false;
-						this.xmIterations = res.data.data;
-						var key=""
-						if(this.productId){
-							key='xm-iteration-select-list-prd-'+this.productId
-							sessionStorage.setItem(key,JSON.stringify(this.xmIterations))
-						}else if(this.linkProjectId){
-							key='xm-iteration-select-list-prj-'+this.linkProjectId
-							sessionStorage.setItem(key,JSON.stringify(this.xmIterations))
-						}
-
-						if(this.autoSelect===true&&this.xmIterations.length>0){
-							if(this.autoSelect!==false&&this.xmIterations.length>0 && this.iterationVisible==false){
-								var row=this.xmIterations[0];
-								this.$refs.table.setCurrentRow(row);
-								this.rowClick(row)
-							}
-						}else{
-							if(this.xmIterations.length==0 && this.moreVisible==false){
-								if(this.editForm && this.editForm.id){
-									this.clearSelectIteration()
-								}
-							}
-						}
-					}else{
-						this.$notify({position:'bottom-left',showClose:true,message: tips.msg, type: 'error' });
-					}
-					this.load.list = false;
-				}).catch( err => this.load.list = false );
-			},
-
-			//选择行xmIteration
-			selsChange: function (sels) {
-				this.sels = sels;
-			},
-			rowClick: function(row, event, column){
-				var oldId=this.editForm&&this.editForm.id?this.editForm.id:null
-				this.editForm=row
-				this.iterationVisible=false;
-				this.moreVisible=false;
-				if(oldId!=this.editForm.id){
-					this.$emit("change",row)
-				}
-				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
-			},
-			/**end 自定义函数请在上面加**/
-			calcFinishRate(row){
-				if(row.finishRate){
-					return parseInt(row.finishRate);
-				}else{
-					return 0;
-				}
-			},
-			close(){
-				this.iterationVisible=false;
-				this.$emit("close")
-			},
-			initData(){
-				var key=""
-				if(this.productId){
-					key='xm-iteration-select-list-prd-'+this.productId
-				}else if(this.linkProjectId){
-					key='xm-iteration-select-list-prj-'+this.linkProjectId
-				}
-
-				if(key){
-					var xmIterationStr=sessionStorage.getItem(key);
-					if(xmIterationStr && xmIterationStr!='null' && xmIterationStr!='undefined'){
-						this.xmIterations=JSON.parse(xmIterationStr);
-						if(this.autoSelect!==false&&this.xmIterations.length>0 && this.iterationVisible==false){
-							var row=this.xmIterations[0];
-							this.$refs.table.setCurrentRow(row);
-							this.rowClick(row)
-						}else{
-							this.clearSelectIteration()
-						}
-					}else{
-						this.searchXmIterations();
-					}
-				}else{
-					this.searchXmIterations();
-				}
-			},
-
-
-			clearSelectIteration(){
-				var oldId=this.editForm.id
-				this.editForm=this.editFormInit
-				this.$refs.table.setCurrentRow();
-				if(oldId!=this.editForm.id){
-					this.$emit("change",null)
-				}
-				this.iterationVisible=false;
-				this.moreVisible=false;
-				this.$emit('clear',null );//  @row-click="rowClick"
-			},
-			refreshSelect() {
-				this.searchXmIterations();
-				this.moreVisible = false;
-			},
-			referenceClick(){
-				if(!this.hadInit){
-					this.initData();
-					this.hadInit=true;
-				}
-				this.iterationVisible=!this.iterationVisible;
-			},
-			reloadOne(){
-				listXmIterationWithState({id:this.editForm.id}).then((res) => {
-					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)
-					}
-				})
-			},
-
-			afterAddSubmit(row) {
-				this.xmIterations.push(row);
-				if (this.productId) {
-					map.set(this.productId, this.xmIterations);
-				} else if (this.linkProjectId) {
-					map.set(this.linkProjectId, this.xmIterations);
-				}
-				if (
-					this.autoSelect !== false &&
-					this.xmIterations.length > 0 &&
-					this.iterationVisible == false
-				) {
-					var row = this.xmIterations[0];
-					this.$refs.table.setCurrentRow(row);
-					this.rowClick(row);
-				}
-				this.addIterationVisible = false;
-			},
-		},//end methods
-		components: {
-			
-			XmIterationAdd,
-		    //在下面添加其它组件
-		},
-		mounted() {
-			this.$nextTick(() => {
-
-			this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);
-
-			if(this.autoSelect!==false){
-					this.initData();
-					this.hadInit=true;
-				}
-        	});
-
-		}
-	}
-
+    </template>
+  </mdp-dialog>
+</span>
+</template> 
+
+<script>  
+
+ import { listXmIterationWithState } from "@/api/xm/core/xmIteration";
+import XmIterationAdd from "../xmIteration/XmIterationEdit.vue";
+export default {
+  components: { XmIterationAdd },
+  name: 'xm-iteration-select',
+    props:{ 
+    /**
+     * 项目编号
+     */
+      linkProjectId:{
+      type:String,
+      default:null,
+    }, 
+    productId:{
+      type:String,
+      default:null,
+    }
+    
+  },
+  data(){
+    return { 
+      myVal:null,
+    }
+  },
+  methods:{
+    listXmIterationWithState, 
+    afterAddSubmit(row){  
+      this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
+    },
+    onChange2(row){ 
+      debugger;
+      this.$emit("selected", row); 
+      this.$emit("change2", row);
+    },
+    onChange(val){ 
+      this.$emit("change", val);
+      this.$emit("input",val);
+    },
+    onClear(){ 
+      this.$emit("clear");
+    },
+    onRowClick(row){
+      this.$emit('row-click',row)
+    }
+  },
+  mounted(){
+       
+  }, 
+}
 </script>
+<style lang="scss" scoped>   
 
-<style rel="stylesheet/scss" lang="scss" scoped>
-
-  .font-class{
-	  color: rgba(116, 85, 85, 0.493);
-  }
-
-.align-right{
-	float: right;
-}
-.title {
-	height: 32px;
-	line-height: 32px;
-	text-align: left;
-	float: left;
-	min-width: 100px;
-  	cursor: pointer;
-}
-</style>
+</style> 
+  
\ No newline at end of file
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 87475307..ae3a98b0 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -1,539 +1,70 @@
-<template>
-  <section>
-    <el-popover
-      placement="bottom"
-      width="400"
-      trigger="manual"
-      v-model="productVisible"
-    >
-      <el-row>
-        <el-button
-          type="text"
-          icon="el-icon-refresh"
-          @click="refreshSelect"
-          title="重新从后台刷新数据回来"
-          >刷新</el-button
-        >
-		<el-button
-              @click="addProductVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建产品</el-button>&nbsp;&nbsp;
-        <el-popover
-          placement="top-start"
-          title="更多条件、操作"
-          width="500"
-          v-model="moreVisible"
-          trigger="manual"
-        >
-
-              <el-button type="text" style="float:right;margin-top:-40px;" @click="moreVisible = false" icon="el-icon-close"
-                >关闭</el-button>
-          <el-row>
-
-						<el-divider></el-divider>
-
-            <el-row>
-              <font class="more-label-font"> 产品经理: </font>
-              <mdp-select-user label="选择产品经理" v-model="filters.pmUserid"></mdp-select-user>
-             </el-row>
-            <el-row>
-              <font class="more-label-font">产品编号:</font>
-              <el-input
-                v-model="filters.id"
-                style="width: 200px;"
-                placeholder="输入产品编号"
-                 clearable
-              >
-              </el-input>
-            </el-row>
-
-            <el-row>
-              <font class="more-label-font"> 产品名称: </font>
-              <el-input
-                v-model="filters.key"
-                style="width: 200px;" clearable
-                placeholder="输入产品名字关键字"
-              >
-              </el-input>
-            </el-row>
-
-
-            <el-row>
-              <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 HH:mm:ss"
-                :default-time="['00:00:00', '23:59:59']"
-                :picker-options="pickerOptions"
-              ></el-date-picker>
-            </el-row>
-            <el-row>
-              <el-button type="primary" style="float:right;" @click="searchXmProducts" icon="el-icon-search"
-                >查询</el-button
-              >
-            </el-row>
-          </el-row>
-          <el-button
-            type="text"
-            slot="reference"
-            @click="moreVisible = !moreVisible" icon="el-icon-search"
-            >更多条件</el-button
-          >
-        </el-popover>
-        <el-button
-          style="float: right"
-          type="text"
-          @click="close"
-          icon="el-icon-close"
-          title="关闭当前窗口"
-          >关闭</el-button
-        >
-      </el-row>
-      <el-row
-        v-if="load.list == false && (!xmProducts || xmProducts.length == 0)"
+<template> 
+<span>
+   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" placeholder="选择产品" :props="{id:'id',name:'productName'}" :load-fun="listXmProductWithState" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
+      <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建产品</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多产品</el-button></el-row>
+   </mdp-select-table> 
+   
+   <mdp-dialog ref="addDialog">
+    <template v-slot="visible,data,dialog">
+      <xm-product-add op-type="add"
+        :sel-project="{ id: linkProjectId, name: '' }"
+        @cancel="dialog.close()"
+        @submit="afterAddSubmit"
       >
-        <el-row v-if="linkProjectId">
-          <el-row
-            >没有查到与项目【{{
-              linkProjectId
-            }}】关联的产品,您可以尝试&nbsp;&nbsp;
-            <el-button
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshSelect"
-              title="重新从后台刷新数据回来"
-              >刷新</el-button
-            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
-              @click="addProductVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建产品</el-button
-            >
-            ，并自动关联项目【{{
-              linkProjectId
-            }}】，或者到【项目->关联产品->加入更多产品到项目】手动关联一个已存在的产品。
-          </el-row>
-        </el-row>
-        <el-row v-else>
-          <el-row
-            >没有查到相关产品,您可以尝试&nbsp;&nbsp;
-            <el-button
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshSelect"
-              title="重新从后台刷新数据回来"
-              >刷新</el-button
-            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
-              @click="addProductVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建产品</el-button
-            >
-          </el-row>
-        </el-row>
-      </el-row>
-      <el-row>
-        <!--列表 XmProduct 产品表-->
-        <el-table
-          ref="table"
-          height="100px" v-adaptive="{bottomOffset:50}"
-          :data="xmProducts"
-          :row-class-name="tableRowClassName"
-          @sort-change="sortChange"
-          :highlight-current-row="true"
-          current-row-key="id"
-          v-loading="load.list"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%"
-        >
-          <el-table-column prop="productName" label="产品名称">
-            <template slot="header" slot-scope="scope"> 产品名称 </template>
-            <template slot-scope="scope">
-              <div class="icon" style="background-color:#409eff"><i class="el-icon-s-opportunity" ></i></div><font>{{ scope.row.productName }}</font>
-              <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="clearSelect()" title="取消选中状态" icon="el-icon-circle-close"></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>
-      <div slot="reference" @click="referenceClick">
-        <slot name="reference" v-bind:product="editForm">
-
-              <div class="title">
-              <slot name="title" v-bind:product="editForm">
-                <el-link
-                  title="产品，点击选择、清除选择"
-                  type="primary"
-                  v-loading="load.list"
-                  icon="el-icon-s-opportunity"
-              >
-              <div class="res-text hidden-md-and-down">
-              {{
-                editForm && editForm.id ? editForm.productName : "选择产品"
-              }}
-              </div>
-
-              <div class="res-text hidden-lg-and-up">
-              {{
-                editForm && editForm.id ? editForm.productName : "选择产品"
-              }}
-              </div>
-              </el-link>
-              <el-button  type="text" size="mini" title="取消选中状态" circle plain v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>&nbsp;
-            </slot>
-              </div>
-
-
-        </slot>
-        </div>
-    </el-popover>
-
-        <el-dialog append-to-body :visible.sync="addProductVisible" width="70%">
-          <xm-product-add op-type="add"
-            :sel-project="{ id: linkProjectId, name: '' }"
-            @cancel="addProductVisible = false"
-            @submit="afterAddSubmit"
-          >
-          </xm-product-add>
-        </el-dialog>
-  </section>
-</template>
+      </xm-product-add>
+    </template>
+  </mdp-dialog>
+</span>
+</template> 
 
-<script>
-import util from "@/common/js/util"; //全局公共库
-//import Sticky from '@/components/Sticky' // 粘性header组件
-
-import { listXmProductWithState } from "@/api/xm/core/xmProduct";
-import { mapGetters } from "vuex";
+<script>  
 
+ import { listXmProductWithState } from "@/api/xm/core/xmProduct";
 import XmProductAdd from "../xmProduct/XmProductEdit.vue";
-const map = new Map();
-
 export default {
-  props: ["dialog", "linkProjectId", "iterationId", "autoSelect"],
-  computed: {
-    ...mapGetters(["userInfo", "roles"]),
+  components: { XmProductAdd },
+  name: 'xm-product-select',
+    props:{ 
+    /**
+     * 项目编号
+     */
+      linkProjectId:{
+      type:String,
+      default:null,
+    }, 
   },
-  watch: {
-    iterationId() {
-      this.initData();
-    },
-
-    linkProjectId() {
-      this.initData();
-    },
+  data(){
+    return { 
+      myVal:null,
+    }
   },
-  data() {
-    const beginDate = new Date();
-    const endDate = new Date();
-    beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12);
-    return {
-      filters: {
-        key: "",
-        id: "", //产品编号
-        pmUserid:'',
-        pmUsername:'',
-      },
-      xmProducts: [], //查询结果
-      pageInfo: {
-        //分页数据
-        total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 10, //每页数据
-        count:true, //是否需要重新计算总记录数
-        pageNum: 1, //当前页码、从1开始计算
-        orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
-        orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-      },
-      load: { list: false, edit: false, del: false, add: false }, //查询中...
-      sels: [], //列表选中数据
-      dicts: {}, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
-      //新增xmProduct界面初始化数据
-      addForm: {
-        id: "",
-        productName: "",
-        branchId: "",
-        remark: "",
-      },
-
-      //编辑xmProduct界面初始化数据
-      editForm: {
-        id: "",
-        productName: "",
-        branchId: "",
-        remark: "",
-      },
-      selectFiltersPmUserVisible: false,
-      maxTableHeight: 300,
-      dateRanger: [],
-      pickerOptions: util.getPickerOptions("datarange"),
-      productVisible: false,
-      moreVisible: false,
-      hadInit: false,
-      addProductVisible: false,
-      /**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();
+  methods:{
+    listXmProductWithState, 
+    afterAddSubmit(row){  
+      this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
     },
-    //获取列表 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 + "%";
-      }
-      if (this.linkProjectId) {
-        params.linkProjectId = this.linkProjectId;
-      }
-      if (this.linkIterationId) {
-        params.linkIterationId = this.linkIterationId;
-      }
-      if (this.filters.id) {
-        params.id = this.filters.id;
-      }
-
-      if (this.filters.pmUserid) {
-        params.pmUserid = this.filters.pmUserid;
-      }
-      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;
-
-            var key=""
-						if(this.iterationId){
-							key='xm-product-select-list-it-'+this.iterationId
-							sessionStorage.setItem(key,JSON.stringify(this.xmProducts))
-						}else if(this.linkProjectId){
-							key='xm-product-select-list-prj-'+this.linkProjectId
-							sessionStorage.setItem(key,JSON.stringify(this.xmProducts))
-						}
-
-            if (
-              this.autoSelect !== false &&
-              this.xmProducts.length > 0 &&
-              this.productVisible == false
-            ) {
-              var row = this.xmProducts[0];
-              this.$refs.table.setCurrentRow(row);
-              this.rowClick(row);
-            }else{
-				if(this.xmProducts.length==0 && this.moreVisible==false ){
-					if(this.editForm && this.editForm.id){
-						this.clearSelect()
-					}
-				}
-			}
-          } else {
-            this.$notify({
-              position: "bottom-left",
-              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.editForm = row;
-      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
-      this.selectedProduct(row);
-      this.productVisible = false;
-      this.moreVisible = false;
-    },
-    selectedProduct: function (row) {
-      this.editForm = row;
-      this.$emit("selected", row);
-      this.productVisible = false;
-      this.moreVisible = false;
+    onChange2(row){ 
+      debugger;
+      this.$emit("selected", row); 
+      this.$emit("change2", row);
     },
-
-    tableRowClassName({ row, rowIndex }) {
-      if (row && this.editForm && row.id == this.editForm.id) {
-        return "success-row";
-      }
-      return "";
+    onChange(val){ 
+      this.$emit("change", val);
+      this.$emit("input",val);
     },
-    clearSelect() {
-      this.$refs.table.setCurrentRow();
+    onClear(){ 
       this.$emit("clear");
-      this.selectedProduct(null);
-      this.productVisible = false;
-      this.moreVisible = false;
     },
-    refreshSelect() {
-      this.searchXmProducts();
-      this.moreVisible = false;
-    },
-    close() {
-      this.productVisible = false;
-      this.moreVisible = false;
-      this.$emit("close");
-    },
-
-    initData() {
-      var key=""
-      if(this.iterationId){
-        key='xm-product-select-list-it-'+this.iterationId
-      }else if(this.linkProjectId){
-        key='xm-product-select-list-prj-'+this.linkProjectId
-      }
-
-      if(key){
-        var xmProductStr=sessionStorage.getItem(key);
-        if(xmProductStr && xmProductStr!='null' && xmProductStr!='undefined'){
-          this.xmProducts = JSON.parse(xmProductStr);
-          if (this.productVisible == false) {
-            if (this.autoSelect !== false && this.xmProducts.length > 0) {
-              var row = this.xmProducts[0];
-              this.$refs.table.setCurrentRow(row);
-              this.rowClick(row);
-            }
-          }
-        } else {
-          this.searchXmProducts();
-        }
-      } else {
-        this.searchXmProducts();
-      }
-    },
-    referenceClick() {
-      if (!this.hadInit) {
-        this.initData();
-        this.hadInit = true;
-      }
-      this.productVisible = !this.productVisible;
-    },
-
-    reloadOne() {
-      listXmProductWithState({ id: this.editForm.id }).then((res) => {
-        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);
-        }
-      });
-    },
-    afterAddSubmit(row) {
-      this.xmProducts.push(row);
-      if (this.iterationId) {
-        map.set(this.iterationId, this.xmProducts);
-      } else if (this.linkProjectId) {
-        map.set(this.linkProjectId, this.xmProducts);
-      }
-      if (
-        this.autoSelect !== false &&
-        this.xmProducts.length > 0 &&
-        this.productVisible == false
-      ) {
-        var row = this.xmProducts[0];
-        this.$refs.table.setCurrentRow(row);
-        this.rowClick(row);
-      }
-      this.addProductVisible = false;
-    },
-  }, //end methods
-  components: {
-    
-    XmProductAdd,
-    //在下面添加其它组件
+    onRowClick(row){
+      this.$emit('row-click',row)
+    }
   },
-  mounted() {
-    this.$nextTick(() => {
-      this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
-      if (this.autoSelect !== false) {
-        this.initData();
-        this.hadInit = true;
-      }
-    });
-  },
-};
-</script>
-<style scoped>
-.align-right {
-  float: right;
-}
-.title {
-  height: 32px;
-  line-height: 32px;
-  text-align: left;
-  float: left;
-  min-width: 100px;
-  cursor: pointer;
+  mounted(){
+       
+  }, 
 }
-</style>
+</script>
+<style lang="scss" scoped>   
+
+</style> 
+  
\ No newline at end of file
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index c2125f45..c75ddf03 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -1,540 +1,73 @@
-<template>
-  <section>
-    <el-popover
-      placement="bottom"
-      width="400"
-      trigger="manual"
-      v-model="projectVisible"
-    >
-	  <el-row>
-        <el-button
-          type="text"
-          icon="el-icon-refresh"
-          @click="refreshSelect"
-          title="重新从后台刷新数据回来"
-          >刷新</el-button
-        >
-		<el-button
-              @click="addProjectVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建项目</el-button>
-                <el-popover
-                  placement="top-start"
-                  title="更多条件、操作"
-                  width="500"
-                  v-model="moreVisible"
-                  trigger="manual"
-                >
-                <el-button type="text" icon="el-icon-close" @click="moreVisible = false" style="float:right;margin-top:-40px;"
-                        >关闭</el-button
-                      >
-                  <el-row>
-
-								<el-divider></el-divider>
-
-                    <el-row>
-                      <font class="more-label-font"> 项目经理: </font>
-                      <mdp-select-user label="选择项目经理" v-model="filters.pmUserid"></mdp-select-user>
-                     </el-row>
-                    <el-row>
-                      <font class="more-label-font">项目编号:</font>
-                      <el-input
-                        v-model="filters.id"
-                        style="width: 200px;"
-                        placeholder="输入项目编号"
-                         clearable
-                      >
-                      </el-input>
-                    </el-row>
-
-                    <el-row>
-                      <font class="more-label-font"> 项目名称: </font>
-                      <el-input
-                        v-model="filters.key"
-                        style="width: 200px;"
-                        placeholder="输入项目名字关键字"
-                         clearable
-                      >
-                      </el-input>
-                    </el-row>
-
-                    <el-row>
-                      <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 HH:mm:ss"
-                        :default-time="['00:00:00', '23:59:59']"
-                        :picker-options="pickerOptions"
-                      ></el-date-picker>
-                    </el-row>
-                    <el-row>
-                      <el-button type="primary" @click="searchXmProjects" style="float:right;" icon="el-icon-search"
-                        >查询</el-button
-                      >
-                    </el-row>
-                  </el-row>
-                  <el-button
-                    type="text"
-                    slot="reference"
-                    @click="moreVisible = !moreVisible"
-                    icon="el-icon-search"
-                    >更多条件</el-button
-                  >
-                </el-popover>
-				<el-button
-				style="float: right"
-				type="text"
-				@click="close"
-				icon="el-icon-close"
-				title="关闭当前窗口"
-				>关闭</el-button
-				>
-	  </el-row>
-      <el-row
-        v-if="load.list == false && (!xmProjects || xmProjects.length == 0)"
+<template> 
+<span>
+   <mdp-select-table v-model="myVal" ref="selectTableRef" show-style="tag" placeholder="选择项目" :props="{id:'id',name:'productName'}" :load-fun="listXmProject" :params="{linkProjectId:linkProjectId}" @change2="onChange2" @clear="onClear" @change="onChange" @click="onRowClick">
+      <el-row slot="toolbar"><el-button size="mini" icon="el-icon-plus" @click="$refs['addDialog'].open()">创建项目</el-button><el-button size="mini" icon="el-icon-search" @click="$refs['selectTableRef'].$refs['tableDialog'].open()">更多项目</el-button></el-row>
+   </mdp-select-table> 
+   
+   <mdp-dialog ref="addDialog">
+    <template v-slot="visible,data,dialog">
+      <xm-project-add op-type="add"
+        :xm-product="{ id: linkProductId, name: '' }"
+        @cancel="dialog.close()"
+        @submit="afterAddSubmit"
       >
-        <el-row v-if="linkProductId">
-          <el-row
-            >没有查到与产品【{{
-              linkProductId
-            }}】关联的项目,您可以尝试&nbsp;&nbsp;
-            <el-button
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshSelect"
-              title="重新从后台刷新数据回来"
-              >刷新</el-button
-            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
-              @click="addProjectVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建项目</el-button
-            >
-            ，并自动关联产品【{{
-              linkProductId
-            }}】，或者到【产品->关联项目->加入更多项目到产品】手动关联一个已存在的项目。
-          </el-row>
-        </el-row>
-        <el-row v-else>
-          <el-row
-            >没有查到相关项目,您可以尝试&nbsp;&nbsp;
-            <el-button
-              type="text"
-              icon="el-icon-refresh"
-              @click="refreshSelect"
-              title="重新从后台刷新数据回来"
-              >刷新</el-button
-            >&nbsp;&nbsp; 重新从后台加载，或者<el-button
-              @click="addProjectVisible = true"
-              icon="el-icon-plus"
-              type="text"
-              >创建项目</el-button
-            >
-          </el-row>
-        </el-row>
-      </el-row>
-      <el-row>
-        <!--列表 XmProject 项目表-->
-        <el-table
-          ref="table"
-          height="100px" v-adaptive="{bottomOffset:50}"
-          :data="xmProjects"
-          :row-class-name="tableRowClassName"
-          @sort-change="sortChange"
-          :highlight-current-row="true"
-          current-row-key="id"
-          v-loading="load.list"
-          border
-          @selection-change="selsChange"
-          @row-click="rowClick"
-          style="width: 100%"
-        >
-          <el-table-column prop="name" label="项目名称">
-            <template slot="header" slot-scope="scope">
-              项目名称
-            </template>
-            <template slot-scope="scope">
-             <div class="icon" style="background-color:#ffd04b"><i class="el-icon-odometer" ></i></div><font>{{ scope.row.name }}</font>
-             <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="clearSelect()" title="取消选中状态" icon="el-icon-circle-close"></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>
-      <span slot="reference" @click="referenceClick">
-        <slot name="reference" v-bind:project="editForm"
-          >
-             <span class="title">
-              <slot name="title" v-bind:project="editForm">
-              <el-link
-              title="项目，点击选择、清除选择"
-              type="warning"
-              icon="el-icon-odometer"
-              >
-              <div class="res-text hidden-md-and-down">
-              {{
-                editForm && editForm.id ? editForm.name: "选择项目"
-              }}
-              </div>
-
-              <div class="res-text hidden-lg-and-up">
-              {{
-               editForm && editForm.id ? editForm.name: "选择项目"
-              }}
-              </div>
-              </el-link>
-              <el-button type="text" size="mini" title="取消选中状态" circle plain v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>
-            </slot>
-              </span>
-        </slot>
-      </span>
-    </el-popover>
+      </xm-project-add>
+    </template>
+  </mdp-dialog>
+</span>
+</template> 
 
-        <el-dialog append-to-body :visible.sync="addProjectVisible" width="70%" top="20px">
-          <xm-project-add
-		  	:op-type="'add'"
-            :xm-product="{ id: linkProductId, name: '' }"
-            @cancel="addProjectVisible = false"
-            @submit="afterAddSubmit"
-          >
-          </xm-project-add>
-        </el-dialog>
-  </section>
-</template>
-
-<script>
-import util from "@/common/js/util"; //全局公共库
-//import Sticky from '@/components/Sticky' // 粘性header组件
+<script>  
 
 import { listXmProject } from "@/api/xm/core/xmProject";
-import { mapGetters } from "vuex";
-const map = new Map();
+import { mapGetters } from "vuex"; 
 
 import XmProjectAdd from "../xmProject/XmProjectEdit.vue";
 
 export default {
-  props: ["linkProductId", "linkIterationId", "autoSelect"],
-  computed: {
-    ...mapGetters(["userInfo", "roles"]),
+  components: { XmProjectAdd },
+  name: 'xm-project-select',
+    props:{ 
+    /**
+     * 项目编号
+     */
+      linkProductId:{
+      type:String,
+      default:null,
+    }, 
   },
-  watch: {
-    linkIterationId() {
-      this.initData();
-    },
-
-    linkProductId() {
-      this.initData();
-    },
+  data(){
+    return { 
+      myVal:null,
+    }
   },
-  data() {
-    const beginDate = new Date();
-    const endDate = new Date();
-    beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12);
-    return {
-      filters: {
-        key: "",
-        id: "", //项目编号
-        pmUserid:'',
-        pmUsername:'',
-      },
-      xmProjects: [], //查询结果
-      pageInfo: {
-        //分页数据
-        total: 0, //服务器端收到0时，会自动计算总记录数，如果上传>0的不自动计算。
-        pageSize: 10, //每页数据
-        count:true, //是否需要重新计算总记录数
-        pageNum: 1, //当前页码、从1开始计算
-        orderFields: [], //排序列 如 ['sex','student_id']，必须为数据库字段
-        orderDirs: [], //升序 asc,降序desc 如 性别 升序、学生编号降序 ['asc','desc']
-      },
-      load: { list: false, edit: false, del: false, add: false }, //查询中...
-      sels: [], //列表选中数据
-      dicts: {}, //下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]}
-
-      //新增xmProject界面初始化数据
-      addForm: {
-        id: "",
-        name: "",
-        branchId: "",
-        remark: "",
-      },
-
-      //编辑xmProject界面初始化数据
-      editForm: {
-        id: "",
-        name: "",
-        branchId: "",
-        remark: "",
-      },
-      selectFiltersPmUserVisible: false,
-      maxTableHeight: 300,
-      dateRanger: [],
-      pickerOptions: util.getPickerOptions("datarange"),
-      projectVisible: false,
-      moreVisible: false,
-      hadInit: false,
-	  addProjectVisible:false,
-    };
-  }, //end data
-  methods: {
-    handleSizeChange(pageSize) {
-      this.pageInfo.pageSize = pageSize;
-      this.getXmProjects();
-    },
-    handleCurrentChange(pageNum) {
-      this.pageInfo.pageNum = pageNum;
-      this.getXmProjects();
-    },
-    // 表格排序 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.getXmProjects();
-    },
-    searchXmProjects() {
-      this.pageInfo.count = true;
-      this.getXmProjects();
-    },
-    //获取列表 XmProject 项目表
-    getXmProjects() {
-      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 + "%";
-      }
-      if (this.linkProductId) {
-        params.linkProductId = this.linkProductId;
-      }
-      if (this.linkIterationId) {
-        params.linkIterationId = this.linkIterationId;
-      }
-      if (this.filters.id) {
-        params.id = this.filters.id;
-      }
-
-      if (this.filters.pmUserid) {
-        params.pmUserid = this.filters.pmUserid;
-      }
-      this.load.list = true;
-      listXmProject(params)
-        .then((res) => {
-          var tips = res.data.tips;
-          if (tips.isOk) {
-            this.pageInfo.total = res.data.total;
-            this.pageInfo.count = false;
-            this.xmProjects = res.data.data;
-
-            var key=""
-						if(this.linkIterationId){
-							key='xm-project-select-list-it-'+this.linkIterationId
-							sessionStorage.setItem(key,JSON.stringify(this.xmProjects))
-						}else if(this.linkProductId){
-							key='xm-project-select-list-prd-'+this.linkProductId
-							sessionStorage.setItem(key,JSON.stringify(this.xmProjects))
-						}
-            if (
-              this.autoSelect !== false &&
-              this.xmProjects.length > 0 &&
-              this.projectVisible == false
-            ) {
-              var row = this.xmProjects[0];
-              this.$refs.table.setCurrentRow(row);
-              this.rowClick(row);
-            } else{
-				if(this.xmProjects.length==0  && this.moreVisible==false){
-					if(this.editForm && this.editForm.id){
-						this.clearSelect()
-					}
-				}
-			}
-          } else {
-            this.$notify({
-              position: "bottom-left",
-              showClose: true,
-              message: tips.msg,
-              type: "error",
-            });
-          }
-          this.load.list = false;
-        })
-        .catch((err) => (this.load.list = false));
+  methods:{
+    listXmProject, 
+    afterAddSubmit(row){  
+      this.$refs['selectTableRef'].onTableDataSelect(this.multiple?[row]:row)
     },
-
-    //选择行xmProject
-    selsChange: function (sels) {
-      this.sels = sels;
-    },
-
-    rowClick: function (row, event, column) {
-      this.editForm = row;
-      this.$emit("row-click", row, event, column); //  @row-click="rowClick"
-      this.selectedProject(row);
-      this.projectVisible = false;
-      this.moreVisible = false;
+    onChange2(row){ 
+      debugger;
+      this.$emit("selected", row); 
+      this.$emit("change2", row);
     },
-    selectedProject: function (row) {
-      this.editForm = row;
-      this.$emit("selected", row);
-      this.projectVisible = false;
-      this.moreVisible = false;
+    onChange(val){ 
+      this.$emit("change", val);
+      this.$emit("input",val);
     },
-
-    tableRowClassName({ row, rowIndex }) {
-      if (row && this.editForm && row.id == this.editForm.id) {
-        return "success-row";
-      }
-      return "";
-    },
-    clearSelect() {
-      this.$refs.table.setCurrentRow();
+    onClear(){ 
       this.$emit("clear");
-      this.selectedProject(null);
-      this.projectVisible = false;
-      this.moreVisible = false;
-    },
-
-    refreshSelect() {
-      this.searchXmProjects();
-      this.moreVisible = false;
-    },
-    close() {
-      this.projectVisible = false;
-      this.moreVisible = false;
-      this.$emit("close");
-    },
-
-    initData() {
-
-      var key=""
-      if(this.linkIterationId){
-        key='xm-project-select-list-it-'+this.linkIterationId
-      }else if(this.linkProductId){
-        key='xm-project-select-list-prd-'+this.linkProductId
-      }
-
-      if(key){
-        var xmProjectStr=sessionStorage.getItem(key);
-        if(xmProjectStr && xmProjectStr!='null' && xmProjectStr!='undefined'){
-          this.xmProjects = JSON.parse(xmProjectStr);
-          if (this.projectVisible == false) {
-            if (this.autoSelect !== false && this.xmProjects.length > 0) {
-              var row = this.xmProjects[0];
-              this.$refs.table.setCurrentRow(row);
-              this.rowClick(row);
-            }
-          }
-        } else {
-          this.searchXmProjects();
-        }
-      } else {
-        this.searchXmProjects();
-      }
-    },
-
-    referenceClick() {
-      if (!this.hadInit) {
-        this.initData();
-        this.hadInit = true;
-      }
-      this.projectVisible = !this.projectVisible;
-    },
-    reloadOne() {
-      listXmProject({ id: this.editForm.id }).then((res) => {
-        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);
-        }
-      });
     },
-
-    afterAddSubmit(row) {
-      this.xmProjects.push(row);
-      if (this.iterationId) {
-        map.set(this.iterationId, this.xmProjects);
-      } else if (this.linkProjectId) {
-        map.set(this.linkProductId, this.xmProjects);
-      }
-      if (
-        this.autoSelect !== false &&
-        this.xmProjects.length > 0 &&
-        this.projectVisible == false
-      ) {
-        var row = this.xmProjects[0];
-        this.$refs.table.setCurrentRow(row);
-        this.rowClick(row);
-      }
-      this.addProjectVisible = false;
-    },
-  }, //end methods
-  components: { XmProjectAdd,
-    //在下面添加其它组件
-  },
-  mounted() {
-    this.$nextTick(() => {
-      if (this.$refs.table) {
-        this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el);
-      }
-
-      if (this.autoSelect !== false) {
-        this.initData();
-        this.hadInit = true;
-      }
-    });
+    onRowClick(row){
+      this.$emit('row-click',row)
+    }
   },
-};
-</script>
-<style scoped>
-.align-right {
-  float: right;
-}
-.title {
-  height: 32px;
-  line-height: 32px;
-  text-align: left;
-  float: left;
-  min-width: 100px;
-  cursor: pointer;
+  mounted(){
+       
+  }, 
 }
-</style>
+</script>
+<style lang="scss" scoped>   
+
+</style> 
+  
\ No newline at end of file