From 2b987fb1ae265a65e85025bc550895ae960988b9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 10:57:58 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=8F=8A=E9=98=85=E7=89=87bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  19 +++
 .../components/MRIPDFF/QuestionForm.vue       |   1 +
 .../components/configList.vue                 | 103 +++++++++++++++
 .../components/exportList.vue                 | 118 ++++++++++++------
 .../reading/reading-tracking/index.vue        |   2 +
 5 files changed, 205 insertions(+), 38 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index 26bba548..63045745 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3931,4 +3931,23 @@ export function updateTrialUserRole(data) {
     method: 'put',
     data
   })
+}
+
+
+
+// 获取报表配置
+export function getTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/getTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
+}
+// 修改报表配置
+export function setTrialQuestionExportResult(data) {
+  return request({
+    url: `/ReadingQuestion/SetTrialQuestionExportResult`,
+    method: 'post',
+    data
+  })
 }
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 3b90daff..526591c5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -328,6 +328,7 @@ export default {
             if (!isNaN(parseInt(isMeasurable)) && parseInt(isMeasurable) === 1) {
               this.isDisabledMeasurableRadio = true
             }
+            i.MeasureData = JSON.parse(i.MeasureData)
           }
           this.markList.push({tableQuestionId: i.TableQuestionId, measureData: i, saveEnum: 1})
         })
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
new file mode 100644
index 00000000..6028aea2
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -0,0 +1,103 @@
+<template>
+  <div>
+    <el-button type="primary" size="mini" @click="submit" style="margin-bottom: 5px;">提交</el-button>
+    <el-table
+      v-loading="loading"
+      :data="exportInfo.QuestionList"
+      height="500"
+      row-key="Id"
+      border
+      default-expand-all
+      :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
+    >
+      <el-table-column prop="QuestionName" label="问题"  width="300">
+      </el-table-column>
+      <el-table-column :key="item.Code"  v-for="item in exportInfo.DicList" :label="item.ValueCN"    >
+        <template v-slot="scope">
+          <el-checkbox
+            @change="() => changeState(scope, item.Code)"
+            :checked="getCheckState(scope, item.Code)">
+          </el-checkbox>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getTrialQuestionExportResult, setTrialQuestionExportResult } from '@/api/trials'
+export default {
+  name: 'configList',
+  props: {
+    trialReadingCriterionId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      exportInfo: []
+    }
+  },
+  mounted() {
+    this.getConfigInfo()
+  },
+  methods: {
+    async getConfigInfo() {
+      try {
+        this.loading = true
+        let res = await getTrialQuestionExportResult({trialReadingCriterionId: this.trialReadingCriterionId})
+        if (res.IsSuccess) {
+          this.exportInfo = res.Result
+        }
+        this.loading = false
+      } catch(e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    async submit() {
+      this.loading = true
+      try {
+        let params= {
+          questionList: [],
+          tableQuestionList: []
+        }
+        params.questionList = this.exportInfo.QuestionList.map(i => {
+          return {
+            questionId: i.QuestionId,
+            tableQuestionId: i.TableQuestionId,
+            exportResult: i.ExportResult
+          }
+        })
+        this.exportInfo.QuestionList.forEach(i => {
+          let childlist = i.Children.map(k => {
+            return {
+              questionId: i.QuestionId,
+              tableQuestionId: k.TableQuestionId,
+              exportResult: k.ExportResult,
+            }
+          })
+          params.tableQuestionList = params.tableQuestionList.concat(childlist)
+        })
+        let res = await setTrialQuestionExportResult(params)
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        }
+        this.loading = false
+      } catch(e) {
+        this.loading = false
+        console.log(e)
+      }
+    },
+    // 获取状态
+    getCheckState(item, code) {
+      return item.row.ExportResult.indexOf(code) > -1;
+    },
+    // 改变状态
+    changeState(item, code) {
+     item.row.ExportResult.indexOf(code)>-1?item.row.ExportResult.splice(item.row.ExportResult.indexOf(code), 1):item.row.ExportResult.push(code);
+    },
+  }
+}
+</script>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index 3b754970..c717a913 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="text-align: right">
     <!--导出-->
-    <el-button
+    <!-- <el-button
       type="primary"
       :disabled="!(trialCriterionList.length > 0)"
       icon="el-icon-download"
@@ -10,48 +10,84 @@
       style="margin-bottom: 10px"
     >
       {{ $t('common:button:export') }}
-    </el-button>
-    <el-tabs type="border-card" v-model="TrialReadingCriterionId">
+    </el-button> -->
+    <el-tabs v-model="exportType">
       <el-tab-pane
-        :label="i.TrialReadingCriterionName"
-        :name="i.TrialReadingCriterionId"
-        v-for="i of trialCriterionList"
-        :key="i.TrialReadingCriterionId"
+        label="报表导出"
+        name="report"
       >
-        <el-table v-loading="loading" :data="list" border stripe>
-          <el-table-column label="" :min-width="50">
-            <template slot-scope="scope">
-              {{ scope.$index + 1 }}
-            </template>
-          </el-table-column>
-          <!-- 文件名称 -->
-          <el-table-column
-            :label="$t('trials:reviewTrack:title:fileName')"
-            :min-width="50"
+        <el-tabs type="border-card" v-model="TrialReadingCriterionId">
+          <el-tab-pane
+            :label="i.TrialReadingCriterionName"
+            :name="i.TrialReadingCriterionId"
+            v-for="i of trialCriterionList"
+            :key="i.TrialReadingCriterionId"
           >
-            <template slot-scope="scope">
-              {{ scope.row.FileName }}
-            </template>
-          </el-table-column>
-          <el-table-column
-            prop=""
-            :label="$t('common:action:action')"
-            min-width="80"
-          >
-            <template slot-scope="scope">
-              <!-- 下载 -->
-              <el-button
-                icon="el-icon-download"
-                circle
-                :title="$t('trials:reviewTrack:title:download')"
-                size="mini"
-                @click="handleExport(scope.row.ExportCatogory)"
+            <el-table v-if="TrialReadingCriterionId === i.TrialReadingCriterionId" v-loading="loading" :data="list" border stripe height="500">
+              <el-table-column label="" :min-width="50">
+                <template slot-scope="scope">
+                  {{ scope.$index + 1 }}
+                </template>
+              </el-table-column>
+              <!-- 文件名称 -->
+              <el-table-column
+                :label="$t('trials:reviewTrack:title:fileName')"
+                :min-width="50"
+              >
+                <template slot-scope="scope">
+                  {{ scope.row.FileName }}
+                </template>
+              </el-table-column>
+              <el-table-column
+                prop=""
+                :label="$t('common:action:action')"
+                min-width="80"
+              >
+                <template slot-scope="scope">
+                  <!-- 下载 -->
+                  <el-button
+                    icon="el-icon-download"
+                    circle
+                    :title="$t('trials:reviewTrack:title:download')"
+                    size="mini"
+                    @click="handleExport(scope.row.ExportCatogory)"
+                  />
+                </template>
+              </el-table-column>
+            </el-table>
+          </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+      <el-tab-pane
+        label="CDISC导出"
+        name="CDISC"
+      >
+      </el-tab-pane>
+      <el-tab-pane
+        label="报表导出配置"
+        name="reportConfig"
+      >
+        <el-tabs type="border-card" v-model="configTrialReadingCriterionId">
+          <el-tab-pane
+              :label="i.TrialReadingCriterionName"
+              :name="i.TrialReadingCriterionId"
+              v-for="i of trialCriterionList"
+              :key="i.TrialReadingCriterionId"
+            >
+              <configList 
+                v-if="configTrialReadingCriterionId === i.TrialReadingCriterionId && exportType === 'reportConfig'" 
+                :trialReadingCriterionId="i.TrialReadingCriterionId" 
               />
-            </template>
-          </el-table-column>
-        </el-table>
+            </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+      <el-tab-pane
+        label="CDISC导出配置"
+        name="CDISCConfig"
+      >
       </el-tab-pane>
     </el-tabs>
+    
   </div>
 </template>
 
@@ -66,9 +102,12 @@ import {
   getDetailedOfEvaluatedLesion_Export,
 } from '@/api/export'
 import { getTrialCriterionList } from '@/api/trials/reading'
-
+import configList from './configList'
 export default {
   name: 'exportList',
+  components: {
+    configList
+  },
   data() {
     return {
       loading: false,
@@ -76,6 +115,8 @@ export default {
       TrialReadingCriterionId: null,
       trialId: null,
       list: [],
+      exportType:'report',
+      configTrialReadingCriterionId: ''
     }
   },
   props: {
@@ -189,6 +230,7 @@ export default {
           this.trialCriterionList = res.Result
           this.TrialReadingCriterionId =
             this.trialCriterionList[0].TrialReadingCriterionId
+          this.configTrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
         })
         .catch(() => {})
     },
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 4ed7f0e8..597db30e 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -833,9 +833,11 @@
       </el-dialog>
       <el-dialog
         v-if="exportVisible"
+        v-dialogDrag
         :title="$t('trials:reviewTrack:button:export')"
         :visible.sync="exportVisible"
         :close-on-click-modal="false"
+        width="80%"
         append-to-body>
         <exportList :trial-reading-criterion-id="TrialReadingCriterionId" :data="searchData" />
       </el-dialog>

From 98502230c3884d4d5f9eedea43d07405c1376dc2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 13:49:43 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E9=98=85=E7=89=87=E8=B7=9F=E8=B8=AA?=
 =?UTF-8?q?=E9=A1=B5=E6=8A=A5=E8=A1=A8=E5=AF=BC=E5=87=BA=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ReviewResults.vue              | 106 ++++++++++
 .../components/configList.vue                 |   2 +-
 .../components/exportList.vue                 | 200 ++++++------------
 .../reading/reading-tracking/index.vue        |   6 +-
 4 files changed, 175 insertions(+), 139 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue

diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
new file mode 100644
index 00000000..c53391b9
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
@@ -0,0 +1,106 @@
+<template>
+  <div style="text-align: right">
+    <el-tabs v-model="exportType">
+      <el-tab-pane
+        label="报表导出"
+        name="report"
+      >
+        <el-tabs type="border-card" v-model="trialReadingCriterionId">
+          <el-tab-pane
+            :label="i.TrialReadingCriterionName"
+            :name="i.TrialReadingCriterionId"
+            v-for="i of trialCriterionList"
+            :key="i.TrialReadingCriterionId"
+          >
+            <exportList 
+              v-if="trialReadingCriterionId === i.TrialReadingCriterionId && exportType === 'report'" 
+              :trialReadingCriterionId="i.TrialReadingCriterionId" 
+              :data="data"
+            />
+          </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+      <el-tab-pane
+        label="CDISC导出"
+        name="CDISC"
+      >
+      </el-tab-pane>
+      <el-tab-pane
+        label="报表导出配置"
+        name="reportConfig"
+      >
+        <el-tabs type="border-card" v-model="configTrialReadingCriterionId">
+          <el-tab-pane
+              :label="i.TrialReadingCriterionName"
+              :name="i.TrialReadingCriterionId"
+              v-for="i of trialCriterionList"
+              :key="i.TrialReadingCriterionId"
+            >
+              <configList 
+                v-if="configTrialReadingCriterionId === i.TrialReadingCriterionId && exportType === 'reportConfig'" 
+                :trialReadingCriterionId="i.TrialReadingCriterionId" 
+              />
+            </el-tab-pane>
+        </el-tabs>
+      </el-tab-pane>
+      <el-tab-pane
+        label="CDISC导出配置"
+        name="CDISCConfig"
+      >
+      </el-tab-pane>
+    </el-tabs>
+    
+  </div>
+</template>
+
+<script>
+import { getTrialCriterionList } from '@/api/trials/reading'
+import exportList from './exportList'
+import configList from './configList'
+export default {
+  name: 'ReviewResults',
+  components: {
+    exportList,
+    configList
+  },
+  data() {
+    return {
+      loading: false,
+      trialCriterionList: [],
+      trialReadingCriterionId: null,
+      trialId: null,
+      exportType:'report',
+      configTrialReadingCriterionId: ''
+    }
+  },
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {}
+      },
+    },
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.getTrialCriterionList()
+  },
+  methods: {
+    async getTrialCriterionList() {
+      try {
+        let res = await getTrialCriterionList(this.trialId)
+        if (res.IsSuccess) {
+          this.trialCriterionList = res.Result
+          this.trialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+          this.configTrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+        }
+      } catch(e) {
+        console.log(e)
+      }
+    },
+  },
+}
+</script>
+
+<style scoped>
+</style>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
index 6028aea2..e70e07bd 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -10,7 +10,7 @@
       default-expand-all
       :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="QuestionName" label="问题"  width="300">
+      <el-table-column prop="QuestionName" label="问题名称"  width="300">
       </el-table-column>
       <el-table-column :key="item.Code"  v-for="item in exportInfo.DicList" :label="item.ValueCN"    >
         <template v-slot="scope">
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
index c717a913..447fccb7 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue
@@ -1,94 +1,41 @@
 <template>
-  <div style="text-align: right">
-    <!--导出-->
-    <!-- <el-button
-      type="primary"
-      :disabled="!(trialCriterionList.length > 0)"
-      icon="el-icon-download"
-      size="mini"
-      @click="handleExport(0)"
-      style="margin-bottom: 10px"
+  <el-table 
+    v-loading="loading" 
+    :data="list" 
+    border 
+    stripe 
+    height="500">
+    <el-table-column label="" :min-width="50">
+      <template slot-scope="scope">
+        {{ scope.$index + 1 }}
+      </template>
+    </el-table-column>
+    <!-- 文件名称 -->
+    <el-table-column
+      :label="$t('trials:reviewTrack:title:fileName')"
+      :min-width="50"
     >
-      {{ $t('common:button:export') }}
-    </el-button> -->
-    <el-tabs v-model="exportType">
-      <el-tab-pane
-        label="报表导出"
-        name="report"
-      >
-        <el-tabs type="border-card" v-model="TrialReadingCriterionId">
-          <el-tab-pane
-            :label="i.TrialReadingCriterionName"
-            :name="i.TrialReadingCriterionId"
-            v-for="i of trialCriterionList"
-            :key="i.TrialReadingCriterionId"
-          >
-            <el-table v-if="TrialReadingCriterionId === i.TrialReadingCriterionId" v-loading="loading" :data="list" border stripe height="500">
-              <el-table-column label="" :min-width="50">
-                <template slot-scope="scope">
-                  {{ scope.$index + 1 }}
-                </template>
-              </el-table-column>
-              <!-- 文件名称 -->
-              <el-table-column
-                :label="$t('trials:reviewTrack:title:fileName')"
-                :min-width="50"
-              >
-                <template slot-scope="scope">
-                  {{ scope.row.FileName }}
-                </template>
-              </el-table-column>
-              <el-table-column
-                prop=""
-                :label="$t('common:action:action')"
-                min-width="80"
-              >
-                <template slot-scope="scope">
-                  <!-- 下载 -->
-                  <el-button
-                    icon="el-icon-download"
-                    circle
-                    :title="$t('trials:reviewTrack:title:download')"
-                    size="mini"
-                    @click="handleExport(scope.row.ExportCatogory)"
-                  />
-                </template>
-              </el-table-column>
-            </el-table>
-          </el-tab-pane>
-        </el-tabs>
-      </el-tab-pane>
-      <el-tab-pane
-        label="CDISC导出"
-        name="CDISC"
-      >
-      </el-tab-pane>
-      <el-tab-pane
-        label="报表导出配置"
-        name="reportConfig"
-      >
-        <el-tabs type="border-card" v-model="configTrialReadingCriterionId">
-          <el-tab-pane
-              :label="i.TrialReadingCriterionName"
-              :name="i.TrialReadingCriterionId"
-              v-for="i of trialCriterionList"
-              :key="i.TrialReadingCriterionId"
-            >
-              <configList 
-                v-if="configTrialReadingCriterionId === i.TrialReadingCriterionId && exportType === 'reportConfig'" 
-                :trialReadingCriterionId="i.TrialReadingCriterionId" 
-              />
-            </el-tab-pane>
-        </el-tabs>
-      </el-tab-pane>
-      <el-tab-pane
-        label="CDISC导出配置"
-        name="CDISCConfig"
-      >
-      </el-tab-pane>
-    </el-tabs>
-    
-  </div>
+      <template slot-scope="scope">
+        {{ scope.row.FileName }}
+      </template>
+    </el-table-column>
+    <el-table-column
+      prop=""
+      :label="$t('common:action:action')"
+      min-width="80"
+    >
+      <template slot-scope="scope">
+        <!-- 下载 -->
+        <el-button
+          icon="el-icon-download"
+          circle
+          :title="$t('trials:reviewTrack:title:download')"
+          size="mini"
+          @click="handleExport(scope.row.ExportCatogory)"
+        />
+      </template>
+    </el-table-column>
+  </el-table>
 </template>
 
 <script>
@@ -101,56 +48,49 @@ import {
   getEvaluationOfTumorEfficacy_Export,
   getDetailedOfEvaluatedLesion_Export,
 } from '@/api/export'
-import { getTrialCriterionList } from '@/api/trials/reading'
-import configList from './configList'
 export default {
   name: 'exportList',
-  components: {
-    configList
-  },
-  data() {
-    return {
-      loading: false,
-      trialCriterionList: [],
-      TrialReadingCriterionId: null,
-      trialId: null,
-      list: [],
-      exportType:'report',
-      configTrialReadingCriterionId: ''
-    }
-  },
   props: {
+    trialReadingCriterionId: {
+      type: String,
+      required: true
+    },
     data: {
       type: Object,
       default() {
         return {}
-      },
-    },
+      }
+    }
   },
-  watch: {
-    TrialReadingCriterionId(v) {
-      if (v === '0') return
-      this.loading = true
-      getTrialReadingCriterionCanExportDocumentList({
-        TrialReadingCriterionId: v,
-      })
-        .then((res) => {
-          this.list = res.Result
-          this.loading = false
-        })
-        .catch(() => {
-          this.loading = true
-        })
-    },
+  data() {
+    return {
+      loading: false,
+      trialId: null,
+      list: []
+    }
   },
   mounted() {
-    this.trialId = this.$route.query.trialId
-    this.getTrialCriterionList()
+    this.getList()
   },
   methods: {
+    async getList() {
+      this.loading = true
+      try {
+        let res = await getTrialReadingCriterionCanExportDocumentList({
+          TrialReadingCriterionId: this.trialReadingCriterionId,
+        })
+        if (res.IsSuccess) {
+          this.list = res.Result
+        }
+        this.loading = false
+      } catch(e) {
+        console.log(e)
+        this.loading = false
+      }
+    },
     handleExport(type) {
       var searchData = { ...this.data }
-      searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
+      searchData.TrialReadingCriterionId = this.trialReadingCriterionId
       switch (type) {
         case 0:
           getReadingTaskList_Export(searchData)
@@ -224,16 +164,6 @@ export default {
           break
       }
     },
-    getTrialCriterionList() {
-      getTrialCriterionList(this.trialId)
-        .then((res) => {
-          this.trialCriterionList = res.Result
-          this.TrialReadingCriterionId =
-            this.trialCriterionList[0].TrialReadingCriterionId
-          this.configTrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-        })
-        .catch(() => {})
-    },
   },
 }
 </script>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 597db30e..be227c2d 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -839,7 +839,7 @@
         :close-on-click-modal="false"
         width="80%"
         append-to-body>
-        <exportList :trial-reading-criterion-id="TrialReadingCriterionId" :data="searchData" />
+        <ReviewResults :data="searchData" />
       </el-dialog>
 
 
@@ -948,7 +948,7 @@ import { changeURLStatic } from '@/utils/history.js'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import RefereeRules from './components/RefereeRules.vue'
-import exportList from './components/exportList.vue'
+import ReviewResults from './components/ReviewResults'
 import ClinicalData from "../../subject/reading-period/components/ClinicalData"
 import RecordList from './components/RecordList.vue'
 const searchDataDefault = () => {
@@ -980,7 +980,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, RefereeRules, ClinicalData, exportList, RecordList },
+  components: { BaseContainer, Pagination, RefereeRules, ClinicalData, ReviewResults, RecordList },
   props: {
     AllocationReadingCategory: {
       type: String

From 0e0c2ca55d7c3d5a30f2a75b7a1ce55e6609ac5e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 14:37:26 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E8=82=9D=E8=84=8F=E5=88=86=E6=AE=B5?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                                            | 4 ++--
 .../reading/dicoms/components/MRIPDFF/QuestionForm.vue        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index 74b7800e..6521fafa 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -252,9 +252,9 @@ export function uploadOCTLipidAngleTemplate(param) {
   })
 }
 
-export function saveTableQuestionMark(param) {
+export function saveTableQuestionMark(param, type) {
   return request({
-    url: `/ReadingImageTask/saveTableQuestionMark`,
+    url: `/ReadingImageTask/saveTableQuestionMark/${type}`,
     method: 'post',
     data: param
   })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 526591c5..a6831a9e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -582,7 +582,7 @@ export default {
     async saveTableQuestionInfo(params, qs) {
       const loading = this.$loading({ fullscreen: true })
       try {
-        let res = await saveTableQuestionMark(params)
+        let res = await saveTableQuestionMark(params, 10)
         if (res.IsSuccess) {
           // 保存后设置保存状态
           let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)

From d12763792286ce5ab74602e7d6283f349b0d58f5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 14:50:22 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=82=9D=E8=84=8F?=
 =?UTF-8?q?=E5=88=86=E6=AE=B5=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                                        | 8 ++++++++
 .../reading/dicoms/components/MRIPDFF/QuestionForm.vue    | 8 ++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index 6521fafa..19bf66a0 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -267,3 +267,11 @@ export function deleteTableQuestionMark(param) {
     data: param
   })
 }
+
+export function submitTaskRowInfo(param, type) {
+  return request({
+    url: `/ReadingImageTask/SubmitTaskRowInfo/${type}`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index a6831a9e..06afca8c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -202,8 +202,8 @@
   </el-form>
 </template>
 <script>
-import { submitTableQuestion } from '@/api/trials'
-import { saveTableQuestionMark, deleteTableQuestionMark } from '@/api/reading'
+// import { submitTableQuestion } from '@/api/trials'
+import { saveTableQuestionMark, submitTaskRowInfo, deleteTableQuestionMark } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 export default {
@@ -582,7 +582,7 @@ export default {
     async saveTableQuestionInfo(params, qs) {
       const loading = this.$loading({ fullscreen: true })
       try {
-        let res = await saveTableQuestionMark(params, 10)
+        let res = await saveTableQuestionMark(params, 11)
         if (res.IsSuccess) {
           // 保存后设置保存状态
           let i = this.markList.findIndex(i=>i.tableQuestionId === qs.Id)
@@ -730,7 +730,7 @@ export default {
             answerList: answers,
             isDicomReading: true
           }
-          const res = await submitTableQuestion(params)
+          const res = await submitTaskRowInfo(params, 11)
           if (res.IsSuccess) {
           // 保存成功！
             this.$message.success(this.$t('common:message:savedSuccessfully'))

From d381b10bcd4ae16abe5a9865d3cc8273ed1acf0b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 15:36:00 +0800
Subject: [PATCH 5/7] =?UTF-8?q?CDISC=E5=AF=BC=E5=87=BA=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ReviewResults.vue              | 55 ++++++++++++-------
 .../components/configList.vue                 | 34 ++++++++++--
 .../reading/reading-tracking/index.vue        |  2 +-
 3 files changed, 66 insertions(+), 25 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
index c53391b9..3f98dd2b 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue
@@ -1,11 +1,11 @@
 <template>
   <div style="text-align: right">
-    <el-tabs v-model="exportType">
+    <el-tabs v-model="activeName">
       <el-tab-pane
         label="报表导出"
         name="report"
       >
-        <el-tabs type="border-card" v-model="trialReadingCriterionId">
+        <el-tabs type="border-card" v-model="reportCriterionId">
           <el-tab-pane
             :label="i.TrialReadingCriterionName"
             :name="i.TrialReadingCriterionId"
@@ -13,7 +13,7 @@
             :key="i.TrialReadingCriterionId"
           >
             <exportList 
-              v-if="trialReadingCriterionId === i.TrialReadingCriterionId && exportType === 'report'" 
+              v-if="reportCriterionId === i.TrialReadingCriterionId && activeName === 'report'" 
               :trialReadingCriterionId="i.TrialReadingCriterionId" 
               :data="data"
             />
@@ -29,24 +29,39 @@
         label="报表导出配置"
         name="reportConfig"
       >
-        <el-tabs type="border-card" v-model="configTrialReadingCriterionId">
+        <el-tabs type="border-card" v-model="reportConfigCriterionId">
           <el-tab-pane
-              :label="i.TrialReadingCriterionName"
-              :name="i.TrialReadingCriterionId"
-              v-for="i of trialCriterionList"
-              :key="i.TrialReadingCriterionId"
-            >
-              <configList 
-                v-if="configTrialReadingCriterionId === i.TrialReadingCriterionId && exportType === 'reportConfig'" 
-                :trialReadingCriterionId="i.TrialReadingCriterionId" 
-              />
-            </el-tab-pane>
+            :label="i.TrialReadingCriterionName"
+            :name="i.TrialReadingCriterionId"
+            v-for="i of trialCriterionList"
+            :key="i.TrialReadingCriterionId"
+          >
+            <configList 
+              v-if="reportConfigCriterionId === i.TrialReadingCriterionId && activeName === 'reportConfig'" 
+              :trialReadingCriterionId="i.TrialReadingCriterionId"
+              :exportType="0"
+            />
+          </el-tab-pane>
         </el-tabs>
       </el-tab-pane>
       <el-tab-pane
         label="CDISC导出配置"
         name="CDISCConfig"
       >
+        <el-tabs type="border-card" v-model="CDISCCriterionId">
+          <el-tab-pane
+            :label="i.TrialReadingCriterionName"
+            :name="i.TrialReadingCriterionId"
+            v-for="i of trialCriterionList"
+            :key="i.TrialReadingCriterionId"
+          >
+            <configList 
+              v-if="CDISCCriterionId === i.TrialReadingCriterionId && activeName === 'CDISCConfig'" 
+              :trialReadingCriterionId="i.TrialReadingCriterionId"
+              :exportType="1"
+            />
+          </el-tab-pane>
+        </el-tabs>
       </el-tab-pane>
     </el-tabs>
     
@@ -67,10 +82,11 @@ export default {
     return {
       loading: false,
       trialCriterionList: [],
-      trialReadingCriterionId: null,
+      reportCriterionId: null,
       trialId: null,
-      exportType:'report',
-      configTrialReadingCriterionId: ''
+      activeName: 'report',
+      reportConfigCriterionId: '',
+      CDISCCriterionId: ''
     }
   },
   props: {
@@ -91,8 +107,9 @@ export default {
         let res = await getTrialCriterionList(this.trialId)
         if (res.IsSuccess) {
           this.trialCriterionList = res.Result
-          this.trialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
-          this.configTrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+          this.reportCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+          this.reportConfigCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+          this.CDISCCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
         }
       } catch(e) {
         console.log(e)
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
index e70e07bd..dce78339 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue
@@ -10,9 +10,15 @@
       default-expand-all
       :tree-props="{ children: 'Children', hasChildren: 'hasChildren' }"
     >
-      <el-table-column prop="QuestionName" label="问题名称"  width="300">
+      <el-table-column 
+        prop="QuestionName" 
+        label="问题名称"  
+        width="300">
       </el-table-column>
-      <el-table-column :key="item.Code"  v-for="item in exportInfo.DicList" :label="item.ValueCN"    >
+      <el-table-column 
+        v-for="item in exportInfo.DicList"
+        :key="item.Code"  
+        :label="item.ValueCN"    >
         <template v-slot="scope">
           <el-checkbox
             @change="() => changeState(scope, item.Code)"
@@ -20,6 +26,17 @@
           </el-checkbox>
         </template>
       </el-table-column>
+      <el-table-column 
+        v-if="exportType === 1"
+        prop="CDISCCode" 
+        label="CDISC编码"  
+        width="500" 
+      >
+       <template v-slot="scope">
+          <el-input v-model="scope.row.CDISCCode" placeholder="CDISC编码"></el-input>
+        </template>
+
+      </el-table-column>
     </el-table>
   </div>
 </template>
@@ -31,6 +48,10 @@ export default {
     trialReadingCriterionId: {
       type: String,
       required: true
+    },
+    exportType: {
+      type: Number,
+      required: true
     }
   },
   data() {
@@ -60,6 +81,7 @@ export default {
       this.loading = true
       try {
         let params= {
+          exportType: this.exportType,
           questionList: [],
           tableQuestionList: []
         }
@@ -67,7 +89,8 @@ export default {
           return {
             questionId: i.QuestionId,
             tableQuestionId: i.TableQuestionId,
-            exportResult: i.ExportResult
+            exportResult: i.ExportResult,
+            CDISCCode: i.CDISCCode
           }
         })
         this.exportInfo.QuestionList.forEach(i => {
@@ -76,6 +99,7 @@ export default {
               questionId: i.QuestionId,
               tableQuestionId: k.TableQuestionId,
               exportResult: k.ExportResult,
+              CDISCCode: k.CDISCCode
             }
           })
           params.tableQuestionList = params.tableQuestionList.concat(childlist)
@@ -92,11 +116,11 @@ export default {
     },
     // 获取状态
     getCheckState(item, code) {
-      return item.row.ExportResult.indexOf(code) > -1;
+      return item.row.ExportResult.indexOf(code) > -1
     },
     // 改变状态
     changeState(item, code) {
-     item.row.ExportResult.indexOf(code)>-1?item.row.ExportResult.splice(item.row.ExportResult.indexOf(code), 1):item.row.ExportResult.push(code);
+     item.row.ExportResult.indexOf(code) > -1 ? item.row.ExportResult.splice(item.row.ExportResult.indexOf(code), 1) : item.row.ExportResult.push(code);
     },
   }
 }
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index be227c2d..d112f98e 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -837,7 +837,7 @@
         :title="$t('trials:reviewTrack:button:export')"
         :visible.sync="exportVisible"
         :close-on-click-modal="false"
-        width="80%"
+        width="60%"
         append-to-body>
         <ReviewResults :data="searchData" />
       </el-dialog>

From ba54da2814feb659f937bbde74019ad5a9c1a999 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 15:43:55 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E9=98=85=E7=89=87=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index 19bf66a0..21dbbf10 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -254,7 +254,7 @@ export function uploadOCTLipidAngleTemplate(param) {
 
 export function saveTableQuestionMark(param, type) {
   return request({
-    url: `/ReadingImageTask/saveTableQuestionMark/${type}`,
+    url: `/saveTableQuestionMark/${type}`,
     method: 'post',
     data: param
   })
@@ -270,7 +270,7 @@ export function deleteTableQuestionMark(param) {
 
 export function submitTaskRowInfo(param, type) {
   return request({
-    url: `/ReadingImageTask/SubmitTaskRowInfo/${type}`,
+    url: `/SubmitTaskRowInfo/${type}`,
     method: 'post',
     data: param
   })

From 518ce72fd22b252db763443fbb5c840648e7d307 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 2 Jan 2025 16:59:29 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E9=98=85=E7=89=87=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/reading.js                                            | 4 ++--
 .../reading/dicoms/components/MRIPDFF/QuestionForm.vue        | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/api/reading.js b/src/api/reading.js
index 21dbbf10..97cce6ba 100644
--- a/src/api/reading.js
+++ b/src/api/reading.js
@@ -260,9 +260,9 @@ export function saveTableQuestionMark(param, type) {
   })
 }
 
-export function deleteTableQuestionMark(param) {
+export function deleteTableQuestionMark(param, type) {
   return request({
-    url: `/ReadingImageTask/deleteTableQuestionMark`,
+    url: `/deleteTableQuestionMark/${type}`,
     method: 'post',
     data: param
   })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
index 06afca8c..3dfe995c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/MRIPDFF/QuestionForm.vue
@@ -703,7 +703,7 @@ export default {
       try {
           let isResetMarks = this.markList.findIndex(i=>i.measureData && i.measureData.MeasureData) > -1 ? true : false
           if (parseInt(this.questionForm[this.isMeasurableId]) === 0 && this.isExitsMarks) {
-            await deleteTableQuestionMark({rowId: this.questionForm.RowId})
+            await deleteTableQuestionMark({rowId: this.questionForm.RowId}, 11)
             this.markList.forEach(i => {
               if (i.measureData && i.measureData.MeasureData) {
                 i.measureData = ''