From ff3853b0ed23c91abf466ec4fcba2b7b4ceb40c3 Mon Sep 17 00:00:00 2001
From: shenhailong <939224067@qq.com>
Date: Tue, 28 Jul 2020 10:28:16 +0800
Subject: [PATCH] 角色类型修改

---
 src/views/nav1/role.vue | 33 +++------------------------------
 src/views/nav1/user.vue |  2 +-
 2 files changed, 4 insertions(+), 31 deletions(-)

diff --git a/src/views/nav1/role.vue b/src/views/nav1/role.vue
index 146c3e2..f0b7503 100755
--- a/src/views/nav1/role.vue
+++ b/src/views/nav1/role.vue
@@ -33,7 +33,7 @@
 			<!--</el-table-column>-->
 			<el-table-column prop="description" label="描述" min-width="160" >
 			</el-table-column>
-			<el-table-column prop="type" label="类型" :formatter="formatType" min-width="80" sortable>
+			<el-table-column prop="type" label="类型" min-width="80" sortable>
 			</el-table-column>
 			<el-table-column prop="businessLicense" label="工商代码" min-width="180" >
 			</el-table-column>
@@ -133,11 +133,11 @@
                 companyOption: [
 					{
 						label: "集团",
-						value: "1"
+						value: "集团"
 					},
 					{
                         label: "公司",
-                        value: "2"
+                        value: "公司"
 					}
 				],
                 treeDefaultProps: {
@@ -195,33 +195,6 @@
 			}
 		},
 		methods: {
-
-			//类型显示转换
-			formatType: function (row, column) {
-				let msg = '未知';
-				switch (row.type) {
-					case "1":
-						msg = '集团';
-						break;
-					case "2":
-						msg = '公司';
-						break;
-					case "3":
-						msg = '部门';
-						break;
-					case "4":
-						msg = '岗位';
-						break;
-				}
-				return msg;
-			},
-			//性别显示转换
-			formatSex: function (row, column) {
-				return row.sex == 1 ? '男' : row.sex == 0 ? '女' : '未知';
-			},
-            formatState: function (row, column) {
-                return row.state == true ? '是' : row.state == false ? '否' : '未知';
-            },
 			handleCurrentChange(val) {
 				this.pageNum = val;
 				this.getRoles();
diff --git a/src/views/nav1/user.vue b/src/views/nav1/user.vue
index f87a513..6fbd5ad 100755
--- a/src/views/nav1/user.vue
+++ b/src/views/nav1/user.vue
@@ -325,7 +325,7 @@
 			// 获取公司列表
 			getCompanyNmae(){
 				let para = {
-					type: "2"
+					type: "公司"
 				};
 				getRoleList(para).then((res) => {
 					this.options = res.data.list;
--
libgit2 0.24.0