From 93afab121d3a013e81d7f07bbfcb2e34ada34da3 Mon Sep 17 00:00:00 2001
From: Yang <903110162@qq.com>
Date: Sun, 7 May 2023 20:42:41 +0800
Subject: [PATCH] commit by yzf

---
 src/views/half/components/EditView.vue    | 3 +--
 src/views/materia/components/EditView.vue | 8 ++++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/half/components/EditView.vue b/src/views/half/components/EditView.vue
index 2c3aa7a..4081b89 100644
--- a/src/views/half/components/EditView.vue
+++ b/src/views/half/components/EditView.vue
@@ -278,8 +278,7 @@ export default {
 			let editColumn = dataColumn.filter(it => {
 				let b = false;
 				if (this.dataInfoObj.FCanEdit != 2) {
-					if (it.fieldType == 7) b = this.userPower[1].indexOf(it.id) >= 0;
-					else b = this.userPower[0].indexOf(it.id) >= 0;
+					b = this.userPower[0].indexOf(it.id) >= 0;
 					if (b) {
 						it.customSlot = it.key;
 						it.cellClass = "edit-item"
diff --git a/src/views/materia/components/EditView.vue b/src/views/materia/components/EditView.vue
index f37c2bb..0f2c238 100644
--- a/src/views/materia/components/EditView.vue
+++ b/src/views/materia/components/EditView.vue
@@ -256,8 +256,12 @@ export default {
 				if (!itemRow["Power"]) {
 					itemRow["Power"] = "";
 				}
-
-				let powerColumns = $this.userPower[0].filter(s => s.F1 == itemRow.FViewType);
+				let FViewType=itemRow.FViewType;
+				if(FViewType==0)
+				{
+					FViewType=10;
+				}
+				let powerColumns = $this.userPower[0].filter(s => s.F1 == FViewType);
 				if (powerColumns) {
 					powerColumns.forEach((itemColums) => {
 						let dataColumn = _data.columns.find(s => s.id == itemColums.F2);