数值题型特性优化（数值类型下拉框暂时只有非dicom报告页已修改）

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

@@ -1,36 +1,25 @@
 <template>
   <div class="criterion-form-item">
-    <div
+    <div v-if="!!question.GroupName && question.Type === 'group'"
-      v-if="!!question.GroupName && question.Type==='group'"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;">
-      style="font-weight: bold;font-size: 16px;margin: 5px 0px;color:#fff;"
-    >
       {{ question.GroupName }}
     </div>
-    <div
+    <div v-if="question.Type === 'table' || question.Type === 'basicTable'"
-      v-if="question.Type==='table' || question.Type==='basicTable'"
+      style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
-      style="font-weight: bold;font-size: 14px;margin: 5px 0px;"
-    >
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
         <span :title="question.Remark">{{ question.QuestionName }}</span>
         <el-button size="mini" v-if="readingTaskState < 2" @click="openAddTableCol(question)">
           {{ $t('common:button:add') }}
         </el-button>
       </div>
-      <el-table
+      <el-table :data="questionForm[question.Id]">
-        :data="questionForm[question.Id]">
         <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ question.OrderMark }}{{ scope.$index + 1 }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column :prop="item.Id" :label="item.QuestionName" :key="item.Id"
-          :prop="item.Id"
+          v-for="item of question.TableQuestions.Questions" show-overflow-tooltip :render-header="renderHeader">
-          :label="item.QuestionName"
-          :key="item.Id"
-          v-for="item of question.TableQuestions.Questions"
-          show-overflow-tooltip
-          :render-header="renderHeader"
-        >
           <template slot-scope="scope">
             <span v-if="item.Type === 'upload'">
               {{ scope.row[item.Id] === '' ? '' : scope.row[item.Id] ? scope.row[item.Id].split('|').length : '' }}
@@ -43,18 +32,15 @@
             </span>
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column :label="$t('common:action:action')" show-overflow-tooltip width="100px"
-            :label="$t('common:action:action')"
+          v-if="readingTaskState < 2" fixed="right">
-            show-overflow-tooltip
-            width="100px"
-            v-if="readingTaskState < 2"
-            fixed="right"
-        >
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">
               {{ $t('common:button:edit') }}
             </el-button>
-            <el-button type="text" size="mini" v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline" @click="deleteTableCol(question, scope.$index)">
+            <el-button type="text" size="mini"
+              v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || IsBaseline"
+              @click="deleteTableCol(question, scope.$index)">
               {{ $t('common:button:delete') }}
             </el-button>
           </template>
@@ -64,284 +50,145 @@
     <template v-else>
       <el-form-item
         v-if="(question.ShowQuestion === 1 && question.ParentTriggerValueList.includes(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-        :label="`${question.QuestionName}`"
+        :label="`${question.QuestionName}`" :title="question.Remark" :prop="question.Id" :rules="[
-        :title="question.Remark"
+          {
-        :prop="question.Id"
+            required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type !== 'group' && question.Type !== 'summary',
-        :rules="[
+            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && (question.RelevanceValueList.includes(isNaN(parseFloat(questionForm[question.RelevanceId])) ? questionForm[question.RelevanceId] : questionForm[question.RelevanceId].toString())))) && question.Type!=='group' && question.Type!=='summary',
+          },
-            message: $t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
           {
             validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
             trigger: ['blur', 'change']
           }
-        ]"
+        ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
         <!-- 输入框 -->
-        <el-input
+        <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='input'"
+          :disabled="question.TableQuestionType === 2 || readingTaskState === 2" />
-          v-model="questionForm[question.Id]"
-          :disabled="question.TableQuestionType === 2 || readingTaskState === 2"
-        />
         <!-- 多行文本输入框 -->
-        <el-input
+        <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-          v-if="question.Type==='textarea'"
+          :autosize="{ minRows: 2, maxRows: 4 }" :disabled="readingTaskState === 2" />
-          v-model="questionForm[question.Id]"
-          type="textarea"
-          :autosize="{ minRows: 2, maxRows: 4}"
-          :disabled="readingTaskState === 2"
-        />
         <!-- 下拉框 -->
-        <el-select
+        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-          v-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
           :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && !!question.DictionaryCode || readingTaskState === 2"
-          @change="((val)=>{formItemChange(val, question)})"
+          @change="((val) => { formItemChange(val, question) })">
-        >
           <template v-if="question.TableQuestionType === 1">
-            <el-option
+            <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-              v-for="item in organList"
+              :value="item[question.DataTableColumn]" />
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
           </template>
           <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              v-for="item of $d[question.DictionaryCode]"
+              :label="item.label" />
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
           </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+          <template
-            <el-option
+            v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-              v-for="item of $d[question.DictionaryCode]"
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              :key="item.id"
+              :label="item.label" />
-              :value="item.value"
-              :label="item.label"
-            />
           </template>
           <template v-else>
-            <el-option
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()"
-              v-for="val in question.TypeValue.split('|')"
+              :value="val.trim()" />
-              :key="val.trim()"
-              :label="val.trim()"
-              :value="val.trim()"
-            />
           </template>
 
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
+        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='radio'"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState === 2">
-          v-model="questionForm[question.Id]"
+          <el-radio v-for="val in question.TypeValue.split('|')" :key="val.trim()" :label="val.trim()">
-          @change="((val)=>{formItemChange(val, question)})"
-          :disabled="readingTaskState === 2"
-        >
-          <el-radio
-            v-for="val in question.TypeValue.split('|')"
-            :key="val.trim()"
-            :label="val.trim()"
-          >
             {{ val.trim() }}
           </el-radio>
         </el-radio-group>
         <!-- 复选框 -->
-        <el-checkbox-group
+        <el-checkbox-group v-if="question.Type === 'checkbox'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='checkbox'"
+          :disabled="readingTaskState === 2">
-          v-model="questionForm[question.Id]"
+          <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()">
-          :disabled="readingTaskState === 2"
-        >
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-          >
             {{ val.trim() }}
           </el-checkbox>
         </el-checkbox-group>
         <!-- 自动分类 -->
-        <el-input
+        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2" />
-          v-model="questionForm[question.Id]"
+        <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
-        />
+          @change="(val) => { formItemChange(val, question) }">
-        <el-select
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          v-if="question.Type === 'class' && question.ClassifyShowType === 2"
-          v-model="questionForm[question.Id]"
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          @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
+        <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+          v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          v-model="questionForm[question.Id]"
+          @change="(val) => { formItemChange(val, question) }">
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
+          <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-radio
-            v-for="item of question.TypeValue.split('|')"
-            :key="item.trim()"
-            :label="item.trim()"
-          >
             {{ item.trim() }}
           </el-radio>
         </el-radio-group>
-        <el-input
+        <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 4" type="number"
-          v-if="question.Type === 'class' && question.ClassifyShowType === 4"
+          :disabled="!question.ClassifyEditType || readingTaskState === 2" v-model="questionForm[question.Id]"
-          type="number"
+          @change="(val) => { formItemNumberChange(val, question) }" />
-          :disabled="!question.ClassifyEditType || readingTaskState === 2"
-          v-model="questionForm[question.Id]"
-          @change="(val) => { formItemNumberChange(val, question) }"
-        />
         <!-- 自动计算 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input
+        <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='calculation'"
+          @input="value = value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
-          v-model="questionForm[question.Id]"
-          @input="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')"
-          disabled
-        />
         <!-- 自增 -->
-        <el-input
+        <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
-          v-if="question.Type==='increment'"
-          v-model="questionForm[question.Id]"
-          disabled
-        />
         <!-- 数值 -->
         <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-select
+        <el-select v-if="question.Type === 'number' && question.TypeValue" v-model="questionForm[question.Id]" clearable
-          v-if="question.Type === 'number' && question.TypeValue"
+          @change="(val) => { formItemNumberChange(val, question) }" :disabled="readingTaskState === 2">
-          v-model="questionForm[question.Id]"
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          clearable
-          @change="(val) => { formItemNumberChange(val, question) }"
-          :disabled="readingTaskState === 2"
-        >
-          <el-option
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val.trim()"
-            :value="val.trim()"
-          />
         </el-select>
-        <el-input
+        <el-input type="text" v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-          type="text"
+          @change="(val) => { formItemNumberChange(val, question) }" @input="numberInput(question.Id)"
-          v-if="question.Type === 'number' && !question.TypeValue && question.DataSource !== 1"
-          @change="(val) => { formItemNumberChange(val, question) }"
-          @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model.trim="questionForm[question.Id]"
+          v-model.trim="questionForm[question.Id]" :disabled="readingTaskState === 2">
-          :disabled="readingTaskState === 2"
-        >
           <!-- <template slot="append">1</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
-        <el-input
+        <el-input type="text" @input="numberInput(question.Id)"
-          type="text"
-          @input="numberInput(question.Id)"
           v-if="question.Type === 'number' && !question.TypeValue && question.DataSource === 1"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          :disabled="question.DataSource === 1 || readingTaskState === 2"
+          :disabled="question.DataSource === 1 || readingTaskState === 2" v-model.trim="questionForm[question.Id]">
-          v-model.trim="questionForm[question.Id]"
-        >
           <!-- <template slot="append">2</template> -->
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
+            question.CustomUnit }}</template>
           <template slot="append" v-else-if="question.ValueType === 2">%</template>
         </el-input>
         <!-- 上传图像 -->
-        <el-upload
+        <el-upload v-if="question.Type === 'upload'" :disabled="readingTaskState === 2" action
-          v-if="question.Type==='upload'"
+          :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
-          :disabled="readingTaskState === 2"
-          action
-          :accept="question.FileType"
-          :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
           :on-preview="handlePictureCardPreview"
           :before-upload="(file) => { return handleBeforeUpload(file, question.FileType) }"
-          :http-request="uploadScreenshot"
+          :http-request="uploadScreenshot" :on-remove="handleRemove" :file-list="fileList"
-          :on-remove="handleRemove"
+          :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
-          :file-list="fileList"
-          :class="{disabled:question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
-        >
           <el-button slot="default" class="el-icon-plus" v-if="readingTaskState < 2">
             {{ this.$t('common:button:upload') }}
           </el-button>
         </el-upload>
-        <viewer
+        <viewer v-if="question.Type === 'upload' && imgVisible" :ref="imageUrl" style="margin:0 10px;"
-          v-if="question.Type==='upload' && imgVisible"
+          :images="[imageUrl]">
-          :ref="imageUrl"
+          <img v-show="false" crossorigin="anonymous" :src="imageUrl" alt="Image">
-          style="margin:0 10px;"
-          :images="[imageUrl]"
-        >
-          <img
-            v-show="false"
-            crossorigin="anonymous"
-            :src="imageUrl"
-            alt="Image"
-          >
         </viewer>
       </el-form-item>
     </template>
 
-    <template v-if="question.Childrens && question.Childrens.length>0 && question.Type !== 'table' && question.Type !== 'basicTable'">
+    <template
-      <CustomizeQuestionFormItem
+      v-if="question.Childrens && question.Childrens.length > 0 && question.Type !== 'table' && question.Type !== 'basicTable'">
-        v-for="(item) in question.Childrens"
+      <CustomizeQuestionFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
-        :key="item.Id"
+        :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="questionForm"
-        :question="item"
+        :visit-task-id="visitTaskId" :criterion-id="criterionId" :CalculationList="CalculationList"
-        :IsBaseline="IsBaseline"
+        @formItemNumberChange="formItemNumberChange" @setFormItemData="setFormItemData"
-        :reading-task-state="readingTaskState"
+        @resetFormItemData="resetFormItemData" />
-        :question-form="questionForm"
-        :visit-task-id="visitTaskId"
-        :criterion-id="criterionId"
-        :CalculationList="CalculationList"
-        @formItemNumberChange="formItemNumberChange"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
     </template>
-    <base-model :config="addOrEdit"
+    <base-model :config="addOrEdit" class="my_dialog" :close-on-click-modal="false" width="400px" append-to-body>
-      class="my_dialog"
-      :close-on-click-modal="false"
-      width="400px"
-      append-to-body
-    >
       <template slot="dialog-body">
-        <el-form
+        <el-form ref="tableQsForm" :model="QuestionsForm" v-loading="loading" size="small">
-            ref="tableQsForm"
+          <QuestionTableFormItem v-for="(item) in QuestionsList" :key="item.Id" :question="item"
-            :model="QuestionsForm"
+            :IsBaseline="IsBaseline" :reading-task-state="readingTaskState" :question-form="QuestionsForm"
-            v-loading="loading"
+            :visit-task-id="visitTaskId" :criterion-id="criterionId" :type="addOrEdit.type"
-            size="small"
+            :CalculationList="CalculationTabelList" @formItemTableNumberChange="formItemTableNumberChange"
-        >
+            @resetFormItemData="resetTableFormItemData" @setFormItemData="setFormTableItemData" />
-          <QuestionTableFormItem
-              v-for="(item) in QuestionsList"
-              :key="item.Id"
-              :question="item"
-              :IsBaseline="IsBaseline"
-              :reading-task-state="readingTaskState"
-              :question-form="QuestionsForm"
-              :visit-task-id="visitTaskId"
-              :criterion-id="criterionId"
-              :type="addOrEdit.type"
-              :CalculationList="CalculationTabelList"
-              @formItemTableNumberChange="formItemTableNumberChange"
-              @resetFormItemData="resetTableFormItemData"
-              @setFormItemData="setFormTableItemData" 
-          />
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
+        <el-button size="small" @click="addOrEdit.visible = false">
-            size="small"
-            @click="addOrEdit.visible = false"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
         <!-- 保存 -->
@@ -351,23 +198,10 @@
       </template>
     </base-model>
     <!-- 预览文件 -->
-    <el-dialog
+    <el-dialog v-if="previewVisible" :visible.sync="previewVisible" :title="$t('common:button:preview')"
-      v-if="previewVisible"
+      :fullscreen="true" append-to-body custom-class="base-dialog-wrapper">
-      :visible.sync="previewVisible"
+      <div class="base-modal-body" style="border: 2px solid #ccc; padding: 10px">
-      :title="$t('common:button:preview')"
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" />
-      :fullscreen="true"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <div
-        class="base-modal-body"
-        style="border: 2px solid #ccc; padding: 10px"
-      >
-        <PreviewFile
-          v-if="previewVisible"
-          :file-path="currentPath"
-          :file-type="currentType"
-        />
       </div>
     </el-dialog>
   </div>
@@ -682,6 +516,7 @@ export default {
       })
     },
     logic(rules, num = 0) {
+      let isNE = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -698,6 +533,9 @@ export default {
                     } else {
                       num *= parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break;
                 case 6:
@@ -707,6 +545,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break;
                 case 7:
@@ -716,6 +557,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                   break;
@@ -723,6 +567,9 @@ export default {
                   var arr = []
                   this.questionForm[o.QuestionId].forEach(q => {
                     arr.push(q[o.TableQuestionId])
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = arr.length === 0 ? 0 : Math.max(...arr)
                   break;
@@ -730,17 +577,26 @@ export default {
                   var arr = []
                   this.questionForm[o.QuestionId].forEach(q => {
                     arr.push(q[o.TableQuestionId])
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = arr.length === 0 ? 0 : Math.min(...arr)
                   break;
               }
             } else {
               num = parseFloat(this.questionForm[o.TableQuestionId])
+              if (this.questionForm[o.TableQuestionId] === 'NE') {
+                isNE = true
+              }
               if (!isNaN(num)) {
                 dataArr.push(num)
               }
             }
           } else {
+            if (this.questionForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 num += parseFloat(this.questionForm[o.TableQuestionId])
@@ -796,6 +652,9 @@ export default {
       } catch (e) {
         console.log(e)
       }
+      if (isNE) {
+        return  'NE'
+      }
       if (rules.ValueType === 2) {
         num = num * 100
       }
@@ -876,7 +735,11 @@ export default {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions);
           var num,
             arr = [];
+          let isNE = false
           CalculateQuestions.forEach((o, i) => {
+            if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             if (i === 0) {
               num = parseFloat(this.QuestionsForm[o.TableQuestionId]);
               arr = [num];
@@ -915,6 +778,9 @@ export default {
               }
             }
           });
+          if (isNE) {
+            num = 'NE'
+          }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
       });
@@ -1069,9 +935,11 @@ export default {
 .my_dialog {
   .criterion-form-item {
     width: 100%;
+
     ::v-deep .el-form-item__content {
       width: auto;
     }
+
     //::v-deep .el-input-goup__append{
     //  background-color: transparent;
     //  color: #ddd;
@@ -1079,25 +947,31 @@ export default {
     //}
   }
 }
+
 ::v-deep .el-form-item__label {
   color: #c3c3c3;
 }
+
 ::v-deep .el-radio__label {
   color: #c3c3c3;
 }
+
 ::v-deep .el-input-group__append {
   background: #000;
   color: #ddd;
   border: 1px solid #5e5e5e;
 }
+
 ::v-deep .el-input .el-input__inner {
   background-color: transparent;
   color: #ddd;
   border: 1px solid #5e5e5e;
 }
+
 .criterion-form-item {
   ::v-deep .criterion-form-item .el-form-item {
     display: block;
+
     .el-form-item__label {
       display: block;
       color: #c8c8c8;
@@ -1105,36 +979,45 @@ export default {
       text-align: left;
     }
   }
+
   .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
+
   .el-input {
     width: 100%;
   }
+
   .mb {
     margin-bottom: 0px;
   }
+
   .disabled {
     ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
+
   .uploadWrapper {
     display: flex;
     flex-direction: column;
     align-items: flex-start;
   }
 }
+
 ::v-deep .el-table__body-wrapper::-webkit-scrollbar {
   height: 10px !important;
 }
+
 ::v-deep .el-table__fixed-right::before {
   display: none;
 }
+
 ::v-deep .el-upload-list__item-name {
   color: #0a84ff;
+
   .el-icon-document {
     color: #0a84ff;
   }

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

@@ -2,232 +2,127 @@
   <div class="criterion-form-item">
     <el-form-item
       v-if="(question.ShowQuestion === 1 && !!~question.ParentTriggerValueList.indexOf(questionForm[question.ParentId])) || question.ShowQuestion === 0"
-        :label="`${question.QuestionName}`"
+      :label="`${question.QuestionName}`" :prop="question.Id" :title="question.Remark" :rules="[
-        :prop="question.Id"
+        {
-        :title="question.Remark"
+          required: (question.IsRequired === 0 || (question.IsRequired === 1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type !== 'group' && question.Type !== 'summary',
-        :rules="[
+          message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
-          { required: (question.IsRequired === 0 || (question.IsRequired ===1 && question.RelevanceId && !!~question.RelevanceValueList.indexOf(questionForm[question.RelevanceId]))) && question.Type!=='group' && question.Type!=='summary',
+        },
-            message:  $t('common:ruleMessage:select'), trigger: ['blur', 'change']},
         {
           validator: question.Type === 'number' && !question.TypeValue ? validatorNumberInput : (rule, value, callback) => { callback() },
           trigger: ['blur', 'change']
         }
-        ]"
+      ]" :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' ? 'uploadWrapper' : '']">
-        :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
-      >
       <!-- 输入框 -->
-        <el-input
+      <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='input'"
+        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')" />
-          v-model="questionForm[question.Id]"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-        />
       <!-- 多行文本输入框 -->
-        <el-input
+      <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-          v-if="question.Type==='textarea'"
-          v-model="questionForm[question.Id]"
-          type="textarea"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          :autosize="{ minRows: 2, maxRows: 4}"
+        :autosize="{ minRows: 2, maxRows: 4 }" />
-        />
       <!-- 下拉框 -->
-        <el-select
+      <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-          v-if="question.Type==='select'"
-          v-model="questionForm[question.Id]"
-          clearable
         :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val)=>{formItemChange(val, question)})"
+        @change="((val) => { formItemChange(val, question) })">
-        >
         <template v-if="question.TableQuestionType === 1">
-            <el-option
+          <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
-              v-for="item in organList"
+            :value="item[question.DataTableColumn]" />
-              :key="item.Id"
-              :label="item[question.DataTableColumn]"
-              :value="item[question.DataTableColumn]"
-            />
         </template>
         <template v-else-if="question.TableQuestionType === 3 || question.QuestionGenre === 3">
-            <el-option
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              v-for="item of $d[question.DictionaryCode]"
+            :label="item.label" />
-              :key="item.id"
-              :value="item.value"
-              :label="item.label"
-            />
         </template>
-          <template v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
+        <template
-            <el-option
+          v-else-if="(question.TableQuestionType === 2 || question.QuestionGenre === 2) && question.DictionaryCode">
-              v-for="item of $d[question.DictionaryCode]"
+          <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="item.value"
-              :key="item.id"
+            :label="item.label" />
-              :value="item.value"
-              :label="item.label"
-            />
         </template>
         <template v-else>
-            <el-option
+          <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
         </template>
 
       </el-select>
       <!-- 单选 -->
-        <el-radio-group
+      <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='radio'"
-          v-model="questionForm[question.Id]"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val)=>{formItemChange(val, question)})"
+        @change="((val) => { formItemChange(val, question) })">
-        >
+        <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-          <el-radio
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
           {{ val }}
         </el-radio>
       </el-radio-group>
       <!-- 复选框 -->
-        <el-checkbox-group
+      <el-checkbox-group v-if="question.Type === 'checkbox'"
-          v-if="question.Type==='checkbox'"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          v-model="questionForm[question.Id]"
+        v-model="questionForm[question.Id]">
-        >
+        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-          <el-checkbox
-            v-for="val in question.TypeValue.split('|')"
-            :key="val"
-            :label="val"
-          >
           {{ val }}
         </el-checkbox>
       </el-checkbox-group>
       <!-- 自动分类 -->
-        <el-input
+      <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
-          v-if="question.Type === 'class' && question.ClassifyShowType === 1"
+        v-model="questionForm[question.Id]" />
-          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-select
+        <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
-          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
+      <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-          v-if="question.Type === 'class' && question.ClassifyShowType === 3"
+        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
-          v-model="questionForm[question.Id]"
+        @change="(val) => { formItemChange(val, question) }">
-          :disabled="!question.ClassifyEditType"
+        <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
-          @change="(val) => { formItemChange(val, question) }"
-        >
-          <el-radio
-            v-for="item of question.TypeValue.split('|')"
-            :key="item.trim()"
-            :label="item.trim()"
-          >
           {{ item.trim() }}
         </el-radio>
       </el-radio-group>
       <!-- 自动计算 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input
+      <el-input v-if="question.Type === 'calculation'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='calculation'"
+        oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')" disabled />
-          v-model="questionForm[question.Id]"
-          oninput="value=value.replace(/^\D*(\d*(?:.\d{0,2})?).*$/g, '$1')"
-          disabled
-        />
       <!-- 自增 -->
-        <el-input
+      <el-input v-if="question.Type === 'increment'" v-model="questionForm[question.Id]" disabled />
-          v-if="question.Type==='increment'"
-          v-model="questionForm[question.Id]"
-          disabled
-        />
       <!-- 数值 -->
       <!-- :precision="2" :step="0.1" :max="10" -->
-        <el-input
+      <el-input type="text" v-if="question.Type === 'number' && question.DataSource !== 1"
-          type="text"
-          v-if="question.Type === 'number' && question.DataSource !== 1"
         :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
-          @change="((val)=>{formItemNumberChange(val, question)})"
+        @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
-          @input="numberInput(question.Id)"
         @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)"
-          v-model.trim="questionForm[question.Id]"
+        v-model.trim="questionForm[question.Id]">
-        >
+        <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
+          question.CustomUnit }}</template>
       </el-input>
-        <el-input
+      <el-input type="text" v-if="question.Type === 'number' && question.DataSource === 1"
-          type="text"
+        :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
-          v-if="question.Type === 'number' && question.DataSource === 1"
+        @blur="handleCalculationBlur(calculationValue)" v-model.trim="calculationValue">
-          :disabled="question.DataSource === 1"
+        <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
-          @input="numberInput(question.Id, true )"
+          question.CustomUnit }}</template>
-          @blur="handleCalculationBlur(calculationValue)"
-          v-model.trim="calculationValue"
-        >
-          <template slot="append" v-if="question.Unit !== 0">{{question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit}}</template>
       </el-input>
       <!-- 上传图像 -->
-        <el-upload
+      <el-upload v-if="question.Type === 'upload'" action :accept="question.FileType"
-          v-if="question.Type==='upload'"
+        :limit="question.ImageCount === 0 ? 100 : question.ImageCount" :on-preview="handlePictureCardPreview"
-          action
+        :before-upload="handleBeforeUpload" :http-request="uploadScreenshot" list-type="picture-card"
-          :accept="question.FileType"
+        :on-remove="handleRemove" :file-list="fileList"
-          :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
+        :class="{ disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount }">
-          :on-preview="handlePictureCardPreview"
-          :before-upload="handleBeforeUpload"
-          :http-request="uploadScreenshot"
-          list-type="picture-card"
-          :on-remove="handleRemove"
-          :file-list="fileList"
-          :class="{disabled: question.ImageCount === 0 ? false : fileList.length >= question.ImageCount}"
-        >
         <i slot="default" class="el-icon-plus" />
         <div slot="file" slot-scope="{file}">
-            <viewer
+          <viewer :ref="file.url" :images="[imageUrl]" style="
-              :ref="file.url"
-              :images="[imageUrl]"
-              style="
                 display: flex;
                 align-items: center;
                 justify-content: center;
                 width: 100%;
                 height: 100%;
-              "
+              ">
-            >
+            <img class="el-upload-list__item-thumbnail" :src="OSSclientConfig.basePath + file.url"
-              <img
+              crossOrigin="anonymous" alt="" style="max-width: 100%; max-height: 100%" />
-                class="el-upload-list__item-thumbnail"
-                :src="OSSclientConfig.basePath + file.url"
-                crossOrigin="anonymous"
-                alt=""
-                style="max-width: 100%; max-height: 100%"
-              />
             <span class="el-upload-list__item-actions">
-                <span
+              <span class="el-upload-list__item-preview" @click="handlePictureCardPreview(file)">
-                  class="el-upload-list__item-preview"
-                  @click="handlePictureCardPreview(file)"
-                >
                 <i class="el-icon-zoom-in" />
               </span>
 
-                <span
+              <span v-if="readingTaskState < 2" class="el-upload-list__item-delete" @click="handleRemove(file)">
-                  v-if="readingTaskState < 2"
-                  class="el-upload-list__item-delete"
-                  @click="handleRemove(file)"
-                >
                 <i class="el-icon-delete" />
               </span>
             </span>
           </viewer>
         </div>
       </el-upload>
-        <el-dialog
+      <el-dialog v-if="question.Type === 'upload'" append-to-body :visible.sync="imgVisible" width="600px">
-          v-if="question.Type==='upload'"
-          append-to-body
-          :visible.sync="imgVisible"
-          width="600px"
-        >
         <el-image :src="imageUrl" width="100%">
           <div slot="placeholder" class="image-slot">
             {{ $t('trials:readingUnit:qsList:message:loading') }}<span class="dot">...</span>
@@ -429,6 +324,7 @@ export default {
       }
     },
     logic(rules, num = 0) {
+      let isNE = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -437,6 +333,10 @@ export default {
         var count = 0
         var maxList = [], minList = []
         rules.CalculateQuestionList.forEach((o, i) => {
+
+          if (this.questionForm[o.TableQuestionId] === 'NE') {
+            isNE = true
+          }
           if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
             if (i !== 0) {
               switch (rules.CustomCalculateMark) {
@@ -514,6 +414,9 @@ export default {
       } catch (e) {
         console.log(e)
       }
+      if (isNE) {
+        return 'NE'
+      }
       if (rules.ValueType === 2) {
         num = num * 100
       }
@@ -610,26 +513,32 @@ export default {
     }
   }
 }
+
 .criterion-form-item {
   .el-form-item {
     display: flex;
     flex-direction: row;
     align-items: flex-start;
   }
+
   ::v-deep .el-form-item__content {
     width: 500px;
   }
+
   .el-input {
     width: 100%;
   }
+
   .mb {
     margin-bottom: 0px;
   }
+
   .disabled {
     ::v-deep .el-upload--picture-card {
       display: none;
     }
   }
+
   .uploadWrapper {
     display: flex;
     flex-direction: column;

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue

@@ -708,6 +708,7 @@ export default {
       }
     },
     logic(rules, num = 0) {
+      let isNE = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -724,6 +725,9 @@ export default {
                     } else {
                       num *= parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break;
                 case 6:
@@ -733,6 +737,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break;
                 case 7:
@@ -742,6 +749,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                   break;
@@ -749,6 +759,9 @@ export default {
                   var arr = []
                   this.questionForm[o.QuestionId].forEach(q => {
                     arr.push(q[o.TableQuestionId])
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = arr.length === 0 ? 0 : Math.max(...arr)
                   break;
@@ -756,17 +769,26 @@ export default {
                   var arr = []
                   this.questionForm[o.QuestionId].forEach(q => {
                     arr.push(q[o.TableQuestionId])
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = arr.length === 0 ? 0 : Math.min(...arr)
                   break;
               }
             } else {
+              if (this.questionForm[o.TableQuestionId] === 'NE') {
+                isNE = true
+              }
               num = parseFloat(this.questionForm[o.TableQuestionId])
               if (!isNaN(num)) {
                 dataArr.push(num)
               }
             }
           } else {
+            if (this.questionForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 num += parseFloat(this.questionForm[o.TableQuestionId])
@@ -822,6 +844,9 @@ export default {
       } catch (e) {
         console.log(e)
       }
+      if (isNE) {
+        return 'NE'
+      }
       if (isNaN(num)) {
         return null
       }
@@ -875,7 +900,11 @@ export default {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions);
           var num,
             arr = [];
+          let isNE = false
           CalculateQuestions.forEach((o, i) => {
+            if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             if (i === 0) {
               num = parseFloat(this.QuestionsForm[o.TableQuestionId]);
               arr = [num];
@@ -914,6 +943,9 @@ export default {
               }
             }
           });
+          if (isNE) {
+            num = 'NE'
+          }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
       });

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue

@@ -375,6 +375,7 @@ export default {
       }
     },
     logic(rules, num = 0) {
+      let isNE = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -383,6 +384,9 @@ export default {
         var count = 0
         var maxList = [], minList = []
         rules.CalculateQuestionList.forEach((o, i) => {
+          if (this.questionForm[o.TableQuestionId] === 'NE') {
+            isNE = true
+          }
           if (rules.CustomCalculateMark > 4 && rules.CustomCalculateMark < 10) {
             if (i !== 0) {
               switch (rules.CustomCalculateMark) {
@@ -460,6 +464,9 @@ export default {
       } catch (e) {
         console.log(e)
       }
+      if (isNE) {
+        return 'NE'
+      }
       if (rules.ValueType === 2) {
         num = num * 100
       }

src/views/trials/trials-panel/reading/visit-review/components/ReportPage.vue

@@ -107,10 +107,11 @@
                     {{ questionForm[scope.row.QuestionId][scope.row.xfIndex][scope.row.TableQuestionId] }}
                   </span>
                   <el-select
-                    v-else-if="(scope.row.Type==='select' || scope.row.Type==='radio') && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
+                    v-else-if="(scope.row.Type==='select' || scope.row.Type==='radio' || (scope.row.Type==='number' && scope.row.TypeValue)) && !scope.row.IsShowInDicom && ((task.IsBaseLine && scope.row.LimitEdit === 1) || (!task.IsBaseLine && scope.row.LimitEdit === 2) || scope.row.LimitEdit === 0)"
                     v-model="questionForm[scope.row.QuestionId]"
                     size="mini"
-                    clearable
+                    :clearable="scope.row.Type!=='number'"
+                    @focus="() => {questionId = scope.row.QuestionId}"
                   >
                     <template>
                       <el-option
@@ -396,7 +397,7 @@ export default {
         if (v.Type === 'number') {
           let val = null
           if (v.ValueType === 0) {
-            val = parseInt(v.Answers[this.visitTaskId])
+            val = v.Answers[this.visitTaskId] ? parseInt(v.Answers[this.visitTaskId]) : ''
           } else if (v.ValueType === 3) {
             val = v.Answers[this.visitTaskId]
           } else {
@@ -422,7 +423,7 @@ export default {
         if (i.Type === 'number') {
           let val = null
           if (i.ValueType === 0) {
-            val = parseInt(i.Answers[this.visitTaskId])
+            val = i.Answers[this.visitTaskId] ? parseInt(i.Answers[this.visitTaskId]) : ''
           } else if (i.ValueType === 3) {
             val = i.Answers[this.visitTaskId]
           } else {
@@ -446,10 +447,12 @@ export default {
       })
     },
     logic(rules, num = 0) {
+      let isNE = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
         }
+        let dataArr = []
         rules.CalculateQuestionList.forEach((o, i) => {
           if (i === 0) {
             if (rules.CustomCalculateMark > 4) {
@@ -461,6 +464,9 @@ export default {
                     } else {
                       num *= parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break
                 case 6:
@@ -470,6 +476,9 @@ export default {
                     } else {
                       num += isNaN(parseFloat(q[o.TableQuestionId])) ? null : parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   break
                 case 7:
@@ -479,6 +488,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId])
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = this.questionForm[o.QuestionId].length === 0 ? 0 : num / this.questionForm[o.QuestionId].length
                   break
@@ -486,6 +498,9 @@ export default {
                   const arr = []
                   this.questionForm[o.QuestionId].forEach(q => {
                     arr.push(q[o.TableQuestionId])
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = arr.length === 0 ? 0 : Math.max(...arr)
                   break
@@ -493,14 +508,32 @@ export default {
                   const arr1 = []
                   this.questionForm[o.QuestionId].forEach(q => {
                     arr1.push(q[o.TableQuestionId])
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   })
                   num = arr1.length === 0 ? 0 : Math.min(...arr1)
                   break
+                case 12:
+                  if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                    dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                  }
+                  if (this.questionForm[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
+                  num = Math.min(...dataArr);
+                  break;
               }
             } else {
               num = parseFloat(this.questionForm[o.TableQuestionId])
+              if (this.questionForm[o.TableQuestionId] === 'NE') {
+                  isNE = true
+                }
             }
           } else {
+            if (this.questionForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 num += parseFloat(this.questionForm[o.TableQuestionId])
@@ -515,12 +548,21 @@ export default {
                 num /= parseFloat(this.questionForm[o.TableQuestionId])
                 // num /= parseFloat(this.questionForm[o.TableQuestionId])
                 break
+              case 12:
+                if (!isNaN(parseFloat(this.questionForm[o.TableQuestionId]))) {
+                  dataArr.push(parseFloat(this.questionForm[o.TableQuestionId]))
+                }
+                num = Math.min(...dataArr);
+                break;
             }
           }
         })
       } catch (e) {
         console.log(e)
       }
+      if (isNE) {
+        return 'NE'
+      }
       if (rules.ValueType === 2) {
         num = num * 100
       }

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

@@ -160,7 +160,7 @@
           <template v-else-if="question.ValueType === 2" slot="append">%</template>
         </el-input>
         <el-input v-else-if="question.Type === 'number' && question.DataSource === 1"
-          v-model="questionForm[question.Id]" type="number" :disabled="question.DataSource === 1">
+          v-model="questionForm[question.Id]" :disabled="question.DataSource === 1">
           <template v-if="question.Unit !== 0" slot="append">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
           <template v-else-if="question.ValueType === 2" slot="append">%</template>
@@ -380,6 +380,7 @@ export default {
       this.addOrEdit.visible = false;
     },
     logic(rules, num = 0) {
+      let isNE = false
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false;
@@ -396,6 +397,9 @@ export default {
                     } else {
                       num *= parseFloat(q[o.TableQuestionId]);
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   });
                   break;
                 case 6:
@@ -405,6 +409,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId]);
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   });
                   break;
                 case 7:
@@ -414,6 +421,9 @@ export default {
                     } else {
                       num += parseFloat(q[o.TableQuestionId]);
                     }
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   });
                   num =
                     this.questionForm[o.QuestionId].length === 0
@@ -424,6 +434,9 @@ export default {
                   var arr = [];
                   this.questionForm[o.QuestionId].forEach((q) => {
                     arr.push(q[o.TableQuestionId]);
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   });
                   num = arr.length === 0 ? 0 : Math.max(...arr);
                   break;
@@ -431,6 +444,9 @@ export default {
                   var arr = [];
                   this.questionForm[o.QuestionId].forEach((q) => {
                     arr.push(q[o.TableQuestionId]);
+                    if (q[o.TableQuestionId] === 'NE') {
+                      isNE = true
+                    }
                   });
                   num = arr.length === 0 ? 0 : Math.min(...arr);
                   console.log("min", this.questionForm[o.QuestionId], arr, num);
@@ -438,11 +454,17 @@ export default {
               }
             } else {
               num = parseFloat(this.questionForm[o.TableQuestionId]);
+              if (this.questionForm[o.TableQuestionId] === 'NE') {
+                isNE = true
+              }
               if (!isNaN(num)) {
                 dataArr.push(num)
               }
             }
           } else {
+            if (this.questionForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             switch (rules.CustomCalculateMark) {
               case 1:
                 num += parseFloat(this.questionForm[o.TableQuestionId]);
@@ -495,6 +517,9 @@ export default {
       } catch (e) {
         console.log(e);
       }
+      if (isNE) {
+        num = 'NE'
+      }
       return num;
     },
     formItemNumberChange(questionId, isTable) {
@@ -538,7 +563,11 @@ export default {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions);
           var num,
             arr = [];
+          let isNE = false
           CalculateQuestions.forEach((o, i) => {
+            if (this.QuestionsForm[o.TableQuestionId] === 'NE') {
+              isNE = true
+            }
             if (i === 0) {
               num = parseFloat(this.QuestionsForm[o.TableQuestionId]);
               arr = [num];
@@ -577,6 +606,9 @@ export default {
               }
             }
           });
+          if (isNE) {
+            num = 'NE'
+          }
           this.$set(this.QuestionsForm, v.Id, num.toString());
         }
       });