From a0b1fdec2bc5ddad11e981936b80d0fdf1e4bc69 Mon Sep 17 00:00:00 2001
From: licp <lichunping@guanfang.com.cn>
Date: 星期三, 03 七月 2024 09:25:06 +0800
Subject: [PATCH] Merge branch 'master' of http://114.132.189.42:9002/r/center-lims-before into master
---
src/components/view/b1-report-preparation.vue | 196 ++++++++++++++++++++++++++++++------------------
1 files changed, 122 insertions(+), 74 deletions(-)
diff --git a/src/components/view/b1-report-preparation.vue b/src/components/view/b1-report-preparation.vue
index 2f546ee..ab65de2 100644
--- a/src/components/view/b1-report-preparation.vue
+++ b/src/components/view/b1-report-preparation.vue
@@ -61,7 +61,7 @@
<div style="width: 100%;height: 100%;">
<div>
<el-row class="title">
- <el-col :span="12" style="padding-left: 20px;">鎶ュ憡缂栧埗</el-col>
+ <el-col :span="12" style="padding-left: 20px;text-align: left;">鎶ュ憡缂栧埗</el-col>
</el-row>
</div>
<div class="search">
@@ -101,70 +101,65 @@
<el-button type="primary" @click="confirmClaim">纭� 瀹�</el-button>
</span>
</el-dialog>
- <el-dialog title="鎶ュ憡瀹℃牳" :visible.sync="issuedVisible" width="400px" :modal-append-to-body="false"
+ <el-dialog title="鎶ュ憡瀹℃牳" :visible.sync="issuedVisible" width="80vw" :modal-append-to-body="false"
:fullscreen="fullscreen">
- <!-- <div class="full-screen">
+ <div class="full-screen">
<i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
- </div> -->
- <!-- <div class="btns">
- <el-button type="primary" size="small">閫氳繃</el-button>
- <el-button size="small">涓嶉�氳繃</el-button>
- </div> -->
+ </div>
+ <div style="height: 80vh;">
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ </div>
<span slot="footer" class="dialog-footer">
- <el-button @click="issuedReasonVisible=true">涓嶉�氳繃</el-button>
- <el-button type="primary" @click="subIssued" :loading="loadingIssued">閫� 杩�</el-button>
- </span>
- </el-dialog>
+ <el-button @click="issuedReasonVisible=true" :disabled="loadingIssued">涓嶉�氳繃</el-button>
+ <el-button type="primary" @click="subIssued" :loading="loadingIssued">閫� 杩�</el-button>
+ </span>
+ </el-dialog>
<el-dialog title="涓嶉�氳繃鍘熷洜" :visible.sync="issuedReasonVisible" width="400px" :modal-append-to-body="false">
<div class="search_thing">
<div class="search_label">涓嶉�氳繃鍘熷洜锛�</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="reason"></el-input></div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="issuedReasonVisible=false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleIssuedReason" :loading="loadingIssuedReason">纭畾</el-button>
- </span>
- </el-dialog>
- <el-dialog title="鎶ュ憡鎵瑰噯" :visible.sync="approveVisible" width="400px" :modal-append-to-body="false"
- :fullscreen="fullscreen">
- <!-- <div class="full-screen">
+ <el-button @click="issuedReasonVisible=false" :disabled="loadingIssuedReason">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleIssuedReason" :loading="loadingIssuedReason">纭畾</el-button>
+ </span>
+ </el-dialog>
+ <el-dialog title="鎶ュ憡鎵瑰噯" :visible.sync="approveVisible" width="80vw" :modal-append-to-body="false" :fullscreen="fullscreen">
+ <div class="full-screen">
<i class="el-icon-full-screen" style="cursor: pointer;font-size: 18px" @click="fullscreen=true;" v-if="!fullscreen"></i>
<img src="../../../static/img/no-full.svg" alt="" v-else style="cursor: pointer;" @click="fullscreen=false;" >
- </div> -->
- <!-- <div class="btns">
- <el-button type="primary" size="small">鎵瑰噯</el-button>
- <el-button size="small">涓嶆壒鍑�</el-button>
- </div> -->
+ </div>
+ <div style="height: 80vh;">
+ <onlyoffice ref="onlyoffice" :options="option" style="width: 100%;height: 100%;" />
+ </div>
<span slot="footer" class="dialog-footer">
- <el-button @click="approveReasonVisible=true">涓嶆壒鍑�</el-button>
- <el-button type="primary" @click="subApprove" :loading="loadingApprove">鎵� 鍑�</el-button>
- </span>
- </el-dialog>
+ <el-button @click="approveReasonVisible=true" :disabled="loadingApprove">涓嶆壒鍑�</el-button>
+ <el-button type="primary" @click="subApprove" :loading="loadingApprove">鎵� 鍑�</el-button>
+ </span>
+ </el-dialog>
<el-dialog title="涓嶆壒鍑嗗師鍥�" :visible.sync="approveReasonVisible" width="400px" :modal-append-to-body="false">
<div class="search_thing">
<div class="search_label">涓嶆壒鍑嗗師鍥狅細</div>
<div class="search_input"><el-input size="small" placeholder="璇疯緭鍏�" clearable v-model="reason"></el-input></div>
</div>
<span slot="footer" class="dialog-footer">
- <el-button @click="approveReasonVisible=false">鍙栨秷</el-button>
- <el-button type="primary" @click="handleApproveReason" :loading="loadingApproveReason">纭畾</el-button>
- </span>
- </el-dialog>
- </div>
+ <el-button @click="approveReasonVisible=false" :disabled="loadingApproveReason">鍙栨秷</el-button>
+ <el-button type="primary" @click="handleApproveReason" :loading="loadingApproveReason">纭畾</el-button>
+ </span>
+ </el-dialog>
+ </div>
</template>
<script>
import ValueTable from '../tool/value-table.vue'
import Word from '../tool/word.vue'
- import file from '../../util/file';
- import {
- convertToHtml
- } from 'mammoth';
+ import onlyoffice from '../tool/onlyoffice.vue'
export default {
components: {
ValueTable,
Word,
+ onlyoffice
},
data() {
return {
@@ -181,15 +176,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 +238,9 @@
}
],
linkEvent: {
- // code: {
- // method: 'selectAllByOne'
- // }
+ code: {
+ method: 'selectAllByOne'
+ }
},
tagField: {
isRatify: {
@@ -302,6 +297,7 @@
value: ``,
reason: '',
currentInfo: null,
+ option:null
}
},
mounted() {
@@ -344,23 +340,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) {
@@ -384,31 +382,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;
@@ -430,7 +450,21 @@
},
handleIssued(row) {
this.currentInfo = row;
- this.issuedVisible = true;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ this.option = {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: false,
+ user_id: 1,
+ user_name: userName,
+ editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + fileName
+ }
+ this.issuedVisible = true;
},
subIssued() {
this.loadingIssued = true;
@@ -453,6 +487,20 @@
},
handleApprove(row) {
this.currentInfo = row;
+ let fileName = (row.urlS===null||row.urlS==='')?row.url:row.urlS
+ fileName = fileName.replace('/word/','')
+ const userName = JSON.parse(localStorage.getItem("user")).name;
+ this.option = {
+ url: this.javaApi + "/word/" + fileName,
+ isEdit: false,
+ fileType: "docx",
+ title: fileName,
+ lang: 'zh-CN',
+ isPrint: false,
+ user_id: 1,
+ user_name: userName,
+ editUrl: this.javaApi + "/insReport/onlyOffice/save?fileName=" + fileName
+ }
this.approveVisible = true;
},
subApprove() {
--
Gitblit v1.9.3