|
@@ -268,7 +268,7 @@ import VabOnlyOffice from '@/components/online-office/index'
|
|
|
import PdfView from '@/components/PdfView.vue';
|
|
|
import screenfull from "screenfull";
|
|
|
import LuckySheet from '@/components/lucky-sheet-editor/LuckySheet.vue'
|
|
|
-import {getExcelJson,saveExcelJson,getExcelPdf} from '@/api/exctab/exceltab';
|
|
|
+import {getExcelJson,saveExcelJson,getExcelPdf,getTempExcelFileUrl} from '@/api/exctab/exceltab';
|
|
|
export default {
|
|
|
components: {
|
|
|
ManualSorting, VabOnlyOffice,LuckySheet,PdfView
|
|
@@ -1149,16 +1149,20 @@ async saveExcelInfo() {
|
|
|
this.saveExcelJsonLoad = true; // 开始加载
|
|
|
try {
|
|
|
|
|
|
- const { data: res } = await getExcelPdf({
|
|
|
+ const { data: res } = await getTempExcelFileUrl({
|
|
|
key: this.from.id,
|
|
|
jsonExcel: JSON.stringify(saveData)
|
|
|
});
|
|
|
|
|
|
if (res.code === 200) {
|
|
|
console.log(res.data,'data');
|
|
|
+ const { data: res1 } = await getExcelPdf({
|
|
|
+ key: this.from.id,
|
|
|
+ url: res1.data
|
|
|
+ });
|
|
|
|
|
|
this.$nextTick(() => {
|
|
|
- this.$refs.pdfDrawerExcelRef.show(res.data,true)
|
|
|
+ this.$refs.pdfDrawerExcelRef.show(res1.data,true)
|
|
|
|
|
|
})
|
|
|
|