diff --git a/packages/party/AppPartyScore/AppPartyScore.vue b/packages/party/AppPartyScore/AppPartyScore.vue index 8aad67f4..cddd8663 100644 --- a/packages/party/AppPartyScore/AppPartyScore.vue +++ b/packages/party/AppPartyScore/AppPartyScore.vue @@ -23,7 +23,7 @@ export default { } }, created() { - this.dict.load("residentType") + this.dict.load("residentType", "householdRelation") } } diff --git a/packages/party/AppPartyScore/psDetail.vue b/packages/party/AppPartyScore/psDetail.vue index 89c0e80d..43ab4d33 100644 --- a/packages/party/AppPartyScore/psDetail.vue +++ b/packages/party/AppPartyScore/psDetail.vue @@ -55,7 +55,7 @@ export default { methods: { getDetail() { let {id} = this.$route.query - this.instance.post("/app/apppartyintegralinfo/list", null, { + this.instance.post("/app/appparty/list", null, { params: {id} }).then(res => { if (res?.data) { diff --git a/packages/party/AppPartyScore/psList.vue b/packages/party/AppPartyScore/psList.vue index bd967a4a..c26dd67b 100644 --- a/packages/party/AppPartyScore/psList.vue +++ b/packages/party/AppPartyScore/psList.vue @@ -7,7 +7,7 @@ @getList="getTableData" :col-configs="colConfigs" :dict="dict"> @@ -37,14 +37,15 @@ export default { colConfigs() { return [ {label: "姓名", prop: "name"}, - {label: "个人积分", prop: "idNumber", align: "center"}, - {label: "家庭积分", prop: "phone", align: "center"}, + {label: "个人积分", prop: "integral", align: "center"}, + {label: "家庭积分", prop: "familySurplusIntegral", align: "center"}, {slot: "options"} ] }, familyCols() { return [ - {label: '与户主关系', prop: 'householdRelation', align: 'center', slot: 'householdRelation', width: 165}, + {label: '与户主关系', prop: 'householdRelation', align: 'center', width: 165, + render: (h, {row}) => h('p', dict.getLabel('householdRelation', row.householdRelation||"户主"))}, {label: '类型', prop: 'residentType', align: 'center', dict: "residentType"}, {label: '姓名', prop: 'name', align: 'center'}, {label: '身份证号', render: (h, {row}) => h('p', this.idCardNoUtil.hideId(row.idNumber)), width: 165}, @@ -54,7 +55,7 @@ export default { }, data() { return { - search: {name: "", ids: ""}, + search: {}, page: {current: 1, size: 10, total: 0}, tableData: [], dialog: false, @@ -66,7 +67,7 @@ export default { this.$router.push({}) }, getTableData() { - this.instance.post("/app/apppartyintegralinfo/list", null, { + this.instance.post("/app/appparty/listByPartyIntegral", null, { params: {...this.page, ...this.search} }).then(res => { if (res?.data) { @@ -78,9 +79,9 @@ export default { showDetail(id) { this.$router.push({query: {id}}) }, - getFamilyByPartyId(partyId) { - this.instance.post("/app/apppartyintegralinfo/list", null, { - params: {...this.list, partyId} + getFamilyByPartyId(idNumber) { + this.instance.post("/app/appresident/queryHomeMember", null, { + params: {idNumber} }).then(res => { if (res?.data) { this.familyList = res.data?.records