From 6103f3c259267e7ebef06452b1484e630a0a34af Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 8 May 2024 10:44:14 +0800
Subject: [PATCH 1/4] =?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
---
.../components/research-trials-list.vue | 38 ++++++++-----------
.../components/view-study-list.vue | 6 +--
src/views/trials/trials-inspection/index.vue | 20 +++++-----
src/views/trials/trials-notice/index.vue | 8 ++--
.../reading/pending-review/index.vue | 1 +
.../trials-panel/reading/reviewed/index.vue | 1 +
.../personnel-manage/components/staff.vue | 5 +++
7 files changed, 39 insertions(+), 40 deletions(-)
diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue
index b9c9d7e..0da4a18 100644
--- a/src/views/trials/trials-inspection/components/research-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/research-trials-list.vue
@@ -37,21 +37,21 @@
prop="ResearchProgramNo"
:label="$t('trials:trials-list:table:researchNumber')"
show-overflow-tooltip
- min-width="140"
+ min-width="120"
>
{{ $fd("sex", scope.row.Sex) }}
@@ -90,27 +90,19 @@
prop="TrialStatusStr"
:label="$t('trials:trials-list:table:status')"
show-overflow-tooltip
- min-width="140"
+ min-width="100"
>
{{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}
- {{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}
- {{ $fd("TrialStatusEnum", scope.row.TrialStatusStr) }}
- {{
- $fd("TrialStatusEnum", scope.row.TrialStatusStr)
- }}
@@ -121,7 +113,7 @@
min-width="140"
>
-
+
@@ -84,7 +84,7 @@
prop="Modalities"
:label="$t('trials:audit:table:modality')"
show-overflow-tooltip
- min-width="140"
+ min-width="120"
sortable="custom"
>
@@ -131,7 +131,7 @@
sortable="custom"
>
-
+
@@ -121,7 +121,7 @@
prop="PatientName"
:label="$t('trials:uploadDicomList:table:patientName')"
show-overflow-tooltip
- min-width="140"
+ min-width="120"
sortable="custom"
>
@@ -129,7 +129,7 @@
prop="PatientBirthDate"
:label="$t('trials:inspection:table:birthdate')"
show-overflow-tooltip
- min-width="140"
+ min-width="120"
sortable="custom"
>
@@ -137,7 +137,7 @@
prop="PatientSex"
:label="$t('trials:trials-myinfo:form:gender')"
show-overflow-tooltip
- min-width="140"
+ min-width="100"
sortable="custom"
>
@@ -149,7 +149,7 @@
prop="CalledAEList"
:label="$t('trials:inspection:table:CalledAE')"
show-overflow-tooltip
- min-width="140"
+ min-width="120"
>
@@ -227,11 +227,11 @@
prop="LatestPushTime"
:label="$t('trials:inspection:table:latestReceiveTime')"
show-overflow-tooltip
- min-width="140"
+ min-width="180"
sortable="custom"
>
-
+
-
+ /> -->
- {{ scope.row.FileName }}
-
+ -->
+
+
+
+
@@ -350,6 +354,7 @@ const getListQueryDefault = () => {
UserName: "",
UserTypeId: "",
OrganizationName: "",
+ Email: "",
IsDeleted: null,
PageIndex: 1,
PageSize: 20,
From f8fa8f470d3ca97f83fe950f9eb92d962591f2c2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 8 May 2024 11:00:35 +0800
Subject: [PATCH 2/4] =?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
---
.../trials/trials-inspection/components/confirm-visit-list.vue | 2 +-
.../trials-inspection/components/research-trials-list.vue | 2 +-
.../trials/trials-inspection/components/view-study-list.vue | 2 +-
src/views/trials/trials-inspection/index.vue | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
index 31b7d6e..ee1f7b4 100644
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
@@ -163,7 +163,7 @@
diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue
index 0da4a18..fd0d578 100644
--- a/src/views/trials/trials-inspection/components/research-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/research-trials-list.vue
@@ -113,7 +113,7 @@
min-width="140"
>
-
+
-
+
-
+
Date: Wed, 8 May 2024 11:45:19 +0800
Subject: [PATCH 3/4] =?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
---
.../components/noticeMarquee.vue | 2 +-
.../trials-list/components/TrialForm.vue | 18 +++
src/views/trials/trials-list/index.vue | 3 +-
src/views/trials/trials-notice/index.vue | 114 +++++++++---------
.../trials-panel/reading/read-task/index.vue | 51 +++++---
.../trial-summary/audit-record/index.vue | 4 +-
6 files changed, 112 insertions(+), 80 deletions(-)
diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue
index 86363d5..6ddc026 100644
--- a/src/views/trials/trials-layout/components/noticeMarquee.vue
+++ b/src/views/trials/trials-layout/components/noticeMarquee.vue
@@ -4,7 +4,7 @@
ref="mar"
hspace="0"
direction="left"
- max-width="500"
+ width="500"
@mouseout="start()"
@mouseover="stop()"
>
diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue
index e4375fc..1ed7475 100644
--- a/src/views/trials/trials-list/components/TrialForm.vue
+++ b/src/views/trials/trials-list/components/TrialForm.vue
@@ -249,6 +249,24 @@ export default {
message: this.$t("trials:trials-list:formRule:minMaxAuthorized"),
trigger: "blur",
},
+ {
+ validator: (rule, value, callback) => {
+ if (
+ value &&
+ (String(value).includes(".") ||
+ new RegExp(/\D/g).test(String(value)))
+ ) {
+ callback(
+ new Error(
+ this.$t("trials:trials-list:formRule:notDecimalsAuthorized")
+ )
+ );
+ } else {
+ callback();
+ }
+ },
+ trigger: "blur",
+ },
],
// 阅片标准
CriterionTypeList: [
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 12dcc25..d939ecf 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -160,7 +160,7 @@
prop="ExperimentName"
:label="$t('trials:trials-list:table:experimentName')"
show-overflow-tooltip
- min-width="100"
+ min-width="140"
sortable="custom"
/>
@@ -206,6 +206,7 @@
:label="$t('trials:trials-list:table:CriterionTypeList')"
show-overflow-tooltip
v-if="hasPermi(['role:pm', 'role:pi', 'role:sr'])"
+ min-width="140"
>
{{
diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue
index 0e1c9e3..bc5d9af 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -222,65 +222,65 @@ export default {
},
showDetail(row) {
var currentNoticeType = this.$fd("NoteType", row.NoticeTypeEnum);
- if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
- this.$alert(row.NoticeContent, currentNoticeType, {
- showConfirmButton: false,
- });
- } else {
- const h = this.$createElement;
- let _this = this;
- this.$msgbox({
- title: currentNoticeType,
- message: h("div", null, [
- h("span", null, row.NoticeContent),
- row.Path
- ? h(
- "div",
- {
- style: {
- marginTop: "10px",
- },
+ // if (row.IsRead || row.ActualNoticeStateEnum !== 1) {
+ // this.$alert(row.NoticeContent, currentNoticeType, {
+ // showConfirmButton: false,
+ // });
+ // } else {
+ const h = this.$createElement;
+ let _this = this;
+ this.$msgbox({
+ title: currentNoticeType,
+ message: h("div", null, [
+ h("span", null, row.NoticeContent),
+ row.Path
+ ? h(
+ "div",
+ {
+ style: {
+ marginTop: "10px",
},
- _this.$t("trials:notice:message:tipTitle")
- )
- : "",
- row.Path
- ? h(
- "a",
- {
- attrs: {
- href: _this.OSSclientConfig.basePath + row.Path,
- target: "_blank",
- },
- style: {
- color: "#428bca",
- },
+ },
+ _this.$t("trials:notice:message:tipTitle")
+ )
+ : "",
+ row.Path
+ ? h(
+ "a",
+ {
+ attrs: {
+ href: _this.OSSclientConfig.basePath + row.Path,
+ target: "_blank",
},
- row.FileName
- )
- : "",
- ]),
- beforeClose: (action, instance, done) => {
- if (action === "confirm") {
- instance.confirmButtonLoading = true;
- setSystemNoticeHaveRead(row.Id)
- .then(async (res) => {
- if (res.IsSuccess) {
- await this.$store.dispatch("global/getNoticeList");
- this.getList();
- }
- instance.confirmButtonLoading = false;
- done();
- })
- .catch(() => {
- instance.confirmButtonLoading = false;
- });
- } else {
- done();
- }
- },
- });
- }
+ style: {
+ color: "#428bca",
+ },
+ },
+ row.FileName
+ )
+ : "",
+ ]),
+ beforeClose: (action, instance, done) => {
+ if (action === "confirm") {
+ instance.confirmButtonLoading = true;
+ setSystemNoticeHaveRead(row.Id)
+ .then(async (res) => {
+ if (res.IsSuccess) {
+ await this.$store.dispatch("global/getNoticeList");
+ this.getList();
+ }
+ instance.confirmButtonLoading = false;
+ done();
+ })
+ .catch(() => {
+ instance.confirmButtonLoading = false;
+ });
+ } else {
+ done();
+ }
+ },
+ });
+ // }
},
downLoadFile(filePath) {
if (!filePath) return;
diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue
index 3eb28ae..4d86a86 100644
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@@ -274,13 +274,13 @@
@click="handleReadImage(scope.row)"
/>
-
+ />