ysy 2 anos atrás
pai
commit
33b14a9964
2 arquivos alterados com 19 adições e 6 exclusões
  1. 5 4
      pages/pda/feeding/details.vue
  2. 14 2
      pages/pda/workOrder/search/index.vue

+ 5 - 4
pages/pda/feeding/details.vue

@@ -98,6 +98,7 @@
 
 							} else if (f.rootCategoryLevelId == 1) {
 								instanceList = instanceList.concat(...f.mattList)
+
 							}
 
 						})
@@ -112,7 +113,7 @@
 				})
 
 
-console.log(this.List)
+				console.log(this.List)
 
 
 
@@ -214,7 +215,7 @@ console.log(this.List)
 				// CX-EQ-YLSJL-008	  设备
 				// M001 M002 模具 
 				//  S310000552731 物料
-				// this.scanItData('CX-EQ-YLSJL-008', id)
+				// this.scanItData('S310000552731', id)
 				// return false
 
 				let _this = this
@@ -328,9 +329,9 @@ console.log(this.List)
 
 			},
 
-			handAdd(id, list) {
+			handAdd(id) {
 				const storageKey = Date.now() + "";
-				uni.setStorageSync(storageKey, list || []);
+				uni.setStorageSync(storageKey, this.List || []);
 				uni.navigateTo({
 					url: `/pages/pda/workOrder/search/index?id=${id}&storageKey=${storageKey}&isType=feed`
 				})

+ 14 - 2
pages/pda/workOrder/search/index.vue

@@ -151,7 +151,20 @@
 			this.isType = option.isType
 			if (option.storageKey) {
 				this.storageKey = option.storageKey
-				this.memoList = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
+				
+				
+				if(this.isType == 'feed') {
+					let _arr =  (this.storageKey && uni.getStorageSync(this.storageKey)) || []
+					this.memoList = [ ..._arr[0].modelList, ..._arr[0].equipmentList]
+					this.mattList = [..._arr[0].instanceList]
+				
+
+				} else {
+					this.memoList = (this.storageKey && uni.getStorageSync(this.storageKey)) || []
+				}
+				
+				
+				
 			}
 
 			this.getTreeList()
@@ -325,7 +338,6 @@
 			},
 
 			mattSave(maList, id) {
-
 				this.list.forEach(e => {
 					if (e.id == id) {
 						this.$set(e, 'checked', maList.length == 0 ? false : true)