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/baoyangjilu/table.vue |  396 +++++++++++++++++--------------------------------------
 1 files changed, 125 insertions(+), 271 deletions(-)

diff --git a/pages/baoyangjilu/table.vue b/pages/baoyangjilu/table.vue
index db45386..f22a823 100644
--- a/pages/baoyangjilu/table.vue
+++ b/pages/baoyangjilu/table.vue
@@ -29,27 +29,25 @@
 					</picker>
 				</view>
 			</view>
-
+			
 			<view class="buttons">
 				<button class="btn-a" size="mini" type="default" @tap="clear">閲嶇疆</button>
 				<button class="btn-b" size="mini" type="default" @tap="creat">鏂板</button>
 				<button class="btn-c" size="mini" type="default" @tap="search">鏌ヨ</button>
 			</view>
 		</view>
-
+		
 		<view style="width: 100%;height: 16rpx;background-color: #e5e5e5;"></view>
-
+		
 		<view class="list" v-for="(item,index) in showList" :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.璁惧浠g爜">
 						<text>璁惧浠g爜锛�</text>{{item.璁惧浠g爜}}
 					</view>
-					<!-- 					<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
-									<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
-								</view> -->
+<!-- 					<view class="detail" v-if="item.鍗曟嵁绫诲瀷">
+						<text>鍗曟嵁绫诲瀷锛�</text>{{item.鍗曟嵁绫诲瀷}}
+					</view> -->
 					<view class="detail" v-if="item.鍐呴儴鍗曟嵁鍙�">
 						<text>鍐呴儴鍗曟嵁鍙凤細</text>{{item.鍐呴儴鍗曟嵁鍙穧}
 					</view>
@@ -134,6 +132,7 @@
 						<text>鎽樿锛�</text>{{item.鎽樿}}
 					</view>
 				</view>
+				
 				<view class="more" v-if="showDetail == index && operations != index">
 					<view class="part" style="border-right: 1px solid #eee;">
 						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
@@ -150,7 +149,7 @@
 						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
 					</view>
 				</view>
-
+				
 				<view class="op" v-if="operations == index">
 					<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
 					<!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
@@ -159,128 +158,8 @@
 					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
 				</view>
 			</uni-card>
-			<!-- #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['璁惧浠g爜']">
-						<text>璁惧浠g爜锛�</text>{{item['璁惧浠g爜']}}
-					</view>
-					<!-- 					<view class="detail" v-if="item['鍗曟嵁绫诲瀷']">
-    <text>鍗曟嵁绫诲瀷锛�</text>{{item['鍗曟嵁绫诲瀷']}}
-  </view> -->
-					<view class="detail" v-if="item['鍐呴儴鍗曟嵁鍙�']">
-						<text>鍐呴儴鍗曟嵁鍙凤細</text>{{item['鍐呴儴鍗曟嵁鍙�']}}
-					</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 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['鍗曚綅鍚嶇О']}}
-					</view>
-					<view class="detail" v-if="item['瀹為檯鐢ㄩ噺']">
-						<text>瀹為檯鐢ㄩ噺锛�</text>{{item['瀹為檯鐢ㄩ噺']}}
-					</view>
-					<view class="detail" v-if="item['鏍囧噯鐢ㄩ噺']">
-						<text>鏍囧噯鐢ㄩ噺锛�</text>{{item['鏍囧噯鐢ㄩ噺']}}
-					</view>
-					<view class="detail" v-if="item['璐熻矗浜�']">
-						<text>璐熻矗浜猴細</text>{{item['璐熻矗浜�']}}
-					</view>
-					<view class="detail" v-if="item['琛ㄤ綋澶囨敞']">
-						<text>琛ㄤ綋澶囨敞锛�</text>{{item['琛ㄤ綋澶囨敞']}}
-					</view>
-					<view class="detail" v-if="item['鍏宠仈鏁伴噺']">
-						<text>鍏宠仈鏁伴噺锛�</text>{{item['鍏宠仈鏁伴噺']}}
-					</view>
-					<view class="detail" v-if="item['鍏宠仈閲戦']">
-						<text>鍏宠仈閲戦锛�</text>{{item['鍏宠仈閲戦']}}
-					</view>
-					<view class="detail" v-if="item['鍏抽棴绫诲瀷']">
-						<text>鍏抽棴绫诲瀷锛�</text>{{item['鍏抽棴绫诲瀷']}}
-					</view>
-				</view>
-				<view class="card-detail" v-if="showDetail == index">
-					<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 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 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['婧愬崟绫诲瀷']}}
-					</view>
-					<view class="detail" v-if="item['hbilltype']">
-						<text>hbilltype锛�</text>{{item['hbilltype']}}
-					</view>
-					<view class="detail" v-if="item['鎽樿']">
-						<text>鎽樿锛�</text>{{item['鎽樿']}}
-					</view>
-				</view>
-				<view class="more" v-if="showDetail == index && operations != index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="top" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏀惰捣
-					</view>
-					<view class="part" @tap.stop="operations = operations==index?-1:index">
-						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
-					</view>
-				</view>
-				<view class="more" v-if="showDetail != index && operations != index">
-					<view class="part" style="border-right: 1px solid #eee;">
-						<uni-icons type="bottom" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鏇村淇℃伅
-					</view>
-					<view class="part" @tap.stop="operations = operations==index?-1:index">
-						<uni-icons type="more-filled" style="color: #888;margin-right: 10rpx;" size="14"></uni-icons>鎿嶄綔
-					</view>
-				</view>
-
-				<view class="op" v-if="operations == index">
-					<button class="op1" size="mini" plain @tap.stop="toSon(item)">瀛愯〃淇℃伅</button>
-					<!-- <button class="op2" size="mini" plain @tap.stop="">鍙嶅鏍�</button> -->
-					<button class="op3" size="mini" plain @tap.stop="edit(item)">缂栬緫</button>
-					<button class="op4" size="mini" plain @tap.stop="del(item)">鍒犻櫎</button>
-					<button class="op5" size="mini" plain @tap.stop="operations = -1">鍙栨秷鎿嶄綔</button>
-				</view>
-			</uni-card>
-			<!-- #endif -->
 		</view>
-
+		
 		<view class="over" v-if="listData.length == 0">鏆傛棤鏁版嵁</view>
 		<view class="over" v-if="listData.length != 0 && listData.length != showList.length">鍔犺浇涓�...</view>
 		<view class="over" v-if="listData.length != 0 && listData.length == showList.length">宸插埌搴�</view>
@@ -288,76 +167,74 @@
 </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',
-				hform: {
-					HBillNo: '',
-					HCreateBy: '',
-					BenginHCreateDate: '',
-					EndHCreateDate: '',
+	    data() {
+	        return {
+				userInfo:getUserInfo(),
+				serverUrl: uni.getStorageSync('serverUrl')||'http://47.96.97.237/API',
+				hform:{
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
 				},
-				sWhere: '',
-				listData: [],
-				showList: [],
-				showDetail: -1,
-				operations: -1,
-
-				page: 1,
-			}
-		},
+				sWhere:'',
+				listData:[],
+				showList:[],
+				showDetail:-1,
+				operations:-1,
+				
+				page:1,
+	        }
+	    },
 		onLoad() {
 			this.getList()
-			console.log(this.userInfo, uni.getStorageSync('HUserName'))
+			console.log(this.userInfo,uni.getStorageSync('HUserName'))
 		},
 		onReachBottom: function() {
 			this.page++
 			setTimeout(() => {
-				this.showList = this.showList.concat(this.getPage(this.page, this.listData))
+				this.showList = this.showList.concat(this.getPage(this.page,this.listData))
 			}, 100)
 		},
 		onPullDownRefresh: function() {
 			this.clear()
-			setTimeout(() => {
+			setTimeout(()=>{
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
-		methods: {
-			getPage(page, list) {
+	    methods: {
+			getPage(page,list){
 				let sindex = (parseInt(page) - 1) * 20
 				let eindex = parseInt(page) * 20
-				let newList = list.slice(sindex, eindex)
+				let newList = list.slice(sindex,eindex)
 				return newList
 			},
-			getList() {
+			getList(){
 				console.log(this.sWhere)
 				uni.showLoading({
-					title: '鍔犺浇涓�...'
+					title:'鍔犺浇涓�...'
 				})
 				uni.request({
-					url: this.serverUrl + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
-					data: {
+				    url: this.serverUrl + '/Sb_EquipMaintainBill/GetEquipMaintainBillList',
+					data:{ 
 						sWhere: this.sWhere,
 						user: uni.getStorageSync('HUserName')
 					},
-					success: (res) => {
-						console.log(1, res);
-						if (res.data.count == 1) {
+				    success: (res) => {
+				        console.log(1,res);
+						if(res.data.count == 1){
 							this.listData = res.data.data
-							this.showList = this.getPage(this.page, this.listData)
-							setTimeout(() => {
-								uni.hideLoading()
+							this.showList = this.getPage(this.page,this.listData)
+							setTimeout(()=>{
+							     uni.hideLoading()
 							}, 1000)
-						} else {
+						}else{
 							uni.hideLoading()
 							uni.showToast({
-								title: res.data.Message,
-								icon: 'none'
+								title:res.data.Message,
+								icon:'none'
 							})
 						}
 					},
@@ -365,267 +242,244 @@
 						console.log(res);
 						uni.hideLoading()
 						uni.showToast({
-							title: '鎺ュ彛璇锋眰澶辫触',
-							icon: 'none'
+							title:'鎺ュ彛璇锋眰澶辫触',
+							icon:'none'
 						})
 					},
 				});
 			},
 			//閫夋嫨鍗曟嵁鏃ユ湡
-			BenginHCreateDateChange(e) {
+			BenginHCreateDateChange(e){
 				console.log(e.detail.value)
 				this.hform.BenginHCreateDate = e.detail.value
 			},
 			//閫夋嫨鍗曟嵁鏃ユ湡
-			EndHCreateDateChange(e) {
+			EndHCreateDateChange(e){
 				console.log(e.detail.value)
 				this.hform.EndHCreateDate = e.detail.value
 			},
-			search() {
+			search(){
 				this.sWhere = ''
 				this.listData = []
 				this.page = 1
 				this.showList = []
-
+				
 				console.log(this.hform)
 				if (this.hform.HBillNo) {
-					this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
+				    this.sWhere += " and 鍗曟嵁鍙� like '%" + this.hform.HBillNo + "%'";
 				}
 				if (this.hform.HCreateBy) {
-					this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
+				    this.sWhere += " and 鍒跺崟浜� like '%" + this.hform.HCreateBy + "%'";
 				}
 				if (this.hform.BenginHCreateDate) {
-					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.BenginHCreateDate + "'";
 				}
 				if (this.hform.EndHCreateDate) {
-					this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
+				    this.sWhere += " and CONVERT(varchar(100),鏃ユ湡, 23) >= '" + this.hform.EndHCreateDate + "'";
 				}
-
+				
 				this.getList()
 			},
-			creat() {
+			creat(){
 				uni.navigateTo({
-					url: '/pages/baoyangjilu/form'
+					url:'/pages/baoyangjilu/form'
 				})
 			},
-			clear() {
+			clear(){
 				this.listData = []
 				this.page = 1
 				this.showList = []
-
+				
 				this.sWhere = ''
 				this.showDetail = -1,
-					this.operations = -1,
-					this.hform = {
-						HBillNo: '',
-						HCreateBy: '',
-						BenginHCreateDate: '',
-						EndHCreateDate: '',
-					}
+				this.operations = -1,
+				this.hform = {
+					HBillNo:'',
+					HCreateBy:'',
+					BenginHCreateDate:'',
+					EndHCreateDate:'',
+				}
 				this.getList()
 			},
-			toSon(item) {
+			toSon(item){
 				uni.navigateTo({
-					url: '/pages/baoyangjilu/table_son?HInterID=' + item.hmainid +
-						'&璁惧鍚嶇О=' + item.璁惧鍚嶇О +
-						'&璁惧浠g爜=' + item.璁惧浠g爜,
+					url:'/pages/baoyangjilu/table_son?HInterID=' + item.hmainid 
+					+ '&璁惧鍚嶇О=' + item.璁惧鍚嶇О 
+					+ '&璁惧浠g爜=' + item.璁惧浠g爜,
 				})
 			},
-
+			
 			//缂栬緫
-			edit(item) {
+			edit(item){
 				console.log(item)
 				uni.navigateTo({
-					url: '/pages/baoyangjilu/form?hmainid=' + item.hmainid
+					url:'/pages/baoyangjilu/form?hmainid=' + item.hmainid 
 				})
 			},
 			//鍒犻櫎
-			del(item) {
+			del(item){
 				console.log(item)
 				uni.showModal({
-					title: '鎻愮ず',
-					content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
-					success: (res) => {
-						if (res.confirm) {
-							console.log('鐢ㄦ埛鐐瑰嚮纭畾', );
+				    title: '鎻愮ず',
+				    content: '纭瑕佸垹闄ゅ悧锛屽垹闄ゅ悗涓嶈兘鎭㈠',
+				    success: (res) => {
+				        if (res.confirm) {
+				            console.log('鐢ㄦ埛鐐瑰嚮纭畾',);
 							uni.request({
-								url: this.serverUrl +
-									'/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
-								data: {
+							    url: this.serverUrl + '/Sb_EquipMaintainBill/DeltetEquipMaintainBillList',
+								data:{ 
 									HInterID: item.hmainid,
 									user: uni.getStorageSync('HUserName')
 								},
-								success: (res) => {
-									console.log(1, res);
-									if (res.data.count == 1) {
+							    success: (res) => {
+							        console.log(1,res);
+									if(res.data.count == 1){
 										this.clear()
 									}
 									uni.showToast({
-										title: res.data.Message,
-										icon: 'none'
+										title:res.data.Message,
+										icon:'none'
 									})
 								},
 								fail: (res) => {
 									console.log(res);
 									uni.showToast({
-										title: '鎺ュ彛璇锋眰澶辫触',
-										icon: 'none'
+										title:'鎺ュ彛璇锋眰澶辫触',
+										icon:'none'
 									})
 								},
 							});
-						} else if (res.cancel) {
-							console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
-						}
-					}
+				        } else if (res.cancel) {
+				            console.log('鐢ㄦ埛鐐瑰嚮鍙栨秷');
+				        }
+				    }
 				});
 			},
-		}
+	    }
 	}
 </script>
 
 <style lang="scss" scoped>
-	.form {
+	.form{
 		width: 640rpx;
 		margin: 20rpx auto;
 	}
-
-	.form-item {
+    .form-item{
 		display: flex;
 		align-items: center;
 		font-size: 28rpx;
 		padding: 6rpx 0;
-
-		.title {
+		.title{
 			width: 180rpx;
-
-			text {
+			text{
 				color: red;
 				font-weight: bold;
 			}
 		}
-
-		.right {
+		.right{
 			width: 450rpx;
 			border-radius: 22rpx;
 			border: 1px solid #acacac;
 		}
-
-		.righton {
+		.righton{
 			width: 450rpx;
 			border-radius: 22rpx;
 			border: 1px solid #e4e4e4;
 			background-color: #e4e4e4;
 		}
-
-		input {
+		input{
 			width: 100%;
 			padding: 8rpx 20rpx;
 			font-size: 30rpx;
 		}
 	}
-
-	.buttons {
+	.buttons{
 		width: 100%;
 		display: flex;
 		justify-content: center;
 		margin-top: 20rpx;
-
-		button {
+		button{
 			border-radius: 50rpx;
 			width: 180rpx;
 			height: 66rpx;
 			line-height: 66rpx;
 			font-size: 28rpx;
 		}
-
-		.btn-a {
+		.btn-a{
 			background-color: #acacac;
 			color: #fff;
 		}
-
-		.btn-b {
+		.btn-b{
 			background-color: #41a863;
 			color: #fff;
 		}
-
-		.btn-c {
+		.btn-c{
 			background-color: #3a78ff;
 			color: #fff;
 		}
 	}
-
-	.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;
 			}
 		}
-
-		.op {
+		.op{
 			display: flex;
 			justify-content: space-around;
 			margin-top: 20rpx;
-
-			button {
+			button{
 				padding: 0;
 				width: 130rpx;
 				font-size: 25rpx;
 			}
-
-			.op1 {
+			.op1{
 				border: 1px solid #41a863;
 				color: #41a863;
 			}
-
-			.op2 {
+			.op2{
 				border: 1px solid #d98d00;
 				color: #d98d00;
 			}
-
-			.op3 {
+			.op3{
 				border: 1px solid #3a78ff;
 				color: #3a78ff;
 			}
-
-			.op4 {
+			.op4{
 				border: 1px solid #da0000;
 				color: #da0000;
 			}
-
-			.op5 {
+			.op5{
 				border: 1px solid #888;
 				color: #888;
 			}
 		}
 	}
-</style>
\ No newline at end of file
+
+</style>

--
Gitblit v1.9.1