diff --git a/src/lang/en/business/resource/gsp.js b/src/lang/en/business/resource/gsp.js index 9618949..b349773 100644 --- a/src/lang/en/business/resource/gsp.js +++ b/src/lang/en/business/resource/gsp.js @@ -139,4 +139,9 @@ export default { tyjy:'Approve Check-out', jjjy:'Reject Check-out', qrgh:'Confirm Check-in', + xzmb: '下载模板', + wjgs: '仅允许导入xls、xlsx格式文件', + tzsc: '将文件拖到此处,或', + djsc: '点击上传', + } diff --git a/src/lang/zh/business/resource/gsp.js b/src/lang/zh/business/resource/gsp.js index e1a23fa..c86c562 100644 --- a/src/lang/zh/business/resource/gsp.js +++ b/src/lang/zh/business/resource/gsp.js @@ -143,5 +143,9 @@ export default { tyjy:'同意借阅', jjjy:'拒绝借阅', qrgh:'确认归还', + xzmb: '下载模板', + wjgs: '仅允许导入xls、xlsx格式文件', + tzsc: '将文件拖到此处,或', + djsc: '点击上传', } diff --git a/src/views/business/archive/gsp/index.vue b/src/views/business/archive/gsp/index.vue index 03f04de..b49a23c 100644 --- a/src/views/business/archive/gsp/index.vue +++ b/src/views/business/archive/gsp/index.vue @@ -43,6 +43,7 @@ export default { changeTab(item) { if (this.active !== item.key) { this.active = item.key + this.saveSimpleLog({name:this.$t(item.name,'zh_CN'),nameEn:this.$t(item.name,'en_US'),jcmc:this.$t('system.enterPage','zh_CN'),jcmcEn:this.$t('system.enterPage','en_US')}) } }, showDetailCallback(val) { diff --git a/src/views/business/resource/gsp/comps/ffjl/Xq.vue b/src/views/business/resource/gsp/comps/ffjl/Xq.vue index fa7dab9..87b90db 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Xq.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Xq.vue @@ -8,7 +8,7 @@
{{ $t('form.cancel') }} - {{ $t('form.export') }} +
{{ $t('page.business.resource.mjy.ffjlxq') diff --git a/src/views/business/resource/gsp/comps/gsp/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue index 14041f8..00f2e48 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xq.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue @@ -161,6 +161,7 @@ export default { this.$modal.loading() exportDetail({ id: this.form.id,lang:this.$store.getters.language.split("_")[0] }).then(response => { window.open(process.env.VUE_APP_FILE_DOMAIN +response.msg) + this.saveSimpleLog({name:this.form.bh,nameEn:this.form.bh,jcmc:'供试品导出',jcmcEn:'Test Item Export'}) this.$modal.closeLoading() }).finally(() => { this.$modal.closeLoading() diff --git a/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue new file mode 100644 index 0000000..598eaa8 --- /dev/null +++ b/src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue @@ -0,0 +1,122 @@ + + + diff --git a/src/views/business/resource/gsp/comps/rkjl/Xq.vue b/src/views/business/resource/gsp/comps/rkjl/Xq.vue index cd4ef78..a4b1568 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Xq.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Xq.vue @@ -8,7 +8,7 @@
{{ $t('form.cancel') }} - {{ $t('form.export') }} +
{{ $t('page.business.resource.gsp.gsprkjl') @@ -50,6 +50,17 @@
+
{{ $t('page.business.resource.gsp.cctj') }}
+ +
+ +
+
+
{{ $t('page.business.resource.gsp.yxq') }}
+ + +
+
{{ $t('page.business.resource.gsp.zysx') }}
diff --git a/src/views/business/resource/gsp/comps/rkjlList.vue b/src/views/business/resource/gsp/comps/rkjlList.vue index b4df945..23dc093 100644 --- a/src/views/business/resource/gsp/comps/rkjlList.vue +++ b/src/views/business/resource/gsp/comps/rkjlList.vue @@ -62,7 +62,7 @@ - {{ + {{ $t('page.business.resource.gsp.dr') }} @@ -176,6 +176,9 @@ + + +
@@ -190,11 +193,12 @@ import Jd from "./rkjl/Jd"; import Xq from "./rkjl/Xq"; import Xz from "./rkjl/Xz"; import Bj from "./rkjl/Bj"; +import RkjlImport from "./rkjl/RkjlImport" import { deepClone } from "@/utils/index"; import { mapGetters } from 'vuex' export default { name: "FfjlList", - components: { Sd, Js, Gd, Jd, Jy, Xq, Xz, Bj }, + components: { Sd, Js, Gd, Jd, Jy, Xq, Xz, Bj, RkjlImport }, data() { return { daterangeCk: [], @@ -232,6 +236,9 @@ export default { this.getList() }, methods: { + handleImport() { + this.$refs.RkjlImport.show() + }, //导出 exportExcel() { let that = this diff --git a/src/views/business/resource/yq/comps/detail.vue b/src/views/business/resource/yq/comps/detail.vue index 24dfcee..1529f8c 100644 --- a/src/views/business/resource/yq/comps/detail.vue +++ b/src/views/business/resource/yq/comps/detail.vue @@ -129,6 +129,7 @@ export default { this.form = response.data this.open = true }) + this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'仪器详情',jcmcEn:'Instrument Detail'}) this.queryParams.id = row.id yqJcgj_list(this.queryParams).then((response) => { this.qmList = response.rows diff --git a/src/views/business/study/comp/syff/Xq.vue b/src/views/business/study/comp/syff/Xq.vue index a73ea3c..81e4a57 100644 --- a/src/views/business/study/comp/syff/Xq.vue +++ b/src/views/business/study/comp/syff/Xq.vue @@ -176,6 +176,7 @@ export default { studyMethod_export({ studyMethodId: this.form.id }).then(response => { let fileUrl = response.data.fileUrl this.$download.saveAs(process.env.VUE_APP_FILE_DOMAIN + fileUrl, this.form.ffmc + ".pdf"); + this.saveSimpleLog({name:this.form.ffmc,nameEn:this.form.ffmc,jcmc:'方法导出',jcmcEn:'Method Export'}) }) } diff --git a/src/views/business/study/comp/syj/Detail.vue b/src/views/business/study/comp/syj/Detail.vue index 963fb37..540a5bb 100644 --- a/src/views/business/study/comp/syj/Detail.vue +++ b/src/views/business/study/comp/syj/Detail.vue @@ -142,6 +142,7 @@ export default { studyRoom_info({ id: row.id }).then(response => { this.form = response.data this.open = true + this.saveSimpleLog({name:row.syjh,nameEn:row.syjh,jcmc:'饲养间详情',jcmcEn:'Animal Room Detail'}) }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/study/comp/wzlb.vue b/src/views/business/study/comp/wzlb.vue index 1447008..5a4c39a 100644 --- a/src/views/business/study/comp/wzlb.vue +++ b/src/views/business/study/comp/wzlb.vue @@ -114,6 +114,7 @@ export default { changeTab(item) { if (this.active !== item.key) { this.active = item.key + this.saveSimpleLog({name:this.$t(item.name,'zh_CN'),nameEn:this.$t(item.name,'en_US'),jcmc:this.$t('system.enterPage','zh_CN'),jcmcEn:this.$t('system.enterPage','en_US')}) } } }