From e111ed0065cdcf6d376895c3928ddd44b1e66ab9 Mon Sep 17 00:00:00 2001
From: yinzuomei <yinzuomei@elink-cn.com>
Date: Thu, 28 Nov 2019 20:46:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E7=AE=A1=E7=90=86[=E6=9C=AA?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E5=B1=85=E6=B0=91=E3=80=81=E5=BE=85=E8=AE=A4?=
 =?UTF-8?q?=E8=AF=81=E5=B1=85=E6=B0=91=E3=80=81=E5=B7=B2=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=B1=85=E6=B0=91=E3=80=81=E5=B1=85=E6=B0=91=E8=AE=A4=E8=AF=81?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5]=E9=A1=B5=E9=9D=A2=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/user/fail-authentication.vue      | 48 ++++++++++++-------
 .../modules/user/pass-authentication.vue      | 48 ++++++++++++-------
 src/views/modules/user/unauthorized.vue       | 48 ++++++++++++-------
 src/views/modules/user/user-add-or-update.vue |  5 +-
 .../modules/user/wait-authentication.vue      | 48 ++++++++++++-------
 5 files changed, 128 insertions(+), 69 deletions(-)

diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue
index e7b5cd70..9751e2eb 100644
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@@ -2,17 +2,25 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-epdc__user}">
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-                <el-form-item label="街道">
+                  <el-form-item label="所属机构">
+                  <el-cascader
+                    v-model="dataForm.deptIdList"
+                    :options="options"
+                    :props="{ checkStrictly: true }"
+                    clearable>
+                  </el-cascader>
+                </el-form-item>
+                <el-form-item label="街道" v-if="false">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :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.communityId" clearable placeholder="请选择" @change="getGridList">
                     <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="网格" v-if="false">
                   <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
@@ -59,7 +67,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/page',
+        getDataListURL: 'app-user/user/query',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -76,8 +84,12 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '2'
+        state: '2',
+        page: 1,
+        limit: 10,
+        deptIdList: []
       },
+      options: [],
       userDetailVisible: false,
       streetOptions: [],
       communityOptions: [],
@@ -89,7 +101,16 @@ export default {
     }
   },
   created () {
-    this.getStreetList()
+    // this.getStreetList()
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
   },
   methods: {
     getStreetList () {
@@ -150,17 +171,10 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
-          }
-        }
+      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
+      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
+      this.$http.post(
+        this.mixinViewModuleOptions.getDataListURL, this.dataForm
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index 84ea6519..5e26a1d4 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -2,17 +2,25 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-epdc__user}">
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-                <el-form-item label="街道">
+                <el-form-item label="所属机构">
+                  <el-cascader
+                    v-model="dataForm.deptIdList"
+                    :options="options"
+                    :props="{ checkStrictly: true }"
+                    clearable>
+                  </el-cascader>
+                </el-form-item>
+                <el-form-item label="街道" v-if="false">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item, index) in streetOptions" :key="index" :label="item.name" :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.communityId" clearable placeholder="请选择" @change="getGridList">
                     <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="网格" v-if="false">
                   <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
@@ -68,7 +76,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/page',
+        getDataListURL: 'app-user/user/query',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -85,8 +93,12 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '3'
+        state: '3',
+        page: 1,
+        limit: 10,
+        deptIdList: []
       },
+      options: [],
       userDetailVisible: false,
       userGridVisible: false,
       streetOptions: [],
@@ -99,7 +111,16 @@ export default {
     }
   },
   created () {
-    this.getStreetList()
+    // this.getStreetList()
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
   },
   methods: {
     getStreetList () {
@@ -160,17 +181,10 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
-          }
-        }
+      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
+      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
+      this.$http.post(
+        this.mixinViewModuleOptions.getDataListURL, this.dataForm
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {
diff --git a/src/views/modules/user/unauthorized.vue b/src/views/modules/user/unauthorized.vue
index b5fa196d..b94596f3 100644
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@@ -2,17 +2,25 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-epdc__user}">
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-                <el-form-item label="街道">
+                <el-form-item label="所属机构">
+                  <el-cascader
+                    v-model="dataForm.deptIdList"
+                    :options="options"
+                    :props="{ checkStrictly: true }"
+                    clearable>
+                  </el-cascader>
+                </el-form-item>
+                <el-form-item label="街道1" v-if="false">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item,index) in streetOptions" :key="index" :label="item.name" :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.communityId" clearable placeholder="请选择" @change="getGridList">
                     <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="网格" v-if="false">
                   <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
@@ -59,7 +67,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/page',
+        getDataListURL: 'app-user/user/query',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -76,8 +84,12 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '0'
+        state: '0',
+        page: 1,
+        limit: 10,
+        deptIdList: []
       },
+      options: [],
       userDetailVisible: false,
       streetOptions: [],
       communityOptions: [],
@@ -89,7 +101,16 @@ export default {
     }
   },
   created () {
-    this.getStreetList()
+    // this.getStreetList()
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
   },
   methods: {
     getStreetList () {
@@ -150,17 +171,10 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
-          }
-        }
+      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
+      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
+      this.$http.post(
+        this.mixinViewModuleOptions.getDataListURL, this.dataForm
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {
diff --git a/src/views/modules/user/user-add-or-update.vue b/src/views/modules/user/user-add-or-update.vue
index 73429531..e24dd05e 100644
--- a/src/views/modules/user/user-add-or-update.vue
+++ b/src/views/modules/user/user-add-or-update.vue
@@ -118,7 +118,10 @@ export default {
         cadreFlag: '',
         state: '',
         tagIds: [],
-        remark: ''
+        remark: '',
+        totalSubmitNum: '',
+        totalPassSubmitNum: '',
+        totalFailNum: ''
       },
       authenticateHistoryVisible: false,
       cadreOptions: [{ cadreFlag: '1', cadreTitle: '是' }, { cadreFlag: '0', cadreTitle: '否' }],
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index c0674753..0ba99cb8 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -2,17 +2,25 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-epdc__user}">
               <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-                <el-form-item label="街道">
+                <el-form-item label="所属机构">
+                  <el-cascader
+                    v-model="dataForm.deptIdList"
+                    :options="options"
+                    :props="{ checkStrictly: true }"
+                    clearable>
+                  </el-cascader>
+                </el-form-item>
+                <el-form-item label="街道" v-if="false">
                   <el-select v-model="dataForm.streetId" clearable placeholder="请选择" @change="getCommunityList">
                     <el-option v-for="(item,index) in streetOptions" :key="index" :label="item.name" :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.communityId" clearable placeholder="请选择" @change="getGridList">
                     <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="网格" v-if="false">
                   <el-select v-model="dataForm.gridId" clearable placeholder="请选择">
                     <el-option v-for="(item,index) in gridOptions" :key="index" :label="item.name" :value="item.id"></el-option>
                   </el-select>
@@ -59,7 +67,7 @@ export default {
   data () {
     return {
       mixinViewModuleOptions: {
-        getDataListURL: 'app-user/user/page',
+        getDataListURL: 'app-user/user/query',
         getDataListIsPage: true,
         deleteURL: '/app-use/user',
         deleteIsBatch: true,
@@ -76,8 +84,12 @@ export default {
         startTime: '',
         endTime: '',
         partyFlag: '',
-        state: '1'
+        state: '1',
+        page: 1,
+        limit: 10,
+        deptIdList: []
       },
+      options: [],
       userDetailVisible: false,
       streetOptions: [],
       communityOptions: [],
@@ -89,7 +101,16 @@ export default {
     }
   },
   created () {
-    this.getStreetList()
+    // this.getStreetList()
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.options = res.data.options
+      })
+      .catch(() => {})
   },
   methods: {
     getStreetList () {
@@ -150,17 +171,10 @@ export default {
         this.dataForm.endTime = ''
       }
       this.dataListLoading = true
-      this.$http.get(
-        this.mixinViewModuleOptions.getDataListURL,
-        {
-          params: {
-            order: this.order,
-            orderField: this.orderField,
-            page: this.mixinViewModuleOptions.getDataListIsPage ? this.page : null,
-            limit: this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null,
-            ...this.dataForm
-          }
-        }
+      this.dataForm.page = this.mixinViewModuleOptions.getDataListIsPage ? this.page : null
+      this.dataForm.limit = this.mixinViewModuleOptions.getDataListIsPage ? this.limit : null
+      this.$http.post(
+        this.mixinViewModuleOptions.getDataListURL, this.dataForm
       ).then(({ data: res }) => {
         this.dataListLoading = false
         if (res.code !== 0) {