修改采购退货

src/mycomponents/detail/comDetailCard.vue

@@ -111,8 +111,7 @@
 				this.detailOptions = getDetailOption();
 			}
 			if (this.scanOptions.length == 0) {
-				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
+				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, false)
-					.allowModifyLocation)
 			}
 		},
 

src/pages/productPutaway/job/productPutawayDetail.vue

@@ -338,9 +338,8 @@
 								this.showErrorMessage("箱码【" + packingNumber + "】,批次【" + batch + "】库位【" + result
 									.fromLocationCode + "】已经扫描")
 							} else {
-								itemDetail.cancleScanedHiht=false;
+								// this.addDetail(itemDetail, result);
-								this.addDetail(itemDetail, result);
+								// return;
-								return;
 								
 								//暂时先不判断状态
 								let itemStatus = getInventoryStatusName(itemDetail.inventoryStatus);
@@ -350,11 +349,15 @@
 										this.showQuestionMessage('实际库存状态[' + balanceStatus + ']与推荐库存状态[' + itemStatus +
 											']不一致,是否继续上架?', res => {
 												if (res) {
+													itemDetail.cancleScanedHiht=false;
 													this.addDetail(itemDetail, result);
 												} else {
 													this.scanPopupGetFocus();
 												}
 											});
+									}else {
+										itemDetail.cancleScanedHiht=false;
+										this.addDetail(itemDetail, result);
 									}
 								// } else {
 								// 	this.addDetail(itemDetail, result);

src/pages/purchaseReturn/coms/comReturnJobCard.vue

@@ -1,6 +1,6 @@
 <template>
 	<job-com-main-card :dataContent="dataContent">
-		<jobComMainDetailCard  :dataContent="dataContent"></jobComMainDetailCard>
+		<jobComMainDetailCard  :dataContent="dataContent" :isShowToLocation="isShowToLocation"></jobComMainDetailCard>
 	</job-com-main-card>
 </template>
 
@@ -21,6 +21,10 @@
 				type: Object,
 				default: {}
 			},
+			isShowToLocation: {
+				type: Boolean,
+				default: true
+			},
 		},
 
 		methods: {

src/pages/purchaseReturn/job/returnDetail.vue

@@ -258,7 +258,10 @@
 								itemDetail.handleQty = Number(result.label.qty);
 								
 								itemDetail.toInventoryStatus = itemDetail.inventoryStatus;
-							 
+								itemDetail.balance={
+									packQty:Number(result.package.packQty),
+									uom:result.package.uom
+								}
 								// itemDetail.balance = result.balance;
 								// itemDetail.balance.balanceQty = Number(result.balance.qty);
 								// itemDetail.balance.packQty = Number(result.package.packQty)

src/pages/purchaseReturn/job/returnJob.vue

@@ -11,7 +11,7 @@
 					<uni-swipe-action-item
 						:right-options="item.status=='2'?detailGiveupOptions:detailOptions"
 						@click="swipeClick($event,item)">
-						<com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
+						<com-return-job-card :dataContent="item" @click='openJobDetail(item)' :isShowToLocation="false" ></com-return-job-card>
 					</uni-swipe-action-item>
 				</view>
 			</uni-swipe-action>