From 79f78e1f44bcb8238067744d03c5e0ac1dac7ee4 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 18 Jan 2022 16:01:31 +0800 Subject: [PATCH] =?UTF-8?q?=E7=A7=AF=E5=88=86=E8=AE=B0=E5=BD=95=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/scoreRecord.vue | 11 +- .../regionalParty/finishList.vue | 16 +- .../communityParty/regionalParty/units.vue | 2 +- .../modules/communityService/shzz/index.vue | 314 ++++++++++-------- .../modules/communityService/sqzzz/index.vue | 283 +++++++++------- 5 files changed, 340 insertions(+), 286 deletions(-) diff --git a/src/views/components/scoreRecord.vue b/src/views/components/scoreRecord.vue index 128e06c0..95f9c9ae 100644 --- a/src/views/components/scoreRecord.vue +++ b/src/views/components/scoreRecord.vue @@ -11,6 +11,7 @@ { - this.$refs.ref_score.initForm(row) + this.$refs.ref_score.initForm(row.id) }) }, diff --git a/src/views/modules/communityService/shzz/index.vue b/src/views/modules/communityService/shzz/index.vue index 36adc798..bd6fa8e5 100644 --- a/src/views/modules/communityService/shzz/index.vue +++ b/src/views/modules/communityService/shzz/index.vue @@ -2,19 +2,20 @@
- - + +
组织名称
-
- +
+
@@ -23,14 +24,13 @@
负责人
-
- +
+
@@ -39,14 +39,13 @@
联系电话
-
- +
+
@@ -56,15 +55,14 @@
服务时间
-
- +
+
@@ -73,9 +71,9 @@ - 查询 + 查询 @@ -83,109 +81,117 @@
- 新增 - - {{ + 新增 + + {{ importBtnTitle }} - excel导出 + excel导出
- - - + + + - + - + - - - + + +
- +
- - + + + + + + +
@@ -196,10 +202,11 @@ import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; import editForm from "./cpts/edit"; import axios from "axios"; +import scoreRecord from '../../../components/scoreRecord.vue' export default { - components: { editForm }, - data() { + components: { editForm, scoreRecord }, + data () { return { openSearch: false, @@ -223,10 +230,14 @@ export default { importBtnTitle: "excel导入", importLoading: false, + + //积分记录 + scoreDiaTitle: '积分记录', + scoreDiaShow: false, }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 450; }, ...mapGetters(["clientHeight"]), @@ -242,23 +253,23 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { // 上传大图标成功 - 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 = @@ -275,7 +286,7 @@ export default { } return fileType && isLt1M; }, - uploadHttpRequest(file) { + uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 @@ -304,35 +315,35 @@ 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(); }, - 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/societyorg/export"; const { pageSize, pageNo, fmData } = this; axios({ @@ -367,23 +378,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/societyorg/del"; const { tableData } = this; @@ -400,7 +411,7 @@ export default { } }, - async getTableData() { + async getTableData () { const url = "/heart/societyorg/getlist"; const { pageSize, pageNo, fmData } = this; const { data, code, msg } = await requestPost(url, { @@ -413,14 +424,27 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - item.serviceTime = - item.serviceStartTime + "至" + item.serviceEndTime; - return item; - }) + item.serviceTime = + item.serviceStartTime + "至" + item.serviceEndTime; + return item; + }) : []; } else { } }, + + //积分记录 + handleScore (row) { + this.scoreDiaShow = true + this.$nextTick(() => { + this.$refs.ref_score.initForm(row.societyId) + }) + }, + + diaClose () { + + this.scoreDiaShow = false + }, }, }; diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index d22fbafa..66ad452f 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -2,19 +2,20 @@
- - + +
组织名称
-
- +
+
@@ -22,15 +23,14 @@
创建时间
-
- +
+
@@ -39,9 +39,9 @@ - 查询 + 查询 @@ -49,111 +49,120 @@
- 新增 - - {{ + 新增 + + {{ importBtnTitle }} - excel导出 + excel导出
- - - + + + - + - - - + + + - + - +
- +
- - + + + + + + +
@@ -164,10 +173,11 @@ import nextTick from "dai-js/tools/nextTick"; import { mapGetters } from "vuex"; import editForm from "./cpts/edit"; import axios from "axios"; +import scoreRecord from '../../../components/scoreRecord.vue' export default { - components: { editForm }, - data() { + components: { editForm, scoreRecord }, + data () { return { openSearch: false, @@ -189,10 +199,14 @@ export default { importBtnTitle: "excel导入", importLoading: false, + + //积分记录 + scoreDiaTitle: '积分记录', + scoreDiaShow: false, }; }, computed: { - maxTableHeight() { + maxTableHeight () { return this.clientHeight - 410; }, ...mapGetters(["clientHeight"]), @@ -208,23 +222,23 @@ export default { } }, }, - mounted() { + mounted () { this.getTableData(); }, methods: { // 上传大图标成功 - 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 = @@ -241,7 +255,7 @@ export default { } return fileType && isLt1M; }, - uploadHttpRequest(file) { + uploadHttpRequest (file) { this.importLoading = true; this.importBtnTitle = "正在上传中..."; const formData = new FormData(); //FormData对象，添加参数只能通过append('key', value)的形式添加 @@ -272,35 +286,35 @@ 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(); }, - 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; @@ -336,23 +350,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"; @@ -370,7 +384,7 @@ export default { } }, - async getTableData() { + async getTableData () { const url = "/heart/iccommunityselforganization/communityselforganizationlist"; const { pageSize, pageNo, fmData } = this; @@ -384,12 +398,25 @@ export default { this.total = data.total || 0; this.tableData = data.list ? data.list.map((item) => { - return item; - }) + return item; + }) : []; } else { } }, + + //积分记录 + handleScore (row) { + this.scoreDiaShow = true + this.$nextTick(() => { + this.$refs.ref_score.initForm(row.orgId) + }) + }, + + diaClose () { + + this.scoreDiaShow = false + }, }, };