From f0d3f18ddd47896806f4f950ed21f18cf3cbea0b 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 11:02:49 +0800
Subject: [PATCH] =?UTF-8?q?import=20BalanceSelect=20=E6=94=B9=E6=88=90?=
 =?UTF-8?q?=E5=A4=A7=E5=86=99=20=E6=96=87=E4=BB=B6=E8=BF=81=E7=A7=BBVue2?=
 =?UTF-8?q?=E5=8D=87=E7=BA=A7Vue3=208/2-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../detail/comRecommendDetailCard.vue         |  2 +-
 src/mycomponents/item/itemQty.vue             |  3 +-
 src/mycomponents/job/jobFilter.vue            |  2 +-
 src/mycomponents/qty/packUnit.vue             | 60 ++++++++++---------
 src/mycomponents/recommend/recommend.vue      |  2 +-
 src/mycomponents/scan/winComScanBalance.vue   |  7 +++
 src/mycomponents/scan/winScanPack.vue         |  4 +-
 src/mycomponents/scan/winScanPackLevel.vue    |  4 +-
 src/mycomponents/scan/winScanPackage.vue      |  4 +-
 src/pages/count/coms/comCountDetailcards.vue  |  2 +-
 src/pages/count/job/countLightDetail.vue      | 22 +++----
 .../coms/comInventoryDetailCard.vue           |  8 +--
 .../coms/comInventoryDetailCardBatch.vue      | 32 +++++-----
 src/pages/inventoryMove/coms/comMoveJob.vue   |  1 +
 src/pages/inventoryMove/job/moveJob.vue       |  4 +-
 src/pages/issue/job/issueJob.vue              |  1 -
 .../productionReturn/job/holdToReturnJob.vue  |  4 +-
 .../productionReturn/job/okToReturnJob.vue    |  2 +-
 src/pages/purchaseReceipt/job/receiptJob.vue  |  6 +-
 src/pages/unPlanned/job/issueJob.vue          |  2 +-
 20 files changed, 89 insertions(+), 83 deletions(-)

diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index a1851711..59bdd084 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -104,7 +104,7 @@ watch(() => props.dataContent, (newDataContent, oldDataContent) => {
     nextTick(() => {
       setTimeout(() => {
         if (collapse1.value) {
-          collapse1.value.resize();
+          collapse1.value.init();
         }
       }, 500);
     });
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index 3644adea..d48dc3b8 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -7,8 +7,7 @@
       <balance-qty v-if="isShowBalanceQty" :dataContent="dataContent"></balance-qty>
       <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)"
                    :handleQty="dataContent.handleQty" :isShowRecommendQty="isShowRecommendQty"
-                   :isShowStatus="false" :isShowStdPack="showStdPack">
-      </compare-qty>
+                   :isShowStatus="false" :isShowStdPack="showStdPack"></compare-qty>
     </view>
   </view>
 </template>
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 041b3e1c..4ff7671f 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -307,7 +307,7 @@ const getScanNumber = (val) => {
   scanNumber.value.closeScanPopup()
   closeScanPopup()
 }
-const emit = defineEmits(['switchChangeToday', 'switchChangeWait', 'onScanNumber', 'onScanAsnNumber', 'productionLineCode', 'fromLocationCode', 'fromLocationCodeConfirm'])
+const emit = defineEmits(['switchChangeToday', 'switchChangeWait', 'onScanNumber', 'onScanAsnNumber', 'productionLineCode', 'fromLocationCode', 'fromLocationCodeConfirm','onQuery'])
 defineExpose({ openFilter })
 </script>
 <style lang="scss">
diff --git a/src/mycomponents/qty/packUnit.vue b/src/mycomponents/qty/packUnit.vue
index eb42e8fa..a7377949 100644
--- a/src/mycomponents/qty/packUnit.vue
+++ b/src/mycomponents/qty/packUnit.vue
@@ -1,36 +1,38 @@
 <template>
-	<view class="std_pack" v-if="dataContent.packQty!=undefined">
-		<text>
-			<!-- {{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}} -->
-<!--			{{getPackUnit(dataContent.packUnit)}}({{Number(dataContent.packQty)}}{{getUom(dataContent.uom)}})-->
-      {{dataContent.packUnit}}({{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}})
-		</text>
-	</view>
+  <view class="std_pack" v-if="dataContent.packQty!=undefined">
+    <text>
+      <!-- {{Number(dataContent.packQty)}}{{getUomInfo(dataContent.uom)}}/{{getPackUnitName(dataContent.packUnit)}} -->
+      <!--			{{getPackUnit(dataContent.packUnit)}}({{Number(dataContent.packQty)}}{{getUom(dataContent.uom)}})-->
+      {{ dataContent.packUnit }}({{ Number(dataContent.packQty) }}{{ getUom(dataContent.uom) }})
+    </text>
+  </view>
 </template>
 <script setup lang="ts">
-	import {
-		getUomInfo,
-		getPackUnitName
-	} from '@/common/directory.js';
-	const props = defineProps({
-		dataContent: {
-			packQty: 1000,
-			uom: "EA",
-		}
-	})
-	const getUom = (uom) => {
-		let item = getUomInfo(uom);
-		if (item == '') {
-			return uom;
-		} else {
-			return item.label
-		}
-	}
+import {onLoad} from "@dcloudio/uni-app";
+import {
+  getUomInfo,
+  getPackUnitName
+} from '@/common/directory.js';
 
-	const getPackUnit = (packUnit) => {
-		let unit = getPackUnitName(packUnit);
-		return unit;
-	}
+const props = defineProps({
+  dataContent: {
+    packQty: 1000,
+    uom: "EA",
+  }
+})
+const getUom = (uom) => {
+  let item = getUomInfo(uom);
+  if (item == '') {
+    return uom;
+  } else {
+    return item.label
+  }
+}
+
+const getPackUnit = (packUnit) => {
+  let unit = getPackUnitName(packUnit);
+  return unit;
+}
 </script>
 
 
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
index 67ba0a63..aadd5b94 100644
--- a/src/mycomponents/recommend/recommend.vue
+++ b/src/mycomponents/recommend/recommend.vue
@@ -33,7 +33,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({
   detail: {
     type: Object,
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index f7228cd3..5733f910 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -104,6 +104,7 @@ const balanceSelectRef = ref(null)
 
 // 方法
 const openScanPopup = (businessTypeValue) => {
+  console.log(businessTypeValue);
   businessType.value = businessTypeValue
   fromInventoryStatuses.value = getDirectoryItemArray(businessTypeValue.outInventoryStatuses)
   fromLocationAreaTypeList.value = getDirectoryItemArray(businessTypeValue.outAreaTypes)
@@ -301,6 +302,12 @@ const losefocus = () => {
 }
 
 const emit = defineEmits(['getBalance'])
+defineExpose({
+  openScanPopup,
+  closeScanPopup,
+  getfocus,
+  losefocus
+})
 </script>
 
 <style lang="scss">
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index cf008d7f..2f681772 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -55,10 +55,10 @@ const simulateScan = (scanMessage) => {
   })
 }
 const openScanPopup = () => {
-  show.value = true
   setTimeout((res) => {
+    show.value = true
     getfocus()
-  }, 200)
+  }, 500)
 }
 
 const closeScanPopup = () => {
diff --git a/src/mycomponents/scan/winScanPackLevel.vue b/src/mycomponents/scan/winScanPackLevel.vue
index 418b043a..9d82bcae 100644
--- a/src/mycomponents/scan/winScanPackLevel.vue
+++ b/src/mycomponents/scan/winScanPackLevel.vue
@@ -79,10 +79,10 @@ const simulateScan = (scanMessage) => {
   })
 }
 const openScanPopup = () => {
-  show.value = true
   setTimeout((res) => {
+    show.value = true
     getfocus()
-  }, 200)
+  }, 500)
 }
 const closeScanPopup = () => {
   losefocus()
diff --git a/src/mycomponents/scan/winScanPackage.vue b/src/mycomponents/scan/winScanPackage.vue
index 06a4ddfb..62ed32d9 100644
--- a/src/mycomponents/scan/winScanPackage.vue
+++ b/src/mycomponents/scan/winScanPackage.vue
@@ -56,10 +56,10 @@ const simulateScan = (item) => {
   comscansimulate.value.clickScanMsg()
 }
 const openScanPopup = () => {
-  show.value = true
   setTimeout((res) => {
+    show.value = true
     getfocus()
-  }, 200)
+  }, 500)
 }
 
 const closeScanPopup = () => {
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
index 16899db8..e8f9460b 100644
--- a/src/pages/count/coms/comCountDetailcards.vue
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -8,7 +8,7 @@
       </view>
       <view class="">
         <view class="uni-flex uni-row">
-          <compareQty :dataContent="dataContent" :recommendQty="dataContent.recommendQty" :handleQty="dataContent.handleQty" :isShowRecommendQty="isShowRecommendQty" :isShowRecommendQty="isShowRecommendQty"> </compareQty>
+          <compareQty :dataContent="dataContent" :recommendQty="dataContent.recommendQty" :handleQty="dataContent.handleQty" :isShowRecommendQty="isShowRecommendQty"> </compareQty>
         </view>
         <!-- <view v-if="dataContent.scaned" style="margin-top: 10rpx; float: right;">
 					<button type="primary" size="mini" @click="edit">编辑</button>
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index 892c65d4..b2aa0b3b 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -34,17 +34,17 @@
       <u-line color="#D8D8D8" style="margin-bottom: 15rpx"></u-line>
       <scroll-view scroll-y="true" class="" style="margin-bottom: 0px">
         <view class="detail-list" v-for="(item, index) in showList" :key="item.id">
-          <uni-swipe-action ref="swipeAction">
-            <uni-swipe-action-item @click="swipeClick($event, item)" :right-options="item.scaned ? scanOptions : detailOptions">
-              <view class="uni-flex uni-row" style="align-items: center" :class="item.scaned ? 'scan_view' : 'item'">
-                <view class="" style="font-size: 30rpx; font-weight: bold"> {{ index + 1 }}. </view>
-                <comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem"
-                                     :settingParam="jobContent" @remove="updateData" @updateData="updateData">
-                </comCountDetailcards>
-              </view>
-              <view class="split_line"></view>
-            </uni-swipe-action-item>
-          </uni-swipe-action>
+          <u-swipe-action ref="swipeAction"
+                            :options="item.scaned ? scanOptions : detailOptions"
+                            @click="(...event)=>swipeClick(event, item)">
+            <view class="uni-flex uni-row" style="align-items: center" :class="item.scaned ? 'scan_view' : 'item'">
+              <view class="" style="font-size: 30rpx; font-weight: bold"> {{ index + 1 }}. </view>
+              <comCountDetailcards :ref="'countDetail_'+index" :dataContent="item" :index="index" @editItem="editItem"
+                                   :settingParam="jobContent" @remove="updateData" @updateData="updateData">
+              </comCountDetailcards>
+            </view>
+            <view class="split_line"></view>
+          </u-swipe-action>
         </view>
       </scroll-view>
       <u-loadmore :status="loadingType" v-if="showList.length > 0" />
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index a1ca2af0..254de65b 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -14,7 +14,7 @@
     <balance-qty-edit ref="qtyEdit" :settingParam="settingParam" @confirm="confirm" :allowEditQty="allowEditQty" :allowEditStatus="true"></balance-qty-edit>
     <win-scan-location ref="scanLocationCode" title="目标库位" :locationAreaTypeList="locationAreaTypeList" @getLocation="getLocation"></win-scan-location>
     <detail-info-popup ref="detailInfoPopupRef"></detail-info-popup>
-    <com-message ref="comMessageRef" />
+    <comMessage ref="comMessageRef"></comMessage>
   </view>
 </template>
 
@@ -47,7 +47,7 @@ const props = defineProps({
   }
 })
 watch(()=> props.dataContent, (newName, oldName)=>{
-  if (dataContent.value.subList.length > 0) {
+  if (props.dataContent.subList.length > 0) {
     nextTick(res => {
       setTimeout(() => {
         if (collapse1.value) {
@@ -68,7 +68,7 @@ const detailOptions = ref([])
 const scanOptions = ref([])
 const removeOptions = ref([])
 const dataList = ref([])
-const comMessageRef = ref('')
+const comMessageRef = ref(null)
 const detailInfoPopupRef = ref('')
 const qtyEdit = ref('')
 const scanLocationCode = ref('')
@@ -91,6 +91,7 @@ const openDetailCardPopup = () => {
   winHint.value.openScanPopup()
 }
 const swipeClick = (params, item) => {
+  console.log(params);
   let text = ''
   if (item.scaned) {
     text = scanOptions.value[params[1]].text
@@ -139,7 +140,6 @@ const getLocation = (location, code) => {
   emit('updateData')
 }
 
-// 传递给父类
 const emit = defineEmits(['updateData', 'removePack', 'openDetail'])
 </script>
 
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue b/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue
index e7997e46..5769ea4a 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCardBatch.vue
@@ -1,26 +1,24 @@
 <template>
   <view class="" style="background-color: #fff;">
-
     <!-- <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty> -->
     <item-compare-qty :dataContent="dataContent" :handleQty="dataContent.handleQty" :isShowStdPack="false">
     </item-compare-qty>
     <view class='split_line'></view>
     <view class="" v-for="(item,index) in dataContent.subList">
-      <u-swipe-action ref="swipeAction" v-if="index ==0" :class="item.scaned?'scan_view':''">
-        <u-swipe-action-item
-            :right-options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
-            @click="swipeClick($event,item)">
-          <div style="display: flex;">
-            <div style="flex: 1;">
-              <batch v-if="item.batch" :batch="item.batch"></batch>
-              <location v-if="item.fromLocationCode" title="来源库位" :locationCode="item.fromLocationCode">
-              </location>
-              <to-location v-if="item.toLocationCode" title="目标库位" :locationCode="item.toLocationCode">
-              </to-location>
-            </div>
-            <text style="font-size: 30rpx;color: #2979ff; " @click="copy(item)" v-if="isDevlement()">复制</text>
-          </div>
-        </u-swipe-action-item>
+      <u-swipe-action ref="swipeAction" v-if="index ==0"
+                      :options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
+                      @click="(...event)=>swipeClick(event,item)"
+                      :class="item.scaned?'scan_view':''">
+        <view style="display: flex;">
+          <view style="flex: 1;">
+            <batch v-if="item.batch" :batch="item.batch"></batch>
+            <location v-if="item.fromLocationCode" title="来源库位" :locationCode="item.fromLocationCode">
+            </location>
+            <to-location v-if="item.toLocationCode" title="目标库位" :locationCode="item.toLocationCode">
+            </to-location>
+          </view>
+          <text style="font-size: 30rpx;color: #2979ff; " @click="copy(item)" v-if="isDevlement()">复制</text>
+        </view>
       </u-swipe-action>
     </view>
 
@@ -70,7 +68,7 @@ const props = defineProps({
     default: true
   }
 });
-const emit = defineEmits(['openDetail', 'remove'])
+const emit = defineEmits(['openDetail', 'remove','updateData'])
 
 const option = ref([]);
 const title = ref("推荐详情");
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index a6d0a45b..3c43edc0 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -72,6 +72,7 @@ const comMessageRef = ref()
 const jobInfoPopupRef = ref()
 const jobListPopupRef = ref()
 const filterItemCode = ref('')
+const comReceiptJobList = ref(null)
 onMounted(() => {
   nextTick(() => {
     detailOptions.value = getDetailOption()
diff --git a/src/pages/inventoryMove/job/moveJob.vue b/src/pages/inventoryMove/job/moveJob.vue
index 1ea558b4..bd7d4c0c 100644
--- a/src/pages/inventoryMove/job/moveJob.vue
+++ b/src/pages/inventoryMove/job/moveJob.vue
@@ -7,10 +7,10 @@
 <script setup lang="ts">
 import { ref, getCurrentInstance, nextTick } from 'vue'
 import { onShow, onNavigationBarButtonTap, onReady, onReachBottom, onPullDownRefresh ,onLoad} from '@dcloudio/uni-app'
-import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+import ComMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 import { goHome, getCurrDate } from '@/common/basic.js'
 
-const receiptjob = ref()
+const receiptjob = ref(null)
 const title = ref('')
 onShow(() => {
   nextTick(() => {
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index f3cce451..704df390 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -444,7 +444,6 @@ const showMessage = (message) => {
   })
 }
 const openScanPopup = () => {
-  scanPopup.value.openScanPopup()
   if (businessType.value == null) {
     getBusinessTypeFunc()
   } else {
diff --git a/src/pages/productionReturn/job/holdToReturnJob.vue b/src/pages/productionReturn/job/holdToReturnJob.vue
index edd6f717..a4f3b306 100644
--- a/src/pages/productionReturn/job/holdToReturnJob.vue
+++ b/src/pages/productionReturn/job/holdToReturnJob.vue
@@ -42,8 +42,8 @@ import comEmptyView from '@/mycomponents/common/comEmptyView.vue'
 import jobFilter from '@/mycomponents/job/jobFilter.vue'
 import comReturnJobCard from '@/pages/productionReturn/coms/comReturnJobCard.vue'
 import JobListPopup from '@/pages/productionReturn/coms/jobListPopup.vue'
-
-import {ref, onMounted, onBeforeUnmount, computed} from 'vue';
+import JobInfoPopup from "@/mycomponents/job/jobInfoPopup.vue";
+import {ref} from 'vue';
 import {
   onLoad,
   onShow,
diff --git a/src/pages/productionReturn/job/okToReturnJob.vue b/src/pages/productionReturn/job/okToReturnJob.vue
index e3404876..1f39db93 100644
--- a/src/pages/productionReturn/job/okToReturnJob.vue
+++ b/src/pages/productionReturn/job/okToReturnJob.vue
@@ -7,7 +7,7 @@
 		</job-filter>
 		<view v-if="jobList.length>0">
 			<u-swipe-action ref="swipeAction" v-for="(item, index) in jobList"
-                        :key="index" options="item.status=='2'?detailGiveupOptions:detailOptions"
+                        :key="index" :options="item.status=='2'?detailGiveupOptions:detailOptions"
                         @click="(...event)=>swipeClick(event,item)">
         <com-return-job-card :dataContent="item" @click='openJobDetail(item)'></com-return-job-card>
 			</u-swipe-action>
diff --git a/src/pages/purchaseReceipt/job/receiptJob.vue b/src/pages/purchaseReceipt/job/receiptJob.vue
index 462a8cb5..3dfeedb7 100644
--- a/src/pages/purchaseReceipt/job/receiptJob.vue
+++ b/src/pages/purchaseReceipt/job/receiptJob.vue
@@ -97,7 +97,7 @@ const refresh = () => {
 const openFilter = () => {
   filter.value.openFilter()
 }
-const goHome = () => {
+const goHome1 = () => {
   goHome()
 }
 const getList = (type) => {
@@ -142,7 +142,7 @@ const getList = (type) => {
 
       const { list } = res.data
       totalCount.value = res.data.total
-      updateTitle(`${title.value}(${totalCount.value})`)
+      updateTitle(`${props.title}(${totalCount.value})`)
       loadingType.value = 'loadmore'
       if (list == null || list.length == 0) {
         loadingType.value = 'nomore'
@@ -403,7 +403,7 @@ const getScanResult = (result) => {
 defineExpose({
   refresh,
   openFilter,
-  goHome,
+  goHome1,
   onReach
 })
 </script>
diff --git a/src/pages/unPlanned/job/issueJob.vue b/src/pages/unPlanned/job/issueJob.vue
index 2cf53a72..d5acbe6c 100644
--- a/src/pages/unPlanned/job/issueJob.vue
+++ b/src/pages/unPlanned/job/issueJob.vue
@@ -55,7 +55,7 @@ const comMessageRef = ref()
 const jobInfoPopupRef = ref()
 const jobListPopupRef = ref()
 const scanPopup = ref()
-onShow(() => {
+onLoad(() => {
   nextTick(() => {
     getList('refresh')
   })