diff --git a/src/views/modules/kpi/streetpersonbase-add-or-update.vue b/src/views/modules/kpi/streetpersonbase-add-or-update.vue
index fad76fed..fb347eff 100644
--- a/src/views/modules/kpi/streetpersonbase-add-or-update.vue
+++ b/src/views/modules/kpi/streetpersonbase-add-or-update.vue
@@ -1,17 +1,22 @@
 <template>
   <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
     <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="所属机构" prop="streetId" v-if="!dataForm.id">
+        <el-cascader
+          v-model="deptIdList"
+          :options="deptIdOptions"
+          clearable
+          ref="name"
+        ></el-cascader>
+    </el-form-item>
           <el-form-item label="群众底数" prop="residentBaseNum">
-          <el-input v-model="dataForm.residentBaseNum" placeholder="群众底数"></el-input>
+          <el-input-number v-model="dataForm.residentBaseNum" :min="0" label="群众底数"></el-input-number>
       </el-form-item>
           <el-form-item label="党员底数" prop="partyBaseNum">
-          <el-input v-model="dataForm.partyBaseNum" placeholder="党员底数"></el-input>
+          <el-input-number v-model="dataForm.partyBaseNum" :min="0" label="群众底数"></el-input-number>
       </el-form-item>
           <el-form-item label="企业底数" prop="companyBaseNum">
-          <el-input v-model="dataForm.companyBaseNum" placeholder="企业底数"></el-input>
+          <el-input-number v-model="dataForm.companyBaseNum" :min="0" label="群众底数"></el-input-number>
       </el-form-item>
       </el-form>
     <template slot="footer">
@@ -23,6 +28,7 @@
 
 <script>
 import debounce from 'lodash/debounce'
+import Cookies from 'js-cookie'
 export default {
   data () {
     return {
@@ -34,13 +40,16 @@ export default {
         residentBaseNum: '',
         partyBaseNum: '',
         companyBaseNum: ''
-      }
+      },
+      // 所属机构配置
+      deptIdOptions: [],
+      deptIdList: []
     }
   },
   computed: {
     dataRule () {
       return {
-        street: [
+        streetId: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ],
         residentBaseNum: [
@@ -55,6 +64,29 @@ export default {
       }
     }
   },
+  created () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/manualScore/importManualScoreExcel?token=${Cookies.get('token')}`
+    // 所属机构创建
+    this.$http
+      .get(`/sys/user/deptOptions/getStreetByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptIdOptions = res.data.options
+      })
+      .catch(() => {})
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+      } else if (val.length > 0) {
+        this.dataForm.streetId = this.deptIdList[val.length - 1]
+        this.dataForm.street = this.$refs['name'].getCheckedNodes()[0].label
+      }
+    }
+  },
   methods: {
     init () {
       this.visible = true
@@ -63,6 +95,7 @@ export default {
         if (this.dataForm.id) {
           this.getInfo()
         }
+        this.deptIdList = []
       })
     },
     // 获取信息
diff --git a/src/views/modules/kpi/streetpersonbase.vue b/src/views/modules/kpi/streetpersonbase.vue
index dec71704..e18c9d94 100644
--- a/src/views/modules/kpi/streetpersonbase.vue
+++ b/src/views/modules/kpi/streetpersonbase.vue
@@ -2,8 +2,13 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__streetpersonbase}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
-          <el-input v-model="dataForm.street" placeholder="请输入街道名称" clearable></el-input>
+        <el-form-item label="所属机构">
+          <el-cascader
+            v-model="deptIdList"
+            :options="options"
+            :props="{ checkStrictly: true }"
+            clearable
+          ></el-cascader>
         </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
@@ -42,6 +47,7 @@
 <script>
 import mixinViewModule from '@/mixins/view-module'
 import AddOrUpdate from './streetpersonbase-add-or-update'
+import Cookies from 'js-cookie'
 export default {
   mixins: [mixinViewModule],
   data () {
@@ -55,11 +61,44 @@ export default {
       dataForm: {
         id: '',
         streetId: ''
-      }
+      },
+      // 所属机构配置
+      deptIdList: [],
+      options: [],
+      streetList: []
     }
   },
   components: {
     AddOrUpdate
+  },
+  created () {
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/manualScore/importManualScoreExcel?token=${Cookies.get('token')}`
+    // 所属机构创建
+    this.$http
+      .get(`/sys/user/deptOptions/getStreetByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+      }
+    }
   }
 }
 </script>