Browse Source

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

shibei_master
jiangyy 3 years ago
parent
commit
1263bbe58d
  1. 117
      src/views/modules/shequzhili/csgltc/csgl.vue
  2. 38
      src/views/modules/shequzhili/csgltc/csglDetail.vue
  3. 137
      src/views/modules/shequzhili/csgltc/csglForm.vue

117
src/views/modules/shequzhili/csgltc/csgl.vue

@ -6,9 +6,9 @@
ref="ref_searchform"
:label-width="'100px'">
<el-form-item label="单位名称"
prop="unitName">
<el-input v-model="formData.unitName"
<el-form-item label="场所名称"
prop="name">
<el-input v-model="formData.name"
class="item_width_1"
clearable
size="small"
@ -16,24 +16,24 @@
</el-input>
</el-form-item>
<el-form-item label="服务事项"
<el-form-item label="场所分类"
prop="serviceMatter">
<el-select class="item_width_1"
v-model="formData.serviceMatter"
v-model="formData.category"
placeholder="请选择"
size="small"
clearable>
<el-option v-for="item in serviceList"
:key="item.value"
:label="item.label"
:value="item.value">
:key="item.categoryKey"
:label="item.categoryName"
:value="item.categoryKey">
</el-option>
</el-select>
</el-form-item>
<el-button style="margin-left:10px"
class="diy-button--search"
class="diy-button--delete"
size="small"
@click="handleSearch">查询</el-button>
<el-button style="margin-left:10px"
@ -45,7 +45,7 @@
</div>
<div class="div_table">
<div class="div_btn">
<el-button class="diy-button--add"
<el-button class="diy-button--delete"
size="small"
@click="handleAdd">新增</el-button>
@ -58,13 +58,17 @@
:limit="1"
:on-exceed="handleExceed"
:http-request="uploadFile">
<el-button class="diy-button--delete"
style="margin-left:10px"
size="small"
@click="handleExportModule('room')">下载模板</el-button>
<el-button style="margin-left:10px"
size="small"
class="diy-button--delete">导入</el-button>
</el-upload>
<el-button style="float:left;margin-left:10px"
class="diy-button--reset"
class="diy-button--delete"
size="small"
@click="handleExport">导出</el-button>
@ -83,19 +87,19 @@
type="index"
width="50"></el-table-column>
<el-table-column prop="unitName"
<el-table-column prop="name"
header-align="center"
align="center"
label="场所名称"
min-width="100">
</el-table-column>
<el-table-column prop="type"
<el-table-column prop="categoryName"
header-align="center"
align="center"
label="场所类别"
min-width="80">
</el-table-column>
<el-table-column prop="serviceMatterListShow"
<el-table-column prop="areaCovered"
header-align="center"
align="center"
label="占地面积"
@ -103,13 +107,13 @@
min-width="250">
</el-table-column>
<el-table-column prop="contact"
<el-table-column prop="capacity"
header-align="center"
align="center"
label="容纳人数"
width="80">
</el-table-column>
<el-table-column prop="contactMobile"
<el-table-column prop="address"
header-align="center"
align="center"
label="地址"
@ -203,18 +207,13 @@ export default {
pageNo: 0,
tableLoading: false,
agencyId: '',
unitList: [],//list
serviceList: [],//list
name: '',
category: '',
typeList: [],//list
serviceList: [],
unitId: '',
formData: {
unitName: '',
serviceMatter: '',
type: '',
contact: '',
contactMobile: ''
name: ''
},
tableData: [],
@ -250,10 +249,47 @@ export default {
handleSearch () {
this.loadTable()
},
async handleExportModule () {
let url = "/gov/org/icCityManagement/download";
let params = {};
await this.$http({
method: "POST",
url,
responseType: "blob",
data: params,
})
.then((res) => {
// this.download(res.data, title + '.xls')
if (res.headers["content-disposition"]) {
let fileName = window.decodeURI(
res.headers["content-disposition"].split(";")[1].split("=")[1]
);
console.log("filename", fileName);
let blob = new Blob([res.data], {
type: "application/vnd.ms-excel",
});
var url = window.URL.createObjectURL(blob);
var aLink = document.createElement("a");
aLink.style.display = "none";
aLink.href = url;
aLink.setAttribute("download", fileName);
document.body.appendChild(aLink);
aLink.click();
document.body.removeChild(aLink); //
window.URL.revokeObjectURL(url); //blob
} else this.$message.error("下载失败");
})
.catch((err) => {
console.log("err", err);
return this.$message.error("网络错误");
});
},
//
async loadService () {
const url = "/heart/serviceitem/dict-list"
// const url = "/heart/serviceitem/dict-list"
const url = "/gov/org/coverage/dict-select-list/city_management"
let params = {
@ -274,12 +310,12 @@ export default {
async loadTable () {
this.tableLoading = true
const url = "/heart/icpartyunit/list"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/list"
const url = "/gov/org/icCityManagement/list"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/list"
let params = {
pageSize: this.pageSize,
pageNo: this.pageNo,
agencyId: this.agencyId,
category: this.category,
...this.formData
}
@ -287,14 +323,6 @@ export default {
if (code === 0) {
this.total = data.total
data.list.forEach(element => {
if (element.serviceMatterList.length > 0) {
element.serviceMatterListShow = element.serviceMatterList.join(',')
} else {
element.serviceMatterListShow = ''
}
});
this.tableData = data.list
} else {
@ -332,7 +360,7 @@ export default {
this.formTitle = '修改'
this.formShow = true
this.$nextTick(() => {
this.$refs.ref_form.initForm('edit', row.id)
this.$refs.ref_form.initForm('edit', row.icCityManagementId)
})
},
@ -363,11 +391,11 @@ export default {
},
async deleteUnit (row) {
const url = "/heart/icpartyunit/delete"
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete"
const url = "/gov/org/icCityManagement/del"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/del"
let params = {
id: row.id
icCityManagementId: row.icCityManagementId
}
const { data, code, msg } = await requestPost(url, params)
@ -387,7 +415,6 @@ export default {
//
resetSearch () {
this.formData = {
unitName: '',
serviceMatter: '',
type: '',
contact: '',
@ -402,9 +429,9 @@ export default {
async handleExport () {
let title = '城市管理图层'
const url = "/heart/icpartyunit/export"
// const url = "/gov/org/icCityManagement/export"
const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export"
let params = {
agencyId: this.agencyId,
...this.formData
}
@ -480,7 +507,7 @@ export default {
//
this.$refs['upload'].clearFiles()
var url = '/heart/icpartyunit/import'
var url = '/gov/org/icCityManagement/import'
let fileFormData = new FormData();
fileFormData.append('file', this.files);//filenamefiletest.zip

38
src/views/modules/shequzhili/csgltc/csglDetail.vue

@ -7,22 +7,22 @@
:model="formData"
class="form">
<el-form-item label="单位名称:"
prop="unitName"
<el-form-item label="场所名称:"
prop="name"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.unitName}}</span>
<span class="detail_span">{{formData.name}}</span>
</el-form-item>
<el-form-item label="分类:"
prop="type"
<el-form-item label="场所类别:"
prop="categoryName"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.type}}</span>
<span class="detail_span">{{formData.categoryName}}</span>
</el-form-item>
<el-form-item label="服务事项:"
<!--<el-form-item label="服务事项:"
prop="serviceMatterList"
label-width="150px"
style="display: block">
@ -30,27 +30,27 @@
v-for="(item,index) in formData.serviceMatterList"
:key="index">{{item}}</p>
</el-form-item>
<el-form-item label="联系人:"
prop="contact"
</el-form-item>-->
<el-form-item label="占地面积:"
prop="areaCovered"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.contact}}</span>
<span class="detail_span">{{formData.areaCovered}}</span>
</el-form-item>
<el-form-item label="联系电话:"
prop="contactMobile"
<el-form-item label="容纳人数:"
prop="capacity"
label-width="150px"
style="display: block">
<span class="detail_span">{{formData.contactMobile}}</span>
<span class="detail_span">{{formData.capacity}}</span>
</el-form-item>
<el-form-item label="在职党员:"
<el-form-item label="地址:"
style="display: block"
prop="memberCount"
prop="address"
label-width="150px">
<span class="detail_span">{{formData.memberCount}}</span>
<span class="detail_span">{{formData.address}}</span>
</el-form-item>
<el-form-item label="备注:"
<!--<el-form-item label="备注:"
prop="remark"
label-width="150px"
style="display: block">
@ -74,7 +74,7 @@
</div>
</div>
</el-form-item>
</el-form-item>-->
</el-form>

137
src/views/modules/shequzhili/csgltc/csglForm.vue

@ -10,22 +10,22 @@
class="form">
<el-form-item label="场所名称"
prop="unitName"
prop="name"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入单位名称"
v-model="formData.unitName">
placeholder="请输入场所名称"
v-model="formData.name">
</el-input>
</el-form-item>
<el-form-item label="场所类型"
prop="type"
<!--<el-form-item label="场所类型"
prop="categoryName"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.type"
v-model="formData.categoryName"
placeholder="请选择"
filterable
clearable>
@ -36,28 +36,57 @@
</el-option>
</el-select>
</el-form-item>-->
<el-form-item label="场所分类"
prop="serviceMatter"
label-width="150px"
style="display: block">
<el-select class="item_width_1"
v-model="formData.category"
placeholder="请选择"
size="small"
filterable
clearable>
<el-option v-for="item in serviceList"
:key="item.categoryKey"
:label="item.categoryName"
:value="item.categoryKey">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="占地面积"
style="display: block"
prop="memberCount"
prop="areaCovered"
label-width="150px">
<el-input-number class="item_width_4"
v-model="formData.memberCount"
v-model="formData.areaCovered"
:min="0"
:max="9999"
label="占地面积"></el-input-number>
</el-form-item>
<el-form-item label="容纳人数"
style="display: block"
prop="memberCount"
prop="capacity"
label-width="150px">
<el-input-number class="item_width_4"
v-model="formData.memberCount"
v-model="formData.capacity"
:min="0"
:max="9999"
label="容纳人数"></el-input-number>
</el-form-item>
<el-form-item label="地址"
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
maxlength="50"
show-word-limit
placeholder="请输入地址名称"
v-model="formData.address">
</el-input>
</el-form-item>
<el-form-item label="位置坐标"
prop="longitude"
@ -82,8 +111,7 @@
@click="handleSearchMap">查询</el-button>
</div>
</div>
<!-- <div style="margin-top: 10px">
<div style="margin-top: 10px">
<span>经度</span>
<el-input class="item_width_3"
maxlength="50"
@ -96,20 +124,9 @@
placeholder="请输入纬度"
v-model="formData.latitude">
</el-input>
</div> -->
</div>
</div>
</el-form-item>
<el-form-item label="地理位置"
prop="address"
label-width="150px"
style="display: block">
<el-input class="item_width_1"
v-model="formData.address">
</el-input>
</el-form-item>
</el-form>
</div>
@ -145,23 +162,21 @@ export default {
formType: 'add', // addeditdetail
btnDisable: false,
unitId: '',
serviceList: [],
icCityManagementId: '',
keyWords: '',
formData: {
unitName: '',
serviceMatterList: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //500
name: '',
category: '',//
areaCovered: '',//
capacity: 0,//
address: '', //
longitude: 36.0722275, //
latitude: 120.38945519 //
},
serviceList: [],//list
cityManagement: {
}
}
},
components: {},
@ -194,10 +209,9 @@ export default {
//
async loadService () {
const url = "/heart/serviceitem/dict-list"
const url = "/gov/org/coverage/dict-select-list/city_management"
// const url = "http://yapi.elinkservice.cn/mock/245/gov/org/coverage/dict-select-list/city_management"
let params = {
type: 'usable'
// parentCategoryCode: '1010'
}
const { data, code, msg } = await requestPost(url, params)
@ -213,19 +227,18 @@ export default {
//
async loadFormData () {
const url = '/heart/icpartyunit/detail'
// const url = 'http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/detail'
const url = '/gov/org/icCityManagement/detail'
// const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/detail'
let params = {
id: this.unitId
icCityManagementId: this.icCityManagementId
}
const { data, code, msg } = await requestPost(url, params)
if (code === 0) {
if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) {
data.serviceMatterList = []
if (null != data){
data : this.cityManagement
}
this.formData = { ...data }
map.setCenter(new TMap.LatLng(this.formData.latitude, this.formData.longitude))
this.setMarker(this.formData.latitude, this.formData.longitude)
@ -265,8 +278,8 @@ export default {
// return false;
// }
let url = '/heart/icpartyunit/save'
// let url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/save"
let url = '/gov/org/icCityManagement/add'
// let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/add"
// if (this.formType === 'edit') {
// this.formData.id = this.unitId
// }
@ -410,13 +423,10 @@ export default {
this.unitId = ''
this.keyWords = ''
this.formData = {
unitName: '',
serviceMatterList: [],
type: '',
contact: '',
contactMobile: '',
memberCount: 0,
remark: '', //500
name: '',
category: '',//
areaCovered: '',//
capacity: 0,//
address: '', //
longitude: '', //
latitude: '' //
@ -442,27 +452,20 @@ export default {
dataRule () {
return {
unitName: [
{ required: true, message: '单位名称不能为空', trigger: 'blur' },
name: [
{ required: true, message: '场所名称不能为空', trigger: 'blur' },
],
type: [
{ required: true, message: '分类不能为空', trigger: 'blur' }
],
contact: [
{ required: true, message: '联系人不能为空', trigger: 'blur' }
],
contactMobile: [
{ required: true, message: '联系电话不能为空', trigger: 'blur' }
],
memberCount: [
{ required: true, message: '在职党员数不能为空', trigger: 'blur' }
categoryName: [
{ required: true, message: '场所类型不能为空', trigger: 'blur' }
],
address: [
{ required: true, message: '详细地址不能为空', trigger: 'blur' }
{ required: true, message: '地址不能为空', trigger: 'blur' }
],
longitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
],
latitude: [
{ required: true, message: '坐标不能为空', trigger: 'blur' }
]
}
},

Loading…
Cancel
Save