diff --git a/src/views/business/form/nonTrial/comp/syff/Xq.vue b/src/views/business/form/nonTrial/comp/syff/Xq.vue
index f742437..b14761e 100644
--- a/src/views/business/form/nonTrial/comp/syff/Xq.vue
+++ b/src/views/business/form/nonTrial/comp/syff/Xq.vue
@@ -19,7 +19,7 @@
@@ -64,6 +64,7 @@ export default {
return {
showExportBtn: false,
pdfSrc: '',
+ pdfUrl: '',
open: false,
pageNum: 1,
loadedRatio: 0, // 当前页面的加载进度,范围是0-1 ,等于1的时候代表当前页已经完全加载完成了
@@ -115,22 +116,19 @@ export default {
getPageNum() {
const loadingTask = pdf.createLoadingTask({
url: this.pdfSrc,
- cMapUrl: 'https://cdn.jsdelivr.net/npm/pdfjs-dist@4.8.69/cmaps/',
+ withCredentials: false,
+ cMapUrl: 'https://unpkg.com/pdfjs-dist@2.16.105/cmaps/',
cMapPacked: true,
})
- let that = this
- //let loadingTask = pdf.createLoadingTask(this.pdfSrc);
- loadingTask.promise
- .then((pdf) => {
- this.totalPages = pdf.numPages;
- //this.loadPdfFromUrl()
- // this.$nextTick(() => {
- // this.setWatermarkContent();
- // });
- })
- .catch((err) => {
- that.$message.msgError("pdf加载失败");
- });
+
+ loadingTask.promise.then(pdf => {
+ this.pdfDoc = pdf
+ this.totalPages = pdf.numPages
+ }).catch(err => {
+ console.error('PDF加载失败:', err)
+ })
+
+ this.pdfUrl = loadingTask
},
// 上一页
@@ -151,6 +149,7 @@ export default {
closeYd(val) {
this.form.zt = val
+ this.cancel()
},
handleExport() {
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue
index cf50778..b4df945 100644
--- a/src/views/business/resource/gsp/comps/rkjlList.vue
+++ b/src/views/business/resource/gsp/comps/rkjlList.vue
@@ -79,9 +79,8 @@
- {{
- $t('form.export') }}
+ {{
+ $t('form.export') }}
@@ -98,6 +97,8 @@
+
{{ scope.row.rkl }} {{ scope.row.rkdw }}
@@ -150,8 +151,8 @@
v-hasPermi="['business:resource:gsp:rkjd']">{{
$t('page.business.resource.gsp.jiedang') }}
- {{
+ {{
$t('page.business.resource.gsp.jieyue') }}
@@ -338,7 +339,7 @@ export default {
a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate)))
a.click()
that.$modal.closeLoading()
- this.saveSimpleLog({name:'',nameEn:'',jcmc:'供试品入库记录导出',jcmcEn:'Test Item Reception Record Export'})
+ this.saveSimpleLog({ name: '', nameEn: '', jcmc: '供试品入库记录导出', jcmcEn: 'Test Item Reception Record Export' })
}).finally(() => {
that.$modal.closeLoading()
})