From 11d1a3db6edfa906fe572da2fc05c18e105d1da2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 16 Apr 2024 11:40:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/hirVisit/index.vue    | 48 ++-----------------
 .../trials-panel/study/components/list.vue    | 39 +++------------
 src/views/trials/trials-panel/study/index.vue |  2 +-
 3 files changed, 11 insertions(+), 78 deletions(-)

diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue
index 953cb21..b762c48 100644
--- a/src/views/trials/trials-panel/hirVisit/index.vue
+++ b/src/views/trials/trials-panel/hirVisit/index.vue
@@ -35,38 +35,6 @@
             />
           </el-select>
         </el-form-item>
-        <!-- 访视名称 -->
-        <!-- <el-form-item :label="$t('trials:globalReview:table:visitName')">
-          <el-select
-            v-model="searchData.SiteId"
-            clearable
-            filterable
-            style="width: 150px"
-          >
-            <el-option
-              v-for="item of visitOptions"
-              :key="item.SiteId"
-              :label="item.TrialSiteCode"
-              :value="item.SiteId"
-            />
-          </el-select>
-        </el-form-item> -->
-        <!-- 状态 -->
-        <!-- <el-form-item :label="$t('trials:trials-list:table:status')">
-          <el-select
-            v-model="searchData.SiteId"
-            clearable
-            filterable
-            style="width: 150px"
-          >
-            <el-option
-              v-for="item of siteOptions"
-              :key="item.SiteId"
-              :label="item.TrialSiteCode"
-              :value="item.SiteId"
-            />
-          </el-select>
-        </el-form-item> -->
         <el-form-item>
           <!-- 查询 -->
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -84,7 +52,7 @@
       </el-form>
     </template>
 
-    <!-- 访视列表 -->
+    <!-- 访视列表:default-sort="{ prop: 'SubmitTime', order: 'descending' }" -->
     <template slot="main-container">
       <el-table
         ref="visitList"
@@ -94,7 +62,6 @@
         stripe
         height="100"
         @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'SubmitTime', order: 'descending' }"
       >
         <el-table-column width="40">
           <template slot-scope="scope">
@@ -166,12 +133,6 @@
             </el-button>
           </template>
         </el-table-column>
-        <!-- 数据收集 -->
-        <!-- <el-table-column
-          prop="StudyCode"
-          :label="$t('trials:crcUpload:table:dataCollected')"
-          show-overflow-tooltip
-        /> -->
         <!-- 最早拍片日期 -->
         <el-table-column
           prop="VisitEarliestStudyTime"
@@ -352,8 +313,8 @@ const defaultSearchData = () => {
     subjectSex: null,
     pageIndex: 1,
     pageSize: 20,
-    asc: false,
-    sortField: "SubmitTime",
+    asc: true,
+    sortField: "",
   };
 };
 export default {
@@ -414,9 +375,7 @@ export default {
         let res = await getPatientSubejctVisitList(data);
         this.loading = false;
         if (res.IsSuccess) {
-          console.log(res.Result.CurrentPageData[0].SubmitState, "SubmitState");
           this.list = res.Result.CurrentPageData;
-          console.log(this.list[0].SubmitState, "list");
           this.total = res.Result.TotalCount;
         }
       } catch (err) {
@@ -458,6 +417,7 @@ export default {
           this.$message.success(
             this.$t("trials:crcUpload:message:submittedSuccessfully")
           );
+          this.getList();
         }
       } catch (err) {
         this.loading = false;
diff --git a/src/views/trials/trials-panel/study/components/list.vue b/src/views/trials/trials-panel/study/components/list.vue
index fef9fd3..141f761 100644
--- a/src/views/trials/trials-panel/study/components/list.vue
+++ b/src/views/trials/trials-panel/study/components/list.vue
@@ -115,7 +115,7 @@
       </el-form>
     </template>
 
-    <!-- 检查列表 -->
+    <!-- 检查列表 :default-sort="{ prop: 'StudyTime', order: 'descending' }" -->
     <template slot="main-container">
       <el-table
         v-loading="loading"
@@ -124,7 +124,6 @@
         stripe
         height="100"
         @sort-change="handleSortByColumn"
-        :default-sort="{ prop: 'StudyTime', order: 'descending' }"
       >
         <el-table-column type="index" width="40" />
         <!-- 受试者编号 -->
@@ -164,32 +163,6 @@
             <span>{{ $fd("sex", Number(scope.row.SubjectSex)) }}</span>
           </template>
         </el-table-column>
-        <!-- 申请号 -->
-        <!-- <el-table-column
-          prop="StudyCode"
-          :label="$t('trials:study:form:accessionNumber')"
-          show-overflow-tooltip
-          sortable="custom"
-          min-width="100"
-        /> -->
-        <!--Called AE-->
-        <el-table-column
-          prop="CalledAE"
-          label="Called AE"
-          show-overflow-tooltip
-          min-width="140"
-          sortable="custom"
-        >
-        </el-table-column>
-        <!--Calling AE-->
-        <el-table-column
-          prop="CallingAE"
-          label="Calling AE"
-          show-overflow-tooltip
-          min-width="140"
-          sortable="custom"
-        >
-        </el-table-column>
         <!-- 检查设备 -->
         <el-table-column
           prop="Modalities"
@@ -334,8 +307,8 @@ const defaultSearchData = () => {
     BeginStudyTime: null,
     EndStudyTime: null,
     IsBindedVisit: null,
-    Asc: false,
-    SortField: "StudyTime",
+    Asc: true,
+    SortField: null,
     PageIndex: 1,
     PageSize: 20,
   };
@@ -434,9 +407,9 @@ export default {
     },
     // 查看影像
     handleViewStudy(row) {
-      let type ='Study'
-      if (this.activeName === 'notSubmit') {
-        type = 'Patient'
+      let type = "Study";
+      if (this.activeName === "notSubmit") {
+        type = "Patient";
       }
       var token = getToken();
       const routeData = this.$router.resolve({
diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue
index a8a5416..3372469 100644
--- a/src/views/trials/trials-panel/study/index.vue
+++ b/src/views/trials/trials-panel/study/index.vue
@@ -113,7 +113,7 @@ export default {
     };
   },
   mounted() {
-    this.getSite();
+    // this.getSite();
     this.getVisitPlanOptions();
   },
   methods: {