From 1952d7b7e8b08162fb4af799679d18468bfe7f8d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Thu, 7 Nov 2024 09:08:47 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=81=E7=A7=BBVue2=E5=8D=87=E7=BA=A7Vue3?=
 =?UTF-8?q?=208/2-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/mycomponents/balance/balanceSelect.vue    |  1 +
 src/mycomponents/item/itemFilter.vue          |  8 +++++--
 src/mycomponents/job/jobFilter.vue            |  7 +++---
 src/mycomponents/package/packageCard.vue      |  2 +-
 src/mycomponents/package/packageList.vue      |  2 +-
 src/mycomponents/scan/winComScan.vue          |  2 +-
 src/mycomponents/scan/winScanItem.vue         |  2 +-
 src/mycomponents/scan/winScanLocation.vue     |  8 +++----
 .../scan/winScanPackAndLocation.vue           |  8 +++----
 src/pages/putaway/job/putawayJob.vue          |  1 +
 src/pages/putaway/record/putawayRecord.vue    | 22 +++++++++----------
 src/pages/query/item.vue                      |  2 +-
 12 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/mycomponents/balance/balanceSelect.vue b/src/mycomponents/balance/balanceSelect.vue
index 4d631b7b..ec79a6ae 100644
--- a/src/mycomponents/balance/balanceSelect.vue
+++ b/src/mycomponents/balance/balanceSelect.vue
@@ -24,6 +24,7 @@ import item from '@/mycomponents/item/item.vue'
 import balance from '@/mycomponents/balance/balance.vue'
 
 const balanceItems = ref([])
+const show = ref(false)
 const openPopup = (items) => {
   if (Array.isArray(items)) {
     balanceItems.value = items
diff --git a/src/mycomponents/item/itemFilter.vue b/src/mycomponents/item/itemFilter.vue
index 3e5c0aea..2935572f 100644
--- a/src/mycomponents/item/itemFilter.vue
+++ b/src/mycomponents/item/itemFilter.vue
@@ -6,7 +6,7 @@
 
       <view class="uni-flex" style="flex-direction: column; width: 100%; margin-top: 10rpx">
         <view class="" style="font-size: 35rpx; margin-bottom: 10rpx"> 库位 </view>
-        <u-einput v-model="locationCode" placeholder="请输入库位"></u-einput>
+        <u-input v-model="locationCode" placeholder="请输入库位"></u-input>
       </view>
       <view class="" style="font-size: 35rpx; margin-top: 10rpx; margin-bottom: 10rpx">
         库存状态 :
@@ -108,8 +108,12 @@ const clearData = ()=>{
   locationCode.value = ''
   state.value = []
 }
-// 传递给父类
 const emit = defineEmits(['onConfirmClick', 'switchChangeToday'])
+defineExpose({
+  openFilter,
+  closeScanPopup,
+  clearData
+})
 </script>
 <style lang="scss">
 .maskbox {
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 48665471..041b3e1c 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -1,5 +1,5 @@
 <template>
-  <uni-popup ref="popup">
+  <u-popup v-model="show" mode="top">
     <view class="maskbox" @tap="maskClick"></view>
     <view class="uni-flex uni-column center"
           style="background-color: white;width: 100%; height:auto;padding: 20rpx;z-index: 99;position: relative; border-radius: 10rpx;">
@@ -90,7 +90,7 @@
       </view>
     </view>
 
-  </uni-popup>
+  </u-popup>
   <win-scan-job-number ref="scanNumber" title="任务编号" @getScanCode='getScanNumber'></win-scan-job-number>
   <win-scan-asn-number ref="scanAsnNumber" :title="otherTitle" @getScanCode='getScanAsNumber'></win-scan-asn-number>
 </template>
@@ -183,7 +183,6 @@ const fromAreaCode = ref('')
 const isOnToday = ref(false)
 const isOnWait = ref(false)
 const params = ref({})
-const popup = ref(null)
 // 监视属性
 watch(
   () => props.checkedToday,
@@ -252,7 +251,7 @@ const openFilter = () => {
   show.value = true
 }
 const openFilterParams = (params)=>{
-  popup.value.open('top')
+  show.value = true
   if(params){
     productionLineCode.value = params.productionLineCode
     fromLocationCode.value = params.fromLocationCode
diff --git a/src/mycomponents/package/packageCard.vue b/src/mycomponents/package/packageCard.vue
index 5ff8a7f1..644bec56 100644
--- a/src/mycomponents/package/packageCard.vue
+++ b/src/mycomponents/package/packageCard.vue
@@ -34,7 +34,7 @@ import batch from '@/mycomponents/balance/batch.vue'
 import recommendQty from '@/mycomponents/qty/recommendQty.vue'
 import compareQty from '@/mycomponents/qty/compareQty.vue'
 import config from '@/static/config.js'
-
+import {watch} from 'vue'
 const props = defineProps({
   dataContent: {
     type: Object,
diff --git a/src/mycomponents/package/packageList.vue b/src/mycomponents/package/packageList.vue
index 89b70949..c5f73196 100644
--- a/src/mycomponents/package/packageList.vue
+++ b/src/mycomponents/package/packageList.vue
@@ -7,7 +7,7 @@
             <u-swipe-action :options="item.scaned && isEdit ? editAndRemoveOptions : item.scaned ? removeOptions : options" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, cur, 'parent')">
               <package-card :dataContent="item" :isShowLocation="false"
                             :isShowFromLocation="isShowFromLocation"
-                            :isShowStatus="isShowStatus" :isShowStatus="isShowPackListStatus">
+                            :isShowStatus="isShowStatus">
               </package-card>
             </u-swipe-action>
           </template>
diff --git a/src/mycomponents/scan/winComScan.vue b/src/mycomponents/scan/winComScan.vue
index 5c1de92d..78be63a9 100644
--- a/src/mycomponents/scan/winComScan.vue
+++ b/src/mycomponents/scan/winComScan.vue
@@ -84,7 +84,7 @@ const scanList = ref([])
 const expand = ref(true)
 const expendIcon = ref('arrow-down')
 const cursorIndex = ref(0)
-const comMessageRef = ref('')
+const comMessageRef = ref(null)
 placeholderValue.value = `请扫描${props.placeholder}`
 onMounted(() => {
 
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index 44592381..b2022a23 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -52,8 +52,8 @@ const scan = ref()
 const expendIcon = ref('arrow-down')
 const comMessageRef = ref()
 const openScanPopup = () => {
-  isShow.value = true
   setTimeout((res) => {
+    isShow.value = true
     getfocus()
   }, 500)
 }
diff --git a/src/mycomponents/scan/winScanLocation.vue b/src/mycomponents/scan/winScanLocation.vue
index 01368ef5..53b80cc5 100644
--- a/src/mycomponents/scan/winScanLocation.vue
+++ b/src/mycomponents/scan/winScanLocation.vue
@@ -44,12 +44,12 @@ const props = defineProps({
 const code = ref('')
 const location = ref({})
 const show = ref(false)
-const scan = ref()
-const comMessageRef = ref()
-const comscansimulate = ref()
+const scan = ref(null)
+const comMessageRef = ref(null)
+const comscansimulate = ref(null)
 const openScanPopup = () => {
-  show.value = true
   setTimeout((res) => {
+    show.value = true
     getfocus()
   }, 500)
 }
diff --git a/src/mycomponents/scan/winScanPackAndLocation.vue b/src/mycomponents/scan/winScanPackAndLocation.vue
index eca60627..22e73f4c 100644
--- a/src/mycomponents/scan/winScanPackAndLocation.vue
+++ b/src/mycomponents/scan/winScanPackAndLocation.vue
@@ -1,10 +1,9 @@
 <template>
   <view>
-    <u-popup v-model="show" mode="bottom" :mask-close-able="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"> 扫描{{ title }} </view>
-
           <view class="">
             <image class="fr icons_scan_close" src="/static/icons/icons_scan_close.svg" @click="closeScanPopup()"> </image>
           </view>
@@ -48,7 +47,6 @@ import { getBasicLocationByCode } from '@/api/request2.js'
 
 import { getListLocationAreaTypeDesc, checkDirectoryItemExist, getDirectoryItemArray, getLocationAreaTypeName, getInventoryStatusDesc } from '@/common/directory.js'
 import { getLabelInfo } from '@/common/label.js'
-import {a} from "unocss-preset-weapp/dist/utilities-322cd311";
 
 const { proxy } = getCurrentInstance()
 const props = defineProps({
@@ -114,8 +112,8 @@ const managementPrecision = ref('')
 const fromInventoryStatuses = ref('')
 const isCheck = ref(false)
 const balanceSelectRef = ref()
-const comscan = ref()
-const comMessageRef = ref()
+const comscan = ref(null)
+const comMessageRef = ref(null)
 const location = ref()
 const chooseWhich = ref('1')
 const handleConfirm = () => {
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 8744cb3f..45c48c69 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -56,6 +56,7 @@ const comMessageRef = ref()
 const scanPopup = ref()
 const jobListRef = ref()
 const jobInfoPopup = ref()
+const checkedWaitTask = ref(null)
 onShow(() => {
   nextTick(() => {
     getList('refresh')
diff --git a/src/pages/putaway/record/putawayRecord.vue b/src/pages/putaway/record/putawayRecord.vue
index d0779185..f7324119 100644
--- a/src/pages/putaway/record/putawayRecord.vue
+++ b/src/pages/putaway/record/putawayRecord.vue
@@ -43,7 +43,8 @@
     </view>
     <win-scan-pack-and-location ref="scanPopup" @getResult="getScanResult" :allowModifyLocation="false"> </win-scan-pack-and-location>
     <com-message ref="comMessageRef" />
-    <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation="getLocation" :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
+    <win-scan-location ref="scanLocationCode" title="来源库位" @getLocation='getLocation'
+                       :locationAreaTypeList="fromLocationAreaTypeList"></win-scan-location>
     <win-scan-location ref="scanToLocationCode" title="目标库位" @getLocation='getToLocationCode'
                        :locationAreaTypeList="toLocationAreaTypeList"></win-scan-location>
   </view>
@@ -51,7 +52,7 @@
 
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
-import { onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh } from '@dcloudio/uni-app'
+import {onLoad, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh, onShow} from '@dcloudio/uni-app'
 import { putawayRecordSubmit, getPutawayRecommendLocation,
   checkItemCodeAndLocation,
   recommendLocationRemoveExpectin } from '@/api/request2.js'
@@ -67,14 +68,15 @@ import { getBusinessType, createItemInfo, createDetailInfo, calcHandleQty } from
 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 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 { useCountStore } from '@/store'
-// 获取自定义的store
+import {a} from "unocss-preset-weapp/dist/utilities-322cd311";
+
 const store = useCountStore()
 const { proxy } = getCurrentInstance()
 const id = ref('')
@@ -91,9 +93,9 @@ const showToLoaction = ref(true)
 const recommendLocationList = ref([]) // 推荐库位列表
 const fromWarehouseCode = ref('') // 来源仓库
 const businessTypeCode = ref('PurchasePutaway')
-const comMessageRef = ref()
-const scanPopup = ref()
-const scanLocationCode = ref()
+const comMessageRef = ref(null)
+const scanPopup = ref(null)
+const scanLocationCode = ref(null)
 const managementList = ref([])
 const toLocationCode = ref()
 const toWarehouseCode = ref('')
@@ -254,9 +256,7 @@ const openScanPopup = () => {
 }
 
 const showFromLocationPopup = () => {
-  nextTick(() => {
-    scanLocationCode.value.openScanPopup()
-  })
+  scanLocationCode.value.openScanPopup()
 }
 
 const closeScanPopup = () => {
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index 9fb8d6d1..fac55f78 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -68,7 +68,7 @@
 	const scanPopup = ref()
 	const paging = ref()
 	const comMessageRef = ref()
-	const filter = ref()
+	const filter = ref(null)
   const topHeight = ref(115)
   const topContent = ref(null)
 	onNavigationBarButtonTap((e) => {