From 3c3a670ae42333749082f875afb87b3c14554596 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 23 Oct 2024 11:13:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A0=87=E5=87=86=E9=85=8D=E7=BD=AE=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/components/CriterionsConfig.vue  | 31 +++++++-
 .../template/components/TableQsList.vue       | 78 ++++++++++++++-----
 .../reading-unit/components/QuestionsForm.vue | 27 +++++--
 .../reading-unit/components/QuestionsList.vue | 40 +++++++---
 .../reading-unit/components/TableQsForm.vue   | 26 +++++--
 .../reading-unit/components/TableQsList.vue   | 67 +++++++++++-----
 6 files changed, 204 insertions(+), 65 deletions(-)

diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index eebf0cd1..b0d0192f 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -115,13 +115,13 @@
             </template>
           </el-table-column>
           <!-- 注释 -->
-          <el-table-column
+          <!-- <el-table-column
             prop="Remark"
             :label="$t('trials:readingUnit:qsList:title:Remark')"
             width="140"
             show-overflow-tooltip
           >
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
             prop="GlobalReadingShowType"
             label="是否在全局阅片显示"
@@ -132,6 +132,28 @@
               {{ $fd('GlobalReadingShowType', scope.row.GlobalReadingShowType) }}
             </template>
           </el-table-column>
+          <!-- 导出标识 -->
+          <!-- <el-table-column
+            prop="ExportIdentification"
+            :label="$t('trials:readingUnit:qsList:title:ExportIdentification')"
+            width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ $fd('ExportIdentification', scope.row.ExportIdentification) }}
+            </template>
+          </el-table-column> -->
+          <!-- 导出目标表格 -->
+          <el-table-column
+            prop="ExportResult"
+            :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+            width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              {{ getStringResult(scope.row.ExportResult, 'ExportResult') }}
+            </template>
+          </el-table-column>
           <!-- 限制编辑 -->
           <el-table-column
             prop="LimitEdit"
@@ -358,6 +380,11 @@ export default {
       this.config.title = `${this.$fd('LesionType', row.LesionType)}：${this.$t('trials:readingUnit:qsList:title:tableQs')}`
       this.config.visible = true
     },
+    getStringResult(arr, dictionaryCode) {
+      let newArr = arr.map(i => this.$fd(dictionaryCode, i))
+      let delimiter = this.$i18n.locale === 'zh' ? '，' : ', '
+      return newArr.join(delimiter)
+    },
     // 查询
     handleSearch() {
       this.getList()
diff --git a/src/views/dictionary/template/components/TableQsList.vue b/src/views/dictionary/template/components/TableQsList.vue
index 1038b5e9..743933d7 100644
--- a/src/views/dictionary/template/components/TableQsList.vue
+++ b/src/views/dictionary/template/components/TableQsList.vue
@@ -27,12 +27,12 @@
       />
       <el-table-column
         prop="QuestionName"
-        label="名称"
+        label="问题名称"
         show-overflow-tooltip
       />
       <el-table-column
         prop="QuestionEnName"
-        label="名称(EN)"
+        label="问题名称(EN)"
         show-overflow-tooltip
       />
       <el-table-column
@@ -44,7 +44,7 @@
           {{ $fd('Criterion_Question_Type',scope.row.Type) }}
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="TableQuestionType"
         label="选项类型"
         show-overflow-tooltip
@@ -60,20 +60,7 @@
         show-overflow-tooltip
         min-width="110"
       />
-      <el-table-column
-        prop="DependShowOrder"
-        label="关联问题"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="DataTableColumn"
-        label="关联字段"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('OrganColumn',scope.row.DataTableColumn) }}
-        </template>
-      </el-table-column>
+       -->
       <el-table-column
         prop="ShowQuestion"
         label="是否显示"
@@ -94,7 +81,7 @@
           {{ $fd('QuestionRequired',scope.row.IsRequired) }}
         </template>
       </el-table-column>
-      <el-table-column
+      <!-- <el-table-column
         prop="IsJudgeQuestion"
         label="是否裁判问题"
         show-overflow-tooltip
@@ -102,8 +89,8 @@
         <template slot-scope="scope">
           {{ $fd('YesOrNo',scope.row.IsJudgeQuestion) }}
         </template>
-      </el-table-column>
-      <el-table-column
+      </el-table-column> -->
+      <!-- <el-table-column
         prop="ParentQuestionShowOrder"
         label="显示依赖父问题"
         min-width="90"
@@ -124,8 +111,53 @@
         prop="RelevanceValue"
         label="必填触发值"
         show-overflow-tooltip
+      /> -->
+      <!-- 导出标识 -->
+      <!-- <el-table-column
+        prop="ExportIdentification"
+        :label="$t('trials:readingUnit:qsList:title:ExportIdentification')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('ExportIdentification', scope.row.ExportIdentification) }}
+        </template>
+      </el-table-column> -->
+      <!-- 导出目标表格 -->
+      <el-table-column
+        prop="ExportResult"
+        :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ getStringResult(scope.row.ExportResult, 'ExportResult') }}
+        </template>
+      </el-table-column>
+      <!-- 限制编辑 -->
+      <el-table-column
+        prop="LimitEdit"
+        :label="$t('trials:readingUnit:qsList:title:limitEdit')"
+        width="160"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('LimitEdit', scope.row.LimitEdit) }}
+        </template>
+      </el-table-column>
+      <!-- <el-table-column
+        prop="DependShowOrder"
+        label="关联问题"
+        show-overflow-tooltip
       />
       <el-table-column
+        prop="DataTableColumn"
+        label="关联字段"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('OrganColumn',scope.row.DataTableColumn) }}
+        </template>
+      </el-table-column> -->
+      <!-- <el-table-column
         prop="ImageCount"
         label="最大上传个数"
         show-overflow-tooltip
@@ -134,6 +166,7 @@
           {{ scope.row.Type === 'upload'?scope.row.ImageCount:'' }}
         </template>
       </el-table-column>
+       -->
       <el-table-column
         prop="MaxRowCount"
         label="最大行数"
@@ -290,6 +323,11 @@ export default {
             }).catch(() => { this.loading = false })
         })
     },
+    getStringResult(arr, dictionaryCode) {
+      let newArr = arr.map(i => this.$fd(dictionaryCode, i))
+      let delimiter = this.$i18n.locale === 'zh' ? '，' : ', '
+      return newArr.join(delimiter)
+    },
     // 查询
     handleSearch() {
       this.getList()
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 9ee98a39..6a5d15cb 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -89,7 +89,7 @@
       <!-- 分组 -->
       <el-form-item
         v-if="form.Type !== 'group'"
-        :label="$t('trials:readingUnit:qsList:title:groupName')"
+        :label="$t('trials:readingUnit:qsList:title:qsGroupName')"
         prop="GroupId"
         :rules="[
           { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
@@ -440,7 +440,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'number') && form.TypeValue"
+        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
         :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
         <el-select v-model="form.DefaultValue" clearable>
@@ -452,7 +452,7 @@
           />
         </el-select>
       </el-form-item>
-      <!-- <el-form-item
+      <el-form-item
         v-if="(form.Type === 'number') && !isFromSystem"
         :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
@@ -460,7 +460,7 @@
           :disabled="form.DataSource === 1"
           v-model="form.DefaultValue"
         />
-      </el-form-item> -->
+      </el-form-item>
       <!-- 高亮标记值 -->
       <el-form-item v-if="(form.Type === 'select' || form.Type === 'radio')" :label="$t('trials:readingUnit:qsList:title:highlightAnswers')" prop="HighlightAnswerList">
         <el-select v-model="form.HighlightAnswerList" clearable multiple>
@@ -527,8 +527,14 @@
         />
       </el-form-item> -->
       <!-- 问题数据来源 -->
-      <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
-                    prop="DataSource">
+      <el-form-item 
+        v-if="form.Type === 'number'" 
+        :label="$t('trials:readingUnit:qsList:title:dataSource')"
+        prop="DataSource"
+        :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
+      >
         <el-radio-group
           v-model="form.DataSource"
         >
@@ -585,6 +591,9 @@
         <el-form-item
           :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
           prop="CustomCalculateMark"
+          :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
         >
           <el-radio-group
             v-model="form.CustomCalculateMark"
@@ -757,6 +766,9 @@
         v-if="form.Type === 'class'"
         :label="$t('trials:readingUnit:label:ClassifyQuestion')"
         prop="ClassifyQuestionId"
+        :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
       >
         <el-select v-model="form.ClassifyQuestionId" clearable>
           <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
@@ -767,6 +779,9 @@
         v-if="form.Type === 'class'"
         :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
         prop="ClassifyAlgorithms"
+        :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
       >
         <div>
           <el-table
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
index 037c4de9..2d5a5e0b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsList.vue
@@ -72,16 +72,6 @@
           {{ $fd('Criterion_Question_Type',scope.row.Type) }}
         </template>
       </el-table-column>
-      <!-- 是否必填 -->
-      <el-table-column
-        prop="IsRequired"
-        :label="$t('trials:readingUnit:qsList:title:isRequired')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
-        </template>
-      </el-table-column>
       <!-- 是否显示 -->
       <el-table-column
         prop="ShowQuestion"
@@ -92,6 +82,16 @@
           {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
         </template>
       </el-table-column>
+      <!-- 是否必填 -->
+      <el-table-column
+        prop="IsRequired"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
+        </template>
+      </el-table-column>
       <!-- 是否裁判问题 -->
       <el-table-column
         prop="IsJudgeQuestion"
@@ -125,6 +125,17 @@
           {{ $fd('GlobalReadingShowType', scope.row.GlobalReadingShowType) }}
         </template>
       </el-table-column>
+      <!-- 导出目标表格 -->
+      <el-table-column
+        prop="ExportResult"
+        :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+        width="160"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ getStringResult(scope.row.ExportResult, 'ExportResult') }}
+        </template>
+      </el-table-column>
       <!-- 限制编辑 -->
       <el-table-column
         prop="LimitEdit"
@@ -137,12 +148,12 @@
         </template>
       </el-table-column>
       <!-- 注释 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="Remark"
         :label="$t('trials:readingUnit:qsList:title:Remark')"
         width="140"
         show-overflow-tooltip
-      />
+      /> -->
       <el-table-column
         prop=""
         :label="$t('common:action:action')"
@@ -386,6 +397,11 @@ export default {
       this.config.title = `${this.language === 'en' && row.QuestionEnName ? row.QuestionEnName : row.QuestionName}：${this.$t('trials:readingUnit:qsList:title:tableQs')}`// 表格问题
       this.config.visible = true
     },
+    getStringResult(arr, dictionaryCode) {
+      let newArr = arr.map(i => this.$fd(dictionaryCode, i))
+      let delimiter = this.$i18n.locale === 'zh' ? '，' : ', '
+      return newArr.join(delimiter)
+    },
     // 查询
     handleSearch() {
       this.getList()
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index d8782ba5..6e680a3d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -233,9 +233,6 @@
         :label="$t('trials:readingUnit:qsList:title:MaxRowCount')" 
         v-if="form.Type !== 'summary' && form.Type !== 'screenshot' && form.Type !== 'upload'"
         prop="MaxRowCount"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }
-        ]"
       >
         <el-input-number
           v-model="form.MaxRowCount"
@@ -249,8 +246,14 @@
       <!-- 私有属性 -->
       <el-divider content-position="left">{{$t('trials:readingUnit:title:privateProperties')}}</el-divider>
       <!-- 问题数据来源 -->
-      <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
-                    prop="DataSource">
+      <el-form-item 
+        v-if="form.Type === 'number'" 
+        :label="$t('trials:readingUnit:qsList:title:dataSource')"
+        prop="DataSource"
+        :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
+      >
         <el-radio-group
           v-model="form.DataSource"
         >
@@ -327,6 +330,9 @@
         <el-form-item
           :label="$t('trials:readingUnit:qsList:title:customCalculateMark')"
           prop="CustomCalculateMark"
+          :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
         >
           <el-radio-group
             v-model="form.CustomCalculateMark"
@@ -455,7 +461,7 @@
         />
       </el-form-item>
       <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'number') && form.TypeValue"
+        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
         :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
         <el-select v-model="form.DefaultValue" clearable>
@@ -468,7 +474,7 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="(form.Type === 'number') && !isFromSystem && !form.TypeValue"
+        v-if="form.Type === 'number' && !isFromSystem"
         :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
         <el-input
@@ -587,6 +593,9 @@
         v-if="form.Type === 'class'"
         :label="$t('trials:readingUnit:label:ClassifyQuestion')"
         prop="ClassifyTableQuestionId"
+        :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
       >
         <el-select v-model="form.ClassifyTableQuestionId" clearable>
           <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName"
@@ -597,6 +606,9 @@
         v-if="form.Type === 'class'"
         :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
         prop="ClassifyAlgorithms"
+        :rules="[
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+        ]"
       >
         <div>
           <el-table
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue
index 2274a4a5..d2892cda 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsList.vue
@@ -50,16 +50,6 @@
           {{ $fd('Criterion_Question_Type',scope.row.Type) }}
         </template>
       </el-table-column>
-      <!-- 是否必填 -->
-      <el-table-column
-        prop="IsRequired"
-        :label="$t('trials:readingUnit:qsList:title:isRequired')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
-        </template>
-      </el-table-column>
       <!-- 是否显示 -->
       <el-table-column
         prop="ShowQuestion"
@@ -70,8 +60,18 @@
           {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
         </template>
       </el-table-column>
-      <!-- 是否裁判问题 -->
+      <!-- 是否必填 -->
       <el-table-column
+        prop="IsRequired"
+        :label="$t('trials:readingUnit:qsList:title:isRequired')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
+        </template>
+      </el-table-column>
+      <!-- 是否裁判问题 -->
+      <!-- <el-table-column
         prop="IsJudgeQuestion"
         :label="$t('trials:readingUnit:qsList:title:isJudgeQuestion')"
         width="120"
@@ -80,9 +80,9 @@
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsJudgeQuestion) }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- 是否在阅片页面显示 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="IsShowInDicom"
         :label="$t('trials:readingUnit:qsList:title:isShowInDicom')"
         width="140"
@@ -91,9 +91,9 @@
         <template slot-scope="scope">
           {{ $fd('YesOrNo', scope.row.IsShowInDicom) }}
         </template>
-      </el-table-column>
+      </el-table-column> -->
       <!-- 是否在全局阅片显示 -->
-      <el-table-column
+      <!-- <el-table-column
         prop="GlobalReadingShowType"
         :label="$t('trials:readingUnit:qsList:title:globalReadingShowType')"
         width="160"
@@ -102,26 +102,52 @@
         <template slot-scope="scope">
           {{ $fd('GlobalReadingShowType', scope.row.GlobalReadingShowType) }}
         </template>
+      </el-table-column> -->
+      <!-- 导出目标表格 -->
+      <el-table-column
+        prop="ExportResult"
+        :label="$t('trials:readingUnit:qsList:title:ExportResult')"
+        width="160"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ getStringResult(scope.row.ExportResult, 'ExportResult') }}
+        </template>
       </el-table-column>
       <!-- 限制编辑 -->
       <el-table-column
         prop="LimitEdit"
         :label="$t('trials:readingUnit:qsList:title:limitEdit')"
-        width="160"
         show-overflow-tooltip
       >
         <template slot-scope="scope">
           {{ $fd('LimitEdit', scope.row.LimitEdit) }}
         </template>
       </el-table-column>
-      <!-- 注释 -->
       <el-table-column
+        prop="IsCopy"
+        :label="$t('trials:readingUnit:qsList:title:PrecopyValue')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('YesOrNo', scope.row.IsCopy) }}
+        </template>
+      </el-table-column>
+      <!-- 最大行数 -->
+      <el-table-column
+        prop="MaxRowCount"
+        :label="$t('trials:readingUnit:qsList:title:MaxRowCount')"
+        show-overflow-tooltip
+      >
+      </el-table-column>
+      <!-- 注释 -->
+      <!-- <el-table-column
         prop="Remark"
         :label="$t('trials:readingUnit:qsList:title:Remark')"
         width="140"
         show-overflow-tooltip
       >
-      </el-table-column>
+      </el-table-column> -->
       <el-table-column
         prop=""
         :label="$t('common:action:action')"
@@ -282,6 +308,11 @@ export default {
             }).catch(() => { this.loading = false })
         })
     },
+    getStringResult(arr, dictionaryCode) {
+      let newArr = arr.map(i => this.$fd(dictionaryCode, i))
+      let delimiter = this.$i18n.locale === 'zh' ? '，' : ', '
+      return newArr.join(delimiter)
+    },
     // 查询
     handleSearch() {
       this.getList()