From 8375d2273687ee5e74a8d9b2f4a873918e9780e6 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 02 Mar 2024 18:07:24 +0800
Subject: [PATCH] 更新
---
subPackage/house/member/add.vue | 2
subPackage/workbench/views/editExamine.vue | 121 ++++++++
pages/home/index.vue | 286 ++++++++++++-------
subPackage/workbench/views/auditSite.vue | 319 ++++++++++++++++++++++
api/place/place.js | 9
pages.json | 26 +
subPackage/house/houseNumber/index.vue | 23 -
common/setting.js | 4
subPackage/task/index.vue | 37 +-
subPackage/workbench/views/audit.vue | 4
10 files changed, 670 insertions(+), 161 deletions(-)
diff --git a/api/place/place.js b/api/place/place.js
index 5017384..976bb18 100644
--- a/api/place/place.js
+++ b/api/place/place.js
@@ -95,4 +95,13 @@
method: 'POST',
data: data
})
+}
+
+
+export const getPlaceList = (params) => {
+ return http.request({
+ url: '/blade-doorplateAddress/doorplateAddress/getPlaceList',
+ method: 'GET',
+ params
+ })
}
\ No newline at end of file
diff --git a/common/setting.js b/common/setting.js
index 97a0c9e..3833aec 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.2.140:9528',
- // devUrl: 'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.2.140:9528',
+ devUrl: 'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'https://kt39592615.goho.co',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
// minioBaseUrl: "http://192.168.0.101:9528/",
diff --git a/pages.json b/pages.json
index 0ad1ff3..916bc24 100644
--- a/pages.json
+++ b/pages.json
@@ -378,7 +378,7 @@
"pages": [{
"path": "index",
"style": {
- "navigationBarTitleText": "我的任务",
+ "navigationBarTitleText": "待办事项",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
@@ -472,6 +472,17 @@
"navigationBarTextStyle": "black"
}
},
+
+ {
+ "path": "views/auditSite",
+ "style": {
+ "navigationBarTitleText": "场所任务",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+
{
"path": "views/cshw",
"style": {
@@ -833,6 +844,7 @@
"navigationBarTextStyle": "black"
}
},
+
{
"path": "houseNumber/siteInspect",
"style": {
@@ -903,12 +915,12 @@
"iconPath": "static/img/tabbar-01.png",
"text": "首页"
},
- // {
- // "pagePath": "pages/circle/index",
- // "iconPath": "static/img/tabbar-02.png",
- // "selectedIconPath": "static/img/tabbar-02-selected.png",
- // "text": "圈子"
- // },
+ {
+ "pagePath": "pages/circle/index",
+ "iconPath": "static/img/tabbar-02.png",
+ "selectedIconPath": "static/img/tabbar-02-selected.png",
+ "text": "圈子"
+ },
{
"pagePath": "pages/user/center",
"iconPath": "static/img/tabbar-03.png",
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 2bd4095..57b0275 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -91,86 +91,91 @@
</u-grid>
</view> -->
- <view class="nav bgc-ff" v-if="roleType == 2 && curSelectSite.addressType == 1">
- <view class="mb-20">
- <u-tabs :list="tabs" @click="changeTabs" :current="tabIndex" lineColor="#ecf4ff" :activeStyle="{
- color: '#017BFC',
- fontWeight: 'bold',
- backgroundColor:'#ecf4ff',
- borderRadius:'14rpx',
- padding:'14rpx 28rpx',
- transition:'background .2s'
- }" :itemStyle="{fontSize:'28rpx'}"></u-tabs>
+
+
+ <view class="" v-if="roleType == 2 && curSelectSite.addressType == 1">
+ <view class="tabs flex">
+ <!-- <u-tabs :list="tabs" @click="changeTabs" :current="tabIndex" lineColor="#ecf4ff" :activeStyle="{
+ color: '#017BFC',
+ fontWeight: 'bold',
+ backgroundColor:'#ecf4ff',
+ borderRadius:'14rpx',
+ padding:'14rpx 28rpx',
+ transition:'background .2s'
+ }" :itemStyle="{fontSize:'28rpx'}"></u-tabs> -->
+
+
+ <view class="tabs-item" :class="k == tabIndex?'tabs-active':''" v-for="(i,k) in tabs"
+ @click="changeTabs(k)">
+ {{i.name}}
+ </view>
+
+
</view>
- <u-grid :border="false" col="4">
- <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs[tabIndex].list" :key="k">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
- </view>
- </u-grid-item>
- </u-grid>
+
+ <view class="nav bgc-ff">
+
+ <u-grid :border="false" col="4">
+ <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs[tabIndex].list" :key="k">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
+ </view>
+ </u-grid-item>
+ </u-grid>
+ </view>
</view>
- <view class="nav bgc-ff" v-if="roleType == 2 && curSelectSite.addressType == 2">
- <view class="mb-20">
- <u-tabs :list="tabs2" @click="changeTabs" :current="tabIndex" lineColor="#ecf4ff" :activeStyle="{
- color: '#017BFC',
- fontWeight: 'bold',
- backgroundColor:'#ecf4ff',
- borderRadius:'14rpx',
- padding:'14rpx 28rpx',
- transition:'background .2s'
- }" :itemStyle="{fontSize:'28rpx'}"></u-tabs>
+
+ <view v-if="roleType == 2 && curSelectSite.addressType == 2">
+ <view class="tabs flex">
+
+ <view class="tabs-item" :class="k == tabIndex?'tabs-active':''" v-for="(i,k) in tabs2"
+ @click="changeTabs(k)">
+ {{i.name}}
+ </view>
+
+
</view>
- <u-grid :border="false" col="4">
- <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs2[tabIndex].list" :key="k">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
- </view>
- </u-grid-item>
+ <view class="nav bgc-ff">
+ <u-grid :border="false" col="4">
+ <u-grid-item @click="navigatorPage(i.path)" v-for="(i,k) in tabs2[tabIndex].list" :key="k">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon :name="i.icon" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">{{i.text}}</text>
+ </view>
+ </u-grid-item>
- <block v-if="tabIndex == 1">
- <u-grid-item @click="navigatorPage('/subPackage/label/form')"
- v-if="curSelectSite.isFront == 1">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">二手交易</text>
- </view>
- </u-grid-item>
- <u-grid-item @click="navigatorPage('/subPackage/label/check')"
- v-if="curSelectSite.isNine == 1">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">消防自查</text>
- </view>
- </u-grid-item>
- </block>
+ <block v-if="tabIndex == 1">
+ <u-grid-item @click="navigatorPage('/subPackage/label/form')"
+ v-if="curSelectSite.isFront == 1">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">二手交易</text>
+ </view>
+ </u-grid-item>
+ <u-grid-item @click="navigatorPage('/subPackage/label/check')"
+ v-if="curSelectSite.isNine == 1">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">消防自查</text>
+ </view>
+ </u-grid-item>
+ </block>
+ <block v-if="tabIndex == 2">
+ <u-grid-item @click="navToSiteList()">
+ <view class="nav-item flex f-d-c a-i-c">
+ <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
+ <text class="nav-item-text f-26 mt-10">场所任务</text>
+ </view>
+ </u-grid-item>
+ </block>
+ </u-grid>
+ </view>
- <block v-if="tabIndex == 2">
- <u-grid-item @click="navToAddRepair()">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">企业商户上报</text>
- </view>
- </u-grid-item>
- <u-grid-item @click="navToSiteList()">
- <view class="nav-item flex f-d-c a-i-c">
- <u-icon name="/static/icon/nav-11.png" width="80rpx" height="80rpx"></u-icon>
- <text class="nav-item-text f-26 mt-10">场所任务</text>
- </view>
- </u-grid-item>
- </block>
-
- </u-grid>
</view>
-
</view>
-
-
-
<view class="bgc-ff p-20 mb-20 pb-20" v-if="isShowHouse">
@@ -184,8 +189,8 @@
</view>
</view>
- <view class="bgc-ff mb-20 p-20 pb-20" v-if="sectionList.length">
- <view class="menu-tabs">
+ <view class=" mb-20 " v-if="sectionList.length">
+ <!-- <view class="menu-tabs">
<u-tabs :list="sectionList" @click="changeMenuTabs" :current="menuTabIndex" lineColor="#ecf4ff"
:activeStyle="{
color: '#017BFC',
@@ -195,18 +200,33 @@
padding:'14rpx 28rpx',
transition:'background .2s'
}" :itemStyle="{fontSize:'28rpx'}" :scrollable="false"></u-tabs>
+ </view> -->
+
+
+ <view class="tabs flex">
+
+ <view class="tabs-item" :class="k == menuTabIndex?'tabs-active':''" v-for="(i,k) in sectionList"
+ @click="changeMenuTabs(k)">
+ {{i.name}}
+ </view>
+
+
</view>
- <u-grid :border="false" col="4">
- <u-grid-item @click="navigatorPage(item.path)"
- v-for="(item, index) in sectionList[menuTabIndex].children" :index="index" :key="index"
- :customStyle="{paddingTop:20+'rpx'}">
- <view class="grid-item flex f-d-c a-i-c" :style="{background:item.background}">
- <u-icon :name="item.pictureImg" width="60rpx" height="60rpx"></u-icon>
- <text class="grid-text f-24 fw mt-10">{{item.name}}</text>
- </view>
- </u-grid-item>
- </u-grid>
+ <view class="menu bgc-ff p-20 pb-20">
+ <u-grid :border="false" col="4">
+ <u-grid-item @click="navigatorPage(item.path)"
+ v-for="(item, index) in sectionList[menuTabIndex].children" :index="index" :key="index"
+ :customStyle="{paddingTop:20+'rpx'}">
+ <view class="grid-item flex f-d-c a-i-c" :style="{background:item.background}">
+ <u-icon :name="item.pictureImg" width="60rpx" height="60rpx"></u-icon>
+ <text class="grid-text f-24 fw mt-10">{{item.name}}</text>
+ </view>
+ </u-grid-item>
+ </u-grid>
+ </view>
+
+
</view>
@@ -357,10 +377,31 @@
tabs: [{
name: '公众服务',
- list: [{
+ list: [
+ // {
+ // icon: "/static/icon/nav-02.png",
+ // text: "公共报事",
+ // path: '/subPackage/bs/views/repair'
+ // },
+ {
icon: "/static/icon/nav-02.png",
- text: "公共报事",
- path: '/subPackage/bs/views/repair'
+ text: "公共维修",
+ path: "/subPackage/bs/views/addRepair?title=公共维修&type=1"
+ },
+ {
+ icon: "/static/icon/nav-02.png",
+ text: "居家维修",
+ path: "/subPackage/bs/views/addRepair?title=居家维修&type=2"
+ },
+ {
+ icon: "/static/icon/nav-04.png",
+ text: "矛盾纠纷",
+ path: "/subPackage/bs/views/addRepair?title=矛盾纠纷&type=3"
+ },
+ {
+ icon: "/static/icon/nav-11.png",
+ text: "投诉举报",
+ path: "/subPackage/bs/views/addRepair?title=投诉举报&type=4"
},
{
icon: "/static/icon/nav-03.png",
@@ -405,8 +446,23 @@
name: '公众服务',
list: [{
icon: "/static/icon/nav-02.png",
- text: "公共报事",
- path: '/subPackage/bs/views/repair'
+ text: "公共维修",
+ path: "/subPackage/bs/views/addRepair?title=公共维修&type=1"
+ },
+ {
+ icon: "/static/icon/nav-02.png",
+ text: "居家维修",
+ path: "/subPackage/bs/views/addRepair?title=居家维修&type=2"
+ },
+ {
+ icon: "/static/icon/nav-04.png",
+ text: "矛盾纠纷",
+ path: "/subPackage/bs/views/addRepair?title=矛盾纠纷&type=3"
+ },
+ {
+ icon: "/static/icon/nav-11.png",
+ text: "投诉举报",
+ path: "/subPackage/bs/views/addRepair?title=投诉举报&type=4"
},
{
icon: "/static/icon/nav-03.png",
@@ -421,10 +477,16 @@
{
name: '企业服务',
list: [{
- text: "场所维护",
- icon: "",
- path: "/subPackage/workbench/views/editExamine"
- }]
+ text: "场所维护",
+ icon: "/static/icon/nav-02.png",
+ path: "/subPackage/workbench/views/editExamine"
+ },
+ {
+ icon: "/static/icon/nav-02.png",
+ text: "企业商户上报",
+ path: "/subPackage/bs/views/addRepair?title=企业商户上报&type=5"
+ }
+ ]
},
{
name: '社区服务',
@@ -553,12 +615,12 @@
changeTabs(e) {
// console.log(item);
- this.tabIndex = e.index
+ this.tabIndex = e
},
changeMenuTabs(e) {
- this.menuTabIndex = e.index;
+ this.menuTabIndex = e;
},
@@ -761,7 +823,6 @@
// } else {
// uni.setStorageSync("taskMenu", []);
// }
-
if (this.sectionList.length) {
let list = this.sectionList.filter(item => item.name == "日常办公");
let taskList = list[0].children.filter(item => item.name == "待办事项");
@@ -774,7 +835,6 @@
} else {
uni.setStorageSync("taskMenu", []);
}
-
}, 200)
},
@@ -1040,16 +1100,9 @@
houseCode
} = uni.getStorageSync("siteInfo")
uni.navigateTo({
- url: `/subPackage/workbench/views/audit?code=${houseCode}&from=index`
+ url: `/subPackage/workbench/views/auditSite?code=${houseCode}&from=index`
})
- },
-
- //企业商户上报
- navToAddRepair() {
- let url = `/subPackage/bs/views/addRepair?title=企业商户上报&type="5`
- this.$u.func.globalNavigator(url, "navTo")
}
-
}
}
</script>
@@ -1098,7 +1151,7 @@
.nav {
padding: 10rpx 0;
margin-bottom: 20rpx;
- border-radius: 10rpx;
+ border-radius: 0 0 10rpx 10rpx;
.nav-item {
padding: 10rpx 0;
@@ -1212,16 +1265,25 @@
}
.tabs {
- padding: 20rpx;
+
+ border-radius: 10rpx 10rpx 0 0;
+ // margin-bottom: 4rpx;
+ background-color: rgb(236, 244, 255);
.tabs-item {
- padding: 10rpx 30rpx;
+ // padding: 12rpx 24rpx;
+ flex: 1;
+ text-align: center;
+ padding: 20rpx 0;
}
.tabs-active {
- border-radius: 10rpx;
- background-color: rgb(236, 244, 255);
- color: #017BFC;
+ border-radius: 10rpx 10rpx 0 0;
+ // background-color: rgb(236, 244, 255);
+ // color: #017BFC;
+ // color: rgb(236, 244, 255);
+ // background-color: #017BFC;
+ background-color: #fff;
font-weight: bold;
}
}
@@ -1229,4 +1291,8 @@
.menu-tabs {
padding: 20rpx 0;
}
+
+ .menu {
+ border-radius: 0 0 10rpx 10rpx;
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/house/houseNumber/index.vue b/subPackage/house/houseNumber/index.vue
index 197f395..7ffb233 100644
--- a/subPackage/house/houseNumber/index.vue
+++ b/subPackage/house/houseNumber/index.vue
@@ -615,31 +615,10 @@
},
navToInspect() {
- if (!this.info.principa) {
+ if (this.info.status == 1) {
this.$showTips("请先完善场所信息")
return
}
- if (!this.info.principal_phone) {
- this.$showTips("请先完善场所信息")
- return
- }
- if (!this.info.place_name) {
- this.$showTips("请先完善场所信息")
- return
- }
- if (!this.info.image_urls) {
- this.$showTips("请先完善场所信息")
- return
- }
- if (!this.info.location) {
- this.$showTips("请先完善场所信息")
- return
- }
- if (!this.info.principal_id_card) {
- this.$showTips("请先完善场所信息")
- return
- }
-
uni.navigateTo({
url: `/subPackage/house/houseNumber/siteInspect?code=${this.stdId}&name=${this.placeName}`
})
diff --git a/subPackage/house/member/add.vue b/subPackage/house/member/add.vue
index ff0c683..99fdbe7 100644
--- a/subPackage/house/member/add.vue
+++ b/subPackage/house/member/add.vue
@@ -948,7 +948,7 @@
getHouseList({
current: pageNo,
size: pageSize,
- townStreetName: uni.getStorageSync("curStreet"),
+ // townStreetName: uni.getStorageSync("curStreet"),
address: this.addressName
}).then(res => {
this.$refs.paging.complete(res.data.records);
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index 268b282..de3ab04 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -22,13 +22,13 @@
</view>
</view>
</view> -->
- <view class="nav bgc-ff mb-20 mt-20" v-if="comprehensive.length">
- <view class="caption">
+ <view class="nav bgc-ff mt-20" v-if="comprehensive.length">
+ <!-- <view class="caption">
<view class="flex a-i-c">
<view class="line"></view>
<text class="f-32 fw">综治任务</text>
</view>
- </view>
+ </view> -->
<view class="nav-item flex j-c-s-b a-i-c" @click="navTo(i.path)" v-for="i in comprehensive">
<text class="f-28">{{i.name}}</text>
@@ -118,15 +118,15 @@
</view>
</view>
</view> -->
- <view class="nav bgc-ff mb-20" v-if="securityList.length">
- <view class="caption">
+ <view class="nav bgc-ff mb-20 mt-20" v-if="securityList.length">
+ <!-- <view class="caption">
<view class="flex a-i-c">
<view class="line"></view>
<text class="f-32 fw">公安任务</text>
</view>
- </view>
+ </view> -->
- <view class="nav-item flex j-c-s-b a-i-c" @click="navTo(`${i.path}&from=task`)" v-for="i in securityList">
+ <view class="nav-item flex j-c-s-b a-i-c" @click="navTo(i.path)" v-for="i in securityList">
<text class="f-28">{{i.name}}</text>
<view class="flex">
<block v-if="bailCount > 0">
@@ -199,17 +199,19 @@
let data = res.data;
this.countInfo = res.data;
for (let i of this.comprehensive) {
- if (i.name == "场所审核") {
+ if (i.name.trim() == "场所审核") {
i.count = data.cssh;
- } else if (i.name == "报事报修") {
+ } else if (i.name.trim() == "报事报修") {
i.count = data.bsbx;
- } else if (i.name == "住户审核") {
+ } else if (i.name.trim() == "住户审核") {
i.count = data.zhsh
- } else if (i.name.trim() == "标签报事") {
+ } else if (i.name.trim() == "二手交易") {
i.count = data.bqsj
- } else if (i.name == "租房管理") {
+ } else if (i.name.trim() == "租户确认") {
i.count = data.czsh
- } else if (i.name == "走访任务") {
+ } else if (i.name.trim() == "走访任务") {
+ i.count = data.zfrw;
+ } else if (i.name.trim() == "走访任务") {
i.count = data.zfrw;
}
}
@@ -236,7 +238,14 @@
icon: "none"
})
} else {
- this.$u.func.globalNavigator(`${url}?from=task`)
+ console.log("url===>", url)
+ uni.navigateTo({
+ url: `${url}?from=task`,
+ complete: (res) => {
+ console.log("errr=>", res)
+ }
+ })
+ // this.$u.func.globalNavigator(`${url}?from=task`)
}
}
}
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index aa0318b..bf8b21b 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -11,7 +11,7 @@
<text class="f-28">时间筛选</text>
<u-icon name="arrow-down"></u-icon>
</view>
- <u-search placeholder="请输入需要查询信息的名称" v-model="keyWord" :clearabled="true" :showAction="true"
+ <u-search placeholder="请输入需要查询信息的名称" v-model="keyword" :clearabled="true" :showAction="true"
:animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
</view>
</view>
@@ -131,7 +131,7 @@
this.getList()
},
clearConfirm() {
- this.keyWord = ''
+ this.keyword = ''
this.searchConfirm()
},
changeTab(e) {
diff --git a/subPackage/workbench/views/auditSite.vue b/subPackage/workbench/views/auditSite.vue
new file mode 100644
index 0000000..a9673f8
--- /dev/null
+++ b/subPackage/workbench/views/auditSite.vue
@@ -0,0 +1,319 @@
+<template>
+ <view>
+ <u-sticky>
+ <view class="bgc-ff">
+ <view class="tab">
+ <!-- <u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
+ :activeStyle="{color:'#017BFC'}">
+ </u-tabs> -->
+ <view class="search flex j-c-s-b a-i-c">
+ <view class="tab-filter flex j-c-c a-i-c" @click="showDateModal">
+ <text class="f-28">时间筛选</text>
+ <u-icon name="arrow-down"></u-icon>
+ </view>
+ <u-search placeholder="请输入需要查询信息的名称" v-model="keyWord" :clearabled="true" :showAction="true"
+ :animation="true" @search="searchConfirm" @clear="clearConfirm"></u-search>
+ </view>
+ </view>
+ </view>
+ </u-sticky>
+
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k"
+ @click="navTo(i.id,i.reportType,i.status,i.type)">
+ <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 == 4" text="待完成" type="warning" plain plainFill></u-tag>
+ <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>
+ <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>
+
+<script>
+ import {
+ getAuditReportingList
+ } from "@/api/reporting/reporting"
+ import dateRangeModal from '@/components/dateRangeModal/modal.vue';
+ export default {
+ components: {
+ dateRangeModal
+ },
+ data() {
+ return {
+ tabList: [
+
+ {
+ name: "全部",
+ status: "",
+ },
+ {
+ name: "待完成",
+ status: 4,
+ },
+ {
+ name: "待审核",
+ status: 1
+ },
+ {
+ name: "审核通过",
+ status: 2
+ },
+ {
+ name: "已拒绝",
+ status: 3
+ }
+ ],
+ tabIndex: 1,
+ currentStatus: 4,
+ list: [],
+ loadingStatus: 'nomore',
+ currentPage: 1,
+ frequency: '',
+ reportType: "",
+ selectDate: [],
+ houseCode: "",
+ keyword: ""
+ }
+ },
+
+ onLoad(option) {
+ console.log(option);
+ if (option.reportType) {
+ this.reportType = option.reportType;
+ uni.setNavigationBarTitle({
+ title: "取保候审"
+ })
+ }
+ if (option.from == "index") {
+ uni.setNavigationBarTitle({
+ title: "场所任务"
+ })
+ }
+ if (option.from == "task") {
+ this.tabIndex = 1;
+ this.currentStatus = 1;
+ }
+ if (option.code) {
+ this.houseCode = option.code;
+ }
+ // this.getList()
+ },
+
+ onShow() {
+ this.resetParams();
+ this.getList()
+ },
+
+ onReachBottom() {
+ this.currentPage++
+ this.getList()
+ },
+
+ methods: {
+ searchConfirm() {
+ this.resetParams()
+ this.getList()
+ },
+ clearConfirm() {
+ this.keyWord = ''
+ this.searchConfirm()
+ },
+ changeTab(e) {
+ this.tabIndex = e.index;
+ this.currentStatus = e.status;
+ this.resetParams();
+ this.getList();
+ },
+ resetParams() {
+ this.list = [];
+ this.currentPage = 1;
+ },
+ getList() {
+ this.$nextTick(() => {
+ this.loadingStatus = 'loadingmore'
+ this.$refs.uToast.show({
+ type: 'loading',
+ message: '正在加载',
+ duration: 9999999
+ })
+ })
+ let params = {
+ current: this.currentPage,
+ size: 20,
+ status: this.currentStatus,
+ frequency: this.frequency
+ }
+ if (this.selectDate.length) {
+ params.startTime = this.selectDate[0]
+ params.endTime = this.selectDate[1]
+ }
+ if (this.houseCode) {
+ params.houseCode = this.houseCode;
+ }
+
+ if (this.reportType) {
+ params.reportType = this.reportType
+ }
+ if (this.keyword) {
+ params.name = this.keyword;
+ }
+
+ getAuditReportingList(params).then(res => {
+ if (res.code != 200) {
+ uni.showToast({
+ title: '数据请求失败',
+ icon: 'error'
+ })
+ return
+ }
+ let records = res.data.records;
+ this.list = [...this.list, ...records]
+ this.$nextTick(() => {
+ this.$refs.uToast.isShow = false
+ })
+ this.loadingStatus = 'nomore'
+ })
+ },
+ navTo(id, reportType, status, type) {
+ if (status == 4) {
+ if (reportType == 8) {
+ this.navToDetail(reportType, id, type)
+ } else {
+ if (uni.getStorageSync("activeRole").roleName == "民警") {
+ this.navToDetail(reportType, id, type)
+ } else {
+ this.navToEdit(reportType, id, type);
+ }
+ }
+ } else {
+ this.navToDetail(reportType, id, type)
+ }
+ },
+
+ navToEdit(reportType, id, type) {
+ // if (reportType == 1) {
+ // this.$u.func.globalNavigator(`/subPackage/label/bail?id=${id}`)
+ // } else if (reportType == 2 || type == 7) {
+ // this.$u.func.globalNavigator(`/subPackage/label/hotel?id=${id}`)
+ // } else if (reportType == 3 || reportType == 4 || reportType == 5) {
+ // this.$u.func.globalNavigator(`/subPackage/label/form?id=${id}`)
+ // } else if (reportType == 6) {
+ // this.$u.func.globalNavigator(`/subPackage/label/school?id=${id}`)
+ // }
+
+ if (reportType == 1) {
+ this.$u.func.globalNavigator(`/subPackage/label/bail?id=${id}`)
+ } else if (reportType == 2) {
+ this.$u.func.globalNavigator(`/subPackage/label/check?id=${id}`)
+ } else if (reportType == 5) {
+ this.$u.func.globalNavigator(`/subPackage/label/form?id=${id}`)
+ }
+ },
+
+ navToDetail(reportType, id, type) {
+ // if (reportType == 1) {
+ // this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
+ // } else if (reportType == 2 || type == 7) {
+ // this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
+ // } else if (reportType == 3 || reportType == 4 || reportType == 5) {
+ // this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
+ // } else if (reportType == 6) {
+ // this.$u.func.globalNavigator(`schoolReportDetail?id=${id}`)
+ // } else {
+ // this.$u.func.globalNavigator(`checkReform?id=${id}`)
+ // }
+
+ if (reportType == 1) {
+ this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
+ } else if (reportType == 2) {
+ this.$u.func.globalNavigator(`selfCheckDetail?id=${id}`)
+ } else if (reportType == 5) {
+ this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
+ } else {
+ this.$u.func.globalNavigator(`checkReform?id=${id}`)
+ }
+
+
+ },
+
+ showDateModal() {
+ this.$refs.dateRane.open();
+ },
+
+ handleRestDate() {
+ this.selectDate = [];
+ this.resetParams();
+ this.getList()
+ },
+ handleComfirmDate(val) {
+ this.selectDate = val;
+ this.resetParams();
+ this.getList()
+ }
+
+ }
+ }
+</script>
+
+<style lang="scss">
+ page {
+ background-color: #F5F5F5;
+ }
+
+
+
+ .tab {
+ // width: 100%;
+
+ }
+
+ .search {
+ padding: 20rpx 20rpx;
+ }
+
+ // .tab /deep/.u-tabs__wrapper__nav__item {
+ // flex: 1;
+ // }
+ .tab-filter {
+ padding: 0 20rpx;
+ }
+
+ .list {
+ margin: 20rpx 30rpx 0;
+ }
+
+ .list-item {
+ padding: 0 30rpx 20rpx;
+ border-radius: 8rpx;
+
+ .item-title {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #F5F5F5;
+ }
+
+ .item-row {
+ padding: 10rpx 0;
+
+ .address {
+ width: 65%;
+ text-align: right;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/workbench/views/editExamine.vue b/subPackage/workbench/views/editExamine.vue
index 1460c92..ea125a5 100644
--- a/subPackage/workbench/views/editExamine.vue
+++ b/subPackage/workbench/views/editExamine.vue
@@ -5,7 +5,7 @@
<box-title :title="'基本信息'"></box-title>
<u-form labelWidth="70" :model="form" :rules="rules" ref="form" class="form">
<u-form-item label="场所位置" required class="form-item" prop="location" @click="getLocation">
- <u--input border="none" v-model="form.location" placeholder="请选择场所位置"></u--input>
+ <u--textarea border="none" v-model="form.location" placeholder="请选择场所位置"></u--textarea>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
<u-form-item label="经纬度" required class="form-item">
@@ -21,6 +21,19 @@
<u-form-item label="法人电话" class="form-item" prop="legalTel" required>
<u--input border="none" type="number" v-model="form.legalTel" placeholder="请填写法人电话"></u--input>
</u-form-item>
+ <u-form-item class="form-item" label="标准地址" required prop="houseCodeBinds"
+ @click="isShowPopup = true">
+ <u--input v-if="!addressNames" border="none" disabled disabledColor="#ffffff"
+ placeholder="请选择标准地址">
+ </u--input>
+ <u-textarea v-if="addressNames" border="none" :disabled="true" disabledColor="#ffffff"
+ v-model="addressNames" placeholder="请选择标准地址">
+ </u-textarea>
+ <u-icon slot="right" name="arrow-right"></u-icon>
+ </u-form-item>
+
+
+
</u-form>
</view>
<view class="license">
@@ -59,6 +72,25 @@
</view>
+ <u-popup :show="isShowPopup" mode="bottom" :round="12" closeable="true" @close="isShowPopup = false">
+ <view class="popup-content">
+ <view class="popup-title f-30">选择标准地址</view>
+ <scroll-view class="popup-list" :scroll-y="true">
+ <u-checkbox-group v-model="checkedPlace" iconPlacement="right" placement="column"
+ @change="checkboxChange" shape="circle">
+ <view class="popup-list-item flex j-c-s-b" v-for="(i,k) in placeList" :key="k">
+ <text class="f-28" style="width:85%">{{i.addressName}}</text>
+ <u-checkbox :name="k"></u-checkbox>
+ </view>
+
+ </u-checkbox-group>
+ </scroll-view>
+
+ </view>
+
+ </u-popup>
+
+
<footer-btn @click="submit"></footer-btn>
<!-- <view class="btn-group">
@@ -83,6 +115,13 @@
import {
minioBaseUrl
} from '@/common/setting'
+
+
+
+ import {
+ getPlaceList
+ } from '@/api/place/place.js'
+
export default {
mixins: [uploadMixin],
components: {
@@ -99,7 +138,8 @@
legalPerson: '',
legalTel: '',
imageUrls: [],
- planImageUrls: []
+ planImageUrls: [],
+ houseCodeBinds: ""
},
rules: {
"location": {
@@ -133,7 +173,11 @@
},
personNum: 1,
curSelectSite: {},
- jwd: ""
+ jwd: "",
+ placeList: [],
+ isShowPopup: false,
+ checkedPlace: [],
+ addressNames: ""
}
},
onShow() {
@@ -144,12 +188,47 @@
//onReady 为uni-app支持的生命周期之一
this.$refs.form.setRules(this.rules)
},
+
mounted() {
+
this.$nextTick(() => {
this.getCsDetails()
+ this.getPlace();
})
},
methods: {
+
+ checkboxChange(n) {
+ console.log('change', n);
+ let list = n;
+ let ids = [];
+ let names = []
+
+ for (let i = 0, ii = list.length; i < ii; i++) {
+
+ ids.push(this.placeList[list[i]].addressCode)
+ names.push(this.placeList[list[i]].addressName)
+ }
+
+
+
+ this.$set(this.form, "houseCodeBinds", ids.join(","))
+ this.addressNames = names.join(",");
+
+
+
+ },
+
+ getPlace() {
+ getPlaceList({
+ addressName: this.form.location
+ }).then(res => {
+ console.log(res)
+ this.placeList = res.data;
+ })
+ },
+
+
getLocation() {
uni.chooseLocation({
success: (res) => {
@@ -386,4 +465,40 @@
border: 1rpx solid #EEEEEE;
background-color: #fff;
}
+
+
+ .popup-content {
+ width: 100%;
+ padding: 0 30rpx 30rpx;
+ box-sizing: border-box;
+ background-color: #fff;
+ // height: 800rpx;
+
+ .popup-title {
+ padding: 30rpx 0;
+ text-align: center;
+ font-weight: bold;
+ }
+
+ .popup-list {
+ height: 600rpx;
+ margin-top: 20rpx;
+ }
+
+ .popup-list-item {
+ padding: 20rpx 0;
+ border-bottom: 1px solid #f1f1f1;
+ position: relative;
+ }
+
+ .address-name {
+ width: 90%;
+ }
+
+ .check-icon {
+ position: absolute;
+ right: 20rpx;
+ top: 20rpx;
+ }
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3