From 20e32587ecbab27e4436f2f64a15faa3c89e4f41 Mon Sep 17 00:00:00 2001
From: pyt <626651354@qq.com>
Date: 星期二, 20 五月 2025 21:39:59 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/H5/threeSide

---
 H5/pages/supervision/supervision.vue |   66 +++++++++++++++++----------------
 1 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/H5/pages/supervision/supervision.vue b/H5/pages/supervision/supervision.vue
index a55d20b..8e72eae 100644
--- a/H5/pages/supervision/supervision.vue
+++ b/H5/pages/supervision/supervision.vue
@@ -2,25 +2,23 @@
 	<view class="content">
 		<view class="bgColor2 shadow1 pb-19" style="position: sticky;top: 0;z-index: 999;">
 			<view class="h-96 flex a-center fs-27  j-between txt-center  font-w400 color1">
-				<view @click="changeType('1')" class="flex1 bgColor2 relative"
-					:class="searchParams.type == '1' && 'color2 font-bold'">
+				<view @click="changeType(1)" class="flex1 bgColor2 relative" :class="type == 1 && 'color2 font-bold'">
 					<view class="relative zIndex1000">
 						处理记录
 					</view>
-					<view v-if="searchParams.type == '1'" class="bgColor1"></view>
+					<view v-if="type == 1" class="bgColor1"></view>
 				</view>
-				<view @click="changeType('2')" class="flex1 bgColor2 relative"
-					:class="searchParams.type == '2' && 'color2 font-bold'">
+				<view @click="changeType(2)" class="flex1 bgColor2 relative" :class="type == 2 && 'color2 font-bold'">
 					<view class="relative zIndex1000">
 						问题驳回池
 					</view>
-					<view v-if="searchParams.type == '2'" class="bgColor1"></view>
+					<view v-if="type == 2" class="bgColor1"></view>
 				</view>
 			</view>
 			<view class="flex a-center j-between mx-27 pl-38 border2">
 				<view class="flex a-center flex1">
 					<image src="../../static/search.png" mode="widthFix" class="w-31 h-31 shrink0 mr-13" />
-					<input v-model="searchParams.searchStr" class="fs-27 flex1" placeholder="输入姓名、联系电话关键字搜索" />
+					<input v-model="searchParams.keyword" class="fs-27 flex1" placeholder="输入姓名、联系电话关键字搜索" />
 				</view>
 				<view @click="searchList" class="fs-23 lh-69 txt-center px-29 br-48 my-4 mx-4 bgcolor88">搜索</view>
 			</view>
@@ -101,18 +99,18 @@
 				<view class="mt-31 border1">
 					<view class="left"></view>
 					<view class="right"></view>
-					<view v-if="searchParams.type == '1'">
+					<view v-if="type == 1">
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>添加办理进度数</view>
-							<view class="font-bold">10</view>
+							<view class="font-bold">{{item.progressCount}}</view>
 						</view>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>已下派次数</view>
-							<view class="font-bold">10</view>
+							<view class="font-bold">{{item.assignmentCount}}</view>
 						</view>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>已上报次数</view>
-							<view class="font-bold">10</view>
+							<view class="font-bold">{{item.reportCount}}</view>
 						</view>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>创建时间</view>
@@ -122,31 +120,32 @@
 					<view v-else>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>申请时间</view>
-							<view class="font-bold">2025-09-09 11:09:09</view>
+							<view class="font-bold">{{ item.applyTime | formatTime }}</view>
 						</view>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>申请人</view>
 							<view class="flex a-center">
-								<view class="font-bold">李雷 13987654321</view>
-								<image @click.stop="callPhone(item.contactNumber)" src="../../static/tell.png"
+								<view class="font-bold">{{item.reporter}} {{item.reporterPhone}}</view>
+								<image @click.stop="callPhone(item.reporterPhone)" src="../../static/tell.png"
 									class="w-58 h-58 shrink0 ml-19" />
 							</view>
 						</view>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>审批时间</view>
-							<view class="font-bold">2025-09-09 11:09:09</view>
+							<view class="font-bold">{{ item.auditTime | formatTime }}</view>
 						</view>
 						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view>审批人</view>
 							<view class="flex a-center">
-								<view class="font-bold">李雷 13987654321</view>
-								<image @click.stop="callPhone(item.contactNumber)" src="../../static/tell.png"
+								<view class="font-bold">{{item.auditorName}} {{item.auditorPhone}}</view>
+								<image @click.stop="callPhone(item.auditorPhone)" src="../../static/tell.png"
 									class="w-58 h-58 shrink0 ml-19" />
 							</view>
 						</view>
-						<view class="flex a-center j-between lh-38 mt-29 ml-38 mr-23 fs-27">
+						<view class="flex j-between lh-38 mt-29 ml-38 mr-23 fs-27">
 							<view class="shrink0">驳回理由</view>
-							<view style="max-width: 458rpx; text-align: right;font-weight: bold;">不同意当前申请不同意当前申请不同意当前申请
+							<view style="max-width: 458rpx; text-align: right;font-weight: bold;">
+								{{item.rejectReason}}
 							</view>
 						</view>
 					</view>
@@ -160,17 +159,17 @@
 <script>
 	import dayjs from '@/uni_modules/uview-ui/libs/util/dayjs.js'
 	import {
-		getList
+		getProcessingList,
+		getRejectList
 	} from './service.js'
 	export default {
 		data() {
 			return {
-				active: 1,
+				type: 1,
 				searchParams: {
 					pageNum: 1,
 					pageSize: 10,
-					type: '1',
-					searchStr: ''
+					keyword: ''
 				},
 				list: [],
 				status: 'loadMore',
@@ -185,7 +184,7 @@
 					'6': '上级驳回',
 					'7': '延期待审核',
 					'8': '已办结'
-				}
+				},
 			}
 		},
 		onReachBottom() {
@@ -220,6 +219,14 @@
 		},
 		methods: {
 			searchList() {
+				if (this.searchParams.keyword == '') {
+					uni.showToast({
+						title: '请输入关键字搜索',
+						icon: 'none',
+						mask: true
+					})
+					return
+				}
 				this.searchParams.pageNum = 1
 				this.fetchList(this.searchParams, (e) => {
 					this.list = e.records || []
@@ -242,24 +249,19 @@
 			},
 			fetchList(params, callback) {
 				if (this.status == 'loading') return
-				this.status = 'loading'
-				getList(params).then(res => {
+				this.status = 'loading';
+				[getProcessingList, getRejectList][this.type - 1](params).then(res => {
 					if (res.code == 200) {
-						res.data.records.map(item => {
-							if (item.images) {
-								item.images = item.images.split(',')
-							}
-						})
 						callback(res.data)
 					}
 				})
 			},
 			// 切换状态筛选
 			changeType(type) {
+				this.type = type
 				this.searchParams = {
 					pageNum: 1,
 					pageSize: 10,
-					type, //全部:不传,上报待审核:0,正在办理:1, 办结:2
 				}
 				this.fetchList(this.searchParams, (e) => {
 					this.list = e.records || []

--
Gitblit v1.7.1