剩余模块：生产入库，销售出库

pages/productionStorage/material.vue

@@ -15,7 +15,7 @@
 				</view>
 			</view>
 			<view class="material-listBox">
-				<scroll-view id="scroll-box" class="scroll-box" scroll-y="true"
+				<scroll-view id="scroll-box1" class="scroll-box" scroll-y="true"
 					:style="{'height':state.scrollHeight+'px'}">
 					<view class="list-box-list" v-if="state.dataList.length > 0">
 						<view class="data-item" v-for="(item, index) in state.dataList"
@@ -39,11 +39,11 @@
 								<view class="zongjian"></view>
 								<view>{{ item.Lot }}</view>
 							</view>
-							<view class="itemBox">
+							<!-- <view class="itemBox">
 								<view>仓库</view>
 								<view class="zongjian"></view>
 								<view>{{ item.MultiLanguageText }}</view>
-							</view>
+							</view> -->
 							<view class="itemBox">
 								<view>{{t('receive.ys')}}</view>
 								<view class="zongjian"></view>
@@ -73,7 +73,7 @@
 		@scanFrameDataFeedback="(res:object)=>{state.scanFrameDataFeedback = res}"
 		@fast="(row:any)=>{state.scanFrameDataFeedback = row}" @err="scanFrameErrFun" />
 	<shortcut ref="shortcutRef" @dataToscanFrame="dataToscanFrameFun" />
-	<tools ref="toolsRef" @defaultPopup="defaultPopupFun" @scanRecord="scanRecordFun" />
+	<tools ref="toolsRef" :type="['scanRecord']" @defaultPopup="defaultPopupFun" @scanRecord="scanRecordFun" />
 </template>
 
 <script lang="ts" setup>
@@ -101,6 +101,7 @@
 			pageSize: 200,
 			totalCount: 0
 		},
+		tabsIndex:'1',
 		FBillNo: '',
 		materialId: '',
 		supplierName: '',
@@ -125,7 +126,6 @@
 			state.scrollHeight = data.height
 		}).exec();
 		// scanFrameRef.value.stateShow(true)
-
 	})
 	/**
 	 * 数据逻辑
@@ -155,22 +155,13 @@
 		PRD_MORPTScanData({
 			FBarCode: val,
 			FBillNo: state.FBillNo,
+			IsPack: 'false'
 		}).then((res : any) => {
-			if (res.data !== null) {
-				console.log(res);
-				scanFrameRef.value.getreceiveBillScanData({ ...res.data, queryString: state.queryString, scanFrameShowSate: state.shortcutDataFeedback.scanFrameShowSate,stashVerify:true  })
-				if (Object.keys(state.shortcutDataFeedback).length) {
-					if (state.shortcutDataFeedback.scanFrameShowSate) {
-						scanFrameRef.value.stateShow(true)
-					} else {
-						postTemporaryScanDraftSaveFun(state.scanFrameDataFeedback)
-					}
-				} else {
-					scanFrameRef.value.stateShow(true)
-				}
-			} else {
-				uni.$u.toast('并没有该条数据')
+			if (res.code === 200) {
+				fnDataList(state.materialId)
 				state.queryString = ''
+			} else {
+				uni.$u.toast(t('verify.noDataMessage'))
 			}
 		})
 	}
@@ -235,10 +226,9 @@
 	/**
 	 * 数据推送
 	 */
-
 	const dataPushNotification = () => {
 		uni.showModal({
-			title: '提示', content: '确定要推送此次数据吗', cancelText: '取消', confirmText: '确定',
+			title: t('public.ts'), content: t('public.tjMessage'), cancelText: t('public.cancel'), confirmText: t('public.confirm'),
 			success(res) {
 				if (res.confirm) {
 					let EntryIds : any = []
@@ -262,7 +252,8 @@
 										Qty: item.FVHUBScanQty,
 										Flot: item.FVHUBFlot,
 										StockId: item.FVHUBStock,
-										StockFlex: item.FVHUBStockFlex
+										StockFlex: item.FVHUBStockFlex,
+										Sno: item.FVHUBJSON
 									})
 								})
 								//推送数据
@@ -298,11 +289,10 @@
 		});
 
 	}
-
 	/**
 	 * 数据请求
 	 */
-	const fnDataList = (FBillNo : any, statesItem : boolean = false) => {
+	const fnDataList = (FBillNo : any) => {
 		let param = {
 			id: FBillNo,
 		};
@@ -316,12 +306,12 @@
 					dataListArray.forEach((p : any) => {
 						let item = {
 							Id: p.Id,
-							MaterialNo: p.MaterialNumber, //物料编码
-							MaterialName: formatLangTextValue(p.MaterialName),  //物料名称
-							Lot: p.FLot_Text,    //批号
-							CheckQty: p.Qty,  		//应扫数量
-							CheckJoinQty: p.ScanedQty,	//已扫数量
-							NoCheckQty: p.UnScanQty, //未扫数量
+							MaterialNo: p.MaterialNumber,//物料编码
+							MaterialName: formatLangTextValue(p.MaterialName),//物料名称
+							Lot: p.FLot_Text,//批号
+							CheckQty: p.Qty, //应扫数量
+							CheckJoinQty: p.ScanedQty,//已扫数量
+							NoCheckQty: p.UnScanQty,//未扫数量
 							MultiLanguageText: Object.keys(p.StockId).length ? formatLangTextValue(p.StockId.Name) : '暂无仓库'
 						};
 						state.dataList.push(item);