ysy пре 2 година
родитељ
комит
1e5517634a

+ 6 - 5
pages/pda/jobBooking/components/turnoverBom.vue

@@ -44,6 +44,7 @@
 				</view>
 
 				<view class="table">
+					<u-list @scrolltolower="scrolltolower" class="z_list">
 					<view class="tr row rx-sc" v-for="(it, idx) in item.extInfo.positionList" :key='idx'>
 						<view class="item ww10">{{it.code}}</view>
 						<view class="item ww35" :class="{'color157': it.workOrderCode === wordItem.code}">
@@ -58,11 +59,7 @@
 							<text v-else>{{it.quantity}}</text>
 						</view>
 					</view>
-
-
-
-
-
+					</u-list>
 
 				</view>
 
@@ -136,6 +133,7 @@
 
 
 			},
+			scrolltolower() {}
 		}
 	}
 </script>
@@ -336,4 +334,7 @@
 		}
 
 	}
+	.z_list{
+		max-height: 500rpx;
+	}
 </style>

+ 9 - 2
pages/pda/turnover/components/turnoverBom.vue

@@ -47,6 +47,7 @@
 					</view>
 
 					<view class="table">
+						<u-list @scrolltolower="scrolltolower" class="z_list">
 						<view class="tr row rx-sc" v-for="(it, idx) in item.extInfo.positionList" :key='idx'>
 							<view class="item ww10">{{it.code}}</view>
 							<view class="item ww30" :class="{'color157': it.workOrderCode === wordItem.code}">
@@ -66,7 +67,7 @@
 							</view>
 						</view>
 
-
+                      </u-list>
 
 
 
@@ -140,7 +141,7 @@
 
 		methods: {
 
-
+           scrolltolower() {},
 
 			handleCheck(index, idx, it) {
 
@@ -466,4 +467,10 @@
 		font-size: 28rpx;
 		color: #FFA929;
 	}
+	
+
+			.z_list{
+				max-height: 500rpx;
+			}
+
 </style>

+ 49 - 39
pages/pda/turnover/components/turnoverPopup.vue

@@ -6,7 +6,7 @@
 
 				<view class="title_box rx-bc">
 					<view class="name">周转车 </view>
-					<view >数量: {{sum - count || 0}} </view>
+					<view>数量: {{sum - count || 0}} </view>
 				</view>
 
 				<u-list @scrolltolower="scrolltolower" class="list_box">
@@ -43,24 +43,29 @@
 							</view>
 
 							<view class="table">
-								<view class="tr row rx-sc" v-for="(it, idx) in item.extInfo.positionList" :key='idx'>
-									<view class="item ww10">{{it.code}}</view>
-									<view class="item ww30" :class="{'color157': it.workOrderCode === wordItem.code}">
-										{{ it.workOrderCode }}
-									</view>
-									<view class="item ww35"
-										:class="{'color157': it.categoryCode === wordItem.productCode}">
-										{{it.categoryCode}}
-									</view>
-									<view class="item ww25  content_num">
-										<input class="uni-input" v-if='it.isFull == 0' @input="quantInt(index, idx, it)"
-											v-model="it.quantity" type="digit"></input>
-										<text v-else>{{it.quantity}}</text>
-									</view>
+								<u-list @scrolltolower="scrolltolower" class="z_list">
+									<view class="tr row rx-sc" v-for="(it, idx) in item.extInfo.positionList"
+										:key='idx'>
+										<view class="item ww10">{{it.code}}</view>
+										<view class="item ww30"
+											:class="{'color157': it.workOrderCode === wordItem.code}">
+											{{ it.workOrderCode }}
+										</view>
+										<view class="item ww35"
+											:class="{'color157': it.categoryCode === wordItem.productCode}">
+											{{it.categoryCode}}
+										</view>
+										<view class="item ww25  content_num">
+											<input class="uni-input" v-if='it.isFull == 0'
+												@input="quantInt(index, idx, it)" v-model="it.quantity"
+												type="digit"></input>
+											<text v-else>{{it.quantity}}</text>
+										</view>
 
 
-								</view>
+									</view>
 
+								</u-list>
 
 
 
@@ -105,27 +110,28 @@
 				wordItem: {},
 				newTurnover: [],
 				idx: null,
-				
+
 				sum: 0,
 				count: 0,
 			}
 		},
 		methods: {
+			scrolltolower() {},
 			open(result, wordInfo, newList, wordItem, index) {
 				this.wordInfo = wordInfo
 				this.wordItem = wordItem
 				this.idx = index
 
-           
-			    this.count= 0
-			    this.sum = 0;
+
+				this.count = 0
+				this.sum = 0;
 				newList[0].extInfo.positionList.forEach(e => {
-					if(e.check) {
-						  this.sum  += Number(e.newQuantity);
+					if (e.check) {
+						this.sum += Number(e.newQuantity);
 					}
 				})
-			
-			   
+
+
 
 				let isFals = newList.some(m => m.code == result && m.isOld == 1)
 				if (isFals) {
@@ -153,9 +159,9 @@
 						.workOrderCode)
 					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'categoryCode', this.wordInfo
 						.categoryCode)
-						
-						this.$set(this.newTurnover[index].extInfo.positionList[idx], 'numAdd', true)
-							this.countFn()
+
+					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'numAdd', true)
+					this.countFn()
 
 				} else {
 					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'workOrderCode', '')
@@ -164,24 +170,24 @@
 					this.$set(this.newTurnover[index].extInfo.positionList[idx], 'numAdd', false)
 					this.countFn()
 				}
-				
-				
-			
+
+
+
 
 
 			},
-			
+
 			countFn() {
-	
-				
+
+
 				this.count = 0;
 				this.newTurnover[0].extInfo.positionList.forEach(e => {
-					if(e.numAdd) {
-						
-						 this.count  += Number(e.quantity);
+					if (e.numAdd) {
+
+						this.count += Number(e.quantity);
 					}
 				})
-				
+
 			},
 
 			cancel() {
@@ -189,7 +195,7 @@
 			},
 
 			save() {
-				if(this.sum - this.count != 0) {
+				if (this.sum - this.count != 0) {
 					uni.showToast({
 						title: '转移数量对应不上',
 						icon: 'none'
@@ -198,7 +204,7 @@
 				}
 				this.$emit('saveTurn', this.idx, this.newTurnover)
 				this.show = false
-			
+
 			}
 		}
 	}
@@ -455,4 +461,8 @@
 			width: 160rpx;
 		}
 	}
+
+	.z_list {
+		max-height: 500rpx;
+	}
 </style>