From c7603f4369845efe6f563fe729b8b7aeabab42e7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 23 Apr 2024 14:55:40 +0800
Subject: [PATCH] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2=E8=8E=B7?=
 =?UTF-8?q?=E5=8F=96instanceId=E6=9B=B4=E6=94=B9=E5=8F=8A=E7=A8=BD?=
 =?UTF-8?q?=E6=9F=A5=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue |   90 +-
 .../trial-summary/audit-record/index.vue      | 1722 ++++++-----------
 2 files changed, 661 insertions(+), 1151 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 1ad5f6e..4d77e8a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -754,14 +754,10 @@ export default {
     getToolStateInfo(e) {
       const { element, currentPoints, image, viewport } = e.detail
       var imageId = image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      var frame = null
-      if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
-      }
+      const imageInfo = this.getInstanceInfo(imageId)
+      var instanceId = imageInfo.instanceId
+      var frame = imageInfo.frame
       this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (var m = 0; m < this.measuredTools.length; m++) {
         var toolType = this.measuredTools[m]
@@ -991,15 +987,10 @@ export default {
     mouseClick(e) {
       const { element, currentPoints, image, viewport } = e.detail
       var imageId = image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      var frame = null
-      if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
-      }
+      const imageInfo = this.getInstanceInfo(imageId)
+      var instanceId = imageInfo.instanceId
+      var frame = imageInfo.frame
       this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
-
       const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
       for (let t = 0; t < this.measuredTools.length; t++) {
         var toolType = this.measuredTools[t]
@@ -1095,14 +1086,10 @@ export default {
         this.minVistNum = this.visitTaskList[0].VisitTaskNum
         this.measureData = this.visitTaskList[idx].MeasureData
         const imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
-        var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-        var frame = null
-        if (instanceId.includes('?frame=')) {
-          frame = instanceId.split('?frame=')[1]
-          instanceId = instanceId.split('?frame=')[0]
-        }
+        const imageInfo = this.getInstanceInfo(imageId)
+        var instanceId = imageInfo.instanceId
+        var frame = imageInfo.frame
         this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-        instanceId = instanceId.split('.')[0]
         this.stack.instanceId = instanceId
         const ToolStateManager = cornerstoneTools.globalImageIdSpecificToolStateManager
         ToolStateManager.clearImageIdToolState(dicomSeries.imageIds)
@@ -1141,7 +1128,7 @@ export default {
     },
     onFirstImageLoaded(image) {
       console.log('onFirstImageLoaded')
-      return new Promise(async resolve => {
+      return new Promise(resolve => {
         const element = this.$refs.canvas
         var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
         cornerstone.displayImage(this.canvas, image, viewport)
@@ -1208,14 +1195,10 @@ export default {
 
         this.stack.firstImageLoading = false
         this.toolState.dicomInfoVisible = true
-        var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-        var frame = null
-        if (instanceId.includes('?frame=')) {
-          frame = instanceId.split('?frame=')[1]
-          instanceId = instanceId.split('?frame=')[0]
-        }
+        const imageInfo = this.getInstanceInfo(image.imageId)
+        var instanceId = imageInfo.instanceId
+        var frame = imageInfo.frame
         this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-        instanceId = instanceId.split('.')[0]
         this.stack.instanceId = instanceId
         this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
         this.resetWwwc()
@@ -1281,14 +1264,10 @@ export default {
       this.stack.imageRendered = true
       // const { element } = e.detail
       var imageId = e.detail.image.imageId
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      var frame = null
-      if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
-      }
+      const imageInfo = this.getInstanceInfo(imageId)
+      var instanceId = imageInfo.instanceId
+      var frame = imageInfo.frame
       this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
       if (this.imageId !== instanceId) {
         this.getOrientationMarker(e.detail.element)
         // 初次加载时，如果该影像存在标记，则以标记的窗宽窗位为初始化默认值，否则以序列的窗宽窗位为初始化默认值
@@ -1344,14 +1323,10 @@ export default {
       this.activeTool = 1
       this.activeToolName = ''
       var { imageId } = element.image
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      var frame = null
-      if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
-      }
+      const imageInfo = this.getInstanceInfo(imageId)
+      var instanceId = imageInfo.instanceId
+      var frame = imageInfo.frame
       this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
       if (e.detail.toolName === 'Length' || e.detail.toolName === 'ArrowAnnotate' || e.detail.toolName === 'RectangleRoi') {
         const measureData = {}
         measureData.studyId = this.stack.studyId
@@ -1468,15 +1443,10 @@ export default {
       var element = cornerstone.getEnabledElement(this.canvas)
       var viewport = element.viewport
       var { imageId } = element.image
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      var frame = null
-      if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
-      }
+      const imageInfo = this.getInstanceInfo(imageId)
+      var instanceId = imageInfo.instanceId
+      var frame = imageInfo.frame
       this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
-
       var uuid = measurementData.uuid
       var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
       if (idx > -1) {
@@ -1533,11 +1503,8 @@ export default {
       // 判断有没有标记  获取第一个标记
       var element = cornerstone.getEnabledElement(this.canvas)
       var { imageId } = element.image
-      var instanceId = imageId.split('/')[imageId.split('/').length - 1]
-      if (instanceId.includes('?frame=')) {
-        instanceId = instanceId.split('?frame=')[0]
-      }
-      instanceId = instanceId.split('.')[0]
+      const imageInfo = this.getInstanceInfo(imageId)
+      var instanceId = imageInfo.instanceId
       var idx = this.measureData.findIndex(item => item.InstanceId === instanceId)
       var measureData = null
       if (idx > -1) {
@@ -1962,6 +1929,15 @@ export default {
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
+    },
+    getInstanceInfo(imageId) {
+      const params = {}
+      const searchParams = new URLSearchParams(imageId.split('?')[1])
+
+      for (const [key, value] of searchParams.entries()) {
+        params[key] = value
+      }
+      return params
     }
 
   }
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index dc59b5e..4e268f5 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -3,7 +3,7 @@
   <BaseContainer class="auditRecord">
     <template slot="search-container">
       <el-form :inline="true">
-        <div style="margin-bottom: 15px">
+        <div style="margin-bottom: 15px;">
           <!-- 研究方案号 -->
           <el-form-item :label="$t('trials:auditRecord:table:researchNo')">
             <el-input v-model="ResearchProgramNo" disabled />
@@ -14,25 +14,29 @@
           </el-form-item>
           <!-- 访视 -->
           <el-form-item :label="$t('trials:auditRecord:table:visit')">
-            <el-select v-model="searchData.VisitPlanInfo" clearable filterable>
+            <el-select
+              v-model="searchData.VisitPlanInfo"
+              clearable
+              filterable
+            >
               <el-option
                 v-for="(item, index) of visitPlanOptions"
                 :key="index"
                 :label="item.VisitName"
                 :value="item.VisitNum"
               />
-              <el-option key="Other" label="Out of Plan" value="1.11" />
+              <el-option
+                key="Other"
+                label="Out of Plan"
+                value="1.11"
+              />
             </el-select>
           </el-form-item>
           <!-- 阅片标准 -->
           <el-form-item :label="$t('trials:auditRecord:table:criterion')">
-            <el-select
-              v-model="searchData.TrialReadingCriterionId"
-              clearable
-              filterable
-            >
+            <el-select v-model="searchData.TrialReadingCriterionId" clearable filterable>
               <el-option
-                v-for="(item, index) of trialCriterionList"
+                v-for="(item,index) of trialCriterionList"
                 :key="index"
                 :label="item.TrialReadingCriterionName"
                 :value="item.TrialReadingCriterionId"
@@ -43,38 +47,19 @@
         <div>
           <!-- 功能模块 -->
           <el-form-item :label="$t('trials:auditRecord:table:funcModule')">
-            <el-select
-              v-model="searchData.ModuleType"
-              style="width: 120px"
-              clearable
-              @change="getModuleTypeDescriptionList"
-            >
-              <el-option
-                v-for="item of $d.ModuleType"
-                :value="item.id"
-                :label="item.label"
-                :key="`ModuleType${item.value}`"
-              />
+            <el-select v-model="searchData.ModuleType" style="width:120px"  clearable @change="getModuleTypeDescriptionList">
+              <el-option v-for="item of $d.ModuleType" :value="item.id" :label="item.label" :key="`ModuleType${item.value}`"/>
             </el-select>
           </el-form-item>
           <!-- 操作名 -->
           <el-form-item :label="$t('trials:auditRecord:table:operationName')">
-            <el-select
-              v-model="searchData.Description"
-              style="width: 120px"
-              clearable
-            >
-              <el-option
-                v-for="item of DescriptionOptions"
-                :value="item"
-                :label="item"
-                :key="item"
-              />
+            <el-select v-model="searchData.Description" style="width:120px"  clearable>
+              <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:operator')">
-            <el-input v-model="searchData.OpByUserName" style="width: 120px" />
+            <el-input v-model="searchData.OpByUserName" style="width:120px" />
           </el-form-item>
           <!-- 操作时间 -->
           <el-form-item :label="$t('trials:auditRecord:table:operateTime')">
@@ -83,63 +68,37 @@
               @change="changeTimeList"
               value-format="yyyy-MM-dd HH:mm:ss"
               :default-time="['00:00:00', '23:59:59']"
-              type="datetimerange"
-            >
+              type="datetimerange">
             </el-date-picker>
           </el-form-item>
+          <!--<el-form-item label="阅片人: ">-->
+          <!--<el-select v-model="searchData.ModuleType" placeholder="模块" clearable>-->
+          <!--<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 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 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-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
-            >
+            <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>
         </div>
+
       </el-form>
     </template>
     <template slot="main-container">
       <el-table
-        v-adaptive="{ bottomOffset: 60 }"
+        v-adaptive="{bottomOffset:60}"
         v-loading="loading"
         :data="list"
         @sort-change="handleSortChange"
@@ -199,7 +158,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{ $fd("ModuleType", scope.row.ModuleTypeId, "id") }}
+            {{$fd('ModuleType', scope.row.ModuleTypeId, 'id')}}
           </template>
         </el-table-column>
         <!-- 操作名 -->
@@ -211,11 +170,7 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            {{
-              $i18n.locale === "zh"
-                ? scope.row.DescriptionCN
-                : scope.row.Description
-            }}
+            {{$i18n.locale === 'zh' ? scope.row.DescriptionCN : scope.row.Description}}
           </template>
         </el-table-column>
         <!-- 修改原因 -->
@@ -237,22 +192,13 @@
         >
           <template slot-scope="scope">
             <div>
-              <el-tooltip
-                v-if="scope.row.IsSign"
-                class="item"
-                effect="dark"
-                placement="top"
-              >
+              <el-tooltip v-if="scope.row.IsSign" class="item" effect="dark" placement="top">
                 <div slot="content">
                   {{ scope.row.SignText }}
                 </div>
-                <el-tag type="success">{{
-                  $fd("YesOrNo", scope.row.IsSign)
-                }}</el-tag>
+                <el-tag type="success">{{ $fd('YesOrNo', scope.row.IsSign) }}</el-tag>
               </el-tooltip>
-              <el-tag v-else type="info">{{
-                $fd("YesOrNo", scope.row.IsSign)
-              }}</el-tag>
+              <el-tag v-else type="info">{{ $fd('YesOrNo', scope.row.IsSign) }}</el-tag>
             </div>
           </template>
         </el-table-column>
@@ -312,48 +258,20 @@
           <template slot-scope="scope">
             <!-- 详情 -->
             <el-button type="text" @click="lookDetails(scope.row)">
-              {{ $t("trials:auditRecord:action:detail") }}
+              {{$t('trials:auditRecord:action:detail')}}
             </el-button>
           </template>
         </el-table-column>
       </el-table>
       <!-- 分页组件 -->
-      <pagination
-        class="page"
-        :total="total"
-        :page.sync="searchData.PageIndex"
-        :limit.sync="searchData.PageSize"
-        @pagination="getList"
-      />
+      <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
       <base-model :config="model_cfg">
         <template slot="dialog-body">
-          <div
-            style="
-              display: flex;
-              align-items: center;
-              justify-content: flex-start;
-            "
-          >
+          <div style="display: flex;align-items: center;justify-content: flex-start;">
             <!-- 同一对象历史操作 -->
-            <el-button
-              size="small"
-              style="position: relative; top: -15px"
-              type="primary"
-              @click="lookAssociated(1)"
-              >{{
-                $t("trials:auditRecord:title:historicalOperations")
-              }}</el-button
-            >
+            <el-button size="small" style="position: relative;top: -15px;" type="primary" @click="lookAssociated(1)">{{$t('trials:auditRecord:title:historicalOperations')}}</el-button>
             <!-- 同一对象关联操作 -->
-            <el-button
-              size="small"
-              style="position: relative; top: -15px"
-              type="primary"
-              @click="lookAssociated(0)"
-              >{{
-                $t("trials:auditRecord:title:relationOperations")
-              }}</el-button
-            >
+            <el-button size="small" style="position: relative;top: -15px;" type="primary" @click="lookAssociated(0)">{{$t('trials:auditRecord:title:relationOperations')}}</el-button>
           </div>
           <el-table
             v-if="auditData.length > 0"
@@ -361,8 +279,9 @@
             border
             style="width: 100%"
             size="small"
+            max-height="400"
           >
-            <!-- 字段名 -->
+          <!-- 字段名 -->
             <el-table-column
               prop="Enum"
               :label="$t('trials:auditRecord:title:fieldName')"
@@ -370,77 +289,28 @@
             />
             <!-- OptType === 'Add' ? '值' : OptType === 'Delete' ? '删除前' : '修改前' -->
             <el-table-column
-              v-if="
-                OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'
-              "
+              v-if="OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'"
               prop="oldValue"
-              :label="
-                OptType === 'Add'
-                  ? $t('trials:auditRecord:title:fieldValue')
-                  : OptType === 'Delete'
-                  ? $t('trials:auditRecord:title:beforeDeletion')
-                  : $t('trials:auditRecord:title:beforeModification')
-              "
+              :label="OptType === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <span>
+                 <span>
                   <!-- 查看详情 -->
-                  <a
-                    v-if="scope.row.DataType === 'OSS'"
-                    target="_blank"
-                    :href="OSSclientConfig.basePath + scope.row.oldValue"
-                  >
-                    {{ $t("common:button:download") }}
+                   <a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
+                    {{$t('common:button:download')}}
                   </a>
-                  <a
-                    v-else-if="
-                      scope.row.DataType === 'Link' ||
-                      scope.row.DataType === 'Router'
-                    "
-                    target="_blank"
-                    :href="scope.row.oldValue"
-                  >
-                    {{ $t("trials:auditRecord:title:viewDetail") }}
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue"  style="color:#409eff;">
+                    {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                  <viewer
-                    v-else-if="
-                      (scope.row.DataType === 'Image' ||
-                        scope.row.DataType === 'ImageList') &&
-                      scope.row.oldValue
-                    "
-                    :ref="scope.row.oldValue"
-                    :images="imagesList"
-                  >
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
                     <!-- 查看图片 -->
-                    <span
-                      style="color: #409eff; cursor: pointer"
-                      @click="openImage(scope.row.oldValue)"
-                      >{{ $t("trials:auditRecord:title:viewImage")
-                      }}{{
-                        scope.row.oldValue instanceof Array
-                          ? `(${scope.row.oldValue.length})`
-                          : ""
-                      }}</span
-                    >
-                    <template v-for="item of scope.row.oldValue">
-                      <img
-                        v-if="scope.row.DataType === 'ImageList'"
-                        :key="item"
-                        :src="item"
-                        v-show="false"
-                        crossorigin="anonymous"
-                        alt=""
-                      />
-                    </template>
-                    <img
-                      v-if="scope.row.DataType === 'Image'"
-                      :src="scope.row.oldValue"
-                      v-show="false"
-                      crossorigin="anonymous"
-                      alt=""
-                    />
-                  </viewer>
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
+                       <template v-for="item of scope.row.oldValue">
+                          <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                       </template>
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.oldValue" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
                   <span v-else>
                     {{ scope.row.oldValue }}
                   </span>
@@ -450,79 +320,27 @@
             <!-- OptType === 'Add' || OptType === 'Init' ? '值' : OptType === 'Delete' ? '删除后' : '修改后' -->
             <el-table-column
               prop="newValue"
-              :label="
-                OptType === 'Add' || OptType === 'Init'
-                  ? $t('trials:auditRecord:title:fieldValue')
-                  : OptType === 'Delete'
-                  ? $t('trials:auditRecord:title:afterDeletion')
-                  : $t('trials:auditRecord:title:afterModification')
-              "
+              :label="OptType === 'Add' || OptType === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
               show-overflow-tooltip
             >
               <template slot-scope="scope">
-                <span
-                  :style="{
-                    color:
-                      scope.row.newValue !== scope.row.oldValue ? '#f66' : null,
-                  }"
-                >
+                <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
                   <!-- 查看详情 -->
-                  <a
-                    v-if="scope.row.DataType === 'OSS'"
-                    target="_blank"
-                    :href="OSSclientConfig.basePath + scope.row.newValue"
-                  >
-                    {{ $t("common:button:download") }}
+                  <a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
+                    {{$t('common:button:download')}}
                   </a>
-                  <a
-                    v-else-if="
-                      scope.row.DataType === 'Link' ||
-                      scope.row.DataType === 'Router'
-                    "
-                    target="_blank"
-                    :href="scope.row.newValue"
-                  >
-                    {{ $t("trials:auditRecord:title:viewDetail") }}
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
+                    {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                  <viewer
-                    v-else-if="
-                      (scope.row.DataType === 'Image' ||
-                        scope.row.DataType === 'ImageList') &&
-                      scope.row.newValue
-                    "
-                    :ref="scope.row.newValue"
-                    :images="imagesList"
-                  >
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
                     <!-- 查看图片 -->
-                    <span
-                      style="color: #409eff; cursor: pointer"
-                      @click="openImage(scope.row.newValue)"
-                      >{{ $t("trials:auditRecord:title:viewImage")
-                      }}{{
-                        scope.row.newValue instanceof Array
-                          ? `(${scope.row.newValue.length})`
-                          : ""
-                      }}</span
-                    >
-                    <template v-for="item of scope.row.newValue">
-                      <img
-                        v-if="scope.row.DataType === 'ImageList'"
-                        :key="item"
-                        :src="OSSclientConfig.basePath + item"
-                        v-show="false"
-                        crossorigin="anonymous"
-                        alt=""
-                      />
-                    </template>
-                    <img
-                      v-if="scope.row.DataType === 'Image'"
-                      :src="OSSclientConfig.basePath + scope.row.newValue"
-                      v-show="false"
-                      crossorigin="anonymous"
-                      alt=""
-                    />
-                    <!--                     <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
-                  </viewer>
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
+                     <template v-for="item of scope.row.newValue">
+                        <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                     </template>
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">
+<!--                     <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
+                   </viewer>
                   <span v-else>{{ scope.row.newValue }}</span>
                 </span>
               </template>
@@ -536,118 +354,56 @@
             size="small"
           >
             <el-table-column
-              v-for="item of tableList"
+              v-for="(item,index) of tableList"
               :prop="item.ColumnValue"
               :label="item.IsMerge ? item.MergeColumnName : item.headName"
               align="center"
               show-overflow-tooltip
-              :key="item.ColumnValue"
+              :key="'tableList' + index"
             >
               <template v-if="!item.IsMerge" slot-scope="scope">
-                <viewer
-                  v-if="item.IsPicture"
-                  :images="imagesList"
-                  :ref="scope.row[item.ColumnValue]"
-                >
+                <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
                   <!-- 查看图片 -->
-                  <span
-                    style="color: #409eff; cursor: pointer"
-                    @click="openImage(scope.row[item.ColumnValue])"
-                    >{{ $t("trials:auditRecord:title:viewImage") }}</span
-                  >
-                  <img
-                    :src="scope.row[item.ColumnValue]"
-                    v-show="false"
-                    crossorigin="anonymous"
-                    alt=""
-                  />
+                  <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                  <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                 </viewer>
-                <span v-else>{{ scope.row[item.ColumnValue] }}</span>
+                <span v-else>{{scope.row[item.ColumnValue]}}</span>
               </template>
               <template v-for="(ite, index) of item.ChildrenList">
                 <el-table-column
                   v-if="item.IsMerge"
-                  :prop="
-                    ite.ListName
-                      ? ite.ListName + ite.ColumnValue + index
-                      : ite.ColumnValue
-                  "
+                  :prop="ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue"
                   :label="ite.headName"
                   align="center"
                   show-overflow-tooltip
-                  :key="ite.ListName + ite.ColumnValue + index"
+                  :key="'ChildrenList' + index"
                 >
                   <template slot-scope="scope">
-                    <viewer
-                      v-if="item.IsPicture"
-                      :images="imagesList"
-                      :ref="
-                        scope.row[
-                          ite.ListName
-                            ? ite.ListName + ite.ColumnValue + index
-                            : ite.ColumnValue
-                        ]
-                      "
-                    >
+                    <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]">
                       <!-- 查看图片 -->
-                      <span
-                        style="color: #409eff; cursor: pointer"
-                        @click="
-                          openImage(
-                            scope.row[
-                              ite.ListName
-                                ? ite.ListName + ite.ColumnValue + index
-                                : ite.ColumnValue
-                            ]
-                          )
-                        "
-                      >
-                        {{ $t("trials:auditRecord:title:viewImage") }}
+                      <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                        {{$t('trials:auditRecord:title:viewImage')}}
                       </span>
-                      <img
-                        :src="
-                          scope.row[
-                            ite.ListName
-                              ? ite.ListName + ite.ColumnValue + index
-                              : ite.ColumnValue
-                          ]
-                        "
-                        v-show="false"
-                        crossorigin="anonymous"
-                        alt=""
-                      />
+                      <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                     </viewer>
-                    <span v-else>{{
-                      scope.row[
-                        ite.ListName
-                          ? ite.ListName + ite.ColumnValue + index
-                          : ite.ColumnValue
-                      ]
-                    }}</span>
+                    <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
                   </template>
                 </el-table-column>
               </template>
             </el-table-column>
           </el-table>
-          <div
-            v-if="otherData.length > 0"
-            style="margin-top: 20px; margin-bottom: 10px"
-          >
+          <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
             <!-- 签名信息: -->
-            {{ $t("trials:auditRecord:title:signInfo") }}
+            {{$t('trials:auditRecord:title:signInfo')}}
           </div>
-          <div v-if="otherData.length > 0" style="color: #f66; font-size: 12px">
-            {{ otherData[0].Value }}
+          <div v-if="otherData.length > 0" style="color:#f66;font-size: 12px">
+            {{otherData[0].Value}}
           </div>
         </template>
         <template slot="dialog-footer">
           <!-- 关闭 -->
-          <el-button
-            size="small"
-            type="primary"
-            @click="model_cfg.visible = false"
-          >
-            {{ $t("common:button:close") }}
+          <el-button size="small" type="primary" @click="model_cfg.visible = false">
+            {{$t('common:button:close')}}
           </el-button>
         </template>
       </base-model>
@@ -661,131 +417,114 @@
         custom-class="base-dialog-wrapper"
       >
         <el-table
-          v-adaptive="{ bottomOffset: 300 }"
-          v-loading="loading"
-          :data="list2"
-          stripe
-          height="100"
-        >
-          <el-table-column type="index" width="40" align="left" />
-          <!-- 研究方案号 -->
-          <el-table-column
-            prop="ResearchProgramNo"
-            min-width="90"
-            :label="$t('trials:auditRecord:table:researchNo')"
-            show-overflow-tooltip
-          />
-          <!-- 中心编号 -->
-          <el-table-column
-            prop="SiteCode"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:siteNo')"
-            show-overflow-tooltip
-          />
-          <!-- 受试者 -->
-          <el-table-column
-            prop="SubjectCode"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:subject')"
-            show-overflow-tooltip
-          />
-          <!-- 访视 -->
-          <el-table-column
-            prop="VisitName"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:visit')"
-            show-overflow-tooltip
-          />
-          <!-- 任务名称 -->
-          <el-table-column
-            prop="TaskName"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:taskName')"
-            show-overflow-tooltip
-            sortable="custom"
-          />
-          <!-- 盲态任务标识 -->
-          <el-table-column
-            prop="BlindName"
-            min-width="150"
-            :label="$t('trials:auditRecord:table:taskBlindName')"
-            show-overflow-tooltip
-            sortable="custom"
-          />
-          <!-- 阅片标准 -->
-          <el-table-column
-            prop="TrialReadingCriterionName"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:criterion')"
-            show-overflow-tooltip
-          />
-          <!-- 功能模块 -->
-          <el-table-column
-            prop="ModuleTypeName"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:funcModule')"
-            show-overflow-tooltip
+            v-adaptive="{bottomOffset:20}"
+            v-loading="loading"
+            :data="list2"
+            stripe
+            height="100"
           >
-            <template slot-scope="scope">
-              {{
-                $i18n.locale === "zh"
-                  ? scope.row.ModuleTypeNameCN
-                  : scope.row.ModuleTypeName
-              }}
-            </template>
-          </el-table-column>
-          <!-- 操作名 -->
-          <el-table-column
-            prop="Description"
-            min-width="140"
-            :label="$t('trials:auditRecord:table:operationName')"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              {{
-                $i18n.locale === "zh"
-                  ? scope.row.DescriptionCN
-                  : scope.row.Description
-              }}
-            </template>
-          </el-table-column>
-          <!-- 修改原因 -->
-          <el-table-column
-            prop="Reason"
-            min-width="100"
-            :label="$t('trials:auditRecord:table:modifyReason')"
-            show-overflow-tooltip
-          />
-          <!-- 是否电签 -->
-          <el-table-column
-            prop="IsSign"
-            min-width="90"
-            align="center"
-            :label="$t('trials:auditRecord:table:isSign')"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              <div>
-                <el-tooltip
-                  v-if="scope.row.IsSign"
-                  class="item"
-                  effect="dark"
-                  placement="top"
-                >
-                  <div slot="content">
-                    {{ scope.row.SignText }}
-                  </div>
-                  <el-tag type="success">{{
-                    $fd("YesOrNo", scope.row.IsSign)
-                  }}</el-tag>
-                </el-tooltip>
-                <el-tag v-else type="info">{{
-                  $fd("YesOrNo", scope.row.IsSign)
-                }}</el-tag>
-              </div>
-            </template>
-          </el-table-column>
-          <!-- 操作人 -->
+            <el-table-column type="index" width="40" align="left" />
+            <!-- 研究方案号 -->
+            <el-table-column
+              prop="ResearchProgramNo"
+              min-width="90"
+              :label="$t('trials:auditRecord:table:researchNo')"
+              show-overflow-tooltip
+            />
+            <!-- 中心编号 -->
+            <el-table-column
+              prop="SiteCode"
+              min-width="100"
+              :label="$t('trials:auditRecord:table:siteNo')"
+              show-overflow-tooltip
+            />
+            <!-- 受试者 -->
+            <el-table-column
+              prop="SubjectCode"
+              min-width="100"
+              :label="$t('trials:auditRecord:table:subject')"
+              show-overflow-tooltip
+            />
+            <!-- 访视 -->
+            <el-table-column
+              prop="VisitName"
+              min-width="100"
+              :label="$t('trials:auditRecord:table:visit')"
+              show-overflow-tooltip
+            />
+            <!-- 任务名称 -->
+            <el-table-column
+                prop="TaskName"
+                min-width="100"
+                :label="$t('trials:auditRecord:table:taskName')"
+                show-overflow-tooltip
+                sortable="custom"
+            />
+            <!-- 盲态任务标识 -->
+            <el-table-column
+                prop="BlindName"
+                min-width="150"
+                :label="$t('trials:auditRecord:table:taskBlindName')"
+                show-overflow-tooltip
+                sortable="custom"
+            />
+            <!-- 阅片标准 -->
+            <el-table-column
+              prop="TrialReadingCriterionName"
+              min-width="100"
+              :label="$t('trials:auditRecord:table:criterion')"
+              show-overflow-tooltip
+            />
+            <!-- 功能模块 -->
+            <el-table-column
+              prop="ModuleTypeName"
+              min-width="100"
+              :label="$t('trials:auditRecord:table:funcModule')"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{$i18n.locale === 'zh' ? scope.row.ModuleTypeNameCN : scope.row.ModuleTypeName}}
+              </template>
+            </el-table-column>
+            <!-- 操作名 -->
+            <el-table-column
+              prop="Description"
+              min-width="140"
+              :label="$t('trials:auditRecord:table:operationName')"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                {{$i18n.locale === 'zh' ? scope.row.DescriptionCN : scope.row.Description}}
+              </template>
+            </el-table-column>
+            <!-- 修改原因 -->
+            <el-table-column
+              prop="Reason"
+              min-width="100"
+              :label="$t('trials:auditRecord:table:modifyReason')"
+              show-overflow-tooltip
+            />
+            <!-- 是否电签 -->
+            <el-table-column
+              prop="IsSign"
+              min-width="90"
+              align="center"
+              :label="$t('trials:auditRecord:table:isSign')"
+              show-overflow-tooltip
+            >
+              <template slot-scope="scope">
+                <div>
+                  <el-tooltip v-if="scope.row.IsSign" class="item" effect="dark" placement="top">
+                    <div slot="content">
+                      {{ scope.row.SignText }}
+                    </div>
+                    <el-tag type="success">{{ $fd('YesOrNo', scope.row.IsSign) }}</el-tag>
+                  </el-tooltip>
+                  <el-tag v-else type="info">{{ $fd('YesOrNo', scope.row.IsSign) }}</el-tag>
+                </div>
+              </template>
+            </el-table-column>
+            <!-- 操作人 -->
           <el-table-column
             prop="CreateUserRealName"
             min-width="80"
@@ -813,33 +552,33 @@
             show-overflow-tooltip
           />
           <!-- 操作时间 -->
-          <el-table-column
-            prop="CreateTime"
-            min-width="140"
-            :label="$t('trials:auditRecord:table:operateTime')"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop="IP"
-            min-width="100"
-            label="IP"
-            show-overflow-tooltip
-          />
-          <el-table-column
-            prop=""
-            min-width="150"
-            :label="$t('common:action:action')"
-            show-overflow-tooltip
-            sortable="custom"
-          >
-            <template slot-scope="scope">
-              <!-- 详情 -->
-              <el-button type="text" @click="lookDetails2(scope.row)">
-                {{ $t("trials:auditRecord:action:detail") }}
-              </el-button>
-            </template>
-          </el-table-column>
-        </el-table>
+            <el-table-column
+              prop="CreateTime"
+              min-width="140"
+              :label="$t('trials:auditRecord:table:operateTime')"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop="IP"
+              min-width="100"
+              label="IP"
+              show-overflow-tooltip
+            />
+            <el-table-column
+              prop=""
+              min-width="150"
+              :label="$t('common:action:action')"
+              show-overflow-tooltip
+              sortable="custom"
+            >
+              <template slot-scope="scope">
+                <!-- 详情 -->
+                <el-button type="text" @click="lookDetails2(scope.row)">
+                  {{$t('trials:auditRecord:action:detail')}}
+                </el-button>
+              </template>
+            </el-table-column>
+          </el-table>
       </el-dialog>
       <base-model :config="model_cfg3">
         <template slot="dialog-body">
@@ -849,8 +588,9 @@
             border
             style="width: 100%"
             size="small"
+            max-height="400"
           >
-            <!-- 字段名 -->
+          <!-- 字段名 -->
             <el-table-column
               prop="Enum"
               :label="$t('trials:auditRecord:title:fieldName')"
@@ -858,30 +598,36 @@
             />
             <!-- OptType === 'Add' ? '值' : OptType === 'Delete' ? '删除前' : '修改前' -->
             <el-table-column
-              v-if="
-                OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'
-              "
+              v-if="OptType !== 'Add' && OptType !== 'Upload' && OptType !== 'Init'"
               prop="oldValue"
-              :label="
-                OptType === 'Add'
-                  ? $t('trials:auditRecord:title:fieldValue')
-                  : OptType === 'Delete'
-                  ? $t('trials:auditRecord:title:beforeDeletion')
-                  : $t('trials:auditRecord:title:beforeModification')
-              "
+              :label="OptType === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
               show-overflow-tooltip
             >
-              <template slot-scope="scope">
+              <!-- <template slot-scope="scope">
                 <span>
-                  <a
-                    v-if="
-                      scope.row.DataType === 'Link' ||
-                      scope.row.DataType === 'Router'
-                    "
-                    target="_blank"
-                    :href="scope.row.oldValue"
-                    >{{ scope.row.oldValue }}</a
-                  >
+                  <a v-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">{{scope.row.oldValue}}</a>
+                  <span v-else>
+                    {{ scope.row.oldValue }}
+                  </span>
+                </span>
+              </template> -->
+              <template slot-scope="scope">
+                 <span>
+                  <!-- 查看详情 -->
+                   <a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
+                    {{$t('common:button:download')}}
+                  </a>
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue" style="color:#409eff;">
+                    {{$t('trials:auditRecord:title:viewDetail')}}
+                  </a>
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
+                       <template v-for="item of scope.row.oldValue">
+                          <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                       </template>
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.oldValue" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
                   <span v-else>
                     {{ scope.row.oldValue }}
                   </span>
@@ -891,31 +637,33 @@
             <!-- OptType === 'Add' || OptType === 'Init' ? '值' : OptType === 'Delete' ? '删除后' : '修改后' -->
             <el-table-column
               prop="newValue"
-              :label="
-                OptType === 'Add' || OptType === 'Init'
-                  ? $t('trials:auditRecord:title:fieldValue')
-                  : OptType === 'Delete'
-                  ? $t('trials:auditRecord:title:afterDeletion')
-                  : $t('trials:auditRecord:title:afterModification')
-              "
+              :label="OptType === 'Add' || OptType === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
               show-overflow-tooltip
             >
+              <!-- <template slot-scope="scope">
+                <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
+                  <a v-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">{{scope.row.newValue}}</a>
+                  <span v-else>{{ scope.row.newValue }}</span>
+                </span>
+              </template> -->
               <template slot-scope="scope">
-                <span
-                  :style="{
-                    color:
-                      scope.row.newValue !== scope.row.oldValue ? '#f66' : null,
-                  }"
-                >
-                  <a
-                    v-if="
-                      scope.row.DataType === 'Link' ||
-                      scope.row.DataType === 'Router'
-                    "
-                    target="_blank"
-                    :href="scope.row.newValue"
-                    >{{ scope.row.newValue }}</a
-                  >
+                <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
+                  <!-- 查看详情 -->
+                  <a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
+                    {{$t('common:button:download')}}
+                  </a>
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
+                    {{$t('trials:auditRecord:title:viewDetail')}}
+                  </a>
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
+                     <template v-for="item of scope.row.newValue">
+                        <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                     </template>
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">
+<!--                     <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
+                   </viewer>
                   <span v-else>{{ scope.row.newValue }}</span>
                 </span>
               </template>
@@ -929,100 +677,78 @@
             size="small"
           >
             <el-table-column
-              v-for="(item, index) of tableList"
+              v-for="(item,index) of tableList"
               :prop="item.ColumnValue"
               :label="item.IsMerge ? item.MergeColumnName : item.headName"
-              :key="`ColumnValue${index}`"
               align="center"
               show-overflow-tooltip
+              :key="'tableList' + index"
             >
               <template v-for="(ite, index) of item.ChildrenList">
                 <el-table-column
                   v-if="item.IsMerge"
-                  :prop="
-                    ite.ListName
-                      ? ite.ListName + ite.ColumnValue + index
-                      : ite.ColumnValue
-                  "
+                  :prop="ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue"
                   :label="ite.headName"
                   align="center"
-                  :key="ite.ListName + ite.ColumnValue + index"
                   show-overflow-tooltip
+                  :key="'ChildrenList' + index"
                 >
                   <template slot-scope="scope">
                     <!-- 查看图片 -->
-                    <span
-                      v-if="ite.IsPicture"
-                      @click="
-                        openImage(
-                          scope.row[
-                            ite.ListName
-                              ? ite.ListName + ite.ColumnValue + index
-                              : ite.ColumnValue
-                          ]
-                        )
-                      "
-                    >
-                      {{ $t("trials:auditRecord:title:viewImage") }}
-                    </span>
-                    <span v-else>{{
-                      scope.row[
-                        ite.ListName
-                          ? ite.ListName + ite.ColumnValue + index
-                          : ite.ColumnValue
-                      ]
-                    }}</span>
+                    <!-- <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                      {{$t('trials:auditRecord:title:viewImage')}}
+                    </span> -->
+                    <viewer v-if="ite.IsPicture && ite.IsPicture !== '--'" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                     <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
+                    <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
                   </template>
                 </el-table-column>
-              </template>
-
-              <template slot-scope="scope">
-                <!-- 查看图片 -->
-                <span
-                  v-if="item.IsPicture"
-                  @click="openImage(scope.row[item.ColumnValue])"
-                >
-                  {{ $t("trials:auditRecord:title:viewImage") }}
-                </span>
-                <span v-else>{{ scope.row[item.ColumnValue] }}</span>
+                <template v-else slot-scope="scope">
+                  <!-- 查看图片 -->
+                  <!-- <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
+                    {{$t('trials:auditRecord:title:viewImage')}}
+                  </span> -->
+                   <viewer v-if="item.IsPicture && item.IsPicture !== '--'" :ref="scope.row[item.ColumnValue]" :images="imagesList" :key="'ChildrenList' + index">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                     <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
+                  <span v-else :key="'ChildrenList' + index">{{scope.row[item.ColumnValue]}}</span>
+                </template>
               </template>
             </el-table-column>
           </el-table>
-          <div
-            v-if="otherData.length > 0"
-            style="margin-top: 20px; margin-bottom: 10px"
-          >
+          <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
             <!-- 签名信息: -->
-            {{ $t("trials:auditRecord:title:signInfo") }}
+            {{$t('trials:auditRecord:title:signInfo')}}
           </div>
-          <div v-if="otherData.length > 0" style="color: #f66; font-size: 12px">
-            {{ otherData[0].Value }}
+          <div v-if="otherData.length > 0" style="color:#f66;font-size: 12px">
+            {{otherData[0].Value}}
           </div>
         </template>
         <template slot="dialog-footer">
           <!-- 关闭 -->
-          <el-button
-            size="small"
-            type="primary"
-            @click="model_cfg3.visible = false"
-          >
-            {{ $t("common:button:close") }}
+          <el-button size="small" type="primary" @click="model_cfg3.visible = false">
+             {{$t('common:button:close')}}
           </el-button>
         </template>
       </base-model>
-      <!--      <base-model :config="model_cfg4">-->
-      <!--        <template slot="dialog-body">-->
+<!--      <base-model :config="model_cfg4">-->
+<!--        <template slot="dialog-body">-->
 
-      <!--        </template>-->
-      <!--        <template slot="dialog-footer">-->
-      <!--          <el-button size="small" type="primary" @click="model_cfg4.visible = false; openImageUrl = null">关闭</el-button>-->
-      <!--        </template>-->
-      <!--      </base-model>-->
-      <!--      <div v-viewer v-if="isViewer">-->
-      <!--        <img-->
-      <!--            :src="openImageUrl"-->
-      <!--            style="width: 50px;height: 50px; cursor:pointer">-->
-      <!--      </div>-->
+<!--        </template>-->
+<!--        <template slot="dialog-footer">-->
+<!--          <el-button size="small" type="primary" @click="model_cfg4.visible = false; openImageUrl = null">关闭</el-button>-->
+<!--        </template>-->
+<!--      </base-model>-->
+<!--      <div v-viewer v-if="isViewer">-->
+<!--        <img-->
+<!--            :src="openImageUrl"-->
+<!--            style="width: 50px;height: 50px; cursor:pointer">-->
+<!--      </div>-->
     </template>
   </BaseContainer>
 </template>
@@ -1031,30 +757,22 @@
 import {
   getTrialSiteSelect,
   getTrialVisitStageSelect,
-  getTrialCriterionList,
-} from "@/api/trials";
-import {
-  getInspectionList,
-  getInspectionJsonDataList,
-} from "@/api/trials/inspection";
-import {
-  getFrontAuditConfigList,
-  getAuditConfigChildList,
-  getModuleTypeDescriptionList,
-  setInspectionEnumValue,
-} from "@/api/dictionary/checkConfig";
-import Pagination from "@/components/Pagination";
-import BaseContainer from "@/components/BaseContainer";
-import BaseModel from "@/components/BaseModel";
-import { getToken } from "@/utils/auth";
+  getTrialCriterionList
+} from '@/api/trials'
+import { getInspectionList, getInspectionJsonDataList } from '@/api/trials/inspection'
+import { getFrontAuditConfigList, getAuditConfigChildList, getModuleTypeDescriptionList, setInspectionEnumValue } from '@/api/dictionary/checkConfig'
+import Pagination from '@/components/Pagination'
+import BaseContainer from '@/components/BaseContainer'
+import BaseModel from '@/components/BaseModel'
+import { getToken } from '@/utils/auth'
 
 export default {
   components: { BaseContainer, Pagination, BaseModel },
-  dicts: ["OptType", "ModuleType", "ChildrenType"],
+  dicts: ['OptType', 'ModuleType', 'ChildrenType'],
   data() {
     const searchDataDefault = () => {
       return {
-        SortField: "",
+        SortField: 'CreateTime',
         Asc: false,
         PageIndex: 1,
         PageSize: 20,
@@ -1076,40 +794,16 @@ export default {
         OpByUserName: null,
         BatchId: null,
         TrialReadingCriterionId: null,
-        RoleName: null,
-      };
-    };
+        RoleName:null
+      }
+    }
     return {
       isViewer: true,
-      otherData: [],
-      model_cfg: {
-        visible: false,
-        showClose: true,
-        width: "600px",
-        title: "",
-        appendToBody: true,
-      },
-      model_cfg2: {
-        visible: false,
-        showClose: true,
-        width: "1000px",
-        title: this.$t("trials:auditRecord:title:viewRelationOperations"),
-        appendToBody: true,
-      }, //'查看关联操作'
-      model_cfg3: {
-        visible: false,
-        showClose: true,
-        width: "600px",
-        title: "",
-        appendToBody: true,
-      },
-      model_cfg4: {
-        visible: false,
-        showClose: true,
-        width: "600px",
-        title: this.$t("trials:auditRecord:title:viewImage"),
-        appendToBody: true,
-      }, //查看图片
+      otherData:[],
+      model_cfg: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true },
+      model_cfg2: { visible: false, showClose: true, width: '1000px', title: this.$t('trials:auditRecord:title:viewRelationOperations'), appendToBody: true },//'查看关联操作'
+      model_cfg3: { visible: false, showClose: true, width: '600px', title: '', appendToBody: true },
+      model_cfg4: { visible: false, showClose: true, width: '600px', title: this.$t('trials:auditRecord:title:viewImage'), appendToBody: true },//查看图片
       total: 0,
       loading: false,
       searchData: searchDataDefault(),
@@ -1133,576 +827,418 @@ export default {
       trialCriterionList: [],
       openImageUrl: null,
       $viewer: null,
-      imagesList: [],
-    };
+      imagesList: []
+    }
   },
   mounted() {
-    this.ResearchProgramNo = this.$route.query.researchProgramNo;
-    this.getSite();
-    this.getVisitPlanOptions();
-    this.getTrialCriterionList();
-    this.getList();
+    this.ResearchProgramNo = this.$route.query.researchProgramNo
+    this.getSite()
+    this.getVisitPlanOptions()
+    this.getTrialCriterionList()
+    this.getList()
   },
   methods: {
     openImage(url) {
-      console.log(url);
-      if (url instanceof Array) {
-        this.imagesList = url.map((v) => this.OSSclientConfig.basePath + v);
-      } else {
-        this.imagesList = [this.OSSclientConfig.basePath + url];
-      }
-      if (this.$refs[url][0]) {
-        this.$refs[url][0].$viewer.show();
-      } else {
-        this.$refs[url].$viewer.show();
-      }
+      console.log(url)
+      
+      this.$nextTick(()=>{
+        if (url instanceof Array) {
+          this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
+        } else {
+          this.imagesList = [this.OSSclientConfig.basePath + url]
+        }
+          if(this.$refs[url][0]) {
+          this.$refs[url][0].$viewer.show()
+        } else {
+          this.$refs[url].$viewer.show()
+        }
+      })
     },
     getTrialCriterionList() {
-      getTrialCriterionList(this.trialId, false)
-        .then((res) => {
-          this.trialCriterionList = res.Result;
-        })
-        .catch(() => {});
+      getTrialCriterionList(this.trialId, false).then(res => {
+        this.trialCriterionList = res.Result
+      }).catch(() => {})
     },
     handleSortChange(column) {
-      if (column.order === "ascending") {
-        this.searchData.Asc = true;
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
       } else {
-        this.searchData.Asc = false;
+        this.searchData.Asc = false
       }
-      this.searchData.SortField = column.prop;
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     changeTimeList() {
       if (this.timeList) {
-        this.searchData.StartTime = this.timeList[0];
-        this.searchData.EndTime = this.timeList[1];
+        this.searchData.StartTime = this.timeList[0]
+        this.searchData.EndTime = this.timeList[1]
       } else {
-        this.searchData.StartTime = null;
-        this.searchData.EndTime = null;
+        this.searchData.StartTime = null
+        this.searchData.EndTime = null
       }
+
     },
     getModuleTypeDescriptionList(v) {
-      this.searchData.Description = null;
-      getModuleTypeDescriptionList(v).then((res) => {
-        this.DescriptionOptions = res.Result;
-      });
+      this.searchData.Description = null
+      getModuleTypeDescriptionList( v ).then(res => {
+        this.DescriptionOptions = res.Result
+      })
     },
     // 获取site下拉框数据
     getSite() {
-      getTrialSiteSelect(this.trialId).then((res) => {
-        this.siteOptions = res.Result;
-      });
+      getTrialSiteSelect(this.trialId).then(res => {
+        this.siteOptions = res.Result
+      })
     },
     // 获取访视下拉框数据
     getVisitPlanOptions() {
-      getTrialVisitStageSelect(this.trialId).then((res) => {
-        this.visitPlanOptions = res.Result;
-      });
+      getTrialVisitStageSelect(this.trialId)
+        .then((res) => {
+          this.visitPlanOptions = res.Result
+        })
     },
     toTree(arr, ParentId) {
       function loop(ParentId) {
-        const res = [];
+        const res = []
         for (let i = 0; i < arr.length; i++) {
-          const item = arr[i];
-          item.hasChildren = false;
+          const item = arr[i]
+          item.hasChildren = false
           if (item.ParentId !== ParentId) {
-            continue;
+            continue
           }
-          item.Children = loop(item.Id);
-          res.push(item);
+          item.Children = loop(item.Id)
+          res.push(item)
         }
-        return res;
+        return res
       }
-      return loop(ParentId);
+      return loop(ParentId)
     },
     formatting(config, obj, upObj, parentRow, row, auditData) {
-      this.tableList = [];
-      this.tableListData = [];
-      this[auditData] = [];
-      config.forEach((v) => {
-        var item;
-        if (!v.IsEnable) return;
+      this.tableList = []
+      this.tableListData = []
+      this[auditData] = []
+      config.forEach(v => {
+        var item
+        if (!v.IsEnable) return
         if (v.IsShowByTrialConfig) {
-          if (!parentRow[v.TrialConfigRelyFieldName]) return;
+          if (!parentRow[v.TrialConfigRelyFieldName]) return
         }
         if (v.IsTableFiled) {
           if (obj[v.TableFiledName] && obj[v.TableFiledName].length > 0) {
             obj[v.TableFiledName].forEach((o, i) => {
-              let uo = upObj[v.TableFiledName][i];
-              if (row.OptType === "Add" || row.OptType === "Init") {
+              let uo = upObj[v.TableFiledName][i]
+              if (row.OptType === 'Add' || row.OptType === 'Init') {
                 item = {
-                  newValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : "--") : "--",
-                  oldValue: "",
-                };
-              } else if (row.OptType === "Delete") {
+                  newValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : '--') : '--',
+                  oldValue: ''
+                }
+              } else if (row.OptType === 'Delete') {
                 item = {
-                  oldValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : "--") : "--",
-                  newValue: "--",
-                };
+                  oldValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : '--') : '--',
+                  newValue: '--'
+                }
               } else {
                 item = {
-                  newValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : "--") : "--",
-                  oldValue: uo ? uo[v.Code] : "--",
-                };
+                  newValue: o[v.Code] ? (o[v.Code] ? o[v.Code] : '--') : '--',
+                  oldValue: uo ? uo[v.Code] : '--'
+                }
               }
-              item.key = o
-                ? (o[v.Code] && o[v.Code] !== null && o[v.Code] !== "") ||
-                  o[v.Code] !== 0
-                  ? o[v.Code]
-                  : "--"
-                : "--";
-              item.Enum = v.ValueCN;
-              item.DataType = v.DataType;
-              item.IsTableFiled = v.IsTableFiled;
-              this[auditData].push(item);
-            });
+              item.key = o ? ((o[v.Code] && o[v.Code] !== null && o[v.Code] !== '' || o[v.Code] !== 0) ? o[v.Code] : '--') : '--'
+              item.Enum = v.ValueCN
+              item.DataType = v.DataType
+              item.IsTableFiled = v.IsTableFiled
+              this[auditData].push(item)
+            })
           }
-          return;
+          return
         }
-        if (v.DataType === "ImageList") {
+        if (v.DataType === 'ImageList') {
           if (obj[v.Code] && obj[v.Code].length > 0) {
             // obj[v.Code].forEach((o,i) => {
             //   var uo = upObj && upObj.length > 0 ? upObj[v.Code][i] : 0
-            if (row.OptType === "Add" || row.OptType === "Init") {
+            if (row.OptType === 'Add' || row.OptType === 'Init') {
               item = {
                 key: v.Code,
                 Enum: v.ValueCN,
-                newValue: obj[v.Code] ? obj[v.Code] : "--",
-                oldValue: "",
-              };
-            } else if (row.OptType === "Delete") {
+                newValue: obj[v.Code] ? obj[v.Code] : '--',
+                oldValue: ''
+              }
+            } else if (row.OptType === 'Delete') {
               item = {
                 key: v.Code,
                 Enum: v.ValueCN,
-                oldValue: obj[v.Code] ? obj[v.Code] : "--",
-                newValue: "--",
-              };
+                oldValue: obj[v.Code] ? obj[v.Code] : '--',
+                newValue: '--'
+              }
             } else {
               item = {
                 key: v.Code,
                 Enum: v.ValueCN,
-                newValue: obj[v.Code] ? obj[v.Code] : "--",
-                oldValue: upObj[v.Code] ? upObj[v.Code] : "--",
-              };
+                newValue: obj[v.Code] ? obj[v.Code] : '--',
+                oldValue: upObj[v.Code] ? upObj[v.Code] : '--'
+              }
             }
-            item.DataType = v.DataType;
-            this[auditData].push(item);
-            //   })
+            item.DataType = v.DataType
+            this[auditData].push(item)
+          //   })
           }
-          return;
+          return
         }
-        if (v.DataType === "Array" || v.DataType === "array") {
+        if (v.DataType === 'Array' || v.DataType === 'array') {
           if (obj[v.Code] && obj[v.Code].length > 0) {
             obj[v.Code].forEach((o) => {
-              var uo = upObj
-                ? upObj[v.Code].find(
-                    (u) => u[v.ChildDataLabel] == o[v.ChildDataLabel]
-                  )
-                : null;
-              if (row.OptType === "Add" || row.OptType === "Init") {
+              var uo = upObj ? upObj[v.Code].find(u => u[v.ChildDataLabel] == o[v.ChildDataLabel]) : null
+              if (row.OptType === 'Add' || row.OptType === 'Init') {
                 item = {
                   key: o[v.ChildDataLabel],
                   Enum: o[v.ChildDataLabel],
-                  newValue: o[v.ChildDataValue]
-                    ? o[v.ChildDataValue]
-                      ? o[v.ChildDataValue]
-                      : "--"
-                    : "--",
-                  oldValue: "",
-                };
-              } else if (row.OptType === "Delete") {
+                  newValue: o[v.ChildDataValue] ? (o[v.ChildDataValue] ? o[v.ChildDataValue] : '--') : '--',
+                  oldValue: ''
+                }
+              } else if (row.OptType === 'Delete') {
                 item = {
                   key: o[v.ChildDataLabel],
                   Enum: o[v.ChildDataLabel],
-                  oldValue: o[v.ChildDataValue]
-                    ? o[v.ChildDataValue]
-                      ? o[v.ChildDataValue]
-                      : "--"
-                    : "--",
-                  newValue: "--",
-                };
+                  oldValue: o[v.ChildDataValue] ? (o[v.ChildDataValue] ? o[v.ChildDataValue] : '--') : '--',
+                  newValue: '--'
+                }
               } else {
                 item = {
                   key: o[v.ChildDataLabel],
                   Enum: o[v.ChildDataLabel],
-                  newValue: o[v.ChildDataValue]
-                    ? o[v.ChildDataValue]
-                      ? o[v.ChildDataValue]
-                      : "--"
-                    : "--",
-                  oldValue: uo ? uo[v.ChildDataValue] : "--",
-                };
+                  newValue: o[v.ChildDataValue] ? (o[v.ChildDataValue] ? o[v.ChildDataValue] : '--') : '--',
+                  oldValue: uo ? uo[v.ChildDataValue] : '--'
+                }
               }
-              this[auditData].push(item);
-            });
+              this[auditData].push(item)
+            })
           }
-          return;
+          return
         }
-        if (v.DataType === "Router") {
+        if (v.DataType === 'Router') {
           item = {
-            oldValue: v.UrlConfig.IsHaveParameters
-              ? v.UrlConfig.RoutePath +
-                "?" +
-                v.UrlConfig.ParameterList.map((v) => {
-                  let a = obj[v.UrlParameterValueName]
-                    ? obj[v.UrlParameterValueName]
-                    : parentRow[v.UrlParameterValueName];
-                  if (v.UrlParameterValueName === "token") {
-                    a = getToken();
-                  }
-                  return v.UrlParameterName + "=" + a + "&";
-                })
-                  .toString()
-                  .replaceAll(",", "")
-              : v.UrlConfig.RoutePath,
-            newValue: v.UrlConfig.IsHaveParameters
-              ? v.UrlConfig.RoutePath +
-                "?" +
-                v.UrlConfig.ParameterList.map((v) => {
-                  let a = obj[v.UrlParameterValueName]
-                    ? obj[v.UrlParameterValueName]
-                    : parentRow[v.UrlParameterValueName];
-                  if (v.UrlParameterValueName === "token") {
-                    a = getToken();
-                  }
-                  return v.UrlParameterName + "=" + a + "&";
-                })
-                  .toString()
-                  .replaceAll(",", "")
-              : v.UrlConfig.RoutePath,
-          };
-          console.log(item);
-          item.IsTableFiled = v.IsTableFiled;
-          item.DataType = v.DataType;
-          item.key = v.Code;
-          item.Enum = v.ValueCN;
-          this[auditData].push(item);
-          return;
+            oldValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
+              v.UrlConfig.ParameterList.map((v) => {
+                let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
+                if (v.UrlParameterValueName === 'token') {
+                  a = getToken()
+                }
+                return v.UrlParameterName + '=' + a + '&'
+              }).toString().replaceAll(',', '') : v.UrlConfig.RoutePath,
+            newValue: v.UrlConfig.IsHaveParameters ?  v.UrlConfig.RoutePath + '?' +
+              v.UrlConfig.ParameterList.map((v) => {
+                let a = obj[v.UrlParameterValueName] ? obj[v.UrlParameterValueName] : parentRow[v.UrlParameterValueName]
+                if (v.UrlParameterValueName === 'token') {
+                  a = getToken()
+                }
+                return v.UrlParameterName + '=' + a + '&'
+              }).toString().replaceAll(',', '') : v.UrlConfig.RoutePath
+          }
+          console.log(item)
+          item.IsTableFiled = v.IsTableFiled
+          item.DataType = v.DataType
+          item.key = v.Code
+          item.Enum = v.ValueCN
+          this[auditData].push(item)
+          return
         }
-        if (v.DataType === "Table") {
-          var head = [];
-          var body = [];
+        if (v.DataType === 'Table') {
+          var head = []
+          var body = []
           v.TableConfigList.forEach((j, i) => {
             if (j.IsFixedColumn) {
-              head.push({
-                IsPicture: j.IsPicture,
-                headName: j.FixedColumnName,
-                IsMerge: j.IsMerge,
-                ColumnName: j.ColumnName,
-                ColumnValue: j.ColumnValue,
-                ListName: j.ListName,
-                MergeColumnName: j.IsMerge ? j.MergeColumnName : null,
-                ChildrenList: [],
-              });
+                head.push({IsPicture: j.IsPicture, headName: j.FixedColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? j.MergeColumnName : null, ChildrenList: []})
             } else {
               if (j.ListName) {
                 obj[v.Code][0][j.ListName].forEach((x, o) => {
-                  head.push({
-                    IsPicture: j.IsPicture,
-                    headName: x[j.ColumnName],
-                    IsMerge: j.IsMerge,
-                    ColumnName: j.ColumnName,
-                    ColumnValue: j.ColumnValue,
-                    ListName: j.ListName,
-                    MergeColumnName: j.IsMerge ? j.MergeColumnName : null,
-                    ChildrenList: [],
-                  });
-                });
+                  head.push({IsPicture: j.IsPicture, headName: x[j.ColumnName], IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? j.MergeColumnName : null, ChildrenList: []})
+                })
               } else {
-                head.push({
-                  IsPicture: j.IsPicture,
-                  headName: j.ColumnName,
-                  IsMerge: j.IsMerge,
-                  ColumnName: j.ColumnName,
-                  ColumnValue: j.ColumnValue,
-                  ListName: j.ListName,
-                  MergeColumnName: j.IsMerge ? j.MergeColumnName : null,
-                  ChildrenList: [],
-                });
+                head.push({IsPicture: j.IsPicture, headName: j.ColumnName, IsMerge: j.IsMerge, ColumnName: j.ColumnName, ColumnValue: j.ColumnValue, ListName: j.ListName, MergeColumnName: j.IsMerge ? j.MergeColumnName : null, ChildrenList: []})
               }
             }
-          });
+          })
           obj[v.Code].forEach((o, i) => {
-            var b = {};
+            var b = {}
             v.TableConfigList.forEach((j) => {
               if (j.ListName) {
                 o[j.ListName].forEach((ite, i) => {
-                  b[j.ListName + j.ColumnValue + i] = ite[j.ColumnValue];
-                });
+                  b[j.ListName + j.ColumnValue + i] = ite[j.ColumnValue]
+                })
               } else {
-                b[j.ColumnValue] = o[j.ColumnValue];
+                b[j.ColumnValue] = o[j.ColumnValue]
               }
-            });
-            body.push(Object.assign({}, b));
-          });
-          var newHead = [];
-          var h = JSON.parse(JSON.stringify(head));
-          h.forEach((j) => {
+            })
+            body.push(Object.assign({}, b))
+          })
+          var newHead = []
+          var h = JSON.parse(JSON.stringify(head))
+          h.forEach(j => {
             if (j.IsMerge) {
-              var hasChildren = h.filter((o) => {
-                return o.MergeColumnName === j.MergeColumnName;
-              });
-              console.log(hasChildren);
+              var hasChildren = h.filter(o => {
+                return o.MergeColumnName === j.MergeColumnName
+              })
+              console.log(hasChildren)
               if (!!hasChildren) {
-                j.ChildrenList = Object.assign([], hasChildren);
-                var has = newHead.find((v) => {
-                  return v.MergeColumnName === j.MergeColumnName;
-                });
+                j.ChildrenList = Object.assign([], hasChildren)
+                var has = newHead.find(v => {
+                  return v.MergeColumnName === j.MergeColumnName
+                })
                 if (!has) {
-                  newHead.push(j);
+                  newHead.push(j)
                 }
               } else {
               }
             } else {
-              newHead.push(j);
+              newHead.push(j)
             }
-          });
-          console.log(newHead, body);
-          this.tableList = newHead;
-          this.tableListData = body;
-          return;
+          })
+          console.log(newHead, body)
+          this.tableList = newHead
+          this.tableListData = body
+          return
         }
         if (v.IsShowParent === 1) {
-          if (row.OptType === "Delete") {
+          if (row.OptType === 'Delete') {
             item = {
               // oldValue: parentRow ? (parentRow[v.Code] ? parentRow[v.Code] : '--') : '--',
-              oldValue: parentRow
-                ? (parentRow[v.Code] &&
-                    parentRow[v.Code] !== null &&
-                    parentRow[v.Code] !== "") ||
-                  parentRow[v.Code] === 0
-                  ? parentRow[v.Code]
-                  : "--"
-                : "--",
-              newValue: "--",
-            };
-          } else if (row.OptType === "Add" || row.OptType === "Init") {
+              oldValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) ? parentRow[v.Code] : '--') : '--',
+              newValue: '--'
+            }
+          } else if (row.OptType === 'Add' || row.OptType === 'Init') {
             item = {
               // newValue: parentRow ? (parentRow[v.Code] ? parentRow[v.Code] : '--') : '--',
-              newValue: parentRow
-                ? (parentRow[v.Code] &&
-                    parentRow[v.Code] !== null &&
-                    parentRow[v.Code] !== "") ||
-                  parentRow[v.Code] === 0
-                  ? parentRow[v.Code]
-                  : "--"
-                : "--",
-              oldValue: "--",
-            };
+              newValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) ? parentRow[v.Code] : '--') : '--',
+              oldValue: '--'
+            }
           } else {
             item = {
               // newValue: parentRow ? (parentRow[v.Code] ? parentRow[v.Code] : '--') : '--',
-              newValue: parentRow
-                ? (parentRow[v.Code] &&
-                    parentRow[v.Code] !== null &&
-                    parentRow[v.Code] !== "") ||
-                  parentRow[v.Code] === 0
-                  ? parentRow[v.Code]
-                  : "--"
-                : "--",
-              oldValue: parentRow
-                ? (parentRow[v.Code] &&
-                    parentRow[v.Code] !== null &&
-                    parentRow[v.Code] !== "") ||
-                  parentRow[v.Code] === 0
-                  ? parentRow[v.Code]
-                  : "--"
-                : "--",
+              newValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) ? parentRow[v.Code] : '--') : '--',
+              oldValue: parentRow ? ((parentRow[v.Code] && parentRow[v.Code] !== null && parentRow[v.Code] !== '' || parentRow[v.Code] === 0) ? parentRow[v.Code] : '--') : '--',
               // oldValue: parentRow ? (parentRow[v.Code] ? parentRow[v.Code] : '--') : '--'
-            };
+            }
           }
-          console.log(item, "1");
+          console.log(item, '1')
         } else if (v.IsShowParent === 0) {
-          if (row.OptType === "Delete") {
+          if (row.OptType === 'Delete') {
             item = {
-              oldValue: obj
-                ? (obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== "") ||
-                  obj[v.Code] === 0
-                  ? obj[v.Code]
-                  : "--"
-                : "--",
-              newValue: "--",
-            };
-          } else if (row.OptType === "Add" || row.OptType === "Init") {
+              oldValue: obj ? ((obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== '' || obj[v.Code] === 0) ? obj[v.Code] : '--') : '--',
+              newValue: '--'
+            }
+          } else if (row.OptType === 'Add' || row.OptType === 'Init') {
             item = {
-              newValue: obj
-                ? (obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== "") ||
-                  obj[v.Code] === 0
-                  ? obj[v.Code]
-                  : "--"
-                : "--",
-              oldValue: "--",
-            };
+              newValue: obj ? ((obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== '' || obj[v.Code] === 0) ? obj[v.Code] : '--') : '--',
+              oldValue: '--'
+            }
           } else {
             item = {
-              newValue: obj
-                ? (obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== "") ||
-                  obj[v.Code] === 0
-                  ? obj[v.Code]
-                  : "--"
-                : "--",
-              oldValue: upObj
-                ? (upObj[v.Code] &&
-                    upObj[v.Code] !== null &&
-                    upObj[v.Code] !== "") ||
-                  upObj[v.Code] === 0
-                  ? upObj[v.Code]
-                  : "--"
-                : "--",
-            };
+              newValue: obj ? ((obj[v.Code] && obj[v.Code] !== null && obj[v.Code] !== '' || obj[v.Code] === 0) ? obj[v.Code] : '--') : '--',
+              oldValue: upObj ? ((upObj[v.Code] && upObj[v.Code] !== null && upObj[v.Code] !== '' || upObj[v.Code] === 0) ? upObj[v.Code] : '--') : '--'
+            }
           }
         } else {
-          if (row.OptType === "Delete") {
+          if (row.OptType === 'Delete') {
             item = {
-              oldValue: row
-                ? (row[v.Code] && row[v.Code] !== null && row[v.Code] !== "") ||
-                  row[v.Code] === 0
-                  ? row[v.Code]
-                  : "--"
-                : "--",
-              newValue: "--",
-            };
-          } else if (row.OptType === "Add" || row.OptType === "Init") {
+              oldValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--',
+              newValue: '--'
+            }
+          } else if (row.OptType === 'Add' || row.OptType === 'Init') {
             item = {
-              newValue: row
-                ? (row[v.Code] && row[v.Code] !== null && row[v.Code] !== "") ||
-                  row[v.Code] === 0
-                  ? row[v.Code]
-                  : "--"
-                : "--",
-              oldValue: "--",
-            };
+              newValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--',
+              oldValue: '--'
+            }
           } else {
             item = {
-              newValue: row
-                ? (row[v.Code] && row[v.Code] !== null && row[v.Code] !== "") ||
-                  row[v.Code] === 0
-                  ? row[v.Code]
-                  : "--"
-                : "--",
-              oldValue: row
-                ? (row[v.Code] && row[v.Code] !== null && row[v.Code] !== "") ||
-                  row[v.Code] === 0
-                  ? row[v.Code]
-                  : "--"
-                : "--",
-            };
+              newValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--',
+              oldValue: row ? ((row[v.Code] && row[v.Code] !== null && row[v.Code] !== '' || row[v.Code] === 0) ? row[v.Code] : '--') : '--'
+            }
           }
         }
-        item.DataType = v.DataType;
-        item.key = v.Code;
-        item.Enum = this.$i18n.locale === "zh" ? v.ValueCN : v.Value;
-        this[auditData].push(item);
-      });
+        item.DataType = v.DataType
+        item.key = v.Code
+        item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
+        this[auditData].push(item)
+      })
+      console.log(this[auditData],this.tableListData,this.tableList)
     },
     getJSON(row) {
-      return new Promise((resolve) => {
-        getInspectionJsonDataList(this.trialId, row.Id).then((res) => {
-          resolve(res.Result);
-        });
-      });
+      return new Promise(resolve => {
+        getInspectionJsonDataList(this.trialId, row.Id).then(res => {
+          resolve(res.Result)
+        })
+      })
     },
     lookAssociated(n) {
-      var searchData = Object.assign(
-        {},
-        {
-          SortField: "",
-          Asc: true,
-          PageIndex: 1,
-          PageSize: 20,
-          TrialId: this.$route.query.trialId,
-          BatchId: !n ? this.currentRow.BatchId : null,
-          ObjectRelationParentId: n
-            ? this.currentRow.ObjectRelationParentId
-            : null,
-          RelationDeadlineTime: n ? this.currentRow.CreateTime : null,
-          GeneralId: n ? this.currentRow.GeneralId : null,
-        }
-      );
+      var searchData = Object.assign({}, {
+        SortField: '',
+        Asc: true,
+        PageIndex: 1,
+        PageSize: 20,
+        TrialId: this.$route.query.trialId,
+        BatchId: !n ? this.currentRow.BatchId : null,
+        ObjectRelationParentId: n ? this.currentRow.ObjectRelationParentId : null,
+        RelationDeadlineTime: n ? this.currentRow.CreateTime : null,
+        GeneralId: n ? this.currentRow.GeneralId : null
+      })
       // 查看关联操作
 
-      this.model_cfg2.title = `${this.$t(
-        "trials:auditRecord:title:viewRelationOperations"
-      )}--${
-        this.$i18n.locale === "en"
-          ? this.currentRow.Description
-          : this.currentRow.DescriptionCN
-      }`;
-      this.loading = true;
-      getInspectionList(searchData)
-        .then((res) => {
-          this.list2 = res.CurrentPageData;
-          this.model_cfg2.visible = true;
-          this.loading = false;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
+      this.model_cfg2.title = `${this.$t('trials:auditRecord:title:viewRelationOperations')}--${this.$i18n.locale === 'en' ? this.currentRow.Description : this.currentRow.DescriptionCN}`
+      this.loading = true
+      getInspectionList(searchData).then((res) => {
+        this.list2 = res.CurrentPageData
+        this.model_cfg2.visible = true
+        this.loading = false
+      }).catch(() => {
+        this.loading = false
+      })
     },
     async lookDetails2(row) {
-      var Json = await this.getJSON(row);
-      var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null;
-      var ParentJson = Json[1] ? JSON.parse(Json[1]) : null;
-      getAuditConfigChildList(row.FrontAuditConfigId).then((res) => {
-        console.log(res);
-        var configList2 = res.Result;
-        this.formatting(
-          configList2,
-          JsonDetail.Data,
-          ParentJson ? ParentJson.Data : null,
-          JsonDetail.CommonData,
-          row,
-          "auditData2"
-        );
-        console.log(this.auditData2);
-        this.otherData2 = [];
+      var Json = await this.getJSON(row)
+      var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null
+      var ParentJson = Json[1] ? JSON.parse(Json[1]) : null
+      getAuditConfigChildList(row.FrontAuditConfigId).then(res => {
+        console.log(res)
+        var configList2 = res.Result
+        this.formatting(configList2, JsonDetail.Data, ParentJson ? ParentJson.Data : null, JsonDetail.CommonData, row, 'auditData2')
+        this.otherData2 = []
         if (row.IsSign) {
           // 签名信息
           this.otherData2.push({
-            Enum: this.$t("trials:auditRecord:title:signInfo2"),
-            Value: row.SignText,
-          });
+            Enum: this.$t('trials:auditRecord:title:signInfo2'),
+            Value: row.SignText
+          })
         }
-        this.model_cfg3.title =
-          this.$i18n.locale === "en" ? row.Description : row.DescriptionCN;
-        this.model_cfg3.visible = true;
-      });
+        this.model_cfg3.title = this.$i18n.locale === 'en' ? row.Description : row.DescriptionCN
+        this.model_cfg3.visible = true
+      })
     },
     async lookDetails(row) {
-      this.currentRow = { ...row };
-      this.OptType = row.OptType;
-      var Json = await this.getJSON(row);
-      var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null;
-      var ParentJson = Json[1] ? JSON.parse(Json[1]) : null;
-      getAuditConfigChildList(row.FrontAuditConfigId).then((res) => {
-        console.log(res);
-        var configList = res.Result;
-        this.formatting(
-          configList,
-          JsonDetail.Data,
-          ParentJson ? ParentJson.Data : null,
-          JsonDetail.CommonData,
-          row,
-          "auditData"
-        );
-        this.otherData = [];
+      this.currentRow = {...row}
+      this.OptType = row.OptType
+      var Json = await this.getJSON(row)
+      var JsonDetail = Json[0] ? JSON.parse(Json[0]) : null
+      var ParentJson = Json[1] ? JSON.parse(Json[1]) : null
+      getAuditConfigChildList(row.FrontAuditConfigId).then(res => {
+        console.log(res)
+        var configList = res.Result
+        this.formatting(configList, JsonDetail.Data, ParentJson ? ParentJson.Data : null, JsonDetail.CommonData, row, 'auditData')
+        this.otherData = []
         if (row.IsSign) {
-          console.log(row.SignText);
+          console.log(row.SignText)
           this.otherData.push({
-            Enum: this.$t("trials:auditRecord:title:signInfo2"), //'签名信息'
-            Value: row.SignText,
-          });
+            Enum: this.$t('trials:auditRecord:title:signInfo2'),//'签名信息'
+            Value: row.SignText
+          })
         }
-        this.model_cfg.title =
-          this.$i18n.locale === "en" ? row.Description : row.DescriptionCN;
-        this.model_cfg.visible = true;
-      });
+        this.model_cfg.title = this.$i18n.locale === 'en' ? row.Description : row.DescriptionCN
+        this.model_cfg.visible = true
+      })
     },
     handleReset() {
       this.searchData = Object.assign(this.searchData, {
-        SortField: "",
+        SortField: '',
         Asc: false,
         PageIndex: 1,
         PageSize: 20,
@@ -1723,34 +1259,32 @@ export default {
         Description: null,
         OpByUserName: null,
         BatchId: null,
-        RoleName: null,
-      });
-      this.timeList = [];
-      this.getList();
+        RoleName: null
+      })
+      this.timeList = []
+      this.getList()
     },
     handleSearch() {
-      this.searchData.PageIndex = 1;
-      this.getList();
+      this.searchData.PageIndex = 1
+      this.getList()
     },
     getList() {
-      this.loading = true;
-      getInspectionList(this.searchData)
-        .then((res) => {
-          this.list = res.CurrentPageData;
-          // this.list = this.list.map(v => {
-          //   v.OptType = v.OptTypeName
-          //   return v
-          // })
-          this.total = res.TotalCount;
-          this.model_cfg.visible = false;
-          this.loading = false;
-          this.searchData.BatchId = null;
-        })
-        .catch(() => {
-          this.loading = false;
-        });
-    },
-  },
-};
+      this.loading = true
+      getInspectionList(this.searchData).then((res) => {
+        this.list = res.CurrentPageData
+        // this.list = this.list.map(v => {
+        //   v.OptType = v.OptTypeName
+        //   return v
+        // })
+        this.total = res.TotalCount
+        this.model_cfg.visible = false
+        this.loading = false
+        this.searchData.BatchId = null
+      }).catch(() => {
+        this.loading = false
+      })
+    }
+  }
+}
 </script>