From fd9deb7e45ff86f3570a3048a459b29f0ebbd628 Mon Sep 17 00:00:00 2001 From: value <z1292839451@163.com> Date: 星期四, 13 六月 2024 18:04:15 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/components/view/b1-report-preparation.vue | 96 ++++++++++++++++++++++++++++++----------------- 1 files changed, 61 insertions(+), 35 deletions(-) diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue index 3a85cb3..f161dfe 100644 --- a/src/components/view/b1-report-preparation.vue +++ b/src/components/view/b1-report-preparation.vue @@ -160,6 +160,7 @@ import { convertToHtml } from 'mammoth'; + import axios from "axios"; export default { components: { ValueTable, @@ -180,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: '涓嬭浇', @@ -242,9 +243,9 @@ } ], linkEvent: { - // code: { - // method: 'selectAllByOne' - // } + code: { + method: 'selectAllByOne' + } }, tagField: { isRatify: { @@ -343,22 +344,25 @@ 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(/ /g, " "); - this.claimVisible = true; + let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS + fileName = fileName.replace('/word/','') + const userName = JSON.parse(localStorage.getItem("user")).name; + //鍙傝�僾abOnlyOffice缁勪欢鍙傛暟閰嶇疆 + const { href } = this.$router.resolve({ + path: `/wordEdit`, + query: { + url: this.javaApi + "/word/" + fileName, + isEdit: true, + fileType: "docx", + title: fileName, + lang: 'zh-CN', + isPrint: true, + user_id: 1, + user_name: userName, + editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + fileName } - }).catch(error => { - console.error(error) }) + window.open(href, '_blank'); }, // 鏉冮檺鍒嗛厤 getPower(radio) { @@ -382,31 +386,53 @@ if (power[i].menuMethod == 'writeReport') { sub = true } + if (power[i].menuMethod == 'ratifyReport') { + approve = true + } + if (power[i].menuMethod == 'examineReport') { + issued = true + } } if (!approve) { - this.componentData.do.splice(5, 1) + this.componentData.do.splice(6, 1) } if (!issued) { - this.componentData.do.splice(4, 1) + this.componentData.do.splice(5, 1) } if (!sub) { - this.componentData.do.splice(3, 1) + this.componentData.do.splice(4, 1) } if (!res) { - this.componentData.do.splice(2, 1) + this.componentData.do.splice(3, 1) } if (!up) { - this.componentData.do.splice(1, 1) + this.componentData.do.splice(2, 1) } - // if (!edit) { - // this.componentData.do.splice(0, 1) - // } + if (!edit) { + this.componentData.do.splice(0, 1) + } }, confirmClaim() { // 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