src/components/clinicalDataQuestions/components/QuestionFormItem.vue

@@ -22,13 +22,7 @@
       </div>
       <el-table :data="questionForm[question.Id]">
         <el-table-column v-for="item of question.TableQuestions" :key="item.Id" :prop="item.Id"
-          :label="item.QuestionName" min-width="100" show-overflow-tooltip>
+          :label="item.QuestionName" min-width="100" show-overflow-tooltip />
-          <template slot-scope="scope">
-            {{ scope.row[item.Id] && Array.isArray(scope.row[item.Id]) ?
-              scope.row[item.Id].join(" | ")
-              : scope.row[item.Id] }}
-          </template>
-        </el-table-column>
         <el-table-column :label="$t('common:action:action')" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" size="mini" @click="openAddTableCol(question, scope.$index)">

src/components/clinicalDataQuestions/components/QuestionsForm.vue

@@ -1,30 +1,52 @@
 <template>
   <div v-loading="loading" style="min-height: 500px;">
-    <el-form v-if="isRender" data-viewport-uid="lc" ref="questions" size="small" :model="questionForm"
+    <el-form
-      :disabled="openType === 'look'">
+      v-if="isRender"
+      data-viewport-uid="lc"
+      ref="questions"
+      size="small"
+      :model="questionForm"
+      :disabled="openType === 'look'"
+    >
       <template>
-        <QuestionFormItem class="father" v-for="question of questions" :key="question.Id" :question="question"
+        <QuestionFormItem
-          :question-form="questionForm" :trial-clinical-id="trialClinicalId" @resetFormItemData="resetFormItemData"
+          class="father"
-          @setFormItemData="setFormItemData" />
+          v-for="question of questions"
+          :key="question.Id"
+          :question="question"
+          :question-form="questionForm"
+          :trial-clinical-id="trialClinicalId"
+          @resetFormItemData="resetFormItemData"
+          @setFormItemData="setFormItemData"
+        />
       </template>
     </el-form>
-    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [2, 3].includes(clinicalDataLevel)"
+    <div class="base-dialog-footer" v-if="!isViewer && openType !== 'look' && [2, 3].includes(clinicalDataLevel)" style="text-align:right;margin-top:10px;">
-      style="text-align:right;margin-top:10px;">
+        <!-- 取消 -->
-      <!-- 取消 -->
+        <el-button
-      <el-button size="small" type="primary" @click="close"
+          size="small"
-        v-show="$route.path !== '/trials/trials-panel/visit/crc-upload' && $route.path !== '/trials/trials-panel/visit/crc-question'">
+          type="primary"
-        {{ $t('common:button:cancel') }}
+          @click="close"
-      </el-button>
+          v-show="$route.path !== '/trials/trials-panel/visit/crc-upload'&&$route.path!=='/trials/trials-panel/visit/crc-question'"
-      <!-- 保存 -->
+        >
-      <el-button size="small" type="primary" @click="submitClinicalForm">
+          {{ $t('common:button:cancel') }}
-        {{ $t('common:button:save') }}
+        </el-button>
-      </el-button>
+        <!-- 保存 -->
+        <el-button size="small" type="primary" @click="submitClinicalForm">
+          {{ $t('common:button:save') }}
+        </el-button>
     </div>
-    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px" append-to-body
+    <el-dialog
-      custom-class="base-dialog-wrapper">
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
       <div slot="title">
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
@@ -84,7 +106,7 @@ export default {
     },
     data: {
       type: Object,
-      default: () => { }
+      default: () => {}
     },
     trialClinicalId: {
       type: String,
@@ -144,7 +166,7 @@ export default {
         let item = this.questionForm[v]
         if (item instanceof Array) {
           let TableQuestionAnswers = item.map(o => {
-            if (o instanceof Object) {
+            if  (o instanceof Object) {
               return Object.keys(o).map(x => {
                 return {
                   TableQuestionId: x,
@@ -229,7 +251,7 @@ export default {
             if (item instanceof Array) {
               let isCheckBox = false
               let TableQuestionAnswers = item.map(o => {
-                if (o instanceof Object) {
+                if  (o instanceof Object) {
                   return Object.keys(o).map(x => {
                     return {
                       TableQuestionId: x,
@@ -365,12 +387,12 @@ export default {
         }
         if (i.ClinicalQuestionType === 'table') {
           this.$set(this.questionForm, i.Id, i.TableAnswer)
-        } else if (i.ClinicalQuestionType === 'checkbox') {
+        }  else if (i.ClinicalQuestionType === 'checkbox') {
           this.$set(this.questionForm, i.Id, i.Answer ? i.Answer.split(',') : [])
           console.log(i.Answer ? i.Answer.split(',') : [])
           console.log(this.questionForm)
-        } else if (i.ClinicalQuestionType === 'number') {
+        }  else if (i.ClinicalQuestionType === 'number') {
-          this.$set(this.questionForm, i.Id, i.Answer || i.DefaultValue)
+          this.$set(this.questionForm, i.Id, i.Answer)
         } else if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
         }
@@ -383,7 +405,7 @@ export default {
         this.questionForm[v] = 0
       } else if (qs.ClinicalQuestionType === 'checkbox') {
         this.questionForm[v] = []
-      } else {
+      } else{
         this.questionForm[v] = ''
       }
     },
@@ -404,26 +426,23 @@ export default {
 </script>
 <style lang="scss" scoped>
 ::-webkit-scrollbar {
-  width: 7px;
+    width: 7px;
-  height: 7px;
+    height: 7px;
-}
+  }
-
+  ::-webkit-scrollbar-thumb {
-::-webkit-scrollbar-thumb {
+    border-radius: 10px;
-  border-radius: 10px;
+    background: #d0d0d0;
-  background: #d0d0d0;
+  }
-}
+.tabContent{
-
+  height:300px;
-.tabContent {
-  height: 300px;
   overflow-y: auto;
 
 }
-
+.father:after{
-.father:after {
   content: "";
   display: block;
   height: 0;
-  clear: both;
+  clear:both;
   visibility: hidden;
 }
 </style>

src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionForm.vue

@@ -14,11 +14,6 @@
       <el-form-item :label="$t('trials:readingUnit:qsList:title:qNameEn')" prop="QuestionEnName">
         <el-input v-model="form.QuestionEnName" />
       </el-form-item>
-      <!--默认值-->
-      <el-form-item :label="$t('trials:readingUnit:qsList:title:defaultValue')" prop="DefaultValue"
-        v-if="form.ClinicalQuestionType === 'number'">
-        <el-input v-model="form.DefaultValue" />
-      </el-form-item>
       <el-form-item
         v-if="form.ClinicalQuestionType === 'select' || form.ClinicalQuestionType === 'radio' || form.ClinicalQuestionType === 'checkbox'"
         :label="$t('trials:qcCfg:table:typeValue')" prop="TypeValue">
@@ -279,8 +274,7 @@ export default {
         GroupId: null,
         CustomCalculateMark: -1,
         RelevanceId: '',
-        RelevanceValue: '',
+        RelevanceValue: ''
-        DefaultValue: ''
       },
       rules: {
         ClinicalQuestionType: [
@@ -332,8 +326,8 @@ export default {
   watch: {
     data: {
       handler() {
-        if (this.data.CustomCalculateMark) {
+        if (this.data.ClinicalQuestionType) {
-          this.getClinicalCalculateQuestions(this.data.CustomCalculateMark)
+          this.getClinicalCalculateQuestions(this.data.ClinicalQuestionType)
         }
       },
       deep: true,
@@ -341,10 +335,10 @@ export default {
     }
   },
   methods: {
-    getClinicalCalculateQuestions(CustomCalculateMark = null) {
+    getClinicalCalculateQuestions(type = null) {
       getClinicalCalculateQuestions({
         TrialClinicalId: this.clinicalId,
-        ClinicalQuestionType: [1, 2, 3, 4].includes(CustomCalculateMark) ? 'number' : 'time'
+        ClinicalQuestionType: type || 'time'
       }).then(res => {
         this.Questions = res.Result
       })
@@ -362,7 +356,6 @@ export default {
     CustomCalculateMarkChange() {
       this.isShow = false
       console.log(this.form.CustomCalculateMark)
-      this.getClinicalCalculateQuestions(this.form.CustomCalculateMark)
       if (this.form.CustomCalculateMark < 0) {
         this.form.CalculateQuestions = []
         return
@@ -539,7 +532,7 @@ export default {
       } else {
         data.LesionType = null
       }
-      // this.getClinicalCalculateQuestions(val)
+      this.getClinicalCalculateQuestions(val)
       data.TypeValue = ''
       data.ValueType = ''
       data.Unit = ''

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -715,16 +715,10 @@ export default {
   },
   methods: {
     selectableStudyName(row) {
-      let select = this.trialStudyNameList.filter((item) => item.IsChoose)
+      return !this.form.StudyUseStudyNameList.includes(row.Name) || !this.form.StudyUseStudyNameList.includes(row.EnName)
-      return (!this.form.StudyUseStudyNameList.includes(row.Name) && !this.form.StudyUseStudyNameList.includes(row.EnName)) || (!select.includes(row) && (this.form.StudyUseStudyNameList.includes(row.EnName) || this.form.StudyUseStudyNameList.includes(row.Name)))
     },
     selectableModality(row) {
-      var a = this.$d.Modality.filter((v) => {
+      return !this.form.StudyUseModalityList.includes(row.value)
-        return !!this.form.ModalityList.find((v1) => {
-          return v1 === v.value
-        })
-      })
-      return !this.form.StudyUseModalityList.includes(row.value) || (!a.includes(row) && this.form.StudyUseModalityList.includes(row.value))
     },
     selectableBodyPart(row) {
       return !row.IsStudyUse