src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue

@@ -156,27 +156,12 @@
         </el-checkbox-group>
         <!-- 自动分类 -->
         <el-input
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-if="question.Type === 'class' && !question.TypeValue"
           v-model="questionForm[question.Id]"
         />
-        <el-select
-          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
-        </el-select>
         <el-radio-group
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-if="question.Type === 'class' && question.TypeValue"
           v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
         >
           <el-radio
             v-for="item of question.TypeValue.split('|')"

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue

@@ -97,27 +97,12 @@
         </el-checkbox-group>
         <!-- 自动分类 -->
         <el-input
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-if="question.Type === 'class' && !question.TypeValue"
           v-model="questionForm[question.Id]"
         />
-        <el-select
-          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
-        </el-select>
         <el-radio-group
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-if="question.Type === 'class' && question.TypeValue"
           v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
         >
           <el-radio
             v-for="item of question.TypeValue.split('|')"

src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue

@@ -198,28 +198,12 @@
         />
         <!-- 自动分类 -->
         <el-input
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-if="question.Type === 'class' && !question.TypeValue"
           v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
         />
-        <el-select
-          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
-        </el-select>
         <el-radio-group
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-if="question.Type === 'class' && question.TypeValue"
           v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType"
-          @change="(val) => { formItemChange(val, question) }"
         >
           <el-radio
             v-for="item of question.TypeValue.split('|')"

src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue

@@ -103,28 +103,12 @@
       />
       <!-- 自动计算 -->
       <el-input
-        v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+        v-if="question.Type === 'class' && !question.TypeValue"
         v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType"
       />
-      <el-select
-        v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-        v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType"
-        @change="(val) => { formItemChange(val, question) }"
-      >
-        <el-option
-          v-for="val in question.TypeValue.split('|')"
-          :key="val"
-          :label="val.trim()"
-          :value="val.trim()"
-        />
-      </el-select>
       <el-radio-group
-        v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+        v-if="question.Type === 'class' && question.TypeValue"
         v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType"
-        @change="(val) => { formItemChange(val, question) }"
       >
         <el-radio
           v-for="item of question.TypeValue.split('|')"
@@ -134,7 +118,6 @@
           {{ item.trim() }}
         </el-radio>
       </el-radio-group>
-      
       <!-- 自增 -->
       <el-input
         v-if="question.Type==='increment'"

src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue

@@ -910,48 +910,6 @@
           </el-table>
         </div>
       </el-form-item>
-      <!-- 分类是否可编辑 -->
-      <el-form-item 
-        v-if="form.Type === 'class'" 
-        :label="$t('trials:readingUnit:qsList:title:ClassifyEditType')"
-        prop="ClassifyEditType"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ClassifyEditType"
-        >
-          <el-radio
-            v-for="item of $d.ClassifyEditType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
-      <!-- 分类显示类型 -->
-      <el-form-item 
-        v-if="form.Type === 'class'" 
-        :label="$t('trials:readingUnit:qsList:title:ClassifyShowType')"
-        prop="ClassifyShowType"
-        :rules="[
-          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-        ]"
-      >
-        <el-radio-group
-          v-model="form.ClassifyShowType"
-        >
-          <el-radio
-            v-for="item of $d.ClassifyShowType"
-            :key="item.id"
-            :label="item.value"
-          >
-            {{ item.label }}
-          </el-radio>
-        </el-radio-group>
-      </el-form-item>
       </div>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@@ -1068,8 +1026,6 @@ export default {
         ExportIdentification: 0,
         ExportResult: [],
         ClassifyType: null,
-        ClassifyEditType: null,
-        ClassifyShowType: null
         // IsEnable: true
       },
       rules: {
@@ -1523,11 +1479,6 @@ export default {
       } else {
         form.MaxAnswerLength = null
       }
-      if (val === 'class') {
-        form.ClassifyEditType = 1
-      } else {
-        form.ClassifyEditType = null
-      }
       form.IsRequired = 2
       form.LesionType = null
       form.ImageCount = 0
@@ -1548,7 +1499,6 @@ export default {
       form.ExportIdentification = 0
       form.ExportResult = []
       form.ClassifyType = null
-      form.ClassifyShowType = null
     },
     getLesionType() {
       return new Promise((resolve, reject) => {

src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue

@@ -607,26 +607,26 @@
         
         <!-- 分类 -->
         <el-form-item 
-          v-if="form.Type === 'class'" 
+        v-if="form.Type === 'class'" 
-          :label="$t('trials:readingUnit:qsList:title:ClassifyType')"
+        :label="$t('trials:readingUnit:qsList:title:ClassifyType')"
-          prop="ClassifyType"
+        prop="ClassifyType"
-          :rules="[
+        :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
+        ]"
+      >
+        <el-radio-group
+          v-model="form.ClassifyType"
+          @change="classifyTypeChange"
         >
-          <el-radio-group
+          <el-radio
-            v-model="form.ClassifyType"
+            v-for="item of $d.ClassifyType"
-            @change="classifyTypeChange"
+            :key="item.id"
+            :label="item.value"
           >
-            <el-radio
+            {{ item.label }}
-              v-for="item of $d.ClassifyType"
+          </el-radio>
-              :key="item.id"
+        </el-radio-group>
-              :label="item.value"
+      </el-form-item>
-            >
-              {{ item.label }}
-            </el-radio>
-          </el-radio-group>
-        </el-form-item>
         <el-form-item
           v-if="form.Type === 'class' && form.ClassifyType === 0"
           :label="$t('trials:readingUnit:label:ClassifyQuestion')"
@@ -706,92 +706,50 @@
           </div>
         </el-form-item>
         <el-form-item
-          v-if="form.Type === 'class' &&  form.ClassifyType === 1"
+        v-if="form.Type === 'class' &&  form.ClassifyType === 1"
-          :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
+        :label="$t('trials:readingUnit:label:ClassifyAlgorithms')"
-          prop="ClassifyAlgorithms"
+        prop="ClassifyAlgorithms"
-          :rules="[
+        :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
+          { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
+        ]"
-        >
+      >
-          <div>
+        <div>
-            <el-table
+          <el-table
-              ref="CalculateTable"
+            ref="CalculateTable"
-              :data="ClassifyAlgorithmsList"
+            :data="ClassifyAlgorithmsList"
-              style="margin: 10px;width: calc(100% - 20px)"
+            style="margin: 10px;width: calc(100% - 20px)"
-              size="small"
+            size="small"
-            >
-              <!-- 运算类型 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:label')"
-                show-overflow-tooltip
-                min-width="70"
-              >
-                <template slot-scope="scope">
-                  {{ scope.row.label }}
-                </template>
-              </el-table-column>
-              <!-- 选项 -->
-              <el-table-column
-                :label="$t('trials:readingUnit:label:options')"
-                show-overflow-tooltip
-                min-width="128"
-              >
-                <template slot-scope="scope">
-                  <el-select v-model="scope.row.val" multiple>
-                    <el-option
-                      v-for="item in classifyQuestionOptions"
-                      :key="item"
-                      :label="item"
-                      :value="item">
-                    </el-option>
-                  </el-select>
-                </template>
-              </el-table-column>
-            </el-table>
-          </div>
-        </el-form-item>
-        <!-- 分类是否可编辑 -->
-        <el-form-item 
-          v-if="form.Type === 'class'" 
-          :label="$t('trials:readingUnit:qsList:title:ClassifyEditType')"
-          prop="ClassifyEditType"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ClassifyEditType"
           >
-            <el-radio
+            <!-- 运算类型 -->
-              v-for="item of $d.ClassifyEditType"
+            <el-table-column
-              :key="item.id"
+              :label="$t('trials:readingUnit:label:label')"
-              :label="item.value"
+              show-overflow-tooltip
+              min-width="70"
             >
-              {{ item.label }}
+              <template slot-scope="scope">
-            </el-radio>
+                {{ scope.row.label }}
-          </el-radio-group>
+              </template>
-        </el-form-item>
+            </el-table-column>
-        <!-- 分类显示类型 -->
+            <!-- 选项 -->
-        <el-form-item 
+            <el-table-column
-          v-if="form.Type === 'class'" 
+              :label="$t('trials:readingUnit:label:options')"
-          :label="$t('trials:readingUnit:qsList:title:ClassifyShowType')"
+              show-overflow-tooltip
-          prop="ClassifyShowType"
+              min-width="128"
-          :rules="[
-            { required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }
-          ]"
-        >
-          <el-radio-group
-            v-model="form.ClassifyShowType"
-          >
-            <el-radio
-              v-for="item of $d.ClassifyShowType"
-              :key="item.id"
-              :label="item.value"
             >
-              {{ item.label }}
+              <template slot-scope="scope">
-            </el-radio>
+                <el-select v-model="scope.row.val" multiple>
-          </el-radio-group>
+                  <el-option
-        </el-form-item>
+                    v-for="item in classifyQuestionOptions"
+                    :key="item"
+                    :label="item"
+                    :value="item">
+                  </el-option>
+                </el-select>
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+      </el-form-item>
       </div>
       
     </div>
@@ -890,9 +848,7 @@ export default {
         ExportIdentification: 0,
         ExportResult: [],
         ImageCount: 0,
-        ClassifyType: null,
+        ClassifyType: null
-        ClassifyEditType: null,
-        ClassifyShowType: null,
         // IsEnable: true
       },
       rules: {
@@ -1282,11 +1238,6 @@ export default {
       } else {
         form.MaxAnswerLength = null
       }
-      if (val === 'class') {
-        form.ClassifyEditType = 1
-      } else {
-        form.ClassifyEditType = null
-      }
       form.IsRequired = 2
       form.TypeValue = ''
       form.TableQuestionType = null
@@ -1309,7 +1260,6 @@ export default {
       form.ExportResult = []
       form.ImageCount = 0
       form.ClassifyType = null
-      form.ClassifyShowType = null
     },
     close() {
       this.$emit('close')