From 0160293d1653d2005533ed181bce858af2a723a1 Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 28 Apr 2022 11:10:26 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BC=81=E5=BE=AE=E8=BF=BD=E5=8A=A0?= =?UTF-8?q?=E6=9D=83=E9=99=90=E7=A0=81=E9=99=90=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/util.js | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/src/common/util.js b/src/common/util.js index 78d4e65f..9a23fbbe 100644 --- a/src/common/util.js +++ b/src/common/util.js @@ -233,7 +233,19 @@ const idCardNoUtil = { return code && code.replace(/^(\d{10})\d{4}(.{4}$)/g, `$1${Array(5).join('*')}$2`) || "-" } } - +/** + * 封装权限判断方法 + */ +export const $permissions = flag => { + let buttons = [] + if (localStorage.getItem('vuex')) { + const vuex = JSON.parse(localStorage.getItem('vuex')) + buttons = vuex.user.buttons + } + if (buttons && buttons.length > 0) { + return buttons.some(b => b.id == flag || b.permission == flag) + } else return false +} export default { dict, confirm, @@ -277,5 +289,6 @@ export default { }, dayjs, idCardNoUtil, - qs + qs, + $permissions } From a746e0fcbffd571ad34845c02a7b55b9b42ad955 Mon Sep 17 00:00:00 2001 From: shijingjing <1789544664@qq.com> Date: Thu, 28 Apr 2022 11:10:58 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=AE=B6=E5=BA=AD=E6=94=B6=E6=94=AF?= =?UTF-8?q?=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AppMonitoringObject/MonitorIncome.vue | 103 ++++++++++++++++-- 1 file changed, 96 insertions(+), 7 deletions(-) diff --git a/src/apps/AppMonitoringObject/MonitorIncome.vue b/src/apps/AppMonitoringObject/MonitorIncome.vue index 559f6ed0..50f3dd5e 100644 --- a/src/apps/AppMonitoringObject/MonitorIncome.vue +++ b/src/apps/AppMonitoringObject/MonitorIncome.vue @@ -4,7 +4,7 @@
- 工资收入 + 工资性收入(元)
- 生产经营收入 + 生产经营收入(元)
- 财产性收入 + 计划生育金(元)
- 转移性收入 + 资产收益扶贫分红收入
- 理赔收入 + 养老保险金（元）
- 生产经营支出 + 低保金（元）
- 合规自然支出 + 特困供养金（元） +
+
+ +
+
+
+
+
+
+ 生态补偿金（元） +
+
+ +
+
+
+
+
+
+ 财产性收入（元） +
+
+ +
+
+
+
+
+
+ 其他财产性收入 +
+
+ +
+
+
+
+
+
+ 转移性收入（元） +
+
+ +
+
+
+
+
+
+ 其他转移性收入（元） +
+
+ +
+
+
+
+
+
+ 生产经营性支出（元） +
+
+ +
+
+
+
+
+
+ 纳入监测对象的收入参考范围 +
+
+ +
+
+
+
+
+
+ 纳入监测对象的人均收入参考范围

*不填时默认为0元

+
保存
From 2c93a9e283b8f55dc876902a3632d81688b1825c Mon Sep 17 00:00:00 2001 From: aixianling Date: Thu, 28 Apr 2022 11:16:07 +0800 Subject: [PATCH 3/3] BUG 29251 --- src/saas/AppGridManagement/FamilyList.vue | 153 ++++++++++++---------- 1 file changed, 86 insertions(+), 67 deletions(-) diff --git a/src/saas/AppGridManagement/FamilyList.vue b/src/saas/AppGridManagement/FamilyList.vue index 10e150e9..099f5dd0 100644 --- a/src/saas/AppGridManagement/FamilyList.vue +++ b/src/saas/AppGridManagement/FamilyList.vue @@ -1,20 +1,22 @@