部分问题修复
parent
7e2292c705
commit
1d5f54f31a
|
@ -192,8 +192,8 @@ export default {
|
|||
} else {
|
||||
this.tableData = Object.assign([], this.arr);
|
||||
}
|
||||
console.log(JSON.stringify(this.$path));
|
||||
console.log(JSON.stringify(this.tableData));
|
||||
// console.log(JSON.stringify(this.$path));
|
||||
// console.log(JSON.stringify(this.tableData));
|
||||
},
|
||||
},
|
||||
};
|
||||
|
|
|
@ -71,6 +71,11 @@ export default {
|
|||
let res = await this.formatVisit();
|
||||
if (!res) return;
|
||||
this.$emit("update:modelData", this.visit);
|
||||
let data = {
|
||||
StudyId: this.studyData.StudyId || this.studyData.SCPStudyId,
|
||||
VisitId: this.visit,
|
||||
};
|
||||
this.$emit("putVisit", data);
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
|
@ -120,6 +125,11 @@ export default {
|
|||
}
|
||||
).then(() => {
|
||||
this.$emit("update:modelData", this.visit);
|
||||
let data = {
|
||||
StudyId: this.studyData.StudyId || this.studyData.SCPStudyId,
|
||||
VisitId: this.visit,
|
||||
};
|
||||
this.$emit("putVisit", data);
|
||||
});
|
||||
}
|
||||
return true;
|
||||
|
|
|
@ -19,13 +19,14 @@
|
|||
:model="submitMessage"
|
||||
class="demo-form-inline"
|
||||
:rules="rules"
|
||||
label-width="150px"
|
||||
label-width="130px"
|
||||
>
|
||||
<div>
|
||||
<!--项目-->
|
||||
<el-form-item
|
||||
:label="$t('trials:workbench:label:trialsStats')"
|
||||
prop="TrialId"
|
||||
label-width="50px"
|
||||
>
|
||||
<trialsSelect
|
||||
:options="trialList"
|
||||
|
@ -33,30 +34,52 @@
|
|||
:status="status"
|
||||
/>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<div class="selectAndBtn">
|
||||
<!--受试者编号-->
|
||||
<el-form-item
|
||||
:label="$t('trials:crcQuestion:table:subjectId')"
|
||||
prop="SubjectId"
|
||||
>
|
||||
<el-select
|
||||
v-model="submitMessage.SubjectId"
|
||||
filterable
|
||||
allow-create
|
||||
default-first-option
|
||||
clearable
|
||||
:disabled="status === 'visit' || !submitMessage.TrialId"
|
||||
<div style="display: inline-block">
|
||||
<!--受试者编号-->
|
||||
<el-form-item
|
||||
:label="$t('trials:crcQuestion:table:subjectId')"
|
||||
prop="SubjectId"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in subjectIdList"
|
||||
:key="item.SubejctId"
|
||||
:label="item.SubjectCode"
|
||||
:value="item.SubejctId"
|
||||
<el-select
|
||||
v-model="submitMessage.SubjectId"
|
||||
clearable
|
||||
:disabled="status === 'visit' || !submitMessage.TrialId"
|
||||
style="width: 300px"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<el-option
|
||||
v-for="item in subjectIdList"
|
||||
:key="item.SubejctId"
|
||||
:label="
|
||||
item.ShortName || item.Sex
|
||||
? `${item.SubjectCode}(${item.ShortName},${
|
||||
item.Sex ? $fd('sex', Number(item.Sex)) : ''
|
||||
})`
|
||||
: item.SubjectCode
|
||||
"
|
||||
:value="item.SubejctId"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!--添加受试者-->
|
||||
<el-button
|
||||
type="primary"
|
||||
v-if="status === 'trial' && submitMessage.TrialId"
|
||||
@click="addSubject_model.visible = true"
|
||||
>
|
||||
{{ $t("trials:selectSubject:button:add") }}
|
||||
</el-button>
|
||||
<div>
|
||||
<el-form-item
|
||||
:label="$t('trials:study:tabpane:bindPatient')"
|
||||
:style="{ opacity: bindPatientTip ? 1 : 0 }"
|
||||
>
|
||||
<span v-if="bindPatientTip">{{
|
||||
bindPatientTip.map((item) => item.PatientIdStr).join(", ")
|
||||
}}</span>
|
||||
</el-form-item>
|
||||
</div>
|
||||
</div>
|
||||
<div class="btnBox">
|
||||
<!--确认添加按钮-->
|
||||
<el-button
|
||||
|
@ -82,16 +105,45 @@
|
|||
</div>
|
||||
<confirmVisitList
|
||||
ref="confirmVisit"
|
||||
:Patient="Patient"
|
||||
:Patient="PatientData"
|
||||
:submitMessage="submitMessage"
|
||||
:status="status"
|
||||
/>
|
||||
<base-model v-if="addSubject_model.visible" :config="addSubject_model">
|
||||
<template slot="dialog-body">
|
||||
<el-form
|
||||
ref="addSubjectForm"
|
||||
:inline="true"
|
||||
:model="addSubjectForm"
|
||||
class="demo-form-inline"
|
||||
:rules="addSubjectrules"
|
||||
>
|
||||
<!--受试者编号-->
|
||||
<el-form-item
|
||||
:label="$t('trials:addSuject:form:subjectCode')"
|
||||
prop="SubjectCode"
|
||||
label-width="150px"
|
||||
>
|
||||
<el-input v-model="addSubjectForm.SubjectCode" clearable></el-input>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
</template>
|
||||
<template slot="dialog-footer">
|
||||
<el-button type="primary" @click="addSubject">
|
||||
{{ $t("common:button:confirm") }}
|
||||
</el-button>
|
||||
<el-button @click="addSubject_model.visible = false">
|
||||
{{ $t("common:button:cancel") }}
|
||||
</el-button>
|
||||
</template>
|
||||
</base-model>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import Pagination from "@/components/Pagination";
|
||||
import trialsSelect from "./trials-select.vue";
|
||||
import confirmVisitList from "./confirm-visit-list.vue";
|
||||
import BaseModel from "@/components/BaseModel";
|
||||
import {
|
||||
getPatientJoinTrialInitSelectList,
|
||||
getTrialSubejctSelectList,
|
||||
|
@ -100,7 +152,7 @@ import {
|
|||
} from "@/api/inspection.js";
|
||||
export default {
|
||||
name: "addTrialsList",
|
||||
components: { Pagination, trialsSelect, confirmVisitList },
|
||||
components: { Pagination, trialsSelect, confirmVisitList, BaseModel },
|
||||
props: {
|
||||
visible: {
|
||||
required: true,
|
||||
|
@ -125,6 +177,7 @@ export default {
|
|||
TrialCode: null,
|
||||
ResearchProgramNo: null,
|
||||
},
|
||||
PatientData: {},
|
||||
subjectIdList: [], // 受试者列表
|
||||
rules: {
|
||||
TrialId: [
|
||||
|
@ -142,8 +195,44 @@ export default {
|
|||
},
|
||||
],
|
||||
},
|
||||
// 新增受试者
|
||||
addSubject_model: {
|
||||
visible: false,
|
||||
title: this.$t("trials:selectSubject:button:add"),
|
||||
width: "500px",
|
||||
appendToBody: true,
|
||||
},
|
||||
addSubjectForm: {
|
||||
SubjectCode: null,
|
||||
},
|
||||
addSubjectrules: {
|
||||
SubjectCode: [
|
||||
{
|
||||
required: true,
|
||||
message: this.$t("trials:subject:format:notSubject"),
|
||||
trigger: ["blur", "change"],
|
||||
},
|
||||
],
|
||||
},
|
||||
};
|
||||
},
|
||||
computed: {
|
||||
bindPatientTip() {
|
||||
if (!this.submitMessage.SubjectId) return false;
|
||||
let PatientList = [];
|
||||
this.subjectIdList.some((item) => {
|
||||
if (
|
||||
item.SubejctId === this.submitMessage.SubjectId &&
|
||||
item.PatientList &&
|
||||
item.PatientList.length > 0
|
||||
) {
|
||||
PatientList.push(...item.PatientList);
|
||||
}
|
||||
});
|
||||
if (PatientList.length <= 0) return false;
|
||||
return PatientList;
|
||||
},
|
||||
},
|
||||
created() {
|
||||
this.getTrialList();
|
||||
},
|
||||
|
@ -159,16 +248,52 @@ export default {
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
// 新增受试者(前端操作未同步后端)
|
||||
async addSubject() {
|
||||
try {
|
||||
let validate = await this.$refs.addSubjectForm.validate();
|
||||
if (!validate) return;
|
||||
let flag = this.subjectIdList.some(
|
||||
(item) => item.SubjectCode === this.addSubjectForm.SubjectCode
|
||||
);
|
||||
if (flag)
|
||||
return this.$message.warning(
|
||||
this.$t("trials:addSubject:format:hasSubject")
|
||||
);
|
||||
let subject = {
|
||||
SubjectCode: this.addSubjectForm.SubjectCode,
|
||||
SubejctId: this.addSubjectForm.SubjectCode,
|
||||
};
|
||||
this.subjectIdList.unshift(subject);
|
||||
this.submitMessage.SubjectId = this.addSubjectForm.SubjectCode;
|
||||
this.addSubject_model.visible = false;
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
}
|
||||
},
|
||||
// 获取受试者列表
|
||||
async getTrialSubejctSelectList(id) {
|
||||
async getTrialSubejctSelectList(id, SubjectId = null) {
|
||||
let data = {
|
||||
TrialId: id,
|
||||
};
|
||||
try {
|
||||
let res = await getTrialSubejctSelectList(data);
|
||||
if (res.IsSuccess) {
|
||||
this.subjectIdList = res.Result;
|
||||
this.submitMessage.SubjectId = null;
|
||||
this.subjectIdList = res.Result || [];
|
||||
this.submitMessage.SubjectId = SubjectId;
|
||||
if (SubjectId) {
|
||||
this.$nextTick(() => {
|
||||
Object.keys(this.Patient).forEach((key) => {
|
||||
this.PatientData[key] = this.Patient[key];
|
||||
});
|
||||
let patient = this.bindPatientTip
|
||||
? this.bindPatientTip.map((item) => item.PatientId)
|
||||
: [];
|
||||
this.PatientData.PatientId = [this.Patient.PatientId, ...patient];
|
||||
this.$refs.confirmVisit.getList(true);
|
||||
this.$refs.confirmVisit.getSubjectVisitSelectList();
|
||||
});
|
||||
}
|
||||
}
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
|
@ -198,21 +323,13 @@ export default {
|
|||
this.btnLoading = false;
|
||||
if (res.IsSuccess) {
|
||||
this.submitMessage.SubjectId = res.Result;
|
||||
if (data.SubjectCode) {
|
||||
let obj = {
|
||||
PatientList: [],
|
||||
SubejctId: res.Result,
|
||||
SubjectCode: data.SubjectCode,
|
||||
};
|
||||
this.subjectIdList.unshift(obj);
|
||||
}
|
||||
this.getTrialSubejctSelectList(
|
||||
this.submitMessage.TrialId,
|
||||
res.Result
|
||||
);
|
||||
this.$message.success(this.$t("common:message:addedSuccessfully"));
|
||||
this.status = "visit";
|
||||
this.$emit("getList");
|
||||
this.$nextTick(() => {
|
||||
this.$refs.confirmVisit.getList(true);
|
||||
this.$refs.confirmVisit.getSubjectVisitSelectList();
|
||||
});
|
||||
}
|
||||
} catch (err) {
|
||||
console.log(err);
|
||||
|
@ -273,6 +390,9 @@ export default {
|
|||
justify-content: space-between;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.btnBox {
|
||||
float: right;
|
||||
}
|
||||
.search {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
@ -36,9 +36,9 @@
|
|||
</el-form>
|
||||
<div class="buttonBox" v-if="status === 'visit'">
|
||||
<!--确认v-if="visitStatus === 'confirm'"-->
|
||||
<el-button type="primary" :loading="btnLoading2" @click="confirm">
|
||||
<!-- <el-button type="primary" :loading="btnLoading2" @click="confirm">
|
||||
{{ $t("trials:seletctedReviews:timeline:confirmation") }}
|
||||
</el-button>
|
||||
</el-button> -->
|
||||
<!--确认提交v-if="visitStatus === 'submit'"-->
|
||||
<el-button
|
||||
type="primary"
|
||||
|
@ -147,6 +147,7 @@
|
|||
:list="visitList"
|
||||
@add="addVisit"
|
||||
@selectChange="selectChange"
|
||||
@putVisit="putVisit"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
|
@ -196,7 +197,6 @@ import {
|
|||
getVisitPatientStudyList,
|
||||
getSubjectVisitSelectList,
|
||||
addOrUpdateSubjectVisit,
|
||||
addSubjectPatientStudyBinding,
|
||||
submitVisitStudyBinding,
|
||||
} from "@/api/inspection.js";
|
||||
import { updateSubjectVisitStudyBinding } from "@/api/trials/visit.js";
|
||||
|
@ -256,6 +256,29 @@ export default {
|
|||
path: `/trials/trials-panel?trialId=${this.submitMessage.TrialId}&trialCode=${this.submitMessage.TrialCode}&researchProgramNo=${this.submitMessage.ResearchProgramNo}`,
|
||||
});
|
||||
},
|
||||
// 访视切换提交
|
||||
async putVisit(item) {
|
||||
let obj = {
|
||||
TrialId: this.submitMessage.TrialId,
|
||||
SubjectId: this.submitMessage.SubjectId,
|
||||
SubjectVisitId: item.VisitId,
|
||||
ScpStudyId: item.StudyId,
|
||||
IsAdd: true,
|
||||
};
|
||||
try {
|
||||
// this.btnLoading = true;
|
||||
let res = await updateSubjectVisitStudyBinding(obj);
|
||||
// this.btnLoading = false;
|
||||
if (res.IsSuccess) {
|
||||
// this.$message.success(this.$t("common:message:savedSuccessfully"));
|
||||
// this.$emit("update:visible", false);
|
||||
this.getList();
|
||||
}
|
||||
} catch (err) {
|
||||
// this.btnLoading = false;
|
||||
console.log(err);
|
||||
}
|
||||
},
|
||||
// 移除检查与访视绑定关系
|
||||
async remove(item) {
|
||||
try {
|
||||
|
@ -434,32 +457,6 @@ export default {
|
|||
var newWindow = window.open(routeData.href, "_blank");
|
||||
this.$emit("setOpenWindow", newWindow);
|
||||
},
|
||||
// 确认
|
||||
async confirm() {
|
||||
let fd = await this.formatData();
|
||||
if (!fd) return;
|
||||
let arr = this.tableSelectData.map((item) => {
|
||||
let obj = {
|
||||
TrialId: this.submitMessage.TrialId,
|
||||
SubjectId: this.submitMessage.SubjectId,
|
||||
SubjectVisitId: item.SubjectVisitId,
|
||||
ScpStudyId: item.SCPStudyId,
|
||||
};
|
||||
return obj;
|
||||
});
|
||||
try {
|
||||
this.btnLoading2 = true;
|
||||
let res = await addSubjectPatientStudyBinding(arr);
|
||||
this.btnLoading2 = false;
|
||||
if (res.IsSuccess) {
|
||||
this.visitStatus = "submit";
|
||||
this.$message.success(this.$t("common:message:savedSuccessfully"));
|
||||
}
|
||||
} catch (err) {
|
||||
this.btnLoading2 = false;
|
||||
console.log(err);
|
||||
}
|
||||
},
|
||||
// 确认提交
|
||||
async confirmSubmit() {
|
||||
let confirm = await this.$confirm(
|
||||
|
|
|
@ -133,6 +133,7 @@
|
|||
</el-form-item>
|
||||
</el-form>
|
||||
</div>
|
||||
<password />
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
@ -143,10 +144,12 @@ import {
|
|||
setNewUserName,
|
||||
SetNewCheckCode,
|
||||
} from "@/api/system/user.js";
|
||||
import password from "./password.vue";
|
||||
var timer = "";
|
||||
var countdown = 60;
|
||||
export default {
|
||||
name: "account",
|
||||
components: { password },
|
||||
props: {
|
||||
user: {
|
||||
required: true,
|
||||
|
|
|
@ -13,9 +13,6 @@
|
|||
$t("trials:trials-myinfo:menuTitle:account")
|
||||
}}</el-menu-item>
|
||||
<el-menu-item index="3">{{
|
||||
$t("trials:trials-myinfo:menuTitle:password")
|
||||
}}</el-menu-item>
|
||||
<el-menu-item index="4">{{
|
||||
$t("trials:trials-myinfo:menuTitle:loginLog")
|
||||
}}</el-menu-item>
|
||||
</el-menu>
|
||||
|
@ -31,8 +28,7 @@
|
|||
:IsCanConnectInternet="IsCanConnectInternet"
|
||||
v-if="activeIndex === '2'"
|
||||
/>
|
||||
<password v-if="activeIndex === '3'" />
|
||||
<login-log v-if="activeIndex === '4'" :name="userName" :isMine="true" />
|
||||
<login-log v-if="activeIndex === '3'" :name="userName" :isMine="true" />
|
||||
</div>
|
||||
</div>
|
||||
</template>
|
||||
|
@ -40,7 +36,6 @@
|
|||
<script>
|
||||
import mine from "./mine.vue";
|
||||
import account from "./account.vue";
|
||||
import password from "./password.vue";
|
||||
import loginLog from "@/views/trials/trials-panel/trial-summary/login-log";
|
||||
import { getUserTypeList, getUser } from "@/api/admin.js";
|
||||
import { getHospital } from "@/api/hospital.js";
|
||||
|
@ -49,7 +44,7 @@ import { mapGetters } from "vuex";
|
|||
|
||||
export default {
|
||||
name: "TrialsMyinfo",
|
||||
components: { mine, account, password, "login-log": loginLog },
|
||||
components: { mine, account, "login-log": loginLog },
|
||||
data() {
|
||||
return {
|
||||
activeIndex: "1",
|
||||
|
@ -123,7 +118,9 @@ export default {
|
|||
.contentBox {
|
||||
width: calc(100% - 220px);
|
||||
background-color: #fff;
|
||||
padding: 20px;
|
||||
padding: 0 20px;
|
||||
height: 100%;
|
||||
overflow: auto;
|
||||
// padding-bottom: 50px;
|
||||
}
|
||||
.trial-myinfo-head {
|
||||
|
@ -136,7 +133,7 @@ export default {
|
|||
overflow: auto;
|
||||
background: #fff;
|
||||
// width: calc(50% - 9px);
|
||||
margin: 6px 0;
|
||||
// margin: 6px 0;
|
||||
height: 100%;
|
||||
// padding-bottom: 50px;
|
||||
.trial-myinfo-left-top {
|
||||
|
@ -183,8 +180,8 @@ export default {
|
|||
overflow: auto;
|
||||
background: #fff;
|
||||
// width: calc(50% - 9px);
|
||||
margin: 6px 0;
|
||||
padding-bottom: 50px;
|
||||
// margin: 6px 0;
|
||||
height: 100%;
|
||||
.sendCode {
|
||||
position: absolute;
|
||||
right: -10px;
|
||||
|
|
|
@ -1,16 +1,5 @@
|
|||
<template>
|
||||
<div class="trial-myinfo-left">
|
||||
<div class="trial-myinfo-left-top">
|
||||
<div class="trial-myinfo-head">
|
||||
<!-- 个人头像 -->
|
||||
{{ $t("trials:trials-myinfo:title:avater") }}
|
||||
</div>
|
||||
<div class="trial-myinfo-body">
|
||||
<div>
|
||||
{{ user.LastName }}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="trial-myinfo-left-bottom">
|
||||
<div class="trial-myinfo-head">
|
||||
<!-- 用户基本信息 -->
|
||||
|
|
|
@ -1,66 +1,59 @@
|
|||
<template>
|
||||
<div class="trial-myinfo-right">
|
||||
<div class="trial-myinfo-right-box">
|
||||
<div class="trial-myinfo-head">
|
||||
<!-- 修改密码 -->
|
||||
{{ $t("trials:trials-myinfo:title:updatePaasord") }}
|
||||
</div>
|
||||
<el-form
|
||||
ref="passwordForm"
|
||||
label-position="right"
|
||||
:model="password"
|
||||
:rules="passwordFormRules"
|
||||
label-width="100px"
|
||||
>
|
||||
<!-- 旧密码 -->
|
||||
<el-form-item
|
||||
:label="$t('recompose:form:oldPassword')"
|
||||
prop="OldPassWord"
|
||||
>
|
||||
<el-input
|
||||
v-model="password.OldPassWord"
|
||||
type="password"
|
||||
show-password
|
||||
auto-complete="new-password"
|
||||
:placeholder="$t('recompose:form:oldPassword')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- 新密码 -->
|
||||
<el-form-item
|
||||
:label="$t('recompose:form:newPassword')"
|
||||
prop="NewPassWord"
|
||||
>
|
||||
<el-input
|
||||
v-model="password.NewPassWord"
|
||||
type="password"
|
||||
show-password
|
||||
auto-complete="new-password"
|
||||
:placeholder="$t('recompose:form:newPassword')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- 确认密码 -->
|
||||
<el-form-item
|
||||
:label="$t('recompose:form:confirmPassword')"
|
||||
prop="ConfirmPassWord"
|
||||
>
|
||||
<el-input
|
||||
v-model="password.ConfirmPassWord"
|
||||
type="password"
|
||||
show-password
|
||||
auto-complete="new-password"
|
||||
:placeholder="$t('recompose:form:confirmPassword')"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-button
|
||||
type="primary"
|
||||
size="small"
|
||||
class="trial-info-btn"
|
||||
@click="save"
|
||||
>
|
||||
{{ $t("trials:trials-myinfo:button:save") }}
|
||||
</el-button>
|
||||
<div class="trial-myinfo-right-box">
|
||||
<div class="trial-myinfo-head">
|
||||
<!-- 修改密码 -->
|
||||
{{ $t("trials:trials-myinfo:title:updatePaasord") }}
|
||||
</div>
|
||||
<el-form
|
||||
ref="passwordForm"
|
||||
label-position="right"
|
||||
:model="password"
|
||||
:rules="passwordFormRules"
|
||||
label-width="100px"
|
||||
>
|
||||
<!-- 旧密码 -->
|
||||
<el-form-item
|
||||
:label="$t('recompose:form:oldPassword')"
|
||||
prop="OldPassWord"
|
||||
>
|
||||
<el-input
|
||||
v-model="password.OldPassWord"
|
||||
type="password"
|
||||
show-password
|
||||
auto-complete="new-password"
|
||||
:placeholder="$t('recompose:form:oldPassword')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- 新密码 -->
|
||||
<el-form-item
|
||||
:label="$t('recompose:form:newPassword')"
|
||||
prop="NewPassWord"
|
||||
>
|
||||
<el-input
|
||||
v-model="password.NewPassWord"
|
||||
type="password"
|
||||
show-password
|
||||
auto-complete="new-password"
|
||||
:placeholder="$t('recompose:form:newPassword')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<!-- 确认密码 -->
|
||||
<el-form-item
|
||||
:label="$t('recompose:form:confirmPassword')"
|
||||
prop="ConfirmPassWord"
|
||||
>
|
||||
<el-input
|
||||
v-model="password.ConfirmPassWord"
|
||||
type="password"
|
||||
show-password
|
||||
auto-complete="new-password"
|
||||
:placeholder="$t('recompose:form:confirmPassword')"
|
||||
/>
|
||||
</el-form-item>
|
||||
</el-form>
|
||||
<el-button type="primary" size="small" class="trial-info-btn" @click="save">
|
||||
{{ $t("trials:trials-myinfo:button:save") }}
|
||||
</el-button>
|
||||
</div>
|
||||
</template>
|
||||
<script>
|
||||
|
|
|
@ -104,9 +104,9 @@
|
|||
<script>
|
||||
import {
|
||||
getSubjectVisitSelectList,
|
||||
addSubjectPatientStudyBinding,
|
||||
addOrUpdateSubjectVisit,
|
||||
} from "@/api/inspection.js";
|
||||
import { updateSubjectVisitStudyBinding } from "@/api/trials/visit.js";
|
||||
import visitSelect from "@/components/visitSelect";
|
||||
export default {
|
||||
name: "editVisitDialog",
|
||||
|
@ -169,11 +169,11 @@ export default {
|
|||
SubjectId: this.data.SubjectId,
|
||||
SubjectVisitId: this.form.SubjectVisitId,
|
||||
ScpStudyId: this.data.StudyId || this.data.SCPStudyId,
|
||||
IsAdd: true,
|
||||
};
|
||||
let arr = [obj];
|
||||
try {
|
||||
this.btnLoading = true;
|
||||
let res = await addSubjectPatientStudyBinding(arr);
|
||||
let res = await updateSubjectVisitStudyBinding(obj);
|
||||
this.btnLoading = false;
|
||||
if (res.IsSuccess) {
|
||||
this.$message.success(this.$t("common:message:savedSuccessfully"));
|
||||
|
|
|
@ -19,9 +19,9 @@
|
|||
class="demo-form-inline topForm"
|
||||
:rules="rules"
|
||||
ref="addSubjectForm"
|
||||
label-width="150px"
|
||||
label-width="130px"
|
||||
>
|
||||
<div class="selectAndBtn">
|
||||
<div>
|
||||
<!--受试者编号-->
|
||||
<el-form-item
|
||||
:label="$t('trials:crcQuestion:table:subjectId')"
|
||||
|
@ -35,56 +35,71 @@
|
|||
default-first-option
|
||||
clearable
|
||||
:disabled="status === 'visit'"
|
||||
style="width: 300px"
|
||||
>
|
||||
<el-option
|
||||
v-for="item in subjectIdList"
|
||||
:key="item.SubejctId"
|
||||
:label="item.SubjectCode"
|
||||
:label="
|
||||
item.ShortName || item.Sex
|
||||
? `${item.SubjectCode}(${item.ShortName},${
|
||||
item.Sex ? $fd('sex', Number(item.Sex)) : ''
|
||||
})`
|
||||
: item.SubjectCode
|
||||
"
|
||||
:value="item.SubejctId"
|
||||
>
|
||||
</el-option>
|
||||
</el-select>
|
||||
</el-form-item>
|
||||
<!--患者-->
|
||||
<el-form-item
|
||||
:label="$t('trials:subject:messge:patient')"
|
||||
label-width="100px"
|
||||
>
|
||||
<el-input
|
||||
:value="selectPatient.map((item) => item.PatientIdStr).join(', ')"
|
||||
disabled
|
||||
:title="selectPatient.map((item) => item.PatientIdStr).join(', ')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="save"
|
||||
:loading="btnLoading"
|
||||
@click.stop="openPatientList"
|
||||
v-if="status === 'trial'"
|
||||
:disabled="!submitMessage.SubjectId"
|
||||
>
|
||||
{{ $t("trials:addRP:button:confirmAddPR") }}
|
||||
{{ $t("common:button:add") }}
|
||||
</el-button>
|
||||
<!-- <el-button
|
||||
type="primary"
|
||||
@click="remove"
|
||||
:loading="btnLoading"
|
||||
v-else
|
||||
>
|
||||
{{ $t("common:button:remove") }}
|
||||
</el-button> -->
|
||||
<div class="btnBox">
|
||||
<el-button
|
||||
type="primary"
|
||||
@click="save"
|
||||
:loading="btnLoading"
|
||||
v-if="status === 'trial'"
|
||||
>
|
||||
{{ $t("trials:addRP:button:confirmAddPR") }}
|
||||
</el-button>
|
||||
<!-- <el-button
|
||||
type="primary"
|
||||
@click="remove"
|
||||
:loading="btnLoading"
|
||||
v-else
|
||||
>
|
||||
{{ $t("common:button:remove") }}
|
||||
</el-button> -->
|
||||
</div>
|
||||
</div>
|
||||
<div>
|
||||
<el-form-item :label="$t('trials:study:tabpane:bindPatient')">
|
||||
<el-form-item
|
||||
:label="$t('trials:study:tabpane:bindPatient')"
|
||||
:style="{ opacity: bindPatientTip ? 1 : 0 }"
|
||||
>
|
||||
<span v-if="bindPatientTip">{{
|
||||
bindPatientTip.map((item) => item.PatientIdStr).join(", ")
|
||||
}}</span>
|
||||
</el-form-item>
|
||||
</div>
|
||||
<!--患者-->
|
||||
<el-form-item :label="$t('trials:subject:messge:patient')">
|
||||
<el-input
|
||||
:value="selectPatient.map((item) => item.PatientIdStr).join(', ')"
|
||||
disabled
|
||||
:title="selectPatient.map((item) => item.PatientIdStr).join(', ')"
|
||||
/>
|
||||
</el-form-item>
|
||||
<el-button
|
||||
type="primary"
|
||||
@click.stop="openPatientList"
|
||||
v-if="status === 'trial'"
|
||||
:disabled="!submitMessage.SubjectId"
|
||||
>
|
||||
{{ $t("common:button:add") }}
|
||||
</el-button>
|
||||
</el-form>
|
||||
</div>
|
||||
<confirmVistList
|
||||
|
@ -173,7 +188,11 @@ export default {
|
|||
if (!this.submitMessage.SubjectId) return false;
|
||||
let PatientList = [];
|
||||
this.subjectIdList.some((item) => {
|
||||
if (item.SubejctId === this.submitMessage.SubjectId) {
|
||||
if (
|
||||
item.SubejctId === this.submitMessage.SubjectId &&
|
||||
item.PatientList &&
|
||||
item.PatientList.length > 0
|
||||
) {
|
||||
PatientList.push(...item.PatientList);
|
||||
}
|
||||
});
|
||||
|
@ -222,7 +241,9 @@ export default {
|
|||
if (res.IsSuccess) {
|
||||
this.submitMessage.SubjectId = res.Result;
|
||||
this.submitMessage.TrialId = data.TrialId;
|
||||
let patient = this.bindPatientTip.map((item) => item.PatientId);
|
||||
let patient = this.bindPatientTip
|
||||
? this.bindPatientTip.map((item) => item.PatientId)
|
||||
: [];
|
||||
this.Patient.PatientId = [...data.PatientIdList, ...patient];
|
||||
this.$message.success(this.$t("common:message:addedSuccessfully"));
|
||||
this.$emit("getList");
|
||||
|
@ -311,6 +332,9 @@ export default {
|
|||
width: 100%;
|
||||
}
|
||||
}
|
||||
.btnBox {
|
||||
float: right;
|
||||
}
|
||||
.search {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
|
|
|
@ -0,0 +1,132 @@
|
|||
<template>
|
||||
<el-dialog
|
||||
:visible.sync="visible"
|
||||
:close-on-click-modal="false"
|
||||
:fullscreen="true"
|
||||
custom-class="upload-dialog"
|
||||
:before-close="beforeClosePitentDig"
|
||||
>
|
||||
<span slot="title">{{ this.$t("trials:subject:title:studyList") }}</span>
|
||||
<el-table
|
||||
ref="patientStudyList"
|
||||
v-loading="loading"
|
||||
v-adaptive="{ bottomOffset: 60 }"
|
||||
:data="list"
|
||||
stripe
|
||||
height="100"
|
||||
>
|
||||
<el-table-column type="index" width="40" />
|
||||
<!--患者ID-->
|
||||
<el-table-column
|
||||
prop="PatientIdStr"
|
||||
:label="$t('trials:uploadDicomList:table:pId')"
|
||||
show-overflow-tooltip
|
||||
min-width="140"
|
||||
sortable="custom"
|
||||
></el-table-column>
|
||||
<!--患者姓名-->
|
||||
<el-table-column
|
||||
prop="PatientName"
|
||||
:label="$t('trials:uploadDicomList:table:patientName')"
|
||||
show-overflow-tooltip
|
||||
min-width="140"
|
||||
sortable="custom"
|
||||
></el-table-column>
|
||||
<!--出生日期-->
|
||||
<el-table-column
|
||||
prop="PatientBirthDate"
|
||||
:label="$t('trials:inspection:table:birthdate')"
|
||||
show-overflow-tooltip
|
||||
min-width="140"
|
||||
sortable="custom"
|
||||
></el-table-column>
|
||||
<!--性别-->
|
||||
<el-table-column
|
||||
prop="PatientSex"
|
||||
:label="$t('trials:trials-myinfo:form:gender')"
|
||||
show-overflow-tooltip
|
||||
min-width="140"
|
||||
sortable="custom"
|
||||
></el-table-column>
|
||||
<!--操作-->
|
||||
<el-table-column :label="$t('common:action:action')" width="250">
|
||||
<template slot-scope="scope">
|
||||
<el-button
|
||||
circle
|
||||
icon="el-icon-delete"
|
||||
:title="$t('trials:subject:patientStudyList:button:delete')"
|
||||
@click.stop="remove(scope.row)"
|
||||
/>
|
||||
</template>
|
||||
</el-table-column>
|
||||
</el-table>
|
||||
</el-dialog>
|
||||
</template>
|
||||
<script>
|
||||
import { deleteSubjectPatientBinding } from "@/api/inspection.js";
|
||||
export default {
|
||||
name: "patientStudyList",
|
||||
props: {
|
||||
visible: {
|
||||
required: true,
|
||||
default: false,
|
||||
},
|
||||
list: {
|
||||
required: true,
|
||||
default: () => {
|
||||
return [];
|
||||
},
|
||||
},
|
||||
SubjectId: {
|
||||
required: true,
|
||||
default: "",
|
||||
},
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
loading: false,
|
||||
};
|
||||
},
|
||||
methods: {
|
||||
beforeClosePitentDig() {
|
||||
this.$emit("update:visible", false);
|
||||
},
|
||||
async remove(item) {
|
||||
try {
|
||||
let confirm = await this.$confirm(
|
||||
this.$t("trials:sitesList:message:removeSite"),
|
||||
{
|
||||
type: "warning",
|
||||
distinguishCancelAndClose: true,
|
||||
confirmButtonText: this.$t("common:button:confirm"),
|
||||
cancelButtonText: this.$t("recompose:button:cancel"),
|
||||
}
|
||||
);
|
||||
if (confirm !== "confirm") return;
|
||||
let params = {
|
||||
PatientId: item.PatientId,
|
||||
SubjectId: this.SubjectId,
|
||||
TrialId: this.$route.query.trialId,
|
||||
};
|
||||
this.loading = true;
|
||||
let res = await deleteSubjectPatientBinding(params);
|
||||
this.loading = false;
|
||||
if (res.IsSuccess) {
|
||||
this.$message.success(this.$t("common:message:removeSuccessfully"));
|
||||
// this.$emit("update:visible", false);
|
||||
this.$emit("getList");
|
||||
let index = this.list.findIndex(
|
||||
(i) => i.PatientId === item.PatientId
|
||||
);
|
||||
let list = [...this.list];
|
||||
list.splice(index, 1);
|
||||
this.$emit("update:list", list);
|
||||
}
|
||||
} catch (err) {
|
||||
this.btnLoading = false;
|
||||
console.log(err);
|
||||
}
|
||||
},
|
||||
},
|
||||
};
|
||||
</script>
|
|
@ -111,6 +111,10 @@
|
|||
<span
|
||||
v-for="(item, index) in scope.row.PatientList"
|
||||
:key="`${item.PatientId}${index}`"
|
||||
@click.stop="
|
||||
openPatientStudy(scope.row.PatientList, scope.row.Id)
|
||||
"
|
||||
style="color: #68a2d5; cursor: pointer"
|
||||
>
|
||||
{{
|
||||
index === scope.row.PatientList.length - 1
|
||||
|
@ -280,10 +284,18 @@
|
|||
@handleOpenDialog="handleOpenDialog"
|
||||
@getList="getList"
|
||||
/>
|
||||
<!--患者列表-->
|
||||
<patientStudyList
|
||||
v-if="PitentVisible"
|
||||
:visible.sync="PitentVisible"
|
||||
:list.sync="PitentStudyList"
|
||||
:SubjectId="PitentStudySubjectId"
|
||||
@getList="getList"
|
||||
/>
|
||||
</BaseContainer>
|
||||
</template>
|
||||
<script>
|
||||
import { getTrialSiteSelect, deleteSubject } from "@/api/trials";
|
||||
import { deleteSubject } from "@/api/trials";
|
||||
import { getPatientSubejctList } from "@/api/trials/subject";
|
||||
import { getSubjectList_Export } from "@/api/export";
|
||||
import BaseContainer from "@/components/BaseContainer";
|
||||
|
@ -291,6 +303,7 @@ import Pagination from "@/components/Pagination";
|
|||
import SubjectsForm from "./components/SubjectsForm";
|
||||
import SubjectStatusForm from "./components/SubjectStatusForm";
|
||||
import addSubject from "./components/add-subject.vue";
|
||||
import patientStudyList from "./components/patient-study-list.vue";
|
||||
// import confirmVisitList from "../../../trials-inspection/components/confirm-visit-list.vue";
|
||||
const searchDataDefault = () => {
|
||||
return {
|
||||
|
@ -312,6 +325,7 @@ export default {
|
|||
SubjectsForm,
|
||||
SubjectStatusForm,
|
||||
addSubject,
|
||||
patientStudyList,
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
|
@ -328,6 +342,10 @@ export default {
|
|||
addSubjectTrialsVisible: false,
|
||||
// 确认访视
|
||||
confirmTrialsVisible: false,
|
||||
// 患者列表(点击病历号打开)
|
||||
PitentVisible: false,
|
||||
PitentStudyList: [],
|
||||
PitentStudySubjectId: null,
|
||||
};
|
||||
},
|
||||
watch: {
|
||||
|
@ -349,6 +367,11 @@ export default {
|
|||
this.loading = false;
|
||||
});
|
||||
},
|
||||
openPatientStudy(list, id) {
|
||||
this.PitentStudyList = list;
|
||||
this.PitentStudySubjectId = id;
|
||||
this.PitentVisible = true;
|
||||
},
|
||||
// 获取受试者列表
|
||||
async getList() {
|
||||
let data = {};
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<template>
|
||||
<BaseContainer>
|
||||
<template slot="search-container" v-if="!isMine">
|
||||
<template slot="search-container">
|
||||
<el-form :inline="true">
|
||||
<el-form-item
|
||||
:label="$t('trials:loginLog:table:optType')"
|
||||
|
@ -41,6 +41,7 @@
|
|||
<el-form-item
|
||||
:label="$t('trials:loginLog:table:userName')"
|
||||
prop="LoginUserName"
|
||||
v-if="!isMine"
|
||||
>
|
||||
<el-input
|
||||
v-model="searchData.LoginUserName"
|
||||
|
@ -52,6 +53,7 @@
|
|||
<el-form-item
|
||||
:label="$t('trials:loginLog:table:userType')"
|
||||
prop="OptType"
|
||||
v-if="!isMine"
|
||||
>
|
||||
<el-select
|
||||
v-model="searchData.LoginUserTypeEnum"
|
||||
|
|
Loading…
Reference in New Issue