From da9e3c4ab4255be8f64c41ce8ea9e38251817ac0 Mon Sep 17 00:00:00 2001
From: xiaozhiyong <xiaozhiyong@sdxkhlw.cn>
Date: Tue, 20 Aug 2024 10:59:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 contractManagement/list/details.vue         | 57 ++++++------
 oilAccount/components/accountListItem.vue   | 97 +++++++++++----------
 oilAccount/page/accountRecharge/details.vue | 50 ++++++-----
 oilAccount/page/accountRecharge/index.vue   |  9 +-
 4 files changed, 109 insertions(+), 104 deletions(-)

diff --git a/contractManagement/list/details.vue b/contractManagement/list/details.vue
index 29be0bd..487d1da 100644
--- a/contractManagement/list/details.vue
+++ b/contractManagement/list/details.vue
@@ -31,7 +31,7 @@
 						</view>
 					</template>
 				</template>
-				<view v-if="item.type === 'filelist'" style="padding-left: 200rpx;">
+				<view v-if="item.type === 'filelist'" style="padding-left: 205rpx;">
 					<text v-if="!item.value.length">暂无</text>
 					<template v-else>
 						<template v-for="(_item, _index) in item.value">
@@ -53,6 +53,20 @@
 
 					</template>
 				</view>
+				<view v-if="item.type === 'table'">
+					<uni-table v-for="_item,_index in item.value" :key="_index" border stripe emptyText="暂无更多数据">
+						<!-- 表头行 -->
+						<uni-tr>
+							<uni-th width="150" align="center">标题</uni-th>
+							<uni-th align="center">内容</uni-th>
+						</uni-tr>
+						<!-- 表格数据行 -->
+						<uni-tr v-for="__item,__index in _item" :key="__index">
+							<uni-td>{{__item.title}}</uni-td>
+							<uni-td>{{phoneHandle(__item.value)}}</uni-td>
+						</uni-tr>
+					</uni-table>
+				</view>
 			</view>
 		</view>
 		<uni-popup ref="popup" background-color="#fff">
@@ -79,9 +93,7 @@
 		},
 		onLoad(option) {
 			this.styles = uni.getMenuButtonBoundingClientRect()
-
 			if (option.details) {
-				console.log('option', decodeURIComponent(option.details))
 				this.infoList = JSON.parse(decodeURIComponent(option.details))
 			}
 			console.log(this.infoList)
@@ -94,6 +106,12 @@
 			}
 		},
 		methods: {
+			phoneHandle(value) {
+				if (value.includes('+86')) {
+					return JSON.parse(value).number
+				}
+				return value
+			},
 			altHandle(item) {
 				let arr = item.split('/')
 				return arr[arr.length - 1]
@@ -138,6 +156,11 @@
 </script>
 
 <style lang="scss">
+	::v-deep {
+		.uni-table-scroll {
+			margin-top: 20rpx;
+		}
+	}
 	page {
 		background: #dddddd80;
 	}
@@ -172,7 +195,6 @@
 		position: relative;
 		top: -80rpx;
 		margin: 0 auto;
-		// padding-bottom: 30rpx;
 		min-height: calc(100vh - 350rpx);
 		width: 96%;
 		padding: 20rpx 20rpx 30rpx 30rpx;
@@ -185,8 +207,8 @@
 			>text {
 				&:nth-of-type(1) {
 					display: inline-block;
-					margin-right: 50rpx;
-					width: 150rpx;
+					margin-right: 35rpx;
+					width: 170rpx;
 					color: #999;
 				}
 
@@ -219,12 +241,8 @@
 		}
 
 		.file-download {
-			// display: inline;
-			// display: flex;
 			margin-bottom: 10rpx;
-	
-				display: inline-flex;
-			
+			display: inline-flex;
 
 			>image {
 				width: 80rpx;
@@ -252,23 +270,6 @@
 					color: #999;
 				}
 			}
-
-			// image {
-			// 	&:nth-of-type(1) {
-			// 		// margin-right: 15rpx;
-			// 		width: 80rpx;
-			// 		height: 80rpx;
-			// 		border-radius: 10rpx;
-			// 	}
-
-			// 	&:nth-of-type(2) {
-			// 		position: relative;
-			// 		left: -5rpx;
-			// 		bottom: -5rpx;
-			// 		width: 32rpx;
-			// 		height: 32rpx;
-			// 	}
-			// }
 		}
 	}
 </style>
\ No newline at end of file
diff --git a/oilAccount/components/accountListItem.vue b/oilAccount/components/accountListItem.vue
index 7858a40..0f418e8 100644
--- a/oilAccount/components/accountListItem.vue
+++ b/oilAccount/components/accountListItem.vue
@@ -63,10 +63,11 @@
 			},
 			typeText: (e, item) => {
 				switch (Number(e)) {
+					// case 0:
+					// 	return ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(item
+					// 		.transactionType) ? '待运营组长审核' : '等待审核'
 					case 0:
-						return ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(item
-							.transactionType) ? '待运营组长审核' : '等待审核'
-
+						return '等待审核'
 					case 1:
 						return '审核通过'
 					case -1:
@@ -77,8 +78,8 @@
 						return '付款完成'
 					case 4:
 						return '取消充值'
-					case 5:
-						return '待数据中心审核'
+					// case 5:
+					// 	return '待数据中心审核'
 					default:
 						return '---'
 				}
@@ -94,48 +95,48 @@
 								color: '#666666',
 								bg: 'rgba(102, 102, 102, 0.1)'
 						}
-						case 'RECHARGE_REBETE':
-							return {
-								text: '充返',
-									color: '#9F43CC',
-									bg: 'rgba(159, 67, 204, 0.1)'
-							}
-							case 'CONSUME_REBATE':
-								return {
-									text: '消返',
-										color: '#9F43CC',
-										bg: 'rgba(159, 67, 204, 0.1)'
-								}
-								case 'DISPATCH':
-									return {
-										text: '调拨',
-											color: '#2866FF',
-											bg: 'rgba(40, 102, 255, 0.1)'
-									}
-									case 'CALLBACK':
-										return {
-											text: '回拨',
-												color: '#FF6700',
-												bg: 'rgba(255, 103, 0, 0.1)'
-										}
-										case 'TURN':
-											return {
-												text: '圈回',
-													color: '#EC4545',
-													bg: 'rgba(236, 69, 69, 0.1)'
-											}
-											case 'CALIBRATION_BALANCE':
-												return {
-													text: '结算校准',
-														color: '#2866FF',
-														bg: 'rgba(40, 102, 255, 0.1)'
-												}
-												default:
-													return {
-														text: '---',
-															color: '#666666',
-															bg: 'rgba(102, 102, 102, 0.1)'
-													}
+					case 'RECHARGE_REBETE':
+						return {
+							text: '充返',
+								color: '#9F43CC',
+								bg: 'rgba(159, 67, 204, 0.1)'
+						}
+					case 'CONSUME_REBATE':
+						return {
+							text: '消返',
+								color: '#9F43CC',
+								bg: 'rgba(159, 67, 204, 0.1)'
+						}
+					case 'DISPATCH':
+						return {
+							text: '调拨',
+								color: '#2866FF',
+								bg: 'rgba(40, 102, 255, 0.1)'
+						}
+					case 'CALLBACK':
+						return {
+							text: '回拨',
+								color: '#FF6700',
+								bg: 'rgba(255, 103, 0, 0.1)'
+						}
+					case 'TURN':
+						return {
+							text: '圈回',
+								color: '#EC4545',
+								bg: 'rgba(236, 69, 69, 0.1)'
+						}
+					case 'CALIBRATION_BALANCE':
+						return {
+							text: '结算校准',
+								color: '#2866FF',
+								bg: 'rgba(40, 102, 255, 0.1)'
+						}
+					default:
+						return {
+							text: '---',
+								color: '#666666',
+								bg: 'rgba(102, 102, 102, 0.1)'
+						}
 				}
 			},
 			icontype(a, b) {
@@ -388,4 +389,4 @@
 		overflow: hidden;
 		width: 670rpx;
 	}
-</style>
+</style>
\ No newline at end of file
diff --git a/oilAccount/page/accountRecharge/details.vue b/oilAccount/page/accountRecharge/details.vue
index 5cee046..7ac73bb 100644
--- a/oilAccount/page/accountRecharge/details.vue
+++ b/oilAccount/page/accountRecharge/details.vue
@@ -162,8 +162,10 @@
 		filters: {
 			typeText: function(e,details) {
 				switch (Number(e)) {
+					// case 0:
+					// 	return ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(details.transactionType) ? '待运营组长审核' : '等待审核'
 					case 0:
-						return ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(details.transactionType) ? '待运营组长审核' : '等待审核'
+						return '等待审核'
 					case 1:
 						return '审核通过'
 					case -1:
@@ -174,8 +176,8 @@
 						return '付款完成'
 					case 4:
 						return '取消充值'
-					case 5:
-						return '待数据中心审核'
+					// case 5:
+					// 	return '待数据中心审核'
 					default:
 						return '---'
 				}
@@ -184,27 +186,27 @@
 		},
 		methods: {
 			examineiPre() {
-				let {
-					auditMark,
-					transactionType
-				} = this.details
-				let authList = uni.getStorageSync('user').authList
-				if (auditMark == 0 && ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(
-						transactionType) &&
-					!authList.includes('finance:site:recharge:operateLeader')) {
-					uni.showToast({
-						title: '无运营组长审核权限！',
-						icon: 'none'
-					})
-					return
-				}
-				if (this.details.auditMark == 5 && !authList.includes('finance:site:recharge:dataCenter')) {
-					uni.showToast({
-						title: '无数据中心审核权限！',
-						icon: 'none'
-					})
-					return
-				}
+				// let {
+				// 	auditMark,
+				// 	transactionType
+				// } = this.details
+				// let authList = uni.getStorageSync('user').authList
+				// if (auditMark == 0 && ['RECHARGE_REBETE', 'CONSUME_REBATE', 'CALIBRATION_BALANCE'].includes(
+				// 		transactionType) &&
+				// 	!authList.includes('finance:site:recharge:operateLeader')) {
+				// 	uni.showToast({
+				// 		title: '无运营组长审核权限！',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
+				// if (this.details.auditMark == 5 && !authList.includes('finance:site:recharge:dataCenter')) {
+				// 	uni.showToast({
+				// 		title: '无数据中心审核权限！',
+				// 		icon: 'none'
+				// 	})
+				// 	return
+				// }
 				this.iShow.examine = true
 			},
 
diff --git a/oilAccount/page/accountRecharge/index.vue b/oilAccount/page/accountRecharge/index.vue
index 09f5896..0e5dd85 100644
--- a/oilAccount/page/accountRecharge/index.vue
+++ b/oilAccount/page/accountRecharge/index.vue
@@ -127,10 +127,11 @@
 					{
 						text: '已审核',
 						index: '1'
-					},{
-						text: '待数据中心审核',
-						index: '5'
-					}
+					},
+					// {
+					// 	text: '待数据中心审核',
+					// 	index: '5'
+					// }
 				],
 				listData: []
 			}