diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index e123cd76..cf2c0c8c 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <uni-popup ref="popup" :mask-click="false">
+    <u-popup v-model="show" mode="bottom">
       <view class="popup_box">
         <view class="pop_title uni-flex space-between">
           <view class="" style="font-size: 35rpx;">
@@ -19,13 +19,13 @@
           </view>
         </view>
       </view>
-    </uni-popup>
+    </u-popup>
     <balance-select ref="balanceSelect" @onSelectItem='selectBalanceItem'></balance-select>
   </view>
   <comMessage ref="comMessage"></comMessage>
 </template>
 
-<script>
+<script setup lang="ts">
 import winComScan from '@/mycomponents/scan/winComScan.vue'
 import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
 import {
@@ -47,275 +47,260 @@ import {
   getListItemTypeDesc,
   getItemTypeInfo
 } from '@/common/directory.js';
-export default {
-  name: 'winScanPack',
-  emits: ["getBalance"],
-  components: {
-    winComScan,
-    balanceSelect
+
+import { ref, onMounted, watch } from 'vue'
+
+const props = defineProps({
+  title: {
+    type: String,
+    default: '箱标签'
   },
-  props: {
-    title: {
-      type: String,
-      default: '箱标签'
-    },
-    isShowHistory: {
-      type: Boolean,
-      default: false
-    },
-    headerType: {
-      type: String,
-      default: "HPQ,HMQ"
-    },
-    balanceFromInventoryStatuses: { //是否传fromInventoryStatuses
-      type: Boolean,
-      default: true
-    },
-    bussinessCode: {
-      type: String,
-      default: ''
-    },
-    verifyCategory: {
-      type: Boolean,
-      default: false
-    },
-    isCheckLocationBalance: {
-      type: Boolean,
-      default: true
-    }
+  isShowHistory: {
+    type: Boolean,
+    default: false
   },
-  data() {
-    return {
-      scanResult: {},
-      show: false,
-      scanList: [],
-      expand: false,
-      showScanResult: {},
-      expendIcon: 'arrow-down',
-      fromLocationCode: '',
-      fromLocation: '',
-      fromLocationList: [],
-      fromLocationAreaTypeList: [],
-      toLocationAreaTypeList: [],
-      locationOnFocus: false,
-      businessType: {},
-      inventoryStatus: [],
-      managementPrecision: '',
-      fromInventoryStatuses: [],
-      itemTypesList: [],
-      isCheck: false,
-      resultData: {}
-    }
+  headerType: {
+    type: String,
+    default: "HPQ,HMQ"
   },
-  created() {
-
+  balanceFromInventoryStatuses: { // 是否传 fromInventoryStatuses
+    type: Boolean,
+    default: true
   },
-  methods: {
-    openScanPopup(businessType) {
-      this.businessType = businessType
-      this.fromInventoryStatuses = getDirectoryItemArray(businessType.outInventoryStatuses)
-      this.fromLocationAreaTypeList = getDirectoryItemArray(businessType.outAreaTypes)
-      this.toLocationAreaTypeList = getDirectoryItemArray(businessType.inAreaTypes)
-      this.itemTypesList = getDirectoryItemArray(businessType.itemTypes)
-      this.$refs.popup.open('bottom')
-      setTimeout(res=>{
-        this.getfocus()
-      },500)
-    },
-
-    getScanResult(result) {
-      this.resultData = result;
-      if (!result.package) {
-        this.showErrorMessage(result.label.code + "包装信息为空")
-        return;
-      }
-      this.getItemCodeType(result.package.itemCode, callBack => {
-        if(this.isCheckLocationBalance){
-          this.queryBalance(this.resultData);
-        }else {
-          this.queryBalance(this.resultData)
-        }
-        //this.queryBalance(this.resultData)
-      })
-    },
+  bussinessCode: {
+    type: String,
+    default: ''
+  },
+  verifyCategory: {
+    type: Boolean,
+    default: false
+  },
+  isCheckLocationBalance: {
+    type: Boolean,
+    default: true
+  }
+})
 
-    //查询到目标库位的库存余额
-    getToLocationBalance(result) {
-      uni.showLoading({
-        title: '查询中',
-        mask: true
-      })
-      var filters = []
-      if (result.package.parentNumber) {
-        var packingNumber = result.package.parentNumber + "," + result.package.number;
-        filters.push({
-          column: "packingNumber",
-          action: "in",
-          value: packingNumber
-        })
-      } else {
-        filters.push({
-          column: "packingNumber",
-          action: "==",
-          value: result.package.number
-        })
-      }
+const scanResult = ref({})
+const show = ref(false)
+const scanList = ref([])
+const expand = ref(false)
+const expendIcon = ref('arrow-down')
+const fromLocationCode = ref('')
+const fromLocation = ref('')
+const fromLocationList = ref([])
+const fromLocationAreaTypeList = ref([])
+const toLocationAreaTypeList = ref([])
+const businessType = ref({})
+const inventoryStatus = ref([])
+const fromInventoryStatuses = ref([])
+const itemTypesList = ref([])
+const resultData = ref({})
 
-      filters.push({
-        column: "itemCode",
-        action: "==",
-        value: result.package.itemCode
-      })
-      filters.push({
-        column: "batch",
-        action: "==",
-        value: result.package.batch
-      })
+const popup = ref(null)
+const comMessage = ref(null)
+const comscan = ref(null)
+const balanceSelect = ref(null)
 
-      filters.push({
-        column: "areaType",
-        action: "in",
-        value: this.toLocationAreaTypeList.join(',')
-      })
+// 方法
+const openScanPopup = (businessTypeValue) => {
+  businessType.value = businessTypeValue
+  fromInventoryStatuses.value = getDirectoryItemArray(businessTypeValue.outInventoryStatuses)
+  fromLocationAreaTypeList.value = getDirectoryItemArray(businessTypeValue.outAreaTypes)
+  toLocationAreaTypeList.value = getDirectoryItemArray(businessTypeValue.inAreaTypes)
+  itemTypesList.value = getDirectoryItemArray(businessTypeValue.itemTypes)
+  show.value = true
+  setTimeout(() => {
+    getfocus()
+  }, 500)
+}
 
+const getScanResult = (result) => {
+  resultData.value = result
+  if (!result.package) {
+    showErrorMessage(result.label.code + "包装信息为空")
+    return
+  }
+  getItemCodeType(result.package.itemCode, () => {
+    if (props.isCheckLocationBalance) {
+      queryBalance(resultData.value)
+    } else {
+      queryBalance(resultData.value)
+    }
+  })
+}
 
-      var params = {
-        filters: filters,
-        pageNo: 1,
-        pageSize: 100,
-      }
-      getBalanceByFilter(params).then(res => {
-        uni.hideLoading()
-        if (res.data.list.length > 0) {
-          this.showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额");
-        } else {
-          this.queryBalance(this.resultData);
-        }
-        // callback(res.data)
-      }).catch(err => {
-        this.showErrorMessage(err.message);
-      })
-    },
+const getToLocationBalance = (result) => {
+  uni.showLoading({
+    title: '查询中',
+    mask: true
+  })
+  const filters = []
+  if (result.package.parentNumber) {
+    const packingNumber = result.package.parentNumber + "," + result.package.number
+    filters.push({
+      column: "packingNumber",
+      action: "in",
+      value: packingNumber
+    })
+  } else {
+    filters.push({
+      column: "packingNumber",
+      action: "==",
+      value: result.package.number
+    })
+  }
 
-    queryBalance(result) {
-      var params = {
-        itemCode: result.package.itemCode,
-        batch: result.label.batch,
-        packingNumber: result.label.packingNumber,
-        parentPackingNumber: result.package.parentNumber,
-        inventoryStatus: this.fromInventoryStatuses,
-        areaType: this.fromLocationAreaTypeList,
-        bussinessCode: this.bussinessCode
-      }
-      uni.showLoading({
-        title: '查询中',
-        mask: true
-      })
-      getBalanceByParams(params).then(res => {
-        uni.hideLoading()
-        if (res.data.length == 0) {
-          var status = getInventoryStatusDesc(params.inventoryStatus)
-          var areaType = getListLocationAreaTypeDesc(params.areaType)
-          var hint =
-              "按物料号 [" + params.itemCode + "] \n" +
-              "包装号 [" + params.packingNumber + "] \n" +
-              "批次 [" + params.batch + "] \n" +
-              "状态 [" + status + "] \n" +
-              "库区 [" + areaType + "] \n" +
-              "未查找到库存余额"
-          this.showErrorMessage(hint)
-        } else if (res.data.length == 1) {
+  filters.push({
+    column: "itemCode",
+    action: "==",
+    value: result.package.itemCode
+  })
+  filters.push({
+    column: "batch",
+    action: "==",
+    value: result.package.batch
+  })
+  filters.push({
+    column: "areaType",
+    action: "in",
+    value: toLocationAreaTypeList.value.join(',')
+  })
 
-          result.balance = res.data[0]
-          if (result.label.packingNumber != result.balance.packingNumber) {
-            result.balance.lableQty = result.label.qty
-          }
-          this.$emit("getBalance", result)
-          // this.closeScanPopup()
-        } else {
-          //多条记录
-          this.$refs.balanceSelect.openPopup(res.data);
-        }
+  const params = {
+    filters: filters,
+    pageNo: 1,
+    pageSize: 100,
+  }
+  getBalanceByFilter(params).then(res => {
+    uni.hideLoading()
+    if (res.data.list.length > 0) {
+      showErrorMessage("包装在库位【" + res.data.list[0].locationCode + "】已有库存余额")
+    } else {
+      queryBalance(resultData.value)
+    }
+  }).catch(err => {
+    showErrorMessage(err.message)
+  })
+}
 
-      }).catch(error => {
-        uni.hideLoading()
-        this.showErrorMessage(error)
-      })
-    },
+const queryBalance = (result) => {
+  const params = {
+    itemCode: result.package.itemCode,
+    batch: result.label.batch,
+    packingNumber: result.label.packingNumber,
+    parentPackingNumber: result.package.parentNumber,
+    inventoryStatus: fromInventoryStatuses.value,
+    areaType: fromLocationAreaTypeList.value,
+    bussinessCode: props.bussinessCode
+  }
+  uni.showLoading({
+    title: '查询中',
+    mask: true
+  })
+  getBalanceByParams(params).then(res => {
+    uni.hideLoading()
+    if (res.data.length === 0) {
+      const status = getInventoryStatusDesc(params.inventoryStatus)
+      const areaType = getListLocationAreaTypeDesc(params.areaType)
+      const hint =
+        "按物料号 [" + params.itemCode + "] \n" +
+        "包装号 [" + params.packingNumber + "] \n" +
+        "批次 [" + params.batch + "] \n" +
+        "状态 [" + status + "] \n" +
+        "库区 [" + areaType + "] \n" +
+        "未查找到库存余额"
+      showErrorMessage(hint)
+    } else if (res.data.length === 1) {
+      result.balance = res.data[0]
+      if (result.label.packingNumber !== result.balance.packingNumber) {
+        result.balance.lableQty = result.label.qty
+      }
+      emit('getBalance', result)
+    } else {
+      balanceSelect.value.openPopup(res.data)
+    }
+  }).catch(error => {
+    uni.hideLoading()
+    showErrorMessage(error)
+  })
+}
 
-    getItemCodeType(itemCode, callBack) {
-      uni.showLoading({
-        title: "加载中",
-        mask: true
-      })
-      getBasicItemByCode(itemCode).then(res => {
-        if (res.data != null && res.data.list.length > 0) {
-          var result = res.data.list[0];
-          var status = result.available;
-          var type = result.type;
-          if (status == "TRUE") {
-            if (checkDirectoryItemExist(this.itemTypesList, type)) {
-              if (this.verifyCategory) {
-                if (result.category == 'LCJ' || result.category == 'BJ') {
-                  callBack()
-                } else {
-                  this.showErrorMessage("扫描物料的种类不是【量产件】或者【备件】")
-                }
-              } else {
-                callBack()
-              }
+const getItemCodeType = (itemCode, callBack) => {
+  uni.showLoading({
+    title: "加载中",
+    mask: true
+  })
+  getBasicItemByCode(itemCode).then(res => {
+    if (res.data && res.data.list.length > 0) {
+      const result = res.data.list[0]
+      const status = result.available
+      const type = result.type
+      if (status === "TRUE") {
+        if (checkDirectoryItemExist(itemTypesList.value, type)) {
+          if (props.verifyCategory) {
+            if (result.category === 'LCJ' || result.category === 'BJ') {
+              callBack()
             } else {
-              var hint = getListItemTypeDesc(this.itemTypesList);
-              uni.hideLoading()
-              this.showErrorMessage("扫描物料[" + itemCode + "]是[" +
-                  getItemTypeInfo(type).label + "],需要的物料类型是[" + hint + "]")
+              showErrorMessage("扫描物料的种类不是【量产件】或者【备件】")
             }
           } else {
-            uni.hideLoading()
-            this.showErrorMessage('物料【' + itemCode + '】不可用');
+            callBack()
           }
         } else {
+          const hint = getListItemTypeDesc(itemTypesList.value)
           uni.hideLoading()
-          this.showErrorMessage('未查找到物料【' + itemCode + '】');
-        }
-      }).catch(error => {
-        uni.hideLoading();
-        this.showErrorMessage(error)
-      })
-    },
-
-    showErrorMessage(message) {
-      this.losefocus()
-      this.$refs.comMessage.showErrorMessage(message, res => {
-        if (res) {
-          if (this.$refs.comscan) {
-            this.$refs.comscan.getfocus()
-          }
+          showErrorMessage("扫描物料[" + itemCode + "]是[" +
+            getItemTypeInfo(type).label + "],需要的物料类型是[" + hint + "]")
         }
-      });
-    },
-
-    selectBalanceItem(item) {
-      this.resultData.balance = item
-      this.$emit("getBalance", this.resultData)
-      // this.closeScanPopup()
-    },
-    closeScanPopup() {
-      this.losefocus();
-      this.$refs.popup.close()
-    },
-    getfocus() {
-      if (this.$refs.comscan) {
-        this.$refs.comscan.getfocus()
+      } else {
+        uni.hideLoading()
+        showErrorMessage('物料【' + itemCode + '】不可用')
       }
-    },
-    losefocus() {
-      if (this.$refs.comscan) {
-        this.$refs.comscan.losefocus()
+    } else {
+      uni.hideLoading()
+      showErrorMessage('未查找到物料【' + itemCode + '】')
+    }
+  }).catch(error => {
+    uni.hideLoading()
+    showErrorMessage(error)
+  })
+}
+
+const showErrorMessage = (message) => {
+  losefocus()
+  comMessage.value.showErrorMessage(message, res => {
+    if (res) {
+      if (comscan.value) {
+        comscan.value.getfocus()
       }
     }
+  })
+}
+
+const selectBalanceItem = (item) => {
+  resultData.value.balance = item
+  emit('getBalance', resultData.value)
+}
+
+const closeScanPopup = () => {
+  losefocus()
+  show.value = false
+}
+
+const getfocus = () => {
+  if (comscan.value) {
+    comscan.value.getfocus()
+  }
+}
+
+const losefocus = () => {
+  if (comscan.value) {
+    comscan.value.losefocus()
   }
 }
+
+const emit = defineEmits(['getBalance'])
 </script>
 
 <style lang="scss">
diff --git a/src/pages/issue/record/directIssue2.vue b/src/pages/issue/record/directIssue2.vue
index 18070a91..c03899ce 100644
--- a/src/pages/issue/record/directIssue2.vue
+++ b/src/pages/issue/record/directIssue2.vue
@@ -53,667 +53,605 @@
 	</view>
 </template>
 
-<script>
-	import {
-		issueRecordSubmit,
-		getWorkShopLineStation,
-		getBalanceByFilter
-	} from '@/api/request2.js';
-
-	import {
-		goHome,
-		getPackingNumberAndBatchByList,
-		deepCopyData
-	} from '@/common/basic.js';
-
-	import {
-		calc
-	} from '@/common/calc.js';
-
-	import {
-		getInventoryStatusDesc,
-		getDirectoryItemArray
-	} from '@/common/directory.js';
-
-	import {
-		getBusinessType,
-		createItemInfo,
-		createDetailInfo,
-		calcTreeHandleQty,
-		calcHandleQty
-	} from '@/common/record.js';
-
-	import {
-		getManagementPrecisions,
-		getPrecisionStrategyList,
-		getPrecisionStrategyParams
-	} from '@/common/balance.js';
-
-	import winScanButton from '@/mycomponents/scan/winScanButton.vue'
-	import winScanPack from '@/mycomponents/scan/winScanPack.vue'
-	import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-	import comBlankView from '@/mycomponents/common/comBlankView.vue'
-	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
-	import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
-	import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
-	import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
-	import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
-
-	export default {
-		components: {
-			winScanButton,
-			winScanPack,
-			requiredLocation,
-			comBlankView,
-			winScanLocation,
-			winScanPackAndLocation,
-			recordComDetailCard,
-			recordDetailCard,
-			balanceSelect
-		},
-		data() {
-			return {
-				id: '',
-				dataContent: {}, //内容
-				detailSource: [], //绑定在页面上的数据源
-				fromLocationInfo: {},
-				fromLocationCode: "",
-				fromLocationAreaTypeList: [],
-				toLocationAreaTypeList: [],
-				inInventoryStatus: "", //目标入库库存状态
-				outInventoryStatus: "", //来源出库库存状态
-				businessType: {},
-				showToLoaction: true,
-				recommendLocationList: [], //推荐库位列表
-				fromWarehouseCode: '', //来源仓库
-				businessTypeCode: "Issue",
-				positionList: [],
-				show: false,
-				positionInfo: "请选择生产线",
-				resultData: {}
-			};
-		},
-		onLoad(option) {
-			uni.setNavigationBarTitle({
-				title: option.title
-			})
-			this.clearData();
-			getBusinessType(this.businessTypeCode, res => {
-				if (res.success) {
-					this.businessType = res.businessType;
-					this.fromLocationAreaTypeList = res.fromLocationAreaTypeList;
-					this.toLocationAreaTypeList = res.toLocationAreaTypeList;
-					this.showFromLocationPopup();
-				} else {
-					this.showErrorMessage(res.message)
-				}
-			});
-
-			// if (this.positionList.length == 0) {
-			getWorkShopLineStation().then(res => {
-				if (res.data != null && res.data.length > 0) {
-					this.positionList = res.data
-				} else {
-					this.showErrorMessage('未查找到位置信息');
-				}
-
-			}).catch(error => {
-				this.showErrorMessage(error);
-			})
-			// }
-
-		},
-		//返回首页
-		onNavigationBarButtonTap(e) {
-			if (e.index === 0) {
-				goHome();
-			}
-		},
-		//拦截返回按钮事件
-		onBackPress(e) {},
-
-		onPullDownRefresh() {},
-
-		mounted() {},
-
-		methods: {
-			getBalance(label, packageInfo, callback) {
-				var filters = []
-
-				if (packageInfo.parentNumber) {
-					var packingNumber = packageInfo.parentNumber + "," + label.packingNumber;
-					filters.push({
-						column: "packingNumber",
-						action: "in",
-						value: packingNumber
-					})
-				} else {
-					filters.push({
-						column: "packingNumber",
-						action: "==",
-						value: label.packingNumber
-					})
-				}
-
-				filters.push({
-					column: "itemCode",
-					action: "==",
-					value: label.itemCode
-				})
-				filters.push({
-					column: "batch",
-					action: "==",
-					value: label.batch
-				})
-
-				if (this.fromInventoryStatuses != null && this.fromInventoryStatuses != "") {
-					filters.push({
-						column: "inventoryStatus",
-						action: "in",
-						value: this.fromInventoryStatuses
-					})
-				}
-
-				var params = {
-					filters: filters,
-					pageNo: 1,
-					pageSize: 100,
-				}
-				getBalanceByFilter(params).then(res => {
-					callback(res.data)
-				}).catch(err => {
-					this.showErrorMessage(err.message);
-				})
-			},
-			getScanResult(result) {
-				this.resultData = result;
-				let packageInfo = result.package;
-				this.getBalance(result.label, packageInfo, balances => {
-					//扫描的是外包装
-					let s = '';
-					if (!result.package.parentNumber) {
-						if (balances.list.length == 0) {
-							this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
-						} else {
-							let newBalances = balances.list.filter(b => b.locationCode == this
-								.fromLocationCode);
-							if (newBalances.length == 0) {
-								this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
-							} else if (newBalances.length == 1) {
-								let balance = newBalances[0];
-								result.balance = balance;
-								this.afterGetBalance(result);
-							} else {
-								this.showBalanceSelect(newBalances);
-							}
-						}
-					} else {
-						//扫描的是小包装
-						if (balances.list.length == 0) {
-							this.showErrorMessage('未查找到该包装的库存信息,请重新扫描')
-						} else {
-							//小包装库存
-							let subPackitems = balances.list.filter(r => r.packingNumber == packageInfo
-								.number)
-							//外包装库存
-							let subParentPackitems = balances.list.filter(r => r.packingNumber ==
-								packageInfo
-								.parentNumber && r.locationCode == this.fromLocationCode)
-							//小包装没有库存，
-							if (subPackitems.length == 0) {
-								//外包装有库存，出库后剩余库存未转换为出库包装规格
-
-								if (subParentPackitems.length > 0) {
-									if (subParentPackitems.length == 1) {
-										let balance = subParentPackitems[0];
-										balance.qty = packageInfo.qty;
-										result.balance = balance;
-										this.afterGetBalance(result);
-									} else {
-										this.showBalanceSelect(subParentPackitems);
-									}
-
-								} else {
-									this.showErrorMessage('按外包装【' + packageInfo.parentNumber + '】和子包装【' +
-										packageInfo.number + '】都未查找到库存余额')
-								}
-							} else {
-								var locationCode = this.fromLocationCode
-								if (balances.list == 1) {
-									locationCode = balances.list[0].locationCode
-								} else {
-									var manyBlances = balances.list.filter(r => r.locationCode != this
-										.fromLocationCode)
-									if (manyBlances.length > 0) {
-										locationCode = manyBlances[0].locationCode;
-										this.showErrorMessage('该包装【' + packageInfo.number + '】在库位【' +
-											locationCode +
-											'】已经有库存余额,请重新扫描')
-									} else {
-										this.afterGetBalance(result);
-									}
-								}
-							}
-						}
-					}
-				})
-			},
-
-			showBalanceSelect(items) {
-				this.$refs.balanceSelect.openPopup(items);
-			},
-
-			selectBalanceItem(balance) {
-				this.resultData.balance = balance;
-				this.afterGetBalance(this.resultData);
-			},
-
-			afterGetBalance(result) {
-        let balance = result.balance;
-        let label = result.label;
-        let pack = result.package;
-        let packUnit = pack.packUnit;
-        let packQty = pack.packQty
-        var item = this.detailSource.find(res => {
-          if (res.itemCode == balance.itemCode) {
-            return res
-          }
-        })
-        if (this.fromWarehouseCode == '') {
-          this.fromWarehouseCode = balance.warehouseCode;
-        }
-        if (item == undefined) {
-
-          var itemp = createItemInfo(balance, pack);
-          let newDetail = createDetailInfo(balance, pack); //
-          newDetail.parentNumber = pack.parentNumber;
-          newDetail.packingNumber = pack.number
-          newDetail.packUnit = packUnit;
-          newDetail.packQty = packQty;
-          itemp.subList.push(newDetail);
-          this.detailSource.push(itemp)
-          calcHandleQty(this.detailSource);
-
+<script setup>
+import {
+  issueRecordSubmit,
+  getWorkShopLineStation,
+  getBalanceByFilter
+} from '@/api/request2.js';
+
+import {
+  goHome,
+  getPackingNumberAndBatchByList,
+  deepCopyData
+} from '@/common/basic.js';
+
+import {
+  calc
+} from '@/common/calc.js';
+
+import {
+  getInventoryStatusDesc,
+  getDirectoryItemArray
+} from '@/common/directory.js';
+
+import {
+  getBusinessType,
+  createItemInfo,
+  createDetailInfo,
+  calcTreeHandleQty,
+  calcHandleQty
+} from '@/common/record.js';
+
+import {
+  getManagementPrecisions,
+  getPrecisionStrategyList,
+  getPrecisionStrategyParams
+} from '@/common/balance.js';
+
+import winScanButton from '@/mycomponents/scan/winScanButton.vue'
+import winScanPack from '@/mycomponents/scan/winScanPack.vue'
+import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
+import comBlankView from '@/mycomponents/common/comBlankView.vue'
+import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
+import winScanPackAndLocation from "@/mycomponents/scan/winScanPackAndLocation.vue"
+import recordComDetailCard from '@/mycomponents/record/recordComDetailCard.vue'
+import recordDetailCard from '@/mycomponents/record/recordDetailCard.vue'
+import balanceSelect from '@/mycomponents/balance/balanceSelect.vue'
+
+import {ref, onMounted} from 'vue';
+import {onLoad, onNavigationBarButtonTap, onBackPress, onPullDownRefresh} from '@dcloudio/uni-app';
+
+const id = ref('');
+const dataContent = ref({});
+const detailSource = ref([]);
+const fromLocationInfo = ref({});
+const fromLocationCode = ref("");
+const fromLocationAreaTypeList = ref([]);
+const toLocationAreaTypeList = ref([]);
+const inInventoryStatus = ref(""); // 目标入库库存状态
+const outInventoryStatus = ref(""); // 来源出库库存状态
+const businessType = ref({});
+const showToLoaction = ref(true);
+const recommendLocationList = ref([]); // 推荐库位列表
+const fromWarehouseCode = ref(''); // 来源仓库
+const businessTypeCode = ref("Issue");
+const positionList = ref([]);
+const show = ref(false);
+const positionInfo = ref("请选择生产线");
+const resultData = ref({});
+const workshopCode = ref('');
+const productionLineCode = ref('');
+const workStationCode = ref('');
+const workShopName = ref('');
+const productionLineName = ref('');
+const workStationName = ref('');
+const rawLocationCode = ref('');
+const fgLocationCode = ref('');
+const managementList = ref([]);
+const scanPopupRef = ref(null);
+const scanLocationCodeRef = ref(null);
+const comMessageRef = ref(null);
+
+const getBusinessType = (code, callback) => {
+  // 获取业务类型的逻辑
+  uni.request({
+    url: `/api/businessType/${code}`,
+    method: 'GET',
+    success: (res) => {
+      if (res.data.success) {
+        businessType.value = res.data.businessType;
+        fromLocationAreaTypeList.value = res.data.fromLocationAreaTypeList;
+        toLocationAreaTypeList.value = res.data.toLocationAreaTypeList;
+        showFromLocationPopup();
+      } else {
+        showErrorMessage(res.data.message);
+      }
+    },
+    fail: (err) => {
+      showErrorMessage(err.message);
+    }
+  });
+};
+
+const showFromLocationPopup = () => {
+  // 显示来源库位弹窗的逻辑
+};
+
+const getWorkShopLineStation = () => {
+  return uni.request({
+    url: '/api/workShopLineStation',
+    method: 'GET'
+  }).then((res) => {
+    if (res.data.data && res.data.data.length > 0) {
+      positionList.value = res.data.data;
+    } else {
+      showErrorMessage('未查找到位置信息');
+    }
+  }).catch((error) => {
+    showErrorMessage(error);
+  });
+};
+
+const showErrorMessage = (message) => {
+  uni.showToast({
+    title: message,
+    icon: 'none'
+  });
+};
+
+const getBalance = (label, packageInfo, callback) => {
+  const filters = [];
+
+  if (packageInfo.parentNumber) {
+    const packingNumber = packageInfo.parentNumber + "," + label.packingNumber;
+    filters.push({
+      column: "packingNumber",
+      action: "in",
+      value: packingNumber
+    });
+  } else {
+    filters.push({
+      column: "packingNumber",
+      action: "==",
+      value: label.packingNumber
+    });
+  }
+
+  filters.push({
+    column: "itemCode",
+    action: "==",
+    value: label.itemCode
+  });
+  filters.push({
+    column: "batch",
+    action: "==",
+    value: label.batch
+  });
+
+  if (fromInventoryStatus.value) {
+    filters.push({
+      column: "inventoryStatus",
+      action: "in",
+      value: fromInventoryStatus.value
+    });
+  }
+
+  const params = {
+    filters: filters,
+    pageNo: 1,
+    pageSize: 100,
+  };
+
+  uni.request({
+    url: '/api/getBalanceByFilter',
+    method: 'POST',
+    data: params,
+    success: (res) => {
+      callback(res.data);
+    },
+    fail: (err) => {
+      showErrorMessage(err.message);
+    }
+  });
+};
+
+const getScanResult = (result) => {
+  resultData.value = result;
+  const packageInfo = result.package;
+  getBalance(result.label, packageInfo, (balances) => {
+    if (!packageInfo.parentNumber) {
+      if (balances.list.length === 0) {
+        showErrorMessage('未查找到该包装的库存信息,请重新扫描');
+      } else {
+        const newBalances = balances.list.filter(b => b.locationCode === fromLocationCode.value);
+        if (newBalances.length === 0) {
+          showErrorMessage('未查找到该包装的库存信息,请重新扫描');
+        } else if (newBalances.length === 1) {
+          const balance = newBalances[0];
+          result.balance = balance;
+          afterGetBalance(result);
         } else {
-          var detail = item.subList.find(r => {
-            if (r.packingNumber == pack.number &&
-                r.batch == balance.batch &&
-                r.locationCode == balance.locationCode &&
-                r.inventoryStatus == balance.inventoryStatus) {
-              return r;
+          showBalanceSelect(newBalances);
+        }
+      }
+    } else {
+      if (balances.list.length === 0) {
+        showErrorMessage('未查找到该包装的库存信息,请重新扫描');
+      } else {
+        const subPackitems = balances.list.filter(r => r.packingNumber === packageInfo.number);
+        const subParentPackitems = balances.list.filter(r => r.packingNumber === packageInfo.parentNumber && r.locationCode === fromLocationCode.value);
+        if (subPackitems.length === 0) {
+          if (subParentPackitems.length > 0) {
+            if (subParentPackitems.length === 1) {
+              const balance = subParentPackitems[0];
+              balance.qty = packageInfo.qty;
+              result.balance = balance;
+              afterGetBalance(result);
+            } else {
+              showBalanceSelect(subParentPackitems);
             }
-          })
-          if (detail == undefined) {
-            let newDetail = createDetailInfo(balance, pack);
-            newDetail.parentNumber = pack.parentNumber;
-            newDetail.packingNumber = pack.number
-            newDetail.packUnit = packUnit;
-            newDetail.packQty = packQty;
-            item.subList.push(newDetail);
-            calcHandleQty(this.detailSource);
+          } else {
+            showErrorMessage(`按外包装[${packageInfo.parentNumber}]和子包装[${packageInfo.number}]都未查找到库存余额`);
           }
-          else {
-            if (detail.scaned == true) {
-              this.showErrorMessage("箱码[" + detail.packingNumber + "]批次[" + balance.batch + "]重复扫描")
+        } else {
+          let locationCode = fromLocationCode.value;
+          if (balances.list.length === 1) {
+            locationCode = balances.list[0].locationCode;
+          } else {
+            const manyBlances = balances.list.filter(r => r.locationCode !== fromLocationCode.value);
+            if (manyBlances.length > 0) {
+              locationCode = manyBlances[0].locationCode;
+              showErrorMessage(`该包装[${packageInfo.number}]在库位[${locationCode}]已经有库存余额,请重新扫描`);
+            } else {
+              afterGetBalance(result);
             }
           }
         }
-			},
-
-
-			getScanResult1(result) {
-				let balance = result.balance;
-				let label = result.label;
-				let pack = result.package;
-				let packUnit = pack.packUnit;
-				let packQty = pack.packQty
-				var item = this.detailSource.find(res => {
-					if (res.itemCode == balance.itemCode) {
-						return res
-					}
-				})
-				if (this.fromWarehouseCode == '') {
-					this.fromWarehouseCode = balance.warehouseCode;
-				}
-				if (item == undefined) {
-
-					var itemp = createItemInfo(balance, pack);
-					let newDetail = createDetailInfo(balance, pack); //
-					newDetail.packUnit = packUnit;
-					newDetail.packQty = packQty;
-					itemp.subList.push(newDetail);
-					this.detailSource.push(itemp)
-					calcHandleQty(this.detailSource);
-
-				} else {
-					var detail = item.subList.find(r => {
-						if (r.packingNumber == balance.packingNumber &&
-							r.batch == balance.batch &&
-							r.locationCode == balance.locationCode &&
-							r.inventoryStatus == balance.inventoryStatus) {
-							return r;
-						}
-					})
-					if (detail == undefined) {
-						let newDetail = createDetailInfo(balance, pack);
-						newDetail.packUnit = packUnit;
-						newDetail.packQty = packQty;
-						item.subList.push(newDetail);
-						calcHandleQty(this.detailSource);
-					} else {
-						if (detail.scaned == true) {
-							this.showErrorMessage("箱码[" + balance.packingNumber + "批次[" + balance.batch + "]重复扫描")
-						}
-					}
-				}
-			},
-
-			//获取推荐库位
-			getRecommendLocation(balance, pack, callback) {
-				uni.showLoading({
-					title: '扫描中...',
-					mask: true
-				})
-				let recommend = this.recommendLocationList.find(r => r.itemCode == balance.itemCode);
-				if (recommend == undefined) {
-					let param = {
-						itemCode: balance.itemCode,
-						batch: balance.batch,
-						inventoryStatus: balance.inventoryStatus,
-						supplierCode: pack.supplierCode,
-						businessCode: this.businessTypeCode
-					};
-					console.log(JSON.stringify(param))
-					getPutawayRecommendLocation(param).then(res => {
-						this.recommendLocationList.push({
-							itemCode: balance.itemCode,
-							locationCode: res.data.code
-						})
-						callback(res.data);
-						uni.hideLoading();
-					}).catch(error => {
-						uni.hideLoading()
-						this.showErrorMessage(error);
-						uni.hideLoading();
-					})
-
-				} else {
-					callback(recommend);
-				}
-			},
-
-			showErrorMessage(message) {
-				this.$refs.comMessage.showErrorMessage(message, res => {
-					if (res) {}
-				});
-			},
-
-			calcTreeHandleQty() {
-				for (let item of this.detailSource) {
-					item.qty = 0;
-					for (let detail of item.subList) {
-						if (detail != undefined) {
-							item.qty = calc.add(item.qty, detail.qty)
-						}
-					}
-				}
-				this.$forceUpdate();
-			},
-
-			showSelect() {
-				// if (this.editPosition) {
-				this.show = true
-				// }
-			},
-
-			confirmSelect(e) {
-				this.positionInfo = e[0].label + "-" + e[1].label + "-" + e[2].label
-				console.log("位置", this.positionInfo)
-				this.workshopCode = e[0].value
-				this.productionLineCode = e[1].value
-				this.workStationCode = e[2].value
-				this.workShopName = e[0].label
-				this.productionLineName = e[1].label
-				this.workStationName = e[2].label
-
-				let shop = this.positionList.find(shop => shop.value == this.workshopCode);
-				if (shop != undefined && shop.children != undefined) {
-					let prodLine = shop.children.find(line => line.value == this.productionLineCode);
-					if (prodLine != undefined && prodLine.children != undefined) {
-						let station = prodLine.children.find(r => r.value == this.workStationCode);
-						if (station.rawLocationCode == '' && station.rawLocationCode == null) {
-							this.showErrorMessage(this.workStationName + "的原材料库位为空,请重新选择")
-							return;
-						} else {
-							this.rawLocationCode = station.rawLocationCode;
-							this.fgLocationCode = station.fgLocationCode;
-						}
-					} else {
-						this.showErrorMessage("生产线-工位基础信息维护错误")
-					}
-				} else {
-					this.showErrorMessage("车间-生产线基础信息维护错误")
-				}
-
-				//赋值到库位代码
-				let toLocationCode = ''
-				this.positionList.forEach(item => {
-					if (this.workshopCode == item.value) { // 车间
-						item.children.find(child => {
-							if (this.productionLineCode == child.value) {
-								toLocationCode = child.children.find(subChild => this.workStationCode ==
-									subChild.value).rawLocationCode;
-							}
-						})
-					}
-				})
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						detail.toLocationCode = toLocationCode
-						detail.productionLineCode = this.productionLineCode
-						detail.workStationCode = this.workStationCode
-					})
-				})
-
-			},
-
-			removeItem(index, item) {
-				this.detailSource.splice(index, 1)
-			},
-
-			removePack() {
-				for (var i = 0; i < this.detailSource.length; i++) {
-					var item = this.detailSource[i];
-					if (item.subList.length == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-				this.updateData();
-			},
-
-			openScanPopup() {
-				if (this.fromLocationCode == "") {
-					this.showFromLocationPopup();
-					return
-				}
-				this.$refs.scanPopup.openScanPopupForType(this.fromLocationCode, this.businessType);
-			},
-
-			showFromLocationPopup() {
-				this.$nextTick(() => {
-					this.$refs.scanLocationCode.openScanPopup();
-				})
-			},
-
-			closeScanPopup() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.closeScanPopup();
-				}
-			},
-
-			scanPopupGetFocus() {
-				if (this.$refs.scanPopup != undefined) {
-					this.$refs.scanPopup.getfocus();
-				}
-			},
-
-			// scanLocationCode(location, code) {
-			// 	this.toLocationCode = code
-			// 	this.toLocationCode = location;
-
-			// },
-
-			commit() {
-				uni.showLoading({
-					title: "提交中....",
-					mask: true
-				});
-
-				//记录有目标库位，需要查询管理模式
-				let precisionStrategyParams = getPrecisionStrategyParams(this.detailSource);
-				//2:获取管理模式，封装参数
-				getPrecisionStrategyList(precisionStrategyParams, res => {
-					if (res.success) {
-						this.managementList = res.list;
-						var params = {
-							...this.setRecordParams()
-						}
-						console.log("提交参数", JSON.stringify(params));
-
-						issueRecordSubmit(params).then(res => {
-							uni.hideLoading()
-							if (res.data) {
-								this.showCommitSuccessMessage("提交成功\n生成直接发料记录\n" + res.data)
-							} else {
-								this.showErrorMessage("提交失败[" + res.msg + "]")
-							}
-						}).catch(error => {
-							uni.hideLoading()
-							this.showErrorMessage(error)
-						})
-					} else {
-						uni.hideLoading();
-						this.showErrorMessage(res.message);
-					}
-				});
-			},
-
-			setRecordParams() {
-				var subList = []
-				var creator = this.$store.state.user.id
-				this.detailSource.forEach(item => {
-					item.subList.forEach(detail => {
-						if (detail.scaned) {
-							var info = getPackingNumberAndBatchByList(this.managementList, detail.itemCode,
-								detail.packingNumber, detail.toLocationCode, detail.batch);
-							var submitItem = deepCopyData(detail)
-							submitItem.toPackingNumber = info.packingNumber;
-							submitItem.toBatch = info.batch;
-							submitItem.toContainerNumber = detail.containerNumber;
-
-							submitItem.fromPackingNumber = info.packingNumber;
-							submitItem.fromBatch = info.batch;
-							submitItem.fromContainerNumber = detail.containerNumber;
-
-							submitItem.fromLocationCode = detail.locationCode;
-							submitItem.toLocationCode = detail.toLocationCode;
-
-							// detail.toInventoryStatus = detail.inventoryStatus
-							// detail.toLocationCode = detail.toLocationCode
-							submitItem.qty = detail.handleQty;
-							submitItem.package = "";
-							submitItem.recordList = [{
-								toInventoryStatus: detail.inventoryStatus,
-								fromParentPackingNumber: detail.parentNumber,
-								fromPackingNumber: info.packingNumber,
-								fromBatch: info.batch,
-								toPackingNumber: info.packingNumber,
-								toBatch: info.batch,
-								fromLocationCode: detail.locationCode,
-								toLocationCode: detail.toLocationCode,
-								handleQty: detail.handleQty,
-								fromPackUnit: detail.packUnit,
-								toPackUnit: detail.packUnit,
-								fromPackQty: detail.packQty,
-								toPackQty: detail.packQty
-							}]
-							subList.push(submitItem)
-						}
-					})
-				})
-				if (subList.length > 0) {
-					this.dataContent.toWarehouseCode = subList[0].toWarehouseCode;
-				}
-				this.dataContent.subList = subList
-				this.dataContent.creator = creator;
-				this.dataContent.fromWarehouseCode = this.fromWarehouseCode;
-				return this.dataContent;
-			},
-
-			showMessage(message) {
-				this.$refs.comMessage.showMessage(message, res => {
-					if (res) {}
-				});
-			},
-
-			showScanMessage(message) {
-				this.$refs.comMessage.showScanMessage(message);
-			},
-
-			afterCloseMessage() {
-				this.scanPopupGetFocus();
-			},
-
-			closeScanMessage() {
-				this.scanPopupGetFocus();
-			},
-			getLocation(location, code) {
-				this.getFromLocationCode(location, code)
-			},
-			getFromLocationCode(location, code) {
-				this.fromLocationInfo = location;
-				this.fromLocationCode = code;
-				this.openScanPopup();
-			},
-			getToLocationCode(location, code) {
-				if (this.fromLocationCode == code) {
-					uni.showToast({
-						title: "来源库位[" + this.fromLocationCode + "]不能与目标库位[" + code + "]一致",
-						duration: 2000
-					})
-					return
-				}
-				this.toLocationCode = code;
-			},
-
-			showCommitSuccessMessage(hint) {
-				this.$refs.comMessage.showSuccessMessage(hint, res => {
-					this.clearData();
-				})
-			},
-
-			updateData() {
-				calcHandleQty(this.detailSource);
-				for (var i = 0; i < this.detailSource.length; i++) {
-					let item = this.detailSource[i];
-					if (item.qty == 0) {
-						this.detailSource.splice(i, 1)
-					}
-				}
-				this.$forceUpdate();
-
-			},
-
-			clearData() {
-				this.fromLocationInfo = {};
-				this.fromLocationCode = '';
-				this.fromWarehouseCode = '';
-				this.toWarehouseCode = '';
-				this.detailSource = [];
-				this.positionInfo = "请选择生产线";
-			}
-		}
-	}
+      }
+    }
+  });
+};
+
+const showBalanceSelect = (items) => {
+  // 显示库存选择弹窗的逻辑
+};
+
+const selectBalanceItem = (balance) => {
+  resultData.value.balance = balance;
+  afterGetBalance(resultData.value);
+};
+
+const afterGetBalance = (result) => {
+  const balance = result.balance;
+  const label = result.label;
+  const pack = result.package;
+  const packUnit = pack.packUnit;
+  const packQty = pack.packQty;
+
+  let item = detailSource.value.find(res => res.itemCode === balance.itemCode);
+  if (fromWarehouseCode.value === '') {
+    fromWarehouseCode.value = balance.warehouseCode;
+  }
+  if (!item) {
+    const itemp = createItemInfo(balance, pack);
+    const newDetail = createDetailInfo(balance, pack);
+    newDetail.parentNumber = pack.parentNumber;
+    newDetail.packingNumber = pack.number;
+    newDetail.packUnit = packUnit;
+    newDetail.packQty = packQty;
+    itemp.subList.push(newDetail);
+    detailSource.value.push(itemp);
+    calcHandleQty(detailSource.value);
+  } else {
+    let detail = item.subList.find(r => r.packingNumber === pack.number && r.batch === balance.batch && r.locationCode === balance.locationCode && r.inventoryStatus === balance.inventoryStatus);
+    if (!detail) {
+      const newDetail = createDetailInfo(balance, pack);
+      newDetail.parentNumber = pack.parentNumber;
+      newDetail.packingNumber = pack.number;
+      newDetail.packUnit = packUnit;
+      newDetail.packQty = packQty;
+      item.subList.push(newDetail);
+      calcHandleQty(detailSource.value);
+    } else {
+      if (detail.scaned) {
+        showErrorMessage(`箱码[${detail.packingNumber}]批次[${balance.batch}]重复扫描`);
+      }
+    }
+  }
+};
+
+const getRecommendLocation = (balance, pack, callback) => {
+  uni.showLoading({
+    title: '扫描中...',
+    mask: true
+  });
+  const recommend = recommendLocationList.value.find(r => r.itemCode === balance.itemCode);
+  if (!recommend) {
+    const param = {
+      itemCode: balance.itemCode,
+      batch: balance.batch,
+      inventoryStatus: balance.inventoryStatus,
+      supplierCode: pack.supplierCode,
+      businessCode: businessTypeCode.value
+    };
+    console.log(JSON.stringify(param));
+    uni.request({
+      url: '/api/getPutawayRecommendLocation',
+      method: 'POST',
+      data: param,
+      success: (res) => {
+        recommendLocationList.value.push({
+          itemCode: balance.itemCode,
+          locationCode: res.data.code
+        });
+        callback(res.data);
+        uni.hideLoading();
+      },
+      fail: (error) => {
+        uni.hideLoading();
+        showErrorMessage(error);
+      }
+    });
+  } else {
+    callback(recommend);
+  }
+};
+
+const calcHandleQty = (source) => {
+  for (let item of source) {
+    item.qty = 0;
+    for (let detail of item.subList) {
+      if (detail) {
+        item.qty = calc.add(item.qty, detail.qty);
+      }
+    }
+  }
+};
+
+const showSelect = () => {
+  show.value = true;
+};
+onLoad((option) => {
+  uni.setNavigationBarTitle({
+    title: option.title
+  });
+  clearData();
+  getBusinessType(businessTypeCode.value, () => {});
+  getWorkShopLineStation();
+});
+
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome();
+  }
+});
+
+const confirmSelect = (e) => {
+  positionInfo.value = e[0].label + '-' + e[1].label + '-' + e[2].label;
+  console.log('位置', positionInfo.value);
+  workshopCode.value = e[0].value;
+  productionLineCode.value = e[1].value;
+  workStationCode.value = e[2].value;
+  workShopName.value = e[0].label;
+  productionLineName.value = e[1].label;
+  workStationName.value = e[2].label;
+
+  let shop = positionList.value.find(shop => shop.value === workshopCode.value);
+  if (shop && shop.children) {
+    let prodLine = shop.children.find(line => line.value === productionLineCode.value);
+    if (prodLine && prodLine.children) {
+      let station = prodLine.children.find(r => r.value === workStationCode.value);
+      if (station.rawLocationCode === '' || station.rawLocationCode === null) {
+        showErrorMessage(workStationName.value + '的原材料库位为空,请重新选择');
+        return;
+      } else {
+        rawLocationCode.value = station.rawLocationCode;
+        fgLocationCode.value = station.fgLocationCode;
+      }
+    } else {
+      showErrorMessage('生产线-工位基础信息维护错误');
+    }
+  } else {
+    showErrorMessage('车间-生产线基础信息维护错误');
+  }
+
+  let toLocationCode = '';
+  positionList.value.forEach(item => {
+    if (workshopCode.value === item.value) { // 车间
+      item.children.find(child => {
+        if (productionLineCode.value === child.value) {
+          toLocationCode = child.children.find(subChild => workStationCode.value === subChild.value).rawLocationCode;
+        }
+      });
+    }
+  });
+  detailSource.value.forEach(item => {
+    item.subList.forEach(detail => {
+      detail.toLocationCode = toLocationCode;
+      detail.productionLineCode = productionLineCode.value;
+      detail.workStationCode = workStationCode.value;
+    });
+  });
+};
+
+const removeItem = (index) => {
+  detailSource.value.splice(index, 1);
+};
+
+const removePack = () => {
+  for (let i = 0; i < detailSource.value.length; i++) {
+    let item = detailSource.value[i];
+    if (item.subList.length === 0) {
+      detailSource.value.splice(i, 1);
+    }
+  }
+  updateData();
+};
+
+const openScanPopup = () => {
+  if (fromLocationCode.value === '') {
+    showFromLocationPopup();
+    return;
+  }
+  scanPopupRef.value.openScanPopupForType(fromLocationCode.value, businessType.value);
+};
+
+const closeScanPopup = () => {
+  if (scanPopupRef.value) {
+    scanPopupRef.value.closeScanPopup();
+  }
+};
+
+const scanPopupGetFocus = () => {
+  if (scanPopupRef.value) {
+    scanPopupRef.value.getfocus();
+  }
+};
+
+const commit = () => {
+  uni.showLoading({
+    title: '提交中....',
+    mask: true
+  });
+
+  let precisionStrategyParams = getPrecisionStrategyParams(detailSource.value);
+  getPrecisionStrategyList(precisionStrategyParams, res => {
+    if (res.success) {
+      managementList.value = res.list;
+      let params = setRecordParams();
+      console.log('提交参数', JSON.stringify(params));
+
+      issueRecordSubmit(params).then(res => {
+        uni.hideLoading();
+        if (res.data) {
+          showCommitSuccessMessage(`提交成功\n生成直接发料记录\n${res.data}`);
+        } else {
+          showErrorMessage(`提交失败[${res.msg}]`);
+        }
+      }).catch(error => {
+        uni.hideLoading();
+        showErrorMessage(error);
+      });
+    } else {
+      uni.hideLoading();
+      showErrorMessage(res.message);
+    }
+  });
+};
+
+const setRecordParams = () => {
+  let subList = [];
+  let creator = store.state.user.id;
+  detailSource.value.forEach(item => {
+    item.subList.forEach(detail => {
+      if (detail.scaned) {
+        let info = getPackingNumberAndBatchByList(managementList.value, detail.itemCode, detail.packingNumber, detail.toLocationCode, detail.batch);
+        let submitItem = deepCopyData(detail);
+        submitItem.toPackingNumber = info.packingNumber;
+        submitItem.toBatch = info.batch;
+        submitItem.toContainerNumber = detail.containerNumber;
+
+        submitItem.fromPackingNumber = info.packingNumber;
+        submitItem.fromBatch = info.batch;
+        submitItem.fromContainerNumber = detail.containerNumber;
+
+        submitItem.fromLocationCode = detail.locationCode;
+        submitItem.toLocationCode = detail.toLocationCode;
+
+        submitItem.qty = detail.handleQty;
+        submitItem.package = '';
+        submitItem.recordList = [{
+          toInventoryStatus: detail.inventoryStatus,
+          fromParentPackingNumber: detail.parentNumber,
+          fromPackingNumber: info.packingNumber,
+          fromBatch: info.batch,
+          toPackingNumber: info.packingNumber,
+          toBatch: info.batch,
+          fromLocationCode: detail.locationCode,
+          toLocationCode: detail.toLocationCode,
+          handleQty: detail.handleQty,
+          fromPackUnit: detail.packUnit,
+          toPackUnit: detail.packUnit,
+          fromPackQty: detail.packQty,
+          toPackQty: detail.packQty
+        }];
+        subList.push(submitItem);
+      }
+    });
+  });
+  if (subList.length > 0) {
+    dataContent.value.toWarehouseCode = subList[0].toWarehouseCode;
+  }
+  dataContent.value.subList = subList;
+  dataContent.value.creator = creator;
+  dataContent.value.fromWarehouseCode = fromWarehouseCode.value;
+  return dataContent.value;
+};
+
+const showMessage = (message) => {
+  comMessageRef.value.showMessage(message, res => {
+    if (res) {}
+  });
+};
+
+const showScanMessage = (message) => {
+  comMessageRef.value.showScanMessage(message);
+};
+
+const afterCloseMessage = () => {
+  scanPopupGetFocus();
+};
+
+const closeScanMessage = () => {
+  scanPopupGetFocus();
+};
+
+const getLocation = (location, code) => {
+  getFromLocationCode(location, code);
+};
+
+const getFromLocationCode = (location, code) => {
+  fromLocationInfo.value = location;
+  fromLocationCode.value = code;
+  openScanPopup();
+};
+
+const getToLocationCode = (location, code) => {
+  if (fromLocationCode.value === code) {
+    uni.showToast({
+      title: `来源库位[${fromLocationCode.value}]不能与目标库位[${code}]一致`,
+      duration: 2000
+    });
+    return;
+  }
+  toLocationCode.value = code;
+};
+
+const showCommitSuccessMessage = (hint) => {
+  comMessageRef.value.showSuccessMessage(hint, res => {
+    clearData();
+  });
+};
+
+const updateData = () => {
+  calcHandleQty(detailSource.value);
+  for (let i = 0; i < detailSource.value.length; i++) {
+    let item = detailSource.value[i];
+    if (item.qty === 0) {
+      detailSource.value.splice(i, 1);
+    }
+  }
+};
+
+const clearData = () => {
+  fromLocationInfo.value = {};
+  fromLocationCode.value = '';
+  fromWarehouseCode.value = '';
+  toWarehouseCode.value = '';
+  detailSource.value = [];
+  positionInfo.value = '请选择生产线';
+};
+
+
+
+
+// 生命周期钩子
+onLoad((option) => {
+  uni.setNavigationBarTitle({
+    title: option.title
+  });
+  clearData();
+  getBusinessType(businessTypeCode.value, () => {});
+  getWorkShopLineStation();
+});
+
+onNavigationBarButtonTap((e) => {
+  if (e.index === 0) {
+    goHome();
+  }
+});
+
 </script>
 
 <style scoped lang="scss">
diff --git a/src/pages/point/index.vue b/src/pages/point/index.vue
index 1a3ec74a..a32305db 100644
--- a/src/pages/point/index.vue
+++ b/src/pages/point/index.vue
@@ -77,219 +77,195 @@
   </view>
 </template>
 
-<script>
+<script setup>
 // 打印页面的模板
 const htmlFileUrl = '/hybrid/html/point.html';
 import {
   pathToBase64
 } from "../../api/img-to-base64.js" //引入解压后的js文件，这里我重新命名了文件名
 // #ifdef APP
-var testModule = uni.requireNativePlugin("TestModule")
+let testModule = uni.requireNativePlugin("TestModule")
 // #endif
+import { ref, watch } from 'vue'
+import { onLoad } from '@dcloudio/uni-app'
 
-export default {
-  name: 'point',
-  data() {
-    return {
-      timer: null,
-      originData: [],
-      data: [],
-      newHtmlContent: '', //打印传入的html
-      isLoadFinish: false,
-      picIndex: 0,
-      picUrl: []
-    }
-  },
-
-  methods: {
-    success(img, item) {
-      item.barcodeBase641 = img
-      uni.hideLoading()
-      this.isLoadFinish = true
-      // #ifdef APP
-      plus.io.resolveLocalFileSystemURL(item.barcodeBase641, (entry) => {
-        // 可通过entry对象操作test.html文件
-        entry.file((file) => {
-          let fileReader = new plus.io.FileReader();
-          fileReader.onloadend = (evt) => {
-            console.log("文件路径" + evt.target.result)
-            item.barcodeBase64 = evt.target.result
-          }
-          fileReader.readAsDataURL(file);
-        });
-      }, (e) => {
-        console.log("失败" + e)
-      });
-      // #endif
-    },
-    setHtmlData() {
-      let str = ''
-      this.readFile(htmlFileUrl, (htmlContent) => {
-        this.newHtmlContent = htmlContent
-        this.data.forEach(item => {
-          str += `<div class="box" style="page-break-before:always;"><br />
-									<div class="left">
-										<div class="left-item">
-											<div class="label bold-label">物品代码</div>
-											<div class="value bold-font font-30" id="name1">${item.itemCode}</div>
-										</div>
-										<div class="left-item">
-											<div class="label">物品名称</div>
-											<div class="value font-30" id="name2">${item.itemName}</div>
-										</div>
-										<div class="left-item">
-											<div class="label">包装名称</div>
-											<div class="value font-20">${item.packName}</div>
-										</div>
-										<div class="left-item">
-											<div class="label">包装号</div>
-											<div class="value font-20">${item.packageCode}</div>
-										</div>`
-          if (item.productionLineCode && item.productionLineCode.length > 0) {
-            str += `
-											<div class="left-item">
-												<div class="label">生产线</div>
-												<div class="value font-20">${item.productionLineCode}</div>
-											</div>
-									`
-          } else {
-            str += `
-											<div class="left-item">
-												<div class="label bold-label">父包装号</div>
-												<div class="value bold-font font-20">${item.parentNumber}</div>
-											</div>
-											<div class="left-item">
-												<div class="label">ASN</div>
-												<div class="value font-20">${item.asnNumber}</div>
-											</div>
-								`
-          }
-          str += `
-										<div class="left-item">
-											<div class="label">数量</div>
-											<div class="value bold-font font-30">${item.qty}</div>
-										</div>`
-          if (item.fromLocationCode && item.fromLocationCode.length > 0) {
-            str += `
-										<div class="left-item">
-											<div class="label">来源库位</div>
-											<div class="value font-20">${item.fromLocationCode}</div>
-										</div>
-									</div>`
-          }
-          str += `
-									<div class="right">
-										<div class="image">
-											<img id='image1' src="${item.barcodeBase64}" alt="" />
-										</div>
-										<div class="left-item">
-											<div class="label">批次</div>
-											<div class="value font-20">${item.batch}</div>
-										</div>
-										<div class="left-item">
-											<div class="label">物料类型</div>
-											<div class="value font-20">${item.itemType}</div>
-										</div>`
-          if (!(item.productionLineCode && item.productionLineCode.length > 0)) {
-            str += `
-											<div class="left-item">
-												<div class="label">供应商</div>
-												<div class="value font-20">${item.supplierCode}</div>
-											</div>
-									`
-          }
-          str += `
+const timer = ref(null)
+const originData = ref([])
+const data = ref([])
+const newHtmlContent = ref('')
+const isLoadFinish = ref(false)
+const picIndex = ref(0)
+const picUrl = ref([])
 
-										<div class="left-item">
-											<div class="label">打印时间</div>
-											<div class="value font-20">${item.printTimes}</div>
-										</div>
-									`
-          if (item.fromLocationCode && item.fromLocationCode.length > 0) {
-            str += `
-										<div class="left-item">
-											<div class="label"></div>
-											<div class="value"></div>
-										</div>
-									</div>
-								</div>`
-          }
-
-        })
+const success = (img, item) => {
+  item.barcodeBase641 = img
+  uni.hideLoading()
+  isLoadFinish.value = true
+  // #ifdef APP
+  plus.io.resolveLocalFileSystemURL(item.barcodeBase641, (entry) => {
+    entry.file((file) => {
+      const fileReader = new plus.io.FileReader()
+      fileReader.onloadend = (evt) => {
+        console.log("文件路径" + evt.target.result)
+        item.barcodeBase64 = evt.target.result
+      }
+      fileReader.readAsDataURL(file)
+    }, (e) => {
+      console.log("失败" + e)
+    })
+  })
+  // #endif
+}
 
-        console.log('str', str)
-        this.newHtmlContent = this.newHtmlContent.replace(
-            "mainBody", str); //替换物品代码
-      });
-    },
-    printImage() {
-      uni.showLoading({
-        title: "加载中",
-        mask: true
-      })
-      this.setHtmlData()
-      let clearInt = setInterval(() => {
-        if (!this.newHtmlContent.mainBody) {
-          // #ifdef APP
-          testModule.doHTMLPrint(this.newHtmlContent)
-          // #endif
-          clearInterval(clearInt)
-          uni.hideLoading()
-        }
-      }, 1000)
-    },
+const setHtmlData = () => {
+  let str = ''
+  readFile(htmlFileUrl, (htmlContent) => {
+    newHtmlContent.value = htmlContent
+    data.value.forEach(item => {
+      str += `<div class="box" style="page-break-before:always;"><br />
+        <div class="left">
+          <div class="left-item">
+            <div class="label bold-label">物品代码</div>
+            <div class="value bold-font font-30" id="name1">${item.itemCode}</div>
+          </div>
+          <div class="left-item">
+            <div class="label">物品名称</div>
+            <div class="value font-30" id="name2">${item.itemName}</div>
+          </div>
+          <div class="left-item">
+            <div class="label">包装名称</div>
+            <div class="value font-20">${item.packName}</div>
+          </div>
+          <div class="left-item">
+            <div class="label">包装号</div>
+            <div class="value font-20">${item.packageCode}</div>
+          </div>`
+      if (item.productionLineCode && item.productionLineCode.length > 0) {
+        str += `
+          <div class="left-item">
+            <div class="label">生产线</div>
+            <div class="value font-20">${item.productionLineCode}</div>
+          </div>
+        `
+      } else {
+        str += `
+          <div class="left-item">
+            <div class="label bold-label">父包装号</div>
+            <div class="value bold-font font-20">${item.parentNumber}</div>
+          </div>
+          <div class="left-item">
+            <div class="label">ASN</div>
+            <div class="value font-20">${item.asnNumber}</div>
+          </div>
+        `
+      }
+      str += `
+        <div class="left-item">
+          <div class="label">数量</div>
+          <div class="value bold-font font-30">${item.qty}</div>
+        </div>`
+      if (item.fromLocationCode && item.fromLocationCode.length > 0) {
+        str += `
+        <div class="left-item">
+          <div class="label">来源库位</div>
+          <div class="value font-20">${item.fromLocationCode}</div>
+        </div>
+      </div>`
+      }
+      str += `
+        <div class="right">
+          <div class="image">
+            <img id='image1' src="${item.barcodeBase64}" alt="" />
+          </div>
+          <div class="left-item">
+            <div class="label">批次</div>
+            <div class="value font-20">${item.batch}</div>
+          </div>
+          <div class="left-item">
+            <div class="label">物料类型</div>
+            <div class="value font-20">${item.itemType}</div>
+          </div>`
+      if (!(item.productionLineCode && item.productionLineCode.length > 0)) {
+        str += `
+          <div class="left-item">
+            <div class="label">供应商</div>
+            <div class="value font-20">${item.supplierCode}</div>
+          </div>
+        `
+      }
+      str += `
+        <div class="left-item">
+          <div class="label">打印时间</div>
+          <div class="value font-20">${item.printTimes}</div>
+        </div>
+      `
+      if (item.fromLocationCode && item.fromLocationCode.length > 0) {
+        str += `
+        <div class="left-item">
+          <div class="label"></div>
+          <div class="value"></div>
+        </div>
+      </div>
+    </div>`
+      }
+    })
 
-    // #ifdef APP
-    // 读取html文件
-    readFile(path, callback) {
-      plus.io.resolveLocalFileSystemURL(path, function (entry) {
-        entry.file(function (file) {
-          var reader = new plus.io.FileReader();
-          reader.onloadend = function (e) {
-            callback(e.target.result);
-          };
-          reader.readAsText(file);
-        }, function (e) {
-          console.log("读取文件失败：" + e.message);
-        });
-      }, function (e) {
-        console.log("获取图片资源失败：" + e.message);
-      });
-    }
-    // #endif
-  },
+    console.log('str', str)
+    newHtmlContent.value = newHtmlContent.value.replace("mainBody", str) // 替换物品代码
+  })
+}
 
-  onLoad(option) {
-    uni.showLoading({
-      title: '加载中...',
-      mask: true
-    });
-    if (option.points) {
-      this.originData = JSON.parse(option.points);
+const printImage = () => {
+  uni.showLoading({
+    title: "加载中",
+    mask: true
+  })
+  setHtmlData()
+  let clearInt = setInterval(() => {
+    if (newHtmlContent.value && newHtmlContent.value.mainBody) {
+      // #ifdef APP
+      testModule.doHTMLPrint(newHtmlContent.value)
+      // #endif
+      clearInterval(clearInt)
+      uni.hideLoading()
     }
-    this.data = this.originData
+  }, 1000)
+}
 
-// 			this.data = [
-//   {
-//     "itemCode": "250.832-02",
-//     "itemName": "线束1右件ZH",
-//     "packName": "内部周转箱",
-//     "packageCode": "PN20240906-0000000001",
-//     "batch": "20240719",
-//     "parentNumber": null,
-//     "itemType": "外购件",
-//     "asnNumber": "ASNS20240731-0002",
-//     "supplierCode": "49000599",
-//     "qty": 90,
-//     "printTimes": "2024-09-06+09:29:37",
-//     "productionLineCode": null,
-// 	"fromLocationCode": "C01-190-10",
-//     "barcodeString": "HPQ;V1.0;B20240719;AASNS20240731-0002;Q90.000000;I250.832-02;L;PPN20240906-0000000001;S49000599;O49000599;L12;E;UPC;",
-//     "barcodeBase64": ""
-//   }
-// ]
-  },
+// #ifdef APP
+// 读取html文件
+const readFile = (path, callback) => {
+  plus.io.resolveLocalFileSystemURL(path, function (entry) {
+    entry.file(function (file) {
+      const reader = new plus.io.FileReader()
+      reader.onloadend = function (e) {
+        callback(e.target.result)
+      }
+      reader.readAsText(file)
+    }, function (e) {
+      console.log("读取文件失败：" + e.message)
+    })
+  }, function (e) {
+    console.log("获取图片资源失败：" + e.message)
+  })
 }
+// #endif
+
+onLoad((option) => {
+  uni.showLoading({
+    title: '加载中...',
+    mask: true
+  })
+  if (option.points) {
+    originData.value = JSON.parse(option.points)
+  }
+  data.value = originData.value
+})
+
+watch(isLoadFinish, (newVal, oldVal) => {
+  if (newVal === true) {
+  }
+}, { immediate: true })
 </script>
 
 <style>
diff --git a/src/pages/productPutaway/job/semiProductPutawayJob.vue b/src/pages/productPutaway/job/semiProductPutawayJob.vue
index fa8fab48..163ee34e 100644
--- a/src/pages/productPutaway/job/semiProductPutawayJob.vue
+++ b/src/pages/productPutaway/job/semiProductPutawayJob.vue
@@ -5,13 +5,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, getCurrentInstance, nextTick } from 'vue'
+import { ref, nextTick } from 'vue'
 import {
   onLoad,
   onShow,
   onNavigationBarButtonTap,
-  onReady,
-  onBackPress,
   onReachBottom,
   onPullDownRefresh,
   onHide, onUnload
@@ -35,9 +33,6 @@ onHide(()=>{
     productPutawayJobRef.value.stopRefresh()
   }
 })
-const onReachBottom = ()=> {
-  productPutawayJobRef.value.onReach();
-}
 onUnload(()=>{
   if (productPutawayJobRef.value) {
     productPutawayJobRef.value.stopRefresh()