From 4c4e0be8d986924e0af033fbf6caad489717834b Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 9 Apr 2024 17:28:08 +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/api/dicomAE.js | 9 +- src/components/TrialsTab/index.vue | 2 +- src/components/visitSelect/index.vue | 5 +- .../components/confirm-visit-list.vue | 17 +- src/views/trials/trials-inspection/index.vue | 47 +- .../trials-list/components/TrialForm.vue | 2 +- .../hirVisit/components/studyInfo.vue | 205 ++ .../hirVisit/components/visit-info.vue | 79 + .../trials/trials-panel/hirVisit/index.vue | 27 +- .../subject-list/components/add-subject.vue | 20 +- .../subject-list/components/patient-list.vue | 43 +- .../trial-summary/audit-record/index.vue | 1699 +++++++++++------ .../trial-summary/trial-information/index.vue | 196 +- 13 files changed, 1645 insertions(+), 706 deletions(-) create mode 100644 src/views/trials/trials-panel/hirVisit/components/studyInfo.vue create mode 100644 src/views/trials/trials-panel/hirVisit/components/visit-info.vue diff --git a/src/api/dicomAE.js b/src/api/dicomAE.js index 859250b..5eb2f78 100644 --- a/src/api/dicomAE.js +++ b/src/api/dicomAE.js @@ -34,10 +34,17 @@ export function testConnect(id) { }) } -// 获取DicomAE下拉框数据 +// 获取calledAE下拉框数据 export function getDicomCalledAEList() { return request({ url: `/Patient/getDicomCalledAEList`, method: 'get' }) +} +// 获取callingAE下拉框数据 +export function getDicomCallingAEList() { + return request({ + url: `/Patient/getDicomCallingAEList`, + method: 'get' + }) } \ No newline at end of file diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue index 41ef34c..cf19262 100644 --- a/src/components/TrialsTab/index.vue +++ b/src/components/TrialsTab/index.vue @@ -213,7 +213,7 @@ export default { if (trialsPanelList.find(c => { return c.path === v.name }) && trialsPanelList.find(c => { return c.path === v.name }).tabHiddn) { return } - isHasChild = isHasChild.filter(i => this.isShow(i.path)) + isHasChild =isHasChild ? isHasChild.filter(i => this.isShow(i.path)) : [] if (isHasChild && isHasChild.length > 0) { this.trialsTabChild = isHasChild[0].path this.$router.push({ path: `${this.trialsTabChild}${query ? '?' : ''}${query}` }) diff --git a/src/components/visitSelect/index.vue b/src/components/visitSelect/index.vue index 91540f5..cf99ee2 100644 --- a/src/components/visitSelect/index.vue +++ b/src/components/visitSelect/index.vue @@ -51,11 +51,10 @@ export default { add() { this.$emit("add"); }, - selectChange() { - this.$emit("selectChange"); + selectChange(flag) { + this.$emit("selectChange", flag); }, handleChange() { - console.log(this.visit); this.$emit("update:modelData", this.visit); }, }, 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 9588d3c..79b3dee 100644 --- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue +++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue @@ -65,6 +65,7 @@ :data="list" stripe height="100" + highlight-current-row @selection-change="handleSelectChange" @sort-change="handleSortByColumn" :default-sort="{ prop: 'StudyTime', order: 'descending' }" @@ -344,6 +345,10 @@ export default { this.$refs.confirmVisitList.clearSort(); if (flag) this.list = []; }, + // 表格高亮 + setCurrent(val) { + this.$refs.confirmVisitList.setCurrentRow(val); + }, // 表格选择 handleSelectChange(selection) { // console.log(selection); @@ -405,10 +410,10 @@ export default { if (!fd) return; let data = { TrialId: this.submitMessage.TrialId, - SubjectVisitId: [], + SubjectVisitList: [], }; this.tableSelectData.forEach((item) => { - data.SubjectVisitId.push(item.SubjectVisitId); + data.SubjectVisitList.push(item.SubjectVisitId); }); try { this.btnLoading2 = true; @@ -446,6 +451,14 @@ export default { return true; }, }, + // 校验表格选择访视是否符合要求 + // verifyData() { + // let arr = [...this.tableSelectData]; + // arr.sort((a, b) => { + // new Date(a.StudyTime).getTime() - new Date(b.StudyTime).getTime(); + // }); + + // }, }; diff --git a/src/views/trials/trials-panel/hirVisit/components/visit-info.vue b/src/views/trials/trials-panel/hirVisit/components/visit-info.vue new file mode 100644 index 0000000..774f2a7 --- /dev/null +++ b/src/views/trials/trials-panel/hirVisit/components/visit-info.vue @@ -0,0 +1,79 @@ + + \ No newline at end of file diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue index 7dc23f2..4b061f9 100644 --- a/src/views/trials/trials-panel/hirVisit/index.vue +++ b/src/views/trials/trials-panel/hirVisit/index.vue @@ -151,7 +151,13 @@ prop="VisitName" :label="$t('trials:uploadMonitor:table:visitName')" show-overflow-tooltip - /> + > + + + diff --git a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue index 007d6ec..1fb2a54 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue @@ -1,136 +1,154 @@