Browse Source

增加在职党员报到和流动党员报到查询参数

release/epdc
luyan 2 years ago
parent
commit
87833322b5
  1. 21
      src/views/modules/user/flowparty-add-or-update.vue
  2. 9
      src/views/modules/user/flowparty-detail.vue
  3. 54
      src/views/modules/user/flowparty.vue
  4. 10
      src/views/modules/user/reportparty-add-or-update.vue
  5. 11
      src/views/modules/user/reportparty.vue

21
src/views/modules/user/flowparty-add-or-update.vue

@ -19,6 +19,13 @@
</el-option>
</el-select>
</el-form-item>
<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-form-item label="现属党支部" prop="partyName">
<el-input v-model="dataForm.partyName" placeholder="现属党支部名称"></el-input>
</el-form-item>
@ -68,7 +75,7 @@
<script>
import debounce from 'lodash/debounce'
export default {
data() {
data () {
return {
visible: false,
dataForm: {
@ -83,7 +90,9 @@ export default {
status: '',
deptId: '',
allDeptIds: [],
examineMsg: ''
examineMsg: '',
party: '',
partyDate: ''
},
options: [],
freelanceOptions: [
@ -98,7 +107,7 @@ export default {
}
},
methods: {
init() {
init () {
this.visible = true
this.getByLoginUser()
this.$nextTick(() => {
@ -112,7 +121,7 @@ export default {
}
})
},
getByLoginUser() {
getByLoginUser () {
this.$http
.get(`/sys/dept/party/getDeptTree`)
.then(({ data: res }) => {
@ -124,7 +133,7 @@ export default {
.catch(() => { })
},
//
getInfo() {
getInfo () {
this.$http.get(`/app-user/flowparty/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
@ -162,7 +171,7 @@ export default {
}, 1000, { 'leading': true, 'trailing': false })
},
computed: {
dataRule() {
dataRule () {
return {
examineMsg: [
{ required: this.dataForm.status === 1 ? true : false, message: this.$t('validate.required'), trigger: blur }

9
src/views/modules/user/flowparty-detail.vue

@ -18,6 +18,15 @@
<span v-if="dataForm.freelance === 0"></span>
<span v-if="dataForm.freelance === 1"></span>
</el-form-item>
<el-form-item label="是否党员" prop="party">
<span v-if="dataForm.party === 0"></span>
<span v-if="dataForm.party === 1"></span>
</el-form-item>
<template v-if="dataForm.party === 1">
<el-form-item label="入党时间" prop="partyDate" v-if="dataForm.partyDate">
<span>{{dataForm.partyDate}}</span>
</el-form-item>
</template>
<el-form-item label="现属党支部" prop="partyName" v-if="dataForm.partyName">
<span>{{dataForm.partyName}}</span>
</el-form-item>

54
src/views/modules/user/flowparty.vue

@ -2,6 +2,10 @@
<el-card shadow="never" class="aui-card--fill">
<div class="mod-__flowparty}">
<el-form :inline="true" :model="dataForm" @keyup.enter.native="getDataList()">
<el-form-item label="所属社区">
<el-cascader v-model="ids" :options="options" :props="{ checkStrictly: true }" filterable clearable>
</el-cascader>
</el-form-item>
<el-form-item label="姓名" label-width="70px">
<el-input v-model="dataForm.name" placeholder="请输入姓名" clearable></el-input>
</el-form-item>
@ -11,6 +15,13 @@
<el-form-item label="联系电话" label-width="70px">
<el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
</el-form-item>
<el-form-item label="是否党员" label-width="70px">
<el-select v-model="dataForm.party" placeholder="请选择" clearable>
<el-option v-for="item in partyOptions" :key="item.value" :label="item.label" :value="item.value"
:v-model="dataForm.party">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item label="审核状态" label-width="70px">
<el-select v-model="dataForm.status" placeholder="请选择">
<el-option v-for="item in statusOptions" :key="item.value" :label="item.label" :value="item.value"
@ -36,6 +47,9 @@
<el-table-column prop="mobile" label="电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="freelance" label="自由职业者" header-align="center" align="center" width="100"
:formatter="fomartFreelance"></el-table-column>
<el-table-column prop="party" label="是否党员" header-align="center" align="center" width="100"
:formatter="fomartParty"></el-table-column>
<el-table-column prop="partyDate" label="入党时间" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="partyName" label="现属党支部" header-align="center" align="center" width="120"></el-table-column>
<el-table-column prop="workUnit" label="工作单位名称" header-align="center" align="center"
width="150"></el-table-column>
@ -88,8 +102,12 @@ export default {
workAddr: '',
status: '',
deptId: '',
allDeptIds: []
allDeptIds: [],
party: '',
partyDate: ''
},
ids: [],
options: [],
detailVisible: false,
statusOptions: [
{
@ -100,6 +118,15 @@ export default {
value: 1,
label: '已审核'
}
],
partyOptions: [
{
value: 0,
label: '否'
}, {
value: 1,
label: '是'
}
]
}
},
@ -107,7 +134,23 @@ export default {
AddOrUpdate,
FlowPartyDetail
},
created: function () {
this.getOptions()
},
watch: {
'ids': function (val) {
this.dataForm.deptId = val.join(',')
}
},
methods: {
getOptions () {
this.$http.get(`/api/admin/dept/getAllDeptTree`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}
this.options = res.data
}).catch(() => { })
},
detail (userId) {
this.detailVisible = true
this.$nextTick(() => {
@ -129,6 +172,15 @@ export default {
return '是'
}
},
fomartParty (row) {
if (row.party === undefined && row.party === '') {
return ''
} else if (row.party === 0) {
return '否'
} else {
return '是'
}
},
//
examine (row) {
row.status = row.status === 0 ? 1 : 0

10
src/views/modules/user/reportparty-add-or-update.vue

@ -117,7 +117,7 @@
<script>
import debounce from 'lodash/debounce'
export default {
data() {
data () {
return {
visible: false,
dataForm: {
@ -153,7 +153,7 @@ export default {
}
},
computed: {
dataRule() {
dataRule () {
return {
name: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' }
@ -192,7 +192,7 @@ export default {
}
},
methods: {
init() {
init () {
this.visible = true
this.getByLoginUser()
this.$nextTick(() => {
@ -206,7 +206,7 @@ export default {
}
})
},
getByLoginUser() {
getByLoginUser () {
this.$http
.get(`/sys/dept/party/getDeptTree`)
.then(({ data: res }) => {
@ -218,7 +218,7 @@ export default {
.catch(() => { })
},
//
getInfo() {
getInfo () {
this.$http.get(`/app-user/reportparty/${this.dataForm.id}`).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)

11
src/views/modules/user/reportparty.vue

@ -15,6 +15,9 @@
<el-form-item label="联系电话" label-width="70px">
<el-input v-model="dataForm.mobile" placeholder="请输入联系电话" clearable></el-input>
</el-form-item>
<el-form-item label="工作单位" label-width="70px">
<el-input v-model="dataForm.workUnit" placeholder="请输入工作单位" clearable></el-input>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
@ -34,10 +37,11 @@
<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="mobile" label="联系电话" header-align="center" align="center"></el-table-column>
<el-table-column prop="parentDeptNames" label="所属社区" header-align="center" align="center"></el-table-column>
<el-table-column prop="parentDeptNames" label="所属社区" header-align="center" align="center"
:formatter="formatterDeptNames"></el-table-column>
<el-table-column prop="homeName" label="小区名称" header-align="center" align="center"></el-table-column>
<el-table-column prop="workUnit" label="工作单位" header-align="center" align="center"></el-table-column>
<el-table-column prop="workType" 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="party" label="是否党员" header-align="center" align="center"
:formatter="formatValue"></el-table-column>
@ -111,7 +115,8 @@ export default {
}
],
ids: [],
options: []
options: [],
tempName: ''
}
},
components: {

Loading…
Cancel
Save