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()
         }
       })
     },

project/sanjianxi/apps.import.json

@@ -1,41 +1,2 @@
 {
-  "AppMediaManage": "媒资管理",
-  "AppBroadcast": "播发记录",
-  "AppEquipmentManage": "设备管理",
-  "AppReportAtWill": "随手拍",
-  "AppGridBlock": "网格区块",
-  "AppGridMember": "网格员管理",
-  "AppContentInfo": "新闻发布",
-  "AppCarousel": "轮播图设置",
-  "AppThematicConfig": "专题配置",
-  "AppConference": "会议通知",
-  "AppAskForm": "问卷表单",
-  "AppApprovalManage": "审批管理",
-  "AppMattersConfig": "事项配置",
-  "AppExaminationApproval": "审批分类",
-  "AppReturnHomeRegister": "返乡登记",
-  "AppHealthReport": "健康上报",
-  "AppRiskArea": "风险地区配置",
-  "AppScoreFamily": "家庭积分",
-  "AppScorePersonal": "个人积分",
-  "AppScoreRules": "积分规则",
-  "AppScoreSupermarket": "积分超市",
-  "AppVillageActivity": "乡村活动",
-  "AppAddressBook": "内部通讯录",
-  "AppNavConfig": "小程序导航配置",
-  "AppConvenienceAddressBook": "便民通讯录",
-  "AppQuestionBank": "党史题库",
-  "AppMeetingChinaunion": "三会一课",
-  "AppPartyHistoryClass": "党员学习",
-  "AppPartyOrganization": "党组织管理",
-  "AppPartyMember": "党员管理",
-  "AppLicence": "产品许可",
-  "AppContentManage": "内容中心",
-  "AppResident": "居民档案",
-  "AppResidentTags": "标签管理",
-  "AppISMap": "监控地图",
-  "AppISManage": "智能安防",
-  "AppISDevice": "安防设备",
-  "AppPartyScore": "党员积分",
-  "AppPartyScoreFlow": "党员积分明细"
 }