暂存代码

src/pages/apply/components/FormListItem.vue

@@ -74,10 +74,14 @@ const integrateData = (printTemplate: any, printData: any) => {
 };
 
 const handlePrint = async (row: any) => {
+	const deviceId = blueTooth.BLEInformation.deviceId;
+	if (!deviceId) {
+		uni.navigateTo({ url: '/pages/blueTooth/index' });
+	}
 	const billNo = row.filter((item: any) => item.label == '单据编码' || item.label == '编码')[0]
 		.value;
 	const formId = JSON.parse(uni.getStorageSync('pageData')).permTag;
-	let printTemplate;
+	let printTemplate: any;
 	// let metaParams = formId == 'WMS_Receive' ? 'WMS_LableRule' : 'BD_ReserveRule'
 	// const { data: metaList } = await getMetadata(metaParams)
 	// console.log(metaList, 'metaList');
@@ -93,32 +97,34 @@ const handlePrint = async (row: any) => {
 			title: '请先在后台设置打印模板',
 			mask: true,
 		});
-	let printData;
 	if (formId == 'WMS_Receive') {
 		const { data: serialList } = await getBillSerialNumber({ billNo, formId });
-		console.log(serialList);
+		// console.log(serialList);
 		if (serialList.data.length === 0)
 			return uni.showToast({
 				title: '该编码下无序列号',
 				icon: 'none',
 			});
 		const { data: printList } = await getPrintData(serialList.data);
-		const { data: analysisList }: any = await getAnalysis({
-			billNo: printList.data[0].FBarCode.split(',')[0],
-		});
-		console.log(printList, analysisList, 'printList');
-		printList.data.map((item: any) => {
-			analysisList.data.map((res: any, r: number) => {
-				let arr = item.FBarCode.split(',');
-				if (arr) {
-					let newArr = arr.slice(1, arr.length - 1);
-					res.FBarCode = item.FBarCode;
-					res.printVal = newArr[r];
-				}
-			});
+		let promises: any = [];
+		// console.log(printList, analysisList, 'printList');
+		printList.data.map(async (item: any) => {
+			if (item.success) {
+				const { data: analysisList }: any = await getAnalysis({
+					billNo: item.data.FBarCode.split(',')[0],
+				});
+				analysisList.data.map((res: any, r: number) => {
+					let arr = item.data.FBarCode.split(',');
+					if (arr) {
+						let newArr = arr.slice(1, arr.length - 1);
+						res.FBarCode = item.data.FBarCode;
+						res.printVal = newArr[r];
+					}
+				});
+				promises.push(generateInstruct(integrateData(printTemplate, analysisList.data), blueTooth))
+			}
 		});
-		printData = analysisList.data;
-		console.log(printData, 'analysisList.data');
+		await Promise.all(promises)
 	} else {
 		const { data: businessList } = await getBusinessList({ formId });
 		console.log(businessList, row);
@@ -133,11 +139,7 @@ const handlePrint = async (row: any) => {
 		});
 		// printData = row
 	}
-	const deviceId = blueTooth.BLEInformation.deviceId;
-	if (!deviceId) {
-		uni.navigateTo({ url: '/pages/blueTooth/index' });
-	}
-	generateInstruct(integrateData(printTemplate, printData), blueTooth);
+	// generateInstruct(integrateData(printTemplate, printData), blueTooth);
 };
 </script>
 

src/pages/apply/formDetail.vue

@@ -137,8 +137,7 @@ onLoad(() => {
 
 onShow(() => {
 	// 判断是否为选单状态
-	console.log(menuSelection.isMenuSelection, 'menuSelection', menuSelectionData.value);
-	if (menuSelection.isMenuSelection) {
+	if (menuSelection.isMenuSelection && !saveList.value.length) {
 		let obj: any = {
 			show: true,
 			scanIcon: 'arrow-up-fill',
@@ -152,7 +151,7 @@ onShow(() => {
 // 扫码执行逻辑
 const handleInput = async () => {
 	try {
-		let e: string = '004,001,2023-07-13T00:00:00,A6514,,A6513,10,'
+		let e: string = '004,0002,2023-07-14T00:00:00,A6526,,A6525,10,'
 		sLoading()
 		let barcodeList = uni.getStorageSync('barcodeList')
 		// 获取条码信息
@@ -309,7 +308,6 @@ const initSerialNumberData = async (data: any) => {
 		if (menuSelection.isMenuSelection && !isBillContentConsistent(requestData)) {
 			return toast('该单据内容不一致');
 		}
-
 		promiseAll(requestData, obj)
 	} else {
 		const { data: res } = await getDataBySerialNumber(data);
@@ -320,12 +318,14 @@ const initSerialNumberData = async (data: any) => {
 	}
 
 	// 更新单据头数据
-	metadataList.value.map((item: any) => {
-		const has = requestData.hasOwnProperty(item.model)
-		if (has) item.options.defaultValue = requestData[item.model]
-	})
+	setTimeout(() => {
+		metadataList.value.map((item: any) => {
+			const has = saveList.value[saveList.value.length - 1].hasOwnProperty(item.model)
+			if (has) item.options.defaultValue = requestData[item.model]
+		})
 
-	if (dataList.length) emptyFilter(formId, data);
+		if (dataList.length) emptyFilter(formId, data);
+	}, 0)
 };
 
 const saveDataAndPushToList = async (data: any, obj: any) => {
@@ -343,14 +343,34 @@ const isBillContentConsistent = (requestData: any) => {
 	return true;
 }
 
-const addBusiness = async (formId: string, list: any[], obj: any) => {
-	const saveData = {
-		formId,
-		list,
+const addBusiness = async (formId: string, list: any, obj: any) => {
+	let promises: any = []
+	const batchCreateBusiness = async (data: any) => {
+		const { data: res } = await createBusiness(data);
+		idsBill.value.push(res.data.id)
+		obj.dataList = res.data;
+		saveDataAndPushToList(res.data, { ...obj })
 	}
-	const { data: res } = await createBusiness(saveData);
-	idsBill.value.push(res.data)
-	promiseAll(res.data, obj)
+	documentBodyModel.value.forEach((model: string) => {
+		if (list.hasOwnProperty(model)) {
+			let models = list[model].length > 1 ? list[model] : [list[model]];
+			models.forEach((req: any) => {
+				const reqModelObj = flattenData([req]);
+				const dataList = dataListFilter(documentBodyList.value, reqModelObj);
+				obj.dataList = dataList;
+				let itemCopy = JSON.parse(JSON.stringify(list))
+				itemCopy[model] = req
+				let saveData = {
+					formId,
+					list: itemCopy,
+				}
+				console.log(saveData);
+
+				promises.push(batchCreateBusiness(saveData));
+			});
+		}
+	});
+	await Promise.all(promises);
 }
 
 const promiseAll = async (requestData: any, obj: any) => {