src/views/trials/trials-panel/reading/global-review/components/CustomizeTable.vue

@@ -317,9 +317,8 @@ export default {
     },
     handleSave(isPrompt = true) {
       return new Promise(async (resolve, reject) => {
-        try {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          let valid = await this.$refs['globalRuleForm'].validate()
+        if (valid) {
-          if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -348,23 +347,22 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            await batchSubmitGlobalReadingInfo(params)
+            try {
-            this.loading = false
+              await batchSubmitGlobalReadingInfo(params)
-            if (isPrompt) {
+              this.loading = false
-              console.log(isPrompt)
+              if (isPrompt) {
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+                console.log(isPrompt)
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              this.$emit('getGlInfo')
+              resolve()
+            } catch (e) {
+              this.loading = false
+              reject()
             }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
           } else {
-            reject(false)
+            reject()
           }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        }
         
       })
     },

src/views/trials/trials-panel/reading/global-review/components/IRecistTable.vue

@@ -373,9 +373,9 @@ export default {
     },
     handleSave(isPrompt = true) {
       return new Promise(async (resolve, reject) => {
-        try {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          let valid = await this.$refs['globalRuleForm'].validate()
+
-          if (valid) {
+        if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -404,24 +404,22 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            await batchSubmitGlobalReadingInfo(params)
+            try {
-            this.loading = false
+              await batchSubmitGlobalReadingInfo(params)
-            if (isPrompt) {
+              this.loading = false
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              if (isPrompt) {
+                console.log(isPrompt)
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              this.$emit('getGlInfo')
+              resolve()
+            } catch (e) {
+              this.loading = false
+              reject()
             }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
           } else {
-            resolve(false)
+            reject()
           }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        } 
-        
-        
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue

@@ -377,9 +377,8 @@ export default {
     },
     handleSave(isPrompt = true) {
       return new Promise(async (resolve, reject) => {
-        try {
+        let valid  = await this.$refs['globalRuleForm'].validate()
-          let valid = await this.$refs['globalRuleForm'].validate()
+        if (valid) {
-          if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -408,23 +407,22 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            await batchSubmitGlobalReadingInfo(params)
+            try {
-            this.loading = false
+              await batchSubmitGlobalReadingInfo(params)
-            if (isPrompt) {
+              this.loading = false
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              if (isPrompt) {
+                console.log(isPrompt)
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              this.$emit('getGlInfo')
+              resolve()
+            } catch (e) {
+              this.loading = false
+              reject()
             }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
           } else {
-            resolve(false)
+            reject()
           }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        } 
-        
         
       })
     },

src/views/trials/trials-panel/reading/global-review/components/MRecistTable.vue

@@ -1,481 +0,0 @@
-<template>
-  <el-form v-if="globalForm.taskList.length > 0" ref="globalRuleForm" :model="globalForm" class="global-form">
-    <el-table
-      v-loading="loading"
-      :data="globalForm.taskList"
-    >
-      <!-- 访视名称 -->
-      <el-table-column
-        prop="BlindName"
-        :label="$t('trials:globalReview:table:visitName')"
-        show-overflow-tooltip
-        width="150"
-      />
-      <!-- 评估结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:evaluationRes')"
-        align="center"
-        prop=""
-      >
-        <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.evaluationQsList"
-            :key="index"
-            prop=""
-            :label="qs"
-            show-overflow-tooltip
-            width="150"
-          >
-            <!-- <template slot-scope="scope">
-              <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
-                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
-                </span>
-                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
-              </div>
-            </template> -->
-            <template slot-scope="scope">
-              <template v-if="(scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===1 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===5)) || (!scope.row.IsBaseLine && (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===2 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===6)) || (scope.row.BeforeQuestionList[index].GlobalReadingShowType ===0 || scope.row.BeforeQuestionList[index].GlobalReadingShowType ===4)">
-                <div v-if="scope.row.BeforeQuestionList.length>index && scope.row.BeforeQuestionList[index].Answer" :style="{color: scope.row.BeforeQuestionList[index].IsGlobalAnswer ? '#f66' : null}">
-                <span v-if="scope.row.BeforeQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.BeforeQuestionList[index].DictionaryCode,parseInt(scope.row.BeforeQuestionList[index].Answer)) }}
-                </span>
-                <span v-else>{{ scope.row.BeforeQuestionList[index].Answer }}</span>
-              </div>
-              </template>
-              
-            </template>
-          </el-table-column>
-        </template>
-      </el-table-column>
-      <!-- 是否同意访视结果 -->
-      <el-table-column
-        prop=""
-        :label="$t('trials:globalReview:table:isAgreeEvaluationRes')"
-        show-overflow-tooltip
-        width="170"
-      >
-        <template slot-scope="scope">
-          <el-form-item
-            v-if="readingTaskState<2"
-            :prop="`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`"
-            label=""
-            :rules="[
-              { required: true,message: $t('common:ruleMessage:select'), trigger: ['change','blur']},
-            ]"
-            class="form-item"
-          >
-            <el-radio-group
-              v-model="globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]"
-              @change="handleAgreeOrNotChange(scope.$index,scope.row.AgreeOrNot[0].GlobalAnswerType)"
-            >
-              <el-radio
-                v-for="item of $d.ReadingYesOrNo"
-                :key="'AgreeOrNot' + item.value"
-                :label="String(item.value)"
-              >
-                {{ item.label }}
-              </el-radio>
-            </el-radio-group>
-          </el-form-item>
-
-          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 1" type="primary">
-            {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}
-          </el-tag>
-          <el-tag v-else-if="scope.row.AgreeOrNot.length > 0 && parseInt(scope.row.AgreeOrNot[0].Answer) === 0" type="danger"> {{ $fd('ReadingYesOrNo',parseInt(scope.row.AgreeOrNot[0].Answer)) }}</el-tag>
-          <span v-else />
-        </template>
-      </el-table-column>
-
-      <!-- 调整后结果 -->
-      <el-table-column
-        :label="$t('trials:globalReview:table:adjustedRes')"
-        align="center"
-        prop=""
-      >
-        <template>
-          <el-table-column
-            v-for="(qs,index) in globalInfo.adjustedQsList"
-            v-if="qs.isShow"
-            :key="index"
-            prop=""
-            :label="qs.questionName"
-            show-overflow-tooltip
-            :min-width="index === 3 ? '200' : '200'"
-          >
-            <template slot-scope="scope">
-              <div v-if="readingTaskState<2 && (scope.row.AfterQuestionList[index].GlobalReadingShowType === 0 || (scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 1) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].GlobalReadingShowType === 2))">
-                <!-- <span v-if="(scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 2) || (!scope.row.IsBaseLine && scope.row.AfterQuestionList[index].LimitEdit === 1)">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode, parseInt(scope.row.AfterQuestionList[index].VisitAnswer)) }}
-                </span> -->
-                <el-form-item
-                  style="margin-bottom: 0;"
-                  :prop="`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:scope.row.AfterQuestionList[index].GlobalAnswerType}`"
-                  label=""
-                  :rules="[
-                    { required:parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0,message: $t('common:ruleMessage:specify'), trigger: ['change','blur']},
-                  ]"
-                >
-                  <label v-if="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) === 0" />
-                  <!-- 裁判问题 -->
-                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 0 ">
-                    <el-tooltip v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])" class="item" effect="dark" :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`], scope.row.AfterQuestionList[index])" placement="top-start">
-                      <el-select
-                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                        style="width:90%;"
-                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                      >
-                        <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                          <el-option
-                            v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                            :key="val"
-                            :label="val"
-                            :value="val"
-                          />
-                        </template>
-                        <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
-                        </template>
-                        <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                            :label="item.label"
-                          />
-                        </template>
-                      </el-select>
-                    </el-tooltip>
-                    <el-select
-                      v-else
-                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                      style="width:90%;"
-                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                    >
-                      <template v-if="scope.row.AfterQuestionList[index].TypeValue">
-                        <el-option
-                          v-for="val in scope.row.AfterQuestionList[index].TypeValue.split('|')"
-                          :key="val"
-                          :label="val"
-                          :value="val"
-                        />
-                      </template>
-                      <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode && scope.row.AfterQuestionList[index].QuestionType === 13">
-                        <template v-if="getLesionCount(scope.row.LesionCountList,0)">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1 && item.value !== 1 && item.value !== 3"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
-                        </template>
-                        <template v-else-if="getLesionCount(scope.row.LesionCountList,1)">
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value!==-1 && item.value !== 1 && item.value !== 6"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
-                        </template>
-                        <template v-else>
-                          <el-option
-                            v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                            v-show="item.value === 1 || item.value === 2 || item.value === 4"
-                            :key="item.id"
-                            :value="String(item.value)"
-                            :label="item.label"
-                            :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          />
-                        </template>
-
-                      </template>
-                      <template v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                        <el-option
-                          v-for="item of $d[scope.row.AfterQuestionList[index].DictionaryCode]"
-                          v-show="item.value !== 6"
-                          :key="item.id"
-                          :value="String(item.value)"
-                          :disabled="String(getBeforeAnswer(scope.row.AfterQuestionList[index].QuestionName,scope.row)) === String(item.value)"
-                          :label="item.label"
-                        />
-                      </template>
-                    </el-select>
-                  </template>
-                  <!-- 评估更新类型 GlobalAnswerType:3 -->
-                  <template v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
-                    <el-tooltip v-if="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)" class="item" effect="dark" :content="getText(globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`], scope.row.AfterQuestionList[index], scope.row.AfterQuestionList[index].GlobalAnswerType)" placement="top-start">
-                      <el-select
-                        v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
-                        style="width:90%;"
-                        :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                      >
-                        <el-option
-                          v-for="val in globalInfo.assessTypeList"
-                          v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
-                          :key="val.Code"
-                          :label="language === 'en'?val.Value:val.ValueCN"
-                          :value="val.Code"
-                        />
-                      </el-select>
-                    </el-tooltip>
-                    <el-select
-                      v-else
-                      v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].GlobalAnswerType}`]"
-                      style="width:90%;"
-                      :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                    >
-                      <el-option
-                        v-for="val in globalInfo.assessTypeList"
-                        v-show="(scope.row.IsBaseLine && val.IsBaseLineUse) || (!scope.row.IsBaseLine && val.IsFollowVisitUse)"
-                        :key="val.Code"
-                        :label="language === 'en'?val.Value:val.ValueCN"
-                        :value="val.Code"
-                      />
-                    </el-select>
-                  </template>
-                  <el-input
-                    v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 1"
-                    v-model="globalForm[`${scope.$index}${scope.row.AfterQuestionList[index].QuestionId?scope.row.AfterQuestionList[index].QuestionId:String(scope.row.AfterQuestionList[index].GlobalAnswerType)}`]"
-                    type="textarea"
-                    maxlength="100"
-                    show-word-limit
-                    style="width:90%;"
-                    :autosize="{ minRows: 2 }"
-                    :disabled="parseInt(globalForm[`${scope.$index}${scope.row.AgreeOrNot[0].GlobalAnswerType}`]) !== 0"
-                  />
-                </el-form-item>
-              </div>
-              <div v-else>
-
-                <span v-if="scope.row.AfterQuestionList[index].GlobalAnswerType === 3">
-                  {{ getAssessType(scope.row.AfterQuestionList[index].Answer) }}
-                </span>
-                <span v-else-if="scope.row.AfterQuestionList[index].DictionaryCode">
-                  {{ $fd(scope.row.AfterQuestionList[index].DictionaryCode,parseInt(scope.row.AfterQuestionList[index].Answer)) }}
-                </span>
-                <span v-else>{{ scope.row.AfterQuestionList[index].Answer }}</span>
-              </div>
-            </template>
-          </el-table-column>
-        </template>
-      </el-table-column>
-      <el-table-column
-        :label="$t('common:action:action')"
-        width="100"
-      >
-        <template slot-scope="scope">
-          <el-button
-            circle
-            :title="$t('trials:globalReview:table:view')"
-            icon="el-icon-view"
-            @click="handleView(scope.row)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-  </el-form>
-</template>
-
-<script>
-import { getToken } from '@/utils/auth'
-import { batchSubmitGlobalReadingInfo } from '@/api/trials'
-import { mapGetters } from 'vuex'
-export default {
-  props: {
-    globalInfo: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    globalForm: {
-      type: Object,
-      default() {
-        return {}
-      }
-    },
-    readingTaskState: {
-      type: Number,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      assessTypes: []
-    }
-  },
-  computed: {
-    ...mapGetters(['language'])
-  },
-  mounted() {
-    this.assessTypes = this.globalInfo.assessTypeList.filter(i => i.IsBaseLineUse === this.isBaseline)
-  },
-  methods: {
-    getText(val, row, type) {
-      if (type === 3) {
-        var o = this.globalInfo.assessTypeList.find(v => {
-          return parseInt(v.Code) === parseInt(val)
-        })
-        if (!o) {
-          return ''
-        }
-        return this.language === 'en' ? o.Value : o.ValueCN
-      } else if (row.TypeValue) {
-        return val
-      } else if (row.DictionaryCode) {
-        return this.$fd(row.DictionaryCode, parseInt(val))
-      }
-    },
-
-    handleView(row) {
-      var token = getToken()
-      var visitTaskId = row.VisitTaskId
-      var criterionType = this.$router.currentRoute.query.criterionType
-      var readingTool = this.$router.currentRoute.query.readingTool
-      readingTool = isNaN(parseInt(readingTool)) ? null : parseInt(readingTool)
-      var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
-      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
-      var path = ''
-      if (readingTool === 0) {
-        path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
-      } else {
-        path = `/noneDicomReading?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${this.globalInfo.trialId}&subjectCode=${this.globalInfo.subjectCode}&subjectId=${this.globalInfo.subjectId}&visitTaskId=${visitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
-      }
-      const routeData = this.$router.resolve({ path })
-      var newWindow = window.open(routeData.href, '_blank')
-      this.$emit('setOpenWindow', newWindow)
-    },
-    getLesionCount(lesionList, lesionType) {
-      const lesion = lesionList.find(i => i.LesionType === lesionType)
-      return lesion ? lesion.Count : 0
-    },
-    handleSave(isPrompt = true) {
-      return new Promise(async (resolve, reject) => {
-        try {
-          let valid = await this.$refs['globalRuleForm'].validate()
-          if (valid) {
-            this.loading = true
-            var visitTaskAnswerList = []
-            this.globalForm.taskList.forEach((item, index) => {
-              var answerList = []
-              item.AfterQuestionList.map(i => {
-                var obj = {}
-                if (i.QuestionId) {
-                  obj.questionId = i.QuestionId
-                  obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.QuestionId}`]
-                } else {
-                  obj.questionId = ''
-                  obj.globalAnswerType = i.GlobalAnswerType
-                  obj.answer = this.globalForm[ `${index}${i.GlobalAnswerType}`]
-                }
-                answerList.push(obj)
-              })
-              answerList.push({ questionId: '', globalAnswerType: item.AgreeOrNot[0].GlobalAnswerType,
-                answer: this.globalForm[ `${index}${item.AgreeOrNot[0].GlobalAnswerType}`] })
-
-              visitTaskAnswerList.push({ visitTaskId: item.VisitTaskId, answerList: answerList })
-            })
-            var params = {
-              globalTaskId: this.globalInfo.visitTaskId,
-              subjectId: this.globalInfo.subjectId,
-              trialId: this.globalInfo.trialId,
-              visitTaskAnswerList
-            }
-            await batchSubmitGlobalReadingInfo(params)
-            this.loading = false
-            if (isPrompt) {
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
-            }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
-          } else {
-            resolve(false)
-          }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        } 
-        
-        
-      })
-    },
-    getBeforeAnswer(qsId, row) {
-      var i = row.BeforeQuestionList.findIndex(item => item.QuestionName === qsId)
-
-      if (i > -1 && row.BeforeQuestionList[i].Answer) {
-        var answer = ''
-        if (row.BeforeQuestionList[i].DictionaryCode) {
-          answer = row.BeforeQuestionList[i].Answer
-        } else {
-          answer = row.BeforeQuestionList[i].Answer
-        }
-        return answer
-      } else {
-        return ''
-      }
-    },
-    handleAgreeOrNotChange(index, globalAnswerType) {
-      var agreeOrNot = parseInt(this.globalForm[`${index}${globalAnswerType}`])
-      if (agreeOrNot === 1) {
-        var qsList = this.globalForm.taskList[index].AfterQuestionList
-        qsList.map(v => {
-          if (v.QuestionId) {
-            this.globalForm[`${index}${v.QuestionId}`] = ''
-          } else if (v.GlobalAnswerType !== globalAnswerType) {
-            this.globalForm[`${index}${v.GlobalAnswerType}`] = ''
-          }
-        })
-      }
-      console.log(this.globalForm)
-    },
-    getAssessType(v) {
-      console.log(this.language)
-      var i = this.globalInfo.assessTypeList.findIndex(i => String(i.Code) === String(v))
-      if (i > -1) {
-        return this.language === 'en' ? this.globalInfo.assessTypeList[i].Value : this.globalInfo.assessTypeList[i].ValueCN
-      } else {
-        return ''
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-::v-deep .el-form-item label:before {
-    content: '*';
-    color: #F56C6C;
-    margin-right: 4px;
-}
-::v-deep .el-textarea .el-input__count{
-  background: rgba(0,0,0,0);
-  line-height: normal;
-}
-::v-deep .el-form-item{
-  margin-bottom: 0px;
-}
-.global-form{
-  ::v-deep .el-form-item__content{
-    padding-bottom: 10px;
-  }
-  ::v-deep .form-item .el-form-item__error{
-    top: 60%;
-  }
-}
-</style>

src/views/trials/trials-panel/reading/global-review/components/PCWG3Table.vue

@@ -220,9 +220,8 @@ export default {
     },
     handleSave(isPrompt = true) {
       return new Promise(async (resolve, reject) => {
-        try {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          let valid = await this.$refs['globalRuleForm'].validate()
+        if (valid) {
-          if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -248,24 +247,21 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            await batchSubmitGlobalReadingInfo(params)
+            try {
-            this.loading = false
+              await batchSubmitGlobalReadingInfo(params)
-            if (isPrompt) {
+              this.loading = false
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              if (isPrompt) {
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              this.$emit('getGlInfo')
+              resolve()
+            } catch (e) {
+              this.loading = false
+              reject()
             }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
           } else {
-            resolve(false)
+            reject()
           }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        } 
-        
-        
       })
     }
   }

src/views/trials/trials-panel/reading/global-review/components/RecistBMTable.vue

@@ -369,10 +369,9 @@ export default {
       return lesion ? lesion.Count : 0
     },
     handleSave(isPrompt = true) {
-      return new Promise(async (resolve, reject) => {
+      return new Promise(async(resolve, reject) => {
-        try {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          let valid = await this.$refs['globalRuleForm'].validate()
+        if (valid) {
-          if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -401,24 +400,22 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            await batchSubmitGlobalReadingInfo(params)
+            try {
-            this.loading = false
+              await batchSubmitGlobalReadingInfo(params)
-            if (isPrompt) {
+              this.loading = false
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              if (isPrompt) {
+                console.log(isPrompt)
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              this.$emit('getGlInfo')
+              resolve()
+            } catch (e) {
+              this.loading = false
+              reject()
             }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
           } else {
-            resolve(false)
+            reject()
           }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        } 
-        
-        
       })
     },
     getBeforeAnswer(qsId, row) {

src/views/trials/trials-panel/reading/global-review/components/RecistTable.vue

@@ -364,9 +364,8 @@ export default {
     },
     handleSave(isPrompt = true) {
       return new Promise(async (resolve, reject) => {
-        try {
+        let valid = await this.$refs['globalRuleForm'].validate()
-          let valid = await this.$refs['globalRuleForm'].validate()
+        if (valid) {
-          if (valid) {
             this.loading = true
             var visitTaskAnswerList = []
             this.globalForm.taskList.forEach((item, index) => {
@@ -395,23 +394,22 @@ export default {
               trialId: this.globalInfo.trialId,
               visitTaskAnswerList
             }
-            await batchSubmitGlobalReadingInfo(params)
+            try {
-            this.loading = false
+              await batchSubmitGlobalReadingInfo(params)
-            if (isPrompt) {
+              this.loading = false
-              this.$message.success(this.$t('common:message:savedSuccessfully'))
+              if (isPrompt) {
+                console.log(isPrompt)
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
+              }
+              this.$emit('getGlInfo')
+              resolve()
+            } catch (e) {
+              this.loading = false
+              reject()
             }
-            this.$emit('getGlInfo')
-            resolve(true)
-            
           } else {
-            resolve(false)
+            reject()
           }
-        } catch(e) {
-          console.log(e)
-          this.loading = false
-          resolve(false)
-        } 
-        
         
       })
     },

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

@@ -41,7 +41,7 @@
           {{ $t('trials:globalReview:button:submit') }}
         </el-button>
       </div>
-      <customize-table
+      <CustomizeTable
         v-if="CriterionType === 0 && Object.keys(globalInfo).length !== 0"
         ref="globalTbl"
         :global-info="globalInfo"
@@ -50,7 +50,7 @@
         @getGlInfo="getGlInfo"
         @setOpenWindow="setOpenWindow"
       />
-      <recist-table
+      <RecistTable
         v-if="CriterionType === 1 && Object.keys(globalInfo).length !== 0"
         ref="globalTbl"
         :global-info="globalInfo"
@@ -59,7 +59,7 @@
         @getGlInfo="getGlInfo"
         @setOpenWindow="setOpenWindow"
       />
-      <lugano-table
+      <LuganoTable
         v-if="CriterionType === 2 && Object.keys(globalInfo).length !== 0"
         ref="globalTbl"
         :global-info="globalInfo"
@@ -69,7 +69,7 @@
         @handleView="handleView"
         @setOpenWindow="setOpenWindow"
       />
-      <pcwg3-table
+      <PCWG3Table
         v-if="CriterionType === 10 && Object.keys(globalInfo).length !== 0"
         ref="globalTbl"
         :global-info="globalInfo"
@@ -79,7 +79,7 @@
         @handleView="handleView"
         @setOpenWindow="setOpenWindow"
       />
-      <irecist-table
+      <IRecistTable
         v-if="CriterionType === 3 && Object.keys(globalInfo).length !== 0"
         ref="globalTbl"
         :global-info="globalInfo"
@@ -88,7 +88,7 @@
         @getGlInfo="getGlInfo"
         @setOpenWindow="setOpenWindow"
       />
-      <recistbm-table
+      <RecistBMTable
         v-if="CriterionType === 17 && Object.keys(globalInfo).length !== 0"
         ref="globalTbl"
         :global-info="globalInfo"
@@ -97,15 +97,6 @@
         @getGlInfo="getGlInfo"
         @setOpenWindow="setOpenWindow"
       />
-      <mrecist-table
-        v-if="CriterionType === 7 && Object.keys(globalInfo).length !== 0"
-        ref="globalTbl"
-        :global-info="globalInfo"
-        :global-form="globalInfo.globalForm"
-        :reading-task-state="readingTaskState"
-        @getGlInfo="getGlInfo"
-        @setOpenWindow="setOpenWindow"
-      />
 
     </el-card>
 
@@ -173,17 +164,16 @@ import const_ from '@/const/sign-code'
 import DicomEvent from '@/views/trials/trials-panel/reading/dicoms/components/DicomEvent'
 import CustomizeTable from './components/CustomizeTable'
 import RecistTable from './components/RecistTable'
-import pcwg3Table from './components/PCWG3Table'
+import PCWG3Table from './components/PCWG3Table'
-import irecistTable from './components/IRecistTable'
+import IRecistTable from './components/IRecistTable'
-import recistbmTable from './components/RecistBMTable'
+import RecistBMTable from './components/RecistBMTable'
-import luganoTable from './components/LuganoTable'
+import LuganoTable from './components/LuganoTable'
-import mrecistTable from './components/MRecistTable.vue'
 import SignForm from '@/views/trials/components/newSignForm'
 import { changeURLStatic } from '@/utils/history.js'
 import store from '@/store'
 export default {
   name: 'GlobalReview',
-  components: { CustomizeTable, RecistTable, pcwg3Table, irecistTable, recistbmTable,luganoTable,mrecistTable, SignForm },
+  components: { CustomizeTable, RecistTable, PCWG3Table, IRecistTable, RecistBMTable,LuganoTable, SignForm },
   props: {
     trialId: {
       type: String,
@@ -394,13 +384,10 @@ export default {
           .catch(() => {})
       } else {
         // 自动保存
-        let res = await this.$refs['globalTbl'].handleSave(false)
+        await this.$refs['globalTbl'].handleSave(false)
-        if (res) {
+        const { ImageAssessmentReportConfirmation } = const_.processSignature
-          const { ImageAssessmentReportConfirmation } = const_.processSignature
+        this.signCode = ImageAssessmentReportConfirmation
-          this.signCode = ImageAssessmentReportConfirmation
+        this.signVisible = true
-          this.signVisible = true
-        }
-        
       }
     },
     // 关闭签名框