6 changed files with 65 additions and 204 deletions
--- 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,28 +132,6 @@
              {{ $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"
@ -380,11 +358,6 @@ 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()
--- 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,7 +60,20 @@
        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="是否显示"
@ -81,7 +94,7 @@
          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
        </template>
      </el-table-column>
-      <!-- <el-table-column
+      <el-table-column
        prop="IsJudgeQuestion"
        label="是否裁判问题"
        show-overflow-tooltip
@ -89,8 +102,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"
@ -111,53 +124,8 @@
        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
@ -166,7 +134,6 @@
          {{ scope.row.Type === 'upload'?scope.row.ImageCount:'' }}
        </template>
      </el-table-column>
-       -->
      <el-table-column
        prop="MaxRowCount"
        label="最大行数"
@ -323,11 +290,6 @@ 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()
--- 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:qsGroupName')"
+        :label="$t('trials:readingUnit:qsList:title:groupName')"
        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.TypeValue"
+        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'number') && 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,14 +527,8 @@
        />
      </el-form-item> -->
      <!-- 问题数据来源 -->
-      <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-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
+                    prop="DataSource">
        <el-radio-group
          v-model="form.DataSource"
        >
@ -591,9 +585,6 @@
        <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"
@ -766,9 +757,6 @@
        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"
@ -779,9 +767,6 @@
        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
--- 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="ShowQuestion"
-        :label="$t('trials:readingUnit:qsList:title:isShow')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
-        </template>
-      </el-table-column>
      <!-- 是否必填 -->
      <el-table-column
        prop="IsRequired"
@ -92,6 +82,16 @@
          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
        </template>
      </el-table-column>
+      <!-- 是否显示 -->
+      <el-table-column
+        prop="ShowQuestion"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
+        </template>
+      </el-table-column>
      <!-- 是否裁判问题 -->
      <el-table-column
        prop="IsJudgeQuestion"
@ -125,17 +125,6 @@
          {{ $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"
@ -148,12 +137,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')"
@ -397,11 +386,6 @@ 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()
--- 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,6 +233,9 @@
        :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"
@ -246,14 +249,8 @@
      <!-- 私有属性 -->
      <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"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
+      <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
+                    prop="DataSource">
        <el-radio-group
          v-model="form.DataSource"
        >
@ -330,9 +327,6 @@
        <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"
@ -461,7 +455,7 @@
        />
      </el-form-item>
      <el-form-item
-        v-if="(form.Type === 'select' || form.Type === 'radio') && form.TypeValue"
+        v-if="(form.Type === 'select' || form.Type === 'radio' || form.Type === 'number') && form.TypeValue"
        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
      >
        <el-select v-model="form.DefaultValue" clearable>
@ -474,7 +468,7 @@
        </el-select>
      </el-form-item>
      <el-form-item
-        v-if="form.Type === 'number' && !isFromSystem"
+        v-if="(form.Type === 'number') && !isFromSystem && !form.TypeValue"
        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
      >
        <el-input
@ -593,9 +587,6 @@
        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"
@ -606,9 +597,6 @@
        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
--- 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="ShowQuestion"
-        :label="$t('trials:readingUnit:qsList:title:isShow')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
-        </template>
-      </el-table-column>
      <!-- 是否必填 -->
      <el-table-column
        prop="IsRequired"
@ -70,8 +60,18 @@
          {{ $fd('QuestionRequired',scope.row.IsRequired) }}
        </template>
      </el-table-column>
+      <!-- 是否显示 -->
+      <el-table-column
+        prop="ShowQuestion"
+        :label="$t('trials:readingUnit:qsList:title:isShow')"
+        show-overflow-tooltip
+      >
+        <template slot-scope="scope">
+          {{ $fd('ShowQuestion',scope.row.ShowQuestion) }}
+        </template>
+      </el-table-column>
      <!-- 是否裁判问题 -->
-      <!-- <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,52 +102,26 @@
        <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
+      <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')"
@ -308,11 +282,6 @@ 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()