From deab87775059280d082785a93c9e7d4f1d5563f7 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Fri, 7 Feb 2025 11:09:19 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=88=E5=B9=B6=E8=A1=A8=E6=A0=BC=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/smartExcel/cpts/excel-summary.vue    | 10 +++++----
 .../base/smartExcel/cpts/excel-view.vue       | 21 ++++++++++++++++++-
 2 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/modules/base/smartExcel/cpts/excel-summary.vue b/src/views/modules/base/smartExcel/cpts/excel-summary.vue
index a1ee0861a..fde8c4140 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-summary.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-summary.vue
@@ -20,7 +20,7 @@
             </div>
         </div>
         <div v-if="showView">
-            <excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal"></excel-view>
+            <excel-view @close="close" :workbookId="workbookId" :infoObj="infoObj" :pageType="'add'" :sheetTotal="sheetTotal" :mergeObj="mergeObj"></excel-view>
         </div>
     </div>
 </template>
@@ -36,7 +36,8 @@ export default {
             ],
             workbookId:'',
             sheetTotal:false,
-            infoObj:{}
+            infoObj:{},
+            mergeObj:null//用于传递subworkbookId与workbookId
         };
     },
     created() {
@@ -80,12 +81,13 @@ export default {
             this.$emit('close')
         },
         handleClickShowView(val){
-            const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction } = val;
+            const { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction,subWorkBookId,workBookId } = val;
             this.$store.state.sidebarFold = true;
             this.showView = true;
             this.sheetTotal =  false
             this.workbookId = val.taskId;
-            this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction };
+            this.infoObj = { id, taskId, taskTitle, taskPeriod, taskType, taskIntroduction};
+            this.mergeObj = {subWorkBookId,workBookId }
         },
         handleClickShowViewAll(val){
             this.$store.state.sidebarFold = true;
diff --git a/src/views/modules/base/smartExcel/cpts/excel-view.vue b/src/views/modules/base/smartExcel/cpts/excel-view.vue
index 4c1e4fda3..461752afe 100644
--- a/src/views/modules/base/smartExcel/cpts/excel-view.vue
+++ b/src/views/modules/base/smartExcel/cpts/excel-view.vue
@@ -75,6 +75,10 @@ export default {
     infoObj:{
       type:Object,
       default:()=>{}
+    },
+    mergeObj:{
+      type:Object,
+      default:()=>{}
     }
   },
   computed: {
@@ -202,7 +206,10 @@ export default {
      let parm = {
       ...this.infoObj
      }
-     parm.taskState = val
+     parm.taskState = val;
+     if(val === 'archived'){
+      this.workbookMerge()
+     }
      const {data,code,msg} = await requestPost(url,parm)
      if(code === 0){
       this.$message.success('操作成功')
@@ -210,6 +217,18 @@ export default {
       console.log(msg);
      }
     },
+    async workbookMerge(){
+      const url = '/actual/base/luckySheet/workbook/merge'
+      let parm = {
+        sourceWorkbookId:this.mergeObj.subWorkBookId,
+        targetWorkbookId:this.mergeObj.workBookId
+      }
+      const {data,code,msg} = await requestPost(url,parm)
+      if(code === 0){
+        console.log('合并成功');
+      }
+    },
+    
   },
   components: {
     excelUploadData