diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index dcc847b..ddce450 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -342,7 +342,7 @@ export default {
this.user.RouteUrl = `${location.protocol}//${location.host}/email-recompose`;
if (this.user.Id) {
if (this.user.IsZhiZhun) {
- this.user.OrganizationName = THIS.hospitalName;
+ this.user.OrganizationName = this.hospitalName;
}
updateUser(this.user)
.then((res) => {
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 b9c9d7e..fd0d578 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"
>
-
+
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 8eeda8b..bc5d9af 100644
--- a/src/views/trials/trials-notice/index.vue
+++ b/src/views/trials/trials-notice/index.vue
@@ -96,13 +96,13 @@
-
+ /> -->
- {{ scope.row.FileName }}
-
+ -->
{
- 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/pending-review/index.vue b/src/views/trials/trials-panel/reading/pending-review/index.vue
index 98b5a72..3b5531f 100644
--- a/src/views/trials/trials-panel/reading/pending-review/index.vue
+++ b/src/views/trials/trials-panel/reading/pending-review/index.vue
@@ -189,6 +189,7 @@
:label="$t('trials:researchStaff:table:Name')"
show-overflow-tooltip
sortable="custom"
+ min-width="120"
/>
-
+ />
+
+
+
+
@@ -350,6 +354,7 @@ const getListQueryDefault = () => {
UserName: "",
UserTypeId: "",
OrganizationName: "",
+ Email: "",
IsDeleted: null,
PageIndex: 1,
PageSize: 20,
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 1ef1222..31f8abe 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -136,7 +136,7 @@
stripe
height="100"
:default-sort="{
- prop: 'TrialReadingCriterionName',
+ prop: 'CreateTime',
order: 'descending',
}"
>
@@ -1245,7 +1245,7 @@ export default {
data() {
const searchDataDefault = () => {
return {
- SortField: "TrialReadingCriterionName",
+ SortField: "CreateTime",
Asc: false,
PageIndex: 1,
PageSize: 20,