归还设备清单 已入库详情

pages.json

@@ -78,6 +78,24 @@
             }
             
         }
+        ,{
+            "path" : "pages/storeManagement/equipmentEnter/returnList",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
+        ,{
+            "path" : "pages/storeManagement/equipmentEnter/enterDetails",
+            "style" :                                                                                    
+            {
+                "navigationBarTitleText": "",
+                "enablePullDownRefresh": false
+            }
+            
+        }
     ],
 
 	

pages/storeManagement/equipmentDelivery/deliveried.vue

@@ -530,14 +530,14 @@
 		background-color: #fff;
 		margin-top: 44rpx;
 		padding: 16rpx 32rpx;
-
+z-index: 999;
 		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>

pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -284,11 +284,7 @@
 
 <style scoped lang="scss">
 	page {
-		
-		
-	}
-	.container{
-		min-height: calc(100vh - 88rpx);
+		padding-bottom: 200rpx;
 	}
 
 	// 出库单状态
@@ -534,13 +530,18 @@
 		background-color: #fff;
 		margin-top: 44rpx;
 		padding: 16rpx 32rpx;
+		z-index: 999;
+		position: fixed;
+		left: 0;
+		right: 0;
+		bottom: 0;
 		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>

pages/storeManagement/equipmentDelivery/deliveryList.vue

@@ -378,6 +378,7 @@ margin-bottom: 24rpx;
 			color: rgba(136, 136, 136, 1);
 			border-radius: 8px;
 			font-family: Microsoft Yahei;
+			font-size: 28rpx;
 		}
 	}
 </style>

pages/storeManagement/equipmentEnter/enterDetails.vue

@@ -0,0 +1,467 @@
+<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" v-for="item in 2" >
+				<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>
+		<!-- 流程 -->
+		<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="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>
+		</view>
+		</view>	
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	page {
+		padding-bottom: 200rpx;
+		}
+
+	// 归还单状态
+	.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(69, 186, 69, 1);
+			font-size: 12px;
+			text-align: center;
+			font-family: Arial;
+			border: 1px solid rgba(69, 186, 69, 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;
+		}
+	}	
+	
+</style>

pages/storeManagement/equipmentEnter/returnList.vue

@@ -0,0 +1,360 @@
+<template>
+	<view>
+		<u-navbar>
+			<view class="title">
+				出库设备清单<text>(18)</text>
+			</view>
+		</u-navbar>
+		<view class="container">
+			<view class="main">
+				<view class="list-item">
+					<!--信息 -->
+					<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 class="receive-options">
+						<view class="title">
+							是否收到
+						</view>
+						<view class="receive-radio">
+							<u-radio-group v-model="value" @change="radioGroupChange">
+								<u-radio @change="radioChange" v-for="(item, index) in list" :key="index"
+									:name="item.name" :disabled="item.disabled">
+									{{item.name}}
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</view>
+					<!-- 备注 -->
+					<textarea placeholder="备注" name="" id="" cols="30" rows="10"></textarea>
+				
+				<!-- 上传图片 -->
+					<view class="upload-img">
+						<u-upload width="144" height="144"  upload-text="" del-bg-color="#0051FF"   :before-upload="beforeUpload"></u-upload>
+					</view>
+				</view>
+
+				<view class="list-item" >
+
+
+					<!--信息 -->
+					<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 class="receive-options">
+						<view class="title">
+							是否收到
+						</view>
+						<view class="receive-radio">
+							<u-radio-group v-model="value" @change="radioGroupChange">
+								<u-radio @change="radioChange" v-for="(item, index) in list" :key="index"
+									:name="item.name" :disabled="item.disabled">
+									{{item.name}}
+								</u-radio>
+							</u-radio-group>
+						</view>
+					</view>
+					<!-- 备注 -->
+					<textarea placeholder="备注" name="" id="" cols="30" rows="10"></textarea>
+				</view>
+			</view>
+		</view>
+		<view class="bottom">
+			<button>保存</button>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [{
+						name: '已收到',
+						disabled: false
+					},
+					{
+						name: '未收到',
+						disabled: false
+					},
+
+				],
+				// u-radio-group的v-model绑定的值如果设置为某个radio的name，就会被默认选中
+				value: '已收到',
+			};
+		},
+		methods: {
+			// 选中某个单选框时，由radio时触发
+			radioChange(e) {
+				// console.log(e);
+			},
+			// 选中任一radio时，由radio-group触发
+			radioGroupChange(e) {
+				// console.log(e);
+			},
+			beforeUpload(index, list) {
+							// 只上传偶数索引的文件
+							if(index % 2 == 0) return true;
+							else return false;
+						}
+		}
+	};
+</script>
+
+<style scoped lang="scss">
+	page{
+		padding-bottom: 200rpx;
+	}
+	.u-navbar {
+		.title {
+			display: flex;
+			flex-direction: row;
+			align-items: center;
+			justify-content: center;
+			flex: 1;
+			position: absolute;
+			left: 0;
+			right: 0;
+			height: 30px;
+			text-align: center;
+			flex-shrink: 0;
+			font-size: 36rpx;
+			color: #101010;
+
+			text {
+				color: #2A8EFB
+			}
+		}
+	}
+
+	.container {
+		.main {
+			padding: 0 24rpx;
+
+			.list-item {
+				border-radius: 8px;
+				padding: 24rpx;
+				background-color: #fff;
+				margin-top: 24rpx;
+			}
+
+			// 信息
+			.list-infos {
+				padding-bottom: 24rpx;
+				border-bottom: 1px solid rgba(232, 232, 232, 1);
+
+				.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;
+					}
+				}
+			}
+
+			// 接收选项
+			.receive-options {
+			 display: flex;
+				align-items: center;
+				padding: 24rpx 0;
+
+				.title {
+					color: #333333;
+					margin-right: 24rpx;
+				}
+
+				.receive-radio {
+					flex: 1;
+
+					/deep/.u-radio-group {
+						width: 100%;
+
+					}
+
+					/deep/.u-radio {
+						margin-right: 48rpx;
+					}
+				}
+
+			}
+
+			// 备注
+			uni-textarea {
+				width: 100%;
+				height: 80rpx;
+				line-height: 80rpx;
+				text-indent: 24rpx;
+				background-color: rgba(241, 242, 245, 1);
+				color: rgba(136, 136, 136, 1);
+				border-radius: 8px;
+				font-family: Microsoft Yahei;
+				font-size: 28rpx;
+			}
+			// 上传图片
+			.upload-img{
+				margin-top: 24rpx;
+				/deep/.u-add-tips{
+					margin-top: 0;
+				}
+				// 右上角删除图标
+				/deep/.u-delete-icon{
+					top: -8rpx;
+					right: -8rpx;
+					width: 36rpx;
+					height: 36rpx;
+				}
+				/deep/.u-list-item{
+					overflow: inherit;
+				}
+				/deep/.u-list-item{
+					margin-right: 8rpx;
+				}
+			}
+
+		}
+
+
+
+	}
+
+
+
+	.bottom {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
+		background-color: #fff;
+		margin-top: 44rpx;
+		padding: 16rpx 32rpx;
+        z-index: 999;  
+		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;
+			
+		}
+	}
+</style>

pages/storeManagement/equipmentEnter/verification.vue

@@ -5,7 +5,7 @@
 			
 		
 		
-		<!-- 出库单状态 -->
+		<!-- 归还单状态 -->
 		<view class="head">
 			<view class="photo">
 				<img src="../../../assets/img/photoCopy 3@1x.png" alt="">
@@ -20,7 +20,7 @@
 				待入库
 			</view>
 		</view>
-		<!-- 出库单详情 -->
+		<!-- 归还单详情 -->
 		<view class="details">
 			<view class="item">
 				<view class="name">
@@ -48,7 +48,7 @@
 			</view>
 		
 		</view>
-		<!-- 出库设备清单 -->
+		<!-- 归还设备清单 -->
 		<view class="list">
 			<view class="list-head">
 				<view class="title">
@@ -137,7 +137,7 @@
 
 		</view>
 		<!-- 流程 -->
-		<view class="process">
+		<view class="process" >
 			<view class="title">
 				流程
 			</view>
@@ -238,14 +238,10 @@
 
 <style scoped lang="scss">
 	page {
-		
-		
-	}
-	.container{
-		min-height: calc(100vh - 88rpx);
-	}
+		padding-bottom: 200rpx;
+		}
 
-	// 出库单状态
+	// 归还单状态
 	.head {
 		background-color: #fff;
 		padding: 24rpx 32rpx;
@@ -293,7 +289,7 @@
 		}
 	}
 
-	// 出库单详情
+	// 归还单详情
 	.details {
 		background-color: #fff;
 		margin-top: 24rpx;
@@ -315,7 +311,7 @@
 		}
 	}
 
-	// 出库单列表
+	// 归还单列表
 	.list {
 		background-color: #fff;
 		margin-top: 24rpx;
@@ -511,18 +507,22 @@
 		}
 	}
 	// 确认出库
-	.bottom{
+	.bottom {
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		right: 0;
 		background-color: #fff;
 		margin-top: 44rpx;
 		padding: 16rpx 32rpx;
-		
-		uni-button{
+	     z-index: 999;
+		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;
-			z-index: 999;
+			
 		}
 	}
 </style>