From 7ac335be5b9dcbe23e00f9074daaa6779d5430d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E9=87=91=E9=B9=8F?= <daofugui@163.com>
Date: Tue, 3 Sep 2019 16:00:42 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E7=AE=A1=E7=90=86=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/partymembers-add-or-update.vue       | 109 ++++++++-------
 src/views/modules/user/partymembers.vue       | 125 +++++++++++++++++-
 2 files changed, 180 insertions(+), 54 deletions(-)

diff --git a/src/views/modules/user/partymembers-add-or-update.vue b/src/views/modules/user/partymembers-add-or-update.vue
index ed4e927f..017de84b 100755
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@@ -10,20 +10,65 @@
       <el-form-item label="身份证号" prop="identityNo">
           <el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
       </el-form-item>
-      <el-form-item label="职务" prop="post">
-          <el-input v-model="dataForm.post" placeholder="职务"></el-input>
+      <el-form-item label="街道党工委">
+          <el-select v-model="dataForm.streetId" placeholder="请选择">
+            <el-option
+              v-for="item in streetOptions"
+              :key="item.streetId"
+              :label="item.streetName"
+              :value="item.streetId">
+            </el-option>
+          </el-select>
       </el-form-item>
-      <el-form-item label="干部下沉标识(0-否，1-是)" prop="cadreFlag">
-          <el-input v-model="dataForm.cadreFlag" placeholder="干部下沉标识(0-否，1-是)"></el-input>
+      <el-form-item label="社区党委">
+        <el-select v-model="dataForm.communityId" placeholder="请选择">
+          <el-option
+            v-for="item in communityOptions"
+            :key="item.communityId"
+            :label="item.communityName"
+            :value="item.communityId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="街道名称" prop="streetName">
-          <el-input v-model="dataForm.streetName" placeholder="街道名称"></el-input>
+      <el-form-item label="网格党支部">
+        <el-select v-model="dataForm.gridId" placeholder="请选择">
+          <el-option
+            v-for="item in gridOptions"
+            :key="item.gridId"
+            :label="item.gridName"
+            :value="item.gridId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="社区名称" prop="communityName">
-          <el-input v-model="dataForm.communityName" placeholder="社区名称"></el-input>
+      <el-form-item label="职务">
+        <el-select v-model="postId" placeholder="请选择">
+          <el-option
+            v-for="item in postOptions"
+            :key="item.postId"
+            :label="item.post"
+            :value="item.postId">
+          </el-option>
+        </el-select>
       </el-form-item>
-      <el-form-item label="网格名称" prop="gridName">
-          <el-input v-model="dataForm.gridName" placeholder="网格名称"></el-input>
+      <el-form-item label="干部下沉">
+        <el-select v-model="dataForm.cadreFlag" placeholder="请选择">
+          <el-option
+            v-for="item in cadreOptions"
+            :key="item.cadreFlag"
+            :label="item.cadreTitle"
+            :value="item.cadreFlag">
+          </el-option>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="用户角色">
+        <el-checkbox-group v-model="checkList">
+          <el-checkbox
+            v-for="item in tagOptions"
+            :key="item.tagId"
+            :label="item.tagValue"
+            :value="item.tadId">
+          </el-checkbox>
+        </el-checkbox-group>
       </el-form-item>
     </el-form>
     <template slot="footer">
@@ -49,7 +94,13 @@ export default {
         streetName: '',
         communityName: '',
         gridName: ''
-      }
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      postOptions: [],
+      cadreOptions: [],
+      tagOptions: []
     }
   },
   computed: {
@@ -63,42 +114,6 @@ export default {
         ],
         identityNo: [
           { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        post: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        postId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        cadreFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        registFlag: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        registTime: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        streetName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        streetId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        communityName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        communityId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridName: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        gridId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
-        ],
-        deptId: [
-          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
         ]
       }
     }
diff --git a/src/views/modules/user/partymembers.vue b/src/views/modules/user/partymembers.vue
index 985538b7..3566aa3f 100755
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@@ -2,24 +2,91 @@
   <el-card shadow="never" class="aui-card--fill">
     <div class="mod-__partymembers}">
       <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <el-form-item>
+        <el-form-item label="街道">
+          <el-select v-model="dataForm.streetId" placeholder="请选择" @change="getCommunityList">
+            <el-option
+              v-for="item in streetOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="社区">
+          <el-select v-model="dataForm.communityId" placeholder="请选择" @change="getGridList">
+            <el-option
+              v-for="item in communityOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="网格">
+          <el-select v-model="dataForm.gridId" placeholder="请选择">
+            <el-option
+              v-for="item in gridOptions"
+              :key="item.id"
+              :label="item.name"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="注册状态">
+          <el-select v-model="dataForm.registFlag" placeholder="请选择">
+            <el-option
+              v-for="item in registOptions"
+              :key="item.registFlag"
+              :label="item.registTitle"
+              :value="item.registFlag">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item label="姓名">
           <el-input v-model="dataForm.realName" placeholder="" clearable></el-input>
         </el-form-item>
-
+        <el-form-item label="手机号">
+          <el-input v-model="dataForm.mobile" placeholder="" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="身份证号">
+          <el-input v-model="dataForm.identityNo" placeholder="" clearable></el-input>
+        </el-form-item>
+        <el-form-item label="职务">
+          <el-select v-model="dataForm.postId" placeholder="请选择">
+            <el-option
+              v-for="item in postOptions"
+              :key="item.postId"
+              :label="item.post"
+              :value="item.postId">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <br>
+        <el-form-item label="注册时间">
+          <el-date-picker
+            v-model="dataForm.timeRange"
+            type="daterange"
+            range-separator="至"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期">
+          </el-date-picker>
+        </el-form-item>
         <el-form-item>
           <el-button @click="getDataList()">{{ $t('query') }}</el-button>
         </el-form-item>
+        <br>
         <el-form-item>
           <el-button v-if="$hasPermission('partymembers:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('partymembers:import')" type="primary" @click="importData()">{{ $t('import') }}</el-button>
+          <el-button v-if="$hasPermission('partymembers:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('partymembers:export')" type="primary" @click="exportData()">{{ $t('export') }}</el-button>
+          <el-button v-if="$hasPermission('partymembers:import')" type="primary" @click="importData()">{{ $t('import') }}</el-button>
         </el-form-item>
         <el-form-item>
-          <el-button v-if="$hasPermission('partymembers:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+          <el-button v-if="$hasPermission('partymembers:export')" type="primary" @click="exportData()">{{ $t('export') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
@@ -71,14 +138,58 @@ export default {
         deleteIsBatch: true
       },
       dataForm: {
-        id: ''
-      }
+        id: '',
+        realName: '',
+        mobile: '',
+        streetId: '',
+        identityNo: '',
+        communityId: '',
+        gridId: '',
+        registFlag: '',
+        postId: '',
+        timeRange: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      registOptions: [],
+      postOptions: []
     }
   },
   components: {
     AddOrUpdate
   },
+  created: function () {
+    this.getStreetList()
+  },
   methods: {
+    getStreetList () {
+      this.$http.get(`/sys/dept/sublist/0`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.streetOptions = res.data
+      }).catch(() => {})
+    },
+    getCommunityList () {
+      this.dataForm.communityId = ''
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.streetId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.communityOptions = res.data
+      }).catch(() => {})
+    },
+    getGridList () {
+      this.dataForm.gridId = ''
+      this.$http.get(`/sys/dept/sublist/` + this.dataForm.communityId).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.gridOptions = res.data
+      }).catch(() => {})
+    },
     formatCadre: function (row, column) {
       return row.cadreFlag === 1 ? '是' : row.cadreFlag === 0 ? '否' : '未知'
     },