From 3a3eacecf7cff294b6567f67bfd6dab7191d9883 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 27 Dec 2023 18:06:53 +0800
Subject: [PATCH] 首页位置选择调整，新增区域选择页面，审核页面增加时间筛选
---
static/icon/nav-bg-05.png | 0
static/icon/nav-07.png | 0
pages/circle/index.vue | 9
static/icon/nav-bg-13.png | 0
static/icon/nav-bg-14.png | 0
static/img/repair-bg.png | 0
static/icon/nav-bg-09.png | 0
pages/home/selectSite.vue | 202 ++++++++++++++++++
static/img/center-bg.png | 0
static/img/login-bg.png | 0
static/icon/nav-08.png | 0
static/icon/nav-bg-10.png | 0
static/icon/nav-bg-01.png | 0
pages/home/index.vue | 53 ++--
static/icon/nav-bg-02.png | 0
static/icon/nav-bg-06.png | 0
subPackage/task/index.vue | 5
subPackage/workbench/views/cshw.vue | 15 +
static/icon/nav-bg-11.png | 0
pages.json | 8
static/icon/nav-bg-03.png | 0
static/icon/login-title.png | 0
subPackage/workbench/views/audit.vue | 120 +++++++---
static/icon/nav-bg-07.png | 0
static/icon/nav-bg-04.png | 0
subPackage/workbench/views/rental.vue | 48 ++++
subPackage/house/roomDetails/index.vue | 4
static/icon/nav-bg-12.png | 0
subPackage/house/list/auditList.vue | 113 +++++++---
common/setting.js | 4
subPackage/workbench/views/report.vue | 68 +++++
static/icon/nav-bg-08.png | 0
32 files changed, 535 insertions(+), 114 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index 38de827..694f66d 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -10,8 +10,8 @@
version: '2.0.0',
// 开发环境接口Url
// devUrl:'http://z4042833u6.wicp.vip',
- devUrl: 'http://192.168.0.108:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.0.106:9528',
+ devUrl: 'https://srgdjczzxtpt.com:2080/api',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl:"http://192.168.0.103:9528/",
// minioBaseUrl: 'https://srgdjczzxtpt.com:2080/',
diff --git a/pages.json b/pages.json
index 57deb2b..739aea1 100644
--- a/pages.json
+++ b/pages.json
@@ -50,6 +50,14 @@
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
}
+ },
+ {
+ "path": "pages/home/selectSite",
+ "style": {
+ "navigationBarTitleText": "区域选择",
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
}
],
"subPackages": [
diff --git a/pages/circle/index.vue b/pages/circle/index.vue
index 198932e..ba8567f 100644
--- a/pages/circle/index.vue
+++ b/pages/circle/index.vue
@@ -109,7 +109,8 @@
commentContent: "", //评论内容
page: 1,
isSearch: false,
- commentList: []
+ commentList: [],
+ envVersion:""
}
},
@@ -126,6 +127,12 @@
this.$refs.paging.reload();
})
},
+
+
+ onShow(){
+ let accountInfo = wx.getAccountInfoSync();
+ this.envVersion = accountInfo.miniProgram.envVersion;
+ },
// onPullDownRefresh() {
// this.getCircleList();
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 26aa3c2..70aee9f 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -1,13 +1,24 @@
<template>
<view class="layout">
- <u-navbar height="48" :autoBack="false" safeAreaInsetTop placeholder @leftClick="selectBoxShow = !selectBoxShow"
+ <!-- <u-navbar height="48" :autoBack="false" safeAreaInsetTop placeholder @leftClick="selectBoxShow = !selectBoxShow"
bgColor="#017BFC">
<view slot="left" class="top flex">
<view class="top-text f-30 fw c-ff">{{curSelectSite.name?curSelectSite.name:'暂无绑定' +roleTypeName+'信息'}}
</view>
<u-icon name="arrow-down" color="#fff"></u-icon>
</view>
+ </u-navbar> -->
+
+
+ <u-navbar height="48" :autoBack="false" safeAreaInsetTop placeholder @leftClick="navToSelectSite()"
+ bgColor="#017BFC">
+ <view slot="left" class="top flex">
+ <view class="top-text f-30 fw c-ff">{{curSelectSite.name?curSelectSite.name:'暂无绑定' +roleTypeName+'信息'}}
+ </view>
+ <u-icon name="arrow-right" color="#fff"></u-icon>
+ </view>
</u-navbar>
+
<view class="swiper">
<u-swiper :list="bannerList" height="320rpx" radius="10"></u-swiper>
@@ -279,6 +290,12 @@
}
this.init()
})
+ //选择位置刷新楼盘表
+ uni.$on('refreshPage',(val)=>{
+ console.log("refreshPage=>",val);
+ this.curSelectSite = val
+ this.getHouseDataList(val.id)
+ })
},
onShareAppMessage() {
@@ -544,18 +561,15 @@
}
},
-
setLiveMenu(arr) {
if (arr.length) {
let index = this.getLiveMenuItem(arr, 1)
let index2 = this.getLiveMenuItem(arr, 2)
- // let index3 = this.getLiveMenuItem(arr, 3)
if (this.curSelectSite.addressType == 1) {
if (index != -1) {
arr.splice(index, 1)
index = this.getLiveMenuItem(arr, 1)
index2 = this.getLiveMenuItem(arr, 2)
- // index3 = this.getLiveMenuItem(arr, 3)
}
if (index2 == -1 && this.roleType == 2) {
arr.push({
@@ -565,19 +579,7 @@
})
index = this.getLiveMenuItem(arr, 1)
index2 = this.getLiveMenuItem(arr, 2)
- // index3 = this.getLiveMenuItem(arr, 3)
}
- // if(index3 == -1){
- // arr.push({
- // name: "取保候审",
- // path: "/subPackage/label/bail",
- // pictureImg: "/static/icon/nav-11.png"
- // })
- // index = this.getLiveMenuItem(arr, 1)
- // index2 = this.getLiveMenuItem(arr, 2)
- // index3 = this.getLiveMenuItem(arr, 3)
- // }
-
} else {
if (index == -1) {
arr.unshift({
@@ -587,20 +589,12 @@
})
index = this.getLiveMenuItem(arr, 1)
index2 = this.getLiveMenuItem(arr, 2)
- // index3 = this.getLiveMenuItem(arr, 3)
}
if (index2 != -1) {
arr.splice(index2, 1)
index = this.getLiveMenuItem(arr, 1)
index2 = this.getLiveMenuItem(arr, 2)
- // index3 = this.getLiveMenuItem(arr, 3)
}
- // if(index3 != -1){
- // arr.splice(index3, 1)
- // index = this.getLiveMenuItem(arr, 1)
- // index2 = this.getLiveMenuItem(arr, 2)
- // index3 = this.getLiveMenuItem(arr, 3)
- // }
}
}
return arr;
@@ -610,12 +604,9 @@
if (type == 1) {
let index = arr.findIndex(item => item.name == "标签报事")
return index;
- } else if(type == 2){
+ } else{
let index2 = arr.findIndex(item => item.name == "租户上报")
return index2
- }else {
- let index3 = arr.findIndex(item => item.name.trim() == "取保候审")
- return index3
}
},
@@ -662,6 +653,10 @@
icon: "none"
})
}
+ },
+
+ navToSelectSite(){
+ this.$u.func.globalNavigator('selectSite', "navTo")
},
//扫一扫
@@ -714,7 +709,7 @@
getHouseType(code) {
// getPublicSecurityDetail
getQrCodeDetail({
- roleName: "网格员",
+ roleName: uni.getStorageSync("activeRole").roleName,
addressCode: code,
}).then(res => {
console.log(res)
diff --git a/pages/home/selectSite.vue b/pages/home/selectSite.vue
new file mode 100644
index 0000000..bb0a4b8
--- /dev/null
+++ b/pages/home/selectSite.vue
@@ -0,0 +1,202 @@
+<template>
+ <view class="">
+ <view class="hander bgc-ff f-30">
+ <text class="c-99">所选位置：</text>
+ <text v-if="currentSite.name">{{currentSite.name}}</text>
+ <block v-if="!currentSite.name">
+ <text v-if="rolesType== 1">暂无绑定街道社区网格信息</text>
+ <text v-if="rolesType==2">暂无绑定居民信息</text>
+ <text v-if="rolesType==3">暂无绑定街道社区信息</text>
+ </block>
+ </view>
+ <view class="section bgc-ff" v-if="roleType == 2 && list.length">
+ <view class="section-title flex a-i-c">
+ <block v-for="(item,index) in list">
+ <text :class="[ 'mr-100',index == selectIndex?'fw f-32':'f-28']"
+ @click="changeType(index)">{{item.name}}</text>
+ </block>
+ </view>
+ <view class="">
+
+ <view class="nomore f-30" v-if="!list[selectIndex].children.length" >
+ 暂无{{selectIndex == 0?"房屋":"场所"}}信息
+ </view>
+
+ <view class="site-list f-30 flex j-c-s-b a-i-c" v-for="(i,k) in list[selectIndex].children"
+ @click="selectChilren(i,k)">
+ <text>{{i.name}}</text>
+ <u-icon v-if="k == chilrenIndex && chilrenId == i.id" size="26" name="checkbox-mark"
+ color="#017BFC"></u-icon>
+ </view>
+ </view>
+ </view>
+
+ <view class="section bgc-ff" v-if="roleType == 1 && list.length">
+ <view class="section-title flex j-c-s-b a-i-c">
+ <view class="flex a-i-c">
+ <text class="f-32 fw">街道社区</text>
+ <text class="ml-20 f-28">{{cateName}}</text>
+ </view>
+ <view class="select-btn c-main f-28" @click="isShow = true">选择街道</view>
+ </view>
+
+ <view class="">
+
+ <view class="nomore f-30" v-if="!list[selectIndex].children.length">
+ 暂无社区信息
+ </view>
+
+
+ <view class="site-list f-30 flex j-c-s-b a-i-c" v-for="(i,k) in list[selectIndex].children"
+ @click="selectChilren(i,k)">
+ <text>{{i.name}}</text>
+ <u-icon v-if="k == chilrenIndex && chilrenId == i.id" size="26" name="checkbox-mark"
+ color="#017BFC"></u-icon>
+ </view>
+ </view>
+ </view>
+
+ <u-picker :show="isShow" :columns="[list]" :defaultIndex=[selectIndex] title="选择街道" keyName="name"
+ @confirm="confirmSelect" @cancel="isShow = false" @close="isShow = false"></u-picker>
+ <u-toast ref="uToast"></u-toast>
+ </view>
+</template>
+
+<script>
+ import {
+ getFuncList,
+ } from "@/api/doorplateAddress/doorplateAddress";
+ export default {
+ data() {
+ return {
+ addressType: 1,
+ selectIndex: 0,
+ list: [],
+ currentSite: {},
+ chilrenIndex: 0,
+ chilrenId: "",
+ roleType: 1,
+ cateName: "",
+ isShow: false,
+ rolesType:1
+ }
+ },
+
+ onLoad() {
+ let {
+ roleName
+ } = uni.getStorageSync("activeRole");
+
+ if (roleName == '网格员' || roleName == '系统管理员') {
+ this.rolesType = 1;
+ } else if (roleName == '居民') {
+ this.rolesType = 2;
+ } else if (roleName == '民警') {
+ this.rolesType = 3;
+ }
+ this.roleName = roleName;
+ this.roleType = roleName == "居民" ? 2 : 1;
+ this.getList()
+ },
+
+ methods: {
+ changeType(index) {
+ this.selectIndex = index;
+ },
+
+ selectChilren(item, index) {
+ this.chilrenId = item.id;
+ this.chilrenIndex = index;
+ console.log(item)
+ uni.navigateBack({
+ success:()=> {
+ this.$store.commit("setSiteInfo",item)
+ uni.$emit("refreshPage",item)
+ }
+ })
+ },
+
+ getList() {
+ this.$refs.uToast.show({
+ type: 'loading',
+ message: '正在加载',
+ duration: 9999999
+ })
+ getFuncList(
+ this.roleType,
+ this.roleName
+ ).then(res => {
+ console.log(res);
+ this.list = res.data;
+ this.$nextTick(() => {
+ if(this.list.length){
+ this.getSelectIndex()
+ }
+ this.$refs.uToast.isShow = false
+ })
+ // this.cateName = res.data[0].name;
+ // this.currentSite = res.data[0].children[0]
+ // this.chilrenId = res.data[0].children[0].id
+ })
+ },
+
+ confirmSelect(e) {
+ console.log(e);
+ this.selectIndex = e.indexs[0];
+ this.cateName = e.value[0].name;
+ this.isShow = false;
+ },
+
+ getSelectIndex(){
+ let data = uni.getStorageSync("siteInfo");
+ this.currentSite = data;
+ for(let i = 0,ii = this.list.length;i<ii;i++){
+ for(let k= 0,kk = this.list[i].children.length;k<kk;k++){
+ if(this.list[i].children[k].name == data.name){
+ this.selectIndex = i;
+ this.cateName = this.list[i].name;
+ this.chilrenId = this.list[i].children[k].id;
+ this.chilrenIndex = k
+ }
+ }
+ }
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ page {
+ background-color: #f5f5f5;
+ }
+
+ .hander {
+ padding: 30rpx;
+ margin-bottom: 20rpx;
+ }
+
+ .section {
+ .section-title {
+ padding: 30rpx;
+ border-bottom: 1px solid #f5f5f5;
+ }
+
+ .mr-100 {
+ margin-right: 100rpx;
+ }
+
+ .site-list {
+ padding: 30rpx;
+ border-bottom: 1px solid #f5f5f5;
+ }
+
+ .select-btn {
+ padding: 6rpx 20rpx;
+ border: 1px solid currentColor;
+ border-radius: 30rpx;
+ }
+ }
+ .nomore{
+ padding:30rpx;
+ }
+</style>
\ No newline at end of file
diff --git a/static/icon/login-title.png b/static/icon/login-title.png
index 8e44a62..bc96690 100644
--- a/static/icon/login-title.png
+++ b/static/icon/login-title.png
Binary files differ
diff --git a/static/icon/nav-07.png b/static/icon/nav-07.png
index 8852ab6..62cede9 100644
--- a/static/icon/nav-07.png
+++ b/static/icon/nav-07.png
Binary files differ
diff --git a/static/icon/nav-08.png b/static/icon/nav-08.png
index abbc11e..e47a0c1 100644
--- a/static/icon/nav-08.png
+++ b/static/icon/nav-08.png
Binary files differ
diff --git a/static/icon/nav-bg-01.png b/static/icon/nav-bg-01.png
index be3ddcd..d2e91c1 100644
--- a/static/icon/nav-bg-01.png
+++ b/static/icon/nav-bg-01.png
Binary files differ
diff --git a/static/icon/nav-bg-02.png b/static/icon/nav-bg-02.png
index 0ccbcc1..fd4e4bc 100644
--- a/static/icon/nav-bg-02.png
+++ b/static/icon/nav-bg-02.png
Binary files differ
diff --git a/static/icon/nav-bg-03.png b/static/icon/nav-bg-03.png
index a9081bd..2cd9b65 100644
--- a/static/icon/nav-bg-03.png
+++ b/static/icon/nav-bg-03.png
Binary files differ
diff --git a/static/icon/nav-bg-04.png b/static/icon/nav-bg-04.png
index ccdd5cb..47b152d 100644
--- a/static/icon/nav-bg-04.png
+++ b/static/icon/nav-bg-04.png
Binary files differ
diff --git a/static/icon/nav-bg-05.png b/static/icon/nav-bg-05.png
index ca5eb71..31f9216 100644
--- a/static/icon/nav-bg-05.png
+++ b/static/icon/nav-bg-05.png
Binary files differ
diff --git a/static/icon/nav-bg-06.png b/static/icon/nav-bg-06.png
index bc3a8bd..8a29462 100644
--- a/static/icon/nav-bg-06.png
+++ b/static/icon/nav-bg-06.png
Binary files differ
diff --git a/static/icon/nav-bg-07.png b/static/icon/nav-bg-07.png
index 65fdcb0..6835367 100644
--- a/static/icon/nav-bg-07.png
+++ b/static/icon/nav-bg-07.png
Binary files differ
diff --git a/static/icon/nav-bg-08.png b/static/icon/nav-bg-08.png
index 2b73ec4..07932ef 100644
--- a/static/icon/nav-bg-08.png
+++ b/static/icon/nav-bg-08.png
Binary files differ
diff --git a/static/icon/nav-bg-09.png b/static/icon/nav-bg-09.png
index 4fa63c4..70f4d4a 100644
--- a/static/icon/nav-bg-09.png
+++ b/static/icon/nav-bg-09.png
Binary files differ
diff --git a/static/icon/nav-bg-10.png b/static/icon/nav-bg-10.png
index be3836c..1de0343 100644
--- a/static/icon/nav-bg-10.png
+++ b/static/icon/nav-bg-10.png
Binary files differ
diff --git a/static/icon/nav-bg-11.png b/static/icon/nav-bg-11.png
index 0daf512..f1bc4b3 100644
--- a/static/icon/nav-bg-11.png
+++ b/static/icon/nav-bg-11.png
Binary files differ
diff --git a/static/icon/nav-bg-12.png b/static/icon/nav-bg-12.png
index 3f7f1c2..7007c77 100644
--- a/static/icon/nav-bg-12.png
+++ b/static/icon/nav-bg-12.png
Binary files differ
diff --git a/static/icon/nav-bg-13.png b/static/icon/nav-bg-13.png
index 1577112..f57d6c0 100644
--- a/static/icon/nav-bg-13.png
+++ b/static/icon/nav-bg-13.png
Binary files differ
diff --git a/static/icon/nav-bg-14.png b/static/icon/nav-bg-14.png
index 6da96bf..b4517f1 100644
--- a/static/icon/nav-bg-14.png
+++ b/static/icon/nav-bg-14.png
Binary files differ
diff --git a/static/img/center-bg.png b/static/img/center-bg.png
index 11d5ebe..26f660f 100644
--- a/static/img/center-bg.png
+++ b/static/img/center-bg.png
Binary files differ
diff --git a/static/img/login-bg.png b/static/img/login-bg.png
index 88ba1dc..1133eb0 100644
--- a/static/img/login-bg.png
+++ b/static/img/login-bg.png
Binary files differ
diff --git a/static/img/repair-bg.png b/static/img/repair-bg.png
index de0b11d..a6aa20c 100644
--- a/static/img/repair-bg.png
+++ b/static/img/repair-bg.png
Binary files differ
diff --git a/subPackage/house/list/auditList.vue b/subPackage/house/list/auditList.vue
index ced7567..536ed94 100644
--- a/subPackage/house/list/auditList.vue
+++ b/subPackage/house/list/auditList.vue
@@ -3,7 +3,12 @@
<view class="header bgc-ff">
<view class="tab">
<u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
- :activeStyle="{color:'#017BFC'}"></u-tabs>
+ :activeStyle="{color:'#017BFC'}">
+ <view class="tab-filter flex j-c-c a-i-c" slot="right" @click="showDateModal">
+ <text class="f-28">时间筛选</text>
+ <u-icon name="arrow-down"></u-icon>
+ </view>
+ </u-tabs>
</view>
<view class="search-box">
<u-search placeholder="请输入住户名" v-model="keyword" :clearabled="true" :showAction="true" :animation="true"
@@ -12,23 +17,6 @@
</view>
<view class="list">
- <!-- <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.name,i.id)">
- <view class="item-title flex a-i-c j-c-s-b mb-20">
- <text class="f-32 fw">{{i.name}}</text>
- <u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
- <u-tag v-if="i.status == 2" text="审核通过" type="success" plain plainFill></u-tag>
- <u-tag v-if="i.status == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
- </view>
- <view class="item-row flex a-i-c j-c-s-b">
- <text class="f-28">时间</text>
- <text class="f-28 c-66">{{i.createTime}}</text>
- </view>
- <view class="item-row flex a-i-c j-c-s-b">
- <text class="f-28">地址</text>
- <text class="address f-28 c-66">{{i.addressName}}</text>
- </view>
- </view> -->
-
<view class="card-box flex bgc-ff" v-for="(item,index) in list" :key="index">
<view class="l flex-1 flex a-i-c">
<view class="head-img mr-20">
@@ -41,7 +29,7 @@
手机：{{item.phoneNumber?item.phoneNumber:"--"}}
</view>
<view class="">
- 楼盘：{{item.aoiName}}
+ 楼盘：{{item.aoiName?item.aoiName:"--"}}
</view>
</view>
</view>
@@ -58,7 +46,9 @@
</view>
</view>
</view>
+ <u-toast ref="uToast"></u-toast>
<u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
+ <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
</view>
</template>
@@ -67,10 +57,23 @@
getHouseholdList,
updateHousehold
} from "@/api/house/household.js"
+ import dateRangeModal from '@/components/dateRangeModal/modal.vue';
export default {
+ components: {
+ dateRangeModal
+ },
data() {
return {
- tabList: [{
+ tabList: [
+
+ {
+ name: "全部",
+ status: ""
+ },
+ {
+
+
+
name: "待审核",
status: 0
},
@@ -84,16 +87,21 @@
// },
],
tabIndex: 0,
- currentStatus: 0,
+ currentStatus: "",
list: [],
loadingStatus: 'nomore',
currentPage: 1,
frequency: '',
- keyword: ""
+ keyword: "",
+ selectDate: [],
}
},
onLoad(option) {
+ if(option.from){
+ this.tabIndex = 1;
+ this.currentStatus = 0;
+ }
this.getList()
},
onReachBottom() {
@@ -124,12 +132,27 @@
this.currentPage = 1;
},
getList() {
- getHouseholdList({
+ this.$nextTick(() => {
+ this.loadingStatus = 'loadmore'
+ this.$refs.uToast.show({
+ type: 'loading',
+ message: '正在加载',
+ duration: 9999999
+ })
+ })
+ let params = {
page: this.currentPage,
size: 20,
confirmFlag: this.currentStatus,
name: this.keyword,
- }).then(res => {
+ }
+
+ if(this.selectDate.length){
+ params.startTime = this.selectDate[0],
+ params.endTime = this.selectDate[1]
+ }
+
+ getHouseholdList(params).then(res => {
if (res.code != 200) {
uni.showToast({
title: '数据请求失败',
@@ -139,10 +162,13 @@
}
let records = res.data.records;
this.list = [...this.list, ...records]
+ this.$nextTick(() => {
+ this.$refs.uToast.isShow = false
+ })
this.loadingStatus = 'nomore'
})
},
- auditResident(item,index){
+ auditResident(item, index) {
uni.showModal({
title: "提示",
content: "是否要通过该住户？",
@@ -154,17 +180,31 @@
}
})
},
-
- auditResidentRequest(item,index){
- updateHousehold(item).then(res=>{
- if(res.code == 200){
+
+ auditResidentRequest(item, index) {
+ updateHousehold(item).then(res => {
+ if (res.code == 200) {
uni.showToast({
- title:"操作成功"
+ title: "操作成功"
})
// this.$set(this.list,index,item);
- this.list.splice(index,1);
+ this.list.splice(index, 1);
}
})
+ },
+ showDateModal() {
+ this.$refs.dateRane.open();
+ },
+
+ handleRestDate() {
+ this.selectDate = [];
+ this.resetParams();
+ this.getList()
+ },
+ handleComfirmDate(val) {
+ this.selectDate = val;
+ this.resetParams();
+ this.getList()
}
}
}
@@ -196,6 +236,11 @@
background-color: #fff;
}
+ .tab-filter {
+ padding: 0 20rpx;
+ }
+
+
.search-box {
padding: 20rpx 0;
}
@@ -225,10 +270,12 @@
}
}
}
- .card-box{
+
+ .card-box {
padding: 20rpx;
margin-bottom: 20rpx;
- .info{
+
+ .info {
line-height: 60rpx;
}
}
diff --git a/subPackage/house/roomDetails/index.vue b/subPackage/house/roomDetails/index.vue
index e82d0c5..08fc496 100644
--- a/subPackage/house/roomDetails/index.vue
+++ b/subPackage/house/roomDetails/index.vue
@@ -18,7 +18,7 @@
<view class="flex j-c-s-b info-content" v-if="houseInfo.buildingName">
<view class="house-info">
- <text>{{houseInfo.buildingName}}{{houseInfo.unitName?houseInfo.unitName:"一单元"}}{{ houseInfo.houseName}}室</text>
+ <text>{{houseInfo.buildingName}}{{houseInfo.unitName||""}}{{ houseInfo.houseName}}室</text>
<text class="c-aa">（共{{ houseInfo.allNum }}人）</text>
</view>
<view class="flex a-i-c">
@@ -309,7 +309,7 @@
this.rentOutList = houseRentalList
this.ownerInfoList = householdList
this.houseInfo.houseName = houseName
- this.houseInfo.unitName = unitName
+ this.houseInfo.unitName = unitName || ""
this.houseInfo.houseTitle = aoiName || subAoi
this.houseInfo.buildingName = buildingName
this.houseInfo.addressName = addressName
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index a5209f8..127a9bb 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -126,7 +126,7 @@
</view>
</view>
- <view class="nav-item flex j-c-s-b a-i-c" @click="navTo(i.path)" v-for="i in securityList">
+ <view class="nav-item flex j-c-s-b a-i-c" @click="navTo(`${i.path}&from=task`)" v-for="i in securityList">
<text class="f-28">{{i.name}}</text>
<view class="flex">
<block v-if="bailCount > 0">
@@ -231,13 +231,14 @@
navTo(url) {
+
if(!url || url == "暂无" ){
uni.showToast({
title:"功能开发中~",
icon:"none"
})
}else {
- this.$u.func.globalNavigator(url)
+ this.$u.func.globalNavigator(`${url}?from=task`)
}
}
}
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index 0b7e061..c013c57 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -2,10 +2,17 @@
<view>
<view class="tab">
<u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
- :activeStyle="{color:'#017BFC'}"></u-tabs>
+ :activeStyle="{color:'#017BFC'}">
+
+ <view class="tab-filter flex j-c-c a-i-c" slot="right" @click="showDateModal">
+ <text class="f-28">时间筛选</text>
+ <u-icon name="arrow-down"></u-icon>
+ </view>
+ </u-tabs>
</view>
<view class="list">
- <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.name,i.id,i.reportType)">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k"
+ @click="navTo(i.name,i.id,i.reportType)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
<text class="f-32 fw">{{i.name}}</text>
<u-tag v-if="i.status == 1" text="待审批" type="warning" plain plainFill></u-tag>
@@ -22,7 +29,10 @@
</view>
</view>
</view>
+ <u-toast ref="uToast"></u-toast>
<u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
+
+ <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
</view>
</template>
@@ -30,10 +40,20 @@
import {
getAuditReportingList
} from "@/api/reporting/reporting"
+ import dateRangeModal from '@/components/dateRangeModal/modal.vue';
export default {
+ components: {
+ dateRangeModal
+ },
data() {
return {
- tabList: [{
+ tabList: [
+
+ {
+ name: "全部",
+ status: "",
+ },
+ {
name: "待审核",
status: 1
},
@@ -47,38 +67,31 @@
},
],
tabIndex: 0,
- currentStatus: 1,
+ currentStatus: "",
list: [],
loadingStatus: 'nomore',
currentPage: 1,
frequency: '',
- reportType:""
+ reportType: "",
+ selectDate: [],
}
},
onLoad(option) {
- // if (option.type == 1) {
- // uni.setNavigationBarTitle({
- // title: "一次性"
- // })
- // this.frequency = 1
- // }
- // if (option.type == 2) {
- // uni.setNavigationBarTitle({
- // title: "周期性"
- // })
- // this.frequency = 2
- // }
-
- if(option.reportType){
+ console.log(option);
+ if (option.reportType) {
this.reportType = option.reportType;
uni.setNavigationBarTitle({
- title:"取保候审"
+ title: "取保候审"
})
}
+ if (option.from) {
+ this.tabIndex = 1;
+ this.currentStatus = 1;
+ }
this.getList()
-
-
+
+
},
onReachBottom() {
this.currentPage++
@@ -89,22 +102,37 @@
changeTab(e) {
this.tabIndex = e.index;
this.currentStatus = e.status;
- this.list = [];
- this.currentPage = 1;
+ this.resetParams();
this.getList();
},
+ resetParams() {
+ this.list = [];
+ this.currentPage = 1;
+ },
getList() {
+ this.$nextTick(() => {
+ this.loadingStatus = 'loadmore'
+ this.$refs.uToast.show({
+ type: 'loading',
+ message: '正在加载',
+ duration: 9999999
+ })
+ })
let params = {
page: this.currentPage,
size: 20,
status: this.currentStatus,
frequency: this.frequency,
}
-
- if(this.reportType){
+ if (this.selectDate.length) {
+ params.startTime = this.selectDate[0],
+ params.endTime = this.selectDate[1]
+ }
+
+ if (this.reportType) {
params.reportType = this.reportType
}
-
+
getAuditReportingList(params).then(res => {
if (res.code != 200) {
uni.showToast({
@@ -115,20 +143,39 @@
}
let records = res.data.records;
this.list = [...this.list, ...records]
+ this.$nextTick(() => {
+ this.$refs.uToast.isShow = false
+ })
this.loadingStatus = 'nomore'
})
},
- navTo(name,id,type) {
- if(type == 1){
+ navTo(name, id, type) {
+ if (type == 1) {
this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
- }else if (type == 2){
+ } else if (type == 2) {
this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
- }else if (type == 3 || type == 4 || type == 5){
+ } else if (type == 3 || type == 4 || type == 5) {
this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
- }else if(type == 6){
+ } else if (type == 6) {
this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
}
+ },
+
+ showDateModal() {
+ this.$refs.dateRane.open();
+ },
+
+ handleRestDate() {
+ this.selectDate = [];
+ this.resetParams();
+ this.getList()
+ },
+ handleComfirmDate(val) {
+ this.selectDate = val;
+ this.resetParams();
+ this.getList()
}
+
}
}
</script>
@@ -156,8 +203,11 @@
}
- .tab /deep/.u-tabs__wrapper__nav__item {
- flex: 1;
+ // .tab /deep/.u-tabs__wrapper__nav__item {
+ // flex: 1;
+ // }
+ .tab-filter {
+ padding: 0 20rpx;
}
.list {
@@ -182,4 +232,4 @@
}
}
}
-</style>
+</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/cshw.vue b/subPackage/workbench/views/cshw.vue
index 580c954..e00eac4 100644
--- a/subPackage/workbench/views/cshw.vue
+++ b/subPackage/workbench/views/cshw.vue
@@ -46,6 +46,10 @@
<text class="f-28">法人信息</text>
<text class="f-28 c-66">{{ item.legalPerson ? item.legalPerson : '未完善'}}</text>
</view>
+ <view class="item-row flex a-i-c j-c-s-b f-28">
+ <text>时间</text>
+ <text class="c-66">{{item.createTime}}</text>
+ </view>
</view>
</view>
<u-toast ref="uToast"></u-toast>
@@ -98,7 +102,7 @@
},
],
tabIndex: 0,
- tabStatus: 1,
+ tabStatus: "",
keyWord: '',
loadingStatus: 'nomore',
clickInfo: {},
@@ -106,6 +110,15 @@
selectDate:[],
}
},
+
+
+ onLoad(option){
+ if(option.from){
+ this.tabIndex = 1;
+ this.tabStatus = 1;
+ }
+ },
+
onShow() {
this.currentRole = uni.getStorageSync("activeRole")
this.resetParams()
diff --git a/subPackage/workbench/views/rental.vue b/subPackage/workbench/views/rental.vue
index 6a21abd..d143512 100644
--- a/subPackage/workbench/views/rental.vue
+++ b/subPackage/workbench/views/rental.vue
@@ -7,7 +7,12 @@
</view> -->
<view class="tabs">
<u-tabs :list="tabsList" :current="tabIndex" @click="tabClick" :inactiveStyle="{color:'#999999'}"
- :activeStyle="{color:'#017BFC'}"></u-tabs>
+ :activeStyle="{color:'#017BFC'}">
+ <view class="tab-filter flex j-c-c a-i-c" slot="right" @click="showDateModal">
+ <text class="f-28">时间筛选</text>
+ <u-icon name="arrow-down"></u-icon>
+ </view>
+ </u-tabs>
</view>
<view class="search-box">
<u-search placeholder="请输入租户名" v-model="keyword" :clearabled="true" :showAction="true" :animation="true"
@@ -65,6 +70,7 @@
</view>
<u-toast ref="uToast"></u-toast>
<u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="已经到底了" line />
+ <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
</view>
</template>
@@ -73,7 +79,12 @@
getRentalHouseContent,
getStatistics
} from '@/api/houseRental/houseRental.js'
+ import dateRangeModal from '@/components/dateRangeModal/modal.vue';
+
export default {
+ components:{
+ dateRangeModal
+ },
data() {
return {
@@ -175,7 +186,8 @@
value: 2
},
],
- tabIndex: 0
+ tabIndex: 0,
+ selectDate:[]
}
},
computed: {
@@ -191,7 +203,11 @@
})
}
},
- onLoad() {
+ onLoad(option) {
+ if(option.from){
+ this.tabIndex = 1
+ this.pagingParams.auditStatus = 0;
+ }
this.currentRole = uni.getStorageSync('activeRole')
this.getStatistics()
},
@@ -285,6 +301,12 @@
const {
roleName
} = this.currentRole
+
+
+ if(this.selectDate.length){
+ this.pagingParams.startTime = this.selectDate[0],
+ this.pagingParams.endTime = this.selectDate[1]
+ }
const {
code,
data: {
@@ -330,6 +352,19 @@
current: 1,
size: 10
}
+ },
+ showDateModal(){
+ this.$refs.dateRane.open();
+ },
+ handleRestDate(){
+ this.selectDate = [];
+ this.resetParams();
+ this.getRentalHouseInfo()
+ },
+ handleComfirmDate(val){
+ this.selectDate = val;
+ this.resetParams();
+ this.getRentalHouseInfo()
}
}
}
@@ -358,6 +393,13 @@
height: 100rpx;
}
+ .tabs{
+ width:100%;
+ }
+ .tab-filter {
+ padding: 0 20rpx;
+ }
+
.search-box {
padding: 20rpx 24rpx 30rpx;
diff --git a/subPackage/workbench/views/report.vue b/subPackage/workbench/views/report.vue
index 1fde3ad..d1ccf30 100644
--- a/subPackage/workbench/views/report.vue
+++ b/subPackage/workbench/views/report.vue
@@ -1,10 +1,17 @@
<template>
<view>
<u-sticky>
- <view class="tab">
+ <view class="hander">
<view class="tab">
<u-tabs :list="tabList" :scrollable="false" :current="tabIndex" @click="changeTab"
- :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
+ :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}">
+
+ <view class="tab-filter flex j-c-c a-i-c" slot="right" @click="showDateModal">
+ <text class="f-28">时间筛选</text>
+ <u-icon name="arrow-down"></u-icon>
+ </view>
+
+ </u-tabs>
<view class="search">
<u-search placeholder="请输入需要查询信息的姓名" v-model="keyWord" :clearabled="true" :showAction="true"
:animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
@@ -30,9 +37,14 @@
<text class="f-28">事发地</text>
<text class="address f-28 c-66">{{ item.address || "" }}</text>
</view>
+ <view class="item-row flex a-i-c j-c-s-b f-28">
+ <text>时间</text>
+ <text class="c-66">{{item.createTime}}</text>
+ </view>
</view>
</view>
<u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
+ <date-range-modal ref="dateRane" @comfirm="handleComfirmDate" @rest="handleRestDate" />
</view>
</template>
@@ -40,7 +52,11 @@
import {
getPage
} from '@/api/task/taskReportForRepairs.js'
+ import dateRangeModal from '@/components/dateRangeModal/modal.vue';
export default {
+ components:{
+ dateRangeModal
+ },
data() {
return {
reportList: [],
@@ -48,7 +64,13 @@
current: 1,
size: 10
},
- tabList: [{
+ tabList: [
+
+ {
+ name: "全部",
+ status: "",
+ },
+ {
name: "待处理",
status: 1,
type: 'warning'
@@ -87,11 +109,20 @@
}
],
tabIndex: 0,
- tabStatus: 1,
+ tabStatus:"",
keyWord: '',
- loadingStatus: 'nomore'
+ loadingStatus: 'nomore',
+ selectDate:[]
}
},
+
+ onLoad(option) {
+ if(option.from){
+ this.tabIndex = 1;
+ this.tabStatus = 1;
+ }
+ },
+
onShow() {
this.currentRole = uni.getStorageSync("activeRole")
this.reportList = []
@@ -107,6 +138,10 @@
const params = {
realName: this.keyWord,
confirmFlag: this.tabStatus
+ }
+ if(this.selectDate.length){
+ params.startTime = this.selectDate[0],
+ params.endTime = this.selectDate[1]
}
const { roleName } = this.currentRole
const res = await getPage({
@@ -157,6 +192,21 @@
const data = JSON.stringify(item)
// this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?id='+id)
this.$u.func.globalNavigator('/subPackage/workbench/views/reportAudit?data='+data)
+ },
+
+ showDateModal(){
+ this.$refs.dateRane.open();
+ },
+
+ handleRestDate(){
+ this.selectDate = [];
+ this.resetParams();
+ this.getPageList()
+ },
+ handleComfirmDate(val){
+ this.selectDate = val;
+ this.resetParams();
+ this.getPageList()
}
}
}
@@ -167,9 +217,15 @@
background-color: #F5F5F5;
}
- .tab {
+ .hander {
background-color: #fff;
+.tab {
+ width: 100%;
+ }
+ .tab-filter {
+ padding: 0 20rpx;
+ }
.search {
padding: 20rpx 70rpx;
}
--
Gitblit v1.9.3