剩余模块：生产退料

components/fui-input/fui-input.vue

@@ -267,7 +267,7 @@
 			},
 			borderBottom: {
 				type: Boolean,
-				default: true
+				default: false
 			},
 			bottomLeft: {
 				type: [Number, String],

components/scan-frame/scan-frame.vue

@@ -68,7 +68,7 @@
 </template>
 
 <script lang="ts" setup>
-	import { reactive, nextTick, onMounted, ref, computed, defineEmits, watch, defineExpose,defineProps } from 'vue';
+	import { reactive, nextTick, onMounted, ref, computed, defineEmits, watch, defineExpose, defineProps } from 'vue';
 	import { onLoad, onShow, onReachBottom, } from '@dcloudio/uni-app'
 	import warehouse from '../warehouse/warehouse.vue'
 	import location from '../warehouse/location.vue'
@@ -77,10 +77,10 @@
 	import { fStockFlexDetailList } from '../../common/request/api/api';
 	const getI18n = useI18n()
 	const { t, locale } = getI18n
-	const eimts = defineEmits(['scanFrameDataFeedback', 'confirmation', 'fast', 'err'])
+	const eimts = defineEmits(['scanFrameDataFeedback', 'confirmation', 'fast', 'err', 'boxShow'])
 	const props = defineProps({
-		types:{
-			type:Array,
+		types: {
+			type: Array,
 			default: () => {
 				return ['warehouseStr', 'locationStr', 'articlesStr', 'quantityStr', 'batchNumberStr']
 			}
@@ -113,8 +113,8 @@
 	/**
 	 * 数据逻辑
 	 */
-	const screeningTypes = (str:string) => {
-		if(props.types.indexOf(str) !== -1) return true
+	const screeningTypes = (str : string) => {
+		if (props.types.indexOf(str) !== -1) return true
 		else return false
 	}
 	watch(() => state.scanFrame, () => {
@@ -238,9 +238,10 @@
 	//手动确认返回数据
 	const confirmationFun = () => {
 		if (dataVerifyFun()) {
-			console.log({ ...state.scanFrame, warehouseData: state.warehouseData, locationData: state.locationData, id: state.receiveBillScanData.Id });
 			eimts('confirmation', { ...state.scanFrame, warehouseData: state.warehouseData, locationData: state.locationData || {}, id: state.receiveBillScanData.Id })
 			dataErase()
+			state.show = false
+			eimts('boxShow',state.show)
 		}
 	}
 
@@ -291,8 +292,14 @@
 	/**
 	 * 弹窗逻辑
 	 */
-	const close = () => { state.show = false }
-	const open = () => { } //待使用
+	const close = () => {
+		state.show = false
+		console.log('===================<><><><><><>=====================',state.show);
+		eimts('boxShow',state.show)
+	}
+	const open = () => { 
+		eimts('boxShow',state.show)
+	} //待使用
 	const stateShow = (val : boolean) => { state.show = val }
 
 	/**

components/tools/shortcut.vue

@@ -1,5 +1,5 @@
 <template>
-	<up-popup :show="state.show" @close="close">
+	<up-popup :show="state.show" @close="close" @open="open">
 		<view class="input-box">
 			<view class="input-item">
 				<up-input :placeholder="t('public.xzck')" border="none" clearable inputAlign="left"
@@ -82,7 +82,7 @@
 	import { fStockFlexDetailList } from '../../common/request/api/api';
 	const getI18n = useI18n()
 	const { t, locale } = getI18n
-	const eimts = defineEmits(['dataToscanFrame'])
+	const eimts = defineEmits(['dataToscanFrame','boxShow'])
 	const state = reactive({
 		show: false,
 		warehouse: false,
@@ -132,7 +132,13 @@
 			}
 		});
 	}
-	const close = () => { state.show = false }
+	const close = () => {
+		state.show = false
+		eimts('boxShow', state.show)
+	}
+	const open = () => {
+		eimts('boxShow', state.show)
+	}
 	const dataToscanFrameFun = () => {
 		if (state.shortcut.warehouseStr !== '' && state.NoLocationList && state.shortcut.locationStr === '') {
 			uni.$u.toast(t('public.qxzcw'))
@@ -144,6 +150,8 @@
 			warehouseData: state.warehouseData,
 			locationData: state.locationData,
 		})
+		state.show = false
+		eimts('boxShow', state.show)
 	}
 	const dataResetFun = () => {
 		state.shortcut = {
@@ -228,7 +236,6 @@
 		state.shortcut.locationStr = item.FFlexValueName
 		state.location = false
 	}
-
 	const toPages = (url : string, data : any = {}) => {
 		uni.$u.route({
 			url: url,