From 7ca7b4c378024b5e2c394ea51731d7ca33239927 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 24 Sep 2025 14:21:34 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=97=E8=AF=95=E8=80=85=E6=96=B0=E5=A2=9E?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=AE=BF=E8=A7=86=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/confirm-visit-list.vue         |   6 +-
 .../components/patient-study-list.vue         | 124 ++++++++----------
 2 files changed, 60 insertions(+), 70 deletions(-)

diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
index ab9d18e..9239d00 100644
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
@@ -1,7 +1,7 @@
 <template>
   <div>
     <div class="search">
-      <p class="line">{{ $t("trials:inspection:message:confirmVisit") }}</p>
+      <p class="line" v-if="showTitle">{{ $t("trials:inspection:message:confirmVisit") }}</p>
       <div class="form">
         <el-form :inline="true" class="base-search-form">
           <!-- 检查日期 -->
@@ -140,6 +140,10 @@ export default {
       require: true,
       default: "trial",
     },
+    showTitle: {
+      type: Boolean,
+      default: true
+    }
   },
   data() {
     return {
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/patient-study-list.vue b/src/views/trials/trials-panel/subject/subject-list/components/patient-study-list.vue
index c5faf45..4ff8e52 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/patient-study-list.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/patient-study-list.vue
@@ -1,79 +1,51 @@
 <template>
-  <el-dialog
-    v-dialogDrag
-    :visible.sync="visible"
-    :close-on-click-modal="false"
-    custom-class="upload-dialog"
-    :before-close="beforeClosePitentDig"
-  >
-    <span slot="title">{{ this.$t("trials:subject:title:studyList") }}</span>
-    <el-table
-      ref="patientStudyList"
-      v-loading="loading"
-      :data="list"
-      stripe
-      height="300px"
-    >
-      <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"
-      >
-        <template slot-scope="scope">
-          <span>{{ $fd("Sex", scope.row.PatientSex) }}</span>
-        </template>
-      </el-table-column>
-      <!--操作-->
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="80"
-        v-if="hasPermi(['trials:trials-panel:subject:delPatient'])"
-      >
-        <template slot-scope="scope">
-          <el-button
-            v-hasPermi="['trials:trials-panel:subject:delPatient']"
-            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 v-dialogDrag :visible.sync="visible" :close-on-click-modal="false" custom-class="upload-dialog"
+    :fullscreen="true" :before-close="beforeClosePitentDig">
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+      <el-tab-pane :label="$t('trials:subject:title:studyList')" name="patient">
+        <!-- <span slot="title">{{ this.$t("trials:subject:title:studyList") }}</span> -->
+        <el-table ref="patientStudyList" v-loading="loading" :data="list" stripe height="300px">
+          <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">
+            <template slot-scope="scope">
+              <span>{{ $fd("Sex", scope.row.PatientSex) }}</span>
+            </template>
+          </el-table-column>
+          <!--操作-->
+          <el-table-column :label="$t('common:action:action')" width="80"
+            v-if="hasPermi(['trials:trials-panel:subject:delPatient'])">
+            <template slot-scope="scope">
+              <el-button v-hasPermi="['trials:trials-panel:subject:delPatient']" circle icon="el-icon-delete"
+                :title="$t('trials:subject:patientStudyList:button:delete')" @click.stop="remove(scope.row)" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-tab-pane>
+      <el-tab-pane :label="$t('trials:subject:title:confirmVistList')" name="confirmVistList">
+        <confirmVistList v-if="activeName === 'confirmVistList'" ref="confirmVisit" :Patient="Patient"
+          :submitMessage="submitMessage" :status="status" :showTitle="false" @close="beforeClosePitentDig" />
+      </el-tab-pane>
+    </el-tabs>
+
   </el-dialog>
 </template>
 <script>
 import { deleteSubjectPatientBinding } from "@/api/inspection.js";
+import confirmVistList from "@/views/trials/trials-inspection/components/confirm-visit-list.vue";
 export default {
   name: "patientStudyList",
+  components: { confirmVistList },
   props: {
     visible: {
       required: true,
@@ -93,9 +65,23 @@ export default {
   data() {
     return {
       loading: false,
+      activeName: 'patient',
+      submitMessage: { SubjectId: null, TrialId: null, TrialCode: null, ResearchProgramNo: null },
+      status: "visit", // 页面当前状态  trial 绑定患者  visit 确认访视
+      Patient: {},
     };
   },
   methods: {
+    handleClick(v) {
+      this.activeName = v.name
+      if (v.name === 'confirmVistList') {
+        this.submitMessage.TrialId = this.$route.query.trialId
+        this.submitMessage.TrialCode = this.$route.query.trialCode
+        this.submitMessage.ResearchProgramNo = this.$route.query.researchProgramNo
+        this.submitMessage.SubjectId = this.SubjectId
+        this.Patient.PatientId = this.list.map(item => item.PatientId)
+      }
+    },
     beforeClosePitentDig() {
       this.$emit("update:visible", false);
     },