Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web

src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue

@@ -19,7 +19,6 @@
         <el-radio-group
           v-model="form.IsHaveQuestion"
           :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
-          style="max-width:200px"
         >
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -46,7 +45,6 @@
           v-model="form.Questioning"
           type="textarea"
           :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
-          style="max-width:200px"
         />
       </el-form-item>
       <!-- 审核建议 -->
@@ -61,7 +59,6 @@
         <el-radio-group
           v-model="form.AuditAdviceEnum"
           :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
-          style="max-width:200px"
         >
           <el-radio
             v-for="item of $d.AuditAdvice"
@@ -88,6 +85,7 @@
           :file-list="fileList"
 
           :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          style="width:300px"
         >
           <i slot="default" class="el-icon-plus" />
           <div slot="file" slot-scope="{file}">
@@ -388,14 +386,22 @@ export default {
   .disabled{
     /deep/ .el-upload--picture-card {
       display: none;
+      
     }
   }
   /deep/  .el-upload-list__item {
     transition: none !important;
+    width:140px;
+    height: 140px;
+    margin: 0 10px 5px 0;
   }
   /deep/  .el-upload-list__item-thumbnail {
       /* 图片在方框内显示长边 */
       object-fit: scale-down !important;
   }
+  .el-radio-group,.el-textarea,.el-input,.el-select{
+    width:300px;
+  }
+
 }
 </style>

src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue

@@ -0,0 +1,139 @@
+<template>
+  <div>
+    <div
+      v-if="!!question.GroupName && (questionForm[question.ParentId] === question.ParentTriggerValue) || question.ParentId===''||question.ParentId===null"
+      style="font-weight: bold;font-size: 16px;margin: 5px 0px;"
+    >
+      {{ question.GroupName }}
+    </div>
+    <el-form-item
+      v-if="(questionForm[question.ParentId] === question.ParentTriggerValue) || question.ParentId===''||question.ParentId===null"
+      :label="`${question.QuestionName}`"
+      :prop="question.Id"
+      :rules="[
+        { required: question.IsRequired && question.Type!=='group' && question.Type!=='summary',
+          message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+      ]"
+      :class="[question.Type==='group'?'mb':'']"
+    >
+
+      <!-- 输入框 -->
+      <el-input
+        v-if="question.Type==='input'"
+        v-model="questionForm[question.Id]"
+        :disabled="auditState >= 2"
+      />
+      <!-- 多行文本输入框 -->
+      <el-input
+        v-if="question.Type==='textarea'"
+        v-model="questionForm[question.Id]"
+        type="textarea"
+        :autosize="{ minRows: 2, maxRows: 4}"
+        :disabled="auditState >= 2"
+      />
+      <!-- 下拉框 -->
+      <el-select
+        v-if="question.Type==='select'"
+        v-model="questionForm[question.Id]"
+        :disabled="auditState >= 2"
+        clearable
+        @change="((val)=>{formItemChange(val, question)})"
+      >
+        <el-option
+          v-for="val in question.TypeValue.split('|')"
+          :key="val"
+          :label="val"
+          :value="val"
+        />
+      </el-select>
+      <!-- 单选 -->
+      <el-radio-group
+        v-if="question.Type==='radio'"
+        v-model="questionForm[question.Id]"
+        :disabled="auditState >= 2"
+        @change="((val)=>{formItemChange(val, question)})"
+      >
+        <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">{{ val }}</el-radio>
+      </el-radio-group>
+      <!-- 复选框 -->
+      <el-checkbox-group
+        v-if="question.Type==='checkbox'"
+        v-model="questionForm[question.Id]"
+        :disabled="auditState >= 2"
+      >
+        <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">{{ val }}</el-checkbox>
+      </el-checkbox-group>
+    </el-form-item>
+
+    <FormItem
+      v-for="(item) in question.Childrens"
+      :key="item.Id"
+      :question="item"
+      :audit-state="auditState"
+      :question-form="questionForm"
+      @resetFormItemData="resetFormItemData"
+    />
+  </div>
+</template>
+<script>
+export default {
+  name: 'FormItem',
+  props: {
+    questionForm: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    question: {
+      type: Object,
+      default() {
+        return []
+      }
+    },
+    auditState: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+
+    }
+  },
+  watch: {
+    questionForm: {
+      deep: true,
+      immediate: true,
+      handler(v) {
+        // console.log(v)
+      }
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    formItemChange(v, question) {
+      if (question.Childrens.length > 0) {
+        this.resetChild(question.Childrens)
+      }
+    },
+    resetChild(obj) {
+      obj.forEach(i => {
+        this.$emit('resetFormItemData', i.Id)
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.resetChild(i.Childrens)
+        }
+      })
+    },
+    resetFormItemData(v) {
+      this.$emit('resetFormItemData', v)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.mb{
+  margin-bottom: 0px;
+}
+</style>

src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue

@@ -1,5 +1,5 @@
 <template>
-  <div v-loading="loading">
+  <div v-loading="loading" class="issues-form">
     <el-form
       v-if="isRender"
       ref="questions"
@@ -23,7 +23,7 @@
 </template>
 <script>
 import { saveMedicineQuestion } from '@/api/trials'
-import FormItem from '@/views/trials/trials-panel/setting/medical-audit/components/FormItem'
+import FormItem from './FormItem'
 export default {
   name: 'QuestionTpl',
   components: {
@@ -151,3 +151,20 @@ export default {
   }
 }
 </script>
+<style lang="scss" scoped>
+.issues-form{
+  /deep/.el-radio-group{
+    width:300px;
+  }
+  /deep/.el-textarea{
+    width:300px;
+  }
+  /deep/.el-input{
+    width:300px;
+  }
+  /deep/.el-select{
+    width:300px;
+  }
+
+}
+</style>

src/views/trials/trials-panel/reading/oncology-review/index.vue

@@ -429,11 +429,7 @@ export default {
           var idx = this.oncologyInfo.OncologyVisits[i].QuestionList.findIndex(v => v.DictionaryCode === 'ImagingOverallAssessment_Lugano')
           if (idx > -1) {
             tumorAssessment = this.oncologyInfo.OncologyVisits[i].QuestionList[idx].Answer
-            console.log(tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult)
+            if (!(this.oncologyInfo.OncologyVisits[i].EvaluationResult !== '' && (tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult || (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult && this.oncologyInfo.OncologyVisits[i].EvaluationReason)))) {
-            if (tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult || (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult && this.oncologyInfo.OncologyVisits[i].EvaluationReason)) {
-              isDiffer = false
-              break
-            } else {
               isDiffer = true
               break
             }