From b5e9d814d0a9802ea0e31f6f91272ebb93133725 Mon Sep 17 00:00:00 2001
From: wangxy <xinyao.wang@le-it.com.cn>
Date: Fri, 29 Oct 2021 14:37:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E8=BF=90=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../productexe/basic/component/artComponent.vue     |  4 ++--
 .../productexe/basic/component/pkgComponent.vue     |  2 +-
 src/views/quality/component/shipmentCode.vue        |  1 +
 src/views/quality/component/shipmentList.vue        | 10 ++++++++--
 src/views/quality/shipment.vue                      | 13 ++++++++++---
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/src/views/productexe/basic/component/artComponent.vue b/src/views/productexe/basic/component/artComponent.vue
index aaaf4a3..756d5c8 100644
--- a/src/views/productexe/basic/component/artComponent.vue
+++ b/src/views/productexe/basic/component/artComponent.vue
@@ -53,7 +53,7 @@ export default {
 				"JIT_ShipOrderItemlst-ShipOrderId",
 				"JIT_ShipOrderItemlst-ItemId",
 				"JIT_ShipOrderItemlst-ItemType",
-				"JIT_ShipOrderItemlst-Pos",
+				// "JIT_ShipOrderItemlst-Pos",
 				"JIT_ShipOrderItemlst-ShipValidateToggle",
 				"JIT_ShipOrderItemlst-Descr",
 				"JIT_ShipOrderItemlst-ProjectId",
@@ -117,7 +117,7 @@ export default {
 	},
 	mounted() {
 		this.dataList = []
-		getShiporderitemlst(this.item['JIT_ShipOrder-ShipOrderId']).then(({code, data =[]}) => {
+		getShiporderitemlst({ShipOrderId: this.item['JIT_ShipOrder-ShipOrderId']}).then(({code, data =[]}) => {
 			if (code === 200) {
 				this.dataList = data
 			}
diff --git a/src/views/productexe/basic/component/pkgComponent.vue b/src/views/productexe/basic/component/pkgComponent.vue
index f6f1906..c9a3fe9 100644
--- a/src/views/productexe/basic/component/pkgComponent.vue
+++ b/src/views/productexe/basic/component/pkgComponent.vue
@@ -77,7 +77,7 @@ export default {
 	},
 	mounted() {
 		this.dataList = []
-		getShiporderdatalst(this.item['JIT_ShipOrder-ShipOrderId']).then(({code, data=[]}) => {
+		getShiporderdatalst({ShipOrderId: this.item['JIT_ShipOrder-ShipOrderId']}).then(({code, data=[]}) => {
 			if (code === 200) {
 				this.dataList = data
 			}
diff --git a/src/views/quality/component/shipmentCode.vue b/src/views/quality/component/shipmentCode.vue
index d7da349..62fbe31 100644
--- a/src/views/quality/component/shipmentCode.vue
+++ b/src/views/quality/component/shipmentCode.vue
@@ -56,6 +56,7 @@ export default {
 							this.isSuccess = true
 							this.newEmitObj = {
 								shipOrderId: this.shipOrderId,
+								isStatus: res.data
 							}
 							this.$emit('handleSuccessCode', this.newEmitObj)
 						} else {
diff --git a/src/views/quality/component/shipmentList.vue b/src/views/quality/component/shipmentList.vue
index 6208647..6727d19 100644
--- a/src/views/quality/component/shipmentList.vue
+++ b/src/views/quality/component/shipmentList.vue
@@ -45,7 +45,6 @@ export default {
 	},
   data() {
     return {
-			tableData: [],
 			loading: false,
 			dataObj: {},
 			orderStatusArray: [],
@@ -69,6 +68,9 @@ export default {
 		})
 	},
 	methods: {
+		reset() {
+			this.dataObj = {}
+		},
 		getInfo(orderId) {
 			getShiporderDetail(orderId).then(({code, data}) => {
 				if (code === 200) {
@@ -92,7 +94,11 @@ export default {
 	watch: {
     shipOrderId: {
       handler(newValue, oldValue) {
-        this.getInfo(newValue)
+				if (newValue) {
+					this.getInfo(newValue)
+				} else {
+					this.dataObj = {}
+				}
       },
       deep: true,
     },
diff --git a/src/views/quality/shipment.vue b/src/views/quality/shipment.vue
index 063e875..b0f36f3 100644
--- a/src/views/quality/shipment.vue
+++ b/src/views/quality/shipment.vue
@@ -37,14 +37,21 @@ export default {
 		handleCurrentChange(data) {
 			if (data.currentData) {
 				this.shipOrderId = data['currentData']['JIT_ShipOrder-ShipOrderId']
+			} else {
+				this.shipOrderId = ''
 			}
 			this.tableData = data.tableData
 		},
 		handleSuccessCode(data) {
-			if (data.shipOrderId) {
-				this.$refs.shipmentList.getInfo(data.shipOrderId)
+			if (data.isStatus === 'success') { // 全部扫描完毕
+				this.$refs.shipmentSearch.getList()
+				this.$refs.shipmentList.reset()
 			} else {
-				this.$refs.shipmentSearch.handleCurrentChange(data.currentShipOrder)
+				if (data.shipOrderId) {
+					this.$refs.shipmentList.getInfo(data.shipOrderId)
+				} else {
+					this.$refs.shipmentSearch.handleCurrentChange(data.currentShipOrder)
+				}
 			}
 		}
 	},