From 15940581e6ec2bb04ff054e727b86d41d3efb4a6 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 29 Jun 2022 15:30:22 +0800 Subject: [PATCH 01/40] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../scss/modules/management/form-main.scss | 11 + .../communityParty/heart/heartForm.vue | 819 ++++++++++++++++++ .../communityParty/heart/heartList.vue | 495 +++++++++++ .../communityParty/heart/heartReview.vue | 450 ++++++++++ .../modules/workPc/guidance/DetailForm.vue | 2 +- 5 files changed, 1776 insertions(+), 1 deletion(-) create mode 100644 src/views/modules/communityParty/heart/heartForm.vue create mode 100644 src/views/modules/communityParty/heart/heartList.vue create mode 100644 src/views/modules/communityParty/heart/heartReview.vue diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss index 6e0cfa6fa..d4fe24c3d 100644 --- a/src/assets/scss/modules/management/form-main.scss +++ b/src/assets/scss/modules/management/form-main.scss @@ -21,6 +21,10 @@ .list_item_width_2 { width: 135px; } + + .item_width_5{ + width: 320px; + } } @@ -51,7 +55,14 @@ } } +.form_flex{ + display:flex; + justify-content: space-around; + .form_item{ +width:50%; + } +} .twoline { display: -webkit-box; diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue new file mode 100644 index 000000000..0feba9631 --- /dev/null +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -0,0 +1,819 @@ + + + + + + diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue new file mode 100644 index 000000000..4cb2d955a --- /dev/null +++ b/src/views/modules/communityParty/heart/heartList.vue @@ -0,0 +1,495 @@ + + + + diff --git a/src/views/modules/communityParty/heart/heartReview.vue b/src/views/modules/communityParty/heart/heartReview.vue new file mode 100644 index 000000000..ec45e380c --- /dev/null +++ b/src/views/modules/communityParty/heart/heartReview.vue @@ -0,0 +1,450 @@ + + + + + + diff --git a/src/views/modules/workPc/guidance/DetailForm.vue b/src/views/modules/workPc/guidance/DetailForm.vue index 8b878642b..8bea54ce7 100644 --- a/src/views/modules/workPc/guidance/DetailForm.vue +++ b/src/views/modules/workPc/guidance/DetailForm.vue @@ -334,7 +334,7 @@ export default { this.$message.error(msg) } }, - dormatHtml(content) { + dormatHtml (content) { let c = '' if (content.indexOf('DOCTYPE') != -1) { c = content.slice(45, -16); From f2b8ad70d376190f56fccc4aaf9f53d1a7526c92 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 29 Jun 2022 17:11:30 +0800 Subject: [PATCH 02/40] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E5=88=9A=E5=BC=80=E5=A7=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/article/drafts.vue | 199 +++++ .../modules/communityParty/article/index.vue | 179 ++++ .../modules/communityService/sqzzz/index.vue | 764 +++++------------- 3 files changed, 567 insertions(+), 575 deletions(-) create mode 100644 src/views/modules/communityParty/article/drafts.vue create mode 100644 src/views/modules/communityParty/article/index.vue diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue new file mode 100644 index 000000000..dbee3e599 --- /dev/null +++ b/src/views/modules/communityParty/article/drafts.vue @@ -0,0 +1,199 @@ + + + + + diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue new file mode 100644 index 000000000..2613427d5 --- /dev/null +++ b/src/views/modules/communityParty/article/index.vue @@ -0,0 +1,179 @@ + + + + + diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 6193674c7..3623864ca 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -1,593 +1,207 @@ - + From 50570ffd2eb09e8ede646a4eb4c12f4ec2f04953 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 29 Jun 2022 17:39:57 +0800 Subject: [PATCH 03/40] 1 --- .../modules/communityParty/article/index.vue | 34 +- .../modules/communityService/sqzzz/index.vue | 764 +++++++++++++----- src/views/modules/cpts/base/index.vue | 30 +- 3 files changed, 634 insertions(+), 194 deletions(-) diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 2613427d5..a6f6dd7c1 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -30,9 +30,9 @@ export default { data() { return { searchParams: [ - { field: "企业名称", keyName: "name", type: "input" }, + { field: "活动标题", keyName: "name", type: "input" }, { - field: "企业类型", + field: "分类", keyName: "category", type: "select", optionUrl: "/gov/org/coverage/dict-select-list/dangerous_chemicals", @@ -40,7 +40,28 @@ export default { optionList: [], }, { - field: "危化品种类", + field: "状态", + keyName: "status", + type: "select", + optionUrl: "", + optionUrlParams: {}, + optionList: [ + { + label: "全部", + value: "0", + }, + { + label: "已发布", + value: "1", + }, + { + label: "已下线", + value: "2", + }, + ], + }, + { + field: "发布范围", keyName: "dangerType", type: "select", optionUrl: "/sys/dict/data/dictlist", @@ -49,6 +70,13 @@ export default { }, optionList: [], }, + { + field: "发布时间", + keyName: "publishTime", + type: "date-range", + supKeys: ["startTime", "endTime"], + supValues: ["", ""], + }, ], tableParams: [ diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue index 3623864ca..6193674c7 100644 --- a/src/views/modules/communityService/sqzzz/index.vue +++ b/src/views/modules/communityService/sqzzz/index.vue @@ -1,207 +1,593 @@ - + diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 3c8250b48..823359d28 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -13,7 +13,7 @@ + { fmData[item.keyName] = item.value; + if (item.supValues) { + item.supValues.forEach((value, index) => { + fmData[item.supKeys[index]] = value; + }); + } }); return fmData; }, From 65f7c94a415c09d5952137b7761b889d1c408431 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Thu, 30 Jun 2022 08:59:27 +0800 Subject: [PATCH 04/40] 111 --- .../scss/modules/management/form-main.scss | 5 + .../communityParty/heart/heartForm.vue | 159 +++++++++------ .../communityParty/heart/heartList.vue | 193 ++++++++++++------ 3 files changed, 237 insertions(+), 120 deletions(-) diff --git a/src/assets/scss/modules/management/form-main.scss b/src/assets/scss/modules/management/form-main.scss index d4fe24c3d..f864cd5d7 100644 --- a/src/assets/scss/modules/management/form-main.scss +++ b/src/assets/scss/modules/management/form-main.scss @@ -22,6 +22,11 @@ width: 135px; } + .list_item_width_3 { + width: 185px; + } + + .item_width_5{ width: 320px; } diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index 0feba9631..cf907040e 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -58,20 +58,18 @@ label-width="150px" prop="actStartTime"> 至 @@ -137,8 +135,9 @@ prop="signUpEndTime" label-width="150px"> @@ -160,20 +159,18 @@ label-width="150px" prop="signInStartTime"> 至 @@ -191,7 +188,7 @@
{//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 let nowData = Date.now() - if (this.formData.serviceTimeStart) { - let serviceTimeStart = new Date(this.formData.serviceTimeStart) - return time.getTime() > nowData || time.getTime() < serviceTimeStart || time.getTime() === serviceTimeStart + if (this.formData.actStartTime) { + let startTime = new Date(this.formData.actStartTime + ':00') + return time.getTime() < startTime } else { - return time.getTime() > nowData + return '' } } @@ -399,7 +396,12 @@ export default { uploadUlr: window.SITE_CONFIG['apiURL'] + '/oss/file/uploadvariedfile', // upload_url: '', // 上传URL upload_name: '', // 图片或视频名称 - replayImgList: [], + replayImgList: [ + { + id: '1', + url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png' + } + ], hideUploadBtn: false } @@ -409,6 +411,8 @@ export default { this.customerId = localStorage.getItem('customerId') this.initMap() this.loadSponsorlist() + + // this.replayImgList.push() }, methods: { @@ -495,20 +499,20 @@ export default { async handleComfirm () { - - this.btnDisable = true - setTimeout(() => { - this.btnDisable = false - }, 10000) - this.$refs['ref_form'].validate((valid, messageObj) => { - if (!valid) { - app.util.validateRule(messageObj) - this.btnDisable = false - } else { - this.addRecord() - } - - }) + console.log(this.formData) + // this.btnDisable = true + // setTimeout(() => { + // this.btnDisable = false + // }, 10000) + // this.$refs['ref_form'].validate((valid, messageObj) => { + // if (!valid) { + // app.util.validateRule(messageObj) + // this.btnDisable = false + // } else { + // this.addRecord() + // } + + // }) }, async addRecord () { @@ -546,8 +550,8 @@ export default { removePic (file, fileList) { - this.formData.imageList.splice(this.formData.imageList.findIndex(item => item === file.url), 1) - this.replayImgList.splice(this.replayImgList.findIndex(item => item.uid === file.uid), 1) + this.formData.coverPic = '' + this.replayImgList = [] this.hideUploadBtn = fileList.length >= 1; }, @@ -562,7 +566,7 @@ export default { }, handleSuccess (response, file, fileList) { this.replayImgList.push(file) - this.formData.imageList.push(response.data.url) + this.formData.coverPic = response.data.url }, @@ -745,16 +749,41 @@ export default { resetData () { this.formData = { - gridId: '',//网格Id - ninePlaceVal: '',//九小场所类型value值 - placeOrgId: '',//场所下的组织Id-场所名称 - placePatrolTeamId: '',//场所下分队Id - inspectorArray: [],//检查人员数组 - inspectors: '',//检查人员Id，逗号分隔 - firstTime: '',//首次巡查时间 - detailed: '',//隐患明细 - firstResult: '',//首次检查结果【0:合格 1:不合格】 - reviewTime: '',//拟复查时间 + actAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", + actContent: "", + actDraftId: "", + actEndTime: "2022-08-30 13:34", + actId: "", + actLatitude: 36.08743, + actLongitude: 120.37479, + actQuota: "10", + actStartTime: "2022-07-30 13:34", + actType: "heart", + auditSwitch: true, + coverPic: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png", + coverPicAuditStatus: "", + customerId: "45687aa479955f9d06204d415238f7cc", + + noticePassedPeople: false, + requirement: "", + reward: "10", + + signInAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", + signInEndTime: "2022-07-30 10:34", + signInLatitude: 36.08743, + signInLongitude: 120.37479, + signInRadius: "100", + signInStartTime: "2022-07-29 13:34", + signUpEndTime: "2022-07-28 13:34", + sponsorContacts: "张三", + sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", + sponsorName: "市北区", + sponsorTel: "15111111111", + sponsorType: "agency", + target: "", + title: "312313", + + volunteerLimit: false, } }, // 开启加载动画 @@ -815,5 +844,21 @@ export default { + + diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue index 4cb2d955a..3e1f09304 100644 --- a/src/views/modules/communityParty/heart/heartList.vue +++ b/src/views/modules/communityParty/heart/heartList.vue @@ -17,33 +17,33 @@ - - + 至 - + prop="status"> @@ -97,17 +97,17 @@ min-width="180"> - - @@ -141,8 +141,28 @@ class="div-table-button--edit" size="small" @click="handleEdit(scope.row)">修改 + 报名审核 + 取消活动 + 查看人员 + 结束活动 + 添加回顾 - 复查记录 + @click="handleReview(scope.row)">报名审核
@@ -165,7 +185,7 @@ size="small" class="div-table-button--more" slot="reference">更多 - + --> @@ -187,7 +207,7 @@ :close-on-click-modal="false" :close-on-press-escape="false" :title="formTitle" - width="1250px" + width="1350px" top="5vh" class="dialog-h" @closed="diaClose"> @@ -196,18 +216,51 @@ @dialogOk="addFormOk"> + + + +
+ + +
+ 取消 + 确定 +
+
+ + + + @closed="diaClose"> + @reviewDiaClose="diaClose">
@@ -227,9 +280,9 @@ export default { data () { let endDisabledDate = (time) => {//这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键 let nowData = Date.now() - if (this.formData.startTime) { - let startTime = new Date(this.formData.startTime) - return time.getTime() > nowData || time.getTime() < startTime || time.getTime() === startTime + if (this.formData.actactStartTime) { + let actStartTime = new Date(this.formData.actactStartTime + ':00') + return time.getTime() < actStartTime || time.getTime() === actStartTime } else { return time.getTime() > nowData } @@ -253,18 +306,18 @@ export default { }, agencyId: '', - gridList: [],//所属网格list--场所区域 + statusList: [ { - value: '0', + value: 'published', label: '进行中' }, { - value: '1', + value: 'finished', label: '已结束' }, { - value: '2', + value: 'canceled', label: '已取消' } ],//是否合格list @@ -272,12 +325,9 @@ export default { formData: { title: '',//活动标题 - firstResult: '',//首次检查结果【0:合格 1:不合格】 - gridId: '',//场所区域【网格Id】 - ninePlaceVal: '',//场所类型【九小场所Value值】 - finalResult: '',//最终检查结果【0:合格 1:不合格】 - startTime: '', - endTime: '' + actStartTime: '', + actEndTime: '', + status: '' }, tableData: [], @@ -285,8 +335,14 @@ export default { //form相关 formShow: false, formTitle: '新增巡查', + actId: '', - reviewShow: false + cancelReason: '', + cancleShow: false,//活动取消 + auditShow: false,//报名审核 + personShow: false,//查看人员 + finishShow: false,//活动结束 + reviewShow: false,//添加回顾 } }, @@ -351,6 +407,15 @@ export default { this.reviewShow = false }, + diaClose () { + + this.cancleShow = false//活动取消 + this.auditShow = false//报名审核 + this.personShow = false//查看人员 + this.finishShow = false//活动结束 + this.reviewShow = false//添加回顾 + }, + handleDetail (row) { this.formTitle = '详情' this.formShow = true @@ -375,7 +440,7 @@ export default { }) }, - handleReview (row) { + handleAudit (row) { this.reviewShow = true this.$nextTick(() => { this.$refs.ref_review.initTable(row.placePatrolRecordId) @@ -391,38 +456,27 @@ export default { this.loadTable() }, - async handleDelete (row) { - - this.$confirm("确认删除?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }) - .then(() => { - this.deleteRecord(row) - }) - .catch(err => { - if (err == "cancel") { - - } - - }); + async handleCancleAct (row) { + this.cancleShow = true + this.actId = row.actId }, - async deleteRecord (row) { - const url = "/gov/org/placepatrolrecord/del" + async cancleAct () { + const url = "/heart/work/act/cancelact" // const url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/del" let params = { - placePatrolRecordId: row.placePatrolRecordId + actId: this.actId, + cancelReason: this.cancelReason, } const { data, code, msg } = await requestPost(url, params) if (code === 0) { + this.cancleShow = false this.$message({ type: "success", - message: "删除成功" + message: "取消成功" }); this.loadTable() @@ -431,17 +485,30 @@ export default { } }, + cancleDiaClose () { + this.cancelReason = '' + this.cancleShow = false//活动取消 + }, + + diaClose () { + + + this.auditShow = false//报名审核 + this.personShow = false//查看人员 + this.finishShow = false//活动结束 + this.reviewShow = false//添加回顾 + }, + //重置搜索条件 resetSearch () { this.formData = { - title: '',//活动标题 - mobile: '',//联系电话 - scale: '',//场所规模【 0:10人以下 1:10-20人 2:21-40人 3:41-100人 4:100人以上】 - gridId: '',//场所区域【网格Id】 - ninePlaceVal: '',//场所类型【九小场所Value值】 - isPage: true,//是否分页(是:true 否:false) 有这个参数是给新增巡查记录时用的，默认是 + title: '',//活动标题 + + actStartTime: '', + actEndTime: '', + status: '' } - this.pageSize = 10 + this.pageSize = 20 this.pageNo = 0 this.loadTable() }, From b2e8231bdfd6775e044d3aaef7ff03e429dc5aef Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 1 Jul 2022 09:39:03 +0800 Subject: [PATCH 05/40] =?UTF-8?q?=E5=85=9A=E5=BB=BA=E5=A3=B0=E9=9F=B3?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/cascader.js | 19 ++ .../modules/communityParty/article/index.vue | 234 +++++++++++------- src/views/modules/cpts/base/cpts/edit.vue | 233 +++++++++-------- src/views/modules/cpts/base/index.vue | 45 +++- 4 files changed, 326 insertions(+), 205 deletions(-) create mode 100644 src/utils/cascader.js diff --git a/src/utils/cascader.js b/src/utils/cascader.js new file mode 100644 index 000000000..759920973 --- /dev/null +++ b/src/utils/cascader.js @@ -0,0 +1,19 @@ +/** + * 深度克隆 + */ +export function getItemByIdInCascader(arr, vals, idName, childName) { + let item = arr.find((v) => v[idName] == vals[0]); + if (vals.length > 1) { + return [ + item, + ...getItemByIdInCascader( + item[childName], + vals.slice(1), + idName, + childName + ), + ]; + } else { + return [item]; + } +} diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index a6f6dd7c1..745eca594 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -16,13 +16,14 @@ :editParams="editParams" :editElseRules="editElseRules" :editBtnName="(item) => (!item.latitude ? '待完善' : '修改')" - idName="icDangerousChemicalsId" + idName="articleId" >
+ + + diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue new file mode 100644 index 000000000..8567a5bdf --- /dev/null +++ b/src/views/modules/communityParty/heart/heartFinish.vue @@ -0,0 +1,374 @@ + + + + + + \ No newline at end of file diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index cf907040e..03b84a368 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -14,7 +14,7 @@ - - - @@ -87,7 +88,7 @@ prop="reward" style="display: block" label-width="150px"> - @@ -95,7 +96,7 @@ prop="sponsorContacts" label-width="150px" style="display: block"> - @@ -108,7 +109,7 @@ prop="sponsorTel" label-width="150px" style="display: block"> - @@ -127,6 +128,7 @@ label-width="150px" style="display: block"> + （选中后报名参加活动人员可以直接审核通过） @@ -134,11 +136,12 @@ style="display: block" prop="signUpEndTime" label-width="150px"> - + placeholder="选择时间"> @@ -146,7 +149,7 @@ prop="requirement" label-width="150px" style="display: block"> - - @@ -257,20 +260,20 @@
-

+ v-html="formData.actContentHtml">

 @@ -325,54 +328,108 @@ export default { let nowData = Date.now() return time.getTime() > nowData } + const valActTime = (rule, value, callback) => { + if (value === '' || value === null) { + callback(new Error('请选择活动开始时间')) + } else if (!this.formData.actEndTime) { + callback(new Error('请选择活动结束时间')) + } else { + callback() + } + } + const valSigninTime = (rule, value, callback) => { + if (value === '' || value === null) { + callback(new Error('请选择签到开始时间')) + } else if (!this.formData.signInEndTime) { + callback(new Error('请选择签到结束时间')) + } else { + callback() + } + } return { formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 btnDisable: false, customerId: '', + actId: '', + valActTime: valActTime, + valSigninTime: valSigninTime, - placesList: [],//场景列表 - teamsList: [],//分队列表 - inspectorsList: [],//检查人员列表 - - placePatrolRecordId: '', formData: { - actAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - actContent: "", + actAddress: "", + actContentHtml: "", + actContent: {}, actDraftId: "", - actEndTime: "2022-08-30 13:34", + actEndTime: "", actId: "", - actLatitude: 36.08743, - actLongitude: 120.37479, - actQuota: "10", - actStartTime: "2022-07-30 13:34", + actLatitude: null, + actLongitude: null, + actQuota: undefined, + actStartTime: "", actType: "heart", - auditSwitch: true, - coverPic: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png", + auditSwitch: false, + coverPic: "", coverPicAuditStatus: "", - customerId: "45687aa479955f9d06204d415238f7cc", + customerId: "", noticePassedPeople: false, requirement: "", - reward: "10", - - signInAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - signInEndTime: "2022-07-30 10:34", - signInLatitude: 36.08743, - signInLongitude: 120.37479, - signInRadius: "100", - signInStartTime: "2022-07-29 13:34", - signUpEndTime: "2022-07-28 13:34", - sponsorContacts: "张三", - sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", - sponsorName: "市北区", - sponsorTel: "15111111111", - sponsorType: "agency", + reward: undefined, + + signInAddress: "", + signInEndTime: "", + signInLatitude: null, + signInLongitude: null, + signInRadius: undefined, + signInStartTime: "", + signUpEndTime: "", + sponsorContacts: "", + sponsorId: "", + sponsorPath: '', + sponsorName: "", + sponsorTel: "", + sponsorType: "", target: "", - title: "312313", + title: "", volunteerLimit: false, }, + formDataTemp: { + actAddress: "山东省青岛市市北区安达路", + actContent: {}, + actContentHtml: "", + actDraftId: "", + actEndTime: "2022-07-20 00:00", + actId: "", + actLatitude: 36.102321679746424, + actLongitude: 120.37441423359928, + actQuota: 50, + actStartTime: "2022-07-15 00:00", + actType: "heart", + auditSwitch: true, + coverPic: "", + coverPicAuditStatus: "", + customerId: "", + noticePassedPeople: false, + requirement: "报名条件报名条件报名条件", + reward: 100, + signInAddress: "山东省青岛市市南区南京路79号丁", + signInEndTime: "2022-07-14 11:00", + signInLatitude: 36.07208450171733, + signInLongitude: 120.38920734352655, + signInRadius: 100, + signInStartTime: "2022-07-14 10:00", + signUpEndTime: "2022-07-13 00:00", + sponsorContacts: "王二麻", + sponsorPath: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28,63d5ff92ea981b1c58e4914ac894c610", + sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", + sponsorName: "市北区", + sponsorTel: "1511111111", + sponsorType: "agency", + target: "", + title: "31231", + volunteerLimit: true, + }, orgOptions: [], orgOptionProps: { @@ -397,10 +454,10 @@ export default { // upload_url: '', // 上传URL upload_name: '', // 图片或视频名称 replayImgList: [ - { - id: '1', - url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png' - } + // { + // id: '1', + // url: 'https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png' + // } ], hideUploadBtn: false @@ -412,23 +469,29 @@ export default { this.initMap() this.loadSponsorlist() + + // this.replayImgList.push() }, methods: { - async initForm (type, placePatrolRecordId) { + async initForm (type, actId) { this.$refs.ref_form.resetFields(); - this.startLoading() + + this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); + this.agencyIdArray = this.formData.sponsorPath.split(',') this.formType = type - if (placePatrolRecordId) { - this.placePatrolRecordId = placePatrolRecordId - this.formData.placePatrolRecordId = placePatrolRecordId + if (actId) { + this.startLoading() + this.actId = actId + this.formData.actId = actId await this.loadFormData() + this.endLoading() } - this.endLoading() + }, //获取主办方 @@ -457,39 +520,53 @@ export default { if (obj) { this.formData.sponsorId = obj.gridId this.formData.sponsorName = obj.agencyName + this.formData.sponsorPath = this.agencyIdArray.join(',') - if (obj.level === 'agency') { + if (obj.level === 'agency') { this.formData.sponsorType = 'agency' } else { - this.formData.sponsorType = 'grid' } } else { this.formData.sponsorId = '' + this.formData.sponsorPath = '' this.formData.sponsorName = '' this.formData.sponsorType = '' } - }, - //加载form async loadFormData () { - const url = '/gov/org/placepatrolrecord/detail' + const url = '/heart/work/act/detail' let params = { - placePatrolRecordId: this.placePatrolRecordId + actId: this.actId } const { data, code, msg } = await requestPost(url, params) if (code === 0) { - data.inspectorArray = data.inspectors.split(',') - this.formData = { ...data } + debugger + this.formData = JSON.parse(JSON.stringify(data)); + this.agencyIdArray = this.formData.sponsorPath.split(',') + if (this.formData.actContent && this.formData.actContent.length > 0) { + this.formData.actContentHtml = this.formData.actContent[0].content + } + + if (this.formData.coverPic) { + let obj = { + id: '111', + url: this.formData.coverPic + } + this.replayImgList = [] + this.replayImgList.push(obj) + + this.hideUploadBtn = true + } } else { @@ -497,30 +574,40 @@ export default { } }, - async handleComfirm () { console.log(this.formData) - // this.btnDisable = true - // setTimeout(() => { - // this.btnDisable = false - // }, 10000) - // this.$refs['ref_form'].validate((valid, messageObj) => { - // if (!valid) { - // app.util.validateRule(messageObj) - // this.btnDisable = false - // } else { - // this.addRecord() - // } - - // }) + + this.btnDisable = true + setTimeout(() => { + this.btnDisable = false + }, 3000) + + this.$refs['ref_form'].validate((valid, messageObj) => { + + if (!valid) { + + app.util.validateRule(messageObj) + this.btnDisable = false + } else { + this.addHeartAct() + } + + }) }, - async addRecord () { - this.formData.actContent = this.dormatHtml(this.formData.actContent) + async addHeartAct () { + let obj = { + contentType: 'rich_text', + content: this.dormatHtml(this.formData.actContentHtml) + } + this.formData.actContent = [] + this.formData.actContent.push(obj) + + this.formData.customerId = this.customerId - let url = "/gov/org/placepatrolrecord/add" + let url = "/heart/work/act/publishV2" // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" - this.formData.inspectors = this.formData.inspectorArray.join(',') + const { data, code, msg } = await requestPost(url, this.formData) @@ -749,39 +836,41 @@ export default { resetData () { this.formData = { - actAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - actContent: "", + actAddress: "", + actContentHtml: "", + actContent: {}, actDraftId: "", - actEndTime: "2022-08-30 13:34", + actEndTime: "", actId: "", - actLatitude: 36.08743, - actLongitude: 120.37479, - actQuota: "10", - actStartTime: "2022-07-30 13:34", + actLatitude: null, + actLongitude: null, + actQuota: undefined, + actStartTime: "", actType: "heart", - auditSwitch: true, - coverPic: "https://elink-esua-epdc.oss-cn-qingdao.aliyuncs.com/epmet/test/20220629/db05fed5cc56417299364ab8362ac9a0.png", + auditSwitch: false, + coverPic: "", coverPicAuditStatus: "", - customerId: "45687aa479955f9d06204d415238f7cc", + customerId: "", noticePassedPeople: false, requirement: "", - reward: "10", - - signInAddress: "市北区海泊桥青岛市市北区政府(延吉路北)", - signInEndTime: "2022-07-30 10:34", - signInLatitude: 36.08743, - signInLongitude: 120.37479, - signInRadius: "100", - signInStartTime: "2022-07-29 13:34", - signUpEndTime: "2022-07-28 13:34", - sponsorContacts: "张三", - sponsorId: "7b6f9a9f9f38d5f9fa7ce94a93d6eb28", - sponsorName: "市北区", - sponsorTel: "15111111111", - sponsorType: "agency", + reward: undefined, + + signInAddress: "", + signInEndTime: "", + signInLatitude: null, + signInLongitude: null, + signInRadius: undefined, + signInStartTime: "", + signUpEndTime: "", + sponsorContacts: "", + sponsorId: "", + sponsorPath: '', + sponsorName: "", + sponsorTel: "", + sponsorType: "", target: "", - title: "312313", + title: "", volunteerLimit: false, } @@ -806,31 +895,50 @@ export default { dataRule () { return { - gridId: [ - { required: true, message: '场所网格不能为空', trigger: 'blur' } - ], - ninePlaceVal: [ - { required: true, message: '场所类型不能为空', trigger: 'blur' }, + sponsorId: [ + { required: true, message: '主办方不能为空', trigger: 'change' } ], - placeOrgId: [ - { required: true, message: '场所名称不能为空', trigger: 'blur' } + title: [ + { required: true, message: '活动标题不能为空', trigger: 'change' }, ], - placePatrolTeamId: [ - { required: true, message: '分队不能为空', trigger: 'blur' } + + coverPic: [ + { required: true, message: '封面图不能为空', trigger: 'change' } ], - inspectorArray: [ - { required: true, message: '巡检人员不能为空', trigger: 'blur' } + actContentHtml: [ + { required: true, message: '活动详情不能为空', trigger: 'change' } + ], + actAddress: [ + { required: true, message: '活动地点不能为空', trigger: 'change' } ], - firstTime: [ - { required: true, message: '首次巡查时间不能为空', trigger: 'blur' } + actStartTime: [ + { required: true, validator: this.valActTime, message: '活动时间不能为空', trigger: 'change' } ], - detailed: [ - { required: true, message: '隐患明细不能为空', trigger: 'blur' } + actQuota: [ + { required: true, message: '活动人数不能为空', trigger: 'change' } + ], + reward: [ + { required: true, message: '活动积分不能为空', trigger: 'change' } + ], + signUpEndTime: [ + { required: true, message: '报名截止时间不能为空', trigger: 'change' } + ], + signInStartTime: [ + { required: true, validator: this.valSigninTime, message: '签到时间不能为空', trigger: 'change' } + ], + signInAddress: [ + { required: true, message: '签到地点不能为空', trigger: 'change' } + ], + signInRadius: [ + { required: true, message: '签到有效范围不能为空', trigger: 'change' } + ], + sponsorContacts: [ + { required: true, message: '联系人不能为空', trigger: 'change' } + ], + sponsorTel: [ + { required: true, message: '联系电话不能为空', trigger: 'change' } ], - firstResult: [ - { required: true, message: '首次巡查结果不能为空', trigger: 'blur' } - ] } }, @@ -848,6 +956,10 @@ export default { .avatar-uploader { margin: 0 0 0 20px; } +.div-tooltip { + margin-left: 10px; + color: red; +} diff --git a/src/views/modules/communityParty/heart/heartReview.vue b/src/views/modules/communityParty/heart/heartReview.vue index ec45e380c..8724d6404 100644 --- a/src/views/modules/communityParty/heart/heartReview.vue +++ b/src/views/modules/communityParty/heart/heartReview.vue @@ -1,138 +1,40 @@ @@ -141,252 +43,119 @@ import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 import { requestPost } from '@/js/dai/request' +import Tinymce from '@c/tinymce2/index.vue' + let loading // 加载动画 + + export default { data () { + return { - tableLoading: false, - placePatrolRecordId: '', - tableData: [], + formType: 'add', //表单操作类型 add新增，edit编辑，detail详情 + btnDisable: false, + customerId: '', + actId: '', + + formData: { + actContent: '', + }, + + } }, - components: {}, + components: { Tinymce }, mounted () { + this.customerId = localStorage.getItem('customerId') }, methods: { - async initTable (placePatrolRecordId) { - this.placePatrolRecordId = placePatrolRecordId - await this.loadTeams() - - await this.loadTable() - - }, - - - //加载分队 - async loadTeams () { - const url = '/gov/org/placepatrolteam/getlist' - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteam/getlist' - let params = { - isPage: false - } - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - this.teamsList = data.list - - - } else { - this.$message.error(msg) - } - }, - - //点击分队切换人员 - async hancleChangeTeam (row, index, tableIndex) { - this.tableData[tableIndex].inspectorArray = [...[]] - let teamId = this.teamsList[index].teamId - await this.loadInspectors(teamId, tableIndex) - }, - - //加载分队下人员 - async loadInspectors (teamId, tableIndex) { + async initForm (type, actId) { + this.$refs.ref_form.resetFields(); + this.startLoading() - const url = '/gov/org/placepatrolteamstaff/getlist' - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolteamstaff/getlist' - let params = { - teamId: teamId - } + this.formType = type + if (actId) { + this.actId = actId + this.formData.actId = actId - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { - // let obj = this.tableData[tableIndex] - this.tableData[tableIndex].inspectorsList = [...data] - // this.tableData[tableIndex]= - // obj.inspectorsList = data - // this.$set(this.tableData, tableIndex, obj) - console.log(this.tableData) - } else { - this.$message.error(msg) } + this.endLoading() }, - //加载form - async loadTable () { - this.tableLoading = true - const url = '/gov/org/placepatrolreviewrecord/getlist' - // const url = 'http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolreviewrecord/getlist' - let params = { - placePatrolRecordId: this.placePatrolRecordId - } - const { data, code, msg } = await requestPost(url, params) - this.tableLoading = false - if (code === 0) { - if (data.list && data.list.length > 0) { - data.list.forEach(item => { - item.isEdit = false - item.isNew = false - let arrayInspectors = item.inspectors.split(',') - item.inspectorArray = [...arrayInspectors] - let arrayReviewTime = item.reviewTime.split(' ') - item.reviewTime = arrayReviewTime[0] - }); - this.tableData = [...data.list] - } else { - this.tableData = [] - } + async handleComfirm () { + console.log(this.formData) + // this.btnDisable = true + // setTimeout(() => { + // this.btnDisable = false + // }, 10000) + // this.$refs['ref_form'].validate((valid, messageObj) => { + // if (!valid) { + // app.util.validateRule(messageObj) + // this.btnDisable = false + // } else { + // this.addRecord() + // } - } else { - this.$message.error(msg) - } - }, + // }) - handleAdd () { - let obj = { - isNew: true,//是否新增 - isEdit: true,//是否编辑 - placePatrolRecordId: this.placePatrolRecordId, - reviewTime: '', - placePatrolTeamId: '', - inspectors: '', - inspectorArray: [], - inspectorsList: [], - reviewResult: '', - } - this.tableData.push(obj) }, + async addRecord () { + this.formData.actContent = this.dormatHtml(this.formData.actContent) - async handleEdit (row, tableIndex) { - let teamId = row.placePatrolTeamId - await this.loadInspectors(teamId, tableIndex) + let url = "/gov/org/placepatrolrecord/add" + // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" + this.formData.inspectors = this.formData.inspectorArray.join(',') - let rowData = JSON.parse(JSON.stringify(row)) - rowData.isEdit = true - rowData.isNew = false - rowData.inspectorArray = rowData.inspectors.split(',') + const { data, code, msg } = await requestPost(url, this.formData) - console.log(rowData) - this.$set(this.tableData, tableIndex, rowData) - }, - - async handleComfirm (row, tableIndex) { - let valiMsg = this.validata(row) - if (valiMsg) { + if (code === 0) { this.$message({ - type: 'warning', - message: valiMsg + type: 'success', + message: '操作成功' }) - return false - } - - this.addReview(row, tableIndex) - - }, - async addReview (row, tableIndex) { - - let url = "/gov/org/placepatrolreviewrecord/add" - if (row.placePatrolReviewRecordId) { - url = "/gov/org/placepatrolreviewrecord/edit" - } - - let params = JSON.parse(JSON.stringify(row)) - params.inspectors = params.inspectorArray.join(',') - params.reviewTime = params.reviewTime + ' 00:00:00' - - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - let array = data.reviewTime.split(' ') - data.reviewTime = array[0] - data.isEdit = false - data.isNew = false - - this.$set(this.tableData, tableIndex, data) - + this.resetData() + this.$emit('dialogOk') + this.btnDisable = false } else { - + this.btnDisable = false this.$message.error(msg) } }, - validata (row) { - let message = '' - if (row.reviewTime === '') { - message = message + '复查时间不能为空；' - } - if (row.placePatrolTeamId === '') { - message = message + '分队名称不能为空；' - } - if (row.inspectorArray.length === 0) { - message = message + '检查人员不能为空；' + dormatHtml (content) { + let c = '' + if (content.indexOf('DOCTYPE') != -1) { + c = content.slice(45, -16); } - if (row.reviewResult === '') { - message = message + '复查结论不能为空；' - } - return message + console.log('content', typeof content) + return c || content }, - async handleDelete (row, tableIndex) { - - this.$confirm("确认删除?", "提示", { - confirmButtonText: "确定", - cancelButtonText: "取消", - type: "warning" - }) - .then(() => { - if (row.placePatrolReviewRecordId) {//存在id，调用服务删除 - this.deleteRecord(row, tableIndex) - } else {//不存在id，直接删除数组数据 - this.tableData.splice(tableIndex, 1); - } - - }) - .catch(err => { - if (err == "cancel") { - - } - }); - }, - - async deleteRecord (row, tableIndex) { - - const url = "/gov/org/placepatrolreviewrecord/del" - - let params = { - placePatrolReviewRecordId: row.placePatrolReviewRecordId - } - const { data, code, msg } = await requestPost(url, params) - - if (code === 0) { - // this.$message({ - // type: "success", - // message: "删除成功" - // }); - - this.tableData.splice(tableIndex, 1); - } else { - this.$message.error(msg) - } - }, handleCancle () { + + this.resetData() this.$emit('dialogCancle') }, - + resetData () { + this.formData = { + actContent: '', + } + }, // 开启加载动画 startLoading () { loading = Loading.service({ @@ -404,47 +173,62 @@ export default { } }, computed: { - tableHeight () { - - return (this.clientHeight - 360) - + dataRule () { + return { + + gridId: [ + { required: true, message: '场所网格不能为空', trigger: 'blur' } + ], + ninePlaceVal: [ + { required: true, message: '场所类型不能为空', trigger: 'blur' }, + ], + placeOrgId: [ + { required: true, message: '场所名称不能为空', trigger: 'blur' } + ], + placePatrolTeamId: [ + { required: true, message: '分队不能为空', trigger: 'blur' } + ], + + inspectorArray: [ + { required: true, message: '巡检人员不能为空', trigger: 'blur' } + ], + firstTime: [ + { required: true, message: '首次巡查时间不能为空', trigger: 'blur' } + ], + detailed: [ + { required: true, message: '隐患明细不能为空', trigger: 'blur' } + ], + firstResult: [ + { required: true, message: '首次巡查结果不能为空', trigger: 'blur' } + ] + } }, - ...mapGetters(['clientHeight']) - }, props: { - resultList: { - type: Array, - default: [] - } } } - + + + From 56a9e9fbe8d66f2f292946cbb4d6b70ecbf68056 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Fri, 1 Jul 2022 11:20:20 +0800 Subject: [PATCH 07/40] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/heart/heartForm.vue | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index 03b84a368..edcb283ac 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -549,7 +549,7 @@ export default { const { data, code, msg } = await requestPost(url, params) if (code === 0) { - debugger + this.formData = JSON.parse(JSON.stringify(data)); this.agencyIdArray = this.formData.sponsorPath.split(',') if (this.formData.actContent && this.formData.actContent.length > 0) { @@ -606,6 +606,12 @@ export default { this.formData.customerId = this.customerId let url = "/heart/work/act/publishV2" + if (this.actId) { + url = '/heart/work/act/republishV2' + } else { + url = "/heart/work/act/publishV2" + } + // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" From fdd80b204e201c35e89d9e27b6e5aac2f3fa1a8b Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Fri, 1 Jul 2022 14:07:29 +0800 Subject: [PATCH 08/40] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/utils/cascader.js | 23 +++++- .../modules/communityParty/article/index.vue | 71 ++++++++++++------- src/views/modules/cpts/base/cpts/edit.vue | 58 +++++++++++---- 3 files changed, 112 insertions(+), 40 deletions(-) diff --git a/src/utils/cascader.js b/src/utils/cascader.js index 759920973..3ab33ae07 100644 --- a/src/utils/cascader.js +++ b/src/utils/cascader.js @@ -1,6 +1,3 @@ -/** - * 深度克隆 - */ export function getItemByIdInCascader(arr, vals, idName, childName) { let item = arr.find((v) => v[idName] == vals[0]); if (vals.length > 1) { @@ -17,3 +14,23 @@ export function getItemByIdInCascader(arr, vals, idName, childName) { return [item]; } } + +export function collapse(arr, childName) { + if (arr.length > 0) { + let ret = [...arr]; + arr.forEach((element) => { + let childs = element[childName]; + if (childs && Array.isArray(childs)) { + ret.push(...collapse(childs, childName)); + } + }); + return ret; + } else { + return []; + } +} + +export default { + getItemByIdInCascader, + collapse, +}; diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 745eca594..8a48672a2 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -23,7 +23,8 @@ diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue index 8567a5bdf..0c7fc05f7 100644 --- a/src/views/modules/communityParty/heart/heartFinish.vue +++ b/src/views/modules/communityParty/heart/heartFinish.vue @@ -52,7 +52,7 @@ header-align="center" align="center" label="姓名" - width="150"> + width="120"> @@ -67,7 +67,7 @@ header-align="center" align="center" label="报名时间" - width="150"> + width="180"> 0) { - data.list.forEach(item => { - if (item.signInFlag) { + arr = data.list.filter(item => item.status === 'passed') + arr.forEach(item => { + if (item.signInFlag === 'signed_in') { item.signInFlagShow = '是' item.grantPointShow = '1' item.grantPoint = true @@ -225,7 +199,7 @@ export default { }); - this.tableData = [...data.list] + this.tableData = [...arr] } else { this.tableData = [] } @@ -243,6 +217,21 @@ export default { }); return false } + let errBeforeSubmit = '' + if ( + new Date(this.formData.actualEndTime).getTime() <= + new Date(this.formData.actualStartTime).getTime() + ) { + errBeforeSubmit = "活动实际开始时间应早于活动实际结束时间"; + } + + if (errBeforeSubmit) { + this.$message({ + type: 'info', + message: errBeforeSubmit + }) + return false + } let userList = [] @@ -250,7 +239,7 @@ export default { // actUserRelationId grantPoint true:给分；false：不给分 denyRewardReason 拒绝理由 this.tableData.forEach(item => { let obj = {} - obj.actUserRelationId = item.userId + obj.actUserRelationId = item.actUserRelationId obj.denyRewardReason = item.denyRewardReason if (item.grantPointShow === '1') { @@ -272,7 +261,7 @@ export default { }); return false } else { - console.log(userList) + this.finishAct(userList) } @@ -282,15 +271,14 @@ export default { }, async finishAct (userList) { - // let url = "/heart/work/act/finish" - let url = "http://yapi.elinkservice.cn/mock/245/heart/work/act/finish" - + let url = "/heart/work/act/finish" + // let url = "http://yapi.elinkservice.cn/mock/245/heart/work/act/finish" let params = { userList: userList, ...this.formData } - + console.log(params) const { data, code, msg } = await requestPost(url, params) @@ -299,6 +287,8 @@ export default { type: "success", message: '操作成功' }); + this.$emit('finishDiaOk') + } else { this.$message.error(msg) @@ -347,6 +337,10 @@ export default { props: { + reward: { + type: Number, + default: undefined + }, actStartTime: { type: String, default: '' diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index edcb283ac..39194f0f8 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -14,13 +14,18 @@ - + - + （选中后报名参加活动人员可以直接审核通过） @@ -262,19 +267,53 @@ - - -

- + label-width="150px" + style="display: block"> + +
+ +

+
+
+
+
{{item.content}}
+ +
+
+ + + +
+ +

+
+
+
+
{{item.content}}
+ +
+
@@ -366,7 +405,8 @@ export default { actQuota: undefined, actStartTime: "", actType: "heart", - auditSwitch: false, + noauditSwitch: false, + auditSwitch: true, coverPic: "", coverPicAuditStatus: "", customerId: "", @@ -406,6 +446,7 @@ export default { actQuota: 50, actStartTime: "2022-07-15 00:00", actType: "heart", + noauditSwitch: false, auditSwitch: true, coverPic: "", coverPicAuditStatus: "", @@ -466,8 +507,8 @@ export default { components: { Tinymce }, mounted () { this.customerId = localStorage.getItem('customerId') - this.initMap() this.loadSponsorlist() + this.initMap() @@ -479,8 +520,9 @@ export default { async initForm (type, actId) { this.$refs.ref_form.resetFields(); - this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); - this.agencyIdArray = this.formData.sponsorPath.split(',') + + + this.formType = type if (actId) { @@ -490,6 +532,9 @@ export default { await this.loadFormData() this.endLoading() + } else { + this.formData = JSON.parse(JSON.stringify(this.formDataTemp)); + this.agencyIdArray = this.formData.sponsorPath.split(',') } }, @@ -551,10 +596,17 @@ export default { if (code === 0) { this.formData = JSON.parse(JSON.stringify(data)); - this.agencyIdArray = this.formData.sponsorPath.split(',') - if (this.formData.actContent && this.formData.actContent.length > 0) { - this.formData.actContentHtml = this.formData.actContent[0].content + if (this.formData.richTextFlag) { + this.agencyIdArray = this.formData.sponsorPath.split(',') + if (this.formData.actContent && this.formData.actContent.length > 0) { + this.formData.actContentHtml = this.formData.actContent[0].content + } + if (this.formData.summaryContent && this.formData.summaryContent.length > 0) { + this.formData.summaryContentHtml = this.formData.summaryContent[0].content + } } + this.formData.auditSwitch = !this.formData.noauditSwitch + if (this.formData.coverPic) { let obj = { @@ -589,6 +641,28 @@ export default { app.util.validateRule(messageObj) this.btnDisable = false } else { + let errBeforeSubmit = '' + + if ( + new Date(this.formData.actEndTime).getTime() <= + new Date(this.formData.actStartTime).getTime() + ) { + errBeforeSubmit = "活动预计开始时间应早于活动预计结束时间"; + } else if ( + new Date(this.formData.signInEndTime).getTime() <= + new Date(this.formData.signInStartTime).getTime() + ) { + errBeforeSubmit = "签到开始时间应早于签到结束时间"; + } + + if (errBeforeSubmit) { + this.$message({ + type: 'info', + message: errBeforeSubmit + }) + return false + } + this.addHeartAct() } @@ -604,9 +678,12 @@ export default { this.formData.actContent.push(obj) this.formData.customerId = this.customerId + this.formData.noticePassedPeople = false + this.formData.auditSwitch = !this.formData.noauditSwitch let url = "/heart/work/act/publishV2" if (this.actId) { + this.formData.actId = this.actId url = '/heart/work/act/republishV2' } else { url = "/heart/work/act/publishV2" @@ -614,9 +691,9 @@ export default { // let url = "http://yapi.elinkservice.cn/mock/245/gov/org/placepatrolrecord/add" - + this.startLoading() const { data, code, msg } = await requestPost(url, this.formData) - + this.endLoading() if (code === 0) { this.$message({ type: 'success', @@ -841,6 +918,8 @@ export default { }, resetData () { + this.replayImgList = [] + this.hideUploadBtn = false this.formData = { actAddress: "", actContentHtml: "", @@ -853,7 +932,8 @@ export default { actQuota: undefined, actStartTime: "", actType: "heart", - auditSwitch: false, + noauditSwitch: false, + auditSwitch: true, coverPic: "", coverPicAuditStatus: "", customerId: "", @@ -966,6 +1046,22 @@ export default { margin-left: 10px; color: red; } + +.text_p { + margin: 0 0; + border: 3px; + + > p { + margin: 0 0; + } +} +.div_content { + width: 1000px; +} +.img_icon { + width: 200px; + height: 200px; +} diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index 36b4bdd63..695821509 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -314,7 +314,7 @@ export default { } else if (item.contentType == "img") { return ``; } else if (item.contentType == "video") { - return ``; + return ``; } else if (item.contentType == "file") { return `附件：${item.fileName}`; } diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index e4ec29847..23ccd330d 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -33,7 +33,38 @@ >存草稿 + + + + + + @@ -42,12 +73,16 @@ import basePage from "@/views/modules/cpts/base/index"; import { getItemByIdInCascader, collapse } from "@/utils/cascader"; import { requestPost } from "@/js/dai/request"; import dateFormat from "dai-js/tools/dateFormat.js"; +import offline from "./cpts/offline"; +import nextTick from "dai-js/tools/nextTick"; export default { props: {}, data() { return { + offlineShowed: false, + draftBtnDisable: false, searchParams: [ @@ -144,7 +179,7 @@ export default { type: "array", arrayDiv: "、", }, - { field: "状态", keyName: "statusFlag", type: "text" }, + { field: "状态", keyName: "statusFlagName", type: "text" }, { field: "发布单位", keyName: "publisherName", type: "text" }, { field: "发布时间", keyName: "publishDate", type: "text" }, { @@ -192,9 +227,9 @@ export default { limit: 1, editDisabled: true, rules: [], - value: [], + value: () => [], supKeys: ["imgUrlArr", "imgUrl"], - supValues: [[], ""], + supValues: [() => [], ""], beforeImgUpload(file, item, that) { console.log(file); const isLt1M = file.size / 1024 / 1024 < 10; @@ -215,9 +250,9 @@ export default { field: "发布范围", keyName: "gridIdList", type: "cascader", - value: [], + value: () => [], supKeys: ["publishRangeDesc"], - supValues: [[]], + supValues: [() => []], optionUrl: "/gov/org/customeragency/agencygridtree", optionUrlParams: { agencyId: this.$store.state.user.agencyId, @@ -402,7 +437,7 @@ export default { } else if (item.contentType == "img") { return ``; } else if (item.contentType == "video") { - return ``; + return ``; } else if (item.contentType == "file") { return `附件：${item.fileName}`; } @@ -426,13 +461,25 @@ export default { }, }; }, - components: { basePage }, + components: { basePage, offline }, computed: {}, watch: {}, async mounted() {}, methods: { + async handleOfflineShow(item) { + console.log(item); + this.offlineShowed = true; + await nextTick(100); + this.$refs.offlineForm.initForm(item); + }, + + handleOfflineSuccess() { + this.$refs.basePage.refresh(); + this.offlineShowed = false; + }, + async handleClickDraft(fmData) { let url = this.addUrl; let params = { diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index 933fc02da..d451ecc2d 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -85,7 +85,7 @@ size="small" clearable show-word-limit - :format="item.format || 'yyyy-MM-dd'" + :value-format="item.format || 'yyyy-MM-dd'" :placeholder="item.placeholder || '请输入'" > @@ -163,9 +163,14 @@ v-model="fmData[item.keyName]" :customerId="customerId" :placeholder="item.placeholder || '请输入'" + :height="500" /> -
+
@@ -187,6 +192,10 @@ @@ -253,6 +255,7 @@ @closed="handleClose" > Date: Tue, 5 Jul 2022 09:27:09 +0800 Subject: [PATCH 21/40] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=8D=95=E4=BD=8Dbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/article/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 23ccd330d..2ec611eca 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -335,8 +335,8 @@ export default { label: "以组织名义", optionList: [ { - label: agencyId, - value: agencyName, + label: agencyName, + value: agencyId, type: "agency", }, ], From cf057c1ab1c2c3996697d945b1657f8643707b88 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Tue, 5 Jul 2022 14:10:47 +0800 Subject: [PATCH 22/40] =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8D=89=E7=A8=BF?= =?UTF-8?q?=E7=AE=B1=E2=80=9C=E6=96=B0=E5=A2=9E=E2=80=9D=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/article/drafts.vue | 2 +- src/views/modules/cpts/base/index.vue | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index 695821509..f2a129785 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -71,7 +71,7 @@ export default { importUrl: "", exportUrl: "", - addUrl: "/gov/voice/article/addOrSaveDraft", + addUrl: "", editUrl: "/gov/voice/article/addOrSaveDraft", infoUrl: "/gov/voice/draft/detailV2", delUrl: "/gov/voice/draft/deletedraft", diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 79bed9c61..896153ac6 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -93,7 +93,10 @@
-
+
Date: Tue, 5 Jul 2022 15:58:01 +0800 Subject: [PATCH 23/40] =?UTF-8?q?=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/article/drafts.vue | 13 +++++++++++++ .../modules/communityParty/article/index.vue | 17 +++++++++++++---- src/views/modules/cpts/base/cpts/edit.vue | 19 +++++++++++++++++-- 3 files changed, 43 insertions(+), 6 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index f2a129785..d134279b8 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -186,6 +186,11 @@ export default { keyName: "publishDate", type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, rules: [ { required: true, @@ -335,6 +340,14 @@ export default { return data; }, + + beforeSubmit(formType, fmData, that) { + if (fmData.isTop == "1" && !fmData.imgUrl) { + that.$message.error("请上传封面图片"); + return false; + } + return true; + }, }, }; }, diff --git a/src/views/modules/communityParty/article/index.vue b/src/views/modules/communityParty/article/index.vue index 2ec611eca..18c6f8db0 100644 --- a/src/views/modules/communityParty/article/index.vue +++ b/src/views/modules/communityParty/article/index.vue @@ -110,10 +110,6 @@ export default { optionUrl: "", optionUrlParams: {}, optionList: [ - { - label: "全部", - value: "", - }, { label: "已发布", value: "published", @@ -309,6 +305,11 @@ export default { keyName: "publishDate", type: "date", value: dateFormat(new Date(), "yyyy-MM-dd"), + pickerOptions: { + disabledDate(time) { + return time.getTime() > Date.now(); + }, + }, rules: [ { required: true, @@ -458,6 +459,14 @@ export default { return data; }, + + beforeSubmit(formType, fmData, that) { + if (fmData.isTop == "1" && !fmData.imgUrl) { + that.$message.error("请上传封面图片"); + return false; + } + return true; + }, }, }; }, diff --git a/src/views/modules/cpts/base/cpts/edit.vue b/src/views/modules/cpts/base/cpts/edit.vue index d451ecc2d..9a2226ef3 100644 --- a/src/views/modules/cpts/base/cpts/edit.vue +++ b/src/views/modules/cpts/base/cpts/edit.vue @@ -81,6 +81,7 @@ formType == 'add' || (formType == 'edit' && !item.editDisable) " v-model="fmData[item.keyName]" + :picker-options="item.pickerOptions" class="item-input" size="small" clearable @@ -771,10 +772,18 @@ export default { }, async submit() { + const { editConfig, fmData, formType, editFixedParams } = this; + if ( + typeof editConfig.beforeSubmit == "function" && + !editConfig.beforeSubmit(formType, fmData, this) + ) { + return; + } + let url = ""; let params = { - ...this.fmData, - ...this.editFixedParams, + ...fmData, + ...editFixedParams, // serviceType: this.fmData.serviceTypeArr.join(","), }; @@ -823,6 +832,12 @@ export default { .item-rich-text { width: 817px; + max-height: 500px; + overflow: auto; + + img { + max-width: 100%; + } &.z-show { box-sizing: border-box; padding: 15px; From 538d6222fdd86e6cc01298b99f99c25e5c83cc10 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Tue, 5 Jul 2022 16:59:39 +0800 Subject: [PATCH 24/40] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/epidemic/antiInfo.vue | 4 + .../modules/base/epidemic/natInfo/natList.vue | 4 + .../communityParty/heart/heartForm.vue | 20 +- .../communityParty/heart/heartList.vue | 5 + .../communityParty/heart/heartPerson.vue | 10 +- .../fivelayers/mapIndex copy 2.vue | 2063 +++++++++++++++++ .../fivelayers/mapIndex copy.vue | 1987 ++++++++++++++++ .../communityGovern/fivelayers/mapIndex.vue | 32 +- .../visual/components/screen-map/index.vue | 4 +- 9 files changed, 4118 insertions(+), 11 deletions(-) create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index dc93596d1..8e4645251 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -152,6 +152,7 @@ - @@ -93,7 +93,7 @@ prop="reward" style="display: block" label-width="150px"> - @@ -141,7 +141,7 @@ style="display: block" prop="signUpEndTime" label-width="150px"> - - @@ -424,7 +424,7 @@ export default { signInEndTime: "", signInLatitude: null, signInLongitude: null, - signInRadius: undefined, + signInRadius: 200, signInStartTime: "", signUpEndTime: "", sponsorContacts: "", @@ -918,7 +918,7 @@ export default { signInEndTime: "", signInLatitude: null, signInLongitude: null, - signInRadius: undefined, + signInRadius: 200, signInStartTime: "", signUpEndTime: "", sponsorContacts: "", @@ -1020,11 +1020,15 @@ export default { } .text_p { + width: 1000px; margin: 0 0; border: 3px; - > p { - margin: 0 0; + p { + margin: 0; + padding: 0; + -webkit-margin-start: 0; + -webkit-margin-end: 0; } } .div_content { diff --git a/src/views/modules/communityParty/heart/heartList.vue b/src/views/modules/communityParty/heart/heartList.vue index 37c2f9357..f6cc8bca4 100644 --- a/src/views/modules/communityParty/heart/heartList.vue +++ b/src/views/modules/communityParty/heart/heartList.vue @@ -283,6 +283,7 @@ class="dialog-h" @closed="personDiaClose"> @@ -586,6 +587,10 @@ export default { this.personShow = false// }, + personDiaClose () { + + this.personShow = false// + }, finishDiaClose () { this.finishShow = false// diff --git a/src/views/modules/communityParty/heart/heartPerson.vue b/src/views/modules/communityParty/heart/heartPerson.vue index 0acab6d62..898a27b49 100644 --- a/src/views/modules/communityParty/heart/heartPerson.vue +++ b/src/views/modules/communityParty/heart/heartPerson.vue @@ -104,6 +104,11 @@
+
+ 关 闭 + +
@@ -220,6 +225,9 @@ export default { this.cancleShow = true }, + handleCancle () { + this.$emit('personDiaClose') + }, // 开启加载动画 startLoading () { @@ -278,6 +286,6 @@ export default { .div_btn { margin-top: 10px; display: flex; - justify-content: flex-end; + justify-content: center; } diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue new file mode 100644 index 000000000..7ee8f5f85 --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy 2.vue @@ -0,0 +1,2063 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue new file mode 100644 index 000000000..efc340ebf --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex copy.vue @@ -0,0 +1,1987 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue index 5535dc576..efc340ebf 100644 --- a/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex.vue @@ -373,6 +373,8 @@ import 'ol/ol.css' import { Map, View } from 'ol' import TileLayer from 'ol/layer/Tile.js'; +import ImageLayer from 'ol/layer/Image'; +import { Raster as RasterSource } from 'ol/source'; import XYZ from 'ol/source/XYZ.js'; import VectorLayer from 'ol/layer/Vector.js'; import VectorSource from 'ol/source/Vector.js'; @@ -489,6 +491,28 @@ var polygonStyleFunction = (function () { }; })() +//定义颜色转换方法 +let reverseFunc = function (pixelsTemp) { + //蓝色 + for (var i = 0; i < pixelsTemp.length; i += 4) { + var r = pixelsTemp[i]; + var g = pixelsTemp[i + 1]; + var b = pixelsTemp[i + 2]; + //运用图像学公式，设置灰度值 + var grey = r * 0.3 + g * 0.59 + b * 0.11; + //将rgb的值替换为灰度值 + pixelsTemp[i] = grey; + pixelsTemp[i + 1] = grey; + pixelsTemp[i + 2] = grey; + + //基于灰色，设置为蓝色，这几个数值是我自己试出来的，可以根据需求调整 + pixelsTemp[i] = 55 - pixelsTemp[i]; + pixelsTemp[i + 1] = 255 - pixelsTemp[i + 1]; + pixelsTemp[i + 2] = 305 - pixelsTemp[i + 2]; + } +}; + + const vueGis = { name: 'HomeMap', data () { @@ -1642,9 +1666,13 @@ const vueGis = { url: 'http://wprd0{1-4}.is.autonavi.com/appmaptile?lang=zh_cn&size=1&style=7&x={x}&y={y}&z={z}', wrapX: true//x方向平铺，也可以选择false }), - zIndex: 20 + zIndex: 20, + crossOrigin: 'anonymous' }); + + + mapView = new View({ //中心点坐标 center: this.centerPoint, @@ -1674,6 +1702,8 @@ const vueGis = { }); map.removeInteraction(dblClickInteraction); + + }, //添加标注图层 addParentLayer () { diff --git a/src/views/modules/visual/components/screen-map/index.vue b/src/views/modules/visual/components/screen-map/index.vue index 58206f455..7e13d3809 100644 --- a/src/views/modules/visual/components/screen-map/index.vue +++ b/src/views/modules/visual/components/screen-map/index.vue @@ -422,7 +422,7 @@ const vueGis = { // imgSize: [32, 32], // scale: 0.5, // src: oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex] || this.iconUrlArray[0] || this.iconUrlArray[0] - src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index &&this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0] + src: (oneIcon.urlIndex && this.iconUrlArray[oneIcon.urlIndex]) || (oneIcon.index && this.iconUrlArray[oneIcon.index]) || this.iconUrlArray[0] }), // text: createTextStyle(oneIcon) }); @@ -627,6 +627,8 @@ const vueGis = { this.zoom = 13 } else if (level === 'community') { this.zoom = 14 + } else { + this.zoom = 12 } }, From fac237d3a89055940c396e6a4401039d1443319a Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 6 Jul 2022 09:04:06 +0800 Subject: [PATCH 25/40] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8---?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rent/rentcontractinfo-add-or-update.vue | 40 +++++++++++++++++-- 1 file changed, 37 insertions(+), 3 deletions(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 2cad16bd8..4586e0d26 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -116,18 +116,32 @@ + + + + + + + 取 消 + 确 定 + + @@ -176,7 +190,10 @@ export default { { dictValue: '孙子女', dictName: '孙子女' }, { dictValue: '兄弟姐妹', dictName: '兄弟姐妹' }, { dictValue: '中介', dictName: '中介' } - ] + ], + checkReason: '', + checkVisible: false, + disabledBtn: false } }, computed: { @@ -269,13 +286,28 @@ export default { } }).catch(() => {}) }, + // 打开审核不通过对话框 + openCheckReasonDialog(){ + this.checkVisible = true + this.checkReason = '' + this.disabledBtn = false + }, + // 不通过审核意见提交 + dialogCheckHandle(){ + if(this.checkReason === ''){ + return this.$message.error('请填写不通过原因') + } + this.checkHandle('2') + this.disabledBtn = true + }, // 审核提交方法 checkHandle: function (type) { const params = { id: this.dataForm.id, state: type, homeId: this.dataForm.homeId, - lessorRelation: this.dataForm.lessorRelation + lessorRelation: this.dataForm.lessorRelation, + reason: this.checkReason } this.$http.post('/pli/power/rentContractInfo/review', params).then(({ data: res }) => { if (res.code !== 0) { @@ -296,6 +328,8 @@ export default { type: 'success', duration: 500, onClose: () => { + this.disabledBtn = false + this.checkVisible = false this.visible = false this.$emit('refreshDataList') } From 801c45b66c37cc2cfd8a43091cbaf09dcc2dc7b8 Mon Sep 17 00:00:00 2001 From: wanggongfeng <1305282856@qq.com> Date: Wed, 6 Jul 2022 10:08:45 +0800 Subject: [PATCH 26/40] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=AE=A1=E6=A0=B8---?= =?UTF-8?q?=E4=B8=8D=E9=80=9A=E8=BF=87=E6=B7=BB=E5=8A=A0=E5=8E=9F=E5=9B=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/plugins/rent/rentcontractinfo-add-or-update.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue index 4586e0d26..ba3a95a10 100644 --- a/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue +++ b/src/views/modules/plugins/rent/rentcontractinfo-add-or-update.vue @@ -116,7 +116,7 @@ - + From 9ae0d14d86c23d26aacd2dcf38a9bf9da321d3e4 Mon Sep 17 00:00:00 2001 From: dai <851733175@qq.com> Date: Wed, 6 Jul 2022 10:27:28 +0800 Subject: [PATCH 27/40] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=B8=B2=E6=9F=93=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/cpts/base/index.vue | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/modules/cpts/base/index.vue b/src/views/modules/cpts/base/index.vue index 896153ac6..f875806d0 100644 --- a/src/views/modules/cpts/base/index.vue +++ b/src/views/modules/cpts/base/index.vue @@ -93,10 +93,7 @@
-
+
Date: Wed, 6 Jul 2022 11:07:11 +0800 Subject: [PATCH 28/40] 000 --- src/views/modules/communityParty/article/drafts.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/modules/communityParty/article/drafts.vue b/src/views/modules/communityParty/article/drafts.vue index d134279b8..8a8829970 100644 --- a/src/views/modules/communityParty/article/drafts.vue +++ b/src/views/modules/communityParty/article/drafts.vue @@ -104,9 +104,9 @@ export default { limit: 1, editDisabled: true, rules: [], - value: [], + value: () => [], supKeys: ["imgUrlArr", "imgUrl"], - supValues: [[], ""], + supValues: [() => [], ""], beforeImgUpload(file, item, that) { console.log(file); const isLt1M = file.size / 1024 / 1024 < 10; @@ -217,8 +217,8 @@ export default { label: "以组织名义", optionList: [ { - label: agencyId, - value: agencyName, + label: agencyName, + value: agencyId, type: "agency", }, ], From 4af07ae63fc00e500f428eaaa092ef6fce11dab0 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 6 Jul 2022 13:27:00 +0800 Subject: [PATCH 29/40] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/heart/heartForm.vue | 12 +- .../fivelayers/mapIndex-baidu.vue | 2071 +++++++++++++++++ 2 files changed, 2078 insertions(+), 5 deletions(-) create mode 100644 src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue diff --git a/src/views/modules/communityParty/heart/heartForm.vue b/src/views/modules/communityParty/heart/heartForm.vue index 701b62dfd..fbd73725d 100644 --- a/src/views/modules/communityParty/heart/heartForm.vue +++ b/src/views/modules/communityParty/heart/heartForm.vue @@ -85,6 +85,7 @@ style="display: block" label-width="150px"> @@ -94,6 +95,7 @@ style="display: block" label-width="150px"> @@ -158,7 +160,7 @@ type="textarea" maxlength="200" show-word-limit - :rows="5" + :rows="7" placeholder="请输入报名条件，不超过200字" v-model="formData.requirement"> @@ -407,7 +409,7 @@ export default { actId: "", actLatitude: null, actLongitude: null, - actQuota: undefined, + actQuota: 0, actStartTime: "", actType: "heart", @@ -418,7 +420,7 @@ export default { noticePassedPeople: false, requirement: "", - reward: undefined, + reward: 0, signInAddress: "", signInEndTime: "", @@ -901,7 +903,7 @@ export default { actId: "", actLatitude: null, actLongitude: null, - actQuota: undefined, + actQuota: 0, actStartTime: "", actType: "heart", @@ -912,7 +914,7 @@ export default { noticePassedPeople: false, requirement: "", - reward: undefined, + reward: 0, signInAddress: "", signInEndTime: "", diff --git a/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue new file mode 100644 index 000000000..049037cdb --- /dev/null +++ b/src/views/modules/visual/communityGovern/fivelayers/mapIndex-baidu.vue @@ -0,0 +1,2071 @@ + + + + + + + + + + + \ No newline at end of file From 6cff725eb314149d7822ffd2561a692fb5ce8839 Mon Sep 17 00:00:00 2001 From: jiangyy Date: Wed, 6 Jul 2022 14:03:16 +0800 Subject: [PATCH 30/40] =?UTF-8?q?=E7=88=B1=E5=BF=83=E4=BA=92=E5=8A=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/heart/heartFinish.vue | 14 +++++++++++--- .../modules/communityParty/heart/heartForm.vue | 16 +++++++++++++--- .../modules/communityParty/heart/heartList.vue | 8 ++++---- 3 files changed, 28 insertions(+), 10 deletions(-) diff --git a/src/views/modules/communityParty/heart/heartFinish.vue b/src/views/modules/communityParty/heart/heartFinish.vue index 0c7fc05f7..bdf0a988b 100644 --- a/src/views/modules/communityParty/heart/heartFinish.vue +++ b/src/views/modules/communityParty/heart/heartFinish.vue @@ -3,9 +3,10 @@
+ class="div_form mgl10"> + min-width="320">