From 99318cdf3b60be911f5c581f9593bfa39dda58bd Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Sun, 28 Apr 2024 17:08:38 +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 | 3 +- src/components/visitSelect/index.vue | 21 +++--- src/permission.js | 3 + src/views/system/hospital/index.vue | 28 ++++++-- src/views/system/user/components/UserInfo.vue | 16 +++-- src/views/system/user/list/index.vue | 12 ++-- .../components/add-trials-list.vue | 26 +++++--- .../components/confirm-visit-list.vue | 65 ++++++++++++++++--- .../components/trials-select.vue | 11 ++-- .../components/view-study-list.vue | 6 +- src/views/trials/trials-inspection/index.vue | 6 +- .../hirVisit/components/edit-study-list.vue | 6 +- .../trials/trials-panel/hirVisit/index.vue | 6 +- .../trials-panel/readManagenent/index.vue | 6 +- .../reading/audit-records/index.vue | 9 ++- .../reading/dicoms/components/ReportPage.vue | 5 +- .../trials-panel/reading/read-task/index.vue | 41 +++++++----- .../reading-task/components/TaskList.vue | 41 +++++++----- .../reading/reading-tracking/index.vue | 36 ++++++---- .../reading/reread-task/index.vue | 24 +++++-- .../components/staffExternalAdd.vue | 12 ++-- .../trials-panel/study/components/list.vue | 21 ++++-- .../study/components/not-bind-study.vue | 6 +- .../subject-list/components/SubjectsForm.vue | 9 +-- .../subject-list/components/add-subject.vue | 27 +++++--- .../components/patient-study-list.vue | 2 +- .../subject/subject-list/index.vue | 6 +- .../trial-summary/audit-record/index.vue | 11 +++- .../trial-summary/login-log/index.vue | 6 ++ .../trial-summary/trial-information/index.vue | 18 ++--- 30 files changed, 331 insertions(+), 158 deletions(-) diff --git a/src/components/BaseForm/search-form.vue b/src/components/BaseForm/search-form.vue index 7e637eb..0761f9f 100644 --- a/src/components/BaseForm/search-form.vue +++ b/src/components/BaseForm/search-form.vue @@ -124,10 +124,11 @@ diff --git a/src/components/visitSelect/index.vue b/src/components/visitSelect/index.vue index 2bf2203..49fbb9b 100644 --- a/src/components/visitSelect/index.vue +++ b/src/components/visitSelect/index.vue @@ -123,14 +123,19 @@ export default { type: "warning", showCancelButton: false, } - ).then(() => { - this.$emit("update:modelData", this.visit); - let data = { - StudyId: this.studyData.StudyId || this.studyData.SCPStudyId, - VisitId: this.visit, - }; - this.$emit("putVisit", data); - }); + ) + .then(() => { + this.$emit("update:modelData", this.visit); + let data = { + StudyId: this.studyData.StudyId || this.studyData.SCPStudyId, + VisitId: this.visit, + }; + this.$emit("putVisit", data); + }) + .catch((err) => { + this.visit = this.modelData; + }); + return false; } return true; } catch (err) { diff --git a/src/permission.js b/src/permission.js index e68f7d2..1ae0024 100644 --- a/src/permission.js +++ b/src/permission.js @@ -6,6 +6,7 @@ import 'nprogress/nprogress.css' import { getToken } from '@/utils/auth' import Vue from 'vue' import { OSSclient } from './utils/oss' +import moment from "moment"; // import getPageTitle from '@/utils/get-page-title' NProgress.configure({ showSpinner: false }) @@ -19,6 +20,8 @@ Vue.prototype.$setOpenWindow = (openWindow) => { } Vue.prototype.$openWindow = openWindow; } +// 时间格式化 +Vue.prototype.$moment = moment; router.beforeEach(async (to, from, next) => { NProgress.start() Vue.prototype.$setOpenWindow(); diff --git a/src/views/system/hospital/index.vue b/src/views/system/hospital/index.vue index 15ae884..0ed5799 100644 --- a/src/views/system/hospital/index.vue +++ b/src/views/system/hospital/index.vue @@ -10,39 +10,53 @@ > - + - + - + - + - + - + - + diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue index 544e441..dcc847b 100644 --- a/src/views/system/user/components/UserInfo.vue +++ b/src/views/system/user/components/UserInfo.vue @@ -24,20 +24,20 @@ class="my_new_pwd" prop="UserName" > - + - + - + - + - +