From a167d072e23568a51d643d05cfc8d406a2c559f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sat, 26 Mar 2022 02:12:16 +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

---
 .../XmProductSelect.vue                       | 268 +++++++++---------
 src/views/xm/core/xmGroup/XmGroupMng.vue      |   2 +-
 src/views/xm/core/xmGroup/XmGroupSelect.vue   |   2 +-
 .../xm/core/xmIteration/XmIterationAdd.vue    |   2 +-
 .../XmIterationLinkForProduct.vue             |   2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue        |   2 +-
 src/views/xm/core/xmMenu/XmMenuSelect.vue     |   2 +-
 .../xmProduct/XmProductForLinkComplex.vue     |   2 +-
 src/views/xm/core/xmProduct/XmProductMng.vue  |   2 +-
 .../XmProductProjectLinkMng.vue               |   2 +-
 .../xmProject/XmProjectForLinkComplex.vue     |   2 +-
 src/views/xm/core/xmProject/XmProjectMng.vue  |   2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |   2 +-
 src/views/xm/core/xmTask/XmTaskMng.vue        |   2 +-
 .../xm/core/xmTestCase/XmTestCaseMng.vue      |   2 +-
 .../core/xmTestCaseExec/XmTestCaseExecMng.vue |   2 +-
 16 files changed, 142 insertions(+), 156 deletions(-)
 rename src/views/xm/core/{xmProduct => components}/XmProductSelect.vue (50%)

diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
similarity index 50%
rename from src/views/xm/core/xmProduct/XmProductSelect.vue
rename to src/views/xm/core/components/XmProductSelect.vue
index 96cab2ae..3189893c 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -1,87 +1,81 @@
 <template>
 	<section>  
-		<el-row > 
-			<!--列表 XmProduct 产品表-->
-			<el-table  ref="table" :height="maxTableHeight" :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 label="序号" type="index" width="50"  >  </el-table-column>
-				<el-table-column  v-if="isSelectProduct==true"  label="产品编码" prop="id" min-width="100" show-overflow-tooltip >  </el-table-column>
-				  <el-table-column prop="productName"  label="产品名称"    show-overflow-tooltip> 
-					 <template slot="header" slot-scope="scope"> 
-						 产品名称 <el-button type="text" @click="clearSelect">清空所选</el-button>&nbsp;<el-button type="text" @click="close">关闭</el-button>
-						 <el-popover
-							placement="top-start"
-							title=""
+			<el-popover  
+							placement="bottom"
 							width="400"
-							trigger="hover" >
-							<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="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'"  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 HH:mm:ss"
-										: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   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   v-else @click="selectFiltersPmUser()">选责任人</el-button>
-									<el-button    @click="setFiltersPmUserAsMySelf()">我的</el-button>
-								</el-col>
-								<el-col  :span="24"  style="padding-top:5px;">
-									<el-button type="primary"  @click="searchXmProducts" >查询</el-button>
-								</el-col>
-							</el-row> 
-							<el-button type="text" slot="reference" style="float:right;">更多条件</el-button>
+							trigger="manual"
+							v-model="productVisible"> 
+							 
+								<el-row > 
+									<!--列表 XmProduct 产品表-->
+									<el-table  ref="table" :height="maxTableHeight" :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"> 
+												产品名称 
+												<span style="float:right;">
+												<el-button type="text" @click="clearSelect">清空</el-button>&nbsp;&nbsp;
+												<el-button type="text" @click="close">关闭</el-button>&nbsp;&nbsp;
+												<el-popover
+													placement="top-start"
+													title=""
+													width="400"
+													v-model="moreVisible"
+													trigger="manual" >
+													<el-row> 
+														<el-col  :span="24"  style="padding-top:5px;"> 
+															<font class="more-label-font">产品编号:</font>  
+															<el-input   v-model="filters.id" style="width:100%;"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">  
+															</el-input> 
+														</el-col>
+														
+														<el-col  :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 HH:mm:ss"
+																: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   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   v-else @click="selectFiltersPmUser()">选责任人</el-button>
+															<el-button    @click="setFiltersPmUserAsMySelf()">我的</el-button>
+														</el-col>
+														<el-col  :span="24"  style="padding-top:5px;">
+															<el-button type="text"  @click="moreVisible=false" >查询</el-button><el-button type="primary"  @click="searchXmProducts" >查询</el-button>
+														</el-col>
+													</el-row> 
+													<el-button type="text" slot="reference" @click="moreVisible=!moreVisible" style="float:right;">更多条件</el-button>
+												</el-popover>  
+												</span>
+											</template>
+											<template slot-scope="scope">
+												<font>{{scope.row.productName}}</font>
+											</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-link title="产品，点击选择、清除选择" @click="productVisible=!productVisible" type="warning" slot="reference" v-if="!xmProduct" icon="el-icon-search"><font style="font-size:14px;">{{filters.product?filters.product.productName:'选择产品'}}</font></el-link> 
 						</el-popover>  
-					 </template>
-					<template slot-scope="scope">
-						<font>{{scope.row.productName}}</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>
@@ -96,21 +90,21 @@
 	import { mapGetters } from 'vuex' 
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
 	import { loadTasksToXmProductState } from '@/api/xm/core/xmProductState'; 
-
+	const map=new Map();
 	
 	export default { 
-		props:['isSelectProduct','selProject','xmIteration','autoSelect'],
+		props:['linkProjectId','iterationId','autoSelect'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
 		    ])
 		},
 		watch:{
-			xmIteration(){
+			iterationId(){
 				this.getXmProducts();
 			},
 			
-			selProject(){
+			linkProjectId(){
 				this.getXmProducts();
 			}
 		},
@@ -120,10 +114,10 @@
 			beginDate.setTime(beginDate.getTime() - 3600 * 1000 * 24 * 7 * 4 * 12 );
 			return {
 				filters: {
-					key: '',
-					queryScope:'compete',
+					key: '', 
 					id:'',//产品编号
-					pmUser:null,//产品经理
+					pmUser:null,//产品经理 
+
 				},
 				xmProducts: [],//查询结果
 				pageInfo:{//分页数据
@@ -137,25 +131,22 @@
 				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'}]} 
-				
-				addFormVisible: false,//新增xmProduct界面是否显示
+				 
 				//新增xmProduct界面初始化数据
 				addForm: {
 					id:'',productName:'',branchId:'',remark:''
 				},
-				
-				editFormVisible: false,//编辑界面是否显示
+				 
 				//编辑xmProduct界面初始化数据
 				editForm: {
 					id:'',productName:'',branchId:'',remark:''
-				},
-				iterationVisible:false,
-				productStateVisible:false,
+				}, 
 				selectFiltersPmUserVisible:false,
 				maxTableHeight:300,
 				dateRanger: [ ],  
 				pickerOptions:  util.pickerOptions('datarange'),
-				
+				productVisible:false,
+				moreVisible:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/
@@ -205,37 +196,20 @@
 				}
 				if(this.filters.key!==""){
 					params.key="%"+this.filters.key+"%"
-				}else{
-					//params.xxx=xxxxx
 				} 
-				if(this.selProject){
-					params.projectId=this.selProject.id
+				if(this.linkProjectId){
+					params.linkProjectId=this.linkProjectId
 				}
-				if(this.xmIteration){
-					params.iterationId=this.xmIteration.id
-				}
-				 
-				params.queryScope=this.filters.queryScope
-				if(this.filters.queryScope=='productId'){
-					if(!this.filters.id){
-						this.$notify({showClose: true, message:"您选择了按产品编号精确查找模式，请输入产品编号", type: 'error' });
-						return;
-					}
+				if(this.iterationId){
+					params.iterationId=this.iterationId
+				} 
+				if(this.filters.id){
 					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==2){
-						 
-						params.ctimeStart=this.dateRanger[0]
-						params.ctimeEnd=this.dateRanger[1]
-					} 
 				} 
-
+				
+				if(this.filters.pmUser){
+					params.pmUserid=this.filters.pmUser.userid
+				}
 				this.load.list = true;
 				listXmProductWithState(params).then((res) => {
 					var tips=res.data.tips;
@@ -243,7 +217,11 @@
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
 						this.xmProducts = res.data.data;
-						
+						if(this.iterationId){
+							 map.set(this.iterationId,this.xmProducts)
+						}else if(this.linkProjectId){
+							map.set(this.linkProjectId,this.xmProducts)
+						}
 						if(this.autoSelect===true&&this.xmProducts.length>0){ 
 							var row=this.xmProducts[0];
 							this.$refs.table.setCurrentRow(row);
@@ -264,10 +242,13 @@
 			rowClick: function(row, event, column){
 				this.editForm=row
 				this.$emit('row-click',row, event, column);//  @row-click="rowClick"
+				this.selectedProduct(row) 
+				this.productVisible=false;
 			},
 			selectedProduct:function(row){
 				this.editForm=row
-				this.$emit('selected',row);
+				this.$emit('selected',row); 
+				this.productVisible=false;
 			},
 			
 			/**begin 自定义函数请在下面加**/
@@ -291,21 +272,7 @@
 				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.$notify({showClose: true, message: tips.msg, type: tips.isOk?'success':'error' }); 
-				}).catch( err  => this.load.edit=false ); 
-			},
+			 
 			tableRowClassName({row, rowIndex}) {
 				if (row.id == this.editForm.id) { 
 					return 'success-row';
@@ -315,10 +282,29 @@
 			clearSelect(){
 				this.$refs.table.setCurrentRow();
 				this.$emit("clear-select");
+				this.selectedProduct(null);
+				this.productVisible=false;
 			},
 			close(){
+				this.productVisible=false;
 				this.$emit("close");
-			}
+			},
+			
+			initData(){
+				if(this.iterationId){
+					var xmProducts=map.get(this.iterationId);
+					if(xmProducts){
+						this.xmProducts=xmProducts;
+					}
+				}else if(this.linkProjectId){
+					var xmProducts=map.get(this.linkProjectId);
+					if(xmProducts){
+						this.xmProducts=xmProducts;
+					}
+				}else{
+					this.searchXmProducts();
+				}
+			},
 		},//end methods
 		components: {  
 			UsersSelect,
@@ -327,7 +313,7 @@
 		mounted() { 
 			this.$nextTick(() => { 
 				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
-				this.getXmProducts();
+				this.initData();
         	}); 
 		}
 	}
diff --git a/src/views/xm/core/xmGroup/XmGroupMng.vue b/src/views/xm/core/xmGroup/XmGroupMng.vue
index 281330c6..96b932b6 100644
--- a/src/views/xm/core/xmGroup/XmGroupMng.vue
+++ b/src/views/xm/core/xmGroup/XmGroupMng.vue
@@ -225,7 +225,7 @@
 	import XmProjectList from '../xmProject/XmProjectList';
 	
 	import XmProjectSelect from '../xmProject/XmProjectSelect';
-	import XmProductSelect from '../xmProduct/XmProductSelect.vue';
+	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
 	
 	export default {
 	    name:'xmGroupMng',
diff --git a/src/views/xm/core/xmGroup/XmGroupSelect.vue b/src/views/xm/core/xmGroup/XmGroupSelect.vue
index 2a20633d..5a7488ba 100644
--- a/src/views/xm/core/xmGroup/XmGroupSelect.vue
+++ b/src/views/xm/core/xmGroup/XmGroupSelect.vue
@@ -50,7 +50,7 @@
    	import XmProjectSelect from '../xmProject/XmProjectSelect';
 
 	import {mapGetters} from 'vuex' 
-import XmProductSelect from '../xmProduct/XmProductSelect.vue';
+import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
 
 	export default {
 		computed: {
diff --git a/src/views/xm/core/xmIteration/XmIterationAdd.vue b/src/views/xm/core/xmIteration/XmIterationAdd.vue
index 1292d3a6..788df0db 100644
--- a/src/views/xm/core/xmIteration/XmIterationAdd.vue
+++ b/src/views/xm/core/xmIteration/XmIterationAdd.vue
@@ -55,7 +55,7 @@
 	import { mapGetters } from 'vuex'	
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
 
-	import XmProductSelect from '../xmProduct/XmProductSelect.vue';
+	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
 	
 	export default { 
 		computed: {
diff --git a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
index 3775dae8..80aa9eb3 100644
--- a/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
+++ b/src/views/xm/core/xmIterationLink/XmIterationLinkForProduct.vue
@@ -45,7 +45,7 @@
 	import { listXmIterationLinkWithProductInfo,addXmIterationLink, delXmIterationLink, batchDelXmIterationLink } from '@/api/xm/core/xmIterationLink';
  
 	import { mapGetters } from 'vuex'
-	import XmProductSelect from '../xmProduct/XmProductSelect.vue';
+	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
 	import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
 	
 	import  XmIterationAdd from '../xmIteration/XmIterationAdd';//新增界面
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index f9b0c543..6c256178 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -445,7 +445,7 @@
 	import  XmMenuAdd from './XmMenuAdd';//新增界面
 	import  XmMenuEdit from './XmMenuEdit';//修改界面
 	import  XmMenuMngBatch from './XmMenuMngBatch';//修改界面
-	import  XmProductSelect from '../xmProduct/XmProductSelect';//新增界面
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
 	import  XmMenuTemplateMng from '../xmMenuTemplate/XmMenuTemplateMng';//新增界面
 	import XmMenuRichDetail from './XmMenuRichDetail';
 	import XmTaskList from '../xmTask/XmTaskList';
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index c217494d..f16507a4 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -165,7 +165,7 @@
 	//import Sticky from '@/components/Sticky' // 粘性header组件
 	import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询
 	import { listXmMenu  } from '@/api/xm/core/xmMenu';
- 	import  XmProductSelect from '../xmProduct/XmProductSelect';//新增界面
+ 	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面
  	import XmMenuRichDetail from './XmMenuRichDetail';
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect"; 
 
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index b5f058d0..67ba6f93 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -77,7 +77,7 @@ import XmQuestionMng from '../xmQuestion/XmQuestionMng.vue';
 import XmProjectList from '../xmProject/XmProjectList.vue';
 import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
 
-import XmProductSelect from './XmProductSelect.vue';
+import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue';
 import XmProductProjectForLink from './XmProductProjectForLink.vue';
 import XmProductOverview from "./XmProductOverview"; 
 import XmIterationLinkForProduct from '../xmIterationLink/XmIterationLinkForProduct.vue';
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index bb2114a3..3c15fca0 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -315,7 +315,7 @@
 	import UsersSelect from "@/views/mdp/sys/user/UsersSelect";
 	import XmProjectList from '../xmProject/XmProjectList.vue';
 	import XmIterationSelect from '../xmIteration/XmIterationSelect.vue';
-	import XmProductSelect from './XmProductSelect.vue'; 
+	import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'; 
 
 	import Guider from '@/components/Guider/Index.js';
 
diff --git a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
index fa2cf007..ffaeec6a 100644
--- a/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
+++ b/src/views/xm/core/xmProductProjectLink/XmProductProjectLinkMng.vue
@@ -42,7 +42,7 @@
 	import  XmProductProjectLinkAdd from './XmProductProjectLinkAdd';//新增界面
 	import  XmProductProjectLinkEdit from './XmProductProjectLinkEdit';//修改界面
 	import { mapGetters } from 'vuex'
-import XmProductSelect from '../xmProduct/XmProductSelect.vue';
+import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
 import XmProjectSelect from '../xmProject/XmProjectSelect.vue';
 	
 	export default { 
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index 1123f3d5..faece9cd 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -77,7 +77,7 @@ import XmQuestionMng from '../xmQuestion/XmQuestionMng.vue';
 import XmProjectSelect from './XmProjectSelect.vue';
 import XmProjectForLink from './XmProjectForLink.vue';
 
-import XmProductSelect from '../xmProduct/XmProductSelect.vue';
+import XmProductSelect from '@/views/xm/core/components/XmProductSelect.vue'
 import XmProductProjectForLink from '../xmProduct/XmProductProjectForLink.vue';
 import XmProjectOverview from "./XmProjectOverview";
 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 4a117713..5cabdfe0 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -329,7 +329,7 @@
 	import xmTaskMng from '../xmTask/XmTaskMng'; 
 	import xmProjectInfo from './XmProjectInfo'; 
 	import XmProjectTplMng from './XmProjectTplMng'; 
-	import XmProductMng from '../xmProduct/XmProductSelect';
+	import XmProductMng from '@/views/xm/core/components/XmProductSelect';
 
 	if(!Vue.component("xm-project-info")){
 		
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index db9419c8..5aaaf787 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -222,7 +222,7 @@
 	import XmGroupMng from '../xmGroup/XmGroupMng';
 	import XmProjectList from '../xmProject/XmProjectList';
 
-	import  XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修改界面
   	import TagMng from "@/views/mdp/arc/tag/TagMng";
 
 	export default {
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 223b3a65..85f08f44 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -1125,7 +1125,7 @@ import { addXmMyFocus, delXmMyFocus } from "@/api/xm/core/xmMyFocus";
 import XmProjectSelect from "../xmProject/XmProjectSelect";
 
 import XmMenuRichDetail from "../xmMenu/XmMenuRichDetail";
-import XmProductSelect from "../xmProduct/XmProductSelect"; //修改界面
+import XmProductSelect from "@/views/xm/core/components/XmProductSelect"; //修改界面
 import TagMng from "@/views/mdp/arc/tag/TagMng";
 
 import XmGantt from "../components/xm-gantt";
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
index 154f5b65..a4fa4981 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseMng.vue
@@ -134,7 +134,7 @@
 	import  XmTestCaseEdit from './XmTestCaseEdit';//修改界面
 	import { mapGetters } from 'vuex'
 	import xmMenuSelect from '../xmMenu/XmMenuSelect';
-	import  XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修改界面
 
 	import XmProjectList from '../xmProject/XmProjectList';
 	import XmGroupMng from '../xmGroup/XmGroupMng';
diff --git a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
index 49610bf3..6b8294a0 100644
--- a/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
+++ b/src/views/xm/core/xmTestCaseExec/XmTestCaseExecMng.vue
@@ -225,7 +225,7 @@
 	import  XmTestCaseEdit from '../xmTestCase/XmTestCaseEdit';//修改界面
 	import  XmQuestionMng from '../xmQuestion/XmQuestionMng';//修改界面
 	import  XmQuestionAdd from '../xmQuestion/XmQuestionAdd';//修改界面 
-	import  XmProductSelect from '../xmProduct/XmProductSelect';//修改界面
+	import  XmProductSelect from '@/views/xm/core/components/XmProductSelect';//修改界面
   import XmGantt from '../components/xm-gantt';
 
 	import { mapGetters } from 'vuex'