diff --git a/src/apps/AppMonitoringObject/AppMonitoringObject.vue b/src/apps/AppMonitoringObject/AppMonitoringObject.vue index 114a097e..10d86b3d 100644 --- a/src/apps/AppMonitoringObject/AppMonitoringObject.vue +++ b/src/apps/AppMonitoringObject/AppMonitoringObject.vue @@ -2,18 +2,13 @@
- -
+
+
+ 全部类型 + {{ $dict.getLabel('fpPrtpStatus', status)}} + +
@@ -38,6 +33,10 @@
+ + +
@@ -73,7 +72,10 @@ export default { areaId: '', areaName: '', isAdmin: false, - checkType: '' + checkType: '', + showType: false, + typelist: [], + status: '' } }, computed: { @@ -85,7 +87,10 @@ export default { this.areaName = this.user.areaName this.$dict.load('fpPrtpStatus').then(() => { this.isGirdUser() + this.typelist = this.$dict.getDict('fpPrtpStatus').filter((e) => e.dictValue != 5) + this.typelist.unshift({ dictName: '全部类型', dictValue: ''}) }) + uni.$on('reload', () => { this.getListInit() }) @@ -104,6 +109,10 @@ export default { }) }, + confirmTypeSelect(val) { + console.log(val); + }, + getListInit() { this.current = 1 this.list = [] @@ -201,11 +210,17 @@ export default { background: #f5f5f5; } - .seach-obj { + .search-obj { + display: flex; + justify-content: space-between; + align-items: center; border-bottom: 2px solid #f5f5f5; border-top: 2px solid #f5f5f5; padding: 20px 32px; background: #fff; + .selectBox { + margin-right: 30px; + } } ::v-deep .u-form { diff --git a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue index 3e220b2d..3c8b10b2 100644 --- a/src/apps/AppMonitoringObject/MonitorFamilySituation.vue +++ b/src/apps/AppMonitoringObject/MonitorFamilySituation.vue @@ -2,7 +2,7 @@

生活条件

-
+
@@ -280,7 +280,7 @@ export default { data() { return { form: { - houseType: '', + houseType: '1', dilapidatedHousehold: '', drinkingWaterSafety: '', move: '',