From 9e9cc36ae6b4599a9698ad448f78564dfb105ba5 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Thu, 23 Jun 2022 10:37:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=AF=8C=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/tinymce2/index.vue | 13 ++++++++++--- src/views/modules/workPc/guidance/DetailForm.vue | 2 ++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue index 60a38284..5f82a817 100644 --- a/src/views/components/tinymce2/index.vue +++ b/src/views/components/tinymce2/index.vue @@ -1,5 +1,5 @@ @@ -51,6 +51,13 @@ import { debounce } from "throttle-debounce"; export default { props: { + id: { + type: String, + default: () => { + num === 10000 && (num = 1); + return `tinymce${+new Date()}${num++}`; + }, + }, value: { default: "", }, @@ -67,7 +74,7 @@ export default { let token = this.getUserToken(); let init = { - selector: '#editors', + selector: `#${this.id}`, language_url: require("./zh_CN.js"), // 中文语言包路径 language: "zh_CN", skin_url: require("tinymce/skins/ui/oxide/skin.css"), // 编辑器皮肤样式 @@ -154,7 +161,7 @@ export default { }; }, mounted() { - tinymce.init(this.init) + // tinymce.init(this.init) }, methods: { vModel(editor) { diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue index 74b0cf3c..8b878642 100644 --- a/src/views/modules/workPc/guidance/DetailForm.vue +++ b/src/views/modules/workPc/guidance/DetailForm.vue @@ -69,6 +69,8 @@ Date: Thu, 23 Jun 2022 17:04:14 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E8=BF=81=E5=87=BA=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/change/verify.vue | 754 +++++++++++++++++ .../modules/plugins/change/verifyForm.vue | 763 ++++++++++++++++++ 2 files changed, 1517 insertions(+) create mode 100644 src/views/modules/plugins/change/verify.vue create mode 100644 src/views/modules/plugins/change/verifyForm.vue diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue new file mode 100644 index 00000000..616b366a --- /dev/null +++ b/src/views/modules/plugins/change/verify.vue @@ -0,0 +1,754 @@ + + + + + diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue new file mode 100644 index 00000000..9dc9bc65 --- /dev/null +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -0,0 +1,763 @@ + + + + From 6341634678103211f948667ff8126de09c8c09e0 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Fri, 24 Jun 2022 11:16:03 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E8=BF=81=E5=87=BA=E5=AE=A1=E6=A0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/plugins/change/verify.vue | 6 +- .../modules/plugins/change/verifyForm.vue | 58 ++++++++++++++++--- 2 files changed, 53 insertions(+), 11 deletions(-) diff --git a/src/views/modules/plugins/change/verify.vue b/src/views/modules/plugins/change/verify.vue index 616b366a..52b8043a 100644 --- a/src/views/modules/plugins/change/verify.vue +++ b/src/views/modules/plugins/change/verify.vue @@ -199,7 +199,7 @@ border style="width: 100%" class="resi-table" - :height="tableHeight" + :height="maxTableHeight" >
-
+
- {{ detailInfo.newHomeName }} + {{ detailInfo.xxdz }} + - + + + 当前人员已不在该房屋 +
+
+ 取消 +
取消 提交 + { + this.loadingForm = false + }, 500) }, async getDatail(type, id) { let url = '/epmetuser/myHome/moveOutConfirmDetail' @@ -656,11 +686,23 @@ export default { }) }, async handleVerify() { - const params = { + let params = { id: this.detailInfo.id, confirmResult: this.confirmResult, reason: this.reason } + if (this.confirmResult == 1 && this.detailInfo.isInHome) { + params = { + ...params, + gridName: this.dataForm.gridName, + villageName: this.dataForm.villageName, + buildName: this.dataForm.buildName, + unitName: this.dataForm.unitName, + homeName: this.dataForm.homeName, + xxdz: this.dataForm.address + } + } + const { data, code, msg } = await requestPost('/epmetuser/myHome/moveOutConfirm', params) From 666d5c61bc37909b10e436cc52751f96a88a071f Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 27 Jun 2022 11:19:48 +0800 Subject: [PATCH 4/7] dd --- .../modules/plugins/change/verifyForm.vue | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index d99e2a74..4cc0f621 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -3,7 +3,7 @@
{{ detailInfo.name }} @@ -35,7 +35,7 @@ - @@ -62,15 +62,15 @@ label-width="150px" > {{ detailInfo.xxdz }} - + --> {{ detailInfo.moveOutDate }} @@ -167,10 +167,10 @@ style="display: block" > - {{ + {{ '迁往' + rootAgency.organizationName + '内其他区域' }} - 其他 + 其他 @@ -437,10 +437,10 @@ export default { this.dataForm.customerId = this.customerId this.dataForm.idCard = row.idCard this.dataForm.mobile = row.mobile - this.dataForm.type = row.outType - this.dataForm.outOfTime = row.moveOutDate + // this.dataForm.type = row.outType + // this.dataForm.outOfTime = row.moveOutDate this.dataForm.reason = row.deleteReason - this.dataForm.address = row.xxdz + // this.dataForm.address = row.xxdz // await this.loadHouseInfo(row.HOME_ID_VALUE) this.dataForm.name = row.name @@ -450,7 +450,7 @@ export default { this.confirmResult = (row.confirmResult == '1' || row.confirmResult == '2') ? row.confirmResult : '' } else this.confirmResult = '1' - this.reason = row.reason + // this.reason = row.reason await this.loadRootAgency() await this.getAgencylist() @@ -665,7 +665,8 @@ export default { }, 2000) this.$refs['ref_form'].validate((valid, messageObj) => { if (!valid) { - app.util.validateRule(messageObj) + // app.util.validateRule(messageObj) + console.log('submit error') } else { if (this.dataForm.type === 'in') { if (!this.dataForm.buildId) { @@ -681,7 +682,7 @@ export default { return false } } - this.saveForm() + // this.saveForm() } }) }, From 36ec4a536a3274a168801eee44d23fd0de2bced1 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Mon, 27 Jun 2022 16:49:08 +0800 Subject: [PATCH 5/7] dd --- src/views/modules/plugins/change/verifyForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/plugins/change/verifyForm.vue b/src/views/modules/plugins/change/verifyForm.vue index 4cc0f621..99c19afe 100644 --- a/src/views/modules/plugins/change/verifyForm.vue +++ b/src/views/modules/plugins/change/verifyForm.vue @@ -682,7 +682,7 @@ export default { return false } } - // this.saveForm() + this.saveForm() } }) }, @@ -715,7 +715,7 @@ export default { } }, async saveForm() { - const url = '/epmetuser/changeRelocation/saveOutOfInfo' + const url = '/epmetuser/changeRelocation/moveOutHome' let noData = new Date() noData = util.dateFormatter(noData, 'time') this.dataForm.transferTime = noData From 9e3ba34027e3fbfe0a7f5eb7e57c75f0dd319031 Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 28 Jun 2022 14:16:33 +0800 Subject: [PATCH 6/7] dd --- src/views/components/resiChangeTransfer.vue | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/components/resiChangeTransfer.vue b/src/views/components/resiChangeTransfer.vue index 1990c3e1..f19da89b 100644 --- a/src/views/components/resiChangeTransfer.vue +++ b/src/views/components/resiChangeTransfer.vue @@ -498,7 +498,8 @@ export default { }, 2000) this.$refs['ref_form'].validate((valid, messageObj) => { if (!valid) { - app.util.validateRule(messageObj) + // app.util.validateRule(messageObj) + console.log('error submit!') } else { if (this.dataForm.type === 'in') { @@ -522,7 +523,9 @@ export default { }, async saveForm () { - const url = '/epmetuser/changeRelocation/saveOutOfInfo' + + // saveOutOfInfo + const url = '/epmetuser/changeRelocation/moveOutHome' let noData = new Date() noData = util.dateFormatter(noData, 'time') this.dataForm.transferTime = noData @@ -530,7 +533,7 @@ export default { const { data, code, msg } = await requestPost(url, this.dataForm) if (code === 0) { - this.$message.success('调动成功') + this.$message.success('操作成功') this.handleCancle() } else { this.$message.error(msg) From ce389708f4cfe67dde67e51f9c25f6d4699c6c9d Mon Sep 17 00:00:00 2001 From: 13176889840 <13176889840@163.com> Date: Tue, 28 Jun 2022 15:41:33 +0800 Subject: [PATCH 7/7] dd --- src/views/components/tinymce2/index.vue | 2 +- .../modules/communityParty/regionalParty/activitysForm.vue | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/views/components/tinymce2/index.vue b/src/views/components/tinymce2/index.vue index 5f82a817..eb118d6a 100644 --- a/src/views/components/tinymce2/index.vue +++ b/src/views/components/tinymce2/index.vue @@ -48,7 +48,7 @@ import "tinymce/plugins/visualblocks"; // import "tinymce/plugins/visualchars"; // import "tinymce/plugins/wordcount"; //数字统计 import { debounce } from "throttle-debounce"; - +let num = 1; export default { props: { id: { diff --git a/src/views/modules/communityParty/regionalParty/activitysForm.vue b/src/views/modules/communityParty/regionalParty/activitysForm.vue index 81b926c1..ea0915d5 100644 --- a/src/views/modules/communityParty/regionalParty/activitysForm.vue +++ b/src/views/modules/communityParty/regionalParty/activitysForm.vue @@ -258,7 +258,7 @@ export default { latitude: 120.38945519 //纬度 }, serviceList: [], - gridList: [], + gridLists: [], agencyId: '' } @@ -304,7 +304,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - this.gridList = data + this.gridLists = data } else { this.$message.error(msg) @@ -390,6 +390,9 @@ export default { if (this.formData.content) { this.formData.content = this.dormatHtml(this.formData.content) } + if (this.formData.result) { + this.formData.result = this.dormatHtml(this.formData.result) + } const { data, code, msg } = await requestPost(url, this.formData)