From d24bb92c070dfa961b60c2d9a05a37f3303b2d48 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Sun, 7 Apr 2024 17:44:11 +0800 Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E7=AE=A1=E7=90=86=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95=E5=AF=B9=E6=8E=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trials.js | 8 ++ .../components/confirm-visit-list.vue | 4 +- .../components/research-trials-list.vue | 4 +- .../components/view-study-list.vue | 2 +- .../trials-layout/components/trialsNavbar.vue | 3 +- .../trials-list/components/SignForm.vue | 1 + .../trials-list/components/TrialForm.vue | 18 +-- .../trials/trials-panel/hirVisit/index.vue | 6 +- .../trials-panel/readManagenent/index.vue | 128 +++++++++++++----- .../trials-panel/study/components/list.vue | 9 +- 10 files changed, 131 insertions(+), 52 deletions(-) diff --git a/src/api/trials.js b/src/api/trials.js index f2fa1a6..5bba999 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -3524,3 +3524,11 @@ export function getTrialListHir(param) { data: param }) } + +// 获取项目详情 +export function getTrialInfoHir(id) { + return request({ + url: `/Patient/getTrialInfo/${id}`, + method: 'get', + }) +} \ 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 index e26df7c..f33c7ce 100644 --- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue +++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue @@ -148,6 +148,7 @@ type="text" @click.stop="detail(scope.row)" class="detail" + disabled >{{ $t("trials:trials-list:action:panel") }} @@ -404,10 +405,9 @@ export default { console.log(err); } }, - // 确认号提交数据校验 + // 确认提交数据校验 formatData() { if (this.tableSelectData.length <= 0) { - console.log(1111111111111111); this.$message.warning( this.$t("trials:inspection:formatData:notCheckStudy") ); 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 b34639e..aa21684 100644 --- a/src/views/trials/trials-inspection/components/research-trials-list.vue +++ b/src/views/trials/trials-inspection/components/research-trials-list.vue @@ -60,10 +60,10 @@ show-overflow-tooltip min-width="140" > - + 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 a135aad..a3abc3d 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -109,7 +109,7 @@ $t("trials:inspection:button:image") }} - {{ + {{ $t("trials:inspection:button:report") }} diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index 0223b63..75e8970 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -32,9 +32,10 @@ - + {{ $t("trials:tab:trials") }} diff --git a/src/views/trials/trials-list/components/SignForm.vue b/src/views/trials/trials-list/components/SignForm.vue index 2f4269c..fd09314 100644 --- a/src/views/trials/trials-list/components/SignForm.vue +++ b/src/views/trials/trials-list/components/SignForm.vue @@ -124,6 +124,7 @@ export default { .sign-form-footer{ margin-top: 10px; text-align: right; + position: absolute; } } diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index 7df2ccc..3c48454 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -148,12 +148,14 @@ :label="$t('trials:trials-list:table:durationAuthorized')" prop="AuthorizationYear" > - - 年 +
+ + 年 +
// import store from "@/store"; import { mapGetters, mapState } from "vuex"; -import { getTrialInfo, addOrUpdateTrialHir } from "@/api/trials"; +import { getTrialInfoHir, addOrUpdateTrialHir } from "@/api/trials"; import { getBasicDataSelects } from "@/api/dictionary/dictionary"; export default { name: "TrialForm", @@ -368,7 +370,7 @@ export default { methods: { initForm() { this.loading = true; - getTrialInfo(this.trialId) + getTrialInfoHir(this.trialId) .then((res) => { this.loading = false; if (res.IsSuccess) { diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue index 499b5bb..880324e 100644 --- a/src/views/trials/trials-panel/hirVisit/index.vue +++ b/src/views/trials/trials-panel/hirVisit/index.vue @@ -93,6 +93,7 @@ stripe height="100" @sort-change="handleSortByColumn" + :default-sort="{ prop: 'SubmitTime', order: 'descending' }" > diff --git a/src/views/trials/trials-panel/readManagenent/index.vue b/src/views/trials/trials-panel/readManagenent/index.vue index a8e96e3..516b76b 100644 --- a/src/views/trials/trials-panel/readManagenent/index.vue +++ b/src/views/trials/trials-panel/readManagenent/index.vue @@ -40,7 +40,7 @@ style="width: 150px" > + + > + - + - + /> --> @@ -197,12 +217,12 @@ const defaultSearchData = () => { return { SubjectCode: null, ReadingCategory: 1, - ReadingTaskState: 0, - TaskState: 0, + ReadingTaskState: null, + TaskState: null, BeginSignTime: null, EndSignTime: null, - PageIndex: 0, - PageSize: 0, + PageIndex: 1, + PageSize: 20, Asc: false, SortField: "CreateTime", }; @@ -213,29 +233,69 @@ export default { data() { return { // 查询 - searchData: {}, - visitOptions: [], + searchData: defaultSearchData(), + dateValue: [], // 列表 - list: [ - { - StudyCode: 1, - }, - ], + list: [], loading: false, total: 0, // 修改检查 - editStudyVisible: false, }; }, + created() { + this.getList(); + }, methods: { // 查询 - handleSearch() {}, + handleSearch() { + this.getList(); + }, // 重置 - handleSearch() {}, + handleReset() { + this.reset(); + this.getList(); + }, + // 初始化 + reset() { + this.searchData = defaultSearchData(); + this.dateValue = []; + this.$refs.redManagenentTable.clearSort(); + }, // 排序 - handleSortByColumn() {}, + 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(); + }, // 获取列表 - async getList() {}, + async getList() { + try { + let data = {}; + Object.keys(this.searchData).forEach((key) => { + data[key] = this.searchData[key]; + }); + data.TrialId = this.$route.query.trialId; + if (this.dateValue[0] && this.dateValue[1]) { + data.earliestStudyTime = this.dateValue[0].toISOString(); + data.latestStudyTime = this.dateValue[1].toISOString(); + } else { + data.EarliestStudyTime = null; + data.LatestStudyTime = null; + } + this.loading = true; + let res = await getPatientVisitTaskList(data); + this.loading = false; + if (res.IsSuccess) { + this.list = res.Result.CurrentPageData; + this.total = res.Result.TotalCount; + } + } catch (err) { + this.loading = false; + console.log(err); + } + }, // 下载报告 downloadReport() {}, // 阅片结果 diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue index 7cccd25..e50b654 100644 --- a/src/views/trials/trials-panel/study/components/list.vue +++ b/src/views/trials/trials-panel/study/components/list.vue @@ -202,9 +202,12 @@ >