出库申请

components/equipmentRetrieval.vue

@@ -205,6 +205,7 @@
 						return {
 							typeId:item.id,
 							name:item.name,
+							
 							list:[],
 							pageIndex:1,
 							pageSize:10,

pages/projectDepartment/exportApplication/deliveryFrom.vue

@@ -577,7 +577,8 @@
 					mask: true,
 				})
 				API.deviceDetailsByName({
-					name:val
+					name:val,
+					model:item.model
 				}).then((res) => {
 					
 					  uni.hideLoading()
@@ -585,13 +586,18 @@
 					 deviceInfo.inventory=res.data.count;
 					this.list.push({
 						deviceName:val,
+						model:deviceInfo.model,
 						obj:deviceInfo,
 						count:1
 					})
 				}).catch(error => {
 					
+					// uni.showToast({
+					// 	title:"添加失败"
+					// })
 					this.list.push({
 						deviceName:item.title,
+						model:item.model,
 						obj:item,
 						count:1
 					})
@@ -602,7 +608,7 @@
 				
 				var c=this.list.findIndex(it=>{
 					
-					return it.obj.title==item.title
+					return (it.obj.title==item.title&&it.obj.model==item.model)
 				})
 				
 				if(c!=-1){