diff --git a/package.json b/package.json index 7d59d22..9494fd4 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,5 @@ { - "name": "EICS", + "name": "HICS", "version": "1.0.0", "scripts": { "dev": "vue-cli-service serve --open", diff --git a/src/views/system/dicomAE/index.vue b/src/views/system/dicomAE/index.vue index 9949068..5261bb3 100644 --- a/src/views/system/dicomAE/index.vue +++ b/src/views/system/dicomAE/index.vue @@ -236,15 +236,20 @@ export default { }, // 测试连通性 async test(item) { - this.loading = true; - let res = await testConnect(item.Id); - this.loading = false; - if (res.IsSuccess && res.Result) { - this.$message.success(this.$t("system:dicomAE:connect:success")); - } else { - this.$message.error(this.$t("system:dicomAE:connect:error")); + try { + this.loading = true; + let res = await testConnect(item.Id); + this.loading = false; + if (res.IsSuccess && res.Result) { + this.$message.success(this.$t("system:dicomAE:connect:success")); + } else { + this.$message.error(this.$t("system:dicomAE:connect:error")); + } + this.getList(); + } catch (err) { + console.log(err); + this.loading = false; } - this.getList(); }, }, }; diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 0ed5799..95ae5d4 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -120,9 +120,9 @@ export default { HospitalCode: [ { required: true, message: "请输入医院编码", trigger: "blur" }, ], - HospitalLogoPath: [ - { required: true, message: "请上传医院logo", trigger: "blur" }, - ], + // HospitalLogoPath: [ + // { required: true, message: "请上传医院logo", trigger: "blur" }, + // ], TrialKeepCount: [ { required: true, message: "请输入未激活项目数", trigger: "blur" }, ], diff --git a/src/views/system/hospital/uploadLogo.vue b/src/views/system/hospital/uploadLogo.vue index 482bdeb..99e9c89 100644 --- a/src/views/system/hospital/uploadLogo.vue +++ b/src/views/system/hospital/uploadLogo.vue @@ -2,7 +2,7 @@
(只能上传png/jpg/jpeg文件) --> -
+
+ /> - + @@ -53,7 +50,12 @@ {{ fileList.length > 0 ? fileList[0].name : "" }}

--> - +
@@ -76,7 +78,7 @@ export default { fileList: [], btnDisabled: false, dialogVisible: false, - dialogImageUrl: '' + dialogImageUrl: "", }; }, watch: { @@ -184,8 +186,10 @@ export default { this.dialogVisible = true; }, handleRemove(file) { + console.log(1111111111); this.fileList = []; - } + this.$emit("update:path", null); + }, }, }; diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue index f9a328a..ed040d6 100644 --- a/src/views/system/notice/components/from.vue +++ b/src/views/system/notice/components/from.vue @@ -86,10 +86,22 @@ :label="$t('system:notice:label:StartDate')" prop="StartDate" > - + - + @@ -388,7 +389,7 @@ export default { data.patientIdList = [this.Patient.PatientId]; } - if (this.dateValue[0] && this.dateValue[1]) { + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { data.earliestStudyTime = this.$moment(this.dateValue[0]).format( "YYYY-MM-DD HH:mm:ss" ); @@ -404,7 +405,6 @@ export default { this.loading = true; let res = await getVisitPatientStudyList(data); this.loading = false; - console.log(res); if (res.IsSuccess) { this.list = res.Result; // this.total = res.Result.TotalCount; @@ -426,7 +426,7 @@ export default { }, // 查询 handleSearch() { - this.searchData.PageIndex = 1; + // this.searchData.PageIndex = 1; this.getList(); }, // 重置 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 7f9ccb9..27bd217 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -37,6 +37,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -251,9 +252,13 @@ export default { data[key] = this.searchData[key]; }); data.PatientId = this.Patient.PatientId; - if (this.dateValue[0] && this.dateValue[1]) { - data.EarliestStudyTime = this.dateValue[0]; - data.LatestStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.EarliestStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.LatestStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.EarliestStudyTime = null; data.LatestStudyTime = null; diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue index b341ed7..8bc9600 100644 --- a/src/views/trials/trials-inspection/index.vue +++ b/src/views/trials/trials-inspection/index.vue @@ -73,6 +73,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" clearable > @@ -396,9 +397,13 @@ export default { Object.keys(this.searchData).forEach((key) => { data[key] = this.searchData[key]; }); - if (this.dateValue[0] && this.dateValue[1]) { - data.BeginPushTime = this.dateValue[0]; - data.EndPushTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.BeginPushTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.EndPushTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.BeginPushTime = null; data.EndPushTime = null; diff --git a/src/views/trials/trials-list/components/activate-page.vue b/src/views/trials/trials-list/components/activate-page.vue index 969d68c..4e4d950 100644 --- a/src/views/trials/trials-list/components/activate-page.vue +++ b/src/views/trials/trials-list/components/activate-page.vue @@ -7,7 +7,7 @@ style="width: 500px; padding: 30px 0 0 30px" >
-

授权申请信息

+

{{ $t("trials:trials-list:activate:message:authorizationMsg") }}

@@ -44,7 +44,7 @@ {{ data.PurchaseDuration }} -

生成激活码信息

+

{{ $t("trials:trials-list:activate:message:activateMsg") }}

{{ data.HospitalName }} @@ -66,7 +66,10 @@ - + - +
@@ -86,14 +89,14 @@ type="primary" @click.stop="getTrialActivationCode" > - 生成 + {{ $t("trials:trials-list:activate:button:create") }} - 复制 + {{ $t("trials:trials-list:activate:button:copy") }} - 下载 + {{ $t("trials:trials-list:activate:button:downLoad") }}
diff --git a/src/views/trials/trials-myinfo/account.vue b/src/views/trials/trials-myinfo/account.vue index 1fd6abe..d395083 100644 --- a/src/views/trials/trials-myinfo/account.vue +++ b/src/views/trials/trials-myinfo/account.vue @@ -144,6 +144,7 @@ import { setNewUserName, SetNewCheckCode, } from "@/api/system/user.js"; +import { removeToken } from "@/utils/auth"; import password from "./password.vue"; var timer = ""; var countdown = 60; @@ -197,15 +198,33 @@ export default { } ); }, - setNewUserName() { - setNewUserName(this.userForm.UserName).then(() => { - this.userForm.UserName = ""; - this.$message.success( - this.$t("trials:trials-myinfo:message:updateSuccessfully") - ); - this.$emit("getUserInfo"); - this.logout(); - }); + async setNewUserName() { + try { + let res = await setNewUserName(this.userForm.UserName); + if (res.IsSuccess) { + this.userForm.UserName = ""; + this.$message.success( + this.$t("trials:trials-myinfo:message:updateSuccessfully") + ); + this.$emit("getUserInfo"); + removeToken(); + let confirm = await this.$confirm( + this.$t("trials:trials-myInfo:confirmMessage:updateUserName"), + { + type: "warning", + showClose: false, + showCancelButton: false, + distinguishCancelAndClose: true, + confirmButtonText: this.$t("common:button:confirm"), + cancelButtonText: this.$t("common:button:cancel"), + } + ); + if (confirm !== "confirm") return; + this.logout(); + } + } catch (err) { + console.log(err); + } }, setNewPhone() { setNewPhone(this.userForm.Phone).then(() => { diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue index bb5acfb..a840d0b 100644 --- a/src/views/trials/trials-myinfo/password.vue +++ b/src/views/trials/trials-myinfo/password.vue @@ -60,6 +60,7 @@ import md5 from "js-md5"; import { mapGetters, mapMutations } from "vuex"; import { modifyPassword } from "@/api/admin.js"; +import { removeToken } from "@/utils/auth"; export default { name: "password", data() { @@ -105,31 +106,43 @@ export default { }, methods: { ...mapMutations({ setLanguage: "lang/setLanguage" }), - save() { - this.$refs.passwordForm.validate((valid) => { - if (valid) { - if (this.password.NewPassWord !== this.password.ConfirmPassWord) { - this.$alert(this.$t("passwordReset:formRule:passwordsDiffer")); - return; - } - const param = { - UserId: this.userId, - NewPassWord: md5(this.password.NewPassWord), - OldPassWord: md5(this.password.OldPassWord), - }; - modifyPassword(param).then((res) => { - if (res.IsSuccess) { - // 修改成功,请重新登录账号 - this.$message.success( - this.$t("trials:trials-myinfo:message:modifyPWSuccessfully") - ); - setTimeout(() => { - this.logout(); - }, 1000); - } - }); + async save() { + try { + let validate = await this.$refs.passwordForm.validate(); + if (!validate) return; + if (this.password.NewPassWord !== this.password.ConfirmPassWord) { + this.$alert(this.$t("passwordReset:formRule:passwordsDiffer")); + return; } - }); + const param = { + UserId: this.userId, + NewPassWord: md5(this.password.NewPassWord), + OldPassWord: md5(this.password.OldPassWord), + }; + let res = await modifyPassword(param); + if (res.IsSuccess) { + // 修改成功,请重新登录账号 + this.$message.success( + this.$t("trials:trials-myinfo:message:modifyPWSuccessfully") + ); + removeToken(); + let confirm = await this.$confirm( + this.$t("trials:trials-myInfo:confirmMessage:updatePassWord"), + { + type: "warning", + showClose: false, + showCancelButton: false, + distinguishCancelAndClose: true, + confirmButtonText: this.$t("common:button:confirm"), + cancelButtonText: this.$t("common:button:cancel"), + } + ); + if (confirm !== "confirm") return; + this.logout(); + } + } catch (err) { + console.log(err); + } }, async logout() { /* eslint-disable */ diff --git a/src/views/trials/trials-notice/index.vue b/src/views/trials/trials-notice/index.vue index b71a197..bdbb54b 100644 --- a/src/views/trials/trials-notice/index.vue +++ b/src/views/trials/trials-notice/index.vue @@ -6,10 +6,10 @@ @@ -17,7 +17,7 @@ @@ -34,17 +34,21 @@ --> - {{ $t('common:button:search') }} + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }} diff --git a/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue b/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue index 5d8af6e..af45682 100644 --- a/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue +++ b/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue @@ -127,6 +127,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -314,9 +315,13 @@ export default { data.PatientIdList = this.data.PatientList.map((item) => item.PatientId); data.SujectVisitId = this.data.SubjectVisitId; data.TrialId = this.$route.query.trialId; - if (this.dateValue[0] && this.dateValue[1]) { - data.EarliestStudyTime = this.dateValue[0]; - data.LatestStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.EarliestStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.LatestStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } try { this.bottomLoading = true; diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue index a60aad8..abedd10 100644 --- a/src/views/trials/trials-panel/hirVisit/index.vue +++ b/src/views/trials/trials-panel/hirVisit/index.vue @@ -43,6 +43,14 @@ /> + + + + @@ -316,6 +325,7 @@ const defaultSearchData = () => { PatientSex: null, BeginStudyTime: null, EndStudyTime: null, + VisitName: null, }; }; export default { @@ -378,9 +388,13 @@ export default { data[key] = this.searchData[key]; }); data.TrialId = this.$route.query.trialId; - if (this.dateValue[0] && this.dateValue[1]) { - data.BeginStudyTime = this.dateValue[0]; - data.EndStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.BeginStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.EndStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.BeginStudyTime = null; data.EndStudyTime = null; diff --git a/src/views/trials/trials-panel/readManagenent/index.vue b/src/views/trials/trials-panel/readManagenent/index.vue index 0e724cd..73828f9 100644 --- a/src/views/trials/trials-panel/readManagenent/index.vue +++ b/src/views/trials/trials-panel/readManagenent/index.vue @@ -71,6 +71,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -277,9 +278,13 @@ export default { data[key] = this.searchData[key]; }); data.TrialId = this.$route.query.trialId; - if (this.dateValue[0] && this.dateValue[1]) { - data.earliestStudyTime = this.dateValue[0]; - data.latestStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.earliestStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.latestStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.EarliestStudyTime = null; data.LatestStudyTime = null; 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 f4b0e7d..8041d53 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -85,6 +85,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" clearable + :default-time="['00:00:00', '23:59:59']" > @@ -606,6 +607,8 @@ const searchDataDefault = () => { ReadingCategory: null, PIAuditState: null, TaskName: null, + BeginSignDate: null, + EndSignDate: null, }; }; export default { @@ -693,6 +696,17 @@ export default { this.loading = true; this.searchData.TrialId = this.trialId; this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + this.searchData.BeginSignDate = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + this.searchData.EndSignDate = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); + } else { + this.searchData.BeginSignDate = null; + this.searchData.EndSignDate = null; + } getIRHaveReadTaskList(this.searchData) .then((res) => { this.list = res.Result.CurrentPageData; 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 9c7975c..d0c3561 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -52,6 +52,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -96,6 +97,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -422,16 +424,24 @@ export default { data[key] = this.searchData[key]; }); data.TrialId = this.$route.query.trialId; - if (this.dateValue[0] && this.dateValue[1]) { - data.earliestStudyTime = this.dateValue[0]; - data.latestStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.earliestStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.latestStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.EarliestStudyTime = null; data.LatestStudyTime = null; } - if (this.dateValue2[0] && this.dateValue2[1]) { - data.BeginTaskCreateTime = this.dateValue2[0]; - data.EndTaskCreateTime = this.dateValue2[1]; + if (this.dateValue2 && this.dateValue2[0] && this.dateValue2[1]) { + data.BeginTaskCreateTime = this.$moment(this.dateValue2[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.EndTaskCreateTime = this.$moment(this.dateValue2[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.BeginTaskCreateTime = null; data.EndTaskCreateTime = null; diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue index b79031b..49d389d 100644 --- a/src/views/trials/trials-panel/study/components/list.vue +++ b/src/views/trials/trials-panel/study/components/list.vue @@ -54,6 +54,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -392,9 +393,13 @@ export default { data[key] = this.searchData[key]; }); data.TrialId = this.$route.query.trialId; - if (this.dateValue[0] && this.dateValue[1]) { - data.BeginStudyTime = this.dateValue[0]; - data.EndStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.BeginStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.EndStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.BeginStudyTime = null; data.EndStudyTime = null; diff --git a/src/views/trials/trials-panel/study/components/not-bind-study.vue b/src/views/trials/trials-panel/study/components/not-bind-study.vue index 402b950..229de91 100644 --- a/src/views/trials/trials-panel/study/components/not-bind-study.vue +++ b/src/views/trials/trials-panel/study/components/not-bind-study.vue @@ -59,6 +59,7 @@ range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期" + :default-time="['00:00:00', '23:59:59']" > @@ -302,9 +303,13 @@ export default { data[key] = this.searchData[key]; }); data.TrialId = this.$route.query.trialId; - if (this.dateValue[0] && this.dateValue[1]) { - data.BeginStudyTime = this.dateValue[0]; - data.EndStudyTime = this.dateValue[1]; + if (this.dateValue && this.dateValue[0] && this.dateValue[1]) { + data.BeginStudyTime = this.$moment(this.dateValue[0]).format( + "YYYY-MM-DD HH:mm:ss" + ); + data.EndStudyTime = this.$moment(this.dateValue[1]).format( + "YYYY-MM-DD HH:mm:ss" + ); } else { data.BeginStudyTime = null; data.EndStudyTime = null; 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 6a04112..1ef1222 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 @@ -9,19 +9,11 @@ --> - + - - - - + @@ -1276,6 +1268,8 @@ export default { BatchId: null, TrialReadingCriterionId: null, UserTypeId: null, + VisitName: null, + SubjectCode: null, }; }; return { @@ -1346,8 +1340,6 @@ export default { }, mounted() { this.ResearchProgramNo = this.$route.query.researchProgramNo; - this.getSite(); - this.getVisitPlanOptions(); this.getTrialCriterionList(); this.getList(); this.getUserType();