From b2b5d39ab5a52643bdc49f9a8c01e94f09a6c48e Mon Sep 17 00:00:00 2001
From: zhangyuan <zhangyuan@sarnasea.com>
Date: Thu, 6 Aug 2020 14:37:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=85=9A=E5=91=98=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/user/fail-authentication.vue |  5 +++++
 .../modules/user/partyauthenticationfailed.vue | 10 +++++-----
 src/views/modules/user/partymembers.vue        | 18 +++++++++---------
 src/views/modules/user/pass-authentication.vue |  5 +++++
 src/views/modules/user/wait-authentication.vue |  5 +++++
 5 files changed, 29 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/user/fail-authentication.vue b/src/views/modules/user/fail-authentication.vue
index 1acd562..58deec3 100644
--- a/src/views/modules/user/fail-authentication.vue
+++ b/src/views/modules/user/fail-authentication.vue
@@ -172,6 +172,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -210,21 +211,25 @@ export default {
         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]
       }
     }
   },
diff --git a/src/views/modules/user/partyauthenticationfailed.vue b/src/views/modules/user/partyauthenticationfailed.vue
index d6472e8..6802414 100644
--- a/src/views/modules/user/partyauthenticationfailed.vue
+++ b/src/views/modules/user/partyauthenticationfailed.vue
@@ -51,16 +51,16 @@
                          width="80"
                          header-align="center"
                          align="center"></el-table-column>
-        <el-table-column prop="identityNo"
-                         label="身份证号"
-                         width="180"
-                         header-align="center"
-                         align="center"></el-table-column>
         <el-table-column prop="mobile"
                          label="手机号"
                          width="110"
                          header-align="center"
                          align="center"></el-table-column>
+        <el-table-column prop="identityNo"
+                         label="身份证号"
+                         width="180"
+                         header-align="center"
+                         align="center"></el-table-column>
         <el-table-column prop="allDeptNames"
                          label="所属网格"
                          min-width="200" show-overflow-tooltip
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index 7c12b09..c485f81 100644
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -118,15 +118,15 @@
                          header-align="center"
                          align="center"
                          width="180"></el-table-column>
-        <!--<el-table-column prop="post"-->
-                         <!--label="职务"-->
-                         <!--header-align="center"-->
-                         <!--align="center"></el-table-column>-->
-        <!--<el-table-column prop="cadreFlag"-->
-                         <!--label="干部下沉"-->
-                         <!--:formatter="formatCadre"-->
-                         <!--header-align="center"-->
-                         <!--align="center"></el-table-column>-->
+        <el-table-column prop="post"
+                         label="职务"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="cadreFlag"
+                         label="干部下沉"
+                         :formatter="formatCadre"
+                         header-align="center"
+                         align="center"></el-table-column>
         <!--<el-table-column prop="partyOrganization"-->
                          <!--label="所在党委"-->
                          <!--header-align="center"-->
diff --git a/src/views/modules/user/pass-authentication.vue b/src/views/modules/user/pass-authentication.vue
index 87e419e..6db22d6 100644
--- a/src/views/modules/user/pass-authentication.vue
+++ b/src/views/modules/user/pass-authentication.vue
@@ -168,6 +168,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -207,21 +208,25 @@ export default {
         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]
       }
     }
   },
diff --git a/src/views/modules/user/wait-authentication.vue b/src/views/modules/user/wait-authentication.vue
index a36c327..2be86b9 100644
--- a/src/views/modules/user/wait-authentication.vue
+++ b/src/views/modules/user/wait-authentication.vue
@@ -161,6 +161,7 @@ export default {
         streetId: '',
         communityId: '',
         gridId: '',
+        deptId: '',
         realName: '',
         mobile: '',
         identityNo: '',
@@ -199,21 +200,25 @@ export default {
         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]
       }
     }
   },