修改盘点

src/pages/count/job/countBlindDetail.vue

@@ -25,8 +25,8 @@
 				</view>
 			</view>
 		</view>
-		<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
+		<u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
-		<view style="margin-top: 170rpx; margin-bottom: 50rpx;">
+		<view style="margin-top: 160rpx; margin-bottom: 50rpx;">
 			<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
 			<scroll-view scroll-y="true" class="" style="margin-bottom: 50px;">
 				<view class="detail-list" v-for="(item, index) in showList" :key="item.id">
@@ -599,7 +599,10 @@
 
 	.header {
 		position: fixed;
+		/* #ifdef H5 */
 		top: 88rpx;
+		/* #endif */
+		
 		left: 0;
 		width: 100%;
 		background-color: #fff;

src/pages/count/job/countJob.vue

@@ -193,17 +193,20 @@
 			},
 
 			openJobDetail(item) {
-				//明盘
-				if(item.isOpenCount=="TRUE"){
 				uni.navigateTo({
-						url: './countLightDetail?id=' + item.id + '&status=' + item.status
+					url: './countDetail?id=' + item.id + '&status=' + item.status
 				});
-				}else {
+				// //明盘
-					//盲盘
+				// if(item.isOpenCount=="TRUE"){
-					uni.navigateTo({
+				// 	uni.navigateTo({
-						url: './countBlindDetail?id=' + item.id + '&status=' + item.status
+				// 		url: './countLightDetail?id=' + item.id + '&status=' + item.status
-					});
+				// 	});
-				}
+				// }else {
+				// 	//盲盘
+				// 	uni.navigateTo({
+				// 		url: './countBlindDetail?id=' + item.id + '&status=' + item.status
+				// 	});
+				// }
 			},
 
 			showItemList(itemList) {

src/pages/count/job/countLightDetail.vue

@@ -29,8 +29,8 @@
 				</view>
 			</view>
 		</view>
-		<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
+		<u-line color="#D8D8D8" style="margin-bottom: 10rpx"></u-line>
-		<view style="margin-top: 170rpx; padding-bottom: 130rpx;">
+		<view style="margin-top: 160rpx; padding-bottom: 130rpx;">
 			<u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
 			<scroll-view scroll-y="true" class="" style="margin-bottom: 0px;">
 				<view class="detail-list" v-for="(item, index) in showList" :key="item.id">
@@ -382,6 +382,7 @@
 					} else {
 						//未扫描，赋值
 						selectItem.scaned = true;
+						selectItem.balanceQty= Number(qty)
 						selectItem.handleQty = Number(qty)
 						selectItem.packQty = pack.packQty
 						selectItem.packUnit = pack.packUnit
@@ -511,17 +512,17 @@
 				});
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-				// countJobSubmit(params).then(res => {
+				countJobSubmit(params).then(res => {
-				// 	uni.hideLoading()
+					uni.hideLoading()
-				// 	if (res.data) {
+					if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data)
+						this.showCommitSuccessMessage("提交成功<br>生成盘点记录<br>" + res.data)
-				// 	} else {
+					} else {
-				// 		this.showErrorMessage("提交失败[" + res.msg + "]")
+						this.showErrorMessage("提交失败[" + res.msg + "]")
-				// 	}
+					}
-				// }).catch(error => {
+				}).catch(error => {
-				// 	uni.hideLoading()
+					uni.hideLoading()
-				// 	this.showErrorMessage(error)
+					this.showErrorMessage(error)
-				// })
+				})
 
 			},
 
@@ -608,7 +609,9 @@
 
 	.header {
 		position: fixed;
+		/* #ifdef H5 */
 		top: 88rpx;
+		/* #endif */
 		left: 0;
 		width: 100%;
 		background-color: #fff;