lilei 1 rok pred
rodič
commit
180c490d59

+ 1 - 5
pages/index/index.vue

@@ -204,10 +204,8 @@
 		}
 		.card-box{
 			border-radius: 20upx;
-			margin: 20rpx 40rpx;
+			margin: 30rpx 40rpx;
 			background: #fff;
-			border-right: 1px solid #eee;
-			border-bottom: 1px solid #eee;
 			overflow: hidden;
 		}
 		.grid-box{
@@ -219,8 +217,6 @@
 				display: flex;
 				flex-direction: column;
 				align-items: center;
-				border-left: 1px solid #eee;
-				border-top: 1px solid #eee;
 				.iconfont{
 					font-size: 110upx;
 					padding: 10upx 0;

+ 7 - 7
pages/stock/detaiList.vue

@@ -10,12 +10,12 @@
 				</view>
 				<view class="st-detailList-info-con flex align_center">
 					<view class="pimgs">
-						<u-image :src="stockInfo&&stockInfo.productMsg||`../../static/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
+						<u-image :src="stockInfo&&stockInfo.productMsg||`../../static/def_img@2x.png`" width="100" height="100" border-radius="10"></u-image>
 					</view>
 					<view class="flex_1">
 						<view>产品编码:{{stockInfo&&stockInfo.productCode || '--'}}</view>
 						<view class="padding_3">原厂编码:{{stockInfo&&stockInfo.productOrigCode || '--'}}</view>
-						<view class="flex align_center justify_between">
+						<view>
 							<view class="font_13">
 								可用总数量:{{toThousands(stockInfo&&stockInfo.currentStockQty||0)}}{{stockInfo&&stockInfo.productUnit||''}}
 							</view>
@@ -24,7 +24,7 @@
 								¥{{toThousands(stockInfo&&stockInfo.currentStockCost||0, 2)}}
 							</view>
 						</view>
-						<view class="flex align_center justify_between">
+						<view>
 							<view class="font_13">
 								冻结总数量:{{toThousands(stockInfo&&stockInfo.freezeQty||0)}}{{stockInfo&&stockInfo.productUnit||''}}
 							</view>
@@ -191,6 +191,9 @@
 </script>
 
 <style lang="less">
+	page{
+		background: #f8f8f8;
+	}
 	.st-detailList-wrap{
 		width: 100%;
 		height: 100vh;
@@ -223,13 +226,10 @@
 				}
 				.st-detailList-info-con{
 					padding: 20upx 20upx 6upx;
-					font-size: 26upx;
+					font-size: 14px;
 					.pimgs{
 						margin-right: 16upx;
 					}
-					.font_13{
-						font-size: 26upx;
-					}
 					.padding_3{
 						padding: 6upx 0;
 					}

+ 11 - 1
pages/stock/index.vue

@@ -19,6 +19,7 @@
 			</view>
 			<u-form :model="form" ref="uForm" label-width="100">
 				<u-form-item label="产品编码"><u-input v-model.trim="form.productCode" border="bottom" placeholder="请输入产品编码" input-align="right" /></u-form-item>
+				<u-form-item label="条形码"><u-input v-model.trim="form.qrCode" border="bottom" placeholder="请输入条形码" input-align="right" /></u-form-item>
 				<u-form-item label="原厂编码"><u-input v-model.trim="form.productOrigCode" border="bottom" placeholder="请输入原厂编码" input-align="right" /></u-form-item>
 				<u-form-item label="产品名称"><u-input v-model.trim="form.productName" border="bottom" placeholder="请输入产品名称" input-align="right" /></u-form-item>
 				<u-form-item label="产品品牌" @click="brandModal=true"><u-input v-model="brandName" border="bottom" readonly placeholder="请选择产品品牌" input-align="right" /></u-form-item>
@@ -53,6 +54,7 @@
 			return {
 				form: {
 					productCode: '', //  产品编码
+					qrCode: '', // 挑选码
 					productName: '', //  产品名称
 					productOrigCode: '', //  原厂编码
 					productBrandSn: undefined, //  产品品牌
@@ -142,6 +144,7 @@
 			// 表单清空
 			handleClean(){
 				this.form.productCode = ''
+				this.form.qrCode = ''
 				this.form.productName = ''
 				this.form.productOrigCode = ''
 				this.brandName = ''
@@ -205,11 +208,15 @@
 </script>
 
 <style lang="scss">
+	page{
+		background: #f8f8f8;
+	}
 	.stock-wrap{
 		padding: 0 30upx;
 		.panel-box {
 			background-color: #ffffff;
 			padding: 20upx 20upx;
+			border-radius: 20upx;
 			.item-box{
 				text-align: center;
 				display: flex;
@@ -217,10 +224,12 @@
 				justify-content: space-between;
 				font-size: 14px;
 			}
+			margin-bottom: 20upx;
 		}
 		.stock-con{
 			background-color: #ffffff;
-			padding: 0 20upx;
+			padding: 20upx;
+			border-radius: 20upx;
 			.stock-tit{
 				font-weight: bold;
 				.u-line{
@@ -231,6 +240,7 @@
 					margin: 0 10upx;
 					border-radius: 5upx;
 				}
+				border-bottom: 1px solid #eee;
 			}
 			.form-footer-btn{
 				margin: 60upx 30upx 30upx;

+ 4 - 1
pages/stock/stockDetail.vue

@@ -2,7 +2,7 @@
 	<view class="stockDetail-wrap">
 		<view class="panel-box flex align_center justify_between">
 			<view class="pimgs">
-				<u-image :src="productData && productData.productMsg||`../../static/def_img@2x.png`" width="120" height="120" border-radius="10"></u-image>
+				<u-image :src="productData && productData.productMsg||`../../static/def_img@2x.png`" width="100" height="100" border-radius="10"></u-image>
 			</view>
 			<view class="info-con flex_1">
 				<view class="padding_7">{{productData && productData.productName || '--'}}</view>
@@ -63,6 +63,9 @@
 </script>
 
 <style lang="scss">
+	page{
+		background: #f8f8f8;
+	}
 	.stockDetail-wrap{
 		padding: 30upx;
 		.panel-box {

+ 11 - 7
pages/stock/stockSearch.vue

@@ -30,7 +30,7 @@
 					</view>
 					<view class="stockSearch-item-con flex align_center">
 						<view class="pimgs">
-							<u-image :src="item.productMsg?item.productMsg:`../../static/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
+							<u-image :src="item.productMsg?item.productMsg:`../../static/def_img@2x.png`" width="100" height="100" border-radius="10"></u-image>
 						</view>
 						<view class="flex_1">
 							<view>产品编码:{{item.productCode || '--'}} <copyText :text="item.productCode" label="产品编码"></copyText></view>
@@ -46,14 +46,14 @@
 							可用库存成本
 							<view>¥{{toThousands(item.currentStockCost||0, 2)}}</view>
 						</view>
-						<view class="font_13">
+						<!-- <view class="font_13">
 							滞销天数
 							<view>
 								<span v-if="item.unsalableDays>=180&&item.unsalableDays<=360" style="color:#FF9900">{{ num(item.unsalableDays) }}</span>
 								<span v-else-if="item.unsalableDays>360" style="color:#FF0000">{{ num(item.unsalableDays) }}</span>
 								<span v-else >{{ num(item.unsalableDays) }}</span>
 							</view>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<view v-if="listData&&listData.length==0">
@@ -180,11 +180,15 @@
 </script>
 
 <style lang="less">
+	page{
+		background: #f8f8f8;
+	}
 	.stockSearch-wrap{
 		width: 100%;
 		height: 100vh;
 		.panel-box {
 			background-color: #ffffff;
+			margin: 25upx;
 			padding: 20upx 0;
 			.item-box{
 				padding: 10upx 30upx;
@@ -204,7 +208,7 @@
 					padding: 20upx;
 					margin: 25upx;
 					border-radius: 20upx;
-					border: 1px solid #e4e7ed;
+					box-shadow: 3upx 2upx 6upx #eee;
 					&:first-child{
 						margin-top: 0;
 					}
@@ -233,7 +237,7 @@
 					}
 					.stockSearch-item-con{
 						padding: 20upx;
-						font-size: 28upx;
+						font-size: 14px;
 						.pimgs{
 							margin-right: 16upx;
 						}
@@ -245,8 +249,8 @@
 					.stockSearch-item-footer{
 						border-top: 2upx solid #eee;
 						.font_13{
-							width: 33%;
-							font-size: 26upx;
+							width: 49%;
+							font-size: 14px;
 							text-align: center;
 							border-left: 2upx solid #eee;
 							padding-top: 20upx;

+ 4 - 1
pages/stock/warehouseDetail.vue

@@ -2,7 +2,7 @@
 	<view class="warehouseDetail-wrap">
 		<view class="panel-box flex align_center justify_between">
 			<view class="pimgs">
-				<u-image :src="productData && productData.productMsg||`../../static/def_img@2x.png`" width="128" height="128" border-radius="10"></u-image>
+				<u-image :src="productData && productData.productMsg||`../../static/def_img@2x.png`" width="100" height="100" border-radius="10"></u-image>
 			</view>
 			<view class="info-con flex_1">
 				<view>{{productData && productData.productCode || '--'}}</view>
@@ -98,6 +98,9 @@
 </script>
 
 <style lang="scss">
+	page{
+		background: #f8f8f8;
+	}
 	.warehouseDetail-wrap{
 		padding: 30upx;
 		.panel-box {

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/app-service.js


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
unpackage/dist/dev/app-plus/app-view.js


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov