From fd7e4cdf2d8f23dd29871bc9f74492872fec573e Mon Sep 17 00:00:00 2001
From: "0.0" <1092404103.qq.com>
Date: Tue, 8 Aug 2023 21:13:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E8=B4=A7=E5=8C=BA=E7=B1=BB=E5=9E=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/option/basicdata/basicdataGoodsArea.js                | 8 ++++----
 .../basicdata/warehouse/goodsArea/basicdataGoodsArea.vue  | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/option/basicdata/basicdataGoodsArea.js b/src/option/basicdata/basicdataGoodsArea.js
index 91fa6c29..4d8d94de 100644
--- a/src/option/basicdata/basicdataGoodsArea.js
+++ b/src/option/basicdata/basicdataGoodsArea.js
@@ -92,13 +92,13 @@ export default {
 
     {
       label: "货区类型",
-      prop: "areaType",
+      prop: "areaTypeName",
     },
     {
       label: "创建人",
-      prop: "createUser",
-      display: false,
-      hide: true,
+      prop: "createUserName",
+      display: true,
+      hide: false,
     },
     {
       label: "创建时间",
diff --git a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
index 87a901ab..bb5a53a9 100644
--- a/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
+++ b/src/views/basicdata/warehouse/goodsArea/basicdataGoodsArea.vue
@@ -296,9 +296,9 @@ export default {
 
     },
     getListInfo(){
-      getDictionaryBiz( 'area_type').then(res => {
-        this.areaTypeData = res.data.data;
-      });
+      // getDictionaryBiz( 'area_type').then(res => {
+      //   this.areaTypeData = res.data.data;
+      // });
 
       getDictionaryBiz( 'enable_status').then(res => {
         this.enableStatus = res.data.data;