From fd4fc21e18283bc07b0459b2423fd6805749404b Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 24 May 2024 17:42:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=81=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 --- .env.production | 2 +- .env.uat | 4 ++-- .env.usa | 4 ++-- src/views/trials/trials-myinfo/password.vue | 7 ++++++- src/views/trials/trials-panel/study/components/list.vue | 4 ++-- 5 files changed, 13 insertions(+), 8 deletions(-) diff --git a/.env.production b/.env.production index 68f45f4..e459511 100644 --- a/.env.production +++ b/.env.production @@ -22,7 +22,7 @@ VUE_APP_LOGOUT_FOR_PERMISSION = false VUE_APP_LOGOUT_FOR_TIME = 1800 # 是否开启密码正则验证 true:是 false:否 -VUE_APP_PASSWORD_FOR_PERMISSION = true +VUE_APP_PASSWORD_FOR_PERMISSION = false # 是否开启密码正则验证 true:是 false:否 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ diff --git a/.env.uat b/.env.uat index c2d8769..4e894be 100644 --- a/.env.uat +++ b/.env.uat @@ -1,6 +1,6 @@ # just a flag -ENV = 'production' -NODE_ENV = 'production' +ENV = 'uat' +NODE_ENV = 'uat' # base public path VUE_APP_BASE_PATH = '/' diff --git a/.env.usa b/.env.usa index 7df52bb..cd4f5b4 100644 --- a/.env.usa +++ b/.env.usa @@ -1,6 +1,6 @@ # just a flag -ENV = 'production' -NODE_ENV = 'production' +ENV = 'usa' +NODE_ENV = 'usa' # base public path VUE_APP_BASE_PATH = '/' diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue index 4734c4d..50357a1 100644 --- a/src/views/trials/trials-myinfo/password.vue +++ b/src/views/trials/trials-myinfo/password.vue @@ -157,4 +157,9 @@ export default { }, }, }; - \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue index 6d4367f..06ddaa5 100644 --- a/src/views/trials/trials-panel/study/components/list.vue +++ b/src/views/trials/trials-panel/study/components/list.vue @@ -72,14 +72,14 @@ {{ $t("common:button:reset") }} - {{ $t("trials:study:button:automaticBind") }} - + --> From 2d2dadcac58a74e79111ce1802cf9326f61a900a Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 27 May 2024 11:26:05 +0800 Subject: [PATCH 02/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E5=90=8D=E7=A7=B0?= =?UTF-8?q?=E9=95=BF=E5=BA=A6=E9=99=90=E5=88=B6=E4=BF=AE=E6=94=B9=E4=B8=BA?= =?UTF-8?q?500?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-list/components/TrialForm.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index 74e6a3c..c919f07 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -316,8 +316,8 @@ export default { trigger: "blur", }, { - max: 100, - message: `${this.$t("common:ruleMessage:maxLength")} 100`, + max: 500, + message: `${this.$t("common:ruleMessage:maxLength")} 500`, }, ], ModalityIds: [ From fd46407dfabfe30e28c8d9b16d6496ab91be541d Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 28 May 2024 11:15:26 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E6=A3=80=E6=9F=A5?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=8E=A8=E9=80=81=E8=AE=B0=E5=BD=95=E5=88=97?= =?UTF-8?q?=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/inspection.js | 18 ++ .../components/push-record-list.vue | 303 ++++++++++++++++++ .../components/view-study-list.vue | 1 + src/views/trials/trials-inspection/index.vue | 17 + 4 files changed, 339 insertions(+) create mode 100644 src/views/trials/trials-inspection/components/push-record-list.vue diff --git a/src/api/inspection.js b/src/api/inspection.js index fdc484e..0e2f7a8 100644 --- a/src/api/inspection.js +++ b/src/api/inspection.js @@ -37,6 +37,24 @@ export function getPatientJoinedTrialList(data) { }) } +// 检查->scp影像推送记录 +export function getSCPImageUploadList(data) { + return request({ + url: '/Patient/getSCPImageUploadList', + method: 'post', + data + }) +} + +// 下载记录 +export function getTrialSubjectVisitDownloadList(data) { + return request({ + url: '/Patient/getTrialSubjectVisitDownloadList', + method: 'post', + data + }) +} + // 获取患者列表（下拉框） export function getTrialSubejctSelectList(data) { return request({ diff --git a/src/views/trials/trials-inspection/components/push-record-list.vue b/src/views/trials/trials-inspection/components/push-record-list.vue new file mode 100644 index 0000000..e627343 --- /dev/null +++ b/src/views/trials/trials-inspection/components/push-record-list.vue @@ -0,0 +1,303 @@ + + \ No newline at end of file diff --git a/src/views/trials/trials-inspection/components/view-study-list.vue b/src/views/trials/trials-inspection/components/view-study-list.vue index b4bcc39..f3edccc 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -273,6 +273,7 @@ export default { this.list = res.Result; } } catch (err) { + this.loading = false; console.log(err); } }, diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue index fba4d66..ec06d34 100644 --- a/src/views/trials/trials-inspection/index.vue +++ b/src/views/trials/trials-inspection/index.vue @@ -92,6 +92,12 @@ {{ $t("common:button:reset") }} + + + + {{ $t("common:button:push") }} + + @@ -294,6 +300,13 @@ :Patient="selectPatient" @getList="getList" /> + + From d0f2854b1cd749c8ffa1d1e19e7bd530c19b4a72 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 28 May 2024 13:29:55 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E9=80=80=E5=9B=9E=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=95=B0=E6=8D=AE=E7=BC=BA=E5=A4=B1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/reading/reread-task/index.vue | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/views/trials/trials-panel/reading/reread-task/index.vue b/src/views/trials/trials-panel/reading/reread-task/index.vue index f618534..d548065 100644 --- a/src/views/trials/trials-panel/reading/reread-task/index.vue +++ b/src/views/trials/trials-panel/reading/reread-task/index.vue @@ -35,7 +35,7 @@ /> - + - + --> From be53acc1910dd4ef6463353b06aaf7900297a5c3 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 29 May 2024 10:22:31 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=88=97=E8=A1=A8?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A3=80=E6=9F=A5=E6=95=B0=E9=87=8F=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-panel/trial-summary/download-record/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/trials/trials-panel/trial-summary/download-record/index.vue b/src/views/trials/trials-panel/trial-summary/download-record/index.vue index 2b5202c..f339820 100644 --- a/src/views/trials/trials-panel/trial-summary/download-record/index.vue +++ b/src/views/trials/trials-panel/trial-summary/download-record/index.vue @@ -123,6 +123,14 @@ show-overflow-tooltip sortable="custom" /> + + Date: Wed, 29 May 2024 11:07:58 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=96=B0=E5=A2=9E=E6=A3=80=E6=9F=A5=E6=95=B0?= =?UTF-8?q?=E9=87=8F=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials-inspection/components/push-record-list.vue | 8 ++++++++ .../trials-panel/trial-summary/download-record/index.vue | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-inspection/components/push-record-list.vue b/src/views/trials/trials-inspection/components/push-record-list.vue index c765ad7..69669a2 100644 --- a/src/views/trials/trials-inspection/components/push-record-list.vue +++ b/src/views/trials/trials-inspection/components/push-record-list.vue @@ -111,6 +111,14 @@ min-width="120" > + + - + Date: Wed, 29 May 2024 15:51:43 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=82=AE=E7=AE=B1=E6=9F=A5=E8=AF=A2=E6=9D=A1?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/list/index.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index 3b820ab..f88bf85 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -68,6 +68,7 @@ const searchDataDefault = () => { return { UserName: null, Phone: null, + EMail:null, OrganizationName: null, UserState: null, UserType: null, @@ -212,6 +213,13 @@ export default { width: "120px", placeholder: "", }, + { + type: "Input", + label: this.$t("system:userlist:label:EMail"), + prop: "EMail", + width: "120px", + placeholder: "", + }, { type: "Input", label: this.$t("system:userlist:label:Organization"), From 93acf8f3335b6ae587f8b83c24b820afabb0c1e6 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 29 May 2024 16:32:33 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=BF=80=E6=B4=BB?= =?UTF-8?q?=E9=A1=B5=E9=BB=98=E8=AE=A4=E6=BF=80=E6=B4=BB=E6=97=A5=E6=9C=9F?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/trials/trials-list/components/activate-page.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-list/components/activate-page.vue b/src/views/trials/trials-list/components/activate-page.vue index 73156d1..68ca13c 100644 --- a/src/views/trials/trials-list/components/activate-page.vue +++ b/src/views/trials/trials-list/components/activate-page.vue @@ -184,7 +184,7 @@ export default { Object.keys(res.Result).forEach((key) => { this.data[key] = res.Result[key]; }); - this.form.PurchaseDuration = this.data.PurchaseDuration; + this.form.PurchaseDuration = this.data.PurchaseDuration * 12; } } catch (err) { console.log(err); From e20719415a363423da96fea0afb2601a87be1328 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 29 May 2024 16:56:14 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/system/user/list/index.vue | 4 ++-- .../trials/trials-inspection/components/push-record-list.vue | 2 +- .../trials-panel/trial-summary/download-record/index.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index f88bf85..de74a08 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -74,9 +74,9 @@ const searchDataDefault = () => { UserType: null, PageIndex: 1, PageSize: 20, - Asc: true, + Asc: false, RealName: "", - SortField: "", + SortField: "CreateTime", CreateTimeArr: [], BeginCreateTime: null, EndCreateTime: null, diff --git a/src/views/trials/trials-inspection/components/push-record-list.vue b/src/views/trials/trials-inspection/components/push-record-list.vue index 69669a2..c23f0b4 100644 --- a/src/views/trials/trials-inspection/components/push-record-list.vue +++ b/src/views/trials/trials-inspection/components/push-record-list.vue @@ -140,7 +140,7 @@ diff --git a/src/views/trials/trials-panel/trial-summary/download-record/index.vue b/src/views/trials/trials-panel/trial-summary/download-record/index.vue index b51cfd5..e33769a 100644 --- a/src/views/trials/trials-panel/trial-summary/download-record/index.vue +++ b/src/views/trials/trials-panel/trial-summary/download-record/index.vue @@ -150,7 +150,7 @@