18 changed files with 346 additions and 619 deletions
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@ -3,12 +3,6 @@
  <BaseContainer>
    <template slot="search-container">
      <el-form :inline="true">
-         <!-- 是否加急 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:consistencyAnalysis: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:consistencyCheck:table:siteId')">
          <!-- 中心编号 -->
          <el-select v-model="searchData.TrialSiteCode" clearable filterable style="width:120px;">
@ -32,10 +26,10 @@
            clearable
          />
        </el-form-item>
-        <!-- 任务类型 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:consistencyAnalysis: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-form-item style="margin-bottom:10px" :label="$t('trials:consistencyAnalysis: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>
        <!-- 阅片人 -->
@ -44,29 +38,16 @@
            <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:consistencyAnalysis: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:consistencyAnalysis: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:consistencyAnalysis:table:category')">
-          <el-select v-model="searchData.IsSelfAnalysis" clearable style="width:120px;">
-            <el-option v-for="item of $d.IsSelfAnalysis" :key="'IsSelfAnalysis' + item.label" :value="item.value" :label="item.label" />
-          </el-select>
-        </el-form-item>
-        <!-- 阅片状态 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:consistencyAnalysis:table:reviewStatus')">
-          <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-form-item style="margin-bottom:10px" :label="$t('trials:consistencyAnalysis: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>
        <!-- 任务状态 -->
@ -75,8 +56,18 @@
            <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:consistencyAnalysis: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:consistencyAnalysis:table:category')">
+          <el-select v-model="searchData.IsSelfAnalysis" clearable style="width:120px;">
+            <el-option v-for="item of $d.IsSelfAnalysis" :key="'IsSelfAnalysis' + 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;">
@ -93,16 +84,6 @@
            @change="changeTimeList"
          />
        </el-form-item>
-        <!-- 完成时间 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:consistencyAnalysis: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') }}
@ -157,6 +138,14 @@
            <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
          </template>
        </el-table-column>
+        <!-- 任务编号 -->
+        <el-table-column
+          prop="TaskCode"
+          :label="$t('trials:consistencyAnalysis:table:taskCode')"
+          width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 中心编号 -->
        <el-table-column
          prop="TrialSiteCode"
@ -174,24 +163,13 @@
          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>
+            {{scope.row.SubjectCode}}
            <span v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" class="status-primary-circle">
              <!-- 影 -->
              {{$t('trials:consistencyAnalysis:table:impact')}}
            </span>
          </template>
        </el-table-column>
-        <!-- 任务编号 -->
-        <!-- <el-table-column
-          prop="TaskCode"
-          :label="$t('trials:consistencyAnalysis:table:taskCode')"
-          width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        /> -->
        <!-- 任务名称 -->
        <el-table-column
          prop="VisitTaskNum"
@ -201,20 +179,17 @@
          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>
+            {{scope.row.TaskName}}
          </template>
        </el-table-column>
        <!-- 盲态任务标识 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="TaskBlindName"
          :label="$t('trials:consistencyAnalysis:table:taskBlindName')"
          width="160"
          sortable="custom"
          show-overflow-tooltip
-        /> -->
+        />
        <!-- 任务类型 -->
        <el-table-column
          prop="ReadingCategory"
@ -230,16 +205,17 @@
            <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:consistencyAnalysis:table:reader')"
-          width="120"
+          prop="IsSelfAnalysis"
+          :label="$t('trials:consistencyAnalysis:table:category')"
+          width="160"
          sortable="custom"
          show-overflow-tooltip
        >
          <template slot-scope="scope">
-            {{scope.row.UserName}}({{scope.row.FullName}})
+            <el-tag v-if="scope.row.IsSelfAnalysis" type="primary">{{ $fd('IsSelfAnalysis', scope.row.IsSelfAnalysis) }}</el-tag>
+            <el-tag v-else type="warning">{{ $fd('IsSelfAnalysis', scope.row.IsSelfAnalysis) }}</el-tag>
          </template>
        </el-table-column>
        <!-- 角色 -->
@ -259,6 +235,18 @@
            <el-tag v-if="scope.row.ArmEnum === 8" style="border-color: #4c2791;color:#4c2791;">{{$fd('ArmEnum', scope.row.ArmEnum)}}</el-tag>
          </template>
        </el-table-column>
+        <!-- 阅片人 -->
+        <el-table-column
+          prop="UserName"
+          :label="$t('trials:consistencyAnalysis:table:reader')"
+          width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{scope.row.UserName}}({{scope.row.FullName}})
+          </template>
+        </el-table-column>
        <!-- 阅片标准 -->
        <el-table-column
          prop="TrialReadingCriterionName"
@ -267,59 +255,6 @@
          sortable="custom"
          show-overflow-tooltip
        />
-        <!-- 一致性分析类别 -->
-        <el-table-column
-          prop="IsSelfAnalysis"
-          :label="$t('trials:consistencyAnalysis:table:category')"
-          width="170"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <el-tag v-if="scope.row.IsSelfAnalysis" type="primary">{{ $fd('IsSelfAnalysis', scope.row.IsSelfAnalysis) }}</el-tag>
-            <el-tag v-else type="warning">{{ $fd('IsSelfAnalysis', scope.row.IsSelfAnalysis) }}</el-tag>
-          </template>
-        </el-table-column>
-        <!-- 阅片状态 -->
-        <el-table-column
-          prop="ReadingTaskState"
-          :label="$t('trials:consistencyAnalysis:table:reviewStatus')"
-          width="140"
-          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:consistencyAnalysis:table:auditTime')"
-          width="160"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-        </el-table-column>
-        <!-- 建议完成时间 -->
-        <!-- <el-table-column
-          prop="SuggesteFinishedTime"
-          :label="$t('trials:consistencyAnalysis:table:suggesteFinishedTime')"
-          width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-         -->
-        <!-- 阅片完成时间 -->
-        <el-table-column
-          prop="SignTime"
-          :label="$t('trials:consistencyAnalysis:table:signTime')"
-          width="160"
-          sortable="custom"
-          show-overflow-tooltip
-        />
        <!-- 任务状态 -->
        <el-table-column
          prop="TaskState"
@ -336,8 +271,46 @@
            <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="AllocateTime"
+          :label="$t('trials:consistencyAnalysis:table:auditTime')"
+          width="160"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+        </el-table-column>
+        <!-- 建议完成时间 -->
+        <el-table-column
+          prop="SuggesteFinishedTime"
+          :label="$t('trials:consistencyAnalysis:table:suggesteFinishedTime')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <!-- 阅片状态 -->
+        <el-table-column
+          prop="ReadingTaskState"
+          :label="$t('trials:consistencyAnalysis:table:reviewStatus')"
+          width="140"
+          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:consistencyAnalysis:table:signTime')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        />
        <!-- 申请状态 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="ReReadingApplyState"
          :label="$t('trials:consistencyAnalysis:table:applyStatus')"
          width="180"
@ -349,9 +322,9 @@
            <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
+        <el-table-column
          prop="IsReReadingOrBackInfluenceAnalysis"
          :label="$t('trials:consistencyAnalysis:table:impactInfluence')"
          width="160"
@ -361,7 +334,7 @@
            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>
            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>
          </template>
-        </el-table-column> -->
+        </el-table-column>
        <el-table-column
          fixed="right"
          :label="$t('common:action:action')"
@ -701,9 +674,7 @@ const searchDataDefault = () => {
    TaskAllocationState: null,
    BeginAllocateDate: null,
    EndAllocateDate: null,
-    TrialReadingCriterionId: null,
-    BeginSignTime: null,
-    EndSignTime: null
+    TrialReadingCriterionId: null
  }
 }
 export default {
@ -736,7 +707,6 @@ export default {
      ReaderRulesFormVisible: false,
      IsSelfAnalysis: true,
      timeList: [],
-      timeList2: [],
      ApplyforReasonVisible: false,
      ApplyforReasonForm: {
        Type: null,
@ -820,15 +790,6 @@ export default {
        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
-      }
-    },
    // 重阅历史
    reReadingHistory(row) {
      this.$router.push({ path: `/trials/trials-panel/reading/reReadingTracking?trialId=${this.$route.query.trialId}&trialCode=${this.$route.query.trialCode}&researchProgramNo=${this.$route.query.researchProgramNo}&SiteId=${row.SiteId}&SubjectCode=${row.SubjectCode}&TaskName=${row.TaskName}&DoctorUserId=${row.DoctorUserId}` })
@ -1020,7 +981,6 @@ export default {
    },
    handleReset() {
      this.timeList = null
-      this.timeList2 = null
      this.searchData = searchDataDefault()
      this.getList()
    },
--- a/src/views/trials/trials-panel/reading/medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/index.vue
@ -32,7 +32,7 @@
                />
              </el-form-item>
              <!-- 盲态任务标识 -->
-              <!-- <el-form-item
+              <el-form-item
                style="margin-bottom:10px"
                :label="$t('trials:medicalFeedback:table:taskBlindName')"
              >
@ -41,7 +41,7 @@
                  style="width:100px;"
                  clearable
                />
-              </el-form-item> -->
+              </el-form-item>
              <!-- 任务类型 -->
              <el-form-item
                style="margin-bottom:10px"
@ -78,26 +78,8 @@
                  />
                </el-select>
              </el-form-item>
-              <!-- 审核结论 -->
-              <el-form-item
-                style="margin-bottom:10px"
-                :label="$t('trials:medicalFeedback:button:isQuestions')"
-              >
-                <el-select
-                  v-model="searchData.IsHaveQuestion"
-                  clearable
-                  style="width:120px;"
-                >
-                  <el-option
-                    v-for="item of $d.IsPass"
-                    :key="'IsPass' + item.label"
-                    :value="item.value"
-                    :label="item.label"
-                  />
-                </el-select>
-              </el-form-item>
              <!-- 医学审核建议 -->
-              <!-- <el-form-item
+              <el-form-item
                style="margin-bottom:10px"
                :label="$t('trials:medicalFeedback:table:auditAdvice')"
              >
@ -113,7 +95,7 @@
                    :label="item.label"
                  />
                </el-select>
-              </el-form-item> -->
+              </el-form-item>

              <!-- 是否认可 -->
              <el-form-item
@ -389,7 +371,6 @@ const searchDataDefault = () => {
    AuditState: null,
    AuditAdviceEnum: null,
    DoctorUserIdeaEnum: null,
-    IsHaveQuestion: null,
    PageIndex: 1,
    PageSize: 20
  }
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@ -58,7 +58,7 @@
                />
              </el-form-item>
              <!-- 盲态任务标识 -->
-              <!-- <el-form-item
+              <el-form-item
                style="margin-bottom:10px"
                :label="$t('trials:medicalFeedback:table:taskBlindName')"
              >
@ -67,22 +67,22 @@
                  style="width:100px;"
                  clearable
                />
-              </el-form-item> -->
-              <!-- 任务类型 -->
+              </el-form-item>
+              <!-- 阅片角色 -->
              <el-form-item
                style="margin-bottom:10px"
-                :label="$t('trials:medicalFeedback:table:readingCategory')"
+                :label="$t('trials:medicalFeedback:table:armEnum')"
              >
                <el-select
-                  v-model="searchData.ReadingCategory"
+                  v-model="searchData.ArmEnum"
                  clearable
                  style="width:120px;"
                >
                  <el-option
-                    v-for="r of $d.ReadingCategory"
-                    :key="'ReadingCategory' + r.label"
-                    :value="r.value"
-                    :label="r.label"
+                    v-for="arm of $d.ArmEnum"
+                    :key="'ArmEnum' + arm.label"
+                    :value="arm.value"
+                    :label="arm.label"
                  />
                </el-select>
              </el-form-item>
@ -104,64 +104,39 @@
                  />
                </el-select>
              </el-form-item>
-              <!-- 阅片角色 -->
+              <el-form-item style="margin-bottom:10px" :label="$t('trials:medicalFeedback:table:taskState')">
+                <el-select v-model="searchData.TaskState" clearable style="width:120px;">
+                  <el-option v-for="i of $d.TaskState" :key="'TaskState' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
+              <!-- 任务类型 -->
              <el-form-item
                style="margin-bottom:10px"
-                :label="$t('trials:medicalFeedback:table:armEnum')"
+                :label="$t('trials:medicalFeedback:table:readingCategory')"
              >
                <el-select
-                  v-model="searchData.ArmEnum"
+                  v-model="searchData.ReadingCategory"
                  clearable
                  style="width:120px;"
                >
                  <el-option
-                    v-for="arm of $d.ArmEnum"
-                    :key="'ArmEnum' + arm.label"
-                    :value="arm.value"
-                    :label="arm.label"
+                    v-for="r of $d.ReadingCategory"
+                    :key="'ReadingCategory' + r.label"
+                    :value="r.value"
+                    :label="r.label"
                  />
                </el-select>
              </el-form-item>
-              <!-- 审核状态 -->
              <el-form-item style="margin-bottom:10px" :label="$t('trials:medicalFeedback:table:auditState')">
                <el-select v-model="searchData.AuditState" clearable style="width:120px;">
                  <el-option v-for="i of $d.MedicalReviewAuditState" :key="'AuditState' + i.label" :value="i.value" :label="i.label" />
                </el-select>
              </el-form-item>
-              <!-- 任务状态 -->
-              <!-- <el-form-item style="margin-bottom:10px" :label="$t('trials:medicalFeedback:table:taskState')">
-                <el-select v-model="searchData.TaskState" clearable style="width:120px;">
-                  <el-option v-for="i of $d.TaskState" :key="'TaskState' + i.label" :value="i.value" :label="i.label" />
-                </el-select>
-              </el-form-item> -->
-              <!-- 审核结论 -->
-              <el-form-item style="margin-bottom:10px" :label="$t('trials:medicalFeedback: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:medicalFeedback: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:medicalFeedback:table:DoctorUserIdeaEnum')">
                <el-select v-model="searchData.DoctorUserIdeaEnum" clearable style="width:120px;">
                  <el-option v-for="i of $d.MedicalReviewDoctorUserIdea" :key="'DoctorUserIdeaEnum' + i.label" :value="i.value" :label="i.label" />
                </el-select>
              </el-form-item>
-              <!-- 审核分配时间 -->
-              <el-form-item style="margin-bottom:10px" :label="$t('trials:medicalFeedback:table:allocateTime')">
-                <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">
                <el-button
                  type="primary"
@ -235,14 +210,7 @@
                width="140"
                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="TaskName"
@ -250,22 +218,15 @@
                width="160"
                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
+              <el-table-column
                prop="TaskBlindName"
                :label="$t('trials:medicalFeedback:table:taskBlindName')"
                width="180"
                sortable="custom"
                show-overflow-tooltip
-              /> -->
+              />
              <!-- 任务类型 -->
              <el-table-column
                prop="ReadingCategory"
@ -301,16 +262,20 @@
                  </el-tag>
                </template>
              </el-table-column>
-              <!-- 阅片人 -->
+              <!-- 阅片任务状态 -->
              <el-table-column
-                prop="UserName"
-                :label="$t('trials:medicalFeedback:table:reader')"
-                width="120"
+                prop="TaskState"
+                :label="$t('trials:medicalFeedback:table:taskState')"
+                width="160"
                sortable="custom"
                show-overflow-tooltip
              >
-                <template v-if="scope.row.DoctorUser" slot-scope="scope">
-                  {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
+                <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>
              <!-- 阅片角色 -->
@ -353,22 +318,51 @@
                  </el-tag>
                </template>
              </el-table-column>
-              <!-- 阅片任务状态 -->
-              <!-- <el-table-column
-                prop="TaskState"
-                :label="$t('trials:medicalFeedback:table:taskState')"
-                width="160"
+              <!-- 阅片人 -->
+              <el-table-column
+                prop="UserName"
+                :label="$t('trials:medicalFeedback:table:reader')"
+                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>
+                <template v-if="scope.row.DoctorUser" slot-scope="scope">
+                  {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
                </template>
-              </el-table-column> -->
+              </el-table-column>
+              <!-- 阅片签名时间 -->
+              <el-table-column
+                prop="SignTime"
+                :label="$t('trials:medicalFeedback:table:signTime')"
+                width="180"
+                sortable="custom"
+                show-overflow-tooltip
+              />
+              <!-- 审核分配时间 -->
+              <el-table-column
+                prop="AllocateTime"
+                :label="$t('trials:medicalFeedback:table:allocateTime')"
+                width="180"
+                sortable="custom"
+                show-overflow-tooltip
+              />
+              <!-- 任务状态 -->
+              <el-table-column
+                prop="IsInvalid"
+                width="120"
+                :label="$t('trials:medicalFeedback:table:isInvalid')"
+                show-overflow-tooltip
+                sortable="custom"
+              >
+                <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"
@ -389,18 +383,6 @@
                  </el-tag>
                </template>
              </el-table-column>
-              <!-- 审核结论 -->
-              <el-table-column
-                prop="IsHaveQuestion"
-                :label="$t('trials:medicalFeedback:table:IsHaveQuestion')"
-                width="130"
-                sortable="custom"
-                show-overflow-tooltip
-              >
-                <template slot-scope="scope">
-                  {{ $fd('IsPass',scope.row.IsHaveQuestion) }}
-                </template>
-              </el-table-column>
              <!-- 审核建议 -->
              <el-table-column
                prop="AuditAdviceEnum"
@ -416,8 +398,8 @@
              <!-- 阅片人是否认同 -->
              <el-table-column
                prop="DoctorUserIdeaEnum"
-                :label="$t('trials:medicalFeedback:table:DoctorUserIdeaEnum')"
-                width="170"
+                :label="$t('trials:medicalFeedback:table:doctorUserIdea')"
+                width="150"
                sortable="custom"
                show-overflow-tooltip
              >
@ -425,41 +407,6 @@
                  {{ $fd('MedicalReviewDoctorUserIdea',scope.row.DoctorUserIdeaEnum) }}
                </template>
              </el-table-column>
-              
-              <!-- 阅片签名时间 -->
-              <!-- <el-table-column
-                prop="SignTime"
-                :label="$t('trials:medicalFeedback:table:signTime')"
-                width="180"
-                sortable="custom"
-                show-overflow-tooltip
-              /> -->
-              <!-- 审核分配时间 -->
-              <el-table-column
-                prop="AllocateTime"
-                :label="$t('trials:medicalFeedback:table:allocateTime')"
-                width="180"
-                sortable="custom"
-                show-overflow-tooltip
-              />
-              <!-- 任务状态 -->
-              <!-- <el-table-column
-                prop="IsInvalid"
-                width="120"
-                :label="$t('trials:medicalFeedback:table:isInvalid')"
-                show-overflow-tooltip
-                sortable="custom"
-              >
-                <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="AuditSignTime"
@ -614,10 +561,7 @@ const searchDataDefault = () => {
    ReadingTaskState: null,
    AuditState: null,
    TaskState: null,
-    DoctorUserIdeaEnum: null,
-    BeginAllocateDate: null,
-    EndAllocateDate: null,
-    IsEffect: true
+    DoctorUserIdeaEnum: null
  }
 }
 export default {
@ -738,15 +682,6 @@ export default {
        }
      })
    },
-    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
-      }
-    },
    handleView(row) {
      this.currentRow = { ...row }
      this.auditVisible = true
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue
@ -3,12 +3,6 @@
  <BaseContainer>
    <template slot="search-container">
      <el-form :inline="true">
-         <!-- 是否加急 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:select: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:select:siteCode')">
          <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
@ -32,54 +26,48 @@
            clearable
          />
        </el-form-item>
-        <!-- 任务类型 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:select: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:select: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" />
          </el-select>
        </el-form-item>
-        <!-- 角色 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:select: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:select: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:select: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="任务状态">
          <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:select: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:select:isGeneratedJudge')">
          <el-select v-model="searchData.IsGeneratedJudge" clearable style="width:120px;">
            <el-option v-for="item of $d.YesOrNo" :key="'IsGeneratedJudge' + item.label" :value="item.value" :label="item.label" />
          </el-select>
        </el-form-item>
-        <!-- 阅片时间 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:select:signTime')">
-          <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>
+<!--        &lt;!&ndash; 全局阅片是否有更新 &ndash;&gt;-->
+<!--        <el-form-item style="margin-bottom:10px" :label="$t('trials:pmMedicalReview:select:globalReadingChanged')">-->
+<!--          <el-select v-model="searchData.IsGeneratedJudge" clearable style="width:120px;">-->
+<!--            <el-option v-for="item of $d.YesOrNo" :key="'ReadingCategory' + 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') }}
@ -119,13 +107,13 @@
          </template>
        </el-table-column>
        <!-- 任务编号 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="TaskCode"
          :label="$t('trials:pmMedicalReview:select:taskCode')"
          width="120"
          sortable="custom"
          show-overflow-tooltip
-        /> -->
+        />
        <!-- 中心编号 -->
        <el-table-column
          prop="TrialSiteCode"
@ -141,22 +129,15 @@
          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
+        <el-table-column
          prop="SubjectCode"
          :label="$t('trials:pmMedicalReview:select:subjectSecondCode')"
          width="120"
          sortable="custom"
          show-overflow-tooltip
-        /> -->
+        />
        <!-- 任务名称 -->
        <el-table-column
          prop="VisitTaskNum"
@ -166,20 +147,17 @@
          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>
+            {{scope.row.TaskName}}
          </template>
        </el-table-column>
        <!-- 盲态任务标识 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="TaskBlindName"
          :label="$t('trials:pmMedicalReview:select:taskBlindName')"
          width="160"
          sortable="custom"
          show-overflow-tooltip
-        /> -->
+        />
        <!-- 任务类型 -->
        <el-table-column
          prop="ReadingCategory"
@ -195,18 +173,6 @@
            <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="DoctorUser.UserName"
-          :label="$t('trials:pmMedicalReview:select:reader')"
-          width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
-          </template>
-        </el-table-column>
        <!-- 角色 -->
        <el-table-column
          prop="ArmEnum"
@ -223,7 +189,18 @@
            <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="DoctorUser.UserName"
+          :label="$t('trials:pmMedicalReview:select:reader')"
+          width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{ scope.row.DoctorUser.UserName }}({{ scope.row.DoctorUser.FullName }})
+          </template>
+        </el-table-column>
        <!-- 阅片标准 -->
        <el-table-column
          prop="TrialReadingCriterionName"
@ -232,21 +209,6 @@
          sortable="custom"
          show-overflow-tooltip
        />
-        <!-- 是否产生裁判 -->
-        <el-table-column
-          prop="IsGeneratedJudge"
-          :label="$t('trials:pmMedicalReview:select:isGeneratedJudge')"
-          width="140"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <div>
-              <el-tag v-if="!scope.row.IsGeneratedJudge" type="danger">{{ $fd('YesOrNo', scope.row.IsGeneratedJudge) }}</el-tag>
-              <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsGeneratedJudge) }}</el-tag>
-            </div>
-          </template>
-        </el-table-column>
        <!-- 阅片完成时间 -->
        <el-table-column
          prop="SignTime"
@ -266,17 +228,47 @@
            {{scope.row.ReadingDuration}}
          </template>
        </el-table-column>
+        <!-- 是否产生裁判 -->
+        <el-table-column
+          prop="IsGeneratedJudge"
+          :label="$t('trials:pmMedicalReview:select:isGeneratedJudge')"
+          width="140"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <div>
+              <el-tag v-if="!scope.row.IsGeneratedJudge" type="danger">{{ $fd('YesOrNo', scope.row.IsGeneratedJudge) }}</el-tag>
+              <el-tag v-else type="primary">{{ $fd('YesOrNo', scope.row.IsGeneratedJudge) }}</el-tag>
+            </div>
+          </template>
+        </el-table-column>
+<!--        &lt;!&ndash; 全局阅片是否有校正 &ndash;&gt;-->
+<!--        <el-table-column-->
+<!--          prop="IsGlobalHaveUpdate"-->
+<!--          :label="$t('trials:pmMedicalReview:select:globalReadingChanged')"-->
+<!--          width="180"-->
+<!--          sortable="custom"-->
+<!--          show-overflow-tooltip-->
+<!--        >-->
+<!--        <template slot-scope="scope">-->
+<!--            <div>-->
+<!--              <el-tag v-if="scope.row.IsGlobalHaveUpdate" type="primary">{{ $fd('YesOrNo', scope.row.IsGlobalHaveUpdate) }}</el-tag>-->
+<!--            </div>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
+        <!-- 审核次数 -->
        <el-table-column
          prop="GeneratedMedicalReviewCount"
          :label="$t('trials:pmMedicalReview:select:auditCount')"
-          width="130"
+          width="150"
          sortable="custom"
          show-overflow-tooltip
        />
        <el-table-column
          fixed="right"
          :label="$t('common:action:action')"
-          min-width="100"
+          width="100"
        >
          <template slot-scope="scope">
            <el-button
@ -299,7 +291,7 @@
        append-to-body
        :close-on-click-modal="false"
      >
-        <AssignMedicalReviewTask :data="rowData" :select-list="SelectList" :doctor-user-list="MIMOptions" @close="() => {AssignMedicalReviewTaskVisible = false}" @getList="refreshList" />
+        <AssignMedicalReviewTask :data="rowData" :select-list="SelectList" :doctor-user-list="MIMOptions" @close="() => {AssignMedicalReviewTaskVisible = false}" @getList="getList" />
      </el-dialog>
    </template>
  </BaseContainer>
@ -330,9 +322,7 @@ const searchDataDefault = () => {
    BeginAllocateDate: null,
    EndAllocateDate: null,
    RootReReadingTaskId: null,
-    IsGeneratedJudge: null,
-    BeginSignTime: null,
-    EndSignTime: null
+    IsGeneratedJudge: null
  }
 }
 export default {
@ -426,11 +416,11 @@ export default {
    },
    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
      }
    },
    // 申请重阅
@ -462,15 +452,12 @@ export default {
      getGenerateMedicalReviewTaskList(this.searchData).then(res => {
        this.loading = false
        this.OtherInfo = res.OtherInfo
+        this.$emit('getList')
        this.AssignMedicalReviewTaskVisible = false
        this.list = res.Result.CurrentPageData
        this.total = res.Result.TotalCount
      }).catch(() => { this.loading = false })
    },
-    refreshList() {
-      this.getList()
-      this.$emit('getList')
-    },
    handleSearch() {
      this.searchData.PageIndex = 1
      this.getList()
--- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue
@ -76,15 +76,6 @@
          </el-select>
        </el-form-item> -->
        
-        
-        <!-- 申请原因 -->
-        <el-form-item style="margin-bottom:10px" :label="$t('trials:rereadTrack:table:applyReason')">
-          <el-input
-            v-model="searchData.RequestReReadingReason"
-            style="width:100px;"
-            clearable
-          />
-        </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;">
@ -450,14 +441,7 @@
              :label="$t('trials:reviewTrack:table:subjectCode')"
              min-width="120"
              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"
@ -466,19 +450,16 @@
              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>
+                {{ scope.row.TaskName }}
              </template>
            </el-table-column>
            <!-- 盲态任务标识 -->
-            <!-- <el-table-column
+            <el-table-column
              prop="TaskBlindName"
              :label="$t('trials:reviewTrack:table:blindName')"
              min-width="120"
              show-overflow-tooltip
-            /> -->
+            />
            <!-- 阅片标准 -->
            <el-table-column
              prop="TrialReadingCriterionName"
@ -617,8 +598,7 @@ const searchDataDefault = () => {
    CompleteClinicalDataEnum: null,
    ArmEnum: null,
    BeginRequestReReadingTime: null,
-    EndRequestReReadingTime: null,
-    RequestReReadingReason: null
+    EndRequestReReadingTime: null
  }
 }
 export default {
--- a/src/views/trials/trials-panel/reading/read-task/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task/index.vue
@ -5,12 +5,6 @@
        <div v-if="TrialReadingCriterionId === item.TrialReadingCriterionId">
          <div slot="search-container" style="position:relative;">
            <el-form :inline="true">
-              <!-- 是否加急 -->
-              <el-form-item style="margin-bottom:10px" :label="$t('trials:readTask:form:IsUrgent')">
-                <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
-                  <el-option v-for="i of $d.YesOrNo" :key="'IsUrgent' + i.label" :value="i.value" :label="i.label" />
-                </el-select>
-              </el-form-item>
              <!-- 受试者编号 -->
              <el-form-item :label="$t('trials:readTask:table:subjectCode')">
                <el-input
@ -31,7 +25,12 @@
                  <el-option v-for="i of $d.ReadingCategory" :key="'ReadingCategory' + i.label" :value="i.value" :label="i.label" />
                </el-select>
              </el-form-item>
-              
+              <!-- 是否加急 -->
+              <el-form-item style="margin-bottom:10px" :label="$t('trials:readTask:form:IsUrgent')">
+                <el-select v-model="searchData.IsUrgent" clearable style="width:120px;">
+                  <el-option v-for="i of $d.YesOrNo" :key="'IsUrgent' + i.label" :value="i.value" :label="i.label" />
+                </el-select>
+              </el-form-item>
              <el-form-item>
                <!-- 查询 -->
                <el-button type="primary" icon="el-icon-search" @click="handleSearch">
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/RecordList.vue
@ -74,12 +74,6 @@
            <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:applyStatus')">
-          <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" :label="$t('trials:reviewTrack:table:assignTime')">
          <el-date-picker
@ -233,7 +227,7 @@
          </template>
        </el-table-column>
        <!-- 角色 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="ArmEnum"
          :label="$t('trials:reviewTrack:table:role')"
          width="100"
@ -248,7 +242,7 @@
            <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>
        <!-- 阅片标准 -->
        <el-table-column
          prop="TrialReadingCriterionName"
@ -385,7 +379,6 @@ const searchDataDefault = () => {
    CompleteClinicalDataEnum: null,
    BeginSignTime: null,
    EndSignTime: null,
-    ReReadingApplyState: null,
    IsEffect: false
    // ArmEnum: null
  }
@ -461,8 +454,6 @@ export default {
      this.getList()
    },
    handleReset() {
-      this.timeList = []
-      this.timeList2 = []
      this.searchData = searchDataDefault()
      this.getList()
    },
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@ -84,7 +84,7 @@
            @change="changeTimeList"
          />
        </el-form-item>
-        <!-- 完成时间 -->
+        <!-- 分配时间 -->
        <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewTrack:table:signTime')">
          <el-date-picker
            v-model="timeList2"
@ -245,7 +245,7 @@
          </template>
        </el-table-column>
        <!-- 角色 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="ArmEnum"
          :label="$t('trials:reviewTrack:table:role')"
          width="100"
@ -260,7 +260,7 @@
            <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>
        <!-- 阅片标准 -->
        <el-table-column
          prop="TrialReadingCriterionName"
@ -317,7 +317,7 @@
        <el-table-column
          prop="TaskState"
          :label="$t('trials:reviewTrack:table:taskStatus')"
-          width="160"
+          width="140"
          sortable="custom"
          show-overflow-tooltip
        >
@ -703,14 +703,7 @@
              :label="$t('trials:reviewTrack:table:subjectCode')"
              min-width="120"
              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"
@ -719,19 +712,16 @@
              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>
+                {{scope.row.TaskName}}
              </template>
            </el-table-column>
            <!-- 盲态任务标识 -->
-            <!-- <el-table-column
+            <el-table-column
              prop="TaskBlindName"
              :label="$t('trials:reviewTrack:table:blindName')"
              min-width="120"
              show-overflow-tooltip
-            /> -->
+            />
            <!-- 阅片标准 -->
            <el-table-column
              prop="TrialReadingCriterionName"
--- a/src/views/trials/trials-panel/reading/reread-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reread-task/index.vue
@ -5,24 +5,6 @@
        <div v-if="TrialReadingCriterionId === item.TrialReadingCriterionId">
          <div slot="search-container">
            <el-form :inline="true">
-              <!-- 是否加急 -->
-              <el-form-item
-                style="margin-bottom:10px"
-                :label="$t('trials:rereadTask: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:rereadTask:table:siteCode')">
                <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
@ -46,13 +28,13 @@
                />
              </el-form-item> -->
              <!-- 任务编号 -->
-              <!-- <el-form-item :label="$t('trials:rereadTask:table:taskCode')">
+              <el-form-item :label="$t('trials:rereadTask:table:taskCode')">
                <el-input
                  v-model="searchData.TaskCode"
                  style="width:130px;"
                  clearable
                />
-              </el-form-item> -->
+              </el-form-item>
              <el-form-item :label="$t('trials:rereadTask:table:taskState')">
                <el-select v-model="searchData.TaskState" clearable style="width:120px;">
                  <el-option v-for="i of $d.TaskState" :key="'TaskState' + i.label" :value="i.value" :label="i.label" />
@ -236,13 +218,13 @@
                </template>
              </el-table-column>
              <!-- 新任务编号 -->
-              <!-- <el-table-column
+              <el-table-column
                prop="ReReadingNewTaskCode"
                :label="$t('trials:rereadTask:table:reReadingNewTaskCode')"
                min-width="120"
                sortable="custom"
                show-overflow-tooltip
-              /> -->
+              />
            </el-table>
            <!-- 分页组件 -->
            <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
@ -301,7 +283,6 @@ import Pagination from '@/components/Pagination'
 import { changeURLStatic } from '@/utils/history.js'
 const searchDataDefault = () => {
  return {
-    IsUrgent: null,
    SubjectCode: '',
    TaskCode: '',
    PageIndex: 1,
--- a/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue
+++ b/src/views/trials/trials-panel/setting/attachment/components/attachmentForm.vue
@ -62,7 +62,7 @@
        >
          <el-option
            v-for="item of userTypeOptions"
-            v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 31"
+            v-if="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 20"
            :key="item.Id"
            :label="item.UserTypeShortName"
            :value="item.Id"
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@ -21,7 +21,6 @@
        <el-form-item :label="$t('trials:attachment:table:fileName')">
          <el-input v-model="searchData.Name" style="width:100px;" />
        </el-form-item>
-        <!-- 培训状态 -->
        <el-form-item :label="$t('trials:attachment:table:isDeleted')">
          <el-select
            clearable
@ -29,32 +28,13 @@
            style="width:150px;"
          >
            <el-option
-              v-for="item of $d.TrainingStatus"
+              v-for="item of $d.YesOrNo"
              :key="item.value"
              :label="item.label"
-              :value="!item.value"
+              :value="item.value"
            />
          </el-select>
        </el-form-item>
-        <!-- 培训角色 -->
-        <el-form-item :label="$t('trials:attachment:table:userType')">
-          <el-select
-            v-model="searchData.UserTypeId"
-            style="width:100%;"
-          >
-            <el-option
-              v-for="item of userTypeOptions"
-              v-show="item.UserTypeEnum !== 1 && item.UserTypeEnum !== 8 && item.UserTypeEnum !== 20 && item.UserTypeEnum !== 31"
-              :key="item.Id"
-              :label="item.UserTypeShortName"
-              :value="item.Id"
-            >
-              <span>{{ item.UserType }}</span>
-            </el-option>
-          </el-select>
-        </el-form-item>
-        
-      
        <el-form-item>
          <!-- 查询 -->
          <el-button type="primary" icon="el-icon-search" @click="handleSearch">
@ -222,7 +202,7 @@
 </template>
 <script>

-import { getTrialDocumentList, userAbandonDoc, getTrialUserTypeList } from '@/api/trials'
+import { getTrialDocumentList, userAbandonDoc } from '@/api/trials'
 import BoxContent from '@/components/BoxContent'
 import Pagination from '@/components/Pagination'
 import AttachmentForm from './components/attachmentForm'
@ -235,8 +215,7 @@ const searchDataDefault = () => {
    PageSize: 20,
    SortField: '',
    Asc: false,
-    IsDeleted: null,
-    UserTypeId: null
+    IsDeleted: null
  }
 }
 export default {
@ -255,14 +234,13 @@ export default {
      currentRow: {},
      currentPath: '',
      currentType: '',
-      trialId: '',
-      userTypeOptions: []
+      trialId: ''
    }
  },
  mounted() {
+    console.log(this.$d.Trial_Document)
    this.trialId = this.$route.query.trialId
    this.getList()
-    this.getUserType()
  },
  methods: {
    // 获取系统文件数据
@ -286,15 +264,6 @@ export default {
        this.loading = false
      })
    },
-    // 获取用户类型下拉数据
-    getUserType() {
-      getTrialUserTypeList().then(res => {
-        this.userTypeOptions = res.Result
-        if (this.form.Id) {
-          this.form.NeedConfirmedUserTypeIdList = this.data.NeedConfirmedUserTypeeIds
-        }
-      }).catch(() => { this.loading = false })
-    },
    // 新增
    handleAdd() {
      this.title = this.$t('common:button:add')
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@ -6,14 +6,10 @@
        <el-form-item :label="$t('trials:sitesList:table:siteId')">
          <el-input v-model="listQuery.TrialSiteCode" class="mr" clearable />
        </el-form-item>
-        <!-- 中心名称 -->
-        <el-form-item :label="$t('trials:sitesList:table:siteName')">
-          <el-input v-model="listQuery.Site" class="mr" clearable />
-        </el-form-item>
        <!-- 中心别名 -->
-        <!-- <el-form-item :label="$t('trials:sitesList:table:siteAliasName')">
+        <el-form-item :label="$t('trials:sitesList:table:siteAliasName')">
          <el-input v-model="listQuery.TrialSiteAliasName" class="mr" clearable />
-        </el-form-item> -->
+        </el-form-item>
        <!-- 关键词 -->
        <el-form-item :label="$t('trials:sitesList:form:keyWord')">
          <el-input
@ -115,7 +111,7 @@
        :label="$t('trials:sitesList:table:siteName')"
        show-overflow-tooltip
        sortable="custom"
-        min-width="120"
+        min-width="240"
      />
      <!-- 中心别名 -->
      <el-table-column
@ -123,30 +119,30 @@
        :label="$t('trials:sitesList:table:siteAliasName')"
        show-overflow-tooltip
        sortable="custom"
-        min-width="120"
+        min-width="240"
      />
      <!-- 城市 -->
-      <!-- <el-table-column
+      <el-table-column
        prop="City"
        :label="$t('trials:sitesList:table:city')"
        sortable="custom"
        show-overflow-tooltip
        width="100"
-      /> -->
+      />
      <!-- 国家 -->
-      <!-- <el-table-column
+      <el-table-column
        prop="Country"
        :label="$t('trials:sitesList:table:country')"
        show-overflow-tooltip
        sortable="custom"
        width="120"
-      /> -->
+      />
      <!-- 参与者 -->
      <el-table-column
        prop="UserNameList"
        :label="$t('trials:sitesList:table:staff')"
        show-overflow-tooltip
-        min-width="100"
+        width="140"
      >
        <template slot-scope="scope">
          <el-button v-if="scope.row.UserCount > 0" size="small" type="text" @click="getCrcList(scope.row)">
@ -154,29 +150,13 @@
          </el-button>
        </template>
      </el-table-column>
-      <!-- Subjects -->
-        <el-table-column
-          prop="SubjectCount"
-          min-width="100"
-          :label="$t('trials:site:table:subjects')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
-        <!-- Visits -->
-        <el-table-column
-          prop="VisitCount"
-          min-width="100"
-          :label="$t('trials:site:table:visits')"
-          show-overflow-tooltip
-          sortable="custom"
-        />
      <!-- 状态 -->
      <el-table-column
        prop="IsDeleted"
        :label="$t('trials:sitesList:table:status')"
        show-overflow-tooltip
        sortable
-        min-width="100"
+        width="100"
      >
        <template slot-scope="scope">
          <el-tag v-if="scope.row.IsDeleted" type="danger">{{ $fd('IsSiteDisable', scope.row.IsDeleted) }}</el-tag>
@ -189,27 +169,27 @@
        :label="$t('trials:sitesList:table:timeAdded')"
        show-overflow-tooltip
        sortable
-        min-width="150"
+        width="210"
      />
      <!-- 禁用时间 -->
-      <!-- <el-table-column
+      <el-table-column
        prop="DeletedTime"
        :label="$t('trials:sitesList:table:timeDeleted')"
        show-overflow-tooltip
        sortable
        width="210"
-      /> -->
-      <!-- <el-table-column
+      />
+      <el-table-column
        prop="CreateTime"
        :label="$t('trials:internalStaff:table:CreateTime')"
        show-overflow-tooltip
        sortable
        width="210"
-      /> -->
+      />
      <el-table-column
        v-if="hasPermi(['trials:trials-panel:setting:personnel-manage:edit-site','trials:trials-panel:setting:personnel-manage:remove-site'])"
        :label="$t('common:action:action')"
-        min-width="120"
+        width="150"
      >
        <template slot-scope="scope">
          <!-- Assign -->
--- a/src/views/trials/trials-panel/study/index.vue
+++ b/src/views/trials/trials-panel/study/index.vue
@ -4,7 +4,7 @@
    <template slot="search-container">
      <el-form :inline="true">
        <!-- Site -->
-        <el-form-item :label="$t('trials:studyList:table:site')">
+        <el-form-item :label="$t('trials:studyList:table:siteId')">
          <el-select
            v-model="searchData.SiteId"
            clearable
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@ -43,10 +43,6 @@
              />
            </el-select>
          </el-form-item>
-          <!-- 任务名称 -->
-          <el-form-item :label="$t('trials:auditRecord:table:taskName')">
-            <el-input v-model="searchData.TaskName" />
-          </el-form-item>
          <!-- 阅片标准 -->
          <el-form-item :label="$t('trials:auditRecord:table:criterion')">
            <el-select v-model="searchData.TrialReadingCriterionId" clearable filterable>
@ -72,23 +68,9 @@
              <el-option v-for="item of DescriptionOptions" :value="item" :label="item" :key="item"/>
            </el-select>
          </el-form-item>
-          <!-- 是否签名 -->
-          <el-form-item :label="$t('trials:auditRecord:table:isSign')">
-            <el-select v-model="searchData.IsSign" style="width:120px"  clearable>
-              <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="`IsSign${item.value}`"/>
-            </el-select>
-          </el-form-item>
          <!-- 操作人 -->
          <el-form-item :label="$t('trials:auditRecord:table:operator')">
-            <el-input v-model="searchData.CreateUserRealName" style="width:120px" />
-          </el-form-item>
-          <!-- 角色 -->
-          <el-form-item :label="$t('trials:auditRecord:table:role')">
-            <el-select v-model="searchData.RoleName" style="width:120px"  clearable>
-              <el-option v-for="item of $d.UserType" :label="item.label" :value="item.label" :key="`RoleName${item.value}`"/>
-            </el-select>
-<!--            <el-input v-model="searchData.RoleName" clearable/>-->
-<!--            RoleName-->
+            <el-input v-model="searchData.OpByUserName" style="width:120px" />
          </el-form-item>
          <!-- 操作时间 -->
          <el-form-item :label="$t('trials:auditRecord:table:operateTime')">
@ -105,8 +87,20 @@
          <!--<el-option v-for="item of dict.type.ModuleType" :value="item.label" :label="item.raw.ValueCN"></el-option>-->
          <!--</el-select>-->
          <!--</el-form-item>-->
-          
-          
+          <!-- 是否签名 -->
+          <el-form-item :label="$t('trials:auditRecord:table:isSign')">
+            <el-select v-model="searchData.IsSign" style="width:120px"  clearable>
+              <el-option v-for="item of $d.YesOrNo" v-show="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="`IsSign${item.value}`"/>
+            </el-select>
+          </el-form-item>
+          <!-- 角色 -->
+          <el-form-item :label="$t('trials:auditRecord:table:role')">
+            <el-select v-model="searchData.RoleName" style="width:120px"  clearable>
+              <el-option v-for="item of $d.UserType" :label="item.label" :value="item.label" :key="`RoleName${item.value}`"/>
+            </el-select>
+<!--            <el-input v-model="searchData.RoleName" clearable/>-->
+<!--            RoleName-->
+          </el-form-item>
          <el-form-item>
            <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>
@ -170,23 +164,16 @@
            fixed="left"
            show-overflow-tooltip
            sortable="custom"
-        >
-          <template slot-scope="scope">
-            <span v-if="scope.row.BlindName && scope.row.TaskName !== scope.row.BlindName">
-              {{ `${scope.row.TaskName}/${scope.row.BlindName}` }}
-            </span>
-            <span v-else>{{scope.row.TaskName}}</span>
-          </template>
-        </el-table-column>
+        />
        <!-- 盲态任务标识 -->
-        <!-- <el-table-column
+        <el-table-column
          prop="BlindName"
          min-width="170"
          :label="$t('trials:auditRecord:table:taskBlindName')"
          fixed="left"
          show-overflow-tooltip
          sortable="custom"
-        /> -->
+        />
        <!-- 阅片标准 -->
        <el-table-column
          prop="TrialReadingCriterionName"
@ -504,22 +491,15 @@
                :label="$t('trials:auditRecord:table:taskName')"
                show-overflow-tooltip
                sortable="custom"
-            >
-              <template slot-scope="scope">
-                <span v-if="scope.row.BlindName && scope.row.TaskName !== scope.row.BlindName">
-                  {{ `${scope.row.TaskName}/${scope.row.BlindName}` }}
-                </span>
-                <span v-else>{{scope.row.TaskName}}</span>
-              </template>
-            </el-table-column>
+            />
            <!-- 盲态任务标识 -->
-            <!-- <el-table-column
+            <el-table-column
                prop="BlindName"
                min-width="150"
                :label="$t('trials:auditRecord:table:taskBlindName')"
                show-overflow-tooltip
                sortable="custom"
-            /> -->
+            />
            <!-- 阅片标准 -->
            <el-table-column
              prop="TrialReadingCriterionName"
@ -846,8 +826,7 @@ export default {
        OpByUserName: null,
        BatchId: null,
        TrialReadingCriterionId: null,
-        RoleName:null,
-        TaskName: null
+        RoleName:null
      }
    }
    return {
--- a/src/views/trials/trials-panel/visit/consistency-check/index.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/index.vue
@ -74,17 +74,15 @@
        </el-button>
      </el-form>
      <!-- 上传 -->
-      <span style="margin-left:auto;">
-        <el-button
-          v-hasPermi="['trials:trials-panel:visit:consistency-check:upload']"
-          type="primary"
-          icon="el-icon-upload2"
-          @click="handleOpenUploadDialog"
-        >
-          {{ $t('trials:consistencyCheck:button:upload') }}
-        </el-button>
-      </span>
-      
+      <el-button
+        v-hasPermi="['trials:trials-panel:visit:consistency-check:upload']"
+        type="primary"
+        icon="el-icon-upload2"
+        style="margin-left:auto;"
+        @click="handleOpenUploadDialog"
+      >
+        {{ $t('trials:consistencyCheck:button:upload') }}
+      </el-button>
    </template>

    <!-- 一致性核查列表 -->
--- a/src/views/trials/trials-panel/visit/crc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-question/index.vue
@ -223,7 +223,7 @@
          prop="ReUploadedTime"
          :label="$t('trials:crcQuestion:table:reuploadTime')"
          show-overflow-tooltip
-          width="140"
+          min-width="150"
          sortable="custom"
        />
        <el-table-column
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@ -3,12 +3,6 @@
    <!-- 搜索框 -->
    <template slot="search-container">
      <el-form :inline="true" class="base-search-form">
-         <!-- 质疑状态 -->
-        <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:challengeState')">
-          <el-select v-model="searchData.ChallengeState" clearable style="width:120px">
-            <el-option v-for="item of $d.CheckIsClosedEnum" :value="item.value" :key="item.label" :label="item.label" />
-          </el-select>
-        </el-form-item>
        <!-- 中心编号 -->
        <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:siteId')">
          <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
@ -47,7 +41,12 @@
            />
          </el-select>
        </el-form-item>
-       
+        <!-- 质疑状态 -->
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:challengeState')">
+          <el-select v-model="searchData.ChallengeState" clearable style="width:120px">
+            <el-option v-for="item of $d.CheckIsClosedEnum" :value="item.value" :key="item.label" :label="item.label" />
+          </el-select>
+        </el-form-item>
        <!-- 提交状态 -->
        <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:submitState')">
          <el-select v-model="searchData.SubmitState" clearable style="width:120px">
@ -312,7 +311,6 @@
          v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload', 'trials:trials-panel:visit:crc-upload:submit','trials:trials-panel:visit:crc-upload:edit','trials:trials-panel:visit:crc-upload:delete'], '||')"
          :label="$t('common:action:action')"
          width="250"
-          fixed="right"
        >
          <template slot-scope="scope">
            <!-- 上传 -->
--- a/src/views/trials/trials-panel/visit/qc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-question/index.vue
@ -57,7 +57,12 @@
            </el-option>
          </el-select>
        </el-form-item>
-       
+        <!-- 是否重传 -->
+        <el-form-item :label="$t('trials:qcQuality:table:ReuploadEnum')">
+          <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
+            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" :key="item.id"/>
+          </el-select>
+        </el-form-item>
        <!-- 是否超限 -->
        <el-form-item :label="$t('trials:qcQuality:table:isOverTime')">
          <el-select v-model="searchData.IsOverTime" clearable style="width:120px">
@ -69,12 +74,6 @@
          <el-select v-model="searchData.IsClosed" clearable style="width:120px">
            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
          </el-select>
-        </el-form-item>
-         <!-- 是否重传 -->
-        <el-form-item :label="$t('trials:qcQuality:table:ReuploadEnum')">
-          <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
-            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" :key="item.id"/>
-          </el-select>
        </el-form-item>
        <!-- 查询 -->
        <el-button type="primary" icon="el-icon-search" @click="handleSearch">