Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_webapp into dev

packages/party/AppPartyScoreFlow/psfList.vue

@@ -70,7 +70,7 @@ export default {
         {label: "调整说明", prop: "remark", align: "center"},
         {label: "事件", prop: "createTime"},
         {label: "类型", prop: "integralType", align: "center", dict: "partyIntegralType"},
-        {label: "积分", prop: "residualIntegral", align: "center"},
+        {label: "积分", prop: "integral", align: "center"},
         {slot: "options"}
       ]
     },
@@ -102,7 +102,10 @@ export default {
         params: {...this.page, ...this.search}
       }).then(res => {
         if (res?.data) {
-          this.tableData = res.data?.records
+          this.tableData = res.data?.records?.map(e => ({
+            ...e,
+            integral: (e.integralType == 0 ? "-" : '+') + e.integral
+          }))
           this.page.total = res.data.total
         }
       })

packages/party/partyMember/components/neighbourSetting.vue

@@ -144,6 +144,7 @@ export default {
           // this.residents = res.data.records?.map(e => ({dictValue: e.id, dictName: e.name}))
           this.residents = res.data.records
           this.list.total = res.data.total
+          this.$refs.Residents.doLayout()
         }
       })
     },