From b17c0969aade7d0d369ae2b2247df131f9533c0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Sun, 28 Apr 2024 09:37:05 +0800 Subject: [PATCH 01/63] 111 --- src/views/modules/home/index.vue | 30 ++---------------------------- 1 file changed, 2 insertions(+), 28 deletions(-) diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue index 66f42ddb6..a9e06684c 100644 --- a/src/views/modules/home/index.vue +++ b/src/views/modules/home/index.vue @@ -254,33 +254,7 @@ export default { myChart: {}, myBarchart: {}, agencyLevel: '', - yData: [ - // { - // value: 720, - // itemStyle: { - // color: { - // type: 'linear', - // x: 0, - // y: 0, - // x2: 0, - // y2: 1, - // colorStops: [{ - // offset: 0, color: '#2D7DF2' // 上部颜色 - // }, { - // offset: 0.45, color: '#7EB1FE' // 中部颜色 - // }, { - // offset: 0.45, color: '#EFB632' // 中部颜色 - // }, { - // offset: 1, color: '#FDD77D' // 下部颜色 - // }], - // global: false // 默认为 false - // }, - // shadowColor: "#91cc75", - // borderType: "dashed", - // // opacity: 0.5 - // } - // },725,165,765,742,710,720,730,735,762,754 - ], + yData: [], myChartStyle: { float: "left", width: "140%", height: "100%" }, } }, @@ -724,7 +698,6 @@ export default { type: 'shadow' } }, - legend: { x: 'center', bottom: '8%', @@ -767,6 +740,7 @@ export default { name: '分类信息不完整数', type: 'bar', stack: '总量', + barWidth: '30px', data: data.categoryStatsDatas.map((item, index) => ({ value: item.nonIntegratedNum, extraProperty: item.resiCategory From c077b2c206b0bc7b7b739bb82f0e6b70b37ddc63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Sun, 28 Apr 2024 10:03:15 +0800 Subject: [PATCH 02/63] Revert "Merge branch 'preview' of http://120.46.222.128:10021/elink-star/epmet-work-pc into fax" This reverts commit 7e589dbdb926bee187126ac8f2e443f4cfdb7124, reversing changes made to b17c0969aade7d0d369ae2b2247df131f9533c0e. --- src/assets/scss/modules/index.scss | 33 +- src/components/GridTree/nodeWrap.vue | 29 +- src/components/JwTree/nodeWrap.vue | 71 +-- src/components/NameSplit/index.vue | 2 +- src/views/components/editResi.vue | 91 +--- .../components/resiExpand/editExpand.vue | 18 +- src/views/components/resiSearch.vue | 76 +--- src/views/dataBoard/cpts/details/jmxq.vue | 2 +- src/views/dataBoard/cpts/details/smyd.vue | 2 +- src/views/dataBoard/cpts/details/xqwmz.vue | 2 +- src/views/dataBoard/cpts/details/yxwxfw.vue | 26 +- src/views/dataBoard/cpts/event-details.vue | 9 +- .../modules/businessTables/complaint.vue | 2 +- .../businessTables/reporting-events.vue | 3 +- src/views/dataBoard/organizational/index.vue | 415 +++++++++++++++++- .../dataBoard/organizational/jwTree/index.vue | 19 +- .../dataBoard/overview/components/Bmysxxq.vue | 1 - .../overview/components/EventDetail.vue | 3 +- .../overview/components/ResourceInfo.vue | 14 +- .../components/ResourceScheduling.vue | 42 +- .../overview/components/ServiceDetails.vue | 2 +- .../modules/base/community/community.vue | 12 +- .../modules/base/community/roomTable.vue | 8 +- src/views/modules/base/resi.vue | 46 +- .../base/smartImport/cpts/completeTask.vue | 52 +-- src/views/modules/base/smartImport/index.vue | 14 +- src/views/modules/home/index.vue | 66 ++- src/views/modules/portrayal/jumin/index.vue | 31 +- 28 files changed, 603 insertions(+), 488 deletions(-) diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index abf63be8b..f86d332f9 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -46,7 +46,7 @@ position: relative; // position: fixed; padding-left: 14px; - height: 16px; + height: 30px; margin-right: 10px; font-size: 15px; z-index: 1; @@ -109,12 +109,13 @@ } .header { + padding: 4px 0; font-size: 15px; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: rgba(0, 0, 0, 0.85); line-height: 17px; - margin-top: 16px; + margin-top: 10px; margin-left: 10px; >img { @@ -127,7 +128,7 @@ .newqsa { border-left: 4px solid #2683DB; - height: 100%; + height: 70%; // width: 4px; margin-left: -10px; padding-left: 8px; @@ -154,26 +155,28 @@ .m-search { box-sizing: border-box; - padding: 0px 16px; + padding: 40px 80px; margin-bottom: 10px; - height: 220px; - display: flex; - flex-direction: column; + height: 200px; // background-image: url("../../images/index/chaxun-bg.png"); background-size: cover; position: relative; .wrap { - + position: absolute; + top: 0; + left: 0; width: 100%; } .mewq { // background-color: #333; - margin-top: 24px; width: inherit; + margin-left: -69px; height: 64px; + margin-top: 85px; box-sizing: border-box; + margin-right: -68px; display: grid; grid-template-columns: repeat(7, 1fr); gap: 5px; @@ -246,12 +249,13 @@ margin-top: 15px; display: flex; align-items: center; + margin-left: 10px; .search-input { position: relative; left: 0; right: 0; - width: 100%; + width: 98%; height: 48px; background: #ffffff; border-radius: 4px; @@ -349,7 +353,7 @@ overflow: hidden; .flex_box { - height: 100%; + height: calc(100% - 30px); width: 100%; overflow: hidden; display: flex; @@ -558,9 +562,8 @@ } .m-tb { - height: 238px; - display: flex; - flex-direction: column; + height: 260px; + .cnt { box-sizing: border-box; margin-top: 20px; @@ -671,6 +674,4 @@ .update-settings { margin-right: 25px; - display: flex; - align-items: center; } \ No newline at end of file diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 2032ddd83..731d2592e 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -35,7 +35,7 @@
-
+
{{ item.organizationName }}
@@ -62,7 +62,6 @@
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 1b5048f7e..763a14985 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -503,7 +503,6 @@ export default { const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form; // 深复制对象 let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form)); - _obj.attentionCrowds = _obj.attentionCrowds.flat() console.log('213', _obj) switch (this.valueb) { case '党员': @@ -602,7 +601,7 @@ export default { this.$refs.myResiSearch.form.categoryKey = categoryKey; this.$refs.myResiSearch.form.agencyId = agencyId; } - + // //呵呵呵哒 // if (this.valueb == '党员') { // _obj.partyFlag = 1 // this.getTableData(_obj); @@ -969,36 +968,16 @@ export default { } ); }, - async handelCLickShowCheckPassword(row) { - const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`; - const { data, code, msg } = await requestPost(url); - if(code==0){ - if(data==true){ - this.editUserId = row.resiId; - this.saveCheckPassword() - } - else{ - this.editUserId = row.resiId; - this.showCheckPassword = true; - } - } - else{ - this.$message.error(msg); - } + handelCLickShowCheckPassword(row) { + this.editUserId = row.resiId; + this.showCheckPassword = true; }, handelClickCheckPassword() { - this.$refs.checkPasswordFrom.validate((vali) => { + this.$refs.checkPasswordFrom.validate(async (vali) => { if (vali) { - this.saveCheckPassword(this.checkPasswordFrom.password); - } else { - return false; - } - }); - }, - async saveCheckPassword(password){ - const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; + const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; let parm = { - password, + password: this.checkPasswordFrom.password, }; const { data, code, msg } = await requestPost(url, parm); if (code === 0) { @@ -1012,7 +991,12 @@ export default { } else { this.$message.error(msg); } + } else { + return false; + } + }); }, + handleAdd() { this.$router.push({ name: "add-resi" }); }, @@ -1193,9 +1177,9 @@ export default { watch: { $route: { handler: function (newVal, oldVal) { - if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) { + if (newVal.name == "base-resi") { this.$nextTick(() => { - this.$refs.myResiSearch.form.attentionCrowds = []; + this.$refs.myResiSearch.form.attentionCrowds = []; this.$refs.myResiSearch.form.healthStatus = []; this.$refs.myResiSearch.form.specialCategoryCodes = []; this.$refs.myResiSearch.form.partyFlag=null; @@ -1212,7 +1196,7 @@ export default { }else if(newVal.params.category === 'PARTY_FLAG'){ this.$refs.myResiSearch.form.partyFlag =1; } - this.handleSearchFrom(); + this.handleSearchFrom(); }); } }, diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 494d87d82..6c50e0a90 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -42,11 +42,12 @@ >查看 - 下载导入失败数据下载导入失败数据 @@ -91,7 +92,6 @@ - diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index fcbd35342..f9619d9fa 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -21,7 +21,7 @@
{{ item.name }} Date: Sun, 28 Apr 2024 10:49:10 +0800 Subject: [PATCH 03/63] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/dataBoard/renfang/cpts/rkfx.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/dataBoard/renfang/cpts/rkfx.vue b/src/views/dataBoard/renfang/cpts/rkfx.vue index 533f2b0ef..3187c105b 100644 --- a/src/views/dataBoard/renfang/cpts/rkfx.vue +++ b/src/views/dataBoard/renfang/cpts/rkfx.vue @@ -397,7 +397,7 @@ export default { display: flex; align-items: center; justify-content: space-between; - margin-left: 25px; + margin-left: 15px; .legend { // flex: 0 0 140px; From bbe285ca06a9c11abea2c129702be7d570f4d280 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Sun, 28 Apr 2024 10:57:33 +0800 Subject: [PATCH 04/63] =?UTF-8?q?=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/components/resiExpand/editExpand.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/views/components/resiExpand/editExpand.vue b/src/views/components/resiExpand/editExpand.vue index 700885990..af51e23ea 100644 --- a/src/views/components/resiExpand/editExpand.vue +++ b/src/views/components/resiExpand/editExpand.vue @@ -310,11 +310,7 @@ export default { }, async getOrgTree() { try { -<<<<<<< HEAD - const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select', { partyOrgId:this.partyOrgIdPath,depth:8 }) -======= const { data } = await requestGet('/actual/base/party/org/listPartyOrgTreeRoot4Select',{depth: 8}) ->>>>>>> a2b508a3f69e44b53fe8aee2fbf58c566b839abc this.formList.forEach(c => { if (c.formId == "parymemberInfoDto") { for (let i of c.form[0].children) { From f3df70608874fc55a8a412628b1409af8be40994 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Sun, 28 Apr 2024 13:57:36 +0800 Subject: [PATCH 05/63] =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E5=9B=9E=E6=BB=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/scss/modules/index.scss | 33 +- src/components/GridTree/nodeWrap.vue | 29 +- src/components/JwTree/nodeWrap.vue | 71 ++- src/components/NameSplit/index.vue | 2 +- src/views/components/editResi.vue | 91 +++- .../components/resiExpand/editExpand.vue | 16 +- src/views/components/resiSearch.vue | 76 +++- src/views/dataBoard/cpts/details/jmxq.vue | 2 +- src/views/dataBoard/cpts/details/smyd.vue | 2 +- src/views/dataBoard/cpts/details/xqwmz.vue | 2 +- src/views/dataBoard/cpts/details/yxwxfw.vue | 26 +- src/views/dataBoard/cpts/event-details.vue | 9 +- .../modules/businessTables/complaint.vue | 2 +- .../businessTables/reporting-events.vue | 3 +- src/views/dataBoard/organizational/index.vue | 415 +----------------- .../dataBoard/organizational/jwTree/index.vue | 19 +- .../dataBoard/overview/components/Bmysxxq.vue | 1 + .../overview/components/EventDetail.vue | 3 +- .../overview/components/ResourceInfo.vue | 14 +- .../components/ResourceScheduling.vue | 42 +- .../overview/components/ServiceDetails.vue | 2 +- .../modules/base/community/community.vue | 12 +- .../modules/base/community/roomTable.vue | 8 +- src/views/modules/base/resi.vue | 46 +- .../base/smartImport/cpts/completeTask.vue | 52 ++- src/views/modules/base/smartImport/index.vue | 14 +- src/views/modules/home/index.vue | 66 +-- src/views/modules/portrayal/jumin/index.vue | 31 +- 28 files changed, 487 insertions(+), 602 deletions(-) diff --git a/src/assets/scss/modules/index.scss b/src/assets/scss/modules/index.scss index f86d332f9..abf63be8b 100644 --- a/src/assets/scss/modules/index.scss +++ b/src/assets/scss/modules/index.scss @@ -46,7 +46,7 @@ position: relative; // position: fixed; padding-left: 14px; - height: 30px; + height: 16px; margin-right: 10px; font-size: 15px; z-index: 1; @@ -109,13 +109,12 @@ } .header { - padding: 4px 0; font-size: 15px; font-family: PingFangSC-Medium, PingFang SC; font-weight: 500; color: rgba(0, 0, 0, 0.85); line-height: 17px; - margin-top: 10px; + margin-top: 16px; margin-left: 10px; >img { @@ -128,7 +127,7 @@ .newqsa { border-left: 4px solid #2683DB; - height: 70%; + height: 100%; // width: 4px; margin-left: -10px; padding-left: 8px; @@ -155,28 +154,26 @@ .m-search { box-sizing: border-box; - padding: 40px 80px; + padding: 0px 16px; margin-bottom: 10px; - height: 200px; + height: 220px; + display: flex; + flex-direction: column; // background-image: url("../../images/index/chaxun-bg.png"); background-size: cover; position: relative; .wrap { - position: absolute; - top: 0; - left: 0; + width: 100%; } .mewq { // background-color: #333; + margin-top: 24px; width: inherit; - margin-left: -69px; height: 64px; - margin-top: 85px; box-sizing: border-box; - margin-right: -68px; display: grid; grid-template-columns: repeat(7, 1fr); gap: 5px; @@ -249,13 +246,12 @@ margin-top: 15px; display: flex; align-items: center; - margin-left: 10px; .search-input { position: relative; left: 0; right: 0; - width: 98%; + width: 100%; height: 48px; background: #ffffff; border-radius: 4px; @@ -353,7 +349,7 @@ overflow: hidden; .flex_box { - height: calc(100% - 30px); + height: 100%; width: 100%; overflow: hidden; display: flex; @@ -562,8 +558,9 @@ } .m-tb { - height: 260px; - + height: 238px; + display: flex; + flex-direction: column; .cnt { box-sizing: border-box; margin-top: 20px; @@ -674,4 +671,6 @@ .update-settings { margin-right: 25px; + display: flex; + align-items: center; } \ No newline at end of file diff --git a/src/components/GridTree/nodeWrap.vue b/src/components/GridTree/nodeWrap.vue index 731d2592e..2032ddd83 100644 --- a/src/components/GridTree/nodeWrap.vue +++ b/src/components/GridTree/nodeWrap.vue @@ -35,7 +35,7 @@
-
+
{{ item.organizationName }}
@@ -62,6 +62,7 @@
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 763a14985..1b5048f7e 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -503,6 +503,7 @@ export default { const { categoryKey, agencyId, level } = this.$refs.myResiSearch.form; // 深复制对象 let _obj = JSON.parse(JSON.stringify(this.$refs.myResiSearch.form)); + _obj.attentionCrowds = _obj.attentionCrowds.flat() console.log('213', _obj) switch (this.valueb) { case '党员': @@ -601,7 +602,7 @@ export default { this.$refs.myResiSearch.form.categoryKey = categoryKey; this.$refs.myResiSearch.form.agencyId = agencyId; } - // //呵呵呵哒 + // if (this.valueb == '党员') { // _obj.partyFlag = 1 // this.getTableData(_obj); @@ -968,16 +969,36 @@ export default { } ); }, - handelCLickShowCheckPassword(row) { - this.editUserId = row.resiId; - this.showCheckPassword = true; + async handelCLickShowCheckPassword(row) { + const url = `/actual/base/residentCategoryUpdateInfo/isUpdater/${row.resiId}`; + const { data, code, msg } = await requestPost(url); + if(code==0){ + if(data==true){ + this.editUserId = row.resiId; + this.saveCheckPassword() + } + else{ + this.editUserId = row.resiId; + this.showCheckPassword = true; + } + } + else{ + this.$message.error(msg); + } }, handelClickCheckPassword() { - this.$refs.checkPasswordFrom.validate(async (vali) => { + this.$refs.checkPasswordFrom.validate((vali) => { if (vali) { - const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; + this.saveCheckPassword(this.checkPasswordFrom.password); + } else { + return false; + } + }); + }, + async saveCheckPassword(password){ + const url = `/actual/base/residentBaseInfo/getResiUserInfo/${this.editUserId}`; let parm = { - password: this.checkPasswordFrom.password, + password, }; const { data, code, msg } = await requestPost(url, parm); if (code === 0) { @@ -991,12 +1012,7 @@ export default { } else { this.$message.error(msg); } - } else { - return false; - } - }); }, - handleAdd() { this.$router.push({ name: "add-resi" }); }, @@ -1177,9 +1193,9 @@ export default { watch: { $route: { handler: function (newVal, oldVal) { - if (newVal.name == "base-resi") { + if (newVal.name == "base-resi" && (!oldVal ||oldVal.name === 'home')) { this.$nextTick(() => { - this.$refs.myResiSearch.form.attentionCrowds = []; + this.$refs.myResiSearch.form.attentionCrowds = []; this.$refs.myResiSearch.form.healthStatus = []; this.$refs.myResiSearch.form.specialCategoryCodes = []; this.$refs.myResiSearch.form.partyFlag=null; @@ -1196,7 +1212,7 @@ export default { }else if(newVal.params.category === 'PARTY_FLAG'){ this.$refs.myResiSearch.form.partyFlag =1; } - this.handleSearchFrom(); + this.handleSearchFrom(); }); } }, diff --git a/src/views/modules/base/smartImport/cpts/completeTask.vue b/src/views/modules/base/smartImport/cpts/completeTask.vue index 6c50e0a90..494d87d82 100644 --- a/src/views/modules/base/smartImport/cpts/completeTask.vue +++ b/src/views/modules/base/smartImport/cpts/completeTask.vue @@ -42,12 +42,11 @@ >查看 - 下载导入失败数据下载导入失败数据 @@ -92,6 +91,7 @@ + diff --git a/src/views/modules/portrayal/jumin/index.vue b/src/views/modules/portrayal/jumin/index.vue index f9619d9fa..fcbd35342 100644 --- a/src/views/modules/portrayal/jumin/index.vue +++ b/src/views/modules/portrayal/jumin/index.vue @@ -21,7 +21,7 @@
{{ item.name }} Date: Mon, 6 May 2024 13:47:32 +0800 Subject: [PATCH 06/63] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9E=B6=E6=9E=84-?= =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E4=BA=BA=E5=91=98=E6=B7=BB=E5=8A=A0=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E6=9D=83=E9=99=90=E8=8C=83=E5=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../base/organization/organization.vue | 66 +++++++++++++++++-- 1 file changed, 62 insertions(+), 4 deletions(-) diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue index eb6b395a7..01473ceb3 100644 --- a/src/views/modules/base/organization/organization.vue +++ b/src/views/modules/base/organization/organization.vue @@ -487,7 +487,7 @@ v-model="peoForm.manageScopes" :options="orgOptions" :props="orgOptionProps" - :show-all-levels="false" + :show-all-levels="true" clearable> @@ -1328,7 +1328,8 @@ export default { // 组织树 orgOptions: [], orgOptionProps :{ - multiple: false, + multiple: true, + emitPath: true, value: 'agencyId', label: 'agencyName', children: 'subAgencyList', @@ -1710,6 +1711,18 @@ export default { }, // 人员修改 async updatePeoDo () { + + const targetAgencyIds = this.peoForm.manageScopes.map(innerArray => innerArray[innerArray.length - 1]); + + // 用于存储提取结果的 Set 对象 + const result = new Set(); + + // 调用递归函数提取 level 与 agencyId 组合成的字符串 + this.extractLevelAndAgencyId(this.orgOptions[0], targetAgencyIds, result); + + // 将 Set 对象转换为数组 + const manageScopeArray = Array.from(result); + const url = "/gov/org/staff/editstaff"; let params = { @@ -1723,7 +1736,7 @@ export default { newRoles: this.peoForm.newRoles, agencyId: this.currentAgencyId, idCard: this.peoForm.idCard, - manageScopes:this.peoForm.manageScopes + manageScopes:manageScopeArray }; const { data, code, msg } = await requestPost(url, params); @@ -1743,6 +1756,20 @@ export default { } }, + // 递归函数，遍历 JSON 对象提取所有的 level 与 agencyId 组合成的字符串 + extractLevelAndAgencyId(obj, agencyIds, result) { + if (obj && typeof obj === 'object') { + if (obj.level && obj.agencyId && agencyIds.includes(obj.agencyId)) { + result.add(`${obj.level}:${obj.agencyId}`); + } + if (Array.isArray(obj.subAgencyList)) { + obj.subAgencyList.forEach(subObj => { + this.extractLevelAndAgencyId(subObj, agencyIds, result); + }); + } + } + }, + // 字典 async getDictionaries () { const url = "/sys/dict/data/dictlist"; @@ -2043,6 +2070,7 @@ export default { }, // 修改网格人员 async xiuGridPeo (row) { + console.log("修改网格人员"); this.modifyPeo = true; this.peoForm.orgType = "grid"; @@ -2085,6 +2113,7 @@ export default { }, // 修改人员 async xiuPeo (row) { + console.log("修改人员"); this.modifyPeo = true; this.peoForm.orgType = "agency"; @@ -2119,13 +2148,42 @@ export default { } }); this.peoForm.newRoles = existedRoleArr; - this.peoForm.manageScopes = data.manageScopes + var paths = this.findParentPath(this.orgOptions[0], data.manageScopes); + this.peoForm.manageScopes = paths; } else { this.$message.error(msg); } }, + findParentPath(data,agencyIds) { + let paths = []; + + function findPathRecursive(agencyId, node, path) { + if (node.agencyId === agencyId) { + path.push(agencyId); + paths.push(path.slice()); // Make a copy of the path array before pushing + return true; + } + + if (node.subAgencyList) { + for (let i = 0; i < node.subAgencyList.length; i++) { + if (findPathRecursive(agencyId, node.subAgencyList[i], path.concat(node.agencyId))) { + return true; + } + } + } + + return false; + } + + agencyIds.forEach(agencyId => { + findPathRecursive(agencyId, data, []); + }); + + return paths; + }, // 修改社区人员 async xiuCommunityPeo (row) { + console.log("修改社区人员"); this.modifyPeo = true; this.peoForm.orgType = "dept"; From 2db216ae47a2fa9532da30516c8da4081c7fc9ee Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 10 May 2024 14:01:46 +0800 Subject: [PATCH 07/63] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E8=87=AA=E6=9F=A5?= =?UTF-8?q?=E9=87=8D=E7=BD=AE=E5=85=A5=E5=8F=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/satisfaction/communitySelfInsp/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index a53173472..3942c486a 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -1045,6 +1045,8 @@ export default { // 重置 resetSearch() { this.formData = {}; + let date = new Date(); + this.formData.period = util.formatDate(date, "yyyy-MM"); this.initData(); }, handleView(row) { From ff5f83d1826f4558cd28413c37f586d249bea658 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 May 2024 10:45:32 +0800 Subject: [PATCH 08/63] =?UTF-8?q?=E9=87=8D=E5=A4=8D=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/satisfaction/communitySelfInsp/index.vue | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/views/modules/satisfaction/communitySelfInsp/index.vue b/src/views/modules/satisfaction/communitySelfInsp/index.vue index 9722d7e21..3942c486a 100644 --- a/src/views/modules/satisfaction/communitySelfInsp/index.vue +++ b/src/views/modules/satisfaction/communitySelfInsp/index.vue @@ -1046,8 +1046,6 @@ export default { resetSearch() { this.formData = {}; let date = new Date(); - this.formData.period = unit.formatDate(date,'yyyy-MM') - let date = new Date(); this.formData.period = util.formatDate(date, "yyyy-MM"); this.initData(); }, From 0a71c782125162265650aa1d694e37dd20b78161 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Fri, 17 May 2024 14:36:15 +0800 Subject: [PATCH 09/63] =?UTF-8?q?=E8=81=94=E5=BB=BA=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E8=81=94=E7=B3=BB=E4=BA=BA=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/communityParty/regionalParty/unitsForm.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/modules/communityParty/regionalParty/unitsForm.vue b/src/views/modules/communityParty/regionalParty/unitsForm.vue index 1cf0f4287..376e7de87 100644 --- a/src/views/modules/communityParty/regionalParty/unitsForm.vue +++ b/src/views/modules/communityParty/regionalParty/unitsForm.vue @@ -76,8 +76,8 @@ class="u-item-width-normal" > - - + Date: Mon, 20 May 2024 17:56:46 +0800 Subject: [PATCH 10/63] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=9D=99=E6=80=81=E9=A1=B5=E9=9D=A2=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/activityRecords.vue | 620 +++++++++++++++++ .../communityParty/activity/eventDetails.vue | 258 +++++++ .../modules/communityParty/activity/index.vue | 634 ++++++++++++++++++ 3 files changed, 1512 insertions(+) create mode 100644 src/views/modules/communityParty/activity/activityRecords.vue create mode 100644 src/views/modules/communityParty/activity/eventDetails.vue create mode 100644 src/views/modules/communityParty/activity/index.vue diff --git a/src/views/modules/communityParty/activity/activityRecords.vue b/src/views/modules/communityParty/activity/activityRecords.vue new file mode 100644 index 000000000..50f528da9 --- /dev/null +++ b/src/views/modules/communityParty/activity/activityRecords.vue @@ -0,0 +1,620 @@ + + + + + + + + + \ No newline at end of file diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue new file mode 100644 index 000000000..501e8b2f7 --- /dev/null +++ b/src/views/modules/communityParty/activity/eventDetails.vue @@ -0,0 +1,258 @@ + + + + + diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue new file mode 100644 index 000000000..27b96df16 --- /dev/null +++ b/src/views/modules/communityParty/activity/index.vue @@ -0,0 +1,634 @@ + + + + \ No newline at end of file From be9c6c0cbe2e945468c9465bdaa3f1f5c322be10 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Tue, 21 May 2024 17:59:26 +0800 Subject: [PATCH 11/63] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=AE=A1=E7=90=86=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/activity/eventDetails.vue | 40 +- .../modules/communityParty/activity/index.vue | 104 ++- .../modules/workSys/typeActivity/index.vue | 635 ++++++++++++++++++ 3 files changed, 742 insertions(+), 37 deletions(-) create mode 100644 src/views/modules/workSys/typeActivity/index.vue diff --git a/src/views/modules/communityParty/activity/eventDetails.vue b/src/views/modules/communityParty/activity/eventDetails.vue index 501e8b2f7..dcd3675de 100644 --- a/src/views/modules/communityParty/activity/eventDetails.vue +++ b/src/views/modules/communityParty/activity/eventDetails.vue @@ -51,7 +51,7 @@
线上报名:   - +
@@ -73,9 +73,12 @@   活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容活动内容
-
- 活动图片： - {{ formData.memberCount || "--" }} +
+ 活动图片： +
+ Image +
@@ -127,8 +130,18 @@ + +
@@ -159,7 +172,24 @@ export default { return { formData: {}, initLoading: false, - online:true, + online: true, + imageArray: [ + { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + ], + tableData: [ + { unitName: '张三', agencyName: '123456789', type: '内容1', serviceMatterListShow: [ { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] }, + { unitName: '李四', agencyName: '987654321', type: '内容2', serviceMatterListShow: [ { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.Is2yEGD5UpcDWjgEZxI3aAHaEo&w=316&h=197&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts1.cn.mm.bing.net/th?id=OIP-C.qTIRFZyY3BxB1CaOT1Uf9wHaEK&w=333&h=187&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' }, + { url: 'https://ts3.cn.mm.bing.net/th?id=OIP-C.4SPZVrcvZ-Tunx4G4FFtRAHaHa&w=250&h=250&c=8&rs=1&qlt=90&o=6&dpr=2&pid=3.1&rm=2' },] }, + + ], }; }, components: {}, diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue index 27b96df16..3b60fa888 100644 --- a/src/views/modules/communityParty/activity/index.vue +++ b/src/views/modules/communityParty/activity/index.vue @@ -9,7 +9,6 @@ - @@ -17,8 +16,8 @@ - + @@ -26,31 +25,44 @@
+ - + + - - - - + + + + + + + +
- 查询 - 重置 + 查询 + 重置
- + 发起活动 - + 活动记录 +
+ + 发起活动 + + 活动记录 +
+ + 导出
- @@ -119,7 +131,7 @@ import activityRecords from './activityRecords' import eventDetails from './eventDetails' import util from '@js/util.js'; - import { requestPost } from "@/js/dai/request"; + import { requestPost,requestGet } from "@/js/dai/request"; import { mapGetters } from 'vuex' import { Loading } from 'element-ui' // 引入Loading服务 @@ -135,6 +147,7 @@ agencyId: '', gridList: [],//所属网格 unitList: [],//单位list + corganizerList:[],//协办方list serviceList: [ { id: "1", @@ -163,6 +176,7 @@ unitId: '', formData: { unitId: '', + xbf:'', title: '', serviceMatter:"", startTime: '', @@ -181,7 +195,8 @@ files: "", fileName: "", uploadUlr: window.SITE_CONFIG['apiURL'] + '/gov/org/neighborhood/import', - searchdemandOptions:[] + searchdemandOptions:[], + detail:{} } }, components: { @@ -202,10 +217,32 @@ this.loadGrid() //获取网格下拉框数据 this.loadTable() + + this.listServerOrg() }, methods: { + async listServerOrg() { + const url = "/actual/base/serviceitem/listServerOrgNewTask"; + let params = { + // serviceTypeId: "1037", + // serverOrgType: "1044", + // businessType: "party_unit", + serverOrgCategoryCode: "", + serverOrgType: "party_unit", + serverParentOrgCategoryCode: "" + }; + + let { data, code, msg } = await requestPost(url, params); + if (code == 0) { + this.corganizerList = data; + console.log("datadata",this.corganizerList) + } else if (code >= 8000) { + this.$message.error(msg); + } + }, + handleCateCHange(val) { if (val.length === 2) { this.formData.serviceMatter = val[1]; @@ -293,21 +330,18 @@ } }, - + //展示表格 async loadTable () { this.tableLoading = true - const url = "/actual/base/icpartyactivity/search" - // const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyactivity/list" + // const url = "/actual/base/communityActivity/page" let params = { agencyId: this.agencyId, pageSize: this.pageSize, pageNo: this.pageNo, ...this.formData } - const { data, code, msg } = await requestPost(url, params) - if (code === 0) { this.total = data.total this.tableData = data.list @@ -350,6 +384,14 @@ this.$refs.ref_form.initForm('add', null) }) }, + // startProcess () { + // this.formTitle = '新增' + + // this.formShow = true + // this.$nextTick(() => { + // this.$refs.ref_form.initForm('add', null) + // }) + // }, handleEdit (row) { this.formTitle = '修改' @@ -534,14 +576,9 @@ this.formData.startTime = startTimeArray[0] + '-' + startTimeArray[1] + '-' + startTimeArray[2] + ' 00:00:00' this.formData.endTime = endTimeArray[0] + '-' + endTimeArray[1] + '-' + endTimeArray[2] + ' 23:59:59' - - // this.startTimeShow = startTimeArray[0] + '年' + startTimeArray[1] + '月' + startTimeArray[2] + '日' - // this.endTimeShow = endTimeArray[0] + '年' + endTimeArray[1] + '月' + endTimeArray[2] + '日' } else { this.formData.startTime = '' this.formData.endTime = '' - // this.startTimeShow = '' - // this.endTimeShow = '' } }, @@ -593,36 +630,39 @@ .g-main { width: 100%; } - + .m-search { background: #ffffff; border-radius: 4px; padding: 30px 20px 5px; box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); } - + .item_width_1 { width: 260px; } + .item_width_2 { width: 495px; } - + .m-table { background: #ffffff; box-shadow: 0px 2px 12px 0px rgba(0, 0, 0, 0.1); border-radius: 4px; margin-top: 15px; padding: 23px 30px 10px; - + .table { margin-top: 20px; } } - + .div_btn { + display: flex; + justify-content: space-between; } - + .el-row { /* margin-bottom: 20px; */ display: flex; @@ -630,5 +670,5 @@ margin-top: 10px; margin-right: 50px; } - + \ No newline at end of file diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue new file mode 100644 index 000000000..1e0f6f6b2 --- /dev/null +++ b/src/views/modules/workSys/typeActivity/index.vue @@ -0,0 +1,635 @@ + + + + \ No newline at end of file From 6f89238b365b06eb018ea0901b5b797153cdbc03 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 22 May 2024 17:32:09 +0800 Subject: [PATCH 12/63] =?UTF-8?q?=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A?= =?UTF-8?q?=E6=B2=A1=E5=8F=8D=E5=BA=94=EF=BC=8C=E5=8B=BE=E9=80=89=E9=9A=90?= =?UTF-8?q?=E6=82=A3=EF=BC=8C=E7=82=B9=E5=87=BB=E7=A1=AE=E5=AE=9A=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/resourceManagement/enterprise/addForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/modules/resourceManagement/enterprise/addForm.vue b/src/views/modules/resourceManagement/enterprise/addForm.vue index ab1ddd4c2..85c171b5b 100644 --- a/src/views/modules/resourceManagement/enterprise/addForm.vue +++ b/src/views/modules/resourceManagement/enterprise/addForm.vue @@ -557,8 +557,8 @@ export default { } }); }else if(this.pageType === 'patrol'){ - if(this.checkboxOptions.length > 0 && this.hiddenDangeArr.length != 0 && this.checkResultFlag != '1' && this.this.patrolForm.checkResultFlag != '1'){ - this.checkboxMessageFlag = true; + if(this.checkboxOptions.legth < 1 && this.hiddenDangeArr.length != 0 && this.checkResultFlag != '1' && this.patrolForm.checkResultFlag != '1'){ + this.checkboxMessagneFlag = true; }else if(this.patrolForm.checkResultFlag == '0'&& this.inputList[0].hazardDesc === '' && this.checkResultFlag == '1'){ this.inputMessageFlag = true; }else{ From ef4b9081ffd9ebd499a7adec405fc3ce3991f2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Thu, 23 May 2024 09:49:42 +0800 Subject: [PATCH 13/63] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/communityParty/activity/index.vue | 24 ++- .../modules/workSys/typeActivity/index.vue | 22 +- .../workSys/typeActivity/typeActivityadd.vue | 195 ++++++++++++++++++ 3 files changed, 223 insertions(+), 18 deletions(-) create mode 100644 src/views/modules/workSys/typeActivity/typeActivityadd.vue diff --git a/src/views/modules/communityParty/activity/index.vue b/src/views/modules/communityParty/activity/index.vue index 3b60fa888..3a5488b46 100644 --- a/src/views/modules/communityParty/activity/index.vue +++ b/src/views/modules/communityParty/activity/index.vue @@ -219,6 +219,7 @@ this.loadTable() this.listServerOrg() + this.communityPublicity() }, @@ -237,12 +238,33 @@ let { data, code, msg } = await requestPost(url, params); if (code == 0) { this.corganizerList = data; - console.log("datadata",this.corganizerList) + // console.log("datadata",this.corganizerList) } else if (code >= 8000) { this.$message.error(msg); } }, + async communityPublicity() { + const url = "/actual/base/communityPublicity/page"; + let params = { + "pageSize": 20, + "pageNo": 1, + // "title": "", + // "tagId": "", + // "startTime": "", + // "endTime": "" + }; + + let { data, code, msg } = await requestGet(url, params); + console.log("datadatadata",data) + // if (code == 0) { + // this.corganizerList = data; + // console.log("datadata",this.corganizerList) + // } else if (code >= 8000) { + // this.$message.error(msg); + // } + }, + handleCateCHange(val) { if (val.length === 2) { this.formData.serviceMatter = val[1]; diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue index 1e0f6f6b2..c8e4fc6d4 100644 --- a/src/views/modules/workSys/typeActivity/index.vue +++ b/src/views/modules/workSys/typeActivity/index.vue @@ -75,8 +75,8 @@ - + + + + + + + + \ No newline at end of file From a0325d5bb47d0ce6f3cba4556216aa321c3b9fd6 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 23 May 2024 17:22:03 +0800 Subject: [PATCH 14/63] =?UTF-8?q?=E4=B8=8A=E6=8A=A5=E4=BA=8B=E4=BB=B6?= =?UTF-8?q?=E5=8A=A0=E5=85=A5=E5=8F=82openFlag=E5=8C=BA=E5=88=86=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E8=AE=A8=E8=AE=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shequzhili/eventOld/cpts/event-info.vue | 17 +++++++++++++---- .../shequzhili/eventOld/cpts/process-form.vue | 5 +++-- 2 files changed, 16 insertions(+), 6 deletions(-) diff --git a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue index bd47b311b..35279cf92 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/event-info.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/event-info.vue @@ -489,6 +489,7 @@ export default { this.formData.operationType == "5" || this.formData.operationType == "6" || this.formData.operationType == "0" || + this.formData.operationType == "7" || (this.formData.operationType == 2 && this.demand.demandUserName) ) { if (Array.isArray(this.formData.gridId) && this.formData.gridId.length) { @@ -503,10 +504,10 @@ export default { this.formData.agencyId = ""; this.formData.gridId = ""; } + this.formData.openFlag = this.formData.operationType == "7"?1:0 const url = "/governance/icEventOld/add"; - const { formData } = this; const { data, code, msg } = await requestPost(url, { - ...formData, + ...this.formData, }); if (code === 0) { this.$message.success("操作成功！"); @@ -523,12 +524,12 @@ export default { }, async handelDispose() { - console.log(this.$refs.ref_processinfo_dispose.okflag); + console.log(this.formData.operationType); this.$refs.ref_processinfo_dispose.getProcessInfo(); if (this.$refs.ref_processinfo_dispose.okflag) { this.formData.operationType = this.$refs.ref_processinfo_dispose.operationType; if (this.formData.operationType === "0" || this.formData.operationType === '5' - || this.formData.operationType === '6') { + || this.formData.operationType === '6' || this.formData.operationType === '7') { this.project = {}; this.demand = {}; if (this.$refs.ref_processinfo_dispose.replayInfo.okflag) { @@ -537,6 +538,14 @@ export default { } this.replayInfo = this.$refs.ref_processinfo_dispose.replayInfo; this.replayInfo.icEventId = this.eventId; + if(this.formData.operationType === '7'){ + this.replayInfo.openFlag = 1 + this.replayInfo.operationType = '7'//不可以openFlag为true时去掉校验吗? + this.replayInfo.content = '1111'//不可以openFlag为true时去掉校验吗? + }else{ + this.replayInfo.openFlag = 0 + } + //回复属性赋值 let url = "/governance/icEventOld/reply"; await this.submitDispose(url, this.replayInfo); diff --git a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue index 3522bc207..138bc01aa 100644 --- a/src/views/modules/shequzhili/eventOld/cpts/process-form.vue +++ b/src/views/modules/shequzhili/eventOld/cpts/process-form.vue @@ -11,6 +11,7 @@ 指派 完成并回复 转服务 + 公开讨论 @@ -175,9 +176,9 @@ export default { this.replayInfo = this.$refs.ref_process_form_replay_end.formData this.okflag = true } - } else if(this.operationType === '4') { + } else if(this.operationType === '4' || this.operationType === '7') { this.okflag = true - }else { + }else{ return false } }, From 67b647e45fc70fd70125c0fc2c10cc2fb765928c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E7=B4=A0?= <66666@66.com> Date: Thu, 23 May 2024 18:06:14 +0800 Subject: [PATCH 15/63] =?UTF-8?q?=E7=A4=BE=E5=8C=BA=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../activity/activityRecords.vue | 127 ++-- .../communityParty/activity/eventDetails.vue | 94 +-- .../modules/communityParty/activity/index.vue | 208 +++--- .../activity/initiateActivity.vue | 664 ++++++++++++++++++ 4 files changed, 889 insertions(+), 204 deletions(-) create mode 100644 src/views/modules/communityParty/activity/initiateActivity.vue diff --git a/src/views/modules/communityParty/activity/activityRecords.vue b/src/views/modules/communityParty/activity/activityRecords.vue index 50f528da9..b4cb9be7b 100644 --- a/src/views/modules/communityParty/activity/activityRecords.vue +++ b/src/views/modules/communityParty/activity/activityRecords.vue @@ -6,18 +6,22 @@ class="form"> - + - - + + + - - + - + --> + + + + + + + @@ -281,6 +288,7 @@ import { Loading } from "element-ui"; // 引入Loading服务 import resiChangeTransfer from "../../components/resiChangeTransfer.vue"; import resideathAdd from "../plugins/change/resideathAdd.vue"; +import diyInfo from "./diyInfo.vue"; let loading; export default { components: { @@ -292,6 +300,7 @@ export default { resiChangeRecord, resiChangeTransfer, resideathAdd, + diyInfo, }, data() { return { @@ -339,6 +348,9 @@ export default { tableDataTow: [], valueb: '', searchList: [], + exportList: [], + diyDialog: false, + treeData: [], autoOpenArr: [], @@ -661,6 +673,40 @@ export default { this.$refs.ref_changerecord.initForm(row); }, + async diyExport() { + await this.getExportList(); + console.log(this.$refs['']); + }, + + handleDiyClose() { + this.diyDialog = false; + }, + + async getExportList(type) { + const url = "/oper/customize/icformitemgroup/list"; + let params = { + formCode: "resident_base_info", + }; + + const { data, code, msg } = await requestPost(url, params); + + if (code === 0) { + data.forEach((item) => { + (async (id) => { + // item.queryItemList = await this.getExportChildList(id) + item.queryItemList = []; + })(item.id); + }); + this.exportList = [...data]; + this.$nextTick(() => { + this.diyDialog = true; + }); + console.log("获取详情成功getExportList----", this.exportList); + } else { + this.$message.error(msg); + } + }, + diaClose() { this.tranferShow = false; this.deathShow = false; From cc65955228946cb74906ac16ac7fe5a8c0ea35c1 Mon Sep 17 00:00:00 2001 From: duanliangtao <48194157+duanliangtao@users.noreply.github.com> Date: Mon, 24 Jun 2024 17:10:54 +0800 Subject: [PATCH 32/63] =?UTF-8?q?=E5=B1=85=E6=B0=91=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=A2=9E=E5=8A=A0=E6=88=BF=E5=B1=8B=E7=9A=84?= =?UTF-8?q?=E5=AF=BC=E5=87=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/resi.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue index 105820401..6814664d3 100644 --- a/src/views/modules/base/resi.vue +++ b/src/views/modules/base/resi.vue @@ -685,7 +685,7 @@ export default { async getExportList(type) { const url = "/oper/customize/icformitemgroup/list"; let params = { - formCode: "resident_base_info", + formCode: "resident_base_info,community_info", }; const { data, code, msg } = await requestPost(url, params); From bbdee5a25011b87167fc68ddd96058b0ff382743 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Wed, 26 Jun 2024 10:20:50 +0800 Subject: [PATCH 33/63] =?UTF-8?q?=E7=94=B5=E5=AD=90=E9=97=A8=E7=89=8C?= =?UTF-8?q?=E4=BA=8C=E7=BB=B4=E7=A0=81=E6=94=B9=E6=88=90=E7=94=B5=E5=AD=90?= =?UTF-8?q?=E9=97=A8=E6=B4=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/base/community/communityTable.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/modules/base/community/communityTable.vue b/src/views/modules/base/community/communityTable.vue index acfb2f384..de6188ab4 100644 --- a/src/views/modules/base/community/communityTable.vue +++ b/src/views/modules/base/community/communityTable.vue @@ -79,7 +79,7 @@
下载电子门牌二维码 + @click="handleExportIDCard()">下载电子门牌
- 活动总结 删除 取消 @@ -298,6 +297,14 @@ this.tableData = data.list this.tableData.forEach((item) => { + this.typeList.forEach((itemuse)=>{ + if(item.typeId==itemuse.id) + { + item.typeName=itemuse.typeName + } + + }) + const currentTime = new Date(); if (item.startTime > currentTime) { if( item.status === 0 ){ @@ -324,12 +331,14 @@ this.updatetow() } } + }); } else { this.$message.error(msg) } + console.log(this.tableData); }, async getDemandOptions() { this.$http @@ -767,13 +776,13 @@ margin: 20px 7px 7px; } - .item_width_1 { - width: 260px; - } + // .item_width_1 { + // width: 260px; + // } - .item_width_2 { - width: 495px; - } + // .item_width_2 { + // width: 495px; + // } .m-table { background: #ffffff; diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue index 78dbc0e24..9c840a3b7 100644 --- a/src/views/modules/workSys/typeActivity/index.vue +++ b/src/views/modules/workSys/typeActivity/index.vue @@ -41,25 +41,25 @@ - + - + From 1b84d890db513fda4d3a89457a0e167d8a32f725 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=98=AF=E5=B0=8F=E7=8E=8B=E5=91=80=5C24601?= <819653817@qq.com> Date: Thu, 27 Jun 2024 14:35:05 +0800 Subject: [PATCH 36/63] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=AE=A3=E4=BC=A0?= =?UTF-8?q?=E7=AD=89=E3=80=82=E3=80=82=E3=80=82=E3=80=82=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../communityParty/comPromotion/add.vue | 51 +++++++++---------- .../communityParty/comPromotion/index.vue | 10 ++-- .../modules/workSys/promotionTab/index.vue | 8 +-- 3 files changed, 34 insertions(+), 35 deletions(-) diff --git a/src/views/modules/communityParty/comPromotion/add.vue b/src/views/modules/communityParty/comPromotion/add.vue index db3ce79d1..1c9f057cf 100644 --- a/src/views/modules/communityParty/comPromotion/add.vue +++ b/src/views/modules/communityParty/comPromotion/add.vue @@ -180,31 +180,31 @@ export default { } }, - async initForm(type, activityId) { - this.startLoading() - this.formType = type - // console.log("阿斯顿撒打算",type, activityId) - if (type === 'edit') { - this.formData = activityId - if (activityId.coverPic) { - let ob = { - fileType: '0', - fileUrl: activityId.coverPic - }; - this.fileList = [ob]; - this.formData.coverPic = ob.fileUrl; - if(this.formData.top == 1){ - this.top = true - } - } - // console.log("this.fileList",this.fileList) - }else if (type === 'records') { - this.records = true - } + // async initForm(type, activityId) { + // this.startLoading() + // this.formType = type + // // console.log("阿斯顿撒打算",type, activityId) + // if (type === 'edit') { + // this.formData = activityId + // if (activityId.coverPic) { + // let ob = { + // fileType: '0', + // fileUrl: activityId.coverPic + // }; + // this.fileList = [ob]; + // this.formData.coverPic = ob.fileUrl; + // if(this.formData.top == 1){ + // this.top = true + // } + // } + // // console.log("this.fileList",this.fileList) + // }else if (type === 'records') { + // this.records = true + // } - this.endLoading() + // this.endLoading() - }, + // }, async handleComfirm() { this.btnDisable = true @@ -242,6 +242,7 @@ export default { }else{ console.log("this.formData",this.formData) let url = '/actual/base/communityPublicity/save' + console.log(url); const { data, code, msg } = await requestPost(url, this.formData) if (code === 0) { this.$message({ @@ -298,9 +299,7 @@ export default { title: [ { required: true, message: '文章标题不能为空', trigger: 'blur' } ], - coverPic:[ - { required: true, message: '请选择封面图', trigger: 'blur' } - ], + content: [ { required: true, message: '内容不能为空', trigger: 'blur' } ], diff --git a/src/views/modules/communityParty/comPromotion/index.vue b/src/views/modules/communityParty/comPromotion/index.vue index 9e52ce2e3..6cdc5b2e7 100644 --- a/src/views/modules/communityParty/comPromotion/index.vue +++ b/src/views/modules/communityParty/comPromotion/index.vue @@ -68,11 +68,11 @@ diff --git a/src/views/modules/workSys/promotionTab/index.vue b/src/views/modules/workSys/promotionTab/index.vue index 5f9e38e9b..9b34a136d 100644 --- a/src/views/modules/workSys/promotionTab/index.vue +++ b/src/views/modules/workSys/promotionTab/index.vue @@ -52,15 +52,15 @@ From 912064f9f66aac6a70041de3272b627af29cf887 Mon Sep 17 00:00:00 2001 From: mk <2403457699@qq.com> Date: Thu, 27 Jun 2024 15:06:50 +0800 Subject: [PATCH 37/63] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/modules/workSys/typeActivity/index.vue | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/src/views/modules/workSys/typeActivity/index.vue b/src/views/modules/workSys/typeActivity/index.vue index 9c840a3b7..344be9dcd 100644 --- a/src/views/modules/workSys/typeActivity/index.vue +++ b/src/views/modules/workSys/typeActivity/index.vue @@ -3,16 +3,14 @@
- - - - @@ -312,6 +310,7 @@ }