From 31b19c23e4d89501b2416d864120c6b6985f75cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Fri, 8 Nov 2024 11:30:53 +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/common/directory.js                       |   4 +-
 src/common/style/new_style.css                |  12 +-
 src/mycomponents/balance/toLocation.vue       |   2 +-
 src/mycomponents/job/jobFilter.vue            |   8 +-
 src/mycomponents/recommend/recommendBatch.vue |   4 +-
 src/mycomponents/scan/winComScanBalance.vue   |   1 -
 src/mycomponents/scan/winScanItem.vue         |  36 +++---
 src/mycomponents/scan/winScanPack.vue         |   2 +-
 src/mycomponents/scan/winScanPackJob.vue      |   2 +-
 src/pages/issue/coms/comIssueDetailCard.vue   |  36 ++++--
 .../issue/coms/comIssueDetailCardBatch.vue    | 117 +++++++++++-------
 src/pages/issue/coms/comScanIssuePack.vue     |   6 +-
 src/pages/issue/job/issueDetail.vue           |  31 ++---
 src/pages/issue/job/issueJob.vue              |  23 ++--
 src/pages/issue/request/issueRequest.vue      |   4 +-
 .../issue/request/issueRequestDetail.vue      |   2 +-
 .../coms/comProductDetailCardBatch.vue        |   1 -
 .../productReceipt/job/productReceiptJob.vue  |   9 +-
 .../productionReturn/job/okToReturnJob.vue    |  13 +-
 src/pages/putaway/job/putawayDetail.vue       |   2 +-
 src/pages/putaway/job/putawayJob.vue          |   2 +-
 src/pages/query/item.vue                      |   2 +-
 .../record/supplierDeliverRecord.vue          |   4 +-
 23 files changed, 188 insertions(+), 135 deletions(-)

diff --git a/src/common/directory.js b/src/common/directory.js
index 478396d5..d53eb8cd 100644
--- a/src/common/directory.js
+++ b/src/common/directory.js
@@ -630,12 +630,12 @@ export function getPackUnitName(value) {
 }
 //获取优先级
 export function getPriorityName(value) {
-	console.log(344,value)
+	// console.log(344,value)
 	var resultInfo = "";
 	if (priorityList.length == 0) {
 		priorityList = getDirectoryInfo("priority")
 	}
-	console.log(455,priorityList)
+	// console.log(455,priorityList)
 	if (priorityList.length > 0) {
 		for (let item of priorityList) {
 			if (item.value == value) {
diff --git a/src/common/style/new_style.css b/src/common/style/new_style.css
index bb400565..19d011f7 100644
--- a/src/common/style/new_style.css
+++ b/src/common/style/new_style.css
@@ -2072,9 +2072,10 @@ button::after {
 
 
 .card_content {
-	font-size: 32rpx;
+	font-size: 40rpx;
 	color:#2E3A63;
-	margin-left:20rpx
+	margin-left:20rpx;
+	font-weight: 600;
 }
 .card_big_content {
 	font-size: 40rpx;
@@ -2097,12 +2098,12 @@ button::after {
 .card_packing_code {
 	color: #3315EB;
 	padding: 5px;
-	font-size: 30rpx;
+	font-size: 26rpx;
+	font-style: italic;
 }
 
 .card_batch {
 	color: #9747FF;
-	padding: 5px;
 	font-size: 26rpx;
 	font-style: italic;
 }
@@ -2186,7 +2187,8 @@ button::after {
 
 .card_view {
 	font-size: 32rpx;
-	margin-top:14rpx
+	margin-top:14rpx;
+	margin-left: 10rpx;
 }
 
 /* 
diff --git a/src/mycomponents/balance/toLocation.vue b/src/mycomponents/balance/toLocation.vue
index 8240601e..6c353f22 100644
--- a/src/mycomponents/balance/toLocation.vue
+++ b/src/mycomponents/balance/toLocation.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="card_view">
     <text class="card_to_location">{{ title }}</text>
-    <text class="card_content">{{ locationCode }}</text>
+    <text class="card_big_content">{{ locationCode }}</text>
   </view>
 </template>
 <script setup lang="ts">
diff --git a/src/mycomponents/job/jobFilter.vue b/src/mycomponents/job/jobFilter.vue
index 4ff7671f..2f482699 100644
--- a/src/mycomponents/job/jobFilter.vue
+++ b/src/mycomponents/job/jobFilter.vue
@@ -188,7 +188,6 @@ watch(
   () => props.checkedToday,
   (newVal) => {
     checkedTodayModel.value = newVal
-    console.log(checkedTodayModel.value)
   },
   { immediate: true, deep: true }
 )
@@ -307,8 +306,11 @@ const getScanNumber = (val) => {
   scanNumber.value.closeScanPopup()
   closeScanPopup()
 }
-const emit = defineEmits(['switchChangeToday', 'switchChangeWait', 'onScanNumber', 'onScanAsnNumber', 'productionLineCode', 'fromLocationCode', 'fromLocationCodeConfirm','onQuery'])
-defineExpose({ openFilter })
+const emit = defineEmits(['switchChangeToday',
+  'switchChangeWait', 'onScanNumber', 'onScanAsnNumber',
+  'productionLineCode', 'fromLocationCode',
+  'fromLocationCodeConfirm','onQuery'])
+defineExpose({ openFilter,openFilterParams })
 </script>
 <style lang="scss">
 .maskbox {
diff --git a/src/mycomponents/recommend/recommendBatch.vue b/src/mycomponents/recommend/recommendBatch.vue
index f64e2d35..9ff7b3e3 100644
--- a/src/mycomponents/recommend/recommendBatch.vue
+++ b/src/mycomponents/recommend/recommendBatch.vue
@@ -131,7 +131,9 @@ const copyPro = () => {
   // #endif
 };
 
-const isDevlement = computed(() => config.isDevelopment);
+const isDevlement = ()=>{
+  return config.isDevelopment;
+};
 </script>
 
 
diff --git a/src/mycomponents/scan/winComScanBalance.vue b/src/mycomponents/scan/winComScanBalance.vue
index 5733f910..06e26353 100644
--- a/src/mycomponents/scan/winComScanBalance.vue
+++ b/src/mycomponents/scan/winComScanBalance.vue
@@ -104,7 +104,6 @@ const balanceSelectRef = ref(null)
 
 // 方法
 const openScanPopup = (businessTypeValue) => {
-  console.log(businessTypeValue);
   businessType.value = businessTypeValue
   fromInventoryStatuses.value = getDirectoryItemArray(businessTypeValue.outInventoryStatuses)
   fromLocationAreaTypeList.value = getDirectoryItemArray(businessTypeValue.outAreaTypes)
diff --git a/src/mycomponents/scan/winScanItem.vue b/src/mycomponents/scan/winScanItem.vue
index 44592381..3ded3af7 100644
--- a/src/mycomponents/scan/winScanItem.vue
+++ b/src/mycomponents/scan/winScanItem.vue
@@ -1,32 +1,31 @@
 <template>
-  <view class="">
-    <u-popup mode="bottom" v-model="isShow">
-      <view class="popup_box">
-        <view class="pop_title uni-flex space-between">
-          <view class=""> 扫描{{ title }} </view>
-          <view class="">
-            <image class="icons_scan_close" src="@/static/icons/icons_scan_close.svg" @click="closeScanPopup()"></image>
-          </view>
+  <u-popup mode="bottom" v-model="isShow">
+    <view class="popup_box">
+      <view class="pop_title uni-flex space-between">
+        <view class=""> 扫描{{ title }} </view>
+        <view class="">
+          <image class="icons_scan_close" src="@/static/icons/icons_scan_close.svg" @click="closeScanPopup()"></image>
         </view>
+      </view>
+      <view class="">
         <view class="">
-          <view class="">
-            <win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false"
-                          headerType="HMQ,HPQ"></win-com-scan>
-          </view>
+          <win-com-scan ref="scan" @getResult="getScanResult" :placeholder='title' :clearResult="false"
+                        headerType="HMQ,HPQ"></win-com-scan>
         </view>
       </view>
-    </u-popup>
-    <com-message ref="comMessageRef" />
-  </view>
+    </view>
+  </u-popup>
+  <com-message ref="comMessageRef" />
 </template>
 
 <script setup lang="ts">
-import { ref, getCurrentInstance, nextTick, onMounted } from 'vue'
+import { ref, getCurrentInstance, nextTick, onMounted, watchEffect } from 'vue'
 import { getBasicItemByCode } from '@/api/request2.js'
 
 import { checkDirectoryItemExist, getListItemTypeDesc, getItemTypeInfo } from '@/common/directory.js'
 
 import winComScan from '@/mycomponents/scan/winComScan.vue'
+import {onShow} from '@dcloudio/uni-app'
 
 const { proxy } = getCurrentInstance()
 const props = defineProps({
@@ -52,11 +51,14 @@ const scan = ref()
 const expendIcon = ref('arrow-down')
 const comMessageRef = ref()
 const openScanPopup = () => {
-  isShow.value = true
   setTimeout((res) => {
+    isShow.value = true
     getfocus()
   }, 500)
 }
+// onShow(()=>{
+//
+// })
 const closeScanPopup = () => {
   losefocus()
   isShow.value = false
diff --git a/src/mycomponents/scan/winScanPack.vue b/src/mycomponents/scan/winScanPack.vue
index 2f681772..e5d56535 100644
--- a/src/mycomponents/scan/winScanPack.vue
+++ b/src/mycomponents/scan/winScanPack.vue
@@ -1,6 +1,6 @@
 <template>
   <view>
-    <u-popup mode="bottom" v-model="show" :mask-close-able="false">
+    <u-popup mode="bottom" v-model="show">
       <view class="popup_box">
         <view class="pop_title uni-flex space-between">
           <view class="" style="font-size: 35rpx"> 扫描{{ title }} </view>
diff --git a/src/mycomponents/scan/winScanPackJob.vue b/src/mycomponents/scan/winScanPackJob.vue
index fb7c8b11..efad1998 100644
--- a/src/mycomponents/scan/winScanPackJob.vue
+++ b/src/mycomponents/scan/winScanPackJob.vue
@@ -1,5 +1,5 @@
 <template>
-  <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>
diff --git a/src/pages/issue/coms/comIssueDetailCard.vue b/src/pages/issue/coms/comIssueDetailCard.vue
index c7d2e6f2..83c3c0ff 100644
--- a/src/pages/issue/coms/comIssueDetailCard.vue
+++ b/src/pages/issue/coms/comIssueDetailCard.vue
@@ -2,7 +2,7 @@
   <view>
     <view class="u-p-l-20 u-p-b-20 u-p-r-20">
       <view v-for="(item, index) in dataContent.Items" :key="index" style="background: white" class="u-p-b-20 u-p-l-20 u-p-r-20">
-        <u-collapse ref="collapse">
+        <u-collapse ref="collapse1">
           <u-collapse-item :open="true">
             <template v-slot:title>
               <view class="" style="width: 90%">
@@ -23,7 +23,7 @@
                   <view class="" v-if="batch.Records.length > 0">
                     <view class="center" style="width: 20px; background-color: #0cc2b6; color: #fff; padding: 0px 2px; font-size: 24rpx"> 扫描 </view>
                     <view class="uni-flex uni-column scan_view" style="flex: 1">
-                      <u-swipe-action :show="record.show" :index="key" v-for="(record, recordIndex) in batch.Records"
+                      <u-swipe-action :show="record.show" :index="recordIndex" v-for="(record, recordIndex) in batch.Records"
                                       :key="recordIndex" :options="settingParam.allowModifyQty=='TRUE'?scanOptions:removeOptions"
                                       bg-color="rgba(255,255,255,0)"
                                       @click="swipeClick($event,batch,record,recordIndex,batchIndex,loacation.Batchs,locatonIndex,item.Locations)" style="width: 100%">
@@ -45,7 +45,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, getCurrentInstance, onMounted, nextTick } from 'vue'
+import {ref, getCurrentInstance, onMounted, nextTick, watch} from 'vue'
 import { onLoad, onNavigationBarButtonTap, onPullDownRefresh } from '@dcloudio/uni-app'
 import itemQty from '@/mycomponents/item/itemQty.vue'
 import recommend from '@/mycomponents/recommend/recommend.vue'
@@ -77,7 +77,7 @@ const batchItem = ref({})
 const detailOptions = ref([])
 const scanOptions = ref([])
 const removeOptions = ref([])
-const collapse = ref()
+const collapse1 = ref()
 const comMessageRef = ref()
 const dataContent = ref(props.dataContent)
 const balanceQtyEditRef = ref()
@@ -95,15 +95,28 @@ onMounted(() => {
   scanOptions.value = getEditRemoveOption()
   removeOptions.value = getRemoveOption()
 })
-const resizeCollapse = () => {
-  nextTick((r) => {
-    collapse.value.forEach((r) => {
-      r.childrens.forEach((i) => {
-        i.init()
+// watch(
+//     () => props.dataContent,
+//     (val) => {
+//       if (props.dataContent.Items.length > 0) {
+//         setTimeout(() => {
+//           if (collapse1.value) {
+//             collapse1.value.init();
+//           }
+//         }, 200);
+//       }
+//     },
+//     { immediate: true, deep: true }
+// )
+const resizeCollapse = ()=> {
+  nextTick(r => {
+    collapse1.value && collapse1.value.forEach(r => {
+      r.childrens.forEach(i => {
+        i.init();
       })
-      r.init()
+      r.init();
     })
-  })
+  });
 }
 const swipeClick = (e, batch, record,recordIndex, batchIndex, Batchs, locatonIndex, Locations) => {
   if (e.content.text == '编辑') {
@@ -136,7 +149,6 @@ const remove = (batch, record, recordIndex,batchIndex,Batchs,locatonIndex,Locati
       if(batch.Records.length == 0 && Locations[locatonIndex].isNewAdd){
         Locations.splice(locatonIndex,1)
       }
-      resizeCollapse()
       emit('updateData', record)
     }
   })
diff --git a/src/pages/issue/coms/comIssueDetailCardBatch.vue b/src/pages/issue/coms/comIssueDetailCardBatch.vue
index f44d7bb0..e5a3855e 100644
--- a/src/pages/issue/coms/comIssueDetailCardBatch.vue
+++ b/src/pages/issue/coms/comIssueDetailCardBatch.vue
@@ -1,44 +1,47 @@
 <template>
   <view>
-
     <!-- <requiredLocation title="需求库位" :locationCode="dataContent.toLocationCode"
       :isShowEdit="dataContent.allowModifyLocation==1"></requiredLocation> -->
-    <view v-for="(item,index) in dataContent.Items">
-      <u-collapse ref="collapse">
-        <u-collapse-item :open="true">
-          <template v-slot:title>
-            <view class="split_line"></view>
-            <!-- 物品 -->
-            <u-swipe-action ref="swipeAction" :options="removeOptions"
-                            @click="(...event)=>itemCoceClick(event,item,index)">
-              <item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
-            </u-swipe-action>
-            <!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
-            </com-issue-request-info> -->
-          </template>
-          <view v-for="(loacation,locatonIndex) in item.Locations">
-            <view v-if="locatonIndex ==0">
-              <view class="uni-flex uni-row space-between">
-                <!-- 推荐库位 -->
-                <location :locationCode="loacation.fromLocationCode">
-                </location>
+    <view class="u-p-l-20 u-p-b-20 u-p-r-20">
+      <view v-for="(item,index) in dataContent.Items">
+        <u-collapse ref="collapseRefs">
+          <u-collapse-item :open="true">
+            <template #title>
+              <view style="flex: 1;overflow: hidden">
+                <view class="split_line"></view>
+                <!-- 物品 -->
+                <u-swipe-action ref="swipeAction" :options="removeOptions"
+                                @click="(...event)=>itemCoceClick(event,item,index)">
+                  <item-qty :dataContent="item" :handleQty="item.handleQty"></item-qty>
+                </u-swipe-action>
               </view>
-              <view v-for="(batch,batchIndex) in loacation.Batchs">
-                <batch :batch="batch.detail.batch" v-if="batchIndex ==0"></batch>
+              <!-- 			<com-issue-request-info :workShopCode="dataContent.workShopCode" :dataContent="dataContent">
+              </com-issue-request-info> -->
+            </template>
+            <view v-for="(loacation,locatonIndex) in item.Locations">
+              <view v-if="locatonIndex ==0">
+                <view class="uni-flex uni-row space-between">
+                  <!-- 推荐库位 -->
+                  <location :locationCode="loacation.fromLocationCode">
+                  </location>
+                </view>
+                <view v-for="(batch,batchIndex) in loacation.Batchs">
+                  <batch :batch="batch.detail.batch" v-if="batchIndex ==0"></batch>
+                </view>
               </view>
             </view>
-          </view>
-        </u-collapse-item>
-      </u-collapse>
+          </u-collapse-item>
+        </u-collapse>
+      </view>
     </view>
   </view>
-  <balance-qty-edit ref="balanceQtyEdit" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
+  <balance-qty-edit ref="receiptHint" @confirm="confirm" :isShowStatus="true"></balance-qty-edit>
   <detail-info-popup ref="detailInfoPopup"></detail-info-popup>
   <comMessage ref="message"></comMessage>
 </template>
 
 <script lang="ts" setup>
-import {ref, onMounted, nextTick} from 'vue';
+import {ref, onMounted, nextTick, watch} from 'vue';
 import itemQty from '@/mycomponents/item/itemQty.vue'
 import recommend from '@/mycomponents/recommend/recommend.vue'
 import recommendBalance from '@/mycomponents/balance/recommendBalance.vue'
@@ -46,7 +49,7 @@ import handleBalance from '@/mycomponents/balance/handleBalance.vue'
 import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
 import jobDetailPopup from '@/mycomponents/job/jobDetailPopup.vue'
 import requiredLocation from '@/mycomponents/location/requiredLocation.vue'
-import balanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
+import BalanceQtyEdit from '@/mycomponents/qty/balanceQtyEdit.vue'
 import location from '@/mycomponents/balance/location.vue'
 import detailInfoPopup from '@/pages/productionReceipt/coms/detailInfoPopup.vue'
 import comIssueRequestInfo from '@/pages/issue/coms/comIssueRequestInfo.vue'
@@ -73,29 +76,49 @@ const detailOptions = ref([]);
 const scanOptions = ref([]);
 const removeOptions = ref([]);
 
-const dataContent = ref({});
 const balanceQtyEdit = ref(null);
 const receiptHint = ref(null);
 const message = ref(null);
-
+const collapseRefs = ref();
+const dataContent = ref(props.dataContent)
+dataContent.value.Items.forEach((item) => {
+  item.Locations.forEach((cur) => {
+    cur.Batchs.forEach((ele) => {
+      ele.Records.forEach((ele1) => {
+        ele1.show = false
+      })
+    })
+  })
+})
 onMounted(() => {
   detailOptions.value = getDetailOption();
   scanOptions.value = getEditRemoveOption();
   removeOptions.value = getRemoveOption();
 });
 
-const resizeCollapse = () => {
-  nextTick(() => {
-    const collapseRefs = ref(null);
-    collapseRefs.value.forEach(r => {
+// watch(
+//     () => props.dataContent,
+//     (val) => {
+//       if (props.dataContent.Items.length > 0) {
+//         setTimeout(() => {
+//           if (collapseRefs.value) {
+//             collapseRefs.value.init();
+//           }
+//         }, 200);
+//       }
+//     },
+//     { immediate: true, deep: true }
+// )
+const resizeCollapse = ()=> {
+  nextTick(r => {
+    collapseRefs.value && collapseRefs.value.forEach(r => {
       r.childrens.forEach(i => {
         i.init();
-      });
-      r.resize();
-    });
+      })
+      r.init();
+    })
   });
-};
-
+}
 const swipeClick = (e, batch, record, recordIndex, batchIndex, Batchs, locatonIndex, Locations) => {
   if (e.content.text === "编辑") {
     edit(batch, record);
@@ -104,12 +127,13 @@ const swipeClick = (e, batch, record, recordIndex, batchIndex, Batchs, locatonIn
   }
 };
 
-const itemCoceClick = (e, item, index) => {
-  if (e.content.text === "移除") {
-    dataContent.value.Items.splice(index, 1);
-    emit('removeItemCode');
+const itemCoceClick = (params, item) => {
+  const { text } = removeOptions.value[params[1]]
+  if (text == '移除') {
+    dataContent.value.Items.splice(params[0], 1)
+    emit('removeItemCode')
   }
-};
+}
 
 const edit = (batch, item) => {
   editItem.value = item;
@@ -133,7 +157,6 @@ const remove = (batch, record, recordIndex, batchIndex, Batchs, locatonIndex, Lo
       if (batch.Records.length === 0 && Locations[locatonIndex].isNewAdd) {
         Locations.splice(locatonIndex, 1);
       }
-      resizeCollapse();
       emit('updateData', record);
     }
   });
@@ -143,7 +166,9 @@ const confirm = (val) => {
   editItem.value.qty = val;
   emit('updateData', editItem.value);
 };
-
+defineExpose({
+  resizeCollapse
+})
 </script>
 
 <style>
diff --git a/src/pages/issue/coms/comScanIssuePack.vue b/src/pages/issue/coms/comScanIssuePack.vue
index ed824d9d..1c9e8259 100644
--- a/src/pages/issue/coms/comScanIssuePack.vue
+++ b/src/pages/issue/coms/comScanIssuePack.vue
@@ -104,7 +104,7 @@ const toLocationCombox = ref()
 const comscansimulate = ref()
 const comMessageRef = ref()
 const detailOptions = ref([])
-const comscan = ref()
+const comscan = ref(null)
 const balanceSelectRef = ref()
 const balanceQtyEditRef = ref()
 const toLocationAreaTypeList = ref([])
@@ -714,7 +714,9 @@ const emit = defineEmits(['updateData', 'closeScan', 'afterScan'])
 defineExpose({
   openScanPopup,
   closeScanPopup,
-  openScanPopupForJobSimulate
+  openScanPopupForJobSimulate,
+  clearList,
+  getfocus
 })
 </script>
 
diff --git a/src/pages/issue/job/issueDetail.vue b/src/pages/issue/job/issueDetail.vue
index 3ce7b87b..6ac06730 100644
--- a/src/pages/issue/job/issueDetail.vue
+++ b/src/pages/issue/job/issueDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="page-wraper">
     <view class="page-header">
-      <view class="page-header-box">
+      <view class="header-view">
         <view class="header_job_top">
           <job-top :dataContent="jobContent"></job-top>
         </view>
@@ -23,12 +23,14 @@
           <!-- <view class="u-p-20">
             <work-station :workshopCode="jobContent.workShopCode" :productionLineCode="toLocation.productionLineCode" :workStationCode="toLocation.workStationCode" :rawLocationCode="toLocation.toLocationCode"> </work-station>
           </view> -->
-          <comIssueDetailCardBatch ref='comIssueDetailCard' :dataContent="toLocation"
+          <comIssueDetailCardBatch :dataContent="toLocation"
+                                   ref="comIssueDetailCard"
                                    :settingParam="jobContent"
-                                   @updateData='updateData' v-if="managementType == 'BY_BATCH'">
+                                   @updateData='updateData'
+                                   v-if="managementType == 'BY_BATCH'">
           </comIssueDetailCardBatch>
           <com-issue-detail-card
-              ref='comIssueDetailCard'
+              ref="comIssueDetailCard"
               :dataContent="toLocation"
               :settingParam="jobContent"
               @updateData='updateData' v-else>
@@ -63,12 +65,12 @@ import { getManagementPrecisions } from '@/common/balance.js'
 
 import { calc } from '@/common/calc.js'
 
-import comIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
+import ComIssueDetailCard from '@/pages/issue/coms/comIssueDetailCard.vue'
 import winScanButton from '@/mycomponents/scan/winScanButton.vue'
 import comScanIssuePack from '@/pages/issue/coms/comScanIssuePack.vue'
 import jobTop from '@/mycomponents/job/jobTop.vue'
 import workStation from '@/mycomponents/workStation/workStation.vue'
-import comIssueDetailCardBatch from '@/pages/issue/coms/comIssueDetailCardBatch.vue'
+import ComIssueDetailCardBatch from '@/pages/issue/coms/comIssueDetailCardBatch.vue'
 import { useCountStore } from '@/store'
 // 获取自定义的store
 const store = useCountStore()
@@ -81,18 +83,20 @@ const detailOptions = ref([])
 const scanOptions = ref([])
 const jobStatus = ref('')
 const scanMessage = ref('')
-const comScanIssuePackRef = ref()
+const comScanIssuePackRef = ref(null)
 const comMessageRef = ref()
 const managementList = ref([])
 const managementType = ref('')
-const comIssueDetailCardRef = ref()
+const comIssueDetailCard = ref(null)
 const fromLocationCode = ref()
+const dataContent = ref()
 onLoad((option) => {
   uni.setNavigationBarTitle({
     title: `${option.title}详情`
   })
   id.value = option.id
   scanMessage.value = option.scanMessage
+  console.log(option);
   if (id.value != undefined) {
     // 新建的任务自动接收
     if (option.status == '1') {
@@ -130,10 +134,8 @@ onBackPress((e) => {
   }
 })
 const resizeCollapse = () => {
-  nextTick((r) => {
-    comIssueDetailCardRef.value.forEach((r) => {
-      r.resizeCollapse()
-    })
+  comIssueDetailCard.value && comIssueDetailCard.value.forEach(r=>{
+    r.resizeCollapse()
   })
 }
 
@@ -329,7 +331,8 @@ const clearInfo = () => {
 }
 const updateData = (record) => {
   const requestLocation = detailSource.value.find((r) => r.toLocationCode == record.toLocationCode)
-  const item = requestLocation.Items.find((r) => r.itemCode == record.itemCode)
+  let item = requestLocation.Items.find((r) => r.itemCode == record.itemCode)
+  console.log(item);
   let itemHandleQty = 0
   if (item != undefined) {
     item.Locations.forEach((l) => {
@@ -471,7 +474,7 @@ const openScanPopupSimulate = (scanMessage) => {
   comScanIssuePackRef.value.openScanPopupForJobSimulate(detailSource.value, jobContent.value, scanMessage)
 }
 const closeScanPopup = () => {
-  updateCommitBtn()
+  // updateCommitBtn()
 }
 </script>
 
diff --git a/src/pages/issue/job/issueJob.vue b/src/pages/issue/job/issueJob.vue
index 704df390..f212c0f4 100644
--- a/src/pages/issue/job/issueJob.vue
+++ b/src/pages/issue/job/issueJob.vue
@@ -67,9 +67,9 @@ const detailCloseOptions = ref([])
 const title = ref('')
 const productionLine = ref('')
 const fromLocation = ref('')
-const filter = ref()
+const filter = ref(null)
 const scanMessage = ref('')
-const comMessageRef = ref()
+const comMessageRef = ref(null)
 const jobInfoPopupRef = ref()
 const jobListPopupRef = ref()
 const scanPopup = ref()
@@ -84,9 +84,9 @@ const toAreaCode = ref('')
 const timer = ref(null)
 const productionLineCode = ref('')
 onShow(() => {
-  nextTick(() => {
+  setTimeout(()=>{
     getList('refresh')
-  })
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
@@ -180,7 +180,7 @@ const getList = (type) => {
   const params = {
     filters: queryFiltersParams,
     pageNo: pageNo.value,
-    pageSize: 100,
+    pageSize: 10,
   }
   getIssueJobList(params)
     .then((res) => {
@@ -202,9 +202,9 @@ const getList = (type) => {
       if (type === "refresh") {
         uni.stopPullDownRefresh();
       }
-      if(jobList.value.length>0){
-        openScanPopup()
-      }
+      // if(jobList.value.length>0){
+      //   openScanPopup()
+      // }
     })
     .catch((error) => {
       if (type === 'refresh') {
@@ -382,7 +382,7 @@ const closeJob = (id) => {
       showMessage(error)
     })
 }
-const getJobInfoByNumber = (number, scanMessage)=>{
+const getJobInfoByNumber = (number, scanMessageMes)=>{
   uni.showLoading({
     title: "加载中....",
     mask: true
@@ -409,7 +409,8 @@ const getJobInfoByNumber = (number, scanMessage)=>{
     if (res.data.list.length == 0) {
       showMessage(`未查找到【${number}】的发料任务`);
     } else {
-      var result = res.data.list[0];
+      let result = res.data.list[0];
+      console.log(result);
       if (result.acceptUserId && result.acceptUserId != store.id) {
         comMessageRef.value.showErrorMessage(`任务号[${result.number}]已经被[${result.acceptUserName}]承接,无法执行`, res => {
           if (res) {
@@ -424,7 +425,7 @@ const getJobInfoByNumber = (number, scanMessage)=>{
       uni.navigateTo({
         url: './issueDetail?id=' + result.masterId + '&status=' + result.status +
             '&scanMessage=' +
-            scanMessage + '&title=' + title.value
+            scanMessageMes + '&title=' + title.value
       });
       scanMessage.value = ""
     }
diff --git a/src/pages/issue/request/issueRequest.vue b/src/pages/issue/request/issueRequest.vue
index 4baaa816..ab4c5de6 100644
--- a/src/pages/issue/request/issueRequest.vue
+++ b/src/pages/issue/request/issueRequest.vue
@@ -70,9 +70,9 @@ onPullDownRefresh(() => {
   getList('refresh')
 })
 onShow(() => {
-  nextTick(() => {
+  setTimeout(()=>{
     getList('refresh')
-  })
+  },100)
 })
 // 返回首页
 onNavigationBarButtonTap((e) => {
diff --git a/src/pages/issue/request/issueRequestDetail.vue b/src/pages/issue/request/issueRequestDetail.vue
index e063b7d2..d8135bb6 100644
--- a/src/pages/issue/request/issueRequestDetail.vue
+++ b/src/pages/issue/request/issueRequestDetail.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="page-wraper">
     <view class="page-header">
-      <view class="page-header-box">
+      <view class="header-view">
         <view class="header_job_top">
           <request-top :dataContent="requestContent"></request-top>
         </view>
diff --git a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
index e27c8c43..783670a4 100644
--- a/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
+++ b/src/pages/productReceipt/coms/comProductDetailCardBatch.vue
@@ -28,7 +28,6 @@
 	import itemCompareQty from '@/mycomponents/item/itemCompareQty.vue'
 	import recommendBatch from '@/mycomponents/recommend/recommendBatch.vue'
 	import recommendQtyEdit from '@/mycomponents/qty/recommendQtyEdit.vue'
-	import jobDetailPopup from '@/mycomponents/detail/jobDetailPopup.vue'
 	import productDetailInfoPopup from '@/pages/productReceipt/coms/productDetailInfoPopup.vue'
 	import winScanLocation from "@/mycomponents/scan/winScanLocation.vue"
 	import comFgCard from "@/pages/productReceipt/coms/comFgCard.vue"
diff --git a/src/pages/productReceipt/job/productReceiptJob.vue b/src/pages/productReceipt/job/productReceiptJob.vue
index 7b7c4c60..0e34487a 100644
--- a/src/pages/productReceipt/job/productReceiptJob.vue
+++ b/src/pages/productReceipt/job/productReceiptJob.vue
@@ -155,6 +155,7 @@ const getList = (type) => {
 }
 
 const openJobDetail = (item, scanMessage = '') => {
+  console.log(item.number);
   getJobInfoByNumber(item.number,scanMessage)
 }
 
@@ -355,7 +356,7 @@ const getScanResult = (result) => {
     showMessage(`${error}\n扫描[${result.scanMessage}]`)
   }
 }
-const getJobInfoByNumber = (number,scanMessage)=>{
+const getJobInfoByNumber = (number,scanMessageMes)=>{
   uni.showLoading({
     title: "加载中....",
     mask: true
@@ -393,15 +394,15 @@ const getJobInfoByNumber = (number,scanMessage)=>{
       }
       if (props.type == 'predict') {
         uni.navigateTo({
-          url: `./productReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${props.title}`
+          url: `./productReceiptDetail?id=${result.masterId}&status=${result.status}&scanMessage=${scanMessageMes}&title=${props.title}`
         })
       } else if (props.type == 'assemble') {
         uni.navigateTo({
-          url: `./fgProductReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${props.title}}`
+          url: `./fgProductReceiptDetail?id=${result.masterId}&status=${result.status}&scanMessage=${scanMessageMes}&title=${props.title}}`
         })
       } else {
         uni.navigateTo({
-          url: `./scrapReceiptDetail?id=${item.masterId}&status=${item.status}&scanMessage=${scanMessage}&title=${props.title}}`
+          url: `./scrapReceiptDetail?id=${result.masterId}&status=${result.status}&scanMessage=${scanMessageMes}&title=${props.title}}`
         })
       }
       scanMessage.value = ''
diff --git a/src/pages/productionReturn/job/okToReturnJob.vue b/src/pages/productionReturn/job/okToReturnJob.vue
index 1f39db93..3c6292e6 100644
--- a/src/pages/productionReturn/job/okToReturnJob.vue
+++ b/src/pages/productionReturn/job/okToReturnJob.vue
@@ -5,10 +5,11 @@
 			@switchChangeWait="switchChangeWait" @onScanNumber="getScanNumber" :checkedToday="checkedToday"
 			:checkedWaitTask="checkedWaitTask">
 		</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"
-                        @click="(...event)=>swipeClick(event,item)">
+		<view v-if="jobList.length>0" class="u-m-20">
+			<u-swipe-action ref="swipeAction" v-for="(item, index) in jobList" class="u-m-b-20"
+                      bg-color="rgba(255,255,255,0)"
+                      :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>
 
@@ -72,7 +73,9 @@ onLoad((option) => {
 });
 
 onShow(() => {
-  getList('refresh');
+  setTimeout(()=>{
+    getList('refresh');
+  })
 });
 
 onReady(() => {
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index 6c0054f6..e763f5f6 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.vue
@@ -179,7 +179,7 @@ const getDetail = () => {
           itemCodes.push(item.itemCode)
           item.scaned = false
         })
-        getManagementPrecisions(itemCodes, that.jobToLocationCode, res => {
+        getManagementPrecisions(itemCodes, jobToLocationCode.value, res => {
           if (res.success) {
             managementList.value = res.list;
             managementType.value = managementList.value.some(item => item.ManagementPrecision ==
diff --git a/src/pages/putaway/job/putawayJob.vue b/src/pages/putaway/job/putawayJob.vue
index 45c48c69..8e9ee736 100644
--- a/src/pages/putaway/job/putawayJob.vue
+++ b/src/pages/putaway/job/putawayJob.vue
@@ -58,7 +58,7 @@ const jobListRef = ref()
 const jobInfoPopup = ref()
 const checkedWaitTask = ref(null)
 onShow(() => {
-  nextTick(() => {
+  setTimeout(()=>{
     getList('refresh')
   })
 })
diff --git a/src/pages/query/item.vue b/src/pages/query/item.vue
index 2e39f11f..a0902739 100644
--- a/src/pages/query/item.vue
+++ b/src/pages/query/item.vue
@@ -33,7 +33,7 @@
 			<u-loadmore :status="loadingType" v-if="dataList.length > 0" />
 		</view>
 		<win-scan-button @goScan="openScanPopup" v-if="itemCode != ''"></win-scan-button>
-		<win-scan-item ref="scanPopup" title="物料代码" @getScanResult="getScanCode"> </win-scan-item>
+		<win-scan-item ref="scanPopup" title="物料代码" @getScanResult="getScanCode"></win-scan-item>
 		<com-message ref="comMessageRef" />
 	</view>
 </template>
diff --git a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
index 95116338..56fa69e9 100644
--- a/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
+++ b/src/pages/supplierDeliver/record/supplierDeliverRecord.vue
@@ -57,9 +57,9 @@ const recordInfoPopupRef = ref()
 const filter = ref()
 const comMessageRef = ref()
 onShow(() => {
-  nextTick(() => {
+  setTimeout(()=>{
     getList('refresh')
-  })
+  },100)
 })
 onLoad((e) => {
   title.value = e.title