From 4547701f78dd4b803ae6194f57c5f78dc3e28c79 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sat, 15 Jun 2024 13:28:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=B0=E4=BB=B6?=
 =?UTF-8?q?=E6=89=AB=E6=8F=8F=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue | 7 +++++--
 .../emisTmsScanRecord/signForModificationAndDeletion.vue   | 7 -------
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 6dbb56d1..7457512b 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -303,7 +303,9 @@ export default {
           }
 
           // this.form.scanType = '10';
-          this.form.scanDate  = new Date();
+          let currentDate = new Date();
+          this.form.scanDate  = currentDate.setMinutes(currentDate.getMinutes() - 10);
+          // this.form.scanDate  = new Date();
           let record =Object.assign({}, this.form)
           record.billCode=scanRstItem.billCode;
           record.scanType = "30";
@@ -552,7 +554,8 @@ export default {
         }
 
         // this.form.scanType = '10';
-        this.form.scanDate  = new Date();
+        let currentDate = new Date();
+        this.form.scanDate  = currentDate.setMinutes(currentDate.getMinutes() - 10);
         let record =Object.assign({}, this.form)
         record.billCode=scanRstItem.billCode;
         record.scanType = '30';
diff --git a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
index 42f1728b..036238f8 100644
--- a/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
+++ b/src/views/emis/emisTmsScanRecord/signForModificationAndDeletion.vue
@@ -543,7 +543,6 @@ export default {
       let that = this;
       // let newList = [];
       this.$modal.confirm('是否确认删除').then(async function(isPass) {
-        debugger;
         console.log(that.form)
         if(isPass){
           for(let i=0; i < ids.length; i++){
@@ -554,15 +553,9 @@ export default {
               return;
             }
           }
-          // that.tmsScanList.forEach(item => {
-          //   if(ids.indexOf(item.id) == -1){
-          //     newList.push(item)
-          //   }
-          // });
           if(that.form.delChecked){
             that.form.delRemark = null;
           }
-          // that.tmsScanList = newList;
           that.getList();
           that.ids = [];
           that.single = true;

From a50242c88266215b8c9527ed663d262bc10e3f57 Mon Sep 17 00:00:00 2001
From: liuyp <liuyongpeng@liuyongpengdeMacBook-Pro-2.local>
Date: Sat, 15 Jun 2024 13:58:14 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../emis/emisTmsScanRecord/arrivalAndDispathScan.vue  | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
index 7457512b..6fd0b68d 100644
--- a/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
+++ b/src/views/emis/emisTmsScanRecord/arrivalAndDispathScan.vue
@@ -124,6 +124,7 @@
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisUserSimplePicker from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 import EmisGetPreSitePicker from '@/views/emis/EmisBaseTools/EmisGetPreSitePicker.vue';
+import { parseTime, dateToStr } from "@/utils/custom";
 
 export default {
   name: "ArrivalAndDispathScan",
@@ -304,7 +305,7 @@ export default {
 
           // this.form.scanType = '10';
           let currentDate = new Date();
-          this.form.scanDate  = currentDate.setMinutes(currentDate.getMinutes() - 10);
+          this.form.scanDate  = new Date(currentDate.setMinutes(currentDate.getMinutes() - 10));
           // this.form.scanDate  = new Date();
           let record =Object.assign({}, this.form)
           record.billCode=scanRstItem.billCode;
@@ -424,16 +425,16 @@ export default {
       var selData = this.selection;
       let newList = Array.from(this.emisTmsScanRecordList);
       let dataMap = this.dataMap;
-
       let scanArrivalData=[];
       let scanDispathData=[];
       selData.forEach(item=>{
         if (item.scanType=="30") {
+          // console.log(dateToStr(item.scanDate || new Date()))
           scanArrivalData.push(
             {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
-              scanDate:item.scanDate || new Date(),
+              scanDate:dateToStr(item.scanDate || new Date()),
             }
           );
         }else if(item.scanType=="40") {
@@ -442,7 +443,7 @@ export default {
               billCode:item.billCode,
               scanWeight:item.scanWeight,
               dispatchOrSendManCode:item.dispatchOrSendManCode,
-              scanDate:item.scanDate || new Date(),
+              scanDate:dateToStr(item.scanDate || new Date()),
             }
           );
         }
@@ -555,7 +556,7 @@ export default {
 
         // this.form.scanType = '10';
         let currentDate = new Date();
-        this.form.scanDate  = currentDate.setMinutes(currentDate.getMinutes() - 10);
+        this.form.scanDate  = new Date(currentDate.setMinutes(currentDate.getMinutes() - 10));
         let record =Object.assign({}, this.form)
         record.billCode=scanRstItem.billCode;
         record.scanType = '30';