From 14ce0a5d40ef22fb8fa7304eba80ffbaf0540a77 Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 11 Nov 2023 14:07:11 +0800
Subject: [PATCH] 首页修改，网格员审核修改
---
subPackage/label/formList.vue | 4 +++-
manifest.json | 6 +++---
pages/home/index.vue | 19 +++++++++++++------
subPackage/workbench/views/hotelReportDetail.vue | 2 +-
subPackage/workbench/views/labelReportDetail.vue | 2 +-
subPackage/workbench/views/bailReportDetail.vue | 2 +-
6 files changed, 22 insertions(+), 13 deletions(-)
diff --git a/manifest.json b/manifest.json
index 03142ec..3b3b89c 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,6 +1,6 @@
{
- "name" : "荆楚水库",
- "appid" : "__UNI__EB167C0",
+ "name" : "基层自治",
+ "appid" : "__UNI__EE88272",
"description" : "",
"versionName" : "1.0.10",
"versionCode" : 104,
@@ -156,7 +156,7 @@
"uniStatistics" : {
"enable" : false
},
- "requiredPrivateInfos" : [ "getLocation","chooseLocation" ],
+ "requiredPrivateInfos" : [ "getLocation", "chooseLocation" ],
"permission" : {
"scope.userLocation" : {
"desc" : "定位"
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 3478a65..2be4c76 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -11,7 +11,7 @@
</u-navbar>
<view class="content">
<view class="swiper mb-30">
- <u-swiper :list="swiperList" height="320rpx"></u-swiper>
+ <u-swiper :list="swiperList" height="260rpx"></u-swiper>
</view>
<view class="" v-if="roleType != 1">
<u-grid :border="false" :col="4">
@@ -79,14 +79,22 @@
</view>
</view>
- <view class="" v-if="roleType == 1">
+ <view class="" v-if="roleType == 1 || (roleType == 2 && curSelectSite.addressType == 2)">
<view class="caption">
<view class="flex a-i-c">
<view class="line"></view>
<text class="f-32 fw">工作台</text>
</view>
</view>
- <u-grid :border="false" col="4">
+ <u-grid :border="false" col="4" v-if="roleType == 2 && curSelectSite.addressType == 2">
+ <u-grid-item @click="navigatorPage('/subPackage/workbench/views/editExamine')" :customStyle="{paddingTop:20+'rpx'}">
+ <view class="grid-item flex f-d-c a-i-c" style="background:linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)">
+ <u-icon name="/static/icon/menu-05.png" width="60rpx" height="60rpx"></u-icon>
+ <text class="grid-text f-24 fw mt-10">场所维护</text>
+ </view>
+ </u-grid-item>
+ </u-grid>
+ <u-grid :border="false" col="4" v-if="roleType == 1">
<u-grid-item @click="navigatorPage(item.path)" v-for="(item, index) in jobList" :index="index"
:key="index" :customStyle="{paddingTop:20+'rpx'}">
<view class="grid-item flex f-d-c a-i-c" :style="{background:item.style.background}">
@@ -257,8 +265,7 @@
style: {
background: 'linear-gradient(133deg, #F9FAFE 0%, rgba(249,250,254,0) 100%)',
},
- path: this.roleType === 2 ? '/subPackage/workbench/views/editExamine' :
- "/subPackage/workbench/views/cshw"
+ path:"/subPackage/workbench/views/cshw"
},
{
icon: "/static/icon/menu-06.png",
@@ -642,7 +649,7 @@
.swiper {
width: 100%;
- height: 320rpx;
+ height: 260rpx;
}
.content {
diff --git a/subPackage/label/formList.vue b/subPackage/label/formList.vue
index 2a6b838..9aeec1d 100644
--- a/subPackage/label/formList.vue
+++ b/subPackage/label/formList.vue
@@ -3,7 +3,9 @@
<view class="list">
<view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k" @click="navTo(i.taskId)">
<view class="item-title flex a-i-c j-c-s-b mb-20">
- <text class="f-32 fw">{{i.hotelName}}</text>
+ <text class="f-32 fw" v-if="i.eventType == 1">打金店</text>
+ <text class="f-32 fw" v-if="i.eventType == 3">二手车交易</text>
+ <text class="f-32 fw" v-if="i.eventType == 2">二手手机维修</text>
<u-tag v-if="i.confirmFlag == 1" text="待审批" type="warning" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 2" text="审核通过" type="success" plain plainFill></u-tag>
<u-tag v-if="i.confirmFlag == 3" text="审核拒绝" type="error" plain plainFill></u-tag>
diff --git a/subPackage/workbench/views/bailReportDetail.vue b/subPackage/workbench/views/bailReportDetail.vue
index 1f85720..d5a6e15 100644
--- a/subPackage/workbench/views/bailReportDetail.vue
+++ b/subPackage/workbench/views/bailReportDetail.vue
@@ -124,7 +124,7 @@
</view>
- <view class="bottom-btn">
+ <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
<u-button type="primary" @click="submit">提交审核</u-button>
</view>
<u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="goOutDate[tabIndex]" mode="datetime"
diff --git a/subPackage/workbench/views/hotelReportDetail.vue b/subPackage/workbench/views/hotelReportDetail.vue
index 9385180..c7843a7 100644
--- a/subPackage/workbench/views/hotelReportDetail.vue
+++ b/subPackage/workbench/views/hotelReportDetail.vue
@@ -54,7 +54,7 @@
</u-form>
</view>
</view>
- <view class="bottom-btn">
+ <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
<u-button type="primary" @click="submit">提交审核</u-button>
</view>
<u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
diff --git a/subPackage/workbench/views/labelReportDetail.vue b/subPackage/workbench/views/labelReportDetail.vue
index 0bb1ce9..a5a4b7d 100644
--- a/subPackage/workbench/views/labelReportDetail.vue
+++ b/subPackage/workbench/views/labelReportDetail.vue
@@ -37,7 +37,7 @@
</u-form>
</view>
</view>
- <view class="bottom-btn">
+ <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
<u-button type="primary" @click="submit">提交审核</u-button>
</view>
<u-picker :closeOnClickOverlay="true" @close="isPickerShow = false" :show="isPickerShow" ref="uPicker"
--
Gitblit v1.9.3