Merge branch 'develop' of http://101.201.121.115:3000/leo/LAPP_GAAS_GFrame_WEBFRONT into liwei

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
 			}

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
 			}

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 {

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,
     },

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)
+				}
 			}
 		}
 	},