Browse Source

福利人员

origin/bugfix_relocation
wanggongfeng 3 years ago
parent
commit
c5f8e8fe48
  1. 42
      src/views/components/resiChangeTransfer.vue
  2. 38
      src/views/modules/plugins/change/changedeath.vue
  3. 12
      src/views/modules/plugins/change/changerelocation.vue
  4. 267
      src/views/modules/plugins/change/changewelfare.vue
  5. 2
      src/views/modules/plugins/change/resichange.vue
  6. 13
      src/views/modules/plugins/change/resideath.vue
  7. 8
      src/views/modules/plugins/change/resiwelfare.vue

42
src/views/components/resiChangeTransfer.vue

@ -135,6 +135,11 @@
v-model="dataForm.reason">
</el-input>
</el-form-item>
<el-form-item label=""
prop="welfareFlag"
label-width="150px">
<el-checkbox v-model="dataForm.welfareFlag">享受福利</el-checkbox>
</el-form-item>
</el-form>
</div>
@ -196,7 +201,8 @@ export default {
gender: '',
age: '',
address: '',
outOfTime: ''
outOfTime: '',
welfareFlag: false
},
customerId: '',//id
@ -263,6 +269,8 @@ export default {
//
if(row.DOOR_NAME !== null && row.DOOR_NAME !== '' && row.DOOR_NAME !== undefined){
this.dataForm.oldHome = row.DOOR_NAME
}else{
this.dataForm.oldHome = ''
}
this.dataForm.customerId = this.customerId
this.dataForm.idCard = row.ID_CARD
@ -471,16 +479,12 @@ export default {
setTimeout(() => {
this.btnDisable = false
}, 2000)
this.$refs['ref_form'].validate((valid, messageObj) => {
if (!valid) {
app.util.validateRule(messageObj)
} else {
if (this.dataForm.type === 'in') {
if (!this.dataForm.buildId) {
this.$message.warning('楼栋')
return false
@ -507,16 +511,33 @@ export default {
this.dataForm.transferTime = noData
const { data, code, msg } = await requestPost(url, this.dataForm)
console.log('----------------')
console.log(this.dataForm)
if (code === 0) {
this.$message.success('调动成功')
this.handleCancle()
// this.$message.success('')
//
this.saveFormOld()
// this.handleCancle()
} else {
this.$message.error(msg)
}
},
async saveFormOld () {
const url = '/epmetuser/icusertransferrecord/add'
let noData = new Date()
noData = util.dateFormatter(noData, 'time')
this.dataForm.transferTime = noData
console.log('-----------3--------------')
console.log(this.dataForm)
const { data, code, msg } = await requestPost(url, this.dataForm)
if (code === 0) {
this.$message.success('调动成功')
this.handleCancle()
} else {
this.$message.error(msg)
}
},
handleCancle () {
this.resetData()
@ -535,7 +556,8 @@ export default {
unitId: '',//Id
homeId: '', //Id
transferTime: '', //
reason: '' //
reason: '', //
outOfTime: ''
}
this.customerId = ''//id

38
src/views/modules/plugins/change/changedeath.vue

@ -45,6 +45,9 @@
<el-form-item>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
@ -71,22 +74,22 @@
<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="gender" label="性别" header-align="center" align="center"></el-table-column>
<el-table-column prop="type" label="类型" header-align="center" align="center">
<template slot-scope="scope">
{{
scope.row.type == '0'
? "租客"
: scope.row.type == '1'
? "房东"
: ""
}}
</template>
</el-table-column>
<el-table-column prop="joinDate" label="加入时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>
<!--<el-table-column prop="type" label="类型" header-align="center" align="center">-->
<!--<template slot-scope="scope">-->
<!--{{-->
<!--scope.row.type == '0'-->
<!--? "租客"-->
<!--: scope.row.type == '1'-->
<!--? "房东"-->
<!--: ""-->
<!--}}-->
<!--</template>-->
<!--</el-table-column>-->
<el-table-column prop="joinDate" label="死亡时间" header-align="center" align="center"></el-table-column>
<!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="removeReason" 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="createdTime" label="创建时间" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="customerId" label="客户ID" 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">
@ -160,6 +163,13 @@ export default {
peopleMore
},
methods: {
resetForm(formName) {
for(const n in this.dataForm) {
this.dataForm[n] = ''
}
this.timeRange = ''
this.getDataList()
},
async handleLook (row) {
if(row.gridId !== ''){
const url = '/gov/org/grid/griddetail'

12
src/views/modules/plugins/change/changerelocation.vue

@ -20,7 +20,7 @@
</el-option>
</el-select>
</el-form-item>
<el-form-item label="所属房屋" >
<el-form-item label="迁往何地" >
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
@ -143,6 +143,9 @@
<el-form-item>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
<el-form-item>
<el-button type="warning" size="small" @click="exportHandle()">{{ $t('export') }}</el-button>
</el-form-item>
@ -254,6 +257,13 @@ export default {
}
},
methods: {
resetForm(formName) {
for(const n in this.dataForm) {
this.dataForm[n] = ''
}
this.timeRange = ''
this.getDataList()
},
handleClearVillage() {
this.dataForm.buildId = ''
this.dataForm.homeId = ''

267
src/views/modules/plugins/change/changewelfare.vue

@ -1,45 +1,92 @@
<template>
<el-card shadow="never" class="aui-card--fill">
<div class="mod-change__changeWelfare}">
<div class="mod-rent__rentDeath} resi-container">
<el-card ref="searchCard" class="search-card">
<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 label="姓名"
prop="name">
<el-input v-model="dataForm.name"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入姓名">
</el-input>
</el-form-item>
<el-form-item label="身份证"
prop="idCard">
<el-input v-model="dataForm.idCard"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入身份证">
</el-input>
</el-form-item>
<el-form-item label="手机"
prop="mobile">
<el-input v-model="dataForm.mobile"
size="small"
class="list_item_width_1"
clearable
placeholder="请输入手机">
</el-input>
</el-form-item>
<el-form-item label="加入时间"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
clearable
size="small"
range-separator="至"
start-placeholder="选择日期"
end-placeholder="选择日期"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button @click="getDataList()">{{ $t('query') }}</el-button>
<el-button type="primary" size="small" @click="getDataList()">{{ $t('query') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="primary" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
<el-button type="primary" size="small" @click="addOrUpdateHandle()">{{ $t('add') }}</el-button>
</el-form-item>
<el-form-item>
<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>
<el-button class="diy-button--reset" size="small" @click="resetForm">重置</el-button>
</el-form-item>
<!--<el-form-item>-->
<!--<el-button type="danger" @click="deleteHandle()">{{ $t('deleteBatch') }}</el-button>-->
<!--</el-form-item>-->
</el-form>
</el-card>
<el-card class="resi-card-table">
<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"></el-table-column>
<el-table-column prop="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>
<el-table-column prop="gridId" label="epmet网格ID" header-align="center" align="center"></el-table-column>
<!--<el-table-column type="selection" header-align="center" align="center" width="50"></el-table-column>-->
<el-table-column label="序号"
type="index"
fixed="left"
align="center"
width="50">
</el-table-column>
<!--<el-table-column prop="id" label="主键" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="userId" label="epmet用户主键" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="gridId" label="epmet网格ID" header-align="center" align="center"></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="mobile" label="手机号" header-align="center" align="center"></el-table-column>
<el-table-column prop="gender" label="性别 0女 1男" header-align="center" align="center"></el-table-column>
<el-table-column prop="type" label="类型" header-align="center" align="center"></el-table-column>
<el-table-column prop="gender" label="性别" header-align="center" align="center"></el-table-column>
<!--<el-table-column prop="type" label="类型" header-align="center" align="center"></el-table-column>-->
<el-table-column prop="joinDate" label="加入时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>
<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center"></el-table-column>
<el-table-column prop="removeReason" label="移除原因" header-align="center" align="center"></el-table-column>
<el-table-column prop="delFlag" label="删除标记 0:未删除,1:已删除" header-align="center" align="center"></el-table-column>
<el-table-column prop="revision" label="乐观锁" header-align="center" align="center"></el-table-column>
<el-table-column prop="createdBy" 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="updatedBy" 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="customerId" label="客户ID" header-align="center" align="center"></el-table-column>
<!--<el-table-column prop="joinReason" label="加入原因" header-align="center" align="center"></el-table-column>-->
<!--<el-table-column prop="removeDate" label="移除时间" header-align="center" align="center" width="100"></el-table-column>-->
<!--<el-table-column prop="removeReason" 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 type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>
<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>
<!--<el-button type="text" size="small" @click="addOrUpdateHandle(scope.row.id)">{{ $t('update') }}</el-button>-->
<!--<el-button type="text" size="small" @click="deleteHandle(scope.row.id)">{{ $t('delete') }}</el-button>-->
<el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
<el-button @click="removeHandleList(scope.row)"
type="text"
size="small"
class="div-table-button--detail">移除福利人员</el-button>
</template>
</el-table-column>
</el-table>
@ -52,8 +99,23 @@
@size-change="pageSizeChangeHandle"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</el-card>
<!-- 弹窗, 新增 / 修改 -->
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getDataList"></add-or-update>
<people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
:userId="lookInfo.userId"
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
<el-dialog
title="移除原因"
:visible.sync="removeVisible"
width="40%">
<textarea v-model="removeReason" placeholder="请输入移除福利人员的原因" class="blacklist-reason"></textarea>
<span slot="footer" class="dialog-footer">
<el-button @click="removeVisible = false"> </el-button>
<el-button type="primary" @click="removeHandle"> </el-button>
</span>
</el-dialog>
</div>
</el-card>
</template>
@ -61,23 +123,170 @@
<script>
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './changewelfare-add-or-update'
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import { requestPost } from "@/js/dai/request";
export default {
mixins: [mixinViewModule],
data () {
return {
mixinViewModuleOptions: {
getDataListURL: '/change/changeWelfare/page',
getDataListURL: '/pli/power/changeWelfare/page',
getDataListIsPage: true,
deleteURL: '/change/changeWelfare',
deleteURL: '/pli/power/changeWelfare',
deleteIsBatch: true
},
dataForm: {
id: ''
}
},
timeRange: '',
//
showedPeopleMoreInfo: false,
lookInfo: {
userId: '',
gridName: ''
},
removeReason: '',
removeVisible: false,
rowData: {},
}
},
components: {
AddOrUpdate
}
AddOrUpdate,
peopleMore
},
watch: {
timeRange (val) {
if (Array.isArray(val) && val.length == 2) {
this.dataForm.startTime = val[0];
this.dataForm.endTime = val[1];
} else {
this.dataForm.startTime = "";
this.dataForm.endTime = "";
}
}
},
methods: {
resetForm(formName) {
for(const n in this.dataForm) {
this.dataForm[n] = ''
}
this.timeRange = ''
this.getDataList()
},
async handleLook (row) {
if(row.gridId !== ''){
const url = '/gov/org/grid/griddetail'
let params = {
gridId : row.gridId,
}
const { data, code, msg } = await requestPost(url, params)
if(code === 0){
this.lookInfo.gridName = data.gridName
} else {
this.$message.error(msg)
}
}else{
this.lookInfo.gridName = ''
}
this.lookInfo.userId = row.userId
this.showedPeopleMoreInfo = true
},
handleCancleLook() {
this.lookInfo.userId = ''
this.lookInfo.gridName = ''
this.showedPeopleMoreInfo = false
},
removeHandleList (row) {
this.removeVisible = true
this.removeReason = ''
this.rowData = { ...row }
},
removeHandle () {
const params = {
id: this.rowData.id,
removeReason: this.removeReason
}
this.$http.post('/pli/power/changeWelfare/removeWelfare', params).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.removeVisible = false
this.getDataList()
}
})
}).catch(err => {
this.$message.error(err.message)
})
},
}
}
</script>
<style lang="scss" scoped>
@import "@/assets/scss/buttonstyle.scss";
.resi-container .resi-card-table {
::v-deep .el-table th {
color: #fff;
background-color: rgba(33, 149, 254, 1);
// border-right: 1px solid rgba(33, 149, 254, 1);
}
}
.resi-table {
::v-deep .el-button--text {
text-decoration: underline;
}
::v-deep .btn-color-del {
margin-left: 10px;
color: rgba(213, 16, 16, 1);
}
::v-deep .btn-color-edit {
color: rgba(0, 167, 169, 1);
}
}
.form-wr {
.input-width {
width: 260px;
}
.input-width-textarea {
width: 500px;
}
.imsg-list {
display: flex;
align-items: center;
.imgs-item {
position: relative;
margin-right: 10px;
.el-icon-delete {
position: absolute;
top: 0;
right: 0;
font-size: 18px;
color: red;
z-index: 3;
cursor: pointer;
}
}
}
}
.div-content {
width: 100%;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
}
.blacklist-reason {
width: 100%;
height: 80px;
border: 1px solid #e4e4e4;
border-radius: 4px;
resize: none;
padding: 8px;
box-sizing: border-box;
}
</style>

2
src/views/modules/plugins/change/resichange.vue

@ -430,6 +430,8 @@ export default {
userId: this.rowData.icResiUserId,
joinReason: this.blacklistReason
}
console.log('----------8----------')
console.log(params)
this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)

13
src/views/modules/plugins/change/resideath.vue

@ -261,11 +261,12 @@
:userId="lookInfo.userId"
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
<el-dialog
title="迁入死亡人口的原因"
:visible.sync="blacklistVisible"
width="40%">
<el-dialog title="迁入死亡人口的原因" :visible.sync="blacklistVisible" width="40%">
<textarea v-model="blacklistReason" placeholder="请输入迁入死亡人口的原因" class="blacklist-reason"></textarea>
<div>
<br/>
</div>
<el-checkbox v-model="welfareFlag">享受福利</el-checkbox>
<span slot="footer" class="dialog-footer">
<el-button @click="blacklistVisible = false"> </el-button>
<el-button type="primary" @click="confirmJoinDeathlist"> </el-button>
@ -345,6 +346,7 @@ export default {
},
blacklistVisible: false, //
blacklistReason: '', //
welfareFlag: false,
rowData: {}, //
}
},
@ -424,7 +426,8 @@ export default {
gender: this.rowData.GENDER == '女' ? '0' : this.rowData.GENDER == '男' ? '1' : '',
type: '1',
userId: this.rowData.icResiUserId,
joinReason: this.blacklistReason
joinReason: this.blacklistReason,
welfareFlag: this.welfareFlag
}
this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => {
if (res.code !== 0) {

8
src/views/modules/plugins/change/resiwelfare.vue

@ -86,7 +86,7 @@
<el-button @click="joinBlacklist(scope.row)"
type="text"
size="small"
class="div-table-button--detail">迁入死亡人口</el-button>
class="div-table-button--detail">添加福利人员</el-button>
<!-- <el-button @click="handleLook(scope.row)"
type="text"
size="small"
@ -262,10 +262,10 @@
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
<el-dialog
title="迁入死亡人口的原因"
title="添加福利人员的原因"
:visible.sync="blacklistVisible"
width="40%">
<textarea v-model="blacklistReason" placeholder="请输入迁入死亡人口的原因" class="blacklist-reason"></textarea>
<textarea v-model="blacklistReason" placeholder="请输入添加福利人员的原因" class="blacklist-reason"></textarea>
<span slot="footer" class="dialog-footer">
<el-button @click="blacklistVisible = false"> </el-button>
<el-button type="primary" @click="confirmJoinDeathlist"> </el-button>
@ -426,7 +426,7 @@ export default {
userId: this.rowData.icResiUserId,
joinReason: this.blacklistReason
}
this.$http.post('/pli/power/rentDeath/save', params).then(({ data: res }) => {
this.$http.post('/pli/power/changeWelfare/save', params).then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
}

Loading…
Cancel
Save