diff --git a/src/pages/customerReturn/record/recordList.vue b/src/pages/customerReturn/record/recordList.vue
index 014bad61..8eaaa212 100644
--- a/src/pages/customerReturn/record/recordList.vue
+++ b/src/pages/customerReturn/record/recordList.vue
@@ -5,13 +5,9 @@
 		</job-filter>
 		<com-empty-view v-if="recordList.length==0"></com-empty-view>
 		<view v-if="recordList.length>0">
-			<uni-swipe-action ref="swipeAction">
-				<view v-for="(item, index) in recordList" :key="index">
-					<uni-swipe-action-item>
-						<comReturnRecordCard :dataContent="item" @click='openJobDetail(item)'></comReturnRecordCard>
-					</uni-swipe-action-item>
-				</view>
-			</uni-swipe-action>
+			<u-swipe-action ref="swipeAction" v-for="(item, index) in recordList" :key="index">
+        <comReturnRecordCard :dataContent="item" @click='openJobDetail(item)'></comReturnRecordCard>
+      </u-swipe-action>
 
 			<job-list-popup ref="jobListPopup" @selectedItem="selectedItem"></job-list-popup>
 			<job-info-popup ref='jobInfoPopup'></job-info-popup>
@@ -25,7 +21,7 @@
 	</view>
 </template>
 
-<script>
+<script setup lang="ts">
 	import {getCustomerReturnRecordList, cancleTakeProductionReceiptJob,} from '@/api/request2.js';
 
 	import {goHome, updateTitle} from '@/common/basic.js';
@@ -47,294 +43,262 @@
 	import winScanPackJob from "@/mycomponents/scan/winScanPackJob.vue"
 	import jobList from '@/mycomponents/jobList/jobList.vue'
 
-	export default {
-		name: 'productionReceipt',
-		components: {
-			comEmptyView,
-			jobFilter,
-			comReturnRecordCard,
-			jobListPopup,
-			jobInfoPopup,
-			winScanPackJob,
-			winScanButton,
-			jobList
-		},
-		data() {
-			return {
-				recordList: [],
-				pageNo: 1,
-				pageSize: 10,
-				totalCount: 0,
-				loadingType: "nomore",
-				checkedToday: false,
-				checkedWaitTask: false,
-				todayTime: "",
-				detailOptions: [],
-				detailGiveupOptions: [],
-				title: '',
-				scanMessage: "",
-				filterItemCode: "",
-				queryParams:{
-					creationTime:"",
-					receiveStatus:"",
-					itemCode:""
-				}
-			};
-		},
-		onLoad(option) {
-			this.title = option.title
-		},
-
-		onShow() {
-			this.getList('refresh')
-		},
-
-		onReady() {
-			this.detailOptions = getDetailOption();
-			this.detailGiveupOptions = getDetailGiveupOption();
-		},
-
-		onReachBottom() {
-			//避免多次触发
-			if (this.loadingType == 'loading' || this.loadingType == 'nomore') {
-				return;
-			}
-			this.getList('more')
-		},
-
-		onPullDownRefresh() {
-			this.getList('refresh')
-		},
-
-		//后退按钮
-		onBackPress(options) {
-			if (options.from === 'navigateBack') {
-				uni.navigateBack({
-					delta: 1
-				})
-				return false;
-			}
-		},
-
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			} else if (e.index == 1) {
-				this.$refs.filter.openFilter();
-			}
-		},
-
-		methods: {
-			
-			setQueryParam() {
-				var filterParams = []
-
-				//只看当天
-				if (this.queryParams.creationTime) {
-					filterParams.push({
-						column: "create_time",
-						action: "betweeen",
-						value: this.queryParams.creationTime
-					})
-				}
-				//只看待处理
-				if (this.queryParams.receiveStatus) {
-					filterParams.push({
-						column: "receiveStatus",
-						action: "in",
-						value: this.queryParams.receiveStatus
-					})
-				} else {
-					filterParams.push({
-						column: "receiveStatus",
-						action: "in",
-						value: "0"
-					})
-				}
-
-				//物料代码
-				if (this.queryParams.itemCode) {
-					filterParams.push({
-						column: "itemCode",
-						action: "like",
-						value: this.queryParams.itemCode
-					})
-					this.filterItemCode = this.queryParams.itemCode
-				}else {
-					if(this.filterItemCode){
-						filterParams.push({
-							column: "itemCode",
-							action: "like",
-							value: this.filterItemCode
-						})
-					}
-					
-				}
-
-				return filterParams;
-
-			},
-			getList(type) {
-				let that = this;
-				uni.showLoading({
-					title: "加载中­....",
-					mask: true
-				});
-
-				this.loadingType = "loading";
-				if (type === "refresh") {
-					this.pageNo = 1;
-					this.recordList = [];
-				}
-				var queryFiltersParams = this.setQueryParam()
-				var params = {
-					filters: queryFiltersParams,
-					pageNo: this.pageNo,
-					pageSize: this.pageSize,
-				}
-				
-				console.log("查询条件",JSON.stringify(params))
-
-				getCustomerReturnRecordList(params).then(res => {
-					uni.hideLoading();
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-
-					var list = res.data.list;
-					this.totalCount = res.data.total
-					updateTitle(this.title + "(" + this.totalCount + ")");
-					this.loadingType = "loadmore";
-					if (list == null || list.length == 0) {
-						this.loadingType = "nomore";
-						return;
-					}
-					list.forEach(item=>{
-						item.packingNumber =item.toPackingNumber
-					})
-					this.recordList = type === "refresh" ? list : this.recordList.concat(list);
-					this.pageNo++;
-
-				}).catch(error => {
-					if (type === "refresh") {
-						uni.stopPullDownRefresh();
-					}
-					this.loadingType = "";
-					updateTitle(this.title);
-					uni.hideLoading();
-					that.showMessage(error)
-				})
-			},
-
-			openJobDetail(item, scanMessage = '') {
-				uni.navigateTo({
-					url: './recordListDetail?id=' + item.masterId + '&receiveStatus=' + item.receiveStatus +
-						'&scanMessage=' + scanMessage + '&title=' + this.title
-				});
-				this.scanMessage = ""
-			},
-
-			showItemList(itemList) {
-				this.$refs.jobListPopup.openPopup(itemList);
-			},
-
-			selectedItem(item) {
-				this.openJobDetail(item);
-			},
-
-			openjobInfoPopup(item) {
-				this.$refs.jobInfoPopup.openPopup(item)
-			},
-
-			showMessage(message) {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.packLoseFocus()
-				}
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {
-						if (this.$refs.scanPopup) {
-							this.$refs.scanPopup.packGetFocus()
-						}
-					}
-				});
-			},
-			openScanPopup() {
-				this.$refs.scanPopup.openScanPopup();
-			},
-			selectItem(item) {
-				this.$refs.scanPopup.closeScanPopup();
-				this.openJobDetail(item, this.scanMessage);
-			},
-			getScanResult(result) {
-				try {
-					this.scanMessage = ""
-					var filters = [{
-							column: "toPackingNumber",
-							action: "in",
-							value: result.package.number + "," + result.package.parentNumber
-						},
-						{
-							column: "receiveStatus",
-							action: "in",
-							value: '0'
-						},
-						{
-							column: "toBatch",
-							action: "==",
-							value: result.label.batch
-						},
-						{
-							column: "itemCode",
-							action: "==",
-							value: result.label.itemCode
-						},
-					]
-
-					getCustomerReturnRecordList({
-						filters: filters,
-						pageNo: 1,
-						pageSize: 100,
-					}).then(res => {
-						this.scanMessage = result.scanMessage
-						let resultList = res.data.list;
-						if (resultList.length > 0) {
-							resultList.forEach(item => {
-								item.title = item.number;
-								item.selected = false
-							})
-							let list = []
-							resultList.forEach(item => {
-								if (!list.find(subItem => subItem.title == item.title)) {
-									list.push(item)
-								}
-							})
-							if (list.length > 1) {
-								this.$refs.recordList.openList(list)
-							} else {
-								this.selectItem(list[0])
-							}
-						} else {
-							this.showMessage("未查找到任务\n" + "扫描[" + result.scanMessage + "]")
-						}
-					}).catch(error => {
-						this.showMessage(error + "\n扫描[" + result.scanMessage + "]")
-					})
-
-				} catch (e) {
-					this.showMessage(e.message)
-				}
-			},
-
-			getListByFilter(params) {
-				this.queryParams.creationTime=params.creationTime
-				this.queryParams.receiveStatus=params.receiveStatus
-				this.queryParams.itemCode=params.itemCode
-				this.getList('refresh')
-			},
-
-		}
-	}
+import { ref,} from 'vue';
+import { onLoad, onShow, onReady, onReachBottom, onPullDownRefresh, onBackPress, onNavigationBarButtonTap } from '@dcloudio/uni-app';
+
+const recordList = ref([]);
+const pageNo = ref(1);
+const pageSize = ref(10);
+const totalCount = ref(0);
+const loadingType = ref("nomore");
+const checkedToday = ref(false);
+const checkedWaitTask = ref(false);
+const todayTime = ref("");
+const detailOptions = ref([]);
+const detailGiveupOptions = ref([]);
+const title = ref('');
+const scanMessage = ref("");
+const filterItemCode = ref("");
+const queryParams = ref({
+  creationTime: "",
+  receiveStatus: "",
+  itemCode: ""
+});
+
+const filter = ref(null);
+const jobListPopup = ref(null);
+const jobInfoPopup = ref(null);
+const comMessage = ref(null);
+const scanPopup = ref(null);
+const recordListRef = ref(null);
+
+onLoad((option) => {
+  title.value = option.title;
+});
+
+onShow(() => {
+  getList('refresh');
+});
+
+onReady(() => {
+  detailOptions.value = getDetailOption();
+  detailGiveupOptions.value = getDetailGiveupOption();
+});
+
+onReachBottom(() => {
+  // 避免多次触发
+  if (loadingType.value === 'loading' || loadingType.value === 'nomore') return;
+  getList('more');
+});
+
+onPullDownRefresh(() => {
+  getList('refresh');
+});
+
+onBackPress((options) => {
+  if (options.from === 'navigateBack') {
+    uni.navigateBack({ delta: 1 });
+    return false;
+  }
+});
+
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome();
+  } else if (e.index === 1) {
+    filter.value.openFilter();
+  }
+});
+
+const setQueryParam = () => {
+  const filterParams = [];
+
+  // 只看当天
+  if (queryParams.value.creationTime) {
+    filterParams.push({
+      column: "create_time",
+      action: "between",
+      value: queryParams.value.creationTime
+    });
+  }
+
+  // 只看待处理
+  if (queryParams.value.receiveStatus) {
+    filterParams.push({
+      column: "receiveStatus",
+      action: "in",
+      value: queryParams.value.receiveStatus
+    });
+  } else {
+    filterParams.push({
+      column: "receiveStatus",
+      action: "in",
+      value: "0"
+    });
+  }
+
+  // 物料代码
+  if (queryParams.value.itemCode) {
+    filterParams.push({
+      column: "itemCode",
+      action: "like",
+      value: queryParams.value.itemCode
+    });
+    filterItemCode.value = queryParams.value.itemCode;
+  } else if (filterItemCode.value) {
+    filterParams.push({
+      column: "itemCode",
+      action: "like",
+      value: filterItemCode.value
+    });
+  }
+
+  return filterParams;
+};
+
+const getList = (type) => {
+  uni.showLoading({ title: "加载中­....", mask: true });
+
+  loadingType.value = "loading";
+  if (type === "refresh") {
+    pageNo.value = 1;
+    recordList.value = [];
+  }
+
+  const queryFiltersParams = setQueryParam();
+  const params = {
+    filters: queryFiltersParams,
+    pageNo: pageNo.value,
+    pageSize: pageSize.value,
+  };
+
+  console.log("查询条件", JSON.stringify(params));
+
+  getCustomerReturnRecordList(params).then((res) => {
+    uni.hideLoading();
+    if (type === "refresh") {
+      uni.stopPullDownRefresh();
+    }
+
+    const list = res.data.list;
+    totalCount.value = res.data.total;
+    updateTitle(`${title.value} (${totalCount.value})`);
+    loadingType.value = "loadmore";
+
+    if (!list || list.length === 0) {
+      loadingType.value = "nomore";
+      return;
+    }
+
+    list.forEach((item) => {
+      item.packingNumber = item.toPackingNumber;
+    });
+
+    recordList.value = type === "refresh" ? list : [...recordList.value, ...list];
+    pageNo.value++;
+  }).catch((error) => {
+    if (type === "refresh") {
+      uni.stopPullDownRefresh();
+    }
+    loadingType.value = "";
+    updateTitle(title.value);
+    uni.hideLoading();
+    showMessage(error);
+  });
+};
+
+const openJobDetail = (item, scanMessage = '') => {
+  uni.navigateTo({
+    url: `./recordListDetail?id=${item.masterId}&receiveStatus=${item.receiveStatus}&scanMessage=${scanMessage}&title=${title.value}`
+  });
+  scanMessage.value = "";
+};
+
+const showItemList = (itemList) => {
+  jobListPopup.value.openPopup(itemList);
+};
+
+const selectedItem = (item) => {
+  openJobDetail(item);
+};
+
+const openjobInfoPopup = (item) => {
+  jobInfoPopup.value.openPopup(item);
+};
+
+const showMessage = (message) => {
+  if (scanPopup.value) {
+    scanPopup.value.packLoseFocus();
+  }
+  comMessage.value.showErrorMessage(message, (res) => {
+    if (res && scanPopup.value) {
+      scanPopup.value.packGetFocus();
+    }
+  });
+};
+
+const openScanPopup = () => {
+  scanPopup.value.openScanPopup();
+};
+
+const selectItem = (item) => {
+  scanPopup.value.closeScanPopup();
+  openJobDetail(item, scanMessage.value);
+};
+
+const getScanResult = (result) => {
+  try {
+    scanMessage.value = "";
+    const filters = [
+      { column: "toPackingNumber", action: "in", value: `${result.package.number},${result.package.parentNumber}` },
+      { column: "receiveStatus", action: "in", value: '0' },
+      { column: "toBatch", action: "==", value: result.label.batch },
+      { column: "itemCode", action: "==", value: result.label.itemCode },
+    ];
+
+    getCustomerReturnRecordList({
+      filters: filters,
+      pageNo: 1,
+      pageSize: 100,
+    }).then((res) => {
+      scanMessage.value = result.scanMessage;
+      const resultList = res.data.list;
+      if (resultList.length > 0) {
+        resultList.forEach((item) => {
+          item.title = item.number;
+          item.selected = false;
+        });
+
+        const list = [];
+        resultList.forEach((item) => {
+          if (!list.find((subItem) => subItem.title === item.title)) {
+            list.push(item);
+          }
+        });
+
+        if (list.length > 1) {
+          recordListRef.value.openList(list);
+        } else {
+          selectItem(list[0]);
+        }
+      } else {
+        showMessage(`未查找到任务\n扫描[${result.scanMessage}]`);
+      }
+    }).catch((error) => {
+      showMessage(`${error}\n扫描[${result.scanMessage}]`);
+    });
+  } catch (e) {
+    showMessage(e.message);
+  }
+};
+
+const getListByFilter = (params) => {
+  queryParams.value.creationTime = params.creationTime;
+  queryParams.value.receiveStatus = params.receiveStatus;
+  queryParams.value.itemCode = params.itemCode;
+  getList('refresh');
+};
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/customerReturn/record/recordListDetail.vue b/src/pages/customerReturn/record/recordListDetail.vue
index 58584d3c..7dc64565 100644
--- a/src/pages/customerReturn/record/recordListDetail.vue
+++ b/src/pages/customerReturn/record/recordListDetail.vue
@@ -1,424 +1,401 @@
 <template>
-	<view class="page-wraper">
-		<view class="page-main">
-			<view class="page-header">
-				<view class="header-view">
-					<view class="header_job_top">
-						<receive-top :dataContent="recordContent"></receive-top>
-					</view>
-				</view>
-			</view>
-			<view v-if="detailSource.length>0" class="uni-flex uni-row "
-				style=";margin-top: 15rpx; margin-bottom: 15rpx; margin-left: 20rpx; text-align: right;">
-				<view class="font_default" style="display: block; font-weight: bold;">
-					整单接收
-				</view>
-				<view class="uni-flex" style="margin-left: 20rpx; align-items: center; text-align: center;">
-					<u-switch v-model="isAllReceived" active-color="#5FCB94" inactive-color="#eee" size="35"
-						@change="switchChange"></u-switch>
-				</view>
-			</view>
-			<scroll-view scroll-y="true">
-				<view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-					<view class="">
-						<com-detail-card :dataContent="item" :index="index" :settingParam="recordContent"
-							@remove="updateData" :isShowToLocation="true" @updateData="updateData"
-							@openDetail="openDetail">
-						</com-detail-card>
-						<view class='split_line'></view>
-					</view>
-
-				</view>
-			</scroll-view>
-		</view>
-
-		<view class="page-footer">
-			<view class="uni-flex u-col-center space-between padding_10"
-				style="background-color:ghostwhite; width: 100%; ">
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" style="width: 280rpx;" hover-class="btn_commit_after"
-						@click="reject">拒绝</button>
-				</view>
-				<view class=" uni-flex uni-row">
-					<button class="btn_single_commit" style="width: 280rpx;" hover-class="btn_commit_after"
-						@click="receive" :disabled="receiveDisable">接收</button>
-				</view>
-			</view>
-		</view>
-
-		<win-scan-button @goScan='openScanPopup'></win-scan-button>
-		<win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ">></win-scan-pack>
-
-		<detail-info-popup ref="detailInfoPopup"></detail-info-popup>
-
-		<comMessage ref="comMessage"></comMessage>
-	</view>
+  <view class="page-wraper">
+    <view class="page-main">
+      <view class="page-header">
+        <view class="header-view">
+          <view class="header_job_top">
+            <receive-top :dataContent="recordContent"></receive-top>
+          </view>
+        </view>
+      </view>
+      <view v-if="detailSource.length>0" class="uni-flex uni-row "
+            style=";margin-top: 15rpx; margin-bottom: 15rpx; margin-left: 20rpx; text-align: right;">
+        <view class="font_default" style="display: block; font-weight: bold;">
+          整单接收
+        </view>
+        <view class="uni-flex" style="margin-left: 20rpx; align-items: center; text-align: center;">
+          <u-switch v-model="isAllReceived" active-color="#5FCB94" inactive-color="#eee" size="35"
+                    @change="switchChange"></u-switch>
+        </view>
+      </view>
+      <scroll-view scroll-y="true">
+        <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
+          <view class="">
+            <com-detail-card :dataContent="item" :index="index" :settingParam="recordContent"
+                             @remove="updateData" :isShowToLocation="true" @updateData="updateData"
+                             @openDetail="openDetail">
+            </com-detail-card>
+            <view class='split_line'></view>
+          </view>
+
+        </view>
+      </scroll-view>
+    </view>
+
+    <view class="page-footer">
+      <view class="uni-flex u-col-center space-between padding_10"
+            style="background-color:ghostwhite; width: 100%; ">
+        <view class=" uni-flex uni-row">
+          <button class="btn_single_commit" style="width: 280rpx;" hover-class="btn_commit_after"
+                  @click="reject">拒绝
+          </button>
+        </view>
+        <view class=" uni-flex uni-row">
+          <button class="btn_single_commit" style="width: 280rpx;" hover-class="btn_commit_after"
+                  @click="receive" :disabled="receiveDisable">接收
+          </button>
+        </view>
+      </view>
+    </view>
+
+    <win-scan-button @goScan='openScanPopup'></win-scan-button>
+    <win-scan-pack ref="scanPopup" @getResult='getScanResult' headerType="HPQ,HMQ">></win-scan-pack>
+
+    <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
+
+    <comMessage ref="comMessage"></comMessage>
+  </view>
 </template>
 
-<script>
-
-	import {
-		getCustomerReturnRecordDetail,
-		customerReturnRecordRefuse,
-		customerReturnRecordReceive,
-	} from '@/api/request2.js';
-	import {
-		goHome,
-		navigateBack,
-		getCurrDateTime,
-		getInventoryStatusName,
-		getSwitchInfoByCode
-	} from '@/common/basic.js';
-	import {
-		getDataSource,
-		calcHandleQty,
-		getScanCount
-	} from '@/common/detail.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
-	import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
-	import receiveTop from '@/mycomponents/receive/receiveTop.vue'
-	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-
-	export default {
-		components: {
-			winScanButton,
-			winScanPack,
-			comDetailCard,
-			detailInfoPopup,
-			receiveTop
-		},
-		data() {
-			return {
-				id: '',
-				scanCount: 0,
-				recordContent: {}, //任务内容
-				subList: [], //接口返回的任务subList
-				detailSource: [], //绑定在页面上的数据源
-				fromLocationCode: "",
-				toLocationCode: "",
-				isAllReceived: false,
-				receiveDisable: true //默认不可点击
-			};
-		},
-		onLoad(option) {
-			uni.setNavigationBarTitle({
-				title: option.title + '详情'
-			})
-			this.id = option.id;
-			if (this.id != undefined) {
-				//新建的任务自动接收
-				if (option.receiveStatus == "0") {
-					this.getDetail();
-				}
-			}
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {
-			//已经接收但是没提交任务
-			if (e.from == 'backbutton') {
-				uni.navigateBack();
-				return true;
-			}
-		},
-
-
-		mounted() {
-
-		},
-		methods: {
-			//接收
-			getDetail() {
-				var that = this;
-				uni.showLoading({
-					title: "加载中....",
-					mask: true
-				});
-				getCustomerReturnRecordDetail(that.id).then(res => {
-					uni.hideLoading();
-					this.isAllReceived= false
-					this.receiveDisable = true 
-					if (res.data == null) {
-						that.showMessage('未获取到详情');
-					} else {
-						if (res.data.list.length > 0) {
-							that.recordContent = res.data.list[0];
-							that.subList = res.data.list;
-							that.subList.forEach(item => {
-								item.batch = item.toBatch;
-								item.packingNumber = item.toPackingNumber;
-							})
-							that.detailSource = getDataSource(that.subList)
-						} else {
-							that.showMessage('列表数据为0');
-						}
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			calcHandleQty() {
-				calcHandleQty(this.detailSource);
-				this.updateBtn()
-				this.continueScan()
-				this.$forceUpdate();
-			},
-
-			updateBtn() {
-				this.scanCount = getScanCount(this.subList);
-				//扫描数量和任务数量相等，直接提交
-				if (this.scanCount == this.subList.length) {
-					this.receiveDisable = false;
-				}else {
-					this.receiveDisable = true;
-				}
-			},
-
-			//继续扫描
-			continueScan() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == this.subList.length) {
-					this.closeScanPopup();
-				} else {
-					this.scanPopupGetFocus();
-				}
-			},
-
-			updateData() {
-				this.calcHandleQty();
-				this.updateBtn()
-			},
-
-			openDetail(item) {
-				this.$refs.detailInfoPopup.openPopup(item)
-			},
-
-			openScanPopup() {
-				this.$refs.scanPopup.openScanPopup();
-			},
-
-			closeScanPopup() {
-				this.$refs.scanPopup.closeScanPopup();
-			},
-
-			getScanResult(result) {
-				try {
-					var itemCode = result.label.itemCode;
-					var packingNumber = result.package.number;
-					var batch = result.label.batch;
-					var detail = this.detailSource.find(r => r.itemCode == itemCode);
-
-					if (detail == undefined) {
-						this.showErrorMessage("物料号【" + itemCode + "】不在列表中")
-					} else {
-						var itemDetail = detail.subList.find(r => {
-							return r.packingNumber == packingNumber &&
-								r.batch == batch
-						})
-						if (itemDetail == undefined) {
-							this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]不在列表中")
-						} else {
-							if (itemDetail.scaned) {
-								this.showErrorMessage("箱码[" + packingNumber + "]" + "批次[" + batch + "]已经扫描")
-							} else {
-								itemDetail.scaned = true;
-								itemDetail.handleQty = Number(itemDetail.qty)
-								this.calcHandleQty();
-							}
-						}
-					}
-				} catch (e) {
-					this.showMessage(e.message)
-				}
-			},
-			reject() {
-				this.showQuestionMessage("是否拒绝接收?", res => {
-					if (res) {
-						uni.showLoading({
-							title: "提交中....",
-							mask: true
-						});
-						customerReturnRecordRefuse(this.id).then(res=>{
-							uni.hideLoading()
-							if(res.data){
-								this.showCommitSuccessMessage("拒绝成功")
-							}else {
-								this.showErrorMessage("拒绝失败[" + res.msg + "]")
-							}
-						}).catch(error=>{
-							uni.hideLoading()
-							this.showErrorMessage(error)
-						})
-					}
-				})
-			},
-
-			receive() {
-				this.scanCount = getScanCount(this.subList);
-				if (this.scanCount == 0) {
-					this.showErrorMessage("扫描数为0,请先扫描")
-					return;
-				}
-				if (this.scanCount < this.subList.length) {
-					this.showErrorMessage("还有未扫描的数据,请先扫描")
-					return;
-				}
-
-				//扫描数量和任务数量相等，直接提交
-				if (this.scanCount == this.subList.length) {
-					this.receiveSubmit();
-				}
-			},
-
-			showMessageHint(hint, callback) {
-				this.$refs.comMessage.showErrorMessage(hint, res => {
-					if (res) {
-						callback()
-					}
-				});
-			},
-
-			receiveSubmit() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-				customerReturnRecordReceive(this.id).then(res => {
-					uni.hideLoading()
-					if (res.data) {
-						this.showCommitSuccessMessage("接收成功")
-					} else {
-						this.showErrorMessage("接收失败[" + res.msg + "]")
-					}
-				}).catch(error => {
-					uni.hideLoading()
-					this.showErrorMessage(error)
-				})
-			},
-
-			showMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showErrorMessage(message) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showErrorMessage(message, res => {
-						if (res) {
-							this.afterCloseMessage()
-						}
-					});
-				})
-			},
-
-			showQuestionMessage(message, callback) {
-				setTimeout(r => {
-					this.scanPopupLoseFocus();
-					this.$refs.comMessage.showQuestionMessage(message, res => {
-						if (res) {
-							callback(res);
-						}
-					});
-				})
-			},
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-
-			scanPopupLoseFocus() {
-				if (this.$refs.scanPopup) {
-					this.$refs.scanPopup.losefocus();
-				}
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					navigateBack(1)
-				})
-			},
-
-			switchChange(isOn) {
-				this.isAllReceived = isOn
-				if(this.isAllReceived){
-					this.detailSource.forEach(item=>{
-						item.subList.forEach(info=>{
-							info.scaned=true;
-							info.handleQty=Number(info.qty)
-						})
-					})
-					this.calcHandleQty();
-				}else {
-					this.$refs.comMessage.showQuestionMessage("是否要关闭整单收货?", res => {
-						if (res) {
-							this.getDetail()
-						} else {
-							this.isAllReceived=true
-						}
-					});
-				}
-				
-			}
-		}
-	}
+<script setup lang="ts">
+
+import {
+  getCustomerReturnRecordDetail,
+  customerReturnRecordRefuse,
+  customerReturnRecordReceive,
+} from '@/api/request2.js';
+import {
+  goHome,
+  navigateBack,
+  getCurrDateTime,
+  getInventoryStatusName,
+  getSwitchInfoByCode
+} from '@/common/basic.js';
+import {
+  getDataSource,
+  calcHandleQty,
+  getScanCount
+} from '@/common/detail.js';
+
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import comDetailCard from "@/mycomponents/detail/comDetailCard.vue"
+import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
+import receiveTop from '@/mycomponents/receive/receiveTop.vue'
+import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+
+import {ref} from 'vue';
+import {
+  onLoad,
+  onBackPress,
+  onNavigationBarButtonTap
+} from '@dcloudio/uni-app';
+
+const id = ref(null);
+const isAllReceived = ref(false);
+const receiveDisable = ref(true);
+const recordContent = ref(null);
+const subList = ref([]);
+const detailSource = ref([]);
+const scanCount = ref(0);
+
+const detailInfoPopup = ref(null);
+const scanPopup = ref(null);
+const comMessage = ref(null);
+
+onLoad((option) => {
+  uni.setNavigationBarTitle({
+    title: option.title + '详情'
+  });
+  id.value = option.id;
+  if (id.value !== undefined) {
+    // 新建的任务自动接收
+    if (option.receiveStatus === "0") {
+      getDetail();
+    }
+  }
+});
+
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome();
+  }
+});
+
+onBackPress((e) => {
+  // 已经接收但是没提交任务
+  if (e.from === 'backbutton') {
+    uni.navigateBack();
+    return true;
+  }
+});
+
+// 方法
+const getDetail = () => {
+  uni.showLoading({title: "加载中....", mask: true});
+  getCustomerReturnRecordDetail(id.value).then((res) => {
+    uni.hideLoading();
+    isAllReceived.value = false;
+    receiveDisable.value = true;
+    if (res.data == null) {
+      showMessage('未获取到详情');
+    } else {
+      if (res.data.list.length > 0) {
+        recordContent.value = res.data.list[0];
+        subList.value = res.data.list;
+        subList.value.forEach((item) => {
+          item.batch = item.toBatch;
+          item.packingNumber = item.toPackingNumber;
+        });
+        detailSource.value = getDataSource(subList.value);
+      } else {
+        showMessage('列表数据为0');
+      }
+    }
+  }).catch((error) => {
+    uni.hideLoading();
+    showErrorMessage(error);
+  });
+};
+
+const calcHandleQty = () => {
+  calcHandleQty(detailSource.value);
+  updateBtn();
+  continueScan();
+};
+
+const updateBtn = () => {
+  scanCount.value = getScanCount(subList.value);
+  // 扫描数量和任务数量相等，直接提交
+  if (scanCount.value === subList.value.length) {
+    receiveDisable.value = false;
+  } else {
+    receiveDisable.value = true;
+  }
+};
+
+const continueScan = () => {
+  scanCount.value = getScanCount(subList.value);
+  if (scanCount.value === subList.value.length) {
+    closeScanPopup();
+  } else {
+    scanPopupGetFocus();
+  }
+};
+
+const updateData = () => {
+  calcHandleQty();
+  updateBtn();
+};
+
+const openDetail = (item) => {
+  detailInfoPopup.value.openPopup(item);
+};
+
+const openScanPopup = () => {
+  scanPopup.value.openScanPopup();
+};
+
+const closeScanPopup = () => {
+  scanPopup.value.closeScanPopup();
+};
+
+const getScanResult = (result) => {
+  try {
+    const itemCode = result.label.itemCode;
+    const packingNumber = result.package.number;
+    const batch = result.label.batch;
+    const detail = detailSource.value.find((r) => r.itemCode === itemCode);
+
+    if (detail === undefined) {
+      showErrorMessage(`物料号【${itemCode}】不在列表中`);
+    } else {
+      const itemDetail = detail.subList.find((r) => r.packingNumber === packingNumber && r.batch === batch);
+      if (itemDetail === undefined) {
+        showErrorMessage(`箱码[${packingNumber}]批次[${batch}]不在列表中`);
+      } else {
+        if (itemDetail.scaned) {
+          showErrorMessage(`箱码[${packingNumber}]批次[${batch}]已经扫描`);
+        } else {
+          itemDetail.scaned = true;
+          itemDetail.handleQty = Number(itemDetail.qty);
+          calcHandleQty();
+        }
+      }
+    }
+  } catch (e) {
+    showMessage(e.message);
+  }
+};
+
+const reject = () => {
+  showQuestionMessage("是否拒绝接收?", (res) => {
+    if (res) {
+      uni.showLoading({title: "提交中....", mask: true});
+      customerReturnRecordRefuse(id.value).then((res) => {
+        uni.hideLoading();
+        if (res.data) {
+          showCommitSuccessMessage("拒绝成功");
+        } else {
+          showErrorMessage(`拒绝失败[${res.msg}]`);
+        }
+      }).catch((error) => {
+        uni.hideLoading();
+        showErrorMessage(error);
+      });
+    }
+  });
+};
+
+const receive = () => {
+  scanCount.value = getScanCount(subList.value);
+  if (scanCount.value === 0) {
+    showErrorMessage("扫描数为0,请先扫描");
+    return;
+  }
+  if (scanCount.value < subList.value.length) {
+    showErrorMessage("还有未扫描的数据,请先扫描");
+    return;
+  }
+
+  // 扫描数量和任务数量相等，直接提交
+  if (scanCount.value === subList.value.length) {
+    receiveSubmit();
+  }
+};
+
+const showMessageHint = (hint, callback) => {
+  comMessage.value.showErrorMessage(hint, (res) => {
+    if (res) {
+      callback();
+    }
+  });
+};
+
+const receiveSubmit = () => {
+  uni.showLoading({title: "提交中....", mask: true});
+  customerReturnRecordReceive(id.value).then((res) => {
+    uni.hideLoading();
+    if (res.data) {
+      showCommitSuccessMessage("接收成功");
+    } else {
+      showErrorMessage(`接收失败[${res.msg}]`);
+    }
+  }).catch((error) => {
+    uni.hideLoading();
+    showErrorMessage(error);
+  });
+};
+
+const showMessage = (message) => {
+  setTimeout(() => {
+    scanPopupLoseFocus();
+    comMessage.value.showMessage(message, (res) => {
+      if (res) {
+        afterCloseMessage();
+      }
+    });
+  });
+};
+
+const showErrorMessage = (message) => {
+  setTimeout(() => {
+    scanPopupLoseFocus();
+    comMessage.value.showErrorMessage(message, (res) => {
+      if (res) {
+        afterCloseMessage();
+      }
+    });
+  });
+};
+
+const showQuestionMessage = (message, callback) => {
+  setTimeout(() => {
+    scanPopupLoseFocus();
+    comMessage.value.showQuestionMessage(message, (res) => {
+      if (res) {
+        callback(res);
+      }
+    });
+  });
+};
+
+const scanPopupGetFocus = () => {
+  if (scanPopup.value) {
+    scanPopup.value.getfocus();
+  }
+};
+
+const scanPopupLoseFocus = () => {
+  if (scanPopup.value) {
+    scanPopup.value.losefocus();
+  }
+};
+
+const afterCloseMessage = () => {
+  scanPopupGetFocus();
+};
+
+const showCommitSuccessMessage = (hint) => {
+  comMessage.value.showSuccessMessage(hint, (res) => {
+    navigateBack(1);
+  });
+};
+
+const switchChange = (isOn) => {
+  isAllReceived.value = isOn;
+  if (isAllReceived.value) {
+    detailSource.value.forEach((item) => {
+      item.subList.forEach((info) => {
+        info.scaned = true;
+        info.handleQty = Number(info.qty);
+      });
+    });
+    calcHandleQty();
+  } else {
+    comMessage.value.showQuestionMessage("是否要关闭整单收货?", (res) => {
+      if (res) {
+        getDetail();
+      } else {
+        isAllReceived.value = true;
+      }
+    });
+  }
+};
 </script>
 
 <style scoped lang="scss">
-	page {
-		width: 100%;
-		height: 100%;
-		background-color: #fff;
-	}
-
-	.page-wraper {
-		display: flex;
-		flex-direction: column;
-		width: 100%;
-		height: 100%;
-	}
-
-
-	.page-main {
-		flex: 1;
-		position: relative;
-	}
-
-	.page-main-scroll {
-		position: absolute;
-		left: 0;
-		right: 0;
-		top: 0;
-		bottom: 0;
-	}
-
-	.page-main-list {
-		/*  height: 80rpx;
-	    line-height: 80rpx; */
-		text-align: center;
-		background: #e0e0e0;
-
-	}
+page {
+  width: 100%;
+  height: 100%;
+  background-color: #fff;
+}
+
+.page-wraper {
+  display: flex;
+  flex-direction: column;
+  width: 100%;
+  height: 100%;
+}
+
+
+.page-main {
+  flex: 1;
+  position: relative;
+}
+
+.page-main-scroll {
+  position: absolute;
+  left: 0;
+  right: 0;
+  top: 0;
+  bottom: 0;
+}
+
+.page-main-list {
+  /*  height: 80rpx;
+    line-height: 80rpx; */
+  text-align: center;
+  background: #e0e0e0;
+
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/productPutaway/record/fgDirectPutaway.vue b/src/pages/productPutaway/record/fgDirectPutaway.vue
index 4bd5f2ad..9fd9fe66 100644
--- a/src/pages/productPutaway/record/fgDirectPutaway.vue
+++ b/src/pages/productPutaway/record/fgDirectPutaway.vue
@@ -1,48 +1,41 @@
- <template>
- 	<view class="">
- 		<product-putaway-record :title="title" ref="productPutawayRecord" putawayType='assemble'></product-putaway-record>
- 	</view>
- </template>
- 
- <script>
- 	import productPutawayRecord from '@/pages/productPutaway/record/productPutawayRecord.vue'
- 
- 	export default {
- 		components: {
- 			productPutawayRecord
- 		},
- 		data() {
- 			return {
- 				title:''
- 			};
- 		},
- 		onLoad(option){
- 			this.title = option.title
- 		},
- 		
- 		onShow() {
- 			if(this.$refs.productPutawayRecord!=undefined){
- 				// this.$refs.productPutawayRecord.refresh();
- 			}
- 		},
- 
- 		onPullDownRefresh() {
- 			// this.$refs.productPutawayRecord.refresh();
- 		},
- 		onNavigationBarButtonTap(e) {
- 			if (e.index === 0) {
- 				this.$refs.productPutawayRecord.toHome();
- 			} else if (e.index == 1) {
- 				this.$refs.productPutawayRecord.openFilter();
- 			}
- 		},
- 
- 		methods: {
- 
- 		}
- 	}
- </script>
- 
- <style scoped lang="scss">
- 
- </style>
\ No newline at end of file
+<template>
+  <view class="">
+    <product-putaway-record :title="title" ref="productPutawayRecordRef" putawayType="assemble"></product-putaway-record>
+  </view>
+</template>
+
+<script setup>
+import { ref } from 'vue';
+import { onLoad, onShow, onPullDownRefresh, onNavigationBarButtonTap } from '@dcloudio/uni-app';
+import productPutawayRecord from '@/pages/productPutaway/record/productPutawayRecord.vue';
+
+const title = ref('');
+const productPutawayRecordRef = ref(null);
+
+onLoad((option) => {
+  title.value = option.title;
+});
+
+onShow(() => {
+  if (productPutawayRecordRef.value) {
+    // productPutawayRecordRef.value.refresh();
+  }
+});
+
+onPullDownRefresh(() => {
+  if (productPutawayRecordRef.value) {
+    // productPutawayRecordRef.value.refresh();
+  }
+});
+
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    productPutawayRecordRef.value.toHome();
+  } else if (e.index === 1) {
+    productPutawayRecordRef.value.openFilter();
+  }
+});
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/pages/productPutaway/record/semiDirectPutaway.vue b/src/pages/productPutaway/record/semiDirectPutaway.vue
index f8aebb9e..5b262c50 100644
--- a/src/pages/productPutaway/record/semiDirectPutaway.vue
+++ b/src/pages/productPutaway/record/semiDirectPutaway.vue
@@ -1,48 +1,41 @@
 <template>
- 	<view class="">
- 		<product-putaway-record :title="title" ref="productPutawayRecord" putawayType='predict'></product-putaway-record>
- 	</view>
- </template>
- 
- <script>
- 	import productPutawayRecord from '@/pages/productPutaway/record/productPutawayRecord.vue'
- 
- 	export default {
- 		components: {
- 			productPutawayRecord
- 		},
- 		data() {
- 			return {
- 				title:''
- 			};
- 		},
- 		onLoad(option){
- 			this.title = option.title
- 		},
- 		
- 		onShow() {
- 			if(this.$refs.productPutawayRecord!=undefined){
- 				this.$refs.productPutawayRecord.refresh();
- 			}
- 		},
- 
- 		onPullDownRefresh() {
- 			this.$refs.productPutawayRecord.refresh();
- 		},
- 		onNavigationBarButtonTap(e) {
- 			if (e.index === 0) {
- 				this.$refs.productPutawayRecord.toHome();
- 			} else if (e.index == 1) {
- 				this.$refs.productPutawayRecord.openFilter();
- 			}
- 		},
- 
- 		methods: {
- 
- 		}
- 	}
- </script>
- 
- <style scoped lang="scss">
- 
- </style>
\ No newline at end of file
+  <view class="">
+    <product-putaway-record :title="title" ref="productPutawayRecordRef" putawayType="predict"></product-putaway-record>
+  </view>
+</template>
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { onLoad, onShow, onPullDownRefresh, onNavigationBarButtonTap } from '@dcloudio/uni-app';
+import productPutawayRecord from '@/pages/productPutaway/record/productPutawayRecord.vue';
+
+const title = ref('');
+const productPutawayRecordRef = ref(null);
+
+onLoad((option) => {
+  title.value = option.title;
+});
+
+onShow(() => {
+  if (productPutawayRecordRef.value) {
+    productPutawayRecordRef.value.refresh();
+  }
+});
+
+onPullDownRefresh(() => {
+  if (productPutawayRecordRef.value) {
+    productPutawayRecordRef.value.refresh();
+  }
+});
+
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    productPutawayRecordRef.value.toHome();
+  } else if (e.index === 1) {
+    productPutawayRecordRef.value.openFilter();
+  }
+});
+</script>
+
+<style scoped lang="scss">
+</style>
diff --git a/src/pages/productReceipt/record/semiDirectReceipt.vue b/src/pages/productReceipt/record/semiDirectReceipt.vue
index 21abec7e..7b8c0a0b 100644
--- a/src/pages/productReceipt/record/semiDirectReceipt.vue
+++ b/src/pages/productReceipt/record/semiDirectReceipt.vue
@@ -1,48 +1,47 @@
 <template>
-	<view class="">
-		<product-receipt-record :title="title" ref="productPutawayRecord" type='predict'></product-receipt-record>
-	</view>
+  <view class="">
+    <product-receipt-record :title="title" ref="productReceiptRecordRef" type="predict"></product-receipt-record>
+  </view>
 </template>
 
-<script>
-	import productReceiptRecord from '@/pages/productReceipt/record/productReceiptRecord.vue'
+<script setup>
+import { ref } from 'vue';
+import { onLoad, onShow, onPullDownRefresh, onNavigationBarButtonTap } from '@dcloudio/uni-app';
+import productReceiptRecord from '@/pages/productReceipt/record/productReceiptRecord.vue';
 
-	export default {
-		components: {
-			productReceiptRecord
-		},
-		data() {
-			return {
-				title:''
-			};
-		},
-		onLoad(option){
-			this.title = option.title
-		},
-		
-		onShow() {
-			if(this.$refs.productReceiptRecord!=undefined){
-				this.$refs.productReceiptRecord.refresh();
-			}
-		},
+// 定义响应式数据
+const title = ref('');
+const productReceiptRecordRef = ref(null);
 
-		onPullDownRefresh() {
-			this.$refs.productReceiptRecord.refresh();
-		},
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				this.$refs.productReceiptRecord.toHome();
-			} else if (e.index == 1) {
-				this.$refs.productReceiptRecord.openFilter();
-			}
-		},
+// 页面加载时处理
+onLoad((option) => {
+  title.value = option.title;
+});
 
-		methods: {
+// 页面显示时处理
+onShow(() => {
+  if (productReceiptRecordRef.value) {
+    productReceiptRecordRef.value.refresh();
+  }
+});
 
-		}
-	}
+// 下拉刷新时处理
+onPullDownRefresh(() => {
+  if (productReceiptRecordRef.value) {
+    productReceiptRecordRef.value.refresh();
+  }
+});
+
+// 导航栏按钮点击事件
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    productReceiptRecordRef.value.toHome();
+  } else if (e.index === 1) {
+    productReceiptRecordRef.value.openFilter();
+  }
+});
 </script>
 
 <style scoped lang="scss">
-
-</style>
\ No newline at end of file
+/* 样式部分保持不变 */
+</style>