From 43bdf0cc193703ee212842588fd64530ad579f5d Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 1 Aug 2024 16:34:07 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E9=87=8D=E4=BC=A0bug?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../visit/crc-upload/components/uploadDicomFiles2.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue index cbe4b436..b8c700a2 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue @@ -882,7 +882,7 @@ export default { modality: this.studyForm.Modality, bodyPart: this.studyForm.BodyPart, }; - updateModality(this.data.TrialId, params) + updateModality(this.trialId, params) .then((res) => { this.btnLoading = false; if (res.IsSuccess) { From 3819f5af0bb3b9c9641d2f1f38dedc4b7852734b Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 2 Aug 2024 11:41:50 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=92=8C=E5=BD=B1=E5=83=8F=E6=8C=87=E6=8E=A7=E9=A1=B5=E9=9D=A2?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=AE=A1=E6=A0=B8=E5=AE=8C=E6=88=90=E6=97=B6?= =?UTF-8?q?=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/visit/crc-upload/index.vue | 7 ++++ .../qc-check/components/qualityAssurance.vue | 4 ++- .../trials-panel/visit/qc-check/index.vue | 33 +++++++++++++++++-- 3 files changed, 41 insertions(+), 3 deletions(-) diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue index 8d534a8c..4cc834e9 100644 --- a/src/views/trials/trials-panel/visit/crc-upload/index.vue +++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue @@ -308,6 +308,13 @@ {{ $fd('AuditStateRC', scope.row.AuditState*1) }} + + { + this.$emit("getList") + }) } else { // 没有后续质控任务 this.$emit("getList"); diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue index 0cdb906b..5fbd6f6d 100644 --- a/src/views/trials/trials-panel/visit/qc-check/index.vue +++ b/src/views/trials/trials-panel/visit/qc-check/index.vue @@ -80,7 +80,16 @@ - + + + + @@ -309,6 +318,13 @@ {{ $fd('AuditStateRC', scope.row.AuditState*1) }} + + { IsUrgent: null, AuditStateArray: [], HandleUserId: '', + BeginAuditTime: null, + EndAuditTime: null, PageIndex: 1, PageSize: 20 // SortField: '', @@ -683,7 +701,8 @@ export default { trialCode: this.$route.query.trialCode, query: null, manualsDialog: { visible: false }, - isFullscreen: false + isFullscreen: false, + timeList: [] } }, watch: { @@ -822,6 +841,7 @@ export default { // 重置 handleReset() { this.searchData = searchDataDefault() + this.timeList = [] this.getList() this.$nextTick(() => { this.$refs.qcCheckList.clearSort() @@ -949,6 +969,15 @@ export default { this.qcVisible = false }) }, + changeTimeList() { + if (this.timeList) { + this.searchData.BeginAuditTime = this.timeList[0] + this.searchData.EndAuditTime = this.timeList[1] + } else { + this.searchData.BeginAuditTime = null + this.searchData.EndAuditTime = null + } + }, openManuals() { this.manualsDialog.visible = true } From f87935f6f5e14112755dae90b15af9b84eda212e Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 2 Aug 2024 13:44:39 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=80=9A=E8=BF=87?= =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9B=B4?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-panel/visit/qc-check/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue index 5fbd6f6d..5a609786 100644 --- a/src/views/trials/trials-panel/visit/qc-check/index.vue +++ b/src/views/trials/trials-panel/visit/qc-check/index.vue @@ -80,13 +80,13 @@ - + From ea413ffe0bacb1ccd89af68334b37ad5d6e03cdd Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 2 Aug 2024 14:00:23 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-panel/visit/qc-check/index.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue index 5a609786..68f34901 100644 --- a/src/views/trials/trials-panel/visit/qc-check/index.vue +++ b/src/views/trials/trials-panel/visit/qc-check/index.vue @@ -85,6 +85,7 @@ Date: Fri, 2 Aug 2024 14:08:42 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?= =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/login/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 59697a13..8fb13978 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -269,7 +269,7 @@ export default { this.setLanguage("en"); this.$updateDictionary(); } else { - if (this.location === "USA") { + if (this.location === "USA" || this.NODE_ENV === "usa") { this.$i18n.locale = "en"; this.setLanguage("en"); this.$updateDictionary();