【grid修改】-王公峰-2020-09-24

src/views/modules/user/alluser.vue

@@ -158,7 +158,7 @@ export default {
         id: '',
         nickname: '',
         identityNo: '',
-        gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         startTime: '',
@@ -210,22 +210,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -240,7 +240,7 @@ export default {
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       if (this.dataForm.streetId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -252,7 +252,7 @@ export default {
     },
     getGridList () {
       this.gridOptions = []
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       if (this.dataForm.communityId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
           if (res.code !== 0) {

src/views/modules/user/fail-authentication.vue

@@ -36,9 +36,9 @@
                        :value="item.id"> </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="网格"
+        <el-form-item label="部门"
                       v-if="false">
-          <el-select v-model="dataForm.gridId"
+          <el-select v-model="dataForm.deptId"
                      clearable
                      placeholder="请选择">
             <el-option v-for="(item,index) in gridOptions"
@@ -187,7 +187,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -242,22 +242,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -300,7 +300,7 @@ export default {
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       if (this.dataForm.streetId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -312,7 +312,7 @@ export default {
     },
     getGridList () {
       this.gridOptions = []
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       if (this.dataForm.communityId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
           if (res.code !== 0) {

src/views/modules/user/hasAuthenticationpartymembers.vue

@@ -168,7 +168,7 @@ export default {
         streetId: '',
         identityNo: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         registFlag: '',
         postId: '',
         startTime: '',
@@ -210,22 +210,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -298,11 +298,11 @@ export default {
         this.communityOptions = []
         this.gridOptions = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
+      this.dataForm.deptId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -313,10 +313,10 @@ export default {
     getGridList () {
       if (this.dataForm.communityId === '') {
         this.gridOptions = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
-      this.dataForm.gridId = ''
+      this.dataForm.deptId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)

src/views/modules/user/party-review.vue

@@ -61,7 +61,7 @@
                     <el-table-column prop="allDeptNames"
                                      label="街道-社区-网格">
                     </el-table-column>
-                    <el-table-column prop="grid"
+                    <el-table-column prop="dept"
                                      label="网格名称" v-if="false">
                     </el-table-column>
                     <el-table-column prop="leaderFlag"

src/views/modules/user/party-wait-authentication.vue

@@ -38,7 +38,7 @@
         </el-form-item>
         <el-form-item label="网格"
                       v-if="false" label-width="70px">
-          <el-select v-model="dataForm.gridId"
+          <el-select v-model="dataForm.deptId"
                      clearable
                      placeholder="请选择">
             <el-option v-for="(item,index) in gridOptions"
@@ -179,7 +179,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -233,22 +233,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -299,7 +299,7 @@ export default {
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       if (this.dataForm.streetId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -311,7 +311,7 @@ export default {
     },
     getGridList () {
       this.gridOptions = []
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       if (this.dataForm.communityId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
           if (res.code !== 0) {

src/views/modules/user/partymembers-add-or-update.vue

@@ -55,7 +55,7 @@
       </el-form-item>
       <el-form-item label="网格党支部"
                     label-width='auto'>
-        <el-select v-model="dataForm.gridId"
+        <el-select v-model="dataForm.deptId"
                    placeholder="请选择"
                    @change="evaluation">
           <el-option v-for="item in gridOptions"
@@ -103,7 +103,7 @@ export default {
         mobile: '',
         identityNo: '',
         cadreFlag: '',
-        gridId: '',
+        deptId: '',
         tagIds: [],
         allDeptIds: []
       },
@@ -188,7 +188,7 @@ export default {
     //   let choosenItem = this.streetOptions.filter(item => item.id === this.dataForm.streetId)[0]
     //   this.dataForm.streetName = choosenItem.name
     //   this.dataForm.communityId = ''
-    //   this.dataForm.gridId = ''
+    //   this.dataForm.deptId = ''
     //   this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
     //     if (res.code !== 0) {
     //       return this.$message.error(res.msg)
@@ -199,7 +199,7 @@ export default {
     // getGridList () {
     //   let choosenItem = this.communityOptions.filter(item => item.id === this.dataForm.communityId)[0]
     //   this.dataForm.communityName = choosenItem.name
-    //   this.dataForm.gridId = ''
+    //   this.dataForm.deptId = ''
     //   this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
     //     if (res.code !== 0) {
     //       return this.$message.error(res.msg)
@@ -208,8 +208,8 @@ export default {
     //   }).catch(() => { })
     // },
     evaluation () {
-      let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.gridId)[0]
+      let choosenItem = this.gridOptions.filter(item => item.id === this.dataForm.deptId)[0]
-      this.dataForm.gridName = choosenItem.name
+      this.dataForm.deptName = choosenItem.name
     },
     // 获取信息
     getInfo () {

src/views/modules/user/partymembers.vue

@@ -244,7 +244,7 @@ export default {
         streetId: '',
         identityNo: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         registFlag: '',
         postId: '',
         startTime: '',
@@ -303,22 +303,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -384,11 +384,11 @@ export default {
         this.communityOptions = []
         this.gridOptions = []
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
       this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
+      this.dataForm.deptId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)
@@ -399,10 +399,10 @@ export default {
     getGridList () {
       if (this.dataForm.communityId === '') {
         this.gridOptions = []
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
         return
       }
-      this.dataForm.gridId = ''
+      this.dataForm.deptId = ''
       this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
         if (res.code !== 0) {
           return this.$message.error(res.msg)

src/views/modules/user/pass-authentication.vue

@@ -38,7 +38,7 @@
         </el-form-item>
         <el-form-item label="网格"
                       v-if="false">
-          <el-select v-model="dataForm.gridId"
+          <el-select v-model="dataForm.deptId"
                      clearable
                      placeholder="请选择">
             <el-option v-for="(item,index) in gridOptions"
@@ -180,7 +180,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -236,22 +236,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -294,7 +294,7 @@ export default {
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       if (this.dataForm.streetId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -306,7 +306,7 @@ export default {
     },
     getGridList () {
       this.gridOptions = []
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       if (this.dataForm.communityId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
           if (res.code !== 0) {

src/views/modules/user/user-add-or-update.vue

@@ -88,15 +88,15 @@
                            width="180"
                            v-if="false">
           </el-table-column>
-          <el-table-column prop="grid"
+          <el-table-column prop="dept"
-                           label="网格"
+                           label="部门"
                            v-if="false">
           </el-table-column> -->
           <el-table-column prop="allDeptNames"
                            label="街道-社区-网格">
           </el-table-column>
-          <el-table-column prop="grid"
+          <el-table-column prop="dept"
-                           label="网格名称"
+                           label="部门名称"
                            v-if="false">
           </el-table-column>
           <el-table-column prop="leaderFlag"

src/views/modules/user/user-detail.vue

@@ -59,8 +59,8 @@
           <el-table-column prop="community"
                            label="社区">
           </el-table-column>
-          <el-table-column prop="grid"
+          <el-table-column prop="dept"
-                           label="网格">
+                           label="部门">
           </el-table-column> -->
           <el-table-column prop="id"
                            label="主键" v-if="false">
@@ -68,8 +68,8 @@
           <el-table-column prop="allDeptNames"
                            label="街道-社区-网格">
           </el-table-column>
-          <el-table-column prop="grid"
+          <el-table-column prop="dept"
-                           label="网格名称" v-if="false">
+                           label="部门名称" v-if="false">
           </el-table-column>
           <el-table-column prop="leaderFlag"
                            label="是否为网格长"

src/views/modules/user/user-grid.vue

@@ -7,7 +7,7 @@
     <el-table :data="userGridList" style="width: 100%">
       <!-- <el-table-column prop="street" label="街道" v-if="false"> </el-table-column>
       <el-table-column prop="community" label="社区" v-if="false"> </el-table-column>
-      <el-table-column prop="grid" label="网格" v-if="false"> </el-table-column>
+      <el-table-column prop="dept" label="部门" v-if="false"> </el-table-column>
       <el-table-column
         v-if="false"
         prop="leaderFlag"
@@ -16,7 +16,7 @@
       >
       </el-table-column> -->
       <el-table-column prop="allDeptNames" label="街道-社区-网格"> </el-table-column>
-      <el-table-column prop="grid" label="网格名称" v-if="false"> </el-table-column>
+      <el-table-column prop="dept" label="部门名称" v-if="false"> </el-table-column>
       <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
         <template slot-scope="scope">
           <el-button  type="text" size="small" @click="unbindGridHandle(scope.row.id,scope.row.userId)">解除</el-button>

src/views/modules/user/user.vue

@@ -18,7 +18,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="网格">
-                  <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
+                  <el-select v-model="dataForm.deptId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
@@ -64,8 +64,8 @@
                     <el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="网格">
+                <el-form-item label="部门">
-                  <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
+                  <el-select v-model="dataForm.deptId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
@@ -112,7 +112,7 @@
                   </el-select>
                 </el-form-item>
                 <el-form-item label="网格">
-                  <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
+                  <el-select v-model="dataForm.deptId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
@@ -162,8 +162,8 @@
                     <el-option v-for="(item,index) in communityOptions" :key="index" :label="item.name" :value="item.id"> </el-option>
                   </el-select>
                 </el-form-item>
-                <el-form-item label="网格">
+                <el-form-item label="部门">
-                  <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
+                  <el-select v-model="dataForm.deptId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
                 </el-form-item>
@@ -223,7 +223,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -256,7 +256,7 @@ export default {
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       if (this.dataForm.streetId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -268,7 +268,7 @@ export default {
     },
     getGridList () {
       this.gridOptions = []
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       if (this.dataForm.communityId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -300,7 +300,7 @@ export default {
     handleClick (tab, event) {
       this.dataForm.streetId = ''
       this.dataForm.communityId = ''
-      this.dataForm.gridId = ''
+      this.dataForm.deptId = ''
       this.dataForm.realName = ''
       this.dataForm.mobile = ''
       this.dataForm.identityNo = ''

src/views/modules/user/volunteerinfo-add-or-update.vue

@@ -28,8 +28,8 @@
           <el-form-item label="积分" prop="points">
           <el-input v-model="dataForm.points" placeholder="积分"></el-input>
       </el-form-item>
-          <el-form-item label="网格ID" prop="gridId">
+          <el-form-item label="部门ID" prop="deptId">
-          <el-input v-model="dataForm.gridId" placeholder="网格ID"></el-input>
+          <el-input v-model="dataForm.deptId" placeholder="部门ID"></el-input>
       </el-form-item>
           <el-form-item label="审批状态" prop="auditStatus">
           <el-input v-model="dataForm.auditStatus" placeholder="审批状态"></el-input>
@@ -65,7 +65,7 @@ export default {
         kindnessTime: '',
         participationNum: '',
         points: '',
-        gridId: '',
+        deptId: '',
         parentDeptIds: '',
         parentDeptNames: '',
         allDeptIds: '',

src/views/modules/user/volunteerinfo.vue

@@ -174,7 +174,7 @@ export default {
         allDeptNames: '',
         streetId: null,
         communityId: null,
-        gridId: null,
+        deptId: null,
         leaderFlag: '0'
       },
       auditStatusType: 0,
@@ -202,22 +202,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },

src/views/modules/user/wait-authentication.vue

@@ -38,7 +38,7 @@
         </el-form-item>
         <el-form-item label="网格"
                       v-if="false">
-          <el-select v-model="dataForm.gridId"
+          <el-select v-model="dataForm.deptId"
                      clearable
                      placeholder="请选择">
             <el-option v-for="(item,index) in gridOptions"
@@ -173,7 +173,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -228,22 +228,22 @@ export default {
       if (val.length === 0) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
-        this.dataForm.gridId = this.deptIdList[2]
+        this.dataForm.deptId = this.deptIdList[2]
       }
     }
   },
@@ -286,7 +286,7 @@ export default {
     },
     getCommunityList () {
       this.communityOptions = this.gridOptions = []
-      this.dataForm.communityId = this.dataForm.gridId = null
+      this.dataForm.communityId = this.dataForm.deptId = null
       if (this.dataForm.streetId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
           if (res.code !== 0) {
@@ -298,7 +298,7 @@ export default {
     },
     getGridList () {
       this.gridOptions = []
-      this.dataForm.gridId = null
+      this.dataForm.deptId = null
       if (this.dataForm.communityId) {
         this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
           if (res.code !== 0) {