PC端【居民管理-未认证居民】所属机构查询条件无作用 改为安宁版本

src/views/modules/user/unauthorized.vue

@@ -4,7 +4,7 @@
     <div class="mod-epdc__user}">
       <el-form :inline="true"
                :model="dataForm"
-               @keyup.enter.native="getDataListSearch()">
+               @keyup.enter.native="getDataList()">
         <el-form-item label="所属机构">
           <el-cascader v-model="deptIdList"
                        :options="options"
@@ -48,45 +48,30 @@
           </el-select>
         </el-form-item>
         <el-form-item label="昵称">
-          <el-input v-model="dataForm.nickname" @keyup.native="btKeyUpnickname"
+          <el-input v-model="dataForm.nickname"
-                    placeholder="请输入"
-                    clearable></el-input>
-        </el-form-item>
-        <el-form-item label="手机号" @keyup.native="btKeyUpmobile">
-          <el-input v-model="dataForm.mobile"
                     placeholder="请输入"
                     clearable></el-input>
         </el-form-item>
+<!--        <el-form-item label="手机号">-->
+<!--          <el-input v-model="dataForm.mobile"-->
+<!--                    placeholder="请输入"-->
+<!--                    clearable></el-input>-->
+<!--        </el-form-item>-->
         <!-- <div class="block"> -->
-        <br>
+        <span class="demonstration">注册时间</span>&nbsp;&nbsp;
-        <el-form-item label="注册时间" prop="startTime">
+        <el-date-picker @change='setRegistTime'
-          <el-date-picker v-model="dataForm.startTime"
+                        v-model="time"
-                          type="date"
+                        value-format="yyyy-MM-dd"
-                          :picker-options="pickerBeginDateBefore"
+                        type="daterange"
-                          value-format="yyyy-MM-dd"
+                        range-separator="至"
-                          format="yyyy-MM-dd"
+                        start-placeholder="开始日期"
-                          placeholder="选择日期时间"
+                        end-placeholder="结束日期"></el-date-picker>&nbsp;
-                          style="width:200px"
-                          @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
-        <el-form-item label="至" prop="endTime">
-          <el-date-picker v-model="dataForm.endTime"
-                          type="date"
-                          :picker-options="pickerBeginDateAfter"
-                          value-format="yyyy-MM-dd"
-                          format="yyyy-MM-dd"
-                          placeholder="选择日期时间"
-                          style="width:200px"
-                          @change="changeTime">
-          </el-date-picker>
-        </el-form-item>
         <el-form-item>
-          <el-button type="success" @click="getDataListSearch()">{{ $t('query') }}</el-button>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
         <el-form-item>
           <el-button v-if="$hasPermission('epdc:user:export')"
-                     type="success"
+                     type="primary"
                      @click="exportHandle()">{{ $t('export') }}</el-button>
         </el-form-item>
         <!-- </div> -->
@@ -96,11 +81,12 @@
                 border
                 @selection-change="dataListSelectionChangeHandle"
                 style="width: 100%;">
-        <el-table-column label="序号" header-align="center" align="center" width="50px">
+        <el-table-column type="selection"
-            <template slot-scope="scope">
+                         header-align="center"
-                {{scope.$index+1}}
+                         align="center"
-            </template>
+                         width="50"></el-table-column>
-        </el-table-column>
+        <el-table-column label="序号"
+                         width="70px" align="center"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column>
         <el-table-column prop="myGridName"
                          label="所属网格（街道-社区-网格）"
                          header-align="center"
@@ -109,13 +95,11 @@
         <el-table-column prop="nickname"
                          label="昵称"
                          header-align="center"
-                         align="center"
-                         show-overflow-tooltip
-                        ></el-table-column>
-        <el-table-column prop="mobile"
-                         label="手机号"
-                         header-align="center"
                          align="center"></el-table-column>
+<!--        <el-table-column prop="mobile"-->
+<!--                         label="手机号"-->
+<!--                         header-align="center"-->
+<!--                         align="center"></el-table-column>-->
         <el-table-column prop="realName"
                          label="真实姓名"
                          header-align="center"
@@ -129,19 +113,17 @@
         <el-table-column prop="createdTime"
                          label="加入网格时间"
                          header-align="center"
-                         align="center"
+                         align="center"></el-table-column>
-                         width="180"></el-table-column>
         <el-table-column prop="state"
                          label="注册状态"
                          :formatter="formatState"
                          header-align="center"
-                         align="center"
+                         align="center"></el-table-column>
-                         width="120"></el-table-column>
         <el-table-column :label="$t('handle')"
                          fixed="right"
                          header-align="center"
                          align="center"
-                         width="150">
+                         width="100">
           <template slot-scope="scope">
             <el-button type="text"
                        size="small"
@@ -187,6 +169,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
+        deptId:'',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -196,22 +179,6 @@ export default {
         state: '0',
         nickname: ''
       },
-      pickerBeginDateBefore: {
-        disabledDate: (time) => {
-          let beginDateVal = this.dataForm.endTime
-          if (beginDateVal) {
-            return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
-      pickerBeginDateAfter: {
-        disabledDate: (time) => {
-          let EndDateVal = this.dataForm.startTime
-          if (EndDateVal) {
-            return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
-          }
-        }
-      },
       deptIdList: [],
       options: [],
       userDetailVisible: false,
@@ -235,7 +202,6 @@ export default {
         this.options = res.data.options
       })
       .catch(() => { })
-    this.initTime()
   },
   watch: {
     'deptIdList': function (val) {
@@ -243,53 +209,29 @@ export default {
         this.dataForm.streetId = ''
         this.dataForm.communityId = ''
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = ''
+      }else
       if (val.length === 1) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = ''
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = this.deptIdList[0]
+      }else
       if (val.length === 2) {
         this.dataForm.streetId = this.deptIdList[0]
         this.dataForm.communityId = this.deptIdList[1]
         this.dataForm.gridId = ''
-      }
+        this.dataForm.deptId = this.deptIdList[1]
+      }else
       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]
       }
     }
   },
   methods: {
-    initTime () {
-      const end = new Date()
-      const start = new Date()
-      start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
-      this.time = [start, end]
-      let year = start.getFullYear()
-      let month = start.getMonth() + 1
-      if (month < 10) {
-        month = '0' + month
-      }
-      let date = start.getDate()
-      if (date < 10) {
-        date = '0' + date
-      }
-      let startDate = year + '-' + month + '-' + date
-      let yearend = end.getFullYear()
-      let monthend = end.getMonth() + 1
-      if (monthend < 10) {
-        monthend = '0' + monthend
-      }
-      let dateend = end.getDate()
-      if (dateend < 10) {
-        dateend = '0' + dateend
-      }
-      let endDate = yearend + '-' + monthend + '-' + dateend
-      this.dataForm.startTime = startDate
-      this.dataForm.endTime = endDate
-    },
     getStreetList () {
       this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
         if (res.code !== 0) {
@@ -322,6 +264,10 @@ export default {
         }).catch(() => { })
       }
     },
+    setRegistTime () {
+      this.dataForm.startTime = this.time[0]
+      this.dataForm.endTime = this.time[1]
+    },
     formatState: function (row, column) {
       let state = row.state
       if (state === '1') {
@@ -374,15 +320,7 @@ export default {
         this.$refs.userDetail.dataForm.id = userId
         this.$refs.userDetail.init()
       })
-    },
+    }
-    btKeyUpnickname(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.nickname = e.target.value
-    },
-    btKeyUpmobile(e){
-      e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
-      this.dataForm.mobile = e.target.value
-    },
   },
   components: {
     AddOrUpdate,