剩余模块：生产退料

pages/returnMaterials/index.vue

@@ -2,28 +2,19 @@
 	<view class="app status-bar-gap">
 		<view class="page">
 			<l-header :title="t('home.sctl')" sticky></l-header>
-			<view class="input-box">
-				<view class="input-item">
-					<up-input :placeholder="t('index.scdd')" border="none" clearable inputAlign="left"
-						v-model="state.queryString" @change="changeFun">
-						<template #prefix>
-							<up-icon name="search" color="#2979ff" size="24"></up-icon>
-						</template>
-					</up-input>
-				</view>
-			</view>
+			<architecture ref="architectureRef" :dataType="t('home.sctl')" :placeholder="t('index.scdd')"
+				@scanConfirm="scanConfirmFun" @inputConfirm="changeFun" />
 			<view class="receive-listBox" ref="listBoxRef">
-				<scroll-view id="scroll-box" class="scroll-box" scroll-y="true"
-					:style="{'height':state.scrollHeight+'px'}" @scrolltolower="fnScrollBottom()">
+				<scroll-view id="scroll-box" class="scroll-box" scroll-y="true" :style="{'height':state.scrollHeight+'px'}"
+					@scrolltolower="fnScrollBottom()">
 					<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="data-item" @click.stop="fnToUrl(item)" v-for="(item, index) in state.dataList" :key="index">
 							<view class="tit">{{ t('index.scdd') }}：{{item.FMOBillNO}}</view>
 							<view class="line-p"></view>
 							<view class="b-font">{{ t('receive.rq') }}：{{item.FDateFormat}}</view>
 						</view>
 					</view>
-					<view  v-if="state.dataList.length==0">
+					<view v-if="state.dataList.length==0">
 						<up-empty mode="list"></up-empty>
 					</view>
 				</scroll-view>
@@ -40,6 +31,7 @@
 	import { PRDPPBOMList } from '../../common/request/api/api';
 	const listBoxRef = ref(null)
 	const getI18n = useI18n()
+	const architectureRef = ref()
 	const { t, locale } = getI18n
 	const state = reactive({
 		queryString: '',
@@ -62,11 +54,18 @@
 		}).exec();
 		fnDataList()
 	})
+	const scanConfirmFun = (e : any) => {
+		state.queryString = e
+		state.page.pageIndex = 1
+		state.dataList = []
+		fnDataList()
+		architectureRef.value.closeFun()
+	}
 	const fnScrollBottom = () => {
-		console.log(state.page.pageIndex * state.page.pageSize,state.page.totalCount);
+		console.log(state.page.pageIndex * state.page.pageSize, state.page.totalCount);
 		if (state.page.pageIndex * state.page.pageSize <= state.page.totalCount) {
 			debugger
-			state.page.pageIndex ++;
+			state.page.pageIndex++;
 			uni.showLoading({ mask: true });
 			setTimeout(() => {
 				fnDataList();
@@ -74,7 +73,7 @@
 		}
 	}
 	const fnToUrl = (item : any) => {
-		toPages('/pages/returnMaterials/material',{id:item.FID,fBillNo:item.FMOBillNO})
+		toPages('/pages/returnMaterials/material', { id: item.FID, fBillNo: item.FMOBillNO })
 	}
 	const debounceTimer = ref()
 	const changeFun = (e : any) => {
@@ -84,14 +83,14 @@
 			state.page.pageIndex = 1
 			state.dataList = []
 			fnDataList()
-		}, 500)
+		})
 	}
 	const fnDataList = () => {
 		let param = {
 			queryString: state.queryString,
 			pageIndex: state.page.pageIndex,
 			pageSize: state.page.pageSize,
-			FType:'Return'
+			FType: 'Return'
 		};
 		if (state.page.pageIndex == 1) {
 			uni.showLoading({ mask: true });
@@ -175,25 +174,29 @@
 			.receive-listBox {
 				flex: 1;
 
-				.list-box-list{
+				.list-box-list {
 					width: 100%;
+
 					// margin: 20rpx auto;
-					.data-item{
+					.data-item {
 						border: 1px solid #efeaea;
 						border-radius: 20rpx;
-						box-shadow: 0rpx 15rpx 15rpx  #efeaea;
+						box-shadow: 0rpx 15rpx 15rpx #efeaea;
 						padding: 20rpx 20rpx 0;
 						margin-bottom: 20rpx;
 						background-color: #ffffff;
-						.tit{
+
+						.tit {
 							font-size: 30rpx;
 							font-weight: bold;
 							padding: 20rpx 0;
 						}
-						.line-p{
+
+						.line-p {
 							border: 1px solid #efeaea;
 						}
-						.b-font{
+
+						.b-font {
 							font-size: 25rpx;
 							padding: 20rpx 0;
 						}
@@ -202,5 +205,4 @@
 			}
 		}
 	}
-	
 </style>

pages/returnMaterials/material.vue

@@ -4,7 +4,7 @@
 			<l-header :title="state.FBillNo" sticky #right>
 				<view style="margin-right: 32rpx;" @click="dataPushNotification">{{ t('receive.tj') }}</view>
 			</l-header>
-			<view class="input-box">
+			<!-- <view class="input-box">
 				<view class="input-item">
 					<up-input :placeholder="t('receive.code')" border="none" clearable inputAlign="left"
 						inputmode="none" v-model="state.queryString" @change="changeFun" ref="inputRef">
@@ -13,10 +13,12 @@
 						</template>
 					</up-input>
 				</view>
-			</view>
+			</view> -->
+			<architecture ref="architectureRef" :dataType="t('home.llyz')" icon="scan" :placeholder="t('verify.tm')"
+				@scanConfirm="scanConfirmFun" @inputConfirm="changeFun"
+				:fence="[state.scanFrameRefShow,state.shortcutRefShow]" />
 			<view class="material-listBox">
-				<scroll-view id="scroll-box" class="scroll-box" scroll-y="true"
-					:style="{'height':state.scrollHeight+'px'}">
+				<scroll-view id="scroll-box" 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"
 							:style="[{'background-color':interpolation(item)},{'margin-bottom':index + 1 === state.dataList.length ? '80px' : '20px'}]"
@@ -66,8 +68,8 @@
 	</view>
 	<scanFrame ref="scanFrameRef" @confirmation="scanFrameCnfirmation"
 		@scanFrameDataFeedback="(res:object)=>{state.scanFrameDataFeedback = res}"
-		@fast="(row:any)=>{state.scanFrameDataFeedback = row}" @err="scanFrameErrFun" />
-	<shortcut ref="shortcutRef" @dataToscanFrame="dataToscanFrameFun" />
+		@fast="(row:any)=>{state.scanFrameDataFeedback = row}" @err="scanFrameErrFun" @boxShow="scanFrameBoxShowShow"/>
+	<shortcut ref="shortcutRef" @dataToscanFrame="dataToscanFrameFun" @boxShow="shortcutBoxShowShow"/>
 	<tools ref="toolsRef" @defaultPopup="defaultPopupFun" @scanRecord="scanRecordFun" />
 </template>
 
@@ -81,6 +83,7 @@
 	import tools from '../../components/tools/tools.vue'
 	import shortcut from '../../components/tools/shortcut.vue'
 	import { sqlite } from '../../stores/sqlite'
+	const architectureRef = ref()
 	const DB = sqlite()
 	const inputRef = ref()
 	const scanFrameRef = ref()
@@ -88,6 +91,9 @@
 	const getI18n = useI18n()
 	const { t, locale } = getI18n
 	const state = reactive({
+		scanFrameRefShow:false,
+		shortcutRefShow:false,
+		
 		queryString: '',
 		dataList: [],
 		scrollHeight: 0,
@@ -108,6 +114,7 @@
 		console.log(pageData);
 		state.materialId = pageData.id
 		state.FBillNo = pageData.fBillNo
+		state.BillNo = pageData.BillNo
 		fnDataList(state.materialId);
 	})
 	onShow(() => {
@@ -121,8 +128,16 @@
 			state.scrollHeight = data.height
 		}).exec();
 		// scanFrameRef.value.stateShow(true)
-
 	})
+	const scanConfirmFun = (e : any) => {
+		getReceiveBillScanData(e)
+	}
+	const shortcutBoxShowShow = (val:boolean) => {
+		state.shortcutRefShow = val
+	}
+	const scanFrameBoxShowShow = (val:boolean) => {
+		state.scanFrameRefShow = val
+	}
 	/**
 	 * 数据逻辑
 	 */
@@ -156,7 +171,7 @@
 			if (res.data !== null) {
 				console.log(res);
 				const scanData = res.data
-				if( scanData.UnScanQty > scanData.BarCodeQty ) scanData.UnScanQty = scanData.BarCodeQty
+				if (scanData.UnScanQty > scanData.BarCodeQty) scanData.UnScanQty = scanData.BarCodeQty
 				scanFrameRef.value.getreceiveBillScanData({ ...scanData, queryString: state.queryString, scanFrameShowSate: state.shortcutDataFeedback.scanFrameShowSate })
 				if (Object.keys(state.shortcutDataFeedback).length) {
 					if (state.shortcutDataFeedback.scanFrameShowSate) {
@@ -171,6 +186,7 @@
 				uni.$u.toast(t('index.bmygtsj'))
 				state.queryString = ''
 			}
+			architectureRef.value.closeFun()
 		})
 	}
 	//固定弹窗数据传输
@@ -246,7 +262,7 @@
 					let param = {
 						FormId: 'PRD_PPBOM',
 						UserId: uni.getStorageSync('userInfo').Context.UserId,
-						FbillNo: state.FBillNo
+						FbillNo: state.BillNo
 					};
 					uni.showLoading({ mask: true });
 					//获取扫描数据里的所有数据
@@ -304,7 +320,7 @@
 	const fnDataList = (FBillNo : any, statesItem : boolean = false) => {
 		let param = {
 			id: FBillNo,
-			IsFeed:'other'
+			IsFeed: 'other'
 		};
 		uni.showLoading({ mask: true });
 		PRDPPBOMView(param).then(res => {