From e39a46f97bd95687c882f81bb373e50db25d4286 Mon Sep 17 00:00:00 2001
From: value <z1292839451@163.com>
Date: 星期四, 16 五月 2024 18:03:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/components/view/b1-report-preparation.vue |   70 +++++++++++++++++++++-------------
 1 files changed, 43 insertions(+), 27 deletions(-)

diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 82269a0..5bfb65e 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -181,15 +181,15 @@
           showSelect: false,
           select: false,
           do: [
-            //   {
-            //   id: 'handleWeave',
-            //   font: '鍦ㄧ嚎缂栧埗',
-            //   type: 'text',
-            //   method: 'handleWeave',
-            //   disabFun: (row, index) => {
-            //     return row.isExamine != null
-            //   }
-            // },
+              {
+              id: 'handleWeave',
+              font: '鍦ㄧ嚎缂栧埗',
+              type: 'text',
+              method: 'handleWeave',
+              disabFun: (row, index) => {
+                return row.isExamine != null
+              }
+            },
             {
               id: 'download',
               font: '涓嬭浇',
@@ -243,9 +243,9 @@
             }
           ],
           linkEvent: {
-            // code: {
-            //   method: 'selectAllByOne'
-            // }
+            code: {
+              method: 'selectAllByOne'
+            }
           },
           tagField: {
             isRatify: {
@@ -344,22 +344,22 @@
         this.upIndex++
       },
       async handleWeave(row) {
-        // this.value = await file.convertFileToHtml(row.url)
-        // this.claimVisible = true;
-        this.$axios.post(this.$api.insReport.wordToHtml, {
-          path: row.urlS ? row.urlS : row.url
-        }).then(res => {
-          if (res.code === 200) {
-            // console.log(11111111,res.data)
-            this.value = res.data
-              .replace(/<a [^>]*>/g, "")
-              .replace(/<\/a>/g, "")
-              .replace(/&nbsp;/g, "&nbsp;&nbsp;");
-            this.claimVisible = true;
+        const userName = JSON.parse(localStorage.getItem("user")).name;
+        //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+        const { href } = this.$router.resolve({
+          path: `/wordEdit`,
+          query: {
+            url: this.javaApi + "/word/" + row.entrustCode + ".docx",
+            isEdit: true,
+            fileType: "docx",
+            title: row.entrustCode + ".docx",
+            lang: 'zh-CN',
+            isPrint: true,
+            user:  { id: 1, name: userName},
+            editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + row.entrustCode + ".docx"
           }
-        }).catch(error => {
-          console.error(error)
         })
+        window.open(href, '_blank');
       },
       // 鏉冮檺鍒嗛厤
       getPower(radio) {
@@ -407,7 +407,23 @@
         // console.log(this.$refs.Word.getValue())
       },
       async selectAllByOne(row) {
-        console.log(row, await file.convertFileToHtml(row.url));
+        const userName = JSON.parse(localStorage.getItem("user")).name;
+        //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆
+        const { href } = this.$router.resolve({
+          path: `/wordEdit`,
+          query: {
+            url: this.javaApi + "/word/" + row.entrustCode + ".docx",
+            isEdit: "false",
+            fileType: "docx",
+            title: row.entrustCode + ".docx",
+            lang: 'zh-CN',
+            isPrint: true,
+            user_id: 1,
+            user_name: userName
+          }
+        })
+        window.open(href, '_blank');
+        console.log(`output->row`,row)
       },
       download(row) {
         let url = row.urlS ? row.urlS : row.url;

--
Gitblit v1.9.3