lilei 9 miesięcy temu
rodzic
commit
bc5e219654

+ 4 - 4
pagesA/digitalShelf/orderDetail.vue

@@ -49,7 +49,7 @@
 						{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
 						{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
 					</view>
 					</view>
 				</view>
 				</view>
-				<view v-for="item in partList" :key="item.productSn" class="flex align-center item-list">
+				<view v-for="item in partList" :key="item.productSn" class="flex align_center item-list">
 					<view>
 					<view>
 						<u-image :src="item.images?item.images:'/static/def_imgs.png'" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 						<u-image :src="item.images?item.images:'/static/def_imgs.png'" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 					</view>
 					</view>
@@ -397,7 +397,6 @@
 					padding: 20rpx 0;
 					padding: 20rpx 0;
 					&:first-child{
 					&:first-child{
 						margin-right: 20rpx;
 						margin-right: 20rpx;
-						margin-top: 18rpx;
 					}
 					}
 					&:last-child{
 					&:last-child{
 						flex-grow: 1;
 						flex-grow: 1;
@@ -405,7 +404,7 @@
 				}
 				}
 				.item-name{
 				.item-name{
 					word-wrap: break-word;
 					word-wrap: break-word;
-					font-size: 32rpx;
+					font-size: 28rpx;
 					color: #333;
 					color: #333;
 					font-weight: bold;
 					font-weight: bold;
 					margin-top: 10rpx;
 					margin-top: 10rpx;
@@ -413,7 +412,7 @@
 				.item-nums{
 				.item-nums{
 					padding: 10rpx 0;
 					padding: 10rpx 0;
 					text{
 					text{
-						font-size: 32rpx;
+						font-size: 28rpx;
 						color: #222222;
 						color: #222222;
 					}
 					}
 				}
 				}
@@ -422,6 +421,7 @@
 					align-items: center;
 					align-items: center;
 					justify-content: space-between;
 					justify-content: space-between;
 					color: #666;
 					color: #666;
+					font-size: 28rpx;
 					> view{
 					> view{
 						&:first-child{
 						&:first-child{
 							font-size: 28rpx;
 							font-size: 28rpx;

+ 11 - 81
pagesA/digitalShelf/orderList.vue

@@ -18,7 +18,7 @@
 									<view class="orderNo">{{item.shelfOrderNo}}</view>
 									<view class="orderNo">{{item.shelfOrderNo}}</view>
 									<view class="times">{{item.createDate}}</view>
 									<view class="times">{{item.createDate}}</view>
 								</view>
 								</view>
-								 <view class="check-row flex align-center">
+								 <view class="check-row check-row-info flex align_center">
 									 <view class="carImage">
 									 <view class="carImage">
 										 <u-image v-if="!item.billSource||item.billSource=='vin'" :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
 										 <u-image v-if="!item.billSource||item.billSource=='vin'" :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
 										 <u-image v-if="item.billSource=='qr_code'" src="/static/qrcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
 										 <u-image v-if="item.billSource=='qr_code'" src="/static/qrcode.png" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
@@ -39,6 +39,9 @@
 										  </view>
 										  </view>
 									 </view>
 									 </view>
 									 <view v-else>
 									 <view v-else>
+										 <view class="carModel flex">
+										 	<text>{{item.shelfOrderDetailList[0].productName}}</text>
+										 </view>
 										  <view class="pcode flex">
 										  <view class="pcode flex">
 											 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
 											 <text>{{item.shelfOrderDetailList[0].productCode}}</text>
 										  </view>
 										  </view>
@@ -48,9 +51,6 @@
 										  		<u-tag :text="item.shelfOrderDetailList[0].origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 										  		<u-tag :text="item.shelfOrderDetailList[0].origCode" mode="light" borderColor="#ffffff" type="warning" size="large"></u-tag>
 										  	</view>
 										  	</view>
 										  </view>
 										  </view>
-										  <view class="carModel flex">
-											  <text>{{item.shelfOrderDetailList[0].productName}}</text>
-										  </view>
 									 </view>
 									 </view>
 								 </view>
 								 </view>
 								 <view class="check-row">
 								 <view class="check-row">
@@ -315,7 +315,6 @@
 				box-shadow: 1px 1px 3px #EEEEEE;
 				box-shadow: 1px 1px 3px #EEEEEE;
 				.check-row{
 				.check-row{
 					display: flex;
 					display: flex;
-					padding: 20upx 10upx;
 					font-size: 28upx;
 					font-size: 28upx;
 					/deep/ .u-tag{
 					/deep/ .u-tag{
 						word-break: break-all;
 						word-break: break-all;
@@ -323,9 +322,9 @@
 					&:first-child{
 					&:first-child{
 						color: #666E75;
 						color: #666E75;
 						font-size: 24upx;
 						font-size: 24upx;
-						padding-bottom: 10upx;
+						padding: 20upx 0;
 						.orderNo{
 						.orderNo{
-							font-size: 30upx;
+							font-size: 28upx;
 							color: #222222;
 							color: #222222;
 							margin-top: -6upx;
 							margin-top: -6upx;
 							flex-grow: 1;
 							flex-grow: 1;
@@ -348,8 +347,8 @@
 							margin-bottom: 10rpx;
 							margin-bottom: 10rpx;
 						}
 						}
 						.carModel{
 						.carModel{
-							color: #222222;
-							font-size: 32upx;
+							color: #333;
+							font-size: 28upx;
 							font-weight: bold;
 							font-weight: bold;
 							line-height: normal;
 							line-height: normal;
 							margin-bottom: 10rpx;
 							margin-bottom: 10rpx;
@@ -396,80 +395,11 @@
 						background-color: #fef0f0;
 						background-color: #fef0f0;
 					}
 					}
 				}
 				}
-			}
-		}
-	}
-    
-	.search-popup{
-		.search-title{
-			text-align: center;
-			padding: 20upx;
-			color: #333;
-			border-bottom: 1px solid #eee;
-		}
-		.uni-list{
-			padding:10upx 20upx;
-			margin: 0;
-			border-bottom: 1px solid #EEEEEE;
-			.uni-list-cell{
-				border: 0;
-				.uni-list-cell-db{
-					flex: 1;
-					width: 100%;
-				}
-				.uni-input{
-					height: 2.5em;
-					line-height: 2.5em;
-					font-size: 28upx;
-					display: flex;
-					align-items: center;
-					> view{
-						&:first-child{
-							flex-grow: 1;
-							color: #666;
-						}
-						&:last-child{
-							color: #999;
-						}
-					}
-				}
-				.item-icon{
-					margin-left: 10upx;
+				.check-row-info{
+					padding-top: 10px;
+					padding-bottom: 5px;
 				}
 				}
 			}
 			}
 		}
 		}
-		.uni-list-btns{
-			display: flex;
-			padding: 50upx 20upx;
-			uni-button{
-				font-size: 28upx;
-				margin: 0 30upx;
-				flex:1;
-				border-radius: 100upx;
-				&:after{
-					border: 0;
-				}
-			}
-		}
-		.checkbox-items{
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: space-between;
-			.checkbox{
-				width: 24%;
-				background: #F8F8F8;
-				text-align: center;
-				margin: 20upx 0;
-				padding: 10upx 0;
-				border-radius: 50upx;
-				font-size: 24upx;
-				border:1upx solid #eee;
-			}
-			.checked{
-				background: rgba(4, 133, 246, 0.15);
-				border-color: rgba(4, 133, 246, 0.5);
-				color: rgba(4, 133, 246, 1);
-			}
-		}
 	}
 	}
 </style>
 </style>

+ 5 - 5
pagesA/digitalShelf/tempOrderList/orderDetail.vue

@@ -39,7 +39,7 @@
 						{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
 						{{partList.length}}款,共<text class="redText">{{totalNums}}</text>件
 					</view>
 					</view>
 				</view>
 				</view>
-				<view v-for="item in partList" :key="item.productSn" class="flex align-center item-list">
+				<view v-for="item in partList" :key="item.productSn" class="flex align_center item-list">
 					<view>
 					<view>
 						<u-image :src="item.images?item.images:'/static/def_imgs.png'" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 						<u-image :src="item.images?item.images:'/static/def_imgs.png'" border-radius="16" width="130" height="130" bg-color="#EBEBEB" ></u-image>
 					</view>
 					</view>
@@ -328,7 +328,6 @@
 					padding: 20rpx 0;
 					padding: 20rpx 0;
 					&:first-child{
 					&:first-child{
 						margin-right: 20rpx;
 						margin-right: 20rpx;
-						margin-top: 18rpx;
 					}
 					}
 					&:last-child{
 					&:last-child{
 						flex-grow: 1;
 						flex-grow: 1;
@@ -336,7 +335,7 @@
 				}
 				}
 				.item-name{
 				.item-name{
 					word-wrap: break-word;
 					word-wrap: break-word;
-					font-size: 32rpx;
+					font-size: 28rpx;
 					color: #333;
 					color: #333;
 					font-weight: bold;
 					font-weight: bold;
 					margin-top: 10rpx;
 					margin-top: 10rpx;
@@ -344,8 +343,8 @@
 				.item-nums{
 				.item-nums{
 					padding: 10rpx 0;
 					padding: 10rpx 0;
 					text{
 					text{
-						font-size: 32rpx;
-						color: #222222;
+						font-size: 28rpx;
+						color: #333;
 					}
 					}
 				}
 				}
 				.item-head{
 				.item-head{
@@ -354,6 +353,7 @@
 					justify-content: space-between;
 					justify-content: space-between;
 					color: #666;
 					color: #666;
 					margin-top: 5px;
 					margin-top: 5px;
+					font-size: 28rpx;
 					> view{
 					> view{
 						&:first-child{
 						&:first-child{
 							font-size: 28rpx;
 							font-size: 28rpx;

+ 4 - 3
pagesA/digitalShelf/tempOrderList/tempOrderList.vue

@@ -18,7 +18,7 @@
 									<view class="orderNo">{{item.tempNo}}</view>
 									<view class="orderNo">{{item.tempNo}}</view>
 									<view class="times">{{item.createDate}}</view>
 									<view class="times">{{item.createDate}}</view>
 								</view>
 								</view>
-								 <view class="check-row flex align-center">
+								 <view class="check-row flex align_center">
 									 <view class="carImage flex align-center">
 									 <view class="carImage flex align-center">
 										 <u-image :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
 										 <u-image :src="item.vehicleLogo" border-radius="30" width="100" height="100" bg-color="#EBEBEB" ></u-image> 
 									 </view>
 									 </view>
@@ -259,6 +259,7 @@
 					&:last-child{
 					&:last-child{
 						align-items: center;
 						align-items: center;
 						justify-content: space-between;
 						justify-content: space-between;
+						padding-top: 0;
 						.nums{
 						.nums{
 							font-size: 28upx;
 							font-size: 28upx;
 							color: #033692;
 							color: #033692;
@@ -266,8 +267,8 @@
 					}
 					}
 					> view{
 					> view{
 						.carModel{
 						.carModel{
-							color: #222222;
-							font-size: 32upx;
+							color: #333;
+							font-size: 28upx;
 							font-weight: bold;
 							font-weight: bold;
 							line-height: normal;
 							line-height: normal;
 							margin-bottom: 10rpx;
 							margin-bottom: 10rpx;

+ 8 - 9
pagesB/procureOrder.vue

@@ -19,7 +19,7 @@
 						产品列表
 						产品列表
 					</view>
 					</view>
 					<view>
 					<view>
-						共<text class="redText">{{total}}</text>款
+						共<text class="cText">{{total}}</text>款
 					</view>
 					</view>
 				</view>
 				</view>
 				<view v-for="(item,dix) in partList" :key="item.id" class="flex align-center item-list">
 				<view v-for="(item,dix) in partList" :key="item.id" class="flex align-center item-list">
@@ -31,14 +31,14 @@
 						<view class="item-name">
 						<view class="item-name">
 						  <text>{{item.product.productName}}</text>
 						  <text>{{item.product.productName}}</text>
 						</view>
 						</view>
-						<view class="item-nums">
+						<view class="item-nums" v-if="item.product&&item.product.code">
 							<text>{{item.product.code}}</text>
 							<text>{{item.product.code}}</text>
 						</view>
 						</view>
-						<view class="item-nums">
-							<text>{{item.product.origCode}}</text>
+						<view class="item-nums" v-if="item.product&&item.product.origCode">
+							<text style="color: #00aaff;">{{item.product.origCode}}</text>
 						</view>
 						</view>
 						<view class="item-head">
 						<view class="item-head">
-							<view class="flex align_baseline">
+							<view class="flex align_center">
 								<view class="price-txt">¥<text>{{item.price}}</text></view>
 								<view class="price-txt">¥<text>{{item.price}}</text></view>
 								<view class="flex align_center rebate-tag" v-if="dix==0">
 								<view class="flex align_center rebate-tag" v-if="dix==0">
 									返<text>5</text>元
 									返<text>5</text>元
@@ -51,7 +51,7 @@
 								</view>
 								</view>
 							</view>
 							</view>
 							<view>
 							<view>
-								X <text class="redText">{{item.qty}}</text>{{item.product&&item.product.unit||''}}
+								X <text class="cText">{{item.qty}}</text>{{item.product&&item.product.unit||''}}
 							</view>
 							</view>
 						</view>
 						</view>
 					</view>
 					</view>
@@ -359,13 +359,11 @@
 				}
 				}
 				.item-name{
 				.item-name{
 					word-wrap: break-word;
 					word-wrap: break-word;
-					font-size: 30rpx;
+					font-size: 28rpx;
 					color: #333;
 					color: #333;
 					font-weight: bold;
 					font-weight: bold;
-					margin-top: 10rpx;
 				}
 				}
 				.item-nums{
 				.item-nums{
-					padding: 5rpx 0;
 					text{
 					text{
 						font-size: 28rpx;
 						font-size: 28rpx;
 						color: #666;
 						color: #666;
@@ -376,6 +374,7 @@
 					align-items: center;
 					align-items: center;
 					justify-content: space-between;
 					justify-content: space-between;
 					color: #666;
 					color: #666;
+					margin-top: 5px;
 					> view:last-child{
 					> view:last-child{
 						font-size: 24rpx;
 						font-size: 24rpx;
 						text{
 						text{