From fb69352849dfac0810d041d6017278b39b29d040 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Wed, 9 Nov 2022 10:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8A=9F=E8=83=BD=E5=8F=98=E5=8C=96:=20?=
 =?UTF-8?q?=E5=9C=B0=E5=8C=BA=E7=AE=A1=E7=90=86=E6=90=9C=E7=B4=A2=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E8=BF=87=E6=BB=A4=EF=BC=8Cfix:=20https://gitee.com/li?=
 =?UTF-8?q?qianglog/django-vue-admin/issues/I5GCS5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web/src/views/system/areas/api.js  |  3 ++-
 web/src/views/system/areas/crud.js | 18 ------------------
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/web/src/views/system/areas/api.js b/web/src/views/system/areas/api.js
index 886fc77..7391a4b 100644
--- a/web/src/views/system/areas/api.js
+++ b/web/src/views/system/areas/api.js
@@ -3,8 +3,9 @@ import { request } from '@/api/service'
 export const urlPrefix = '/api/system/area/'
 
 export function GetList (query) {
-  if (query.pcode === undefined || query.pcode === null || query.pcode.length === 0) {
+  if ((!query.pcode || query.pcode.length === 0) && !query.name && !query.code) {
     query.level = 1
+    delete query.pcode
   }
   return request({
     url: urlPrefix,
diff --git a/web/src/views/system/areas/crud.js b/web/src/views/system/areas/crud.js
index 7a00b91..c7a0092 100644
--- a/web/src/views/system/areas/crud.js
+++ b/web/src/views/system/areas/crud.js
@@ -70,24 +70,6 @@ export const crudOptions = (vm) => {
       width: 100
     },
     columns: [
-      {
-        title: '关键词',
-        key: 'search',
-        show: false,
-        disabled: true,
-        search: {
-          disabled: false
-        },
-        form: {
-          disabled: true,
-          component: {
-            placeholder: '请输入关键词'
-          }
-        },
-        view: {
-          disabled: true
-        }
-      },
       {
         title: 'ID',
         key: 'id',