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

src/mycomponents/qty/recommendQtyEdit.vue

@@ -187,6 +187,7 @@ import { nextTick } from 'vue';
 			setValue() {
 				// var recommendQty = Number(this.dataContent.qty);
 				// var labelQty = Number(this.dataContent.record.label.qty);
+				// 采购收货判断是否大于包装数量isNumPackTips这个字段做判断
 				if (this.allQty > parseFloat(this.dataContent.packQty) && this.isNumPackTips) {
 					this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于包装数量[' +
 						this.dataContent.packQty +
@@ -196,7 +197,8 @@ import { nextTick } from 'vue';
 						})
 						return
 				} 
-				if (this.allQty > this.labelQty && this.isNumTips) {
+				// 其他功能判断是否大于标签数量
+				if (this.allQty > this.labelQty && this.isNumTips && !this.isNumPackTips) {
 					this.$refs.comMessage.showErrorMessage('数量[' + this.allQty + ']不允许大于标签数量[' +
 						this.labelQty +
 						']',

src/pages/issue/job/issueDetailBatch.vue

@@ -688,7 +688,7 @@
 						if (res) {
 							return
 							//防止重复点击
-							// this.$throttle(this.submit, 2000, this)()
+							this.$throttle(this.submit, 2000, this)()
 						} else {
 							this.scanPopupGetFocus()
 						}
@@ -696,7 +696,7 @@
 				}else {
 					return
 					//防止重复点击
-					// this.$throttle(this.submit, 2000, this)()
+					this.$throttle(this.submit, 2000, this)()
 				}
 			},
 

src/pages/purchaseReceipt/job/receiptDetail.vue

@@ -194,6 +194,9 @@
 			this.source_type = option.source_type;
 			this.switchCode = "purchasereceiptPrintPDA" //采购收货PDA打印开关
 			this.switchCode1 = "EnableQms" //根据开关中是否启用QMS去判断，如果为TRUE显示检验指引单，如果为FALSE不显示检验指引单
+			uni.setNavigationBarTitle({
+				title:option.title + '详情'
+			})
 			if (this.id != undefined) {
 				//新建的任务自动接收
 				if (this.status == "1") {

src/pages/purchaseReceipt/job/receiptJob.vue

@@ -310,7 +310,7 @@
 			openJobDetail(item, scanMessage = '') {
 				uni.navigateTo({
 					url: './receiptDetail?id=' + item.masterId + '&status=' + item.status + '&operation=' + this
-						.operation + '&scanMessage=' + scanMessage + '&source_type=' + this.source_type
+						.operation + '&scanMessage=' + scanMessage + '&source_type=' + this.source_type + '&title=' + this.title
 				});
 				this.scanMessage = ""
 			},

src/pages/unPlanned/job/receiptJobDetail.vue

@@ -42,6 +42,7 @@
 		<win-scan-button @goScan='openScanPopup'></win-scan-button>
 		<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ"></win-scan-pack>
 
+		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
 		<comMessage ref="comMessage"></comMessage>
 	</view>
 </template>
@@ -80,6 +81,7 @@
 	import comReceiptDetailCard from '@/pages/unPlanned/coms/comReceiptDetailCard.vue'
 	import jobTop from '@/mycomponents/job/jobTop.vue'
 	import comRecommendDetailCard from "@/mycomponents/detail/comRecommendDetailCard.vue"
+	import detailInfoPopup from '@/pages/unPlanned/coms/detailInfoPopup.vue'
 
 	export default {
 		name: 'receipt_detail',
@@ -89,7 +91,8 @@
 			comReceiptDetailCard,
 			locationCompare,
 			jobTop,
-			comRecommendDetailCard
+			comRecommendDetailCard,
+			detailInfoPopup
 		},
 		data() {
 			return {
@@ -229,6 +232,16 @@
 
 
 			updateData() {
+				//删除新添加的
+				for (var i = 0; i < this.detailSource.length; i++) {
+					var item =this.detailSource[i]
+					for (var j = 0; j < item.subList.length; j++) {
+						var sub =item.subList[j]
+						if(!sub.isRecommend&&!sub.scaned){
+							item.subList.splice(j,1)
+						}
+					}
+				}
 				calcHandleQty(this.detailSource);
 				this.$forceUpdate()
 			},
@@ -279,13 +292,13 @@
 								toLocationCode:locationCode,
 								// inventoryStatus:inventoryStatus,
 								// toInventoryStatus:inventoryStatus,
-								// balance:result.balance,
+								balance:{},
 								isRecommend:false,
 								isNewAdd:"newAdd"
 							}
 							// newAdd.balance.balanceQty = Number(result.balance.qty);
-							// newAdd.balance.packQty = Number(result.package.packQty)
-							// newAdd.balance.packUnit = result.package.packUnit
+							newAdd.balance.packQty = Number(result.package.packQty)
+							newAdd.balance.packUnit = result.package.packUnit
 							newAdd.scaned = true;
 							detail.subList.push(newAdd)
 						} else {
@@ -302,11 +315,11 @@
 								this.continueScan()
 							}
 						}
-						let array = this.detailSource.map((item=>{
-							return {
-								...item,
-								subList: item.subList.filter(cur=>cur.isRecommend == true)
-							}
+						let array =  []
+						this.detailSource.forEach((item=>{
+							let obj = {...item}
+							obj.subList=item.subList.filter(cur=>cur.isRecommend == true)
+							array.push(obj)
 						}))
 						calcHandleQty(array);
 					}
@@ -523,6 +536,9 @@
 				return this.jobContent;
 			},
 
+			openDetail(item) {
+				this.$refs.detailInfoPopup.openPopup(item)
+			},