Merge branch 'intex' of http://dev.ccwin-in.com:3000/sfms3.0/sfms3.0-uniapp into intex

src/pages/deliver/job/deliverDetailBatch.vue

@@ -639,11 +639,12 @@
 					// let obj = {...toLocationCode}
 					// delete obj.subList
 					let  recordList = []
-					let obj1 ={}
+					let obj ={}
 					let arr = toLocationCode.subList.filter(item=>item.scaned)
 				console.log(888,arr)
 				if(arr.length>0){
 					arr.forEach(record=>{
+						let obj1 = {}
 						obj1.itemCode =toLocationCode.itemCode;
 						obj1.itemName =toLocationCode.itemName;
 						obj1.scaned =record.scaned;
@@ -664,11 +665,11 @@
 						obj1.toPackingNumber = '';
 						obj1.packingNumber = '';
 						obj1.fromPackingNumber ='';
-						// obj = {...obj1}
+						obj = {...obj1}
 						recordList.push(obj1)
 					})
 					subList.push({
-						...obj1,
+						...obj,
 						recordList: recordList
 					})
 				}

src/pages/inspect/job/inspectDetail.vue

@@ -147,7 +147,6 @@
 		},
 		methods: {
 			deleteFileByTable(id) {
-				debugger
 				deleteFileByTable("jobInspectDetail", id).then(res => {})
 			},