Browse Source

Merge branch 'dev-tuceng0616' into dev

feature
jiangyy 3 years ago
parent
commit
60fa0dcaa8
  1. 18
      src/views/modules/communityService/ninePlaces/places/places.vue
  2. 28
      src/views/modules/communityService/ninePlaces/places/placesForm.vue
  3. 253
      src/views/modules/communityService/sqzzz/index.vue
  4. 33
      src/views/modules/cpts/base/cpts/edit.vue
  5. 9
      src/views/modules/cpts/base/index.vue
  6. 1
      src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue
  7. 3
      src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue
  8. 10
      src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue
  9. 1
      src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue
  10. 10
      src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue

18
src/views/modules/communityService/ninePlaces/places/places.vue

@ -149,11 +149,15 @@
<template slot-scope="scope">
<el-button type="text"
class="div-table-button--detail"
size="small"
@click="handleDetail(scope.row)">查看</el-button>
<el-button v-if="agencyId===scope.row.agencyId" type="text"
class="div-table-button--edit"
size="small"
@click="handleEdit(scope.row)">修改</el-button>
<el-button type="text"
<el-button v-if="agencyId===scope.row.agencyId" type="text"
class="div-table-button--delete"
size="small"
@click="handleDelete(scope.row)">删除</el-button>
@ -182,7 +186,7 @@
class="dialog-h"
@closed="diaClose">
<places-form ref="ref_form"
:gridList="gridList"
:agencyId="agencyId"
:scaleList="scaleList"
:placeTypeList="placeTypeList"
@dialogCancle="addFormCancle"
@ -262,7 +266,8 @@ export default {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId
agencyId: this.agencyId,
purpose:"query"
}
const { data, code, msg } = await requestPost(url, params)
@ -366,6 +371,13 @@ export default {
this.$refs.ref_form.initForm('edit', row.placeOrgId)
})
},
handleDetail (row) {
this.formTitle = '详情'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('detail', row.placeOrgId)
})
},
addFormCancle () {
this.formShow = false

28
src/views/modules/communityService/ninePlaces/places/placesForm.vue

@ -148,6 +148,7 @@ export default {
async initForm (type, placeOrgId) {
this.$refs.ref_form.resetFields();
this.loadGrid()
this.formType = type
if (placeOrgId) {
@ -156,6 +157,25 @@ export default {
await this.loadFormData()
}
},
async loadGrid () {
const url = "/gov/org/customergrid/gridoption"
let params = {
agencyId: this.agencyId,
purpose:"addorupdate"
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
this.gridList = data
} else {
this.$message.error(msg)
}
},
//
@ -301,10 +321,6 @@ export default {
},
props: {
gridList: {
type: Array,
default: []
},
scaleList: {
type: Array,
default: []
@ -313,6 +329,10 @@ export default {
type: Array,
default: []
},
agencyId: {
type: String,
default: ""
},
}
}
</script>

253
src/views/modules/communityService/sqzzz/index.vue

@ -1,58 +1,72 @@
<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">
<el-form-item label="组织名称"
prop="organizationName">
<el-input v-model="fmData.organizationName"
class="demo-form-inline"
>
<el-form-item label="组织名称" prop="organizationName">
<el-input
v-model="fmData.organizationName"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
placeholder="请输入"
>
</el-input>
</el-form-item>
<el-form-item label="创建时间"
prop="createTime">
<el-date-picker v-model="fmData.createTime"
<el-form-item label="创建时间" prop="createTime">
<el-date-picker
v-model="fmData.createTime"
type="daterange"
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 label="备注"
prop="remark">
<el-input v-model="fmData.remark"
<el-form-item label="备注" prop="remark">
<el-input
v-model="fmData.remark"
class="resi-cell-input"
size="small"
clearable
placeholder="请输入">
placeholder="请输入"
>
</el-input>
</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 class="diy-button--add"
size="small"
@click="handleAdd">新增</el-button>
<el-button class="diy-button--export"
<el-button class="diy-button--add" size="small" @click="handleAdd"
>新增</el-button
>
<el-button
class="diy-button--export"
size="small"
@click="handleExportModule('room')">下载模板</el-button>
<el-upload ref="upload"
@click="handleExportModule('room')"
>下载模板</el-button
>
<el-upload
ref="upload"
class="upload-btn"
action="uploadUlr"
:limit="1"
@ -63,73 +77,69 @@
:on-progress="handleProgress"
:on-success="handleExcelSuccess"
:before-upload="beforeExcelUpload"
:http-request="uploadHttpRequest">
<el-button size="small"
:http-request="uploadHttpRequest"
>
<el-button
size="small"
class="diy-button--delete"
:loading="importLoading">{{ importBtnTitle }}</el-button>
:loading="importLoading"
>{{ importBtnTitle }}</el-button
>
</el-upload>
<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="maxTableHeight">
<el-table-column label="序号"
type="index"
align="center"
width="50" />
<el-table-column prop="organizationName"
:height="maxTableHeight"
>
<el-table-column label="序号" type="index" align="center" width="50" />
<el-table-column
prop="organizationName"
label="组织名称"
align="center">
align="center"
>
<template slot-scope="scope">
<a class="name-a"
@click="handleWatch(scope.$index)">
<a class="name-a" @click="handleWatch(scope.$index)">
{{ scope.row.organizationName }}
</a>
</template>
</el-table-column>
<el-table-column prop="categoryName"
align="center"
label="分类名称">
<el-table-column prop="categoryName" align="center" label="分类名称">
</el-table-column>
<el-table-column prop="organizationPersonCount"
<el-table-column
prop="organizationPersonCount"
align="center"
label="组织人数">
label="组织人数"
>
</el-table-column>
<el-table-column prop="serviceItem"
<el-table-column
prop="serviceItem"
label="服务事项"
align="center"
:show-overflow-tooltip="true">
:show-overflow-tooltip="true"
>
</el-table-column>
<el-table-column prop="score"
width="100"
align="center"
label="积分">
<el-table-column prop="score" width="100" align="center" label="积分">
</el-table-column>
<el-table-column prop="principalName"
align="center"
label="负责人">
<el-table-column prop="principalName" align="center" label="负责人">
</el-table-column>
<el-table-column prop="principalPhone"
align="center"
label="联系电话">
<el-table-column prop="principalPhone" align="center" label="联系电话">
</el-table-column>
<el-table-column prop="remark"
align="center"
label="备注">
<el-table-column prop="remark" align="center" label="备注">
</el-table-column>
<el-table-column prop="organizationCreatedTime"
<el-table-column
prop="organizationCreatedTime"
align="center"
label="创建时间">
label="创建时间"
>
</el-table-column>
<el-table-column fixed="right"
label="操作"
align="center"
width="160">
<el-table-column fixed="right" label="操作" align="center" width="160">
<template slot-scope="scope">
<!-- <el-button
@click="handleWatch(scope.$index)"
@ -137,64 +147,87 @@
size="small"
>查看</el-button
> -->
<el-button type="text"
<el-button
type="text"
class="div-table-button--detail"
size="small"
@click="handleScore(scope.row)">积分记录</el-button>
@click="handleScore(scope.row)"
>积分记录</el-button
>
<el-button @click="handleEdit(scope.$index)"
<el-button
@click="handleEdit(scope.$index)"
v-if="scope.row.agencyId == $store.state.user.agencyId"
type="text"
size="small"
class="div-table-button--edit">修改</el-button>
class="div-table-button--edit"
>修改</el-button
>
<el-popconfirm title="删除之后无法回复,确认删除?"
<el-popconfirm
title="删除之后无法回复,确认删除?"
v-if="scope.row.agencyId == $store.state.user.agencyId"
@onConfirm="handleDel(scope.row, scope.$index)"
@confirm="handleDel(scope.row, scope.$index)">
<el-button slot="reference"
@confirm="handleDel(scope.row, scope.$index)"
>
<el-button
slot="reference"
type="text"
size="small"
class="div-table-button--delete"
style="margin-left: 10px">删除</el-button>
style="margin-left: 10px"
>删除</el-button
>
</el-popconfirm>
</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="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="scoreDiaShow"
<el-dialog
:visible.sync="scoreDiaShow"
:close-on-click-modal="false"
:close-on-press-escape="false"
:title="scoreDiaTitle"
width="70%"
top="5vh"
@closed="diaClose">
<score-record ref="ref_score"
:serviceType="'community_org'"></score-record>
@closed="diaClose"
>
<score-record
ref="ref_score"
:serviceType="'community_org'"
></score-record>
</el-dialog>
</div>
</template>
@ -209,7 +242,7 @@ import scoreRecord from "../../../components/scoreRecord.vue";
export default {
components: { editForm, scoreRecord },
data () {
data() {
return {
openSearch: false,
@ -239,7 +272,7 @@ export default {
};
},
computed: {
maxTableHeight () {
maxTableHeight() {
return this.$store.state.inIframe
? this.clientHeight - 360 + this.iframeHeigh
: this.clientHeight - 360;
@ -257,11 +290,11 @@ export default {
}
},
},
mounted () {
mounted() {
this.getTableData();
},
methods: {
async handleExportModule () {
async handleExportModule() {
let url = "/heart/iccommunityselforganization/import-template-download";
let params = {};
@ -298,18 +331,18 @@ export default {
});
},
//
handleExcelSuccess (res, file) {
handleExcelSuccess(res, file) {
if (res.code === 0 && res.msg === "success") {
console.log("resss---ppp", res);
} else {
this.$message.error(res.msg);
}
},
handleProgress (event, file, fileList) {
handleProgress(event, file, fileList) {
console.log("percentage", file.percentage);
},
beforeExcelUpload (file) {
beforeExcelUpload(file) {
console.log("file", file);
const isType = file.type === "application/vnd.ms-excel";
const isTypeComputer =
@ -326,7 +359,7 @@ export default {
}
return fileType && isLt1M;
},
async uploadHttpRequest (file) {
async uploadHttpRequest(file) {
this.importLoading = true;
this.importBtnTitle = "正在上传中...";
this.$message({
@ -381,38 +414,38 @@ export default {
this.$refs.upload.clearFiles();
},
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.handleSearch();
},
async handleAdd () {
async handleAdd() {
this.formShow = true;
await nextTick();
console.log(this.$refs);
this.$refs.eleEditForm.initForm("add");
},
async handleChu () {
async handleChu() {
const url =
"/heart/iccommunityselforganization/exportcommunityselforganization";
const { pageSize, pageNo, fmData } = this;
@ -448,23 +481,23 @@ export default {
});
},
async handleWatch (rowIndex) {
async handleWatch(rowIndex) {
this.formShow = true;
await nextTick();
this.$refs.eleEditForm.initForm("detail", this.tableData[rowIndex]);
},
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";
@ -478,12 +511,12 @@ export default {
this.$message.success("删除成功!");
this.getTableData();
} else {
this.$message.error(msg)
this.$message.error(msg);
// this.$message.success("");
}
},
async getTableData () {
async getTableData() {
const url =
"/heart/iccommunityselforganization/communityselforganizationlist";
const { pageSize, pageNo, fmData } = this;
@ -501,19 +534,19 @@ export default {
})
: [];
} else {
this.$message.error(msg)
this.$message.error(msg);
}
},
//
handleScore (row) {
handleScore(row) {
this.scoreDiaShow = true;
this.$nextTick(() => {
this.$refs.ref_score.initForm(row.orgId);
});
},
diaClose () {
diaClose() {
this.scoreDiaShow = false;
},
},

33
src/views/modules/cpts/base/cpts/edit.vue

@ -265,10 +265,26 @@
</div>
</el-form>
<slot v-bind:id="formId" v-bind:info="fmData" v-bind:formType="formType"></slot>
<div class="div_btn resi-btns" v-if="!formBtnFixed">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button
v-if="formType != 'watch'"
type="primary"
size="small"
:disabled="btnDisable"
@click="handleComfirm"
> </el-button
>
</div>
<slot
v-bind:id="formId"
v-bind:info="fmData"
v-bind:formType="formType"
></slot>
</div>
<div class="div_btn resi-btns">
<div class="div_btn resi-btns" v-if="formBtnFixed">
<el-button size="small" @click="handleCancle"> </el-button>
<el-button
v-if="formType != 'watch'"
@ -303,6 +319,10 @@ export default {
type: String,
default: "info",
},
formBtnFixed: {
type: Boolean,
default: true,
},
idName: {
type: String,
default: "",
@ -431,8 +451,13 @@ export default {
// init
initMap(item) {
let { latitude, longitude } = this.$store.state.user;
if (!latitude || latitude == "" || latitude == "0") {
latitude = 39.9088810666821;
longitude = 116.39743841556731;
}
//
var center = new window.TMap.LatLng(36.0722275, 120.38945519);
var center = new window.TMap.LatLng(latitude, longitude);
// map TMap.Map()
map = new window.TMap.Map(document.getElementById("app"), {
center: center, //
@ -545,7 +570,7 @@ export default {
console.log("------------------------------------info", this.fmData);
await nextTick(800);
if (map) {
if (map && data.latitude) {
map.setCenter(new TMap.LatLng(data.latitude, data.longitude));
}
} else {

9
src/views/modules/cpts/base/index.vue

@ -212,6 +212,7 @@
:editParams="editParams"
:editParamsDiv="editParamsDiv"
:editFixedParams="editFixedParams"
:formBtnFixed="formBtnFixed"
@close="handleClose"
@afterEdit="handleEditSuccess"
>
@ -318,6 +319,11 @@ export default {
type: String,
default: "id",
},
formBtnFixed: {
type: Boolean,
default: true,
},
},
data() {
@ -535,11 +541,12 @@ export default {
handleClose() {
this.formShow = false;
this.getTableData();
},
handleEditSuccess() {
this.handleClose();
this.getTableData();
// this.getTableData();
},
async handleDelete(rowData, rowIndex) {

1
src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue

@ -12,6 +12,7 @@
:importUrl="importUrl"
:mubanUrl="mubanUrl"
:editParams="editParams"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
idName="icDangerousChemicalsId"
></base-page>
</div>

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

@ -192,7 +192,7 @@
</template>
</el-table-column>
<el-table-column v-if="!disabled" 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
@ -224,6 +224,7 @@
v-if="formType == 'edit'"
title="删除之后无法恢复,确认删除?"
@onConfirm="del(scope.row)"
@confirm="del(scope.row)"
>
<el-button
slot="reference"

10
src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue

@ -17,10 +17,16 @@
:editFixedParams="editFixedParams"
:editParamsDiv="5"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
:formBtnFixed="false"
idName="enterpriseId"
>
<template v-slot:editElse="{ id, formType, info }">
<record v-if="formType != 'add' && id" :formType="formType" :enterpriseId="id" :enterpriseInfo="info"></record>
<record
v-if="formType != 'add' && id"
:formType="formType"
:enterpriseId="id"
:enterpriseInfo="info"
></record>
</template>
</base-page>
</div>
@ -93,7 +99,7 @@ export default {
{ field: "场所名称", keyName: "placeOrgName", type: "text" },
{ field: "场所地址", keyName: "address", type: "text" },
{ field: "场所类型", keyName: "placeTypeName", type: "text" },
{ field: "规模", keyName: "scale", type: "text" },
{ field: "规模", keyName: "scaleName", type: "text" },
{ field: "负责人", keyName: "personInCharge", type: "text" },
{ field: "联系电话", keyName: "mobile", type: "text" },
{ field: "最新检查时间", keyName: "latestPatrolTime", type: "text" },

1
src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue

@ -12,6 +12,7 @@
:importUrl="importUrl"
:mubanUrl="mubanUrl"
:editParams="editParams"
:editBtnName="(item) => (item.latitude == '' ? '待完善' : '修改')"
idName="icSuperiorResourceId"
></base-page>
</div>

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

@ -391,7 +391,7 @@ import { Circle as CircleStyle, Icon, Fill, Stroke, Style, Text } from 'ol/style
import nextTick from 'dai-js/tools/nextTick'
import { mapGetters } from "vuex";
import { Loading } from 'element-ui'; //Loading
import { requestPost } from "@/js/dai/request";
import { requestPost, requestGet } from "@/js/dai/request";
import cptTb from "@/views/modules/visual/cpts/tb";
@ -1030,6 +1030,7 @@ const vueGis = {
this.selInfo = JSON.parse(JSON.stringify(data))
this.handleShowPopup(coordinate)
} else {
this.$message.error(msg)
}
@ -1125,12 +1126,17 @@ const vueGis = {
this.getMapTable();
},
handleSearch () {
this.demand.pageNo = 1
this.getTable();
this.getMapTable();
},
//
handleClickRow (index) {
let selData = this.tableList[index]
if (selData.longitude && selData.latitude) {
mapView.setCenter([selData.longitude, selData.latitude]);
}
this.clickMapVolunteer(selData)
// alert(index)

Loading…
Cancel
Save