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

【市北代码迁移至安宁】【党员管理】-王公峰-2020-09-17

redesign
wanggongfeng 5 years ago
parent
b69e532604
commit
81c4688003
6 changed files with 650 additions and 351 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 46
      src/views/modules/leader/partycase-add-or-update.vue
  2. 159
      src/views/modules/user/hasAuthenticationpartymembers.vue
  3. 138
      src/views/modules/user/party-wait-authentication.vue
  4. 143
      src/views/modules/user/partyauthenticationfailed.vue
  5. 20
      src/views/modules/user/partymembers-add-or-update.vue
  6. 193
      src/views/modules/user/partymembers.vue

46
src/views/modules/leader/partycase-add-or-update.vue
View File

@ -56,7 +56,7 @@
<span class="line-h-40" style="font-weight: bold">党员年龄分布：图表内容</span></div> <span class="line-h-40" style="font-weight: bold">党员年龄分布：图表内容</span></div>
</div> </div>
<div style="padding-left: 120px" v-for="(item,i) in dataForm.partyCaseDisrtibutionDTOList" <div style="padding-left: 120px" v-for="(item,i) in dataForm.partyCaseDisrtibutionDTOList"
v-if="item.type==='0'" :key="i"> v-if="item.type==='0'">
<el-form-item :label="item.distributionName" label-width="120px" <el-form-item :label="item.distributionName" label-width="120px"
:prop="'partyCaseDisrtibutionDTOList.'+i+'.distributionInfoCount'" :prop="'partyCaseDisrtibutionDTOList.'+i+'.distributionInfoCount'"
:rules="dataRule.countNum"> :rules="dataRule.countNum">
@ -83,11 +83,12 @@
</div> </div>
</div> </div>
<div style="padding-left: 120px" v-for="(item,i) in dataForm.partyCaseDisrtibutionDTOList" <div style="padding-left: 120px" v-for="(item,i) in dataForm.partyCaseDisrtibutionDTOList"
v-if="item.type==='1'" :key="i"> v-if="item.type==='1'">
<el-form-item :label="item.distributionName" label-width="120px" <el-form-item :label="item.distributionName" label-width="120px"
:prop="'partyCaseDisrtibutionDTOList.'+i+'.distributionInfoCount'" :prop="'partyCaseDisrtibutionDTOList.'+i+'.distributionInfoCount'"
:rules="dataRule.countNum"> :rules="dataRule.countNum">
<el-input class="input-count" @change="disrtibutionNumberChange(i,item.type)" <el-input class="input-count" @change="disrtibutionNumberChange(i,item.type)"
oninput="value=value.replace(/[^\d]/g,'')"
v-model="dataForm.partyCaseDisrtibutionDTOList[i].distributionInfoCount"></el-input> v-model="dataForm.partyCaseDisrtibutionDTOList[i].distributionInfoCount"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="占党员总数" label-width="100px" prop="categoryInfo"> <el-form-item label="占党员总数" label-width="100px" prop="categoryInfo">
@ -113,13 +114,13 @@ export default {
{ {
type: '-1', type: '-1',
categoryInfo: '', categoryInfo: '',
parytAmount: 0 parytAmount: 0,
}, { }, {
type: '0', type: '0',
categoryInfo: '' categoryInfo: '',
}, { }, {
type: '1', type: '1',
categoryInfo: '' categoryInfo: '',
}], }],
partyCaseDisrtibutionDTOList: [ partyCaseDisrtibutionDTOList: [
{ {
@ -152,22 +153,22 @@ export default {
distributionInfoCount: 0, distributionInfoCount: 0,
distributionInfoPercent: 0, distributionInfoPercent: 0,
type: '1' type: '1'
}, }
{ , {
distributionName: '离退休人员：', distributionName: '离退休人员：',
distributionInfoCount: 0, distributionInfoCount: 0,
distributionInfoPercent: 0, distributionInfoPercent: 0,
type: '1' type: '1'
}, }
{ , {
distributionName: '其他职业：', distributionName: '其他职业：',
distributionInfoCount: 0, distributionInfoCount: 0,
distributionInfoPercent: 0, distributionInfoPercent: 0,
type: '1' type: '1'
}], }],
partyCaseNumberDTOList: [] partyCaseNumberDTOList: [],
}, },
loading: true loading: true,
} }
}, },
computed: { computed: {
@ -190,17 +191,17 @@ export default {
], ],
sort: [ sort: [
{required: true, message: this.$t('validate.required'), trigger: 'blur'} {required: true, message: this.$t('validate.required'), trigger: 'blur'}
] ],
} }
} }
}, },
mounted() { mounted() {
this.init() this.init();
}, },
methods: { methods: {
init() { init() {
this.$nextTick(() => { this.$nextTick(() => {
this.$refs['dataForm'].resetFields() this.$refs['dataForm'].resetFields();
this.getInfo() this.getInfo()
}) })
}, },
@ -211,20 +212,21 @@ export default {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
if (res.data.partyCaseCategoryDTOList.length > 0) { if (res.data.partyCaseCategoryDTOList.length > 0) {
this.dataForm.partyCaseCategoryDTOList = res.data.partyCaseCategoryDTOList this.dataForm.partyCaseCategoryDTOList = res.data.partyCaseCategoryDTOList;
} }
if (res.data.partyCaseDisrtibutionDTOList.length > 0) { if (res.data.partyCaseDisrtibutionDTOList.length > 0) {
this.dataForm.partyCaseDisrtibutionDTOList = res.data.partyCaseDisrtibutionDTOList this.dataForm.partyCaseDisrtibutionDTOList = res.data.partyCaseDisrtibutionDTOList;
} }
if (res.data.partyCaseNumberDTOList.length > 0) { if (res.data.partyCaseNumberDTOList.length > 0) {
this.dataForm.partyCaseNumberDTOList = res.data.partyCaseNumberDTOList this.dataForm.partyCaseNumberDTOList = res.data.partyCaseNumberDTOList;
} else { } else {
this.getStreetInfo() this.getStreetInfo();
} }
this.loading = false this.loading = false;
}).catch(() => { }).catch(() => {
this.loading = false this.loading = false;
}) });
}, },
// 获取街道信息 // 获取街道信息
getStreetInfo() { getStreetInfo() {
@ -232,7 +234,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} }
this.dataForm.partyCaseNumberDTOList = res.data this.dataForm.partyCaseNumberDTOList = res.data;
}).catch(() => { }).catch(() => {
}) })
}, },

159
src/views/modules/user/hasAuthenticationpartymembers.vue
View File

@ -4,7 +4,7 @@
<div class="mod-__hasAuthenticationpartymembers.vue}"> <div class="mod-__hasAuthenticationpartymembers.vue}">
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataListSearch()">
<el-form-item label="所属机构"> <el-form-item label="所属机构">
<el-cascader v-model="deptIdList" <el-cascader v-model="deptIdList"
:options="options" :options="options"
@ -24,38 +24,51 @@
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<br> <br>
<el-form-item label="姓名"> <el-form-item label="姓名" label-width="68px">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="" placeholder=""
@keyup.native="btKeyUpRealName"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="" placeholder=""
@keyup.native="btKeyUpMobile"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号"> <el-form-item label="身份证号">
<el-input v-model="dataForm.identityNo" <el-input v-model="dataForm.identityNo"
placeholder="" placeholder=""
@keyup.native="btKeyUpIdentityNo"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<br> <br>
<el-form-item label="认证时间"> <el-form-item label="注册时间" prop="startTime" label-width="70px">
<el-date-picker v-model="timeRange" <el-date-picker v-model="dataForm.startTime"
type="daterange" type="date"
start-placeholder="开始日期" :picker-options="pickerBeginDateBefore"
end-placeholder="结束日期"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:default-time="['00:00:00', '23:59:59']" format="yyyy-MM-dd"
@change="selectedTime"> placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('epdc:user:export')" <el-button v-if="$hasPermission('epdc:user:export')"
type="primary" type="success"
@click="exportHandle()">{{ $t('export') }}</el-button> @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
<br> <br>
@ -66,57 +79,64 @@
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%;"> style="width: 100%;">
<el-table-column type="selection" <el-table-column label="序号" header-align="center" align="center" width="50px">
header-align="center" <template slot-scope="scope">
align="center" {{scope.$index+1}}
width="50"></el-table-column> </template>
</el-table-column>
<el-table-column prop="realName" <el-table-column prop="realName"
label="姓名" label="姓名"
width="80"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="120"></el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
label="手机号" label="手机号"
width="110"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="150"></el-table-column>
<el-table-column prop="identityNo" <el-table-column prop="identityNo"
label="身份证号" label="身份证号"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
<!--<el-table-column prop="post"--> width="200"></el-table-column>
<!--label="职务"--> <el-table-column prop="post"
<!--header-align="center"--> label="职务"
<!--align="center"></el-table-column>--> header-align="center"
<!--<el-table-column prop="cadreFlag"--> align="center"
<!--label="干部下沉"--> v-if="false"></el-table-column>
<!--:formatter="formatCadre"--> <el-table-column prop="cadreFlag"
<!--header-align="center"--> label="干部下沉"
<!--align="center"></el-table-column>--> :formatter="formatCadre"
<!--<el-table-column prop="tagName"--> header-align="center"
<!--label="角色"--> align="center"
<!--header-align="center"--> v-if="false"></el-table-column>
<!--align="center"></el-table-column>--> <el-table-column prop="tagName"
label="角色"
header-align="center"
align="center"
v-if="false"></el-table-column>
<el-table-column prop="registFlag" <el-table-column prop="registFlag"
label="注册状态" label="注册状态"
:formatter="formatRegist" :formatter="formatRegist"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="120"></el-table-column>
<el-table-column prop="registTime" <el-table-column prop="registTime"
label="认证时间" label="认证时间"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="180"></el-table-column>
<el-table-column prop="createdTime" <el-table-column prop="createdTime"
label="注册时间" label="注册时间"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="180"></el-table-column>
<el-table-column prop="allDeptNames" <el-table-column prop="allDeptNames"
label="街道-社区-网格" label="街道-社区-网格"
header-align="center" header-align="center"
min-width="200" show-overflow-tooltip> </el-table-column> align="center"
min-width="350"
show-overflow-tooltip> </el-table-column>
</el-table> </el-table>
<el-pagination :current-page="page" <el-pagination :current-page="page"
:page-sizes="[10, 20, 50, 100]" :page-sizes="[10, 20, 50, 100]"
@ -154,6 +174,22 @@ export default {
startTime: '', startTime: '',
endTime: '' endTime: ''
}, },
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
// streetOptions: [], // streetOptions: [],
communityOptions: [], communityOptions: [],
gridOptions: [], gridOptions: [],
@ -203,14 +239,39 @@ export default {
this.options = res.data.options this.options = res.data.options
}) })
.catch(() => { }) .catch(() => { })
this.initTime()
// this.getStreetList() // this.getStreetList()
this.getRegistOptions() this.getRegistOptions()
// this.getPostOptions() // this.getPostOptions()
}, },
methods: { methods: {
selectedTime () { initTime () {
this.dataForm.startTime = this.timeRange[0] const end = new Date()
this.dataForm.endTime = this.timeRange[1] const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
this.timeRange = [start, end]
let year = start.getFullYear()
let month = start.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let date = start.getDate()
if (date < 10) {
date = '0' + date
}
let startDate = year + '-' + month + '-' + date
let yearend = end.getFullYear()
let monthend = end.getMonth() + 1
if (monthend < 10) {
monthend = '0' + monthend
}
let dateend = end.getDate()
if (dateend < 10) {
dateend = '0' + dateend
}
let endDate = yearend + '-' + monthend + '-' + dateend
this.dataForm.startTime = startDate
this.dataForm.endTime = endDate
}, },
// getStreetList () { // getStreetList () {
// this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => { // this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
@ -220,6 +281,18 @@ export default {
// this.streetOptions = res.data // this.streetOptions = res.data
// }).catch(() => { }) // }).catch(() => { })
// }, // },
btKeyUpRealName (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.realName = e.target.value
},
btKeyUpMobile (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.mobile = e.target.value
},
btKeyUpIdentityNo (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.identityNo = e.target.value
},
getCommunityList () { getCommunityList () {
if (this.dataForm.streetId === '') { if (this.dataForm.streetId === '') {
this.communityOptions = [] this.communityOptions = []

138
src/views/modules/user/party-wait-authentication.vue
View File

@ -4,8 +4,8 @@
<div class="mod-epdc__user}"> <div class="mod-epdc__user}">
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataListSearch()">
<el-form-item label="所属机构"> <el-form-item label="所属机构" label-width="70px">
<el-cascader v-model="deptIdList" <el-cascader v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
@ -13,7 +13,7 @@
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="街道" <el-form-item label="街道"
v-if="false"> v-if="false" label-width="70px">
<el-select v-model="dataForm.streetId" <el-select v-model="dataForm.streetId"
clearable clearable
placeholder="请选择" placeholder="请选择"
@ -25,7 +25,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="社区" <el-form-item label="社区"
v-if="false"> v-if="false" label-width="70px">
<el-select v-model="dataForm.communityId" <el-select v-model="dataForm.communityId"
clearable clearable
placeholder="请选择" placeholder="请选择"
@ -37,7 +37,7 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="网格" <el-form-item label="网格"
v-if="false"> v-if="false" label-width="70px">
<el-select v-model="dataForm.gridId" <el-select v-model="dataForm.gridId"
clearable clearable
placeholder="请选择"> placeholder="请选择">
@ -47,31 +47,46 @@
:value="item.id"></el-option> :value="item.id"></el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="姓名"> <el-form-item label="姓名" label-width="70px">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpRealName"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号" label-width="70px">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpMobile"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<!-- <div class="block"> --> <!-- <div class="block"> -->
<span class="demonstration">注册时间</span>&nbsp;&nbsp; <br/>
<el-date-picker @change='setRegistTime' <el-form-item label="注册时间" prop="startTime" label-width="70px">
v-model="time" <el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:200px" @change="changeTime">
end-placeholder="结束日期"></el-date-picker>&nbsp; </el-date-picker>
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('epdc:user:export')" <el-button v-if="$hasPermission('epdc:user:export')"
type="primary" type="success"
@click="exportHandle()">{{ $t('export') }}</el-button> @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
<!-- </div> --> <!-- </div> -->
@ -81,39 +96,43 @@
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%;"> style="width: 100%;">
<el-table-column label="序号" <el-table-column label="序号" header-align="center" align="center" width="50px">
width="50px"><template slot-scope="scope">{{scope.$index+1}}</template></el-table-column> <template slot-scope="scope">
{{scope.$index+1}}
</template>
</el-table-column>
<el-table-column prop="realName" <el-table-column prop="realName"
label="姓名" label="姓名"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="120"></el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
label="手机号" label="手机号"
width="110"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="150"></el-table-column>
<el-table-column prop="identityNo" <el-table-column prop="identityNo"
label="身份证号" label="身份证号"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="200"></el-table-column>
<el-table-column prop="allDeptNames" <el-table-column prop="allDeptNames"
label="认证网格" label="认证网格"
min-width="200"
show-overflow-tooltip
header-align="center" header-align="center"
align="left"></el-table-column> align="center"
min-width="400"
show-overflow-tooltip></el-table-column>
<el-table-column prop="address" <el-table-column prop="address"
label="居住地址" label="居住地址"
min-width="180"
show-overflow-tooltip
header-align="center" header-align="center"
align="left"></el-table-column> align="center"
min-width="350"
show-overflow-tooltip></el-table-column>
<el-table-column prop="updatedTime" <el-table-column prop="updatedTime"
label="提交时间" label="提交时间"
width="160"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="180"></el-table-column>
<el-table-column :label="$t('handle')" <el-table-column :label="$t('handle')"
fixed="right" fixed="right"
header-align="center" header-align="center"
@ -169,6 +188,22 @@ export default {
partyFlag: '0', // 是否是党员(0-否，1-是) partyFlag: '0', // 是否是党员(0-否，1-是)
state: '1' state: '1'
}, },
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
deptIdList: [], deptIdList: [],
options: [], options: [],
partyReviewVisible: false, partyReviewVisible: false,
@ -191,6 +226,7 @@ export default {
this.options = res.data.options this.options = res.data.options
}) })
.catch(() => { }) .catch(() => { })
this.initTime()
}, },
watch: { watch: {
'deptIdList': function (val) { 'deptIdList': function (val) {
@ -217,6 +253,42 @@ export default {
} }
}, },
methods: { methods: {
initTime () {
const end = new Date()
const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
this.time = [start, end]
let year = start.getFullYear()
let month = start.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let date = start.getDate()
if (date < 10) {
date = '0' + date
}
let startDate = year + '-' + month + '-' + date
let yearend = end.getFullYear()
let monthend = end.getMonth() + 1
if (monthend < 10) {
monthend = '0' + monthend
}
let dateend = end.getDate()
if (dateend < 10) {
dateend = '0' + dateend
}
let endDate = yearend + '-' + monthend + '-' + dateend
this.dataForm.startTime = startDate
this.dataForm.endTime = endDate
},
btKeyUpRealName (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.realName = e.target.value
},
btKeyUpMobile (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.mobile = e.target.value
},
getStreetList () { getStreetList () {
this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => { this.$http.get(`/sys/dept/sublist/` + (localStorage.getItem('street') === null ? '1169154711480528897' : localStorage.getItem('street'))).then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
@ -249,10 +321,6 @@ export default {
}).catch(() => { }) }).catch(() => { })
} }
}, },
setRegistTime () {
this.dataForm.startTime = this.time[0]
this.dataForm.endTime = this.time[1]
},
formatState: function (row, column) { formatState: function (row, column) {
let state = row.state let state = row.state
if (state === '1') { if (state === '1') {

143
src/views/modules/user/partyauthenticationfailed.vue
View File

@ -4,78 +4,97 @@
<div class="mod-user__partyauthenticationfailed}"> <div class="mod-user__partyauthenticationfailed}">
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataListSearch()">
<el-form-item label="姓名"> <el-form-item label="姓名" label-width="70px">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpRealname"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号" label-width="70px">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpMobile"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号"> <el-form-item label="身份证号" label-width="70px">
<el-input v-model="dataForm.identityNo" <el-input v-model="dataForm.identityNo"
placeholder="请输入" placeholder="请输入"
@keyup.native="btKeyUpIdentityNo"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="认证时间"> <br>
<el-date-picker @change='setRegistTime' <el-form-item label="认证时间" prop="startTime" label-width="70px">
v-model="time" <el-date-picker v-model="dataForm.startTime"
type="date"
:picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
type="daterange" format="yyyy-MM-dd"
range-separator="至" placeholder="选择日期时间"
start-placeholder="开始日期" style="width:200px" @change="changeTime">
end-placeholder="结束日期"></el-date-picker>&nbsp; </el-date-picker>
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="primary" <el-button type="success"
@click="exportHandle()">{{ $t('export') }}</el-button> @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
</el-form-item>
</el-form> </el-form>
<el-table v-loading="dataListLoading" <el-table v-loading="dataListLoading"
:data="dataList" :data="dataList"
border border
@selection-change="dataListSelectionChangeHandle" @selection-change="dataListSelectionChangeHandle"
style="width: 100%;"> style="width: 100%;">
<el-table-column type="selection" <el-table-column label="序号" header-align="center" align="center" width="50px">
header-align="center" <template slot-scope="scope">
align="center" {{scope.$index+1}}
width="50"></el-table-column> </template>
</el-table-column>
<el-table-column prop="realName" <el-table-column prop="realName"
label="姓名" label="姓名"
width="80"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="100"></el-table-column>
<el-table-column prop="identityNo" <el-table-column prop="identityNo"
label="身份证号" label="身份证号"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="200"></el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
label="手机号" label="手机号"
width="110"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="150"></el-table-column>
<el-table-column prop="allDeptNames" <el-table-column prop="allDeptNames"
label="所属网格" label="所属网格"
min-width="200" show-overflow-tooltip
header-align="center" header-align="center"
align="left"></el-table-column> align="center"
min-width="350"
show-overflow-tooltip></el-table-column>
<el-table-column prop="createdTime" <el-table-column prop="createdTime"
label="认证时间" label="认证时间"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="180"></el-table-column>
<el-table-column prop="address" <el-table-column prop="address"
label="居民住址" label="居民住址"
min-width="200" show-overflow-tooltip
header-align="center" header-align="center"
align="left"></el-table-column> align="center"
min-width="350"
show-overflow-tooltip></el-table-column>
<!-- <el-table-column :label="$t('handle')" <!-- <el-table-column :label="$t('handle')"
fixed="right" fixed="right"
header-align="center" header-align="center"
@ -127,18 +146,68 @@ export default {
startTime: '', startTime: '',
endTime: '' endTime: ''
}, },
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
time: '' time: ''
} }
}, },
created () {
this.initTime()
},
methods: { methods: {
setRegistTime () { initTime () {
if (this.time === null) { const end = new Date()
this.dataForm.startTime = '' const start = new Date()
this.dataForm.endTime = '' start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
} else { this.time = [start, end]
this.dataForm.startTime = this.time[0] let year = start.getFullYear()
this.dataForm.endTime = this.time[1] let month = start.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let date = start.getDate()
if (date < 10) {
date = '0' + date
}
let startDate = year + '-' + month + '-' + date
let yearend = end.getFullYear()
let monthend = end.getMonth() + 1
if (monthend < 10) {
monthend = '0' + monthend
}
let dateend = end.getDate()
if (dateend < 10) {
dateend = '0' + dateend
} }
let endDate = yearend + '-' + monthend + '-' + dateend
this.dataForm.startTime = startDate
this.dataForm.endTime = endDate
},
btKeyUpRealname (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.realName = e.target.value
},
btKeyUpMobile (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.mobile = e.target.value
},
btKeyUpIdentityNo (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.identityNo = e.target.value
}, },
// 新增 / 修改 // 新增 / 修改
addOrUpdateHandle (id) { addOrUpdateHandle (id) {

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

@ -2,7 +2,8 @@
<el-dialog :visible.sync="visible" <el-dialog :visible.sync="visible"
:title="!dataForm.id ? $t('add') : $t('update')" :title="!dataForm.id ? $t('add') : $t('update')"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false"> :close-on-press-escape="false"
customClass="customWidth">
<el-form :model="dataForm" <el-form :model="dataForm"
:rules="dataRule" :rules="dataRule"
ref="dataForm" ref="dataForm"
@ -11,17 +12,17 @@
<el-form-item label="姓名" <el-form-item label="姓名"
prop="realName"> prop="realName">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="姓名"></el-input> placeholder="姓名" style="width:90%;" maxlength="10"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" <el-form-item label="手机号"
prop="mobile"> prop="mobile">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="手机号"></el-input> placeholder="手机号" style="width:90%;"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号" <el-form-item label="身份证号"
prop="identityNo"> prop="identityNo">
<el-input v-model="dataForm.identityNo" <el-input v-model="dataForm.identityNo"
placeholder="身份证号"></el-input> placeholder="身份证号" style="width:90%;"></el-input>
</el-form-item> </el-form-item>
<!-- <el-form-item label="街道党工委" <!-- <el-form-item label="街道党工委"
label-width='auto' label-width='auto'
@ -126,10 +127,12 @@ export default {
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
], ],
mobile: [ mobile: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ pattern: /^[1][1,2,3,4,5,6,7,8,9][0-9]{9}$/, message: '请输入正确号码格式', trigger: 'blur' }
], ],
identityNo: [ identityNo: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' },
{ pattern: /(^\d{15}$)|bai(^\d{18}$)|(^\d{17}(\d|X|x)$)/, message: '请输入正确身份证号', trigger: 'blur' }
], ],
streetId: [ streetId: [
{ required: true, message: this.$t('validate.required'), trigger: 'blur' } { required: true, message: this.$t('validate.required'), trigger: 'blur' }
@ -258,3 +261,8 @@ export default {
} }
} }
</script> </script>
<style lang="scss">
.customWidth {
width:35%
}
</style>

193
src/views/modules/user/partymembers.vue
View File

@ -4,65 +4,77 @@
<div class="mod-__partymembers}"> <div class="mod-__partymembers}">
<el-form :inline="true" <el-form :inline="true"
:model="dataForm" :model="dataForm"
@keyup.enter.native="getDataList()"> @keyup.enter.native="getDataListSearch()">
<el-form-item label="所属机构"> <el-form-item label="所属机构" label-width="70px">
<el-cascader v-model="deptIdList" <el-cascader v-model="deptIdList"
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable> clearable>
</el-cascader> </el-cascader>
</el-form-item> </el-form-item>
<el-form-item label="注册状态" label-width="70px">
<el-select v-model="dataForm.registFlag"
placeholder="请选择">
<el-option v-for="item in registFlagOptions"
:key="item.dictValue"
:label="item.dictName"
:value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<br> <br>
<el-form-item label="姓名"> <el-form-item label="姓名" label-width="70px">
<el-input v-model="dataForm.realName" <el-input v-model="dataForm.realName"
placeholder="" placeholder="请输入姓名"
@keyup.native="btKeyUpRealName"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号"> <el-form-item label="手机号" label-width="70px">
<el-input v-model="dataForm.mobile" <el-input v-model="dataForm.mobile"
placeholder="" placeholder="请输入手机号"
@keyup.native="btKeyUpMobile"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<el-form-item label="身份证号"> <el-form-item label="身份证号" label-width="70px">
<el-input v-model="dataForm.identityNo" <el-input v-model="dataForm.identityNo"
placeholder="" placeholder="请输入身份证号"
@keyup.native="btKeyUpIdentityNo"
clearable></el-input> clearable></el-input>
</el-form-item> </el-form-item>
<!--<el-form-item label="职务">--> <el-form-item label="职务" v-if="false">
<!--<el-select v-model="dataForm.postId"--> <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>-->
<br>
<el-form-item label="注册状态">
<el-select v-model="dataForm.registFlag"
placeholder="请选择"> placeholder="请选择">
<el-option v-for="item in registFlagOptions" <el-option v-for="item in postOptions"
:key="item.dictValue" :key="item.dictValue"
:label="item.dictName" :label="item.dictName"
:value="item.dictValue"> :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="注册时间"> <br>
<el-date-picker v-model="timeRange" <el-form-item label="认证时间" prop="startTime" label-width="70px">
type="daterange" <el-date-picker v-model="dataForm.startTime"
start-placeholder="开始日期" type="date"
end-placeholder="结束日期" :picker-options="pickerBeginDateBefore"
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
:default-time="['00:00:00', '23:59:59']" format="yyyy-MM-dd"
@change="selectedTime"> placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker>
</el-form-item>
<el-form-item label="至" prop="endTime">
<el-date-picker v-model="dataForm.endTime"
type="date"
:picker-options="pickerBeginDateAfter"
value-format="yyyy-MM-dd"
format="yyyy-MM-dd"
placeholder="选择日期时间"
style="width:200px" @change="changeTime">
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button> <el-button @click="getDataListSearch()" type="success">{{ $t('query') }}</el-button>
</el-form-item> </el-form-item>
<br>
<el-form-item> <el-form-item>
<el-button v-if="$hasPermission('partymembers:save')" <el-button v-if="$hasPermission('partymembers:save')"
type="primary" type="primary"
@ -74,11 +86,11 @@
@click="deleteHandle()">{{ $t('deleteBatch') }}</el-button> @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
</el-form-item> --> </el-form-item> -->
<el-form-item> <el-form-item>
<el-button type="info" v-if="$hasPermission('partymembers:export')" <el-button type="success" v-if="$hasPermission('partymembers:export')"
@click="exportHandle()">{{ $t('export') }}</el-button> @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button type="info" v-if="$hasPermission('partymembers:exporttemplate')" <el-button type="success" v-if="$hasPermission('partymembers:exporttemplate')"
@click="exportMoudleHandle()">导出模板</el-button> @click="exportMoudleHandle()">导出模板</el-button>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
@ -104,44 +116,58 @@
header-align="center" header-align="center"
align="center" align="center"
width="50"></el-table-column> --> width="50"></el-table-column> -->
<el-table-column label="序号" header-align="center" align="center" width="50px">
<template slot-scope="scope">
{{scope.$index+1}}
</template>
</el-table-column>
<el-table-column prop="realName" <el-table-column prop="realName"
label="姓名" label="姓名"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="150"></el-table-column>
<el-table-column prop="mobile" <el-table-column prop="mobile"
label="手机号" label="手机号"
width="110"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="200"></el-table-column>
<el-table-column prop="identityNo" <el-table-column prop="identityNo"
label="身份证号" label="身份证号"
header-align="center" header-align="center"
align="center" align="center"
width="180"></el-table-column> width="200"></el-table-column>
<!--<el-table-column prop="post"--> <el-table-column prop="post"
<!--label="职务"--> label="职务"
<!--header-align="center"--> header-align="center"
<!--align="center"></el-table-column>--> align="center"
<!--<el-table-column prop="cadreFlag"--> v-if="false"></el-table-column>
<!--label="干部下沉"--> <el-table-column prop="cadreFlag"
<!--:formatter="formatCadre"--> label="干部下沉"
<!--header-align="center"--> :formatter="formatCadre"
<!--align="center"></el-table-column>--> header-align="center"
<!--<el-table-column prop="partyOrganization"--> align="center"
<!--label="所在党委"--> v-if="false"></el-table-column>
<!--header-align="center"--> <el-table-column prop="partyOrganization"
<!--align="center"></el-table-column>--> label="所在党委"
header-align="center"
align="center"
v-if="false"></el-table-column>
<el-table-column prop="registFlag" <el-table-column prop="registFlag"
label="注册状态" label="注册状态"
header-align="center" header-align="center"
align="center" :formatter="formatregistFlag"></el-table-column> align="center" :formatter="formatregistFlag"
width="100"></el-table-column>
<el-table-column prop="registTime" <el-table-column prop="registTime"
label="认证时间" label="认证时间"
width="180"
header-align="center" header-align="center"
align="center"></el-table-column> align="center"
width="180"></el-table-column>
<el-table-column prop="allDeptNames" <el-table-column prop="allDeptNames"
label="街道-社区-网格" min-width="200" show-overflow-tooltip> </el-table-column> label="街道-社区-网格"
min-width="300"
show-overflow-tooltip
header-align="center"
align="center"> </el-table-column>
<el-table-column :label="$t('handle')" <el-table-column :label="$t('handle')"
fixed="right" fixed="right"
header-align="center" header-align="center"
@ -245,6 +271,22 @@ export default {
dictValue: '2' dictValue: '2'
} }
], ],
pickerBeginDateBefore: {
disabledDate: (time) => {
let beginDateVal = this.dataForm.endTime
if (beginDateVal) {
return time.getTime() > new Date(beginDateVal + ' 00:00:00').getTime()
}
}
},
pickerBeginDateAfter: {
disabledDate: (time) => {
let EndDateVal = this.dataForm.startTime
if (EndDateVal) {
return time.getTime() < new Date(EndDateVal + ' 00:00:00').getTime()
}
}
},
timeRange: [], timeRange: [],
upLoadUrl: '', upLoadUrl: '',
faultDataVisible: false, faultDataVisible: false,
@ -292,13 +334,50 @@ export default {
.catch(() => { }) .catch(() => { })
// this.getStreetList() // this.getStreetList()
this.getRegistOptions() this.getRegistOptions()
this.initTime()
// this.getPostOptions() // this.getPostOptions()
this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}` this.uploadUrl = `${window.SITE_CONFIG['apiURL']}/app-user/partymembers/importExcel?token=${Cookies.get('token')}`
}, },
methods: { methods: {
selectedTime () { initTime () {
this.dataForm.startTime = this.timeRange[0] const end = new Date()
this.dataForm.endTime = this.timeRange[1] const start = new Date()
start.setTime(start.getTime() - 3600 * 1000 * 24 * 30)
this.time = [start, end]
let year = start.getFullYear()
let month = start.getMonth() + 1
if (month < 10) {
month = '0' + month
}
let date = start.getDate()
if (date < 10) {
date = '0' + date
}
let startDate = year + '-' + month + '-' + date
let yearend = end.getFullYear()
let monthend = end.getMonth() + 1
if (monthend < 10) {
monthend = '0' + monthend
}
let dateend = end.getDate()
if (dateend < 10) {
dateend = '0' + dateend
}
let endDate = yearend + '-' + monthend + '-' + dateend
this.dataForm.startTime = startDate
this.dataForm.endTime = endDate
},
btKeyUpRealName (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.realName = e.target.value
},
btKeyUpMobile (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.mobile = e.target.value
},
btKeyUpIdentityNo (e) {
e.target.value = e.target.value.replace(/[`~!#$%^&*()_\+=<>?:"{}|~！#￥%……&*（）={}|《》？：“”【】\\[\]、；‘’，。、\s+]/g, '')
this.dataForm.identityNo = e.target.value
}, },
getCommunityList () { getCommunityList () {
if (this.dataForm.streetId === '') { if (this.dataForm.streetId === '') {

Write Preview
Loading…
Cancel
Save