From 8a736f150b04c87bd4124b4996a4b3188f2aee2e Mon Sep 17 00:00:00 2001
From: Lou <luzhiping@qqyjz.com>
Date: Thu, 09 Nov 2023 17:47:37 +0800
Subject: [PATCH] 新增报事列表
---
subPackage/label/formList.vue | 70 ++++
subPackage/label/bailList.vue | 69 ++++
api/reporting/reporting.js | 42 ++
manifest.json | 474 ++++++++++++++--------------
pages.json | 29 +
subPackage/label/bail.vue | 22
subPackage/label/hotelList.vue | 69 ++++
subPackage/label/index.vue | 31 +
subPackage/label/hotel.vue | 9
subPackage/label/form.vue | 120 +++---
10 files changed, 607 insertions(+), 328 deletions(-)
diff --git a/api/reporting/reporting.js b/api/reporting/reporting.js
index 1db1d29..a49e2a2 100644
--- a/api/reporting/reporting.js
+++ b/api/reporting/reporting.js
@@ -1,5 +1,14 @@
import http from '@/http/api.js'
+//获取报事数量统计
+export const getReportingCount = (data) => {
+ return http.request({
+ url: '/blade-task/task/countNumber',
+ method: 'POST',
+ data: data
+ })
+}
+
//添加旅馆安全报事
export const saveHotelReporting = (data) => {
return http.request({
@@ -9,6 +18,39 @@
})
}
+//获取旅馆安报事列表
+export const getHotelReportingList = (params) => {
+ return http.request({
+ url: '/blade-taskHotelReporting/taskHotelReporting/page',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
+//获取取保候审报事列表
+export const geteBailReportingList = (params) => {
+ return http.request({
+ url: '/blade-taskBailReportingEvent/taskBailReportingEvent/page',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
+//获取打金店报事列表
+export const getLabelReportingList = (params) => {
+ return http.request({
+ url: '/blade-taskLabelReportingEvent/taskLabelReportingEvent/page',
+ method: 'get',
+ params: {
+ ...params
+ }
+ })
+}
+
//添加取保候审报事
export const saveBailReporting = (data) => {
return http.request({
diff --git a/manifest.json b/manifest.json
index 5f6b0b2..05e5a7d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -1,238 +1,238 @@
{
- "name": "荆楚水库",
- "appid": "__UNI__EB167C0",
- "description": "",
- "versionName": "1.0.10",
- "versionCode": 104,
- "transformPx": false,
- /* 5+App特有相关 */
- "app-plus": {
- "compatible": {
- "ignoreVersion": true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
- },
- "safearea": {
- "bottom": {
- "offset": "none"
- }
- },
- "usingComponents": true,
- "nvueCompiler": "uni-app",
- "compilerVersion": 3,
- "splashscreen": {
- "alwaysShowBeforeRender": false,
- "waiting": false,
- "autoclose": false,
- "delay": 0
- },
- /* 模块配置 */
- "modules": {
- "VideoPlayer": {},
- "Camera": {},
- "Geolocation": {},
- "Push": {},
- "Maps": {}
- },
- /* 应用发布信息 */
- "distribute": {
- /* android打包配置 */
- "android": {
- "permissions": [
- "<uses-feature android:name=\"android.hardware.camera\"/>",
- "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
- "<uses-permission android:name=\"android.permission.CAMERA\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
- "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
- "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
- "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
- "<uses-permission android:name=\"android.permission.INTERNET\"/>",
- "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
- "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
- "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
- "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
- "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
- "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
- "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
- "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
- "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
- ],
- "abiFilters": ["armeabi-v7a", "arm64-v8a"]
- },
- /* ios打包配置 */
- "ios": {
- "dSYMs": false,
- "UIBackgroundModes": "",
- "idfa": false
- },
- /* SDK配置 */
- "sdkConfigs": {
- "ad": {},
- "maps": {
- "amap": {
- "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
- }
- },
- "geolocation": {
- "amap": {
- "__platform__": ["ios", "android"],
- "appkey_ios": "4bcdf5434597cc9160c9e0168c4a7bc7",
- "appkey_android": "c21be9bc7343573c28112c4fe272cb41"
- },
- "system": {
- "__platform__": ["ios", "android"]
- }
- },
- "push": {
- "unipush": {
- "offline": true
- }
- }
- },
- "icons": {
- "android": {
- "hdpi": "D:/Desktop/hbsl/app/应用图标/72.png",
- "xhdpi": "D:/Desktop/hbsl/app/应用图标/96.png",
- "xxhdpi": "D:/Desktop/hbsl/app/应用图标/144.png",
- "xxxhdpi": "D:/Desktop/hbsl/app/应用图标/192.png"
- },
- "ios": {
- "appstore": "D:/Desktop/icon/1024x1024bb.png",
- "iphone": {
- "app@2x": "D:/Desktop/icon/120.png",
- "app@3x": "D:/Desktop/icon/180.png",
- "spotlight@2x": "D:/Desktop/icon/80.png",
- "spotlight@3x": "D:/Desktop/icon/120.png",
- "settings@2x": "D:/Desktop/icon/58.png",
- "settings@3x": "D:/Desktop/icon/87.png",
- "notification@2x": "D:/Desktop/icon/40.png",
- "notification@3x": "D:/Desktop/icon/60.png"
- },
- "ipad": {
- "app": "",
- "app@2x": "",
- "proapp@2x": "",
- "spotlight": "",
- "spotlight@2x": "",
- "settings": "",
- "settings@2x": "",
- "notification": "",
- "notification@2x": ""
- }
- }
- },
- "splashscreen": {
- "useOriginalMsgbox": true
- }
- },
- "uniStatistics": {
- "enable": false
- },
- "nativePlugins": {}
- },
- /* 快应用特有相关 */
- "quickapp": {},
- /* 小程序特有相关 */
- "mp-weixin": {
- "appid": "wx1ff4bbc24b343ef1",
- "setting": {
- "urlCheck": false,
- "minified": true,
- "postcss": true,
- "es6": true
- },
- "usingComponents": true,
- "optimization": {
- "subPackages": true
- },
- "uniStatistics": {
- "enable": false
- },
- "requiredPrivateInfos": ["getLocation"],
- "permission": {
- "scope.userLocation": {
- "desc": "定位"
- }
- }
- },
- "mp-alipay": {
- "usingComponents": true,
- "uniStatistics": {
- "enable": false
- }
- },
- "mp-baidu": {
- "usingComponents": true,
- "uniStatistics": {
- "enable": false
- }
- },
- "mp-toutiao": {
- "usingComponents": true,
- "setting": {
- "es6": true,
- "minified": true,
- "postcss": true,
- "urlCheck": false
- },
- "uniStatistics": {
- "enable": false
- }
- },
- "h5": {
- "template": "template.h5.html",
- "router": {
- "mode": "hash",
- "base": "/app"
- },
- "optimization": {
- "treeShaking": {
- "enable": true
- }
- },
- "devServer": {
- "proxy": {
- "/api": {
- "target": "http://127.0.0.1",
- //"target" : "https://rider.bladex.vip/api",
- "pathRewrite": {
- "^/api": "/"
- }
- }
- },
- "port": "",
- "https": false
- },
- "uniStatistics": {
- "enable": false
- },
- "sdkConfigs": {
- "maps": {
- "amap": {
- "key": "7fa69abe1defd5888bb85bc736cda874",
- "securityJsCode": "8ac9e5f522c62ed6e3a5800a87b0d140",
- "serviceHost": ""
- }
- }
- },
- "unipush": {
- "enable": false
- }
- },
- "uniStatistics": {
- "enable": false
- },
- "mp-qq": {
- "uniStatistics": {
- "enable": false
- }
- }
-}
\ No newline at end of file
+ "name" : "荆楚水库",
+ "appid" : "__UNI__EB167C0",
+ "description" : "",
+ "versionName" : "1.0.10",
+ "versionCode" : 104,
+ "transformPx" : false,
+ /* 5+App特有相关 */
+ "app-plus" : {
+ "compatible" : {
+ "ignoreVersion" : true //true表示忽略版本检查提示框，HBuilderX1.9.0及以上版本支持
+ },
+ "safearea" : {
+ "bottom" : {
+ "offset" : "none"
+ }
+ },
+ "usingComponents" : true,
+ "nvueCompiler" : "uni-app",
+ "compilerVersion" : 3,
+ "splashscreen" : {
+ "alwaysShowBeforeRender" : false,
+ "waiting" : false,
+ "autoclose" : false,
+ "delay" : 0
+ },
+ /* 模块配置 */
+ "modules" : {
+ "VideoPlayer" : {},
+ "Camera" : {},
+ "Geolocation" : {},
+ "Push" : {},
+ "Maps" : {}
+ },
+ /* 应用发布信息 */
+ "distribute" : {
+ /* android打包配置 */
+ "android" : {
+ "permissions" : [
+ "<uses-feature android:name=\"android.hardware.camera\"/>",
+ "<uses-feature android:name=\"android.hardware.camera.autofocus\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_COARSE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_FINE_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_LOCATION_EXTRA_COMMANDS\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_MOCK_LOCATION\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.ACCESS_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CALL_PHONE\"/>",
+ "<uses-permission android:name=\"android.permission.CAMERA\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_NETWORK_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.CHANGE_WIFI_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.FLASHLIGHT\"/>",
+ "<uses-permission android:name=\"android.permission.GET_ACCOUNTS\"/>",
+ "<uses-permission android:name=\"android.permission.INTERNET\"/>",
+ "<uses-permission android:name=\"android.permission.MODIFY_AUDIO_SETTINGS\"/>",
+ "<uses-permission android:name=\"android.permission.MOUNT_UNMOUNT_FILESYSTEMS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_LOGS\"/>",
+ "<uses-permission android:name=\"android.permission.READ_PHONE_STATE\"/>",
+ "<uses-permission android:name=\"android.permission.RECORD_AUDIO\"/>",
+ "<uses-permission android:name=\"android.permission.REQUEST_INSTALL_PACKAGES\"/>",
+ "<uses-permission android:name=\"android.permission.VIBRATE\"/>",
+ "<uses-permission android:name=\"android.permission.WAKE_LOCK\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_CONTACTS\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_EXTERNAL_STORAGE\"/>",
+ "<uses-permission android:name=\"android.permission.WRITE_SETTINGS\"/>"
+ ],
+ "abiFilters" : [ "armeabi-v7a", "arm64-v8a" ]
+ },
+ /* ios打包配置 */
+ "ios" : {
+ "dSYMs" : false,
+ "UIBackgroundModes" : "",
+ "idfa" : false
+ },
+ /* SDK配置 */
+ "sdkConfigs" : {
+ "ad" : {},
+ "maps" : {
+ "amap" : {
+ "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
+ }
+ },
+ "geolocation" : {
+ "amap" : {
+ "__platform__" : [ "ios", "android" ],
+ "appkey_ios" : "4bcdf5434597cc9160c9e0168c4a7bc7",
+ "appkey_android" : "c21be9bc7343573c28112c4fe272cb41"
+ },
+ "system" : {
+ "__platform__" : [ "ios", "android" ]
+ }
+ },
+ "push" : {
+ "unipush" : {
+ "offline" : true
+ }
+ }
+ },
+ "icons" : {
+ "android" : {
+ "hdpi" : "D:/Desktop/hbsl/app/应用图标/72.png",
+ "xhdpi" : "D:/Desktop/hbsl/app/应用图标/96.png",
+ "xxhdpi" : "D:/Desktop/hbsl/app/应用图标/144.png",
+ "xxxhdpi" : "D:/Desktop/hbsl/app/应用图标/192.png"
+ },
+ "ios" : {
+ "appstore" : "D:/Desktop/icon/1024x1024bb.png",
+ "iphone" : {
+ "app@2x" : "D:/Desktop/icon/120.png",
+ "app@3x" : "D:/Desktop/icon/180.png",
+ "spotlight@2x" : "D:/Desktop/icon/80.png",
+ "spotlight@3x" : "D:/Desktop/icon/120.png",
+ "settings@2x" : "D:/Desktop/icon/58.png",
+ "settings@3x" : "D:/Desktop/icon/87.png",
+ "notification@2x" : "D:/Desktop/icon/40.png",
+ "notification@3x" : "D:/Desktop/icon/60.png"
+ },
+ "ipad" : {
+ "app" : "",
+ "app@2x" : "",
+ "proapp@2x" : "",
+ "spotlight" : "",
+ "spotlight@2x" : "",
+ "settings" : "",
+ "settings@2x" : "",
+ "notification" : "",
+ "notification@2x" : ""
+ }
+ }
+ },
+ "splashscreen" : {
+ "useOriginalMsgbox" : true
+ }
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "nativePlugins" : {}
+ },
+ /* 快应用特有相关 */
+ "quickapp" : {},
+ /* 小程序特有相关 */
+ "mp-weixin" : {
+ "appid" : "wxdc5675f4df850da6",
+ "setting" : {
+ "urlCheck" : false,
+ "minified" : true,
+ "postcss" : true,
+ "es6" : true
+ },
+ "usingComponents" : true,
+ "optimization" : {
+ "subPackages" : true
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "requiredPrivateInfos" : [ "getLocation" ],
+ "permission" : {
+ "scope.userLocation" : {
+ "desc" : "定位"
+ }
+ }
+ },
+ "mp-alipay" : {
+ "usingComponents" : true,
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-baidu" : {
+ "usingComponents" : true,
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "mp-toutiao" : {
+ "usingComponents" : true,
+ "setting" : {
+ "es6" : true,
+ "minified" : true,
+ "postcss" : true,
+ "urlCheck" : false
+ },
+ "uniStatistics" : {
+ "enable" : false
+ }
+ },
+ "h5" : {
+ "template" : "template.h5.html",
+ "router" : {
+ "mode" : "hash",
+ "base" : "/app"
+ },
+ "optimization" : {
+ "treeShaking" : {
+ "enable" : true
+ }
+ },
+ "devServer" : {
+ "proxy" : {
+ "/api" : {
+ "target" : "http://127.0.0.1",
+ //"target" : "https://rider.bladex.vip/api",
+ "pathRewrite" : {
+ "^/api" : "/"
+ }
+ }
+ },
+ "port" : "",
+ "https" : false
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "sdkConfigs" : {
+ "maps" : {
+ "amap" : {
+ "key" : "7fa69abe1defd5888bb85bc736cda874",
+ "securityJsCode" : "8ac9e5f522c62ed6e3a5800a87b0d140",
+ "serviceHost" : ""
+ }
+ }
+ },
+ "unipush" : {
+ "enable" : false
+ }
+ },
+ "uniStatistics" : {
+ "enable" : false
+ },
+ "mp-qq" : {
+ "uniStatistics" : {
+ "enable" : false
+ }
+ }
+}
diff --git a/pages.json b/pages.json
index 868e39b..6a4cc3a 100644
--- a/pages.json
+++ b/pages.json
@@ -139,7 +139,34 @@
{
"path": "form",
"style": {
- "navigationBarTitleText": "大金店报事",
+ "navigationBarTitleText": "打金店报事",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "hotelList",
+ "style": {
+ "navigationBarTitleText": "报事列表",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "bailList",
+ "style": {
+ "navigationBarTitleText": "报事列表",
+ "enablePullDownRefresh": false,
+ "navigationBarBackgroundColor": "#fff",
+ "navigationBarTextStyle": "black"
+ }
+ },
+ {
+ "path": "formList",
+ "style": {
+ "navigationBarTitleText": "报事列表",
"enablePullDownRefresh": false,
"navigationBarBackgroundColor": "#fff",
"navigationBarTextStyle": "black"
diff --git a/subPackage/label/bail.vue b/subPackage/label/bail.vue
index 4a022ba..6f27e40 100644
--- a/subPackage/label/bail.vue
+++ b/subPackage/label/bail.vue
@@ -5,7 +5,7 @@
:labelStyle="{fontSize:'28rpx'}">
<view class="content">
<u-form-item label="姓名" prop="checkUserName" borderBottom required>
- <u-input v-model="info.checkUserName" disabled disabledColor="#fff" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
+ <u-input v-model="info.checkUserName" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
<u-form-item label="手机" prop="checkTelephone" borderBottom required>
@@ -30,9 +30,9 @@
<view class="upload bgc-ff">
<view class="f-28 mb-20">位置图片</view>
<view class="mt-20">
- <u-upload :fileList="form.image" :previewFullImage="uploadConfig.previewFullImage"
+ <u-upload :fileList="form.images" :previewFullImage="uploadConfig.previewFullImage"
:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
- :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'fireImageUrls')"
+ :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImg"
@delete="deletePic">
<view class="upload-item upload-icon flex_base">
<u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
@@ -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" @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>
@@ -130,14 +130,10 @@
},
confirmDate(e) {
- console.log(e);
this.showSelectDate = false;
- this.info.applyTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
+ this.info.applyTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM:ss')
},
-
-
-
checkImages() {
if (this.form.images.length) {
this.$set(this.info,"locationImageUrls",this.setImages())
@@ -153,7 +149,7 @@
},
sumitInfo() {
- this.$refs.info.validate().then(valid => {
+ this.$refs.form.validate().then(valid => {
this.checkImages();
saveBailReporting(this.info).then(res => {
uni.showToast({
@@ -161,7 +157,8 @@
title: '提交成功',
success() {
setTimeout(() => {
- that.$u.func.globalNavigator("", "navBack")
+ // this.$u.func.globalNavigator("", "navBack")
+ uni.navigateBack()
}, 1000)
}
})
@@ -169,8 +166,7 @@
})
},
navigatorPage() {
- let url = "/subPackage/bs/views/repairList" + "?title=" + this.title + "&type=" + this.info.type
- this.$u.func.globalNavigator(url, "navTo")
+ this.$u.func.globalNavigator('bailList', "navTo")
}
}
}
diff --git a/subPackage/label/bailList.vue b/subPackage/label/bailList.vue
new file mode 100644
index 0000000..60458ea
--- /dev/null
+++ b/subPackage/label/bailList.vue
@@ -0,0 +1,69 @@
+<template>
+ <view class="">
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k">
+ <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>
+</template>
+
+<script>
+ import {getBailReportingList} from "@/api/reporting/reporting.js"
+ export default {
+ data(){
+ return {
+ list:[]
+ }
+ },
+
+ onLoad(){
+ this.getList()
+ },
+
+ methods:{
+ getList(){
+ getBailReportingList({
+ checkUserId:uni.getStorageSync("userInfo").user_id,
+ page:1,
+ size:20
+ }).then(res=>{
+ console.log(res)
+ this.list = res.data.records;
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ page{
+ background-color:#F5F5F5;
+ }
+ .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%;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/label/form.vue b/subPackage/label/form.vue
index 88a0151..7df12db 100644
--- a/subPackage/label/form.vue
+++ b/subPackage/label/form.vue
@@ -4,27 +4,25 @@
<u-form labelPosition="left" :model="info" :rules="rules" ref="form" labelWidth="100"
:labelStyle="{fontSize:'28rpx'}">
<view class="content">
-
- <u-form-item label="对象电话" prop="transactionObjectTel" borderBottom required>
- <u-input v-model="info.transactionObjectTel" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
- inputAlign="right"></u-input>
+ <u-form-item label="对象电话" prop="transactionObjectTel" borderBottom required>
+ <u-input v-model="info.transactionObjectTel" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="交易金额" prop="transactionMoney" borderBottom required>
- <u-input v-model="info.transactionMoney" disabled disabledColor="#fff" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
- inputAlign="right"></u-input>
+ <u-form-item label="交易金额" prop="transactionMoney" borderBottom required>
+ <u-input v-model="info.transactionMoney" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
</u-form-item>
- <u-form-item label="物品数量" prop="goodsNums" borderBottom required>
- <u-input v-model="info.goodsNums" type="number" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
- inputAlign="right"></u-input>
+ <u-form-item label="物品数量" prop="goodsNums" borderBottom required>
+ <u-input v-model="info.goodsNums" type="number" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
</u-form-item>
-
<u-form-item label="交易位置" prop="location" borderBottom ref="location" required>
- <u-input v-model="info.location" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
+ <u-input v-model="info.location" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
inputAlign="right"></u-input>
</u-form-item>
<u-form-item label="交易过程" prop="transactionProcess" borderBottom>
- <u-input v-model="info.transactionProcess" border="none" placeholder="请输入" placeholderClass="f-28 c-99"
- inputAlign="right"></u-input>
+ <u-input v-model="info.transactionProcess" border="none" placeholder="请输入"
+ placeholderClass="f-28 c-99" inputAlign="right"></u-input>
</u-form-item>
</view>
@@ -33,8 +31,8 @@
<view class="mt-20">
<u-upload :fileList="imageUrls" :previewFullImage="uploadConfig.previewFullImage"
:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
- :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'imageUrls')"
- @delete="deletePic">
+ :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
+ @afterRead="afterReadImgs($event,'imageUrls')" @delete="deletePic">
<view class="upload-item upload-icon flex_base">
<u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
</view>
@@ -46,8 +44,8 @@
<view class="mt-20">
<u-upload :fileList="goodsImageUrls" :previewFullImage="uploadConfig.previewFullImage"
:accept="uploadConfig.acceptImg" :multiple="uploadConfig.multiple"
- :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture" @afterRead="afterReadImgs($event,'goodsImageUrls')"
- @delete="deletePic">
+ :maxCount="uploadConfig.maxCount" :capture="uploadConfig.capture"
+ @afterRead="afterReadImgs($event,'goodsImageUrls')" @delete="deletePic">
<view class="upload-item upload-icon flex_base">
<u-icon name="/static/icon/upload.png" width="60rpx" height="60rpx"></u-icon>
</view>
@@ -58,7 +56,7 @@
</u-form>
<button class="submit-btn" @click="sumitInfo">提交</button>
- <!-- <button class="list-btn" @click="navigatorPage">我上报的事件</button> -->
+ <button class="list-btn" @click="navigatorPage">我上报的事件</button>
</view>
</template>
@@ -70,17 +68,17 @@
} from "@/api/reporting/reporting";
export default {
mixins: [uploadMixin],
- data(){
- return{
+ data() {
+ return {
info: {
- transactionObjectTel:"",
- transactionMoney:"",
- goodsNums:"",
- location:"",
- transactionProcess:"",
- districtId:"",
- districtName:"",
- userId:""
+ transactionObjectTel: "",
+ transactionMoney: "",
+ goodsNums: "",
+ location: "",
+ transactionProcess: "",
+ houseCode: "",
+ districtName: "",
+ userId: ""
},
rules: {
'transactionObjectTel': {
@@ -89,57 +87,61 @@
message: '请输入对象电话',
trigger: ['blur', 'change']
},
-
+
'transactionMoney': {
type: 'string',
required: true,
message: '请输入交易金额',
trigger: ['blur', 'change']
},
- 'location':{
+ 'location': {
type: 'string',
required: true,
message: '请输入交易位置',
trigger: ['blur', 'change']
},
- 'transactionProcess':{
+ 'transactionProcess': {
type: 'string',
required: false,
message: '请输入交易过程',
trigger: ['blur', 'change']
}
},
- imageUrls:[],
- goodsImageUrls:[]
+ imageUrls: [],
+ goodsImageUrls: [],
+ eventType:1
}
},
onLoad(option) {
- if(option.type != 1){
- uni.setNavigationBarTitle({title:this.setTitle(option.type)})
+ if (option.type != 1) {
+ this.eventType = option.type;
+ uni.setNavigationBarTitle({
+ title: this.setTitle(option.type)
+ })
}
- this.$set(this.info,"eventType",option.type);
+ this.$set(this.info, "eventType", option.type);
let siteInfo = uni.getStorageSync("siteInfo");
let userInfo = uni.getStorageSync("userInfo");
this.$set(this.info, "houseCode", siteInfo.id);
this.$set(this.info, "districtName", siteInfo.name);
this.$set(this.info, "userId", userInfo.user_id);
},
- methods:{
- setTitle(type){
- if(type == 2){
+ methods: {
+ setTitle(type) {
+ if (type == 2) {
return "二手车交易"
- }else if (type == 3){
+ } else if (type == 3) {
return "二手手机维修"
}
},
-
-
+
+
confirmDate(e) {
console.log(e);
this.showSelectDate = false;
this.info.checkTime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM')
},
-
+
async afterReadImgs(event, key) {
this.showLoading()
let lists = [].concat(event.file)
@@ -161,27 +163,27 @@
}
this.loadingClose()
},
-
+
checkImages() {
if (this.imageUrls.length) {
- this.$set(this.info,"imageUrls",this.setImages(this.imageUrls))
+ this.$set(this.info, "imageUrls", this.setImages(this.imageUrls))
}
if (this.goodsImageUrls.length) {
- this.$set(this.info,"goodsImageUrls",this.setImages(this.goodsImageUrls))
+ this.$set(this.info, "goodsImageUrls", this.setImages(this.goodsImageUrls))
}
-
+
},
-
- setImages(key){
+
+ setImages(key) {
let urls = [];
- for(let i of key){
+ for (let i of key) {
urls.push(i.url);
}
- return urls.join(",")
+ return urls.join(",")
},
-
+
sumitInfo() {
- this.$refs.info.validate().then(valid => {
+ this.$refs.form.validate().then(valid => {
this.checkImages()
saveLabelReporting(this.info).then(res => {
uni.showToast({
@@ -189,17 +191,17 @@
title: '提交成功',
success() {
setTimeout(() => {
- that.$u.func.globalNavigator("", "navBack")
+ uni.navigateBack()
+ // this.$u.func.globalNavigator("", "navBack")
}, 1000)
}
})
})
})
},
- // navigatorPage() {
- // let url = "/subPackage/bs/views/repairList" + "?title=" + this.title + "&type=" + this.info.type
- // this.$u.func.globalNavigator(url, "navTo")
- // }
+ navigatorPage() {
+ this.$u.func.globalNavigator(`formList?type=${this.eventType}`, "navTo")
+ }
}
}
</script>
diff --git a/subPackage/label/formList.vue b/subPackage/label/formList.vue
new file mode 100644
index 0000000..9a1e28a
--- /dev/null
+++ b/subPackage/label/formList.vue
@@ -0,0 +1,70 @@
+<template>
+ <view class="">
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k">
+ <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>
+</template>
+
+<script>
+ import {getLabelReportingList} from "@/api/reporting/reporting.js"
+ export default {
+ data(){
+ return {
+ list:[]
+ }
+ },
+
+ onLoad(option){
+ this.getList(option.type)
+ },
+
+ 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;
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ page{
+ background-color:#F5F5F5;
+ }
+ .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%;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/label/hotel.vue b/subPackage/label/hotel.vue
index e6575df..785b889 100644
--- a/subPackage/label/hotel.vue
+++ b/subPackage/label/hotel.vue
@@ -149,7 +149,7 @@
</view>
</u-form>
<button class="submit-btn" @click="sumitInfo">提交</button>
- <!-- <button class="list-btn" @click="navigatorPage">我上报的事件</button> -->
+ <button class="list-btn" @click="navigatorPage">我上报的事件</button>
<u-datetime-picker ref="datetimePicker" :show="showSelectDate" v-model="checkTime" mode="datetime"
:formatter="formatter" @confirm="confirmDate" @cancel="showSelectDate = false"></u-datetime-picker>
<u-picker :show="isShowFireStatus" :columns="fireStatus" :defaultIndex="fireStatusIndex"
@@ -321,7 +321,6 @@
onReady() {
// 微信小程序需要用此写法
this.$refs.datetimePicker.setFormatter(this.formatter)
- console.log("==>", this)
},
methods: {
@@ -408,7 +407,8 @@
title: '提交成功',
success() {
setTimeout(() => {
- that.$u.func.globalNavigator("", "navBack")
+ uni.navigateBack()
+ // that.$u.func.globalNavigator("", "navBack")
}, 1000)
}
})
@@ -416,8 +416,7 @@
})
},
navigatorPage() {
- let url = "/subPackage/bs/views/repairList" + "?title=" + this.title + "&type=" + this.info.type
- this.$u.func.globalNavigator(url, "navTo")
+ this.$u.func.globalNavigator('hotelList', "navTo")
}
}
}
diff --git a/subPackage/label/hotelList.vue b/subPackage/label/hotelList.vue
new file mode 100644
index 0000000..b3959d8
--- /dev/null
+++ b/subPackage/label/hotelList.vue
@@ -0,0 +1,69 @@
+<template>
+ <view class="">
+ <view class="list">
+ <view class="list-item bgc-ff mb-20" v-for="(i,k) in list" :key="k">
+ <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>
+</template>
+
+<script>
+ import {getHotelReportingList} from "@/api/reporting/reporting.js"
+ export default {
+ data(){
+ return {
+ list:[]
+ }
+ },
+
+ onLoad(){
+ 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;
+ })
+ }
+ }
+ }
+</script>
+
+<style lang="scss">
+ page{
+ background-color:#F5F5F5;
+ }
+ .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%;
+ }
+ }
+ }
+</style>
\ No newline at end of file
diff --git a/subPackage/label/index.vue b/subPackage/label/index.vue
index 8cfdf5c..542626a 100644
--- a/subPackage/label/index.vue
+++ b/subPackage/label/index.vue
@@ -14,7 +14,7 @@
<view class="flex f-d-c ml-40">
<text class="f-36">总申请</text>
<view class="flex a-i-c">
- <text class="f-48 c-blue fw mr-6">50</text>
+ <text class="f-48 c-blue fw mr-6">{{count.all}}</text>
<text class="f-24 c-99">件</text>
</view>
</view>
@@ -24,7 +24,7 @@
<view class="flex f-d-c ml-40">
<text class="f-36">已处理</text>
<view class="flex a-i-c">
- <text class="f-48 c-green fw mr-6">50</text>
+ <text class="f-48 c-green fw mr-6">{{count.processed}}</text>
<text class="f-24 c-99">件</text>
</view>
</view>
@@ -36,12 +36,10 @@
<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>
</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.bgImg" mode="aspectFill"></image>
<view class="nav-item-inner flex f-d-c">
@@ -49,16 +47,16 @@
<button class="item-btn" :style="{backgroundColor:i.background}">立即上报</button>
</view>
</view>
-
-
</view>
</view>
-
</view>
</template>
<script>
+
+ import { getReportingCount } from '@/api/reporting/reporting.js'
+
export default {
data(){
return {
@@ -94,25 +92,32 @@
background:"#13C6C7"
}
],
- siteInfo:{}
+ siteInfo:{},
+ count:{}
}
},
onLoad(){
this.siteInfo = uni.getStorageSync("siteInfo");
+ this.getCount(uni.getStorageSync("siteInfo").id);
},
-
methods:{
+ getCount(code){
+ getReportingCount({houseCode:code}).then(res=>{
+ console.log(res);
+ this.count = res.data;
+ })
+ },
+
navTo(path,index){
let type = 1;
- if(index == 2){
+ if(index == 1){
type == 1
}else if (index == 3){
- type = 2
- }else {
type = 3
+ }else if(index == 4) {
+ type = 2
}
-
this.$u.func.globalNavigator(`${path}?type=${type}`, "navTo")
}
--
Gitblit v1.9.3