From b26247bb08e1bc15ca3cc42ca78402c47f35c411 Mon Sep 17 00:00:00 2001
From: lijuncheng <juncheng.li@ccwin-in.com>
Date: Thu, 30 Nov 2023 11:22:36 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=87=E8=B4=AD=E9=80=80=E8=B4=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mycomponents/detail/comDetailCard.vue     |  4 +-
 pages.json                                | 64 +----------------------
 pages/purchaseReturn/job/returnDetail.vue | 41 ++++++---------
 pages/putaway/record/putawayRecord.vue    |  3 +-
 4 files changed, 20 insertions(+), 92 deletions(-)

diff --git a/mycomponents/detail/comDetailCard.vue b/mycomponents/detail/comDetailCard.vue
index e0ca6925..e5e6fd93 100644
--- a/mycomponents/detail/comDetailCard.vue
+++ b/mycomponents/detail/comDetailCard.vue
@@ -68,8 +68,8 @@
 				default: true
 			},
 			locationTypeList: {
-				type: Object,
-				default: {}
+				type: Array,
+				default: []
 			},
 		},
 		watch: {
diff --git a/pages.json b/pages.json
index 41a4d87e..7ea1b5be 100644
--- a/pages.json
+++ b/pages.json
@@ -17,49 +17,7 @@
 				"enablePullDownRefresh": true
 			}
 		},
-		{
-			"path": "pages/mine/index",
-			"style": {
-				"navigationBarTitleText": "设置",
-				"enablePullDownRefresh": true
-			}
-		},
-		{
-			"path": "pages/mine/avatar/index",
-			"style": {
-				"navigationBarTitleText": "修改头像"
-			}
-		}, {
-			"path": "pages/mine/info/index",
-			"style": {
-				"navigationBarTitleText": "个人信息"
-			}
-		}, {
-			"path": "pages/mine/info/edit",
-			"style": {
-				"navigationBarTitleText": "编辑资料"
-			}
-		}, {
-			"path": "pages/mine/pwd/index",
-			"style": {
-				"navigationBarTitleText": "修改密码"
-			}
-		}, {
-			"path": "pages/mine/setting/index",
-			"style": {
-				"navigationBarTitleText": "应用设置"
-			}
-		}, {
-			"path": "pages/mine/help/index",
-			"style": {
-				"navigationBarTitleText": "常见问题"
-			}
-		}, {
-			"path": "pages/mine/about/index",
-			"style": {
-				"navigationBarTitleText": "关于我们"
-			}
-		},
+		
 		{
 			"path": "pages/common/webview/index",
 			"style": {
@@ -71,16 +29,6 @@
 				"navigationBarTitleText": "浏览文本"
 			}
 		},
-		{
-			"path": "pages/home/index",
-			"style": {
-				"navigationBarTitleText": "WMS仓库管理系统-移动端",
-				"titleNView": {
-					"autoBackButton": "true",
-					"buttons": [{}]
-				}
-			}
-		},
 		{
 			"path": "pages/login/index",
 			"style": {
@@ -644,16 +592,6 @@
 					"buttons": [{}]
 				}
 			}
-		}, {
-			"path": "pages/query/number",
-			"style": {
-				"navigationBarTitleText": "按库位查询库存",
-				"enablePullDownRefresh": true,
-				"titleNView": {
-					"autoBackButton": "true",
-					"buttons": [{}]
-				}
-			}
 		}, {
 			"path": "pages/query/container",
 			"style": {
diff --git a/pages/purchaseReturn/job/returnDetail.vue b/pages/purchaseReturn/job/returnDetail.vue
index 35721444..7d627f88 100644
--- a/pages/purchaseReturn/job/returnDetail.vue
+++ b/pages/purchaseReturn/job/returnDetail.vue
@@ -92,9 +92,7 @@
 				jobContent: {}, //任务内容
 				subList: [], //接口返回的任务subList
 				detailSource: [], //绑定在页面上的数据源
-				toLocationInfo: {},
 				businessTypeInfo: {},
-				locationTypeList: [],
 				managementList: []
 			};
 		},
@@ -316,17 +314,17 @@
 				
 				var params =this.setParams()
 				console.log("提交参数", JSON.stringify(params));
-				// purchaseReturnJobsubmit(params).then(res => {
-				// 	uni.hideLoading()
-				// 	if (res.data) {
-				// 		this.showCommitSuccessMessage("提交成功<br>生成采购退货记录" + res.data, )
-				// 	} else {
-				// 		this.showErrorMessage("提交失败"+res.msg)
-				// 	}
-				// }).catch(error => {
-				// 	uni.hideLoading()
-				// 	this.showErrorMessage(error)
-				// })
+				purchaseReturnJobsubmit(params).then(res => {
+					uni.hideLoading()
+					if (res.data) {
+						this.showCommitSuccessMessage(res.data)
+					} else {
+						this.showErrorMessage("提交失败["+res.msg+"]")
+					}
+				}).catch(error => {
+					uni.hideLoading()
+					this.showErrorMessage(error)
+				})
 
 			},
 
@@ -337,16 +335,11 @@
 				this.detailSource.forEach(item => {
 					item.subList.forEach(detail => {
 						if (detail.scaned) {
-							// var info = getPackingNumberAndBatch(this.managementList, detail.itemCode,
-							// 	detail.packingNumber, detail.batch);
-							// detail.toPackingNumber = info.packingNumber;
-							// detail.toBatch = info.batch;
-							detail.singlePrice = detail.balance.singlePrice;
-							detail.amount = detail.balance.singlePrice * detail.handleQty;
-							
-							detail.arriveDate = detail.balance.arriveDate;
-							detail.produceDate = detail.balance.produceDate;
-							detail.expireDate = detail.balance.expireDate;
+							detail.toPackingNumber = detail.packingNumber;
+							detail.toContainerNumber = detail.containerNumber;
+							detail.toBatch = detail.batch;
+							detail.toInventoryStatus = detail.inventoryStatus;
+							detail.toLocationCode = detail.toLocationCode;
 							subList.push(detail)
 						}
 					})
@@ -423,11 +416,9 @@
 
 			showCommitSuccessMessage(number) {
 				this.$refs.comMessage.showSuccessMessage('提交成功<br>生成退货记录:' + number, res => {
-					setTimeout(() => {
 						uni.navigateTo({
 							url: './returnJob'
 						})
-					})
 				})
 			}
 		}
diff --git a/pages/putaway/record/putawayRecord.vue b/pages/putaway/record/putawayRecord.vue
index 61f3919c..862a4030 100644
--- a/pages/putaway/record/putawayRecord.vue
+++ b/pages/putaway/record/putawayRecord.vue
@@ -133,7 +133,7 @@
 					this.tolocationTypeList = res.tolocationTypeList;
 					this.showFromLocationPopup();
 				} else {
-					this.$refs.comMessage.showBreakMessage(res.message);
+					this.showErrorMessage(res.message)
 				}
 			});
 		},
@@ -189,7 +189,6 @@
 			showErrorMessage(message) {
 				this.$refs.comMessage.showErrorMessage(message, res => {
 					if (res) {
-
 					}
 				});
 			},