Merge remote-tracking branch 'origin/migration' into migration

src/views/modules/custom/enterpriseinfo.vue

@@ -113,22 +113,22 @@
                 if (val.length === 0) {
                     this.dataForm.streetId = ''
                     this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
+                    this.dataForm.deptId = ''
                 }
                 if (val.length === 1) {
                     this.dataForm.streetId = this.ids[0]
                     this.dataForm.communityId = ''
-                    this.dataForm.gridId = ''
+                    this.dataForm.deptId = ''
                 }
                 if (val.length === 2) {
                     this.dataForm.streetId = this.ids[0]
                     this.dataForm.communityId = this.ids[1]
-                    this.dataForm.gridId = ''
+                    this.dataForm.deptId = ''
                 }
                 if (val.length === 3) {
                     this.dataForm.streetId = this.ids[0]
                     this.dataForm.communityId = this.ids[1]
-                    this.dataForm.gridId = this.ids[2]
+                    this.dataForm.deptId = this.ids[2]
                 }
             }
         },

src/views/modules/custom/epidemic.vue

@@ -90,7 +90,7 @@ export default {
         endTime: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         reporter: '',
         mobile: ''
       },
@@ -125,22 +125,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.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
@@ -154,11 +154,11 @@ export default {
       }).catch(() => {})
     },
     btKeyUpReporter(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.reporter= e.target.value
     },
     btKeyUpMobile(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.mobile= e.target.value
     },
   }

src/views/modules/custom/epidemicsentrypost-add-or-update.vue

@@ -43,7 +43,7 @@ export default {
       dataForm: {
         id: '',
         sentryPostCode: '',
-        gridId: ''
+        deptId: ''
       },
       verifyOptions: []
     }

src/views/modules/custom/epidemicsentrypost.vue

@@ -88,7 +88,7 @@ export default {
       visible: false,
       dataForm: {
         id: '',
-        gridId: '',
+        deptId: '',
         sentryPostCode: ''
       }
     }
@@ -97,13 +97,13 @@ export default {
     init () {
       this.visible = true
       this.dataForm.sentryPostCode = ''
-      this.getDataList(this.dataForm.gridId)
+      this.getDataList(this.dataForm.deptId)
     },
     // 新增 修改
     addOrUpdateHandle () {
       this.addOrUpdateVisible = true
       this.$nextTick(() => {
-        this.$refs.addOrUpdate.dataForm.gridId = this.dataForm.gridId
+        this.$refs.addOrUpdate.dataForm.deptId = this.dataForm.deptId
         this.$refs.addOrUpdate.init()
       })
     },
@@ -114,14 +114,14 @@ export default {
     // 批量生成功能
     initDeptMaCodeHandle () {
       this.$http
-        .post(`custom/epidemicSentryPost/createCodes`, { gridId: this.dataForm.gridId })
+        .post(`custom/epidemicSentryPost/createCodes`, { deptId: this.dataForm.deptId })
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg)
           }
         })
         .catch(() => {})
-      this.getDataList(this.dataForm.gridId)
+      this.getDataList(this.dataForm.deptId)
     },
     // 单独生成哨卡码
     singleMaCodeHandle (id) {
@@ -133,7 +133,7 @@ export default {
           }
         })
         .catch(() => {})
-      this.getDataList(this.dataForm.gridId)
+      this.getDataList(this.dataForm.deptId)
     }
   },
   components: {

src/views/modules/custom/gridoperatorinfo.vue

@@ -62,7 +62,7 @@
                          label="所属网格"
                          header-align="center"
                          align="center" min-width="200" show-overflow-tooltip
-                         
+
          ></el-table-column>
         <el-table-column prop="dutyCategoryId"
                          label="网格员类型"
@@ -146,7 +146,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: ''
+        deptId: ''
       },
       ids: [],
       options: [],
@@ -167,17 +167,17 @@ export default {
       if (val.length == 0 || val.length == 1) {
         this.dataForm.streetId = val[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length == 2) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = val[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length == 3) {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
-        this.dataForm.gridId = val[2]
+        this.dataForm.deptId = val[2]
       }
     }
   },

src/views/modules/group/gridpartymembergroup.vue

@@ -3,7 +3,7 @@
     <div class="mod-news__group}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataListSearch()">
         <el-form-item label="网格">
-          <el-input v-model="dataForm.grid" @keyup.native="btKeyUpGrid" placeholder="请输入网格名称" clearable></el-input>
+          <el-input v-model="dataForm.dept" @keyup.native="btKeyUpGrid" placeholder="请输入网格名称" clearable></el-input>
         </el-form-item>
         <el-form-item>
           <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
@@ -15,7 +15,7 @@
         <el-table-column prop="district" label="市区" header-align="center" align="center"></el-table-column>
         <el-table-column prop="street" label="街道" header-align="center" align="center"></el-table-column>
         <el-table-column prop="community" label="社区" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="grid" label="网格" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="dept" 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 type="text" size="small" @click="createParty(scope.row)">生成党员群</el-button>
@@ -52,8 +52,8 @@ export default {
         streetId: '',
         community: '',
         communityId: '',
-        grid: '',
-        gridId: ''
+        dept: '',
+        deptId: ''
       }
     }
   },
@@ -66,8 +66,8 @@ export default {
         streetId: row.streetId,
         community: row.community,
         communityId: row.communityId,
-        grid: row.grid,
-        gridId: row.gridId
+        dept: row.dept,
+        deptId: row.deptId
       }]
       this.$http['post']('/group/epdc-app/group/createPartys', postForm).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -84,7 +84,7 @@ export default {
     },
     btKeyUpGrid (e) {
     e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-    this.dataForm.grid = e.target.value
+    this.dataForm.dept = e.target.value
   },
     createPartys () {
       var postForm = this.dataList

src/views/modules/group/group.vue

@@ -153,7 +153,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         state: '0'
       },
       postForm: {
@@ -202,7 +202,7 @@ 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.ids[0]
@@ -214,7 +214,7 @@ export default {
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },

src/views/modules/group/leaderboard.vue

@@ -17,7 +17,7 @@
           </el-select>
         </el-form-item>
         <br>
-        <el-form-item label="时间" label-width="80px" 
+        <el-form-item label="时间" label-width="80px"
                       prop="startTime">
           <el-date-picker v-model="dataForm.startTime"
                           type="date"
@@ -88,7 +88,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: ''
       },
@@ -133,22 +133,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.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },

src/views/modules/group/topic-list.vue

@@ -21,7 +21,7 @@
         </el-form-item>
         <br>
         <el-form-item label="排序方式">
-          <el-select v-model="dataForm.orderType" clearable style="width:200px;" 
+          <el-select v-model="dataForm.orderType" clearable style="width:200px;"
                      placeholder="请选择">
             <el-option v-for="item in orderTypeOptions"
                        :key="item.id"
@@ -108,7 +108,7 @@ export default {
         id: '',
         streetId: '',
         communityId: '',
-        gridId: '',
+        deptId: '',
         startTime: '',
         endTime: '',
         groupId: '',
@@ -158,22 +158,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.ids[0]
         this.dataForm.communityId = ''
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 2) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = ''
+        this.dataForm.deptId = ''
       }
       if (val.length === 3) {
         this.dataForm.streetId = this.ids[0]
         this.dataForm.communityId = this.ids[1]
-        this.dataForm.gridId = this.ids[2]
+        this.dataForm.deptId = this.ids[2]
       }
     }
   },
@@ -206,7 +206,7 @@ export default {
       }).catch(() => {})
     },
       btKeyUpKeyWord(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')  
+      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
       this.dataForm.keyword= e.target.value
     }
   }

src/views/modules/sys/deptmacode-optimize.vue

@@ -98,7 +98,7 @@
             <el-button v-if="$hasPermission('sys:deptmacode:create') && !scope.row.codeUrl"
                        type="text"
                        size="small"
-                       @click="createDeptMaCodeHandle(scope.row.gridId)">生成</el-button>
+                       @click="createDeptMaCodeHandle(scope.row.deptId)">生成</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -134,7 +134,7 @@ export default {
       dataForm: {
         streetId: null,
         communityId: null,
-        gridId: null,
+        deptId: null,
         leaderFlag: '0'
       },
       epidemicSentryPostVisible: false,
@@ -143,7 +143,7 @@ export default {
       options: [],
       streetList: [],
       communityList: [],
-      gridList: [],
+      deptList: [],
       maCodeCategorys: [
         { id: '0', name: '群众注册码' },
         { id: '1', name: '网格长注册码' },
@@ -171,22 +171,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]
       }
     }
   },
@@ -285,8 +285,8 @@ export default {
         .catch(() => { })
     },
     clearDataForm () {
-      this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null
-      this.communityList = this.gridList = []
+      this.dataForm.streetId = this.dataForm.communityId = this.dataForm.deptId = null
+      this.communityList = this.deptList = []
     },
     downloadHandle (codeUrl) {
       window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${codeUrl}`
@@ -295,7 +295,7 @@ export default {
     sentryManage (id) {
       this.epidemicSentryPostVisible = true
       this.$nextTick(() => {
-        this.$refs.epidemicSentryPost.dataForm.gridId = id
+        this.$refs.epidemicSentryPost.dataForm.deptId = id
         this.$refs.epidemicSentryPost.init()
       })
     },

src/views/modules/sys/deptmacode.vue

@@ -74,7 +74,7 @@
                          label="社区"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="grid"
+        <el-table-column prop="dept"
                          label="网格"
                          header-align="center"
                          align="center"></el-table-column>
@@ -119,13 +119,13 @@
             <el-button v-if="$hasPermission('sys:deptmacode:sentryManage')"
                        type="text"
                        size="small"
-                       @click="sentryManage(scope.row.gridId)">哨卡管理</el-button>
+                       @click="sentryManage(scope.row.deptId)">哨卡管理</el-button>
             <el-button v-if="
                 $hasPermission('sys:deptmacode:create') && !scope.row.codeUrl
               "
                        type="text"
                        size="small"
-                       @click="createDeptMaCodeHandle(scope.row.gridId)">生成</el-button>
+                       @click="createDeptMaCodeHandle(scope.row.deptId)">生成</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -161,7 +161,7 @@ export default {
       dataForm: {
         streetId: null,
         communityId: null,
-        gridId: null,
+        deptId: null,
         leaderFlag: '0'
       },
       epidemicSentryPostVisible: false,
@@ -170,7 +170,7 @@ export default {
       options: [],
       streetList: [],
       communityList: [],
-      gridList: [],
+      deptList: [],
       maCodeCategorys: [
         { id: '0', name: '群众注册码' },
         { id: '1', name: '网格长注册码' }
@@ -197,22 +197,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]
       }
     }
   },
@@ -311,8 +311,8 @@ export default {
         .catch(() => { })
     },
     clearDataForm () {
-      this.dataForm.streetId = this.dataForm.communityId = this.dataForm.gridId = null
-      this.communityList = this.gridList = []
+      this.dataForm.streetId = this.dataForm.communityId = this.dataForm.deptId = null
+      this.communityList = this.deptList = []
     },
     downloadHandle (codeUrl) {
       window.location.href = `${window.SITE_CONFIG['apiURL']}/oss/file/download?fileUrl=${codeUrl}`
@@ -321,7 +321,7 @@ export default {
     sentryManage (id) {
       this.epidemicSentryPostVisible = true
       this.$nextTick(() => {
-        this.$refs.epidemicSentryPost.dataForm.gridId = id
+        this.$refs.epidemicSentryPost.dataForm.deptId = id
         this.$refs.epidemicSentryPost.init()
       })
     },