diff --git a/src/api/inspection.js b/src/api/inspection.js
index 02005d6..7ce9ce6 100644
--- a/src/api/inspection.js
+++ b/src/api/inspection.js
@@ -19,6 +19,15 @@ export function getPatientJoinTrialInitList(data) {
})
}
+// 检查->患者可加入项目列表(下拉选框)
+export function getPatientJoinTrialInitSelectList(data) {
+ return request({
+ url: '/Patient/getPatientJoinTrialInitSelectList',
+ method: 'post',
+ data
+ })
+}
+
// 检查->患者已加入项目列表
export function getPatientJoinedTrialList(data) {
return request({
@@ -62,4 +71,49 @@ export function getPatientStudyList(data) {
method: 'post',
data
})
+}
+
+// 绑定访视->获取患者检查列表
+export function getVisitPatientStudyList(data) {
+ return request({
+ url: '/Patient/getVisitPatientStudyList',
+ method: 'post',
+ data
+ })
+}
+
+// 绑定访视->获取已存在的访视
+export function getSubjectVisitSelectList(data) {
+ return request({
+ url: '/Patient/getSubjectVisitSelectList',
+ method: 'post',
+ data
+ })
+}
+
+// 绑定访视->添加或更新访视
+export function addOrUpdateSubjectVisit(data) {
+ return request({
+ url: '/Patient/addOrUpdateSubjectVisit',
+ method: 'post',
+ data
+ })
+}
+
+// 绑定访视->确认患者与访视关系
+export function addSubjectPatientStudyBinding(data) {
+ return request({
+ url: '/Patient/addSubjectPatientStudyBinding',
+ method: 'post',
+ data
+ })
+}
+
+// 绑定访视->提交患者与访视关系
+export function submitVisitStudyBinding(data) {
+ return request({
+ url: '/Patient/submitVisitStudyBinding',
+ method: 'post',
+ data
+ })
}
\ No newline at end of file
diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue
index 7839191..6458076 100644
--- a/src/views/trials/trials-inspection/components/add-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/add-trials-list.vue
@@ -12,79 +12,88 @@
}}:{{ Patient.PatientIdStr }},{{ Patient.PatientName }})
+
{{ $t("trials:inspection:message:checkAddTrials") }}
-
-
-
-
-
-
-
-
-
-
-
{{ $t("trials:inspection:message:checkAddTrials") }}
-
+
+
{{ $t("trials:inspection:message:confirmVisit") }}
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{
- item.label
- }}
+
+
+
+
+
+
+
+
+
+ {{ $t("trials:trials-list:action:panel") }}
-
-
-
-
-
-
-
-
-
-
@@ -202,14 +230,21 @@
@@ -382,24 +615,12 @@ export default {
display: flex;
align-items: center;
justify-content: space-between;
+ flex-wrap: wrap;
}
.search {
display: flex;
align-items: center;
flex-wrap: wrap;
- p {
- width: 100%;
- display: flex;
- align-items: center;
- justify-content: space-between;
- &::after {
- display: block;
- content: "";
- flex: 1;
- height: 1px;
- border-top: 1px solid #ddd;
- }
- }
.form {
width: 100%;
display: flex;
@@ -407,11 +628,35 @@ export default {
justify-content: space-between;
}
}
-::v-deep .has-gutter {
- .el-table-column--selection {
- .el-checkbox {
- display: none;
- }
+.line {
+ width: 100%;
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ &::after {
+ display: block;
+ content: "";
+ flex: 1;
+ height: 1px;
+ border-top: 1px solid #ddd;
}
}
+.selectAndBtn {
+ width: 100%;
+ display: flex;
+ align-items: flex-start;
+ justify-content: space-between;
+}
+.demo-form-inline {
+ width: 100%;
+}
+.detail {
+ margin-left: 10px;
+}
+.addVisit {
+ margin: 0;
+ line-height: 34px;
+ text-align: center;
+ cursor: pointer;
+}
\ No newline at end of file
diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
deleted file mode 100644
index d7da029..0000000
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ /dev/null
@@ -1,216 +0,0 @@
-
-
- {{ $t("trials:inspection:message:confirmVisit") }}({{
- $t("trials:trials-list:table:researchNumber")
- }}:T0001132,ZhangSan)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- {{ $t("common:button:search") }}
-
-
-
- {{ $t("common:button:reset") }}
-
-
-
-
-
-
- {{ $t("trials:seletctedReviews:timeline:confirmation") }}
-
-
-
- {{ $t("trials:inspection:button:confirmAndSubmit") }}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
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 68ee530..d115230 100644
--- a/src/views/trials/trials-inspection/components/research-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/research-trials-list.vue
@@ -18,9 +18,9 @@
}}({{ total }})
-
+
-
-
+
+
+
+
+
+
+
+
+
+ {{ $t("trials:trials-list:table:researchNumber") }}
+
+
+ {{ $t("trials:trials-list:table:experimentName") }}
+
+
+ {{ $t("trials:trials-list:table:sponsor") }}
+
+
+
+
+
+ {{ $t("trials:trials-list:table:researchNumber") }}:
+ {{ item.ResearchProgramNo }}
+
+ {{ $t("trials:trials-list:table:experimentName") }}:
+ {{ item.ExperimentName }}
+
+ {{ $t("trials:trials-list:table:sponsor") }}:
+ {{ item.SponsorName }}
+
+
+
+ {{ item.ResearchProgramNo }}
+
+
+ {{ item.ExperimentName }}
+
+
+ {{ item.SponsorName }}
+
+
+
+
+
+
+
+ {{ $t("trials:trials-list:table:researchNumber") }}:
+ {{ data.ResearchProgramNo }}
+
+ {{ $t("trials:trials-list:table:experimentName") }}:
+ {{ data.ExperimentName }}
+
+ {{ $t("trials:trials-list:table:sponsor") }}:
+ {{ data.SponsorName }}
+
+ {{ data.ResearchProgramNo }}
+
+
+
+
+
+
+
+
+
+
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 03fb049..637ea0f 100644
--- a/src/views/trials/trials-inspection/components/view-study-list.vue
+++ b/src/views/trials/trials-inspection/components/view-study-list.vue
@@ -64,7 +64,10 @@
:data="list"
stripe
height="100"
+ @sort-change="handleSortByColumn"
+ :default-sort="{ prop: 'StudyTime', order: 'descending' }"
>
+
@@ -149,8 +153,8 @@ export default {
EarliestStudyTime: null,
LatestStudyTime: null,
PatientId: null,
- Asc: true,
- SortField: null,
+ Asc: false,
+ SortField: "StudyTime",
},
dateValue: [],
// 可加入项目列表
@@ -158,12 +162,8 @@ export default {
list: [],
};
},
- watch: {
- visible() {
- if (this.visible) {
- this.getList();
- }
- },
+ created() {
+ this.getList();
},
methods: {
// 关闭弹框
@@ -202,12 +202,17 @@ export default {
},
// 重置
handleReset() {
+ this.reset();
+ this.getList();
+ },
+ // 初始化
+ reset() {
Object.keys(this.searchData).forEach((key) => {
this.searchData[key] = null;
});
- this.searchData.Asc = true;
+ this.searchData.Asc = false;
+ this.SortField.Asc = "StudyTime";
this.dateValue = [];
- this.getList();
},
// 查看影像
image(item) {
@@ -219,6 +224,14 @@ export default {
},
// 查看报告
report() {},
+ // 表格排序
+ handleSortByColumn(sort) {
+ this.searchData.SortField = sort.prop;
+ if (sort.order === "ascending") this.searchData.Asc = true;
+ if (sort.order === "descending") this.searchData.Asc = false;
+ if (!sort.order) this.searchData.SortField = null;
+ this.getList();
+ },
},
};
diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue
index 297e48b..8168016 100644
--- a/src/views/trials/trials-inspection/index.vue
+++ b/src/views/trials/trials-inspection/index.vue
@@ -73,7 +73,9 @@
stripe
height="100"
@sort-change="handleSortByColumn"
+ :default-sort="{ prop: 'LatestPushTime', order: 'descending' }"
>
+
@@ -192,20 +195,23 @@
-
-
@@ -216,7 +222,6 @@ import BaseContainer from "@/components/BaseContainer";
import Pagination from "@/components/Pagination";
import researchTrialsList from "./components/research-trials-list";
import addTrialsList from "./components/add-trials-list";
-import confirmVisitList from "./components/confirm-visit-list";
import viewStudyList from "./components/view-study-list";
import { getPatientList } from "@/api/inspection.js";
import { getDicomCalledAEList } from "@/api/dicomAE.js";
@@ -227,7 +232,6 @@ export default {
Pagination,
researchTrialsList,
addTrialsList,
- confirmVisitList,
viewStudyList,
},
data() {
@@ -238,8 +242,8 @@ export default {
PatientName: null,
CalledAEList: [],
ExperimentName: null,
- Asc: true,
- SortField: null,
+ Asc: false,
+ SortField: "LatestPushTime",
PageIndex: 1,
PageSize: 10,
},
@@ -254,8 +258,6 @@ export default {
researchTrialsVisible: false,
// 可加入项目列表
addTrialsVisible: false,
- // 确认访视列表
- confirmTrialsVisible: false,
// 查看检查列表
studyTrialsVisible: false,
};
@@ -306,7 +308,8 @@ export default {
this.searchData.PageIndex = 1;
this.searchData.PageSize = 10;
this.searchData.CalledAEList = [];
- this.searchData.Asc = true;
+ this.searchData.Asc = false;
+ this.SortField.Asc = "LatestPushTime";
this.$refs.inspectionList.clearSort();
this.getList();
},
diff --git a/src/views/trials/trials-panel/subject/subject-list/index.vue b/src/views/trials/trials-panel/subject/subject-list/index.vue
index 547b336..c498813 100644
--- a/src/views/trials/trials-panel/subject/subject-list/index.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/index.vue
@@ -274,7 +274,7 @@
@handleOpenDialog="handleOpenDialog"
/>
-
+