XCKJ
/
hir_web
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

部分问题修复

main
wangxiaoshuang 2024-04-25 09:36:39 +08:00
parent 08ba4ab87e
commit 709a811b75
7 changed files with 58 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/views/system/notice/components/from.vue
View File

@ -14,7 +14,7 @@
> >
<el-select v-model="form.NoticeLevelEnum" clearable size="small"> <el-select v-model="form.NoticeLevelEnum" clearable size="small">
<el-option <el-option
v-for="item of dict.type.NoteLevel" v-for="item of $d.NoteLevel"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.raw.Code * 1" :value="item.raw.Code * 1"
@ -27,10 +27,10 @@
> >
<el-select v-model="form.NoticeTypeEnum" clearable size="small"> <el-select v-model="form.NoticeTypeEnum" clearable size="small">
<el-option <el-option
v-for="item of dict.type.NoteType" v-for="item of $d.NoteType"
:key="item.value" :key="item.id"
:label="item.label" :label="item.label"
:value="item.raw.Code * 1" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -44,10 +44,10 @@
size="small" size="small"
> >
<el-option <el-option
v-for="item of dict.type.NoticeApplicableTrial" v-for="item of $d.TrialType"
:key="item.value" :key="item.id"
:label="item.label" :label="item.label"
:value="item.raw.Code * 1" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -62,10 +62,10 @@
size="small" size="small"
> >
<el-option <el-option
v-for="item of roleList" v-for="item of $d.UserType"
:key="item.Id" :key="item.id"
:label="item.UserTypeShortName" :label="item.label"
:value="item.Id" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -75,10 +75,10 @@
> >
<el-select v-model="form.NoticeModeEnum" clearable size="small"> <el-select v-model="form.NoticeModeEnum" clearable size="small">
<el-option <el-option
v-for="item of dict.type.NoticeMode" v-for="item of $d.NoticeMode"
:key="item.value" :key="item.value"
:label="item.label" :label="item.label"
:value="item.raw.Code * 1" :value="item.value"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>

16
src/views/system/notice/index.vue
View File

@ -25,7 +25,7 @@
> >
<el-select v-model="searchData.NoticeTypeEnum" clearable size="small"> <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
<el-option <el-option
v-for="item of $d.TrialType" v-for="item of $d.NoteType"
:key="item.id" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
@ -42,8 +42,8 @@
size="small" size="small"
> >
<el-option <el-option
v-for="item of $d.NoticeApplicableTrial" v-for="item of $d.TrialType"
:key="item.value" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.value"
/> />
@ -61,9 +61,9 @@
> >
<el-option <el-option
v-for="item of $d.UserType" v-for="item of $d.UserType"
:key="item.Id" :key="item.id"
:label="item.label" :label="item.label"
:value="item.value" :value="item.id"
/> />
</el-select> </el-select>
</el-form-item> </el-form-item>
@ -188,10 +188,10 @@
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ {{
$d.NoticeApplicableTrial.find((v) => { $d.TrialType.find((v) => {
return v.raw.Code * 1 === scope.row.ApplicableProjectEnum; return v.raw.Code * 1 === scope.row.ApplicableProjectEnum;
}) })
? $d.NoticeApplicableTrial.find((v) => { ? $d.TrialType.find((v) => {
return v.raw.Code * 1 === scope.row.ApplicableProjectEnum; return v.raw.Code * 1 === scope.row.ApplicableProjectEnum;
}).label }).label
: "" : ""
@ -237,7 +237,7 @@
show-overflow-tooltip show-overflow-tooltip
> >
<template slot-scope="scope"> <template slot-scope="scope">
{{ scope.row.StartDate }}-{{ scope.row.EndDate }} {{ scope.row.StartDate }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column <el-table-column

1
src/views/trials/trials-inspection/components/add-trials-list.vue
View File

@ -108,6 +108,7 @@
:Patient="PatientData" :Patient="PatientData"
:submitMessage="submitMessage" :submitMessage="submitMessage"
:status="status" :status="status"
@close="beforeCloseStudyDig"
/> />
<base-model v-if="addSubject_model.visible" :config="addSubject_model"> <base-model v-if="addSubject_model.visible" :config="addSubject_model">
<template slot="dialog-body"> <template slot="dialog-body">

1
src/views/trials/trials-inspection/components/confirm-visit-list.vue
View File

@ -487,6 +487,7 @@ export default {
this.$message.success( this.$message.success(
this.$t("trials:crcUpload:message:submittedSuccessfully") this.$t("trials:crcUpload:message:submittedSuccessfully")
); );
this.$emit("close");
} }
} catch (err) { } catch (err) {
this.btnLoading2 = false; this.btnLoading2 = false;

60
src/views/trials/trials-inspection/components/trials-select.vue
View File

@ -38,22 +38,11 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
width: 80px; width: 150px;
" "
> >
{{ $t("trials:trials-list:table:researchNumber") }} {{ $t("trials:trials-list:table:researchNumber") }}
</div> </div>
<div
style="
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 160px;
"
>
{{ $t("trials:trials-list:table:experimentName") }}
</div>
<div <div
style=" style="
display: inline-block; display: inline-block;
@ -65,6 +54,17 @@
> >
{{ $t("trials:trials-list:table:sponsor") }} {{ $t("trials:trials-list:table:sponsor") }}
</div> </div>
<div
style="
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 160px;
"
>
{{ $t("trials:trials-list:table:experimentName") }}
</div>
</div> </div>
</div> </div>
<el-tooltip <el-tooltip
@ -80,11 +80,11 @@
{{ $t("trials:trials-list:table:researchNumber") }}: {{ $t("trials:trials-list:table:researchNumber") }}:
{{ item.ResearchProgramNo }} {{ item.ResearchProgramNo }}
<br /> <br />
{{ $t("trials:trials-list:table:experimentName") }}:
{{ item.ExperimentName }}
<br />
{{ $t("trials:trials-list:table:sponsor") }}: {{ $t("trials:trials-list:table:sponsor") }}:
{{ item.SponsorName }} {{ item.SponsorName }}
<br />
{{ $t("trials:trials-list:table:experimentName") }}:
{{ item.ExperimentName }}
</div> </div>
<div <div
class="options_item" class="options_item"
@ -100,22 +100,11 @@
overflow: hidden; overflow: hidden;
text-overflow: ellipsis; text-overflow: ellipsis;
white-space: nowrap; white-space: nowrap;
width: 80px; width: 150px;
" "
> >
{{ item.ResearchProgramNo }} {{ item.ResearchProgramNo }}
</div> </div>
<div
style="
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 160px;
"
>
{{ item.ExperimentName }}
</div>
<div <div
style=" style="
display: inline-block; display: inline-block;
@ -127,6 +116,17 @@
> >
{{ item.SponsorName }} {{ item.SponsorName }}
</div> </div>
<div
style="
display: inline-block;
overflow: hidden;
text-overflow: ellipsis;
white-space: nowrap;
width: 160px;
"
>
{{ item.ExperimentName }}
</div>
</div> </div>
</el-tooltip> </el-tooltip>
</div> </div>
@ -233,7 +233,11 @@ export default {
inputChange(v) { inputChange(v) {
this.resultFilter = this.options.filter((o) => { this.resultFilter = this.options.filter((o) => {
var reg = new RegExp(v, "ig"); var reg = new RegExp(v, "ig");
return reg.test(o.ResearchProgramNo) || reg.test(o.ExperimentName)|| reg.test(o.SponsorName); return (
reg.test(o.ResearchProgramNo) ||
reg.test(o.ExperimentName) ||
reg.test(o.SponsorName)
);
}); });
}, },
}, },

1
src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue
View File

@ -107,6 +107,7 @@
:Patient="Patient" :Patient="Patient"
:submitMessage="submitMessage" :submitMessage="submitMessage"
:status="status" :status="status"
@close="beforeCloseStudyDig"
/> />
<base-model v-if="patient_model.visible" :config="patient_model"> <base-model v-if="patient_model.visible" :config="patient_model">
<template slot="dialog-body"> <template slot="dialog-body">

6
src/views/trials/trials-panel/subject/subject-list/components/patient-study-list.vue
View File

@ -2,7 +2,6 @@
<el-dialog <el-dialog
:visible.sync="visible" :visible.sync="visible"
:close-on-click-modal="false" :close-on-click-modal="false"
:fullscreen="true"
custom-class="upload-dialog" custom-class="upload-dialog"
:before-close="beforeClosePitentDig" :before-close="beforeClosePitentDig"
> >
@ -10,10 +9,9 @@
<el-table <el-table
ref="patientStudyList" ref="patientStudyList"
v-loading="loading" v-loading="loading"
v-adaptive="{ bottomOffset: 60 }"
:data="list" :data="list"
stripe stripe
height="100" height="300px"
> >
<el-table-column type="index" width="40" /> <el-table-column type="index" width="40" />
<!--患者ID--> <!--患者ID-->
@ -49,7 +47,7 @@
sortable="custom" sortable="custom"
></el-table-column> ></el-table-column>
<!--操作--> <!--操作-->
<el-table-column :label="$t('common:action:action')" width="250"> <el-table-column :label="$t('common:action:action')" width="80">
<template slot-scope="scope"> <template slot-scope="scope">
<el-button <el-button
circle circle