From e9a1d3e11c9108a7b8a49e15e7d6a2849d3941d3 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 9 May 2024 11:28:18 +0800 Subject: [PATCH 1/6] =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E7=BC=96?= =?UTF-8?q?=E8=BE=91=E4=BF=A1=E6=81=AF=E5=B9=B4=E9=BE=84=E8=AE=BE=E7=BD=AE?= =?UTF-8?q?=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../subject-list/components/SubjectsForm.vue | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue index 330acc2..19e20a8 100644 --- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue +++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue @@ -21,8 +21,8 @@ - - + + @@ -113,6 +113,20 @@ export default { }, { max: 50, message: `${this.$t("common:ruleMessage:maxLength")} 50` }, ], + Age: [ + { + pattern: /^[1-9]\d*$/, + message: this.$t("trials:subject:formRule:checkAge"), + trigger: "blur", + }, + { + type: "number", + min: 1, + max: 200, + message: this.$t("trials:subject:formRule:numberAge"), + trigger: "blur", + }, + ], }, btnLoading: false, siteOptions: [], From f8ab8e8eeaf9f6f61e7d7baf859d80e4785e5570 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 9 May 2024 15:46:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E4=BF=AE=E6=94=B915?= =?UTF-8?q?=E5=A4=A9=E6=A0=A1=E9=AA=8C=E5=BC=B9=E7=AA=97=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E5=8F=96=E6=B6=88=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/visitSelect/index.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/visitSelect/index.vue b/src/components/visitSelect/index.vue index 49fbb9b..773caed 100644 --- a/src/components/visitSelect/index.vue +++ b/src/components/visitSelect/index.vue @@ -121,7 +121,7 @@ export default { this.$t("trials:uploadDicomList:label:prompt"), { type: "warning", - showCancelButton: false, + // showCancelButton: false, } ) .then(() => { @@ -133,7 +133,7 @@ export default { this.$emit("putVisit", data); }) .catch((err) => { - this.visit = this.modelData; + this.visit = this.modelData; }); return false; } From 7d6202bb129df675c137f551bb36c3ff047e62ac Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 10 May 2024 13:22:27 +0800 Subject: [PATCH 3/6] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-inspection/components/add-trials-list.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue index b963079..326d09e 100644 --- a/src/views/trials/trials-inspection/components/add-trials-list.vue +++ b/src/views/trials/trials-inspection/components/add-trials-list.vue @@ -53,7 +53,7 @@ :label=" item.ShortName || item.Sex ? `${item.SubjectCode}（${item.ShortName}，${ - item.Sex ? $fd('sex',item.Sex) : '' + item.Sex ? $fd('sex', item.Sex) : '' }）` : item.SubjectCode " @@ -360,6 +360,7 @@ export default { this.$emit("getList"); } } catch (err) { + this.btnLoading = false; console.log(err); } }, @@ -393,6 +394,7 @@ export default { this.$refs.confirmVisit.changeVisitStatus(true); } } catch (err) { + this.btnLoading = false; console.log(err); } }, From 99bb0b61c759ee21b1ee59f0453624d9eea38b7c Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 10 May 2024 16:10:36 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E5=85=B3=E8=81=94?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E5=BC=B9=E6=A1=86=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../hirVisit/components/edit-study-list.vue | 3 ++- .../trial-summary/audit-record/index.vue | 15 ++++++++++----- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue b/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue index af45682..85db723 100644 --- a/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue +++ b/src/views/trials/trials-panel/hirVisit/components/edit-study-list.vue @@ -117,7 +117,7 @@ - + @@ -128,6 +128,7 @@ start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" + clearable > diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue index 31f8abe..613e6fe 100644 --- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue +++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue @@ -877,7 +877,7 @@ 0" + v-if="otherData2.length > 0" style="margin-top: 20px; margin-bottom: 10px" > {{ $t("trials:auditRecord:title:signInfo") }} -
- {{ otherData[0].Value }} +
+ {{ otherData2[0].Value }}
@@ -161,6 +163,7 @@ import { getTrialSubejctSelectList, addSubjectPatientBinding, deleteSubjectPatientBinding, + verifyTrialSubject, } from "@/api/inspection.js"; export default { name: "addTrialsList", @@ -242,6 +245,7 @@ export default { }, ], }, + errMessage: null, }; }, computed: { @@ -286,17 +290,30 @@ export default { // 新增受试者(前端操作未同步后端) async addSubject() { try { + this.errMessage = null; let validate = await this.$refs.addSubjectForm.validate(); if (!validate) return; - let subject = { + let data = { + TrialId: this.submitMessage.TrialId, SubjectCode: this.addSubjectForm.SubjectCode, - SubejctId: this.addSubjectForm.SubjectCode, }; - this.subjectIdList.unshift(subject); - this.submitMessage.SubjectId = this.addSubjectForm.SubjectCode; - this.addSubject_model.visible = false; + let res = await verifyTrialSubject(data); + if (res.IsSuccess) { + 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); + if (err.Code === 5) { + this.getTrialSubejctSelectList(this.submitMessage.TrialId, null); + this.$emit("getList"); + this.errMessage = err.ErrorMessage; + } } }, // 获取受试者列表 @@ -415,6 +432,15 @@ export default { };