diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
index b3319fc4..ee6e626c 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
@@ -3,6 +3,12 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
+        <!-- 是否加急 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:isUrgent')">
+          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:pmMedicalReview:table:siteCode')">
           <el-select v-model="searchData.TrialSiteCode" clearable filterable style="width:120px;">
@@ -26,54 +32,77 @@
             clearable
           />
         </el-form-item>
+        <!-- 任务类型 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:taskType')">
+          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 阅片人 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:reader')">
           <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
             <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
           </el-select>
         </el-form-item>
+        <!-- 角色 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:role')">
+          <el-select v-model="searchData.ArmEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.ArmEnum" :key="'ArmEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 审核人 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:mim')">
+          <el-select v-model="searchData.MedicalManagerUserId" clearable>
+            <el-option v-for="item of MIMOptions" :label="`${item.UserName}(${item.FullName})`" :value="item.UserId" :key="item.UserId" />
+          </el-select>
+        </el-form-item>
+        <!-- 审核状态 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:auditState')">
+          <el-select v-model="searchData.AuditState" clearable style="width:120px;">
+            <el-option v-for="item of $d.MedicalReviewAuditState" :key="'AuditState' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 审核结论 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:IsHaveQuestion')">
+          <el-select v-model="searchData.IsHaveQuestion" clearable style="width:120px;">
+            <el-option v-for="item of $d.IsPass"  :key="'IsHaveQuestion' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 审核建议 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:auditAdvice')">
+          <el-select v-model="searchData.AuditAdviceEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.AuditAdvice"  :key="'AuditAdvice' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 阅片人认同 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:whetherAgree')">
+          <el-select v-model="searchData.DoctorUserIdeaEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.MedicalReviewDoctorUserIdea"  :key="'DoctorUserIdeaEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 阅片标准 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:criterionName')">
           <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width:120px;">
             <el-option v-for="item of trialCriterionList" :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" />
           </el-select>
         </el-form-item>
-        <!-- 是否加急 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:isUrgent')">
-          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
+        
         <!-- 阅片任务状态 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:taskState')">
           <el-select v-model="searchData.TaskState" clearable style="width:120px;">
             <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        <!-- 任务类型 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:taskType')">
-          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
+        
         <!-- 阅片状态 -->
         <!-- <el-form-item style="margin-bottom:10px" label="阅片状态">
           <el-select v-model="searchData.TaskAllocationState" clearable style="width:120px;">
             <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item> -->
-        <!-- 审核状态 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:auditState')">
-          <el-select v-model="searchData.AuditState" clearable style="width:120px;">
-            <el-option v-for="item of $d.MedicalReviewAuditState" :key="'AuditState' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:mim')">
-          <el-select v-model="searchData.MedicalManagerUserId" clearable>
-            <el-option v-for="item of MIMOptions" :label="`${item.UserName}(${item.FullName})`" :value="item.UserId" :key="item.UserId" />
-          </el-select>
-        </el-form-item>
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:signTime')">
+        
+       <!-- 审核分配时间 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:allocateTime')">
           <el-date-picker
             v-model="timeList"
             value-format="yyyy-MM-dd HH:mm:ss"
@@ -82,16 +111,7 @@
             @change="changeTimeList"
           />
         </el-form-item>
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:auditAdvice')">
-          <el-select v-model="searchData.AuditAdviceEnum" clearable>
-            <el-option v-for="item of $d.AuditAdvice"  :key="'AuditAdvice' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:table:whetherAgree')">
-          <el-select v-model="searchData.DoctorUserIdeaEnum" clearable>
-            <el-option v-for="item of $d.MedicalReviewDoctorUserIdea"  :key="'DoctorUserIdeaEnum' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
+        
 
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@@ -154,7 +174,14 @@
           width="120"
           sortable="custom"
           show-overflow-tooltip
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.MedicalNo && scope.row.MedicalNo !== scope.row.SubjectCode">
+              {{ `${scope.row.SubjectCode}/${scope.row.MedicalNo}` }}
+            </span>
+            <span v-else>{{scope.row.SubjectCode}}</span>
+          </template>
+        </el-table-column>
         <!-- 任务名称 -->
         <el-table-column
           prop="VisitTaskNum"
@@ -164,17 +191,20 @@
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            {{scope.row.TaskName}}
+            <span v-if="scope.row.TaskBlindName && scope.row.TaskName !== scope.row.TaskBlindName">
+              {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
+            </span>
+            <span v-else>{{scope.row.TaskName}}</span>
           </template>
         </el-table-column>
         <!-- 盲态任务标识 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="TaskBlindName"
           :label="$t('trials:pmMedicalReview:table:blindName')"
           width="160"
           sortable="custom"
           show-overflow-tooltip
-        />
+        /> -->
         <!-- 任务类型 -->
         <el-table-column
           prop="ReadingCategory"
@@ -191,7 +221,7 @@
           </template>
         </el-table-column>
         <!-- 阅片任务状态 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="TaskState"
           :label="$t('trials:pmMedicalReview:table:taskState')"
           width="160"
@@ -205,6 +235,18 @@
             <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
             <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
           </template>
+        </el-table-column> -->
+        <!-- 阅片人 -->
+        <el-table-column
+          prop="DoctorUser.UserName"
+          :label="$t('trials:pmMedicalReview:table:reader')"
+          width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope" v-if="scope.row.DoctorUser.UserName">
+            {{scope.row.DoctorUser.UserName}}({{scope.row.DoctorUser.FullName}})
+          </template>
         </el-table-column>
         <!-- 角色 -->
         <el-table-column
@@ -223,34 +265,6 @@
             <el-tag v-else type="danger">{{$fd('ArmEnum', scope.row.ArmEnum)}}</el-tag>
           </template>
         </el-table-column>
-        <!-- 阅片人 -->
-        <el-table-column
-          prop="DoctorUser.UserName"
-          :label="$t('trials:pmMedicalReview:table:reader')"
-          width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope" v-if="scope.row.DoctorUser.UserName">
-            {{scope.row.DoctorUser.UserName}}({{scope.row.DoctorUser.FullName}})
-          </template>
-        </el-table-column>
-        <!-- 阅片标准 -->
-        <el-table-column
-          prop="TrialReadingCriterionName"
-          :label="$t('trials:pmMedicalReview:table:criterionName')"
-          width="180"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <!-- 阅片完成时间 -->
-        <el-table-column
-          prop="SignTime"
-          :label="$t('trials:pmMedicalReview:table:signTime')"
-          width="210"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 医学经理 -->
         <el-table-column
           prop="MedicalManagerUser.UserName"
@@ -263,32 +277,6 @@
             {{scope.row.MedicalManagerUser.UserName}}({{scope.row.MedicalManagerUser.FullName}})
           </template>
         </el-table-column>
-        <!-- 审核分配时间 -->
-        <el-table-column
-          prop="AllocateTime"
-          :label="$t('trials:pmMedicalReview:table:allocateTime')"
-          width="180"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <!-- 任务状态 -->
-        <el-table-column
-          prop="IsInvalid"
-          width="120"
-          :label="$t('trials:pmMedicalReview:table:isInvalid')"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsInvalid" type="danger">
-              {{$fd('IsTakeEffect', scope.row.IsInvalid)}}
-            </el-tag>
-            <el-tag v-else type="primary">
-              {{$fd('IsTakeEffect', scope.row.IsInvalid)}}
-            </el-tag>
-          </template>
-        </el-table-column>
         <!-- 审核状态 -->
         <el-table-column
           prop="AuditState"
@@ -303,11 +291,23 @@
             <el-tag type="danger" v-if="scope.row.AuditState === 2">{{$fd('MedicalReviewAuditState', scope.row.AuditState)}}</el-tag>
           </template>
         </el-table-column>
+        <!-- 审核结论 -->
+        <el-table-column
+          prop="IsHaveQuestion"
+          :label="$t('trials:pmMedicalReview:table:IsHaveQuestion')"
+          width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{$fd('IsPass', scope.row.IsHaveQuestion)}}
+          </template>
+        </el-table-column>
         <!-- 审核建议 -->
         <el-table-column
           prop="AuditAdviceEnum"
           :label="$t('trials:pmMedicalReview:table:auditAdvice')"
-          width="120"
+          width="130"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -328,6 +328,14 @@
             <el-tag type="danger" v-if="scope.row.DoctorUserIdeaEnum === 2"> {{$fd('MedicalReviewDoctorUserIdea', scope.row.DoctorUserIdeaEnum)}} </el-tag>
           </template>
         </el-table-column>
+        <!-- 审核分配时间 -->
+        <el-table-column
+          prop="AllocateTime"
+          :label="$t('trials:pmMedicalReview:table:allocateTime')"
+          width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
         <!-- 审核签名时间 -->
         <el-table-column
           prop="AuditSignTime"
@@ -336,6 +344,42 @@
           sortable="custom"
           show-overflow-tooltip
         />
+
+        <!-- 阅片标准 -->
+        <el-table-column
+          prop="TrialReadingCriterionName"
+          :label="$t('trials:pmMedicalReview:table:criterionName')"
+          width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 阅片完成时间 -->
+        <!-- <el-table-column
+          prop="SignTime"
+          :label="$t('trials:pmMedicalReview:table:signTime')"
+          width="210"
+          sortable="custom"
+          show-overflow-tooltip
+        /> -->
+        <!-- 任务状态 -->
+        <!-- <el-table-column
+          prop="IsInvalid"
+          width="120"
+          :label="$t('trials:pmMedicalReview:table:isInvalid')"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.IsInvalid" type="danger">
+              {{$fd('IsTakeEffect', scope.row.IsInvalid)}}
+            </el-tag>
+            <el-tag v-else type="primary">
+              {{$fd('IsTakeEffect', scope.row.IsInvalid)}}
+            </el-tag>
+          </template>
+        </el-table-column> -->
+        
+        
         <el-table-column
           :label="$t('common:action:action')"
           width="240"
@@ -459,7 +503,7 @@ const searchDataDefault = () => {
     BeginSignTime: null,
     EndSignTime: null,
     AuditAdviceEnum: null,
-    DoctorUserIdeaEnum: null
+    DoctorUserIdeaEnum: null,
   }
 }
 export default {
@@ -505,11 +549,11 @@ export default {
   methods: {
     changeTimeList() {
       if (this.timeList) {
-        this.searchData.BeginSignTime = this.timeList[0]
-        this.searchData.EndSignTime = this.timeList[1]
+        this.searchData.BeginAllocateDate = this.timeList[0]
+        this.searchData.EndAllocateDate = this.timeList[1]
       } else {
-        this.searchData.BeginSignTime = null
-        this.searchData.EndSignTime = null
+        this.searchData.BeginAllocateDate = null
+        this.searchData.EndAllocateDate = null
       }
     },
     handleExport() {
diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
index dabde036..90d67600 100644
--- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
@@ -3,6 +3,12 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
+        <!-- 是否加急 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:isUrgent')">
+          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:rereadTrack:table:siteCode')">
           <el-select v-model="searchData.TrialSiteCode" clearable filterable style="width:120px;">
@@ -26,63 +32,65 @@
             clearable
           />
         </el-form-item>
+        <!-- 任务类型 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:taskType')">
+          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 阅片人 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:reader')">
           <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
             <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
           </el-select>
         </el-form-item>
+        <!-- 角色 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:role')">
+          <el-select v-model="searchData.ArmEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.ArmEnum" :key="'ArmEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 阅片标准 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:criterionName')">
           <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width:120px;">
             <el-option v-for="item of trialCriterionList" :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" />
           </el-select>
         </el-form-item>
-        <!-- 是否加急 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:isUrgent')">
-          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 任务状态 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:taskStatus')">
-          <el-select v-model="searchData.TaskState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 任务类型 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:taskType')">
-          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 分配状态 -->
-        <!-- <el-form-item style="margin-bottom:10px" label="分配状态">
-          <el-select v-model="searchData.TaskAllocationState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item> -->
         <!-- 申请类型 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:applyType')">
           <el-select v-model="searchData.RequestReReadingType" clearable style="width:120px;">
             <el-option v-for="item of $d.RequestReReadingType" :key="'RequestReReadingType' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
+        <!-- 任务状态 -->
+        <!-- <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:taskStatus')">
+          <el-select v-model="searchData.TaskState" clearable style="width:120px;">
+            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item> -->
+        
+        <!-- 分配状态 -->
+        <!-- <el-form-item style="margin-bottom:10px" label="分配状态">
+          <el-select v-model="searchData.TaskAllocationState" clearable style="width:120px;">
+            <el-option v-for="item of $d.TaskAllocationState" :key="'TaskAllocationState' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item> -->
+        
         <!-- 审批结果 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:approvalResult')">
           <el-select v-model="searchData.RequestReReadingResultEnum" clearable style="width:120px;">
             <el-option v-for="item of $d.RequestReReadingResult" :key="'RequestReReadingResultEnum' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        <!-- 分配时间 -->
-        <!-- <el-form-item style="margin-bottom:10px" label="分配时间">
+        <!-- 申请时间 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:applyTime')">
           <el-date-picker
             v-model="timeList"
             value-format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange"
             @change="changeTimeList"
           />
-        </el-form-item> -->
+        </el-form-item>
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
@@ -134,7 +142,14 @@
           min-width="120"
           sortable="custom"
           show-overflow-tooltip
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.OriginalReReadingTask.MedicalNo && scope.row.OriginalReReadingTask.MedicalNo !== scope.row.OriginalReReadingTask.SubjectCode">
+              {{ `${scope.row.OriginalReReadingTask.SubjectCode}/${scope.row.OriginalReReadingTask.MedicalNo}` }}
+            </span>
+            <span v-else>{{scope.row.OriginalReReadingTask.SubjectCode}}</span>
+          </template>
+        </el-table-column>
         <!-- 任务名称 -->
         <el-table-column
           prop="OriginalReReadingTask.TaskName"
@@ -142,25 +157,32 @@
           width="140"
           sortable="custom"
           show-overflow-tooltip
-        />
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.OriginalReReadingTask.TaskBlindName && scope.row.OriginalReReadingTask.TaskName !== scope.row.OriginalReReadingTask.TaskBlindName">
+              {{ `${scope.row.OriginalReReadingTask.TaskName}/${scope.row.OriginalReReadingTask.TaskBlindName}` }}
+            </span>
+            <span v-else>{{scope.row.OriginalReReadingTask.TaskName}}</span>
+          </template>
+        </el-table-column>
         <!-- 盲态任务标识 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="OriginalReReadingTask.TaskBlindName"
           :label="$t('trials:rereadTrack:table:blindName')"
           width="160"
           sortable="custom"
           show-overflow-tooltip
-        />
+        /> -->
         <!-- 任务创建时间 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="OriginalReReadingTask.CreateTime"
           :label="$t('trials:rereadTrack:table:createTime')"
           width="180"
           sortable="custom"
           show-overflow-tooltip
-        />
+        /> -->
         <!-- 任务状态 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="OriginalReReadingTask.TaskState"
           :label="$t('trials:rereadTrack:table:taskStatus')"
           width="160"
@@ -174,7 +196,7 @@
             <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
             <el-tag v-if="scope.row.OriginalReReadingTask.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.OriginalReReadingTask.TaskState) }}</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <!-- 任务类型 -->
         <el-table-column
           prop="OriginalReReadingTask.ReadingCategory"
@@ -190,6 +212,18 @@
             <el-tag v-if="scope.row.OriginalReReadingTask.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.OriginalReReadingTask.ReadingCategory) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 阅片人 -->
+        <el-table-column
+          prop="OriginalReReadingTask.UserName"
+          :label="$t('trials:rereadTrack:table:reader')"
+          width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.OriginalReReadingTask.UserName }}({{ scope.row.OriginalReReadingTask.FullName }})
+          </template>
+        </el-table-column>
         <!-- 角色 -->
         <el-table-column
           prop="OriginalReReadingTask.ArmEnum"
@@ -206,18 +240,7 @@
             <el-tag v-if="scope.row.OriginalReReadingTask.ArmEnum === 5" type="warning">{{ $fd('ArmEnum', scope.row.OriginalReReadingTask.ArmEnum) }}</el-tag>
           </template>
         </el-table-column>
-        <!-- 阅片人 -->
-        <el-table-column
-          prop="OriginalReReadingTask.UserName"
-          :label="$t('trials:rereadTrack:table:reader')"
-          width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.OriginalReReadingTask.UserName }}({{ scope.row.OriginalReReadingTask.FullName }})
-          </template>
-        </el-table-column>
+        
         <!-- 阅片标准 -->
         <el-table-column
           prop="OriginalReReadingTask.TrialReadingCriterionName"
@@ -238,7 +261,7 @@
         <el-table-column
           prop="RequestReReadingType"
           :label="$t('trials:rereadTrack:table:applyType')"
-          width="160"
+          width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -253,7 +276,7 @@
         <el-table-column
           prop="RequestReReadingTime"
           :label="$t('trials:rereadTrack:table:applyTime')"
-          width="210"
+          width="160"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -269,7 +292,7 @@
         <el-table-column
           prop="RequestReReadingResultEnum"
           :label="$t('trials:rereadTrack:table:approvalResult')"
-          width="170"
+          width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -287,13 +310,13 @@
           </template>
         </el-table-column>
         <!-- 新任务编号 -->
-        <el-table-column
+        <!-- <el-table-column
           prop="ReReadingNewTaskCode"
           :label="$t('trials:rereadTrack:table:newTaskCode')"
           width="160"
           sortable="custom"
           show-overflow-tooltip
-        />
+        /> -->
         <el-table-column
           v-if="hasPermi(['trials:trials-panel:reReadingTracking:edit'])"
           fixed="right"
@@ -325,6 +348,14 @@
               :title="$t('trials:rereadTrack:table:influenceTaskList')"
               @click="getInfluencedTaskList(scope.row)"
             />
+            <!-- 新任务 -->
+            <el-button
+              :disabled="!scope.row.ReReadingNewTaskCode"
+              icon="el-icon-link"
+              circle
+              :title="$t('trials:rereadTrack:table:newTask')"
+              @click="getNewTaskList(scope.row)"
+            />
           </template>
         </el-table-column>
       </el-table>
@@ -564,7 +595,10 @@ const searchDataDefault = () => {
     TrialReadingCriterionId: null,
     RequestReReadingType: null,
     ReReadingApplyState: null,
-    CompleteClinicalDataEnum: null
+    CompleteClinicalDataEnum: null,
+    ArmEnum: null,
+    BeginRequestReReadingTime: null,
+    EndRequestReReadingTime: null
   }
 }
 export default {
@@ -1009,13 +1043,16 @@ export default {
     handleSubjectAssignListSelectChange(e) {
       this.SubjectAssignSelectList = e
     },
+    getNewTaskList(row) {
+      this.$router.push({ path: `/trials/trials-panel/reading/readingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&TaskName=${row.OriginalReReadingTask.TaskName}&DoctorUserId=${row.OriginalReReadingTask.DoctorUserId}&TrialReadingCriterionId=${row.OriginalReReadingTask.TrialReadingCriterionId}&SubjectCode=${row.OriginalReReadingTask.SubjectCode}` })
+    },
     changeTimeList() {
       if (this.timeList) {
-        this.searchData.BeginAllocateDate = this.timeList[0]
-        this.searchData.EndAllocateDate = this.timeList[1]
+        this.searchData.BeginRequestReReadingTime = this.timeList[0]
+        this.searchData.EndRequestReReadingTime = this.timeList[1]
       } else {
-        this.searchData.BeginAllocateDate = null
-        this.searchData.EndAllocateDate = null
+        this.searchData.BeginRequestReReadingTime = null
+        this.searchData.EndRequestReReadingTime = null
       }
     },
     handleCancel() {
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
new file mode 100644
index 00000000..f6339d6e
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
@@ -0,0 +1,473 @@
+/* eslint-disable */
+<template>
+  <BaseContainer>
+    <template slot="search-container">
+      <el-form :inline="true">
+        <!-- 是否加急 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:isUrgent')">
+          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 临床数据是否完备 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:completeClinicalDataEnum')">
+          <el-select v-model="searchData.CompleteClinicalDataEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.CompleteClinicalDataEnum" :key="'CompleteClinicalDataEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 中心编号 -->
+        <el-form-item :label="$t('trials:reviewTrack:table:siteCode')">
+          <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
+            <el-option
+              v-for="(item,index) of siteOptions"
+              :key="index"
+              :label="item.TrialSiteCode"
+              :value="item.SiteId"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 受试者编号 -->
+        <el-form-item :label="$t('trials:reviewTrack:table:subjectCode')">
+          <el-input v-model="searchData.SubjectCode" style="width:100px;" />
+        </el-form-item>
+        <!-- 任务名称 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskName')">
+          <el-input
+            v-model="searchData.TaskName"
+            style="width:100px;"
+            clearable
+          />
+        </el-form-item>
+        <!-- 任务类型 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskType')">
+          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 阅片人 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:reader')">
+          <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
+            <el-option v-for="item of doctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
+          </el-select>
+        </el-form-item>
+        <!-- 角色 -->
+        <!-- <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:role')">
+          <el-select v-model="searchData.ArmEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.ArmEnum" :key="'ArmEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item> -->
+        <!-- 阅片标准 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:criterionName')">
+          <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width:120px;">
+            <el-option v-for="item of trialCriterionList" :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" />
+          </el-select>
+        </el-form-item>
+        <!-- 阅片状态 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:readingStatus')">
+          <el-select v-model="searchData.ReadingTaskState" clearable style="width:120px;">
+            <el-option v-for="item of $d.ReadingTaskState" :key="'ReadingTaskState' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 任务状态 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskStatus')">
+          <el-select v-model="searchData.TaskState" clearable style="width:120px;">
+            <el-option v-show="item.value === 3 || item.value === 4" v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 分配时间 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:assignTime')">
+          <el-date-picker
+            v-model="timeList"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList"
+          />
+        </el-form-item>
+        <!-- 分配时间 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:signTime')">
+          <el-date-picker
+            v-model="timeList2"
+            value-format="yyyy-MM-dd HH:mm:ss"
+            type="datetimerange"
+            :default-time="['00:00:00', '23:59:59']"
+            @change="changeTimeList2"
+          />
+        </el-form-item>
+        <el-form-item style="margin-bottom:10px">
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+            {{ $t('common:button:search') }}
+          </el-button>
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+            {{ $t('common:button:reset') }}
+          </el-button>
+        </el-form-item>
+      </el-form>
+    </template>
+    <template slot="main-container">
+      <el-table
+        v-adaptive="{bottomOffset:60}"
+        v-loading="loading"
+        :data="list"
+        stripe
+        height="100"
+        @sort-change="handleSortChange"
+      >
+        <!-- 是否加急 -->
+        <el-table-column
+          prop="IsUrgent"
+          :label="$t('trials:reviewTrack:table:isUrgent')"
+          width="120"
+          sortable="custom"
+          align="center"
+        >
+          <template slot-scope="scope">
+            <!-- <el-tag v-if="scope.row.IsUrgent" type="danger">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
+            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag> -->
+            <el-tooltip placement="top">
+              <div slot="content">
+                <span>{{`加急原因：${$fd('TaskUrgentType',scope.row.TaskUrgentType)}`}}</span><br/>
+                <span>{{scope.row.TaskUrgentRemake?`备注：${scope.row.TaskUrgentRemake}`:''}}</span>
+              </div>
+             <div>
+              <el-button :disabled="!(!scope.row.TaskState && (scope.row.ReadingTaskState === 0 || scope.row.ReadingTaskState === 1)) || !scope.row.IsCanEditUrgentState" v-if="scope.row.IsUrgent" type="danger" size="mini" @click="changeUrgentStatus(scope.row)">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-button>
+             </div>
+            </el-tooltip>
+              <el-button :disabled="!(!scope.row.TaskState && (scope.row.ReadingTaskState === 0 || scope.row.ReadingTaskState === 1)) || !scope.row.IsCanEditUrgentState" v-if="!scope.row.IsUrgent" type="primary" size="mini" @click="changeUrgentStatus(scope.row)">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-button>
+
+          </template>
+        </el-table-column>
+        <!-- 临床数据是否完备 -->
+        <el-table-column
+          prop="CompleteClinicalDataEnum"
+          :label="$t('trials:reviewTrack:table:completeClinicalDataEnum')"
+          width="160"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.CompleteClinicalDataEnum === -1">
+              {{$fd('CompleteClinicalDataEnum', scope.row.CompleteClinicalDataEnum)}}
+            </span>
+            <el-button type="text" v-else @click="handleView(scope.row)">
+              {{$fd('CompleteClinicalDataEnum', scope.row.CompleteClinicalDataEnum)}}
+            </el-button>
+          </template>
+        </el-table-column>
+        <!-- 中心编号 -->
+        <el-table-column
+          prop="TrialSiteCode"
+          :label="$t('trials:reviewTrack:table:siteCode')"
+          width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 受试者编号 -->
+        <el-table-column
+          prop="SubjectCode"
+          :label="$t('trials:reviewTrack:table:subjectCode')"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.MedicalNo && scope.row.MedicalNo !== scope.row.SubjectCode">
+              {{ `${scope.row.SubjectCode}/${scope.row.MedicalNo}` }}
+            </span>
+            <span v-else>{{scope.row.SubjectCode}}</span>
+          </template>
+        </el-table-column>
+        <!-- 任务名称 -->
+        <el-table-column
+          prop="VisitTaskNum"
+          :label="$t('trials:reviewTrack:table:taskName')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.TaskBlindName && scope.row.TaskName !== scope.row.TaskBlindName">
+              {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
+            </span>
+            <span v-else>{{scope.row.TaskName}}</span>
+          </template>
+        </el-table-column>
+        <!-- 盲态任务标识 -->
+        <!-- <el-table-column
+          prop="TaskBlindName"
+          :label="$t('trials:reviewTrack:table:blindName')"
+          width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        /> -->
+        <!-- 任务类型 -->
+        <el-table-column
+          prop="ReadingCategory"
+          :label="$t('trials:reviewTrack:table:taskType')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.ReadingCategory === 1" type="primary">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.ReadingCategory === 2" type="info">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.ReadingCategory === 4" type="danger">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+            <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 阅片人 -->
+        <el-table-column
+          prop="UserName"
+          :label="$t('trials:reviewTrack:table:reader')"
+          width="130"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template v-if="scope.row.UserName" slot-scope="scope">
+            {{ scope.row.UserName }}({{ scope.row.FullName }})
+          </template>
+        </el-table-column>
+        <!-- 角色 -->
+        <el-table-column
+          prop="ArmEnum"
+          :label="$t('trials:reviewTrack:table:role')"
+          width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.ArmEnum === 0" type="primary">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.ArmEnum === 1" type="primary">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.ArmEnum === 2" type="success">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.ArmEnum === 3" type="info">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.ArmEnum === 4" type="danger">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
+            <el-tag v-if="scope.row.ArmEnum === 5" type="warning">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
+          </template>
+        </el-table-column>
+        <!-- 阅片标准 -->
+        <el-table-column
+          prop="TrialReadingCriterionName"
+          :label="$t('trials:reviewTrack:table:criterionName')"
+          min-width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 阅片状态 -->
+        <el-table-column
+          prop="ReadingTaskState"
+          :label="$t('trials:reviewTrack:table:readingStatus')"
+          width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
+            <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
+          </template>
+        </el-table-column>
+         <!-- 分配时间 -->
+        <el-table-column
+          prop="AllocateTime"
+          :label="$t('trials:reviewTrack:table:assignTime')"
+          width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 建议完成时间 -->
+        <el-table-column
+          prop="SuggesteFinishedTime"
+          :label="$t('trials:reviewTrack:table:suggesteFinishedTime')"
+          width="210"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 阅片完成时间 -->
+        <el-table-column
+          prop="SignTime"
+          :label="$t('trials:reviewTrack:table:signTime')"
+          min-width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="ReadingDuration"
+          :label="$t('trials:reviewTrack:table:readingDuration')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 任务状态 -->
+        <el-table-column
+          prop="TaskState"
+          :label="$t('trials:reviewTrack:table:taskStatus')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+          </template>
+        </el-table-column>
+        
+        
+        
+       
+        <!-- 申请状态 -->
+        <el-table-column
+          prop="ReReadingApplyState"
+          :label="$t('trials:reviewTrack:table:applyStatus')"
+          min-width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.ReReadingApplyState === 4 || scope.row.ReReadingApplyState === 5" type="danger">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
+            <el-tag v-if="scope.row.ReReadingApplyState === 2" type="primary">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
+            <el-tag v-if="scope.row.ReReadingApplyState === 3" type="warning">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column
+          fixed="right"
+          :label="$t('common:action:action')"
+          width="260"
+        >
+          <template slot-scope="scope">
+            <!-- 查看阅片结果 -->
+            <el-button
+              :disabled="scope.row.ReadingTaskState !== 2"
+              icon="el-icon-view"
+              circle
+              :title="$t('trials:reviewTrack:action:viewResults')"
+              @click="lookReadingResults(scope.row)"
+            />
+          </template>
+        </el-table-column>
+      </el-table>
+      <!-- 分页组件 -->
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+    </template>
+  </BaseContainer>
+</template>
+<script>
+import { getTrialSiteSelect } from '@/api/trials'
+import { getTrialCriterionList, getReadingTaskList, getDoctorUserSelectList } from '@/api/trials/reading'
+import BaseContainer from '@/components/BaseContainer'
+import Pagination from '@/components/Pagination'
+
+const searchDataDefault = () => {
+  return {
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: true,
+    SortField: '',
+    TrialId: null,
+    SiteId: null,
+    SubjectId: null,
+    SubjectCode: null,
+    IsUrgent: null,
+    TaskName: null,
+    TaskState: null,
+    DoctorUserId: null,
+    ReadingCategory: null,
+    TaskAllocationState: null,
+    BeginAllocateDate: null,
+    EndAllocateDate: null,
+    ReadingTaskState: null,
+    CompleteClinicalDataEnum: null,
+    BeginSignTime: null,
+    EndSignTime: null,
+    IsEffect: false
+    // ArmEnum: null
+  }
+}
+export default {
+  name: 'RecordList',
+  components: { BaseContainer, Pagination },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      loading: false,
+      timeList: [],
+      timeList2: [],
+      siteOptions: [],
+      doctorUserList: [],
+      trialCriterionList: [],
+      trialId: this.$route.query.trialId
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getSite()
+    this.getDoctorUserSelectList()
+    this.getTrialCriterionList()
+  },
+  methods: {
+    getList() {
+      this.searchData.TrialId = this.$route.query.trialId
+      this.loading = true
+      getReadingTaskList(this.searchData).then(res => {
+        this.loading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { this.loading = false })
+    },
+    getSite() {
+      getTrialSiteSelect(this.trialId).then(res => {
+        this.siteOptions = res.Result
+      })
+    },
+    getDoctorUserSelectList() {
+      getDoctorUserSelectList(this.$route.query.trialId).then(res => {
+        this.doctorUserList = res.Result
+      })
+    },
+    getTrialCriterionList() {
+      getTrialCriterionList(this.trialId).then(res => {
+        this.trialCriterionList = res.Result
+      }).catch(() => {})
+    },
+    changeTimeList() {
+      if (this.timeList) {
+        this.searchData.BeginAllocateDate = this.timeList[0]
+        this.searchData.EndAllocateDate = this.timeList[1]
+      } else {
+        this.searchData.BeginAllocateDate = null
+        this.searchData.EndAllocateDate = null
+      }
+    },
+    changeTimeList2() {
+      if (this.timeList2) {
+        this.searchData.BeginSignTime = this.timeList2[0]
+        this.searchData.EndSignTime = this.timeList2[1]
+      } else {
+        this.searchData.BeginSignTime = null
+        this.searchData.EndSignTime = null
+      }
+    },
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    // 排序
+    handleSortChange(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    }
+  }
+}
+</script>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 5c24fdd2..02862cd7 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -3,6 +3,18 @@
   <BaseContainer>
     <template slot="search-container">
       <el-form :inline="true">
+        <!-- 是否加急 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:isUrgent')">
+          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
+            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
+        <!-- 临床数据是否完备 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:completeClinicalDataEnum')">
+          <el-select v-model="searchData.CompleteClinicalDataEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.CompleteClinicalDataEnum" :key="'CompleteClinicalDataEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 中心编号 -->
         <el-form-item :label="$t('trials:reviewTrack:table:siteCode')">
           <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
@@ -26,51 +38,40 @@
             clearable
           />
         </el-form-item>
+        <!-- 任务类型 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskType')">
+          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
+            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 阅片人 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:reader')">
           <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
             <el-option v-for="item of DoctorUserList" :key="'DoctorUserId' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
           </el-select>
         </el-form-item>
+        <!-- 角色 -->
+        <!-- <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:role')">
+          <el-select v-model="searchData.ArmEnum" clearable style="width:120px;">
+            <el-option v-for="item of $d.ArmEnum" :key="'ArmEnum' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item> -->
         <!-- 阅片标准 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:criterionName')">
           <el-select v-model="searchData.TrialReadingCriterionId" clearable style="width:120px;">
             <el-option v-for="item of trialCriterionList" :key="'TrialReadingCriterionId' + item.TrialReadingCriterionId" :value="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" />
           </el-select>
         </el-form-item>
-        <!-- 临床数据是否完备 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:completeClinicalDataEnum')">
-          <el-select v-model="searchData.CompleteClinicalDataEnum" clearable style="width:120px;">
-            <el-option v-for="item of $d.CompleteClinicalDataEnum" :key="'CompleteClinicalDataEnum' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 是否加急 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:isUrgent')">
-          <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" :key="'IsUrgent' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 任务状态 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskStatus')">
-          <el-select v-model="searchData.TaskState" clearable style="width:120px;">
-            <el-option v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 任务类型 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskType')">
-          <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
         <!-- 阅片状态 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:readingStatus')">
           <el-select v-model="searchData.ReadingTaskState" clearable style="width:120px;">
             <el-option v-for="item of $d.ReadingTaskState" :key="'ReadingTaskState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:ReReadingApplyState')">
-          <el-select v-model="searchData.ReReadingApplyState" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReReadingApplyState" :key="'ReReadingApplyState' + item.label" :value="item.value" :label="item.label" />
+        <!-- 任务状态 -->
+        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:taskStatus')">
+          <el-select v-model="searchData.TaskState" clearable style="width:120px;">
+            <el-option v-show="item.value === 0 || item.value === 5" v-for="item of $d.TaskState" :key="'TaskState' + item.label" :value="item.value" :label="item.label" />
           </el-select>
         </el-form-item>
         <!-- 分配时间 -->
@@ -93,6 +94,11 @@
             @change="changeTimeList2"
           />
         </el-form-item>
+        <!-- <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:ReReadingApplyState')">
+          <el-select v-model="searchData.ReReadingApplyState" clearable style="width:120px;">
+            <el-option v-for="item of $d.ReReadingApplyState" :key="'ReReadingApplyState' + item.label" :value="item.value" :label="item.label" />
+          </el-select>
+        </el-form-item> -->
         <el-form-item style="margin-bottom:10px">
           <el-button type="primary" icon="el-icon-search" @click="handleSearch">
             {{ $t('common:button:search') }}
@@ -104,6 +110,9 @@
           <el-button type="primary" icon="el-icon-download" @click="handleExport">
             {{ $t('common:button:export') }}
           </el-button>
+          <el-button type="primary" icon="el-icon-info" @click="handleViewRecord">
+            {{ $t('common:button:record') }}
+          </el-button>
 <!--          <el-button type="primary" @click="openReadingRules">-->
 <!--            阅片任务规则-->
 <!--          </el-button>-->
@@ -122,7 +131,7 @@
         height="100"
         @sort-change="handleSortChange"
       >
-      <!-- 是否加急 -->
+        <!-- 是否加急 -->
         <el-table-column
           prop="IsUrgent"
           :label="$t('trials:reviewTrack:table:isUrgent')"
@@ -146,42 +155,6 @@
 
           </template>
         </el-table-column>
-        <!-- 中心编号 -->
-        <el-table-column
-          prop="TrialSiteCode"
-          :label="$t('trials:reviewTrack:table:siteCode')"
-          width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <!-- 受试者编号 -->
-        <el-table-column
-          prop="SubjectCode"
-          :label="$t('trials:reviewTrack:table:subjectCode')"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <!-- 任务名称 -->
-        <el-table-column
-          prop="VisitTaskNum"
-          :label="$t('trials:reviewTrack:table:taskName')"
-          width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{scope.row.TaskName}}
-          </template>
-        </el-table-column>
-        <!-- 盲态任务标识 -->
-        <el-table-column
-          prop="TaskBlindName"
-          :label="$t('trials:reviewTrack:table:blindName')"
-          width="160"
-          sortable="custom"
-          show-overflow-tooltip
-        />
         <!-- 临床数据是否完备 -->
         <el-table-column
           prop="CompleteClinicalDataEnum"
@@ -198,43 +171,52 @@
             </el-button>
           </template>
         </el-table-column>
-        <!-- 阅片状态 -->
+        <!-- 中心编号 -->
         <el-table-column
-          prop="ReadingTaskState"
-          :label="$t('trials:reviewTrack:table:readingStatus')"
-          width="160"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
-            <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
-          </template>
-        </el-table-column>
-        <!-- 阅片完成时间 -->
-        <el-table-column
-          prop="SignTime"
-          :label="$t('trials:reviewTrack:table:signTime')"
-          min-width="180"
+          prop="TrialSiteCode"
+          :label="$t('trials:reviewTrack:table:siteCode')"
+          width="100"
           sortable="custom"
           show-overflow-tooltip
         />
-        <!-- 任务状态 -->
+        <!-- 受试者编号 -->
         <el-table-column
-          prop="TaskState"
-          :label="$t('trials:reviewTrack:table:taskStatus')"
-          width="160"
+          prop="SubjectCode"
+          :label="$t('trials:reviewTrack:table:subjectCode')"
+          min-width="120"
           sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
-            <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <span v-if="scope.row.MedicalNo && scope.row.MedicalNo !== scope.row.SubjectCode">
+              {{ `${scope.row.SubjectCode}/${scope.row.MedicalNo}` }}
+            </span>
+            <span v-else>{{scope.row.SubjectCode}}</span>
           </template>
         </el-table-column>
+        <!-- 任务名称 -->
+        <el-table-column
+          prop="VisitTaskNum"
+          :label="$t('trials:reviewTrack:table:taskName')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span v-if="scope.row.TaskBlindName && scope.row.TaskName !== scope.row.TaskBlindName">
+              {{ `${scope.row.TaskName}/${scope.row.TaskBlindName}` }}
+            </span>
+            <span v-else>{{scope.row.TaskName}}</span>
+          </template>
+        </el-table-column>
+        <!-- 盲态任务标识 -->
+        <!-- <el-table-column
+          prop="TaskBlindName"
+          :label="$t('trials:reviewTrack:table:blindName')"
+          width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        /> -->
         <!-- 任务类型 -->
         <el-table-column
           prop="ReadingCategory"
@@ -250,6 +232,18 @@
             <el-tag v-if="scope.row.ReadingCategory === 5" type="warning">{{ $fd('ReadingCategory', scope.row.ReadingCategory) }}</el-tag>
           </template>
         </el-table-column>
+        <!-- 阅片人 -->
+        <el-table-column
+          prop="UserName"
+          :label="$t('trials:reviewTrack:table:reader')"
+          width="130"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template v-if="scope.row.UserName" slot-scope="scope">
+            {{ scope.row.UserName }}({{ scope.row.FullName }})
+          </template>
+        </el-table-column>
         <!-- 角色 -->
         <el-table-column
           prop="ArmEnum"
@@ -267,18 +261,6 @@
             <el-tag v-if="scope.row.ArmEnum === 5" type="warning">{{ $fd('ArmEnum', scope.row.ArmEnum) }}</el-tag>
           </template>
         </el-table-column>
-        <!-- 阅片人 -->
-        <el-table-column
-          prop="UserName"
-          :label="$t('trials:reviewTrack:table:reader')"
-          width="130"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template v-if="scope.row.UserName" slot-scope="scope">
-            {{ scope.row.UserName }}({{ scope.row.FullName }})
-          </template>
-        </el-table-column>
         <!-- 阅片标准 -->
         <el-table-column
           prop="TrialReadingCriterionName"
@@ -287,7 +269,20 @@
           sortable="custom"
           show-overflow-tooltip
         />
-        <!-- 分配时间 -->
+        <!-- 阅片状态 -->
+        <el-table-column
+          prop="ReadingTaskState"
+          :label="$t('trials:reviewTrack:table:readingStatus')"
+          width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.ReadingTaskState === 2" type="primary">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
+            <el-tag v-else type="danger">{{ $fd('ReadingTaskState', scope.row.ReadingTaskState) }}</el-tag>
+          </template>
+        </el-table-column>
+         <!-- 分配时间 -->
         <el-table-column
           prop="AllocateTime"
           :label="$t('trials:reviewTrack:table:assignTime')"
@@ -303,8 +298,43 @@
           sortable="custom"
           show-overflow-tooltip
         />
-        <!-- 申请状态 -->
+        <!-- 阅片完成时间 -->
         <el-table-column
+          prop="SignTime"
+          :label="$t('trials:reviewTrack:table:signTime')"
+          min-width="180"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="ReadingDuration"
+          :label="$t('trials:reviewTrack:table:readingDuration')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 任务状态 -->
+        <el-table-column
+          prop="TaskState"
+          :label="$t('trials:reviewTrack:table:taskStatus')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <el-tag v-if="scope.row.TaskState === 0" type="primary">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 1" type="info">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 3" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 4" type="warning">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+            <el-tag v-if="scope.row.TaskState === 5" type="danger">{{ $fd('TaskState', scope.row.TaskState) }}</el-tag>
+          </template>
+        </el-table-column>
+        
+        
+        
+       
+        <!-- 申请状态 -->
+        <!-- <el-table-column
           prop="ReReadingApplyState"
           :label="$t('trials:reviewTrack:table:applyStatus')"
           min-width="140"
@@ -316,7 +346,7 @@
             <el-tag v-if="scope.row.ReReadingApplyState === 2" type="primary">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
             <el-tag v-if="scope.row.ReReadingApplyState === 3" type="warning">{{ $fd('ReReadingApplyState', scope.row.ReReadingApplyState) }}</el-tag>
           </template>
-        </el-table-column>
+        </el-table-column> -->
         <el-table-column
           fixed="right"
           :label="$t('common:action:action')"
@@ -882,6 +912,18 @@
         </div>
       </el-form>
     </el-dialog>
+    <el-dialog
+      v-if="recordVisible"
+      :title="$t('trials:readingTracking:title:failureRecord')"
+      :visible.sync="recordVisible"
+      width="1200px"
+      :fullscreen="true"
+      append-to-body
+      :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper"
+    >
+      <RecordList />
+    </el-dialog>
     </template>
   </BaseContainer>
 </template>
@@ -889,11 +931,13 @@
 import { getTrialSiteSelect,setTaskUrgent } from '@/api/trials'
 import { getTrialCriterionList, PMSetTaskBack, getInfluencedTaskList, getReReadingOrBackInfluenceTaskList, getReadingTaskList, configTrialReadingTaskViewRule, getDoctorUserSelectList, applyReReading } from '@/api/trials/reading'
 import { getToken } from '@/utils/auth'
+import { changeURLStatic } from '@/utils/history.js'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import RefereeRules from './components/RefereeRules.vue'
 import exportList from './components/exportList.vue'
-import ClinicalData from "../../subject/reading-period/components/ClinicalData";
+import ClinicalData from "../../subject/reading-period/components/ClinicalData"
+import RecordList from './components/RecordList.vue'
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
@@ -915,12 +959,15 @@ const searchDataDefault = () => {
     ReadingTaskState: null,
     CompleteClinicalDataEnum: null,
     BeginSignTime: null,
-    EndSignTime: null
+    EndSignTime: null,
+    IsEffect: true,
+    TrialReadingCriterionId: null
+    // ArmEnum: null
   }
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, RefereeRules, ClinicalData, exportList },
+  components: { BaseContainer, Pagination, RefereeRules, ClinicalData, exportList, RecordList },
   props: {
     AllocationReadingCategory: {
       type: String
@@ -989,14 +1036,25 @@ export default {
       TrialReadingCriterionId: null,
       urgentVisible: false,
       urgentForm: { VisitTaskId: '', IsUrgent: null,TaskUrgentType:null,TaskUrgentRemake:null },
-      dialogLoading:false,
-      openWindow:null
+      dialogLoading: false,
+      openWindow: null,
+      recordVisible: false
     }
   },
   mounted() {
     this.searchData.ReadingCategory = this.AllocationReadingCategory
     this.searchData.SubjectCode = this.AllocationSubjectCode
-    console.log(this.searchData.SubjectCode, this.searchData.ReadingCategory)
+    if (this.$route.query.SubjectCode) {
+      this.searchData.SubjectCode = this.$route.query.SubjectCode
+      this.searchData.TrialReadingCriterionId = this.$route.query.TrialReadingCriterionId ? this.$route.query.TrialReadingCriterionId : null
+      this.searchData.DoctorUserId = this.$route.query.DoctorUserId ? this.$route.query.DoctorUserId : null
+      this.searchData.TaskName = this.$route.query.TaskName ? this.$route.query.TaskName : null
+      changeURLStatic('SubjectCode', '')
+      changeURLStatic('TrialReadingCriterionId', '')
+      changeURLStatic('TaskName', '')
+      changeURLStatic('DoctorUserId', '')
+    }
+    this.searchData.ReadingCategory = this.AllocationReadingCategory
     this.getList()
     this.getSite()
     this.getDoctorUserSelectList()
@@ -1168,6 +1226,9 @@ export default {
         this.total = res.Result.TotalCount
       }).catch(() => { this.loading = false })
     },
+    handleViewRecord() {
+      this.recordVisible = true
+    },
     handleSearch() {
       this.searchData.PageIndex = 1
       this.getList()