From 81a3399523bce8ec51336f219e31c69b151cec6c Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Wed, 29 Nov 2023 19:15:15 +0800
Subject: [PATCH] 修复部分问题，我的任务菜单修改；圈子页面编写；新增公共报事明细页面；
---
subPackage/bs/views/repairRecord.vue | 4
pages/circle/index.vue | 90 ++++++++++-
pages.json | 12
subPackage/label/index.vue | 72 ++++++--
store/index.js | 20 +-
subPackage/article/detail.vue | 3
pages/home/index.vue | 78 ++++++---
subPackage/label/bail.vue | 1
static/icon/nav-11.png | 0
subPackage/user/role/index.vue | 6
subPackage/bs/views/repair.vue | 7
common/setting.js | 4
subPackage/workbench/views/reportAudit.vue | 40 +++-
subPackage/bs/views/addRepair.vue | 61 +++++++
subPackage/task/index.vue | 66 ++++++-
15 files changed, 355 insertions(+), 109 deletions(-)
diff --git a/common/setting.js b/common/setting.js
index b62f2a4..a837f6e 100644
--- a/common/setting.js
+++ b/common/setting.js
@@ -12,8 +12,8 @@
// devUrl: 'https://sk.hubeishuiyi.cn',
// devUrl: 'http://192.168.1.156:9528',
// devUrl:'http://192.168.1.50:9528',
- devUrl: 'http://192.168.0.102:9528',
- // devUrl:'https://srgdjczzxtpt.com:2080/api',
+ // devUrl: 'http://192.168.0.102:9528',
+ devUrl:'https://srgdjczzxtpt.com:2080/api',
// devUrl: 'http://192.168.0.102:9528',
// devUrl: 'https://srgdjczzxtpt.com:2080/api',
minioBaseUrl: "https://srgdjczzxtpt.com:2080/gminio/jczz/",
diff --git a/pages.json b/pages.json
index e7ad5e1..c0df428 100644
--- a/pages.json
+++ b/pages.json
@@ -593,12 +593,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/circle/index.vue b/pages/circle/index.vue
index 3a45747..8b2045f 100644
--- a/pages/circle/index.vue
+++ b/pages/circle/index.vue
@@ -1,23 +1,93 @@
<template>
<view class="">
- <u-navbar @rightClick="rightClick" :autoBack="false">
- <view class="" slot="left">
- <u-search placeholder="日照香炉生紫烟" v-model="keyword" :showAction="false"></u-search>
+ <view class="">
+ <u-navbar @rightClick="rightClick" :autoBack="false">
+ <view class="" slot="left">
+ <u-search placeholder="搜索" v-model="keyword" :showAction="false"></u-search>
+ </view>
+ </u-navbar>
+ </view>
+ <view class="content">
+ <view class="topic-item">
+ <view class="flex">
+ <u-avatar size="44"></u-avatar>
+ <view class="ml-10 flex f-d-c">
+ <text class="f-26 mb-10">张三</text>
+ <text class="f-22 c-66">1小时前发布</text>
+ </view>
+ </view>
+ <view class="topic-content f-28">
+ 租车位18970055016微信同号三栋附近最好，负一二楼都可以
+ </view>
+ <u-album :urls="urls" keyName="src"></u-album>
+ <view class="topic-action flex j-c-f-e">
+ <view class="flex a-i-c">
+ <u-icon name="heart-fill" color="#C4C8CB" size="24"></u-icon>
+ <text class="f-22 c-66 ml-10">10</text>
+ </view>
+ <view class="flex ml-30 a-i-c">
+ <u-icon name="chat-fill" color="#C4C8CB" size="24"></u-icon>
+ <text class="f-22 c-66 ml-10">10</text>
+ </view>
+ </view>
</view>
-
- </u-navbar>
+ </view>
+
+ <view class="float flex j-c-c a-i-c">
+ <view class="float-box bgc-main flex j-c-c f-d-c a-i-c">
+ <u-icon name="plus" color="#fff" size="24"></u-icon>
+ <text class="f-26 c-ff">发布</text>
+ </view>
+ </view>
+
</view>
+
</template>
<script>
- export default{
- data(){
- return{
- keyword:""
+ export default {
+ data() {
+ return {
+ keyword: "",
+ urls: [{
+ src: 'https://cdn.uviewui.com/uview/album/1.jpg',
+ }]
}
}
}
</script>
-<style>
+<style lang="scss">
+ .content {
+ padding: 0 30rpx;
+ margin-top: 130rpx;
+
+ .topic-item {
+ padding: 30rpx 0 0;
+ border-bottom: 1px solid #F5F5F5;
+ }
+
+ .topic-content {
+ padding: 20rpx 0;
+ }
+
+ .topic-action {
+ padding: 30rpx 0;
+ }
+ }
+ .float{
+ width:120rpx;
+ height:120rpx;
+ border-radius: 50%;
+ border:1px solid #3A74F1;
+ position: fixed;
+ bottom: 20%;
+ right:30rpx;
+ .float-box{
+ width:110rpx;
+ height:110rpx;
+ border-radius: 50%;
+
+ }
+ }
</style>
\ No newline at end of file
diff --git a/pages/home/index.vue b/pages/home/index.vue
index d242140..73bd7d1 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -21,7 +21,7 @@
</u-grid>
<view class="section flex j-c-s-b mt-40">
- <view class="section-item" v-for="(i,k) in contactList" :key="k" @click="navigatorPage()">
+ <view class="section-item" v-for="(i,k) in contactList" :key="k" @click="navigatorPage()">
<image class="section-item-bg" :src="i.pictureImg" mode="aspectFill"></image>
<view class="item-box">
<view class="f-28">{{i.name}}</view>
@@ -68,7 +68,7 @@
</view>
</view>
- <view class="mb-20" v-if="roleType == 2">
+ <view class="mb-20" v-if="roleType == 2">
<caption-row title="社区" />
<view class="mt-20">
<u-grid :border="false" col="4">
@@ -111,9 +111,6 @@
</u-grid-item>
</u-grid>
</view>
-
-
-
<view class="notic" v-if="isShowNotice">
<caption-row title="通知公告" :is-link="true" url="/subPackage/article/list" />
<notice-list :data="notice" />
@@ -275,13 +272,15 @@
this.init()
uni.$on('refresh', () => {
this.selectSiteIndex = [0, 0]
- this.curSelectSite = {addressType:1}
+ this.curSelectSite = {
+ addressType: 1
+ }
this.init()
})
},
onReady() {
- if(!uni.getStorageSync("userInfo")){
+ if (!uni.getStorageSync("userInfo")) {
uni.redirectTo({
url: "/pages/login/login-account"
})
@@ -473,14 +472,23 @@
// this.getNoticeMenu();
// }, 100)
// });
- this.menuList = uni.getStorageSync("menu")
- this.liveList = this.hasMenu('生活')
- this.contactList = this.hasMenu('快捷拨号');
- this.jobList = this.hasMenu('工作台')
- if (this.menuList.length) {
- this.getHouseMenu();
- this.getNoticeMenu();
+ this.menuList = uni.getStorageSync("menu")
+ let liveList = this.hasMenu('生活')
+ this.liveList = this.setLiveMenu(liveList);
+ this.contactList = this.hasMenu('快捷拨号');
+ this.jobList = this.hasMenu('工作台')
+ if (this.menuList.length) {
+ this.getHouseMenu();
+ this.getNoticeMenu();
+ }
+ setTimeout(()=>{
+ if(this.jobList.length){
+ let taskList = this.jobList.filter(item => item.name == "我的任务")
+ uni.setStorageSync("taskMenu",taskList[0].children);
+ }else {
+ uni.setStorageSync("taskMenu",[]);
}
+ },200)
},
getHouseMenu() {
@@ -496,6 +504,25 @@
if (list.length) {
this.getNoticeList()
}
+ },
+
+
+ setLiveMenu(arr) {
+ let index = arr.findIndex(item => item.name == "标签报事")
+ if (this.curSelectSite.addressType == 1) {
+ if (index != -1) {
+ arr.splice(index, 1)
+ }
+ } else {
+ if (index == -1) {
+ arr.unshift({
+ name: "标签报事",
+ path: "/subPackage/label/index",
+ pictureImg: "/static/icon/nav-01.png"
+ })
+ }
+ }
+ return arr;
},
// 页面跳转
@@ -524,26 +551,27 @@
navigatorPage(path) {
if (path) {
- if (( path == '/subPackage/bs/views/zhsb' || path == '/subPackage/bs/views/repair' )&& this.curHouseCode === '') {
+ if ((path == '/subPackage/bs/views/zhsb' || path == '/subPackage/bs/views/repair') && this
+ .curHouseCode === '') {
uni.showToast({
title: "尚无绑定房屋信息",
icon: "error"
})
-
- }else if(path == '/subPackage/user/clockIn/index'){
+
+ } else if (path == '/subPackage/user/clockIn/index') {
uni.showToast({
- title:"功能开发中~",
- icon:"none"
+ title: "功能开发中~",
+ icon: "none"
})
-
- }else {
+
+ } else {
this.$u.func.globalNavigator(`${path}?houseCode=${this.curHouseCode}`, "navTo")
}
-
- }else {
+
+ } else {
uni.showToast({
- title:"功能开发中~",
- icon:"none"
+ title: "功能开发中~",
+ icon: "none"
})
}
},
diff --git a/static/icon/nav-11.png b/static/icon/nav-11.png
new file mode 100644
index 0000000..dd0fb7b
--- /dev/null
+++ b/static/icon/nav-11.png
Binary files differ
diff --git a/store/index.js b/store/index.js
index f8bc1b3..f6d7af1 100644
--- a/store/index.js
+++ b/store/index.js
@@ -141,16 +141,16 @@
if(!data) return
let menu = data.filter(e => e.name == 'app')[0].children;
commit("SET_MENU",menu);
- let liveList = menu.filter(item=>item.name == '生活')
- let labelList = [];
- if(liveList.length && liveList[0].children){
- for(let i of liveList[0].children){
- if(i.name == "标签报事" && i.children.length){
- commit("setLabelReporMenutList",i.children)
- break;
- }
- }
- }
+ // let liveList = menu.filter(item=>item.name == '生活')
+ // let labelList = [];
+ // if(liveList.length && liveList[0].children){
+ // for(let i of liveList[0].children){
+ // if(i.name == "标签报事" && i.children.length){
+ // commit("setLabelReporMenutList",i.children)
+ // break;
+ // }
+ // }
+ // }
resolve(menu)
}else {
reject("fail")
diff --git a/subPackage/article/detail.vue b/subPackage/article/detail.vue
index e007ca9..c8bb036 100644
--- a/subPackage/article/detail.vue
+++ b/subPackage/article/detail.vue
@@ -46,8 +46,7 @@
</view>
<button v-if="computeEndTime > 0 && !applyInfo.userId" class="apply-btn bgc-main c-ff "
@click="handleApply()">报名</button>
- <button v-if="applyInfo.userId" class="apply-btn bgc-lightblue c-main border-current"
- @click="handleApply()">已报名</button>
+ <button v-if="applyInfo.userId" class="apply-btn bgc-lightblue c-main border-current">已报名</button>
<button v-if="computeEndTime <= 0"
class="apply-btn bgc-lightblue c-main border-current">已结束</button>
</view>
diff --git a/subPackage/bs/views/addRepair.vue b/subPackage/bs/views/addRepair.vue
index e353e54..8cbbb4b 100644
--- a/subPackage/bs/views/addRepair.vue
+++ b/subPackage/bs/views/addRepair.vue
@@ -15,9 +15,28 @@
<u-input v-model="info.realName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="手机" prop="phone" :borderBottom="false" ref="phone">
+ <u-form-item label="手机" prop="phone" borderBottom ref="phone">
<u-input v-model="info.phone" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
+ </u-form-item>
+ <u-form-item label="事发位置" prop="address" :borderBottom="false" >
+ <view class="address-row flex">
+ <view class="address-content f-28" v-if="info.address">
+ {{info.address}}
+ </view>
+ <view class="address-content f-28 c-99" v-if="!info.address">
+ 请选择地址
+ </view>
+ <view class="location-btn c-main f-24" @click="getLocation()">
+ 获取地址
+ </view>
+ </view>
+ <!-- <u-input v-model="info.address" border="none" placeholderClass="f-28 c-99"
+ inputAlign="right" disabled disabledColor="#fff">
+ <template slot="suffix">
+ <button class="location-btn c-main f-24" @click="getLocation()">获取地址</button>
+ </template>
+ </u-input> -->
</u-form-item>
</u-form>
</view>
@@ -58,6 +77,9 @@
phone: "",
remark: "",
type: -1,
+ address:"",
+ lat:"",
+ lng:""
},
rules: {
'realName': {
@@ -70,6 +92,12 @@
type: 'string',
required: true,
message: '请输入手机号',
+ trigger: ['blur', 'change']
+ },
+ 'address': {
+ type: 'string',
+ required: true,
+ message: '请选择地址',
trigger: ['blur', 'change']
},
},
@@ -91,6 +119,18 @@
console.log(this.curSelectSite);
},
methods: {
+
+ getLocation(){
+ uni.chooseLocation({
+ success:(res)=>{
+ this.$set(this.info,"address",res.address);
+ this.$set(this.info,"lat",res.latitude);
+ this.$set(this.info,"lng",res.longitude)
+ }
+ })
+ },
+
+
sumitInfo() {
const that = this
this.$refs.form.validate().then(valid => {
@@ -181,4 +221,23 @@
color: #fff;
margin-top: 50rpx;
}
+ .address-row{
+ flex:1;
+ justify-content: flex-end;
+ align-items:center;
+ }
+ .address-content{
+ width:calc(100% - 116rpx - 20rpx);
+ margin-right:20rpx;
+ }
+ .location-btn{
+ width:116rpx;
+ height:46rpx;
+ line-height: 46rpx;
+ border-radius: 4rpx;
+ border:1px solid currentColor;
+ padding:0;
+ background-color: #fff;
+ text-align: center;
+ }
</style>
\ No newline at end of file
diff --git a/subPackage/bs/views/repair.vue b/subPackage/bs/views/repair.vue
index 42b82dc..36c2b7a 100644
--- a/subPackage/bs/views/repair.vue
+++ b/subPackage/bs/views/repair.vue
@@ -132,11 +132,8 @@
})
},
navToRecord(type=0){
- return
this.$u.func.globalNavigator(`/subPackage/bs/views/repairRecord?type=${type}`, "navTo")
}
-
-
}
}
</script>
@@ -244,6 +241,10 @@
font-size: 22rpx;
padding: 0;
margin: 0;
+ border:none;
+ }
+ .item-btn::after{
+ border:none;
}
}
diff --git a/subPackage/bs/views/repairRecord.vue b/subPackage/bs/views/repairRecord.vue
index a18e67a..b7e1acc 100644
--- a/subPackage/bs/views/repairRecord.vue
+++ b/subPackage/bs/views/repairRecord.vue
@@ -132,6 +132,8 @@
records
}
} = res
+
+
if (code !== 200) {
uni.showToast({
title: '数据请求失败',
@@ -168,7 +170,7 @@
pushPage(item) {
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)
+ this.$u.func.globalNavigator(`/subPackage/workbench/views/reportAudit?data=${data}&from=record`)
}
}
}
diff --git a/subPackage/label/bail.vue b/subPackage/label/bail.vue
index 26f7f75..b90b0af 100644
--- a/subPackage/label/bail.vue
+++ b/subPackage/label/bail.vue
@@ -272,7 +272,6 @@
.address-content{
width:calc(100% - 116rpx - 20rpx);
margin-right:20rpx;
- text-align: right;
}
.location-btn{
width:116rpx;
diff --git a/subPackage/label/index.vue b/subPackage/label/index.vue
index 94a0d5a..22d2b17 100644
--- a/subPackage/label/index.vue
+++ b/subPackage/label/index.vue
@@ -31,19 +31,19 @@
</view>
</view>
- <view class="site-box bgc-ff flex" v-if="siteInfo.name">
+ <view class="site-box bgc-ff flex" v-if="curSiteInfo.name">
<view class="flex a-i-c">
<u-icon name="map-fill" color="#AAAAAA"></u-icon>
<text class="f-28 c-aa ml-20">当前小区：</text>
</view>
- <text class="address f-28">{{siteInfo.name}}</text>
+ <text class="address f-28">{{curSiteInfo.name}}</text>
</view>
<view class="nav flex flex-wrap j-c-s-b">
- <view class="nav-item" v-for="(i,k) in navList" :key="k" @click="navTo(i.path,k)">
- <image class="nav-item-bg" :src="i.pictureImg" mode="aspectFill"></image>
+ <view class="nav-item" v-for="(i,k) in labelList" :key="k" @click="navTo(i.path,k)">
+ <image class="nav-item-bg" :src="i.bgImg" mode="aspectFill"></image>
<view class="nav-item-inner flex f-d-c">
- <text class="f-32 mb-30">{{i.name}}</text>
+ <text class="f-32 mb-30">{{i.title}}</text>
<button class="item-btn" :style="{backgroundColor:i.background}">立即上报</button>
</view>
</view>
@@ -61,51 +61,58 @@
data(){
return {
navList:[
- {
- title:"取保候审",
- bgImg:"/static/icon/nav-bg-10.png",
- path:"bail",
- background:"#63C875"
- },
+ // {
+ // title:"取保候审",
+ // bgImg:"/static/icon/nav-bg-10.png",
+ // path:"bail",
+ // background:"#63C875"
+ // },
{
title:"打金店",
bgImg:"/static/icon/nav-bg-11.png",
- path:"form",
- background:"#4D98E2"
+ path:"form?type=1",
+ background:"#4D98E2",
+ id:"130808"
},
{
title:"旅馆安全",
bgImg:"/static/icon/nav-bg-12.png",
path:"hotel",
- background:"#EC7E51"
+ background:"#EC7E51",
+ id:"120102"
},
{
title:"二手车交易",
bgImg:"/static/icon/nav-bg-13.png",
- path:"form",
- background:"#F4B862"
+ path:"form?type=3",
+ background:"#F4B862",
+ id:"140304"
},
{
title:"二手手机维修",
bgImg:"/static/icon/nav-bg-14.png",
- path:"form",
- background:"#13C6C7"
+ path:"form?type=4",
+ background:"#13C6C7",
+ id:"130604"
},
{
title:"校园安全",
bgImg:"/static/icon/nav-bg-11.png",
path:"school",
- background:"#4D98E2"
+ background:"#4D98E2",
+ id:"160100"
}
],
- siteInfo:{},
- count:{}
+ curSiteInfo:{},
+ count:{},
+ labelList:[]
}
},
onLoad(){
- this.siteInfo = uni.getStorageSync("siteInfo");
- this.navList = uni.getStorageSync("labelMenuList");
+ this.curSiteInfo = uni.getStorageSync("siteInfo");
+ // this.navList = uni.getStorageSync("labelMenuList");
+ this.getMenu()
},
onShow() {
@@ -113,6 +120,21 @@
},
methods:{
+
+ getMenu(){
+ let labelList = this.curSiteInfo.categoryLabelList;
+ let navList = this.navList;
+ let list = []
+ for(let i =0,ii=labelList.length;i<ii;i++){
+ for(let k = 0,kk = navList.length;k<kk;k++){
+ if(labelList[i].categoryNo == navList[k].id){
+ list.push(navList[k])
+ }
+ }
+ }
+ this.labelList = list;
+ },
+
getCount(code){
getReportingCount({houseCode:code}).then(res=>{
console.log(res);
@@ -222,6 +244,10 @@
font-size:22rpx;
padding:0;
margin:0;
+ border:none;
+ }
+ .item-btn::after{
+ border:none;
}
}
diff --git a/subPackage/task/index.vue b/subPackage/task/index.vue
index dceade5..3e9cb42 100644
--- a/subPackage/task/index.vue
+++ b/subPackage/task/index.vue
@@ -22,7 +22,7 @@
</view>
</view>
</view> -->
- <view class="nav bgc-ff mb-20 mt-20">
+ <view class="nav bgc-ff mb-20 mt-20" v-if="comprehensive.length">
<view class="caption">
<view class="flex a-i-c">
<view class="line"></view>
@@ -30,11 +30,20 @@
</view>
</view>
- <view class="nav-item flex j-c-s-b a-i-c" @click="navTo('/subPackage/workbench/views/cshw')">
- <text class="f-28">场所审核</text>
+ <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>
<view class="flex">
<!-- <text class="f-28 c-99">待处理</text>
<view class="dot bgc-main">3</view> -->
+ <u-icon name="arrow-right" color="#999"></u-icon>
+ </view>
+ </view>
+
+<!-- <view class="nav-item flex j-c-s-b a-i-c" @click="navTo('/subPackage/workbench/views/cshw')" v-for="i in comprehensive">
+ <text class="f-28">场所审核</text>
+ <view class="flex">
+ <text class="f-28 c-99">待处理</text>
+ <view class="dot bgc-main">3</view>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
</view>
@@ -71,8 +80,8 @@
<view class="nav-item flex j-c-s-b a-i-c" @click="navTo()">
<text class="f-28">走访提醒</text>
<view class="flex">
- <!-- <text class="f-28 c-99">待处理</text>
- <view class="dot bgc-main">3</view> -->
+ <text class="f-28 c-99">待处理</text>
+ <view class="dot bgc-main">3</view>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
</view>
@@ -85,7 +94,7 @@
</block>
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
- </view>
+ </view> -->
</view>
@@ -107,15 +116,16 @@
</view>
</view>
</view> -->
- <view class="nav bgc-ff mb-20">
+ <view class="nav bgc-ff mb-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 class="nav-item flex j-c-s-b a-i-c" @click="navTo()">
- <text class="f-28">取保候审</text>
+
+ <view class="nav-item flex j-c-s-b a-i-c" @click="navTo()" v-for="i in securityList">
+ <text class="f-28">{{i.name}}</text>
<view class="flex">
<block v-if="false">
<text class="f-28 c-99">待处理</text>
@@ -124,6 +134,16 @@
<u-icon name="arrow-right" color="#999"></u-icon>
</view>
</view>
+ <!-- <view class="nav-item flex j-c-s-b a-i-c" @click="navTo()">
+ <text class="f-28">取保候审</text>
+ <view class="flex">
+ <block v-if="false">
+ <text class="f-28 c-99">待处理</text>
+ <view class="dot bgc-main">{{countInfo.comprehensiveTask}}</view>
+ </block>
+ <u-icon name="arrow-right" color="#999"></u-icon>
+ </view>
+ </view> -->
</view>
</view>
</template>
@@ -143,16 +163,36 @@
}],
repairsCount: 0,
- countInfo: {}
+ countInfo: {},
+ securityList:[],
+ comprehensive:[]
}
},
+ onLoad(){
+ this.getMenuList()
+ },
onShow() {
this.getCount();
this.getRepairsCount();
},
methods: {
+
+ getMenuList(){
+ let list = uni.getStorageSync("taskMenu");
+ if(list.length){
+ for(let i of list){
+ if(i.remark == '1'){
+ this.comprehensive.push(i)
+ }else {
+ this.security.push(i)
+ }
+ }
+ }
+
+ },
+
getCount() {
getCountTypeNumber().then(res => {
if (res.code == 200) {
@@ -170,13 +210,13 @@
navTo(url) {
- if(url){
- this.$u.func.globalNavigator(url)
- }else {
+ if(!url || url == "暂无" ){
uni.showToast({
title:"功能开发中~",
icon:"none"
})
+ }else {
+ this.$u.func.globalNavigator(url)
}
}
}
diff --git a/subPackage/user/role/index.vue b/subPackage/user/role/index.vue
index 487dbeb..486131d 100644
--- a/subPackage/user/role/index.vue
+++ b/subPackage/user/role/index.vue
@@ -47,7 +47,7 @@
})
let data = res.data
console.log(data)
- data.forEach(item => {
+ data.forEach((item,index) => {
if(item.roleName == "居民"){
item.icon = "/static/icon/user-01.png"
}else if (item.roleName == "场所负责人"){
@@ -55,6 +55,10 @@
}else {
item.icon = "/static/icon/user-03.png"
}
+
+ if(item.roleName == "物业管理员"){
+ data.splice(index,1);
+ }
// this.roleData.push({
// id: e.id,
// iconName: 'account-fill',
diff --git a/subPackage/workbench/views/reportAudit.vue b/subPackage/workbench/views/reportAudit.vue
index 8f969a1..ee1ec56 100644
--- a/subPackage/workbench/views/reportAudit.vue
+++ b/subPackage/workbench/views/reportAudit.vue
@@ -9,13 +9,15 @@
<lineItem :data-info="basicData"></lineItem>
</view>
</view>
- <view class="pic-box">
+ <view class="pic-box" v-if="imgUrls.length">
<view class="title-box">
<view class="line"></view>
<view class="text">事件照片</view>
</view>
<view class="pic-data">
- <u-image class="img" :src="imgUrls" width="80" height="80"></u-image>
+ <view class="mr-20 " v-for="i in imgUrls">
+ <u-image class="img" :src="i" width="80" height="80"></u-image>
+ </view>
</view>
</view>
<view class="audit-box">
@@ -25,18 +27,18 @@
</view>
<view class="audit-form">
<u-form labelWidth="70" :model="form" class="form" ref="form">
- <u-form-item label="事件状态" @click="isPickerShow = true" class="form-item">
+ <u-form-item label="事件状态" @click="showPicker" class="form-item">
<u--input v-model="form.confirmFlag" disabled disabledColor="#ffffff" placeholder="请选择审核状态"
border="none" :placeholder="defaultPlaceholder"></u--input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item label="备注" class="form-item">
- <u--input v-model="form.confirmNotion" border="none"></u--input>
+ <u-form-item label="备注" class="form-item" v-if="from == 'list' || (from == 'record' && form.confirmNotion)">
+ <u--input v-model="form.confirmNotion" border="none" :disabled="from == 'record'?true:false"></u--input>
</u-form-item>
</u-form>
</view>
</view>
- <view class="bottom">
+ <view class="bottom" v-if="from == 'list'">
<u-button type="primary" @click="submit">提交处理</u-button>
</view>
<u-picker :defaultIndex="[defaultColums]" :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
@@ -49,6 +51,7 @@
import {
checkReportForRepairsData
} from '@/api/task/taskReportForRepairs.js'
+ import { minioBaseUrl } from "@/common/setting.js"
export default {
components: {
lineItem
@@ -108,7 +111,7 @@
},
defaultPlaceholder: "",
defaultColums: 0,
- imgUrls: '',
+ imgUrls: [],
currentId: '',
defaultData: {},
isPickerShow: false,
@@ -126,12 +129,16 @@
status: 3
},
]
- ]
+ ],
+ from:"list"
}
},
onLoad(option) {
// const { id } = option
// this.currentId = id
+ if(option.from){
+ this.from = option.from;
+ }
const {
data
} = option
@@ -141,6 +148,13 @@
this.setDefaultValue()
},
methods: {
+
+ showPicker(){
+ if(this.from == "list"){
+ this.isPickerShow = true;
+ }
+ },
+
async checkReportForRepairs() {
const {
confirmFlag,
@@ -180,12 +194,16 @@
if (item.name === 'type') {
item.value = this.findObjValue(item.value, this.typeList, 'type').name || '未完善'
}
- })
- this.imgUrls = this.defaultData.imgUrls
+ })
+ if(this.defaultData.imageUrls){
+ this.imgUrls = this.defaultData.imageUrls.split(",")
+ }
+
let columns = this.columns[0]
this.defaultColums = columns.findIndex(item => item.status == this.defaultData.confirmFlag)
this.defaultPlaceholder = columns[this.defaultColums].name
- },
+ },
+
submit() {
this.checkReportForRepairs()
},
--
Gitblit v1.9.3