From 26abb1a9b3242bf8c268c8a3963e687f39fb3fec Mon Sep 17 00:00:00 2001
From: zhangyongzhangyong <2012005003@qq.coom>
Date: Mon, 27 Apr 2020 15:19:51 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A1=97=E9=81=93=E4=BA=BA=E5=91=98=E5=BA=95?=
 =?UTF-8?q?=E6=95=B0=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/kpi/streetpersonbase-add-or-update.vue | 6 ------
 src/views/modules/kpi/streetpersonbase.vue               | 8 ++++----
 2 files changed, 4 insertions(+), 10 deletions(-)

diff --git a/src/views/modules/kpi/streetpersonbase-add-or-update.vue b/src/views/modules/kpi/streetpersonbase-add-or-update.vue
index c6d92ca0..fad76fed 100644
--- a/src/views/modules/kpi/streetpersonbase-add-or-update.vue
+++ b/src/views/modules/kpi/streetpersonbase-add-or-update.vue
@@ -3,9 +3,6 @@
     <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '80px'">
           <el-form-item label="街道" prop="street">
           <el-input v-model="dataForm.street" placeholder="街道"></el-input>
-      </el-form-item>
-          <el-form-item label="街道ID" prop="streetId">
-          <el-input v-model="dataForm.streetId" placeholder="街道ID"></el-input>
       </el-form-item>
           <el-form-item label="群众底数" prop="residentBaseNum">
           <el-input v-model="dataForm.residentBaseNum" placeholder="群众底数"></el-input>
@@ -46,9 +43,6 @@ export default {
         street: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
-        streetId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
         residentBaseNum: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
diff --git a/src/views/modules/kpi/streetpersonbase.vue b/src/views/modules/kpi/streetpersonbase.vue
index 492bd209..dec71704 100644
--- a/src/views/modules/kpi/streetpersonbase.vue
+++ b/src/views/modules/kpi/streetpersonbase.vue
@@ -3,13 +3,13 @@
     <div class="mod-__streetpersonbase}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
         <el-form-item>
-          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+          <el-input v-model="dataForm.street" placeholder="请输入街道名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission(':streetpersonbase:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+          <el-button v-if="$hasPermission('streetpersonbase:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -19,8 +19,8 @@
         <el-table-column prop="companyBaseNum" label="企业底数" header-align="center" align="center"></el-table-column>
         <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
           <template slot-scope="scope">
-            <el-button v-if="$hasPermission(':streetpersonbase:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
-            <el-button v-if="$hasPermission(':streetpersonbase:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+            <el-button v-if="$hasPermission('streetpersonbase:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('streetpersonbase:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>