lilei 2 лет назад
Родитель
Сommit
285f20736e

+ 5 - 2
pages/common/commonModal.vue

@@ -49,7 +49,7 @@
 			showTitle:{ //  是否显示标题
 				type: Boolean,
 				default: true
-			}
+			},
 		},
 		data() {
 			return {
@@ -87,9 +87,12 @@
 		width: 100%;
 		height: 100vh;
 		z-index: 10000;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
 		.modal-con{
 			width: 70%;
-			margin: 40vh auto 0;
 			background-color: #fff;
 			border-radius: 24upx;
 			position: relative;

+ 2 - 2
pages/common/printTag/printTag.vue

@@ -21,7 +21,7 @@
 			<view class="shelf-info-body">
 				<view>产品编码:{{fromPage == 'smdy'?infoData.productCode : infoData.productEntity&&infoData.productEntity.code}}</view>
 				<view>产品名称:{{fromPage == 'smdy'?infoData.productName : infoData.productEntity&&infoData.productEntity.productName}}</view>
-				<view>{{fromPage == 'smdy'?'实发数量':'当前库存'}}:{{fromPage == 'smdy'?infoData.confirmQty : infoData.qty}}{{infoData.productEntity&&infoData.productEntity.unit}}</view>
+				<view>{{fromPage == 'smdy'?'补货数量':'当前库存'}}:{{infoData.qty}}{{infoData.productEntity&&infoData.productEntity.unit}}</view>
 				<view v-if="fromPage == 'bdtq'">最大库容:{{infoData.maxQty}}{{infoData.productEntity&&infoData.productEntity.unit}}</view>
 			</view>
 		</view>
@@ -60,7 +60,7 @@
 			const _this = this
 			_this.fromPage = options.page
 			_this.infoData = options.data ? JSON.parse(options.data) : {};
-			_this.printNum = _this.fromPage == 'smdy' ? _this.infoData.confirmQty : _this.infoData.maxQty
+			_this.printNum = _this.fromPage == 'smdy' ? _this.infoData.qty : _this.infoData.maxQty
 			_this.printNum = _this.printNum||1
 			console.log(_this.infoData)
 			// 保持屏幕常亮

+ 4 - 4
pages/replenishmentManage/detail.vue

@@ -37,16 +37,16 @@
 			</view>
 		</view>
 		<!-- 生成销售单 -->
-		<common-modal v-if="confirmModal" :showTitle="false" :openModal="confirmModal" @confirm="modalConfirm" @close="confirmModal=false">
+		<common-modal v-if="confirmModal" :top="salesOrderList.length?'20vh':'40vh'" :showTitle="false" :openModal="confirmModal" @confirm="modalConfirm" @close="confirmModal=false">
 			<view style="font-size: 28upx;">
 				<view style="padding: 10upx;margin: 20upx 0;" class="flex align_center justify_between">
 					<view>产品总款数:<text style="color: red;">{{partList.length}}</text></view>
 					<view>产品总件数:<text style="color: red;">{{totalNums}}</text></view>
 				</view>
 				<view v-if="salesOrderList.length">
-					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
+					<view style="padding: 0 10upx 5upx;">此补货单已经存在对应的销售单?</view>
 					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
-					<view>
+					<scroll-view :scroll-y="true" style="max-height: 18vh;">
 						<view 
 						v-for="item in salesOrderList" 
 						:key="item.id"
@@ -59,7 +59,7 @@
 								<u-icon name="arrow-right"></u-icon>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 				</view>
 				<view v-else>
 					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>

+ 2 - 4
pages/replenishmentManage/manualPrint.vue

@@ -89,11 +89,9 @@
 					if(res.status == 200 && res.data){
 						res.data.map(item =>{
 							if(item.billState == 'FINISH'){
-								item.confirmQty = item.putQty ? Number(item.putQty) : 0
-								item.printQty = item.confirmQty ? Number(item.confirmQty) : 0
+								item.printQty = item.putQty ? Number(item.putQty) : 0
 							}else{
-								item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
-								item.printQty = item.confirmQty ? Number(item.confirmQty) : 0
+								item.printQty = item.qty ? Number(item.qty) : 0
 							}
 						})
 						this.partList = res.data || []

+ 3 - 3
pages/replenishmentManage/outWarehousing.vue

@@ -44,9 +44,9 @@
 					<view>产品总件数:<text style="color: red;">{{totalNums}}</text></view>
 				</view>
 				<view v-if="salesOrderList.length">
-					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
+					<view style="padding: 0 10upx 5upx;">此补货单已经存在对应的销售单?</view>
 					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
-					<view>
+					<scroll-view :scroll-y="true" style="max-height: 18vh;">
 						<view 
 						v-for="item in salesOrderList" 
 						:key="item.id"
@@ -59,7 +59,7 @@
 								<u-icon name="arrow-right"></u-icon>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 				</view>
 				<view v-else>
 					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>

+ 3 - 3
pages/replenishmentManage/scanCodePrint.vue

@@ -98,9 +98,9 @@
 					if(res.status == 200 && res.data){
 						res.data.map(item =>{
 							if(item.billState == 'FINISH'){
-								item.confirmQty = item.putQty ? Number(item.putQty) : 0
+								item.qty = item.putQty ? Number(item.putQty) : 0
 							}else{
-								item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
+								item.qty = item.qty ? Number(item.qty) : 0
 							}
 						})
 						this.partList = res.data || []
@@ -130,7 +130,7 @@
 							productName: res.data&&res.data[0]&&res.data[0].product&&res.data[0].product.name,
 							productCode: res.data&&res.data[0]&&res.data[0].product&&res.data[0].product.code,
 							productSn: res.data&&res.data[0]&&res.data[0].product&&res.data[0].product.productSn,
-							confirmQty: res.data&&res.data[0]&&res.data[0].confirmQty,
+							qty: res.data&&res.data[0]&&res.data[0].qty,
 							shelfSn: res.data&&res.data[0]&&res.data[0].shelfSn,
 							replenishBillDetailSn: res.data&&res.data[0]&&res.data[0].replenishBillDetailSn,
 							shelfPlaceCode: res.data&&res.data[0]&&res.data[0].shelfPlaceCode,

+ 6 - 7
pages/replenishmentManage/signWarehousing.vue

@@ -45,9 +45,9 @@
 					<view>产品总件数:<text style="color: red;">{{totalNums}}</text></view>
 				</view>
 				<view v-if="salesOrderList.length">
-					<view style="padding: 0 10upx 10upx;">此补货单已经存在对应的销售单?</view>
+					<view style="padding: 0 10upx 5upx;">此补货单已经存在对应的销售单?</view>
 					<view style="padding: 0 10upx 20upx;">确认再次生成销售单吗?</view>
-					<view>
+					<scroll-view :scroll-y="true" style="max-height: 18vh;">
 						<view 
 						v-for="item in salesOrderList" 
 						:key="item.id"
@@ -60,7 +60,7 @@
 								<u-icon name="arrow-right"></u-icon>
 							</view>
 						</view>
-					</view>
+					</scroll-view>
 				</view>
 				<view v-else>
 					<view style="padding: 0 10upx 20upx;">确认生成销售单?</view>
@@ -147,10 +147,9 @@
 						_this.totalQty = 0
 						_this.confirmQty = 0
 						res.data.map(item =>{
-							item.confirmQty = item.confirmQty ? Number(item.confirmQty) : 0
-							item.putQty = item.confirmQty ? Number(item.confirmQty) : 0
-							if(item.confirmQty && Number(item.confirmQty)){
-								_this.totalQty += Number(item.confirmQty)
+							item.putQty = item.qty ? Number(item.qty) : 0
+							if(item.qty && Number(item.qty)){
+								_this.totalQty += Number(item.qty)
 							}
 							if(item.putQty && Number(item.putQty)){
 								_this.confirmQty += Number(item.putQty)