Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/trials/trials-panel/reading/reading-tracking/components/ReviewResults.vue

@@ -24,6 +24,20 @@
         label="CDISC导出"
         name="CDISC"
       >
+        <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"
+          >
+            <exportList 
+              v-if="CDISCCriterionId === i.TrialReadingCriterionId && activeName === 'CDISC'" 
+              :trialReadingCriterionId="i.TrialReadingCriterionId" 
+              :data="data"
+            />
+          </el-tab-pane>
+        </el-tabs>
       </el-tab-pane>
       <el-tab-pane
         label="报表导出配置"
@@ -85,6 +99,7 @@ export default {
       reportCriterionId: null,
       trialId: null,
       activeName: 'report',
+      CDISCCriterionId:'',
       reportConfigCriterionId: '',
       CDISCCriterionId: ''
     }
@@ -108,6 +123,7 @@ export default {
         if (res.IsSuccess) {
           this.trialCriterionList = res.Result
           this.reportCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+          this.CDISCCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
           this.reportConfigCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
           this.CDISCCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
         }

src/views/trials/trials-panel/reading/reading-tracking/components/configList.vue

@@ -33,7 +33,12 @@
         width="500" 
       >
        <template v-slot="scope">
-          <el-input v-model="scope.row.CDISCCode" placeholder="CDISC编码"></el-input>
+          <el-input 
+            v-model="scope.row.CDISCCode" 
+            placeholder="CDISC编码"
+            size="mini"
+          >
+          </el-input>
         </template>
 
       </el-table-column>
@@ -67,7 +72,12 @@ export default {
     async getConfigInfo() {
       try {
         this.loading = true
-        let res = await getTrialQuestionExportResult({trialReadingCriterionId: this.trialReadingCriterionId})
+        let res = await getTrialQuestionExportResult(
+          {
+            trialReadingCriterionId: this.trialReadingCriterionId, 
+            exportType: this.exportType
+          }
+        )
         if (res.IsSuccess) {
           this.exportInfo = res.Result
         }

src/views/trials/trials-panel/reading/reading-tracking/components/exportList.vue

@@ -5,7 +5,7 @@
     border 
     stripe 
     height="500">
-    <el-table-column label="" :min-width="50">
+    <el-table-column label="" width="50">
       <template slot-scope="scope">
         {{ scope.$index + 1 }}
       </template>