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
commit
3aeedca732
  1. 2
      src/views/main-navbar.vue
  2. 370
      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. 189
      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. 7
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

2
src/views/main-navbar.vue

@ -6,7 +6,7 @@
:class="`aui-navbar--${$store.state.navbarLayoutType}`"
>
<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:;">{{
$store.state.user.agencyName
}}</a>

370
src/views/modules/base/collect.vue

@ -1,12 +1,11 @@
<template>
<div class="resi-container">
<el-card ref="searchCard" class="search-card">
<el-form
ref="searchForm"
<el-card ref="searchCard"
class="search-card">
<el-form ref="searchForm"
:inline="true"
:model="fmData"
class="demo-form-inline"
>
class="demo-form-inline">
<!-- <el-form-item
v-if="communityList.length > 0"
label="所在社区"
@ -28,95 +27,82 @@
</el-option>
</el-select>
</el-form-item> -->
<el-form-item label="居住地址" prop="address">
<el-input
v-model="fmData.address"
<el-form-item label="居住地址"
prop="address">
<el-input v-model="fmData.address"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="户籍地址" prop="domicilePlace">
<el-input
v-model="fmData.domicilePlace"
<el-form-item label="户籍地址"
prop="domicilePlace">
<el-input v-model="fmData.domicilePlace"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入"
>
placeholder="请输入">
</el-input>
</el-form-item>
<el-form-item label="填写时间" prop="startTime">
<el-date-picker
v-model="timeRange"
<el-form-item label="填写时间"
prop="startTime">
<el-date-picker v-model="timeRange"
type="daterange"
clearable
size="small"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
value-format="yyyy-MM-dd"
>
value-format="yyyy-MM-dd">
</el-date-picker>
</el-form-item>
<el-form-item>
<el-button
class="diy-button--search"
<el-button class="diy-button--search"
size="small"
@click="handleSearch"
>查询</el-button
>
<el-button
class="diy-button--reset"
@click="handleSearch">查询</el-button>
<el-button class="diy-button--reset"
size="small"
@click="resetForm('searchForm')"
>重置</el-button
>
@click="resetForm('searchForm')">重置</el-button>
</el-form-item>
</el-form>
</el-card>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button @click="handleChu" class="diy-button--reset" size="small"
>导出</el-button
>
<el-button @click="handleChu"
class="diy-button--reset"
size="small">导出</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
border
style="width: 100%"
class="resi-table"
:height="tableHeight"
:span-method="arraySpanMethod"
>
<el-table-column label="序号" prop="desc" align="center" width="50"/>
<el-table-column
prop="houseHolderName"
:span-method="arraySpanMethod">
<el-table-column label="序号"
prop="desc"
align="center"
width="50" />
<el-table-column prop="houseHolderName"
width="100"
label="户主姓名"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="address"
:show-overflow-tooltip="true" />
<el-table-column prop="address"
align="center"
min-width="140"
label="居住地址"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
<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>
</template>
</el-table-column>
<el-table-column
prop="houseType"
<el-table-column prop="houseType"
align="center"
width="100"
label="房屋状态"
>
label="房屋状态">
<template slot-scope="scope">
<span v-if="scope.row.houseType == 1">出租</span>
<span v-if="scope.row.houseType == 2">闲置</span>
@ -124,109 +110,85 @@
<span v-if="scope.row.houseType == 0">自住</span>
</template>
</el-table-column>
<el-table-column
prop="totalResi"
<el-table-column prop="totalResi"
width="80"
align="center"
label="居住人数"
/>
<el-table-column
prop="memberName"
label="居住人数" />
<el-table-column prop="memberName"
width="100"
label="成员姓名"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberIdNum"
:show-overflow-tooltip="true" />
<el-table-column prop="memberIdNum"
width="180"
align="center"
label="成员证件号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberMobile"
:show-overflow-tooltip="true" />
<el-table-column prop="memberMobile"
width="140"
align="center"
label="成员手机号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="relationship"
:show-overflow-tooltip="true" />
<el-table-column prop="relationship"
min-width="120"
align="center"
label="与户主关系"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
<template slot-scope="scope">
<span>{{getRelationshipName(scope.row.relationship)}}</span>
</template>
</el-table-column>
<el-table-column
prop="heSuanCount"
<el-table-column prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数"
/>
label="核酸检测次数" />
<el-table-column
prop="ymjz"
<el-table-column prop="ymjz"
width="140"
align="center"
label="疫苗接种情况"
>
label="疫苗接种情况">
<template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span>
</template>
</el-table-column>
<el-table-column
prop="domicilePlace"
<el-table-column prop="domicilePlace"
min-width="140"
align="center"
label="户籍地址"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="workPlace"
:show-overflow-tooltip="true" />
<el-table-column prop="workPlace"
min-width="120"
align="center"
label="单位名称"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="remark"
:show-overflow-tooltip="true" />
<el-table-column prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="faceImg"
<el-table-column prop="faceImg"
min-width="120"
align="center"
label="人脸"
>
label="人脸">
<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"
: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> -->
</div>
</el-image>
</template>
</el-table-column>
<el-table-column
prop="checkState"
<el-table-column prop="checkState"
min-width="120"
align="center"
label="状态"
:show-overflow-tooltip="true"
fixed="right"
>
fixed="right">
<template slot-scope="scope">
<span v-if="scope.row.checkState === '0'">未审核</span>
<span v-else-if="scope.row.checkState === '1'">未通过</span>
@ -234,90 +196,81 @@
<span v-else></span>
</template>
</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">
<el-button
type="text"
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleWatch('look', scope.row)"
>查看</el-button
>
<el-button
type="text"
@click="handleWatch('look', scope.row)">查看</el-button>
<!-- <el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleWatch('check', scope.row)">审核</el-button> -->
<el-button type="text"
class="div-table-button--detail"
size="small"
v-if="scope.row.agencyId == agencyId && scope.row.checkState === '0'"
@click="handleWatch('check', scope.row)"
>审核</el-button
>
@click="handleWatch('check', scope.row)">审核</el-button>
</template>
</el-table-column>
</el-table>
<div>
<el-pagination
@size-change="handleSizeChange"
<el-pagination @size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page.sync="pageNo"
:page-sizes="[20, 50, 100, 200]"
:page-size="parseInt(pageSize)"
layout="sizes, prev, pager, next, total"
:total="total"
>
:total="total">
</el-pagination>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="信息详情"
width="1100px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
@closed="handleClose">
<div class="scroll-h">
<el-form
ref="ref_form"
<el-form ref="ref_form"
:inline="true"
:model="dataForm"
:disabled="true"
class="form"
>
<el-form-item
label="户主姓名:"
class="form">
<el-form-item label="户主姓名:"
prop="houseHolderName"
label-width="150px"
>
label-width="150px">
<!-- <el-input class="item_width_1"
v-model="dataForm.houseHolderName">
</el-input> -->
<div class="wd50">{{ dataForm.houseHolderName }}</div>
</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> -->
<div class="wd50">{{ dataForm.address }}</div>
</el-form-item>
<div>
<el-form-item
label="房屋状态:"
<el-form-item label="房屋状态:"
prop="houseType"
label-width="150px"
>
label-width="150px">
<!-- <el-input class="item_width_1"
v-model="dataForm.houseType">
</el-input> -->
<div class="wd50">{{ dataForm.houseType }}</div>
</el-form-item>
<el-form-item
label="居住人数:"
<el-form-item label="居住人数:"
prop="totalResi"
label-width="150px"
>
label-width="150px">
<!-- <el-input class="item_width_1"
v-model="dataForm.totalResi">
</el-input> -->
@ -325,92 +278,70 @@
</el-form-item>
</div>
</el-form>
<el-table
:data="dataForm.list"
<el-table :data="dataForm.list"
border
style="width: 1060px; margin: 20px"
class="resi-table"
:height="dialogTableHeight"
>
<el-table-column
label="序号"
:height="dialogTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column
prop="memberName"
width="50" />
<el-table-column prop="memberName"
width="100"
label="成员姓名"
align="center"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberIdNum"
:show-overflow-tooltip="true" />
<el-table-column prop="memberIdNum"
width="180"
align="center"
label="成员证件号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="memberMobile"
:show-overflow-tooltip="true" />
<el-table-column prop="memberMobile"
width="140"
align="center"
label="成员手机号"
:show-overflow-tooltip="true"
/>
<el-table-column
prop="heSuanCount"
:show-overflow-tooltip="true" />
<el-table-column prop="heSuanCount"
width="120"
align="center"
label="核酸检测次数"
/>
label="核酸检测次数" />
<el-table-column
prop="ymjz"
<el-table-column prop="ymjz"
width="140"
align="center"
label="疫苗接种情况"
>
label="疫苗接种情况">
<template slot-scope="scope">
<span v-if="scope.row.ymjz == 1">全程接种</span>
<span v-if="scope.row.ymjz == 2">未全程接种</span>
<span v-if="scope.row.ymjz == 0">未接种</span>
</template>
</el-table-column>
<el-table-column
prop="domicilePlace"
<el-table-column prop="domicilePlace"
min-width="140"
align="center"
label="户籍所在地 "
:show-overflow-tooltip="true"
/>
<el-table-column
prop="workPlace"
:show-overflow-tooltip="true" />
<el-table-column prop="workPlace"
min-width="120"
align="center"
label="单位或学校 "
:show-overflow-tooltip="true"
/>
<el-table-column
prop="remark"
:show-overflow-tooltip="true" />
<el-table-column prop="remark"
align="center"
label="备注"
:show-overflow-tooltip="true"
>
:show-overflow-tooltip="true">
</el-table-column>
<el-table-column
prop="faceImg"
<el-table-column prop="faceImg"
min-width="120"
align="center"
label="人脸"
>
label="人脸">
<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"
: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> -->
</div>
</el-image>
@ -419,8 +350,12 @@
</el-table>
<div class="resi-btns">
<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'" type="danger" @click="showAddHouse">{{ $t('checkTGBtn') }}</el-button>
<el-button v-if="dialogType == 'check'"
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>
</el-dialog>
@ -448,7 +383,7 @@ import axios from "axios";
import roomForm from './roomForm'
export default {
data() {
data () {
return {
agencyId: '',
openSearch: false,
@ -484,19 +419,19 @@ export default {
},
computed: {
...mapGetters(["clientHeight", "iframeHeight"]),
tableHeight() {
tableHeight () {
const h = this.clientHeight - 360 + this.iframeHeigh;
const _h = this.clientHeight - 360;
return this.$store.state.inIframe ? h : _h;
},
dialogTableHeight() {
dialogTableHeight () {
const h = this.clientHeight - 460 + this.iframeHeigh;
const _h = this.clientHeight - 460;
return this.$store.state.inIframe ? h : _h;
},
},
watch: {
timeRange(val) {
timeRange (val) {
if (Array.isArray(val) && val.length == 2) {
this.fmData.startTime = val[0];
this.fmData.endTime = val[1];
@ -515,12 +450,12 @@ export default {
this.getTableData()
},
methods: {
async getDictList() {
async getDictList () {
const url = "/sys/dict/data/relationship"
const { data, code, msg } = await requestPost(url, { formCode: "resi_base_info" })
if (code === 0) {
this.relationshipOptions = [ ...data ]
this.relationshipOptions = [...data]
} else {
this.$message.success("操作失败!")
}
@ -534,7 +469,7 @@ export default {
})
return label
},
arraySpanMethod({ row, column, rowIndex, columnIndex }) {
arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
// console.log('row-----r', row)
// console.log('column-----c', column)
if (
@ -562,7 +497,7 @@ export default {
}
}
},
async handleChu() {
async handleChu () {
const url = "/epmetuser/icresicollect/export";
const { pageSize, pageNo, fmData } = this;
axios({
@ -596,33 +531,33 @@ export default {
return this.$message.error("网络错误");
});
},
handleSizeChange(val) {
handleSizeChange (val) {
console.log(`每页 ${val}`);
this.pageSize = val;
window.localStorage.setItem("pageSize", val);
this.getTableData();
},
handleCurrentChange(val) {
handleCurrentChange (val) {
console.log(`当前页: ${val}`);
this.pageNo = val;
this.getTableData();
},
handleClose() {
handleClose () {
this.formShow = false;
},
handleSearch(val) {
handleSearch (val) {
console.log(this.fmData);
this.pageNo = 1;
this.getTableData();
},
resetForm(formName) {
resetForm (formName) {
this.$refs[formName].resetFields();
this.timeRange = "";
this.handleSearch();
},
async handleWatch(type, row) {
async handleWatch (type, row) {
this.dialogType = type
// this.formShow = true;
await nextTick();
@ -645,17 +580,17 @@ export default {
}
},
async handleEdit(rowIndex) {
async handleEdit (rowIndex) {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm("edit", this.tableData[rowIndex]);
},
handleEditSuccess() {
handleEditSuccess () {
this.handleClose();
this.getTableData();
},
async handleDel(rowData, rowIndex) {
async handleDel (rowData, rowIndex) {
console.log(rowData, rowIndex);
const url =
"/heart/iccommunityselforganization/delcommunityselforganization";
@ -672,7 +607,7 @@ export default {
this.$message.success("操作失败!");
}
},
async getcommunityList() {
async getcommunityList () {
const url = "/gov/org/agency/community-list";
const { data, code, msg } = await requestPost(url);
if (code === 0) {
@ -681,7 +616,7 @@ export default {
} else {
}
},
async getTableData() {
async getTableData () {
const url = "/epmetuser/icresicollect/list"
const { pageSize, pageNo, fmData } = this
const { data, code, msg } = await requestPost(url, {
@ -713,7 +648,7 @@ export default {
}
},
//
formatArr(arr) {
formatArr (arr) {
let res = [];
let arr1 = arr.map((n, index) => {
return {
@ -758,10 +693,19 @@ export default {
doorName: this.dataForm.doorName || ''
}
if (type == '1') {
this.$prompt('请输入不通过的原因', '提示', {
const h = this.$createElement
this.$prompt(
h('p', null, [h('i', { style: 'color: red' }, '* '),
h('span', null, '请输入不通过的原因:')]),
'提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
inputPattern: /^.+$/,
inputErrorMessage: '请输入原因'
}).then(({ value }) => {
// if (!value) {
// return this.$message.error('')
// }
params.checkReason = value
this.$http.post('/epmetuser/icresicollect/collectCheck', params).then(({ data: res }) => {
if (res.code !== 0) {
@ -771,7 +715,7 @@ export default {
this.getTableData()
//
// this.fileJurisdiction(params)
}).catch(() => {})
}).catch(() => { })
}).catch(() => {
//
})
@ -785,7 +729,7 @@ export default {
this.getTableData()
//
// this.fileJurisdiction(params)
}).catch(() => {})
}).catch(() => { })
}
},
//
@ -805,7 +749,7 @@ export default {
this.$emit('refreshDataList')
}
})
}).catch(() => {})
}).catch(() => { })
},
roomFormOk (e) {
this.dataForm.buildingUnitId = e.buildingUnitId
@ -856,8 +800,8 @@ export default {
}
.badge {
display: block;
color: #F1F2E5;
background-color: #D7000F;
color: #f1f2e5;
background-color: #d7000f;
border-radius: 12px;
width: 70px;
}

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

@ -126,7 +126,16 @@
height="350">
<el-table-column prop="name"
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"
label="本级工作人员职责"
width="260">
@ -161,10 +170,16 @@
type="info"
icon="el-icon-rank"
@click="transfer(scope.row)">调动</el-button>
<el-button size="mini"
<el-button v-if="scope.row.enableFlag==='enable'"
size="mini"
type="danger"
icon="el-icon-circle-close"
@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>
</el-table-column>
</el-table>
@ -177,6 +192,7 @@
<el-table-column prop="name"
label="下级机关单位/基层科室工作人员"
width="260"></el-table-column>
<el-table-column prop="roles"
label="下级机关单位/基层科室工作人员职责"
width="260">
@ -1894,6 +1910,47 @@ export default {
this.DisableForm.staffId = row.staffId;
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 () {
const url = "/epmetuser/customerstaff/disabledstaff";

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

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

189
src/views/modules/communityService/dqfwzx/index.vue

@ -2,24 +2,26 @@
<div>
<el-card class="resi-card-table">
<div class="resi-row-btn">
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
<el-button class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
</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="list" :class="{ 'z-iframe': $store.state.inIframe }">
<div
@click="currentIndex = index"
<div class="list"
:class="{ 'z-iframe': $store.state.inIframe }">
<div @click="currentIndex = index"
class="item"
:class="{ 'z-on': currentIndex == index }"
:key="'ct' + index"
v-for="(item, index) in tableData"
>
v-for="(item, index) in tableData">
<div class="item-btns">
<a v-if="currentIndex == index" @click="handleEdit">修改</a>
<a v-if="currentIndex == index" @click="handleDel">删除</a>
<a v-if="currentIndex == index"
@click="handleEdit">修改</a>
<a v-if="currentIndex == index"
@click="handleDel">删除</a>
</div>
<div class="item-name">{{ item.centerName }}</div>
@ -49,108 +51,93 @@
>
</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
style="width: 100%"
class="resi-table"
:max-height="maxTableHeight"
>
<el-table-column
label="序号"
:max-height="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50"
/>
<el-table-column prop="matterName" label="事项名称">
width="50" />
<el-table-column prop="matterName"
label="事项名称">
</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
fixed="right"
<el-table-column fixed="right"
label="操作"
align="center"
width="120"
>
width="120">
<template slot-scope="scope">
<el-button
@click="handleOrder(scope.$index)"
<el-button @click="handleOrder(scope.$index)"
type="text"
size="small"
style="color: #1c6afd"
>预约</el-button
>
style="color: #1c6afd">预约</el-button>
<el-button
@click="handleOrderList(scope.$index)"
<el-button @click="handleOrderList(scope.$index)"
type="text"
size="small"
style="margin-right: 10px; color: #1c6afd"
>预约记录</el-button
>
style="margin-right: 10px; color: #1c6afd">预约记录</el-button>
</template>
</el-table-column>
</el-table>
</div>
</div>
<div class="m-hint" v-else>
<el-empty description="暂无内容" :image-size="200"></el-empty>
<div class="m-hint"
v-else>
<el-empty description="暂无内容"
:image-size="200"></el-empty>
</div>
</el-card>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="formShow"
<el-dialog :visible.sync="formShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="formTitle"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleClose"
>
<edit-form
ref="eleEditForm"
@closed="handleClose">
<edit-form ref="eleEditForm"
@dialogCancle="handleClose"
@dialogOk="handleEditSuccess"
></edit-form>
@dialogOk="handleEditSuccess"></edit-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="form2Show"
<el-dialog :visible.sync="form2Show"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseForm2"
>
<order-form
ref="eleOrderForm"
@closed="handleCloseForm2">
<order-form ref="eleOrderForm"
@dialogCancle="handleCloseForm2"
@dialogOk="handleOrderSuccess"
></order-form>
@dialogOk="handleOrderSuccess"></order-form>
</el-dialog>
<!-- 修改弹出框 -->
<el-dialog
:visible.sync="orderListShow"
<el-dialog :visible.sync="orderListShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
title="预约记录"
width="850px"
top="5vh"
class="dialog-h"
@closed="handleCloseOrderList"
>
<order-list
ref="eleOrderList"
@dialogCancle="handleCloseOrderList"
></order-list>
@closed="handleCloseOrderList">
<order-list ref="eleOrderList"
@dialogCancle="handleCloseOrderList"></order-list>
</el-dialog>
</div>
</template>
@ -168,7 +155,7 @@ var map;
export default {
components: { editForm, orderForm, orderList },
data() {
data () {
return {
openSearch: false,
@ -185,7 +172,7 @@ export default {
};
},
computed: {
maxTableHeight() {
maxTableHeight () {
return this.$store.state.inIframe
? this.clientHeight - 520 + 120
: this.clientHeight - 520;
@ -193,17 +180,17 @@ export default {
...mapGetters(["clientHeight"]),
},
watch: {
currentIndex() {
currentIndex () {
this.setMap();
},
},
async mounted() {
async mounted () {
await this.loadAgency();
await this.getTableData();
},
methods: {
// init
initMap() {
initMap () {
let { latitude, longitude } = this.$store.state.user;
map = new daiMap(
@ -217,7 +204,7 @@ export default {
);
},
setMap() {
setMap () {
const { tableData, currentIndex } = this;
let item = tableData[currentIndex];
if (item) {
@ -226,24 +213,24 @@ export default {
}
},
handleClose() {
handleClose () {
this.formShow = false;
},
handleCloseForm2() {
handleCloseForm2 () {
this.form2Show = false;
},
handleCloseOrderList() {
handleCloseOrderList () {
this.orderListShow = false;
},
async handleAdd() {
async handleAdd () {
this.formShow = true;
await nextTick();
console.log(this.$refs);
this.$refs.eleEditForm.initForm("add");
},
async handleWatch() {
async handleWatch () {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm(
@ -252,7 +239,7 @@ export default {
);
},
async handleEdit() {
async handleEdit () {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm(
@ -261,12 +248,12 @@ export default {
);
},
handleEditSuccess() {
handleEditSuccess () {
this.handleClose();
this.getTableData();
},
async handleOrder(index) {
async handleOrder (index) {
this.form2Show = true;
await nextTick();
this.$refs.eleOrderForm.initForm(
@ -276,18 +263,18 @@ export default {
);
},
handleOrderSuccess() {
handleOrderSuccess () {
this.handleCloseForm2();
},
async handleOrderList(index) {
async handleOrderList (index) {
this.orderListShow = true;
await nextTick(0);
console.log(this.$refs);
this.$refs.eleOrderList.init(this.tableData[this.currentIndex], index);
},
async handleDel() {
async handleDel () {
if (!confirm("删除后不可恢复,确定删除?")) return;
const item = this.tableData[this.currentIndex];
@ -303,7 +290,7 @@ export default {
}
},
async getTableData() {
async getTableData () {
const oldLen = this.tableData.length;
const url = "/gov/org/icpartyservicecenter/partyservicecenterlist";
const { data, code, msg } = await requestPost(url, {
@ -312,6 +299,46 @@ export default {
});
if (code === 0) {
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;
@ -324,7 +351,7 @@ export default {
},
//
async loadAgency() {
async loadAgency () {
const url = "/epmetuser/customerstaff/staffbasicinfo";
let params = {};

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

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

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

@ -101,30 +101,30 @@
<el-form-item label="出租人" label-width="100px">
<el-input size="small" v-model="dataForm.lessorName" placeholder='出租人' clearable @keyup.native="btKeyUpLessorName"></el-input>
</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-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-form-item>
<br/>
<el-form-item label="承租人" label-width="100px">
<el-input size="small" v-model="dataForm.lesseeName" placeholder='承租人' clearable @keyup.native="btKeyUpLesseeName"></el-input>
</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-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-form-item>
<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-option v-for="item in endDateArr" :key="item.dictValue" :label="item.dictName" :value="item.dictValue">
</el-option>
</el-select>
</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"
type="date" size="small"
:picker-options="pickerBeginDateBefore"

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

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

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

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

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

@ -92,7 +92,8 @@
</div>
<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"
:total="demand.total"
background
@ -321,7 +322,7 @@
<span>{{ selInfo.address }}</span>
</div>
<div class="popContentTitle">规模
<span>{{ selInfo.scale }}</span>
<span>{{ selInfo.scaleName }}</span>
</div>
<div class="popContentTitle">负责人
<span>{{ selInfo.personInCharge }}</span>

7
src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

@ -89,7 +89,8 @@
</div>
<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"
:total="demand.total"
background
@ -318,7 +319,7 @@
<span>{{ selInfo.address }}</span>
</div>
<div class="popContentTitle">规模
<span>{{ selInfo.scale }}</span>
<span>{{ selInfo.scaleName }}</span>
</div>
<div class="popContentTitle">负责人
<span>{{ selInfo.personInCharge }}</span>
@ -1035,7 +1036,7 @@ const vueGis = {
async loadEnterprisePartrol (info) {
const url = "/gov/org/enterprise/detail/" + info.id
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/enterprise/detail"
debugger
const { data, code, msg } = await requestPost(url)
if (code === 0) {

Loading…
Cancel
Save