elink-star
/
epmet-oper-gov
12
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

chanpin_shequ_jiagou
wxz 2 years ago
parent
d13bc84a85 a626003bb4
commit
a19febf190
3 changed files with 812 additions and 560 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 554
      src/views/modules/base/collect.vue
  2. 33
      src/views/modules/base/organization/organization.vue
  3. 193
      src/views/modules/partymember/icpartyorgtree.vue

554
src/views/modules/base/collect.vue
View File

@ -1,11 +1,12 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card ref="searchCard" <el-card ref="searchCard" class="search-card">
class="search-card"> <el-form
<el-form ref="searchForm" ref="searchForm"
:inline="true" :inline="true"
:model="fmData" :model="fmData"
class="demo-form-inline"> class="demo-form-inline"
>
<!-- <el-form-item <!-- <el-form-item
v-if="communityList.length > 0" v-if="communityList.length > 0"
label="所在社区" label="所在社区"
@ -27,82 +28,118 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="居住地址" <el-form-item label="居住地址" prop="address">
prop="address"> <el-input
<el-input v-model="fmData.address" v-model="fmData.address"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item label="户籍地址" prop="domicilePlace">
<el-input
v-model="fmData.domicilePlace"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入"> placeholder="请输入"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="户籍地址" <el-form-item label="户主姓名" prop="houseHolderName">
prop="domicilePlace"> <el-input
<el-input v-model="fmData.domicilePlace" v-model="fmData.houseHolderName"
class="resi-cell-input" class="resi-cell-input"
size="small" size="small"
clearable clearable
placeholder="请输入"> placeholder="请输入"
>
</el-input> </el-input>
</el-form-item> </el-form-item>
<el-form-item label="填写时间" <el-form-item label="审核状态" prop="checkState">
prop="startTime"> <el-select v-model="fmData.checkState">
<el-date-picker v-model="timeRange" <el-option
v-for="item in checkStateList"
:key="item.value"
:label="item.label"
:value="item.value"
>
</el-option>
</el-select>
</el-form-item>
<el-form-item label="填写时间" prop="startTime">
<el-date-picker
v-model="timeRange"
type="daterange" type="daterange"
clearable clearable
size="small" size="small"
range-separator="至" range-separator="至"
start-placeholder="开始日期" start-placeholder="开始日期"
end-placeholder="结束日期" end-placeholder="结束日期"
value-format="yyyy-MM-dd"> value-format="yyyy-MM-dd"
>
</el-date-picker> </el-date-picker>
</el-form-item> </el-form-item>
<el-form-item> <el-form-item>
<el-button class="diy-button--search" <el-button
class="diy-button--search"
size="small" size="small"
@click="handleSearch">查询</el-button> @click="handleSearch"
<el-button class="diy-button--reset" >查询</el-button
>
<el-button
class="diy-button--reset"
size="small" size="small"
@click="resetForm('searchForm')">重置</el-button> @click="resetForm('searchForm')"
>重置</el-button
>
</el-form-item> </el-form-item>
</el-form> </el-form>
</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 @click="handleChu" <el-button @click="handleChu" class="diy-button--reset" size="small"
class="diy-button--reset" >导出</el-button
size="small">导出</el-button> >
</div> </div>
<el-table :data="tableData" <el-table
:data="tableData"
border border
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table"
:height="tableHeight" :height="tableHeight"
:span-method="arraySpanMethod"> :span-method="arraySpanMethod"
<el-table-column label="序号" >
prop="desc" <el-table-column label="序号" prop="desc" align="center" width="50" />
align="center" <el-table-column
width="50" /> prop="houseHolderName"
<el-table-column prop="houseHolderName"
width="100" width="100"
label="户主姓名" label="户主姓名"
align="center" align="center"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="address" />
<el-table-column
prop="address"
align="center" align="center"
min-width="140" min-width="140"
label="居住地址" label="居住地址"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.homeId == 'other'" <span v-if="scope.row.homeId == 'other'" class="badge"
class="badge">房屋缺失</span> >房屋缺失</span
>
<span>{{ scope.row.address }}</span> <span>{{ scope.row.address }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="houseType" <el-table-column
prop="houseType"
align="center" align="center"
width="100" width="100"
label="房屋状态"> label="房屋状态"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.houseType == 1">出租</span> <span v-if="scope.row.houseType == 1">出租</span>
<span v-if="scope.row.houseType == 2">闲置</span> <span v-if="scope.row.houseType == 2">闲置</span>
@ -110,85 +147,110 @@
<span v-if="scope.row.houseType == 0">自住</span> <span v-if="scope.row.houseType == 0">自住</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="totalResi" <el-table-column
prop="totalResi"
width="80" width="80"
align="center" align="center"
label="居住人数" /> label="居住人数"
<el-table-column prop="memberName" />
<el-table-column
prop="memberName"
width="100" width="100"
label="成员姓名" label="成员姓名"
align="center" align="center"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="memberIdNum" />
<el-table-column
prop="memberIdNum"
width="180" width="180"
align="center" align="center"
label="成员证件号" label="成员证件号"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="memberMobile" />
<el-table-column
prop="memberMobile"
width="140" width="140"
align="center" align="center"
label="成员手机号" label="成员手机号"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="relationship" />
<el-table-column
prop="relationship"
min-width="120" min-width="120"
align="center" align="center"
label="与户主关系" label="与户主关系"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span>{{ getRelationshipName(scope.row.relationship) }}</span> <span>{{ getRelationshipName(scope.row.relationship) }}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="heSuanCount" <el-table-column
prop="heSuanCount"
width="120" width="120"
align="center" align="center"
label="核酸检测次数" /> label="核酸检测次数"
/>
<el-table-column prop="ymjz" <el-table-column
prop="ymjz"
width="140" width="140"
align="center" align="center"
label="疫苗接种情况"> label="疫苗接种情况"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span> <span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span> <span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span> <span v-if="scope.row.ymjz == 0">未接种</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="domicilePlace" <el-table-column
prop="domicilePlace"
min-width="140" min-width="140"
align="center" align="center"
label="户籍地址" label="户籍地址"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="workPlace" />
<el-table-column
prop="workPlace"
min-width="120" min-width="120"
align="center" align="center"
label="单位名称" label="单位名称"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="remark" />
<el-table-column
prop="remark"
align="center" align="center"
label="备注" label="备注"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column prop="faceImg" <el-table-column
prop="faceImg"
min-width="120" min-width="120"
align="center" align="center"
label="人脸"> label="人脸"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-image style="max-height: 50px; max-width: 50px;" <el-image
style="max-height: 50px; max-width: 50px"
:src="scope.row.faceImg" :src="scope.row.faceImg"
:preview-src-list="[scope.row.faceImg]"> :preview-src-list="[scope.row.faceImg]"
<div slot="error" >
class="image-slot"> <div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i> --> <!-- <i class="el-icon-picture-outline"></i> -->
</div> </div>
</el-image> </el-image>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="checkState" <el-table-column
prop="checkState"
min-width="120" min-width="120"
align="center" align="center"
label="状态" label="状态"
:show-overflow-tooltip="true" :show-overflow-tooltip="true"
fixed="right"> fixed="right"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.checkState === '0'">未审核</span> <span v-if="scope.row.checkState === '0'">未审核</span>
<span v-else-if="scope.row.checkState === '1'">未通过</span> <span v-else-if="scope.row.checkState === '1'">未通过</span>
@ -196,81 +258,96 @@
<span v-else></span> <span v-else></span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column label="操作" <el-table-column label="操作" align="center" width="100" fixed="right">
align="center"
width="100"
fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button type="text" <el-button
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleWatch('look', scope.row)">查看</el-button> @click="handleWatch('look', scope.row)"
>查看</el-button
>
<!-- <el-button type="text" <!-- <el-button type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
@click="handleWatch('check', scope.row)">审核</el-button> --> @click="handleWatch('check', scope.row)">审核</el-button> -->
<el-button type="text" <el-button
type="text"
class="div-table-button--detail" class="div-table-button--detail"
size="small" size="small"
v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'" v-if="
@click="handleWatch('check', scope.row)">审核</el-button> scope.row.agencyId == agencyId && scope.row.checkState === '0'
"
@click="handleWatch('check', scope.row)"
>审核</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<div> <div>
<el-pagination @size-change="handleSizeChange" <el-pagination
@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="parseInt(pageSize)" :page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total" layout="sizes, prev, pager, next, total"
:total="total"> :total="total"
>
</el-pagination> </el-pagination>
</div> </div>
</el-card> </el-card>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog :visible.sync="formShow" <el-dialog
:visible.sync="formShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="信息详情" title="信息详情"
width="1100px" width="1100px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="handleClose"> @closed="handleClose"
>
<div class="scroll-h"> <div class="scroll-h">
<el-form ref="ref_form" <el-form
ref="ref_form"
:inline="true" :inline="true"
:model="dataForm" :model="dataForm"
:disabled="true" :disabled="true"
class="form"> class="form"
<el-form-item label="户主姓名:" >
<el-form-item
label="户主姓名:"
prop="houseHolderName" prop="houseHolderName"
label-width="150px"> label-width="150px"
>
<!-- <el-input class="item_width_1" <!-- <el-input class="item_width_1"
v-model="dataForm.houseHolderName"> v-model="dataForm.houseHolderName">
</el-input> --> </el-input> -->
<div class="wd50">{{ dataForm.houseHolderName }}</div> <div class="wd50">{{ dataForm.houseHolderName }}</div>
</el-form-item> </el-form-item>
<el-form-item label="居住地址:" <el-form-item label="居住地址:" prop="address" label-width="150px">
prop="address"
label-width="150px">
<!-- <el-input class="wd50" v-model="dataForm.address"> <!-- <el-input class="wd50" v-model="dataForm.address">
</el-input> --> </el-input> -->
<div class="wd50">{{ dataForm.address }}</div> <div class="wd50">{{ dataForm.address }}</div>
</el-form-item> </el-form-item>
<div> <div>
<el-form-item label="房屋状态:" <el-form-item
label="房屋状态:"
prop="houseType" prop="houseType"
label-width="150px"> label-width="150px"
>
<!-- <el-input class="item_width_1" <!-- <el-input class="item_width_1"
v-model="dataForm.houseType"> v-model="dataForm.houseType">
</el-input> --> </el-input> -->
<div class="wd50">{{ dataForm.houseType }}</div> <div class="wd50">{{ dataForm.houseType }}</div>
</el-form-item> </el-form-item>
<el-form-item label="居住人数:" <el-form-item
label="居住人数:"
prop="totalResi" prop="totalResi"
label-width="150px"> label-width="150px"
>
<!-- <el-input class="item_width_1" <!-- <el-input class="item_width_1"
v-model="dataForm.totalResi"> v-model="dataForm.totalResi">
</el-input> --> </el-input> -->
@ -278,70 +355,98 @@
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<el-table :data="dataForm.list" <el-table
:data="dataForm.list"
border border
style="width: 1060px; margin: 20px" style="width: 1060px; margin: 20px"
class="resi-table" class="resi-table"
:height="dialogTableHeight"> :height="dialogTableHeight"
<el-table-column label="序号" >
<el-table-column
label="序号"
type="index" type="index"
align="center" align="center"
width="50" /> width="50"
<el-table-column prop="memberName" />
<el-table-column
prop="memberName"
width="100" width="100"
label="成员姓名" label="成员姓名"
align="center" align="center"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="memberIdNum" />
<el-table-column
prop="memberIdNum"
width="180" width="180"
align="center" align="center"
label="成员证件号" label="成员证件号"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="memberMobile" />
<el-table-column
prop="memberMobile"
width="140" width="140"
align="center" align="center"
label="成员手机号" label="成员手机号"
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="heSuanCount" />
<el-table-column
prop="heSuanCount"
width="120" width="120"
align="center" align="center"
label="核酸检测次数" /> label="核酸检测次数"
/>
<el-table-column prop="ymjz" <el-table-column
prop="ymjz"
width="140" width="140"
align="center" align="center"
label="疫苗接种情况"> label="疫苗接种情况"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span> <span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span> <span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span> <span v-if="scope.row.ymjz == 0">未接种</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="domicilePlace" <el-table-column
prop="relationShipName"
width="120"
align="center"
label="与户主关系"
/>
<el-table-column
prop="domicilePlace"
min-width="140" min-width="140"
align="center" align="center"
label="户籍所在地 " label="户籍所在地 "
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="workPlace" />
<el-table-column
prop="workPlace"
min-width="120" min-width="120"
align="center" align="center"
label="单位或学校 " label="单位或学校 "
:show-overflow-tooltip="true" /> :show-overflow-tooltip="true"
<el-table-column prop="remark" />
<el-table-column
prop="remark"
align="center" align="center"
label="备注" label="备注"
:show-overflow-tooltip="true"> :show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column prop="faceImg" <el-table-column
prop="faceImg"
min-width="120" min-width="120"
align="center" align="center"
label="人脸"> label="人脸"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-image style="max-height: 50px; max-width: 50px;" <el-image
style="max-height: 50px; max-width: 50px"
:src="scope.row.faceImg" :src="scope.row.faceImg"
:preview-src-list="[scope.row.faceImg]"> :preview-src-list="[scope.row.faceImg]"
<div slot="error" >
class="image-slot"> <div slot="error" class="image-slot">
<!-- <i class="el-icon-picture-outline"></i> --> <!-- <i class="el-icon-picture-outline"></i> -->
</div> </div>
</el-image> </el-image>
@ -349,28 +454,38 @@
</el-table-column> </el-table-column>
</el-table> </el-table>
<div class="resi-btns"> <div class="resi-btns">
<el-button @click="formShow = false">{{ $t('cancel') }}</el-button> <el-button @click="formShow = false">{{ $t("cancel") }}</el-button>
<el-button v-if="dialogType == 'check'" <el-button
v-if="dialogType == 'check'"
type="danger" type="danger"
@click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button> @click="checkHandle('1')"
<el-button v-if="dialogType == 'check'" >{{ $t("checkBTGBtn") }}</el-button
>
<el-button
v-if="dialogType == 'check'"
type="danger" type="danger"
@click="showAddHouse">{{ $t('checkTGBtn') }}</el-button> @click="showAddHouse"
>{{ $t("checkTGBtn") }}</el-button
>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
<!-- 新增房屋弹出框 --> <!-- 新增房屋弹出框 -->
<el-dialog :visible.sync="addHouseShow" <el-dialog
:visible.sync="addHouseShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
title="新增房屋" title="新增房屋"
width="900px" width="900px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="addHouseShow = false"> @closed="addHouseShow = false"
<room-form ref="ref_form" >
<room-form
ref="ref_form"
@dialogCancle="addHouseShow = false" @dialogCancle="addHouseShow = false"
@dialogOk="roomFormOk"></room-form> @dialogOk="roomFormOk"
></room-form>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -380,12 +495,12 @@ import { requestPost } from "@/js/dai/request";
import nextTick from "dai-js/tools/nextTick"; import nextTick from "dai-js/tools/nextTick";
import { mapGetters } from "vuex"; import { mapGetters } from "vuex";
import axios from "axios"; import axios from "axios";
import roomForm from './roomForm' import roomForm from "./roomForm";
export default { export default {
data() { data() {
return { return {
agencyId: '', agencyId: "",
openSearch: false, openSearch: false,
formShow: false, formShow: false,
@ -403,6 +518,8 @@ export default {
endTime: "", endTime: "",
address: "", address: "",
domicilePlace: "", domicilePlace: "",
checkState: "",
houseHolderName: "",
}, },
dataForm: {}, dataForm: {},
communityList: [], communityList: [],
@ -410,12 +527,17 @@ export default {
importBtnTitle: "导入", importBtnTitle: "导入",
importLoading: false, importLoading: false,
addHouseShow: false, addHouseShow: false,
dialogType: 'look', // 对话框是check审核还是look查看 dialogType: "look", // 对话框是check审核还是look查看
relationshipOptions: [] relationshipOptions: [],
} checkStateList: [
{ value: "0", label: "待审核" },
{ value: "1", label: "审核不通过" },
{ value: "2", label: "审核通过" },
],
};
}, },
components: { components: {
roomForm roomForm,
}, },
computed: { computed: {
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
@ -442,32 +564,34 @@ export default {
}, },
}, },
created() { created() {
this.agencyId = localStorage.getItem('agencyId') this.agencyId = localStorage.getItem("agencyId");
}, },
mounted() { mounted() {
// this.getcommunityList(); // this.getcommunityList();
this.getDictList() this.getDictList();
this.getTableData() this.getTableData();
}, },
methods: { methods: {
async getDictList() { async getDictList() {
const url = "/sys/dict/data/relationship" const url = "/sys/dict/data/relationship";
const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" }) const { data, code, msg } = await requestPost(url, {
formCode: "resi_base_info",
});
if (code === 0) { if (code === 0) {
this.relationshipOptions = [...data] this.relationshipOptions = [...data];
} else { } else {
this.$message.success("操作失败！") this.$message.success("操作失败！");
} }
}, },
getRelationshipName(value) { getRelationshipName(value) {
let label = '' let label = "";
this.relationshipOptions.forEach(item => { this.relationshipOptions.forEach((item) => {
if (item.value == value) { if (item.value == value) {
label = item.label label = item.label;
} }
}) });
return label return label;
}, },
arraySpanMethod({ row, column, rowIndex, columnIndex }) { arraySpanMethod({ row, column, rowIndex, columnIndex }) {
// console.log('row-----r', row) // console.log('row-----r', row)
@ -558,7 +682,7 @@ export default {
}, },
async handleWatch(type, row) { async handleWatch(type, row) {
this.dialogType = type this.dialogType = type;
// this.formShow = true; // this.formShow = true;
await nextTick(); await nextTick();
const url = "/epmetuser/icresicollect/detail"; const url = "/epmetuser/icresicollect/detail";
@ -571,7 +695,14 @@ export default {
console.log("data----de", data); console.log("data----de", data);
this.dataForm = { this.dataForm = {
...data, ...data,
houseType: data.houseType == '1' ? '出租' : data.houseType == '2' ? '闲置' : data.houseType == '3' ? '未售出' : '自住' // 1：出租 0：自住 2：闲置 3：未售出 houseType:
data.houseType == "1"
? "出租"
: data.houseType == "2"
? "闲置"
: data.houseType == "3"
? "未售出"
: "自住", // 1：出租 0：自住 2：闲置 3：未售出
}; };
// this.getTableData(); // this.getTableData();
this.formShow = true; this.formShow = true;
@ -617,33 +748,33 @@ export default {
} }
}, },
async getTableData() { async getTableData() {
const url = "/epmetuser/icresicollect/list" const url = "/epmetuser/icresicollect/list";
const { pageSize, pageNo, fmData } = this const { pageSize, pageNo, fmData } = this;
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
pageSize, pageSize,
pageNo, pageNo,
...fmData, ...fmData,
}) });
if (code === 0) { if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！") console.log("列表请求成功！！！！！！！！！！！！！！");
this.total = data.total || 0 this.total = data.total || 0;
let _i = 0 let _i = 0;
let arr = [] let arr = [];
this.spanIndex = this.spanIndex =
data.list && data.list &&
data.list.map((item, index) => { data.list.map((item, index) => {
if (index == 0) _i = 0 if (index == 0) _i = 0;
else _i = _i + data.list[index - 1].list.length; else _i = _i + data.list[index - 1].list.length;
arr.push(_i) arr.push(_i);
// console.log("_i-----", _i, arr) // console.log("_i-----", _i, arr)
// if (index === data.list.length - 1) firstIndex = _i - item.list.length // if (index === data.list.length - 1) firstIndex = _i - item.list.length
return { return {
firstIndex: _i, firstIndex: _i,
len: item.list.length, len: item.list.length,
} };
}) });
this.tableData = data.list && this.formatArr(data.list) this.tableData = data.list && this.formatArr(data.list);
console.log("tableData----0", this.spanIndex) console.log("tableData----0", this.spanIndex);
} else { } else {
} }
}, },
@ -674,13 +805,13 @@ export default {
return res; return res;
}, },
showAddHouse() { showAddHouse() {
if (this.dataForm.homeId == 'other') { if (this.dataForm.homeId == "other") {
this.addHouseShow = true this.addHouseShow = true;
this.$nextTick(() => { this.$nextTick(() => {
this.$refs.ref_form.initForm('add', null, this.dataForm.id) this.$refs.ref_form.initForm("add", null, this.dataForm.id);
}) });
} else { } else {
this.checkHandle('2') this.checkHandle("2");
} }
}, },
// 审核提交方法 // 审核提交方法
@ -688,74 +819,89 @@ export default {
const params = { const params = {
id: this.dataForm.id, id: this.dataForm.id,
checkState: type, // 0-未审核 1-未通过 2-已通过 checkState: type, // 0-未审核 1-未通过 2-已通过
checkReason: '', checkReason: "",
buildingUnitId: this.dataForm.buildingUnitId || '', buildingUnitId: this.dataForm.buildingUnitId || "",
doorName: this.dataForm.doorName || '' doorName: this.dataForm.doorName || "",
} };
if (type == '1') { if (type == "1") {
const h = this.$createElement const h = this.$createElement;
this.$prompt( this.$prompt(
h('p', null, [h('i', { style: 'color: red' }, '* '), h("p", null, [
h('span', null, '请输入不通过的原因：')]), h("i", { style: "color: red" }, "* "),
'提示', { h("span", null, "请输入不通过的原因："),
confirmButtonText: '确定', ]),
cancelButtonText: '取消', "提示",
{
confirmButtonText: "确定",
cancelButtonText: "取消",
inputPattern: /^.+$/, inputPattern: /^.+$/,
inputErrorMessage: '请输入原因' inputErrorMessage: "请输入原因",
}).then(({ value }) => { }
)
.then(({ value }) => {
// if (!value) { // if (!value) {
// return this.$message.error('请填写审核不通过原因') // return this.$message.error('请填写审核不通过原因')
// } // }
params.checkReason = value params.checkReason = value;
this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => { this.$http
.post("/epmetuser/icresicollect/collectCheck", params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg);
} }
this.formShow = false this.formShow = false;
this.getTableData() this.getTableData();
// 调用文件下发权限接口 // 调用文件下发权限接口
// this.fileJurisdiction(params) // this.fileJurisdiction(params)
}).catch(() => { })
}).catch(() => {
// 取消输入原因
}) })
.catch(() => {});
})
.catch(() => {
// 取消输入原因
});
} else { } else {
this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => { this.$http
.post("/epmetuser/icresicollect/collectCheck", params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg);
} }
this.addHouseShow = false this.addHouseShow = false;
this.formShow = false this.formShow = false;
this.getTableData() this.getTableData();
// 调用文件下发权限接口 // 调用文件下发权限接口
// this.fileJurisdiction(params) // this.fileJurisdiction(params)
}).catch(() => { }) })
.catch(() => {});
} }
}, },
// 文件下发权限接口 // 文件下发权限接口
fileJurisdiction(params) { fileJurisdiction(params) {
this.$http.post('/pli/power/rentContractInfo/send', params).then(({ data: res }) => { this.$http
.post("/pli/power/rentContractInfo/send", params)
.then(({ data: res }) => {
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.msg) return this.$message.error(res.msg);
} }
this.$message({ this.$message({
message: this.$t('prompt.success'), message: this.$t("prompt.success"),
type: 'success', type: "success",
duration: 500, duration: 500,
onClose: () => { onClose: () => {
this.disabledBtn = false this.disabledBtn = false;
this.checkVisible = false this.checkVisible = false;
this.visible = false this.visible = false;
this.$emit('refreshDataList') this.$emit("refreshDataList");
} },
});
}) })
}).catch(() => { }) .catch(() => {});
}, },
roomFormOk(e) { roomFormOk(e) {
this.dataForm.buildingUnitId = e.buildingUnitId this.dataForm.buildingUnitId = e.buildingUnitId;
this.dataForm.doorName = e.doorName this.dataForm.doorName = e.doorName;
this.checkHandle('2') this.checkHandle("2");
} },
}, },
}; };
</script> </script>

33
src/views/modules/base/organization/organization.vue
View File

@ -869,10 +869,12 @@
<script> <script>
import { requestPost, requestGet } from "@/js/dai/request"; import { requestPost, requestGet } from "@/js/dai/request";
import daiMap from "@/utils/dai-map"; import daiMap from "@/utils/dai-map";
import nextTick from "dai-js/tools/nextTick";
export default { export default {
data () { data () {
return { return {
gridLat:'',
gridLng:'',
// 新增组织弹窗 // 新增组织弹窗
createAgencyDialogFlag: false, createAgencyDialogFlag: false,
// 修改市区级组织弹窗 // 修改市区级组织弹窗
@ -1159,6 +1161,7 @@ export default {
}, },
modifyGridPop (val) { modifyGridPop (val) {
if (val) { if (val) {
console.log('1');
setTimeout(() => { setTimeout(() => {
this.createMap(); this.createMap();
}, 1000); }, 1000);
@ -1636,8 +1639,8 @@ export default {
(this.modifyGridFrom.gridTypeName = ""), (this.modifyGridFrom.gridTypeName = ""),
(this.modifyGridFrom.contacts = ""), (this.modifyGridFrom.contacts = ""),
(this.modifyGridFrom.mobile = ""), (this.modifyGridFrom.mobile = ""),
(this.latitude = ""), (this.gridLat = ""),
(this.longitude = ""), (this.gridLng = ""),
(this.modifyGridFrom.agencyId = ""), (this.modifyGridFrom.agencyId = ""),
(this.modifyGridFrom.gridType = ""), (this.modifyGridFrom.gridType = ""),
(this.modifyGridFrom.manageDistrict = ""), (this.modifyGridFrom.manageDistrict = ""),
@ -2388,7 +2391,6 @@ export default {
// 根据id获取组织机构详细信息 // 根据id获取组织机构详细信息
async getOrgDetailsById () { async getOrgDetailsById () {
const url = "/gov/org/agency/agencydetail"; const url = "/gov/org/agency/agencydetail";
let params = { let params = {
agencyId: this.judgeOrgInfoLevel.id, agencyId: this.judgeOrgInfoLevel.id,
}; };
@ -2451,7 +2453,6 @@ export default {
}; };
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
this.modifyGridFrom.gridName = data.gridName; this.modifyGridFrom.gridName = data.gridName;
this.modifyGridFrom.code = data.code; this.modifyGridFrom.code = data.code;
@ -2463,6 +2464,8 @@ export default {
this.modifyGridFrom.manageDistrict = data.manageDistrict; this.modifyGridFrom.manageDistrict = data.manageDistrict;
this.modifyGridFrom.griId = data.grid; this.modifyGridFrom.griId = data.grid;
this.modifyGridFrom.gridSort = data.gridSort; this.modifyGridFrom.gridSort = data.gridSort;
this.latitude = data.latitude,
this.longitude =data.longitude
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -2491,7 +2494,7 @@ export default {
this.getAgencyList(); this.getAgencyList();
this.getDepartmentList(); this.getDepartmentList();
this.getGridList(); this.getGridList();
this.agencyPeo(); // this.agencyPeo();
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -2516,7 +2519,7 @@ export default {
this.getAgencyList(); this.getAgencyList();
this.getDepartmentList(); this.getDepartmentList();
this.getGridList(); this.getGridList();
this.agencyPeo(); // this.agencyPeo();
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -2524,7 +2527,6 @@ export default {
// 修改网格确定按钮 // 修改网格确定按钮
async submitModifyGrid () { async submitModifyGrid () {
const url = "/gov/org/grid/editgrid"; const url = "/gov/org/grid/editgrid";
let params = { let params = {
gridId: this.modifyGridFrom.griId, gridId: this.modifyGridFrom.griId,
gridName: this.modifyGridFrom.gridName, gridName: this.modifyGridFrom.gridName,
@ -2534,8 +2536,10 @@ export default {
code: this.modifyGridFrom.code, code: this.modifyGridFrom.code,
gridType: this.modifyGridFrom.gridType, gridType: this.modifyGridFrom.gridType,
sort: this.modifyGridFrom.gridSort, sort: this.modifyGridFrom.gridSort,
longitude:this.gridLng,
latitude:this.gridLat
}; };
console.log(params);
const { data, code, msg } = await requestPost(url, params); const { data, code, msg } = await requestPost(url, params);
if (code === 0) { if (code === 0) {
@ -2544,7 +2548,7 @@ export default {
this.getAgencyList(); this.getAgencyList();
this.getDepartmentList(); this.getDepartmentList();
this.getGridList(); this.getGridList();
this.agencyPeo(); // this.agencyPeo();
} else { } else {
this.$message.error(msg); this.$message.error(msg);
} }
@ -2602,9 +2606,8 @@ export default {
handleMoveCenter(e); handleMoveCenter(e);
}); });
// map.setCenter(latitude, longitude); map.setCenter(latitude, longitude);
map.setMarker(latitude, longitude); map.setMarker(latitude, longitude);
// setMarker(latitude, longitude); // setMarker(latitude, longitude);
// function setMarker(lat, lng) { // function setMarker(lat, lng) {
@ -2622,14 +2625,16 @@ export default {
// }, // },
// ]); // ]);
// } // }
let than = this
function handleMoveCenter (e) { function handleMoveCenter (e) {
console.log('看看能触发你吗?');
//修改地图中心点 //修改地图中心点
const { lat, lng } = map.getCenter(); const { lat, lng } = map.getCenter();
// const lat = lat; // const lat = lat;
// const lng = lng; // const lng = lng;
map.setMarker(lat, lng); map.setMarker(lat, lng);
than.gridLat=lat
than.gridLng=lng
// let { msg, data } = await map.getAddress(lat, lng); // let { msg, data } = await map.getAddress(lat, lng);
// if (msg == "success") { // if (msg == "success") {
// this.formData.address = data.address // this.formData.address = data.address

193
src/views/modules/partymember/icpartyorgtree.vue
View File

@ -1,9 +1,12 @@
<template> <template>
<el-card ref="searchCard" class="resi-card-table"> <el-card ref="searchCard" class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" <el-button
class="diy-button--add"
size="small" size="small"
@click="addOrUpdateHandle()">新增</el-button> @click="addOrUpdateHandle()"
>新增</el-button
>
</div> </div>
<!-- 列表表格 --> <!-- 列表表格 -->
<el-table <el-table
@ -14,89 +17,175 @@
row-key="id" row-key="id"
:tree-props="{ children: 'children', hasChildren: 'hasChildren' }" :tree-props="{ children: 'children', hasChildren: 'hasChildren' }"
:header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }" :header-cell-style="{ background: '#2195FE', color: '#FFFFFF' }"
:height="tableHeight"> :height="tableHeight"
<el-table-column prop="partyOrgName" min-width="250" label="党组织名称"></el-table-column> >
<el-table-column
prop="partyOrgName"
min-width="250"
label="党组织名称"
></el-table-column>
<el-table-column prop="partyOrgType" min-width="150" label="类别"> <el-table-column prop="partyOrgType" min-width="150" label="类别">
<template slot-scope="scope"> <template slot-scope="scope">
<span v-for="(item, index) in partyOrgTypes" <span
v-for="(item, index) in partyOrgTypes"
:key="item.value" :key="item.value"
:value="item.label" :value="item.label"
v-if="scope.row.partyOrgType == item.value"> v-if="scope.row.partyOrgType == item.value"
{{ item.label }}</span> >
{{ item.label }}</span
>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="principal" width="120" label="负责人"></el-table-column> <el-table-column
<el-table-column prop="principalMobile" width="150" label="联系方式"></el-table-column> prop="principal"
width="120"
label="负责人"
></el-table-column>
<el-table-column
prop="principalMobile"
width="150"
label="联系方式"
></el-table-column>
<el-table-column label="操作" align="center" width="300"> <el-table-column label="操作" align="center" width="300">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button v-if="scope.row.partyOrgType != '6'" <el-button
v-if="scope.row.partyOrgType != '6'"
@click="principal(scope.row)" @click="principal(scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">{{'负责人'}}</el-button> class="div-table-button--detail"
<el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '6'" >{{ principalBtnName(scope.row) }}</el-button
>
<el-button
v-if="
(scope.row.agencyId == agencyId ||
scope.row.agencyPids.includes(agencyId)) &&
scope.row.partyOrgType != '6'
"
@click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)" @click="handleLook(scope.row.agencyPids, scope.row.id, scope.row)"
type="text" type="text"
size="small" size="small"
class="div-table-button--detail">{{'查看党员'}}</el-button> class="div-table-button--detail"
<el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '5' && scope.row.partyOrgType != '6'" >{{ "查看党员" }}</el-button
@click="addOrUpdateHandle('', scope.row.id, scope.row.orgPids, scope.row.agencyId, scope.row.partyOrgType, scope.row.partyOrgName)" >
<el-button
v-if="
(scope.row.agencyId == agencyId ||
scope.row.agencyPids.includes(agencyId)) &&
scope.row.partyOrgType != '5' &&
scope.row.partyOrgType != '6'
"
@click="
addOrUpdateHandle(
'',
scope.row.id,
scope.row.orgPids,
scope.row.agencyId,
scope.row.partyOrgType,
scope.row.partyOrgName
)
"
type="text" type="text"
size="small" size="small"
class="div-table-button--add">新增下级</el-button> class="div-table-button--add"
<el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId)) && scope.row.partyOrgType != '6'" >新增下级</el-button
@click="addOrUpdateHandle(scope.row.id, '', '', scope.row.pid, scope.row.partyOrgType, '')" >
<el-button
v-if="
(scope.row.agencyId == agencyId ||
scope.row.agencyPids.includes(agencyId)) &&
scope.row.partyOrgType != '6'
"
@click="
addOrUpdateHandle(
scope.row.id,
'',
'',
scope.row.pid,
scope.row.partyOrgType,
''
)
"
type="text" type="text"
size="small" size="small"
class="div-table-button--edit">修改</el-button> class="div-table-button--edit"
<el-button v-if="(scope.row.agencyId == agencyId || scope.row.agencyPids.includes(agencyId))&& scope.row.partyOrgType != '6'" >修改</el-button
>
<el-button
v-if="
(scope.row.agencyId == agencyId ||
scope.row.agencyPids.includes(agencyId)) &&
scope.row.partyOrgType != '6'
"
@click="deleteAgency(scope.row.id)" @click="deleteAgency(scope.row.id)"
type="text" type="text"
size="small" size="small"
class="btn-color-del">删除</el-button> class="btn-color-del"
>删除</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
<add-or-update v-if="addOrUpdateVisible" ref="addOrUpdate" @refreshDataList="getTableData"></add-or-update> <add-or-update
v-if="addOrUpdateVisible"
ref="addOrUpdate"
@refreshDataList="getTableData"
></add-or-update>
<!-- 查看党员 --> <!-- 查看党员 -->
<el-dialog :visible.sync="lookMemberShow" <el-dialog
:visible.sync="lookMemberShow"
:close-on-click-modal="false" :close-on-click-modal="false"
:close-on-press-escape="false" :close-on-press-escape="false"
:title="memberTitle" :title="memberTitle"
width="1050px" width="1050px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
@closed="lookMemberClose"> @closed="lookMemberClose"
<look-Member ref="ref_table_Member" >
<look-Member
ref="ref_table_Member"
@lookMemberCancle="lookMemberCancle" @lookMemberCancle="lookMemberCancle"
@lookMemberOk="lookMemberOk"></look-Member> @lookMemberOk="lookMemberOk"
></look-Member>
</el-dialog> </el-dialog>
<el-dialog <el-dialog
title="负责人" :title="principalDialogTitle"
:visible.sync="principalShow" :visible.sync="principalShow"
width="850px" width="850px"
top="5vh" top="5vh"
class="dialog-h" class="dialog-h"
:before-close="handleClose"> :before-close="handleClose"
<el-form ref="refPrincipalRules" >
<el-form
ref="refPrincipalRules"
:inline="true" :inline="true"
:model="editPrincipalData" :model="editPrincipalData"
:rules="principalRules" :rules="principalRules"
class="div_form"> class="div_form"
<el-form-item label="负责人" >
<el-form-item label="姓名" label-width="150px" prop="principal">
<el-input
v-model="editPrincipalData.principal"
placeholder="请输入"
clearable
style="width: 200px"
class="item_width_4"
>
</el-input>
</el-form-item>
<el-form-item
label="联系电话"
label-width="150px" label-width="150px"
prop="principal"> prop="principalMobile"
<el-select v-model="editPrincipalData.principal" >
placeholder="请选择" <el-input
v-model="editPrincipalData.principalMobile"
placeholder="请输入"
clearable clearable
style="width: 200px" style="width: 200px"
class="item_width_4"> class="item_width_4"
<el-option v-for="item in staffs" >
:key="item.value" </el-input>
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</el-form-item> </el-form-item>
</el-form> </el-form>
<span slot="footer" class="dialog-footer"> <span slot="footer" class="dialog-footer">
@ -121,7 +210,8 @@
principal: '', principal: '',
principalMobile: '', principalMobile: '',
partyOrgId: '', partyOrgId: '',
principalStaffId: '' // principalStaffId: '',
principalMobile:''
}, },
searchH: 0, searchH: 0,
dataForm: { dataForm: {
@ -165,7 +255,8 @@
agencyId: '', agencyId: '',
addOrUpdateVisible: false, addOrUpdateVisible: false,
lookMemberShow: false, lookMemberShow: false,
memberTitle: '查看党员' memberTitle: '查看党员',
principalDialogTitle:'负责人'
} }
}, },
components: { components: {
@ -183,9 +274,15 @@
principalRules() { principalRules() {
return { return {
principal: [ principal: [
{required: true, message: '负责人不能为空', trigger: 'blur'} {required: true, message: '姓名不能为空', trigger: 'blur'}
] ]
} }
},
principalBtnName(){
return row =>{
let title = row.partyOrgType=='0'?'省委书记':row.partyOrgType=='1'?'市委书记':row.partyOrgType=='2'?'区委书记':row.partyOrgType=='3'?'党工委书记':row.partyOrgType=='4'?'党委书记':row.partyOrgType=='5'?'支部书记':row.partyOrgType=='6'?'党小组':'负责人'
return title
}
} }
}, },
mounted() { mounted() {
@ -209,6 +306,10 @@
}) })
this.editPrincipalData.partyOrgId = row.id this.editPrincipalData.partyOrgId = row.id
this.editPrincipalData.principal = row.principal this.editPrincipalData.principal = row.principal
this.editPrincipalData.principalMobile = row.principalMobile
let title = row.partyOrgType=='0'?'省委书记':row.partyOrgType=='1'?'市委书记':row.partyOrgType=='2'?'区委书记':row.partyOrgType=='3'?'党工委书记':row.partyOrgType=='4'?'党委书记':row.partyOrgType=='5'?'支部书记':row.partyOrgType=='6'?'党小组':'负责人'
this.principalDialogTitle = title
console.log(row);
this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{ this.$http.post('/data/aggregator/org/staff-select-list/'+row.agencyId,{'params': {}}).then(({ data: res }) =>{
if (res.code !== 0) { if (res.code !== 0) {
return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败') return this.$message.error(res.internalMsg ? res.internalMsg : res.msg ? res.msg : '查询失败')
@ -221,7 +322,7 @@
this.staffs.forEach(s => { this.staffs.forEach(s => {
if (this.editPrincipalData.principal === s.value){ if (this.editPrincipalData.principal === s.value){
this.editPrincipalData.principal = s.name this.editPrincipalData.principal = s.name
this.editPrincipalData.principalStaffId = s.value // this.editPrincipalData.principalStaffId = s.value
this.editPrincipalData.principalMobile = s.mobile this.editPrincipalData.principalMobile = s.mobile
} }
}) })
@ -249,7 +350,7 @@
principal: '', principal: '',
principalMobile: '', principalMobile: '',
partyOrgId: '', partyOrgId: '',
principalStaffId: '' // principalStaffId: ''
} }
}, },
// 查询列表 // 查询列表

Write Preview
Loading…
Cancel
Save