Browse Source

Merge branch 'dev_partymember_sync'

# Conflicts:
#	src/views/components/editResi.vue
dev-烟台中转登录
wanggongfeng 3 years ago
parent
commit
70174b2ed5
  1. 20
      src/App.vue
  2. 5
      src/views/components/editResi.vue
  3. 4
      src/views/components/resiForm.vue
  4. 55
      src/views/modules/base/huji/chusheng/index.vue
  5. 60
      src/views/modules/base/huji/immigration/index.vue
  6. 63
      src/views/modules/communityParty/members/crateForm.vue
  7. 16
      src/views/modules/communityParty/members/detailForm.vue
  8. 16
      src/views/modules/communityParty/members/index.vue
  9. 58
      src/views/modules/plugins/change/changedeath.vue
  10. 65
      src/views/modules/plugins/change/changerelocation.vue

20
src/App.vue

@ -194,4 +194,24 @@ export default {
flex-direction: column;
justify-content: center;
}
::-webkit-scrollbar {
// display: none;
width: 8px;
height: 8px;
background-color: #EBEEF5;
}
::-webkit-scrollbar-thumb {
box-shadow: inset 0 0 6px rgba(0, 0, 0, .3);
-webkit-box-shadow: inset 0 0 6px rgba(243, 236, 236, 0.3);
background-color: #ccc;
border-radius: 8px;
}
::-webkit-scrollbar-track {
box-shadow: inset 0 0 6px rgba(0,0,0, .2);
/*滚动条的轨道*/
border-radius: 8px;
background: rgba(255, 255, 255, 1);
}
</style>

5
src/views/components/editResi.vue

@ -308,9 +308,10 @@
</template>
<script>
import { isCard, isMobile } from '@/utils/validate'
import { isCard, isMobile, isPhone } from '@/utils/validate'
import { requestPost } from "@/js/dai/request";
export default {
name: 'editForm',
props: {
@ -373,7 +374,7 @@ export default {
if (value === '') {
callback(new Error('请输入手机号'))
} else {
if (!isMobile(value)) {
if (!isMobile(value) && !isPhone(value)) {
callback(new Error('手机号格式不正确'))
}
callback()

4
src/views/components/resiForm.vue

@ -258,7 +258,7 @@
</template>
<script>
import { isCard, isPassport, isMobile } from '@/utils/validate'
import { isCard, isPassport, isMobile, isPhone } from '@/utils/validate'
import { computedCard } from '@/utils/index'
export default {
@ -305,7 +305,7 @@ export default {
if (value === '') {
callback(new Error('请输入手机号'))
} else {
if (!isMobile(value)) {
if (!isMobile(value) && !isPhone(value)) {
callback(new Error('手机号格式不正确'))
}
callback()

55
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,16 @@
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
<el-popconfirm v-if="true"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDelNew(scope.row)"
@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 +370,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 +450,7 @@ export default {
//
scoreDiaTitle: "积分记录",
scoreDiaShow: false,
changeRecordShow: false,
};
},
computed: {
@ -460,6 +487,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 +857,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;

60
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,16 @@
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
<el-popconfirm v-if="true"
title="删除之后无法回复,确认删除?"
@onConfirm="handleDelNew(scope.row)"
@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 +375,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 +408,6 @@ export default {
detailShow: false,
formTitle: '迁入登记',
detailShow: false,
pageNo: 1,
pageSize: window.localStorage.getItem('pageSize') || 20,
total: 1,
@ -424,7 +450,8 @@ export default {
importLoading: false,
searchH: 0,
tableHeight: 0
tableHeight: 0,
changeRecordShow: false,
}
},
computed: {
@ -477,6 +504,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 +938,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

63
src/views/modules/communityParty/members/crateForm.vue

@ -146,16 +146,52 @@
clearable></el-input>
</el-form-item>
</div>
<el-form-item label="备注"
prop="remark">
<el-input v-model="form.remark"
:autosize="{ minRows: 4, maxRows: 10}"
:disabled="disabled"
type="textarea"
clearable
class="input-width-textarea"
placeholder="请输入内容"></el-input>
</el-form-item>
<div class="flex-div">
<el-form-item label="入党时所在党支部"
prop="rdsszzb"
class="wd50">
<el-input v-model="form.rdsszzb"
placeholder="请输入"
:disabled="disabled"
class="input-width"
clearable></el-input>
</el-form-item>
<el-form-item label="组织关系转入社区时间"
prop="zzgxzrsqsj"
class="wd50">
<el-date-picker v-model="form.zzgxzrsqsj"
:disabled="disabled"
type="date"
class="input-width"
clearable
placeholder="选择日期"
format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
</div>
<div class="flex-div">
<el-form-item label="是否请长假"
prop="isQcj"
class="wd50">
<el-radio-group v-model="form.isQcj"
class="input-width">
<el-radio label="1"></el-radio>
<el-radio label="0"></el-radio>
</el-radio-group>
</el-form-item>
<el-form-item label="备注"
prop="remark"
class="wd50">
<el-input v-model="form.remark"
:autosize="{ minRows: 4, maxRows: 10}"
:disabled="disabled"
type="textarea"
clearable
class="input-width-textarea "
placeholder="请输入内容"></el-input>
</el-form-item>
</div>
<div>
<div style="margin-top: 20px; text-align: center;">
<el-button size="small"
@ -202,7 +238,7 @@
</template>
<script>
import { isCard, isMobile } from '@/utils/validate'
import { isCard, isMobile, isPhone } from '@/utils/validate'
import { computedCard } from '@/utils/index'
import pointsInfo from './cpts/points.vue'
@ -232,7 +268,7 @@ export default {
if (value === '') {
callback(new Error('请输入手机号'))
} else {
if (!isMobile(value)) {
if (!isMobile(value) && !isPhone(value)) {
callback(new Error('手机号格式不正确'))
}
callback()
@ -290,6 +326,9 @@ export default {
isDyzxh: '0',
isMxx: '0',
culture: '',
rdsszzb: '',
zzgxzrsqsj: '',
isQcj: '0',
remark: ''
},
eduList: [],

16
src/views/modules/communityParty/members/detailForm.vue

@ -79,9 +79,23 @@
</div>
</div>
<div class="m-row-2">
<div class="info-prop">
<span class="info-title-2">入党时所在党支部</span>
<span>{{ info.rdsszzb?info.rdsszzb:'--'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">组织关系转入社区时间</span>
<span>{{ info.zzgxzrsqsj?info.zzgxzrsqsj:'--' }}</span>
</div>
</div>
<div class="m-row-2">
<div class="info-prop">
<span class="info-title-2">是否请长假</span>
<span>{{ info.isQcj==='1'?'是':'否'}}</span>
</div>
<div class="info-prop">
<span class="info-title-2">备注</span>
<span>{{ info.remark? info.remark:'--' }}</span>

16
src/views/modules/communityParty/members/index.vue

@ -114,6 +114,7 @@
</el-select>
</el-form-item>
</div>
<div>
<el-form-item label="免学习"
prop="isMxx">
<el-select v-model="searchForm.isMxx"
@ -126,6 +127,18 @@
value="0" />
</el-select>
</el-form-item>
<el-form-item label="是否请长假"
prop="isQcj">
<el-select v-model="searchForm.isQcj"
filterable
placeholder="请选择"
clearable>
<el-option label="是"
value="1" />
<el-option label="否"
value="0" />
</el-select>
</el-form-item>
<el-form-item label="最近缴费时间"
label-width="130px"
prop="startTime">
@ -138,8 +151,8 @@
start-placeholder="开始时间"
end-placeholder="结束时间">
</el-date-picker>
</el-form-item>
</div>
<el-form-item label="入党时间"
prop="startTime">
<el-date-picker v-model="timeRange"
@ -447,6 +460,7 @@ export default {
partyZw: '',
isDyzxh: '',
isMxx: '',
isQcj: '',
culture: '',
isPay: '',
rdsjStartDate: '',

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

@ -112,8 +112,22 @@
<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="确认恢复?"
@onConfirm="handleRecovery(scope.row)"
@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 +147,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 +164,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 +193,8 @@ export default {
isWelfareArr: [
{ dictValue: '0', dictName: '否' },
{ dictValue: '1', dictName: '是' }
]
],
changeRecordShow: false
}
},
watch: {
@ -183,9 +210,36 @@ export default {
},
components: {
AddOrUpdate,
peopleMore
peopleMore,
resiChangeRecord
},
methods: {
async handleRecovery (rowData) {
console.log('11111')
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({

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

@ -194,6 +194,27 @@
<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="确认恢复?"
@onConfirm="handleRecovery(scope.row)"
@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 +232,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 +249,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 +290,14 @@ export default {
isWelfareArr: [
{ dictValue: '0', dictName: '否' },
{ dictValue: '1', dictName: '是' }
]
],
changeRecordShow: false
}
},
components: {
AddOrUpdate,
peopleMore
peopleMore,
resiChangeRecord
},
computed: {
changeVDisabled() {
@ -291,6 +326,32 @@ export default {
}
},
methods: {
async handleRecovery (rowData) {
console.log('11111')
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