From 5d17be69be0793a5d1503da6390ee6f78c1852ba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=8E=8B=E5=BF=97=E5=9B=BD?= <854933521@qq.com>
Date: Wed, 30 Oct 2024 17:10:50 +0800
Subject: [PATCH] =?UTF-8?q?page/package/coms=20=E6=96=87=E4=BB=B6=E8=BF=81?=
 =?UTF-8?q?=E7=A7=BB=208/8-10/25?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/package/coms/comOverPackJobCard.vue |  5 ++++-
 .../package/coms/comOverPackJobDetailCard.vue |  2 +-
 src/pages/package/coms/comScanPackagePack.vue | 19 ++++++++++++++++---
 3 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/pages/package/coms/comOverPackJobCard.vue b/src/pages/package/coms/comOverPackJobCard.vue
index 109c7daa..d1a4df6c 100644
--- a/src/pages/package/coms/comOverPackJobCard.vue
+++ b/src/pages/package/coms/comOverPackJobCard.vue
@@ -1,12 +1,15 @@
 <template>
   <job-com-main-card :dataContent="dataContent">
-    <jobComMainDetailCard :dataContent="dataContent"></jobComMainDetailCard>
+    <jobComMainDetailCard  :dataContent="dataContent" :isShowPackCount="true"></jobComMainDetailCard>
+    <view class='split_line' v-show="dataContent.acceptUserName"></view>
+    <jobAccept :dataContent="dataContent" v-show="dataContent.acceptUserName"></jobAccept>
   </job-com-main-card>
 </template>
 
 <script setup lang="ts">
 import jobComMainCard from '@/mycomponents/job/jobComMainCard.vue'
 import jobComMainDetailCard from '@/mycomponents/job/jobComMainDetailCard.vue'
+import jobAccept from '@/mycomponents/job/jobAccept.vue'
 
 const props = defineProps({
   dataContent: {
diff --git a/src/pages/package/coms/comOverPackJobDetailCard.vue b/src/pages/package/coms/comOverPackJobDetailCard.vue
index 8d67183a..7206331c 100644
--- a/src/pages/package/coms/comOverPackJobDetailCard.vue
+++ b/src/pages/package/coms/comOverPackJobDetailCard.vue
@@ -26,7 +26,7 @@
                 <view class="uni-flex uni-row" v-if="batch.Records.length > 0">
                   <view class="center" style="width: 20px; background-color: #0cc2b6; color: #fff; margin-left: 40px; padding: 0px 2px"> 扫描 </view>
                   <view class="uni-flex uni-column scan_view" style="width: 100%">
-                    <u-swipe-action :show="record.show" :index="key" v-for="(record, key) in batch.Records" :key="key" :options="scanOptions" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, batch, record)" style="width: 100%">
+                    <u-swipe-action :show="record.show" :index="key" v-for="(record, key) in batch.Records" :key="key" :options="settingParam.allowModifyQty=='TRUE'?scanOptions:removeOptions" bg-color="rgba(255,255,255,0)" @click="(...event) => swipeClick(event, batch, record)" style="width: 100%">
                       <handle-balance :detail="record" :isShowLocation="false" :isShowBatch="batch.packingNumber != null"> </handle-balance>
                     </u-swipe-action>
                   </view>
diff --git a/src/pages/package/coms/comScanPackagePack.vue b/src/pages/package/coms/comScanPackagePack.vue
index 8caed75c..c223c20a 100644
--- a/src/pages/package/coms/comScanPackagePack.vue
+++ b/src/pages/package/coms/comScanPackagePack.vue
@@ -79,6 +79,15 @@ const initData = () => {
     fromLocationList.value = getFromLocationList()
   }
 }
+//模拟扫描
+const openScanPopupForJobSimulate = (content, jobcontent, scanMessage)=> {
+  issueRecord.value = [];
+  dataContent.value = content;
+  jobContent.value = jobcontent;
+  initData();
+  scanPopup.value.openScanPopupForJobSimulate(fromLocationCode.value, fromLocationList.value, jobContent.value, scanMessage);
+
+},
 const showBalanceSelect = (items) => {
   balanceSelect.value.openPopup(items)
 }
@@ -135,6 +144,7 @@ const onScan = (result) => {
     const lot = result.label.batch
     const item = toLocation.value.Items.find((r) => r.itemCode == itemCode)
     if (item == undefined) {
+      packLoseFocus()
       showErrorMessage(`未查找到物料【${itemCode}】的发料明细`, (res) => {
         packGetFocus()
       })
@@ -184,10 +194,10 @@ const afterGetBalance = (label, balance, packageInfo) => {
         const record = batch.Records.find((r) => r.packingNumber == packingCode)
         if (record == undefined) {
           // 如果有推荐箱码
-          if (batch.Recommends.length > 0) {
+          if (batch.Recommends && batch.Recommends.length > 0) {
             const recommend = batch.Recommends.find((r) => r.packingNumber == packingCode)
             if (recommend != undefined) {
-              that.addRecord(batch, label, balance, packageInfo)
+              addRecord(batch, label, balance, packageInfo)
             } else {
               // 允许修改箱码
               if (jobContent.value.allowModifyPackingNumber == 'TRUE') {
@@ -278,7 +288,10 @@ const addRecord = (batch, label, balance, packageInfo) => {
   const record = creatRecord(label, balance, packageInfo)
   batch.Records.push(record)
   calcBatchHandleQty(batch)
-  packGetFocus()
+  emit('refresh')
+  setTimeout(res=>{
+    packGetFocus();
+  },100)
 }
 
 const swipeClick = (params, item) => {