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

111

feature/dev_worklog2
jiangyy 3 years ago
parent
dccd7f4839
commit
dfd41b4911
2 changed files with 233 additions and 368 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 379
      src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
  2. 222
      src/views/modules/visual/communityGovern/fivelayers/qsydw.vue

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

@ -1,243 +1,200 @@
<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"
:disabled="btnDisabled || disabled"
@click="handleAdd"
>新增</el-button
>
<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>
</div>
<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">
<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">
</el-table-column>
<el-table-column
prop="patrolTime"
label="巡查时间"
align="center"
width="200px"
>
<el-table-column prop="patrolTime"
label="巡查时间"
align="center"
width="200px">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.isEdit"
v-model="scope.row.patrolTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
<el-date-picker v-if="scope.row.isEdit"
v-model="scope.row.patrolTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
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"
label="巡查人员"
align="center"
width="200px"
>
<el-table-column prop="staffId"
label="巡查人员"
align="center"
width="200px">
<template slot-scope="scope">
<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"
:key="subItem.value"
:label="subItem.label"
:value="subItem.value"
>
<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"
:key="subItem.value"
:label="subItem.label"
: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"
label="联系电话"
align="center"
width="200px"
>
<el-table-column prop="mobile"
label="联系电话"
align="center"
width="200px">
<template slot-scope="scope">
<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>
<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>
</template>
</el-table-column>
<el-table-column
prop="result"
label="巡查结果"
align="center"
width="200px"
>
<el-table-column prop="result"
label="巡查结果"
align="center"
width="200px">
<template slot-scope="scope">
<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"
:key="subItem.value"
:label="subItem.label"
:value="subItem.value"
>
<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"
:key="subItem.value"
:label="subItem.label"
: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"
label="隐患明细"
align="center"
width="200px"
>
<el-table-column prop="detailed"
label="隐患明细"
align="center"
width="200px">
<template slot-scope="scope">
<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>
<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>
</template>
</el-table-column>
<el-table-column
prop="imgList"
label="图片列表"
align="center"
width="150px"
>
<el-table-column prop="imgList"
label="图片列表"
align="center"
width="150px">
<template slot-scope="scope">
<div v-if="scope.row.isEdit">
<el-upload
class="avatar-uploader"
:action="uploadUrl"
:data="{ customerId: customerId }"
:show-file-list="true"
:limit="3"
:file-list="scope.row.imgShowList"
:on-success="(res) => handleImgSuccess(res, scope.row)"
:on-remove="(res) => handleImgRemove(res, scope.row)"
list-type="picture"
:before-upload="beforeImgUpload"
>
<el-upload class="avatar-uploader"
:action="uploadUrl"
:data="{ customerId: customerId }"
:show-file-list="true"
:limit="3"
:file-list="scope.row.imgShowList"
:on-success="(res) => handleImgSuccess(res, scope.row)"
:on-remove="(res) => handleImgRemove(res, scope.row)"
list-type="picture"
: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"
style="width: 100px; height: 50px"
:src="scope.row.imgList[0]"
fit="cover"
:preview-src-list="scope.row.imgList"
></el-image>
<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>
</div>
</template>
</el-table-column>
<el-table-column
prop="reviewTime"
label="拟复查时间"
align="center"
width="200px"
>
<el-table-column prop="reviewTime"
label="拟复查时间"
align="center"
width="200px">
<template slot-scope="scope">
<el-date-picker
v-if="scope.row.isEdit"
v-model="scope.row.reviewTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
placeholder="选择日期"
>
<el-date-picker v-if="scope.row.isEdit"
v-model="scope.row.reviewTime"
type="date"
class="input-width"
value-format="yyyy-MM-dd"
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"
fixed="right"
label="操作"
align="center"
width="120"
>
<el-table-column v-if="!disabled"
fixed="right"
label="操作"
align="center"
width="120">
<template slot-scope="scope">
<template v-if="scope.row.isEdit">
<el-button
@click="handleEdit(scope.row)"
type="text"
size="small"
class="btn-color-edit"
>保存</el-button
>
<el-button
@click="handleChange(scope.row, 'cancle')"
type="text"
size="small"
class="btn-color-edit"
>取消</el-button
>
<el-button @click="handleEdit(scope.row)"
type="text"
size="small"
class="btn-color-edit">保存</el-button>
<el-button @click="handleChange(scope.row, 'cancle')"
type="text"
size="small"
class="btn-color-edit">取消</el-button>
</template>
<template v-else>
<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'"
title="删除之后无法恢复，确认删除？"
@onConfirm="del(scope.row)"
@confirm="del(scope.row)"
>
<el-button
slot="reference"
type="text"
size="small"
class="btn-color-del"
style="margin-left: 10px"
>删除</el-button
>
<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'"
title="删除之后无法恢复，确认删除？"
@onConfirm="del(scope.row)"
@confirm="del(scope.row)">
<el-button slot="reference"
type="text"
size="small"
class="btn-color-del"
style="margin-left: 10px">删除</el-button>
</el-popconfirm>
</template>
</template>
@ -267,8 +224,12 @@ export default {
type: String,
default: "",
},
source: {//展示来源：manage 管理平台 visiual 可视化平台
type: String,
default: 'manage'
}
},
data() {
data () {
return {
uploadUrl: window.SITE_CONFIG["apiURL"] + "/oss/file/uploadqrcodeV2",
customerId: localStorage.getItem("customerId"),
@ -299,7 +260,7 @@ export default {
},
computed: {
allowOperate() {
allowOperate () {
const {
enterpriseInfo: { agencyId },
} = this;
@ -308,7 +269,7 @@ export default {
},
watch: {
enterpriseId: {
handler(val) {
handler (val) {
console.log("val------points", val);
if (val.length > 0) {
this.btnDisabled = false;
@ -319,12 +280,12 @@ export default {
},
},
created() {
created () {
this.getOptionStaff();
},
methods: {
beforeImgUpload(file) {
beforeImgUpload (file) {
console.log(file);
const isLt1M = file.size / 1024 / 1024 < 10;
const srcType = file.type;
@ -341,7 +302,7 @@ export default {
return true;
},
handleImgSuccess(res, row) {
handleImgSuccess (res, row) {
console.log("handleImgSuccess", res);
if (res.code === 0 && res.msg === "success") {
row.imgList.push(res.data.url);
@ -351,13 +312,13 @@ export default {
}
},
computeImgShowList(row) {
computeImgShowList (row) {
row.imgShowList = row.imgList.map((url) => {
return { name: "", url };
});
},
handleImgRemove(file, row) {
handleImgRemove (file, row) {
console.log("handleImgRemove", file);
let url = file.url || file.response.data.url;
if (url) {
@ -366,13 +327,13 @@ export default {
}
},
getRowClass({ rowIndex, columnIndex }) {
getRowClass ({ rowIndex, columnIndex }) {
if (rowIndex === 0) {
return "background: #2195fe; color: #fff;";
}
},
handleChange(row, type) {
handleChange (row, type) {
console.log("type----", type);
if (type == "cancle") {
row = { ...this.tempRow };
@ -388,7 +349,7 @@ export default {
this.isEdit = !this.isEdit;
},
handleChangeStaff(row) {
handleChangeStaff (row) {
const { staffId } = row;
const { optionStaff } = this;
let item = optionStaff.find((item) => item.value == staffId);
@ -398,7 +359,7 @@ export default {
}
},
async getOptionStaff() {
async getOptionStaff () {
let url = `/data/aggregator/org/staff-select-list/${this.$store.state.user.agencyId}`;
const { data, code, msg } = await requestPost(url, {});
@ -409,12 +370,12 @@ export default {
}
},
async handleEdit(row) {
async handleEdit (row) {
if (this.btnType == "add") this.save(row);
else this.edit(row);
},
handleAdd() {
handleAdd () {
this.btnType = "add";
this.isEdit = true;
@ -433,7 +394,7 @@ export default {
this.tableData.push(item);
},
async save(row) {
async save (row) {
const params = {
partyMemberId: this.enterpriseId,
...row,
@ -457,7 +418,7 @@ export default {
});
},
async edit(row) {
async edit (row) {
const params = {
...row,
};
@ -480,7 +441,7 @@ export default {
});
},
async del(row) {
async del (row) {
await this.$http
.post(`/gov/org/enterprise/del-patrol/${row.patrolId}`)
.then(({ data: res }) => {
@ -497,7 +458,7 @@ export default {
});
},
async getList() {
async getList () {
const { enterpriseId } = this;
const params = {};

222
src/views/modules/visual/communityGovern/fivelayers/qsydw.vue
View File

@ -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>
<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="服务地点"
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="item">
<span class="item-field">场所地址：</span>
<span>{{ eventDetailData.address }}</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.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";
function iniFmData () {
return {
operationType: '2',//处理方式[0:已回复 1:已转项目 2:已转服务]
icEventId: '',//事件Id
gridId: '',//
categoryCode: '',// 二级服务分类编码
parentCode: '',// 父级服务分类编码
content: '',// 服务内容1000字
reportType: 'self_help',// 社区帮办：community；楼长帮办：building_caption;党员帮办：party;自身上报：self_help
reportUserName: '',// 上报人姓名
reportUserMobile: '',// 自身上报时存储注册居民的手机号
reportTime: '',// 上报时间
demandUserId: '',// 需求人：user.id或者ic_resi_user.id
demandUserName: '',// 需求人姓名
demandUserMobile: '',//需求人联系电话
wantServiceTime: '',// 希望服务时间
serviceType: '',
serverId: '',
locationDetail: '',
serviceLocation: '',//事件地址
latitude: '',// 经度
longitude: '',//维度
// categoryId: ''
};
}
import record from "@/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record";
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>

Write Preview
Loading…
Cancel
Save