剩余模块：生产退料

pages/ruleValidation/verification.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'}]"
@@ -62,7 +64,7 @@
 						</view>
 						<view style="text-align: center;color: #F5F5F5;height: 20px;"></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>
@@ -71,8 +73,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>
 
@@ -86,6 +88,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()
@@ -93,6 +96,9 @@
 	const getI18n = useI18n()
 	const { t, locale } = getI18n
 	const state = reactive({
+		scanFrameRefShow: false,
+		shortcutRefShow: false,
+
 		queryString: '',
 		dataList: [],
 		scrollHeight: 0,
@@ -115,7 +121,7 @@
 		fnDataList(state.materialId);
 	})
 	onShow(() => {
-		if(state.materialId){
+		if (state.materialId) {
 			fnDataList(state.materialId);
 		}
 	})
@@ -127,6 +133,15 @@
 		// scanFrameRef.value.stateShow(true)
 
 	})
+	const scanConfirmFun = (e : any) => {
+		getReceiveBillScanData(e)
+	}
+	const shortcutBoxShowShow = (val : boolean) => {
+		state.shortcutRefShow = val
+	}
+	const scanFrameBoxShowShow = (val : boolean) => {
+		state.scanFrameRefShow = val
+	}
 	/**
 	 * 数据逻辑
 	 */
@@ -141,7 +156,7 @@
 			return 'rgb(87 191 254)'
 		}
 	}
-	
+
 	//防抖输入
 	const debounceTimer = ref()
 	const changeFun = (e : any) => {
@@ -172,13 +187,14 @@
 				uni.$u.toast(t('verify.noDataMessage'))
 				state.queryString = ''
 			}
+			architectureRef.value.closeFun()
 		})
 	}
 	//固定弹窗数据传输
 	const scanFrameCnfirmation = (row : any) => {
 		state.scanFrameDataFeedback = row
 		console.log(row);
-		
+
 		postTemporaryScanDraftSaveFun(state.scanFrameDataFeedback)
 	}
 	//数据异常窗口弹出
@@ -196,10 +212,10 @@
 			FVHUBScanQty: item.quantityStr,						//扫描数量
 			FVHUBEntryId: item.id,  									//行ID
 			FVHUBFlot: item.batchNumberStr,						//批号
-			FVHUBStock: {	
+			FVHUBStock: {
 				FNUMBER: ""															//仓库编号
-			},	
-			FVHUBMaterial: {	
+			},
+			FVHUBMaterial: {
 				FNUMBER: item.articlesStr 							//物料编码
 			},
 
@@ -264,18 +280,18 @@
 								//推送数据
 								PRD_PickMtrlCheck({
 									EntryIds: EntryIds.toString(),
-									Ids:state.materialId
+									Ids: state.materialId
 								}).then((res : any) => {
 									console.log();
-									if(res.code === 200){
-										fStockFlexDetailDelete({Ids:ids.toString()}).then((res:any) => {
-											if(res.code === 200) {
+									if (res.code === 200) {
+										fStockFlexDetailDelete({ Ids: ids.toString() }).then((res : any) => {
+											if (res.code === 200) {
 												fnDataList(state.materialId);
 												uni.$u.toast(t('public.cg'))
 											}
 										})
 									}
-									
+
 								})
 							} else {
 								uni.$u.toast(t('verify.noDataMessage'))