From a65db18c9ed01edf9ffc13a6b05827010de53a03 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, 5 Mar 2022 14:39:38 +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  |  7 +--
 .../xm/core/xmProduct/XmProductRecycle.vue    |  2 +-
 .../xm/core/xmProduct/XmProductTplMng.vue     | 58 ++++++++++++++-----
 3 files changed, 46 insertions(+), 21 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index eb0e981b..61032bfe 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -424,12 +424,7 @@ import XmProductSelect from './XmProductSelect.vue';
 					if(tips.isOk){
 						this.pageInfo.total = res.data.total;
 						this.pageInfo.count=false;
-						this.xmProducts = res.data.data;
-						if(this.xmProducts==null || this.xmProducts.length==0){
-							this.templateVisible=true;
-						}else{
-							this.templateVisible=false;
-						}
+						this.xmProducts = res.data.data; 
 					}else{
 						this.$notify({showClose: true, message: tips.msg, type: 'error' });
 					}
diff --git a/src/views/xm/core/xmProduct/XmProductRecycle.vue b/src/views/xm/core/xmProduct/XmProductRecycle.vue
index 739fc582..25ccc2dd 100644
--- a/src/views/xm/core/xmProduct/XmProductRecycle.vue
+++ b/src/views/xm/core/xmProduct/XmProductRecycle.vue
@@ -254,7 +254,7 @@
 				if(this.xmIteration){
 					params.iterationId=this.xmIteration.id
 				}
-				 
+				 params.del="1"
 				params.queryScope=this.filters.queryScope
 				if(this.filters.queryScope=='productId'){
 					if(!this.filters.id){
diff --git a/src/views/xm/core/xmProduct/XmProductTplMng.vue b/src/views/xm/core/xmProduct/XmProductTplMng.vue
index ac45bf67..2b3e041c 100644
--- a/src/views/xm/core/xmProduct/XmProductTplMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductTplMng.vue
@@ -17,25 +17,37 @@
 			</el-col>
  
 		</el-row>
-		<el-row  class="page-main" >
+		<el-row  class="page-main" v-if="showType!='simple'">
 			<!--列表 XmProduct 产品表-->
 			<el-table ref="table"  :height="maxTableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
   				
 				<el-table-column    label="序号" width="60" type="index"  v-if="showType!='simple'">  
 				</el-table-column> 
-				  <el-table-column prop="productName" label="产品模板(参考学习用)" min-width="200" sortable show-overflow-tooltip> 
+				  <el-table-column prop="productName" label="产品模板(参考学习用)" min-width="150" sortable show-overflow-tooltip> 
 					<template slot-scope="scope">
 						<el-link  @click="intoInfo(scope.row)">{{scope.row.productName}}</el-link>
 					</template>
 				</el-table-column> 
-				<el-table-column prop="code" v-if="showType!='simple'" label="产品编码" width="200" sortable>  
-				</el-table-column> 
-				<el-table-column prop="assistantUsername" v-if="showType!='simple'" label="创建人" width="200" sortable>  
-				</el-table-column> 
-				<el-table-column prop="ctime" v-if="showType!='simple'" label="创建时间" width="200" sortable>  
-				</el-table-column> 
-				<el-table-column prop="remark" v-if="showType!='simple'" label="备注" width="200" sortable>  
-				</el-table-column> 
+				<el-table-column prop="code" label="产品代号" min-width="100" sortable> 
+				</el-table-column>
+				<el-table-column prop="pstatus" label="状态" width="100" sortable :formatter="formatPstatus"> 
+				</el-table-column>
+				<el-table-column prop="finishRate" label="进度" width="100" sortable>
+					<template slot-scope="scope"> 
+						<font  ><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag> 
+						</font>
+					</template>
+				</el-table-column>
+				<el-table-column prop="pmUsername" label="产品经理" width="120" sortable show-overflow-tooltip>
+					<template slot-scope="scope"> 						
+						<el-tag v-if="scope.row.pmUsername">{{scope.row.pmUsername}}</el-tag> 
+					</template>
+				</el-table-column>
+				
+				<el-table-column label="工作量(人时)" width="200">
+					<el-table-column prop="planWorkload" label="预计" width="100"  show-overflow-tooltip sortable></el-table-column>
+					<el-table-column prop="actWorkload" label="实际" width="100"  show-overflow-tooltip sortable></el-table-column>
+				</el-table-column>
 				<el-table-column  label="" width="100" fixed="right">
 					<template slot-scope="scope">
 						<el-button type="text" title="通过复制创建新的项目" @click="onCopyToBtnClick(scope.row)" :disabled="load.add" v-loading="load.add">复制</el-button>
@@ -43,10 +55,28 @@
 					</template>
 				</el-table-column> 
 			</el-table>
-			</el-row> 
-		 	<el-pagination  layout="total, sizes, prev, pager, 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>
-
-					<!--编辑 XmProduct 产品表界面-->
+			<el-pagination  layout="total, sizes, prev, pager, 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-row  class="page-main" v-else>
+			<!--列表 XmProduct 产品表-->
+			<el-table ref="table"  :height="maxTableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list"  @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+  				
+				<el-table-column    label="序号" width="60" type="index">  
+				</el-table-column> 
+				  <el-table-column prop="productName" label="产品模板(参考学习用)" sortable show-overflow-tooltip> 
+					<template slot-scope="scope">
+						<el-link  @click="intoInfo(scope.row)">{{scope.row.productName}}</el-link>
+					</template>
+				</el-table-column>  
+				<el-table-column  label="操作" width="80" fixed="right">
+					<template slot-scope="scope">
+						<el-button type="text" title="通过复制创建新的项目" @click="onCopyToBtnClick(scope.row)" :disabled="load.add" v-loading="load.add">复制</el-button> 
+					</template>
+				</el-table-column> 
+			</el-table>
+			<el-pagination  layout="total, sizes, prev, pager, 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="editFormVisible"  size="50%" :with-header="false"  append-to-body   :close-on-click-modal="false">
 				  <xm-product-edit :xm-product="editForm" :visible="editFormVisible" @cancel="editFormVisible=false" @submit="afterEditSubmit"></xm-product-edit>
 			</el-drawer>