Merge branch 'master_hella' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into master_hella

src/mycomponents/qty/balanceQtyEdit.vue

@@ -178,18 +178,20 @@
 			},
 			setValue() {
 				var balanceQty = Number(this.dataContent.balanceQty);
-				if (this.allQty == 0) {
+				if(this.allQty<0){
-					this.$refs.comMessage.showConfirmWarningModal('数量必须大于0',
+					this.$refs.comMessage.showConfirmWarningModal('数量必须大于等于0',
 						res => {
 							this.allQty = balanceQty;
 						})
-				} else if (this.allQty > balanceQty) {
+				}else {
-					this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
+					if (this.allQty > balanceQty) {
-						res => {
+						this.$refs.comMessage.showConfirmWarningModal('数量[' + this.allQty + ']不允许大于库存数量[' + balanceQty + ']',
-							this.allQty = balanceQty;
+							res => {
-						})
+								this.allQty = balanceQty;
-				} else {
+							})
-					this.callback();
+					} else {
+						this.callback();
+					}
 				}
 			},
 			callback() {

src/mycomponents/record/recordComDetailCard.vue

@@ -1,22 +1,23 @@
 <template>
 	<view class="" style="background-color: #fff;">
-		<uni-collapse ref="collapse1" @change="">
+		<uni-collapse ref="collapse1">
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
-					<uni-swipe-action >
+					<uni-swipe-action>
 						<uni-swipe-action-item @click="removeItem($event,dataContent)" :right-options="removeOptions">
-							<item-qty :dataContent="dataContent" 
+							<item-qty :dataContent="dataContent" :isShowBalance="true"
-								:isShowBalance="true" :isShowBalanceQty="isShowBalanceQty"></item-qty>
+								:isShowBalanceQty="isShowBalanceQty"></item-qty>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
 				<view class='split_line'></view>
 				<view class="" v-for="(detail,index) in dataContent.subList" :key="index">
-					<uni-swipe-action >
+					<uni-swipe-action>
 						<uni-swipe-action-item @click="swipeClick($event,detail,index)"
 							:right-options="detail.scaned?scanOptions:detailOptions">
 							<balance :dataContent="detail" :isShowStdPack="false" :isShowStatus="isShowStatus"
-								:isShowPack="true" :isShowFromLocation="isShowFromLocation" :isShowToLocation="isShowToLocation">
+								:isShowPack="true" :isShowFromLocation="isShowFromLocation"
+								:isShowToLocation="isShowToLocation">
 							</balance>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
@@ -26,7 +27,7 @@
 		</uni-collapse>
 		<balance-qty-edit ref="balanceQtyEdit" @confirm="confirm"></balance-qty-edit>
 		<record-detail-popup ref="recordDetailPopup"></record-detail-popup>
-	<!-- 	<balance-detail-popup ref="balanceDetailPopup"></balance-detail-popup> -->
+		<!-- 	<balance-detail-popup ref="balanceDetailPopup"></balance-detail-popup> -->
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -90,19 +91,23 @@
 			},
 		},
 		watch: {
+
 			dataContent: {
 				handler(newName, oldName) {
 					if (this.dataContent.subList.length > 0) {
-						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+						this.$nextTick(res => {
-							this.$nextTick(res => {
+							setTimeout(() => {
-								this.$refs.collapse1.resize()
+								if (this.$refs.collapse1) {
-							})
+									this.$refs.collapse1.resize();
-						}
+								}
+							}, 500)
+						})
 					}
 				},
 				immediate: true,
 				deep: true
 			}
+
 		},
 
 		data() {

src/pages/issue/request/issueScanRequest.vue

@@ -97,8 +97,6 @@
 				var labelInfo = data.label;
 				
 				var data = {
-					productionLineCode:labelInfo.productionLineCode,
-					workStationCode:labelInfo.workStationCode,
 					itemCode:labelInfo.itemCode,
 					location:labelInfo.location,
 					qty:labelInfo.qty,
@@ -107,6 +105,8 @@
 					
 				};
 				this.detailSource.subList.push(data)
+				this.detailSource.productionLineCode=labelInfo.productionLineCode;
+				this.detailSource.workStationCode=labelInfo.workStationCode;
 				this.detailSource.warehouseCode = labelInfo.warehouseCode;
 				this.detailSource.workshopCode = labelInfo.workshopCode;
 				this.submit();

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -515,10 +515,7 @@
 									const timer1 = setInterval(async () => {
 										if (timerCount == 15) {
 											clearInterval(timer1)
-											uni.showToast({
+											this.showErrorMessage("上架任务生成异常，请到收货记录里重新生成上架申请")
-												title: "跳转打印页面失败",
-												icon: "none"
-											});
 											return;
 										}
 										await getPutawayJobList({

src/pages/repleinsh/record/directRepleinshRecord.vue

@@ -285,7 +285,8 @@
 			},
 			
 			selectBalanceItem(balance) {
-				this.afterGetBalance(this.resultData, balance);
+				this.resultData.balance =balance;
+				this.afterGetBalance(this.resultData);
 			},
 			
 			afterGetBalance(result){