diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index f42dfbb0..59dff19c 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -6,9 +6,9 @@ ref="ref_searchform" :label-width="'100px'"> - - + - + :key="item.categoryKey" + :label="item.categoryName" + :value="item.categoryKey"> 查询
- 新增 @@ -58,13 +58,17 @@ :limit="1" :on-exceed="handleExceed" :http-request="uploadFile"> + 下载模板 导入 导出 @@ -83,19 +87,19 @@ type="index" width="50"> - - - - - { + // 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);//filename是键，file是值，就是要传的文件，test.zip是要传的文件名 diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue index 306fc3f8..f07e1158 100644 --- a/src/views/modules/shequzhili/csgltc/csglDetail.vue +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -7,22 +7,22 @@ :model="formData" class="form"> - - {{formData.unitName}} + {{formData.name}} - - {{formData.type}} + {{formData.categoryName}} - @@ -30,27 +30,27 @@ v-for="(item,index) in formData.serviceMatterList" :key="index">{{item}}

- - --> + - {{formData.contact}} + {{formData.areaCovered}} - - {{formData.contactMobile}} + {{formData.capacity}} - - {{formData.memberCount}} + {{formData.address}} - @@ -74,7 +74,7 @@
- + --> diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index f12353d1..8ddd65b6 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -10,22 +10,22 @@ class="form"> + placeholder="请输入场所名称" + v-model="formData.name"> - @@ -36,28 +36,57 @@ + --> + + + + + + 平方公里 + + + + 查询 - - + - - - - - - - @@ -145,23 +162,21 @@ export default { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 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' } ] } },