部分问题修复
parent
4c4e0be8d9
commit
4c788d60cc
|
@ -103,7 +103,7 @@
|
||||||
<el-form :inline="true" class="base-search-form">
|
<el-form :inline="true" class="base-search-form">
|
||||||
<!-- 患者编号 -->
|
<!-- 患者编号 -->
|
||||||
<el-form-item :label="$t('trials:uploadDicomList:table:pId')">
|
<el-form-item :label="$t('trials:uploadDicomList:table:pId')">
|
||||||
<el-input v-model="searchData.SubjectInfo" style="width: 100px" />
|
<el-input v-model="searchData.PatientIdStr" style="width: 100px" />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
<!-- 检查日期 -->
|
<!-- 检查日期 -->
|
||||||
<el-form-item :label="$t('trials:uploadedDicoms:table:studyDate')">
|
<el-form-item :label="$t('trials:uploadedDicoms:table:studyDate')">
|
||||||
|
@ -140,13 +140,15 @@
|
||||||
</el-button>
|
</el-button>
|
||||||
</div>
|
</div>
|
||||||
<el-table
|
<el-table
|
||||||
ref="addTrialsList"
|
ref="bottomList"
|
||||||
v-loading="bottomLoading"
|
v-loading="bottomLoading"
|
||||||
v-adaptive="{ bottomOffset: 60 }"
|
v-adaptive="{ bottomOffset: 60 }"
|
||||||
:data="bottomList"
|
:data="bottomList"
|
||||||
stripe
|
stripe
|
||||||
height="100"
|
height="100"
|
||||||
@selection-change="handleSelectChange"
|
@selection-change="handleSelectChange"
|
||||||
|
@sort-change="handleSortByColumn"
|
||||||
|
:default-sort="{ prop: 'SubmitTime', order: 'descending' }"
|
||||||
>
|
>
|
||||||
<el-table-column type="selection" align="center" width="45" />
|
<el-table-column type="selection" align="center" width="45" />
|
||||||
<!--患者编号-->
|
<!--患者编号-->
|
||||||
|
@ -155,6 +157,7 @@
|
||||||
prop="PatientIdStr"
|
prop="PatientIdStr"
|
||||||
:label="$t('trials:uploadDicomList:table:pId')"
|
:label="$t('trials:uploadDicomList:table:pId')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<!--检查类型-->
|
<!--检查类型-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -162,6 +165,7 @@
|
||||||
prop="Modalities"
|
prop="Modalities"
|
||||||
:label="$t('trials:audit:table:modality')"
|
:label="$t('trials:audit:table:modality')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<!--序列数量-->
|
<!--序列数量-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -169,6 +173,7 @@
|
||||||
prop="SeriesCount"
|
prop="SeriesCount"
|
||||||
:label="$t('trials:audit:table:seriesCount')"
|
:label="$t('trials:audit:table:seriesCount')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<!--图像数量-->
|
<!--图像数量-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -176,6 +181,7 @@
|
||||||
prop="InstanceCount"
|
prop="InstanceCount"
|
||||||
:label="$t('trials:audit:table:instanceCount')"
|
:label="$t('trials:audit:table:instanceCount')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<!--检查日期-->
|
<!--检查日期-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -183,6 +189,7 @@
|
||||||
prop="StudyTime"
|
prop="StudyTime"
|
||||||
:label="$t('trials:audit:table:studyDate')"
|
:label="$t('trials:audit:table:studyDate')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<!--所属访视-->
|
<!--所属访视-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -190,6 +197,7 @@
|
||||||
prop="VisitName"
|
prop="VisitName"
|
||||||
:label="$t('trials:hirVisit:table:ownershipVisit')"
|
:label="$t('trials:hirVisit:table:ownershipVisit')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
></el-table-column>
|
></el-table-column>
|
||||||
<!--操作-->
|
<!--操作-->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -222,6 +230,9 @@ const defaultSearchData = () => {
|
||||||
return {
|
return {
|
||||||
EarliestStudyTime: null,
|
EarliestStudyTime: null,
|
||||||
LatestStudyTime: null,
|
LatestStudyTime: null,
|
||||||
|
Asc: false,
|
||||||
|
SortField: "StudyTime",
|
||||||
|
PatientIdStr: null,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
export default {
|
export default {
|
||||||
|
@ -298,6 +309,14 @@ export default {
|
||||||
this.bottomLoading = false;
|
this.bottomLoading = false;
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
// 排序
|
||||||
|
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.getBottomList();
|
||||||
|
},
|
||||||
// 修改检查与访视绑定关系
|
// 修改检查与访视绑定关系
|
||||||
async setRelation(item, isAdd = true) {
|
async setRelation(item, isAdd = true) {
|
||||||
try {
|
try {
|
||||||
|
@ -361,6 +380,7 @@ export default {
|
||||||
reset() {
|
reset() {
|
||||||
this.searchData = defaultSearchData();
|
this.searchData = defaultSearchData();
|
||||||
this.dateValue = [];
|
this.dateValue = [];
|
||||||
|
this.$refs.bottomList.clearSort();
|
||||||
},
|
},
|
||||||
// 可选检查表格选择
|
// 可选检查表格选择
|
||||||
handleSelectChange() {},
|
handleSelectChange() {},
|
||||||
|
|
|
@ -87,6 +87,7 @@
|
||||||
<!-- 访视列表 -->
|
<!-- 访视列表 -->
|
||||||
<template slot="main-container">
|
<template slot="main-container">
|
||||||
<el-table
|
<el-table
|
||||||
|
ref="visitList"
|
||||||
v-loading="loading"
|
v-loading="loading"
|
||||||
v-adaptive="{ bottomOffset: 60 }"
|
v-adaptive="{ bottomOffset: 60 }"
|
||||||
:data="list"
|
:data="list"
|
||||||
|
@ -110,6 +111,7 @@
|
||||||
prop="SubjectCode"
|
prop="SubjectCode"
|
||||||
:label="$t('trials:uploadMonitor:table:subjectId')"
|
:label="$t('trials:uploadMonitor:table:subjectId')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
/>
|
/>
|
||||||
<!-- 患者编号 -->
|
<!-- 患者编号 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -135,12 +137,14 @@
|
||||||
prop="SubjectShortName"
|
prop="SubjectShortName"
|
||||||
:label="$t('trials:researchStaff:table:Name')"
|
:label="$t('trials:researchStaff:table:Name')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
/>
|
/>
|
||||||
<!-- 性别 -->
|
<!-- 性别 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="SubjectSex"
|
prop="SubjectSex"
|
||||||
:label="$t('trials:subject:table:gender')"
|
:label="$t('trials:subject:table:gender')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<span>{{ $fd("sex", Number(scope.row.SubjectSex)) }}</span>
|
<span>{{ $fd("sex", Number(scope.row.SubjectSex)) }}</span>
|
||||||
|
@ -151,6 +155,7 @@
|
||||||
prop="VisitName"
|
prop="VisitName"
|
||||||
:label="$t('trials:uploadMonitor:table:visitName')"
|
:label="$t('trials:uploadMonitor:table:visitName')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-button type="text" @click="handleOpenStudyDialog(scope.row)">
|
<el-button type="text" @click="handleOpenStudyDialog(scope.row)">
|
||||||
|
@ -346,6 +351,7 @@ export default {
|
||||||
// 重置
|
// 重置
|
||||||
handleReset() {
|
handleReset() {
|
||||||
this.searchData = defaultSearchData();
|
this.searchData = defaultSearchData();
|
||||||
|
this.$refs.visitList.clearSort();
|
||||||
this.getList();
|
this.getList();
|
||||||
},
|
},
|
||||||
// 排序
|
// 排序
|
||||||
|
|
|
@ -109,6 +109,7 @@
|
||||||
prop="SubjectCode"
|
prop="SubjectCode"
|
||||||
:label="$t('trials:uploadMonitor:table:subjectId')"
|
:label="$t('trials:uploadMonitor:table:subjectId')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
/>
|
/>
|
||||||
<!-- 患者编号 -->
|
<!-- 患者编号 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
@ -131,15 +132,17 @@
|
||||||
>
|
>
|
||||||
<!-- 患者姓名 -->
|
<!-- 患者姓名 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="StudyCode"
|
prop="StudyName"
|
||||||
:label="$t('trials:researchStaff:table:Name')"
|
:label="$t('trials:researchStaff:table:Name')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
/>
|
/>
|
||||||
<!-- 任务名称 -->
|
<!-- 任务名称 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="TaskBlindName"
|
prop="TaskBlindName"
|
||||||
:label="$t('trials:auditRecord:table:taskName')"
|
:label="$t('trials:auditRecord:table:taskName')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
/>
|
/>
|
||||||
<!-- 任务创建时间 -->
|
<!-- 任务创建时间 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
|
|
|
@ -24,6 +24,27 @@
|
||||||
>
|
>
|
||||||
<el-input v-model="data.SubjectShortName" disabled />
|
<el-input v-model="data.SubjectShortName" disabled />
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!--序列数量-->
|
||||||
|
<el-form-item
|
||||||
|
:label="$t('trials:audit:table:seriesCount')"
|
||||||
|
prop="reason"
|
||||||
|
>
|
||||||
|
<el-input v-model="data.SeriesCount" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<!--图像数量-->
|
||||||
|
<el-form-item
|
||||||
|
:label="$t('trials:audit:table:instanceCount')"
|
||||||
|
prop="reason"
|
||||||
|
>
|
||||||
|
<el-input v-model="data.InstanceCount" disabled />
|
||||||
|
</el-form-item>
|
||||||
|
<!--检查描述-->
|
||||||
|
<el-form-item
|
||||||
|
:label="$t('trials:inspection:table:studyDescription')"
|
||||||
|
prop="reason"
|
||||||
|
>
|
||||||
|
<el-input v-model="data.Description" disabled />
|
||||||
|
</el-form-item>
|
||||||
<!--访视-->
|
<!--访视-->
|
||||||
<el-form-item
|
<el-form-item
|
||||||
:label="$t('trials:auditRecord:table:visit')"
|
:label="$t('trials:auditRecord:table:visit')"
|
||||||
|
|
|
@ -23,6 +23,21 @@
|
||||||
</el-option>
|
</el-option>
|
||||||
</el-select>
|
</el-select>
|
||||||
</el-form-item>
|
</el-form-item>
|
||||||
|
<!-- 是否绑定访视 -->
|
||||||
|
<el-form-item
|
||||||
|
:label="$t('trials:study:button:bindVisit')"
|
||||||
|
v-if="activeName === 'notSubmit'"
|
||||||
|
>
|
||||||
|
<el-select v-model="searchData.IsBindedVisit" clearable>
|
||||||
|
<el-option
|
||||||
|
v-for="item of $d.YesOrNo"
|
||||||
|
:key="item.id"
|
||||||
|
:label="item.label"
|
||||||
|
:value="item.value"
|
||||||
|
>
|
||||||
|
</el-option>
|
||||||
|
</el-select>
|
||||||
|
</el-form-item>
|
||||||
<!-- 申请号 -->
|
<!-- 申请号 -->
|
||||||
<!-- <el-form-item :label="$t('trials:study:form:accessionNumber')">
|
<!-- <el-form-item :label="$t('trials:study:form:accessionNumber')">
|
||||||
<el-input v-model="searchData.SubjectInfo" style="width: 140px" />
|
<el-input v-model="searchData.SubjectInfo" style="width: 140px" />
|
||||||
|
@ -117,12 +132,13 @@
|
||||||
:label="$t('trials:uploadDicomList:table:pId')"
|
:label="$t('trials:uploadDicomList:table:pId')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
min-width="100"
|
min-width="100"
|
||||||
|
sortable="custom"
|
||||||
>
|
>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
<!-- 姓名 -->
|
<!--患者姓名 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="SubjectShortName"
|
prop="PatientName"
|
||||||
:label="$t('trials:researchStaff:table:Name')"
|
:label="$t('trials:uploadDicomList:table:patientName')"
|
||||||
show-overflow-tooltip
|
show-overflow-tooltip
|
||||||
sortable="custom"
|
sortable="custom"
|
||||||
min-width="100"
|
min-width="100"
|
||||||
|
@ -182,6 +198,30 @@
|
||||||
min-width="100"
|
min-width="100"
|
||||||
v-if="activeName === 'submit'"
|
v-if="activeName === 'submit'"
|
||||||
/>
|
/>
|
||||||
|
<!-- 检查描述 -->
|
||||||
|
<el-table-column
|
||||||
|
prop="Description"
|
||||||
|
:label="$t('trials:inspection:table:studyDescription')"
|
||||||
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
|
min-width="100"
|
||||||
|
/>
|
||||||
|
<!-- 序列数量 -->
|
||||||
|
<el-table-column
|
||||||
|
prop="SeriesCount"
|
||||||
|
:label="$t('trials:audit:table:seriesCount')"
|
||||||
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
|
min-width="100"
|
||||||
|
/>
|
||||||
|
<!-- 图像数量 -->
|
||||||
|
<el-table-column
|
||||||
|
prop="InstanceCount"
|
||||||
|
:label="$t('trials:audit:table:instanceCount')"
|
||||||
|
show-overflow-tooltip
|
||||||
|
sortable="custom"
|
||||||
|
min-width="100"
|
||||||
|
/>
|
||||||
<!-- 检查日期 -->
|
<!-- 检查日期 -->
|
||||||
<el-table-column
|
<el-table-column
|
||||||
prop="StudyTime"
|
prop="StudyTime"
|
||||||
|
@ -207,9 +247,12 @@
|
||||||
min-width="100"
|
min-width="100"
|
||||||
>
|
>
|
||||||
<template slot-scope="scope">
|
<template slot-scope="scope">
|
||||||
<el-tag v-if="scope.row.SubmitState * 1 === 0" type="warning">{{
|
<span v-if="scope.row.SubmitState === null">-</span>
|
||||||
$fd("SubmitState", scope.row.SubmitState * 1)
|
<el-tag
|
||||||
}}</el-tag>
|
v-else-if="scope.row.SubmitState * 1 === 0"
|
||||||
|
type="warning"
|
||||||
|
>{{ $fd("SubmitState", scope.row.SubmitState * 1) }}</el-tag
|
||||||
|
>
|
||||||
<el-tag v-else-if="scope.row.SubmitState * 1 === 1" type="danger">{{
|
<el-tag v-else-if="scope.row.SubmitState * 1 === 1" type="danger">{{
|
||||||
$fd("SubmitState", scope.row.SubmitState * 1)
|
$fd("SubmitState", scope.row.SubmitState * 1)
|
||||||
}}</el-tag>
|
}}</el-tag>
|
||||||
|
@ -238,7 +281,11 @@
|
||||||
@click="editVisitFn(scope.row)"
|
@click="editVisitFn(scope.row)"
|
||||||
v-if="activeName === 'notSubmit'"
|
v-if="activeName === 'notSubmit'"
|
||||||
v-hasPermi="['trials:trials-panel:study:editVisit']"
|
v-hasPermi="['trials:trials-panel:study:editVisit']"
|
||||||
>{{ $t("trials:study:button:editVisit") }}</el-button
|
>{{
|
||||||
|
scope.row.SubjectVisitId
|
||||||
|
? $t("trials:study:button:editVisit")
|
||||||
|
: $t("trials:study:button:bindVisit")
|
||||||
|
}}</el-button
|
||||||
>
|
>
|
||||||
</template>
|
</template>
|
||||||
</el-table-column>
|
</el-table-column>
|
||||||
|
@ -276,6 +323,7 @@ const defaultSearchData = () => {
|
||||||
PatientSex: null,
|
PatientSex: null,
|
||||||
BeginStudyTime: null,
|
BeginStudyTime: null,
|
||||||
EndStudyTime: null,
|
EndStudyTime: null,
|
||||||
|
IsBindedVisit: null,
|
||||||
Asc: false,
|
Asc: false,
|
||||||
SortField: "StudyTime",
|
SortField: "StudyTime",
|
||||||
PageIndex: 1,
|
PageIndex: 1,
|
||||||
|
|
|
@ -1,12 +1,12 @@
|
||||||
<template>
|
<template>
|
||||||
<div>
|
<div>
|
||||||
<el-tabs type="border-card" v-model="activeName">
|
<el-tabs type="border-card" v-model="activeName">
|
||||||
<el-tab-pane :label="$t('trials:study:tabpane:notBind')" name="notBind">
|
<!-- <el-tab-pane :label="$t('trials:study:tabpane:notBind')" name="notBind">
|
||||||
<notBindStudyList
|
<notBindStudyList
|
||||||
activeName="notBind"
|
activeName="notBind"
|
||||||
v-if="activeName === 'notBind'"
|
v-if="activeName === 'notBind'"
|
||||||
/>
|
/>
|
||||||
</el-tab-pane>
|
</el-tab-pane> -->
|
||||||
<el-tab-pane
|
<el-tab-pane
|
||||||
:label="$t('trials:study:tabpane:notSubmit')"
|
:label="$t('trials:study:tabpane:notSubmit')"
|
||||||
name="notSubmit"
|
name="notSubmit"
|
||||||
|
@ -109,7 +109,7 @@ export default {
|
||||||
tokenKey: getToken(),
|
tokenKey: getToken(),
|
||||||
openWindow: null,
|
openWindow: null,
|
||||||
|
|
||||||
activeName: "notBind", // notSubmit 未提交 submit 提交 notBind 未绑定
|
activeName: "notSubmit", // notSubmit 未提交 submit 提交 notBind 未绑定
|
||||||
};
|
};
|
||||||
},
|
},
|
||||||
mounted() {
|
mounted() {
|
||||||
|
|
Loading…
Reference in New Issue