会员数量
${e.member_number || 0}
活动数量
${e.activity_number || 0}
@@ -635,7 +635,7 @@ export default {
return info = res.data
}
}),
- this.getFraternities(area.unique_id).then(list => {
+ this.getFraternityTypes(area.unique_id).then(list => {
let 互助会 = 0, 会员数量 = 0
list.forEach(e => {
互助会 += e.number
@@ -778,8 +778,9 @@ export default {
return code.substring(0, 6) + last
},
getFraternityData(args) {
+ const row = this.fraternityTypes[args.rowIndex]
this.dialog = true
- this.detail = {eventType: "互助会信息", mapType: 'fraternitySta', list: []}
+ this.detail = {eventType: row.type, mapType: 'fraternitySta', list: []}
const area_code = this.transferAreaCode(this.areaId)
this.fraternityLoading = true
this.instance.get("/hzh/find-fraternity-member-detail", {params: {area_code}}).then(res => {
@@ -795,14 +796,27 @@ export default {
console.log(current)
this.fraternityExtra = true
this.$set(this.detail, 'extraType', type)
- this.$set(this.detail, 'extra', current[{
- 1: 'parent', 2: 'student'
- }[type]]?.map(e => [e.name, genderDict[e.gender], e.age]) || [])
+
this.$set(this.detail, 'extraTitle', {
- 1: '家长名单', 2: '学生名单', 3: '活动清单'
+ 1: '家长名单', 2: '学生名单', 3: '活动情况'
}[type])
if (type == 3) {
-
+ this.$set(this.detail, 'others', {header: [], rowNum: 3})
+ this.instance.get("/hzh/find-fraternity-activity-detail", {params: {area_code: this.transferAreaCode(this.areaId)}}).then(res => {
+ if (res?.data) {
+ this.$set(this.detail, 'extra', res.data.map(e => [`
+
+

+
+
${e.activity_name}
+
${e.start_time + "-" + e.end_time}
+
${e.activity_address}
`]))
+ }
+ })
+ } else {
+ this.$set(this.detail, 'extra', current[{
+ 1: 'parent', 2: 'student'
+ }[type]]?.map(e => [e.name, genderDict[e.gender], e.age]) || [])
}
}
},
@@ -941,6 +955,23 @@ export default {
}
}
}
+
+ &.activity {
+ background: #ffffff0a;
+ padding: 14px;
+ height: 108px;
+ text-align: left;
+
+ b {
+ color: #FFFFFF;
+ }
+
+ .actImg {
+ width: 80px;
+ height: 80px;
+ flex-shrink: 0;
+ }
+ }
}
.chart {