diff --git a/src/assets/scss/modules/visual/a_customize.scss b/src/assets/scss/modules/visual/a_customize.scss index 1a5842ff..acafcce2 100644 --- a/src/assets/scss/modules/visual/a_customize.scss +++ b/src/assets/scss/modules/visual/a_customize.scss @@ -34,7 +34,7 @@ .visiual-form { ::v-deep .el-input { - width: 350px; + // width: 350px; height: 36px; .el-input__inner { height: 100%; @@ -70,8 +70,8 @@ ::v-deep .el-date-editor { width: 360px; position: relative; - background: #06186d; - border: 1px solid #1a64cc; + // background: #06186d; + // border: 1px solid #1a64cc; .el-range-input { color: #fff; background: #06186d; diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index 2d786fa2..a0485942 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -58,6 +58,8 @@ style="width: 100%"> + 进入 + @click="entryDepartment(scope.row)">进入 @@ -187,7 +189,8 @@ class-name="small-padding fixed-width"> @@ -492,6 +524,100 @@ export default { }, + async handleSync (row) { + + this.$confirm("确认同步?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.syncUnit(row) + }) + .catch(err => { + if (err == "cancel") { + + } + + }); + }, + async handleNoSync (row) { + + this.$confirm("确认取消同步?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.noSyncUnit(row) + }) + .catch(err => { + if (err == "cancel") { + + } + + }); + }, + + async syncUnit (row) { + const url = "/gov/org/department/syncdept" + + let params = { + id: row.id, + deptName: row.unitName, + mobile: row.contactMobile, + personName: row.contact, + deptType: 'party_unit', + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + if (data.type) { + this.$message({ + type: "success", + message: "同步成功" + }); + this.loadTable() + } else { + this.$message.error(msg) + } + + + + } else { + this.$message.error(msg) + } + }, + + async noSyncUnit (row) { + const url = "/gov/org/department/notsyncdept" + // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete" + + let params = { + id: row.id, + deptId: row.deptId, + deptStaffId: row.deptStaffId, + deptType: 'party_unit', + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + if (data.type) { + this.$message({ + type: "success", + message: "取消同步成功" + }); + this.loadTable() + } else { + this.$message.error(msg) + } + } else { + this.$message.error(msg) + } + }, + async handleDelete (row) { this.$confirm("确认删除?", "提示", { diff --git a/src/views/modules/communityService/fuwujilu/addForm.vue b/src/views/modules/communityService/fuwujilu/addForm.vue index d9db06ee..30efdcc3 100644 --- a/src/views/modules/communityService/fuwujilu/addForm.vue +++ b/src/views/modules/communityService/fuwujilu/addForm.vue @@ -1,6 +1,6 @@
- +
- - + + - - + + @@ -244,7 +225,7 @@ import scoreRecord from "../../../components/scoreRecord.vue"; export default { components: { editForm, scoreRecord }, - data() { + data () { return { openSearch: false, @@ -274,7 +255,7 @@ export default { }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.$store.state.inIframe ? this.clientHeight - 360 + this.iframeHeigh : this.clientHeight - 360; @@ -292,11 +273,11 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { - async handleExportModule() { + async handleExportModule () { let url = "/heart/iccommunityselforganization/import-template-download"; let params = {}; @@ -333,18 +314,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 = @@ -361,7 +342,7 @@ export default { } return fileType && isLt1M; }, - async uploadHttpRequest(file) { + async uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; this.$message({ @@ -416,38 +397,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; @@ -483,23 +464,117 @@ 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 handleSync (row) { + + this.$confirm("确认同步?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.syncUnit(row) + }) + .catch(err => { + if (err == "cancel") { + + } + + }); + }, + async handleNoSync (row) { + + this.$confirm("确认取消同步?", "提示", { + confirmButtonText: "确定", + cancelButtonText: "取消", + type: "warning" + }) + .then(() => { + this.noSyncUnit(row) + }) + .catch(err => { + if (err == "cancel") { + + } + + }); + }, + + async syncUnit (row) { + const url = "/gov/org/department/syncdept" + + let params = { + id: row.orgId, + deptName: row.organizationName, + mobile: row.principalPhone, + personName: row.principalName, + deptType: 'community_org', + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + if (data.type) { + this.$message({ + type: "success", + message: "同步成功" + }); + this.loadTable() + } else { + this.$message.error(msg) + } + + + + } else { + this.$message.error(msg) + } + }, + + async noSyncUnit (row) { + const url = "/gov/org/department/notsyncdept" + // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/delete" + + let params = { + id: row.orgId, + deptId: row.deptId, + deptStaffId: row.deptStaffId, + deptType: 'community_org', + } + + const { data, code, msg } = await requestPost(url, params) + + if (code === 0) { + if (data.type) { + this.$message({ + type: "success", + message: "取消同步成功" + }); + this.loadTable() + } else { + this.$message.error(msg) + } + } else { + this.$message.error(msg) + } + }, + + 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"; @@ -518,7 +593,7 @@ export default { } }, - async getTableData() { + async getTableData () { const url = "/heart/iccommunityselforganization/communityselforganizationlist"; const { pageSize, pageNo, fmData } = this; @@ -532,8 +607,8 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { this.$message.error(msg); @@ -541,14 +616,14 @@ export default { }, //积分记录 - handleScore(row) { + handleScore (row) { this.scoreDiaShow = true; this.$nextTick(() => { this.$refs.ref_score.initForm(row.orgId); }); }, - diaClose() { + diaClose () { this.scoreDiaShow = false; }, }, diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 261e4c9f..ed76d7d0 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -371,9 +371,12 @@ ref="eleEditForm" @handleClose="handleClose" /> --> - + @handleClose="handleClose" /> --> + @@ -408,6 +411,7 @@ import ScreenLoading from "@/views/modules/visual/cpts/loading"; import People from "../../basicinfo/people"; import eventInfo from "./eventInfo"; import serviceInfo from "./serviceInfo"; +import fuwuInfo from "./fuwuInfo"; @@ -1865,7 +1869,7 @@ const vueGis = { ...mapGetters(["clientHeight"]) }, - components: { cptTb, cptCard, ScreenLoading, People, eventInfo, serviceInfo }, + components: { cptTb, cptCard, ScreenLoading, People, eventInfo, serviceInfo, fuwuInfo }, } export default vueGis; diff --git a/src/views/modules/workSys/role/role.vue b/src/views/modules/workSys/role/role.vue index da7d11f5..13a5aba1 100644 --- a/src/views/modules/workSys/role/role.vue +++ b/src/views/modules/workSys/role/role.vue @@ -95,12 +95,14 @@ class="div-table-button--detail" size="small" @click="handleDetail(scope.row)">查看 - 修改 - 删除