diff --git a/src/api/inspection.js b/src/api/inspection.js index 7ce9ce6..f480a30 100644 --- a/src/api/inspection.js +++ b/src/api/inspection.js @@ -116,4 +116,13 @@ export function submitVisitStudyBinding(data) { method: 'post', data }) +} + +// 清除数据 +export function DeletePatientStudyAllData(params) { + return request({ + url: '/Patient/DeletePatientStudyAllData', + method: 'delete', + params + }) } \ No newline at end of file diff --git a/src/views/system/dicomAE/components/edit-dicom.vue b/src/views/system/dicomAE/components/edit-dicom.vue index 1eebc8d..0e02ab1 100644 --- a/src/views/system/dicomAE/components/edit-dicom.vue +++ b/src/views/system/dicomAE/components/edit-dicom.vue @@ -13,27 +13,30 @@ :model="form" :rules="rules" size="small" - label-width="150px" + label-width="100px" >
- + - + - + - + - +
@@ -95,10 +98,26 @@ export default { }, rules: { CalledAE: [ - { required: true, message: "请输入AE Title", trigger: "blur" }, + { + required: true, + message: this.$t("common:ruleMessage:specify"), + trigger: "blur", + }, + ], + IP: [ + { + required: true, + message: this.$t("common:ruleMessage:specify"), + trigger: "blur", + }, + ], + Port: [ + { + required: true, + message: this.$t("common:ruleMessage:specify"), + trigger: "blur", + }, ], - IP: [{ required: true, message: "请输入IP", trigger: "blur" }], - Port: [{ required: true, message: "请输入pORT", trigger: "blur" }], }, btnLoading: false, }; diff --git a/src/views/system/dicomAE/index.vue b/src/views/system/dicomAE/index.vue index ef325f4..9949068 100644 --- a/src/views/system/dicomAE/index.vue +++ b/src/views/system/dicomAE/index.vue @@ -22,16 +22,18 @@ - 搜索 - 重置 + {{ + $t("system:dicom:search:search") + }} + {{ + $t("system:dicom:search:reset") + }} 新增{{ $t("system:dicom:search:add") }} @@ -77,6 +79,26 @@ min-width="120" show-overflow-tooltip /> + + + + + + {{ $t("system:dicom:table:edit") }}{{ $t("system:dicom:action:edit") }} 删除 - 测试{{ $t("system:dicom:action:remove") }} + {{ + $t("system:dicom:action:test") + }} @@ -144,7 +166,7 @@ export default { list: [], // 弹窗 editDicomVisible: false, - editDicomTitle: "添加", + editDicomTitle: "", DICOM: {}, }; }, @@ -182,9 +204,9 @@ export default { // 打开弹框 openDialog(key, item = {}) { this.editDicomVisible = true; - this.editDicomTitle = "编辑"; + this.editDicomTitle = this.$t("system:dicom:action:edit"); if (key === "add") { - this.editDicomTitle = "添加"; + this.editDicomTitle = this.$t("system:dicom:search:add"); } this.DICOM = JSON.parse(JSON.stringify(item)); }, @@ -222,6 +244,7 @@ export default { } else { this.$message.error(this.$t("system:dicomAE:connect:error")); } + this.getList(); }, }, }; 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 f80011e..34920c2 100644 --- a/src/views/trials/trials-inspection/components/research-trials-list.vue +++ b/src/views/trials/trials-inspection/components/research-trials-list.vue @@ -53,10 +53,10 @@ show-overflow-tooltip min-width="140" > - + @@ -82,7 +82,7 @@ min-width="140" > diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue index 204bb8f..fe03258 100644 --- a/src/views/trials/trials-inspection/index.vue +++ b/src/views/trials/trials-inspection/index.vue @@ -132,7 +132,11 @@ show-overflow-tooltip min-width="140" sortable="custom" - > + > + + + @@ -272,7 +282,7 @@ import Pagination from "@/components/Pagination"; import researchTrialsList from "./components/research-trials-list"; import addTrialsList from "./components/add-trials-list"; import viewStudyList from "./components/view-study-list"; -import { getPatientList } from "@/api/inspection.js"; +import { getPatientList, DeletePatientStudyAllData } from "@/api/inspection.js"; import { getDicomCalledAEList, getDicomCallingAEList } from "@/api/dicomAE.js"; const defaultSearchData = () => { @@ -326,6 +336,31 @@ export default { this.getList(); }, methods: { + // 清除数据 + async DeletePatientStudyAllData(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, + }; + let res = await DeletePatientStudyAllData(params); + if (res.IsSuccess) { + this.getList(); + this.$message.success(this.$t("common:message:removedSuccessfully")); + } + } catch (err) { + console.log(err); + } + }, // 获取calledAE列表 async getDicomCalledAEList() { try { diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue index a128f04..3a9bffb 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalAdd.vue @@ -242,12 +242,11 @@ export default { if (["PM", "PI", "SR", "OA"].includes(name)) { this.form.IsZhiZhun = true; this.form.OrganizationName = this.hospitalName; - return (this.IsZhiZhunDisabled = true); + return; } } this.form.IsZhiZhun = false; this.form.OrganizationName = null; - this.IsZhiZhunDisabled = false; }, deep: true, immediate: true, diff --git a/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue b/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue index fa579a2..9ebffd3 100644 --- a/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue +++ b/src/views/trials/trials-panel/subject/subject-list/components/add-subject.vue @@ -24,7 +24,7 @@
@@ -52,9 +52,17 @@ + + + {{ $t("trials:selectSubject:button:add") }} + - {{ $t("common:button:add") }} + {{ $t("common:button:check") }}
+ + + +