入库和盘点

ghsApp/src/pagesStorehouse/allot/inSelect.vue

@@ -27,7 +27,7 @@
 				</view>
 			</template>
 			<view class="btn-view">
-				<button :class="['admin-button-com', 'blue']" @click="confirmData">提交盘点</button>
+				<button class="admin-button-com blue" @click="confirmData">提交盘点</button>
 			</view>
 		</view>
 	</view>
@@ -111,7 +111,7 @@ export default {
 			})
 		},
 		async initData() {
-            const {data: { list,moreData }} = await getStockInListApi({status:'',page: this.list.page})
+            const {data: { list,moreData }} = await getStockInListApi({status:'',page: this.list.page,searchTime:this.searchTime,startTime:this.startTime,endTime:this.endTime})
 			if (moreData == 0) {
 				this.list.finished = true
 			} else {
@@ -248,7 +248,7 @@ export default {
 				justify-content: center;
 				margin: 0 6upx;
 				width: 200upx;
-				height: 70upx;
+				height: 90upx;
 				font-size: 30upx;
 			}
 		}
@@ -292,7 +292,7 @@ export default {
 				justify-content: center;
 				margin: 0 6upx;
 				width: 200upx;
-				height: 70upx;
+				height: 90upx;
 				font-size: 30upx;
 			}
 		}

ghsApp/src/pagesStorehouse/allot/inSelectItem.vue

@@ -6,10 +6,10 @@
 		</view>
 		<view class="details-main">
 			<view class="item-header">
-				<text class="name">编号 {{info.orderSn}} </text>
+				<text class="name">{{ info.addTime.substr(5,11) }}</text><text v-if="info.check == 1" style="position:absolute;right:60upx;color:green;font-weight:bold;">已盘点</text>
 			</view>
 			<view class="item-row">
-				<view class="mark">{{ info.addTime.substr(5,11) }}</view>
+				<view class="orderSn">{{info.orderSn}}</view>
 			</view>
 			<view class="item-row">
 				<view class="mark">{{ info.status == 1 ?'待入库': info.status == 2 ?'已入库':'已取消'}}</view>
@@ -80,8 +80,7 @@ export default {
 		}
 		.name {
 			font-size: 28upx;
-			font-family: PingFang SC;
-			font-weight: 600;
+			font-weight: 450;
 			color: #333333;
 		}
 	}
@@ -90,7 +89,11 @@ export default {
 		display: flex;
 		align-items: center;
 		justify-content: space-between;
-
+		.orderSn{
+			font-size: 28upx;
+			font-weight: 400;
+			color: #666666;
+		}
 		.mark {
 			font-size: 28upx;
 			font-weight: 400;
@@ -100,7 +103,7 @@ export default {
 			display: flex;
 			align-items: center;
 			font-size: 28upx;
-			font-weight: 600;
+			font-weight: 400;
 			color: #333333;
 			.iconfont {
 				font-size: 28upx;
@@ -109,4 +112,4 @@ export default {
 		}
 	}
 }
-</style>
+</style>

ghsApp/src/pagesStorehouse/inventory/list.vue

@@ -22,8 +22,9 @@
 			</block>
 		</view>
 		<div class="app-footer open_btn">
-			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:32upx;">全部花材下载</div>
-			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:32upx;">入库单盘点</div>
+			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:10upx;">全部花材</div>
+			<div @click="getAllItem()" class="admin-button-com big default" style="margin-right:10upx;">全部库存</div>
+			<div @click="stockInAddEvent" class="admin-button-com big blue" style="margin-right:10upx;">入库盘点</div>
 			<div @click="addEvent" class="admin-button-com big blue">新增盘点</div>
 		</div>
 	</view>