From b9fb5de71becca97560fb333515a8b881c95d837 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Tue, 13 May 2025 11:57:39 +0800
Subject: [PATCH] md

---
 .../emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue |  8 ++++----
 src/views/login.vue                                  | 12 +++++-------
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 74bae015..b2ed73a5 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -734,9 +734,6 @@ export default {
       }
       this.form = {...response.data};
 
-
-
-
       this.emisCoPackDetail=[];
       let resList = await listEmisTmsSiteBatchDtl({batchNo: this.form.batchNo});
       if(!resList || resList.code != 200){
@@ -1030,6 +1027,10 @@ export default {
       {
 
         this.isDoing=true;
+        if(this.isCopy){
+          this.form.id=null;
+        }
+
         let response = await addEmisTmsSiteBatch(this.form);
         if(!response || response.code != 200){
           this.isDoing=false;
@@ -1084,7 +1085,6 @@ export default {
       }
       else if(this.coPackType == "edit"){
         // 修改
-
         this.isDoing=true;
 
         let res = await updateEmisTmsSiteBatch(this.form);
diff --git a/src/views/login.vue b/src/views/login.vue
index 457beaef..bc9d0dfb 100644
--- a/src/views/login.vue
+++ b/src/views/login.vue
@@ -460,18 +460,16 @@ export default {
   },
   methods: {
     async initMacId(){
-      // const fp = await FingerprintJS.load()
-      // const result = await fp.get()
-      // const macCode = result.visitorId
+      const fp = await FingerprintJS.load()
+      const result = await fp.get()
+      const fpMacCode = result.visitorId
       let macCode=localStorage.getItem('EMIS_TnMacCode')||'';
       if(!macCode){
-        macCode=uuidv4().replaceAll('-','');
+        // macCode=uuidv4().replaceAll('-','');
+        macCode=fpMacCode;
         localStorage.setItem('EMIS_TnMacCode',macCode);
       }
-      // console.log("==>macCode==>",macCode);
-
       let submitMacCode="202408###"+macCode;
-      // console.log("==>==>",submitMacCode);
 
       this.loginForm.macCode=submitMacCode;
     },