From d29d2c6e64ea80a3794e9f69e31f2e35cac097ac Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Sat, 11 Nov 2023 18:12:32 +0800
Subject: [PATCH] 取保候审审核问题修复
---
subPackage/article/list.vue | 109 ++--
subPackage/label/formList.vue | 114 +++--
/dev/null | 665 ------------------------------
subPackage/label/bailList.vue | 112 +++--
pages/home/index.vue | 2
subPackage/label/bail.vue | 2
subPackage/label/hotelList.vue | 108 ++-
subPackage/workbench/views/bailReportDetail.vue | 32 +
subPackage/label/hotel.vue | 1
subPackage/workbench/views/audit.vue | 136 +++--
10 files changed, 358 insertions(+), 923 deletions(-)
diff --git a/pages/home/index.vue b/pages/home/index.vue
index 80715f1..f5c81dd 100644
--- a/pages/home/index.vue
+++ b/pages/home/index.vue
@@ -158,7 +158,7 @@
<text class="f-24 c-99 ml-10">{{item.countNumber}}</text>
</view> -->
<view class="flex a-i-c">
- <u-icon name="eye-fill" size="22" color="#CECECE"></u-icon>
+ <u-icon name="eye-fill" size="20" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
</view>
</view>
diff --git a/subPackage/article/list.vue b/subPackage/article/list.vue
index 80f79e1..b540fb6 100644
--- a/subPackage/article/list.vue
+++ b/subPackage/article/list.vue
@@ -1,29 +1,30 @@
<template>
<view class="">
<view class="tab">
- <u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab" :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
+ <u-tabs :list="tabList" :current="tabIndex" keyName="dictValue" @change="changeTab"
+ :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
</view>
- <view v-for="(item,index) in noticeList" :key="index" class="list">
- <view class="notic-list bgc-ff" @click="navTo(item.id)">
- <view class="f-28 mb-30">
- {{item.title}}
- </view>
- <view class="flex a-i-c j-c-s-b">
- <view class="f-28 flex a-i-c">
- <!-- <view class="flex a-i-c mr-30">
+ <view class="list">
+ <view class="notic-list bgc-ff" v-for="(item,index) in noticeList" key="index" @click="navTo(item.id)">
+ <view class="f-28 mb-30">
+ {{item.title}}
+ </view>
+ <view class="flex a-i-c j-c-s-b">
+ <view class="f-28 flex a-i-c">
+ <!-- <view class="flex a-i-c mr-30">
<u-icon name="thumb-up-fill" size="24" color="#CECECE"></u-icon>
<text class="f-24 c-99 ml-10">{{item.countNumber}}</text>
</view> -->
- <view class="flex a-i-c">
- <u-icon name="eye-fill" size="22" color="#CECECE"></u-icon>
- <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
+ <view class="flex a-i-c">
+ <u-icon name="eye-fill" size="20" color="#CECECE"></u-icon>
+ <text class="f-24 c-99 ml-10">{{item.viewNumber}}</text>
+ </view>
</view>
+ <text class="f-24 c-99">{{item.createTime}}</text>
</view>
- <text class="f-24 c-99">{{item.createTime}}</text>
</view>
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
- </view>
- <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
</template>
@@ -33,52 +34,57 @@
getCategory
} from "@/api/article/article.js";
export default {
- data(){
+ data() {
return {
- tabList:[],
- tabId:"",
- tabIndex:0,
+ tabList: [],
+ tabId: "",
+ tabIndex: 0,
noticeList: [],
- currentPage:1,
+ currentPage: 1,
loadingStatus: 'nomore'
}
},
onLoad() {
this.getCateList()
-
+
},
onReachBottom() {
this.currentPage++
this.getPageList()
},
-
- methods:{
-
- changeTab(e){
+
+ methods: {
+
+ changeTab(e) {
this.tabIndex = e.index;
this.tabId = e.dictKey;
this.noticeList = [];
this.currentPage = 1;
this.getNoticeList()
},
-
- getCateList(){
+
+ getCateList() {
getCategory({
- parentId:'1722966265111248897'
- }).then(res=>{
+ parentId: '1722966265111248897'
+ }).then(res => {
console.log(res)
- this.tabList = res.data;
- this.tabId = res.data[0].dictKey;
+ let data = res.data;
+ data.unshift({
+ dictKey: "",
+ dictValue: "全部"
+ })
+ this.tabList = data;
+ // this.tabId = data[0].dictKey;
this.getNoticeList()
})
},
-
+
async getNoticeList() {
this.loadingStatus = 'loadingmore'
const param = {
size: 10,
current: this.currentPage,
- articleType:this.tabId
+ articleType: this.tabId
}
const res = await getPage(param)
const {
@@ -96,9 +102,9 @@
}
this.noticeList = [...this.noticeList, ...records]
this.loadingStatus = 'nomore'
-
+
},
- navTo(id){
+ navTo(id) {
this.$u.func.globalNavigator(`detail?id=${id}`, "navTo")
}
}
@@ -106,29 +112,32 @@
</script>
<style>
- page{
- background-color:#f5f5f5;
+ page {
+ background-color: #f5f5f5;
}
- .tab{
- width:100%;
- height:88rpx;
- position:fixed;
+
+ .tab {
+ width: 100%;
+ height: 88rpx;
+ position: fixed;
/*#ifdef H5*/
- top:88rpx;
+ top: 88rpx;
/*#endif*/
- /*#ifdef MP-WEIXIN*/
- top:0;
+ /*#ifdef MP-WEIXIN*/
+ top: 0;
/*#endif*/
- left:0;
- background-color:#fff;
- padding:0 30rpx;
+ left: 0;
+ background-color: #fff;
+ padding: 0 30rpx;
box-sizing: border-box;
z-index: 999;
-
+
}
- .list{
- margin-top:108rpx;
+
+ .list {
+ margin-top: 108rpx;
}
+
.notic-list {
padding: 30rpx;
border-bottom: 1px solid #f5f5f5;
diff --git a/subPackage/label/bail.vue b/subPackage/label/bail.vue
index 6f27e40..0d2f31f 100644
--- a/subPackage/label/bail.vue
+++ b/subPackage/label/bail.vue
@@ -42,7 +42,7 @@
</view>
</u-form>
<button class="submit-btn" @click="sumitInfo">提交</button>
- <button class="list-btn" @click="navigatorPage">我上报的事件</button>
+ <button class="list-btn mb-20" @click="navigatorPage">我上报的事件</button>
<u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="applyTime" mode="datetime"
:formatter="formatter" @confirm="confirmDate" @cancel="showSelectDate = false"></u-datetime-picker>
</view>
diff --git a/subPackage/label/bailList.vue b/subPackage/label/bailList.vue
index 037980f..80e36c7 100644
--- a/subPackage/label/bailList.vue
+++ b/subPackage/label/bailList.vue
@@ -1,75 +1,97 @@
<template>
<view class="">
- <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.checkUserName}}</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>
- </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>
- </view>
+ <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.checkUserName}}</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>
+ </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.applyTime}}</text>
+ </view>
+ </view>
+ </view>
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
</template>
<script>
- import {getBailReportingList} from "@/api/reporting/reporting.js"
+ import {
+ getBailReportingList
+ } from "@/api/reporting/reporting.js"
export default {
- data(){
+ data() {
return {
- list:[]
+ list: [],
+ currentPage: 1,
+ loadingStatus: 'nomore',
}
},
-
- onLoad(){
+
+ onLoad() {
this.getList()
},
-
- methods:{
- getList(){
+ onReachBottom() {
+ this.currentPage++
+ this.getPageList()
+ },
+
+ methods: {
+ getList() {
getBailReportingList({
- checkUserId:uni.getStorageSync("userInfo").user_id,
- page:1,
- size:20
- }).then(res=>{
- console.log(res)
- this.list = res.data.records;
+ checkUserId: uni.getStorageSync("userInfo").user_id,
+ page: this.currentPage,
+ size: 10
+ }).then(res => {
+ if (res.code != 200) {
+ uni.showToast({
+ title: '数据请求失败',
+ icon: 'error'
+ })
+ return
+ }
+ let records = res.data.records;
+ this.list = [...this.list, ...records]
+ this.loadingStatus = 'nomore'
})
},
-
- navTo(id){
+
+ navTo(id) {
uni.navigateTo({
- url:`/subPackage/workbench/views/bailReportDetail?id=${id}`
+ url: `/subPackage/workbench/views/bailReportDetail?id=${id}`
})
}
-
+
}
}
</script>
<style lang="scss">
- page{
- background-color:#F5F5F5;
+ page {
+ background-color: #F5F5F5;
}
- .list{
- margin:20rpx 30rpx 0;
+
+ .list {
+ margin: 20rpx 30rpx 0;
}
- .list-item{
- padding:0 30rpx 20rpx;
+
+ .list-item {
+ padding: 0 30rpx 20rpx;
border-radius: 8rpx;
- .item-title{
- padding:30rpx 0;
- border-bottom:1px solid #F5F5F5;
+
+ .item-title {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #F5F5F5;
}
- .item-row{
- padding:10rpx 0;
- .address{
- width:65%;
+
+ .item-row {
+ padding: 10rpx 0;
+
+ .address {
+ width: 65%;
}
}
}
diff --git a/subPackage/label/formList.vue b/subPackage/label/formList.vue
index 9aeec1d..27ead47 100644
--- a/subPackage/label/formList.vue
+++ b/subPackage/label/formList.vue
@@ -1,52 +1,69 @@
<template>
<view class="">
- <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" 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>
- </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>
- </view>
+ <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" 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>
+ </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.applyTime}}</text>
+ </view>
+ </view>
+ </view>
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
</template>
<script>
- import {getLabelReportingList} from "@/api/reporting/reporting.js"
+ import {
+ getLabelReportingList
+ } from "@/api/reporting/reporting.js"
export default {
- data(){
+ data() {
return {
- list:[]
+ list: [],
+ currentPage: 1,
+ loadingStatus: 'nomore',
}
},
-
- onLoad(option){
+
+ onLoad(option) {
this.getList(option.type)
},
-
- methods:{
- getList(type){
+ onReachBottom() {
+ this.currentPage++
+ this.getList()
+ },
+
+ methods: {
+ getList(type) {
getLabelReportingList({
- userId:uni.getStorageSync("userInfo").user_id,
- page:1,
- size:20,
- eventType:type
- }).then(res=>{
- console.log(res)
- this.list = res.data.records;
+ userId: uni.getStorageSync("userInfo").user_id,
+ page: this.currentPage,
+ size: 10,
+ eventType: type
+ }).then(res => {
+ if (res.code != 200) {
+ uni.showToast({
+ title: '数据请求失败',
+ icon: 'error'
+ })
+ return
+ }
+ let records = res.data.records;
+ this.list = [...this.list, ...records]
+ this.loadingStatus = 'nomore'
})
},
- navTo(id){
+ navTo(id) {
uni.navigateTo({
- url:`/subPackage/workbench/views/bailReportDetail?id=${id}`
+ url: `/subPackage/workbench/views/bailReportDetail?id=${id}`
})
}
}
@@ -54,23 +71,28 @@
</script>
<style lang="scss">
- page{
- background-color:#F5F5F5;
+ page {
+ background-color: #F5F5F5;
}
- .list{
- margin:20rpx 30rpx 0;
+
+ .list {
+ margin: 20rpx 30rpx 0;
}
- .list-item{
- padding:0 30rpx 20rpx;
+
+ .list-item {
+ padding: 0 30rpx 20rpx;
border-radius: 8rpx;
- .item-title{
- padding:30rpx 0;
- border-bottom:1px solid #F5F5F5;
+
+ .item-title {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #F5F5F5;
}
- .item-row{
- padding:10rpx 0;
- .address{
- width:65%;
+
+ .item-row {
+ padding: 10rpx 0;
+
+ .address {
+ width: 65%;
}
}
}
diff --git a/subPackage/label/hotel.vue b/subPackage/label/hotel.vue
index 51e46d0..c4cf9d8 100644
--- a/subPackage/label/hotel.vue
+++ b/subPackage/label/hotel.vue
@@ -488,6 +488,7 @@
font-size: 32rpx;
color: #fff;
margin-top: 50rpx;
+ margin-bottom:20rpx;
}
.mb-20 {
diff --git a/subPackage/label/hotel2.vue b/subPackage/label/hotel2.vue
deleted file mode 100644
index 496b019..0000000
--- a/subPackage/label/hotel2.vue
+++ /dev/null
@@ -1,665 +0,0 @@
-<template>
- <view class="container">
- <u-form labelWidth="70" :model="form" :rules="rules" ref="form">
- <!-- <view class="box-title">
- <box-title title="基础信息"></box-title>
- </view> -->
- <view class="item">
- <u-form-item class="form-item" labelWidth="100" label="社区名称:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
- <u-form-item class="form-item" labelWidth="100" label="酒店名称:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
- <u-form-item class="form-item" labelWidth="100" label="自查人姓名:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
- <u-form-item class="form-item" labelWidth="100" label="自查人手机:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
- <u-form-item class="form-item" labelWidth="100" label="自查位置:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
-
- <u-form-item @click="showPicker = true" class="form-item" labelWidth="100" label="灭火器数量:"
- :required="isRequired" :disabled="isDisabled" prop="buildingCode">
- <u--input border="none" disabledColor="#ffffff" v-model="form.building" placeholder="请选择">
- </u--input>
- <u-icon slot="right" name="arrow-right"></u-icon>
- </u-form-item>
- <u-form-item class="form-item" labelWidth="100" label="灭火器状态:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请选择"></u--input>
- <u-icon slot="right" name="arrow-right"></u-icon>
- </u-form-item>
- </view>
-
-
- <view class="box-title">
- <box-title title="灭火器日期(要拍到限用日期)"></box-title>
- </view>
- <view class="item pic mb-20">
- <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
- :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
- :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
- </u-upload>
- </view>
- <view class="item">
- <u-form-item class="form-item" labelWidth="100" label="安全通道有无:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
- <u-form-item @click="showPicker = true" class="form-item" labelWidth="100" label="安全通道状态:"
- :required="isRequired" :disabled="isDisabled" prop="buildingCode">
- <u--input border="none" disabledColor="#ffffff" v-model="form.building" placeholder="请选择">
- </u--input>
- <u-icon slot="right" name="arrow-right"></u-icon>
- </u-form-item>
- </view>
-
-
- <view class="box-title">
- <box-title title="安全通道图片(拍到门和指示箭头)"></box-title>
- </view>
- <view class="item pic mb-20">
- <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
- :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
- :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
- </u-upload>
- </view>
- <view class="item ">
- <u-form-item class="form-item" labelWidth="100" label="技防设施有无:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
- <u-form-item @click="showPicker = true" class="form-item" labelWidth="100" label="技防设施名称:"
- :required="isRequired" :disabled="isDisabled" prop="buildingCode">
- <u--input border="none" disabledColor="#ffffff" v-model="form.building" placeholder="请选择">
- </u--input>
- <u-icon slot="right" name="arrow-right"></u-icon>
- </u-form-item>
- </view>
-
- <view class="box-title">
- <box-title title="技防设施(拍到视频画面)"></box-title>
- </view>
- <view class="item pic">
- <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
- :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
- :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
- </u-upload>
- </view>
- <view class="box-title">
- <box-title title="未成年人入住登记本照片上传"></box-title>
- </view>
- <view class="item pic mb-20">
- <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
- :accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple" :maxCount="uploadConfig.maxCount"
- :capture="uploadConfig.capture" @afterRead="afterReadImg" @delete="deletePic">
- </u-upload>
- </view>
- <u-form-item class="form-item" labelWidth="100" label="是否实名登记:" :required="isRequiredPlace"
- :disabled="isDisabled" prop="placeName">
- <u--input border="none" v-model="form.placeName" placeholder="请输入"></u--input>
- </u-form-item>
-
-
- </u-form>
-
-
-
-
-
-
-
- <view class="bottom">
- <view class="btn">
- <u-button @click="submit" type="primary" text="提交"></u-button>
- </view>
- </view>
-
-
-
- <uni-popup class="citys_win popup_win" ref="uniPopup" type="bottom">
- <wyh-tree-select :items="labelList" title="标签选择" :showNav="true" defaultActiveColor="#4586fe"
- :activeIds="activeIds" @clickItem="labelClick" :showCancel="false" :showConfirm="false">
- </wyh-tree-select>
- </uni-popup>
-
-
- <u-picker :show="showPicker" :defaultIndex="defaultIndex" ref="uPicker" keyName="name" :loading="pickerLoading"
- :columns="pickColumns" @change="changeHandler" @confirm="confirmPicker"
- @cancel="showPicker = false"></u-picker>
- <u-picker :show="show" :columns="columns"></u-picker>
-
-
- </view>
-</template>
-
-<script>
- import uploadMixin from "@/mixin/uploadMixin";
- import lineItem from "@/subPackage/workbench/components/lineItem.vue"
- import {
- getLabelList
- } from "@/api/label/label";
- import {
- getDoorplateAddressDetail,
- getDoorplateAddressList
- } from "@/api/doorplateAddress/doorplateAddress";
- import {
- add
- } from "@/api/place/place";
- export default {
- mixins: [uploadMixin],
- components: {
- lineItem
- },
- data() {
- return {
- isRequired: false,
- isRequiredPlace: true,
- isDisabled: true,
- showPicker: false,
- pickerLoading: false,
- pickColumns: [],
- defaultIndex: [0, 0, 0, 0, 0],
-
- selectValue: [],
-
- form: {
- buildingCode: "",
- label: "",
- remark: "",
- imageUrls: "",
- },
- rules: {
- 'buildingCode': {
- type: 'string',
- required: true,
- message: '请选择楼栋',
- trigger: ['blur', 'change']
- },
- 'placeName': {
- type: 'string',
- required: true,
- message: '请输入场所名称',
- trigger: ['blur', 'change']
- },
- 'label': {
- type: 'string',
- required: true,
- message: '请选择标签',
- trigger: ['blur', 'change'],
- },
- 'username': {
- type: 'string',
- required: true,
- message: '请输入场所负责人',
- trigger: ['blur', 'change'],
- },
- 'phone': {
- type: 'string',
- required: true,
- message: '请输入手机号',
- trigger: ['blur', 'change'],
- },
- },
-
- labelList: [{
- text: '全部标签',
- children: [],
- dot: false
- }, ],
-
- comprehensiveData: {
- basic: [{
- label: "社区名称",
- value: "暂无数据"
- },
- {
- label: "网格名称",
- value: "暂无数据"
- },
- {
- label: "网格员",
- value: "暂无数据"
- },
- {
- label: "联系电话",
- value: "暂无数据"
- }
- ],
- scene: [{
- label: "场所照片",
- value: "",
- useSlot: "pic",
- },
- {
- label: "采集人",
- value: "未完善"
- },
- {
- label: "采集时间",
- value: "未完善"
- },
- {
- label: "场所负责人",
- value: "未完善",
- },
- {
- label: "采集人",
- value: "未完善"
- },
- {
- label: "采集时间",
- value: "未完善",
- },
- {
- label: "历史事件",
- value: "未完善",
- }
- ],
- },
- publicData: {
- basic: [{
- label: "公安局",
- value: "暂无数据"
- },
- {
- label: "派出所",
- value: "暂无数据"
- },
- {
- label: "辖区民警",
- value: "暂无数据"
- },
- {
- label: "联系电话",
- value: "暂无数据"
- }
- ],
- scene: [{
- label: "消防照片",
- value: "",
- useSlot: "pic",
- },
- {
- label: "采集人",
- value: "未完善"
- },
- {
- label: "采集时间",
- value: "未完善"
- },
- {
- label: "消防负责人",
- value: "未完善",
- },
- {
- label: "采集人",
- value: "未完善"
- },
- {
- label: "采集时间",
- value: "未完善",
- },
- {
- label: "历史事件",
- value: "未完善",
- }
- ],
- },
-
- activeIds: [],
- showLabelList: [],
-
- stdId: "",
- }
- },
- watch: {
- activeIds: {
- handler(newVal) {
- this.form.label = newVal.join(",")
- }
- },
- "form.buildingCode": {
- handler(newVal) {
- console.log(newVal)
- }
- }
-
- },
-
- created() {
- this.buildColumn()
- },
- mounted() {
-
- },
- options: {
- styleIsolation: 'shared', // 解除样式隔离
- },
- onLoad(option) {
- this.stdId = option.stdId
- console.log(this.stdId, "----------")
- if (this.stdId) {
- this.getBuildingDetail()
- }
-
-
- },
- onShow() {
- this.getLabel()
- this.getLocation()
- },
- methods: {
-
- getBuildingDetail(params = {}) {
- getDoorplateAddressDetail(Object.assign(params, {
- stdId: this.stdId
- })).then(res => {
- let data = res.data
- this.form.buildingCode = data.buildingCode
-
- let buildingNameArr = [data.townStreetName, data.neiName, data.streetRuName, data.aoiName,
- data.buildingName
- ]
- let arr = buildingNameArr.filter(e => {
- return e != null || e != ''
- })
- this.form.building = arr.join("")
- })
- },
-
- //表单提交
- submit() {
- const that = this
- this.$refs.form.validate().then(valid => {
- if (valid) {
- if (this.form.images.length > 0) {
- let urls = []
- this.form.images.forEach(e => {
- urls.push(e.name)
- })
- this.form.imageUrls = urls.join(",")
- }
- add(this.form).then(res => {
- uni.showToast({
- icon: 'success',
- title: '提交成功',
- success() {
- setTimeout(() => {
- that.$u.func.globalNavigator(
- "/pages/home/index", "switchTab")
- }, 1000)
- }
- })
- })
- }
- })
-
- },
-
- async buildColumn() {
-
- //设置街道
- const townStreet = await this.getDoorplateAddressList(null, "townStreet")
- this.setColumn(townStreet, 0)
- //设置社区
- const nei = await this.getDoorplateAddressList(townStreet[0].code, "nei")
- this.setColumn(nei, 1)
- //设置路
- const streetRu = await this.getDoorplateAddressList(nei[0].code, "streetRu")
- this.setColumn(streetRu, 2)
- //设置地区
- const district = await this.getDoorplateAddressList(streetRu[0].code, "district")
- this.setColumn(district, 3)
- //设置楼栋
- const building = await this.getDoorplateAddressList(district[0].code, "building")
- this.setColumn(building, 4)
- },
-
- setColumn(data, index) {
- this.$set(this.pickColumns, index, data)
- },
-
- getLocation() {
- const that = this
- uni.getLocation({
- type: 'wgs84', // 坐标系类型
- success: function(res) {
- var latitude = res.latitude; // 维度
- var longitude = res.longitude; // 经度
-
- that.form.lng = longitude
- that.form.lat = latitude
-
- that.form.jwd = longitude + "," + latitude
- },
- fail: function(res) {
- console.log('获取定位失败：' + res.errMsg);
- }
- });
- },
-
- async getDoorplateAddressList(code, type) {
- const res = await getDoorplateAddressList(code, type)
- return res.data
- },
-
- confirmPicker(e) {
-
- if (e.value[4]) {
- this.selectValue = e.value
-
- let arr = this.selectValue.map(e => e.name)
- this.form.building = arr.join("")
-
- this.form.buildingCode = e.value[4].code
- }
- this.showPicker = false
- },
-
- async changeHandler(e) {
- const {
- columnIndex,
- index,
- // 微信小程序无法将picker实例传出来，只能通过ref操作
- picker = this.$refs.uPicker
- } = e
- let item = e.values[columnIndex][index]
- //街道
- if (columnIndex === 0) {
- //获取社区列表
- const nei = await this.getDoorplateAddressList(item.code, "nei")
- picker.setColumnValues(1, nei)
-
- const streetRu = await this.getDoorplateAddressList(nei[0].code, "streetRu")
- picker.setColumnValues(2, streetRu)
-
- const district = await this.getDoorplateAddressList(streetRu[0].code, "district")
- picker.setColumnValues(3, district)
-
- const building = await this.getDoorplateAddressList(district[0].code, "building")
- picker.setColumnValues(4, building)
- }
-
- if (columnIndex === 1) {
- const streetRu = await this.getDoorplateAddressList(item.code, "streetRu")
- picker.setColumnValues(2, streetRu)
-
- const district = await this.getDoorplateAddressList(streetRu[0].code, "district")
- picker.setColumnValues(3, district)
-
- const building = await this.getDoorplateAddressList(district[0].code, "building")
- picker.setColumnValues(4, building)
- }
-
- if (columnIndex === 2) {
-
- const district = await this.getDoorplateAddressList(item.code, "district")
- picker.setColumnValues(3, district)
-
- const building = await this.getDoorplateAddressList(district[0].code, "building")
- picker.setColumnValues(4, building)
- }
-
- if (columnIndex === 3) {
- const building = await this.getDoorplateAddressList(item.code, "building")
- picker.setColumnValues(4, building)
- }
-
- },
-
- //弹出层打开
- popup() {
- this.$refs.uniPopup.open()
- },
-
- getLabel() {
- getLabelList({
- size: -1
- }).then(res => {
- let data = res.data.records
- data.sort((a, b) => a.sort - b.sort)
-
- data.forEach(label => {
- this.labelList[0].children.push({
- id: label.id,
- text: label.labelName
- })
- })
- })
- },
-
- labelClick(item) {
-
- //判断label是否已在
- const label = this.showLabelList.find(e => e.id == item.id)
- if (label) {
- //在，去掉
- this.showLabelList = this.showLabelList.filter(e => e.id != label.id)
- this.activeIds = this.activeIds.filter(e => e != label.id)
- } else {
- //不在，添加
- item.isClose = false
- this.showLabelList.push(item)
- this.activeIds.push(item.id)
- }
-
- this.showLabelList.sort((a, b) => a.sort - b.sort)
-
- },
- delTag(label) {
- label.isClose = true
- this.showLabelList = this.showLabelList.filter(e => e.id != label.id)
- this.activeIds = this.activeIds.filter(e => e != label.id)
-
- }
- }
- }
-</script>
-
-<style lang="scss">
-
- page{
- background-color: #F5F5F5;;
- }
-
- .container {
- // position: relative;
- width: 100%;
- // height: 100%;
- // display: flex;
- // flex-direction: column;
- // background: #F9F9FA;
-
- .box-title {
- padding: 10px 0;
-
- .title-more {
- display: flex;
- align-items: center;
- height: 100%;
-
- .item {
- width: 50rpx;
- height: 40rpx;
- color: #ffffff;
- padding: 6rpx;
- font-size: 2rpx;
- text-align: center;
- line-height: 20px;
- }
-
- }
- }
-
- .item {
- padding:0 30rpx;
- .form-item {
- // background-color: #ffffff;
- // padding: 2rpx 10px;
- // border-bottom: 0.1px solid #eff1f3;
- }
-
- .label {
- padding: 10rpx 30rpx;
- display: flex;
- background-color: #ffffff;
- flex-wrap: wrap;
-
- .activeLabel {
- // width: 80rpx;
- margin-left: 10rpx;
- margin-top: 10rpx
- }
- }
-
-
-
- }
-
- .pic {
- background-color: #ffffff;
- padding: 40rpx 30rpx;
- }
-
- .bottom {
- padding: 20rpx;
- background-color: #ffffff;
- display: flex;
- justify-content: center;
- align-items: center;
-
- .btn {
- width: calc(100% - 40rpx);
- }
- }
- }
-
- /deep/ .u-form-item {
- background-color: #ffffff;
- padding: 2rpx 10px;
- border-bottom: 1px solid #eff1f3;
- }
-
- .red {
- background-color: red;
- border-radius: 10rpx 0rpx 0rpx 10rpx;
- }
-
- .orange {
- background-color: orange;
- }
-
- .green {
- background-color: green;
- border-radius: 0rpx 10rpx 10rpx 0rpx;
- }
-</style>
\ No newline at end of file
diff --git a/subPackage/label/hotelList.vue b/subPackage/label/hotelList.vue
index 0a211d9..269bc5c 100644
--- a/subPackage/label/hotelList.vue
+++ b/subPackage/label/hotelList.vue
@@ -1,49 +1,66 @@
<template>
<view class="">
- <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>
- <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>
- </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>
- </view>
+ <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>
+ <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>
+ </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.applyTime}}</text>
+ </view>
+ </view>
+ </view>
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
</template>
<script>
- import {getHotelReportingList} from "@/api/reporting/reporting.js"
+ import {
+ getHotelReportingList
+ } from "@/api/reporting/reporting.js"
export default {
- data(){
+ data() {
return {
- list:[]
+ list: [],
+ currentPage: 1,
+ loadingStatus: 'nomore',
}
},
-
- onLoad(){
+
+ onLoad() {
this.getList()
},
-
- methods:{
- getList(){
+ onReachBottom() {
+ this.currentPage++
+ this.getList()
+ },
+
+ methods: {
+ getList() {
getHotelReportingList({
- checkUserId:uni.getStorageSync("userInfo").user_id,
- page:1,
- size:20
- }).then(res=>{
- console.log(res)
- this.list = res.data.records;
+ checkUserId: uni.getStorageSync("userInfo").user_id,
+ page: this.currentPage,
+ size: 10
+ }).then(res => {
+ if (res.code != 200) {
+ uni.showToast({
+ title: '数据请求失败',
+ icon: 'error'
+ })
+ return
+ }
+ let records = res.data.records;
+ this.list = [...this.list, ...records]
+ this.loadingStatus = 'nomore'
})
},
- navTo(id){
+ navTo(id) {
uni.navigateTo({
- url:`/subPackage/workbench/views/hotelReportDetail?id=${id}`
+ url: `/subPackage/workbench/views/hotelReportDetail?id=${id}`
})
}
}
@@ -51,23 +68,28 @@
</script>
<style lang="scss">
- page{
- background-color:#F5F5F5;
+ page {
+ background-color: #F5F5F5;
}
- .list{
- margin:20rpx 30rpx 0;
+
+ .list {
+ margin: 20rpx 30rpx 0;
}
- .list-item{
- padding:0 30rpx 20rpx;
+
+ .list-item {
+ padding: 0 30rpx 20rpx;
border-radius: 8rpx;
- .item-title{
- padding:30rpx 0;
- border-bottom:1px solid #F5F5F5;
+
+ .item-title {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #F5F5F5;
}
- .item-row{
- padding:10rpx 0;
- .address{
- width:65%;
+
+ .item-row {
+ padding: 10rpx 0;
+
+ .address {
+ width: 65%;
}
}
}
diff --git a/subPackage/workbench/views/audit.vue b/subPackage/workbench/views/audit.vue
index 14032d4..04d0a39 100644
--- a/subPackage/workbench/views/audit.vue
+++ b/subPackage/workbench/views/audit.vue
@@ -1,14 +1,14 @@
-
<template>
<view>
<view class="tab">
- <u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}" :activeStyle="{color:'#017BFC'}"></u-tabs>
+ <u-tabs :list="tabList" :current="tabIndex" @click="changeTab" :inactiveStyle="{color:'#999999'}"
+ :activeStyle="{color:'#017BFC'}"></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)">
+ <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 == 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>
@@ -22,60 +22,61 @@
</view>
</view>
</view>
- <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
+ <u-loadmore :status="loadingStatus" loadmoreText="开始加载" loadingText="数据加载中" nomoreText="没有更多了" line />
</view>
</template>
<script>
- import { getAuditReportingList } from "@/api/reporting/reporting"
+ import {
+ getAuditReportingList
+ } from "@/api/reporting/reporting"
export default {
- data(){
+ data() {
return {
- tabList:[
+ tabList: [{
+ name: "待审核",
+ status: 1
+ },
{
- name:"待审核",
- status:1
- },
- {
- name:"审核通过",
- status:2
- },
- {
- name:"已拒绝",
- status:3
- },
+ name: "审核通过",
+ status: 2
+ },
+ {
+ name: "已拒绝",
+ status: 3
+ },
],
- tabIndex:0,
- currentStatus:1,
- list:[],
+ tabIndex: 0,
+ currentStatus: 1,
+ list: [],
loadingStatus: 'nomore',
- currentPage:1
+ currentPage: 1
}
},
-
- onLoad(){
+
+ onLoad() {
this.getList()
},
onReachBottom() {
this.currentPage++
this.getPageList()
},
-
- methods:{
- changeTab(e){
+
+ methods: {
+ changeTab(e) {
this.tabIndex = e.index;
this.currentStatus = e.status;
this.list = [];
this.currentPage = 1;
this.getList();
},
- getList(){
+ getList() {
getAuditReportingList({
- page:this.currentPage,
- size:20,
- status:this.currentStatus
- }).then(res=>{
- if(res.code != 200){
+ page: this.currentPage,
+ size: 20,
+ status: this.currentStatus
+ }).then(res => {
+ if (res.code != 200) {
uni.showToast({
title: '数据请求失败',
icon: 'error'
@@ -87,12 +88,12 @@
this.loadingStatus = 'nomore'
})
},
- navTo(name,id){
- if(name == "旅馆安全"){
+ navTo(name, id) {
+ if (name == "旅馆安全") {
this.$u.func.globalNavigator(`hotelReportDetail?id=${id}`)
- }else if (name == "取保候审"){
+ } else if (name == "取保候审") {
this.$u.func.globalNavigator(`bailReportDetail?id=${id}`)
- }else{
+ } else {
this.$u.func.globalNavigator(`labelReportDetail?id=${id}`)
}
}
@@ -101,43 +102,50 @@
</script>
<style lang="scss">
- page{
- background-color:#F5F5F5;
+ page {
+ background-color: #F5F5F5;
}
- .tab{
- width:100%;
- height:88rpx;
- position:fixed;
+
+ .tab {
+ width: 100%;
+ height: 88rpx;
+ position: fixed;
/*#ifdef H5*/
- top:88rpx;
+ top: 88rpx;
/*#endif*/
- /*#ifdef MP-WEIXIN*/
- top:0;
+ /*#ifdef MP-WEIXIN*/
+ top: 0;
/*#endif*/
- left:0;
- background-color:#fff;
- padding:0 30rpx;
+ left: 0;
+ background-color: #fff;
+ padding: 0 30rpx;
box-sizing: border-box;
z-index: 999;
-
+
}
- .tab /deep/.u-tabs__wrapper__nav__item{
- flex:1;
+
+ .tab /deep/.u-tabs__wrapper__nav__item {
+ flex: 1;
}
- .list{
- margin:118rpx 30rpx 0;
+
+ .list {
+ margin: 118rpx 30rpx 0;
}
- .list-item{
- padding:0 30rpx 20rpx;
+
+ .list-item {
+ padding: 0 30rpx 20rpx;
border-radius: 8rpx;
- .item-title{
- padding:30rpx 0;
- border-bottom:1px solid #F5F5F5;
+
+ .item-title {
+ padding: 30rpx 0;
+ border-bottom: 1px solid #F5F5F5;
}
- .item-row{
- padding:10rpx 0;
- .address{
- width:65%;
+
+ .item-row {
+ padding: 10rpx 0;
+
+ .address {
+ width: 65%;
}
}
}
diff --git a/subPackage/workbench/views/bailReportDetail.vue b/subPackage/workbench/views/bailReportDetail.vue
index d5a6e15..8415b7e 100644
--- a/subPackage/workbench/views/bailReportDetail.vue
+++ b/subPackage/workbench/views/bailReportDetail.vue
@@ -52,7 +52,7 @@
inputAlign="right"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item label="报备位置" prop="checkUserName" borderBottom @click="getLocation('returnLocation')">
+ <u-form-item label="报备位置" prop="checkUserName" borderBottom @click="getLocation('startLocation')">
<u-input v-model="goOutInfo.startLocation" disabled disabledColor="#ffffff"
border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
@@ -66,7 +66,7 @@
inputAlign="right"></u-input>
<u-icon slot="right" name="arrow-right"></u-icon>
</u-form-item>
- <u-form-item label="到达位置" prop="reachLocation" borderBottom @click="getLocation('returnLocation')">
+ <u-form-item label="到达位置" prop="reachLocation" borderBottom @click="getLocation('reachLocation')">
<u-input v-model="goOutInfo.reachLocation" disabled disabledColor="#ffffff"
border="none" placeholder="请获取当前位置" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
@@ -124,8 +124,11 @@
</view>
- <view class="bottom-btn" v-if="(roleType == 1 && status == 1) || (roleType == 2 && status == 2)">
+ <view class="bottom-btn" v-if="roleType == 1 && status == 1">
<u-button type="primary" @click="submit">提交审核</u-button>
+ </view>
+ <view class="bottom-btn" v-if="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"
:formatter="formatter" @confirm="confirmDate" @cancel="cancelPickerDate"></u-datetime-picker>
@@ -229,7 +232,7 @@
}
],
tabIndex:0,
- goOutDate:["","",""],
+ goOutDate:[new Date(),new Date(),new Date()],
showSelectDate:false,
status:1 ,//当前状态 1待审核 2审核通过 3审核不通过
id:""
@@ -247,6 +250,9 @@
} else {
this.roleType = 1;
}
+ // this.goOutDate.forEach(item=>{
+ // item = new Date()
+ // })
},
methods: {
@@ -256,14 +262,14 @@
},
showPickerDate(){
- if(this.roleType == 2) return;
+ if(this.roleType == 2 && this.status != 2) return;
this.showSelectDate = true;
},
cancelPickerDate(){
this.showSelectDate = false;
},
showPicker(){
- if(this.roleType == 2) return;
+ if(this.roleType == 2 && this.status != 2) return;
this.isPickerShow = true
},
@@ -291,7 +297,8 @@
},
getLocation(key){
- if(this.roleType == 2) return;
+ console.log(key)
+ if(this.roleType == 2 && this.status != 2) return;
uni.chooseLocation({
success:(res)=>{
console.log(res);
@@ -362,7 +369,7 @@
checkImages() {
if (this.startImageUrls.length) {
- this.$set(this.goOutInfo, "startImageUrls", this.setGoOutImages(this.fireImageUrls))
+ this.$set(this.goOutInfo, "startImageUrls", this.setGoOutImages(this.startImageUrls))
}
if (this.reachImageUrls.length) {
this.$set(this.goOutInfo, "reachImageUrls", this.setGoOutImages(this.reachImageUrls))
@@ -401,6 +408,10 @@
icon: 'error'
})
}else {
+ uni.showToast({
+ title: '提交成功!',
+ icon: 'success'
+ })
this.getDetailInfo(this.taskId)
}
// uni.navigateBack()
@@ -465,5 +476,10 @@
}
+ .upload-item {
+ width: 140rpx;
+ height: 140rpx;
+ border: 1px solid #EEEEEE;
+ }
</style>
\ No newline at end of file
--
Gitblit v1.9.3