From 92d5d09e18f8005a13478a651daaa652066a5576 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Mon, 15 Jan 2024 13:58:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=9F=E4=BA=A7=E9=80=80?=
 =?UTF-8?q?=E6=96=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages.json                                    |  6 ++--
 pages/inventoryMove/coms/comMoveRecord.vue    |  2 +-
 .../inventoryMove/coms/comMoveRecordCard.vue  | 14 +++++++-
 pages/issue/record/issueRecord.vue            | 31 ++++++++--------
 .../coms/comReturnRequestCreator.vue          | 35 +++++++++----------
 .../productionReturn/record/returnToHold.vue  |  6 +++-
 .../productionReturn/record/returnToStore.vue |  7 +++-
 7 files changed, 62 insertions(+), 39 deletions(-)

diff --git a/pages.json b/pages.json
index 859ab9f7..c385da96 100644
--- a/pages.json
+++ b/pages.json
@@ -466,7 +466,7 @@
 		{
 			"path": "pages/issue/record/issueRecord",
 			"style": {
-				"navigationBarTitleText": "直接发料",
+				"navigationBarTitleText": "直接发料记录",
 				"enablePullDownRefresh": true,
 				"titleNView": {
 					"autoBackButton": "true"
@@ -561,14 +561,14 @@
 		{
 			"path": "pages/productionReturn/record/returnToStore",
 			"style": {
-				"navigationBarTitleText": "合格退料",
+				"navigationBarTitleText": "合格退料记录",
 				"enablePullDownRefresh": false
 			}
 		},
 		{
 			"path": "pages/productionReturn/record/returnToHold",
 			"style": {
-				"navigationBarTitleText": "隔离退料",
+				"navigationBarTitleText": "隔离退料记录",
 				"enablePullDownRefresh": false
 			}
 		},
diff --git a/pages/inventoryMove/coms/comMoveRecord.vue b/pages/inventoryMove/coms/comMoveRecord.vue
index 7d835a77..d9681136 100644
--- a/pages/inventoryMove/coms/comMoveRecord.vue
+++ b/pages/inventoryMove/coms/comMoveRecord.vue
@@ -247,7 +247,7 @@
 						if (r.packingNumber == balance.packingNumber &&
 							r.batch == balance.batch &&
 							r.fromLocationCode == balance.locationCode &&
-							r.inventoryStatus == balance.inventoryStatus &&
+							r.toInventoryStatus == balance.inventoryStatus &&
 							r.scaned == true) {
 							return r;
 						}
diff --git a/pages/inventoryMove/coms/comMoveRecordCard.vue b/pages/inventoryMove/coms/comMoveRecordCard.vue
index 6217e99b..c8545a41 100644
--- a/pages/inventoryMove/coms/comMoveRecordCard.vue
+++ b/pages/inventoryMove/coms/comMoveRecordCard.vue
@@ -86,7 +86,19 @@
 
 		},
 		watch: {
-
+			dataContent: {
+				handler(newName, oldName) {
+					if (this.dataContent.subList.length > 0) {
+						if (this.$refs.collapse1 != undefined && this.$refs.collapse1 != null) {
+							this.$nextTick(res => {
+								this.$refs.collapse1.resize()
+							})
+						}
+					}
+				},
+				immediate: true,
+				deep: true
+			}
 		},
 
 		data() {
diff --git a/pages/issue/record/issueRecord.vue b/pages/issue/record/issueRecord.vue
index d552d498..30efb9df 100644
--- a/pages/issue/record/issueRecord.vue
+++ b/pages/issue/record/issueRecord.vue
@@ -58,6 +58,9 @@
 	import {
 		getBusinessType,
 	} from '@/common/record.js';
+	import {
+		calc
+	} from '@/common/calc.js';
 	
 	import {
 		getManagementPrecisions
@@ -209,7 +212,7 @@
 			caclcQty() {
 				var totalQty = 0;
 				this.detailSource.subList.forEach(res => {
-					totalQty += res.qty
+					totalQty = calc.add(totalQty,res.qty); 
 				})
 				this.detailSource.totalQty = totalQty;
 			},
@@ -241,10 +244,10 @@
 						let handleQty = 0;
 						if (batch != undefined) {
 							batch.Records.forEach(res => {
-								handleQty += Number(res.qty)
+								handleQty = calc.add(handleQty,res.qty); 
 							})
 							batch.handleQty = handleQty;
-							itemHandleQty += handleQty;
+							itemHandleQty = calc.add(itemHandleQty,handleQty)
 						}
 					})
 				}
@@ -338,17 +341,17 @@
 				var params = this.setParams()
 				console.log("提交参数", JSON.stringify(params));
 			
-				issueRecordSubmit(params).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data)
-					} else {
-						this.showErrorMessage("提交失败:" + res.msg)
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
+				// issueRecordSubmit(params).then(res => {
+				// 	uni.hideLoading()
+				// 	if (res.data) {
+				// 		this.showCommitSuccessMessage("提交成功<br>生成发料记录<br>" + res.data)
+				// 	} else {
+				// 		this.showErrorMessage("提交失败:" + res.msg)
+				// 	}
+				// }).catch(error => {
+				// 	uni.hideLoading()
+				// 	this.showErrorMessage(error)
+				// })
 			},
 			
 			showCommitSuccessMessage(hint) {
diff --git a/pages/productionReturn/coms/comReturnRequestCreator.vue b/pages/productionReturn/coms/comReturnRequestCreator.vue
index 698454e0..058c5e62 100644
--- a/pages/productionReturn/coms/comReturnRequestCreator.vue
+++ b/pages/productionReturn/coms/comReturnRequestCreator.vue
@@ -5,7 +5,7 @@
 			</comReturnRequestInfo>
 			<uni-swipe-action ref="swipeAction">
 				<view v-for="(item, index) in dataContent.subList" :key="index">
-					<uni-swipe-action-item @click="swipeClick($event,item)" :right-options="detailOptions">
+					<uni-swipe-action-item @click="swipeClick($event,item,index)" :right-options="options">
 						<item-qty :dataContent="item" :isShowStdPack="false">
 						</item-qty>
 						<!-- <view v-if="item.batch!=''" style="margin-left: 10rpx;">
@@ -36,7 +36,7 @@
 	import {
 		getDetailOption,
 		getDetailEditRemoveOption,
-		getDetailRemoveOption
+		getDetailRemoveOption,
 	} from '@/common/array.js';
 
 	export default {
@@ -79,7 +79,6 @@
 		},
 		watch: {
 			dataContent(newVal) {
-				this.requestItem = newVal.subList[0];
 			},
 		},
 
@@ -92,9 +91,9 @@
 
 					}
 				},
-				requestItem: {},
 				detailOptions: [],
-				scanOptions: []
+				scanOptions: [],
+				options:[]
 			}
 		},
 
@@ -103,26 +102,30 @@
 				this.detailOptions = getDetailOption();
 			}
 			if (this.scanOptions.length == 0) {
-				this.scanOptions = getDetailEditRemoveOption();
+				this.scanOptions = getDetailRemoveOption();
 				// if (this.dataContent.allowModifyQty == 1) {
 				// 	this.scanOptions = getDetailEditRemoveOption();
 				// } else {
 				// 	this.scanOptions = getDetailRemoveOption();
 				// }
 			}
-			if(!this.isSwipe){
-				this.detailOptions=[]
-			}
+			
+			this.options =this.scanOptions
+			// if(!this.isSwipe){
+			// 	this.options=[]
+			// }else {
+			// 	this.options =this.scanOptions
+			// }
 		},
 
 		methods: {
-			swipeClick(e, item) {
+			swipeClick(e, item,index) {
 				if (e.content.text == "详情") {
 					this.detail(item)
 				} else if (e.content.text == "编辑") {
 					this.edit(item)
 				} else if (e.content.text == "移除") {
-					this.remove(item)
+					this.remove(item,index)
 				}
 			},
 			edit(item) {
@@ -136,17 +139,13 @@
 				// // this.showItem = item;
 				// // this.$refs.jobDetailPopup.openPopup(item)
 			},
-			remove(item) {
+			remove(item,index) {
 				this.$refs.message.showQuestionMessage("确定移除扫描信息?",
 					res => {
 						if (res) {
-							item.scaned = false
-							item.record = {}
-							item.balance = {}
-							item.inventoryStatus = item.RecommendInventoryStatus
-							// item.record.qty = 0;
+							this.dataContent.subList.splice(index, 1)
 							this.$forceUpdate()
-							this.$emit('remove', item)
+							// this.$emit('remove', item)
 						}
 					});
 			},
diff --git a/pages/productionReturn/record/returnToHold.vue b/pages/productionReturn/record/returnToHold.vue
index 8833f5d5..90382c73 100644
--- a/pages/productionReturn/record/returnToHold.vue
+++ b/pages/productionReturn/record/returnToHold.vue
@@ -61,6 +61,10 @@
 		getPackingNumberAndBatchByList,
 		deepCopyData
 	} from '@/common/basic.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
 
 	import {
 		getDirectoryItemArray
@@ -246,7 +250,7 @@
 					item.qty = 0;
 					for (let detail of item.subList) {
 						if (detail != undefined) {
-							item.qty += Number(detail.qty)
+							item.qty = calc.add(item.qty,detail.qty)
 						}
 					}
 				}
diff --git a/pages/productionReturn/record/returnToStore.vue b/pages/productionReturn/record/returnToStore.vue
index c4214847..8b48921b 100644
--- a/pages/productionReturn/record/returnToStore.vue
+++ b/pages/productionReturn/record/returnToStore.vue
@@ -56,6 +56,10 @@
 	import {
 		getDirectoryItemArray
 	} from '@/common/directory.js';
+	
+	import {
+		calc
+	} from '@/common/calc.js';
 
 	import {
 		getBusinessType,
@@ -247,7 +251,8 @@
 					item.qty = 0;
 					for (let detail of item.subList) {
 						if (detail != undefined) {
-							item.qty += Number(detail.qty)
+							item.qty = calc.add(item.qty,detail.qty)
+							
 						}
 					}
 				}