From 709a811b75f5c37d0d074bf5305babd77e4149af Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 25 Apr 2024 09:36:39 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/notice/components/from.vue   | 26 ++++----
 src/views/system/notice/index.vue             | 16 ++---
 .../components/add-trials-list.vue            |  1 +
 .../components/confirm-visit-list.vue         |  1 +
 .../components/trials-select.vue              | 60 ++++++++++---------
 .../subject-list/components/add-subject.vue   |  1 +
 .../components/patient-study-list.vue         |  6 +-
 7 files changed, 58 insertions(+), 53 deletions(-)

diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue
index 6e7cfe1..5d49ac0 100644
--- a/src/views/system/notice/components/from.vue
+++ b/src/views/system/notice/components/from.vue
@@ -14,7 +14,7 @@
         >
           <el-select v-model="form.NoticeLevelEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoteLevel"
+              v-for="item of $d.NoteLevel"
               :key="item.value"
               :label="item.label"
               :value="item.raw.Code * 1"
@@ -27,10 +27,10 @@
         >
           <el-select v-model="form.NoticeTypeEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoteType"
-              :key="item.value"
+              v-for="item of $d.NoteType"
+              :key="item.id"
               :label="item.label"
-              :value="item.raw.Code * 1"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
@@ -44,10 +44,10 @@
             size="small"
           >
             <el-option
-              v-for="item of dict.type.NoticeApplicableTrial"
-              :key="item.value"
+              v-for="item of $d.TrialType"
+              :key="item.id"
               :label="item.label"
-              :value="item.raw.Code * 1"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
@@ -62,10 +62,10 @@
             size="small"
           >
             <el-option
-              v-for="item of roleList"
-              :key="item.Id"
-              :label="item.UserTypeShortName"
-              :value="item.Id"
+              v-for="item of $d.UserType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -75,10 +75,10 @@
         >
           <el-select v-model="form.NoticeModeEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoticeMode"
+              v-for="item of $d.NoticeMode"
               :key="item.value"
               :label="item.label"
-              :value="item.raw.Code * 1"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 0f9877c..1f73ba5 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -25,7 +25,7 @@
         >
           <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
             <el-option
-              v-for="item of $d.TrialType"
+              v-for="item of $d.NoteType"
               :key="item.id"
               :label="item.label"
               :value="item.value"
@@ -42,8 +42,8 @@
             size="small"
           >
             <el-option
-              v-for="item of $d.NoticeApplicableTrial"
-              :key="item.value"
+              v-for="item of $d.TrialType"
+              :key="item.id"
               :label="item.label"
               :value="item.value"
             />
@@ -61,9 +61,9 @@
           >
             <el-option
               v-for="item of $d.UserType"
-              :key="item.Id"
+              :key="item.id"
               :label="item.label"
-              :value="item.value"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -188,10 +188,10 @@
         >
           <template slot-scope="scope">
             {{
-              $d.NoticeApplicableTrial.find((v) => {
+              $d.TrialType.find((v) => {
                 return v.raw.Code * 1 === scope.row.ApplicableProjectEnum;
               })
-                ? $d.NoticeApplicableTrial.find((v) => {
+                ? $d.TrialType.find((v) => {
                     return v.raw.Code * 1 === scope.row.ApplicableProjectEnum;
                   }).label
                 : ""
@@ -237,7 +237,7 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{ scope.row.StartDate }}-{{ scope.row.EndDate }}
+            {{ scope.row.StartDate }}
           </template>
         </el-table-column>
         <el-table-column
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 13c64ec..6a2bd7c 100644
--- a/src/views/trials/trials-inspection/components/add-trials-list.vue
+++ b/src/views/trials/trials-inspection/components/add-trials-list.vue
@@ -108,6 +108,7 @@
       :Patient="PatientData"
       :submitMessage="submitMessage"
       :status="status"
+      @close="beforeCloseStudyDig"
     />
     <base-model v-if="addSubject_model.visible" :config="addSubject_model">
       <template slot="dialog-body">
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 eaa2fe1..80e127e 100644
--- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue
+++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue
@@ -487,6 +487,7 @@ export default {
           this.$message.success(
             this.$t("trials:crcUpload:message:submittedSuccessfully")
           );
+          this.$emit("close");
         }
       } catch (err) {
         this.btnLoading2 = false;
diff --git a/src/views/trials/trials-inspection/components/trials-select.vue b/src/views/trials/trials-inspection/components/trials-select.vue
index 633ed59..8c0643b 100644
--- a/src/views/trials/trials-inspection/components/trials-select.vue
+++ b/src/views/trials/trials-inspection/components/trials-select.vue
@@ -38,22 +38,11 @@
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              width: 80px;
+              width: 150px;
             "
           >
             {{ $t("trials:trials-list:table:researchNumber") }}
           </div>
-          <div
-            style="
-              display: inline-block;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              width: 160px;
-            "
-          >
-            {{ $t("trials:trials-list:table:experimentName") }}
-          </div>
           <div
             style="
               display: inline-block;
@@ -65,6 +54,17 @@
           >
             {{ $t("trials:trials-list:table:sponsor") }}
           </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>
       <el-tooltip
@@ -80,11 +80,11 @@
           {{ $t("trials:trials-list:table:researchNumber") }}:
           {{ item.ResearchProgramNo }}
           <br />
-          {{ $t("trials:trials-list:table:experimentName") }}:
-          {{ item.ExperimentName }}
-          <br />
           {{ $t("trials:trials-list:table:sponsor") }}:
           {{ item.SponsorName }}
+          <br />
+          {{ $t("trials:trials-list:table:experimentName") }}:
+          {{ item.ExperimentName }}
         </div>
         <div
           class="options_item"
@@ -100,22 +100,11 @@
               overflow: hidden;
               text-overflow: ellipsis;
               white-space: nowrap;
-              width: 80px;
+              width: 150px;
             "
           >
             {{ item.ResearchProgramNo }}
           </div>
-          <div
-            style="
-              display: inline-block;
-              overflow: hidden;
-              text-overflow: ellipsis;
-              white-space: nowrap;
-              width: 160px;
-            "
-          >
-            {{ item.ExperimentName }}
-          </div>
           <div
             style="
               display: inline-block;
@@ -127,6 +116,17 @@
           >
             {{ item.SponsorName }}
           </div>
+          <div
+            style="
+              display: inline-block;
+              overflow: hidden;
+              text-overflow: ellipsis;
+              white-space: nowrap;
+              width: 160px;
+            "
+          >
+            {{ item.ExperimentName }}
+          </div>
         </div>
       </el-tooltip>
     </div>
@@ -233,7 +233,11 @@ export default {
     inputChange(v) {
       this.resultFilter = this.options.filter((o) => {
         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)
+        );
       });
     },
   },
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 4abcc40..fa579a2 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
@@ -107,6 +107,7 @@
       :Patient="Patient"
       :submitMessage="submitMessage"
       :status="status"
+      @close="beforeCloseStudyDig"
     />
     <base-model v-if="patient_model.visible" :config="patient_model">
       <template slot="dialog-body">
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 4f376f1..2fcdf89 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
@@ -2,7 +2,6 @@
   <el-dialog
     :visible.sync="visible"
     :close-on-click-modal="false"
-    :fullscreen="true"
     custom-class="upload-dialog"
     :before-close="beforeClosePitentDig"
   >
@@ -10,10 +9,9 @@
     <el-table
       ref="patientStudyList"
       v-loading="loading"
-      v-adaptive="{ bottomOffset: 60 }"
       :data="list"
       stripe
-      height="100"
+      height="300px"
     >
       <el-table-column type="index" width="40" />
       <!--患者ID-->
@@ -49,7 +47,7 @@
         sortable="custom"
       ></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">
           <el-button
             circle