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

@@ -93,7 +93,7 @@
                 <span>{{ $fd('YesOrNo', scope.row.IsHaveChange ) }}</span>
                 <!-- 查看详情 -->
                 <el-button
-                  v-if="scope.row.IsHaveChange && oncologyInfo.GlobalTaskId"
+                  v-if="scope.row.IsHaveChange && !!oncologyInfo.GlobalTaskId"
                   type="text"
                   style="margin-left:5px;"
                   @click="handleViewDetail(oncologyInfo.GlobalTaskId)"
@@ -125,10 +125,10 @@
               show-overflow-tooltip
               width="150"
             >
-              <template slot="header">
+              <template slot="header" slot-scope="scope">
                 <div>
-                  <span>{{ $t('trials:oncologyReview:title:findings') }}</span>
+                    <span>{{ $t('trials:oncologyReview:title:findings') }}</span>
-                  <span style="color:red">*</span>
+                    <span style="color:red">*</span>
                 </div>
               </template>
               <template slot-scope="scope">
@@ -139,7 +139,6 @@
                 >
                   <el-option
                     v-for="item in assessTypeList"
-                    v-show="item.Code !== '-1'"
                     :key="item.Id"
                     :label="item.Value"
                     :value="item.Code"
@@ -363,12 +362,11 @@ export default {
     },
     handleSave(isPrompt) {
       this.loading = true
-      // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
+      var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
-      var isDiffer = this.checkDifferResult()
+      if (index > -1) {
-      if (isDiffer) {
         this.loading = false
-        // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1'
+        // '肿瘤学阅片结论不能为空！'
-        this.$confirm('肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！', {
+        this.$confirm(this.$t('trials:oncologyReview:message:msg1'), {
           type: 'warning',
           distinguishCancelAndClose: true
         })
@@ -396,7 +394,7 @@ export default {
           oncologyTaskId: this.visitTaskId,
           oncologyQuestionList: oncologyQuestionList,
           globalTaskId: this.oncologyInfo.GlobalTaskId,
-          relatedTaskId: this.oncologyInfo.RelatedTaskId
+          relatedTaskId:this.oncologyInfo.RelatedTaskId
         }
         return new Promise((resolve, reject) => {
           setOncologyReadingInfo(params).then(res => {
@@ -413,25 +411,6 @@ export default {
         })
       }
     },
-    checkDifferResult() {
-      var isDiffer = false
-      var criterionType = parseInt(this.$route.query.criterionType)
-      if (criterionType === 2) {
-        for (let i = 0; i < this.oncologyInfo.OncologyVisits.length; i++) {
-          if (this.oncologyInfo.OncologyVisits[i].IsBaseLine) continue
-          var tumorAssessment = ''
-          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) {
-              isDiffer = true
-              break
-            }
-          }
-        }
-      }
-      return isDiffer
-    },
     handleSubmit() {
       this.$refs['adForm'].validate((valid) => {
         if (!valid) return