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

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

# Conflicts:
#	src/views/main-shuju/main-navbar.vue
yantai_master
jiangyy 3 years ago
parent
075333caf4 5568174f14
commit
3aeedca732
11 changed files with 621 additions and 518 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. 2
      src/views/main-navbar.vue
  2. 668
      src/views/modules/base/collect.vue
  3. 61
      src/views/modules/base/organization/organization.vue
  4. 81
      src/views/modules/communityService/dqfwzx/cpts/edit.vue
  5. 261
      src/views/modules/communityService/dqfwzx/index.vue
  6. 2
      src/views/modules/communityService/fuwujilu/detailForm.vue
  7. 12
      src/views/modules/plugins/rent/rentcontractinfo.vue
  8. 4
      src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
  9. 2
      src/views/modules/visual/command/cpts/popup.vue
  10. 5
      src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
  11. 41
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

2
src/views/main-navbar.vue
View File

@ -6,7 +6,7 @@
:class="`aui-navbar--${$store.state.navbarLayoutType}`" :class="`aui-navbar--${$store.state.navbarLayoutType}`"
> >
<div class="aui-navbar__header"> <div class="aui-navbar__header">
<h1 class="aui-navbar__brand" @click="$router.push({ name: 'home' })"> <h1 class="aui-navbar__brand">
<a class="aui-navbar__brand-lg" href="javascript:;">{{ <a class="aui-navbar__brand-lg" href="javascript:;">{{
$store.state.user.agencyName $store.state.user.agencyName
}}</a> }}</a>

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

@ -1,12 +1,11 @@
<template> <template>
<div class="resi-container"> <div class="resi-container">
<el-card ref="searchCard" class="search-card"> <el-card ref="searchCard"
<el-form class="search-card">
ref="searchForm" <el-form 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="所在社区"
@ -28,95 +27,82 @@
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> --> </el-form-item> -->
<el-form-item label="居住地址" prop="address"> <el-form-item label="居住地址"
<el-input prop="address">
v-model="fmData.address" <el-input v-model="fmData.address"
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="户籍地址" prop="domicilePlace"> <el-form-item label="户籍地址"
<el-input prop="domicilePlace">
v-model="fmData.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="填写时间" prop="startTime"> <el-form-item label="填写时间"
<el-date-picker prop="startTime">
v-model="timeRange" <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 <el-button class="diy-button--search"
class="diy-button--search" size="small"
size="small" @click="handleSearch">查询</el-button>
@click="handleSearch" <el-button class="diy-button--reset"
>查询</el-button size="small"
> @click="resetForm('searchForm')">重置</el-button>
<el-button
class="diy-button--reset"
size="small"
@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" class="diy-button--reset" size="small" <el-button @click="handleChu"
>导出</el-button class="diy-button--reset"
> size="small">导出</el-button>
</div> </div>
<el-table <el-table :data="tableData"
: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 align="center"
prop="address" min-width="140"
align="center" label="居住地址"
min-width="140" :show-overflow-tooltip="true">
label="居住地址"
:show-overflow-tooltip="true"
>
<template slot-scope="scope"> <template slot-scope="scope">
<span v-if="scope.row.homeId == 'other'" class="badge">房屋缺失</span> <span v-if="scope.row.homeId == 'other'"
class="badge">房屋缺失</span>
<span>{{scope.row.address}}</span> <span>{{scope.row.address}}</span>
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="houseType"
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>
@ -124,200 +110,167 @@
<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 <el-table-column prop="totalResi"
prop="totalResi" width="80"
width="80" align="center"
align="center" label="居住人数" />
label="居住人数" <el-table-column prop="memberName"
/> width="100"
<el-table-column label="成员姓名"
prop="memberName" align="center"
width="100" :show-overflow-tooltip="true" />
label="成员姓名" <el-table-column prop="memberIdNum"
align="center" width="180"
:show-overflow-tooltip="true" align="center"
/> label="成员证件号"
<el-table-column :show-overflow-tooltip="true" />
prop="memberIdNum" <el-table-column prop="memberMobile"
width="180" width="140"
align="center" align="center"
label="成员证件号" label="成员手机号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="relationship"
<el-table-column min-width="120"
prop="memberMobile" align="center"
width="140" label="与户主关系"
align="center" :show-overflow-tooltip="true">
label="成员手机号" <template slot-scope="scope">
:show-overflow-tooltip="true" <span>{{getRelationshipName(scope.row.relationship)}}</span>
/> </template>
<el-table-column
prop="relationship"
min-width="120"
align="center"
label="与户主关系"
:show-overflow-tooltip="true"
>
<template slot-scope="scope">
<span>{{getRelationshipName(scope.row.relationship)}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="heSuanCount"
prop="heSuanCount" width="120"
width="120" align="center"
align="center" label="核酸检测次数" />
label="核酸检测次数"
/>
<el-table-column <el-table-column prop="ymjz"
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 <el-table-column prop="domicilePlace"
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"
/> min-width="120"
<el-table-column align="center"
prop="workPlace" label="单位名称"
min-width="120" :show-overflow-tooltip="true" />
align="center" <el-table-column prop="remark"
label="单位名称" align="center"
:show-overflow-tooltip="true" label="备注"
/> :show-overflow-tooltip="true">
<el-table-column
prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="faceImg"
prop="faceImg" min-width="120"
min-width="120" align="center"
align="center" label="人脸">
label="人脸" <template slot-scope="scope">
> <el-image style="max-height: 50px; max-width: 50px;"
<template slot-scope="scope"> :src="scope.row.faceImg"
<el-image :preview-src-list="[scope.row.faceImg]">
style="max-height: 50px; max-width: 50px;" <div slot="error"
:src="scope.row.faceImg" class="image-slot">
:preview-src-list="[scope.row.faceImg]"> <!-- <i class="el-icon-picture-outline"></i> -->
<div slot="error" class="image-slot"> </div>
<!-- <i class="el-icon-picture-outline"></i> --> </el-image>
</div> </template>
</el-image>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="checkState"
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">
> <span v-if="scope.row.checkState === '0'">未审核</span>
<template slot-scope="scope"> <span v-else-if="scope.row.checkState === '1'">未通过</span>
<span v-if="scope.row.checkState === '0'">未审核</span> <span v-else-if="scope.row.checkState === '2'">已通过</span>
<span v-else-if="scope.row.checkState === '1'">未通过</span> <span v-else></span>
<span v-else-if="scope.row.checkState === '2'">已通过</span> </template>
<span v-else></span>
</template>
</el-table-column> </el-table-column>
<el-table-column label="操作" align="center" width="100" fixed="right"> <el-table-column label="操作"
align="center"
width="100"
fixed="right">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button type="text"
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 type="text"
>查看</el-button class="div-table-button--detail"
> size="small"
<el-button @click="handleWatch('check', scope.row)">审核</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="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
@click="handleWatch('check', scope.row)" @click="handleWatch('check', scope.row)">审核</el-button>
>审核</el-button
>
</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="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 <el-dialog :visible.sync="formShow"
: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 <el-form ref="ref_form"
ref="ref_form" :inline="true"
:inline="true" :model="dataForm"
:model="dataForm" :disabled="true"
:disabled="true" class="form">
class="form" <el-form-item label="户主姓名:"
> prop="houseHolderName"
<el-form-item label-width="150px">
label="户主姓名:"
prop="houseHolderName"
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="居住地址:" prop="address" label-width="150px"> <el-form-item label="居住地址:"
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 <el-form-item label="房屋状态:"
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 <el-form-item label="居住人数:"
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> -->
@ -325,102 +278,84 @@
</el-form-item> </el-form-item>
</div> </div>
</el-form> </el-form>
<el-table <el-table :data="dataForm.list"
: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="序号"
> type="index"
<el-table-column align="center"
label="序号" width="50" />
type="index" <el-table-column prop="memberName"
align="center" width="100"
width="50" label="成员姓名"
/> align="center"
<el-table-column :show-overflow-tooltip="true" />
prop="memberName" <el-table-column prop="memberIdNum"
width="100" width="180"
label="成员姓名" align="center"
align="center" label="成员证件号"
:show-overflow-tooltip="true" :show-overflow-tooltip="true" />
/> <el-table-column prop="memberMobile"
<el-table-column width="140"
prop="memberIdNum" align="center"
width="180" label="成员手机号"
align="center" :show-overflow-tooltip="true" />
label="成员证件号" <el-table-column prop="heSuanCount"
:show-overflow-tooltip="true" width="120"
/> align="center"
<el-table-column label="核酸检测次数" />
prop="memberMobile"
width="140"
align="center"
label="成员手机号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数"
/>
<el-table-column <el-table-column prop="ymjz"
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 <el-table-column prop="domicilePlace"
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"
/> min-width="120"
<el-table-column align="center"
prop="workPlace" label="单位或学校 "
min-width="120" :show-overflow-tooltip="true" />
align="center" <el-table-column prop="remark"
label="单位或学校 " align="center"
:show-overflow-tooltip="true" label="备注"
/> :show-overflow-tooltip="true">
<el-table-column
prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true"
>
</el-table-column> </el-table-column>
<el-table-column <el-table-column prop="faceImg"
prop="faceImg" min-width="120"
min-width="120" align="center"
align="center" label="人脸">
label="人脸" <template slot-scope="scope">
> <el-image style="max-height: 50px; max-width: 50px;"
<template slot-scope="scope"> :src="scope.row.faceImg"
<el-image :preview-src-list="[scope.row.faceImg]">
style="max-height: 50px; max-width: 50px;" <div slot="error"
:src="scope.row.faceImg" class="image-slot">
:preview-src-list="[scope.row.faceImg]"> <!-- <i class="el-icon-picture-outline"></i> -->
<div slot="error" class="image-slot"> </div>
<!-- <i class="el-icon-picture-outline"></i> --> </el-image>
</div> </template>
</el-image>
</template>
</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'" type="danger" @click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button> <el-button v-if="dialogType == 'check'"
<el-button v-if="dialogType == 'check'" type="danger" @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button> type="danger"
@click="checkHandle('1')">{{ $t('checkBTGBtn') }}</el-button>
<el-button v-if="dialogType == 'check'"
type="danger"
@click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
</div> </div>
</div> </div>
</el-dialog> </el-dialog>
@ -448,7 +383,7 @@ 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,
@ -484,19 +419,19 @@ export default {
}, },
computed: { computed: {
...mapGetters(["clientHeight", "iframeHeight"]), ...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() { tableHeight () {
const h = this.clientHeight - 360 + this.iframeHeigh; const h = this.clientHeight - 360 + this.iframeHeigh;
const _h = this.clientHeight - 360; const _h = this.clientHeight - 360;
return this.$store.state.inIframe ? h : _h; return this.$store.state.inIframe ? h : _h;
}, },
dialogTableHeight() { dialogTableHeight () {
const h = this.clientHeight - 460 + this.iframeHeigh; const h = this.clientHeight - 460 + this.iframeHeigh;
const _h = this.clientHeight - 460; const _h = this.clientHeight - 460;
return this.$store.state.inIframe ? h : _h; return this.$store.state.inIframe ? h : _h;
}, },
}, },
watch: { watch: {
timeRange(val) { timeRange (val) {
if (Array.isArray(val) && val.length == 2) { if (Array.isArray(val) && val.length == 2) {
this.fmData.startTime = val[0]; this.fmData.startTime = val[0];
this.fmData.endTime = val[1]; this.fmData.endTime = val[1];
@ -515,12 +450,12 @@ export default {
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("操作失败！")
} }
@ -534,7 +469,7 @@ export default {
}) })
return label return label
}, },
arraySpanMethod({ row, column, rowIndex, columnIndex }) { arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
// console.log('row-----r', row) // console.log('row-----r', row)
// console.log('column-----c', column) // console.log('column-----c', column)
if ( if (
@ -562,7 +497,7 @@ export default {
} }
} }
}, },
async handleChu() { async handleChu () {
const url = "/epmetuser/icresicollect/export"; const url = "/epmetuser/icresicollect/export";
const { pageSize, pageNo, fmData } = this; const { pageSize, pageNo, fmData } = this;
axios({ axios({
@ -596,33 +531,33 @@ export default {
return this.$message.error("网络错误"); return this.$message.error("网络错误");
}); });
}, },
handleSizeChange(val) { handleSizeChange (val) {
console.log(`每页 ${val} 条`); console.log(`每页 ${val} 条`);
this.pageSize = val; this.pageSize = val;
window.localStorage.setItem("pageSize", val); window.localStorage.setItem("pageSize", val);
this.getTableData(); this.getTableData();
}, },
handleCurrentChange(val) { handleCurrentChange (val) {
console.log(`当前页: ${val}`); console.log(`当前页: ${val}`);
this.pageNo = val; this.pageNo = val;
this.getTableData(); this.getTableData();
}, },
handleClose() { handleClose () {
this.formShow = false; this.formShow = false;
}, },
handleSearch(val) { handleSearch (val) {
console.log(this.fmData); console.log(this.fmData);
this.pageNo = 1; this.pageNo = 1;
this.getTableData(); this.getTableData();
}, },
resetForm(formName) { resetForm (formName) {
this.$refs[formName].resetFields(); this.$refs[formName].resetFields();
this.timeRange = ""; this.timeRange = "";
this.handleSearch(); this.handleSearch();
}, },
async handleWatch(type, row) { async handleWatch (type, row) {
this.dialogType = type this.dialogType = type
// this.formShow = true; // this.formShow = true;
await nextTick(); await nextTick();
@ -645,17 +580,17 @@ export default {
} }
}, },
async handleEdit(rowIndex) { async handleEdit (rowIndex) {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]); this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
}, },
handleEditSuccess() { handleEditSuccess () {
this.handleClose(); this.handleClose();
this.getTableData(); this.getTableData();
}, },
async handleDel(rowData, rowIndex) { async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex); console.log(rowData, rowIndex);
const url = const url =
"/heart/iccommunityselforganization/delcommunityselforganization"; "/heart/iccommunityselforganization/delcommunityselforganization";
@ -672,7 +607,7 @@ export default {
this.$message.success("操作失败！"); this.$message.success("操作失败！");
} }
}, },
async getcommunityList() { async getcommunityList () {
const url = "/gov/org/agency/community-list"; const url = "/gov/org/agency/community-list";
const { data, code, msg } = await requestPost(url); const { data, code, msg } = await requestPost(url);
if (code === 0) { if (code === 0) {
@ -681,7 +616,7 @@ export default {
} else { } else {
} }
}, },
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, {
@ -713,7 +648,7 @@ export default {
} }
}, },
// 数组扁平化 // 数组扁平化
formatArr(arr) { formatArr (arr) {
let res = []; let res = [];
let arr1 = arr.map((n, index) => { let arr1 = arr.map((n, index) => {
return { return {
@ -721,13 +656,13 @@ export default {
list: list:
n.list.length > 0 n.list.length > 0
? n.list.map((i) => { ? n.list.map((i) => {
return { return {
...n, ...n,
...i, ...i,
desc: index + 1, desc: index + 1,
list: [], list: [],
}; };
}) })
: [], : [],
}; };
}); });
@ -758,10 +693,19 @@ export default {
doorName: this.dataForm.doorName || '' doorName: this.dataForm.doorName || ''
} }
if (type == '1') { if (type == '1') {
this.$prompt('请输入不通过的原因', '提示', { const h = this.$createElement
this.$prompt(
h('p', null, [h('i', { style: 'color: red' }, '* '),
h('span', null, '请输入不通过的原因：')]),
'提示', {
confirmButtonText: '确定', confirmButtonText: '确定',
cancelButtonText: '取消', cancelButtonText: '取消',
inputPattern: /^.+$/,
inputErrorMessage: '请输入原因'
}).then(({ value }) => { }).then(({ value }) => {
// if (!value) {
// 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) {
@ -771,7 +715,7 @@ export default {
this.getTableData() this.getTableData()
// 调用文件下发权限接口 // 调用文件下发权限接口
// this.fileJurisdiction(params) // this.fileJurisdiction(params)
}).catch(() => {}) }).catch(() => { })
}).catch(() => { }).catch(() => {
// 取消输入原因 // 取消输入原因
}) })
@ -785,7 +729,7 @@ export default {
this.getTableData() this.getTableData()
// 调用文件下发权限接口 // 调用文件下发权限接口
// this.fileJurisdiction(params) // this.fileJurisdiction(params)
}).catch(() => {}) }).catch(() => { })
} }
}, },
// 文件下发权限接口 // 文件下发权限接口
@ -795,17 +739,17 @@ export default {
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
@ -856,8 +800,8 @@ export default {
} }
.badge { .badge {
display: block; display: block;
color: #F1F2E5; color: #f1f2e5;
background-color: #D7000F; background-color: #d7000f;
border-radius: 12px; border-radius: 12px;
width: 70px; width: 70px;
} }

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

@ -126,7 +126,16 @@
height="350"> height="350">
<el-table-column prop="name" <el-table-column prop="name"
label="本级工作人员名字" label="本级工作人员名字"
width="260"></el-table-column> width="260">
<template slot-scope="scope">
<span>{{scope.row.name}}</span>
<el-tag v-if="scope.row.enableFlag==='disabled'"
type="danger"
style="margin-left:10px"
size="mini"
disable-transitions>{{ '已禁用' }}</el-tag>
</template>
</el-table-column>
<el-table-column prop="roles" <el-table-column prop="roles"
label="本级工作人员职责" label="本级工作人员职责"
width="260"> width="260">
@ -161,10 +170,16 @@
type="info" type="info"
icon="el-icon-rank" icon="el-icon-rank"
@click="transfer(scope.row)">调动</el-button> @click="transfer(scope.row)">调动</el-button>
<el-button size="mini" <el-button v-if="scope.row.enableFlag==='enable'"
size="mini"
type="danger" type="danger"
icon="el-icon-circle-close" icon="el-icon-circle-close"
@click="DisablePeo(scope.row)">禁用</el-button> @click="DisablePeo(scope.row)">禁用</el-button>
<el-button v-if="scope.row.enableFlag==='disabled'"
size="mini"
type="danger"
icon="el-icon-circle-close"
@click="enablestaff(scope.row)">解禁</el-button>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
@ -177,6 +192,7 @@
<el-table-column prop="name" <el-table-column prop="name"
label="下级机关单位/基层科室工作人员" label="下级机关单位/基层科室工作人员"
width="260"></el-table-column> width="260"></el-table-column>
<el-table-column prop="roles" <el-table-column prop="roles"
label="下级机关单位/基层科室工作人员职责" label="下级机关单位/基层科室工作人员职责"
width="260"> width="260">
@ -1894,6 +1910,47 @@ export default {
this.DisableForm.staffId = row.staffId; this.DisableForm.staffId = row.staffId;
this.Disable = true; this.Disable = true;
}, },
enablestaff (row) {
this.$confirm("确认解禁该员工?", "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
})
.then(() => {
this.submitEnable(row)
})
.catch(err => {
if (err == "cancel") {
// this.$message({
// type: "info",
// message: "已取消删除"
// });
}
});
},
// 确定解禁
async submitEnable (row) {
const url = "/epmetuser/customerstaff/enablestaff";
let params = {
staffId: row.staffId,
};
const { data, code, msg } = await requestPost(url, params);
if (code === 0) {
this.$message.success("解禁成功");
this.Disable = false;
this.getAgencyList();
this.getDepartmentList();
this.getGridList();
this.getAgencyStaffListData();
} else {
this.$message.error(msg);
}
},
// 确定禁用 // 确定禁用
async submitDisable () { async submitDisable () {
const url = "/epmetuser/customerstaff/disabledstaff"; const url = "/epmetuser/customerstaff/disabledstaff";

81
src/views/modules/communityService/dqfwzx/cpts/edit.vue
View File

@ -169,8 +169,23 @@
:value="item.value"> :value="item.value">
</el-option> </el-option>
</el-select> </el-select>
<el-select v-if="item.appointmentType==='custom'"
<el-time-select style="width: 120px; margin-left: 20px" style="width: 300px; margin-left: 10px"
v-model="item.customList"
filterable
multiple
placeholder="请选择"
:disabled="item.matterId != undefined">
<el-option v-for="item in customOption"
:key="item.value"
:label="item.label"
:value="item.value">
</el-option>
</el-select>
</div>
<div class="item-pic"
style="margin-top:20px;">
<el-time-select style="width: 150px; "
v-model="item.startTime" v-model="item.startTime"
:picker-options="{ :picker-options="{
start: '00:00', start: '00:00',
@ -181,7 +196,7 @@
:disabled="item.matterId != undefined"> :disabled="item.matterId != undefined">
</el-time-select> </el-time-select>
<span style="margin: 0 5px">至</span> <span style="margin: 0 5px">至</span>
<el-time-select style="width: 120px" <el-time-select style="width: 150px"
v-model="item.endTime" v-model="item.endTime"
:picker-options="{ :picker-options="{
start: '00:00', start: '00:00',
@ -196,6 +211,7 @@
size="small" size="small"
@click="handleDelStaff(index)">删除</el-button> @click="handleDelStaff(index)">删除</el-button>
</div> </div>
</div> </div>
<div class="item-add"> <div class="item-add">
@ -261,6 +277,41 @@ export default {
label: "周末", label: "周末",
value: "weekend", value: "weekend",
}, },
{
label: "自定义",
value: "custom",
},
],
customOption: [
{
label: "周日",
value: "1",
},
{
label: "周一",
value: "2",
},
{
label: "周二",
value: "3",
},
{
label: "周三",
value: "4",
},
{
label: "周四",
value: "5",
},
{
label: "周五",
value: "6",
},
{
label: "周六",
value: "7",
},
], ],
dataForm: { dataForm: {
@ -350,6 +401,8 @@ export default {
matterImg: "", matterImg: "",
startTime: "", startTime: "",
endTime: "", endTime: "",
customDay: "",
customList: []
}, },
]; ];
}, },
@ -470,6 +523,15 @@ export default {
this.dataForm = { ...this.dataForm, ...row }; this.dataForm = { ...this.dataForm, ...row };
this.partyServiceCenterId = this.dataForm.partyServiceCenterId; this.partyServiceCenterId = this.dataForm.partyServiceCenterId;
this.dataForm.matterList.forEach(element => {
if (element.customDay) {
element.customList = element.customDay.split(',')
} else {
element.customList = []
}
});
} else { } else {
this.dataForm.latitude = latitude this.dataForm.latitude = latitude
this.dataForm.longitude = longitude this.dataForm.longitude = longitude
@ -491,7 +553,7 @@ export default {
this.btnDisable = true; this.btnDisable = true;
setTimeout(() => { setTimeout(() => {
this.btnDisable = false; this.btnDisable = false;
}, 10000); }, 5000);
this.$refs["ref_form"].validate((valid, messageObj) => { this.$refs["ref_form"].validate((valid, messageObj) => {
if (!valid) { if (!valid) {
app.util.validateRule(messageObj); app.util.validateRule(messageObj);
@ -516,14 +578,17 @@ export default {
const matterList = this.dataForm.matterList.filter( const matterList = this.dataForm.matterList.filter(
(item) => !item.matterId (item) => !item.matterId
); );
if ( if (
matterList.some( matterList.some(
(item) => (item) =>
!item.matterImg || !item.matterImg ||
!item.matterName || !item.matterName ||
!item.appointmentType || !item.appointmentType ||
!item.startTime || !item.startTime ||
!item.endTime !item.endTime || (item.appointmentType === 'custom' && item.customList.length === 0)
) )
) { ) {
return this.$message({ return this.$message({
@ -532,6 +597,12 @@ export default {
}); });
} }
matterList.forEach(element => {
element.customDay = element.customList.join(',')
});
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
...this.dataForm, ...this.dataForm,
matterList, matterList,

261
src/views/modules/communityService/dqfwzx/index.vue
View File

@ -2,24 +2,26 @@
<div> <div>
<el-card class="resi-card-table"> <el-card class="resi-card-table">
<div class="resi-row-btn"> <div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd" <el-button class="diy-button--add"
>新增</el-button size="small"
> @click="handleAdd">新增</el-button>
</div> </div>
<div class="m-center" v-if="tableData.length > 0"> <div class="m-center"
v-if="tableData.length > 0">
<div class="center-left"> <div class="center-left">
<div class="list" :class="{ 'z-iframe': $store.state.inIframe }"> <div class="list"
<div :class="{ 'z-iframe': $store.state.inIframe }">
@click="currentIndex = index" <div @click="currentIndex = index"
class="item" class="item"
:class="{ 'z-on': currentIndex == index }" :class="{ 'z-on': currentIndex == index }"
:key="'ct' + index" :key="'ct' + index"
v-for="(item, index) in tableData" v-for="(item, index) in tableData">
>
<div class="item-btns"> <div class="item-btns">
<a v-if="currentIndex == index" @click="handleEdit">修改</a> <a v-if="currentIndex == index"
<a v-if="currentIndex == index" @click="handleDel">删除</a> @click="handleEdit">修改</a>
<a v-if="currentIndex == index"
@click="handleDel">删除</a>
</div> </div>
<div class="item-name">{{ item.centerName }}</div> <div class="item-name">{{ item.centerName }}</div>
@ -49,108 +51,93 @@
> >
</div> --> </div> -->
<div id="centerIndexApp" class="div_map"></div> <div id="centerIndexApp"
class="div_map"></div>
<el-table
:data="tableData[currentIndex].matterList" <el-table :data="tableData[currentIndex].matterList"
border border
style="width: 100%" style="width: 100%"
class="resi-table" class="resi-table"
:max-height="maxTableHeight" :max-height="maxTableHeight">
> <el-table-column label="序号"
<el-table-column type="index"
label="序号" align="center"
type="index" width="50" />
align="center" <el-table-column prop="matterName"
width="50" label="事项名称">
/>
<el-table-column prop="matterName" label="事项名称">
</el-table-column> </el-table-column>
<el-table-column prop="allowTime" label="可预约时间 "> <el-table-column prop="allowTime"
label="可预约时间 ">
<template slot-scope="scope">
<span v-if="scope.row.appointmentType==='custom'">{{scope.row.showName}}</span>
<span v-else>{{scope.row.allowTime}}</span>
</template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column fixed="right"
fixed="right" label="操作"
label="操作" align="center"
align="center" width="120">
width="120"
>
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button @click="handleOrder(scope.$index)"
@click="handleOrder(scope.$index)" type="text"
type="text" size="small"
size="small" style="color: #1c6afd">预约</el-button>
style="color: #1c6afd"
>预约</el-button <el-button @click="handleOrderList(scope.$index)"
> type="text"
size="small"
<el-button style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
@click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd"
>预约记录</el-button
>
</template> </template>
</el-table-column> </el-table-column>
</el-table> </el-table>
</div> </div>
</div> </div>
<div class="m-hint" v-else> <div class="m-hint"
<el-empty description="暂无内容" :image-size="200"></el-empty> v-else>
<el-empty description="暂无内容"
:image-size="200"></el-empty>
</div> </div>
</el-card> </el-card>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="formShow"
:visible.sync="formShow" :close-on-click-modal="false"
:close-on-click-modal="false" :close-on-press-escape="false"
:close-on-press-escape="false" :title="formTitle"
:title="formTitle" width="850px"
width="850px" top="5vh"
top="5vh" class="dialog-h"
class="dialog-h" @closed="handleClose">
@closed="handleClose" <edit-form ref="eleEditForm"
> @dialogCancle="handleClose"
<edit-form @dialogOk="handleEditSuccess"></edit-form>
ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
</el-dialog> </el-dialog>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="form2Show"
:visible.sync="form2Show" :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="handleCloseForm2">
@closed="handleCloseForm2" <order-form ref="eleOrderForm"
> @dialogCancle="handleCloseForm2"
<order-form @dialogOk="handleOrderSuccess"></order-form>
ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"
></order-form>
</el-dialog> </el-dialog>
<!-- 修改弹出框 --> <!-- 修改弹出框 -->
<el-dialog <el-dialog :visible.sync="orderListShow"
:visible.sync="orderListShow" :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="handleCloseOrderList">
@closed="handleCloseOrderList" <order-list ref="eleOrderList"
> @dialogCancle="handleCloseOrderList"></order-list>
<order-list
ref="eleOrderList"
@dialogCancle="handleCloseOrderList"
></order-list>
</el-dialog> </el-dialog>
</div> </div>
</template> </template>
@ -168,7 +155,7 @@ var map;
export default { export default {
components: { editForm, orderForm, orderList }, components: { editForm, orderForm, orderList },
data() { data () {
return { return {
openSearch: false, openSearch: false,
@ -185,7 +172,7 @@ export default {
}; };
}, },
computed: { computed: {
maxTableHeight() { maxTableHeight () {
return this.$store.state.inIframe return this.$store.state.inIframe
? this.clientHeight - 520 + 120 ? this.clientHeight - 520 + 120
: this.clientHeight - 520; : this.clientHeight - 520;
@ -193,17 +180,17 @@ export default {
...mapGetters(["clientHeight"]), ...mapGetters(["clientHeight"]),
}, },
watch: { watch: {
currentIndex() { currentIndex () {
this.setMap(); this.setMap();
}, },
}, },
async mounted() { async mounted () {
await this.loadAgency(); await this.loadAgency();
await this.getTableData(); await this.getTableData();
}, },
methods: { methods: {
// 地图初始化函数，本例取名为init，开发者可根据实际情况定义 // 地图初始化函数，本例取名为init，开发者可根据实际情况定义
initMap() { initMap () {
let { latitude, longitude } = this.$store.state.user; let { latitude, longitude } = this.$store.state.user;
map = new daiMap( map = new daiMap(
@ -217,7 +204,7 @@ export default {
); );
}, },
setMap() { setMap () {
const { tableData, currentIndex } = this; const { tableData, currentIndex } = this;
let item = tableData[currentIndex]; let item = tableData[currentIndex];
if (item) { if (item) {
@ -226,24 +213,24 @@ export default {
} }
}, },
handleClose() { handleClose () {
this.formShow = false; this.formShow = false;
}, },
handleCloseForm2() { handleCloseForm2 () {
this.form2Show = false; this.form2Show = false;
}, },
handleCloseOrderList() { handleCloseOrderList () {
this.orderListShow = false; this.orderListShow = false;
}, },
async handleAdd() { async handleAdd () {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
console.log(this.$refs); console.log(this.$refs);
this.$refs.eleEditForm.initForm("add"); this.$refs.eleEditForm.initForm("add");
}, },
async handleWatch() { async handleWatch () {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm( this.$refs.eleEditForm.initForm(
@ -252,7 +239,7 @@ export default {
); );
}, },
async handleEdit() { async handleEdit () {
this.formShow = true; this.formShow = true;
await nextTick(); await nextTick();
this.$refs.eleEditForm.initForm( this.$refs.eleEditForm.initForm(
@ -261,12 +248,12 @@ export default {
); );
}, },
handleEditSuccess() { handleEditSuccess () {
this.handleClose(); this.handleClose();
this.getTableData(); this.getTableData();
}, },
async handleOrder(index) { async handleOrder (index) {
this.form2Show = true; this.form2Show = true;
await nextTick(); await nextTick();
this.$refs.eleOrderForm.initForm( this.$refs.eleOrderForm.initForm(
@ -276,18 +263,18 @@ export default {
); );
}, },
handleOrderSuccess() { handleOrderSuccess () {
this.handleCloseForm2(); this.handleCloseForm2();
}, },
async handleOrderList(index) { async handleOrderList (index) {
this.orderListShow = true; this.orderListShow = true;
await nextTick(0); await nextTick(0);
console.log(this.$refs); console.log(this.$refs);
this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index); this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
}, },
async handleDel() { async handleDel () {
if (!confirm("删除后不可恢复，确定删除？")) return; if (!confirm("删除后不可恢复，确定删除？")) return;
const item = this.tableData[this.currentIndex]; const item = this.tableData[this.currentIndex];
@ -303,7 +290,7 @@ export default {
} }
}, },
async getTableData() { async getTableData () {
const oldLen = this.tableData.length; const oldLen = this.tableData.length;
const url = "/gov/org/icpartyservicecenter/partyservicecenterlist"; const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
const { data, code, msg } = await requestPost(url, { const { data, code, msg } = await requestPost(url, {
@ -312,6 +299,46 @@ export default {
}); });
if (code === 0) { if (code === 0) {
console.log("列表请求成功！！！！！！！！！！！！！！"); console.log("列表请求成功！！！！！！！！！！！！！！");
data.forEach(tableItem => {
if (tableItem.matterList.length > 0) {
tableItem.matterList.forEach(element => {
if (element.appointmentType === 'custom') {
let showName = ''
let customList = element.customDay.split(',')
let customNameList = []
customList.forEach(customItem => {
if (customItem === '1') {
customNameList.push('周日')
}
if (customItem === '2') {
customNameList.push('周一')
}
if (customItem === '3') {
customNameList.push('周二')
}
if (customItem === '4') {
customNameList.push('周三')
}
if (customItem === '5') {
customNameList.push('周四')
}
if (customItem === '6') {
customNameList.push('周五')
}
if (customItem === '7') {
customNameList.push('周六')
}
});
showName = customNameList.join('、')
showName = showName + ' ' + element.startTime + '-' + element.endTime
element.showName = showName
}
});
}
});
this.tableData = data; this.tableData = data;
@ -324,7 +351,7 @@ export default {
}, },
//加载组织 //加载组织
async loadAgency() { async loadAgency () {
const url = "/epmetuser/customerstaff/staffbasicinfo"; const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {}; let params = {};

2
src/views/modules/communityService/fuwujilu/detailForm.vue
View File

@ -21,7 +21,7 @@
<div class="info-prop"> <div class="info-prop">
<span class="info-title-2">政策依据：</span> <span class="info-title-2">政策依据：</span>
<span>{{ formData.policyName||'--' }}</span> <span>{{ formData.policyTitle||'--' }}</span>
<el-button v-if="formData.policyId" <el-button v-if="formData.policyId"
style="margin-left: 10px" style="margin-left: 10px"
type="primary" type="primary"

12
src/views/modules/plugins/rent/rentcontractinfo.vue
View File

@ -101,30 +101,30 @@
<el-form-item label="出租人" label-width="100px"> <el-form-item label="出租人" label-width="100px">
<el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input> <el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出租人证件号" label-width="100px"> <el-form-item label="出租人证件号" label-width="110px">
<el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input> <el-input size="small" v-model="dataForm.lessorIdCard" placeholder='出租人证件号' clearable @keyup.native="btKeyUpLessorIdCard"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="出租人手机号" label-width="100px"> <el-form-item label="出租人手机号" label-width="110px">
<el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input> <el-input size="small" v-model="dataForm.lessorMobile" placeholder='出租人手机号' clearable @keyup.native="btKeyUpLessorMobile"></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
<el-form-item label="承租人" label-width="100px"> <el-form-item label="承租人" label-width="100px">
<el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input> <el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="承租人证件号" label-width="100px"> <el-form-item label="承租人证件号" label-width="110px">
<el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input> <el-input size="small" v-model="dataForm.lesseeIdCard" placeholder='承租人证件号' clearable @keyup.native="btKeyUpLesseeIdCard"></el-input>
</el-form-item> </el-form-item>
<el-form-item label="承租人手机号" label-width="100px"> <el-form-item label="承租人手机号" label-width="110px">
<el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input> <el-input size="small" v-model="dataForm.lesseeMobile" placeholder='承租人手机号' clearable @keyup.native="btKeyUpLesseeMobile"></el-input>
</el-form-item> </el-form-item>
<br/> <br/>
<el-form-item label="合同到期时间" prop="endDate" label-width="100px"> <el-form-item label="合同到期时间" prop="endDate" label-width="110px">
<el-select size="small" v-model="dataForm.endDate" placeholder="合同到期时间" clearable> <el-select size="small" v-model="dataForm.endDate" placeholder="合同到期时间" clearable>
<el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue"> <el-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option> </el-option>
</el-select> </el-select>
</el-form-item> </el-form-item>
<el-form-item label="合同签订时间" prop="startTime" label-width="100px"> <el-form-item label="合同签订时间" prop="startTime" label-width="110px">
<el-date-picker v-model="dataForm.startTime" <el-date-picker v-model="dataForm.startTime"
type="date" size="small" type="date" size="small"
:picker-options="pickerBeginDateBefore" :picker-options="pickerBeginDateBefore"

4
src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
View File

@ -43,6 +43,7 @@
width="200px"> width="200px">
<template slot-scope="scope"> <template slot-scope="scope">
<el-select v-if="scope.row.isEdit" <el-select v-if="scope.row.isEdit"
filterable
v-model="scope.row.staffId" v-model="scope.row.staffId"
placeholder="请选择" placeholder="请选择"
class="input-width" class="input-width"
@ -121,7 +122,8 @@
width="150px"> width="150px">
<template slot-scope="scope"> <template slot-scope="scope">
<div v-if="scope.row.isEdit"> <div v-if="scope.row.isEdit">
<el-upload :headers="$getElUploadHeaders()" class="avatar-uploader" <el-upload :headers="$getElUploadHeaders()"
class="avatar-uploader"
:action="uploadUrl" :action="uploadUrl"
:data="{ customerId: customerId }" :data="{ customerId: customerId }"
:show-file-list="true" :show-file-list="true"

2
src/views/modules/visual/command/cpts/popup.vue
View File

@ -360,7 +360,7 @@
</div> </div>
<div class="item"> <div class="item">
规模： 规模：
<span>{{ info.scale || "--" }}</span> <span>{{ info.scaleName || "--" }}</span>
</div> </div>
<div class="item"> <div class="item">
负责人： 负责人：

5
src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue
View File

@ -92,7 +92,8 @@
</div> </div>
<div class="m-pagination"> <div class="m-pagination">
<el-pagination hide-on-single-page :current-page="demand.pageNo" <el-pagination hide-on-single-page
:current-page="demand.pageNo"
:page-size="demand.pageSize" :page-size="demand.pageSize"
:total="demand.total" :total="demand.total"
background background
@ -321,7 +322,7 @@
<span>{{ selInfo.address }}</span> <span>{{ selInfo.address }}</span>
</div> </div>
<div class="popContentTitle">规模： <div class="popContentTitle">规模：
<span>{{ selInfo.scale }}</span> <span>{{ selInfo.scaleName }}</span>
</div> </div>
<div class="popContentTitle">负责人： <div class="popContentTitle">负责人：
<span>{{ selInfo.personInCharge }}</span> <span>{{ selInfo.personInCharge }}</span>

41
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue
View File

@ -31,24 +31,24 @@
<div class="div_coverage"> <div class="div_coverage">
<div class="coverage_item" <div class="coverage_item"
@click="handleClickCoverage(index)" @click="handleClickCoverage(index)"
v-for="(item,index) in coverageTypesList" v-for="(item,index) in coverageTypesList"
:key="index"> :key="index">
<img :src="item.select?selImg:noSelImg" /> <img :src="item.select?selImg:noSelImg" />
<span>{{item.label}}</span> <span>{{item.label}}</span>
</div> </div>
</div> </div>
<div class="div_category"> <div class="div_category">
<div v-for="(item,index) in categoryListshow" <div v-for="(item,index) in categoryListshow"
:key="index" :key="index"
class="category_item"> class="category_item">
<div v-for="(colItem,colIndex) in item" <div v-for="(colItem,colIndex) in item"
:key="colIndex" :key="colIndex"
class="list_item" class="list_item"
@click="handleClickCategory(index,colIndex)"> @click="handleClickCategory(index,colIndex)">
<img :src="colItem.dataIcon" <img :src="colItem.dataIcon"
alt /> alt />
<div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}} <div :class="['item_content',colItem.sel?'item_content_sel':'']">{{colItem.categoryName}}
</div> </div>
@ -68,14 +68,14 @@
placeholder="请输入搜索内容" placeholder="请输入搜索内容"
v-model="search"> v-model="search">
<i slot="prefix" <i slot="prefix"
class="icon"> class="icon">
<img src="../../../../../assets/img/modules/visual/sousuo.png" <img src="../../../../../assets/img/modules/visual/sousuo.png"
alt /> alt />
</i> </i>
</el-input> </el-input>
<div class="btn" <div class="btn"
@click="handleSearch">搜索</div> @click="handleSearch">搜索</div>
</div> </div>
<div class="m-tb"> <div class="m-tb">
@ -89,12 +89,13 @@
</div> </div>
<div class="m-pagination"> <div class="m-pagination">
<el-pagination hide-on-single-page :current-page="demand.pageNo" <el-pagination hide-on-single-page
:page-size="demand.pageSize" :current-page="demand.pageNo"
:total="demand.total" :page-size="demand.pageSize"
background :total="demand.total"
layout="prev, pager, next,total" background
@current-change="handlePageNoChange_demand"> layout="prev, pager, next,total"
@current-change="handlePageNoChange_demand">
</el-pagination> </el-pagination>
</div> </div>
</div> </div>
@ -318,7 +319,7 @@
<span>{{ selInfo.address }}</span> <span>{{ selInfo.address }}</span>
</div> </div>
<div class="popContentTitle">规模： <div class="popContentTitle">规模：
<span>{{ selInfo.scale }}</span> <span>{{ selInfo.scaleName }}</span>
</div> </div>
<div class="popContentTitle">负责人： <div class="popContentTitle">负责人：
<span>{{ selInfo.personInCharge }}</span> <span>{{ selInfo.personInCharge }}</span>
@ -1035,7 +1036,7 @@ const vueGis = {
async loadEnterprisePartrol (info) { async loadEnterprisePartrol (info) {
const url = "/gov/org/enterprise/detail/" + info.id const url = "/gov/org/enterprise/detail/" + info.id
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail" // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
debugger
const { data, code, msg } = await requestPost(url) const { data, code, msg } = await requestPost(url)
if (code === 0) { if (code === 0) {

Write Preview
Loading…
Cancel
Save