Browse Source

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

master
13176889840 3 years ago
parent
commit
1b9c7602ae
  1. 193
      src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
  2. 220
      src/views/modules/visual/communityGovern/fivelayers/qsydw.vue

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

@ -1,149 +1,127 @@
<template>
<div class="m-record" style="padding: 0 20px">
<div class="m-record"
style="padding: 0 20px">
<h3>巡查记录</h3>
<div class="mt10" v-if="formType == 'edit'">
<el-button
size="small"
class="diy-button--add"
<div class="mt10"
v-if="formType == 'edit'">
<el-button size="small"
:class="[source==='manage'?'diy-button--add':'diy-button--export']"
:disabled="btnDisabled || disabled"
@click="handleAdd"
>新增</el-button
>
@click="handleAdd">新增</el-button>
</div>
<el-table
:data="tableData"
<el-table :data="tableData"
row-key="id"
border
style="width: 100%"
:header-cell-style="getRowClass"
>
<el-table-column label="序号" type="index" align="center" width="50">
:header-cell-style="getRowClass">
<el-table-column label="序号"
type="index"
align="center"
width="50">
</el-table-column>
<el-table-column
prop="patrolTime"
<el-table-column prop="patrolTime"
label="巡查时间"
align="center"
width="200px"
>
width="200px">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.isEdit"
<el-date-picker v-if="scope.row.isEdit"
v-model="scope.row.patrolTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
placeholder="选择日期">
</el-date-picker>
<div v-else class="div-content">{{ scope.row.patrolTime }}</div>
<div v-else
class="div-content">{{ scope.row.patrolTime }}</div>
</template>
</el-table-column>
<el-table-column
prop="staffId"
<el-table-column prop="staffId"
label="巡查人员"
align="center"
width="200px"
>
width="200px">
<template slot-scope="scope">
<el-select
v-if="scope.row.isEdit"
<el-select v-if="scope.row.isEdit"
v-model="scope.row.staffId"
placeholder="请选择"
class="input-width"
@change="handleChangeStaff(scope.row)"
clearable
>
<el-option
v-for="subItem in optionStaff"
clearable>
<el-option v-for="subItem in optionStaff"
:key="subItem.value"
:label="subItem.label"
:value="subItem.value"
>
:value="subItem.value">
</el-option>
</el-select>
<div v-else class="div-content">{{ scope.row.staffName }}</div>
<div v-else
class="div-content">{{ scope.row.staffName }}</div>
</template>
</el-table-column>
<el-table-column
prop="mobile"
<el-table-column prop="mobile"
label="联系电话"
align="center"
width="200px"
>
width="200px">
<template slot-scope="scope">
<el-input
v-if="scope.row.isEdit"
<el-input v-if="scope.row.isEdit"
type="number"
v-model="scope.row.mobile"
placeholder="请输入"
class="input-width"
clearable
disabled
></el-input>
<div v-else class="div-content">{{ scope.row.mobile }}</div>
disabled></el-input>
<div v-else
class="div-content">{{ scope.row.mobile }}</div>
</template>
</el-table-column>
<el-table-column
prop="result"
<el-table-column prop="result"
label="巡查结果"
align="center"
width="200px"
>
width="200px">
<template slot-scope="scope">
<el-select
v-if="scope.row.isEdit"
<el-select v-if="scope.row.isEdit"
v-model="scope.row.result"
placeholder="请选择"
class="input-width"
size="small"
clearable
>
<el-option
v-for="subItem in optionResult"
clearable>
<el-option v-for="subItem in optionResult"
:key="subItem.value"
:label="subItem.label"
:value="subItem.value"
>
:value="subItem.value">
</el-option>
</el-select>
<div v-else class="div-content">{{ scope.row.resultName }}</div>
<div v-else
class="div-content">{{ scope.row.resultName }}</div>
</template>
</el-table-column>
<el-table-column
prop="detailed"
<el-table-column prop="detailed"
label="隐患明细"
align="center"
width="200px"
>
width="200px">
<template slot-scope="scope">
<el-input
v-if="scope.row.isEdit"
<el-input v-if="scope.row.isEdit"
type="text"
v-model="scope.row.detailed"
placeholder="请输入"
class="input-width"
maxlength="500"
clearable
></el-input>
<div v-else class="div-content">{{ scope.row.detailed }}</div>
clearable></el-input>
<div v-else
class="div-content">{{ scope.row.detailed }}</div>
</template>
</el-table-column>
<el-table-column
prop="imgList"
<el-table-column prop="imgList"
label="图片列表"
align="center"
width="150px"
>
width="150px">
<template slot-scope="scope">
<div v-if="scope.row.isEdit">
<el-upload
class="avatar-uploader"
<el-upload class="avatar-uploader"
:action="uploadUrl"
:data="{ customerId: customerId }"
:show-file-list="true"
@ -152,92 +130,71 @@
:on-success="(res) => handleImgSuccess(res, scope.row)"
:on-remove="(res) => handleImgRemove(res, scope.row)"
list-type="picture"
:before-upload="beforeImgUpload"
>
:before-upload="beforeImgUpload">
<i class="el-icon-plus avatar-uploader-icon"></i> 最多三张图片
</el-upload>
</div>
<div v-else class="div-content">
<el-image
v-if="scope.row.imgList.length > 0"
<div v-else
class="div-content">
<el-image v-if="scope.row.imgList.length > 0"
style="width: 100px; height: 50px"
:src="scope.row.imgList[0]"
fit="cover"
:preview-src-list="scope.row.imgList"
></el-image>
:preview-src-list="scope.row.imgList"></el-image>
</div>
</template>
</el-table-column>
<el-table-column
prop="reviewTime"
<el-table-column prop="reviewTime"
label="拟复查时间"
align="center"
width="200px"
>
width="200px">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.isEdit"
<el-date-picker v-if="scope.row.isEdit"
v-model="scope.row.reviewTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
placeholder="选择日期">
</el-date-picker>
<div v-else class="div-content">{{ scope.row.patrolTime }}</div>
<div v-else
class="div-content">{{ scope.row.patrolTime }}</div>
</template>
</el-table-column>
<el-table-column
v-if="!disabled"
<el-table-column v-if="!disabled"
fixed="right"
label="操作"
align="center"
width="120"
>
width="120">
<template slot-scope="scope">
<template v-if="scope.row.isEdit">
<el-button
@click="handleEdit(scope.row)"
<el-button @click="handleEdit(scope.row)"
type="text"
size="small"
class="btn-color-edit"
>保存</el-button
>
<el-button
@click="handleChange(scope.row, 'cancle')"
class="btn-color-edit">保存</el-button>
<el-button @click="handleChange(scope.row, 'cancle')"
type="text"
size="small"
class="btn-color-edit"
>取消</el-button
>
class="btn-color-edit">取消</el-button>
</template>
<template v-else>
<el-button
v-if="formType == 'edit'"
<el-button v-if="formType == 'edit'"
@click="handleChange(scope.row, 'edit')"
type="text"
size="small"
:disabled="disabled"
class="btn-color-edit"
>修改</el-button
>
<el-popconfirm
v-if="formType == 'edit'"
class="btn-color-edit">修改</el-button>
<el-popconfirm v-if="formType == 'edit'"
title="删除之后无法恢复,确认删除?"
@onConfirm="del(scope.row)"
@confirm="del(scope.row)"
>
<el-button
slot="reference"
@confirm="del(scope.row)">
<el-button slot="reference"
type="text"
size="small"
class="btn-color-del"
style="margin-left: 10px"
>删除</el-button
>
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</template>
@ -267,6 +224,10 @@ export default {
type: String,
default: "",
},
source: {//manage visiual
type: String,
default: 'manage'
}
},
data () {
return {

220
src/views/modules/visual/communityGovern/fivelayers/qsydw.vue

@ -12,113 +12,55 @@
<img src="@/assets/img/shuju/people/close.png" />
</div>
<el-form ref="ref_form"
:inline="false"
:model="formData"
:rules="dataRule"
label-width="100px">
<!-- <el-form-item label="事件分类"
label-width="150px"
prop="categoryId">
<el-cascader class="cell-width-2"
ref="myCascader"
v-model="selCategoryArray"
:key="iscascaderShow"
:options="casOptions"
:props="optionProps"
:show-all-levels="false"
@change="handleChangeCate"></el-cascader>
</el-form-item> -->
<el-form-item label="服务内容"
label-width="150px"
:class="{'form-item':source==='visiual'}"
prop="content">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="formData.content"
:autosize="{ minRows: 2, maxRows: 10 }"
type="textarea"
clearable
class="cell-width-area"
placeholder="请输入内容"></el-input>
<div class="list-wr">
<div class="list">
<div class="item">
<span class="item-field">场所类型</span>
<span>{{ eventDetailData.placeTypeName }}</span>
</div>
</el-form-item>
<el-form-item label="服务类型"
label-width="150px"
:class="{'form-item':source==='visiual'}"
prop="categoryCode">
<div :class="{'visiual-form':source==='visiual'}">
<el-cascader v-model="formData.categoryCode"
:options="demandOptions"
clearable
class="cell-width-1"
@change="handleCateSlect"></el-cascader>
<div class="item">
<span class="item-field">场所名称</span>
<span>{{ eventDetailData.placeOrgName }}</span>
</div>
</el-form-item>
<el-form-item label="服务时间"
label-width="150px"
:class="{'form-item':source==='visiual'}"
prop="wantServiceTime">
<div :class="{'visiual-form':source==='visiual'}">
<el-date-picker v-model="formData.wantServiceTime"
type="datetime"
class="cell-width-1"
clearable
value-format="yyyy-MM-dd HH:mm:ss"
placeholder="选择日期时间">
</el-date-picker>
<div class="item">
<span class="item-field">规模</span>
<span>{{ eventDetailData.scaleName }}</span>
</div>
</el-form-item>
<el-form-item label="需求人"
label-width="150px"
:class="{'form-item':source==='visiual'}"
prop="demandUserName">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="formData.demandUserName"
class="cell-width-1"></el-input>
<div class="item">
<span class="item-field">联系电话</span>
<span>{{ eventDetailData.mobile }}</span>
</div>
</el-form-item>
<el-form-item label="联系电话"
label-width="150px"
:class="{'form-item':source==='visiual'}"
prop="demandUserMobile">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="formData.demandUserMobile"
class="cell-width-1"></el-input>
</div>
</el-form-item>
<el-form-item label="服务地点"
prop="serviceLocation"
:class="{'form-item':source==='visiual'}"
label-width="150px"
style="display: block">
<div :class="{'visiual-form':source==='visiual'}">
<el-input class="cell-width-1"
v-model="formData.serviceLocation">
</el-input>
<div class="list">
<div class="item">
<span class="item-field">场所区域</span>
<span>{{ eventDetailData.agencyName+eventDetailData.gridName }}</span>
</div>
</el-form-item>
<el-form-item label="门牌号"
:class="{'form-item':source==='visiual'}"
label-width="150px"
prop="locationDetail">
<div :class="{'visiual-form':source==='visiual'}">
<el-input v-model="formData.locationDetail"
class="cell-width-1"></el-input>
<div class="item">
<span class="item-field">场所地址</span>
<span>{{ eventDetailData.address }}</span>
</div>
<div class="item">
<span class="item-field">负责人</span>
<span>{{ eventDetailData.personInCharge }}</span>
</div>
</el-form-item>
</div>
</el-form>
</div>
<div class="div_record">
<record :formType="'edit'"
:source="'visiual'"
:enterpriseId="enterpriseId"
:enterpriseInfo="enterpriseInfo"></record>
</div>
<div class="div-btn "
style="padding-bottom:10px">
<el-button size="small"
@click="handleClose">关闭</el-button>
</div>
</cpt-card>
</div>
</div>
@ -128,33 +70,9 @@
import cptCard from "@/views/modules/visual/cpts/card";
import { requestPost } from "@/js/dai/request";
import eventInfo from "@/views/modules/shequzhili/event/cpts/event-info";
import record from "@/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record";
function iniFmData () {
return {
operationType: '2',//[0: 1: 2:]
icEventId: '',//Id
gridId: '',//
categoryCode: '',//
parentCode: '',//
content: '',// 1000
reportType: 'self_help',// communitybuilding_caption;party;self_help
reportUserName: '',//
reportUserMobile: '',//
reportTime: '',//
demandUserId: '',// user.idic_resi_user.id
demandUserName: '',//
demandUserMobile: '',//
wantServiceTime: '',//
serviceType: '',
serverId: '',
locationDetail: '',
serviceLocation: '',//
latitude: '',//
longitude: '',//
// categoryId: ''
};
}
export default {
name: "dialogInfo",
props: {
@ -163,7 +81,7 @@ export default {
components: {
cptCard,
eventInfo,
record
},
data () {
@ -171,50 +89,37 @@ export default {
loading: false,
pageType: 'dispose',
eventId: '1552537796854706177',
eventDetailData: {},
formData: iniFmData(),
btnDisable: false,
customerId: localStorage.getItem("customerId"),
demandOptions: [],
serviceOptions: [
],
serviceOptiondList: [],
casOptions: [],
iscascaderShow: 0,
selCategoryArray: [],
selCateObj: {},
optionProps: {
multiple: false,
value: 'id',
label: 'name',
children: 'subCategory',
},
enterpriseInfo: {},
enterpriseId: '1544585407179968514',
};
},
async mounted () {
this.loading = false
await this.handleSearch()
await this.loadInfo()
this.loading = true
},
methods: {
async handleSearch () {
async loadInfo () {
const url = "/gov/org/enterprise/detail/" + this.enterpriseId;
const url = "/gov/project/icEvent/detail";
// const url = "http://yapi.elinkservice.cn/mock/245/gov/project/icEvent/detail";
const { data, code, msg } = await requestPost(url, {
icEventId: this.eventId,
});
const { data, code, msg } = await requestPost(url);
if (code === 0) {
this.eventDetailData = { ...data };
this.pageType = "dispose";
} else {
this.$message.error(msg);
}
@ -223,11 +128,11 @@ export default {
handleClose () {
this.pageType = "";
this.$emit("handleClose")
// this.eventId = ""
},
handleOk () {
this.pageType = "";
// this.eventId = ""
this.pageNo = 1
},
@ -293,11 +198,6 @@ export default {
padding: 0 32px;
}
.sel-service {
display: flex;
justify-content: flex-start;
}
.div_btn {
display: flex;
justify-content: center;
@ -316,4 +216,8 @@ export default {
margin-left: 20px;
}
}
.div_record {
// padding-bottom: 30px;
}
</style>

Loading…
Cancel
Save