13:46合并

src/router/index.js

@@ -77,6 +77,8 @@ export const asyncRouterMap = [{
 		title: '合同列表',
 		icon: 'el-icon-s-order',
 		roles: ['admin', 'salesman', 'supplier'],
+		
+
 	},
 	redirect: {
 		name: 'contracts'
@@ -90,7 +92,7 @@ export const asyncRouterMap = [{
 				title: '合同列表',
 				icon: 'el-icon-s-order',
 				roles: ['admin', 'salesman', 'supplier'],
-				activeMenu: '/contracts/index'
+				activeMenu: '/contracts/contracts'
 			}
 		},
 		{
@@ -100,7 +102,7 @@ export const asyncRouterMap = [{
 			meta: {
 				title: '合同详情',
 				roles: ['admin', 'salesman', 'supplier'],
-				activeMenu: '/contracts/index'
+				activeMenu: '/contracts/contracts'
 			},
 			hidden: true
 		},

src/views/contracts/index.vue

@@ -76,7 +76,7 @@
             <i class="el-icon-arrow-down el-icon--right" />
           </div>
           <el-dropdown-menu slot="dropdown">
-            <el-dropdown-item command="全部">全部</el-dropdown-item>
+            <!-- <el-dropdown-item command="全部">全部</el-dropdown-item> -->
             <el-dropdown-item command="正常">正常</el-dropdown-item>
             <el-dropdown-item command="删除">删除</el-dropdown-item>
           </el-dropdown-menu>
@@ -348,12 +348,6 @@ export default {
   },
   mounted() {
     this.checked = this.$store.state.user.checked;
-	
-	//显示合同状态为正常的数据
-	// this.formData.contractStatus = 2;
-	// this.currentPage = 1;
-	// this.searchForm = { ...this.formData };
-	// this.getData(this.searchForm);
 		this.roleId = this.$store.state.user.userInfo.roleId;
 		console.log(this.roleId,"id")
 	// 获取所有数据
@@ -364,7 +358,9 @@ export default {
   },
   methods: {
     /* ajax发请求获取列表数据 */
-    getData(searchForm = {}) {
+    getData(searchForm = {
+      contractStatus:2
+    }) {
       const params = {
         pageIndex: this.currentPage,
         pageSize: this.pagesize,
@@ -663,9 +659,9 @@ export default {
       if (command === "删除") {
         this.formData.contractStatus = 1;
       }
-      if (command === "全部") {
-        this.formData.contractStatus = 0;
-      }
+      // if (command === "全部") {
+      //   this.formData.contractStatus = 0;
+      // }
       this.currentPage = 1;
       this.searchForm = { ...this.formData };
       this.getData(this.searchForm);