From 25100ec3d663fdab00f6dacb9f427b772c2f806f Mon Sep 17 00:00:00 2001
From: chenhaozhe <cgz@hz-kingdee.com>
Date: 星期一, 14 七月 2025 12:27:54 +0800
Subject: [PATCH] 合并开发文件

---
 pages/shebeiguanli/list.vue |  165 ++++++++++++++++++------------------------------------
 1 files changed, 55 insertions(+), 110 deletions(-)

diff --git a/pages/shebeiguanli/list.vue b/pages/shebeiguanli/list.vue
index de5f0dd..ffd8995 100644
--- a/pages/shebeiguanli/list.vue
+++ b/pages/shebeiguanli/list.vue
@@ -1,21 +1,6 @@
 <template>
 	<view class="content">
 		<view class="infoArea">
-			<!-- #ifdef MP-WEIXIN -->
-			<view class="name">{{infoData['璁惧鍚嶇О']}}</view>
-			<view class="dm">锛� 浠g爜锛歿{infoData['璁惧浠g爜']}} 锛�</view>
-			<view class="other">
-				<view class="half">鍑哄巶缂栧彿: <text>{{infoData['璁惧鍑哄巶缂栧彿']}}</text></view>
-				<view class="half">鍑哄巶鏃ユ湡: <text>{{infoData['璁惧鍑哄巶鏃ユ湡'].substr(0,10)}}</text></view>
-				<view class="half">璁惧缂栫爜: <text v-if="infoData['璁惧缂栫爜']!= 'null'">{{infoData['璁惧缂栫爜']}}</text></view>
-				<view class="half">璁惧绫诲瀷: <text v-if="infoData['璁惧绫诲瀷 ']!= 'null'">{{infoData['璁惧绫诲瀷']}}</text></view>
-			</view>
-			<view class="other" style="margin-top: 0;">
-				<view class="all">璁惧瑙勬牸: <text v-if="infoData['璁惧瑙勬牸']!= 'null'">{{infoData['璁惧瑙勬牸']}}</text></view>
-				<view class="all">璁惧鍨嬪彿: <text v-if="infoData['璁惧鍨嬪彿']!= 'null'">{{infoData['璁惧鍨嬪彿']}}</text></view>
-			</view>
-			<!-- #endif -->
-			<!-- #ifndef MP-WEIXIN -->
 			<view class="name">{{infoData.璁惧鍚嶇О}}</view>
 			<view class="dm">锛� 浠g爜锛歿{infoData.璁惧浠g爜}} 锛�</view>
 			<view class="other">
@@ -28,19 +13,16 @@
 				<view class="all">璁惧瑙勬牸: <text v-if="infoData.璁惧瑙勬牸 != 'null'">{{infoData.璁惧瑙勬牸}}</text></view>
 				<view class="all">璁惧鍨嬪彿: <text v-if="infoData.璁惧鍨嬪彿 != 'null'">{{infoData.璁惧鍨嬪彿}}</text></view>
 			</view>
-			<!-- #endif -->
-
+			
 			<view class="choose">
 				<view class="tab" :class="{focus: number == 1}" @tap="changeTab(1)">鏃ュ父璁板綍</view>
 				<view class="tab" :class="{focus: number == 2}" @tap="changeTab(2)">缁翠慨璁板綍</view>
 			</view>
 		</view>
-
+		
 		<view style="width: 100%;height: 380rpx;"></view>
 		<view class="list" v-for="(item,index) in listData" :key="index">
-			<!-- #ifndef MP-WEIXIN -->
-			<uni-card :title="item.鍗曟嵁绫诲瀷" :extra="item.鍗曟嵁鍙�" style="margin: 10px;"
-				@tap="showDetail = showDetail==index?-1:index">
+			<uni-card :title="item.鍗曟嵁绫诲瀷" :extra="item.鍗曟嵁鍙�" style="margin: 10px;" @tap="showDetail = showDetail==index?-1:index">
 				<view class="card-detail">
 					<view class="detail" v-if="item.鍒跺崟浜�">
 						<text>鍒跺崟浜猴細</text>{{item.鍒跺崟浜簘}
@@ -55,51 +37,29 @@
 						<text>瀹℃牳鏃ユ湡锛�</text>{{item.瀹℃牳鏃ユ湡.substr(0,10)}}
 					</view>
 				</view>
-				<!-- #endif -->
-				<!-- #ifdef MP-WEIXIN -->
-				<uni-card style="margin: 10px;"
-					@tap="showDetail = showDetail==index?-1:index">
-					<view class="card-detail">
-						<view class="detail" v-if="item['鍒跺崟浜�']">
-							<text>鍒跺崟浜猴細</text>{{item['鍒跺崟浜�']}}
-						</view>
-						<view class="detail" v-if="item['鍒跺崟鏃ユ湡']">
-							<text>鍒跺崟鏃ユ湡锛�</text>{{item['鍒跺崟鏃ユ湡'].substr(0,10)}}
-						</view>
-						<view class="detail" v-if="item['瀹℃牳浜�']">
-							<text>瀹℃牳浜猴細</text>{{item['瀹℃牳浜�']}}
-						</view>
-						<view class="detail" v-if="item['瀹℃牳鏃ユ湡']">
-							<text>瀹℃牳鏃ユ湡锛�</text>{{item['瀹℃牳鏃ユ湡'].substr(0,10)}}
-						</view>
-					</view>
-					<!-- #endif -->
-
-				</uni-card>
+			</uni-card>
 		</view>
-
+		
 		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
 		<view class="over" v-if="listData.length != 0">宸插埌搴�</view>
 	</view>
 </template>
 
 <script>
-	import {
-		getUserInfo
-	} from "@/utils/auth.js";
+	import { getUserInfo } from "@/utils/auth.js";
 	export default {
-		data() {
-			return {
-				userInfo: getUserInfo(),
-				serverUrl: uni.getStorageSync('serverUrl') || 'http://47.96.97.237/API',
-				infoData: {},
-				number: 1,
-				listData: [],
-				listData1: [],
-				listData2: [],
-				showDetail: -1,
-			}
-		},
+	    data() {
+	        return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+				infoData:{},
+				number:1,
+				listData:[],
+				listData1:[],
+				listData2:[],
+				showDetail:-1,
+	        }
+	    },
 		onLoad(e) {
 			console.log(e)
 			// e = {
@@ -119,29 +79,27 @@
 			this.infoData = e
 			this.getList(e.HInterID)
 		},
-		methods: {
-			getList(HInterID) {
+	    methods: {
+			getList(HInterID){
 				uni.showLoading({
-					title: '鍔犺浇涓�...'
+					title:'鍔犺浇涓�...'
 				})
 				uni.request({
-					url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
-					data: {
-						"HInterID": HInterID
-					},
-					success: (res) => {
-						if (res.data.count == 1) {
+				    url: this.serverUrl + '/Gy_EquipFileMain/Sb_EquipFileBillResumeDate',
+					data: { "HInterID": HInterID },
+				    success: (res) => {
+						if(res.data.count == 1){
 							this.listData1 = res.data.list[0]
 							this.listData2 = res.data.list[1]
 							this.listData = res.data.list[0]
-							console.log(1, this.listData1);
-							console.log(2, this.listData2);
+							console.log(1,this.listData1);
+							console.log(2,this.listData2);
 							uni.hideLoading()
-						} else {
+						}else{
 							uni.hideLoading()
 							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
+								title:res.data.Message,
+								icon:'none'
 							})
 						}
 					},
@@ -149,26 +107,26 @@
 						console.log(res);
 						uni.hideLoading()
 						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
 						})
 					},
 				});
 			},
-			changeTab(e) {
+			changeTab(e){
 				this.number = e
-				if (e == 1) {
+				if(e==1){
 					this.listData = this.listData1
-				} else {
+				}else{
 					this.listData = this.listData2
 				}
 			}
-		}
+	    }
 	}
 </script>
 
 <style lang="scss" scoped>
-	.infoArea {
+	.infoArea{
 		width: 100%;
 		padding-top: 20rpx;
 		background-color: #f0f0f0;
@@ -176,23 +134,20 @@
 		top: 0;
 		left: 0;
 		z-index: 99;
-
-		.name {
+		.name{
 			text-align: center;
 			font-size: 32rpx;
 			font-weight: 600;
 			color: #333;
 			line-height: 150%;
 		}
-
-		.dm {
+		.dm{
 			text-align: center;
 			font-size: 27rpx;
 			font-weight: 500;
 			color: #333;
 		}
-
-		.other {
+		.other{
 			display: flex;
 			flex-wrap: wrap;
 			width: 90%;
@@ -200,23 +155,19 @@
 			margin-top: 12rpx;
 			font-size: 27rpx;
 			color: #666;
-
-			text {
+			text{
 				font-size: 28rpx;
 				color: #333;
 				margin-left: 10rpx;
 			}
-
-			.half {
+			.half{
 				width: 50%;
 			}
-
-			.all {
+			.all{
 				width: 100%;
 			}
 		}
-
-		.choose {
+		.choose{
 			height: 70rpx;
 			margin-top: 20rpx;
 			padding: 0 30rpx;
@@ -225,15 +176,13 @@
 			border-radius: 40rpx 40rpx 0 0;
 			border-bottom: 2px solid #eee;
 			display: flex;
-
-			.tab {
+			.tab{
 				margin: 0 20rpx;
 				text-align: center;
 				font-size: 28rpx;
 				color: #666;
 			}
-
-			.focus {
+			.focus{
 				font-size: 30rpx;
 				color: #333;
 				font-weight: 600;
@@ -241,42 +190,38 @@
 			}
 		}
 	}
-
-	.list {
+	
+	.list{
 		width: 100%;
-
-		.card-detail {
+		.card-detail{
 			width: 100%;
 			display: flex;
 			flex-wrap: wrap;
 			justify-content: space-between;
 			line-height: 120%;
-
-			.detail {
+			.detail{
 				// width: 50%;
 				font-size: 26rpx;
 				margin-bottom: 12rpx;
 				color: #555;
 				margin-right: 20rpx;
-
-				text {
+				text{
 					color: #999;
 					font-size: 26rpx;
 				}
 			}
 		}
-
-		.more {
+		.more{
 			color: #888;
 			font-size: 24rpx;
 			display: flex;
 			border-top: 1px solid #eee;
 			padding-top: 20rpx;
-
-			.part {
+			.part{
 				width: 50%;
 				text-align: center;
 			}
 		}
 	}
-</style>
\ No newline at end of file
+
+</style>

--
Gitblit v1.9.1