From c19ecc8f02cebd913601f6be6cfb7c468f45fc9c Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Mon, 9 Feb 2026 17:46:19 +0800 Subject: [PATCH 1/5] =?UTF-8?q?feat:[=E8=B5=84=E6=BA=90=E7=AE=A1=E7=90=86]?= =?UTF-8?q?[=E4=BE=9B=E8=AF=95=E5=93=81=E5=85=A5=E5=BA=93=E8=AE=B0?= =?UTF-8?q?=E5=BD=95]=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/resource/gsp.js | 5 + src/lang/zh/business/resource/gsp.js | 4 + src/views/business/archive/gsp/index.vue | 1 + src/views/business/resource/gsp/comps/ffjl/Xq.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Xq.vue | 1 + .../resource/gsp/comps/rkjl/RkjlImport.vue | 122 +++++++++++++++++++++ src/views/business/resource/gsp/comps/rkjl/Xq.vue | 13 ++- src/views/business/resource/gsp/comps/rkjlList.vue | 11 +- src/views/business/resource/yq/comps/detail.vue | 1 + src/views/business/study/comp/syff/Xq.vue | 1 + src/views/business/study/comp/syj/Detail.vue | 1 + src/views/business/study/comp/wzlb.vue | 1 + 12 files changed, 159 insertions(+), 4 deletions(-) create mode 100644 src/views/business/resource/gsp/comps/rkjl/RkjlImport.vue 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')}) } } } From ab760e6d96cfcd27a2b9830ced21da2f38943a43 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 9 Feb 2026 18:54:01 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20lba002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/CustomTable.vue | 2 + src/lang/en/template/lba.js | 9 +- src/lang/zh/template/lba.js | 9 +- .../business/comps/template/TemplateTable.vue | 6 +- .../business/comps/template/comps/lba/LBA002.vue | 257 +++++++++++++++++++++ 5 files changed, 280 insertions(+), 3 deletions(-) create mode 100644 src/views/business/comps/template/comps/lba/LBA002.vue diff --git a/src/components/Template/CustomTable.vue b/src/components/Template/CustomTable.vue index c965764..2d1ad05 100644 --- a/src/components/Template/CustomTable.vue +++ b/src/components/Template/CustomTable.vue @@ -756,6 +756,8 @@ export default { color: #606266; margin-top: 20px; &.no-border { + box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1); + border-radius: 5px 5px; border: none; .custom-table-cell { border-right: none; diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js index 9191f6d..8ba2d42 100644 --- a/src/lang/en/template/lba.js +++ b/src/lang/en/template/lba.js @@ -1,4 +1,11 @@ //LBA export default { - lba001: {} //用的SP001 + lba001: {}, //用的SP001 + lba002: { + cztj: 'Work Condition', + czsj: 'Work Time', + jcbmc: 'Analysis Plate Name', + tjh: 'Add Row', + sc: 'Delete' + } } diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js index 9191f6d..ca7d5aa 100644 --- a/src/lang/zh/template/lba.js +++ b/src/lang/zh/template/lba.js @@ -1,4 +1,11 @@ //LBA export default { - lba001: {} //用的SP001 + lba001: {}, //用的SP001 + lba002: { + cztj: '操作条件', + czsj: '操作时间', + jcbmc: '检测板名称', + tjh: '添加行', + sc: '删除' + } } diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index 5e8ae40..dcb833e 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -53,6 +53,7 @@ import PCR002 from "./comps/pcr/PCR002.vue"; //LBA // LBA001-使用SP001 +import LBA002 from "./comps/lba/LBA002.vue"; //ADA // ADA001-使用SP001 @@ -68,7 +69,9 @@ export default { //色谱 SP001, SP003, SP00456,SP007, SP008, SP009, SP010, SP011, SP012, SP013, SP014, SP015, SP016, SP017, SP018, // PCR - PCR002 + PCR002, + // PCR + LBA002 }, props: { sn: { @@ -122,6 +125,7 @@ export default { 'PCR002': 'PCR002', //LBA 'LBA001': 'SP001', + 'LBA002': 'LBA002', //样品 'YP001': 'SP001', //ADA diff --git a/src/views/business/comps/template/comps/lba/LBA002.vue b/src/views/business/comps/template/comps/lba/LBA002.vue new file mode 100644 index 0000000..0102eeb --- /dev/null +++ b/src/views/business/comps/template/comps/lba/LBA002.vue @@ -0,0 +1,257 @@ + + + + + \ No newline at end of file From d135e8b4b7b247a36bd1f2aa13e1d441aad8e655 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 9 Feb 2026 18:54:36 +0800 Subject: [PATCH 3/5] =?UTF-8?q?fix:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20=E4=BF=AE=E6=94=B9=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/lba/LBA002.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/business/comps/template/comps/lba/LBA002.vue b/src/views/business/comps/template/comps/lba/LBA002.vue index 0102eeb..95c515b 100644 --- a/src/views/business/comps/template/comps/lba/LBA002.vue +++ b/src/views/business/comps/template/comps/lba/LBA002.vue @@ -50,7 +50,7 @@ import { debounce } from 'lodash-es' import TableOpertaionDelete from "@/components/Template/operation/TableOpertaionDelete.vue" export default { - name: "SP001", + name: "LBA002", components: { BaseInfoFormPackage, LineLabel, TableList, Step, CustomTable,TableOpertaionDelete }, mixins: [templateMixin], props: { From 56401aa214917416735133340dffb37450bccdd8 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Feb 2026 19:55:09 +0800 Subject: [PATCH 4/5] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93]=E5=AD=98?= =?UTF-8?q?=E5=82=A8=E4=BD=8D=E7=BD=AE=E8=87=B4=E5=91=BDbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resource/gyzj/comps/gyzj/Cc.vue | 14 +++++----- src/views/business/resource/gyzj/comps/gyzj/Rk.vue | 7 +++-- .../business/resource/gyzj/comps/gyzj/Sqrk.vue | 5 +++- src/views/business/resource/mjy/comps/mjy/Cc.vue | 12 +++++---- src/views/business/resource/mjy/comps/mjy/Gh.vue | 31 ++++++++++++---------- src/views/business/resource/mjy/comps/mjy/Rk.vue | 5 +++- src/views/business/study/comp/wzlb/mjyList.vue | 2 +- 7 files changed, 46 insertions(+), 30 deletions(-) diff --git a/src/views/business/resource/gyzj/comps/gyzj/Cc.vue b/src/views/business/resource/gyzj/comps/gyzj/Cc.vue index 2adaf33..9047777 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Cc.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Cc.vue @@ -18,15 +18,14 @@ - - - + + + - - - + + @@ -140,6 +139,9 @@ export default { created() { }, methods: { + ccwzChange(val){ + this.form.cctj=val.wc + }, cancel() { this.open = false }, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Rk.vue b/src/views/business/resource/gyzj/comps/gyzj/Rk.vue index 418c6a0..9c29bb7 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Rk.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Rk.vue @@ -39,14 +39,14 @@ - + - + @@ -190,6 +190,9 @@ export default { created() { }, methods: { + rkwzChange(val){ + this.form.rktj=val.wc + }, cancel() { this.open = false }, diff --git a/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue b/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue index 91e2d8c..35da436 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Sqrk.vue @@ -40,7 +40,7 @@ - + @@ -165,6 +165,9 @@ export default { created() { }, methods: { + rkwzChange(val){ + this.form.rktj=val.wc + }, cancel() { this.open = false }, diff --git a/src/views/business/resource/mjy/comps/mjy/Cc.vue b/src/views/business/resource/mjy/comps/mjy/Cc.vue index a70124a..7cf1aae 100644 --- a/src/views/business/resource/mjy/comps/mjy/Cc.vue +++ b/src/views/business/resource/mjy/comps/mjy/Cc.vue @@ -19,14 +19,13 @@ - - + + - - - + + @@ -139,6 +138,9 @@ export default { created() { }, methods: { + ccwzChange(val){ + this.form.cctj=val.wc + }, cancel() { this.open = false }, diff --git a/src/views/business/resource/mjy/comps/mjy/Gh.vue b/src/views/business/resource/mjy/comps/mjy/Gh.vue index 36cbe3a..36bcfe7 100644 --- a/src/views/business/resource/mjy/comps/mjy/Gh.vue +++ b/src/views/business/resource/mjy/comps/mjy/Gh.vue @@ -4,7 +4,7 @@ -
+
@@ -27,20 +27,20 @@ + }} - - + + - - + + @@ -48,7 +48,7 @@ + }} @@ -63,7 +63,7 @@ + }} @@ -78,7 +78,7 @@ - + @@ -138,7 +138,7 @@ - @@ -151,21 +151,21 @@ - - + - @@ -178,7 +178,7 @@ - @@ -299,6 +299,9 @@ export default { created() { }, methods: { + rkwzChange(val) { + this.form.rktj = val.wc + }, rklChange() { if (!isNaN(this.form.rkmz)) { this.form.jsl = _.subtract(parseFloat(this.form.ckmz), parseFloat(this.form.rkmz)) diff --git a/src/views/business/resource/mjy/comps/mjy/Rk.vue b/src/views/business/resource/mjy/comps/mjy/Rk.vue index 8ef2066..edd1505 100644 --- a/src/views/business/resource/mjy/comps/mjy/Rk.vue +++ b/src/views/business/resource/mjy/comps/mjy/Rk.vue @@ -47,7 +47,7 @@ - + @@ -239,6 +239,9 @@ export default { created() { }, methods: { + rkwzChange(val){ + this.form.rktj=val.wc + }, cancel() { this.open = false }, diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue index 981b44e..17e6c5b 100644 --- a/src/views/business/study/comp/wzlb/mjyList.vue +++ b/src/views/business/study/comp/wzlb/mjyList.vue @@ -93,7 +93,7 @@ $t('page.business.resource.mjy.xgkc') }} - {{ $t('page.business.resource.gyzj.quchu') }} From a75ca399a1dd45d0e521c684a02111dcf2271a16 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 9 Feb 2026 20:15:35 +0800 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=20ADA002?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/template/ada.js | 3 ++- src/lang/en/template/lba.js | 4 +--- src/lang/zh/template/ada.js | 3 ++- src/lang/zh/template/lba copy.js | 9 +++++++++ src/lang/zh/template/lba.js | 4 +--- src/views/business/comps/template/TemplateTable.vue | 2 ++ 6 files changed, 17 insertions(+), 8 deletions(-) create mode 100644 src/lang/zh/template/lba copy.js diff --git a/src/lang/en/template/ada.js b/src/lang/en/template/ada.js index 8e065d9..9fef94f 100644 --- a/src/lang/en/template/ada.js +++ b/src/lang/en/template/ada.js @@ -1,4 +1,5 @@ //ADA export default { - ada001: {} //用的SP001 + ada001: {}, //用的SP001 + ada002: {} //用的LBA001 } diff --git a/src/lang/en/template/lba.js b/src/lang/en/template/lba.js index 8ba2d42..8f2b7e7 100644 --- a/src/lang/en/template/lba.js +++ b/src/lang/en/template/lba.js @@ -4,8 +4,6 @@ export default { lba002: { cztj: 'Work Condition', czsj: 'Work Time', - jcbmc: 'Analysis Plate Name', - tjh: 'Add Row', - sc: 'Delete' + jcbmc: 'Analysis Plate Name' } } diff --git a/src/lang/zh/template/ada.js b/src/lang/zh/template/ada.js index 8e065d9..9fef94f 100644 --- a/src/lang/zh/template/ada.js +++ b/src/lang/zh/template/ada.js @@ -1,4 +1,5 @@ //ADA export default { - ada001: {} //用的SP001 + ada001: {}, //用的SP001 + ada002: {} //用的LBA001 } diff --git a/src/lang/zh/template/lba copy.js b/src/lang/zh/template/lba copy.js new file mode 100644 index 0000000..1e220c6 --- /dev/null +++ b/src/lang/zh/template/lba copy.js @@ -0,0 +1,9 @@ +//LBA +export default { + lba001: {}, //用的SP001 + lba002: { + cztj: '操作条件', + czsj: '操作时间', + jcbmc: '检测板名称' + } +} diff --git a/src/lang/zh/template/lba.js b/src/lang/zh/template/lba.js index ca7d5aa..1e220c6 100644 --- a/src/lang/zh/template/lba.js +++ b/src/lang/zh/template/lba.js @@ -4,8 +4,6 @@ export default { lba002: { cztj: '操作条件', czsj: '操作时间', - jcbmc: '检测板名称', - tjh: '添加行', - sc: '删除' + jcbmc: '检测板名称' } } diff --git a/src/views/business/comps/template/TemplateTable.vue b/src/views/business/comps/template/TemplateTable.vue index dcb833e..46a7281 100644 --- a/src/views/business/comps/template/TemplateTable.vue +++ b/src/views/business/comps/template/TemplateTable.vue @@ -57,6 +57,7 @@ import LBA002 from "./comps/lba/LBA002.vue"; //ADA // ADA001-使用SP001 +// ADA002-使用LBA002 export default { name: "TemplateTable", @@ -130,6 +131,7 @@ export default { 'YP001': 'SP001', //ADA 'ADA001': 'SP001', + 'ADA002': 'LBA002', } } return this.componentMap || "Demo"