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

src/mycomponents/qty/recommendQtyEdit.vue

@@ -41,7 +41,7 @@
 								</view>
 							</view>
 							<view class='split_line'></view>
-							<view class="uni-flex uni-row space-between padding title u-col-center" >
+							<view class="uni-flex uni-row space-between padding title u-col-center" v-if="showBalanceQty">
 								<text>库存数量 : </text>
 								<view class="uni-flex uni-row uni-center" style="align-items: center;">
 									<text class="text_recommend">{{Number(dataContent.balanceQty)}}</text>
@@ -119,6 +119,10 @@ import { nextTick } from 'vue';
 				type: Boolean,
 				default: true
 			},
+			showBalanceQty: {
+				type: Boolean,
+				default: false
+			},
 		},
 		methods: {
 			getPackUnitName(packUnit) {

src/pages/issue/job/issueDetailBatch.vue

@@ -503,7 +503,8 @@
 				var creator = this.$store.state.user.id
 				console.log(2343,this.detailSource)
 				this.detailSource.forEach(toLocationCode => {
-					let obj = toLocationCode
+					let obj = {...toLocationCode}
+					delete obj.subList
 					obj.recordList = []
 					let obj1 ={}
 					let arr = toLocationCode.subList.filter(item=>item.scaned)
@@ -520,14 +521,18 @@
 						obj1.packingNumber =record.packingNumber;
 						obj1.qty =record.qty;
 						obj1.scaned =record.scaned;
-						obj1.inventoryStatus =record.fromInventoryStatus;
-						obj1.inventoryStatus =record.fromInventoryStatus;
 						obj1.toLocationCode =record.toLocationCode;
+						obj1.fromPackingNumber ='';
+						obj1.fromBatch = record.batch;
+						obj1.toBatch  = record.batch;
+						obj1.toInventoryStatus   = record.inventoryStatus;
+						obj1.toPackingNumber  ="";
+						obj1.packingNumber  = "";
 						
 						let single_price = record.balance.singlePrice == null ? 0 : record.balance.singlePrice;
 						
-						record.singlePrice = single_price;
+						obj1.singlePrice = single_price;
-						record.amount = single_price *record.qty;
+						obj1.amount = single_price *record.qty;
 					obj.recordList.push(obj1)
 					})
 					subList.push(obj)

src/pages/purchaseReceipt/coms/comReceiptDetailCard.vue

@@ -12,7 +12,7 @@
 					</uni-swipe-action>
 				</template>
 				<package-list :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"
-					:settingParam="settingParam" @collapseChange="collapseChange" @updateData="updateData"
+					:settingParam="settingParam" @collapseChaWnge="collapseChange" @updateData="updateData"
 					:isShowFromLocation="false"></package-list>
 			</uni-collapse-item>
 		</uni-collapse>

src/pages/purchaseReceipt/coms/comReceiptDetailCardBacth.vue

@@ -4,17 +4,16 @@
 			<uni-collapse-item :open="true">
 				<template v-slot:title>
 					<uni-swipe-action>
-						<uni-swipe-action-item :right-options="dataContent.handleQty>0? scanOptions:options"
+						<uni-swipe-action-item :right-options="dataContent.handleQty>0? removeOptions:options"
-							@click="swipeClick($event,dataContent)" :class="dataContent.scaned?'scan_view':''">
+							@click="swipeClick($event,dataContent)">
 							<itemCompareQty :dataContent="dataContent" :handleQty="dataContent.handleQty"
 								:isShowPackUnit="false"></itemCompareQty>
-							
-							<batch v-if="dataContent.subList[0].batch" :batch="dataContent.subList[0].batch"></batch>
-							<location  title="来源库位"  v-if="dataContent.subList[0].fromLocationCode" :locationCode="dataContent.subList[0].fromLocationCode">
-							</location>
 						</uni-swipe-action-item>
 					</uni-swipe-action>
 				</template>
+				<package-list :dataContent="dataContent.subList" :isEdit="settingParam.allowModifyQty=='TRUE'"
+					:settingParam="settingParam" @collapseChange="collapseChange" @updateData="updateData"
+					:isShowFromLocation="false"></package-list>
 			</uni-collapse-item>
 		</uni-collapse>
 
@@ -34,14 +33,10 @@
 	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
 	import receiptDetailInfoPopup from '@/pages/purchaseReceipt/coms/receiptDetailInfoPopup.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+	import pack from '@/mycomponents/balance/pack.vue'
 	import detailList from '@/mycomponents/detail/detailList.vue'
 	import packageList from '@/mycomponents/package/packageList.vue'
 
-	import pack from '@/mycomponents/balance/pack.vue'
-	import location from '@/mycomponents/balance/location.vue'
-	import toLocation from '@/mycomponents/balance/toLocation.vue'
-	import batch from '@/mycomponents/balance/batch.vue'
-
 	import {
 		getDetailOption,
 		getPurchaseReceiptOption,
@@ -58,11 +53,7 @@
 			receiptDetailInfoPopup,
 			winScanLocation,
 			detailList,
-			packageList,
+			packageList
-			pack,
-			location,
-			toLocation,
-			batch
 		},
 		props: {
 			dataContent: {
@@ -77,6 +68,8 @@
 				type: Object,
 				default: null
 			},
+
+
 		},
 		watch: {
 
@@ -99,9 +92,6 @@
 		},
 
 		mounted() {
-			this.$nextTick(()=>{
-				console.log(this.dataContent)
-			})
 			if (this.detailOptions.length == 0) {
 				this.detailOptions = getDetailOption();
 			}
@@ -109,7 +99,6 @@
 				this.scanOptions = getPurchaseReceiptOption(this.settingParam.allowModifyQty, this.settingParam
 					.allowModifyLocation)
 			}
-			console.log(111,this.scanOptions)
 
 			if (this.removeOptions.length == 0) {
 				this.removeOptions = getRemoveOption();
@@ -208,14 +197,12 @@
 			// 		});
 			// },
 			confirm(qty) {
-				console.log(qty)
 				this.editItem.handleQty = qty;
 				this.$emit('updateData')
 			},
 			updateData() {
 				this.$emit('updateData')
-			},
+			}
-			
 		}
 	}
 </script>

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -390,7 +390,7 @@
 											pack.labelQty = Number(result.label.qty);
 										}
 									}
-									calcTreeHandleQty(this.detailSource);
+								calcHandleQty(this.detailSource);
 									itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序
 									this.$forceUpdate()
 								}
@@ -456,7 +456,6 @@
 									item.scaned = true;
 									itemDetail.scanDate = new Date();
 									item.handleQty = calc.add(item.handleQty,result.label.qty)
-									item.balanceQty = balanceInfo.qty;
 									item.toLocationCode = this.toLocationCode;
 								})
 								// calcHandleQty(this.detailSource);
@@ -497,7 +496,9 @@
 										}
 										if (isScan) {
 											pack.scanDate = new Date();
-											this.showMessage("箱码【" + packingNumber + "】已经扫描");
+											// this.showMessage("箱码【" + packingNumber + "】已经扫描");
+											
+											pack.handleQty = calc.add(pack.handleQty,result.label.qty)
 										} else {
 											this.packingNumberList.push(packingNumber)
 											pack.scaned = true
@@ -507,8 +508,7 @@
 											pack.labelQty = Number(result.label.qty);
 										}
 									}
-									itemDetail.balanceQty = balanceInfo.qty;
+									calcHandleQty(this.detailSource);
-									calcTreeHandleQty(this.detailSource);
 									itemDetail.packList.sort(compareDesc('scanDate')); //按扫描信息排序
 									this.$forceUpdate()
 								}
@@ -529,7 +529,8 @@
 								}
 								if (isScan) {
 									itemDetail.scanDate = new Date();
-									this.showMessage("箱码【" + packingNumber + "】已经扫描")
+									// this.showMessage("箱码【" + packingNumber + "】已经扫描")
+									itemDetail.handleQty = calc.add(itemDetail.handleQty,result.label.qty)
 								} else {
 									this.packingNumberList.push(packingNumber)
 									itemDetail.scaned = true;
@@ -539,7 +540,6 @@
 									console.log(itemDetail.handleQty)
 									itemDetail.toLocationCode = this.toLocationCode;
 									itemDetail.labelQty = Number(result.label.qty);
-									itemDetail.balanceQty = balanceInfo.qty;
 									itemDetail.packList.forEach(pac => {
 										pac.scaned = true
 										pac.scanDate = new Date();
@@ -551,6 +551,7 @@
 									this.continueScan()
 									this.$forceUpdate()
 								}
+									calcHandleQty(this.detailSource);
 							}
 						}
 					}
@@ -570,11 +571,11 @@
 			},
 
 			updateData() {
-				if(this.managementType == 'BY_BATCH'){
+				// if(this.managementType == 'BY_BATCH'){
-				}else{
+				// }else{
-				calcTreeHandleQty(this.detailSource)
+				// calcTreeHandleQty(this.detailSource)
-				}
+				// }
-				// calcHandleQty(this.detailSource);
+				calcHandleQty(this.detailSource);
 			},
 
 			scanLocationCode(location, code) {
@@ -715,7 +716,6 @@
 				var params = this.setParams();
 				let that = this
 				console.log(params)
-				return
 				purchaseReceiptJobSubmit(params).then(res => {
 					if (res.data) {
 						let isCheckPrint = getSwitchInfoByCode(this.switchCode)//是否显示上架指引单