diff --git a/src/assets/scss/modules/management/list-main.scss b/src/assets/scss/modules/management/list-main.scss index 132b39be..922bfaf7 100644 --- a/src/assets/scss/modules/management/list-main.scss +++ b/src/assets/scss/modules/management/list-main.scss @@ -36,12 +36,12 @@ box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); border-radius: 4px; margin-top: 15px; - padding: 10px; + padding: 10px 20px; position: relative; .div_btn { margin-top: 10px; - margin-left: 10px; + // margin-left: 10px; display: flex; .btn_upload { diff --git a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue index 10929b97..dd59b13b 100644 --- a/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue +++ b/src/views/modules/communityService/fuwuzuzhi/cpts/edit.vue @@ -30,7 +30,7 @@ > -
{{ fmData.serviceTypeName }}
+
{{ fmData.serviceTypeName }}
-
{{ fmData.orgName || "--" }}
+
{{ fmData.orgName || "--" }}
 -
{{ fmData.orgDescribe || "--" }}
+
+ {{ fmData.orgDescribe || "--" }} +
-
{{ fmData.principalName || "--" }}
+
+ {{ fmData.principalName || "--" }} +
-
{{ fmData.principalMobile || "--" }}
+
+ {{ fmData.principalMobile || "--" }} +
-
{{ fmData.remark || "--" }}
+
{{ fmData.remark || "--" }}
 @@ -188,6 +194,7 @@ import { mapGetters } from "vuex"; import { requestPost } from "@/js/dai/request"; import formVltHelper from "dai-js/tools/formVltHelper"; +import nextTick from "dai-js/tools/nextTick"; var map; var search; @@ -288,8 +295,8 @@ export default { geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 // 监听地图平移结束 - map.on("panend", () => { - this.handleMoveCenter(); + map.on("panend", (e) => { + this.handleMoveCenter(e); }); this.handleMoveCenter(); }, @@ -336,7 +343,7 @@ export default { }); }, - handleMoveCenter() { + handleMoveCenter(e) { //修改地图中心点 const center = map.getCenter(); const lat = center.getLat(); @@ -345,11 +352,13 @@ export default { this.fmData.longitude = lng; this.setMarker(lat, lng); - geocoder - .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 - .then((result) => { - this.fmData.address = result.result.address; - }); + if (e && e.originalEvent) { + geocoder + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.fmData.address = result.result.address; + }); + } }, async getInfo() { @@ -366,7 +375,11 @@ export default { ...data, serviceTypeArr: data.serviceType.split(","), }; - map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); + + await nextTick(800); + if (map) { + map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); + } } else { this.$message.error(msg); } diff --git a/src/views/modules/communityService/sqzzz/cpts/edit.vue b/src/views/modules/communityService/sqzzz/cpts/edit.vue index 3b1d06b8..508d61ed 100644 --- a/src/views/modules/communityService/sqzzz/cpts/edit.vue +++ b/src/views/modules/communityService/sqzzz/cpts/edit.vue @@ -1,185 +1,246 @@ @@ -189,15 +250,19 @@ import { mapGetters } from "vuex"; import { Loading } from "element-ui"; // 引入Loading服务 import { requestPost } from "@/js/dai/request"; import formVltHelper from "dai-js/tools/formVltHelper"; +import nextTick from "dai-js/tools/nextTick"; var map; var search; var markers; var infoWindowList; let loading; // 加载动画 +var geocoder; // 新建一个正逆地址解析类 export default { - data () { + components: {}, + props: {}, + data() { return { formType: "add", //表单操作类型 add新增，edit编辑，detail详情 @@ -219,11 +284,11 @@ export default { organizationPersonnel: [], }, categoryList: [], + volunteerList: [], }; }, - components: {}, computed: { - dataRule () { + dataRule() { return { organizationName: [ { required: true, message: "组织名称 不能为空", trigger: "blur" }, @@ -255,18 +320,53 @@ export default { }; }, }, - props: {}, watch: {}, - async created () { + async mounted() { this.getCategoryList(); - }, - async mounted () { + this.getVolunteerList(); this.initMap(); }, methods: { - async getCategoryList () { + querySearchVolunteer(queryString, cb) { + const { volunteerList } = this; + var results = queryString + ? volunteerList.filter((item) => { + return item.value.indexOf(queryString) !== -1; + }) + : volunteerList; + // 调用 callback 返回建议列表的数据 + cb(results); + }, + + handleSelectVolunteer(index, vItem) { + this.dataForm.organizationPersonnel[index] = { + personName: vItem.name, + personPhone: vItem.mobile, + icResiUserId: vItem.icResiUserId, + }; + }, + + async getVolunteerList() { + const url = "/epmetuser/icresiuser/volunteer-list"; + const params = {}; + const { data, code, msg } = await requestPost(url, params); + if (code === 0) { + this.volunteerList = data.map((item) => { + return { + name: item.name, + value: item.label, + mobile: item.mobile, + icResiUserId: item.icResiUserId, + }; + }); + } else { + this.$message.error(msg); + } + }, + + async getCategoryList() { const url = "/sys/dict/data/dictlist"; const params = { dictType: "self_org_category", @@ -278,19 +378,19 @@ export default { this.$message.error(msg); } }, - handleAddStaff () { + handleAddStaff() { this.dataForm.organizationPersonnel = [ ...this.dataForm.organizationPersonnel, - { personName: "", personPhone: "" }, + { personName: "", personPhone: "", icResiUserId: "" }, ]; }, - handleDelStaff (index) { + handleDelStaff(index) { const { organizationPersonnel } = this.dataForm; organizationPersonnel.splice(index, 1); this.dataForm.organizationPersonnel = organizationPersonnel; }, // 地图初始化函数，本例取名为init，开发者可根据实际情况定义 - initMap () { + initMap() { // 定义地图中心点坐标 var center = new window.TMap.LatLng(36.0722275, 120.38945519); // 定义map变量，调用 TMap.Map() 构造函数创建地图 @@ -309,14 +409,16 @@ export default { }); infoWindowList = Array(10); + geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 + // 监听地图平移结束 - map.on("panend", () => { - this.handleMoveCenter(); + map.on("panend", (e) => { + this.handleMoveCenter(e); }); this.handleMoveCenter(); }, - setMarker (lat, lng) { + setMarker(lat, lng) { markers.setGeometries([]); markers.add([ { @@ -330,7 +432,7 @@ export default { ]); }, - handleSearchMap () { + handleSearchMap() { infoWindowList.forEach((infoWindow) => { infoWindow.close(); }); @@ -358,7 +460,8 @@ export default { }); }, - handleMoveCenter () { + handleMoveCenter(e) { + console.log(e); //修改地图中心点 const center = map.getCenter(); const lat = center.getLat(); @@ -366,9 +469,17 @@ export default { this.dataForm.latitude = lat; this.dataForm.longitude = lng; this.setMarker(lat, lng); + + if (e && e.originalEvent) { + geocoder + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.dataForm.address = result.result.address; + }); + } }, - async initForm (type, row) { + async initForm(type, row) { this.$refs.ref_form.resetFields(); this.formType = type; @@ -376,11 +487,15 @@ export default { if (row) { this.dataForm = { ...this.dataForm, ...row }; this.orgId = this.dataForm.orgId; - map.setCenter(new TMap.LatLng(row.latitude, row.longitude)); + + await nextTick(800); + if (map) { + map.setCenter(new TMap.LatLng(row.latitude, row.longitude)); + } } }, - async handleComfirm () { + async handleComfirm() { this.btnDisable = true; setTimeout(() => { this.btnDisable = false; @@ -400,10 +515,7 @@ export default { dataForm: { organizationPersonnel }, } = this; let vlt = organizationPersonnel.every((item) => { - return ( - item.personName && - item.personPhone - ); + return item.personName && item.personPhone; }); if (!vlt) { return this.$message({ @@ -416,7 +528,7 @@ export default { }); }, - async submit () { + async submit() { let url = ""; if (this.formType === "add") { url = "/heart/iccommunityselforganization/addcommunityselforganization"; @@ -444,11 +556,11 @@ export default { } }, - handleCancle () { + handleCancle() { this.resetData(); this.$emit("dialogCancle"); }, - resetData () { + resetData() { this.orgId = ""; this.dataForm = { organizationName: "", @@ -466,7 +578,7 @@ export default { }; }, // 开启加载动画 - startLoading () { + startLoading() { loading = Loading.service({ lock: true, // 是否锁定 text: "正在加载……", // 加载中需要显示的文字 @@ -474,7 +586,7 @@ export default { }); }, // 结束加载动画 - endLoading () { + endLoading() { // clearTimeout(timer); if (loading) { loading.close(); diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 176c1f8a..47bbf6b4 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -2,122 +2,270 @@
- - - - - - - + +
+ +
@@ -155,17 +303,53 @@ export default { type: String, default: "info", }, + idName: { + type: String, + default: "", + }, + addUrl: { + type: String, + default: "", + }, + editUrl: { + type: String, + default: "", + }, + delUrl: { + type: String, + default: "", + }, + infoUrl: { + type: String, + default: "", + }, + editParams: { type: Array, default: () => [], }, + editFixedParams: { + type: Object, + default: () => { + return {}; + }, + }, + editParamsDiv: { + type: Number, + default: 0, + }, }, data() { return { + iniLoaded: false, + btnDisable: false, fmData: {}, + + editParams1: [], + editParams2: [], }; }, components: {}, @@ -192,10 +376,20 @@ export default { } }, + computeFmData() { + console.log(this.fmData); + }, + iniFmData() { - const { editParams } = this; - editParams.forEach(async (item, index) => { - this.fmData[item.keyName] = item.value; + const { editParams, fmData, editParamsDiv } = this; + editParams.forEach((item, index) => { + fmData[item.keyName] = item.value || ""; + if (item.supValues) { + item.supValues.forEach((value, index) => { + fmData[item.supKeys[index]] = value; + }); + } + if (item.type == "select") { if (item.optionUrl) { this.getFmOptions( @@ -205,10 +399,22 @@ export default { ); } } else if (item.type == "address") { - await nextTick(500); - this.initMap(item); + this.$nextTick(async () => { + await nextTick(300); + this.initMap(item); + }); } }); + + this.fmData = { ...fmData }; + if (editParamsDiv) { + this.editParams1 = editParams.slice(0, editParamsDiv); + this.editParams2 = editParams.slice(editParamsDiv); + } else { + this.editParams1 = editParams; + } + console.log("------------------------------------", this.fmData); + this.iniLoaded = true; }, async getFmOptions(index, url, params) { @@ -246,8 +452,8 @@ export default { geocoder = new TMap.service.Geocoder(); // 新建一个正逆地址解析类 // 监听地图平移结束 - map.on("panend", () => { - this.handleMoveCenter(item); + map.on("panend", (e) => { + this.handleMoveCenter(item, e); }); this.handleMoveCenter(item); }, @@ -286,35 +492,48 @@ export default { } = data[0]; map.setCenter(new TMap.LatLng(lat, lng)); this.setMarker(lat, lng); - item.supValues[0] = lng; - item.supValues[1] = lat; + // item.supValues[0] = lng; + // item.supValues[1] = lat; + this.fmData[item.supKeys[0]] = lng; + this.fmData[item.supKeys[1]] = lat; } else { this.$message.error("未检索到相关位置坐标"); } }); }, - handleMoveCenter(item) { + handleMoveCenter(item, e) { + console.log(e); //修改地图中心点 const center = map.getCenter(); const lat = center.getLat(); const lng = center.getLng(); - item.supValues[0] = lng; - item.supValues[1] = lat; + // item.supValues[0] = lng; + // item.supValues[1] = lat; + this.fmData[item.supKeys[0]] = lng; + this.fmData[item.supKeys[1]] = lat; this.setMarker(lat, lng); - geocoder - .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 - .then((result) => { - item.value = result.result.address; - }); + if (e && e.originalEvent) { + geocoder + .getAddress({ location: new TMap.LatLng(lat, lng) }) // 将给定的坐标位置转换为地址 + .then((result) => { + this.fmData[item.keyName] = result.result.address; + }); + } }, async getInfo() { - const url = "/heart/icServiceOrg/detail"; + let url = this.infoUrl; + if (!url) return; + const { idName, formId } = this; + + if (url.endsWith("/")) { + url += formId; + } const params = { - icServiceOrgId: this.formId, + [idName]: formId, }; const { data, code, msg } = await requestPost(url, params); @@ -322,9 +541,13 @@ export default { this.fmData = { ...this.fmData, ...data, - serviceTypeArr: data.serviceType.split(","), }; - map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); + console.log("------------------------------------info", this.fmData); + + await nextTick(800); + if (map) { + map.setCenter(new TMap.LatLng(data.latitude, data.longitude)); + } } else { this.$message.error(msg); } @@ -339,7 +562,7 @@ export default { setTimeout(() => { this.btnDisable = false; }, 5000); - this.computeFmData(); + this.$refs["ref_form"].validate((valid, messageObj) => { if (!valid) { app.util.validateRule(messageObj); @@ -350,25 +573,11 @@ export default { }); }, - computeFmData() { - console.log("11111111111111111112", this.fmData); - // let fmData = {}; - // this.editParams.forEach((item) => { - // fmData[item.keyName] = item.value; - // if (item.supValues) { - // item.supValues.forEach((value, index) => { - // fmData[item.supKeys[index]] = value; - // }); - // } - // }); - // this.fmData = fmData; - return this.fmData; - }, - async submit() { let url = ""; let params = { - ...this.computeFmData(), + ...this.fmData, + ...this.editFixedParams, // serviceType: this.fmData.serviceTypeArr.join(","), }; @@ -376,8 +585,6 @@ export default { url = this.addUrl; } else { url = this.editUrl; - - // params.icServiceOrgId = this.formId; } const { data, code, msg } = await requestPost(url, params); @@ -403,39 +610,57 @@ export default { diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 11a22dea..7c4d678c 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -2,7 +2,7 @@
- +
@@ -40,14 +40,14 @@ 查询 新增 - + >
查看 编辑{{ editBtnName(scope.row) }} + > + +
@@ -227,15 +269,55 @@ export default { type: String, default: "", }, + infoUrl: { + type: String, + default: "", + }, exportUrl: { type: String, default: "", }, + importUrl: { + type: String, + default: "", + }, + mubanUrl: { + type: String, + default: "", + }, + + editAuth: { + type: Function, + default: () => true, + }, + editBtnName: { + type: Function, + default: () => "编辑", + }, + delAuth: { + type: Function, + default: () => true, + }, editParams: { type: Array, default: () => [], }, + editFixedParams: { + type: Object, + default: () => { + return {}; + }, + }, + editParamsDiv: { + type: Number, + default: 0, + }, + + idName: { + type: String, + default: "id", + }, }, data() { @@ -308,6 +390,89 @@ export default { this.getTableData(); }, + beforeExcelUpload(file) { + console.log("file", file); + const isType = file.type === "application/vnd.ms-excel"; + const isTypeComputer = + file.type === + "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"; + const fileType = isType || isTypeComputer; + const isLt1M = file.size / 1024 / 1024 < 10; + if (!fileType) { + this.$message.error("上传文件只能是xls/xlsx格式！"); + } + + if (!isLt1M) { + this.$message.error("上传文件大小不能超过 10MB!"); + } + return fileType && isLt1M; + }, + async uploadHttpRequest(file) { + let { importUrl: url } = this; + if (!url) return; + + this.$message({ + showClose: true, + message: "导入中，请到系统管理-导入记录中查看进度", + duration: 0, + }); + + const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 + formData.append("file", file.file); //添加文件对象 + await this.$http + .post(url, formData) + .then((res) => { + console.log("res-up", res); + if (res.data.code == 0 && res.data.msg == "success") { + // this.$message.success('导入成功') + this.getTableData(); + this.$refs.upload.clearFiles(); + } else this.$message.error(res.data.msg); + }) + .catch((err) => { + console.log("失败", err); + file.onError(); //上传失败的文件会从文件列表中删除 + // this.$message.error('导入失败') + }); + }, + + async handleExportModule() { + let { mubanUrl: url } = this; + if (!url) return; + + await this.$http({ + method: "POST", + url, + responseType: "blob", + data: {}, + }) + .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 handleExport() { const { exportUrl: url } = this; if (!url) return; @@ -353,16 +518,18 @@ export default { }, handleWatch(row) { + const { idName } = this; this.formType = "watch"; - this.formId = row.icServiceOrgId; + this.formId = row[idName]; this.formTitle = "查看"; this.formShow = true; }, handleEdit(row) { + const { idName } = this; this.formType = "edit"; - this.formId = row.icServiceOrgId; - this.formTitle = "编辑"; + this.formId = row[idName]; + this.formTitle = "修改"; this.formShow = true; }, @@ -377,13 +544,17 @@ export default { async handleDelete(rowData, rowIndex) { console.log(rowData, rowIndex); - const { delUrl: url } = this; + let { delUrl: url } = this; if (!url) return; - const { tableData } = this; + const { tableData, idName } = this; + const idValue = tableData[rowIndex][idName]; + if (url.endsWith("/")) { + url += idValue; + } const { data, code, msg } = await requestPost(url, { - icServiceOrgId: tableData[rowIndex].icServiceOrgId, + [idName]: idValue, }); if (code === 0) { @@ -447,5 +618,5 @@ export default { diff --git a/src/views/modules/shequ/cpts/people-more.vue b/src/views/modules/shequ/cpts/people-more.vue index 4ebad94f..69e549c3 100644 --- a/src/views/modules/shequ/cpts/people-more.vue +++ b/src/views/modules/shequ/cpts/people-more.vue @@ -252,6 +252,7 @@ style="margin-top: 10px; padding: 0 20px" > 0) { - if (ele.children.some(row => row.value === val)) { + if (ele.children.some((row) => row.value === val)) { path.unshift(ele.label); - this.getNodePath(ele.children,val,path); + this.getNodePath(ele.children, val, path); } else { - this.getNodePath(ele.children,val,path); + this.getNodePath(ele.children, val, path); } } } diff --git a/src/views/modules/shequzhili/csgltc/csgl.vue b/src/views/modules/shequzhili/csgltc/csgl.vue index e617744d..50d6bb80 100644 --- a/src/views/modules/shequzhili/csgltc/csgl.vue +++ b/src/views/modules/shequzhili/csgltc/csgl.vue @@ -24,16 +24,16 @@ size="small" clearable> + :key="item.value" + :label="item.label" + :value="item.value"> 查询
- 新增 - 下载模板 @@ -67,7 +67,7 @@ 导出 @@ -115,6 +115,7 @@ @@ -131,12 +132,24 @@ class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看 - 待完善 + 修改 + 修改 - 删除 @@ -202,7 +215,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, agencyId: '', @@ -428,8 +441,8 @@ export default { async handleExport () { let title = '城市管理图层' - // const url = "/gov/org/icCityManagement/export" - const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export" + const url = "/gov/org/icCityManagement/export" + // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/icCityManagement/export" let params = { ...this.formData } diff --git a/src/views/modules/shequzhili/csgltc/csglDetail.vue b/src/views/modules/shequzhili/csgltc/csglDetail.vue index f07e1158..b568e532 100644 --- a/src/views/modules/shequzhili/csgltc/csglDetail.vue +++ b/src/views/modules/shequzhili/csgltc/csglDetail.vue @@ -22,15 +22,6 @@ {{formData.categoryName}} - {{formData.address}} - - +
@@ -106,8 +94,8 @@ export default { } }, components: {}, - mounted () { - this.initMap() + async mounted () { + await this.initMap() }, methods: { diff --git a/src/views/modules/shequzhili/csgltc/csglForm.vue b/src/views/modules/shequzhili/csgltc/csglForm.vue index 8ddd65b6..b09e52fd 100644 --- a/src/views/modules/shequzhili/csgltc/csglForm.vue +++ b/src/views/modules/shequzhili/csgltc/csglForm.vue @@ -48,9 +48,9 @@ filterable clearable> + :key="item.value" + :label="item.label" + :value="item.value"> @@ -186,7 +186,7 @@ export default { methods: { - async initForm (type, unitId) { + async initForm (type, icCityManagementId) { this.startLoading() this.$refs.ref_form.resetFields(); @@ -194,9 +194,9 @@ export default { await this.loadService() this.formType = type - if (unitId) { - this.unitId = unitId - this.formData.id = unitId + if (icCityManagementId) { + this.icCityManagementId = icCityManagementId + this.formData.icCityManagementId = icCityManagementId await this.loadFormData() } else { map.setCenter(new TMap.LatLng(36.0722275, 120.38945519)) @@ -268,24 +268,13 @@ export default { }, async addUnit () { - // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - // if (regPhone.test(this.formData.contactMobile) === false) { - // this.btnDisable = false - // this.$message({ - // type: 'warning', - // message: '请输入正确的手机号码' - // }) - // return false; - // } - - 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 - // } - + let url = '' + if (this.formType === 'add'){ + url = '/gov/org/icCityManagement/add' + }else { + url = '/gov/org/icCityManagement/edit' + } const { data, code, msg } = await requestPost(url, this.formData) - if (code === 0) { this.$message({ type: 'success', @@ -298,7 +287,6 @@ export default { this.btnDisable = false this.$message.error(msg) } - }, handleCancle () { diff --git a/src/views/modules/shequzhili/ggfwtc/ggfw.vue b/src/views/modules/shequzhili/ggfwtc/ggfw.vue index e912a6e2..922a5649 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfw.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfw.vue @@ -25,14 +25,14 @@ size="small" clearable> + :key="item.value" + :label="item.label" + :value="item.value"> 查询
- 新增 - 下载模板 @@ -66,7 +66,7 @@ size="small">导入 导出
@@ -112,6 +112,7 @@ @@ -127,11 +128,23 @@ class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看 - 待完善 + 修改 - 修改 + 删除 @@ -197,7 +210,7 @@ export default { return { loading: false, total: 0, - pageSize: 10, + pageSize: 20, pageNo: 0, tableLoading: false, agencyId: '', diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue index 6cf4af89..42d9d9a1 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwDetail.vue @@ -41,6 +41,29 @@ label-width="150px"> {{formData.address}} + +
+
+
+ 经度 + + + 纬度 + + +
+
+
diff --git a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue index 30c30a8c..6b433e07 100644 --- a/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue +++ b/src/views/modules/shequzhili/ggfwtc/ggfwForm.vue @@ -30,9 +30,9 @@ filterable clearable> + :key="item.value" + :label="item.label" + :value="item.value"> @@ -154,7 +154,7 @@ latitude: 120.38945519 //纬度 }, serviceList: [],//服务list - + publicServiceData: {}, } }, components: {}, @@ -210,12 +210,11 @@ let params = { icPublicServiceId: this.icPublicServiceId } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - if (!data.serviceMatterList || !Array.isArray(data.serviceMatterList)) { - data.serviceMatterList = [] + console.log(data) + if (null != data) { + data: this.publicServiceData } this.formData = { ...data } @@ -247,24 +246,13 @@ }, async addUnit () { - // const regPhone = /^1(3|4|5|6|7|8|9)\d{9}$/; //手机号码 - // if (regPhone.test(this.formData.contactMobile) === false) { - // this.btnDisable = false - // this.$message({ - // type: 'warning', - // message: '请输入正确的手机号码' - // }) - // return false; - // } - - let url = '/gov/org/icPublicService/add' - // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/icPublicService/add" - // if (this.formType === 'edit') { - // this.formData.id = this.unitId - // } - + let url = '' + if (this.formType === 'add'){ + url = '/gov/org/icPublicService/add' + }else { + url = '/gov/org/icPublicService/edit' + } const { data, code, msg } = await requestPost(url, this.formData) - if (code === 0) { this.$message({ type: 'success', diff --git a/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue new file mode 100644 index 00000000..91301a2e --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/weihua/index.vue @@ -0,0 +1,149 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue new file mode 100644 index 00000000..6d681bd8 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/cpts/record.vue @@ -0,0 +1,536 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue new file mode 100644 index 00000000..82db5113 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/anquan/xuncha/index.vue @@ -0,0 +1,234 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue new file mode 100644 index 00000000..61459b13 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/yingji/ziyuan/index.vue @@ -0,0 +1,130 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue b/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue new file mode 100644 index 00000000..cfa4e62a --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/anzhibangjiao.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/base.vue b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue new file mode 100644 index 00000000..e1279300 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/base.vue @@ -0,0 +1,777 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue b/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue new file mode 100644 index 00000000..51499380 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/buliangqingshaonian.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue b/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue new file mode 100644 index 00000000..0c59feaf --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/shequjiaozheng.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue new file mode 100644 index 00000000..f55fba23 --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xidurenyuanvue.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue new file mode 100644 index 00000000..477cd82d --- /dev/null +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xiejiaorenyuan.vue @@ -0,0 +1,35 @@ + + + + + diff --git a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue index 79e71c99..a9624c93 100644 --- a/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue +++ b/src/views/modules/shequzhili/tuceng/zhonghe/xinfang.vue @@ -1,94 +1,25 @@ + +