Browse Source

迁入迁出,死亡管理,出生管理,页面修改

feature
wanggongfeng 3 years ago
parent
commit
1a4c6657df
  1. 54
      src/views/modules/base/huji/chusheng/index.vue
  2. 59
      src/views/modules/base/huji/immigration/index.vue
  3. 56
      src/views/modules/plugins/change/changedeath.vue
  4. 63
      src/views/modules/plugins/change/changerelocation.vue

54
src/views/modules/base/huji/chusheng/index.vue

@ -302,6 +302,11 @@
size="small"
class="div-table-button--edit">修改</el-button>
<el-button @click="handleChangeRecord(scope.row)"
type="text"
size="small"
class="div-table-button--detail">变更记录</el-button>
<el-popconfirm v-if="false"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@ -312,6 +317,15 @@
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
<el-popconfirm v-if="true"
title="删除之后无法回复,确认删除?"
@confirm="handleDelNew(scope.row)">
<el-button slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
@ -355,19 +369,30 @@
@diaDetailClose="detailFormCancle"></detail-form>
</el-dialog>
<!-- 变更记录 -->
<el-dialog :visible.sync="changeRecordShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'变更记录'"
width="1150px"
top="5vh"
@closed="diaClose">
<resi-change-record ref="ref_changerecord"></resi-change-record>
</el-dialog>
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick";
import resiChangeRecord from '../../../../components/resiChangeRecord.vue'
import { mapGetters } from "vuex";
import editForm from "./cpts/edit";
import detailForm from "./cpts/detail";
import axios from "axios";
export default {
components: { editForm, detailForm },
components: { editForm, detailForm, resiChangeRecord},
data () {
return {
openSearch: false,
@ -424,6 +449,7 @@ export default {
//
scoreDiaTitle: "积分记录",
scoreDiaShow: false,
changeRecordShow: false,
};
},
computed: {
@ -460,6 +486,17 @@ export default {
this.getTableData();
},
methods: {
diaClose () {
this.changeRecordShow = false
},
//
async handleChangeRecord (row) {
this.changeRecordShow = true
await nextTick(200)
this.$refs.ref_changerecord.initForm(row)
},
handleClearVillage () {
this.fmData.buildId = "";
this.fmData.homeId = "";
@ -819,6 +856,21 @@ export default {
}
},
async handleDelNew (rowData) {
const url = "/epmetuser/icBirthRecord/deleteById";
let params = {
id: rowData.id
}
const { data, code, msg } = await requestPost(url,params);
if (code === 0) {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.success("操作失败!");
}
},
async getTableData () {
const url = "/epmetuser/icBirthRecord/page";
const { pageSize, pageNo, fmData } = this;

59
src/views/modules/base/huji/immigration/index.vue

@ -294,7 +294,7 @@
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
width="150">
<template slot-scope="scope">
<el-button v-if="false"
@click="handleWatch(scope.$index)"
@ -306,6 +306,11 @@
size="small"
class="div-table-button--edit">修改</el-button>
<el-button @click="handleChangeRecord(scope.row)"
type="text"
size="small"
class="div-table-button--detail">变更记录</el-button>
<el-popconfirm v-if="false"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row, scope.$index)"
@ -316,6 +321,15 @@
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
<el-popconfirm v-if="true"
title="删除之后无法回复,确认删除?"
@confirm="handleDelNew(scope.row)">
<el-button slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
@ -360,19 +374,31 @@
ref="ref_form_detail"
@diaDetailClose="detailFormCancle"></detail-form>
</el-dialog>
<!-- 变更记录 -->
<el-dialog :visible.sync="changeRecordShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'变更记录'"
width="1150px"
top="5vh"
@closed="diaClose">
<resi-change-record ref="ref_changerecord"></resi-change-record>
</el-dialog>
</div>
</template>
<script>
import { requestPost } from '@/js/dai/request'
import nextTick from 'dai-js/tools/nextTick'
import resiChangeRecord from '../../../../components/resiChangeRecord.vue'
import { mapGetters } from 'vuex'
import editForm from './edit'
import detailForm from './detail'
import axios from 'axios'
export default {
components: { editForm, detailForm },
components: { editForm, detailForm, resiChangeRecord},
data () {
return {
openSearch: false,
@ -381,7 +407,6 @@ export default {
detailShow: false,
formTitle: '迁入登记',
detailShow: false,
pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20,
total: 1,
@ -424,7 +449,8 @@ export default {
importLoading: false,
searchH: 0,
tableHeight: 0
tableHeight: 0,
changeRecordShow: false,
}
},
computed: {
@ -477,6 +503,17 @@ export default {
console.log('searchH----', this.$refs.searchCard.$el.offsetHeight)
},
methods: {
diaClose () {
this.changeRecordShow = false
},
//
async handleChangeRecord (row) {
this.changeRecordShow = true
await nextTick(200)
this.$refs.ref_changerecord.initForm(row)
},
handleClearVillage () {
this.fmData.buildId = ''
this.fmData.homeId = ''
@ -900,6 +937,20 @@ export default {
}
},
async handleDelNew (rowData) {
const url = "/epmetuser/icMoveIn/deleteById";
let params = {
id: rowData.moveInId
}
const { data, code, msg } = await requestPost(url,params);
if (code === 0) {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.success("操作失败!");
}
},
async getTableData () {
const url = '/epmetuser/icMoveIn/list'
const { pageSize, pageNo, fmData } = this

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

@ -112,8 +112,21 @@
<el-table-column :label="$t('handle')" fixed="right" header-align="center" align="center" width="150">
<template slot-scope="scope">
<el-button @click="handleLook(scope.row)" type="text" size="small" class="btn-color-look">查看</el-button>
<el-button @click="handleChangeRecord(scope.row)"
type="text"
size="small"
class="div-table-button--detail">变更记录</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-popconfirm v-if="scope.row.status !== '0'"
title="确认恢复?"
@confirm="handleRecovery(scope.row)">
<el-button slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px">恢复</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
@ -133,6 +146,16 @@
:userId="lookInfo.userId"
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
<!-- 变更记录 -->
<el-dialog :visible.sync="changeRecordShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'变更记录'"
width="1150px"
top="5vh"
@closed="diaClose">
<resi-change-record ref="ref_changerecord"></resi-change-record>
</el-dialog>
</div>
</template>
@ -140,6 +163,8 @@
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './changedeath-add-or-update'
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import nextTick from 'dai-js/tools/nextTick'
import resiChangeRecord from '../../../components/resiChangeRecord.vue'
import { requestPost } from "@/js/dai/request";
export default {
mixins: [mixinViewModule],
@ -167,7 +192,8 @@ export default {
isWelfareArr: [
{ dictValue: '0', dictName: '否' },
{ dictValue: '1', dictName: '是' }
]
],
changeRecordShow: false
}
},
watch: {
@ -183,9 +209,35 @@ export default {
},
components: {
AddOrUpdate,
peopleMore
peopleMore,
resiChangeRecord
},
methods: {
async handleRecovery (rowData) {
const url = "/epmetuser/rentDeath/recovery";
let params = {
id: rowData.id
}
const { data, code, msg } = await requestPost(url,params);
if (code === 0) {
this.$message.success("恢复成功!");
this.getDataList();
} else {
this.$message.success("操作失败!");
}
},
diaClose () {
this.changeRecordShow = false
},
//
async handleChangeRecord (row) {
this.changeRecordShow = true
await nextTick(200)
this.$refs.ref_changerecord.initForm(row)
},
exportHandle () {
const url = this.mixinViewModuleOptions.exportURL
this.$http({

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

@ -194,6 +194,26 @@
<el-table-column prop="outOfTime" label="迁出时间" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column prop="reason" label="迁出原因" header-align="center" align="center" min-width="100" show-overflow-tooltip></el-table-column>
<el-table-column prop="address" label="迁往何地" header-align="center" align="center" min-width="120" show-overflow-tooltip></el-table-column>
<el-table-column fixed="right"
label="操作"
align="center"
width="120">
<template slot-scope="scope">
<el-button @click="handleChangeRecord(scope.row)"
type="text"
size="small"
class="div-table-button--detail">变更记录</el-button>
<el-popconfirm v-if="scope.row.status !== '0'"
title="确认恢复?"
@confirm="handleRecovery(scope.row)">
<el-button slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px">恢复</el-button>
</el-popconfirm>
</template>
</el-table-column>
</el-table>
<el-pagination
:current-page="page"
@ -211,6 +231,16 @@
:userId="lookInfo.userId"
:gridName="lookInfo.gridName"
@close="handleCancleLook" />
<!-- 变更记录 -->
<el-dialog :visible.sync="changeRecordShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="'变更记录'"
width="1150px"
top="5vh"
@closed="diaClose">
<resi-change-record ref="ref_changerecord"></resi-change-record>
</el-dialog>
</div>
</template>
@ -218,6 +248,8 @@
import mixinViewModule from '@/mixins/view-module'
import AddOrUpdate from './changerelocation-add-or-update'
import peopleMore from "@/views/modules/shequ/cpts/people-more";
import nextTick from 'dai-js/tools/nextTick'
import resiChangeRecord from '../../../components/resiChangeRecord.vue'
import { requestPost } from "@/js/dai/request";
export default {
mixins: [mixinViewModule],
@ -257,12 +289,14 @@ export default {
isWelfareArr: [
{ dictValue: '0', dictName: '否' },
{ dictValue: '1', dictName: '是' }
]
],
changeRecordShow: false
}
},
components: {
AddOrUpdate,
peopleMore
peopleMore,
resiChangeRecord
},
computed: {
changeVDisabled() {
@ -291,6 +325,31 @@ export default {
}
},
methods: {
async handleRecovery (rowData) {
const url = "/epmetuser/changeRelocation/recovery";
let params = {
id: rowData.id
}
const { data, code, msg } = await requestPost(url,params);
if (code === 0) {
this.$message.success("恢复成功!");
this.getDataList();
} else {
this.$message.success("操作失败!");
}
},
diaClose () {
this.changeRecordShow = false
},
//
async handleChangeRecord (row) {
this.changeRecordShow = true
await nextTick(200)
this.$refs.ref_changerecord.initForm(row)
},
exportHandle () {
const url = this.mixinViewModuleOptions.exportURL
this.$http({

Loading…
Cancel
Save