Browse Source

Merge remote-tracking branch 'origin/yantai_master' into 煙台-政務master

yantai_master
jianjun 3 years ago
parent
commit
e84e27c79d
  1. 206
      src/views/components/editResi.vue
  2. 5
      src/views/modules/base/community/roomDetail.vue
  3. 24
      src/views/modules/base/community/roomForm.vue
  4. 78
      src/views/modules/base/epidemic/antiInfo.vue
  5. 54
      src/views/modules/base/epidemic/natFocus/natFocusEdit.vue
  6. 43
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  7. 316
      src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue
  8. 41
      src/views/modules/base/epidemic/natInfo/natDetail.vue
  9. 54
      src/views/modules/base/epidemic/natInfo/natList.vue
  10. 47
      src/views/modules/base/epidemic/natInfo/noNatDetail.vue
  11. 37
      src/views/modules/base/epidemic/natInfo/noNatList.vue
  12. 47
      src/views/modules/base/epidemic/travel.vue
  13. 49
      src/views/modules/base/epidemic/travelDetail.vue
  14. 42
      src/views/modules/base/epidemic/vaccin.vue
  15. 53
      src/views/modules/base/epidemic/vaccinForm.vue
  16. 52
      src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
  17. 42
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  18. 274
      src/views/modules/base/resi.vue
  19. 4
      src/views/modules/shequ/cpts/people-more.vue

206
src/views/components/editResi.vue

@ -1,28 +1,44 @@
<template> <template>
<div :id="formId" class="resi-container"> <div :id="formId"
<el-form :ref="formId" class="resi-form" :model="form" :rules="rulesForm" :label-width="labelWidth"> class="resi-container">
<el-form :ref="formId"
class="resi-form"
:model="form"
:rules="rulesForm"
:label-width="labelWidth">
<template v-if="supportAdd"> <template v-if="supportAdd">
<el-row style="margin-bottom: 10px;"> <el-row style="margin-bottom: 10px;">
<el-col :span="24"> <el-col :span="24">
<el-button icon="el-icon-plus" size="small" @click="handleAddRow"></el-button> <el-button icon="el-icon-plus"
size="small"
@click="handleAddRow"></el-button>
</el-col> </el-col>
</el-row> </el-row>
<edit-form v-for="(item, index) in addList" :key="index" :ref="'baseForms' + index" :columns="3" <edit-form v-for="(item, index) in addList"
:form-list="item.itemList || formList" :form-id="'baseForms' + item.row" /> :key="index"
:ref="'baseForms' + index"
:columns="3"
:form-list="item.itemList || formList"
:form-id="'baseForms' + item.row" />
</template> </template>
<template v-else> <template v-else>
<el-row v-if="fixed" class="resi-row"> <el-row v-if="fixed"
class="resi-row">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col :span="6"> <el-col :span="6">
<el-form-item prop="GRID_ID" label="所属网格"> <el-form-item prop="GRID_ID"
label="所属网格">
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> --> <!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value"> <div class="resi-cell-value">
<el-select v-model.trim="form.GRID_ID" :disabled="disabled" placeholder="请选择网格" size="small" <el-select v-model.trim="form.GRID_ID"
clearable class="resi-cell-select" @change="handleChangeGrid" :disabled="disabled"
> placeholder="请选择网格"
<el-option size="small"
v-for="item in optionsG" clearable
class="resi-cell-select"
@change="handleChangeGrid">
<el-option v-for="item in optionsG"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -33,15 +49,19 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="18"> <el-col :span="18">
<el-form-item label="所属房屋" required> <el-form-item label="所属房屋"
required>
<div class="resi-cell-value"> <div class="resi-cell-value">
<div class="resi-cell-col"> <div class="resi-cell-col">
<el-form-item prop="VILLAGE_ID"> <el-form-item prop="VILLAGE_ID">
<el-select v-model.trim="form.VILLAGE_ID" placeholder="请选择小区" size="small" <el-select v-model.trim="form.VILLAGE_ID"
clearable class="resi-cell-select" :disabled="disabled" @change="handleChangeV" placeholder="请选择小区"
> size="small"
<el-option clearable
v-for="item in optionsV" class="resi-cell-select"
:disabled="disabled"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -49,11 +69,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="BUILD_ID"> <el-form-item prop="BUILD_ID">
<el-select v-model.trim="form.BUILD_ID" placeholder="请选择楼号" size="small" <el-select v-model.trim="form.BUILD_ID"
clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" @change="handleChangeB" placeholder="请选择楼号"
> size="small"
<el-option clearable
v-for="item in optionsB" :disabled="disabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -61,11 +84,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="UNIT_ID"> <el-form-item prop="UNIT_ID">
<el-select v-model.trim="form.UNIT_ID" placeholder="请选择单元" size="small" <el-select v-model.trim="form.UNIT_ID"
clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" @change="handleChangeD" placeholder="请选择单元"
> size="small"
<el-option clearable
v-for="item in optionsD" :disabled="disabled"
class="resi-cell-select resi-cell-select-middle"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -73,12 +99,14 @@
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="HOME_ID"> <el-form-item prop="HOME_ID">
<el-select v-model.trim="form.HOME_ID" placeholder="请选择房号" size="small" <el-select v-model.trim="form.HOME_ID"
clearable :disabled="disabled" class="resi-cell-select resi-cell-select-middle" placeholder="请选择房号"
@change="handleChangeH" size="small"
> clearable
<el-option :disabled="disabled"
v-for="item in optionsH" class="resi-cell-select resi-cell-select-middle"
@change="handleChangeH">
<el-option v-for="item in optionsH"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -134,34 +162,46 @@
</el-form-item> </el-form-item>
</el-col> --> </el-col> -->
</el-row> </el-row>
<el-row v-for="(item, index) in sliceList(formList, columns)" :key="index" class="resi-row"> <el-row v-for="(item, index) in sliceList(formList, columns)"
:key="index"
class="resi-row">
<!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> --> <!-- <el-col v-for="n in item" :key="n.id" :span="n.itemType === 'textarea'&&24 || (24/columns)"> -->
<el-col v-for="n in item" :key="n.itemId" :span="item.length === 1 ? 24 : (24/columns)" <el-col v-for="n in item"
:key="n.itemId"
:span="item.length === 1 ? 24 : (24/columns)"
:style="n.itemType === 'divider' && 'display: none;'"> :style="n.itemType === 'divider' && 'display: none;'">
<el-form-item :prop="n.columnName" :label="n.label"> <el-form-item :prop="n.columnName"
:label="n.label">
<!-- <div class="resi-cell"> --> <!-- <div class="resi-cell"> -->
<!-- <div class="resi-cell-label">{{n.label}}</div> --> <!-- <div class="resi-cell-label">{{n.label}}</div> -->
<div class="resi-cell-value"> <div class="resi-cell-value">
<template v-if="n.itemType === 'input' || n.itemType === 'textarea'"> <template v-if="n.itemType === 'input' || n.itemType === 'textarea'">
<el-input <!-- <span v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'">{{ form[n.columnName]||'--'}}</span> -->
v-if="n.validType" <el-input v-if="n.columnName==='MOBILE'||n.columnName==='ID_CARD'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入内容" placeholder="请输入内容">
>
</el-input> </el-input>
<el-input
v-else <el-input v-else-if="n.validType"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入内容" placeholder="请输入内容">
> </el-input>
<el-input v-else
v-model.trim="form[n.columnName]"
:disabled="disabled"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入内容">
</el-input> </el-input>
</template> </template>
<!-- <template v-if="n.itemType === 'textarea'"> <!-- <template v-if="n.itemType === 'textarea'">
@ -175,8 +215,7 @@
> >
</el-input> </el-input>
</template> --> </template> -->
<el-date-picker <el-date-picker v-else-if="n.itemType === 'datepicker'"
v-else-if="n.itemType === 'datepicker'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
class="resi-cell-input" class="resi-cell-input"
@ -187,8 +226,7 @@
format="yyyy 年 MM 月 dd 日" format="yyyy 年 MM 月 dd 日"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd">
</el-date-picker> </el-date-picker>
<el-date-picker <el-date-picker v-else-if="n.itemType === 'daterange'"
v-else-if="n.itemType === 'daterange'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
type="daterange" type="daterange"
@ -197,17 +235,14 @@
value-format="yyyy-MM-dd" value-format="yyyy-MM-dd"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期">
>
</el-date-picker> </el-date-picker>
<el-time-picker <el-time-picker v-else-if="n.itemType === 'timepicker'"
v-else-if="n.itemType === 'timepicker'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
placeholder="任意时间点"> placeholder="任意时间点">
</el-time-picker> </el-time-picker>
<el-time-picker <el-time-picker v-else-if="n.itemType === 'timerange'"
v-else-if="n.itemType === 'timerange'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:disabled="disabled" :disabled="disabled"
is-range is-range
@ -216,12 +251,15 @@
end-placeholder="结束时间" end-placeholder="结束时间"
placeholder="选择时间范围"> placeholder="选择时间范围">
</el-time-picker> </el-time-picker>
<el-select v-else-if="n.itemType === 'select'" v-model.trim="form[n.columnName]" <el-select v-else-if="n.itemType === 'select'"
v-model.trim="form[n.columnName]"
:multiple="n.multiSelect" :multiple="n.multiSelect"
:disabled="disabled" :disabled="disabled"
placeholder="请选择" size="small" clearable class="resi-cell-select"> placeholder="请选择"
<el-option size="small"
v-for="item in n.options || options" clearable
class="resi-cell-select">
<el-option v-for="item in n.options || options"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value"> :value="item.value">
@ -231,8 +269,7 @@
:options="options" :options="options"
:props="{ checkStrictly: true }" :props="{ checkStrictly: true }"
clearable></el-cascader> --> clearable></el-cascader> -->
<el-cascader <el-cascader v-else-if="n.itemType === 'cascader'"
v-else-if="n.itemType === 'cascader'"
v-model.trim="form[n.columnName]" v-model.trim="form[n.columnName]"
:options="n.options" :options="n.options"
:disabled="disabled" :disabled="disabled"
@ -242,7 +279,10 @@
class="resi-cell-select"> class="resi-cell-select">
</el-cascader> </el-cascader>
<template v-else-if="n.itemType === 'radio'"> <template v-else-if="n.itemType === 'radio'">
<el-radio v-for="ns in n.options" :key="ns.value" v-model.trim="form[n.columnName]" :disabled="disabled" <el-radio v-for="ns in n.options"
:key="ns.value"
v-model.trim="form[n.columnName]"
:disabled="disabled"
:label="ns.value"> :label="ns.value">
{{ ns.label }} {{ ns.label }}
</el-radio> </el-radio>
@ -250,7 +290,10 @@
</template> </template>
<template v-else-if="n.itemType === 'checkbox'"> <template v-else-if="n.itemType === 'checkbox'">
<el-checkbox-group v-model.trim="form[n.columnName]"> <el-checkbox-group v-model.trim="form[n.columnName]">
<el-checkbox v-for="ns in n.options" :key="ns.value" :label="ns.value" :disabled="disabled">{{ns.label}}</el-checkbox> <el-checkbox v-for="ns in n.options"
:key="ns.value"
:label="ns.value"
:disabled="disabled">{{ns.label}}</el-checkbox>
<!-- <el-checkbox label="n.la"></el-checkbox> --> <!-- <el-checkbox label="n.la"></el-checkbox> -->
</el-checkbox-group> </el-checkbox-group>
</template> </template>
@ -266,10 +309,15 @@
<script> <script>
import { isCard, isMobile } from '@/utils/validate' import { isCard, isMobile } from '@/utils/validate'
import { requestPost } from "@/js/dai/request";
export default { export default {
name: 'editForm', name: 'editForm',
props: { props: {
editUserId: {
type: String,
default: ''
},
fixed: { fixed: {
type: Boolean, type: Boolean,
default: false default: false
@ -504,6 +552,7 @@ export default {
created () { created () {
this.initForm() this.initForm()
console.log('formInfo---gggreg', this.rulesForm) console.log('formInfo---gggreg', this.rulesForm)
console.log('formList', this.formList)
if (this.supportAdd) { if (this.supportAdd) {
this.addList = [...this.mutiList] this.addList = [...this.mutiList]
// console.log('addList----111', this.addList) // console.log('addList----111', this.addList)
@ -515,8 +564,34 @@ export default {
this.getUniList() this.getUniList()
this.getHouseList() this.getHouseList()
} }
},
mounted () {
console.log('this.editUserId', this.editUserId)
if (this.editUserId) {
this.handleTuomin()
}
}, },
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.editUserId,
type: "checkIcResiUser",
});
if (code === 0) {
this.$set(this.form, 'MOBILE', data.mobile)
this.$set(this.form, 'ID_CARD', data.idCard)
} else {
this.$message.error(msg);
}
},
initForm () { initForm () {
this.formList.forEach(async item => { this.formList.forEach(async item => {
if (item.optionSourceType === 'remote') { if (item.optionSourceType === 'remote') {
@ -808,17 +883,16 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
.resi-form { .resi-form {
:deep .el-date-editor.el-input, .el-date-editor.el-input__inner { :deep .el-date-editor.el-input,
.el-date-editor.el-input__inner {
width: 100% !important; width: 100% !important;
} }
} }
.resi-cell-value .resi-cell-input { .resi-cell-value .resi-cell-input {
width: 190px; width: 190px;
} }
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
.resi-form .resi-row { .resi-form .resi-row {
margin-bottom: 0; margin-bottom: 0;
} }

5
src/views/modules/base/community/roomDetail.vue

@ -170,11 +170,11 @@ export default {
}, },
async handleTuomin () { async handleTuomin () {
const url = "/gov/org/ichouse/detailByType"; const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
id: this.houseId, id: this.houseId,
type: "house", type: "checkHouse",
}); });
if (code === 0) { if (code === 0) {
@ -184,7 +184,6 @@ export default {
this.$message.error(msg); this.$message.error(msg);
} }
}, },
async loadHouseInfo () { async loadHouseInfo () {

24
src/views/modules/base/community/roomForm.vue

@ -1,12 +1,7 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="false"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<el-form ref="ref_form" <el-form ref="ref_form"
:inline="false" :inline="false"
:model="dataForm" :model="dataForm"
@ -263,23 +258,6 @@ export default {
}, },
async handleTuomin () {
const url = "/gov/org/ichouse/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.houseId,
type: "house",
});
if (code === 0) {
this.$set(this.dataForm, 'ownerPhone', data.mobile)
this.$set(this.dataForm, 'ownerIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
async loadHouseInfo () { async loadHouseInfo () {

78
src/views/modules/base/epidemic/antiInfo.vue

@ -227,7 +227,8 @@
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.epidemic_prevention_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
@ -266,6 +267,14 @@
class="dialog-h" class="dialog-h"
@closed="handleCnalceForm"> @closed="handleCnalceForm">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="btnAuths.epidemic_prevention_view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div class="m-row"> <div class="m-row">
<div class="m-row-info"> <div class="m-row-info">
@ -287,11 +296,11 @@
<div class="m-row-info"> <div class="m-row-info">
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">手机号</span> <span class="info-title-2">手机号</span>
<span>{{ formDetail.mobile||'--' }}</span> <span>{{ formDetail.showMobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">证件号</span> <span class="info-title-2">证件号</span>
<span>{{ formDetail.idCard||'--' }}</span> <span>{{ formDetail.showIdCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">疫苗接种针次</span> <span class="info-title-2">疫苗接种针次</span>
@ -480,6 +489,8 @@ export default {
houseName: '', houseName: '',
mobile: '', mobile: '',
idCard: '', idCard: '',
showMobile: '',
showIdCard: '',
vaccineCount: '', vaccineCount: '',
natCount: '' natCount: ''
}, },
@ -497,6 +508,13 @@ export default {
//form //form
formShow: false, formShow: false,
formTitle: '新增', formTitle: '新增',
selRowId: '',
btnAuths: {
epidemic_prevention_view: false, //
epidemic_prevention_view_real_data: false, //
},
} }
}, },
@ -507,8 +525,7 @@ export default {
}, },
async mounted () { async mounted () {
// this.updateBtnAuths();
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
@ -523,6 +540,33 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
console.log('btns', rot.meta.btns)
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.selRowId,
type: "JMFYXX",
});
if (code === 0) {
this.$set(this.formDetail, 'showMobile', data.mobile)
this.$set(this.formDetail, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
handleAgeChange (val) { handleAgeChange (val) {
console.log('val----age---', val) console.log('val----age---', val)
if (val.start) { if (val.start) {
@ -615,7 +659,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
console.log('获取查询详情成功', res.data)
this.optionsG = res.data this.optionsG = res.data
} }
}) })
@ -635,7 +679,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data this.optionsV = res.data
} }
}) })
@ -652,7 +696,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data this.optionsB = res.data
} }
}) })
@ -669,7 +713,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data this.optionsD = res.data
} }
}) })
@ -684,7 +728,7 @@ export default {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg)
} else { } else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data this.optionsH = res.data
} }
}) })
@ -762,7 +806,7 @@ export default {
async handleDetail (row) { async handleDetail (row) {
this.selRowId = row.id
await this.getDetailInfo(row.id) await this.getDetailInfo(row.id)
await this.getDetailList(row.id) await this.getDetailList(row.id)
this.formTitle = '详情' this.formTitle = '详情'
@ -861,7 +905,10 @@ export default {
}, },
props: { props: {
view_real_data: {//
type: Boolean,
default: false,
}
} }
} }
</script> </script>
@ -885,6 +932,13 @@ export default {
.min-w180 { .min-w180 {
min-width: 170px; min-width: 170px;
} }
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>

54
src/views/modules/base/epidemic/natFocus/natFocusEdit.vue

@ -1,6 +1,12 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="formType==='detail' && view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<el-form v-if="formType !== 'detail'" <el-form v-if="formType !== 'detail'"
ref="ref_form1" ref="ref_form1"
:inline="true" :inline="true"
@ -124,12 +130,12 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">手机号</span> <span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span> <span>{{ formData.showMobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">证件号</span> <span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span> <span>{{ formData.showIdCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -176,6 +182,8 @@ function iniGetFmData () {
name: "", name: "",
idCard: "", idCard: "",
mobile: "", mobile: "",
showIdCard: '',
showMobile: '',
reason: "", reason: "",
remark: "", remark: "",
isSelChannel: false, isSelChannel: false,
@ -190,7 +198,7 @@ export default {
data () { data () {
return { return {
formType: "edit", formType: "edit",
veroId: '',
gridList: [], gridList: [],
btnDisable: false, btnDisable: false,
@ -214,19 +222,38 @@ export default {
destroyed () { }, destroyed () { },
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.veroId,
type: this.fromSource,
});
if (code === 0) {
this.$set(this.formData, 'showMobile', data.mobile)
this.$set(this.formData, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
handleChannelChange (val) { handleChannelChange (val) {
this.formData.content = ""; this.formData.content = "";
}, },
async initForm (formType, row) { async initForm (formType, row) {
this.formType = formType; this.formType = formType;
if (this.formType === 'edit') {
this.$refs["ref_form1"].resetFields(); this.$refs["ref_form1"].resetFields();
}
row.channel = []; row.channel = [];
row.content = ""; row.content = "";
row.attentionType = 2; row.attentionType = 2;
row.isSelChannel = false; row.isSelChannel = false;
this.formData = JSON.parse(JSON.stringify(row)); this.formData = JSON.parse(JSON.stringify(row));
this.veroId = row.id
this.options.isolatedState.forEach(element => { this.options.isolatedState.forEach(element => {
if (this.formData.isolatedState === element.value) { if (this.formData.isolatedState === element.value) {
this.formData.isolatedStateShow = element.label this.formData.isolatedStateShow = element.label
@ -354,10 +381,14 @@ export default {
}, },
}, },
props: { props: {
// serviceList: { view_real_data: {//
// type: Array, type: Boolean,
// default: [] default: false,
// }, },
fromSource: {//
type: String,
default: '',
},
}, },
}; };
</script> </script>
@ -366,6 +397,13 @@ export default {
</style> </style>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/epidemic.scss"; @import "@/assets/scss/modules/management/epidemic.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>

43
src/views/modules/base/epidemic/natFocus/natFocusList.vue

@ -147,14 +147,17 @@
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--add" <el-button v-if="btnAuths.focus_groups_add"
class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button style="float: left" <el-button v-if="btnAuths.focus_groups_import"
style="float: left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload v-if="btnAuths.focus_groups_import"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
@ -169,7 +172,8 @@
class="diy-button--delete">导入</el-button> class="diy-button--delete">导入</el-button>
</el-upload> </el-upload>
<el-button style="float: left; margin-left: 10px" <el-button v-if="btnAuths.focus_groups_export"
style="float: left; margin-left: 10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
@ -277,11 +281,13 @@
align="center" align="center"
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.focus_groups_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="btnAuths.focus_groups_update"
type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
@ -349,6 +355,8 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<nat-focus-edit ref="ref_form_edit" <nat-focus-edit ref="ref_form_edit"
:fromSource="'focusGroupSpecialAttentionQuarantine'"
:view_real_data="btnAuths.focus_groups_view_real_data"
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-focus-edit> @dialogOk="addFormOk"></nat-focus-edit>
</el-dialog> </el-dialog>
@ -468,6 +476,15 @@ export default {
showedPeopleMoreInfo: false, showedPeopleMoreInfo: false,
currentPepeleId: "", currentPepeleId: "",
currentPepeleGridName: "", currentPepeleGridName: "",
btnAuths: {
focus_groups_add: false, //
focus_groups_import: false, //
focus_groups_export: false, //
focus_groups_view: false, //
focus_groups_update: false, //
focus_groups_view_real_data: false, //
},
}; };
}, },
components: { components: {
@ -484,6 +501,8 @@ export default {
}, },
async mounted () { async mounted () {
this.updateBtnAuths();
for (let i = 0; i < 11; i++) { for (let i = 0; i < 11; i++) {
let obj = { let obj = {
value: i + "", value: i + "",
@ -502,6 +521,16 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
async handleWatchPeopleInfo (rowIndex) { async handleWatchPeopleInfo (rowIndex) {
let item = this.tableData[rowIndex]; let item = this.tableData[rowIndex];
this.currentPepeleId = item.userId; this.currentPepeleId = item.userId;
@ -775,6 +804,8 @@ export default {
if (code === 0) { if (code === 0) {
row.mobile = data.mobile; row.mobile = data.mobile;
row.idCard = data.idCard; row.idCard = data.idCard;
row.showMobile = data.showMobile;
row.showIdCard = data.showIdCard;
} }
return row; return row;
}, },

316
src/views/modules/base/epidemic/natFocus/natFocusListHistory.vue

@ -1,79 +1,69 @@
<template> <template>
<div class="div_main"> <div class="div_main">
<div class="div_search"> <div class="div_search">
<el-form <el-form :inline="true"
:inline="true"
:model="formData" :model="formData"
ref="ref_searchform" ref="ref_searchform"
:label-width="'90px'" :label-width="'90px'">
>
<div> <div>
<el-form-item label="姓名" prop="name"> <el-form-item label="姓名"
<el-input prop="name">
v-model="formData.name" <el-input v-model="formData.name"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入姓名" placeholder="请输入姓名">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="手机号" prop="mobile"> <el-form-item label="手机号"
<el-input prop="mobile">
v-model="formData.mobile" <el-input v-model="formData.mobile"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入手机号" placeholder="请输入手机号">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="证件号" prop="mobile"> <el-form-item label="证件号"
<el-input prop="mobile">
v-model="formData.idCard" <el-input v-model="formData.idCard"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入身份证号或护照号" placeholder="请输入身份证号或护照号">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="关注原因" prop="mobile"> <el-form-item label="关注原因"
<el-input prop="mobile">
v-model="formData.reason" <el-input v-model="formData.reason"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入关注原因" placeholder="请输入关注原因">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="隔离状态" prop="isolatedState"> <el-form-item label="隔离状态"
<el-select prop="isolatedState">
v-model="formData.isolatedState" <el-select v-model="formData.isolatedState"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
placeholder="请选择" placeholder="请选择"
clearable clearable>
> <el-option v-for="item in options.isolatedState"
<el-option
v-for="item in options.isolatedState"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="备注" prop="remark"> <el-form-item label="备注"
<el-input prop="remark">
v-model="formData.remark" <el-input v-model="formData.remark"
size="small" size="small"
class="list_item_width_1" class="list_item_width_1"
clearable clearable
placeholder="请输入备注" placeholder="请输入备注">
>
</el-input> </el-input>
</el-form-item> </el-form-item>
</div> </div>
@ -83,103 +73,80 @@
<div class="resi-cell-value"> <div class="resi-cell-value">
<div class="resi-cell-col"> <div class="resi-cell-col">
<el-form-item prop="villageId"> <el-form-item prop="villageId">
<el-select <el-select v-model.trim="formData.villageId"
v-model.trim="formData.villageId"
placeholder="小区" placeholder="小区"
size="small" size="small"
clearable clearable
class="resi-cell-select" class="resi-cell-select"
@change="handleChangeV" @change="handleChangeV">
> <el-option v-for="item in optionsV"
<el-option
v-for="item in optionsV"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="buildId"> <el-form-item prop="buildId">
<el-select <el-select v-model.trim="formData.buildId"
v-model.trim="formData.buildId"
placeholder="楼号" placeholder="楼号"
:disabled="!this.formData.villageId" :disabled="!this.formData.villageId"
size="small" size="small"
clearable clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1" class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeB" @change="handleChangeB">
> <el-option v-for="item in optionsB"
<el-option
v-for="item in optionsB"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="unitId"> <el-form-item prop="unitId">
<el-select <el-select v-model.trim="formData.unitId"
v-model.trim="formData.unitId"
placeholder="单元" placeholder="单元"
size="small" size="small"
:disabled="!this.formData.buildId" :disabled="!this.formData.buildId"
clearable clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1" class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeD" @change="handleChangeD">
> <el-option v-for="item in optionsD"
<el-option
v-for="item in optionsD"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item prop="homeId"> <el-form-item prop="homeId">
<el-select <el-select v-model.trim="formData.homeId"
v-model.trim="formData.homeId"
placeholder="房号" placeholder="房号"
:disabled="!this.formData.unitId" :disabled="!this.formData.unitId"
size="small" size="small"
clearable clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1" class="resi-cell-select resi-cell-select-middle list_item_width_1">
> <el-option v-for="item in optionsH"
<el-option
v-for="item in optionsH"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value">
>
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
</div> </div>
</div> </div>
</el-form-item> </el-form-item>
<el-button <el-button style="margin-left: 30px"
style="margin-left: 30px"
size="small" size="small"
class="diy-button--search" class="diy-button--search"
@click="handleSearch" @click="handleSearch">查询</el-button>
>查询</el-button <el-button style="margin-left: 10px"
>
<el-button
style="margin-left: 10px"
size="small" size="small"
class="diy-button--reset" class="diy-button--reset"
@click="resetSearch" @click="resetSearch">重置</el-button>
>重置</el-button
>
</div> </div>
</el-form> </el-form>
</div> </div>
<div class="div_table"> <div class="div_table">
<el-table <el-table ref="ref_table"
ref="ref_table"
class="table" class="table"
:data="tableData" :data="tableData"
border border
@ -188,30 +155,22 @@
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
@select="handleSelectTable" @select="handleSelectTable"
@select-all="handleSelAll" @select-all="handleSelAll"
style="width: 100%" style="width: 100%">
> <el-table-column label="序号"
<el-table-column
label="序号"
header-align="center" header-align="center"
align="center" align="center"
type="index" type="index"
width="50" width="50"></el-table-column>
></el-table-column>
<el-table-column <el-table-column prop="name"
prop="name"
header-align="center" header-align="center"
align="center" align="center"
label="姓名" label="姓名"
width="90" width="90">
>
<template slot-scope="scope"> <template slot-scope="scope">
<a <a style="cursor: pointer"
style="cursor: pointer"
v-if="scope.row.userId" v-if="scope.row.userId"
@click="handleWatchPeopleInfo(scope.$index)" @click="handleWatchPeopleInfo(scope.$index)">{{ scope.row.name }}</a>
>{{ scope.row.name }}</a
>
<span v-else>{{ scope.row.name }}</span> <span v-else>{{ scope.row.name }}</span>
</template> </template>
</el-table-column> </el-table-column>
@ -233,126 +192,98 @@
> >
</el-table-column> --> </el-table-column> -->
<el-table-column <el-table-column prop="allName"
prop="allName"
header-align="center" header-align="center"
align="center" align="center"
label="所属房屋" label="所属房屋"
min-width="200" min-width="200">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="reason"
prop="reason"
header-align="center" header-align="center"
align="center" align="center"
label="关注原因" label="关注原因"
width="180" width="180">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="isolatedState"
prop="isolatedState"
header-align="center" header-align="center"
align="center" align="center"
label="隔离状态" label="隔离状态"
width="180" width="180">
>
<template slot-scope="scope"> <template slot-scope="scope">
{{ optionsDict.isolatedState[scope.row.isolatedState] || "--" }} {{ optionsDict.isolatedState[scope.row.isolatedState] || "--" }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="lastNatTime"
prop="lastNatTime"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
label="最后一次核酸时间" label="最后一次核酸时间"
width="170" width="170">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="remark"
prop="remark"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
label="备注" label="备注"
min-width="180" min-width="180">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column label="操作"
label="操作"
fixed="right" fixed="right"
width="140" width="140"
header-align="center" header-align="center"
align="center" align="center"
class="operate" class="operate">
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button v-if="btnAuths.focus_groups_his_view"
type="text" type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)" @click="handleDetail(scope.row)">查看</el-button>
>查看</el-button
>
<el-popover <el-popover popper-class="btn-popper"
popper-class="btn-popper"
placement="bottom" placement="bottom"
style="margin-left: 10px" style="margin-left: 10px"
width="20" width="20"
trigger="hover" trigger="hover">
>
<div class="table-more-btn"> <div class="table-more-btn">
<el-button <el-button type="text"
type="text"
class="div-table-button--detail--noline" class="div-table-button--detail--noline"
size="small" size="small"
@click="handleNoticeList(scope.row)" @click="handleNoticeList(scope.row)">通知记录</el-button>
>通知记录</el-button
>
</div> </div>
<div class="table-more-btn"> <div class="table-more-btn">
<el-button <el-button type="text"
type="text"
class="div-table-button--detail--noline" class="div-table-button--detail--noline"
size="small" size="small"
@click="handleVisiteList(scope.row)" @click="handleVisiteList(scope.row)">随访记录</el-button>
>随访记录</el-button
>
</div> </div>
<el-button <el-button type="text"
type="text"
size="small" size="small"
class="div-table-button--more" class="div-table-button--more"
slot="reference" slot="reference">更多<i class="el-icon-caret-bottom"></i></el-button>
>更多<i class="el-icon-caret-bottom"></i
></el-button>
</el-popover> </el-popover>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination <el-pagination @size-change="handleSizeChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="pageNo" :current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="pageSize" :page-size="pageSize"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total">
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
<!-- 新增弹出框 --> <!-- 新增弹出框 -->
<el-dialog <el-dialog :visible.sync="addFormShow"
:visible.sync="addFormShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:destroy-on-close="true" :destroy-on-close="true"
@ -360,87 +291,68 @@
width="1050px" width="1050px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose" @closed="diaClose">
> <nat-focus-add ref="ref_form_add"
<nat-focus-add
ref="ref_form_add"
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk" @dialogOk="addFormOk"></nat-focus-add>
></nat-focus-add>
</el-dialog> </el-dialog>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="editFormShow"
:visible.sync="editFormShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="editFormTitle" :title="editFormTitle"
width="1050px" width="1050px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose" @closed="diaClose">
> <nat-focus-edit ref="ref_form_edit"
<nat-focus-edit :fromSource="'focusGroupSpecialAttentionHistory'"
ref="ref_form_edit" :view_real_data="btnAuths.focus_groups_his_view_real_data"
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk" @dialogOk="addFormOk"></nat-focus-edit>
></nat-focus-edit>
</el-dialog> </el-dialog>
<!-- 发送通知弹出框 --> <!-- 发送通知弹出框 -->
<el-dialog <el-dialog :visible.sync="sendNoticeFormShow"
:visible.sync="sendNoticeFormShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="发送通知" title="发送通知"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose" @closed="diaClose">
> <nf-send-notice ref="ref_sendnotice"
<nf-send-notice
ref="ref_sendnotice"
@dialogOk="sendNoticeOk" @dialogOk="sendNoticeOk"
@dialogCancle="diaClose" @dialogCancle="diaClose"></nf-send-notice>
></nf-send-notice>
</el-dialog> </el-dialog>
<!-- 通知记录弹出框 --> <!-- 通知记录弹出框 -->
<el-dialog <el-dialog :visible.sync="noticeListFormShow"
:visible.sync="noticeListFormShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="通知记录" title="通知记录"
width="1050px" width="1050px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose" @closed="diaClose">
> <nf-notice-list ref="ref_noticelist"
<nf-notice-list @dialogCancle="diaClose"></nf-notice-list>
ref="ref_noticelist"
@dialogCancle="diaClose"
></nf-notice-list>
</el-dialog> </el-dialog>
<!-- 随访记录弹出框 --> <!-- 随访记录弹出框 -->
<el-dialog <el-dialog :visible.sync="visiteListFormShow"
:visible.sync="visiteListFormShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="随访记录" title="随访记录"
width="1050px" width="1050px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose" @closed="diaClose">
> <nf-visite-list ref="ref_visitelist"
<nf-visite-list @dialogCancle="diaClose"></nf-visite-list>
ref="ref_visitelist"
@dialogCancle="diaClose"
></nf-visite-list>
</el-dialog> </el-dialog>
<people-more <people-more v-if="showedPeopleMoreInfo && currentPepeleId"
v-if="showedPeopleMoreInfo && currentPepeleId"
:userId="currentPepeleId" :userId="currentPepeleId"
:gridName="currentPepeleGridName" :gridName="currentPepeleGridName"
@close="showedPeopleMoreInfo = false" @close="showedPeopleMoreInfo = false" />
/>
</div> </div>
</template> </template>
@ -515,6 +427,12 @@ export default {
showedPeopleMoreInfo: false, showedPeopleMoreInfo: false,
currentPepeleId: "", currentPepeleId: "",
currentPepeleGridName: "", currentPepeleGridName: "",
btnAuths: {
focus_groups_his_view: false, //
focus_groups_his_view_real_data: false, //
},
}; };
}, },
components: { components: {
@ -531,6 +449,8 @@ export default {
}, },
async mounted () { async mounted () {
this.updateBtnAuths();
for (let i = 0; i < 11; i++) { for (let i = 0; i < 11; i++) {
let obj = { let obj = {
value: i + "", value: i + "",
@ -549,6 +469,16 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
async handleWatchPeopleInfo (rowIndex) { async handleWatchPeopleInfo (rowIndex) {
let item = this.tableData[rowIndex]; let item = this.tableData[rowIndex];
this.currentPepeleId = item.userId; this.currentPepeleId = item.userId;
@ -822,6 +752,8 @@ export default {
if (code === 0) { if (code === 0) {
row.mobile = data.mobile; row.mobile = data.mobile;
row.idCard = data.idCard; row.idCard = data.idCard;
row.showMobile = data.showMobile;
row.showIdCard = data.showIdCard;
} }
return row; return row;
}, },

41
src/views/modules/base/epidemic/natInfo/natDetail.vue

@ -1,6 +1,13 @@
<template> <template>
<div class="epidemic-form"> <div class="epidemic-form">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div v-if="initLoading" <div v-if="initLoading"
class="m-row"> class="m-row">
<div class="m-info"> <div class="m-info">
@ -11,12 +18,12 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">手机号</span> <span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span> <span>{{ formData.showMobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">证件号</span> <span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span> <span>{{ formData.showIdCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -90,7 +97,22 @@ export default {
}, },
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.icNatId,
type: "natRecord",
});
if (code === 0) {
this.$set(this.formData, 'showMobile', data.mobile)
this.$set(this.formData, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
async initForm (icNatId) { async initForm (icNatId) {
this.startLoading() this.startLoading()
@ -178,17 +200,24 @@ export default {
}, },
props: { props: {
// serviceList: { view_real_data: {//
// type: Array, type: Boolean,
// default: [] default: false,
// },
} }
},
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss"; @import "@/assets/scss/modules/management/detail-main.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>

54
src/views/modules/base/epidemic/natInfo/natList.vue

@ -111,15 +111,18 @@
</div> </div>
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--add" <el-button v-if="btnAuths.ic_nat_add"
class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button style="float:left" <el-button v-if="btnAuths.ic_nat_import"
style="float:left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload v-if="btnAuths.ic_nat_import"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -134,10 +137,16 @@
class="diy-button--delete">导入</el-button> class="diy-button--delete">导入</el-button>
</el-upload> </el-upload>
<el-button style="float:left;margin-left:10px" <el-button v-if="btnAuths.ic_nat_export"
style="float:left;margin-left:10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
<el-button style="float:left;margin-left:10px"
class="diy-button--export"
size="small"
@click="handleTiming()">定时</el-button>
</div> </div>
<el-table class="table" <el-table class="table"
@ -216,14 +225,11 @@
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.ic_nat_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleTiming(scope.row)">定时</el-button>
<el-button v-if="!isResiUser" <el-button v-if="!isResiUser"
type="text" type="text"
@ -231,13 +237,13 @@
size="small" size="small"
@click="handleAttention(scope.row)">同步</el-button> @click="handleAttention(scope.row)">同步</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId" <el-button v-if="btnAuths.ic_nat_update&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId" <el-button v-if="btnAuths.ic_nat_del&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--delete " class="div-table-button--delete "
size="small" size="small"
@ -277,7 +283,7 @@
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-form> @dialogOk="addFormOk"></nat-form>
</el-dialog> </el-dialog>
<!-- 修改弹出框 --> <!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow" <el-dialog :visible.sync="detailShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -287,6 +293,7 @@
class="dialog-h" class="dialog-h"
@closed="diaDetailClose"> @closed="diaDetailClose">
<nat-detail ref="ref_detail" <nat-detail ref="ref_detail"
:view_real_data="btnAuths.ic_nat_view_real_data"
@dialogCancle="diaDetailClose"></nat-detail> @dialogCancle="diaDetailClose"></nat-detail>
</el-dialog> </el-dialog>
@ -357,6 +364,16 @@ export default {
detailShow: false, detailShow: false,
formTitle: '新增', formTitle: '新增',
btnAuths: {
ic_nat_add: false, //
ic_nat_import: false, //
ic_nat_export: false, //
ic_nat_del: false, //
ic_nat_view: false, //
ic_nat_update: false, //
ic_nat_view_real_data: false, //
},
} }
}, },
components: { components: {
@ -366,8 +383,7 @@ export default {
}, },
async mounted () { async mounted () {
// this.updateBtnAuths();
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
@ -381,7 +397,15 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
async handleSearch () { async handleSearch () {
this.isResiUser = this.formData.orgType === 'current' this.isResiUser = this.formData.orgType === 'current'

47
src/views/modules/base/epidemic/natInfo/noNatDetail.vue

@ -1,6 +1,13 @@
<template> <template>
<div class="epidemic-form"> <div class="epidemic-form">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div v-if="initLoading" <div v-if="initLoading"
class="m-row"> class="m-row">
<div class="m-info"> <div class="m-info">
@ -11,12 +18,12 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">联系方式</span> <span class="info-title-2">联系方式</span>
<span>{{ formData.realMobile||'--' }}</span> <span>{{ formData.mobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">证件号</span> <span class="info-title-2">证件号</span>
<span>{{ formData.realIdCard||'--' }}</span> <span>{{ formData.idCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -79,8 +86,6 @@ export default {
icNatId: '', icNatId: '',
formData: {}, formData: {},
} }
}, },
components: {}, components: {},
@ -91,16 +96,29 @@ export default {
}, },
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.icNatId,
type: "noNatCompare",
});
if (code === 0) {
this.$set(this.formData, 'mobile', data.mobile)
this.$set(this.formData, 'idCard', data.idCard)
} else {
this.$message.error(msg);
}
},
async initForm (row) { async initForm (row) {
this.startLoading() this.startLoading()
// this.formData.agencyId = this.agencyId // this.formData.agencyId = this.agencyId
this.formData = JSON.parse(JSON.stringify(row)) this.formData = JSON.parse(JSON.stringify(row))
// this.icNatId = icNatId this.icNatId = row.recordId
// this.formData.icNatId = icNatId
// await this.loadFormData()
this.initLoading = true this.initLoading = true
this.endLoading() this.endLoading()
@ -163,17 +181,24 @@ export default {
}, },
props: { props: {
// serviceList: { view_real_data: {//
// type: Array, type: Boolean,
// default: [] default: true,
// },
} }
},
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss"; @import "@/assets/scss/modules/management/detail-main.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>

37
src/views/modules/base/epidemic/natInfo/noNatList.vue

@ -83,11 +83,13 @@
size="small" size="small"
@click="handleAdd">新增</el-button> --> @click="handleAdd">新增</el-button> -->
<el-button style="float:left" <el-button v-if="btnAuths.nat_compare_rec_import"
style="float:left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload v-if="btnAuths.nat_compare_rec_import"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -102,7 +104,8 @@
class="diy-button--delete">导入</el-button> class="diy-button--delete">导入</el-button>
</el-upload> </el-upload>
<el-button style="float:left;margin-left:10px" <el-button v-if="btnAuths.nat_compare_rec_export"
style="float:left;margin-left:10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
@ -190,7 +193,8 @@
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.nat_compare_rec_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
@ -223,7 +227,7 @@
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk"></nat-form> @dialogOk="addFormOk"></nat-form>
</el-dialog> </el-dialog>
<!-- 修改弹出框 --> <!-- 详情弹出框 -->
<el-dialog :visible.sync="detailShow" <el-dialog :visible.sync="detailShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
@ -233,6 +237,7 @@
class="dialog-h" class="dialog-h"
@closed="diaDetailClose"> @closed="diaDetailClose">
<no-nat-detail ref="ref_detail" <no-nat-detail ref="ref_detail"
:view_real_data="btnAuths.nat_compare_rec_view_real_data"
@dialogCancle="diaDetailClose"></no-nat-detail> @dialogCancle="diaDetailClose"></no-nat-detail>
</el-dialog> </el-dialog>
@ -287,7 +292,14 @@ export default {
detailShow: false, detailShow: false,
formTitle: '新增', formTitle: '新增',
sHeight: 0 sHeight: 0,
btnAuths: {
nat_compare_rec_import: false, //
nat_compare_rec_export: false, //
nat_compare_rec_view: false, //
nat_compare_rec_view_real_data: false, //
},
} }
}, },
@ -298,7 +310,8 @@ export default {
}, },
async mounted () { async mounted () {
// this.updateBtnAuths();
const { user } = this.$store.state const { user } = this.$store.state
this.agencyId = user.agencyId this.agencyId = user.agencyId
@ -311,7 +324,15 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
async handleSearch () { async handleSearch () {
await this.loadTable() await this.loadTable()

47
src/views/modules/base/epidemic/travel.vue

@ -82,14 +82,17 @@
</div> </div>
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--add" <el-button v-if="btnAuths.tripreport_add"
class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button class="diy-button--export" <el-button v-if="btnAuths.tripreport_import"
class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload v-if="btnAuths.tripreport_import"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
:multiple='false' :multiple='false'
:show-file-list='false' :show-file-list='false'
@ -105,7 +108,8 @@
:loading="importLoading">{{importBtnTitle}}</el-button> :loading="importLoading">{{importBtnTitle}}</el-button>
</el-upload> </el-upload>
<el-button style="margin-left:10px" <el-button v-if="btnAuths.tripreport_export"
style="margin-left:10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
:loading="exportBtn" :loading="exportBtn"
@ -218,12 +222,14 @@
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.tripreport_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<!-- v-if="scope.row.userType != 'resi'" --> <!-- v-if="scope.row.userType != 'resi'" -->
<el-button type="text" <el-button v-if="btnAuths.tripreport_update"
type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
@ -280,7 +286,8 @@
@click="handleVisiteList(scope.row) ">随访记录</el-button> @click="handleVisiteList(scope.row) ">随访记录</el-button>
</el-dropdown-item> </el-dropdown-item>
<el-dropdown-item> <el-dropdown-item>
<el-button type="text" <el-button v-if="btnAuths.tripreport_del"
type="text"
class="div-table-button--delete--noline " class="div-table-button--delete--noline "
size="small" size="small"
@click="handleDelete(scope.row)">删除</el-button> @click="handleDelete(scope.row)">删除</el-button>
@ -327,6 +334,7 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<travel-detail v-if="detailShow" <travel-detail v-if="detailShow"
:view_real_data="btnAuths.tripreport_view_real_data"
@dialogCancle="addFormCancle" @dialogCancle="addFormCancle"
ref="ref_detail"></travel-detail> ref="ref_detail"></travel-detail>
</el-dialog> </el-dialog>
@ -422,7 +430,17 @@ export default {
lazy: true, lazy: true,
checkStrictly: true, checkStrictly: true,
lazyLoad: this.lzayLoadArea lazyLoad: this.lzayLoadArea
} },
btnAuths: {
tripreport_add: false, //
tripreport_import: false, //
tripreport_export: false, //
tripreport_del: false, //
tripreport_view: false, //
tripreport_update: false, //
tripreport_view_real_data: false, //
},
} }
}, },
@ -437,8 +455,7 @@ export default {
}, },
async mounted () { async mounted () {
// this.updateBtnAuths();
const { user } = this.$store.state const { user } = this.$store.state
console.log('user-----', user) console.log('user-----', user)
@ -450,6 +467,16 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
lzayLoadArea (node, resolve) { lzayLoadArea (node, resolve) {
this.getArea(node, resolve) this.getArea(node, resolve)
// setTimeout(() => { // setTimeout(() => {

49
src/views/modules/base/epidemic/travelDetail.vue

@ -2,6 +2,12 @@
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div v-if="initLoading" <div v-if="initLoading"
class="m-row"> class="m-row">
<div class="m-info"> <div class="m-info">
@ -12,12 +18,12 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-4">手机号</span> <span class="info-title-4">手机号</span>
<span>{{ formData.mobile||'--' }}</span> <span>{{ formData.showMobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-4">证件号</span> <span class="info-title-4">证件号</span>
<span>{{ formData.idCard||'--' }}</span> <span>{{ formData.showIdCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -92,13 +98,35 @@ export default {
destroyed () { destroyed () {
this.nowAllCode = [] this.nowAllCode = []
}, },
props: {
view_real_data: {//
type: Boolean,
default: false,
}
},
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.icNatId,
type: "routeFollow",
});
if (code === 0) {
this.$set(this.formData, 'showMobile', data.mobile)
this.$set(this.formData, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
async initForm (row) { async initForm (row) {
console.log('row----', row) console.log('row----', row)
this.formData.agencyId = this.agencyId this.formData.agencyId = this.agencyId
this.icNatId = row.id
await this.loadFormData(row.id) await this.loadFormData(row.id)
this.initLoading = true this.initLoading = true
@ -184,13 +212,7 @@ export default {
} }
}, },
async handleSelPerson (personItem) {
this.formData.userId = personItem.demandUserId
this.formData.name = personItem.demandUserName
this.formData.mobile = personItem.demandUserMobile
this.formData.idCard = personItem.idCard
this.handleSelAddress(personItem.houseId)
},
async loadFormData (id) { async loadFormData (id) {
@ -242,6 +264,13 @@ export default {
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss"; @import "@/assets/scss/modules/management/detail-main.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>

42
src/views/modules/base/epidemic/vaccin.vue

@ -92,15 +92,18 @@
</div> </div>
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--add" <el-button v-if="btnAuths.vaccine_add"
class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button style="float: left" <el-button v-if="btnAuths.vaccine_import"
style="float: left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload v-if="btnAuths.vaccine_import"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
@ -115,7 +118,8 @@
class="diy-button--delete">导入</el-button> class="diy-button--delete">导入</el-button>
</el-upload> </el-upload>
<el-button style="float: left; margin-left: 10px" <el-button v-if="btnAuths.vaccine_export"
style="float: left; margin-left: 10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
@ -189,7 +193,8 @@
align="center" align="center"
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.vaccine_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
@ -199,13 +204,13 @@
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleAttention(scope.row)">同步</el-button> @click="handleAttention(scope.row)">同步</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId" <el-button v-if="btnAuths.vaccine_update&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
<el-button v-if="isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId" <el-button v-if="btnAuths.vaccine_del&&isResiUser&&(scope.row.userType==='resi'||scope.row.userType==='icresi') &&scope.row.agencyId===agencyId"
type="text" type="text"
class="div-table-button--delete " class="div-table-button--delete "
size="small" size="small"
@ -244,6 +249,7 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<vaccinForm ref="ref_form" <vaccinForm ref="ref_form"
:view_real_data="btnAuths.vaccine_view_real_data"
@dialogCancle="diaClose"></vaccinForm> @dialogCancle="diaClose"></vaccinForm>
</el-dialog> </el-dialog>
<el-dialog :visible.sync="addFormShow" <el-dialog :visible.sync="addFormShow"
@ -321,6 +327,15 @@ export default {
formTitle: "新增", formTitle: "新增",
addFormShow: false, addFormShow: false,
btnAuths: {
vaccine_add: false, //
vaccine_import: false, //
vaccine_export: false, //
vaccine_del: false, //
vaccine_view: false, //
vaccine_update: false, //
vaccine_view_real_data: false, //
},
}; };
}, },
components: { components: {
@ -330,7 +345,7 @@ export default {
}, },
async created () { }, async created () { },
async mounted () { async mounted () {
// this.updateBtnAuths();
const { user } = this.$store.state; const { user } = this.$store.state;
this.agencyId = user.agencyId; this.agencyId = user.agencyId;
@ -342,6 +357,15 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
async handleSearch () { async handleSearch () {
this.isResiUser = this.formData.searchType === "current"; this.isResiUser = this.formData.searchType === "current";
@ -447,6 +471,8 @@ export default {
if (code === 0) { if (code === 0) {
row.mobile = data.mobile; row.mobile = data.mobile;
row.idCard = data.idCard; row.idCard = data.idCard;
row.showMobile = data.showMobile;
row.showIdCard = data.showIdCard;
row.isResiUser = data.isResiUser row.isResiUser = data.isResiUser
} }
return row; return row;

53
src/views/modules/base/epidemic/vaccinForm.vue

@ -1,6 +1,13 @@
<template> <template>
<div> <div>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<div v-if="initLoading" <div v-if="initLoading"
class="m-row"> class="m-row">
<div class="m-info"> <div class="m-info">
@ -11,12 +18,12 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">手机号</span> <span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span> <span>{{ formData.showMobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">证件号</span> <span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span> <span>{{ formData.showIdCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -57,6 +64,7 @@ export default {
data () { data () {
return { return {
initLoading: false, initLoading: false,
vaccineId: '',
formData: { formData: {
agencyId: '',//Id agencyId: '',//Id
userId: '',//idicResiUserId userId: '',//idicResiUserId
@ -64,13 +72,13 @@ export default {
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
showIdCard: '',
showMobile: '',
inoculateTime: '', inoculateTime: '',
inoculateAddress: '', inoculateAddress: '',
manufacturer: '' manufacturer: ''
}, },
} }
}, },
components: {}, components: {},
@ -81,6 +89,22 @@ export default {
}, },
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.vaccineId,
type: "vaccinationRecord",
});
if (code === 0) {
this.$set(this.formData, 'showMobile', data.mobile)
this.$set(this.formData, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
handleChannelChange (val) { handleChannelChange (val) {
this.formData.content = '' this.formData.content = ''
}, },
@ -89,6 +113,7 @@ export default {
this.formData = { ...row } this.formData = { ...row }
this.vaccineId = row.vaccineId
// this.endLoading() // this.endLoading()
console.log('formData----', this.formData) console.log('formData----', this.formData)
this.initLoading = true this.initLoading = true
@ -166,6 +191,8 @@ export default {
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
showIdCard: '',
showMobile: '',
natTime: '', natTime: '',
natAddress: '', natAddress: '',
natResult: '', natResult: '',
@ -199,20 +226,24 @@ export default {
}, },
props: { props: {
view_real_data: {//
type: Boolean,
default: false,
// serviceList: {
// type: Array,
// default: []
// },
} }
},
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@import "@/assets/scss/modules/management/detail-main.scss"; @import "@/assets/scss/modules/management/detail-main.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>

52
src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue

@ -2,6 +2,12 @@
<div class="epidemic-form"> <div class="epidemic-form">
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<div v-if="formType==='detail' && view_real_data"
class="div_tuomin">
<el-button size="mini"
class="diy-button--search"
@click="handleTuomin">显示脱敏信息</el-button>
</div>
<el-form v-if="formType !== 'detail'" <el-form v-if="formType !== 'detail'"
ref="ref_form1" ref="ref_form1"
:inline="true" :inline="true"
@ -113,12 +119,12 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">手机号</span> <span class="info-title-2">手机号</span>
<span>{{ formData.mobile||'--' }}</span> <span>{{ formData.showMobile||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">证件号</span> <span class="info-title-2">证件号</span>
<span>{{ formData.idCard||'--' }}</span> <span>{{ formData.showIdCard||'--' }}</span>
</div> </div>
<div class="info-prop"> <div class="info-prop">
@ -162,7 +168,7 @@ export default {
return { return {
formType: "edit", formType: "edit",
veroId: '',
gridList: [], gridList: [],
btnDisable: false, btnDisable: false,
@ -172,6 +178,8 @@ export default {
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
showIdCard: '',
showMobile: '',
remark: '', remark: '',
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
@ -187,6 +195,22 @@ export default {
}, },
methods: { methods: {
async handleTuomin () {
const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, {
id: this.veroId,
type: "vaccineSpecialAttention",
});
if (code === 0) {
this.$set(this.formData, 'showMobile', data.mobile)
this.$set(this.formData, 'showIdCard', data.idCard)
} else {
this.$message.error(msg);
}
},
handleChannelChange (val) { handleChannelChange (val) {
this.formData.content = '' this.formData.content = ''
}, },
@ -199,7 +223,7 @@ export default {
row.attentionType = 1 row.attentionType = 1
row.isSelChannel = false row.isSelChannel = false
this.formData = JSON.parse(JSON.stringify(row)) this.formData = JSON.parse(JSON.stringify(row))
this.veroId = row.id
}, },
@ -261,6 +285,8 @@ export default {
name: '', name: '',
idCard: '', idCard: '',
mobile: '', mobile: '',
showIdCard: '',
showMobile: '',
remark: '', remark: '',
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
@ -330,14 +356,11 @@ export default {
}, },
props: { props: {
view_real_data: {//
type: Boolean,
default: false,
// serviceList: {
// type: Array,
// default: []
// },
} }
},
} }
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>
@ -346,6 +369,13 @@ export default {
<style lang="scss" scoped > <style lang="scss" scoped >
@import "@/assets/scss/modules/management/epidemic.scss"; @import "@/assets/scss/modules/management/epidemic.scss";
.div_tuomin {
position: absolute;
top: 0;
right: 40px;
z-index: 1000;
}
</style> </style>

42
src/views/modules/base/epidemic/veroFocus/veroFocusList.vue

@ -136,15 +136,18 @@
</div> </div>
<div class="div_table"> <div class="div_table">
<div class="div_btn"> <div class="div_btn">
<el-button class="diy-button--add" <el-button v-if="btnAuths.special_attention_add"
class="diy-button--add"
size="small" size="small"
@click="handleAdd">新增</el-button> @click="handleAdd">新增</el-button>
<el-button style="float: left" <el-button v-if="btnAuths.special_attention_import"
style="float: left"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule">下载模板</el-button> @click="handleExportModule">下载模板</el-button>
<el-upload :headers="$getElUploadHeaders()" <el-upload v-if="btnAuths.special_attention_import"
:headers="$getElUploadHeaders()"
ref="upload" ref="upload"
:multiple="false" :multiple="false"
:show-file-list="false" :show-file-list="false"
@ -159,7 +162,8 @@
class="diy-button--delete">导入</el-button> class="diy-button--delete">导入</el-button>
</el-upload> </el-upload>
<el-button style="float: left; margin-left: 10px" <el-button v-if="btnAuths.special_attention_export"
style="float: left; margin-left: 10px"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="handleExport">导出</el-button> @click="handleExport">导出</el-button>
@ -251,11 +255,13 @@
align="center" align="center"
class="operate"> class="operate">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button v-if="btnAuths.special_attention_view"
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleDetail(scope.row)">查看</el-button> @click="handleDetail(scope.row)">查看</el-button>
<el-button type="text" <el-button v-if="btnAuths.special_attention_update"
type="text"
class="div-table-button--edit" class="div-table-button--edit"
size="small" size="small"
@click="handleEdit(scope.row)">修改</el-button> @click="handleEdit(scope.row)">修改</el-button>
@ -323,6 +329,7 @@
class="dialog-h" class="dialog-h"
@closed="diaClose"> @closed="diaClose">
<vero-focus-edit ref="ref_form_edit" <vero-focus-edit ref="ref_form_edit"
:view_real_data="btnAuths.special_attention_view_real_data"
@dialogCancle="diaClose" @dialogCancle="diaClose"
@dialogOk="addFormOk"></vero-focus-edit> @dialogOk="addFormOk"></vero-focus-edit>
</el-dialog> </el-dialog>
@ -419,6 +426,15 @@ export default {
noticeListFormShow: false, noticeListFormShow: false,
visiteListFormShow: false, visiteListFormShow: false,
editFormTitle: "修改疫苗接种关注名单", editFormTitle: "修改疫苗接种关注名单",
btnAuths: {
special_attention_add: false, //
special_attention_import: false, //
special_attention_export: false, //
special_attention_view: false, //
special_attention_update: false, //
special_attention_view_real_data: false, //
},
}; };
}, },
components: { components: {
@ -433,6 +449,8 @@ export default {
this.$refs["ref_table"].doLayout(); this.$refs["ref_table"].doLayout();
}, },
async mounted () { async mounted () {
this.updateBtnAuths();
const { user } = this.$store.state; const { user } = this.$store.state;
this.agencyId = user.agencyId; this.agencyId = user.agencyId;
for (let i = 0; i < 11; i++) { for (let i = 0; i < 11; i++) {
@ -447,6 +465,16 @@ export default {
}, },
methods: { methods: {
//
updateBtnAuths () {
let rot = this.$route;
if (Array.isArray(rot.meta.btns)) {
rot.meta.btns.forEach((item) => {
this.btnAuths[item.permissions] = true;
});
}
},
handleSearch () { handleSearch () {
this.selectionAll = []; this.selectionAll = [];
this.loadTable(); this.loadTable();
@ -696,6 +724,8 @@ export default {
if (code === 0) { if (code === 0) {
row.mobile = data.mobile; row.mobile = data.mobile;
row.idCard = data.idCard; row.idCard = data.idCard;
row.showMobile = data.showMobile;
row.showIdCard = data.showIdCard;
} }
return row; return row;
}, },

274
src/views/modules/base/resi.vue

@ -1,74 +1,63 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card class="resi-card"> <el-card class="resi-card">
<el-collapse v-if="openSearch" v-model="activeNames"> <el-collapse v-if="openSearch"
<el-collapse-item v-model="activeNames">
v-for="item in searchList" <el-collapse-item v-for="item in searchList"
:key="item.itemGroupId" :key="item.itemGroupId"
:name="item.itemGroupId" :name="item.itemGroupId">
>
<template slot="title"> <template slot="title">
<div class="collapse-title">{{ item.groupName }}</div> <div class="collapse-title">{{ item.groupName }}</div>
</template> </template>
<resi-search <resi-search v-if="searchList.length > 0"
v-if="searchList.length > 0"
:ref="'resiSearch' + item.itemGroupId" :ref="'resiSearch' + item.itemGroupId"
:form-list="item.queryItemList" :form-list="item.queryItemList"
:column-name="defaultCategotyKey" :column-name="defaultCategotyKey"
:show-grid="item.groupName == '基础信息'" :show-grid="item.groupName == '基础信息'" />
/>
</el-collapse-item> </el-collapse-item>
</el-collapse> </el-collapse>
<template v-else> <template v-else>
<resi-search <resi-search v-if="searchList.length > 0"
v-if="searchList.length > 0"
ref="resiSearch" ref="resiSearch"
:form-list="searchList[0].queryItemList" :form-list="searchList[0].queryItemList"
:column-name="defaultCategotyKey" :column-name="defaultCategotyKey"
:show-grid="true" :show-grid="true"
:is-arrow="true" :is-arrow="true"
@search="handleSearch" @search="handleSearch" />
/>
</template> </template>
<el-row v-if="openSearch" class="resi-search"> <el-row v-if="openSearch"
class="resi-search">
<!-- <el-col :span="20"> <!-- <el-col :span="20">
<el-button type="primary" size="mini">查询</el-button> <el-button type="primary" size="mini">查询</el-button>
</el-col> --> </el-col> -->
<el-col :span="24"> <el-col :span="24">
<el-button type="primary" size="small" @click="handleSearchFrom" <el-button type="primary"
>查询</el-button size="small"
> @click="handleSearchFrom">查询</el-button>
<el-button <el-button class="diy-button--reset"
class="diy-button--reset"
size="small" size="small"
@click="resetSearchForm" @click="resetSearchForm">重置</el-button>
>重置</el-button
>
</el-col> </el-col>
</el-row> </el-row>
<div class="resi-down" @click="handleOpenSearch"> <div class="resi-down"
<img v-if="openSearch" src="../../../assets/img/arrow-up.png" /> @click="handleOpenSearch">
<img v-else src="../../../assets/img/arrow-down.png" /> <img v-if="openSearch"
src="../../../assets/img/arrow-up.png" />
<img v-else
src="../../../assets/img/arrow-down.png" />
</div> </div>
</el-card> </el-card>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button <el-button v-if="btnAuths.ic_resi_add"
v-if="btnAuths.ic_resi_add"
size="small" size="small"
class="diy-button--add" class="diy-button--add"
@click="handleAdd" @click="handleAdd">新增</el-button>
>新增</el-button <el-button v-if="btnAuths.ic_resi_import"
>
<el-button
v-if="btnAuths.ic_resi_import"
class="diy-button--export" class="diy-button--export"
size="small" size="small"
@click="handleExportModule('room')" @click="handleExportModule('room')">下载模板</el-button>
>下载模板</el-button <el-upload v-if="btnAuths.ic_resi_import"
>
<el-upload
v-if="btnAuths.ic_resi_import"
:headers="$getElUploadHeaders()" :headers="$getElUploadHeaders()"
ref="upload" ref="upload"
class="upload-demo" class="upload-demo"
@ -81,46 +70,32 @@
:on-progress="handleProgress" :on-progress="handleProgress"
:on-success="handleExcelSuccess" :on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload" :before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest" :http-request="uploadHttpRequest">
> <el-button size="small"
<el-button
size="small"
class="diy-button--delete" class="diy-button--delete"
:loading="importLoading" :loading="importLoading">{{ importBtnTitle }}</el-button>
>{{ importBtnTitle }}</el-button
>
</el-upload> </el-upload>
<!-- <el-button size="small" <!-- <el-button size="small"
class="diy-button--reset" class="diy-button--reset"
:loading="exportBtn" :loading="exportBtn"
@click="handleExport">{{exportBtnTitle}}</el-button> --> @click="handleExport">{{exportBtnTitle}}</el-button> -->
<el-button <el-button v-if="btnAuths.ic_resi_export"
v-if="btnAuths.ic_resi_export"
class="diy-button--reset" class="diy-button--reset"
size="small" size="small"
@click="diyExport" @click="diyExport">导出</el-button>
>导出</el-button <el-button v-if="btnAuths.ic_resi_batch_del"
>
<el-button
v-if="btnAuths.ic_resi_batch_del"
class="diy-button--add" class="diy-button--add"
size="small" size="small"
@click="deleteBatch" @click="deleteBatch">批量删除</el-button>
>批量删除</el-button
>
<!-- <el-button type="primary" size="small">下载人口模板</el-button> --> <!-- <el-button type="primary" size="small">下载人口模板</el-button> -->
<el-button <el-button size="small"
size="small"
v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn" v-if="btnAuths.ic_resi_smart_import && displayedBaobiaoBtn"
class="diy-button--add" class="diy-button--add"
@click="reportForm" @click="reportForm">智能填报</el-button>
>智能填报</el-button
>
</div> </div>
<el-table <el-table ref="ref_table"
ref="ref_table"
:data="tableData" :data="tableData"
v-loading="tableLoading" v-loading="tableLoading"
border border
@ -128,46 +103,40 @@
class="resi-table" class="resi-table"
:height="tableHeight" :height="tableHeight"
@select-all="selectAll" @select-all="selectAll"
@selection-change="selectionChange" @selection-change="selectionChange">
> <el-table-column type="selection"
<el-table-column
type="selection"
fixed="left" fixed="left"
align="center" align="center"
:selectable="checkSelect" :selectable="checkSelect"
width="55" width="55" />
/> <el-table-column label="序号"
<el-table-column
label="序号"
type="index" type="index"
fixed="left" fixed="left"
align="center" align="center"
width="50" width="50">
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column v-for="item in tableHeader"
v-for="item in tableHeader"
:key="item.columnName" :key="item.columnName"
:prop="item.columnName" :prop="item.columnName"
:label="item.label" :label="item.label"
align="center" align="center"
:fixed="item.columnName == 'NAME' ? 'left' : false" :fixed="item.columnName == 'NAME' ? 'left' : false"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
:width="item.width || computedWidth(item.label, item.itemType)" :width="item.width || computedWidth(item.label, item.itemType)">
>
<!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" --> <!-- :width="item.itemType === 'radio' ? computedWidth(item.label) : 180" -->
<template slot-scope="scope"> <template slot-scope="scope">
<a <a v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
v-if="item.columnName == 'NAME' && btnAuths.ic_resi_view"
class="name-a" class="name-a"
@click="handleLook(scope.row)" @click="handleLook(scope.row)">
>
{{ handleFilterSpan(scope.row, item) }} {{ handleFilterSpan(scope.row, item) }}
</a> </a>
<span v-else>{{ handleFilterSpan(scope.row, item) }}</span> <span v-else>{{ handleFilterSpan(scope.row, item) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column fixed="right" label="操作" align="center" width="150"> <el-table-column fixed="right"
label="操作"
align="center"
width="150">
<template slot-scope="scope"> <template slot-scope="scope">
<!-- <el-button @click="handleLook(scope.row)" <!-- <el-button @click="handleLook(scope.row)"
type="text" type="text"
@ -177,28 +146,20 @@
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">变动</el-button> --> class="div-table-button--detail">变动</el-button> -->
<el-button <el-button v-if="btnAuths.ic_resi_change_rec"
v-if="btnAuths.ic_resi_change_rec"
@click="handleChangeRecord(scope.row)" @click="handleChangeRecord(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail" class="div-table-button--detail">变更记录</el-button>
>变更记录</el-button
>
<template v-if="filterEdit(scope.row.ORG_ID)"> <template v-if="filterEdit(scope.row.ORG_ID)">
<el-button <el-button v-if="btnAuths.ic_resi_update"
v-if="btnAuths.ic_resi_update"
@click="handleEdit(scope.row)" @click="handleEdit(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit" class="div-table-button--edit">修改</el-button>
>修改</el-button <el-popconfirm v-if="btnAuths.ic_resi_del"
>
<el-popconfirm
v-if="btnAuths.ic_resi_del"
title="删除之后无法回复,确认删除?" title="删除之后无法回复,确认删除?"
@onConfirm="handleDel(scope.row)" @onConfirm="handleDel(scope.row)">
>
<!-- <el-button slot="reference" <!-- <el-button slot="reference"
type="text" type="text"
size="small" size="small"
@ -221,56 +182,48 @@
@click="deleteBatch">删除</el-button> --> @click="deleteBatch">删除</el-button> -->
</div> </div>
<div> <div>
<el-pagination <el-pagination @size-change="handleSizeChange"
@size-change="handleSizeChange"
@current-change="handleCurrentChange" @current-change="handleCurrentChange"
:current-page.sync="currentPage" :current-page.sync="currentPage"
:page-sizes="[20, 50, 100, 200]" :page-sizes="[20, 50, 100, 200]"
:page-size="pageSize" :page-size="pageSize"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total" :total="total">
>
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
</el-card> </el-card>
<el-dialog <el-dialog :title="formName"
:title="formName"
:visible.sync="dialogVisible" :visible.sync="dialogVisible"
width="80%" width="80%"
top="5vh" top="5vh"
append-to-body append-to-body
class="dialog-h" class="dialog-h"
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handlerCancle" :before-close="handlerCancle">
>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<resi-form <resi-form v-if="dialogVisible"
v-if="dialogVisible"
ref="baseForm" ref="baseForm"
:fixed="true" :fixed="true"
:form-list="formList" :form-list="formList"
@changegroup="handleChangeGroup" @changegroup="handleChangeGroup" />
/> <div v-if="dialogVisible"
<div v-if="dialogVisible" class="resi-other"> class="resi-other">
<div class="resi-other-title">其他</div> <div class="resi-other-title">其他</div>
<div class="tabs-other-info"> <div class="tabs-other-info">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName"
<el-tab-pane @tab-click="handleClick">
v-for="item in tabsList" <el-tab-pane v-for="item in tabsList"
:key="item.groupId" :key="item.groupId"
:label="item.label" :label="item.label"
:name="'group' + item.groupId" :name="'group' + item.groupId">
> <resi-form :ref="'group' + item.groupId"
<resi-form
:ref="'group' + item.groupId"
:columns="3" :columns="3"
:form-info="item.formInfo && item.formInfo" :form-info="item.formInfo && item.formInfo"
:support-add="item.supportAdd" :support-add="item.supportAdd"
:form-id="item.columnName" :form-id="item.columnName"
:form-list="item.itemList" :form-list="item.itemList" />
/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
@ -278,50 +231,44 @@
</div> </div>
<div class="resi-btns"> <div class="resi-btns">
<el-button size="small" @click="handlerCancle">取消</el-button> <el-button size="small"
<el-button @click="handlerCancle">取消</el-button>
type="primary" <el-button type="primary"
size="small" size="small"
:loading="btnLoading" :loading="btnLoading"
@click="handleSUbmit" @click="handleSUbmit">提交</el-button>
>提交</el-button
>
</div> </div>
</el-dialog> </el-dialog>
<el-dialog <el-dialog :title="formName"
:title="formName"
:visible.sync="dialogEditVisible" :visible.sync="dialogEditVisible"
width="80%" width="80%"
append-to-body append-to-body
class="dialog-h" class="dialog-h"
top="5vh" top="5vh"
:close-on-click-modal="false" :close-on-click-modal="false"
:before-close="handlerEditCancle" :before-close="handlerEditCancle">
>
<div class="dialog-h-content scroll-h"> <div class="dialog-h-content scroll-h">
<edit-resi <edit-resi v-if="dialogEditVisible"
v-if="dialogEditVisible"
ref="baseForm" ref="baseForm"
:disabled="disabled" :disabled="disabled"
:editUserId="editUserId"
:form-info="editForm" :form-info="editForm"
:fixed="true" :fixed="true"
:form-list="formList" :form-list="formList"
:agency-id="editAgencyId" :agency-id="editAgencyId"
@changegroup="handleChangeGroup" @changegroup="handleChangeGroup" />
/> <div v-if="dialogEditVisible"
<div v-if="dialogEditVisible" class="resi-other"> class="resi-other">
<div class="resi-other-title">其他</div> <div class="resi-other-title">其他</div>
<div class="tabs-other-info"> <div class="tabs-other-info">
<el-tabs v-model="activeName" @tab-click="handleClick"> <el-tabs v-model="activeName"
<el-tab-pane @tab-click="handleClick">
v-for="item in tabsList" <el-tab-pane v-for="item in tabsList"
:key="item.groupId" :key="item.groupId"
:label="item.label" :label="item.label"
:name="'group' + item.groupId" :name="'group' + item.groupId">
> <edit-resi :ref="'group' + item.groupId"
<edit-resi
:ref="'group' + item.groupId"
:columns="3" :columns="3"
:support-add="item.supportAdd" :support-add="item.supportAdd"
:form-id="item.columnName" :form-id="item.columnName"
@ -329,65 +276,53 @@
:form-list="item.itemList" :form-list="item.itemList"
:disabled="disabled" :disabled="disabled"
:label-width="'140px'" :label-width="'140px'"
:agency-id="editAgencyId" :agency-id="editAgencyId" />
/>
</el-tab-pane> </el-tab-pane>
</el-tabs> </el-tabs>
</div> </div>
</div> </div>
</div> </div>
<div class="resi-btns"> <div class="resi-btns">
<el-button size="small" @click="handlerEditCancle">取消</el-button> <el-button size="small"
<el-button @click="handlerEditCancle">取消</el-button>
v-if="!disabled" <el-button v-if="!disabled"
type="primary" type="primary"
size="small" size="small"
:loading="btnLoading" :loading="btnLoading"
@click="handleEditSUbmit" @click="handleEditSUbmit">提交</el-button>
>提交</el-button
>
</div> </div>
</el-dialog> </el-dialog>
<!-- 调动 --> <!-- 调动 -->
<el-dialog <el-dialog :visible.sync="tranferShow"
:visible.sync="tranferShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="'人员变动'" :title="'人员变动'"
width="950px" width="950px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="diaClose" @closed="diaClose">
> <resi-transfer ref="ref_transfer"
<resi-transfer @dialogCancle="transferClose"></resi-transfer>
ref="ref_transfer"
@dialogCancle="transferClose"
></resi-transfer>
</el-dialog> </el-dialog>
<!-- 变更记录 --> <!-- 变更记录 -->
<el-dialog <el-dialog :visible.sync="changeRecordShow"
:visible.sync="changeRecordShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="'变更记录'" :title="'变更记录'"
width="1150px" width="1150px"
top="5vh" top="5vh"
@closed="diaClose" @closed="diaClose">
>
<resi-change-record ref="ref_changerecord"></resi-change-record> <resi-change-record ref="ref_changerecord"></resi-change-record>
</el-dialog> </el-dialog>
<el-dialog <el-dialog :visible.sync="diyDialog"
:visible.sync="diyDialog"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
width="1150px" width="1150px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h">
> <diy-info v-if="diyDialog"
<diy-info
v-if="diyDialog"
ref="ref_diy" ref="ref_diy"
:list="exportList" :list="exportList"
:search="{ :search="{
@ -396,16 +331,13 @@
pageSize: pageSize, pageSize: pageSize,
conditions: conditions, conditions: conditions,
}" }"
@close="handleDiyClose" @close="handleDiyClose"></diy-info>
></diy-info>
</el-dialog> </el-dialog>
<people-more <people-more v-if="showedPeopleMoreInfo && lookInfo.userId"
v-if="showedPeopleMoreInfo && lookInfo.userId"
:view_real_data="btnAuths.ic_resi_view_real_data" :view_real_data="btnAuths.ic_resi_view_real_data"
:userId="lookInfo.userId" :userId="lookInfo.userId"
:gridName="lookInfo.gridName" :gridName="lookInfo.gridName"
@close="handleCancleLook" @close="handleCancleLook" />
/>
<baobiao ref="baobiao" /> <baobiao ref="baobiao" />
</div> </div>
</template> </template>
@ -489,6 +421,7 @@ export default {
userId: "", userId: "",
gridName: "", gridName: "",
}, },
editUserId: '',
displayedBaobiaoBtn: false, displayedBaobiaoBtn: false,
@ -963,6 +896,7 @@ export default {
async handleEdit (row) { async handleEdit (row) {
this.disabled = false; this.disabled = false;
this.editAgencyId = row.ORG_ID; this.editAgencyId = row.ORG_ID;
this.editUserId = row.icResiUserId
await this.getFormList("edit"); await this.getFormList("edit");
await this.getrowInfo(row.icResiUserId); await this.getrowInfo(row.icResiUserId);
}, },

4
src/views/modules/shequ/cpts/people-more.vue

@ -410,11 +410,11 @@ export default {
methods: { methods: {
async handleTuomin () { async handleTuomin () {
const url = "/gov/org/ichouse/detailByType"; const url = "/data/aggregator/epmetuser/detailByType";
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
id: this.userId, id: this.userId,
type: "icResiUser", type: "checkIcResiUser",
}); });
if (code === 0) { if (code === 0) {

Loading…
Cancel
Save