From 38f5b52938c88e5509b9d710fbdadf4b1aa9f16a Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 8 Aug 2024 16:26:10 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E4=B8=AD=E5=BF=83=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/personnel-manage/components/site.vue | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue index ace89353..911a32c1 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue @@ -281,6 +281,7 @@ :fetch-suggestions="querySearch" @select="handleSelect" placeholder="" + @change="handleChange" > @@ -614,9 +615,13 @@ export default { this.form.TrialSiteName = item.SiteName; this.form.TrialSiteAliasName = item.AliasName ? item.AliasName - : this.form.TrialSiteAliasName; + : item.SiteName; this.form.SiteId = item.SiteId; }, + handleChange(v) { + if (v) return + this.form.TrialSiteAliasName = '' + }, querySearch(queryString, cb) { var TrialSiteSelectList = this.TrialSiteSelectList; var results = queryString @@ -643,8 +648,14 @@ export default { let res = await getTrialSiteSelectList(); if (res.IsSuccess) { this.TrialSiteSelectList = res.Result.map((item) => { + let v = '' + if (this.$i18n.locale === 'zh' && item.AliasName) { + v = `(${item.AliasName})` + } else if (this.$i18n.locale === 'en' && item.AliasName) { + v = `( ${item.AliasName} )` + } return { - value: item.SiteName + " " + item.AliasName, + value: `${item.SiteName} ${v}`, ...item, }; }); From de313e9b52ca54ef71ea1da089701b3d65565715 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Fri, 9 Aug 2024 11:44:32 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E5=8E=BB=E9=99=A4=E9=94=81=E5=B1=8F?= =?UTF-8?q?=E4=BA=8C=E6=AC=A1=E9=AA=8C=E8=AF=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main.js b/src/main.js index 762ef18e..aacc85f9 100644 --- a/src/main.js +++ b/src/main.js @@ -440,22 +440,22 @@ async function VueInit() { done() }, 500) } - if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) { - sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => { - done(); - Vue.prototype.$MFA({ - status: "lock", - UserId: my_userid, - EMail: res.Result, - username: my_username, - callBack: () => { - closeLock(_vm) - }, - }) - }) - } else { - closeLock(_vm) - } + // if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) { + // sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => { + // done(); + // Vue.prototype.$MFA({ + // status: "lock", + // UserId: my_userid, + // EMail: res.Result, + // username: my_username, + // callBack: () => { + // closeLock(_vm) + // }, + // }) + // }) + // } else { + closeLock(_vm) + // } } else { // console.log(111) From 67d995d18087548d4559477b6601d7f9cf4cf485 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Fri, 9 Aug 2024 13:04:47 +0800 Subject: [PATCH 03/16] =?UTF-8?q?=E9=98=85=E7=89=87=E7=B1=BB=E5=9E=8B?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enrolled-reviewers/list/index.vue | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue index 82736cab..681469d5 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue @@ -272,20 +272,22 @@ From 08710d78d160cf5e7920785875762773d87c80a1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Fri, 9 Aug 2024 13:08:52 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/trial-config/components/clinicalDataForm.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue index 53c17d04..2482885e 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue @@ -16,10 +16,12 @@ - @@ -27,7 +29,7 @@ v-model="form.ClinicalDataSetName" :disabled="data.IsFromSystemData === true" /> - + --> Date: Fri, 9 Aug 2024 13:41:35 +0800 Subject: [PATCH 05/16] =?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 --- .../enrolled-reviewers/list/index.vue | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue index 681469d5..6e0ce792 100644 --- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue +++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue @@ -1,5 +1,5 @@ @@ -205,32 +263,45 @@ append-to-body custom-class="base-dialog-wrapper" > -
- +
+
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 3459aa8d..777cc4e9 100644 --- a/src/views/trials/trials-panel/visit/qc-check/index.vue +++ b/src/views/trials/trials-panel/visit/qc-check/index.vue @@ -5,15 +5,29 @@ - - + + - + - + - + @@ -40,11 +57,7 @@ > {{ item.VisitName }} - + @@ -54,11 +67,35 @@ :label="$t('trials:qcCheck:table:auditState')" class="my_multiple" > - - + + - - + + @@ -66,15 +103,27 @@ v-if="OtherInfo.QCProcessEnum !== 0" :label="$t('trials:qcCheck:table:participant')" > - + {{ item.HandleUser }} - + {{ item.HandleUserRealName }} @@ -89,17 +138,30 @@ type="datetimerange" :default-time="['00:00:00', '23:59:59']" @change="changeTimeList" - style="width:240px" + style="width: 240px" /> - {{ $t('common:button:search') }} + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }} + + + + {{ $t("common:button:export") }} @@ -110,7 +172,7 @@ @@ -158,26 +220,36 @@ > @@ -206,7 +278,11 @@ sortable="custom" > @@ -240,15 +319,44 @@ @@ -262,7 +370,11 @@ sortable="custom" > @@ -274,7 +386,11 @@ sortable="custom" > @@ -302,22 +418,48 @@ sortable="custom" > @@ -337,28 +479,48 @@ > @@ -373,13 +535,20 @@ />
- {{ $t('trials:crcUpload:label:finalVisit') }} + {{ $t("trials:crcUpload:label:finalVisit") }} - : {{ $t('trials:crcUpload:label:finalVisitDetail') }} + : {{ $t("trials:crcUpload:label:finalVisitDetail") }} - - {{ $t('trials:crcUpload:label:lostVisit') }} + + {{ $t("trials:crcUpload:label:lostVisit") }} - : {{ $t('trials:crcUpload:label:lostVisitDetail') }} + : {{ $t("trials:crcUpload:label:lostVisitDetail") }} - - {{ $t('trials:crcUpload:label:pd') }} + + {{ $t("trials:crcUpload:label:pd") }} - : {{ $t('trials:crcUpload:label:pdDetail') }} - - {{ $t('trials:crcUpload:label:enrollmentConfirm') }} + : {{ $t("trials:crcUpload:label:pdDetail") }} + + {{ $t("trials:crcUpload:label:enrollmentConfirm") }} - : {{ $t('trials:crcUpload:label:enrollmentConfirmDetail') }} + : {{ $t("trials:crcUpload:label:enrollmentConfirmDetail") }} - - {{ $t('trials:qcCheck:label:preliminary') }} + + {{ $t("trials:qcCheck:label:preliminary") }} - : {{ $t('trials:qcCheck:label:preliminaryAudit') }} + : {{ $t("trials:qcCheck:label:preliminaryAudit") }} - - {{ $t('trials:qcCheck:label:review') }} + + {{ $t("trials:qcCheck:label:review") }} - : {{ $t('trials:qcCheck:label:reviewAudit') }} + : {{ $t("trials:qcCheck:label:reviewAudit") }}
- {{ trialCode }} - {{ rowData.TrialSiteCode }} - {{ rowData.SubjectCode }} + {{ + trialCode + }} + {{ + rowData.TrialSiteCode + }} + {{ + rowData.SubjectCode + }} {{ `${rowData.VisitName} (${rowData.VisitNum})` }} @@ -504,8 +730,8 @@ - {{$t('trials:reading:button:handbooks')}} - - - + {{ $t("trials:reading:button:handbooks") }} + + + -
+
@@ -543,14 +781,22 @@ > - {{ searchData.TrialCode }} - {{ rowData.TrialSiteCode }} - {{ rowData.SubjectCode }} - {{ `${rowData.VisitName} (${rowData.VisitNum})` }} + {{ + searchData.TrialCode + }} + {{ + rowData.TrialSiteCode + }} + {{ + rowData.SubjectCode + }} + {{ + `${rowData.VisitName} (${rowData.VisitNum})` + }}
- + - {{ item.label }} + {{ item.label }} @@ -579,13 +832,18 @@ :label="$t('trials:crcUpload:form:pd')" > - {{ item.label }} + {{ item.label }}
-

{{ $t('trials:audit:tab:dicoms') }}

+

{{ $t("trials:audit:tab:dicoms") }}

@@ -593,20 +851,36 @@
-

{{ $t('trials:audit:tab:nonDicoms') }}

+

+ {{ $t("trials:audit:tab:nonDicoms") }} +

- +
-

{{ $t('trials:audit:tab:clinicalData') }}

- - +

+ {{ $t("trials:audit:tab:clinicalData") }} +

+ +
-
@@ -617,7 +891,7 @@ :close-on-click-modal="false" :title="$t('trials:qcCheck:dialogTitle:setUrgent')" width="400px" - style="height:500px" + style="height: 500px" custom-class="base-dialog-wrapper" > @@ -625,19 +899,37 @@ - {{ item.label }} + {{ item.label }}
-