设备入库 入库核验

pages.json

@@ -69,6 +69,15 @@
             }
             
         }
+        ,{
+            "path" : "pages/storeManagement/equipmentEnter/verification",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/storeManagement/equipmentDelivery/deliveried.vue

@@ -244,8 +244,8 @@
 									仓库管理
 								</view>
 								<view class="date">
-																	2023-03-26 13:00
-																</view>
+									2023-03-26 13:00
+								</view>
 							</view>
 							<view class="u-order-time">
 								<view class="photo">
@@ -255,7 +255,7 @@
 									<img src="../../../assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
 								</view>
 								<view class="name">
-								   周乐心
+									周乐心
 								</view>
 							</view>
 						</view>
@@ -263,7 +263,7 @@
 				</u-time-line-item>
 			</u-time-line>
 		</view>
-   
+
 	</view>
 </template>
 
@@ -280,9 +280,9 @@
 <style scoped lang="scss">
 	page {
 		padding-bottom: 100px;
-		
+
 	}
-	
+
 
 	// 出库单状态
 	.head {
@@ -435,9 +435,11 @@
 			color: rgba(51, 51, 51, 1);
 			font-size: 32rpx;
 		}
-        .u-time-axis-item{
+
+		.u-time-axis-item {
 			margin-bottom: 76rpx;
 		}
+
 		.u-time-axis {
 			padding: 18rpx 40rpx;
 		}
@@ -514,22 +516,24 @@
 			}
 
 		}
-      
+
 	}
-	
-	.u-time-axis{
-		.u-time-axis-item:last-of-type{
+
+	.u-time-axis {
+		.u-time-axis-item:last-of-type {
 			margin-bottom: 0;
 		}
 	}
+
 	// 确认出库
-	.bottom{
+	.bottom {
 		background-color: #fff;
 		margin-top: 44rpx;
 		padding: 16rpx 32rpx;
-		uni-button{
+
+		uni-button {
 			border-radius: 8px;
-			background: linear-gradient(180deg, rgba(22,119,255,1) 0%,rgba(16,98,213,1) 100%);
+			background: linear-gradient(180deg, rgba(22, 119, 255, 1) 0%, rgba(16, 98, 213, 1) 100%);
 			color: rgba(255, 255, 255, 1);
 			font-size: 32rpx;
 			line-height: 88rpx;

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -1,7 +1,8 @@
 <template>
-	<view class="container">
+	<view >
 		<u-navbar title="出库单详情"></u-navbar>
 		<!-- 出库单状态 -->
+		<view class="container">
 		<view class="head">
 			<view class="photo">
 				<img src="../../../assets/img/photoCopy 3@1x.png" alt="">
@@ -263,7 +264,8 @@
 				</u-time-line-item>
 			</u-time-line>
 		</view>
-    <!-- 确认出库 -->
+    </view>
+	<!-- 确认出库 -->
 	<view class="bottom" >
 		<button>确认出库</button>
 	</view>
@@ -285,7 +287,9 @@
 		
 		
 	}
-	
+	.container{
+		min-height: calc(100vh - 88rpx);
+	}
 
 	// 出库单状态
 	.head {

pages/storeManagement/equipmentEnter/equipmentEnter.vue

@@ -0,0 +1,181 @@
+<template>
+	<view>
+		<view class="head">
+			<u-navbar title="设备入库"></u-navbar>
+			<view class="tabs">
+				<u-tabs bar-width="80" inactive-color="#777777" active-color="#101010":list="list" :is-scroll="false" :current="current" @change="change"></u-tabs>
+			</view>
+	
+		</view>
+		<view class="list1" v-if="this.current==0">
+			<view class="item" v-for="item in 2">
+				<view class="title">
+					<view class="name">
+						BR23-0001-01
+					</view>
+					<view class="classify">
+						耗材
+					</view>
+					<view class="state">
+						待入库
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						入库位置：
+					</view>
+					<view class="value">
+						十号路仓库
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						交接人：
+					</view>
+					<view class="value">
+						孙斌
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						创建时间：
+					</view>
+					<view class="value">
+						2023/03/15 16:15:31
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		<view class="list2" v-if="this.current==1" > 
+			<view class="item" v-for="item in 2">
+				<view class="title">
+					<view class="name">
+						BR23-0001-02
+					</view>
+					<view class="classify">
+						耗材
+					</view>
+					<view class="state">
+						待入库
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						入库位置：
+					</view>
+					<view class="value">
+						十号路仓库
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						交接人：
+					</view>
+					<view class="value">
+						孙斌
+					</view>
+				</view>
+				<view class="group">
+					<view class="name">
+						创建时间：
+					</view>
+					<view class="value">
+						2023/03/15 16:15:31
+					</view>
+				</view>
+				
+			</view>
+		</view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+					name: '待入库'
+				}, {
+					name: '已入库'
+				}
+					
+				],
+				current: 0
+			}
+		},
+		methods: {
+			change(index) {
+				this.current = index;
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	page{
+		padding-bottom: 100rpx;
+		
+	}
+	.head{
+		background: linear-gradient(180deg, rgba(190,211,240,1) 0%,rgba(244,244,246,1) 100%) ;
+		height: 590rpx;
+		padding: 0 32rpx;
+		/deep/.u-navbar{
+			background: 0!important;
+		}
+		/deep/.u-border-bottom:after{
+			height: 0;
+		}
+	}
+	.tabs{
+		width: 250rpx;
+		/deep/.u-tabs{
+			background: 0 !important;
+		}
+		/deep/.u-tab-bar{
+			background-color: #2A8EFB !important;
+		}
+	}
+
+
+ .list1,.list2{
+	 padding: 0 32rpx;
+	 margin-top: -400rpx;
+	 .item{
+		 border-radius: 8px;
+		 background-color: rgba(255, 255, 255, 1);
+		 padding: 32rpx;
+		 margin-bottom: 24rpx;
+		 .title{
+			 color: rgba(51, 51, 51, 1);
+			 font-size: 36rpx;
+			 margin-bottom: 16rpx;
+			 display: flex;
+			 align-items: center;
+			 .classify{
+				 margin-left: 26rpx;
+				 padding: 10rpx 16rpx;
+				 border-radius: 4px;
+				 background-color: rgba(219, 255, 212, 1);
+				 color: rgba(69, 186, 69, 1);
+				 font-size: 24rpx;
+				 text-align: center;
+			 }
+			 .state{
+				 margin-left: auto;
+				 color: rgba(22, 119, 255, 1);
+				 font-size: 32rpx;
+			 }
+		 }
+		 .group{
+			 display: flex;
+			 color: rgba(119, 119, 119, 1);
+			 margin-top: 16rpx;
+			 font-weight: bold;
+		 }
+	 }
+	 
+ }
+</style>

pages/storeManagement/equipmentEnter/verification.vue

@@ -0,0 +1,528 @@
+<template>
+	<view >
+		<u-navbar title="入库单详情"></u-navbar>
+		<view class="container">
+			
+		
+		
+		<!-- 出库单状态 -->
+		<view class="head">
+			<view class="photo">
+				<img src="../../../assets/img/photoCopy 3@1x.png" alt="">
+			</view>
+			<view class="name">
+				刘群
+			</view>
+			<view class="submit">
+				提交了<text>设备归还单</text>
+			</view>
+			<view class="state">
+				待入库
+			</view>
+		</view>
+		<!-- 出库单详情 -->
+		<view class="details">
+			<view class="item">
+				<view class="name">
+					项目部
+				</view>
+				<view class="value">
+					洪湖文泉110kV变电站二期施工单位
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					归还仓库
+				</view>
+				<view class="value">
+					荆力总包仓库
+				</view>
+			</view>
+			<view class="item">
+				<view class="name">
+					提交时间
+				</view>
+				<view class="value">
+					2020-11-27 11:00
+				</view>
+			</view>
+		
+		</view>
+		<!-- 出库设备清单 -->
+		<view class="list">
+			<view class="list-head">
+				<view class="title">
+					归还设备清单
+				</view>
+				<view class="amount">
+					全部 <text>18</text> 件设备
+					<u-icon name="arrow-right"></u-icon>
+				</view>
+			</view>
+			<!-- 清单信息 -->
+			<view class="list-infos" >
+				<view class="infos-head">
+					<view class="name">
+						50KV直流高压电缆检测仪
+					</view>
+					<view class="state">
+					<text><img src="../../../assets/img/riLine-checkbox-circle-line@1x.png" alt=""></text>	已收到	 
+					</view>
+				</view>
+				<view class="infos">
+					<view class="infos-1">
+						<view class="infos-item">
+							<view class="item-name">
+								型号：
+							</view>
+							<view class="item-value">
+								GZYV GYVZ-50
+							</view>
+						</view>
+
+					</view>
+					<view class="infos-2">
+						<view class="infos-item">
+							<view class="item-name">
+								设备编号：
+							</view>
+							<view class="item-value">
+								ND920182001511
+							</view>
+						</view>
+						
+					</view>
+
+				</view>
+
+			</view>
+			
+			<view class="list-infos" >
+				<view class="infos-head">
+					<view class="name">
+						50KV直流高压电缆检测仪
+					</view>
+					<view class="qr-code">
+						<text><img src="../../../assets/img/riLine-qr-scan-line Copy@1x.png" alt=""></text>
+						<text>扫码核验</text>
+					</view>
+				</view>
+				<view class="infos">
+					<view class="infos-1">
+						<view class="infos-item">
+							<view class="item-name">
+								型号：
+							</view>
+							<view class="item-value">
+								GZYV GYVZ-50
+							</view>
+						</view>
+			
+					</view>
+					<view class="infos-2">
+						<view class="infos-item">
+							<view class="item-name">
+								设备编号：
+							</view>
+							<view class="item-value">
+								ND920182001511
+							</view>
+						</view>
+						
+					</view>
+			
+				</view>
+			
+			</view>
+
+		</view>
+		<!-- 流程 -->
+		<view class="process">
+			<view class="title">
+				流程
+			</view>
+			<u-time-line>
+
+				<u-time-line-item node-top="10">
+					<template v-slot:node>
+						<view>
+							<view class="u-node" style="background:#CDCDCD;">
+								<!-- 此处为uView的icon组件 -->
+								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
+							</view>
+						</view>
+					</template>
+
+					<template v-slot:content>
+						<view>
+							<view class="u-order-desc">
+								<view class="level">
+									项目部
+								</view>
+								<view class="date">
+									2023-03-26 13:00
+								</view>
+							</view>
+							<view class="u-order-time">
+								<view class="photo">
+									<img src="../../../assets/img/level.png" alt="">
+								</view>
+								<view class="confirm">
+									<img src="../../../assets/img/riFill-checkbox-circle-fill@1x.png" alt="">
+								</view>
+								<view class="name">
+									李天择
+								</view>
+							</view>
+						</view>
+					</template>
+				</u-time-line-item>
+
+				
+				
+
+				<u-time-line-item node-top="10">
+					<template v-slot:node>
+						<view class="">
+							<view class="u-node" style="background:#CDCDCD;">
+								<!-- 此处为uView的icon组件 -->
+								<!-- <u-icon name="checkmark" color="#fff" :size="24"></u-icon> -->
+							</view>
+						</view>
+					</template>
+
+					<template v-slot:content>
+						<view>
+							<view class="u-order-desc">
+								<view class="level">
+									仓库管理
+								</view>
+								<view class="state">
+									等待验收入库
+								</view>
+							</view>
+							<view class="u-order-time">
+								<view class="photo">
+									<img src="../../../assets/img/level.png" alt="">
+								</view>
+								<view class="confirm">
+									<img src="../../../assets/img/riFill-gradienter-fill@1x.png" alt="">
+								</view>
+								<view class="name">
+								   周乐心
+								</view>
+							</view>
+						</view>
+					</template>
+				</u-time-line-item>
+			</u-time-line>
+		</view>
+		</view>
+    <!-- 确认出库 -->
+	<view class="bottom" >
+		<button>确认入库</button>
+	</view>
+	
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		
+		
+	}
+	.container{
+		min-height: calc(100vh - 88rpx);
+	}
+
+	// 出库单状态
+	.head {
+		background-color: #fff;
+		padding: 24rpx 32rpx;
+		display: flex;
+		align-items: center;
+		color: #101010;
+		font-size: 32rpx;
+
+		.photo {
+			width: 84rpx;
+			height: 84rpx;
+			border-radius: 100rpx;
+
+			img {
+				width: 100%;
+				height: 100%;
+				overflow: hidden;
+			}
+		}
+
+		.name {
+			color: #101010;
+			font-size: 32rpx;
+			margin-right: 8rpx;
+			margin-left: 24rpx;
+		}
+
+		.submit {
+			text {
+				color: #3385FF;
+			}
+		}
+
+		.state {
+			line-height: 48rpx;
+			padding: 0 24rpx;
+			border-radius: 50px;
+			background-color: rgba(255, 255, 255, 1);
+			color: rgba(51, 133, 255, 1);
+			font-size: 12px;
+			text-align: center;
+			font-family: Arial;
+			border: 1px solid rgba(51, 133, 255, 1);
+			margin-left: auto;
+		}
+	}
+
+	// 出库单详情
+	.details {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 0 32rpx;
+
+		.item {
+			display: flex;
+			justify-content: space-between;
+			padding: 22rpx 0;
+			border-bottom: 1px solid rgba(244, 244, 244, 1);
+
+			.name {
+				color: rgba(119, 119, 119, 1);
+			}
+
+			.value {
+				color: #101010;
+			}
+		}
+	}
+
+	// 出库单列表
+	.list {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 22rpx 32rpx;
+
+		.list-head {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.title {
+				color: #333333;
+				font-size: 32rpx
+			}
+
+			.amount {
+				color: #777777;
+				font-size: 24rpx;
+
+				text {
+					color: #3385FF;
+				}
+
+				/deep/.u-icon--right {
+					margin-left: 8rpx;
+				}
+			}
+		}
+
+		// 清单信息
+		.list-infos {
+			border-radius: 8px;
+			background-color: #F5F6F9;
+			margin-top: 24rpx;
+			padding: 24rpx;
+
+			.infos-head {
+				display: flex;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 24rpx;
+
+				.name {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+
+				.state {
+					border: 1px solid rgba(69, 186, 69, 1);
+					border-radius: 4px;
+					color: rgba(69, 186, 69, 1);
+					font-size: 24rpx;
+					line-height: 48rpx;
+					width: 160rpx;
+					text-align: center;
+					text{
+						img{
+							vertical-align: middle;
+							margin-right: 4rpx;
+						}
+					}
+				}
+				.qr-code {
+					border-radius: 4px;
+					background: linear-gradient(180deg, rgba(22, 119, 255, 1) 0%, rgba(16, 98, 213, 1) 100%);
+					color: rgba(255, 255, 255, 1);
+					font-size: 24rpx;
+					width: 160rpx;
+					text-align: center;
+					line-height: 48rpx;
+				
+					text {
+						img {
+							vertical-align: middle;
+						}
+					}
+				}
+			}
+
+			.infos {
+				margin-top: 16rpx;
+				display: flex;
+				justify-content: space-between;
+				color: #777777;
+				font-size: 24rpx;
+
+				.infos-1 {
+					
+				}
+
+				.infos-item {
+					display: flex;
+					margin-bottom: 8rpx;
+				}
+			}
+		}
+	}
+
+	// 流程
+	.process {
+		background-color: #fff;
+		margin-top: 24rpx;
+		padding: 24rpx 32rpx;
+		.title {
+			color: rgba(51, 51, 51, 1);
+			font-size: 32rpx;
+		}
+        .u-time-axis-item{
+			margin-bottom: 76rpx;
+		}
+		.u-time-axis {
+			padding: 18rpx 40rpx;
+		}
+
+		.u-node {
+			width: 18rpx;
+			height: 18rpx;
+			border-radius: 100rpx !important;
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			background: #d0d0d0;
+		}
+
+		.u-order-title {
+			color: #333333;
+			font-weight: bold;
+			font-size: 32rpx;
+		}
+
+		.u-order-desc {
+			margin-bottom: 16rpx;
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			.level {
+				color: #333333;
+				font-size: 32rpx;
+				font-weight: bold;
+			}
+
+			.date {
+				color: rgba(119, 119, 119, 1);
+			}
+
+			.state {
+				color: rgba(255, 121, 0, 1);
+			}
+		}
+
+		.u-order-time {
+			width: 90rpx;
+			color: #777777;
+			font-size: 28rpx;
+			margin-top: 16rpx;
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+
+			.photo {
+				width: 56rpx;
+				height: 56rpx;
+				border-radius: 100px;
+				margin-bottom: 4rpx;
+
+				img {
+					width: 100%;
+					height: 100%;
+					overflow: hidden;
+					position: relative;
+				}
+			}
+
+			.confirm {
+				position: absolute;
+				top: 46rpx;
+				left: 56rpx;
+			}
+
+			.name {
+				color: rgba(51, 51, 51, 1);
+				font-size: 24rpx;
+			}
+
+		}
+      
+	}
+	
+	.u-time-axis{
+		.u-time-axis-item:last-of-type{
+			margin-bottom: 0;
+		}
+	}
+	// 确认出库
+	.bottom{
+		background-color: #fff;
+		margin-top: 44rpx;
+		padding: 16rpx 32rpx;
+		
+		uni-button{
+			border-radius: 8px;
+			background: linear-gradient(180deg, rgba(22,119,255,1) 0%,rgba(16,98,213,1) 100%);
+			color: rgba(255, 255, 255, 1);
+			font-size: 32rpx;
+			line-height: 88rpx;
+			z-index: 999;
+		}
+	}
+</style>