diff --git a/src/components/doctorCheck/CheckPicture.vue b/src/components/doctorCheck/CheckPicture.vue index b41c676..29f4053 100644 --- a/src/components/doctorCheck/CheckPicture.vue +++ b/src/components/doctorCheck/CheckPicture.vue @@ -3,7 +3,7 @@
采图 + size="small" v-loading.fullscreen.lock="fullscreenLoading">采图
{ let lres = JSON.parse(res) @@ -526,7 +530,8 @@ export default { }).catch(err => { this.$message.error(err) }).finally(() => { - loading.close() + // loading.close() + this.fullscreenLoading = false }); }, diff --git a/src/components/report/TurnoverReport.vue b/src/components/report/TurnoverReport.vue index 6e506a3..5b7cec9 100644 --- a/src/components/report/TurnoverReport.vue +++ b/src/components/report/TurnoverReport.vue @@ -82,11 +82,11 @@ 查询
- 导出 + 导出
-
+
diff --git a/src/views/fee-settings/cardBill.vue b/src/views/fee-settings/cardBill.vue index 99d8cee..ba5adde 100644 --- a/src/views/fee-settings/cardBill.vue +++ b/src/views/fee-settings/cardBill.vue @@ -58,8 +58,11 @@
查询
+
+ 导出 +
-
+
@@ -105,7 +108,7 @@ import moment from "moment"; import { mapState, mapActions } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { dddw, objCopy, arrayReduce, arrayExistObj, deepCopy } from "@/utlis/proFunc"; - +import FileSaver from 'file-saver'; export default { components: { @@ -207,6 +210,15 @@ export default { }); }, + //通用导出 + btnExport(elId) { + let table = document.getElementById(elId); + let tableData = table.innerHTML + let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls' + let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" }); + FileSaver.saveAs(blob, fileName); + }, + //合计 getSummaries(param) { //console.log('getSummaries param', param) diff --git a/src/views/fee-settings/cardBillSum.vue b/src/views/fee-settings/cardBillSum.vue index 6081711..1bf7da7 100644 --- a/src/views/fee-settings/cardBillSum.vue +++ b/src/views/fee-settings/cardBillSum.vue @@ -58,8 +58,11 @@
查询
+
+ 导出 +
-
+
@@ -82,7 +85,7 @@ import moment from "moment"; import { mapState, mapActions } from "vuex"; import { getapi, postapi, putapi, deletapi } from "@/api/api"; import { dddw, objCopy, arrayReduce, arrayExistObj, deepCopy } from "@/utlis/proFunc"; - +import FileSaver from 'file-saver'; export default { components: { @@ -181,6 +184,15 @@ export default { }); }, + //通用导出 + btnExport(elId) { + let table = document.getElementById(elId); + let tableData = table.innerHTML + let fileName = moment(new Date()).format('yyyyMMDDHHmmss') + '.xls' + let blob = new Blob([tableData], { type: "text/plain;charset=utf-8" }); + FileSaver.saveAs(blob, fileName); + }, + //合计 getSummaries(param) { //console.log('getSummaries param', param)