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

src/views/modules/user/partymembers-add-or-update.vue

@@ -0,0 +1,167 @@
+<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' : '80px'">
+      <el-form-item label="姓名" prop="realName">
+          <el-input v-model="dataForm.realName" placeholder="姓名"></el-input>
+      </el-form-item>
+      <el-form-item label="手机号" prop="mobile">
+          <el-input v-model="dataForm.mobile" placeholder="手机号"></el-input>
+      </el-form-item>
+      <el-form-item label="身份证号" prop="identityNo">
+          <el-input v-model="dataForm.identityNo" placeholder="身份证号"></el-input>
+      </el-form-item>
+      <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="社区党委">
+        <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="网格党支部">
+        <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="职务">
+        <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="干部下沉">
+        <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">
+      <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: '',
+        realName: '',
+        mobile: '',
+        identityNo: '',
+        post: '',
+        cadreFlag: '',
+        streetName: '',
+        communityName: '',
+        gridName: ''
+      },
+      streetOptions: [],
+      communityOptions: [],
+      gridOptions: [],
+      postOptions: [],
+      cadreOptions: [],
+      tagOptions: []
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        realName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        mobile: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        identityNo: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/partymembers/${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']('/app-user/partymembers/', 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 })
+  }
+}
+</script>

src/views/modules/user/partymembers.vue

@@ -0,0 +1,205 @@
+<template>
+  <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 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:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <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: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%;">
+        <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="tag" 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="streetName" label="街道党工委" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="communityName" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('partymembers:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('partymembers: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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './partymembers-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/partymembers/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/partymembers',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        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 ? '否' : '未知'
+    },
+    formatRegist: function (row, column) {
+      return row.registFlag === 1 ? '是' : row.registFlag === 0 ? '否' : '未知'
+    },
+    importData () {
+    },
+    exportData () {
+    }
+  }
+}
+</script>

src/views/modules/user/usertag-add-or-update.vue

@@ -0,0 +1,89 @@
+<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' : '80px'">
+      <el-form-item label="标签名" prop="tagName">
+          <el-input v-model="dataForm.tagName" placeholder="标签名"></el-input>
+      </el-form-item>
+      <el-form-item label="标签描述" prop="tagDesc">
+          <el-input v-model="dataForm.tagDesc" placeholder="标签描述"></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: '',
+        tagName: '',
+        tagDesc: ''
+      }
+    }
+  },
+  computed: {
+    dataRule () {
+      return {
+        tagName: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ],
+        tagDesc: [
+          { required: true, message: this.$t('validate.required'), trigger: 'blur' }
+        ]
+      }
+    }
+  },
+  methods: {
+    init () {
+      this.visible = true
+      this.$nextTick(() => {
+        this.$refs['dataForm'].resetFields()
+        if (this.dataForm.id) {
+          this.getInfo()
+        }
+      })
+    },
+    // 获取信息
+    getInfo () {
+      this.$http.get(`/app-user/usertag/${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']('/app-user/usertag/', 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 })
+  }
+}
+</script>

src/views/modules/user/usertag.vue

@@ -0,0 +1,67 @@
+<template>
+  <el-card shadow="never" class="aui-card--fill">
+    <div class="mod-__usertag}">
+      <el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
+        <!-- <el-form-item>
+          <el-input v-model="dataForm.id" placeholder="id" clearable></el-input>
+        </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('usertag:save')" type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
+        </el-form-item>
+        <el-form-item>
+          <el-button v-if="$hasPermission('usertag:delete')" type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
+        </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="tagName" label="标签名" header-align="center" align="center"></el-table-column>
+        <el-table-column prop="tagDesc" 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 :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
+          <template slot-scope="scope">
+            <el-button v-if="$hasPermission('usertag:update')" type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
+            <el-button v-if="$hasPermission('usertag: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>
+    </div>
+  </el-card>
+</template>
+
+<script>
+import mixinViewModule from '@/mixins/view-module'
+import AddOrUpdate from './usertag-add-or-update'
+export default {
+  mixins: [mixinViewModule],
+  data () {
+    return {
+      mixinViewModuleOptions: {
+        getDataListURL: '/app-user/usertag/page',
+        getDataListIsPage: true,
+        deleteURL: '/app-user/usertag',
+        deleteIsBatch: true
+      },
+      dataForm: {
+        id: ''
+      }
+    }
+  },
+  components: {
+    AddOrUpdate
+  }
+}
+</script>