From a53312ed52e378f3072e38075e374bc66857529d Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 26 Apr 2024 15:12:55 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/BaseForm/search-form.vue | 7 + src/store/modules/user.js | 4 +- .../system/dicomAE/components/edit-dicom.vue | 46 ++++- src/views/system/user/components/Account.vue | 4 + src/views/system/user/components/UserInfo.vue | 3 + .../components/view-study-list.vue | 4 +- src/views/trials/trials-inspection/index.vue | 14 +- .../trials-list/components/TrialForm.vue | 6 +- src/views/trials/trials-myinfo/account.vue | 2 +- src/views/trials/trials-myinfo/index.vue | 1 + src/views/trials/trials-myinfo/mine.vue | 3 +- .../reading/dicoms/components/ReportPage.vue | 1 - .../reading/reading-tracking/index.vue | 5 +- .../subject-list/components/patient-list.vue | 4 +- .../trial-summary/trial-information/index.vue | 169 ++++++++++-------- 15 files changed, 175 insertions(+), 98 deletions(-) diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue index 43d416c..7e637eb 100644 --- a/src/components/BaseForm/search-form.vue +++ b/src/components/BaseForm/search-form.vue @@ -15,6 +15,7 @@ size="mini" :style="{ width: item.width }" :readonly="item.readonly" + clearable /> @@ -37,6 +39,7 @@ v-model="searchData[item.prop]" :placeholder="item.placeholder" size="mini" + clearable :style="{ width: item.width }" @change="item.change && item.change(that, searchData[item.prop])" > @@ -96,6 +99,7 @@ value-format="yyyy-MM-dd" format="yyyy-MM-dd" :picker-options="item.pickerOption" + clearable /> diff --git a/src/store/modules/user.js b/src/store/modules/user.js index 6f3d378..1b228ad 100644 --- a/src/store/modules/user.js +++ b/src/store/modules/user.js @@ -163,8 +163,8 @@ const actions = { commit('SET_USERNAME', zzSessionStorage.getItem('userName')) commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount'))) commit('SET_NEED_SIGN_TRIALS_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignTrialDocCount'))) - console.log( zzSessionStorage.getItem('TotalNeedSignSystemDocCount')) - console.log( zzSessionStorage.getItem('TotalNeedSignTrialDocCount')) + console.log(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')) + console.log(zzSessionStorage.getItem('TotalNeedSignTrialDocCount')) zzSessionStorage.setItem('userName', user.name) zzSessionStorage.setItem('userId', user.id) zzSessionStorage.setItem('userTypeShortName', user.userTypeShortName) diff --git a/src/views/system/dicomAE/components/edit-dicom.vue b/src/views/system/dicomAE/components/edit-dicom.vue index 0e02ab1..6574df6 100644 --- a/src/views/system/dicomAE/components/edit-dicom.vue +++ b/src/views/system/dicomAE/components/edit-dicom.vue @@ -7,6 +7,7 @@ custom-class="base-dialog-wrapper" append-to-body :before-close="handleCancel" + v-dialogDrag > - + - + - + @@ -103,6 +104,17 @@ export default { message: this.$t("common:ruleMessage:specify"), trigger: "blur", }, + { + pattern: /[a-zA-Z]/, + message: this.$t("common:ruleMessage:CalledAEPattern"), + trigger: "blur", + }, + { + min: 1, + max: 16, + message: this.$t("common:ruleMessage:CalledAEPattern"), + trigger: "blur", + }, ], IP: [ { @@ -110,6 +122,27 @@ export default { message: this.$t("common:ruleMessage:specify"), trigger: "blur", }, + { + validator: (rule, value, callback) => { + if ( + value === "" || + typeof value === "undefined" || + value == null + ) { + callback(new Error(this.$t("common:ruleMessage:ipPattern"))); + } else { + const reg = + /^(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])\.(\d{1,2}|1\d\d|2[0-4]\d|25[0-5])$/; + if (!reg.test(value) && value !== "") { + callback(new Error(this.$t("common:ruleMessage:ipPattern"))); + } else { + callback(); + } + } + }, + message: this.$t("common:ruleMessage:ipPattern"), + trigger: "blur", + }, ], Port: [ { @@ -117,6 +150,13 @@ export default { message: this.$t("common:ruleMessage:specify"), trigger: "blur", }, + { + type: "number", + min: 0, + max: 65535, + message: this.$t("common:ruleMessage:portPattern"), + trigger: "blur", + }, ], }, btnLoading: false, diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue index 0b124b3..53c8e65 100644 --- a/src/views/system/user/components/Account.vue +++ b/src/views/system/user/components/Account.vue @@ -36,6 +36,10 @@ export default { message: this.$t("trials:adRules:message:msg7"), type: "success", }); + let msg = this.$t("system:userlist:message:ResetPassword2"); + msg = msg.replace("xxx", params("userName")); + msg = msg.replace("yyy", params("email")); + this.$alert(decodeURIComponent(msg)); } }); }); diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue index 5f97c75..544e441 100644 --- a/src/views/system/user/components/UserInfo.vue +++ b/src/views/system/user/components/UserInfo.vue @@ -339,6 +339,9 @@ export default { this.user.BaseUrl = `${location.protocol}//${location.host}/login`; this.user.RouteUrl = `${location.protocol}//${location.host}/email-recompose`; if (this.user.Id) { + if (this.user.IsZhiZhun) { + this.user.OrganizationName = THIS.hospitalName; + } updateUser(this.user) .then((res) => { this.isDisabled = false; 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 0e68253..738a405 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -89,7 +89,7 @@ @@ -97,7 +97,7 @@ diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue index fe03258..f40e8cc 100644 --- a/src/views/trials/trials-inspection/index.vue +++ b/src/views/trials/trials-inspection/index.vue @@ -19,7 +19,10 @@ /> - + - + @@ -157,7 +163,7 @@ diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index e0cb1ca..9ee69dc 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -44,7 +44,11 @@ :label="$t('trials:trials-list:form:researchNumber')" prop="ResearchProgramNo" > - + - + {{ user.CheckCode }} @@ -184,7 +185,7 @@ export default { this.$message.success( this.$t("trials:trials-myinfo:message:updateSuccessfully") ); - this.getUserInfo(); + this.$emit("getUserInfo"); }) .catch(() => { this.isDisabled = false; diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue index 1ec9652..c89e1de 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -378,7 +378,6 @@ export default { let href = this.OSSclientConfig.basePath + res.Result; let fileName = res.Result.split("/")[res.Result.split("/").length - 1]; - a.download = fileName; this.fileData = { path:href, name:fileName diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index 0c8534b..0cdd2d8 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -29,7 +29,7 @@ - + @@ -143,7 +143,7 @@ > { PatientSex: null, BeginTaskCreateTime: null, EndTaskCreateTime: null, + SubjectName: null, }; }; export default { diff --git a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue index 7c05f7c..f801e92 100644 --- a/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue +++ b/src/views/trials/trials-panel/subject/subject-list/components/patient-list.vue @@ -18,7 +18,7 @@ clearable /> - Called AE: + {{ $t("trials:subject:table:CalledAE") }} - Calling AE: + {{ $t("trials:subject:table:CallingAE") }}
- - - - {{ $fd("TrialType", trialInfo.TrialType) }} - - - - {{ trialInfo.ResearchProgramNo }} - - - - {{ trialInfo.ExperimentName }} - - - - {{ trialInfo.MedicineName }} - - - - {{ trialInfo.Sponsor }} - - - - {{ trialInfo.HeadPI }} - - - - {{ $fd("Trial_Phase", trialInfo.PhaseId, "id") }} - - - - {{ trialInfo.Indication }} - - - - {{ - trialInfo.CriterionTypeList - ? trialInfo.CriterionTypeList.map((item) => - $fd("CriterionType", item) - ).join(", ") - : "" - }} - - - - {{ trialInfo.CRO }} - - - + + {{ $fd("TrialType", trialInfo.TrialType) }} + + + + {{ trialInfo.ResearchProgramNo }} + + + + {{ trialInfo.ExperimentName }} + + + + {{ trialInfo.MedicineName }} + + + + {{ trialInfo.Sponsor }} + + + + {{ trialInfo.HeadPI }} + + + + {{ $fd("Trial_Phase", trialInfo.PhaseId, "id") }} + + + + {{ trialInfo.Indication }} + + + + {{ + trialInfo.CriterionTypeList + ? trialInfo.CriterionTypeList.map((item) => + $fd("CriterionType", item) + ).join(", ") + : "" + }} + + + + {{ trialInfo.CRO }} + + + - - - {{ trialInfo.ContactUser }} - - - - {{ trialInfo.ContactPhone }} - - - - {{ trialInfo.AuthorizationDuration }} - - + + + {{ trialInfo.ContactUser }} + + + + {{ trialInfo.ContactPhone }} + + + + {{ trialInfo.AuthorizationDuration }} + + +
-

项目授权信息

+

项目授权信息

{{ otherInfo.AuthorizationDeadLineDate }} +
+ {{ $t("trials:activate:renewalAuthorization") }} +
- {{ $t("trials:activate:renewalAuthorization") }}
+