elink-star
/
esua-epdc-admin
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

修改党员报道查询逻辑

release/epdc
luyan 1 year ago
parent
cfb5750bac
commit
2feeb9c4fb
3 changed files with 142 additions and 121 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 224
      src/views/modules/user/reportparty-add-or-update.vue
  2. 8
      src/views/modules/user/reportparty-detail.vue
  3. 31
      src/views/modules/user/reportparty.vue

224
src/views/modules/user/reportparty-add-or-update.vue
View File

@ -1,117 +1,118 @@
<!-- eslint-disable no-unneeded-ternary -->
<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' : '180px'">
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="党员姓名"></el-input>
</el-form-item>
<el-form-item label="身份证号" prop="idCard">
<el-input v-model="dataForm.idCard" 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="workUnit">
<el-input v-model="dataForm.workUnit" placeholder="现工作单位"></el-input>
</el-form-item>
<el-form-item label="单位性质" prop="workType">
<el-input v-model="dataForm.workType" placeholder="工作单位性质"></el-input>
</el-form-item>
<el-form-item label="单位行业" prop="workIndustry">
<el-input v-model="dataForm.workIndustry" placeholder="工作单位行业"></el-input>
</el-form-item>
<el-form-item label="是否居住在市北" prop="shiBei">
<el-select v-model="dataForm.shiBei">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.shiBei">
</el-option>
</el-select>
</el-form-item>
<template v-if="dataForm.shiBei === 0">
<el-form-item label="联系社区名称" prop="allDeptIds">
<el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
</el-form-item>
</template>
<template v-if="dataForm.shiBei === 1">
<el-form-item label="居住小区名称" prop="homeName">
<el-input v-model="dataForm.homeName" placeholder="居住小区名称"></el-input>
</el-form-item>
<template v-if="dataForm.id == ''">
<el-form-item label="所属社区" prop="deptId">
<el-cascader v-model="dataForm.deptId" :options="options" clearable></el-cascader>
</el-form-item>
</template>
<template v-if="dataForm.id != ''">
<el-form-item label="所属社区" prop="allDeptIds">
<el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
</el-form-item>
</template>
</template>
<el-row>
<el-col :span="12">
<el-form-item label="是否党员" prop="party">
<el-select v-model="dataForm.party">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.party">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否愿意加入志愿者" prop="volunteer">
<el-select v-model="dataForm.volunteer">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.volunteer">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否愿意加入网格员" prop="gridStaff">
<el-select v-model="dataForm.gridStaff">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.gridStaff">
</el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="dataForm.shiBei === 1">
<el-col :span="12">
<el-form-item label="是否愿意加入业务委员会" prop="owners">
<el-select v-model="dataForm.owners">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.owners">
</el-option>
</el-select>
<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' : '180px'">
<el-form-item label="姓名" prop="name">
<el-input v-model="dataForm.name" placeholder="党员姓名"></el-input>
</el-form-item>
<el-form-item label="身份证号码(后6位)" prop="idCard">
<el-input v-model="dataForm.idCard" 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="workUnit">
<el-input v-model="dataForm.workUnit" placeholder="现工作单位"></el-input>
</el-form-item>
<el-form-item label="单位性质" prop="workType">
<el-input v-model="dataForm.workType" placeholder="工作单位性质"></el-input>
</el-form-item>
<el-form-item label="单位行业" prop="workIndustry">
<el-input v-model="dataForm.workIndustry" placeholder="工作单位行业"></el-input>
</el-form-item>
<el-form-item label="是否居住在市北" prop="shiBei">
<el-select v-model="dataForm.shiBei">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.shiBei">
</el-option>
</el-select>
</el-form-item>
<template v-if="dataForm.shiBei === 0">
<el-form-item label="包联社区名称" prop="allDeptIds">
<el-cascader v-model="dataForm.couplingCommunity" :options="options" clearable></el-cascader>
</el-form-item>
</template>
<template v-if="dataForm.shiBei === 1">
<el-form-item label="居住小区名称" prop="homeName">
<el-input v-model="dataForm.homeName" placeholder="居住小区名称"></el-input>
</el-form-item>
<template v-if="dataForm.id == ''">
<el-form-item label="所属社区" prop="deptId">
<el-cascader v-model="dataForm.deptId" :options="options" clearable></el-cascader>
</el-form-item>
</template>
<template v-if="dataForm.id != ''">
<el-form-item label="所属社区" prop="allDeptIds">
<el-cascader v-model="dataForm.allDeptIds" :options="options" clearable></el-cascader>
</el-form-item>
</template>
</template>
<el-row>
<el-col :span="12">
<el-form-item label="是否党员" prop="party">
<el-select v-model="dataForm.party">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label"
:value="item.value" :v-model="dataForm.party">
</el-option>
</el-select>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="是否愿意加入志愿者" prop="volunteer">
<el-select v-model="dataForm.volunteer">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label"
:value="item.value" :v-model="dataForm.volunteer">
</el-option>
</el-select>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-form-item label="是否愿意加入网格员" prop="gridStaff">
<el-select v-model="dataForm.gridStaff">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label"
:value="item.value" :v-model="dataForm.gridStaff">
</el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="dataForm.shiBei === 1">
<el-col :span="12">
<el-form-item label="是否愿意加入业务委员会" prop="owners">
<el-select v-model="dataForm.owners">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label"
:value="item.value" :v-model="dataForm.owners">
</el-option>
</el-select>
</el-form-item>
</el-col>
</template>
</el-row>
<el-form-item label="特长" prop="specialty">
<el-input type="textarea" v-model="dataForm.specialty" placeholder="特长" style="width: 80%;"></el-input>
</el-form-item>
<el-form-item label="审核状态" prop="status">
<el-select v-model="dataForm.status">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.status">
</el-option>
</el-select>
</el-form-item>
</el-col>
<template v-if="dataForm.status === 1">
<el-form-item label="审核意见" prop="examineMsg">
<el-input type="textarea" v-model="dataForm.examineMsg" placeholder="审核意见"
style="width: 80%;"></el-input>
</el-form-item>
</template>
</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-row>
<el-form-item label="特长" prop="specialty">
<el-input type="textarea" v-model="dataForm.specialty" placeholder="特长" style="width: 80%;"></el-input>
</el-form-item>
<el-form-item label="审核状态" prop="status">
<el-select v-model="dataForm.status">
<el-option v-for="item in regOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.status">
</el-option>
</el-select>
</el-form-item>
<template v-if="dataForm.status === 1">
<el-form-item label="审核意见" prop="examineMsg">
<el-input type="textarea" v-model="dataForm.examineMsg" placeholder="审核意见" style="width: 80%;"></el-input>
</el-form-item>
</template>
</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>
</el-dialog>
</template>
<script>
@ -137,6 +138,7 @@ export default {
owners: '',
shiBei: '',
allDeptIds: [],
couplingCommunity:[],
status: '',
examineMsg: ''
},
@ -238,7 +240,7 @@ export default {
if (this.dataForm.shiBei === 0) {
this.dataForm.homeName = ''
}
this.$http[!this.dataForm.id ? 'post' : 'put'](!this.dataForm.id ? '/app-user/reportparty/save' : '/app-user/reportparty/', this.dataForm).then(({ data: res }) => {
this.$http['post'](!this.dataForm.id ? '/app-user/reportparty/save' : '/app-user/reportparty/update', this.dataForm).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

8
src/views/modules/user/reportparty-detail.vue
View File

@ -44,8 +44,8 @@
</el-form-item>
</template>
<template v-if="dataForm.shiBei === 0">
<el-form-item label="包联社区名称" prop="allDeptIds">
<span>{{ dataForm.parentDeptNames }}</span>
<el-form-item label="包联社区名称" prop="couplingCommunityName">
<span>{{ dataForm.couplingCommunityName }}</span>
</el-form-item>
</template>
<el-form-item label="是否党员" prop="party">
@ -100,7 +100,9 @@ export default {
hobbies: '',
villageName: '',
updatedTime: '',
allDeptIds: []
couplingCommunityName:'',
allDeptIds: [],
couplingCommunity:[]
}
}
},

31
src/views/modules/user/reportparty.vue
View File

@ -2,6 +2,13 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-__reportparty}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="报道类型">
<el-select v-model="dataForm.sel">
<el-option v-for="item in selectOptions" :key="item.value" :label="item.label"
:value="item.value" :v-model="dataForm.sel">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属社区">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" filterable clearable>
</el-cascader>
@ -36,7 +43,7 @@
@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="name" label="姓名" header-align="center" align="center"></el-table-column>
<el-table-column prop="idCard" label="证件号码" header-align="center" align="center"></el-table-column>
<!-- <el-table-column prop="idCard" 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="parentDeptNames" label="行政区域/社区" header-align="center"
align="center"></el-table-column>
@ -44,7 +51,7 @@
<el-table-column prop="workUnit" label="工作单位" header-align="center" align="center"></el-table-column>
<el-table-column prop="couplingCommunityName" 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="updatedTime" label="报到时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="party" label="是否党员" header-align="center" align="center"
:formatter="formatParty"></el-table-column>
<el-table-column prop="volunteer" label="是否愿意加入志愿者" header-align="center" align="center"
@ -53,13 +60,13 @@
:formatter="formatGridStaff"></el-table-column>
<el-table-column prop="owners" label="是否愿意加入业务委员会" header-align="center" align="center"
:formatter="formatOwners"></el-table-column>
<el-table-column prop="status" label="审核状态" header-align="center" align="center" width="80"
:formatter="formatStatus"></el-table-column>
<!-- <el-table-column prop="status" label="审核状态" header-align="center" align="center" width="80"
:formatter="formatStatus"></el-table-column> -->
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button type="text" size="small" @click="examine(scope.row)">{{ $t(scope.row.status === 0) ?
<!-- <el-button type="text" size="small" @click="examine(scope.row)">{{ $t(scope.row.status === 0) ?
'审核'
: '驳回' }}</el-button>
: '驳回' }}</el-button> -->
<el-button type="text" size="mini" @click="detail(scope.row.id)"
class="custom-table-button-default">查看</el-button>
<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update')
@ -109,7 +116,8 @@ export default {
workAddr: '',
status: '',
deptId: '',
allDeptIds: []
allDeptIds: [],
sel: 0,
},
detailVisible: false,
regOptions: [
@ -121,6 +129,15 @@ export default {
label: '是'
}
],
selectOptions: [
{
value: 0,
label: '居住社区'
}, {
value: 1,
label: '包联社区'
}
],
ids: [],
options: [],
tempName: ''

Write Preview
Loading…
Cancel
Save