From 58cf3d3efcfde5d77f1dcc0e8a2150667f55a2a6 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Wed, 19 Jun 2024 16:42:29 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4scandate=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTmsScanRecord/arrivalScan.vue             | 3 ++-
 src/views/emis/emisTmsScanRecord/coPackageScanning.vue       | 3 ++-
 src/views/emis/emisTmsScanRecord/customsClearScan.vue        | 3 ++-
 src/views/emis/emisTmsScanRecord/customsDeclearScan.vue      | 3 ++-
 src/views/emis/emisTmsScanRecord/deliveryScan.vue            | 3 ++-
 src/views/emis/emisTmsScanRecord/loadingScan.vue             | 4 +++-
 src/views/emis/emisTmsScanRecord/outgoingScan.vue            | 3 ++-
 src/views/emis/emisTmsScanRecord/positionScanning.vue        | 3 ++-
 src/views/emis/emisTmsScanRecord/scanRecord.vue              | 5 +++--
 src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue | 5 +++--
 src/views/emis/emisTmsScanRecord/unloadingScan.vue           | 3 ++-
 src/views/emis/emisTmsScanRecord/unpackScan.vue              | 3 ++-
 12 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/arrivalScan.vue b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
index 204c5cfc..7829e869 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalScan.vue
@@ -123,6 +123,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "ArrivalScan",
@@ -378,7 +379,7 @@ export default {
           {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );
diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
index c7ee0ff8..9e1b5488 100644
--- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
@@ -131,6 +131,7 @@
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 import EmisPackNoPicker from '@/views/emis/EmisBaseTools/EmisPackNoPicker.vue';
+import { parseTime } from "@/utils/custom";
 
 
 export default {
@@ -392,7 +393,7 @@ export default {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
             bagNo:item.bagNo,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );
diff --git a/src/views/emis/emisTmsScanRecord/customsClearScan.vue b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
index ff89a452..192a1d7a 100644
--- a/src/views/emis/emisTmsScanRecord/customsClearScan.vue
+++ b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
@@ -125,6 +125,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "CustomsClearScan",
@@ -382,7 +383,7 @@ export default {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
             preOrNextStationCode:item.preOrNextStationCode,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );
diff --git a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
index db81d79b..fccd3623 100644
--- a/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
+++ b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
@@ -124,6 +124,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "CustomsDeclearScan",
@@ -381,7 +382,7 @@ export default {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
             preOrNextStationCode:item.preOrNextStationCode,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );
diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
index d2bf2f90..1d05515f 100644
--- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue
+++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
@@ -116,6 +116,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "DeliveryScan",
@@ -374,7 +375,7 @@ export default {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
             dispatchOrSendManCode:item.dispatchOrSendManCode,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
           }
         );
       });
diff --git a/src/views/emis/emisTmsScanRecord/loadingScan.vue b/src/views/emis/emisTmsScanRecord/loadingScan.vue
index 95ead4ac..8139d6cc 100644
--- a/src/views/emis/emisTmsScanRecord/loadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/loadingScan.vue
@@ -124,6 +124,8 @@
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 import CarSimplePicker from '@/views/emis/EmisBaseTools/CarSimplePicker.vue';
+import { parseTime } from "@/utils/custom";
+
 export default {
   name: "LoadingScan",
   props:{
@@ -382,7 +384,7 @@ export default {
             scanWeight:item.scanWeight,
             carNo:item.carNo,
             preOrNextStationCode:item.preOrNextStationCode,
-            scanDate:item.scanDate,
+            scanDate:parseTime(item.scanDate || new Date()),
             bagNo:item.bagNo
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index cf05b206..4a1b503a 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -127,6 +127,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "OutgoingScan",
@@ -388,7 +389,7 @@ export default {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
             preOrNextStationCode:item.preOrNextStationCode,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );
diff --git a/src/views/emis/emisTmsScanRecord/positionScanning.vue b/src/views/emis/emisTmsScanRecord/positionScanning.vue
index cf8819d6..86093636 100644
--- a/src/views/emis/emisTmsScanRecord/positionScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/positionScanning.vue
@@ -130,6 +130,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "PositionScanning",
@@ -391,7 +392,7 @@ export default {
             billCode:item.billCode,
             signMan:item.signMan,
             picUrl:item.picUrl,
-            scanDate:item.scanDate,
+            scanDate:parseTime(item.scanDate || new Date()),
             scanWeight:item.scanWeight,
             keepType:item.keepType,
             remark:item.remark,//((item.keepWarehouseRemark?item.keepWarehouseRemark+" ":"") + (item.remark ? item.remark : "")).trim(),
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index 55898190..9ba85b0b 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -122,7 +122,8 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
-import { map } from "jquery";
+// import { map } from "jquery";
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "ScanRecord",
@@ -369,7 +370,7 @@ export default {
             billCode:item.billCode,
             scanWeight:item.scanWeight,
             dispatchOrSendManCode:item.dispatchOrSendManCode,
-            scanDate:item.scanDate || new Date()
+            scanDate:parseTime(item.scanDate || new Date())
           }
         );
       });
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index 86bb7030..fd234d4d 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -175,6 +175,7 @@
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "TransmitReceiveScanning",
@@ -500,7 +501,7 @@ export default {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
               dispatchOrSendManCode:item.dispatchOrSendManCode,
-              scanDate:item.scanDate || new Date()
+              scanDate:parseTime(item.scanDate || new Date())
             }
           );
         }else if(item.scanType=="20") {
@@ -512,7 +513,7 @@ export default {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
               preOrNextStationCode:item.preOrNextStationCode,
-              scanDate:item.scanDate || new Date()
+              scanDate:parseTime(item.scanDate || new Date())
             }
           );
         }
diff --git a/src/views/emis/emisTmsScanRecord/unloadingScan.vue b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
index 51d2dce4..21def4fa 100644
--- a/src/views/emis/emisTmsScanRecord/unloadingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unloadingScan.vue
@@ -118,6 +118,7 @@
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 import CarSimplePicker from '@/views/emis/EmisBaseTools/CarSimplePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "UnLoadingScan",
@@ -360,7 +361,7 @@ export default {
             scanWeight:item.scanWeight,
             carNo:item.carNo,
             preOrNextStationCode:item.preOrNextStationCode,
-            scanDate:item.scanDate,
+            scanDate:parseTime(item.scanDate || new Date()),
             bagNo:item.bagNo,
             picUrl: item.picUrl
           }
diff --git a/src/views/emis/emisTmsScanRecord/unpackScan.vue b/src/views/emis/emisTmsScanRecord/unpackScan.vue
index d694f4a0..91cc27d6 100644
--- a/src/views/emis/emisTmsScanRecord/unpackScan.vue
+++ b/src/views/emis/emisTmsScanRecord/unpackScan.vue
@@ -114,6 +114,7 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetPreSitePicker from '@/views/emis/EmisBaseTools/EmisGetPreSitePicker.vue';
+import { parseTime } from "@/utils/custom";
 
 export default {
   name: "UnpackScan",
@@ -365,7 +366,7 @@ export default {
             scanWeight:item.scanWeight,
             bagNo:item.bagNo,
             // preOrNextStationCode:item.preOrNextStationCode,
-            scanDate:item.scanDate
+            scanDate:parseTime(item.scanDate || new Date())
             // dispatchOrSendManCode:item.dispatchOrSendManCode
           }
         );