diff --git a/src/common/style/pdabasic.css b/src/common/style/pdabasic.css
index 65f1521e..33cc3bcd 100644
--- a/src/common/style/pdabasic.css
+++ b/src/common/style/pdabasic.css
@@ -741,7 +741,6 @@ page {
 
 .page-header .header-view .header_item {
 	/* padding-left: 10rpx; */
-	padding: 5rpx 10rpx;
 	font-size: 32rpx;
 }
 
diff --git a/src/main.ts b/src/main.ts
index e28e3ea4..8c870363 100644
--- a/src/main.ts
+++ b/src/main.ts
@@ -36,7 +36,7 @@ export function createApp() {
 	app.config.globalProperties.$throttle = noclick.throttle;
 	// 缓存
 	app.config.globalProperties.$storage = storage
-	app.component('com-message', comMessage)
+	app.component('ComMessage', comMessage)
 
 
 
diff --git a/src/mycomponents/balance/batch.vue b/src/mycomponents/balance/batch.vue
index 851a547b..acad1ce1 100644
--- a/src/mycomponents/balance/batch.vue
+++ b/src/mycomponents/balance/batch.vue
@@ -14,5 +14,6 @@
 	})
 </script>
 
-<style>
+<style scoped>
+
 </style>
diff --git a/src/mycomponents/balance/location.vue b/src/mycomponents/balance/location.vue
index dddbfa35..b715f6d5 100644
--- a/src/mycomponents/balance/location.vue
+++ b/src/mycomponents/balance/location.vue
@@ -18,4 +18,6 @@ const props = defineProps({
 })
 </script>
 
-<style></style>
+<style scoped>
+
+</style>
diff --git a/src/mycomponents/balance/pack.vue b/src/mycomponents/balance/pack.vue
index b36fcec6..0114c85c 100644
--- a/src/mycomponents/balance/pack.vue
+++ b/src/mycomponents/balance/pack.vue
@@ -25,4 +25,9 @@ onMounted(()=>{
 })
 </script>
 
-<style></style>
+<style lang="scss" scoped>
+.card_packing_code {
+
+  padding: 0;
+}
+</style>
diff --git a/src/mycomponents/detail/comDetailCard.vue b/src/mycomponents/detail/comDetailCard.vue
index 8dbb9d6d..53e0a3f4 100644
--- a/src/mycomponents/detail/comDetailCard.vue
+++ b/src/mycomponents/detail/comDetailCard.vue
@@ -104,7 +104,7 @@ onMounted(() => {
     detailOptions.value = getDetailOption()
   }
   if (scanOptions.value.length == 0) {
-    scanOptions.value = getPurchaseReceiptOption(settingParam.value.allowModifyQty, false)
+    scanOptions.value = getPurchaseReceiptOption(props.settingParam.allowModifyQty, false)
   }
   nextTick((res) => {
     collapse.value.init()
diff --git a/src/mycomponents/detail/comRecommendDetailCard.vue b/src/mycomponents/detail/comRecommendDetailCard.vue
index 59bdd084..82dbe82c 100644
--- a/src/mycomponents/detail/comRecommendDetailCard.vue
+++ b/src/mycomponents/detail/comRecommendDetailCard.vue
@@ -14,10 +14,9 @@
                             @click="(...event)=>swipeClick(event,item)">
             <view  v-if="item.isRecommend" class="uni-flex" style="flex-direction: row; align-items: center;background-color: antiquewhite;">
               <view class="" style="font-size: 32rpx; color: black; font-weight: bold; text-align: center;">
-                推
-                荐
+                推 荐
               </view>
-              <recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
+              <recommend :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
               </recommend>
             </view>
             <view v-else class="uni-flex" style="flex-direction: row; align-items: center;background-color: antiquewhite; margin-top: 5rpx;">
diff --git a/src/mycomponents/detail/comRecommendDetailCardBatch.vue b/src/mycomponents/detail/comRecommendDetailCardBatch.vue
index 60022756..dc923a53 100644
--- a/src/mycomponents/detail/comRecommendDetailCardBatch.vue
+++ b/src/mycomponents/detail/comRecommendDetailCardBatch.vue
@@ -16,8 +16,8 @@
           </view>
           <view class="" style="flex:1;">
             <batch v-if="item.batch" :batch="item.batch"></batch>
-            <location v-if="item.fromLocationCode" title="来源库位" :locationCode="item.fromLocationCode">
-            </location>
+            <location v-if="item.fromLocationCode" title="来源库位"
+                      :locationCode="item.fromLocationCode"></location>
           </view>
           <text style="font-size: 30rpx;color: #2979ff; " @click="copy(item)" v-if="isDevlement()">复制</text>
         </view>
@@ -28,9 +28,8 @@
             际
           </view>
           <view class="scan_view" style="flex:1;">
-            <batch v-if="item.batch" :batch="item.batch"></batch>
-            <location v-if="item.fromLocationCode" title="来源库位" :locationCode="item.fromLocationCode">
-            </location>
+            <location v-if="item.fromLocationCode" title="来源库位"
+                      :locationCode="item.fromLocationCode"></location>
           </view>
           <!-- <recommend  :detail="item" :isShowStatus="isShowStatus" :isShowToLocation="false">
           </recommend> -->
diff --git a/src/mycomponents/item/itemCompareQty.vue b/src/mycomponents/item/itemCompareQty.vue
index 895531d3..35afde77 100644
--- a/src/mycomponents/item/itemCompareQty.vue
+++ b/src/mycomponents/item/itemCompareQty.vue
@@ -1,9 +1,9 @@
 <template>
-  <view class="uni-flex uni-row space-between uni-inline-item" style="margin-left: 10px;">
+  <view class="uni-flex uni-row space-between uni-inline-item" style="margin-left: 10px; flex: 1">
     <view>
       <item :dataContent="dataContent"></item>
     </view>
-    <view style="width: 40%; display: flex; flex-direction: column; justify-content: flex-end; margin-right: 10rpx; word-break: break-word">
+    <view style="flex:1;display: flex; flex-direction: column; justify-content: flex-end; margin-right: 10rpx; word-break: break-word">
       <recommend-qty v-if="handleQty == 0" :dataContent="dataContent" :isShowStatus="false" :isShowStdPack="true"></recommend-qty>
       <compare-qty v-else :dataContent="dataContent" :recommendQty="Number(dataContent.qty)" :handleQty="Number(handleQty)" :isShowStatus="false" :isShowPackUnit="isShowPackUnit"> </compare-qty>
     </view>
diff --git a/src/mycomponents/item/itemQty.vue b/src/mycomponents/item/itemQty.vue
index d48dc3b8..5cea8f33 100644
--- a/src/mycomponents/item/itemQty.vue
+++ b/src/mycomponents/item/itemQty.vue
@@ -1,5 +1,5 @@
 <template>
-  <view class="uni-flex uni-row space-between center u-p-t-20 u-p-b-20" style="width: 100%; border-bottom: 1px solid rgba(230, 230, 2300.5)">
+  <view class="uni-flex uni-row space-between center u-p-t-20 u-p-b-20" style="padding-left:10px;: 100%; border-bottom: 1px solid rgba(230, 230, 2300.5)">
     <view style="flex: 1">
       <item :dataContent="dataContent"></item>
     </view>
diff --git a/src/mycomponents/recommend/recommend.vue b/src/mycomponents/recommend/recommend.vue
index aadd5b94..ba6d3909 100644
--- a/src/mycomponents/recommend/recommend.vue
+++ b/src/mycomponents/recommend/recommend.vue
@@ -1,6 +1,6 @@
 <template>
-  <view :class="detail.scaned ? 'scan_view' : ''" class="u-p-t-1 u-p-b-20">
-    <view class="uni-flex uni-row space-between u-p-t-20" style="align-items: center">
+  <view :class="detail.scaned ? 'scan_view' : ''" class="" style="flex: 1;background-color: white">
+    <view class="uni-flex uni-row space-between" style="align-items: center">
       <!-- uni-inline-item 暂时拿掉-->
       <view style="word-break: break-all">
         <!-- 	<container v-if="isShowContainer&&detail.containerNumber!=null" :container="detail.containerNumber">
diff --git a/src/pages/count/coms/comCountDetailcards.vue b/src/pages/count/coms/comCountDetailcards.vue
index e8f9460b..89b38d3c 100644
--- a/src/pages/count/coms/comCountDetailcards.vue
+++ b/src/pages/count/coms/comCountDetailcards.vue
@@ -60,15 +60,16 @@ const props = defineProps({
     default: true
   }
 })
+const emit = defineEmits(['editItem'])
 const edit = () => {
-  emit('editItem', dataContent.value)
+  emit('editItem', props.dataContent)
 }
 const isDevlement = () => {
   return config.isDevelopment
 }
 const copy = () => {
   // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-  const content = `HPQ;V1.0;I${dataContent.value.itemCode};P${dataContent.value.packingNumber};B${dataContent.value.batch};Q${dataContent.value.qty}`
+  const content = `HPQ;V1.0;I${props.dataContent.itemCode};P${props.dataContent.packingNumber};B${props.dataContent.batch};Q${props.dataContent.qty}`
   uni.setClipboardData({
     data: content,
     success: () => {
@@ -80,7 +81,7 @@ const copy = () => {
 }
 const copyPro = () => {
   // HPQ;V1.0;ICE115F11161AG;PP20230427000026;B20230427002;Q100
-  const content = `HMQ;V1.0;I${dataContent.value.itemCode};P${dataContent.value.packingNumber};B${dataContent.value.batch};Q${dataContent.value.qty}`
+  const content = `HMQ;V1.0;I${props.dataContent.itemCode};P${props.dataContent.packingNumber};B${props.dataContent.batch};Q${props.dataContent.qty}`
   uni.setClipboardData({
     data: content,
     success: () => {
diff --git a/src/pages/count/job/countLightDetail.vue b/src/pages/count/job/countLightDetail.vue
index b2aa0b3b..dfa83a7d 100644
--- a/src/pages/count/job/countLightDetail.vue
+++ b/src/pages/count/job/countLightDetail.vue
@@ -1,30 +1,32 @@
 <template>
   <view class="page-wraper">
-    <view class="header">
-      <view class="">
-        <job-top :dataContent="jobContent"></job-top>
-      </view>
-      <view class="cen_card" style="padding-top: 10rpx; padding-bottom: 10rpx">
-        <view class="cell_box uni-flex uni-row" style="font-weight: bold">
-          <view class="cell_info" style="color: #000">
-            <view class="text_lightblue" style="color: #000">阶段</view>
-            <view style="color: #000">{{ getCountStageNameValue(jobContent.stage) }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">策略</view>
-            <view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">库位</view>
-            <view style="color: #000">{{ fromLocationCode }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">总数</view>
-            <view style="color: #000"> {{ allCount }}</view>
-          </view>
-          <view class="cell_info">
-            <view class="text_lightblue" style="color: #000">已扫描</view>
-            <view style="color: #000">{{ scanCount }}</view>
+    <view class="page-header">
+      <view class="header-view">
+        <view class="header_job_top">
+          <job-top :dataContent="jobContent"></job-top>
+        </view>
+        <view class="cen_card" style="padding:10rpx 0">
+          <view class="cell_box uni-flex uni-row" style="font-weight: bold">
+            <view class="cell_info" style="color: #000">
+              <view class="text_lightblue" style="color: #000">阶段</view>
+              <view style="color: #000">{{ getCountStageNameValue(jobContent.stage) }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">策略</view>
+              <view style="color: #000">{{ isOpenCount(jobContent.isOpenCount) }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">库位</view>
+              <view style="color: #000">{{ fromLocationCode }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">总数</view>
+              <view style="color: #000"> {{ allCount }}</view>
+            </view>
+            <view class="cell_info">
+              <view class="text_lightblue" style="color: #000">已扫描</view>
+              <view style="color: #000">{{ scanCount }}</view>
+            </view>
           </view>
         </view>
       </view>
@@ -202,6 +204,7 @@ const getDetail = () => {
       if (res.data == null) {
         showMessage('未获取到详情')
       } else {
+        console.log(res);
         jobContent.value = res.data
         jobStatus.value = res.data.status
         fromLocationCode.value = jobContent.value.countSplitCode
diff --git a/src/pages/deliver/coms/comDeliverJobCard.vue b/src/pages/deliver/coms/comDeliverJobCard.vue
index 6132b1c0..5b9b08c0 100644
--- a/src/pages/deliver/coms/comDeliverJobCard.vue
+++ b/src/pages/deliver/coms/comDeliverJobCard.vue
@@ -1,8 +1,8 @@
 <template>
   <job-com-main-card :dataContent="dataContent">
     <jobComMainDetailCard :isShowDeliverType="isShowDeliverType" :dataContent="dataContent"></jobComMainDetailCard>
-    <view class="card_view" style="margin-left: 10px">
-      <text class="card_packing_code">发货类型</text>
+    <view class="card_view" style="margin-bottom: 10rpx">
+      <text class="card_packing_code" style="padding:0;">发货类型</text>
       <text class="card_content">{{ dataContent.deliverType == 'CUST' ? '寄售库发货' : '三方库发货' }}</text>
     </view>
   </job-com-main-card>
diff --git a/src/pages/deliver/job/deliverJob.vue b/src/pages/deliver/job/deliverJob.vue
index 87ef6586..24ceae63 100644
--- a/src/pages/deliver/job/deliverJob.vue
+++ b/src/pages/deliver/job/deliverJob.vue
@@ -168,11 +168,11 @@ const openJobDetail = (item) => {
       managementType = managementList.some(cur => cur.ManagementPrecision == 'BY_BATCH') ?
           'BY_BATCH' : ''
       if (managementType == 'BY_BATCH') {
-        proxy.$tab.navigateTo({
+        uni.navigateTo({
           url: './deliverDetailBatch?id=' + item.masterId + '&status=' + item.status+'&title='+this.title
         });
       } else {
-        proxy.$tab.navigateTo(`./deliverDetail?id=${item.masterId}&status=${item.status}&title=${title.value}`)
+        uni.navigateTo(`./deliverDetail?id=${item.masterId}&status=${item.status}&title=${title.value}`)
       }
     }
   })
diff --git a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
index 254de65b..40205d0c 100644
--- a/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
+++ b/src/pages/inventoryMove/coms/comInventoryDetailCard.vue
@@ -3,7 +3,9 @@
     <u-collapse ref="collapse1" @change="">
       <u-collapse-item :open="true">
         <template v-slot:title>
-          <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+          <view style="flex: 1">
+            <item-qty :dataContent="dataContent" :handleQty="dataContent.handleQty"></item-qty>
+          </view>
         </template>
         <view class="split_line"></view>
         <u-swipe-action :show="detail.show" :index="index" v-for="(detail, index) in dataContent.subList" :key="index" :options="detail.scaned ? scanOptions : detailOptions" bg-color="rgba(255,255,255,0)" class="u-m-b-20" @click="(...event) => swipeClick(event, detail)">
diff --git a/src/pages/inventoryMove/coms/comMoveJob.vue b/src/pages/inventoryMove/coms/comMoveJob.vue
index 3c43edc0..753a8b47 100644
--- a/src/pages/inventoryMove/coms/comMoveJob.vue
+++ b/src/pages/inventoryMove/coms/comMoveJob.vue
@@ -21,7 +21,7 @@
 <script setup lang="ts">
 import { ref, getCurrentInstance, onMounted, nextTick, watch } from 'vue'
 import { getInventoryMoveJobList, cancleTakeInventoryMoveJob } from '@/api/request2.js'
-
+import {onShow} from '@dcloudio/uni-app'
 import { goHome, getCurrDate } from '@/common/basic.js'
 
 import { getDetailOption, getDetailGiveupOption } from '@/common/array.js'
@@ -77,7 +77,12 @@ onMounted(() => {
   nextTick(() => {
     detailOptions.value = getDetailOption()
     detailGiveupOptions.value = getDetailGiveupOption()
-    // refresh()
+
+  })
+})
+onShow(()=>{
+  setTimeout(()=>{
+    getList('refresh')
   })
 })
 const updateTitle = () => {
@@ -167,7 +172,6 @@ const getList = (type) => {
         loadingType.value = 'nomore'
         return
       }
-      console.log(jobList.value)
       pageNo.value++
       updateTitle()
     })
diff --git a/src/pages/inventoryMove/job/holdToOkMoveJob.vue b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
index 22350718..c67e1490 100644
--- a/src/pages/inventoryMove/job/holdToOkMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToOkMoveJob.vue
@@ -12,9 +12,9 @@ import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 const receiptjob = ref()
 const title = ref('')
 onShow(() => {
-  if(receiptjob.value){
+  setTimeout(()=>{
     receiptjob.value.refresh()
-  }
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
diff --git a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
index 6cc47db0..a99965f8 100644
--- a/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToScrapMoveJob.vue
@@ -9,12 +9,12 @@ 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'
 
-const receiptjob = ref()
+const receiptjob = ref(null)
 const title = ref('')
 onShow(() => {
-  if(receiptjob.value){
+  setTimeout(()=>{
     receiptjob.value.refresh()
-  }
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
diff --git a/src/pages/inventoryMove/job/holdToWipMoveJob.vue b/src/pages/inventoryMove/job/holdToWipMoveJob.vue
index 7749f9a6..8be33cdd 100644
--- a/src/pages/inventoryMove/job/holdToWipMoveJob.vue
+++ b/src/pages/inventoryMove/job/holdToWipMoveJob.vue
@@ -7,7 +7,7 @@
 <script lang="ts" setup>
 import {ref} from 'vue'
 import {onLoad, onShow, onPullDownRefresh, onReachBottom, onNavigationBarButtonTap} from '@dcloudio/uni-app'
-import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
+import ComMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 
 const title = ref('')
 const comMoveJob = ref('')
@@ -15,9 +15,9 @@ onLoad((option) => {
   title.value = option.title
 })
 onShow(()=> {
-  if (comMoveJob.value) {
+  setTimeout(()=>{
     comMoveJob.value.refresh();
-  }
+  },100)
 })
 onPullDownRefresh(()=> {
   if (comMoveJob.value) {
diff --git a/src/pages/inventoryMove/job/inventoryMoveDetail.vue b/src/pages/inventoryMove/job/inventoryMoveDetail.vue
index afe49776..9149cd3e 100644
--- a/src/pages/inventoryMove/job/inventoryMoveDetail.vue
+++ b/src/pages/inventoryMove/job/inventoryMoveDetail.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>
diff --git a/src/pages/inventoryMove/job/okToHoldMoveJob.vue b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
index e04fd921..1642caf3 100644
--- a/src/pages/inventoryMove/job/okToHoldMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToHoldMoveJob.vue
@@ -7,34 +7,33 @@
 <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'
 
-const receiptjob = ref()
+const comMoveJob = ref()
 const title = ref('')
 onShow(() => {
-  if(receiptjob.value){
-    receiptjob.value.refresh()
-  }
+  setTimeout(()=>{
+    comMoveJob.value.refresh()
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
 })
 onPullDownRefresh(() => {
-  if(receiptjob.value){
-    receiptjob.value.refresh()
+  if(comMoveJob.value){
+    comMoveJob.value.refresh()
   }
 })
 onReachBottom(() => {
-  if(receiptjob.value){
-    receiptjob.value.onReach()
+  if(comMoveJob.value){
+    comMoveJob.value.onReach()
   }
 })
 onNavigationBarButtonTap((e) => {
   if (e.index === 0) {
-    receiptjob.value.goHome1()
-    // this.$refs.receiptjob.refresh();
+    comMoveJob.value.goHome1()
   } else if (e.index == 1) {
-    receiptjob.value.openFilter()
+    comMoveJob.value.openFilter()
   }
 })
 </script>
diff --git a/src/pages/inventoryMove/job/okToScrapMoveJob.vue b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
index 45795716..e34455ea 100644
--- a/src/pages/inventoryMove/job/okToScrapMoveJob.vue
+++ b/src/pages/inventoryMove/job/okToScrapMoveJob.vue
@@ -12,9 +12,9 @@ import comMoveJob from '@/pages/inventoryMove/coms/comMoveJob.vue'
 const receiptjob = ref()
 const title = ref('')
 onShow(() => {
-  if(receiptjob.value){
+  setTimeout(()=>{
     receiptjob.value.refresh()
-  }
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
diff --git a/src/pages/productReceipt/job/productReceiptDetail.vue b/src/pages/productReceipt/job/productReceiptDetail.vue
index 33a6738f..5e0edbc3 100644
--- a/src/pages/productReceipt/job/productReceiptDetail.vue
+++ b/src/pages/productReceipt/job/productReceiptDetail.vue
@@ -1,37 +1,36 @@
 <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>
-      </view>
-    </view>
-
-    <view class="cen_card" style="padding: 20rpx 0px 0px">
-      <view class="cell_box uni-flex uni-row">
-        <view class="cell_info">
-          <view class="text_lightblue">车间</view>
-          <view>
-            {{ jobContent.workShopCode }}
-          </view>
-        </view>
-        <view class="cell_info">
-          <view class="text_lightblue">生产线</view>
-          <view>
-            {{ productionLineCode }}
-          </view>
-        </view>
-        <view class="cell_info">
-          <view class="text_lightblue">班组</view>
-          <view>
-            {{ jobContent.team }}
-          </view>
-        </view>
-        <view class="cell_info">
-          <view class="text_lightblue">班次</view>
-          <view>
-            {{ jobContent.shiftName }}
+          <view class="cen_card" style="padding: 20rpx 0px 0px">
+            <view class="cell_box uni-flex uni-row">
+              <view class="cell_info">
+                <view class="text_lightblue">车间</view>
+                <view>
+                  {{ jobContent.workShopCode }}
+                </view>
+              </view>
+              <view class="cell_info">
+                <view class="text_lightblue">生产线</view>
+                <view>
+                  {{ productionLineCode }}
+                </view>
+              </view>
+              <view class="cell_info">
+                <view class="text_lightblue">班组</view>
+                <view>
+                  {{ jobContent.team }}
+                </view>
+              </view>
+              <view class="cell_info">
+                <view class="text_lightblue">班次</view>
+                <view>
+                  {{ jobContent.shiftName }}
+                </view>
+              </view>
+            </view>
           </view>
         </view>
       </view>
diff --git a/src/pages/productRecycle/job/productRecycleJob.vue b/src/pages/productRecycle/job/productRecycleJob.vue
index b27adf47..0e3a4c68 100644
--- a/src/pages/productRecycle/job/productRecycleJob.vue
+++ b/src/pages/productRecycle/job/productRecycleJob.vue
@@ -52,9 +52,9 @@ const comMessageRef = ref()
 const jobInfoPopupRef = ref()
 const jobListPopupRef = ref()
 onShow(() => {
-  nextTick(() => {
+  setTimeout(()=>{
     getList('refresh')
-  })
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
diff --git a/src/pages/productRecycle/job/productRecycleJobDetail.vue b/src/pages/productRecycle/job/productRecycleJobDetail.vue
index 24b86a83..682a8afc 100644
--- a/src/pages/productRecycle/job/productRecycleJobDetail.vue
+++ b/src/pages/productRecycle/job/productRecycleJobDetail.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>
@@ -13,7 +13,7 @@
     <view class="page-main">
       <scroll-view scroll-y="true" class="page-main-scroll">
         <view class="detail-list" v-for="(item, index) in detailSource" :key="item.id">
-          <view class="">
+          <view class="" v-if="managementType.length > 0">
             <comDetailCardBatch :dataContent="item" :index="index" :settingParam="jobContent" :isShowStatus="false"
                                 @remove="updateData" @updateData="updateData" @openDetail="openDetail"
                                 :locationAreaTypeList='toLocationAreaTypeList' v-if="managementType == 'BY_BATCH'">
@@ -75,6 +75,7 @@ const scanPopup = ref()
 const comMessageRef = ref()
 const jobDetailPopup = ref()
 const fromLocationCode = ref()
+const toLocationAreaTypeList = ref([])
 onLoad((option) => {
   uni.setNavigationBarTitle({
     title: `${option.title}详情`
@@ -153,7 +154,7 @@ const getDetail = () => {
         detailSource.value = await getDataSource(subList.value);
         //获取管理模式，封装参数
         let itemCodes = []
-        this.detailSource.forEach(item => {
+        detailSource.value.forEach(item => {
           itemCodes.push(item.itemCode)
           item.scaned = false
         })
diff --git a/src/pages/purchaseReceipt/job/receiptDetail.vue b/src/pages/purchaseReceipt/job/receiptDetail.vue
index b87d2ef8..74c0ea1e 100644
--- a/src/pages/purchaseReceipt/job/receiptDetail.vue
+++ b/src/pages/purchaseReceipt/job/receiptDetail.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">
           <jobTopAsn :dataContent="jobContent"></jobTopAsn>
         </view>
diff --git a/src/pages/purchaseReturn/coms/comReturnDetailCardBatch.vue b/src/pages/purchaseReturn/coms/comReturnDetailCardBatch.vue
index 016e1177..aa0d7602 100644
--- a/src/pages/purchaseReturn/coms/comReturnDetailCardBatch.vue
+++ b/src/pages/purchaseReturn/coms/comReturnDetailCardBatch.vue
@@ -1,15 +1,13 @@
 <template>
 	<view>
 		<view v-for="(item,index) in dataContent.subList">
-
 			<view class="split_line"></view>
 			<!-- 物品 -->
 			<u-swipe-action ref="swipeAction"  :class="item.scaned?'scan_view':''"
                         :options="(item.scaned&&isEdit)?editAndRemoveOptions : item.scaned? removeOptions:options"
                         @click="(...event)=>itemCoceClick(event,item,index)" >
         <item-qty :dataContent="item" :isShowBalanceQty="false" :handleQty="item.handleQty"></item-qty>
-        <location :locationCode="item.fromLocationCode">
-        </location>
+        <location :locationCode="item.fromLocationCode"></location>
         <batch :batch="item.batch"></batch>
 			</u-swipe-action>
 		</view>
@@ -29,8 +27,8 @@
 	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 location from '@/mycomponents/balance/location.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'
 	import batch from '@/mycomponents/balance/batch.vue'
@@ -73,7 +71,7 @@ const collapse = ref(null);
 const balanceQtyEdit = ref(null);
 const receiptHint = ref(null);
 const message = ref(null);
-
+const options = ref([])
 onMounted(() => {
   removeOptions.value = getRemoveOption();
   editAndRemoveOptions.value = getEditRemoveOption();
diff --git a/src/pages/purchaseReturn/coms/comScanReturnPack.vue b/src/pages/purchaseReturn/coms/comScanReturnPack.vue
index 07584898..73a02996 100644
--- a/src/pages/purchaseReturn/coms/comScanReturnPack.vue
+++ b/src/pages/purchaseReturn/coms/comScanReturnPack.vue
@@ -576,445 +576,6 @@ const cancle = () => {
 const emit = defineEmits(['closeScan', 'updateData']);
 </script>
 
-export default {
-name: 'winScanPack',
-components: {
-winComScan,
-balance,
-balanceQtyEdit,
-balanceSelect
-},
-props: {
-title: {
-type: String,
-default: ''
-},
-headerType: {
-type: String,
-default: "HPQ,HMQ"
-},
-allowModifyLocation:{
-type:Boolean,
-default:false
-}
-
-},
-data() {
-return {
-dataContent: {},
-jobContent: {},
-expendIcon: 'arrow-down',
-show: false,
-scanList: [],
-toLocation: null,
-toLocationCode: '',
-fromLocationList: [],
-fromLocationCode: '',
-fromLocation: null,
-issueRecord: [], //退货历史
-expand: true,
-scanOptions: {},
-editItem: {},
-positionInfo: "请选择位置",
-positionList: [],
-defaultValueList: [],
-label: {},
-fromInventoryStatuses: [],
-packageInfo: {}
-}
-},
-created() {
-
-},
-watch: {},
-mounted() {
-this.detailOptions = getDetailOption();
-this.scanOptions = getDetailEditRemoveOption();
-},
-methods: {
-openScanPopup(content, jobcontent) {
-this.issueRecord = [];
-this.dataContent = content;
-this.jobContent = jobcontent;
-this.initData();
-this.positionInfo = this.jobContent.workShopCode + "-" + this.jobContent.subList[0].productionLineCode +
-"-" + this.jobContent.subList[0].workStationCode
-this.$refs.popup.open('bottom')
-setTimeout(res => {
-this.getfocus();
-}, 500)
-},
-
-closeScanPopup() {
-this.losefocus()
-this.$refs.popup.close();
-this.$emit("closeScan")
-//清除数据，恢复默认值
-// Object.assign(this.$data, this.$options.data());
-},
-
-initData() {
-let that = this;
-that.fromLocationList = [];
-if (that.dataContent != null) {
-that.fromInventoryStatuses = getDirectoryItemArray(this.jobContent.outInventoryStatuses)
-that.toLocation = that.dataContent[0];
-that.toLocationCode = that.dataContent[0].toLocationCode;
-that.fromLocationList = that.getFromLocationList();
-}
-},
-
-showBalanceSelect(items, packageInfo) {
-this.packageInfo = packageInfo;
-this.$refs.balanceSelect.openPopup(items);
-},
-
-getFromLocationList() {
-let list = [];
-this.dataContent.forEach(location=>{
-location.Items.forEach(item => {
-item.Locations.forEach(f => {
-list.push(f.fromLocationCode)
-})
-})
-})
-this.fromLocationCode = list[0];
-return list;
-},
-
-fromLocationUpdate(fromlocation) {
-let location = this.fromLocationList.find(r => r == fromlocation)
-// 成品退货任务--同一物料，可以扫描提交不在任务中的库位
-// if (location == undefined) {
-this.fromLocationCode = fromlocation
-//  this.showErrorMessage('退货库位【' + fromlocation + '】不存在')
-// }
-},
-onScan(result) {
-try {
-let that = this;
-
-if (that.fromLocationCode == '') {
-that.showErrorMessage('请选择来源库位', res => {
-that.$refs.toLocationCombox.onFocus();
-});
-return;
-}
-let packageInfo = result.package;
-let itemCode = result.label.itemCode;
-let packingCode = result.label.packingNumber;
-let lot = result.label.batch;
-let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
-if (item == undefined) {
-that.showErrorMessage('未查找到物料【' + itemCode + '】的退货明细',
-res => {
-that.getfocus();
-}
-)
-return;
-} else {
-//查找库存信息
-uni.showLoading({
-title: '加载中',
-mask: true
-})
-getBalanceByManagementPrecision(result.label, that.fromLocationCode, that.fromInventoryStatuses,
-balanceRes => {
-if (balanceRes.success) {
-if (balanceRes.data.list.length == 0) {
-this.showErrorMessage('在来源库位[' + this.fromLocationCode + '],未查找到该包装的库存记录',
-res => {
-this.packGetFocus();
-})
-} else if (balanceRes.data.list.length == 1) {
-let balance = balanceRes.data.list[0];
-this.afterGetBalance(result.label, balance, packageInfo);
-} else {
-this.label = result.label;
-this.showBalanceSelect(balanceRes.data.list, packageInfo);
-}
-} else {
-this.showErrorMessage(balanceRes.message.message);
-}
-uni.hideLoading();
-});
-}
-} catch (e) {
-this.showErrorMessage(e.stack)
-uni.hideLoading();
-}
-},
-
-selectBalanceItem(balance) {
-this.afterGetBalance(balance, balance, this.packageInfo);
-},
-
-
-afterGetBalance(label, balance, packageInfo) {
-let that = this;
-try {
-let itemCode = label.itemCode;
-let packingCode = label.packingNumber;
-let lot = label.batch;
-let item = that.toLocation.Items.find(r => r.itemCode == itemCode);
-let fromLocation = item.Locations.find(l => l.fromLocationCode == that.fromLocationCode);
-// 成品退货任务--同一物料，可以扫描提交不在任务中的库位
-if(!fromLocation){
-fromLocation = {
-Batchs:[{
-Recommends:[],
-Records: [],
-batch: label.batch,
-detail:{
-...packageInfo,
-fromLocationCode: balance.locationCode,
-toLocationCode:this.toLocationCode
-},
-handleQty: 0,
-packingNumber: null,
-// packingNumber: label.packingNumber,
-qty: label.qty,
-uom: label.uom
-}],
-toLocationCode:this.toLocationCode,
-fromLocationCode: balance.locationCode,
-handleQty: 0,
-qty: label.qty,
-uom: label.uom
-}
-item.Locations.push(fromLocation)
-}
-if (fromLocation != undefined) {
-let batch = fromLocation.Batchs.find(r => r.batch == lot);
-if (batch != undefined) {
-if (batch.Records == undefined) {
-batch.Records = [];
-}
-
-let record = batch.Records.find(r => r.packingNumber == packingCode);
-if (record == undefined) {
-//如果有推荐箱码
-if (batch.Recommends&&batch.Recommends.length > 0) {
-let recommend = batch.Recommends.find(r => r.packingNumber == packingCode);
-if (recommend != undefined) {
-that.addRecord(batch, label, balance, packageInfo)
-} else {
-//允许修改箱码
-if (this.jobContent.allowModifyPackingNumber == 'TRUE') {
-that.addRecord(batch, label, balance, packageInfo);
-} else {
-that.showErrorMessage('未查找到该箱码【' + packingCode + '】的明细',
-res => {
-that.getfocus();
-}
-)
-}
-}
-} else {
-that.addRecord(batch, label, balance, packageInfo)
-}
-} else {
-that.showErrorMessage('箱码【' + packingCode + '】已经扫描,请继续扫描下一箱',
-res => {
-that.getfocus();
-}
-)
-}
-} else {
-if (this.jobContent.allowModifyBatch == "TRUE") {
-this.showQuestionMessage('在【' + that.fromLocationCode + '】库位下,未查找到批次【' + lot +
-'】的退货明细,是否要继续退货?', res => {
-if (res) {
-let batch = that.createBatchInfo(label, balance,packageInfo);
-fromLocation.Batchs.unshift(batch);
-}
-})
-} else {
-that.showErrorMessage("未查找到\n物料【"+itemCode+"】批次【" + lot +" 】的退货明细",
-res => {
-that.getfocus();
-});
-}
-}
-} else {
-that.showErrorMessage('未查找到推荐库位【' + that.fromLocationCode + '】的退货明细',
-res => {
-that.getfocus();
-}
-)
-}
-} catch (e) {
-that.showErrorMessage(e.stack,
-res => {
-that.getfocus();
-}
-)
-}
-},
-
-createBatchInfo(data, balance, packageInfo) {
-let batch = {
-batch: data.lot||data.batch,
-qty: 0,
-uom: data.uom,
-handleQty: Number(data.qty),
-Records: [],
-detail:{
-fromLocationCode:this.fromLocationCode, //balance.locationCode
-toLocationCode:this.toLocationCode,
-itemCode:data.itemCode,
-handleQty: Number(data.qty),
-packingNumber:data.packingNumber,
-qty: 0,
-uom:data.uom,
-itemName:packageInfo.itemName,
-itemDesc1:packageInfo.itemDesc1,
-itemDesc2:packageInfo.itemDesc2,
-singlePrice:balance.singlePrice,
-amount:balance.amount
-}
-}
-let record = this.creatRecord(data, balance, packageInfo);
-batch.Records.push(record);
-this.issueRecord.unshift(record)
-return batch;
-},
-
-creatRecord(label, balance, packageInfo) {
-balance.packQty = packageInfo.packQty
-balance.packUnit = packageInfo.packUnit
-let record = {
-scaned: true,
-itemCode: label.itemCode,
-packingNumber: label.packingNumber,
-batch: label.batch,
-qty: Number(label.qty) > Number(balance.qty) ? Number(balance.qty) : Number(label.qty),
-uom: balance.uom,
-inventoryStatus: balance.inventoryStatus,
-balance: balance,
-toLocationCode: this.toLocationCode,
-supplierCode: label.supplierCode,
-packUnit: packageInfo.packUnit,
-packQty: packageInfo.packQty,
-singlePrice:balance.singlePrice,
-amount:balance.amount
-}
-return record;
-},
-
-calcBatchHandleQty(batch) {
-let handleQty = 0;
-batch.Records.forEach(res => {
-handleQty = calc.add(handleQty, res.qty)
-})
-batch.handleQty = handleQty;
-},
-
-addRecord(batch, label, balance, packageInfo) {
-let record = this.creatRecord(label, balance, packageInfo);
-batch.Records.push(record);
-this.issueRecord.unshift(record)
-this.calcBatchHandleQty(batch);
-this.$emit('updateData', "");
-this.getfocus();
-},
-
-getfocus() {
-if (this.$refs.comscan != undefined) {
-this.$refs.comscan.getfocus();
-}
-},
-
-losefocus() {
-if (this.$refs.comscan != undefined) {
-this.$refs.comscan.losefocus();
-}
-},
-
-expands() {
-this.expand = !this.expand;
-this.expendIcon = this.expand == true ? "arrow-down" : "arrow-up"
-},
-
-swipeClick(e, item, index) {
-if (e.content.text == "详情") {
-this.detail(item)
-} else if (e.content.text == "编辑") {
-this.edit(item)
-} else if (e.content.text == "移除") {
-this.remove(item, index)
-}
-},
-edit(item) {
-this.editItem = item;
-// item.balance.balanceQty = item.balance.qty;
-item.balance.balanceQty = item.balance.qty;
-this.$refs.balanceQtyEdit.openEditPopup(item.balance, item.qty);
-},
-
-detail(item) {
-this.showItem = item;
-this.$refs.receiptHint.openScanPopup()
-},
-remove(record, index) {
-this.showQuestionMessage("确定移除扫描信息?",
-res => {
-if (res) {
-record.qty = 0;
-this.issueRecord.splice(index, 1)
-
-let item = this.toLocation.Items.find(r => r.itemCode == record.itemCode);
-if (item != undefined) {
-item.Locations.forEach(l => {
-let batch = l.Batchs.find(b => b.packingNumber == record.packingNumber && b
-.batch == record.batch);
-let rIndex = batch.Records.findIndex(r => r.packingNumber == record
-.packingNumber && r
-.batch == record.batch);
-batch.Records.splice(rIndex, 1);
-})
-}
-this.$emit('updateData', item);
-}
-});
-},
-
-packGetFocus() {
-this.$refs.comscan.getfocus();
-},
-packLoseFocus() {
-this.$refs.comscan.losefocus();
-},
-showMessage(message, callback) {
-setTimeout(r => {
-this.packLoseFocus();
-this.$refs.comMessageRef.showMessage(message, callback);
-})
-},
-showErrorMessage(message, callback) {
-setTimeout(r => {
-this.packLoseFocus();
-this.$refs.comMessageRef.showErrorMessage(message, callback);
-
-})
-},
-showQuestionMessage(message, callback) {
-setTimeout(r => {
-this.packLoseFocus();
-this.$refs.comMessageRef.showQuestionMessage(message, callback);
-})
-},
-confirm(val) {
-this.editItem.qty = Number(val);
-this.$emit('updateData', this.editItem)
-},
-cancle() {
-this.closeScanPopup()
-}
-}
-}
-</script>
-
 <style lang="scss">
 button {
   border: none;
diff --git a/src/pages/purchaseReturn/job/returnDetailBatch.vue b/src/pages/purchaseReturn/job/returnDetailBatch.vue
index 53a9c8dd..08634781 100644
--- a/src/pages/purchaseReturn/job/returnDetailBatch.vue
+++ b/src/pages/purchaseReturn/job/returnDetailBatch.vue
@@ -22,9 +22,11 @@
 
 		<view class="page-main">
 			<scroll-view scroll-y="true" class="page-main-scroll">
-				<comReturnDetailCardBatch ref='comIssueDetailCard' :dataContent="detailSource" :settingParam="jobContent"
-					@updateData='updateData' v-if="managementType == 'BY_BATCH'">
-				</comReturnDetailCardBatch>
+				<view class="detail-list">
+          <comReturnDetailCardBatch ref='comIssueDetailCard' :dataContent="detailSource" :settingParam="jobContent"
+                                    @updateData='updateData' v-if="managementType == 'BY_BATCH'">
+          </comReturnDetailCardBatch>
+        </view>
 			</scroll-view>
 		</view>
 
diff --git a/src/pages/purchaseReturn/job/returnJob.vue b/src/pages/purchaseReturn/job/returnJob.vue
index f1f54d5b..920c2b7e 100644
--- a/src/pages/purchaseReturn/job/returnJob.vue
+++ b/src/pages/purchaseReturn/job/returnJob.vue
@@ -53,9 +53,10 @@ const managementType = ref('')
 const managementList = ref([])
 const jobListPopup = ref(null)
 onShow(() => {
-  nextTick(() => {
+
+  setTimeout(()=>{
     getList('refresh')
-  })
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
diff --git a/src/pages/putaway/job/putawayDetail.vue b/src/pages/putaway/job/putawayDetail.vue
index e763f5f6..4c3abd5f 100644
--- a/src/pages/putaway/job/putawayDetail.vue
+++ b/src/pages/putaway/job/putawayDetail.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>
diff --git a/src/pages/unPlanned/coms/comIssueJobCard.vue b/src/pages/unPlanned/coms/comIssueJobCard.vue
index 4879ef63..a76c502f 100644
--- a/src/pages/unPlanned/coms/comIssueJobCard.vue
+++ b/src/pages/unPlanned/coms/comIssueJobCard.vue
@@ -1,7 +1,7 @@
 <template>
   <job-com-main-card :dataContent="dataContent">
     <jobComMainDetailCard  :dataContent="dataContent" :isShowToLocation="false"></jobComMainDetailCard>
-    <view class="task_item" style="margin-left:22rpx;">
+    <view class="task_item">
       <view class="task_text">
         <view class="card_view">
           <text class="card_packing_code ">目的地</text>
diff --git a/src/pages/unPlanned/job/issueJobDetail.vue b/src/pages/unPlanned/job/issueJobDetail.vue
index add77875..f1b18888 100644
--- a/src/pages/unPlanned/job/issueJobDetail.vue
+++ b/src/pages/unPlanned/job/issueJobDetail.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>
diff --git a/src/pages/unPlanned/job/receiptJob.vue b/src/pages/unPlanned/job/receiptJob.vue
index c6811219..7d2fd61e 100644
--- a/src/pages/unPlanned/job/receiptJob.vue
+++ b/src/pages/unPlanned/job/receiptJob.vue
@@ -63,9 +63,9 @@ const jobInfoPopupRef = ref()
 const jobListPopupRef = ref()
 const scanPopup = ref()
 onShow(() => {
-  nextTick(() => {
+  setTimeout(()=>{
     getList('refresh')
-  })
+  },100)
 })
 onLoad((option) => {
   title.value = option.title
diff --git a/src/pages/unPlanned/job/receiptJobDetail.vue b/src/pages/unPlanned/job/receiptJobDetail.vue
index 2911e5c4..90ae7be7 100644
--- a/src/pages/unPlanned/job/receiptJobDetail.vue
+++ b/src/pages/unPlanned/job/receiptJobDetail.vue
@@ -1,12 +1,11 @@
 <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>
         <view class="header_item"> 申请单号 : {{ jobContent.requestNumber }} </view>
-        <view class="split_line"></view>
       </view>
     </view>