Merge branch 'dev_1114' of http://121.42.41.42:7070/r/esua-epdc-admin into dev_1114

6 years ago · 1171d99bd2
9 changed files with 805 additions and 47 deletions
--- a/src/views/modules/events/category.vue
+++ b/src/views/modules/events/category.vue
@ -64,6 +64,7 @@ export default {
      this.$message.error('上传失败请重试')
    },
    uploadSuccess (response, file, fileList) {
+      this.getDataList()// 刷新列表
      this.dataListLoading = false
      this.$refs.upload.clearFiles()
      if (response.data !== null && response.data.length > 0) {
--- a/src/views/modules/kpi/kpimanualscore-add-or-update.vue
+++ b/src/views/modules/kpi/kpimanualscore-add-or-update.vue
@ -0,0 +1,204 @@
+<template>
+  <el-dialog :visible.sync="visible" :title="!dataForm.id ? $t('add') : $t('update')" :close-on-click-modal="false" :close-on-press-escape="false">
+    <el-form :model="dataForm" :rules="dataRule" ref="dataForm" @keyup.enter.native="dataFormSubmitHandle()" :label-width="$i18n.locale === 'en-US' ? '120px' : '120px'">
+      <el-form-item label="考核规则名称" prop="ruleId">
+          <el-select clearable v-model="dataForm.ruleId" :disabled="dataForm.id?true:false">
+            <el-option
+              v-for="item in kpiManualRuleList"
+              :key="item.id"
+              :label="item.ruleName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+      </el-form-item>
+      <el-form-item label="被打分部门" v-if="!dataForm.id">
+          <el-cascader
+            v-model="deptIdList"
+            :options="deptIdOptions"
+            clearable
+          ></el-cascader>
+      </el-form-item>
+      <el-form-item label="考核周期起始月" prop="scoreStartMonth">
+          <el-date-picker v-model="dataForm.scoreStartMonth" :disabled="dataForm.id?true:false"
+              type="month" clearable placeholder="选择月"
+              value-format="yyyy-MM"  format="yyyy-MM">
+          </el-date-picker>
+        </el-form-item>
+      <el-form-item label="考核起止日期" prop="scoreStartDate" v-if="allDeptNamesFlag">
+          <el-date-picker v-model="dataForm.scoreStartDate"
+              type="date" clearable :disabled="true"
+              value-format="yyyy-MM-dd"  format="yyyy-MM-dd">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item label="考核终止日期" prop="scoreEndDate" v-if="allDeptNamesFlag">
+        <el-date-picker v-model="dataForm.scoreEndDate"
+              type="date" clearable :disabled="true"
+              value-format="yyyy-MM-dd"  format="yyyy-MM-dd">
+          </el-date-picker>
+      </el-form-item>
+      <el-form-item label="完整部门名称" prop="allDeptNames" v-if="allDeptNamesFlag">
+          <el-input v-model="dataForm.allDeptNames" placeholder="完整部门名称" :disabled="true"></el-input>
+      </el-form-item>
+      <el-form-item label="得分" prop="score">
+          <el-input-number v-model="dataForm.score" :min="0" :max="100"></el-input-number>
+      </el-form-item>
+      <el-form-item label="所有父级部门id" prop="parentDeptIds" v-if="false">
+          <el-input v-model="dataForm.parentDeptIds" placeholder="所有父级部门id"></el-input>
+      </el-form-item>
+      <el-form-item label="所有父级部门名称" prop="parentDeptNames" v-if="false">
+          <el-input v-model="dataForm.parentDeptNames" placeholder="所有父级部门名称"></el-input>
+      </el-form-item>
+      <el-form-item label="完整部门id" prop="allDeptIds" v-if="false">
+          <el-input v-model="dataForm.allDeptIds" placeholder="完整部门id"></el-input>
+      </el-form-item>
+      </el-form>
+    <template slot="footer">
+      <el-button @click="visible = false">{{ $t('cancel') }}</el-button>
+      <el-button type="primary" @click="dataFormSubmitHandle()">{{ $t('confirm') }}</el-button>
+    </template>
+  </el-dialog>
+</template>
+
+<script>
+import debounce from 'lodash/debounce'
+export default {
+  data () {
+    return {
+      visible: false,
+      dataForm: {
+        id: '',
+        ruleId: '',
+        deptId: '',
+        score: '',
+        scoreStartDate: '',
+        scoreEndDate: '',
+        parentDeptIds: '',
+        parentDeptNames: '',
+        allDeptIds: '',
+        allDeptNames: '',
+        scoreStartMonth: ''
+      },
+      kpiManualRuleList: [], // 已绑定手动打分的考核规则列表
+      allDeptNamesFlag: 'true',
+      deptIdOptions: [],
+      deptIdList: []
+    }
+  },
+  created () {
+    this.$http
+      .get(`/sys/user/deptOptions/getByLoginUser`)
+      .then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.deptIdOptions = res.data.options
+      })
+      .catch(() => {})
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.deptId = ''
+      } else if (val.length > 0) {
+        this.dataForm.deptId = this.deptIdList[val.length - 1]
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        ruleId: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        deptId: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        score: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        scoreStartMonth: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        scoreStartDate: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        scoreEndDate: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptIds: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        parentDeptNames: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptIds: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        allDeptNames: [
+          { required: false, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        this.dataForm.allDeptNames = ''
+        this.dataForm.deptId = ''
+        if (this.dataForm.id) {
+          this.getInfo()
+          this.allDeptNamesFlag = true
+        } else {
+          this.allDeptNamesFlag = false
+        }
+        this.getKpiManualRule()
+        this.deptIdList = []
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/kpi/kpimanualscore/${this.dataForm.id}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.dataForm = {
+          ...this.dataForm,
+          ...res.data
+        }
+      }).catch(() => {})
+    },
+    // 表单提交
+    dataFormSubmitHandle: debounce(function () {
+      this.$refs['dataForm'].validate((valid) => {
+        if (!valid) {
+          return false
+        }
+        this.$http[!this.dataForm.id ? 'post' : 'put']('/kpi/kpimanualscore/', this.dataForm).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg)
+          }
+          this.$message({
+            message: this.$t('prompt.success'),
+            type: 'success',
+            duration: 500,
+            onClose: () => {
+              this.visible = false
+              this.$emit('refreshDataList')
+            }
+          })
+        }).catch(() => {})
+      })
+    }, 1000, { 'leading': true, 'trailing': false }),
+    getKpiManualRule () {
+      this.$http.get(`/kpi/kpirule/getKpiManualRule/`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.kpiManualRuleList = res.data
+      }).catch(() => { })
+    }
+  }
+}
+</script>
--- a/src/views/modules/kpi/kpimanualscore.vue
+++ b/src/views/modules/kpi/kpimanualscore.vue
@ -0,0 +1,212 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-kpi__kpimanualscore}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <el-form-item label="考核规则名称">
+          <el-select clearable v-model="dataForm.ruleId">
+            <el-option
+              v-for="item in kpiManualRuleList"
+              :key="item.id"
+              :label="item.ruleName"
+              :value="item.id">
+            </el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="考核周期起始月">
+          <el-date-picker v-model="dataForm.scoreStartDate"
+              type="month" clearable placeholder="选择月"
+              value-format="yyyy-MM"  format="yyyy-MM">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpimanualscore:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpimanualscore:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('kpi:kpimanualscore:export')" type="info" @click="exportTemplate()">导出录入模板</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-upload class="upload-demo"
+                     ref="upload"
+                     v-loading="dataListLoading"
+                     :action="uploadUrl"
+                     :limit="1"
+                     :on-success='uploadSuccess'
+                     :on-error='errorExceed'
+                     accept=".xls,.xlsx">
+            <el-button type="primary">上传</el-button>
+          </el-upload>
+        </el-form-item>
+      </el-form>
+      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
+        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
+        <el-table-column prop="id" label="主键" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column type="index" width="50" label="序号"></el-table-column>
+        <el-table-column prop="allDeptNames" label="部门名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ruleName" label="考核规则名称" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="kpiCycle" label="考核周期" header-align="center" align="center" :formatter="showKpiCycleFormatter"></el-table-column>
+        <el-table-column prop="scoreStartDate" label="考核起止日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="scoreEndDate" label="考核终止日期" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="score" label="得分" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="ruleId" label="epdc_kpi_rule表主键" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="deptId" label="被打分的部门id" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="parentDeptIds" label="所有父级部门id" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="parentDeptNames" label="所有父级部门名称" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column prop="allDeptIds" label="完整部门id" header-align="center" align="center" v-if="false"></el-table-column>
+        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('kpi:kpimanualscore:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('kpi:kpimanualscore:delete')" type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <el-pagination
+        :current-page="page"
+        :page-sizes="[10, 20, 50, 100]"
+        :page-size="limit"
+        :total="total"
+        layout="total, sizes, prev, pager, next, jumper"
+        @size-change="pageSizeChangeHandle"
+        @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+      <!-- 弹窗, 新增 / 修改 -->
+      <add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
+      <!-- 错误信息 -->
+      <el-dialog :visible.sync="faultDataVisible"
+                 title="请修改后重新提交">
+        <el-table :data="errordataList"
+                  border
+                  style="width: 100%;">
+          <el-table-column prop="errorLine"
+                           label="行数"
+                           header-align="center"
+                           align="center"></el-table-column>
+          <el-table-column prop="errorInfo"
+                           label="错误信息"
+                           header-align="center"
+                           align="center"></el-table-column>
+        </el-table>
+        <template slot="footer">
+          <el-button type="primary"
+                     @click="faultDataVisible = false">确定</el-button>
+        </template>
+      </el-dialog>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './kpimanualscore-add-or-update'
+import Cookies from 'js-cookie'
+import qs from 'qs'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/kpi/kpimanualscore/page',
+        getDataListIsPage: true,
+        deleteURL: '/kpi/kpimanualscore',
+        deleteIsBatch: true,
+        exportURL: '/kpi/kpimanualscore/exportTemplate'
+      },
+      dataForm: {
+        ruleId: '',
+        scoreStartDate: ''
+      },
+      upLoadUrl: '',
+      faultDataVisible: false,
+      errordataList: [],
+      kpiManualRuleList: [], // 已绑定手动打分的考核规则列表
+      kpiCycleList: []// 考核周期字典表值
+    }
+  },
+  components: {
+    AddOrUpdate
+  },
+  created () {
+    this.getKpiManualRule()
+    this.getKpiCycleList()
+    this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/kpi/kpimanualscore/importManualScoreExcel?token=${Cookies.get('token')}`
+  },
+  // 已绑定手动打分的考核规则
+  methods: {
+    getKpiManualRule () {
+      this.$http.get(`/kpi/kpirule/getKpiManualRule/`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.kpiManualRuleList = res.data
+      }).catch(() => { })
+    },
+    // 获取绩效考核周期下拉框集合
+    getKpiCycleList () {
+      this.$http.get(`/sys/dict/listSimple/kpi_cycle`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.kpiCycleList = res.data
+      }).catch(() => { })
+    },
+    showKpiCycleFormatter: function (row, column) {
+      if (row.kpiCycle) {
+        let dict = this.kpiCycleList.filter(item => item.dictValue === row.kpiCycle)[0]
+        if (dict) {
+          return dict.dictName
+        }
+      }
+      return ''
+    },
+    // 导出录入模板
+    exportTemplate () {
+      var scoreStartDate = this.dataForm.scoreStartDate
+      var ruleId = this.dataForm.ruleId
+      var params = qs.stringify({
+        'token': Cookies.get('token'),
+        'scoreStartTime': scoreStartDate,
+        'ruleId': ruleId
+      })
+      if (!ruleId) {
+        return this.$message.error('考核规则不能为空')
+      }
+      if (!scoreStartDate) {
+        return this.$message.error('考核周期起始月不能为空')
+      }
+      window.location.href = `${window.SITE_CONFIG['apiURL']}${this.mixinViewModuleOptions.exportURL}?${params}`
+    },
+    errorExceed (file, fileList) {
+      this.$message.error('上传失败请重试')
+    },
+    uploadSuccess (response, file, fileList) {
+      this.dataListLoading = false
+      this.$refs.upload.clearFiles()
+      if (response.code !== 0 && (response.data == null || response.data.length === 0)) {
+        this.$message.error('上传失败' + response.msg)
+        return
+      }
+      if (response.code !== 0 || (response.data !== null && response.data.length > 0)) {
+        this.faultDataVisible = true
+        this.errordataList = response.data
+        console.log(this.faultDataVisible)
+        this.$message.error('上传失败')
+        return
+      }
+      this.$message({
+        message: this.$t('prompt.success'),
+        type: 'success',
+        duration: 500,
+        onClose: () => {
+          this.getDataList()
+        }
+      })
+    }
+  }
+}
+</script>
--- a/src/views/modules/kpi/kpimanualscorerule-add-or-update.vue
+++ b/src/views/modules/kpi/kpimanualscorerule-add-or-update.vue
@ -25,7 +25,7 @@
        </el-select>
      </el-form-item>
          <el-form-item label="满分" prop="fullMarks">
-          <el-input-number v-model="dataForm.fullMarks" :min="0" label="满分"></el-input-number>
+          <el-input-number v-model="dataForm.fullMarks" :min="0" :max="100"></el-input-number>
      </el-form-item>
      </el-form>
    <template slot="footer">
--- a/src/views/modules/user/hasAuthenticationpartymembers.vue
+++ b/src/views/modules/user/hasAuthenticationpartymembers.vue
@ -0,0 +1,294 @@
+<template>
+  <el-card shadow="never"
+           class="aui-card--fill">
+    <div class="mod-__hasAuthenticationpartymembers.vue}">
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <el-form-item label="所属机构">
+          <el-cascader v-model="deptIdList"
+                       :options="options"
+                       :props="{ checkStrictly: true }"
+                       clearable>
+          </el-cascader>
+        </el-form-item>
+        <el-form-item label="注册状态">
+          <el-select v-model="dataForm.registFlag"
+                     clearable
+                     placeholder="请选择">
+            <el-option v-for="item in registOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
+            </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>
+        <br>
+        <el-form-item label="注册时间">
+          <el-date-picker v-model="timeRange"
+                          type="daterange"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"
+                          value-format="yyyy-MM-dd"
+                          :default-time="['00:00:00', '23:59:59']"
+                          @change="selectedTime">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item>
+          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+        </el-form-item>
+        <br>
+
+      </el-form>
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="realName"
+                         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="identityNo"
+                         label="身份证号"
+                         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="tagName"
+                         label="角色"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="registFlag"
+                         label="注册状态"
+                         :formatter="formatRegist"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="registTime"
+                         label="注册时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="allDeptNames"
+                         label="街道-社区-网格"> </el-table-column>
+      </el-table>
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
+      </el-pagination>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/partymembers/hasAuthenticationPartyPage',
+        getDataListIsPage: true
+      },
+      dataForm: {
+        id: '',
+        realName: '',
+        mobile: '',
+        streetId: '',
+        identityNo: '',
+        communityId: '',
+        gridId: '',
+        registFlag: '',
+        postId: '',
+        startTime: '',
+        endTime: ''
+      },
+      // streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      registOptions: [],
+      // postOptions: [],
+      timeRange: [],
+      upLoadUrl: '',
+      faultDataVisible: false,
+      errordataList: [],
+      options: [],
+      deptIdList: []
+    }
+  },
+  components: {
+  },
+  watch: {
+    'deptIdList': function (val) {
+      if (val.length === 0) {
+        this.dataForm.streetId = ''
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 1) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 2) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = ''
+      }
+      if (val.length === 3) {
+        this.dataForm.streetId = this.deptIdList[0]
+        this.dataForm.communityId = this.deptIdList[1]
+        this.dataForm.gridId = this.deptIdList[2]
+      }
+    }
+  },
+  created: function () {
+    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(() => { })
+    // this.getStreetList()
+    this.getRegistOptions()
+    // this.getPostOptions()
+  },
+  methods: {
+    selectedTime () {
+      this.dataForm.startTime = this.timeRange[0]
+      this.dataForm.endTime = this.timeRange[1]
+    },
+    // getStreetList () {
+    //   this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.streetOptions = res.data
+    //   }).catch(() => { })
+    // },
+    getCommunityList () {
+      if (this.dataForm.streetId === '') {
+        this.communityOptions = []
+        this.gridOptions = []
+        this.dataForm.communityId = ''
+        this.dataForm.gridId = ''
+        return
+      }
+      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 () {
+      if (this.dataForm.communityId === '') {
+        this.gridOptions = []
+        this.dataForm.gridId = ''
+        return
+      }
+      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(() => { })
+    },
+    getRegistOptions () {
+      this.$http.get(`/sys/dict/sublist/1168769645576179713`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          return this.$message.error(res.msg)
+        }
+        this.registOptions = res.data
+      }).catch(() => { })
+    },
+    // getPostOptions () {
+    //   this.$http.get(`/sys/dict/sublist/1168770417290366977`).then(({ data: res }) => {
+    //     if (res.code !== 0) {
+    //       return this.$message.error(res.msg)
+    //     }
+    //     this.postOptions = res.data
+    //   }).catch(() => { })
+    // },
+    formatCadre: function (row, column) {
+      return row.cadreFlag === '1' ? '是' : row.cadreFlag === '0' ? '否' : '未知'
+    },
+    formatRegist: function (row, column) {
+      return row.registFlag === '1' ? '是' : row.registFlag === '0' ? '否' : '未知'
+    },
+    importData () {
+    },
+    // 获取数据列表
+    getDataList () {
+      if (this.timeRange === null) {
+        this.dataForm.startTime = ''
+        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
+          }
+        }
+      ).then(({ data: res }) => {
+        this.dataListLoading = false
+        if (res.code !== 0) {
+          this.dataList = []
+          this.total = 0
+          return this.$message.error(res.msg)
+        }
+        this.dataList = this.mixinViewModuleOptions.getDataListIsPage ? res.data.list : res.data
+        this.total = this.mixinViewModuleOptions.getDataListIsPage ? res.data.total : 0
+      }).catch(() => {
+        this.dataListLoading = false
+      })
+    }
+  }
+}
+</script>
--- a/src/views/modules/user/partyauthenticationfailed.vue
+++ b/src/views/modules/user/partyauthenticationfailed.vue
@ -1,38 +1,91 @@
 <template>
-  <el-card shadow="never" class="aui-card--fill">
+  <el-card shadow="never"
+           class="aui-card--fill">
    <div class="mod-user__partyauthenticationfailed}">
-      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
-        <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>
-        <span class="demonstration">认证时间</span>&nbsp;&nbsp;
-        <el-date-picker @change='setRegistTime' v-model="time" value-format="yyyy-MM-dd" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"></el-date-picker>&nbsp;
-        <el-form-item>
-          <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+      <el-form :inline="true"
+               :model="dataForm"
+               @keyup.enter.native="getDataList()">
+        <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-date-picker @change='setRegistTime'
+                          v-model="time"
+                          value-format="yyyy-MM-dd"
+                          type="daterange"
+                          range-separator="至"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>&nbsp;
+          <el-form-item>
+            <el-button @click="getDataList()">{{ $t('query') }}</el-button>
+          </el-form-item>
        </el-form-item>
      </el-form>
-      <el-table v-loading="dataListLoading" :data="dataList" border @selection-change="dataListSelectionChangeHandle" style="width: 100%;">
-        <el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>
-        <el-table-column prop="realName" label="姓名" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="identityNo" 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="gridName" label="认证网格" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="createdTime" label="认证时间" header-align="center" align="center"></el-table-column>
-        <el-table-column prop="address" label="居民住址" header-align="center" align="center"></el-table-column>
-        <el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+      <el-table v-loading="dataListLoading"
+                :data="dataList"
+                border
+                @selection-change="dataListSelectionChangeHandle"
+                style="width: 100%;">
+        <el-table-column type="selection"
+                         header-align="center"
+                         align="center"
+                         width="50"></el-table-column>
+        <el-table-column prop="realName"
+                         label="姓名"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="identityNo"
+                         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="gridName"
+                         label="认证网格"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="createdTime"
+                         label="认证时间"
+                         header-align="center"
+                         align="center"></el-table-column>
+        <el-table-column prop="address"
+                         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 v-if="$hasPermission('partyauthenticationfailed:view')" type="text" size="small" @click="addOrUpdateHandle(scope.row.userId)">{{ $t('look') }}</el-button>
+            <el-button v-if="$hasPermission('partyauthenticationfailed:view')"
+                       type="text"
+                       size="small"
+                       @click="addOrUpdateHandle(scope.row.userId)">{{ $t('look') }}</el-button>
          </template>
        </el-table-column>
      </el-table>
-      <el-pagination
-        :current-page="page"
-        :page-sizes="[10, 20, 50, 100]"
-        :page-size="limit"
-        :total="total"
-        layout="total, sizes, prev, pager, next, jumper"
-        @size-change="pageSizeChangeHandle"
-        @current-change="pageCurrentChangeHandle">
+      <el-pagination :current-page="page"
+                     :page-sizes="[10, 20, 50, 100]"
+                     :page-size="limit"
+                     :total="total"
+                     layout="total, sizes, prev, pager, next, jumper"
+                     @size-change="pageSizeChangeHandle"
+                     @current-change="pageCurrentChangeHandle">
      </el-pagination>
      <!-- 查看 -->
      <add-or-update v-if="addOrUpdateVisible"
--- a/src/views/modules/user/partymembers-add-or-update.vue
+++ b/src/views/modules/user/partymembers-add-or-update.vue
@ -102,12 +102,7 @@ export default {
        mobile: '',
        identityNo: '',
        cadreFlag: '',
-        streetId: '',
-        streetName: '',
-        communityId: '',
-        communityName: '',
        gridId: '',
-        gridName: '',
        tagIds: [],
        allDeptIds: []
      },
--- a/src/views/modules/user/partymembers.vue
+++ b/src/views/modules/user/partymembers.vue
@ -47,7 +47,7 @@
            </el-option>
          </el-select>
        </el-form-item> -->
-        <el-form-item label="注册状态">
+        <!-- <el-form-item label="注册状态">
          <el-select v-model="dataForm.registFlag"
                     clearable
                     placeholder="请选择">
@ -57,7 +57,7 @@
                       :value="item.dictValue">
            </el-option>
          </el-select>
-        </el-form-item>
+        </el-form-item> -->
        <br>
        <el-form-item label="姓名">
          <el-input v-model="dataForm.realName"
@ -74,16 +74,16 @@
                    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.dictValue"
-              :label="item.dictName"
-              :value="item.dictValue">
+        <el-form-item label="职务">
+          <el-select v-model="dataForm.postId"
+                     placeholder="请选择">
+            <el-option v-for="item in postOptions"
+                       :key="item.dictValue"
+                       :label="item.dictName"
+                       :value="item.dictValue">
            </el-option>
          </el-select>
-        </el-form-item> -->
+        </el-form-item>
        <br>
        <el-form-item label="注册时间">
          <el-date-picker v-model="timeRange"
@ -165,9 +165,8 @@
                         label="角色"
                         header-align="center"
                         align="center"></el-table-column>
-        <el-table-column prop="registFlag"
-                         label="注册状态"
-                         :formatter="formatRegist"
+        <el-table-column prop="partyOrganization"
+                         label="所在党委"
                         header-align="center"
                         align="center"></el-table-column>
        <el-table-column prop="registTime"
--- a/src/views/modules/user/unauthorized.vue
+++ b/src/views/modules/user/unauthorized.vue
@ -10,7 +10,7 @@
                    clearable>
                  </el-cascader>
                </el-form-item>
-                <el-form-item label="街道1" v-if="false">
+                <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>