From 055aa5dcede312bf5aa139caf26869bc1c954e87 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 20 Jul 2021 13:39:40 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=95=8C=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/router/routes_xm.js                       |  3 +-
 .../xm/core/xmProduct/XmProductAllMng.vue     | 47 +++++++++++++++++++
 src/views/xm/core/xmProduct/XmProductMng.vue  | 16 +++----
 3 files changed, 57 insertions(+), 9 deletions(-)
 create mode 100644 src/views/xm/core/xmProduct/XmProductAllMng.vue

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 0babb3fa..c34efd98 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -99,7 +99,8 @@ export default {
       },
       // leaf: true,//只有一个节点
       children: [ 
- 
+        { path: 'xmProduct/XmProductAllMng', component: _import('xm/core/xmProduct/XmProductAllMng'), name: 'XmProductAllMng', meta: { title: '产品总览' }}, 
+
          { path: 'xmProduct/XmProductMng', component: _import('xm/core/xmProduct/XmProductMng'), name: 'XmProductMng', meta: { title: '产品管理' }}, 
 
         { path: 'xmMenu/XmMenuMng', component: _import('xm/core/xmMenu/XmMenuMng'), name: 'XmMenuMng', meta: { title: '故事管理' }},
diff --git a/src/views/xm/core/xmProduct/XmProductAllMng.vue b/src/views/xm/core/xmProduct/XmProductAllMng.vue
new file mode 100644
index 00000000..4a3f7d0e
--- /dev/null
+++ b/src/views/xm/core/xmProduct/XmProductAllMng.vue
@@ -0,0 +1,47 @@
+<template>
+	<section> 
+		 <xm-product-mng :data-scope="'all'"></xm-product-mng>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	//import Sticky from '@/components/Sticky' // 粘性header组件 
+	import { mapGetters } from 'vuex'
+ import XmProductMng from './XmProductMng.vue';
+	
+export default { 
+	computed: {
+		...mapGetters([
+			'userInfo','roles'
+		]), 
+	},
+	watch: {
+			
+	},
+	data() {
+		return {
+				
+			/**end 自定义属性请在上面加 请加备注**/
+		}
+	},//end data
+	methods: {
+			
+		/**end 自定义函数请在上面加**/
+		
+	},//end methods
+	components: {  
+		XmProductMng,
+		//在下面添加其它组件
+	},
+	mounted() { 
+		this.$nextTick(() => {
+				
+		}); 
+	}
+}
+
+</script>
+
+<style scoped> 
+</style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index df96fd93..01db4ce7 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -106,9 +106,9 @@
 				<el-button  slot="reference"   icon="el-icon-more" circle></el-button>
 			</el-popover> 
 		</el-row>
-		<el-row  class="page-main page-height-80"> 
+		<el-row  class="page-main page-height-80"  v-show="showType"> 
 			<!--列表 XmProject xm_project-->
-			<el-row v-show="showType" v-loading="load.list">
+			<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-card @click.native="intoInfo(p,i)" class="project-card" shadow="always">
 						<div class="project-name" title="这是产品名称">{{p.productName}}</div>
@@ -142,12 +142,12 @@
 				</el-col>
 			</el-row>
 		</el-row>
-		<el-row  class="padding-top"> 
+		<el-row  class="padding-top" v-show="!showType"> 
 			<!--列表 XmProduct 产品表-->
 			<el-table ref="table"  :height="tableHeight" :data="xmProducts" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
   				<el-table-column prop="productName" label="产品名称" min-width="300"> 
 					<template slot-scope="scope">
-						<span><el-link type="primary" @click="showEdit(scope.row)">{{scope.row.productName}}</el-link></span>
+						<span><el-link type="primary" @click="intoInfo(p)">{{scope.row.productName}}</el-link></span>
 						
 						<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag>
 						
@@ -192,9 +192,9 @@
 					</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-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-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>
@@ -311,7 +311,7 @@ import XmProductSelect from './XmProductSelect.vue';
 				pickerOptions:  util.pickerOptions('datarange'),
 				projectVisible:false,
 				productSelectVisible:false,
-				showType:true,
+				showType:false,
 				/**begin 自定义属性请在下面加 请加备注**/
 					
 				/**end 自定义属性请在上面加 请加备注**/