From e07a28ee68fa766b0f2b133892170a4c010c2357 Mon Sep 17 00:00:00 2001 From: memorylkf <312904636@qq.com> Date: Mon, 9 Feb 2026 10:35:01 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=20[=E7=99=BB=E5=BD=95]=20=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=AC=AC=E4=B8=80=E4=B8=AAurl?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/Sidebar/Logo.vue | 8 ++++---- src/store/getters.js | 4 +++- src/store/modules/user.js | 10 ++++++++-- src/views/login.vue | 4 ++-- 4 files changed, 17 insertions(+), 9 deletions(-) diff --git a/src/layout/components/Sidebar/Logo.vue b/src/layout/components/Sidebar/Logo.vue index 8ed2eaa..ecfb97f 100644 --- a/src/layout/components/Sidebar/Logo.vue +++ b/src/layout/components/Sidebar/Logo.vue @@ -2,16 +2,16 @@
- +

{{ $t('system.title') }}

- - + + - +
diff --git a/src/store/getters.js b/src/store/getters.js index df156c6..bc86946 100644 --- a/src/store/getters.js +++ b/src/store/getters.js @@ -17,6 +17,8 @@ const getters = { topbarRouters: (state) => state.permission.topbarRouters, defaultRoutes: (state) => state.permission.defaultRoutes, sidebarRouters: (state) => state.permission.sidebarRouters, - language: (state) => state.app.language + language: (state) => state.app.language, + + defaultUrl: (state) => state.user.defaultUrl } export default getters diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 2199cf7..94c5f0c 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -13,7 +13,9 @@ const user = { nickName: '', avatar: '', roles: [], - permissions: [] + permissions: [], + + defaultUrl: '/user/work' }, mutations: { @@ -40,6 +42,9 @@ const user = { }, SET_PERMISSIONS: (state, permissions) => { state.permissions = permissions + }, + SET_DEFAULTURL: (state, defaultUrl) => { + state.defaultUrl = defaultUrl } }, @@ -59,7 +64,8 @@ const user = { commit('SET_TOKEN', data.access_token) setExpiresIn(data.expires_in) commit('SET_EXPIRES_IN', data.expires_in) - resolve() + commit('SET_DEFAULTURL', data.defaultUrl) + resolve(data.defaultUrl) }) .catch((error) => { reject(error) diff --git a/src/views/login.vue b/src/views/login.vue index dab6767..4d9c330 100644 --- a/src/views/login.vue +++ b/src/views/login.vue @@ -156,8 +156,8 @@ export default { Cookies.remove("password"); Cookies.remove('rememberMe'); } - this.$store.dispatch("Login", this.loginForm).then(() => { - this.$router.push({ path: this.redirect || "/" }).catch(()=>{}); + this.$store.dispatch("Login", this.loginForm).then((url) => { + this.$router.push({ path: url }).catch(()=>{}); }).catch(err => { if(err && err.message==='exists'){ this.$confirm(this.$t('system.crowdOut'), this.$t('system.tip'), { From 7292f2917415720e20eac28b72786d8b570bd448 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Feb 2026 10:59:35 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93]=E6=93=8D?= =?UTF-8?q?=E4=BD=9C=E6=97=A5=E5=BF=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resource/gyzj/comps/ffjl/Xq.vue | 1 + src/views/business/resource/gyzj/comps/ffjlList.vue | 1 + src/views/business/resource/gyzj/comps/gyzj/Xq.vue | 1 + src/views/business/resource/gyzj/comps/gyzjList.vue | 1 + src/views/business/resource/gyzj/index.vue | 1 + src/views/business/resource/mjy/comps/ffjl/Xq.vue | 3 +++ src/views/business/resource/mjy/comps/ffjlList.vue | 1 + src/views/business/resource/mjy/comps/mjy/Xq.vue | 3 ++- src/views/business/resource/mjy/comps/mjyList.vue | 1 + src/views/business/resource/mjy/index.vue | 1 + src/views/business/study/comp/wzlb/gyzjList.vue | 2 +- src/views/business/study/comp/wzlb/mjyList.vue | 2 +- 12 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue index c966c8a..9b272b1 100644 --- a/src/views/business/resource/gyzj/comps/ffjl/Xq.vue +++ b/src/views/business/resource/gyzj/comps/ffjl/Xq.vue @@ -221,6 +221,7 @@ export default { this.form = response.data this.open = true this.getJjcgjList() + this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'给药制剂发放回收详情',jcmcEn:'Formulation In-and-Out Record Detail'}) }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/resource/gyzj/comps/ffjlList.vue b/src/views/business/resource/gyzj/comps/ffjlList.vue index 892648b..4771aef 100644 --- a/src/views/business/resource/gyzj/comps/ffjlList.vue +++ b/src/views/business/resource/gyzj/comps/ffjlList.vue @@ -397,6 +397,7 @@ export default { a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate))) a.click() that.$modal.closeLoading() + that.saveSimpleLog({name:'',nameEn:'',jcmc:'给药制剂发放回收导出',jcmcEn:'Formulation In-and-Out Record Export'}) }).finally(() => { that.$modal.closeLoading() }) diff --git a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue index 1469336..b851d7e 100644 --- a/src/views/business/resource/gyzj/comps/gyzj/Xq.vue +++ b/src/views/business/resource/gyzj/comps/gyzj/Xq.vue @@ -226,6 +226,7 @@ export default { this.form = response.data this.open = true this.getTzList() + this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'给药制剂详情',jcmcEn:'Formulation Detail'}) }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/resource/gyzj/comps/gyzjList.vue b/src/views/business/resource/gyzj/comps/gyzjList.vue index ad1875d..dfbd478 100644 --- a/src/views/business/resource/gyzj/comps/gyzjList.vue +++ b/src/views/business/resource/gyzj/comps/gyzjList.vue @@ -414,6 +414,7 @@ export default { a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate))) a.click() that.$modal.closeLoading() + that.saveSimpleLog({name:'',nameEn:'',jcmc:'给药制剂导出',jcmcEn:'Formulation Export'}) }).finally(() => { that.$modal.closeLoading() }) diff --git a/src/views/business/resource/gyzj/index.vue b/src/views/business/resource/gyzj/index.vue index 911db44..041119a 100644 --- a/src/views/business/resource/gyzj/index.vue +++ b/src/views/business/resource/gyzj/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/mjy/comps/ffjl/Xq.vue b/src/views/business/resource/mjy/comps/ffjl/Xq.vue index c1d00fb..9af529f 100644 --- a/src/views/business/resource/mjy/comps/ffjl/Xq.vue +++ b/src/views/business/resource/mjy/comps/ffjl/Xq.vue @@ -222,6 +222,9 @@ export default { this.form = response.data this.open = true this.getJjcgjList() + this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'麻精药发放回收详情',jcmcEn:'Controlled Drug In-and-Out Record Detail'}) + }).finally(() => { + this.$modal.closeLoading() }) } } diff --git a/src/views/business/resource/mjy/comps/ffjlList.vue b/src/views/business/resource/mjy/comps/ffjlList.vue index 39af500..db642e3 100644 --- a/src/views/business/resource/mjy/comps/ffjlList.vue +++ b/src/views/business/resource/mjy/comps/ffjlList.vue @@ -397,6 +397,7 @@ export default { a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate))) a.click() that.$modal.closeLoading() + that.saveSimpleLog({name:'',nameEn:'',jcmc:'麻精药发放回收导出',jcmcEn:'Controlled Drug In-and-Out Record Export'}) }).finally(() => { that.$modal.closeLoading() }) diff --git a/src/views/business/resource/mjy/comps/mjy/Xq.vue b/src/views/business/resource/mjy/comps/mjy/Xq.vue index 1c0be7b..fa465f2 100644 --- a/src/views/business/resource/mjy/comps/mjy/Xq.vue +++ b/src/views/business/resource/mjy/comps/mjy/Xq.vue @@ -221,8 +221,9 @@ export default { this.$modal.loading() info({ id: row.id }).then(response => { this.form = response.data - this.getTzList() this.open = true + this.getTzList() + this.saveSimpleLog({name:row.bh,nameEn:row.bh,jcmc:'麻精药详情',jcmcEn:'Controlled Drug Detail'}) }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/resource/mjy/comps/mjyList.vue b/src/views/business/resource/mjy/comps/mjyList.vue index 84e3a24..c06594f 100644 --- a/src/views/business/resource/mjy/comps/mjyList.vue +++ b/src/views/business/resource/mjy/comps/mjyList.vue @@ -413,6 +413,7 @@ export default { a.href = uri + window.btoa(unescape(encodeURIComponent(exportTemplate))) a.click() that.$modal.closeLoading() + that.saveSimpleLog({name:'',nameEn:'',jcmc:'麻精药导出',jcmcEn:'Controlled Drug Export'}) }).finally(() => { that.$modal.closeLoading() }) diff --git a/src/views/business/resource/mjy/index.vue b/src/views/business/resource/mjy/index.vue index fbe816e..f441a96 100644 --- a/src/views/business/resource/mjy/index.vue +++ b/src/views/business/resource/mjy/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/study/comp/wzlb/gyzjList.vue b/src/views/business/study/comp/wzlb/gyzjList.vue index a69fa9b..a6b16c7 100644 --- a/src/views/business/study/comp/wzlb/gyzjList.vue +++ b/src/views/business/study/comp/wzlb/gyzjList.vue @@ -102,7 +102,7 @@ - {{ $t('page.business.resource.gyzj.ruku') }} diff --git a/src/views/business/study/comp/wzlb/mjyList.vue b/src/views/business/study/comp/wzlb/mjyList.vue index 17e6c5b..981b44e 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 09acbb154f9e7d9ae0880ced97efec45488a5809 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Feb 2026 12:04:15 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:[=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95]?= =?UTF-8?q?=E6=A3=80=E6=B5=8B=E6=9D=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/mixins/templateMixin.js | 5 +++++ src/views/business/study/comp/tbbd/Bj.vue | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/business/comps/template/mixins/templateMixin.js b/src/views/business/comps/template/mixins/templateMixin.js index 9c192eb..50e9835 100644 --- a/src/views/business/comps/template/mixins/templateMixin.js +++ b/src/views/business/comps/template/mixins/templateMixin.js @@ -129,9 +129,11 @@ export default { resource: [], //试验试剂信息 resourceWz: [], //物资信息 yqResource: [], //仪器信息 + jcbList: [], //检测板信息 resourceTmp:[],//试验试剂信息提交用 yqResourceTmp: [], //仪器信息提交用 + jcbListTmp: [], //检测板信息提交用 sysjColumns: [ { label: 'template.common.reagentName', prop: "mc" },//名称 { label: 'template.common.reagentCode', prop: "bh" },//编号 @@ -235,6 +237,9 @@ export default { getYqResource() { return this.yqResourceTmp }, + getJcbList() { + return this.jcbListTmp + }, //根据ref数组获取直接formData getFilledFormDataByRefs(refArr = []) { let result = {} diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index 067cccd..05b85fc 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -417,6 +417,7 @@ export default { bdnr: '', resource: '', yqResource: '', + jcbList:'', qmrmm: '', sfcz: false, czfs: '', @@ -445,6 +446,7 @@ export default { resourceYj: [], resource: [], yqResource: [], + jcbList:[], bdmbTitle: this.$t('page.business.form.bdmb'), rulesApprove: { qmrmm: [{ @@ -644,6 +646,7 @@ export default { that.formApprove.bdnr = JSON.stringify(content) that.resource = that.$refs.templateTable.getResource() that.yqResource = that.$refs.templateTable.getYqResource() + that.jcbList = that.$refs.templateTable.getJcbList() that.openApprove = true } }, @@ -827,7 +830,6 @@ export default { } } that.$modal.loading() - debugger that.formYjcc.resource = JSON.stringify(that.resourceYj) that.formYjcc.cclist = JSON.stringify(that.cclistYj) studyFormFill_yjcc(that.formYjcc).then(response => { @@ -848,6 +850,7 @@ export default { that.$modal.loading() that.formApprove.resource = JSON.stringify(that.resource) that.formApprove.yqResource = JSON.stringify(that.yqResource) + that.formApprove.jcbList = JSON.stringify(that.jcbList) if (that.czlist.length > 0) { that.formApprove.czlist = JSON.stringify(that.czlist) } From 3d98f42e109ca33f58b5d1bb8731c0870ae98112 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Mon, 9 Feb 2026 13:46:50 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E8=AE=B0=E5=BD=95]=E6=9C=89=E6=95=88=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/nonTrial/comp/syff/Xq.vue | 15 +++--- src/views/business/resource/gsp/comps/rkjl/Bj.vue | 15 ++++++ src/views/business/resource/gsp/comps/rkjl/Xz.vue | 10 ++++ src/views/business/study/comp/syff/Xq.vue | 60 ++++++++++++++++------- 4 files changed, 75 insertions(+), 25 deletions(-) diff --git a/src/views/business/form/nonTrial/comp/syff/Xq.vue b/src/views/business/form/nonTrial/comp/syff/Xq.vue index 01cc033..f742437 100644 --- a/src/views/business/form/nonTrial/comp/syff/Xq.vue +++ b/src/views/business/form/nonTrial/comp/syff/Xq.vue @@ -54,8 +54,6 @@