11

pages/purchase/index.vue

@@ -4,7 +4,7 @@
 			<l-header title="采购入库" sticky></l-header>
 			<view class="input-box">
 				<view class="input-item">
-					<up-input :placeholder="t('receive.djbh')" border="none" clearable inputAlign="left"
+					<up-input :placeholder="t('verify.grn')" border="none" clearable inputAlign="left"
 						v-model="state.queryString" @change="changeFun">
 						<template #prefix>
 							<up-icon name="search" color="#2979ff" size="24"></up-icon>
@@ -18,7 +18,7 @@
 					<view class="list-box-list" v-if="state.dataList.length > 0">
 						<view class="data-item" @click.stop="fnToUrl(item)"
 							v-for="(item, index) in state.dataList" :key="index">
-							<view class="tit">{{ t('receive.djbh') }}：{{item.FBillNo}}</view>
+							<view class="tit">{{ t('verify.grn') }}：{{item.FBillNo}}</view>
 							<view class="line-p"></view>
 							<view class="b-font">{{ t('receive.rq') }}：{{item.FDateFormat}}</view>
 						</view>

pages/purchase/material.vue

@@ -59,6 +59,16 @@
 								<view class="zongjian"></view>
 								<view>{{ item.CheckQty }}</view>
 							</view>
+							<view class="itemBox">
+								<view>让步</view>
+								<view class="zongjian"></view>
+								<view>{{ item.CsnReceiveQty }}</view>
+							</view>
+							<view class="itemBox">
+								<view>合格</view>
+								<view class="zongjian"></view>
+								<view>{{ item.ReceiveQty }}</view>
+							</view>
 						</view>
 						<view style="text-align: center;color: #F5F5F5;height: 20px;"></view>
 					</view>
@@ -141,6 +151,7 @@
 			return 'rgb(87 191 254)'
 		}
 	}
+	
 	//防抖输入
 	const debounceTimer = ref()
 	const changeFun = (e : any) => {
@@ -155,7 +166,7 @@
 		PURReceiveBillScanData({
 			FBarCode: val,
 			FBillNo: state.FBillNo,
-			IsInStock:'true'
+			IsInStock: 'true'
 		}).then((res : any) => {
 			if (res.data !== null) {
 				console.log(res);
@@ -178,6 +189,7 @@
 	//固定弹窗数据传输
 	const scanFrameCnfirmation = (row : any) => {
 		state.scanFrameDataFeedback = row
+		console.log(row);
 		postTemporaryScanDraftSaveFun(state.scanFrameDataFeedback)
 	}
 	//数据异常窗口弹出
@@ -187,8 +199,10 @@
 	//数据记录暂存
 	const postTemporaryScanDraftSaveFun = (item : any) => {
 		const obj = {};
-		if (item.warehouseData.FIsOpenLocation) {
-			const key = `FVHUBSTOCKFLEX__FF${item.warehouseData.FFlexId}`; //仓位Id
+		console.log(item);
+		debugger
+		if (item.warehouseData.FIsOpenLocation && Object.keys(item.locationData).length != 0) {
+			const key = `FVHUBSTOCKFLEX__FF${item.locationData.FID}`; //仓位Id
 			obj[key] = { FNumber: item.locationData.FlexEntryId.Number }; //仓位编码
 		}
 		const str = JSON.stringify(obj);
@@ -206,7 +220,9 @@
 			FVHUBMaterial: {
 				FNUMBER: item.articlesStr
 			},
-			...JSON.parse(str),
+			FVHUBStockFlex:{
+				...JSON.parse(str),
+			}
 		}).then((res : any) => {
 			state.queryString = ''
 			if (res.data.IsSuccess) {
@@ -325,6 +341,8 @@
 							CheckQty: p.Qty,  		//应扫数量
 							CheckJoinQty: p.ScanedQty,	//已扫数量
 							NoCheckQty: p.UnScanQty, //未扫数量
+							CsnReceiveQty: p.CsnReceiveQty, //未扫数量
+							ReceiveQty: p.ReceiveQty, //未扫数量
 						};
 						state.dataList.push(item);
 					});