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

src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue

@@ -96,7 +96,7 @@
 
                         </div>
                       </div>
-                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;">
+                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False' && readingTaskState < 2" style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
                         <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '4' && ((item.LesionType === 0 && [0,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0))" class="item" :content="$t('trials:reading:button:split')" placement="bottom">
                           <i class="iconfont icon-24gl-split" style="color:#fff;font-size: 16px;" @click.stop="handleSplit(item.TableQuestions.Answers[i].RowId,item.Id)" />

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

@@ -5,56 +5,9 @@
       ref="conclusionsForm"
       v-loading="loading"
       :model="form"
-      label-width="100px"
+      label-position="left"
-      style="width:500px"
+      label-width="800px"
     >
-
-      <el-form-item style="text-align:right;width: 500px;">
-        <!-- <el-button
-          v-if="userTypeEnumInt===14 && auditState !== 2"
-          type="primary"
-          size="small"
-          :disabled="isSendMessage"
-          @click="handleSave(true)"
-        >
-          {{ form.IsHaveQuestion?$t('trials:medicalFeedback:button:saveAndSend'):$t('common:button:save') }}
-        </el-button> -->
-        <!-- <el-button
-          v-if="form.IsHaveQuestion === true && isSendMessage && userTypeEnumInt===14"
-          type="primary"
-          size="small"
-          @click="handleReply"
-        >
-          {{ isClosedDialog?$t('trials:medicalFeedback:button:viewQuestions'):$t('trials:medicalFeedback:button:reply') }}
-        </el-button>
-
-        <el-button
-          v-if="form.IsHaveQuestion === true && isSendMessage && userTypeEnumInt===13"
-          type="primary"
-          size="small"
-          @click="handleReply"
-        >
-          {{ isClosedDialog?$t('trials:medicalFeedback:button:viewQuestions'):$t('trials:medicalFeedback:button:reply') }}
-        </el-button> -->
-        <!-- 查看质询 -->
-        <!-- <el-button
-          v-if="form.IsHaveQuestion === true && isSendMessage && userTypeEnumInt!==13 && userTypeEnumInt!==14"
-          type="primary"
-          size="small"
-          @click="handleReply"
-        >
-          {{ $t('trials:medicalFeedback:button:viewQuestions') }}
-        </el-button> -->
-        <!-- 关闭 -->
-        <!-- <el-button
-          v-if="userTypeEnumInt===14 && form.IsHaveQuestion === true && !isClosedDialog && isSendMessage "
-          type="primary"
-          size="small"
-          @click="handleCloseReply"
-        >
-          {{ $t('trials:medicalFeedback:button:close') }}
-        </el-button> -->
-      </el-form-item>
       <!-- 是否有问题 -->
       <el-form-item
         :label="$t('trials:medicalFeedback:button:isQuestions')"
@@ -66,6 +19,7 @@
         <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"
@@ -92,6 +46,7 @@
           v-model="form.Questioning"
           type="textarea"
           :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          style="max-width:200px"
         />
       </el-form-item>
       <!-- 审核建议 -->
@@ -106,6 +61,7 @@
         <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"

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

@@ -5,17 +5,9 @@
       ref="questions"
       size="small"
       :model="questionForm"
+      label-position="left"
+      label-width="800px"
     >
-      <el-form-item v-if="auditState!==2 && userTypeEnumInt===14" style="text-align:right;width: 500px;">
-        <!-- 保存 -->
-        <!-- <el-button
-          type="primary"
-          size="small"
-          @click="handleSave(true)"
-        >
-          {{ $t('common:button:save') }}
-        </el-button> -->
-      </el-form-item>
       <FormItem
         v-for="question of questions"
         :key="question.Id"

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

@@ -362,6 +362,7 @@ export default {
       }
     },
     handleSave(isPrompt) {
+      return new Promise((resolve, reject) => {
         this.loading = true
         // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
         var isDiffer = this.checkDifferResult()
@@ -369,15 +370,19 @@ export default {
           this.loading = false
           // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1'
           // '肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！'
+          // this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
+          //   type: 'warning',
+          //   distinguishCancelAndClose: true,
+          //   showCancelButton: false
+          // }).then(_ => {})
+          //   .catch(_ => {
+          //   })
           this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
             type: 'warning',
-          distinguishCancelAndClose: true
+            showCancelButton: false
           })
             .then(() => {
-            return Promise.reject(false)
+              reject(false)
-          })
-          .catch(action => {
-            return Promise.reject(false)
             })
         } else {
           this.loading = true
@@ -399,7 +404,7 @@ export default {
             globalTaskId: this.oncologyInfo.GlobalTaskId,
             relatedTaskId: this.oncologyInfo.RelatedTaskId
           }
-        return new Promise((resolve, reject) => {
+
           setOncologyReadingInfo(params).then(res => {
             this.loading = false
             this.getList()
@@ -411,8 +416,8 @@ export default {
             this.loading = false
             reject(false)
           })
-        })
         }
+      })
     },
     checkDifferResult() {
       var isDiffer = false
@@ -424,7 +429,11 @@ 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
-            if (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult) {
+            console.log(tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult)
+            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
             }