From 727e8257ce455dfda3170da082bf1ecb4525992a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 15 Jul 2022 11:43:01 +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

---
 src/views/xm/core/xmProduct/XmProductMng.vue  | 37 +++++++++++++------
 .../xm/core/xmProduct/XmProductTplMng.vue     |  2 +-
 src/views/xm/core/xmProject/XmProjectMng.vue  |  8 ++--
 .../xm/core/xmProject/XmProjectTplMng.vue     |  2 +-
 4 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 328126a3..28164891 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -1,24 +1,35 @@
 <template>
 	<section>
-		<el-row>
-		<el-col :span="6" v-if="templateVisible"> 
-			<xm-product-tpl-mng @copy="searchXmProducts" ref="xmProductTplMngRef" show-type="simple"></xm-product-tpl-mng>
+		<el-row  class="padding-left padding-right">
+		<el-col :span="6" class="border padding" > 
+			<el-row>
+				<el-row>
+					您可以通过 &nbsp;<el-button   @click="showAdd" icon="el-icon-plus" type="primary" plain>项目</el-button>&nbsp;创建一个新项目
+				</el-row>
+				<el-row> 
+					通过&nbsp;<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">公共模板</el-button>&nbsp;体验项目的过程。<br/>
+				</el-row>
+				<el-row> 
+					通过&nbsp;<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">拷贝模板</el-button>&nbsp;快速创建新项目。<br/>
+				</el-row>
+			</el-row>
+			
 		</el-col> 
-		<el-col :span="templateVisible?18:24" class="padding-left border padding-right">
+		<el-col :span="18" class="padding-left">
 			<el-row >
 				<el-row>
-					<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
+					<el-select   v-model="filters.queryScope"  style="width:120px;"  placeholder="产品查询范围" clear>
 						<el-option :label="userInfo.branchName+'机构下所有的产品'" value="branchId"></el-option>
 						<el-option label="我相关的产品" value="compete"></el-option>
 						<el-option label="按产品编号精确查找" value="productId"></el-option>
 					</el-select>
 					
-					<el-select  v-model="filters.pstatus" clearable placeholder="状态">
+					<el-select  v-model="filters.pstatus" clearable placeholder="状态"  style="width:100px;">
 						<el-option v-for="(item,index) in dicts['xmProductPstatus']" :value="item.id" :label="item.name" :key="index"></el-option> 
 					</el-select>  
-					<el-input v-if="filters.queryScope=='productId'" style="width:20%;"  v-model="filters.id"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts">
+					<el-input v-if="filters.queryScope=='productId'" style="width:20%;"  v-model="filters.id"  placeholder="输入产品编号" @keyup.enter.native="searchXmProducts" clearable>
 					</el-input>
-					<el-input v-model="filters.key" style="width: 20%;" placeholder="名称查询" clearable>   
+					<el-input v-if="filters.queryScope!='productId'" v-model="filters.key" style="width: 20%;" placeholder="名称查询" clearable>   
 					</el-input>
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProducts" icon="el-icon-search">查询</el-button>
 					
@@ -122,7 +133,7 @@
 				<el-row v-show="showType">
 					<!--列表 XmProject xm_project-->
 					<el-row v-loading="load.list">
-						<el-col  v-cloak v-for="(p,i) in xmProducts" :key="i" :xl="4" :lg="6" :md="8" :sm="12">
+						<el-col  v-cloak v-for="(p,i) in xmProducts" :key="i" :xl="8" :lg="8" :md="12" :sm="12">
 							<el-card @click.native="intoInfo(p,i)" class="project-card" shadow="always">
 								<div class="project-name" title="这是产品名称">{{p.productName}}</div>
 								<div class="project-id eui-text-truncate">{{p.code}}</div>
@@ -270,7 +281,7 @@
 					<el-dialog
 						title="通过复制创建新的模板或者新的产品"
 						:visible.sync="copyToVisible"
-						width="30%" > 
+						width="600" > 
 						<el-form>
 						<el-form-item label="产品名称">
 							<el-input v-model="xmProductCopy.productName" placeholder="新的产品名称"></el-input> 
@@ -301,6 +312,10 @@
 			</el-row>
 		</el-col>
 		</el-row> 
+		
+		<el-dialog :visible.sync="templateVisible" append-to-body width="60%" top="20px">
+			<xm-product-tpl-mng @copy="searchXmProducts" :show-type="'simple'" ref="xmProductTplMngRef"></xm-product-tpl-mng>
+		</el-dialog>
 	</section>
 </template>
 
@@ -389,7 +404,7 @@
 				pickerOptions:  util.getPickerOptions('datarange'),
 				projectVisible:false,
 				productSelectVisible:false,
-				showType:false,
+				showType:true,
 				xmProductCopy:{
 					id:'',productName:'',code:'',isTpl:'',copyMenu:'1',copyPhase:'1',copyGroup:'1',copyGroupUser:'0'
 				},
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index 0fbdc456..32817783 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -86,7 +86,7 @@
 		<el-dialog
 			title="通过复制创建新的模板或者新的产品"
 			:visible.sync="copyToVisible"
-			width="30%" > 
+			width="600" > 
 			<el-form>
 			<el-form-item label="产品名称">
 				<el-input v-model="xmProductCopy.productName" placeholder="新的产品名称"></el-input> 
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index bb53b294..85f8fe93 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -4,13 +4,13 @@
 			<el-col :span="6" class="border padding" > 
 				<el-row>
 					<el-row>
-						您可以通过<el-button   @click="showAdd" icon="el-icon-plus" type="primary" plain>项目</el-button>创建一个新项目
+						您可以通过 &nbsp;<el-button   @click="showAdd" icon="el-icon-plus" type="primary" plain>项目</el-button>&nbsp;创建一个新项目
 					</el-row>
 					<el-row> 
-						通过<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">公共模板</el-button>体验一下项目的过程。<br/>
+						通过&nbsp;<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">公共模板</el-button>&nbsp;体验项目的过程。<br/>
 					</el-row>
 					<el-row> 
-						通过<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">拷贝模板</el-button>成为一个新项目。<br/>
+						通过&nbsp;<el-button @click="templateVisible=true" type="primary" plain style="margin-bottom:5px;">拷贝模板</el-button>&nbsp;快速创建新项目。<br/>
 					</el-row>
 				</el-row>
 				
@@ -281,7 +281,7 @@
 		<el-dialog
 			title="通过复制创建新的模板或者新的项目"
 			:visible.sync="copyToVisible"
-			width="30%" > 
+			width="600" > 
 			<el-form>
 			<el-form-item label="项目名称">
 				<el-input v-model="xmProjectCopy.name" placeholder="新的项目名称"></el-input> 
diff --git a/src/views/xm/core/xmProject/XmProjectTplMng.vue b/src/views/xm/core/xmProject/XmProjectTplMng.vue
index 150bf1c1..0a32f523 100644
--- a/src/views/xm/core/xmProject/XmProjectTplMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectTplMng.vue
@@ -47,7 +47,7 @@
 			title="通过复制创建新的模板或者新的项目"
 			:visible.sync="copyToVisible"
 			append-to-body
-			width="30%" > 
+			width="600" > 
 			<el-form>
 			<el-form-item label="项目名称">
 				<el-input v-model="xmProjectCopy.name" placeholder="新的项目名称"></el-input>