From 02779a6dd6562a0849ec98caa61d9deaff62353a Mon Sep 17 00:00:00 2001 From: yanran200730 Date: Mon, 15 Aug 2022 18:14:04 +0800 Subject: [PATCH 01/10] bug --- src/project/saas/AppResidentDocument/Add.vue | 52 +++++++++++------- src/project/saas/AppResidentDocument/Tags.vue | 53 +++++++++++++++++-- 2 files changed, 82 insertions(+), 23 deletions(-) diff --git a/src/project/saas/AppResidentDocument/Add.vue b/src/project/saas/AppResidentDocument/Add.vue index 35651f88..6d7433c5 100644 --- a/src/project/saas/AppResidentDocument/Add.vue +++ b/src/project/saas/AppResidentDocument/Add.vue @@ -84,7 +84,7 @@
现住址 - +
{{ form.currentAreaName }} 请选择 @@ -94,20 +94,6 @@
-
- * -
- - 居民标签 - - 请选择 - - - -
-
@@ -122,7 +108,7 @@
户籍地址 - +
{{ form.householdAreaName }} 请选择 @@ -141,6 +127,19 @@
+
+
+ + 居民标签 + + 请选择 + + + +
+
保存
@@ -174,7 +173,8 @@ export default { householdAreaName: '', householdAddress: '', residentType: '', - age: '' + age: '', + residentLabelList: [] }, showSelect: false, formName: '', @@ -191,6 +191,11 @@ export default { this.form.residentType = options.type } this.$dict.load('yesOrNo', 'sex', 'householdRelation', 'nation', 'education', 'maritalStatus', 'politicsStatus', 'militaryStatus', 'faithType') + + uni.$on('onChecked', e => { + console.log(e) + this.form.residentLabelList = e + }) }, computed: { ...mapState(['user']), @@ -246,7 +251,9 @@ export default { }, toChooseTags () { - uni.navigateTo({url: `./Tags`}) + uni.navigateTo({ + url: `./Tags?ids=${this.form.residentLabelList.map(v => v).join(',')}` + }) }, confirmSelect(e) { @@ -302,6 +309,15 @@ export default { \ No newline at end of file + diff --git a/src/apps/AppHelpEffect/addLog.vue b/src/apps/AppHelpEffect/addLog.vue index bee27801..bad00281 100644 --- a/src/apps/AppHelpEffect/addLog.vue +++ b/src/apps/AppHelpEffect/addLog.vue @@ -1,35 +1,55 @@ + + diff --git a/src/apps/AppHelpEffect/normalFarmerList.vue b/src/apps/AppHelpEffect/normalFarmerList.vue new file mode 100644 index 00000000..83e7d224 --- /dev/null +++ b/src/apps/AppHelpEffect/normalFarmerList.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/src/apps/AppMonitoringObject/Add.vue b/src/apps/AppMonitoringObject/Add.vue index ed9db1d0..ec0906ef 100644 --- a/src/apps/AppMonitoringObject/Add.vue +++ b/src/apps/AppMonitoringObject/Add.vue @@ -16,17 +16,17 @@
--> -
-
-
- * - 监测对象类型 -
-
- -
-
-
+ + + + + + + + + + +
diff --git a/src/apps/AppMonitoringObject/AppMonitoringObject.vue b/src/apps/AppMonitoringObject/AppMonitoringObject.vue index e78d4a05..77f84443 100644 --- a/src/apps/AppMonitoringObject/AppMonitoringObject.vue +++ b/src/apps/AppMonitoringObject/AppMonitoringObject.vue @@ -6,7 +6,7 @@
全部类型 - {{ $dict.getLabel('fpPrtpStatus', status)}} + {{ $dict.getLabel('fpPrtpStatus', status) }}
+ @confirm="confirmTypeSelect"/>
@@ -71,8 +71,6 @@ export default { currentTabs: 0, areaId: '', areaName: '', - isAdmin: false, - checkType: '', showType: false, typelist: [], status: '' @@ -80,40 +78,29 @@ export default { }, computed: { ...mapState(['user']), + checkType: v => v.user.girdCheckType, + isAdmin: v => v.user.girdCheckType > 0 }, onShow() { document.title = '监测对象' this.areaId = this.user.areaId this.areaName = this.user.areaName this.$dict.load('fpPrtpStatus').then(() => { - this.isGirdUser() + this.isAdmin && this.getList() this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5) - this.typelist.unshift({ dictName: '全部类型', dictValue: ''}) + this.typelist.unshift({dictName: '全部类型', dictValue: ''}) }) - + uni.$on('reload', () => { this.getListInit() }) }, methods: { - isGirdUser() { - this.isAdmin = false - this.$http.post('/app/appgirdmemberinfo/checkLogOnUser').then((res) => { - if (res?.data) { - if (res.data.checkType != '0') { - this.isAdmin = true - this.checkType = res.data.checkType - this.getList() - } - } - }) - }, - confirmTypeSelect(val) { this.status = val?.[0].value - this.$nextTick(()=>{ + this.$nextTick(() => { this.current = 1, - this.list = [] + this.list = [] this.getList() }) }, @@ -148,16 +135,16 @@ export default { change(index) { this.currentTabs = index - if(this.currentTabs == 1) { + if (this.currentTabs == 1) { this.typelist = this.$dict.getDict('fpPrtpStatus') - this.typelist.unshift({ dictName: '全部类型', dictValue: ''}) + this.typelist.unshift({dictName: '全部类型', dictValue: ''}) } else if (this.currentTabs == 0) { this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5) - this.typelist.unshift({ dictName: '全部类型', dictValue: ''}) + this.typelist.unshift({dictName: '全部类型', dictValue: ''}) } this.status = '' this.getListInit() - + }, toDetail(item) { @@ -233,6 +220,7 @@ export default { border-top: 2px solid #f5f5f5; padding: 20px 32px; background: #fff; + .selectBox { margin-right: 30px; } diff --git a/src/apps/AppMonitoringObject/Detail.vue b/src/apps/AppMonitoringObject/Detail.vue index dda20fae..5a7e63c4 100644 --- a/src/apps/AppMonitoringObject/Detail.vue +++ b/src/apps/AppMonitoringObject/Detail.vue @@ -1,5 +1,5 @@ diff --git a/src/apps/AppPovertyHome/AppPovertyHome.vue b/src/apps/AppPovertyHome/AppPovertyHome.vue index 368ff2fe..803dede3 100644 --- a/src/apps/AppPovertyHome/AppPovertyHome.vue +++ b/src/apps/AppPovertyHome/AppPovertyHome.vue @@ -1,11 +1,11 @@