Browse Source

V-deep更新

zhengkaixin 1 month ago
parent
commit
4d02884675
24 changed files with 658 additions and 658 deletions
  1. 53 53
      App.vue
  2. 3 3
      components/equipmentRetrieval.vue
  3. 5 5
      pages/index/index.vue
  4. 3 3
      pages/otherFunctions/equipmentRetrieval/equipmentDetail.vue
  5. 3 3
      pages/otherFunctions/equipmentRetrieval/equipmentInfo.vue
  6. 4 4
      pages/otherFunctions/equipmentRetrieval/equipmentRetrieval.vue
  7. 1 1
      pages/otherFunctions/messageCenter/messageCenter.vue
  8. 1 1
      pages/projectDepartment/exportApplication/deliveryDetails.vue
  9. 4 4
      pages/projectDepartment/exportApplication/deliveryFrom.vue
  10. 5 5
      pages/projectDepartment/exportApplication/exportApplication.vue
  11. 1 1
      pages/projectDepartment/exportProcess/deliveryDetails.vue
  12. 1 1
      pages/projectDepartment/exportProcess/deliveryInfo.vue
  13. 5 5
      pages/projectDepartment/exportProcess/exportProcess.vue
  14. 1 1
      pages/projectDepartment/exportReturn/deliveryDetails.vue
  15. 6 6
      pages/projectDepartment/exportReturn/deliveryFrom.vue
  16. 5 5
      pages/projectDepartment/exportReturn/exportReturn.vue
  17. 525 525
      pages/storeManagement/equipmentDelivery/deliveriedList.vue
  18. 1 1
      pages/storeManagement/equipmentDelivery/deliveryDetails.vue
  19. 4 4
      pages/storeManagement/equipmentDelivery/equipmentDelivery.vue
  20. 7 7
      pages/storeManagement/equipmentEnter/deliveryDetails.vue
  21. 6 6
      pages/storeManagement/equipmentEnter/equipmentEnter.vue
  22. 5 5
      pages/storeManagement/equipmentInspection/equipmentInspection.vue
  23. 1 1
      pages/storeManagement/equipmentInspection/inspectionRecord.vue
  24. 8 8
      pages/storeManagement/equipmentInspection/planDetail.vue

+ 53 - 53
App.vue

@@ -6,23 +6,23 @@
 <script>
 <script>
 	
 	
 	import './config/.env.js'
 	import './config/.env.js'
-	//import './assets/js/font.js'
-	export default {
-		onLaunch: function() {
+	//import './assets/js/font.js'
+	export default {
+		onLaunch: function() {
 			console.log('App Launch')
 			console.log('App Launch')
-				
+				
 		},
 		},
-		 
+		 
 		onShow: function() {
 		onShow: function() {
-			
-			console.log('App Show')
-		},
-		onHide: function() {
-			console.log('App Hide')
-		}
-	}
-</script>
-
+			
+			console.log('App Show')
+		},
+		onHide: function() {
+			console.log('App Hide')
+		}
+	}
+</script>
+
 <style lang="scss">
 <style lang="scss">
 	
 	
 	.scanpopo{
 	.scanpopo{
@@ -81,23 +81,23 @@
 		 	 padding-top: 20px;
 		 	 padding-top: 20px;
 		 }
 		 }
 	}
 	}
-	
+	
 	/*每个页面公共css */
 	/*每个页面公共css */
 	html, body {
 	html, body {
 	  background-color:#F4F4F6;  
 	  background-color:#F4F4F6;  
 	  margin: 0;
 	  margin: 0;
-	  padding: 0;
-	  font-family: 'PingFang Regular';
-	  /* font-weight: bold; */
+	  padding: 0;
+	  font-family: 'PingFang Regular';
+	  /* font-weight: bold; */
 	  
 	  
 	} 
 	} 
-/deep/.u-divider{
-	color: rgba(182, 189, 195, 1);
-	font-size: 24rpx;
-}
-/* tabs标签 */
-/deep/.u-tab-item{
-			  font-weight: normal !important;
+::v-deep .u-divider{
+	color: rgba(182, 189, 195, 1);
+	font-size: 24rpx;
+}
+/* tabs标签 */
+::v-deep .u-tab-item{
+			  font-weight: normal !important;
 		  }
 		  }
 	.uni-icon-success-no-circle:before {
 	.uni-icon-success-no-circle:before {
 	    content: "" !important ;
 	    content: "" !important ;
@@ -115,32 +115,32 @@
 		cursor: pointer;
 		cursor: pointer;
 		text-align: center;
 		text-align: center;
 		border-radius: 1px;
 		border-radius: 1px;
-	}
-	/deep/.u-title{
-		
-		font-size:36rpx !important;
-		color: rgba(51, 51, 51, 1) !important;		
-	}
-	/deep/.uicon-nav-back {
-		color: #101010 !important;
-	}
-	@media screen and (min-width: 320px) {
-	   /deep/.u-tabbar__content {
-			height: 45px!important;
-	   }
-	}
-	@media screen and (min-width: 375px) {
-	   /deep/.u-tabbar__content {
-			height: 55px!important;
-	   }
-	}
-	@media screen and (min-width: 425px) {
-	   /deep/.u-tabbar__content {
-			height: 65px!important;
-	   }
-	}
-	.u-back-text{
-		color: #101010 !important;
-		font-size: 17px !important
-	}
+	}
+	::v-deep .u-title{
+		
+		font-size:36rpx !important;
+		color: rgba(51, 51, 51, 1) !important;		
+	}
+	::v-deep .uicon-nav-back {
+		color: #101010 !important;
+	}
+	@media screen and (min-width: 320px) {
+	   ::v-deep .u-tabbar__content {
+			height: 45px!important;
+	   }
+	}
+	@media screen and (min-width: 375px) {
+	   ::v-deep .u-tabbar__content {
+			height: 55px!important;
+	   }
+	}
+	@media screen and (min-width: 425px) {
+	   ::v-deep .u-tabbar__content {
+			height: 65px!important;
+	   }
+	}
+	.u-back-text{
+		color: #101010 !important;
+		font-size: 17px !important
+	}
 </style>
 </style>

+ 3 - 3
components/equipmentRetrieval.vue

@@ -493,7 +493,7 @@
 		background-color: #fff;
 		background-color: #fff;
 	}
 	}
 	
 	
-	.iscomponents /deep/.u-search{
+	.iscomponents ::v-deep .u-search{
 		width: 630rpx !important;
 		width: 630rpx !important;
 	}
 	}
 	 
 	 
@@ -520,13 +520,13 @@
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 
 
-		/deep/.u-content {
+		::v-deep .u-content {
 			
 			
 			border-radius: 0px !important;
 			border-radius: 0px !important;
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 
 
-		/deep/.u-icon--right {
+		::v-deep .u-icon--right {
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 		}
 		}
 
 

+ 5 - 5
pages/index/index.vue

@@ -356,11 +356,11 @@
 		z-index: 999;
 		z-index: 999;
 
 
 		.tel {
 		.tel {
-			/deep/.u-input {}
+			::v-deep .u-input {}
 		}
 		}
 
 
 		.pwd {
 		.pwd {
-			/deep/.u-input {}
+			::v-deep .u-input {}
 		}
 		}
 
 
 
 
@@ -383,7 +383,7 @@
 			border: 1px solid rgba(193, 204, 223, 1);
 			border: 1px solid rgba(193, 204, 223, 1);
 			border-radius: 8px;
 			border-radius: 8px;
 
 
-			/deep/.u-input__input {
+			::v-deep .u-input__input {
 				font-size: 32rpx;
 				font-size: 32rpx;
 			}
 			}
 
 
@@ -407,7 +407,7 @@
 				display: flex;flex-wrap: wrap;
 				display: flex;flex-wrap: wrap;
 				justify-content: space-between;
 				justify-content: space-between;
 
 
-				/deep/uni-input {
+				::v-deep uni-input {
 					height: 80rpx !important;
 					height: 80rpx !important;
 					line-height: 80rpx !important;
 					line-height: 80rpx !important;
 					color: #A7ACB4;
 					color: #A7ACB4;
@@ -453,7 +453,7 @@
 		}
 		}
 		.login-btn{
 		.login-btn{
 			margin-top: 80rpx;
 			margin-top: 80rpx;
-			/deep/uni-button{
+			::v-deep uni-button{
 				border-radius: 8px;
 				border-radius: 8px;
 				background-color: rgba(0, 59, 254, 1);
 				background-color: rgba(0, 59, 254, 1);
 				color: #fff;
 				color: #fff;

+ 3 - 3
pages/otherFunctions/equipmentRetrieval/equipmentDetail.vue

@@ -342,7 +342,7 @@
 	page{
 	page{
 		padding-bottom:100px;
 		padding-bottom:100px;
 	}
 	}
-	/deep/.u-line-1{
+	::v-deep .u-line-1{
 		overflow: inherit;	
 		overflow: inherit;	
 	}
 	}
 	// 图片
 	// 图片
@@ -389,7 +389,7 @@
 		  position: sticky;
 		  position: sticky;
 		  top: 0;
 		  top: 0;
 		  z-index: 9999;
 		  z-index: 9999;
-		  /deep/.u-tab-bar{
+		  ::v-deep .u-tab-bar{
 			  background-color: #2A8EFB !important;
 			  background-color: #2A8EFB !important;
 			  bottom:-8rpx;
 			  bottom:-8rpx;
 		  }
 		  }
@@ -428,7 +428,7 @@
 		  }
 		  }
 		  // 提示
 		  // 提示
 		  .hint{
 		  .hint{
-			  /deep/.u-alert-desc{
+			  ::v-deep .u-alert-desc{
 				  color: rgba(255, 121, 0, 1);
 				  color: rgba(255, 121, 0, 1);
 				  font-size: 28rpx
 				  font-size: 28rpx
 			  }
 			  }

+ 3 - 3
pages/otherFunctions/equipmentRetrieval/equipmentInfo.vue

@@ -377,7 +377,7 @@
 	page{
 	page{
 		padding-bottom:100px;
 		padding-bottom:100px;
 	}
 	}
-	/deep/.u-line-1{
+	::v-deep .u-line-1{
 		overflow: inherit;	
 		overflow: inherit;	
 	}
 	}
 	// 图片
 	// 图片
@@ -424,7 +424,7 @@
 		  position: sticky;
 		  position: sticky;
 		  top: 0;
 		  top: 0;
 		  z-index: 9999;
 		  z-index: 9999;
-		  /deep/.u-tab-bar{
+		  ::v-deep .u-tab-bar{
 			  background-color: #2A8EFB !important;
 			  background-color: #2A8EFB !important;
 			  bottom:-8rpx;
 			  bottom:-8rpx;
 		  }
 		  }
@@ -463,7 +463,7 @@
 		  }
 		  }
 		  // 提示
 		  // 提示
 		  .hint{
 		  .hint{
-			  /deep/.u-alert-desc{
+			  ::v-deep .u-alert-desc{
 				 // color: rgba(255, 121, 0, 1);
 				 // color: rgba(255, 121, 0, 1);
 				  font-size: 28rpx
 				  font-size: 28rpx
 			  }
 			  }

+ 4 - 4
pages/otherFunctions/equipmentRetrieval/equipmentRetrieval.vue

@@ -45,7 +45,7 @@
 	page {
 	page {
 		background-color: #fff;
 		background-color: #fff;
 	}
 	}
-	.iscomponents /deep/.u-search{
+	.iscomponents ::v-deep .u-search{
 		width: 630rpx !important;
 		width: 630rpx !important;
 	}
 	}
 	// 搜索
 	// 搜索
@@ -61,7 +61,7 @@
 			overflow: hidden;
 			overflow: hidden;
 		}
 		}
 		
 		
-		/deep/.u-search {
+		::v-deep .u-search {
 			width: 530rpx;
 			width: 530rpx;
 			margin: auto !important;
 			margin: auto !important;
 			position: relative;
 			position: relative;
@@ -70,13 +70,13 @@
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 
 
-		/deep/.u-content {
+		::v-deep .u-content {
 			width: 430px;
 			width: 430px;
 			border-radius: 0px !important;
 			border-radius: 0px !important;
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 
 
-		/deep/.u-icon--right {
+		::v-deep .u-icon--right {
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 		}
 		}
 
 

+ 1 - 1
pages/otherFunctions/messageCenter/messageCenter.vue

@@ -122,7 +122,7 @@
 		padding-bottom: 100px;
 		padding-bottom: 100px;
 		background-color: #fff;
 		background-color: #fff;
 	}
 	}
-	/deep/.u-slot-content {
+	::v-deep .u-slot-content {
 		justify-content: end;
 		justify-content: end;
 		margin-right: 32rpx;
 		margin-right: 32rpx;
 		color: rgba(51, 51, 51, 1);
 		color: rgba(51, 51, 51, 1);

+ 1 - 1
pages/projectDepartment/exportApplication/deliveryDetails.vue

@@ -525,7 +525,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 4 - 4
pages/projectDepartment/exportApplication/deliveryFrom.vue

@@ -650,7 +650,7 @@
 			overflow: hidden;
 			overflow: hidden;
 		}
 		}
 		
 		
-		/deep/.u-search {
+		::v-deep .u-search {
 			width: 630rpx;
 			width: 630rpx;
 			margin: auto !important;
 			margin: auto !important;
 			position: relative;
 			position: relative;
@@ -659,13 +659,13 @@
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 	
 	
-		/deep/.u-content {
+		::v-deep .u-content {
 			width: 430px;
 			width: 430px;
 			border-radius: 0px !important;
 			border-radius: 0px !important;
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 	
 	
-		/deep/.u-icon--right {
+		::v-deep .u-icon--right {
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 		}
 		}
 	
 	
@@ -802,7 +802,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 5 - 5
pages/projectDepartment/exportApplication/exportApplication.vue

@@ -202,14 +202,14 @@
 	.head {
 	.head {
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 
 
-		/deep/.u-navbar {
+		::v-deep .u-navbar {
 			//background: 0!important;
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			height: 210rpx;
 			height: 210rpx;
 			//padding: 0 32rpx;
 			//padding: 0 32rpx;
 		}
 		}
 
 
-		/deep/.u-border-bottom:after {
+		::v-deep .u-border-bottom:after {
 			height: 0;
 			height: 0;
 		}
 		}
 
 
@@ -223,12 +223,12 @@
 		justify-content: space-between;
 		justify-content: space-between;
 		align-items: center;
 		align-items: center;
 
 
-		/deep/.u-tabs {
+		::v-deep .u-tabs {
 			background: 0 !important;
 			background: 0 !important;
 			width: 250rpx;
 			width: 250rpx;
 		}
 		}
 
 
-		/deep/.u-tab-bar {
+		::v-deep .u-tab-bar {
 			background-color: #2A8EFB !important;
 			background-color: #2A8EFB !important;
 		}
 		}
 
 
@@ -237,7 +237,7 @@
 			position: relative;
 			position: relative;
 			font-family: Microsoft Yahei;
 			font-family: Microsoft Yahei;
 
 
-			/deep/.uicon-arrow-down {
+			::v-deep .uicon-arrow-down {
 				margin-left: 4rpx;
 				margin-left: 4rpx;
 			}
 			}
 		}
 		}

+ 1 - 1
pages/projectDepartment/exportProcess/deliveryDetails.vue

@@ -556,7 +556,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 1 - 1
pages/projectDepartment/exportProcess/deliveryInfo.vue

@@ -311,7 +311,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 5 - 5
pages/projectDepartment/exportProcess/exportProcess.vue

@@ -355,14 +355,14 @@
 	.head {
 	.head {
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 	
 	
-		/deep/.u-navbar {
+		::v-deep .u-navbar {
 			//background: 0!important;
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			height: 210rpx;
 			height: 210rpx;
 			//padding: 0 32rpx;
 			//padding: 0 32rpx;
 		}
 		}
 	
 	
-		/deep/.u-border-bottom:after {
+		::v-deep .u-border-bottom:after {
 			height: 0;
 			height: 0;
 		}
 		}
 	
 	
@@ -374,18 +374,18 @@
 		display: flex;flex-wrap: wrap;
 		display: flex;flex-wrap: wrap;
 		justify-content: space-between;
 		justify-content: space-between;
 		align-items: center;
 		align-items: center;
-		/deep/.u-tabs{
+		::v-deep .u-tabs{
 			background: 0 !important;
 			background: 0 !important;
 			width: 250rpx;
 			width: 250rpx;
 		}
 		}
-		/deep/.u-tab-bar{
+		::v-deep .u-tab-bar{
 			background-color: #2A8EFB !important;
 			background-color: #2A8EFB !important;
 		}
 		}
 		.screen{
 		.screen{
 			color: #415058;
 			color: #415058;
 			position: relative;
 			position: relative;
 			font-family: Microsoft Yahei;
 			font-family: Microsoft Yahei;
-			/deep/.uicon-arrow-down{
+			::v-deep .uicon-arrow-down{
 				margin-left: 4rpx;
 				margin-left: 4rpx;
 			}
 			}
 		}
 		}

+ 1 - 1
pages/projectDepartment/exportReturn/deliveryDetails.vue

@@ -312,7 +312,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 6 - 6
pages/projectDepartment/exportReturn/deliveryFrom.vue

@@ -642,7 +642,7 @@
 			overflow: hidden;
 			overflow: hidden;
 		}
 		}
 		
 		
-		/deep/.u-search {
+		::v-deep .u-search {
 			width: 630rpx;
 			width: 630rpx;
 			margin: auto !important;
 			margin: auto !important;
 			position: relative;
 			position: relative;
@@ -651,13 +651,13 @@
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 	
 	
-		/deep/.u-content {
+		::v-deep .u-content {
 			width: 430px;
 			width: 430px;
 			border-radius: 0px !important;
 			border-radius: 0px !important;
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 	
 	
-		/deep/.u-icon--right {
+		::v-deep .u-icon--right {
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 		}
 		}
 	
 	
@@ -703,12 +703,12 @@
 		.receive-radio {
 		.receive-radio {
 			flex: 1;
 			flex: 1;
 	
 	
-			/deep/.u-radio-group {
+			::v-deep .u-radio-group {
 				width: 100%;
 				width: 100%;
 	
 	
 			}
 			}
 	
 	
-			/deep/.u-radio {
+			::v-deep .u-radio {
 				margin-right: 48rpx;
 				margin-right: 48rpx;
 			}
 			}
 		}
 		}
@@ -824,7 +824,7 @@
 						color: #3385FF;
 						color: #3385FF;
 					}
 					}
 				
 				
-					/deep/.u-icon--right {
+					::v-deep .u-icon--right {
 						margin-left: 8rpx;
 						margin-left: 8rpx;
 					}
 					}
 				}
 				}

+ 5 - 5
pages/projectDepartment/exportReturn/exportReturn.vue

@@ -192,14 +192,14 @@
 	.head {
 	.head {
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 	
 	
-		/deep/.u-navbar {
+		::v-deep .u-navbar {
 			//background: 0!important;
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			height: 210rpx;
 			height: 210rpx;
 			//padding: 0 32rpx;
 			//padding: 0 32rpx;
 		}
 		}
 	
 	
-		/deep/.u-border-bottom:after {
+		::v-deep .u-border-bottom:after {
 			height: 0;
 			height: 0;
 		}
 		}
 	
 	
@@ -211,18 +211,18 @@
 		display: flex;flex-wrap: wrap;
 		display: flex;flex-wrap: wrap;
 		justify-content: space-between;
 		justify-content: space-between;
 		align-items: center;
 		align-items: center;
-		/deep/.u-tabs{
+		::v-deep .u-tabs{
 			background: 0 !important;
 			background: 0 !important;
 			width: 250rpx;
 			width: 250rpx;
 		}
 		}
-		/deep/.u-tab-bar{
+		::v-deep .u-tab-bar{
 			background-color: #2A8EFB !important;
 			background-color: #2A8EFB !important;
 		}
 		}
 		.screen{
 		.screen{
 			color: #415058;
 			color: #415058;
 			position: relative;
 			position: relative;
 			font-family: Microsoft Yahei;
 			font-family: Microsoft Yahei;
-			/deep/.uicon-arrow-down{
+			::v-deep .uicon-arrow-down{
 				margin-left: 4rpx;
 				margin-left: 4rpx;
 			}
 			}
 		}
 		}

+ 525 - 525
pages/storeManagement/equipmentDelivery/deliveriedList.vue

@@ -1,11 +1,11 @@
-<template>
-	<view>
-		<u-navbar>
-			<view class="u-navbar ">
-				<view class="title">
-					出库设备清单<text>({{recordsTotal}})</text>
-				</view>
-			</view>
+<template>
+	<view>
+		<u-navbar>
+			<view class="u-navbar ">
+				<view class="title">
+					出库设备清单<text>({{recordsTotal}})</text>
+				</view>
+			</view>
 			<view class="details" v-if="status==1" slot="bottom">
 			<view class="details" v-if="status==1" slot="bottom">
 				<view class="list-details">
 				<view class="list-details">
 					<view class="list-head">
 					<view class="list-head">
@@ -17,7 +17,7 @@
 						</view>
 						</view>
 					</view>
 					</view>
 				</view>
 				</view>
-			</view>
+			</view>
 		</u-navbar>
 		</u-navbar>
 		<u-popup  v-model="showpopup" class="scanpopo"  mode="bottom"
 		<u-popup  v-model="showpopup" class="scanpopo"  mode="bottom"
 		border-radius="14"
 		border-radius="14"
@@ -76,16 +76,16 @@
 					 style="width: 100%; height: 300px;"></camera>
 					 style="width: 100%; height: 300px;"></camera>
 					<!--  #endif -->
 					<!--  #endif -->
 				</u-popup>
 				</u-popup>
-		<view class="listHead " :class="status==1?'container':''" >
-		<view class="list" v-for="(item,index) in list" :key="index">
-			<!-- 清单信息 -->
-			<view class="list-infos">
-				<view class="infos-head">
-					<view class="name">
-						{{item.deviceName}}
+		<view class="listHead " :class="status==1?'container':''" >
+		<view class="list" v-for="(item,index) in list" :key="index">
+			<!-- 清单信息 -->
+			<view class="list-infos">
+				<view class="infos-head">
+					<view class="name">
+						{{item.deviceName}}
 					</view>
 					</view>
-
-					 
+
+					 
 				</view>
 				</view>
 				
 				
 				<view class="infos">
 				<view class="infos">
@@ -136,10 +136,10 @@
 					</view>
 					</view>
 				
 				
 				</view>
 				</view>
-				
-				<view class="infos" v-if="false">
-					<view class="infos-1">
-						
+				
+				<view class="infos" v-if="false">
+					<view class="infos-1">
+						
 						<view class="infos-item">
 						<view class="infos-item">
 							<view class="item-name">
 							<view class="item-name">
 								{{recordItemStatus(item.status)}}:
 								{{recordItemStatus(item.status)}}:
@@ -148,9 +148,9 @@
 								{{item.needCount}}
 								{{item.needCount}}
 							</view>
 							</view>
 						</view>
 						</view>
-					
-					</view>
-					<view class="infos-2" v-if="false">
+					
+					</view>
+					<view class="infos-2" v-if="false">
 						<view class="infos-item">
 						<view class="infos-item">
 							<view class="item-name">
 							<view class="item-name">
 								库存:
 								库存:
@@ -158,29 +158,29 @@
 							<view class="item-value"  :style="'color:'+recordStatusColor(1)">
 							<view class="item-value"  :style="'color:'+recordStatusColor(1)">
 								{{item.deviceInfo?item.deviceInfo.count:''}}
 								{{item.deviceInfo?item.deviceInfo.count:''}}
 							</view>
 							</view>
-						</view>
-						
-					</view>
-
-				</view>
-				<!-- 地址 -->
-				<view class="address">
-					<view class="name">
-						位置:
-					</view>
-					<view class="value">
-						{{item.deviceInfo.addressId?item.deviceInfo.addressId:'未录入'}}
-					</view>
-				</view>
-				<!-- 备注 -->
-				<view class="remark" v-if="false">
-					<view class="name">
-						备注:
-					</view>
-					<view class="value">
-						22
-					</view>
-				</view>
+						</view>
+						
+					</view>
+
+				</view>
+				<!-- 地址 -->
+				<view class="address">
+					<view class="name">
+						位置:
+					</view>
+					<view class="value">
+						{{item.deviceInfo.addressId?item.deviceInfo.addressId:'未录入'}}
+					</view>
+				</view>
+				<!-- 备注 -->
+				<view class="remark" v-if="false">
+					<view class="name">
+						备注:
+					</view>
+					<view class="value">
+						22
+					</view>
+				</view>
 				<view class="prepare-out" v-if="item.realDeviceList&&item.realDeviceList.length">
 				<view class="prepare-out" v-if="item.realDeviceList&&item.realDeviceList.length">
 					<view class="head">
 					<view class="head">
 						<view class="amount">
 						<view class="amount">
@@ -234,95 +234,95 @@
 						
 						
 					
 					
 					</view>
 					</view>
-				</view>
-				<view class="prepare-out 2" v-else>
-					<view class="head">
-						<view class="amount">
-							<view class="title">
-								实际领用:
-							</view>
-							<view class="value">
-								{{scanMap.get(item.deviceName+key+item.model+key+item.specifications).length}}
-							</view>
-						</view>
-
-						<view class="unfold" v-show="scanMap.get(item.deviceName+key+item.model+key+item.specifications).length>2" @click="changeShow(item)">
-							{{item.show?'收起':'展开'}}<u-icon name="arrow-down"></u-icon>
-							<!-- 	<view class="option" v-if="show==true">
-								
-								
-							</view> -->
-						</view>
-
-					</view>
-					<!-- 编号 -->
-					<view class="serial-number" v-for="(item2,j) in scanMap.get(item.deviceName+key+item.model+key+item.specifications)"
-						v-show="j<2||item.show" :key="j">
-						<view class="item">
-							<view class="text">
-								设备编号:
-							</view>
-							<view class="number" @click="delOutList(item2)">
-								<span v-if="item2.healthStatus!=1"
-									:style="'    margin-right: 1px;color:'+recordStatusColor(item2.healthStatus)">[{{item2.healthStatusN}}]</span>
-								<span v-if="item2.status!=1"
-									:style="'    margin-right: 1px;color:'+recordStatusColor(item2.status)">[{{item2.statusN}}]</span>
-								{{showCode(item2)}}
-							</view>
-						</view>
-						<view class="del" @click="delOutList(item2)">
-							<u-icon name="trash-fill"></u-icon>
-							<!-- <img src="@/assets/img/riLine-delete-bin-line Copy@1x.png" alt=""> -->
-						</view>
-					</view>
-				</view>
+				</view>
+				<view class="prepare-out 2" v-else>
+					<view class="head">
+						<view class="amount">
+							<view class="title">
+								实际领用:
+							</view>
+							<view class="value">
+								{{scanMap.get(item.deviceName+key+item.model+key+item.specifications).length}}
+							</view>
+						</view>
+
+						<view class="unfold" v-show="scanMap.get(item.deviceName+key+item.model+key+item.specifications).length>2" @click="changeShow(item)">
+							{{item.show?'收起':'展开'}}<u-icon name="arrow-down"></u-icon>
+							<!-- 	<view class="option" v-if="show==true">
+								
+								
+							</view> -->
+						</view>
+
+					</view>
+					<!-- 编号 -->
+					<view class="serial-number" v-for="(item2,j) in scanMap.get(item.deviceName+key+item.model+key+item.specifications)"
+						v-show="j<2||item.show" :key="j">
+						<view class="item">
+							<view class="text">
+								设备编号:
+							</view>
+							<view class="number" @click="delOutList(item2)">
+								<span v-if="item2.healthStatus!=1"
+									:style="'    margin-right: 1px;color:'+recordStatusColor(item2.healthStatus)">[{{item2.healthStatusN}}]</span>
+								<span v-if="item2.status!=1"
+									:style="'    margin-right: 1px;color:'+recordStatusColor(item2.status)">[{{item2.statusN}}]</span>
+								{{showCode(item2)}}
+							</view>
+						</view>
+						<view class="del" @click="delOutList(item2)">
+							<u-icon name="trash-fill"></u-icon>
+							<!-- <img src="@/assets/img/riLine-delete-bin-line Copy@1x.png" alt=""> -->
+						</view>
+					</view>
+				</view>
 				<textarea  class="textarea"
 				<textarea  class="textarea"
 				
 				
-				placeholder="备注" name="" id="" v-model="item.remark" cols="30" rows="1"></textarea>
-			</view>
-
-		</view>
-		<view class="list" v-if="noScanList.length" >
-			<view class="list-infos">
-				<view class="infos-head">
-					<view class="name">
-						扫码结果不符合清单
-					</view>
-
-				</view>
-				<view class="infos">
-					<view class="infos-1">
-						<view class="infos-item">
-							
-							<view class="item-value">
-								以下设备不计入出库设备中
-							</view>
-						</view>
-
-					</view>
-					</view>
-
-
-					<view class="prepare-out"  >
-						<view class="head">
-							<view class="amount">
-								<view class="title">
-									不符合清单:
-								</view>
-
-							</view>
-
-						</view>
-						<!-- 编号 -->
-						<view class="serial-number" v-for="(item,index) in noScanList" :key="index">
-							<view class="item">
-								<view class="text">
-									设备编号:
-								</view>
-								<view class="number">
-									{{showCode(item)}}
-								</view>
-							</view>
+				placeholder="备注" name="" id="" v-model="item.remark" cols="30" rows="1"></textarea>
+			</view>
+
+		</view>
+		<view class="list" v-if="noScanList.length" >
+			<view class="list-infos">
+				<view class="infos-head">
+					<view class="name">
+						扫码结果不符合清单
+					</view>
+
+				</view>
+				<view class="infos">
+					<view class="infos-1">
+						<view class="infos-item">
+							
+							<view class="item-value">
+								以下设备不计入出库设备中
+							</view>
+						</view>
+
+					</view>
+					</view>
+
+
+					<view class="prepare-out"  >
+						<view class="head">
+							<view class="amount">
+								<view class="title">
+									不符合清单:
+								</view>
+
+							</view>
+
+						</view>
+						<!-- 编号 -->
+						<view class="serial-number" v-for="(item,index) in noScanList" :key="index">
+							<view class="item">
+								<view class="text">
+									设备编号:
+								</view>
+								<view class="number">
+									{{showCode(item)}}
+								</view>
+							</view>
 							<view class="item">
 							<view class="item">
 								<view class="text">
 								<view class="text">
 									设备名称:
 									设备名称:
@@ -330,34 +330,34 @@
 								<view class="number">
 								<view class="number">
 									{{item.title}}
 									{{item.title}}
 								</view>
 								</view>
-							</view>
-						</view>
-				
-				</view>
+							</view>
+						</view>
+				
+				</view>
 			</view>
 			</view>
-			
-		</view>
+			
+		</view>
 		
 		
 		<u-divider   border-color="#CFD2D5">已经到底了</u-divider>
 		<u-divider   border-color="#CFD2D5">已经到底了</u-divider>
 		
 		
 			
 			
-		</view>
-		<!-- 确认出库 -->
-		<view class="bottom" v-if="status==1">
-			<u-button type="primary" @click="gotoOut()">确认出库</u-button>
-
-		</view>
-	</view>
-</template>
-
-<script>
-	import * as API from '@/apis/pagejs/storeManagement.js'
-	import {
-		recordItemStatus,
-		recordStatusColor
-	} from '@/apis/status.js'
-	export default {
-		data() {
+		</view>
+		<!-- 确认出库 -->
+		<view class="bottom" v-if="status==1">
+			<u-button type="primary" @click="gotoOut()">确认出库</u-button>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import * as API from '@/apis/pagejs/storeManagement.js'
+	import {
+		recordItemStatus,
+		recordStatusColor
+	} from '@/apis/status.js'
+	export default {
+		data() {
 			return {
 			return {
 				nowscan:{
 				nowscan:{
 				"title": "",
 				"title": "",
@@ -372,34 +372,34 @@
 			status:"",
 			status:"",
 			deviceposition:"back",
 			deviceposition:"back",
 			scanFunctionIsUseable:true,
 			scanFunctionIsUseable:true,
-				showpopup:false,
-				show: false,
-				list: [],
-				scanList: [],
+				showpopup:false,
+				show: false,
+				list: [],
+				scanList: [],
 				id: "",
 				id: "",
-				key:"-#jp$-",
-				recordsTotal: 0,
-				listFrom: {
-					pageIndex: 1,
-					pageSize: 99999,
-
-				}
-			}
-		},
-		onReachBottom() {
-
-			if (this.list.length < this.recordsTotal) {
-				this.myLoadmore();
-			}
-		},
-		onLoad(op) {
+				key:"-#jp$-",
+				recordsTotal: 0,
+				listFrom: {
+					pageIndex: 1,
+					pageSize: 99999,
+
+				}
+			}
+		},
+		onReachBottom() {
+
+			if (this.list.length < this.recordsTotal) {
+				this.myLoadmore();
+			}
+		},
+		onLoad(op) {
 			this.id = op.id
 			this.id = op.id
-			this.status = op.status
-			this.getList()
-		},
-		onReady() {
-
-		},
+			this.status = op.status
+			this.getList()
+		},
+		onReady() {
+
+		},
 		computed: {
 		computed: {
 			noScanList() {
 			noScanList() {
 				var list= this.list.map(item=>{
 				var list= this.list.map(item=>{
@@ -412,28 +412,28 @@
 				})
 				})
 			
 			
 				return reList
 				return reList
-			},
-			scanMap() {
-				var map = new Map()
-
-				this.scanList.forEach(item => {
-					var title=item.title+this.key+item.model+this.key+item.specifications
-					if (map.has(title)) {
-						var list = map.get(title)
-						list.unshift(item)
-						map.set(title, list)
-					} else {
-						map.set(title, [item])
-					}
-
-				})
-
-				console.log(map)
-				return map
-			},
-		},
-		methods: {
-			recordItemStatus,
+			},
+			scanMap() {
+				var map = new Map()
+
+				this.scanList.forEach(item => {
+					var title=item.title+this.key+item.model+this.key+item.specifications
+					if (map.has(title)) {
+						var list = map.get(title)
+						list.unshift(item)
+						map.set(title, list)
+					} else {
+						map.set(title, [item])
+					}
+
+				})
+
+				console.log(map)
+				return map
+			},
+		},
+		methods: {
+			recordItemStatus,
 			recordStatusColor,
 			recordStatusColor,
 			ckInfo(item) {
 			ckInfo(item) {
 				
 				
@@ -481,9 +481,9 @@
 						icon: "none"
 						icon: "none"
 					})
 					})
 				})
 				})
-			},
-			gotoOut() {
-				//recordData
+			},
+			gotoOut() {
+				//recordData
 			
 			
 				var list=[];
 				var list=[];
 				var bl=true;
 				var bl=true;
@@ -539,7 +539,7 @@
 							console.log('用户点击取消');
 							console.log('用户点击取消');
 						}
 						}
 					}
 					}
-				});
+				});
 			},
 			},
 			 error(e) {
 			 error(e) {
 			            console.log(e);
 			            console.log(e);
@@ -586,53 +586,53 @@
 				  //                    this.src = res.tempImagePath
 				  //                    this.src = res.tempImagePath
 				  //                }
 				  //                }
 				  //            });
 				  //            });
-			 },
-			gotoscanH5(val) {
+			 },
+			gotoscanH5(val) {
 				console.log('111')
 				console.log('111')
-				
-				var _this = this;
-				uni.showModal({
-					title: '提示',
-					editable: true,
-					//content: '这是一个模态弹窗',
-					success: function(res) {
-						if (res.confirm) {
-							_this.getscan(res.content)
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-
-
-			},
-			delOutListMethod(deviceInfo) {
-				var c = this.scanList.findIndex(item => {
-					return item.id == deviceInfo.id
-				})
-				if (c > -1) {
-					this.scanList.splice(c, 1)
-					uni.showToast({
-						title: "删除成功",
-						icon: "none"
-					})
-				}
-			},
-			delOutList(item) {
-				var _this = this;
-				uni.showModal({
-					title: '提示',
-					//editable:true,
-					content: '确认是否删除',
-					success: function(res) {
-						if (res.confirm) {
-							_this.delOutListMethod(item)
-						} else if (res.cancel) {
-							console.log('用户点击取消');
-						}
-					}
-				});
-			},
+				
+				var _this = this;
+				uni.showModal({
+					title: '提示',
+					editable: true,
+					//content: '这是一个模态弹窗',
+					success: function(res) {
+						if (res.confirm) {
+							_this.getscan(res.content)
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+
+
+			},
+			delOutListMethod(deviceInfo) {
+				var c = this.scanList.findIndex(item => {
+					return item.id == deviceInfo.id
+				})
+				if (c > -1) {
+					this.scanList.splice(c, 1)
+					uni.showToast({
+						title: "删除成功",
+						icon: "none"
+					})
+				}
+			},
+			delOutList(item) {
+				var _this = this;
+				uni.showModal({
+					title: '提示',
+					//editable:true,
+					content: '确认是否删除',
+					success: function(res) {
+						if (res.confirm) {
+							_this.delOutListMethod(item)
+						} else if (res.cancel) {
+							console.log('用户点击取消');
+						}
+					}
+				});
+			},
 			getscan(val) {
 			getscan(val) {
 				console.log(val);
 				console.log(val);
 				
 				
@@ -645,62 +645,62 @@
 					return
 					return
 				}
 				}
 				
 				
-				
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.queryDeviceByCode({
-					code: val,
-				}).then((res) => {
-					uni.hideLoading();
-					if (res.data.deviceInfo) {
-						console.log(res.data.deviceInfo)
-						this.nowscan=res.data.deviceInfo;
-						var c = this.scanList.find(item => {
-							return item.id == res.data.deviceInfo.id
-						})
-						if (c) {
-							uni.showToast({
-								title: "已存在,添加失败",
-								icon: "none"
-							})
-						} else {
-							this.scanList.push(res.data.deviceInfo)
-							uni.showToast({
-								title: "添加成功",
-								icon: "none"
-							})
-						}
-
-
-
-					} else {
-						uni.showToast({
-							title: "二维码无效",
-							icon: "none"
+				
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.queryDeviceByCode({
+					code: val,
+				}).then((res) => {
+					uni.hideLoading();
+					if (res.data.deviceInfo) {
+						console.log(res.data.deviceInfo)
+						this.nowscan=res.data.deviceInfo;
+						var c = this.scanList.find(item => {
+							return item.id == res.data.deviceInfo.id
+						})
+						if (c) {
+							uni.showToast({
+								title: "已存在,添加失败",
+								icon: "none"
+							})
+						} else {
+							this.scanList.push(res.data.deviceInfo)
+							uni.showToast({
+								title: "添加成功",
+								icon: "none"
+							})
+						}
+
+
+
+					} else {
+						uni.showToast({
+							title: "二维码无效",
+							icon: "none"
 						})
 						})
-						this.nowscan={}
-					}
-
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			getList() {
-				uni.showLoading({
-					title: "加载中",
-					mask: true,
-				})
-				API.outRecordDeviceById({
-					recordId: this.id,
-					pageSize: this.listFrom.pageSize,
-					pageIndex: this.listFrom.pageIndex,
-				}).then((res) => {
-					uni.hideLoading();
+						this.nowscan={}
+					}
+
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			getList() {
+				uni.showLoading({
+					title: "加载中",
+					mask: true,
+				})
+				API.outRecordDeviceById({
+					recordId: this.id,
+					pageSize: this.listFrom.pageSize,
+					pageIndex: this.listFrom.pageIndex,
+				}).then((res) => {
+					uni.hideLoading();
 				
 				
 					if (this.listFrom.pageIndex == 1) {
 					if (this.listFrom.pageIndex == 1) {
 						this.list = res.data.data;
 						this.list = res.data.data;
@@ -709,85 +709,85 @@
 							...this.list,
 							...this.list,
 							...res.data.data
 							...res.data.data
 						];
 						];
-					}
-					this.recordsTotal = res.data.recordsTotal;
-				}).catch(error => {
-					uni.showToast({
-						title: error,
-						icon: "none"
-					})
-				})
-			},
-			myLoadmore() {
-				this.listFrom.pageIndex += 1;
-				this.getList();
-			},
-			changeShow(item) {
-				console.log(item.show)
-				console.log(item)
-				if (item.show) {
-					item.show = false;
-				} else {
-					item.show = true;
-				}
-				this.$forceUpdate()
-
-			}
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	.bottom {
-		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;
-
-		// }
-	}
-
-	page {
-		padding-bottom: 100px;
-	}
-
-	.u-navbar {
-		display: flex;flex-wrap: wrap;
-		font-size: 36rpx;
-		align-items: center;
-		justify-content: center;
-		flex: 1;
-		position: absolute;
-		left: 0;
-		right: 0;
-		height: 60rpx;
-		text-align: center;
-		flex-shrink: 0;
-		left: 237rpx;
-		right: 107rpx;
-		width: 300rpx;
-
-		.title {
-
-
-			line-height: 60rpx;
-			font-size: 36rpx;
-			flex: 1;
-
-			text {
-				color: #2A8EFB
-			}
-		}
+					}
+					this.recordsTotal = res.data.recordsTotal;
+				}).catch(error => {
+					uni.showToast({
+						title: error,
+						icon: "none"
+					})
+				})
+			},
+			myLoadmore() {
+				this.listFrom.pageIndex += 1;
+				this.getList();
+			},
+			changeShow(item) {
+				console.log(item.show)
+				console.log(item)
+				if (item.show) {
+					item.show = false;
+				} else {
+					item.show = true;
+				}
+				this.$forceUpdate()
+
+			}
+		}
+	}
+</script>
+
+<style scoped lang="scss">
+	.bottom {
+		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;
+
+		// }
+	}
+
+	page {
+		padding-bottom: 100px;
+	}
+
+	.u-navbar {
+		display: flex;flex-wrap: wrap;
+		font-size: 36rpx;
+		align-items: center;
+		justify-content: center;
+		flex: 1;
+		position: absolute;
+		left: 0;
+		right: 0;
+		height: 60rpx;
+		text-align: center;
+		flex-shrink: 0;
+		left: 237rpx;
+		right: 107rpx;
+		width: 300rpx;
+
+		.title {
+
+
+			line-height: 60rpx;
+			font-size: 36rpx;
+			flex: 1;
+
+			text {
+				color: #2A8EFB
+			}
+		}
 	}
 	}
 	.details {
 	.details {
 		background-color: #fff;
 		background-color: #fff;
@@ -816,7 +816,7 @@
 						color: #3385FF;
 						color: #3385FF;
 					}
 					}
 			
 			
-					/deep/.u-icon--right {
+					::v-deep .u-icon--right {
 						margin-left: 8rpx;
 						margin-left: 8rpx;
 					}
 					}
 				}
 				}
@@ -883,7 +883,7 @@
 				}
 				}
 			}
 			}
 		}
 		}
-	}
+	}
 	.scantitle{
 	.scantitle{
 		text-align: center;
 		text-align: center;
 		font-size: 44rpx;
 		font-size: 44rpx;
@@ -896,147 +896,147 @@
 	.listHead{
 	.listHead{
 	
 	
 		padding-bottom: 60px;
 		padding-bottom: 60px;
-	}
-	.list {
-		background-color: #fff;
-		margin: 24rpx;
-		padding: 22rpx 32rpx;
-		
-		// 清单信息
-		.list-infos {
-			border-radius: 8px;
-			
-			.infos-head {
-				display: flex;flex-wrap: wrap;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 24rpx;
-
-				.name {
-					color: rgba(51, 51, 51, 1);
-					font-size: 32rpx;
-				}
-
-				.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: 64rpx;
-
-					text {
-						img {
-							vertical-align: middle;
-						}
-					}
-				}
-			}
-
-			.infos {
-				margin-top: 16rpx;
-				display: flex;flex-wrap: wrap;
-				color: #777777;
-				font-size: 24rpx;
-
-				.infos-1 {
-					margin-right: 68rpx;
-				}
-
-
-				.infos-item {
-					display: flex;flex-wrap: wrap;
+	}
+	.list {
+		background-color: #fff;
+		margin: 24rpx;
+		padding: 22rpx 32rpx;
+		
+		// 清单信息
+		.list-infos {
+			border-radius: 8px;
+			
+			.infos-head {
+				display: flex;flex-wrap: wrap;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 24rpx;
+
+				.name {
+					color: rgba(51, 51, 51, 1);
+					font-size: 32rpx;
+				}
+
+				.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: 64rpx;
+
+					text {
+						img {
+							vertical-align: middle;
+						}
+					}
+				}
+			}
+
+			.infos {
+				margin-top: 16rpx;
+				display: flex;flex-wrap: wrap;
+				color: #777777;
+				font-size: 24rpx;
+
+				.infos-1 {
+					margin-right: 68rpx;
+				}
+
+
+				.infos-item {
+					display: flex;flex-wrap: wrap;
 					margin-bottom: 8rpx;
 					margin-bottom: 8rpx;
 					.item-value{
 					.item-value{
 						max-width: 200rpx;
 						max-width: 200rpx;
-					}
-				}
-
-			}
-
-			.address,
-			.remark {
-				display: flex;flex-wrap: wrap;
-				color: #777777;
-				font-size: 24rpx;
-				margin-bottom: 8rpx;
-			}
-		}
-
-		.prepare-out {
-			padding: 24rpx;
-			margin-top: 40rpx;
-			border-radius: 8px;
-			background-color: rgba(245, 246, 249, 1);
-
-			.head {
-				display: flex;flex-wrap: wrap;
-				justify-content: space-between;
-				align-items: center;
-				margin-bottom: 24rpx;
-
-				.amount {
-					display: flex;flex-wrap: wrap;
-					color: rgba(0, 81, 255, 1);
-					font-size: 32rpx;
-				}
-
-				.unfold {
-					color: rgba(146, 158, 165, 1);
-					font-size: 24rpx;
-					position: relative;
-
-					.u-icon--right {
-						margin-left: 8rpx;
-					}
-				}
-
-				.option {
-					width: 160rpx;
-					height: 32rpx;
-					background-color: #fff;
-					position: absolute;
-					top: 30rpx;
-					right: 0;
-				}
-			}
-
-			// 编号
-			.serial-number {
-				display: flex;flex-wrap: wrap;
-				justify-content: space-between;
-				align-items: center;
-				margin-top: 16rpx;
-				color: rgba(51, 51, 51, 1);
-				font-weight: bold;
+					}
+				}
+
+			}
+
+			.address,
+			.remark {
+				display: flex;flex-wrap: wrap;
+				color: #777777;
+				font-size: 24rpx;
+				margin-bottom: 8rpx;
+			}
+		}
+
+		.prepare-out {
+			padding: 24rpx;
+			margin-top: 40rpx;
+			border-radius: 8px;
+			background-color: rgba(245, 246, 249, 1);
+
+			.head {
+				display: flex;flex-wrap: wrap;
+				justify-content: space-between;
+				align-items: center;
+				margin-bottom: 24rpx;
+
+				.amount {
+					display: flex;flex-wrap: wrap;
+					color: rgba(0, 81, 255, 1);
+					font-size: 32rpx;
+				}
+
+				.unfold {
+					color: rgba(146, 158, 165, 1);
+					font-size: 24rpx;
+					position: relative;
+
+					.u-icon--right {
+						margin-left: 8rpx;
+					}
+				}
+
+				.option {
+					width: 160rpx;
+					height: 32rpx;
+					background-color: #fff;
+					position: absolute;
+					top: 30rpx;
+					right: 0;
+				}
+			}
+
+			// 编号
+			.serial-number {
+				display: flex;flex-wrap: wrap;
+				justify-content: space-between;
+				align-items: center;
+				margin-top: 16rpx;
+				color: rgba(51, 51, 51, 1);
+				font-weight: bold;
 				.itemLine{
 				.itemLine{
 					width: 100%;
 					width: 100%;
 					.view {
 					.view {
 						float: right;
 						float: right;
 						color: #0051ff;
 						color: #0051ff;
 					}
 					}
-				}
-				.item {
+				}
+				.item {
 					display: flex;flex-wrap: wrap;
 					display: flex;flex-wrap: wrap;
-					
-				}
-			}
-
-		}
-
-		// 备注
-		.textarea {
-			width: 100%;
-			height: 80rpx;
-			line-height: 80rpx;
-			text-indent: 24rpx;
-			margin-top: 24rpx;
-			background-color: rgba(241, 242, 245, 1);
-			color: rgba(136, 136, 136, 1);
-			border-radius: 8px;
-			font-family: Microsoft Yahei;
-			font-size: 28rpx;
-		}
-	}
+					
+				}
+			}
+
+		}
+
+		// 备注
+		.textarea {
+			width: 100%;
+			height: 80rpx;
+			line-height: 80rpx;
+			text-indent: 24rpx;
+			margin-top: 24rpx;
+			background-color: rgba(241, 242, 245, 1);
+			color: rgba(136, 136, 136, 1);
+			border-radius: 8px;
+			font-family: Microsoft Yahei;
+			font-size: 28rpx;
+		}
+	}
 </style>
 </style>

+ 1 - 1
pages/storeManagement/equipmentDelivery/deliveryDetails.vue

@@ -401,7 +401,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 4 - 4
pages/storeManagement/equipmentDelivery/equipmentDelivery.vue

@@ -172,14 +172,14 @@
 	.head {
 	.head {
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 	
 	
-		/deep/.u-navbar {
+		::v-deep .u-navbar {
 			//background: 0!important;
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			height: 210rpx;
 			height: 210rpx;
 			//padding: 0 32rpx;
 			//padding: 0 32rpx;
 		}
 		}
 	
 	
-		/deep/.u-border-bottom:after {
+		::v-deep .u-border-bottom:after {
 			height: 0;
 			height: 0;
 		}
 		}
 	
 	
@@ -193,11 +193,11 @@
 		align-items: center;
 		align-items: center;
 		
 		
 		
 		
-		/deep/.u-tabs{
+		::v-deep .u-tabs{
 			background: 0 !important;
 			background: 0 !important;
 			width: 250rpx;
 			width: 250rpx;
 		}
 		}
-		/deep/.u-tab-bar{
+		::v-deep .u-tab-bar{
 			background-color: #2A8EFB !important;
 			background-color: #2A8EFB !important;
 		}
 		}
 	}
 	}

+ 7 - 7
pages/storeManagement/equipmentEnter/deliveryDetails.vue

@@ -806,12 +806,12 @@
 				.receive-radio {
 				.receive-radio {
 					flex: 1;
 					flex: 1;
 	
 	
-					/deep/.u-radio-group {
+					::v-deep .u-radio-group {
 						width: 100%;
 						width: 100%;
 	
 	
 					}
 					}
 	
 	
-					/deep/.u-radio {
+					::v-deep .u-radio {
 						margin-right: 48rpx;
 						margin-right: 48rpx;
 					}
 					}
 				}
 				}
@@ -833,20 +833,20 @@
 			// 上传图片
 			// 上传图片
 			.upload-img{
 			.upload-img{
 				margin-top: 24rpx;
 				margin-top: 24rpx;
-				/deep/.u-add-tips{
+				::v-deep .u-add-tips{
 					margin-top: 0;
 					margin-top: 0;
 				}
 				}
 				// 右上角删除图标
 				// 右上角删除图标
-				/deep/.u-delete-icon{
+				::v-deep .u-delete-icon{
 					top: -8rpx;
 					top: -8rpx;
 					right: -8rpx;
 					right: -8rpx;
 					width: 36rpx;
 					width: 36rpx;
 					height: 36rpx;
 					height: 36rpx;
 				}
 				}
-				/deep/.u-list-item{
+				::v-deep .u-list-item{
 					overflow: inherit;
 					overflow: inherit;
 				}
 				}
-				/deep/.u-list-item{
+				::v-deep .u-list-item{
 					margin-right: 8rpx;
 					margin-right: 8rpx;
 				}
 				}
 			}
 			}
@@ -954,7 +954,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 
 
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 6 - 6
pages/storeManagement/equipmentEnter/equipmentEnter.vue

@@ -225,13 +225,13 @@
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 	
 	
-		/deep/.u-content {
+		::v-deep .u-content {
 			width: 430px;
 			width: 430px;
 			border-radius: 0px !important;
 			border-radius: 0px !important;
 			height: 64rpx !important;
 			height: 64rpx !important;
 		}
 		}
 	
 	
-		/deep/.u-icon--right {
+		::v-deep .u-icon--right {
 			margin-right: 16rpx;
 			margin-right: 16rpx;
 		}
 		}
 	
 	
@@ -254,14 +254,14 @@
 	.head {
 	.head {
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 	
 	
-		/deep/.u-navbar {
+		::v-deep .u-navbar {
 			//background: 0!important;
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			height: 210rpx;
 			height: 210rpx;
 			//padding: 0 32rpx;
 			//padding: 0 32rpx;
 		}
 		}
 	
 	
-		/deep/.u-border-bottom:after {
+		::v-deep .u-border-bottom:after {
 			height: 0;
 			height: 0;
 		}
 		}
 	
 	
@@ -275,11 +275,11 @@
 		align-items: center;
 		align-items: center;
 		
 		
 		
 		
-		/deep/.u-tabs{
+		::v-deep .u-tabs{
 			background: 0 !important;
 			background: 0 !important;
 			width: 250rpx;
 			width: 250rpx;
 		}
 		}
-		/deep/.u-tab-bar{
+		::v-deep .u-tab-bar{
 			background-color: #2A8EFB !important;
 			background-color: #2A8EFB !important;
 		}
 		}
 	}
 	}

+ 5 - 5
pages/storeManagement/equipmentInspection/equipmentInspection.vue

@@ -303,14 +303,14 @@
 	.head {
 	.head {
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 		background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 
 
-		/deep/.u-navbar {
+		::v-deep .u-navbar {
 			//background: 0!important;
 			//background: 0!important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			background: linear-gradient(180deg, rgba(190, 211, 240, 1) 0%, rgba(244, 244, 246, 1) 100%) !important;
 			height: 210rpx;
 			height: 210rpx;
 			//padding: 0 32rpx;
 			//padding: 0 32rpx;
 		}
 		}
 
 
-		/deep/.u-border-bottom:after {
+		::v-deep .u-border-bottom:after {
 			height: 0;
 			height: 0;
 		}
 		}
 
 
@@ -324,12 +324,12 @@
 		justify-content: space-between;
 		justify-content: space-between;
 		align-items: center;
 		align-items: center;
 
 
-		/deep/.u-tabs {
+		::v-deep .u-tabs {
 			background: 0 !important;
 			background: 0 !important;
 			//width: 480rpx;
 			//width: 480rpx;
 		}
 		}
 
 
-		/deep/.u-tab-bar {
+		::v-deep .u-tab-bar {
 			background-color: #2A8EFB !important;
 			background-color: #2A8EFB !important;
 		}
 		}
 
 
@@ -338,7 +338,7 @@
 			position: relative;
 			position: relative;
 			font-family: Microsoft Yahei;
 			font-family: Microsoft Yahei;
 
 
-			/deep/.uicon-arrow-down {
+			::v-deep .uicon-arrow-down {
 				margin-left: 4rpx;
 				margin-left: 4rpx;
 			}
 			}
 		}
 		}

+ 1 - 1
pages/storeManagement/equipmentInspection/inspectionRecord.vue

@@ -157,7 +157,7 @@
 				color: #929EA5;
 				color: #929EA5;
 				font-family: Microsoft Yahei;
 				font-family: Microsoft Yahei;
 
 
-				/deep/.uicon-arrow-down {
+				::v-deep .uicon-arrow-down {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}

+ 8 - 8
pages/storeManagement/equipmentInspection/planDetail.vue

@@ -480,7 +480,7 @@
 				color: red;
 				color: red;
 				font-family: Microsoft Yahei;
 				font-family: Microsoft Yahei;
 
 
-				/deep/.uicon-arrow-down {
+				::v-deep .uicon-arrow-down {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}
@@ -549,7 +549,7 @@
 					color: #3385FF;
 					color: #3385FF;
 				}
 				}
 		
 		
-				/deep/.u-icon--right {
+				::v-deep .u-icon--right {
 					margin-left: 8rpx;
 					margin-left: 8rpx;
 				}
 				}
 			}
 			}
@@ -701,12 +701,12 @@
 				.receive-radio {
 				.receive-radio {
 					flex: 1;
 					flex: 1;
 
 
-					/deep/.u-radio-group {
+					::v-deep .u-radio-group {
 						width: 100%;
 						width: 100%;
 
 
 					}
 					}
 
 
-					/deep/.u-radio {
+					::v-deep .u-radio {
 						margin-right: 48rpx;
 						margin-right: 48rpx;
 					}
 					}
 				}
 				}
@@ -730,23 +730,23 @@
 			.upload-img {
 			.upload-img {
 				margin-top: 24rpx;
 				margin-top: 24rpx;
 
 
-				/deep/.u-add-tips {
+				::v-deep .u-add-tips {
 					margin-top: 0;
 					margin-top: 0;
 				}
 				}
 
 
 				// 右上角删除图标
 				// 右上角删除图标
-				/deep/.u-delete-icon {
+				::v-deep .u-delete-icon {
 					top: -8rpx;
 					top: -8rpx;
 					right: -8rpx;
 					right: -8rpx;
 					width: 36rpx;
 					width: 36rpx;
 					height: 36rpx;
 					height: 36rpx;
 				}
 				}
 
 
-				/deep/.u-list-item {
+				::v-deep .u-list-item {
 					overflow: inherit;
 					overflow: inherit;
 				}
 				}
 
 
-				/deep/.u-list-item {
+				::v-deep .u-list-item {
 					margin-right: 8rpx;
 					margin-right: 8rpx;
 				}
 				}
 			}
 			}