Browse Source

Merge branch 'dev-220411' of http://git.elinkit.com.cn:7070/r/epmet-oper-gov into dev-220411

shibei_master
dai 3 years ago
parent
commit
37b02efa9b
  1. BIN
      src/assets/img/caiji-bc.png
  2. BIN
      src/assets/img/logo.png
  3. 2
      src/assets/scss/modules/visual/communityManage.scss
  4. 60
      src/assets/scss/pages/caiji.scss
  5. 10
      src/router/index.js
  6. 4
      src/views/modules/base/community/buildTable.vue
  7. 19
      src/views/modules/base/community/community.vue
  8. 4
      src/views/modules/base/community/communityTable.vue
  9. 11
      src/views/modules/base/community/roomForm.vue
  10. 4
      src/views/modules/base/community/roomTable.vue
  11. 6
      src/views/modules/base/epidemic/natFocus/natFocusAdd.vue
  12. 197
      src/views/modules/base/epidemic/natFocus/natFocusList.vue
  13. 33
      src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue
  14. 12
      src/views/modules/base/epidemic/veroFocus/veroFocusEdit.vue
  15. 211
      src/views/modules/base/epidemic/veroFocus/veroFocusList.vue
  16. 4
      src/views/modules/communityParty/regionalParty/activitys.vue
  17. 11
      src/views/modules/visual/basicinfo/basicInfoMain.vue
  18. 251
      src/views/modules/visual/basicinfo/peopleList.vue
  19. 55
      src/views/modules/visual/communityParty/party.vue
  20. 27
      src/views/pages/caiji.vue
  21. 76
      src/views/pages/caijisuccess.vue

BIN
src/assets/img/caiji-bc.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 8.8 KiB

BIN
src/assets/img/logo.png

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.2 KiB

2
src/assets/scss/modules/visual/communityManage.scss

@ -18,7 +18,7 @@
} }
} }
.div_table { .div_table_item {
margin-top: 20px; margin-top: 20px;
position: relative; position: relative;
} }

60
src/assets/scss/pages/caiji.scss

@ -1,4 +1,5 @@
.bg-caiji { .bg-caiji {
background-color: rgba(189, 214, 255, 0.89); background-color: rgba(189, 214, 255, 0.89);
height: 100%; height: 100%;
width: 100vw; width: 100vw;
@ -50,15 +51,66 @@
} }
.bg-caiji-success { .bg-caiji-success {
background: url("../../assets/img/caiji-bc.png") no-repeat;
background-size: 100% 100%;
height: 100vh; height: 100vh;
width: 100vw; width: 100vw;
text-align: center; text-align: center;
.title { .title {
background-color: rgba(189, 214, 255, 0.89); // background-color: rgba(189, 214, 255, 0.89);
padding: 20px; padding-top:30px;
font-size: 18px;
font-family: PingFang SC;
font-weight: 800;
color: #333333;
display: flex;
height:25px;
align-items: center;
justify-content: center;
>img{
width:27px;
height:25px;
}
.title_name{
margin-left:5px;
margin-top:5px;
}
}
.div_tip{
text-align: center; text-align: center;
font-size: 20px; margin-top:35px;
font-size: 18px;
font-family: PingFang SC;
font-weight: 800;
color: #2E78E2;
line-height: 26px;
}
.div_content{
margin:20px 10px 30px 10px;
padding:20px 16px;
background: #FFFFFF;
border-radius: 10px;
font-size: 16px;
font-family: Source Han Serif SC;
font-weight: 400;
color: #333333;
line-height: 30px;
text-align: left;
.content_long{
display: flex;
justify-content: left;
align-items: flex-start;
.content_title{
flex:0 0 80px;
}
}
} }
.main { .main {

10
src/router/index.js

@ -128,6 +128,16 @@ export const moduleShujuRoutes = {
isTab: true, isTab: true,
}, },
}, },
{
path: "/main-shuju/visual-basicinfo-people-list",
props: true,
component: () => import("@/views/modules/visual/basicinfo/peopleList"),
name: "visual-basicinfo-people-list",
meta: {
title: "人员列表",
isTab: true,
},
},
], ],
}; };

4
src/views/modules/base/community/buildTable.vue

@ -54,7 +54,7 @@
@click="deleteBatch">批量删除</el-button> @click="deleteBatch">批量删除</el-button>
</div> </div>
<div class="div_table"> <div class="div_table_item">
<el-table ref="ref_table" <el-table ref="ref_table"
:data="tableData" :data="tableData"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
@ -190,7 +190,7 @@ export default {
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 270 + this.iframeHeight : this.clientHeight - 270 return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
}, },

19
src/views/modules/base/community/community.vue

@ -15,8 +15,8 @@
:props="defaultProps" :props="defaultProps"
:highlight-current="true" :highlight-current="true"
node-key="id" node-key="id"
:default-expanded-keys="openNodes"
:expand-on-click-node="false" :expand-on-click-node="false"
default-expand-all
:filter-node-method="filterNode" :filter-node-method="filterNode"
@node-click="handleNodeClick"> @node-click="handleNodeClick">
</el-tree> </el-tree>
@ -123,6 +123,7 @@ export default {
filterText: '', filterText: '',
treeLoading: true, treeLoading: true,
treeData: [], treeData: [],
openNodes: [],
defaultProps: { defaultProps: {
children: 'children', children: 'children',
label: 'showName' label: 'showName'
@ -160,8 +161,10 @@ export default {
}, },
async mounted () { async mounted () {
this.treeLoading = true this.treeLoading = true
await this.loadOrgData() await this.loadOrgData()
await this.loadTree() await this.loadTree()
await this.loadOpenNode()
await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj) await this.$refs['ref_communityTable'].loadTable(true, this.selTreeObj)
if (this.treeData.length > 0) { if (this.treeData.length > 0) {
@ -213,6 +216,20 @@ export default {
// this.loadTable() // this.loadTable()
}, },
async loadOpenNode () {
const url = "/gov/org/building/tree-ids"
let params = {}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.openNodes = data
} else {
this.$message.error(msg)
}
},
async loadTree (isRefresh) { async loadTree (isRefresh) {
const url = "/gov/org/building/treelist" const url = "/gov/org/building/treelist"
let params = {} let params = {}

4
src/views/modules/base/community/communityTable.vue

@ -78,7 +78,7 @@
</div> </div>
<div class="div_table"> <div class="div_table_item">
<el-table ref="ref_table" <el-table ref="ref_table"
:data="tableData" :data="tableData"
border border
@ -237,7 +237,7 @@ export default {
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 300 + this.iframeHeight : this.clientHeight - 300 return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
}, },

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

@ -180,11 +180,12 @@ export default {
this.dataForm.buildingUnitId = this.dataForm.unitNumKey this.dataForm.buildingUnitId = this.dataForm.unitNumKey
this.houseType = this.dataForm.houseTypeKey this.houseType = this.dataForm.houseTypeKey
this.purpose = this.dataForm.purposeKey this.purpose = this.dataForm.purposeKey
if (this.dataForm.rentFlagKey) { this.rentFlag = parseInt(this.dataForm.rentFlagKey)
this.rentFlag = 1 // if (this.dataForm.rentFlagKey==='2') {
} else { // this.rentFlag = parseInt(this.dataForm.rentFlagKey)
this.rentFlag = 0 // } else {
} // this.rentFlag = 0
// }
} }

4
src/views/modules/base/community/roomTable.vue

@ -36,7 +36,7 @@
@click="deleteBatch">批量删除</el-button> @click="deleteBatch">批量删除</el-button>
</div> </div>
<div class="div_table"> <div class="div_table_item ">
<el-table ref="ref_table" <el-table ref="ref_table"
:data="tableData" :data="tableData"
:header-cell-style="{background:'#2195FE',color:'#FFFFFF'}" :header-cell-style="{background:'#2195FE',color:'#FFFFFF'}"
@ -208,7 +208,7 @@ export default {
}, },
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 270 + this.iframeHeight : this.clientHeight - 270 return this.$store.state.inIframe ? this.clientHeight - 310 + this.iframeHeight : this.clientHeight - 310
}, },

6
src/views/modules/base/epidemic/natFocus/natFocusAdd.vue

@ -198,6 +198,12 @@
label="身份证" label="身份证"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="houseName"
header-align="center"
align="center"
label="所属房屋"
min-width="170">
</el-table-column>
<el-table-column prop="natCount" <el-table-column prop="natCount"
header-align="center" header-align="center"
align="center" align="center"

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

@ -59,6 +59,74 @@
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="所属房屋">
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select v-model.trim="formData.villageId"
placeholder="小区"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select v-model.trim="formData.buildId"
placeholder="楼号"
:disabled="!this.formData.villageId"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select v-model.trim="formData.unitId"
placeholder="单元"
size="small"
:disabled="!this.formData.buildId"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select v-model.trim="formData.homeId"
placeholder="房号"
:disabled="!this.formData.unitId"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form-item>
<el-button style="margin-left:30px" <el-button style="margin-left:30px"
size="small" size="small"
class="diy-button--search" class="diy-button--search"
@ -145,6 +213,12 @@
label="身份证" label="身份证"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="allName"
header-align="center"
align="center"
label="所属房屋"
min-width="170">
</el-table-column>
<el-table-column prop="reason" <el-table-column prop="reason"
header-align="center" header-align="center"
align="center" align="center"
@ -325,7 +399,16 @@ export default {
idCard: '', idCard: '',
remark: '', remark: '',
reason: '', reason: '',
villageId: '',
buildId: '',
unitId: '',
homeId: ''
}, },
optionsV: [],
optionsB: [],
optionsH: [],
optionsD: [],
natNumList: [], natNumList: [],
tableData: [], tableData: [],
@ -386,20 +469,120 @@ export default {
this.tableData = data.list this.tableData = data.list
this.analysisTableSelection() this.analysisTableSelection()
this.tableData.forEach(item => {
if (!item.allName) {
item.allName = '--'
}
item.roomShow = ''
if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
item.roomShow = '--'
} else {
if (item.villageName) {
item.roomShow = item.roomShow + item.villageName
}
if (item.buildName) {
item.roomShow = item.roomShow + item.buildName
}
if (item.unitName) {
item.roomShow = item.roomShow + item.unitName
}
if (item.villageName) {
item.roomShow = item.roomShow + item.homeName
}
}
// this.tableData.forEach(item => {
// if (item.time) {
// let timeArray = item.time.split(' ')
// item.time = timeArray[0]
// }
// }); });
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
this.tableLoading = false this.tableLoading = false
}, },
handleChangeV (val) {
console.log('val', val)
this.formData.buildId = ''
this.formData.unitId = ''
this.formData.homeId = ''
this.getBuildList()
this.getUniList()
this.getHouseList()
},
handleChangeB (val) {
console.log('val', val)
this.formData.unitId = ''
this.formData.homeId = ''
this.getUniList()
this.getHouseList()
},
handleChangeD () {
this.formData.homeId = ''
this.getHouseList()
},
getValiheList () {
const { user } = this.$store.state
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.GRID_ID, agencyId: user.agencyId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getBuildList () {
this.$http
.post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getUniList () {
this.$http
.post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getHouseList () {
this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
handleSelectTable (selection, row) { handleSelectTable (selection, row) {
row.isSel = !row.isSel row.isSel = !row.isSel
@ -771,7 +954,7 @@ export default {
}, },
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360 return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
}, },

33
src/views/modules/base/epidemic/veroFocus/veroFocusAdd.vue

@ -46,6 +46,18 @@
v-model="formData1.idCard"> v-model="formData1.idCard">
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="关注原因"
prop="reason"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入关注原因"
clearable
v-model="formData1.reason">
</el-input>
</el-form-item>
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" prop="remark"
label-width="150px" label-width="150px"
@ -172,6 +184,12 @@
label="身份证" label="身份证"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="houseName"
header-align="center"
align="center"
label="所属房屋"
min-width="170">
</el-table-column>
<el-table-column prop="vaccineCount" <el-table-column prop="vaccineCount"
header-align="center" header-align="center"
align="center" align="center"
@ -219,6 +237,17 @@
:model="formData2" :model="formData2"
ref="ref_form2" ref="ref_form2"
:label-width="'90px'"> :label-width="'90px'">
<el-form-item label="关注原因"
prop="reason"
label-width="100px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入关注原因"
clearable
v-model="formData2.reason">
</el-input>
</el-form-item>
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" prop="remark"
@ -317,6 +346,7 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
reason: '',
}, },
@ -326,6 +356,7 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
reason: '',
}, },
tableData: [], tableData: [],
total: 0, total: 0,
@ -661,6 +692,7 @@ export default {
channel: [], channel: [],
content: '', content: '',
attentionType: 1, attentionType: 1,
reason: '',
} }
this.formData2 = { this.formData2 = {
@ -669,6 +701,7 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
reason: '',
} }
this.formDataSearch = { this.formDataSearch = {
gridId: '', gridId: '',

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

@ -44,6 +44,16 @@
v-model="formData.idCard"> v-model="formData.idCard">
</el-input> --> </el-input> -->
</el-form-item> </el-form-item>
<el-form-item label="关注原因"
prop="reason"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
placeholder="请输入关注原因"
clearable
v-model="formData.reason">
</el-input>
</el-form-item>
<el-form-item label="备注" <el-form-item label="备注"
prop="remark" prop="remark"
label-width="150px" label-width="150px"
@ -135,6 +145,7 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
reason: '',
}, },
} }
@ -223,6 +234,7 @@ export default {
isSelChannel: false, isSelChannel: false,
channel: [], channel: [],
content: '', content: '',
reason: '',
} }
}, },

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

@ -54,6 +54,73 @@
</el-form-item> </el-form-item>
</div>
<div>
<el-form-item label="所属房屋">
<div class="resi-cell-value">
<div class="resi-cell-col">
<el-form-item prop="villageId">
<el-select v-model.trim="formData.villageId"
placeholder="小区"
size="small"
clearable
class="resi-cell-select"
@change="handleChangeV">
<el-option v-for="item in optionsV"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="buildId">
<el-select v-model.trim="formData.buildId"
placeholder="楼号"
:disabled="!this.formData.villageId"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeB">
<el-option v-for="item in optionsB"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="unitId">
<el-select v-model.trim="formData.unitId"
placeholder="单元"
size="small"
:disabled="!this.formData.buildId"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1"
@change="handleChangeD">
<el-option v-for="item in optionsD"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
<el-form-item prop="homeId">
<el-select v-model.trim="formData.homeId"
placeholder="房号"
:disabled="!this.formData.unitId"
size="small"
clearable
class="resi-cell-select resi-cell-select-middle list_item_width_1">
<el-option v-for="item in optionsH"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item>
</div>
</div>
</el-form-item>
<el-button style="margin-left:30px" <el-button style="margin-left:30px"
size="small" size="small"
class="diy-button--search" class="diy-button--search"
@ -140,18 +207,31 @@
label="身份证" label="身份证"
min-width="170"> min-width="170">
</el-table-column> </el-table-column>
<el-table-column prop="allName"
header-align="center"
align="center"
label="所属房屋"
min-width="170">
</el-table-column>
<el-table-column prop="vaccinationCount" <el-table-column prop="vaccinationCount"
header-align="center" header-align="center"
align="center" align="center"
label="接种针次" label="接种针次"
width="100"> width="100">
</el-table-column> </el-table-column>
<el-table-column prop="reason"
header-align="center"
align="center"
show-overflow-tooltip
label="关注原因"
min-width="230">
</el-table-column>
<el-table-column prop="remark" <el-table-column prop="remark"
header-align="center" header-align="center"
align="center" align="center"
show-overflow-tooltip show-overflow-tooltip
label="备注" label="备注"
min-width="230"> min-width="200">
</el-table-column> </el-table-column>
<el-table-column prop="lastInformTime" <el-table-column prop="lastInformTime"
header-align="center" header-align="center"
@ -319,7 +399,16 @@ export default {
mobile: '', mobile: '',
idCard: '', idCard: '',
vaccinationCount: '', vaccinationCount: '',
villageId: '',
buildId: '',
unitId: '',
homeId: ''
}, },
optionsV: [],
optionsB: [],
optionsH: [],
optionsD: [],
veroNumList: [], veroNumList: [],
tableData: [], tableData: [],
@ -345,6 +434,8 @@ export default {
this.$refs['ref_table'].doLayout() this.$refs['ref_table'].doLayout()
}, },
async mounted () { async mounted () {
const { user } = this.$store.state
this.agencyId = user.agencyId
for (let i = 0; i < 11; i++) { for (let i = 0; i < 11; i++) {
let obj = { let obj = {
value: i + '', value: i + '',
@ -352,7 +443,7 @@ export default {
} }
this.veroNumList.push(obj) this.veroNumList.push(obj)
} }
this.getValiheList()
await this.loadTable() await this.loadTable()
}, },
@ -381,19 +472,121 @@ export default {
this.analysisTableSelection() this.analysisTableSelection()
// this.tableData.forEach(item => { this.tableData.forEach(item => {
// if (item.time) { if (!item.allName) {
// let timeArray = item.time.split(' ') item.allName = '--'
// item.time = timeArray[0] }
// } item.roomShow = ''
if (!item.villageName && !item.buildName && !item.unitName && !item.homeName) {
item.roomShow = '--'
} else {
if (item.villageName) {
item.roomShow = item.roomShow + item.villageName
}
if (item.buildName) {
item.roomShow = item.roomShow + item.buildName
}
if (item.unitName) {
item.roomShow = item.roomShow + item.unitName
}
if (item.villageName) {
item.roomShow = item.roomShow + item.homeName
}
}
// });
});
} else { } else {
this.$message.error(msg) this.$message.error(msg)
} }
this.tableLoading = false this.tableLoading = false
}, },
handleChangeV (val) {
console.log('val', val)
this.formData.buildId = ''
this.formData.unitId = ''
this.formData.homeId = ''
this.getBuildList()
this.getUniList()
this.getHouseList()
},
handleChangeB (val) {
console.log('val', val)
this.formData.unitId = ''
this.formData.homeId = ''
this.getUniList()
this.getHouseList()
},
handleChangeD () {
this.formData.homeId = ''
this.getHouseList()
},
getValiheList () {
const { user } = this.$store.state
this.$http
.post('/gov/org/icneighborhood/neighborhoodoption', { gridId: this.formData.GRID_ID, agencyId: user.agencyId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsV = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getBuildList () {
this.$http
.post('/gov/org/icbuilding/buildingoption', { neighborHoodId: this.formData.villageId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsB = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getUniList () {
this.$http
.post('/gov/org/icbuildingunit/unitoption', { buildingId: this.formData.buildId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsD = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
getHouseList () {
this.$http
.post('/gov/org/ichouse/houseoption', { unitId: this.formData.unitId })
.then(({ data: res }) => {
if (res.code !== 0) {
return this.$message.error(res.msg)
} else {
console.log('获取查询详情成功', res.data)
this.optionsH = res.data
}
})
.catch(() => {
return this.$message.error('网络错误')
})
},
handleSelectTable (selection, row) { handleSelectTable (selection, row) {
row.isSel = !row.isSel row.isSel = !row.isSel
@ -761,7 +954,7 @@ export default {
}, },
computed: { computed: {
tableHeight () { tableHeight () {
return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeight : this.clientHeight - 360 return this.$store.state.inIframe ? this.clientHeight - 415 + this.iframeHeight : this.clientHeight - 415
}, },

4
src/views/modules/communityParty/regionalParty/activitys.vue

@ -139,10 +139,10 @@
label="单位名称" label="单位名称"
width="180"> width="180">
</el-table-column> </el-table-column>
<el-table-column prop="所属网格" <el-table-column prop="gridName"
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 prop="title" <el-table-column prop="title"

11
src/views/modules/visual/basicinfo/basicInfoMain.vue

@ -107,7 +107,7 @@
<div class="list_item"> <div class="list_item">
<div v-for="(colItem,colIndex) in item" <div v-for="(colItem,colIndex) in item"
:key="colIndex" :key="colIndex"
class="list_item_col"> class="list_item_col" @click="handleTo(colItem)">
<img :src="colItem.dataIcon" <img :src="colItem.dataIcon"
alt /> alt />
<div class="item_content"> <div class="item_content">
@ -310,6 +310,15 @@ const vueGis = {
}, },
methods: { methods: {
handleTo(item) {
this.$router.push({
path: `/main-shuju/visual-basicinfo-people-list`,
query: {
columnName: item.columnName,
label: item.label
}
});
},
hideAgencyList () { hideAgencyList () {
this.showAgencyList = !this.showAgencyList this.showAgencyList = !this.showAgencyList
// if (this.showAgencyList) { // if (this.showAgencyList) {

251
src/views/modules/visual/basicinfo/peopleList.vue

@ -0,0 +1,251 @@
<template>
<div class="div_people_search">
<!-- 组织路由 -->
<div class="div_top g-bread">
<el-breadcrumb separator-class="el-icon-arrow-right">
<el-breadcrumb-item v-for="item in breadList" :key="item.path" :to="{ path: item.path }">
{{ item.meta.title }}
</el-breadcrumb-item>
</el-breadcrumb>
</div>
<div v-if="orgLevel!=='people'">
<div class="list_box">
<div class="info_tip">
<img src="../../../../assets/img/shuju/title-tip.png"
alt />
<div class="tip_title">{{tableTitle}}</div>
</div>
<div class="warning-table">
<div class="table">
<div class="table-header">
<div class="td td1">序号</div>
<div class="td td1">姓名</div>
<div class="td td3">所属网格</div>
<div class="td td3">所属房屋</div>
<div class="td td2">手机</div>
<div class="td td3">身份证</div>
<div class="td td1">性别</div>
<div class="td td2">出生日期</div>
<div class="td td1">操作</div>
</div>
<div v-if="!loading && tableData.length> 0"
class="table-body">
<div class="table-body-tr"
v-for="(item,index) in tableData"
:key='index'>
<div class="td td1">{{item.sort}} </div>
<div class="td td1">{{item.name}} </div>
<div class="td td3">{{item.gridName}} </div>
<div class="td td3">{{item.neighborHoodName + item.buildNum}} </div>
<!-- <div class="td td1">{{item.buildNum}} </div> -->
<div class="td td2">{{item.mobile}} </div>
<div class="td td3">{{item.idCard}} </div>
<div class="td td1">{{item.gender}} </div>
<div class="td td2">{{item.birthday}} </div>
<div @click="handelToPeople(item)"
class="td td1 btn_detail">{{'查看'}} </div>
</div>
</div>
<div class="table-status"
v-if="loading">
<screen-loading>加载中</screen-loading>
</div>
<div class="table-status"
v-if="tableData.length == 0 && !loading">
<div class="no-data">
<img src="@/assets/img/modules/visual/noData.png"
class="no-data-img" />
</div>
</div>
</div>
</div>
</div>
<div class="pagination">
<el-pagination background
layout="prev, pager, next, total"
:current-page="pageNo"
:page-size="pageSize"
:total="total"
@current-change="pageCurrentChangeHandle">
</el-pagination>
</div>
</div>
<!-- <people v-if="orgLevel==='people'"
:uid="selUserId"
ref="ref_people"></people> -->
<people-more v-show="showedMoreInfo"
v-if="info.userId"
:userId="info.userId"
:gridName="info.gridName"
@close="showedMoreInfo = false" />
</div>
</template>
<script>
import { requestPost } from "@/js/dai/request";
import People from "./people";
import ScreenLoading from "@/views/modules/visual/cpts/loading";
import peopleMore from "@/views/modules/visual/basicinfo/cpts/people-more";
export default {
name: "people-list",
components: {
People, ScreenLoading, peopleMore
},
data () {
return {
showedMoreInfo: false,
tableTitle: '党员',
loading: false,
headerList: [],
tableData: [],
searchName: '',
pageSize: 7,
pageNo: 1,
total: 0,
orgLevel: 'search',
selUserId: '',
//
runNum: 0,
runAgencyArray: [],
info: {},
breadList: []
};
},
activated () {
this.searchName = ''
this.tableData = []
const { columnName, label } = this.$route.query
this.searchName = columnName
this.tableTitle = label
this.loadList()
},
beforeRouteEnter(to, from, next) {
const arr = [ {...from }, { ...to, meta: { title: '人员列表'}}]
next((vm) =>{
vm.breadList = [ ...arr ]
})
},
methods: {
handleSearch () {
},
async loadList () {
this.loading = true
const url = "/epmetuser/icresiuser/searchbycategory"
let params = {
columnName: this.searchName,
pageSize: this.pageSize,
pageNo: this.pageNo
}
const { data, code, msg } = await requestPost(url, params)
this.loading = false
if (code === 0) {
this.total = data.total
this.tableData = data.list
} else {
this.$message.error(msg)
}
},
//
handelToPeople (item) {
// this.toSubAgency('people', this.tableData[index].userId)
this.info = { ...item }
this.showedMoreInfo = true
},
pageCurrentChangeHandle (val) {
this.pageNo = val
this.loadList()
},
// type:polygon / people
async toSubAgency (type, userId) {
this.orgLevel = 'people'
this.selUserId = userId
},
//
handleClickBack () {
this.orgLevel = 'search'
},
},
destroyed () {
console.log("我已经离开了!");
},
};
</script>
<style
lang="scss"
src="@/assets/scss/modules/visual/basicInfoMain.scss"
scoped
></style>
<style
lang="scss"
src="@/assets/scss/modules/visual/searchPerson.scss"
scoped
></style>
<style lang="scss" scoped>
.div_search_list {
.el-input__inner[WarningColor="warning"] {
border-radius: 8px 0 0 8px;
height: 53px;
background-color: #01106800;
border: 2px solid #0082fb;
padding-left: 70px;
font-size: 18px;
font-family: PingFang SC;
font-weight: 400;
color: #ffffff;
}
}
.list_box {
width: 96%;
height: 780px;
margin: 20px auto;
}
.pagination {
margin-top: 0;
}
.g-bread {
padding: 10px 20px;
::v-deep .el-breadcrumb__item {
font-size: 16px;
.el-breadcrumb__inner {
color: #fff;
}
}
}
</style>

55
src/views/modules/visual/communityParty/party.vue

@ -42,6 +42,9 @@
</div> </div>
</div> </div>
<div class="ecahrts-button">
<el-button type="warning" size="small" @click="handleExport('age')">导出</el-button>
</div>
<div class="warning-box-bottom"> <div class="warning-box-bottom">
<screen-table <screen-table
:headerList="headerList" :headerList="headerList"
@ -86,6 +89,9 @@
</div> </div>
</div> </div>
</div> </div>
<div class="ecahrts-button">
<el-button type="warning" size="small" @click="handleExport('edu')">导出</el-button>
</div>
<div class="warning-box-bottom"> <div class="warning-box-bottom">
<screen-table <screen-table
:headerList="headerEduList" :headerList="headerEduList"
@ -795,6 +801,45 @@ export default {
this.pageNo = val; this.pageNo = val;
this.getEduList(this.agencyId, this.orgType, this.eduCode) this.getEduList(this.agencyId, this.orgType, this.eduCode)
}, },
async handleExport(type) {
const urls = {
age: '/epmetuser/icresiuser/partymemberagelist/export',
edu: '/epmetuser/icresiuser/partymembereducationlist/export'
}
const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
let params = {
orgId: _arr[0],
orgType: orgType,
code: type == 'age' ? this.ageCode : this.eduCode,
}
// .post('epmetuser/icresiuser/exportExcel', params)
await this.$http({
method: 'POST',
url: urls[type],
responseType: 'blob',
data: params
})
.then(res => {
console.log('resllll', res)
let fileName = window.decodeURI(res.headers["content-disposition"].split(";")[1].split("=")[1])
console.log('filename', fileName)
let blob = new Blob([res.data], { type: 'application/vnd.ms-excel' })
var url = window.URL.createObjectURL(blob)
var aLink = document.createElement('a')
aLink.style.display = 'none'
aLink.href = url
aLink.setAttribute('download', fileName)
document.body.appendChild(aLink)
aLink.click()
document.body.removeChild(aLink) //
window.URL.revokeObjectURL(url) //blob
})
.catch((err) => {
console.log('获取导出失败', err)
return this.$message.error('网络错误')
})
},
}, },
}; };
</script> </script>
@ -1032,4 +1077,14 @@ export default {
padding: 0 30px; padding: 0 30px;
// overflow-y: scroll; // overflow-y: scroll;
} }
.ecahrts-button {
width: 100%;
padding-right: 30px;
text-align: right;
::v-deep .el-button--warning {
background: linear-gradient(90deg, #0863EA, #3B9FFC);
border: 0;
}
}
</style> </style>

27
src/views/pages/caiji.vue

@ -142,6 +142,18 @@
type="tel" type="tel"
v-model="item.mobile"></mt-field> v-model="item.mobile"></mt-field>
<div class="line"></div> <div class="line"></div>
<mt-field class="my-field"
:disableClear="true"
:label="'户籍所在地'"
placeholder="请输入"
v-model="item.domicilePlace"></mt-field>
<div class="line"></div>
<mt-field class="my-field"
:disableClear="true"
:label="'学校或单位'"
placeholder="请输入"
v-model="item.workPlace"></mt-field>
<div class="line"></div>
<div @click="handelSel('detNum',index)"> <div @click="handelSel('detNum',index)">
<mt-cell :title="'参加核酸检测次数'" <mt-cell :title="'参加核酸检测次数'"
@ -262,6 +274,8 @@ export default {
{ {
name: '', name: '',
mobile: '', mobile: '',
domicilePlace: '',
workPlace: '',
idNum: '', idNum: '',
customerId: '', customerId: '',
heSuanCount: null, heSuanCount: null,
@ -648,7 +662,12 @@ export default {
this.btnDisabled = false this.btnDisabled = false
if (code === 0) { if (code === 0) {
this.$router.replace({ name: 'caijisuccess' }) this.$router.replace({
name: 'caijisuccess',
query: {
formData: this.formData
}
})
// Toast({ // Toast({
// message: '', // message: '',
// duration: 3000 // duration: 3000
@ -727,7 +746,7 @@ export default {
let member1 = this.memberList[0] let member1 = this.memberList[0]
if (!member1.name || !member1.mobile || !member1.idNum || !member1.selDetNum.value || !member1.selDetCondition.value) { if (!member1.name || !member1.mobile || !member1.domicilePlace || !member1.workPlace || !member1.idNum || !member1.selDetNum.value || !member1.selDetCondition.value) {
aletMessage = '请完整填写用户1信息' aletMessage = '请完整填写用户1信息'
return aletMessage return aletMessage
} }
@ -736,7 +755,7 @@ export default {
for (let i = 1; i < this.memberList.length; i++) { for (let i = 1; i < this.memberList.length; i++) {
let item = this.memberList[i] let item = this.memberList[i]
if (item.name || item.mobile || item.idNum || item.selDetNum.value || item.selDetCondition.value) {// if (item.name || item.mobile || item.domicilePlace || item.workPlace || item.idNum || item.selDetNum.value || item.selDetCondition.value) {//
if (!item.name || !item.idNum) { if (!item.name || !item.idNum) {
aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息' aletMessage = '请完整填写用户' + (i + 1) + '的姓名和身份证信息'
return aletMessage return aletMessage
@ -828,6 +847,8 @@ export default {
let objTemp = { let objTemp = {
name: '', name: '',
mobile: '', mobile: '',
domicilePlace: '',
workPlace: '',
idNum: '', idNum: '',
heSuanCount: null, heSuanCount: null,
ymjz: '', ymjz: '',

76
src/views/pages/caijisuccess.vue

@ -1,17 +1,50 @@
<template> <template>
<div class="bg-caiji-success"> <div class="bg-caiji-success">
<div class="title"> <div class="title">
居民信息填报 <img src="@/assets/img/logo.png">
<div class="title_name">居民信息填报</div>
</div> </div>
<div class="main"> <div class="div_tip">
<div>提交成功</div>
<div>请截图保存方便核验人员查看</div>
</div>
<div class="div_content">
<div class="content_long">
<div class="content_title">所属房屋</div>
<div>{{formData.address}}</div>
</div>
<div>
<span>房主姓名</span>
<span>{{formData.houseHolderName}}</span>
</div>
<div v-for="(item,index) in formData.memberList"
:key="index">
<div>
<span>成员{{index+1}}</span>
<span>{{item.name}}</span>
</div>
<div>
<span>身份证号</span>
<span>{{item.idNum}}</span>
</div>
<div>
<span>手机号</span>
<span>{{item.mobile}}</span>
</div>
</div>
</div>
<!-- <div class="main">
<div class="icon-success"> <div class="icon-success">
<i class="el-icon-circle-check "></i> <i class="el-icon-circle-check "></i>
</div> </div>
<div class="success-content"> 提交成功</div> <div class="success-content"> 提交成功</div>
</div> </div> -->
</div> </div>
</template> </template>
<script> <script>
@ -26,7 +59,7 @@ export default {
data () { data () {
return { return {
formData: {},
} }
}, },
components: {}, components: {},
@ -35,6 +68,41 @@ export default {
}, },
created () { }, created () { },
mounted () { mounted () {
let query = this.$route.query
this.formData = query.formData
// this.formData = {
// address: "113123123",
// buildId: "1494482424728395778",
// buildName: "",
// customerId: "45687aa479955f9d06204d415238f7cc",
// homeId: "other",
// homeName: "3123123",
// houseHolderName: "",
// houseType: "1",
// memberList: [
// {
// customerId: "45687aa479955f9d06204d415238f7cc",
// domicilePlace: "23123",
// heSuanCount: "2",
// idNum: "312312",
// mobile: "15111111111",
// name: "",
// },
// {
// customerId: "45687aa479955f9d06204d415238f7cc",
// domicilePlace: "123123",
// heSuanCount: null,
// idNum: "",
// mobile: "3123123123",
// name: "",
// }
// ]
// }
console.log(this.formData)
}, },

Loading…
Cancel
Save