diff --git a/src/views/modules/communityService/dqfwzx/cpts/order.vue b/src/views/modules/communityService/dqfwzx/cpts/order.vue index 6452dc55..501266fd 100644 --- a/src/views/modules/communityService/dqfwzx/cpts/order.vue +++ b/src/views/modules/communityService/dqfwzx/cpts/order.vue @@ -31,13 +31,22 @@ label-width="150px" style="display: block" > - - + --> + + + - +
{{ item.time }} - +
item.selected); + let endIndex = list.findIndex((item, index) => { + return ( + item.selected && + (index == list.length - 1 || !list[index + 1].selected) + ); + }); + // console.log(startIndex, endIndex); + if (startIndex == -1) { + list[index].selected = !list[index].selected; + } else if (startIndex == endIndex) { + let big = Math.max(startIndex, index); + let little = Math.min(startIndex, index); + if (big == little) { + list[index].selected = !list[index].selected; + } else { + for (let i = little; i <= big; i++) { + // console.log(i); + if (!list[i].isAppointment) { + this.$message({ + type: "warning", + message: "请选择连续的时间", + }); + return false; + } + list[i].selected = true; + } + } + } else { + if (index == startIndex || index == endIndex) { + list[index].selected = !list[index].selected; + } else if (list[index].selected) { + let big = index; + let little = index; + if (startIndex - index < index - endIndex) { + big = endIndex; + } else { + little = startIndex; + } + for (let i = little; i <= big; i++) { + list[i].selected = false; + } + } else { + let big = index; + let little = index; + if (index < startIndex) { + big = startIndex; + } else { + little = endIndex; + } + for (let i = little; i <= big; i++) { + // console.log(i); + if (!list[i].isAppointment) { + this.$message({ + type: "warning", + message: "请选择连续的时间", + }); + return false; + } + list[i].selected = true; + } + } + } + console.log(list); + this.timeList = list; + return false; + }, + + async getDateList() { + let url = "/gov/org/icpartyservicecenter/appointmenttime"; + + const { + dataForm: { matterId }, + } = this; + if (!matterId) return; + + const { data, code, msg } = await requestPost(url, { + matterId, + date: dateFormat(new Date(), "yyyy-MM-dd"), + }); + + if (code === 0) { + this.dateList = data.dateList || []; + // this.dataForm.appointmentDate = data.dateList[0]; + } else { } }, @@ -219,8 +332,11 @@ export default { }); if (code === 0) { - this.timeList = data.timeDetail || []; - } else { + let timeList = data.timeDetail || []; + this.timeList = timeList.map((item) => { + item.selected = false; + return item; + }); } }, diff --git a/src/views/modules/visual/communityParty/community.vue b/src/views/modules/visual/communityParty/community.vue index 0c2833d5..98ce1210 100644 --- a/src/views/modules/visual/communityParty/community.vue +++ b/src/views/modules/visual/communityParty/community.vue @@ -5,7 +5,7 @@
- 区域化党建 + 区域化党建   +
+
+ + + + +
+
+ + +
党建单位分类统计
-
- - - - -
-
- - -
+
@@ -664,6 +666,7 @@ export default { margin-right: 6px; } .title-label { + font-size: 20px; font-weight: 800; ::v-deep .el-input { @@ -673,8 +676,8 @@ export default { font-size: 18px; font-weight: 800; color: #fff; - background: transparent; - border: 0; + background: #06186d; + border: 1px solid #1a64cc; } .el-icon-arrow-down::before { content: "\e790"; @@ -710,8 +713,10 @@ export default { background: #2865fa; border-radius: 50%; } - .second-select { - margin: 0 10px 0 40px; + +} +.second-select { + margin: 0 10px 0 10px; ::v-deep .el-input { width: 180px; height: 36px; @@ -757,8 +762,6 @@ export default { .second-select:last-child { margin-left: 0; } -} - .box-wr { display: flex; box-sizing: border-box; diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue index 238e8160..7e0e1651 100644 --- a/src/views/modules/visual/communityParty/party.vue +++ b/src/views/modules/visual/communityParty/party.vue @@ -4,18 +4,7 @@
- + 党员信息统计  
+ 服务措施分析   
-
选择时间
+