From ddd7e4638cc9c74401fdb5040a2b5ec4ced1fb50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Sun, 4 Feb 2024 18:00:34 +0800
Subject: [PATCH 001/374] 1

---
 .../customize/CustomizeQuestionFormItem.vue   |  10 +-
 .../CustomizeQuestionTableFormItem.vue        | 110 +++++++++++++++++-
 .../reading-unit/components/QuestionsForm.vue |  13 ++-
 .../reading-unit/components/TableQsForm.vue   |  64 +++++++---
 4 files changed, 172 insertions(+), 25 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index 2cf652e5..895b68fc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -288,7 +288,7 @@
               :visit-task-id="visitTaskId"
               :criterion-id="criterionId"
               :type="addOrEdit.type"
-              :CalculationList="CalculationList"
+              :CalculationList="CalculationTabelList"
               @formItemTableNumberChange="formItemTableNumberChange"
               @setFormItemData="setFormItemData"
               @resetFormItemData="resetFormItemData"
@@ -368,7 +368,8 @@ export default {
       loading: false,
       RowIndex: 0,
       RowId: null,
-      digitPlaces: 0
+      digitPlaces: 0,
+      CalculationTabelList: []
     }
   },
   watch: {
@@ -411,7 +412,7 @@ export default {
       }
     }
     if (this.question.Type === 'table') {
-      // this.getQuestionCalculateRelation()
+      this.getQuestionCalculateRelation()
       if (this.questionForm[this.question.Id]) {
         this.QuestionsForm = {}
         this.question.TableQuestions.Questions.forEach(v => {
@@ -511,10 +512,9 @@ export default {
     },
     getQuestionCalculateRelation() {
       getQuestionCalculateRelation({
-        TrialReadingCriterionId: this.criterionId,
         ReadingQuestionId: this.question.Id
       }).then(res => {
-        this.CalculationList = res.Result
+        this.CalculationTabelList = res.Result
       })
     },
     save() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
index 7d1bbbb0..ca9732b9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
@@ -211,6 +211,12 @@ export default {
       type: String,
       required: true
     },
+    CalculationList: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
     readingTaskState: {
       type: Number,
       required: true
@@ -248,14 +254,27 @@ export default {
       digitPlaces: 0
     }
   },
+  // watch: {
+  //   questionForm: {
+  //     deep: true,
+  //     immediate: true,
+  //     handler(v) {
+  //
+  //     }
+  //   }
+  // },
   watch: {
     questionForm: {
       deep: true,
       immediate: true,
-      handler(v) {
-
+      handler(v, oldv) {
+        try {
+          if (!v[this.question.Id] || !oldv[this.question.Id]) return
+        } catch (e) {
+        }
+        this.formItemNumberChange(this.question.Id, false)
       }
-    }
+    },
   },
   mounted() {
     this.digitPlaces = localStorage.getItem('digitPlaces') ? parseInt(localStorage.getItem('digitPlaces')) : 0
@@ -323,8 +342,91 @@ export default {
       } else {
       }
     },
+    logic(rules, num = 0) {
+      try {
+        if (rules.CalculateQuestionList.length === 0) {
+          return false
+        }
+        var count = 0
+        var maxList = [], minList = []
+        rules.CalculateQuestionList.forEach((o, i) => {
+          if (rules.CustomCalculateMark > 4) {
+            if (i !== 0) {
+              switch (rules.CustomCalculateMark) {
+                case 7:
+                  count += parseFloat(this.questionForm[o.TableQuestionId])
+                  if (i === rules.CalculateQuestionList.length - 1) {
+                    num = count / rules.CalculateQuestionList.length
+                  }
+                  break;
+                case 8:
+                  maxList.push(this.questionForm[o.TableQuestionId])
+                  if (i === rules.CalculateQuestionList.length - 1) {
+                    num = Math.max(...maxList)
+                  }
+                  break;
+                case 9:
+                  minList.push(this.questionForm[o.TableQuestionId])
+                  if (i === rules.CalculateQuestionList.length - 1) {
+                    num = Math.min(...minList)
+                  }
+                  break;
+              }
+            } else {
+              maxList.push(this.questionForm[o.TableQuestionId])
+              minList.push(this.questionForm[o.TableQuestionId])
+              count = parseFloat(this.questionForm[o.TableQuestionId])
+              num = parseFloat(this.questionForm[o.TableQuestionId])
+            }
+          } else {
+            switch (rules.CustomCalculateMark) {
+              case 1:
+                num += parseFloat(this.questionForm[o.TableQuestionId])
+                break;
+              case 2:
+                num -= parseFloat(this.questionForm[o.TableQuestionId])
+                break;
+              case 3:
+                num *= parseFloat(this.questionForm[o.TableQuestionId])
+                break;
+              case 4:
+                if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
+                  num = 0
+                } else {
+                  num /= parseFloat(this.questionForm[o.TableQuestionId])
+                }
+                break;
+            }
+          }
+        })
+      } catch (e) {
+        console.log(e)
+      }
+      var digitPlaces = parseInt(localStorage.getItem('digitPlaces'))
+      if (rules.ValueType === 2) {
+        num = num * 100
+      }
+      return num.toFixed(digitPlaces)
+    },
     formItemNumberChange(v, question) {
-      this.$emit('formItemTableNumberChange', v, question)
+      console.log(this.CalculationList)
+      this.CalculationList.forEach((v, i) => {
+        console.log('v', v)
+        var find = v.CalculateQuestionList.filter(o => {
+          return o.QuestionId === question.Id
+        })
+        console.log('find', find)
+        // find的自动计算值number
+        if (find) {
+          var num = this.logic(v)
+          console.log(num)
+          if (num !== false) {
+            this.$set(this.questionForm, v.QuestionId, num)
+            // this.$emit('setFormItemData', { key: v.QuestionId, val: num })
+          }
+        }
+      })
+      // this.$emit('formItemTableNumberChange', v, question)
     },
     resetChild(obj) {
       obj.forEach(i => {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index a6fd45bf..977bf2f0 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -447,8 +447,8 @@
         </el-select>
       </el-form-item>
       <el-form-item
-        v-if="(form.QuestionGenre === 0 || form.QuestionGenre === null) && (form.Type === 'select' || form.Type === 'radio') && isFromSystem"
-        :label="$t('trials:qcCfg:table:typeValue')"
+        v-if="(form.Type === 'select' || form.Type === 'radio') && isFromSystem"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
       >
         <el-select v-model="form.DefaultValue" clearable>
           <el-option
@@ -459,6 +459,15 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="(form.Type === 'number') && !isFromSystem"
+        :label="$t('trials:readingUnit:qsList:title:defaultValue')"
+      >
+        <el-input
+          :disabled="form.DataSource === 1"
+          v-model="form.DefaultValue"
+        />
+      </el-form-item>
       <!-- 分组 -->
       <el-form-item
         v-if="form.Type !== 'group'"
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index a9d4d7ca..1ffe4da1 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -69,6 +69,21 @@
           v-model="form.IsCopy"
         />
       </el-form-item>
+      <!-- 问题数据来源 -->
+      <el-form-item v-if="form.Type === 'number'" :label="$t('trials:readingUnit:qsList:title:dataSource')"
+                    prop="DataSource">
+        <el-radio-group
+          v-model="form.DataSource"
+        >
+          <el-radio
+            v-for="item of $d.DataSource"
+            :key="`DataSource${item.value}`"
+            :label="item.value"
+          >
+            {{ item.label }}
+          </el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item
         v-if="form.Type === 'number'"
         :label="$t('trials:readingUnit:qsList:title:valueType')"
@@ -135,14 +150,26 @@
             style="line-height: 40px;"
             @change="(v) => CustomCalculateMarkChange(v)"
           >
-            <el-radio
-              v-for="item of $d.CustomCalculateMark"
-              v-if="item.value <= 4"
-              :key="`CustomCalculateMark${item.value}`"
-              :label="item.value"
-            >
-              {{ item.label }}
-            </el-radio>
+            <div>
+              <el-radio
+                v-for="item of $d.CustomCalculateMark"
+                v-show="item.value <= 4"
+                :key="`CustomCalculateMark${item.value}`"
+                :label="item.value"
+              >
+                {{ item.label }}
+              </el-radio>
+            </div>
+            <div>
+              <el-radio
+                v-for="item of $d.CustomCalculateMark"
+                v-show="item.value > 6"
+                :key="`CustomCalculateMark${item.value}`"
+                :label="item.value"
+              >
+                {{ item.label }}
+              </el-radio>
+            </div>
           </el-radio-group>
         </el-form-item>
         <el-table
@@ -174,16 +201,12 @@
             min-width="180"
           >
             <template slot-scope="scope">
-              <el-select v-if="!scope.row.IsTable" v-model="scope.row.TableQuestionId" clearable>
+              <el-select v-model="scope.row.TableQuestionId" clearable>
                 <el-option v-for="item of Questions" :key="item.QuestionId" :label="item.QuestionName" :value="item.QuestionId" />
               </el-select>
-              <el-select v-if="scope.row.IsTable" v-model="scope.row.TableQuestionId" clearable>
-                <el-option v-for="item of !scope.row.QuestionId ? [] : tableQuestions.find(v => v.QuestionId === scope.row.QuestionId).TableQuestions" :key="item.QuestionId" :label="item.QuestionName" :value="item.QuestionId" />
-              </el-select>
             </template>
           </el-table-column>
           <el-table-column
-            v-if="form.CustomCalculateMark <= 4"
             :label="$t('common:action:action')"
             prop="TableQuestionId"
             show-overflow-tooltip
@@ -620,7 +643,20 @@ export default {
             }
           }
         }
-
+        // for (const k in this.form) {
+        //   if (k === 'CalculateQuestions' && this.data[k] !== undefined) {
+        //     console.log(this.data[k])
+        //     this.form[k] = JSON.parse(this.data[k])
+        //     console.log('CalculateQuestions', this.form[k])
+        //   } else if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
+        //     this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
+        //     console.log(11111, this.form)
+        //   } else {
+        //     if (this.data.hasOwnProperty(k)) {
+        //       this.form[k] = this.data[k]
+        //     }
+        //   }
+        // }
         if (this.form.ParentId) {
           var index = this.parentOptions.findIndex(item => {
             return item.QuestionId === this.form.ParentId

From 2a6d0faf115bd6a16c0120e595828f7db448cd38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 5 Feb 2024 09:25:14 +0800
Subject: [PATCH 002/374] 1

---
 .../CustomizeQuestionTableFormItem.vue        | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
index ca9732b9..91316b09 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
@@ -379,23 +379,27 @@ export default {
               num = parseFloat(this.questionForm[o.TableQuestionId])
             }
           } else {
-            switch (rules.CustomCalculateMark) {
-              case 1:
-                num += parseFloat(this.questionForm[o.TableQuestionId])
-                break;
-              case 2:
-                num -= parseFloat(this.questionForm[o.TableQuestionId])
-                break;
-              case 3:
-                num *= parseFloat(this.questionForm[o.TableQuestionId])
-                break;
-              case 4:
-                if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
-                  num = 0
-                } else {
-                  num /= parseFloat(this.questionForm[o.TableQuestionId])
-                }
-                break;
+            if (i !== 0) {
+              switch (rules.CustomCalculateMark) {
+                case 1:
+                  num += parseFloat(this.questionForm[o.TableQuestionId])
+                  break;
+                case 2:
+                  num -= parseFloat(this.questionForm[o.TableQuestionId])
+                  break;
+                case 3:
+                  num *= parseFloat(this.questionForm[o.TableQuestionId])
+                  break;
+                case 4:
+                  if (parseFloat(this.questionForm[o.TableQuestionId]) === 0) {
+                    num = 0
+                  } else {
+                    num /= parseFloat(this.questionForm[o.TableQuestionId])
+                  }
+                  break;
+              }
+            } else {
+              num = parseFloat(this.questionForm[o.TableQuestionId])
             }
           }
         })

From f09bf427e5e0d7b91583630ce81671977a8eedcf Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 5 Feb 2024 09:43:42 +0800
Subject: [PATCH 003/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomCanvas.vue  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 298bef3d..8e1a48f3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -14,7 +14,7 @@
     <!-- 临床数据 -->
     <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
-        <svg-icon icon-class="159" class="svg-icon" />
+        <svg-icon icon-class="documentation" class="svg-icon"/>
       </el-tooltip>
 
     </div>
@@ -222,7 +222,8 @@ export default {
         visitTaskId: '',
         taskBlindName: '',
         frame: null,
-        imageRendered: false
+        imageRendered: false,
+        isExistsClinicalData:false
         // preventCache: true
       },
       dicomInfo: {
@@ -1058,6 +1059,7 @@ export default {
         this.stack.seriesIndex = dicomSeries.seriesIndex
         this.stack.sliceThickness = dicomSeries.sliceThickness
         this.stack.instanceCount = dicomSeries.instanceCount
+        this.stack.isExistsClinicalData = dicomSeries.isExistsClinicalData
         // this.measuredData = dicomSeries.measuredData
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
         this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum

From 6a8308fe5fee6bfec36a4539df37e6dd5e9176a1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 5 Feb 2024 09:51:03 +0800
Subject: [PATCH 004/374] 1

---
 .../reading/dicoms/customize/CustomizeQuestionFormItem.vue   | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index 895b68fc..e1c7c3fb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -18,6 +18,11 @@
       </div>
       <el-table
         :data="questionForm[question.Id]">
+        <el-table-column :label="$t('CustomizeQuestionFormItem:label:OrderMark')" width="60px" show-overflow-tooltip>
+          <template slot-scope="scope">
+            {{question.OrderMark}}{{scope.$index + 1}}
+          </template>
+        </el-table-column>
         <el-table-column
           :prop="item.Id"
           :label="item.QuestionName"

From ee8b6308067d07bc8bfb355dc15fe097ab9b0ad0 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 20 Feb 2024 10:06:30 +0800
Subject: [PATCH 005/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E5=88=86?=
 =?UTF-8?q?=E8=A3=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionForm.vue | 65 +++++++++++++++----
 .../dicoms/components/Lugano/QuestionList.vue | 64 ++++++++++++++++--
 2 files changed, 111 insertions(+), 18 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 229eb3f8..5928f3e0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -340,7 +340,8 @@ export default {
       pictureBaseStr: '',
       currentMarkTool: '',
       digitPlaces: 2,
-      stateDisabled: false
+      stateDisabled: false,
+      splitLesionTargetPDD: null
     }
   },
   mounted() {
@@ -363,10 +364,9 @@ export default {
       })
     },
     previewImage() {
-      console.log(this.$refs.viewer[0])
       this.$refs.viewer[0].$viewer.show()
     },
-    async initForm() {
+    async initForm(params) {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
         var val = this.answers[item.Id]
@@ -448,6 +448,14 @@ export default {
         const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
         this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
       }
+      if (this.lesionType === 0 && params && params.splitLesionTargetPPD) {
+        // ppd
+
+        var ppd = this.getQuestionVal(12)
+        ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
+
+        this.splitLesionTargetPDD = ppd + params.splitLesionTargetPPD
+      }
 
       // 如果当前病灶状态为“疾病进展”，且满足疾病进展的条件，则状态不允许更改
       var state = this.getQuestionVal(7)// 长径
@@ -458,9 +466,15 @@ export default {
       pddIncrease = isNaN(parseFloat(pddIncrease)) ? 0 : parseFloat(pddIncrease)
       var ldiIncrease = this.getQuestionVal(18)// 相比PPD最低点LDi增加值
       ldiIncrease = isNaN(parseFloat(ldiIncrease)) ? 0 : parseFloat(ldiIncrease)
-      var sdiIncrease = this.getQuestionVal(19)// 相比PPD最低点LDi增加值
+      var sdiIncrease = this.getQuestionVal(19)// 相比PPD最低点SDi增加值
       sdiIncrease = isNaN(parseFloat(sdiIncrease)) ? 0 : parseFloat(sdiIncrease)
+
       if (!this.isBaseLineTask && state === 4 && this.lesionType === 0 && ldi && pddIncrease && ldiIncrease && sdiIncrease) {
+        if (this.splitLesionTargetPDD) {
+          var minPPD = this.getQuestionVal(13)
+          minPPD = parseFloat(minPPD)
+          pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+        }
         /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
          * 相比最低点PPD增加百分比 ≥50％
@@ -805,6 +819,9 @@ export default {
                   this.$set(this.questionForm, stateId, 0)
                 }
               }
+            } else if (this.isCurrentTaskAdd === 'True' && !lesionState && measureData.type === 'Bidirectional') {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 0)
             }
             if (this.lesionType === 0) {
               this.calculatePPD()
@@ -941,34 +958,56 @@ export default {
       } else {
         this.$set(this.questionForm, sdiIncreaseObj.Id, 'NA')
       }
-
+      var pddIncreaseNum = null
+      if (this.splitLesionTargetPDD) {
+        pddIncreaseNum = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+      } else {
+        pddIncreaseNum = ((((ppd - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+      }
       /** 疾病进展* **/
-      if (!this.isBaseLineTask && ldi && pddIncrease && ldiIncrease && sdiIncrease) {
+      if (!this.isBaseLineTask && ldi && pddIncreaseNum && ldiIncrease && sdiIncrease && this.lesionType === 0 && this.isCurrentTaskAdd === 'False') {
         /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
          * 相比最低点PPD增加百分比 ≥50％
          * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
         **/
-        if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+        if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
           const stateId = this.getQuestionId(7)
-          console.log(stateId)
           this.$set(this.questionForm, stateId, 4)
           this.stateDisabled = true
-        } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+        } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
           /** 疾病进展
            * 当前靶病灶LDi>20 mm
            * 相比最低点PPD增加百分比 ≥50％
            * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
           **/
           const stateId = this.getQuestionId(7)
-          console.log(stateId)
           this.$set(this.questionForm, stateId, 4)
           this.stateDisabled = true
         } else {
+          // 不符合疾病进展是否需要清空修改前疾病进展的状态
+          // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+          // if (lesionState === 4) {
+          //   const stateId = this.getQuestionId(7)
+          //   this.$set(this.questionForm, stateId, null)
+          // }
           this.stateDisabled = false
         }
+      } else {
+        // 不符合疾病进展是否需要清空修改前疾病进展的状态
+        // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
+        // if (lesionState === 4) {
+        //   const stateId = this.getQuestionId(7)
+        //   this.$set(this.questionForm, stateId, null)
+        // }
+        this.stateDisabled = false
       }
     },
+    setSplitLesionTargetPPD(v) {
+      var ppd = this.getQuestionVal(12)
+      ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
+      this.splitLesionTargetPDD = ppd + v
+    },
     returnFloat(num) {
       if (num) return
       var value = Math.round(parseFloat(num) * 100) / 100
@@ -1622,12 +1661,12 @@ export default {
           submitTableQuestion(params).then(async res => {
             // 保存成功！
             this.$message.success(this.$t('common:message:savedSuccessfully'))
+
             this.currentMarkTool = measureData ? measureData.type : ''
             // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
 
             this.$set(this.questionForm, 'saveTypeEnum', 2)
             this.originalQuestionForm = { ...this.questionForm }
-            loading.close()
             var isLymphLesion = this.getQuestionVal(2)
             isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
             var lesionOrgan = this.getQuestionVal(6)
@@ -1642,6 +1681,10 @@ export default {
             DicomEvent.$emit('readingPageUpdate', {})
             DicomEvent.$emit('getReportInfo', true)
             DicomEvent.$emit('setMeasuredToolsPassive')
+            loading.close()
+            if (parseInt(this.answers.SplitOrMergeType) === 0) {
+              this.$emit('getReadingQuestionAndAnswer')
+            }
           }).catch(() => { loading.close() })
         })
       })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 830b94a0..f7d5d3dc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -87,10 +87,15 @@
 
                         </div>
                       </div>
-                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;transform: rotateY(180deg);">
+                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
-                        <!-- <el-tooltip v-show="readingTaskState<2 && !!item.TableQuestions.Answers[i].RowId && !isBaseLineTask && item.TableQuestions.Answers[i].isDicomReading !== false" class="item" :content="$t('trials:reading:button:split')" placement="left">
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId" 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)" />
+                        </el-tooltip>
+
+                        <!-- 融合 -->
+                        <!-- <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId " class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" />
                         </el-tooltip> -->
                       </div>
 
@@ -147,7 +152,7 @@
   </div>
 </template>
 <script>
-import { splitLesion } from '@/api/trials'
+import { splitLesion, getSplitPPdSum } from '@/api/trials'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
@@ -202,7 +207,9 @@ export default {
       isFirstRender: false,
       CriterionType: null,
       subjectCode: '',
-      isNonTargetMeasurement: false
+      isNonTargetMeasurement: false,
+      splitTargetLesions: [],
+      lesionTypeQuestionId: ''
     }
   },
   computed: {
@@ -257,6 +264,19 @@ export default {
         this.$refs['ecrf3'].getQuestions(this.visitTaskId)
       })
     })
+    DicomEvent.$on('refreshSplitTargetLesionPDD', async(callback) => {
+      this.splitTargetLesions = await this.getSplitTargetLesionPDD()
+      if (this.splitTargetLesions && this.splitTargetLesions.length > 0) {
+        this.splitTargetLesions.map(i => {
+          var refName = `${this.lesionTypeQuestionId}_${i.RowIndex}`
+          console.log(refName)
+          var params = {}
+          params.splitLesionTargetPPD = i.AllPPD
+          this.$refs[refName] && this.$refs[refName][0].initForm(params)
+        })
+      }
+      callback(true)
+    })
 
     window.addEventListener('resize', this.setHeight)
   },
@@ -268,6 +288,7 @@ export default {
   },
   methods: {
     async initList() {
+      console.log('initList')
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
         this.visitTaskId = this.visitTaskList[i].VisitTaskId
@@ -297,6 +318,9 @@ export default {
           await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[i].VisitTaskId })
           loading.close()
         }
+        if (!this.isBaseLineTask) {
+          this.splitTargetLesions = await this.getSplitTargetLesionPDD()
+        }
         this.questions = this.visitTaskList[i].ReadingQuestions
         this.$nextTick(() => {
           this.$refs['ecrf'].getQuestions(this.visitTaskId)
@@ -306,7 +330,15 @@ export default {
           this.tableQuestions.forEach(item => {
             item.TableQuestions.Answers.forEach(i => {
               var refName = `${item.Id}_${i.RowIndex}`
-              this.$refs[refName] && this.$refs[refName][0].initForm()
+              var params = {}
+              if (parseInt(i.LesionType) === 0) {
+                this.lesionTypeQuestionId = item.Id
+                var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
+                if (idx > -1) {
+                  params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                }
+              }
+              this.$refs[refName] && this.$refs[refName][0].initForm(params)
             })
           })
         })
@@ -415,7 +447,8 @@ export default {
       return new Promise(async resolve => {
         try {
           const loading = this.$loading({ fullscreen: true })
-          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(() => {
+
+          await store.dispatch('reading/refreshReadingQuestionAndAnswer', { trialId: this.$router.currentRoute.query.trialId, visitTaskId: this.visitTaskId }).then(async() => {
             var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
             if (idx > -1) {
               if (this.visitTaskList[idx].ReadingQuestions.length > 0) {
@@ -425,12 +458,22 @@ export default {
               this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
               this.isCurrentTask = this.visitTaskList[idx].IsCurrentTask
             }
+            if (!this.isBaseLineTask) {
+              this.splitTargetLesions = await this.getSplitTargetLesionPDD()
+            }
             this.getTableQuestions()
             this.$nextTick(() => {
               this.tableQuestions.forEach(item => {
                 item.TableQuestions.Answers.forEach(i => {
                   var refName = `${item.Id}_${i.RowIndex}`
-                  this.$refs[refName] && this.$refs[refName][0].initForm()
+                  var params = {}
+                  if (parseInt(i.LesionType) === 0) {
+                    var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
+                    if (idx > -1) {
+                      params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                    }
+                  }
+                  this.$refs[refName] && this.$refs[refName][0].initForm(params)
                 })
               })
             })
@@ -442,6 +485,13 @@ export default {
         } catch (e) { console.log(e) }
       })
     },
+    getSplitTargetLesionPDD() {
+      return new Promise(resolve => {
+        getSplitPPdSum({ visitTaskId: this.visitTaskId }).then(res => {
+          resolve(res.Result)
+        }).catch(() => { resolve() })
+      })
+    },
     setHeight() {
       this.height = window.innerHeight - 140
     },

From be96b2e93ef03e875be44c3546e2c06fe35f1716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 20 Feb 2024 11:41:08 +0800
Subject: [PATCH 006/374] =?UTF-8?q?=E6=BB=91=E5=9D=97=E8=B7=B3=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                                             |  2 +-
 src/views/login/index.vue                            |  5 +++--
 .../attachments/self-attachment/index.vue            | 12 ++++++++----
 .../reading/dicoms/components/DicomCanvas.vue        |  2 +-
 .../dicoms/customize/CustomizeDicomCanvas.vue        |  3 ++-
 5 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/.env.usa b/.env.usa
index 1f1d2d26..84f3865a 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-01-31/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-02-16/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1e13f20c..ed76f483 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -109,7 +109,7 @@
         <span style="color:#428bca">关于</span>
       </a>
     </div>
-    <Vcode :show="isShow" slider-text="拖到滑块完成验证" :imgs="[Img1]" @success="onSuccess" />
+<!--    <Vcode :show="isShow" slider-text="拖到滑块完成验证" :imgs="[Img1]" @success="onSuccess" />-->
     <el-dialog
       v-if="aboutVisible"
       :visible.sync="aboutVisible"
@@ -230,7 +230,8 @@ export default {
       this.loginType = this.$route.query.loginType
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.isShow = true
+          this.onSuccess()
+          // this.isShow = true
         } else {
           // console.log('error submit!!')
           return false
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 2c002819..481cca23 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -39,7 +39,6 @@
         </el-form-item>
       </el-form>
     </template>
-
     <template slot="main-container">
       <!-- 系统文件列表 -->
       <el-table
@@ -324,16 +323,21 @@ export default {
     closeSignDialog(isSave) {
       this.signVisible = false
       if (isSave) {
-        this.$confirm('是否进入下一个签署文档？').then(res => {
+        this.$confirm('Go to next document?').then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {
-            this.handleSign(res.Result)
+            if (!res.Result) {
+              this.currentIsConfirm = true
+            } else {
+              this.handleSign(res.Result)
+            }
+            this.getList()
           })
         }).catch(() => {
           this.currentIsConfirm = true
+          this.getList()
         })
-        this.getList()
       }
     },
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8e1a48f3..72e1552c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -83,7 +83,7 @@
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
     <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown.stop="sliderMousedown($event)" />
+      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 6b08c699..021eb599 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -76,7 +76,7 @@
       <!-- <div>{{ dicomInfo.time }}</div> -->
     </div>
     <div ref="sliderBox" class="my_slider_box" style="position: absolute;right: 1px;height: calc(100% - 140px);transform: translateY(-50%);top: calc(50% - 30px);width: 10px;background: #333;cursor: pointer" @click.stop="goViewer($event)">
-      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @mousedown.stop="sliderMousedown($event)" />
+      <div :style="{top: height + '%'}" style="z-index:10;background: #9e9e9e;height: 20px;width: 100%;position: absolute;top: 0;cursor: move" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}
@@ -471,6 +471,7 @@ export default {
   },
   methods: {
     goViewer(e) {
+      console.log('goViewer')
       console.log(this.$refs['sliderBox'].clientHeight)
       var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
       this.height = height

From 9906f4467729740472539d97ae6cb0a3a3c96da9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 20 Feb 2024 11:44:34 +0800
Subject: [PATCH 007/374] =?UTF-8?q?Go=20to=20next=20document=3F=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/attachments/self-attachment/index.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 481cca23..cff606da 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -323,7 +323,7 @@ export default {
     closeSignDialog(isSave) {
       this.signVisible = false
       if (isSave) {
-        this.$confirm('Go to next document?').then(res => {
+        this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {

From 6e95127522852718e8fd5cab3c0878fe22903ec5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 20 Feb 2024 15:54:22 +0800
Subject: [PATCH 008/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  15 ++
 .../reading/dicoms/components/DicomCanvas.vue |  21 ++-
 .../dicoms/components/Lugano/QuestionForm.vue |  12 +-
 .../dicoms/components/Lugano/QuestionList.vue | 154 +++++++++++++++++-
 4 files changed, 184 insertions(+), 18 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 7808c3f3..c0d188d7 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3519,3 +3519,18 @@ export function getTrialSiteSurveySelectList(param) {
     data: param
   })
 }
+export function getCanMergeLesion(param) {
+  return request({
+    url: `/ReadingImageTask/getCanMergeLesion`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function mergeLesion(param) {
+  return request({
+    url: `/ReadingImageTask/mergeLesion`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8e1a48f3..4e14aaff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -14,7 +14,7 @@
     <!-- 临床数据 -->
     <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
-        <svg-icon icon-class="documentation" class="svg-icon"/>
+        <svg-icon icon-class="documentation" class="svg-icon" />
       </el-tooltip>
 
     </div>
@@ -223,7 +223,7 @@ export default {
         taskBlindName: '',
         frame: null,
         imageRendered: false,
-        isExistsClinicalData:false
+        isExistsClinicalData: false
         // preventCache: true
       },
       dicomInfo: {
@@ -539,7 +539,7 @@ export default {
       this.mousePosition.y = currentPoints.image.y + 1
       this.mousePosition.mo = stats.mo
       this.mousePosition.suv = stats.suv
-      if (this.isFirstChangeTask && this.pointNearTool(e)) {
+      if ((this.isFirstChangeTask || this.disabledMarks.length > 0) && this.pointNearTool(e)) {
         e.stopImmediatePropagation()
         e.stopPropagation()
         e.preventDefault()
@@ -555,7 +555,7 @@ export default {
     mouseDown(e) {
       this.image = e.detail.image
       var pointNearTool = this.pointNearTool(e)
-      if (this.isFirstChangeTask && pointNearTool) {
+      if ((this.isFirstChangeTask || this.disabledMarks.length > 0) && pointNearTool) {
         e.stopImmediatePropagation()
         e.stopPropagation()
         e.preventDefault()
@@ -604,6 +604,15 @@ export default {
       })
       return arr
     },
+    getMergeMarks(measureDatas) {
+      var arr = []
+      measureDatas.map(i => {
+        if ((i.LesionType === 0) && i.SplitOrMergeType === 1) {
+          arr.push(i.OrderMarkName)
+        }
+      })
+      return arr
+    },
     getRGBPixels(element, x, y, width, height) {
       if (!element) {
         return
@@ -1064,11 +1073,15 @@ export default {
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === dicomSeries.visitTaskId)
         this.stack.visitTaskNum = this.visitTaskList[idx].VisitTaskNum
         this.isFirstChangeTask = this.visitTaskList[idx].IsFirstChangeTask
+        var criterionType = parseInt(localStorage.getItem('CriterionType'))
         if (this.isFirstChangeTask) {
           this.disabledMarks = this.getDisabledMarks(this.visitTaskList[idx].MeasureData)
+        } else if (criterionType === 2) {
+          this.disabledMarks = this.getMergeMarks(this.visitTaskList[idx].MeasureData)
         } else {
           this.disabledMarks = []
         }
+
         this.maxVistNum = this.visitTaskList[this.visitTaskList.length - 1].VisitTaskNum
         this.minVistNum = this.visitTaskList[0].VisitTaskNum
         this.measureData = this.visitTaskList[idx].MeasureData
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 5928f3e0..8ee76602 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -30,7 +30,7 @@
           <el-select
             v-model="questionForm.LesionType"
             filterable
-            :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask"
+            :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
             :popper-append-to-body="lesionType === 0 ? false :true"
             @change="((val)=>{lesionTypeChange(val)})"
           >
@@ -63,7 +63,7 @@
             <el-input
               v-if="qs.Type==='input' || qs.Type==='number'"
               v-model="questionForm[qs.Id]"
-              :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName))"
+              :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName) && lesionType !== 2) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || !!answers.SplitOrMergeLesionName)) || answers.SplitOrMergeType === '1'"
               @change="((val)=>{formItemChange(val, qs)})"
             >
               <template v-if="(qs.QuestionMark===0 || qs.QuestionMark===1) && qs.Unit" slot="append">
@@ -77,7 +77,7 @@
             v-model="questionForm[qs.Id]"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 4}"
-            :disabled="!isCurrentTask || readingTaskState>=2"
+            :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
             @change="((val)=>{formItemChange(val, qs)})"
           />
           <!-- 下拉框 -->
@@ -88,7 +88,7 @@
             v-model="questionForm[qs.Id]"
             filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
-            :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled)"
+            :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1'"
             :popper-append-to-body="lesionType === 0 ? false :true"
             @change="((val)=>{formItemChange(val, qs)})"
           >
@@ -166,7 +166,7 @@
           <el-radio-group
             v-if="qs.Type==='radio'"
             v-model="questionForm[qs.id]"
-            :disabled="!isCurrentTask || readingTaskState>=2"
+            :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
           >
             <el-radio
               v-for="val in qs.options.split('|')"
@@ -234,7 +234,7 @@
         </el-form-item>
       </div>
       <div
-        v-if="isCurrentTask && readingTaskState<2"
+        v-if="isCurrentTask && readingTaskState<2 && answers.SplitOrMergeType !== '1'"
         class="base-dialog-footer"
         style="text-align:right;margin-top:10px;"
       >
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index f7d5d3dc..7ac36f4b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -87,16 +87,16 @@
 
                         </div>
                       </div>
-                      <div v-if="((item.LesionType === 0 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0) || (item.LesionType === 1 && [0,1].includes(parseInt(item.TableQuestions.Answers[i].lesionState))) || (item.LesionType === 2 && parseInt(item.TableQuestions.Answers[i].lesionState) === 0)) && item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;">
+                      <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId" class="item" :content="$t('trials:reading:button:split')" placement="bottom">
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '1' && ((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)" />
                         </el-tooltip>
 
                         <!-- 融合 -->
-                        <!-- <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId " class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
-                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" />
-                        </el-tooltip> -->
+                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '2' && ((item.LesionType === 0 && [0,1,4].includes(parseInt(item.TableQuestions.Answers[i].lesionState))))" class="item" :content="$t('trials:reading:button:merge')" placement="bottom">
+                          <i class="iconfont icon-24gl-merge" style="color:#fff;font-size: 16px;" @click.stop="handleMerge(item.TableQuestions.Answers[i],item.Id,item.OrderMark)" />
+                        </el-tooltip>
                       </div>
 
                     </div>
@@ -149,10 +149,62 @@
         @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
       />
     </div>
+    <el-dialog
+      v-if="merge.visible"
+      v-loading="merge.loading"
+      :visible.sync="merge.visible"
+      :close-on-click-modal="false"
+      title="靶病灶融合"
+      width="500px"
+    >
+      <div class="merge-table">
+        <div class="merge-label">
+          <label>当前病灶： </label>
+          <span>{{ mergeInfo.lesionName }}</span>
+          <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
+        </div>
+        <div class="merge-label"><label>请选择融合病灶： </label></div>
+        <el-table
+          :data="lesionData"
+          style="width: 450px"
+          size="mini"
+          height="200"
+          @selection-change="handleSelectionChange"
+        >
+          <el-table-column
+            type="selection"
+            width="45"
+          />
+          <el-table-column
+            prop="OrderMarkName"
+            label="编号"
+            width="80"
+          />
+          <el-table-column
+            prop="Part"
+            label="部位"
+            min-width="120"
+            show-overflow-tooltip
+          />
+        </el-table>
+      </div>
+      <div slot="footer" style="text-align:right;">
+        <!-- 确认 -->
+        <el-button
+          type="primary"
+          size="mini"
+          :disabled="mergeList.length === 0"
+          @click="confirmMerge"
+        >
+          {{ $t('common:button:confirm') }}</el-button>
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
+      </div>
+    </el-dialog>
   </div>
 </template>
 <script>
-import { splitLesion, getSplitPPdSum } from '@/api/trials'
+import { splitLesion, getSplitPPdSum, getCanMergeLesion, mergeLesion } from '@/api/trials'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
 import { mapGetters } from 'vuex'
@@ -209,7 +261,11 @@ export default {
       subjectCode: '',
       isNonTargetMeasurement: false,
       splitTargetLesions: [],
-      lesionTypeQuestionId: ''
+      lesionTypeQuestionId: '',
+      merge: { visible: false, loading: false },
+      lesionData: [],
+      mergeInfo: {},
+      mergeList: []
     }
   },
   computed: {
@@ -288,7 +344,6 @@ export default {
   },
   methods: {
     async initList() {
-      console.log('initList')
       var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
       if (i > -1) {
         this.visitTaskId = this.visitTaskList[i].VisitTaskId
@@ -613,6 +668,53 @@ export default {
         })
       })
     },
+    // 融合
+    handleMerge(answers, questionId, orderMark) {
+      this.lesionData = []
+      this.merge.visible = true
+      this.mergeInfo.questionId = questionId
+      this.mergeInfo.mergeRowId = answers.RowId
+      this.mergeInfo.lesionName = this.getLesionName(orderMark, answers.RowIndex)
+      this.mergeInfo.lesionPart = answers.lesionPart
+      this.merge.loading = true
+      getCanMergeLesion({ rowId: answers.RowId }).then(res => {
+        this.lesionData = res.Result
+        this.merge.loading = false
+      }).catch(() => { this.merge.loading = false })
+    },
+    handleSelectionChange(val) {
+      this.mergeList = []
+      val.map(i => {
+        this.mergeList.push(i.RowId)
+      })
+    },
+    confirmMerge() {
+      this.$confirm('融合后将无法撤销, 是否继续?', '提示', {
+        type: 'warning'
+      }).then(() => {
+        this.lesionMerge()
+      }).catch(() => {
+
+      })
+    },
+    lesionMerge() {
+      this.merge.loading = true
+      var params = {
+        visitTaskId: this.visitTaskId,
+        questionId: this.mergeInfo.questionId,
+        mergeRowId: this.mergeInfo.mergeRowId,
+        meltingInToLesionList: this.mergeList
+      }
+      mergeLesion(params).then(res => {
+        this.merge.loading = false
+        this.merge.visible = false
+        DicomEvent.$emit('readingPageUpdate', {})
+        DicomEvent.$emit('getReportInfo', true)
+        DicomEvent.$emit('setMeasuredToolsPassive')
+        this.getReadingQuestionAndAnswer()
+        // 刷新病灶列表及标记
+      }).catch(() => { this.merge.loading = false })
+    },
     isCanActiveTool(toolName) {
       this.isNonTargetMeasurement = false
       this.getUnSaveTarget()
@@ -1233,5 +1335,41 @@ export default {
     }
 
   }
+  .merge-table{
+    padding:0 10px;
+    /deep/.el-table{
+      background-color:  #1e1e1e !important;
+      color: #dfdfdf;
+    }
+    /deep/.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+      border-bottom: 1px solid #dfdfdf;
+    }
+    .el-table--border::after, .el-table--group::after, .el-table::before{
+      background-color: #1e1e1e;
+    }
+    /deep/.el-table__header-wrapper{
+        th{
+          background-color:  #1e1e1e !important;
+          color: #dfdfdf;
+        }
+      }
+    /deep/.el-table__body-wrapper{
+      tr{
+        background-color:  #1e1e1e !important;
+        color: #dfdfdf;
+      }
+      tr:hover > td{
+        background-color:  #1e1e1e !important;
+      }
+    }
+    /deep/.el-table__empty-block{
+      background-color:  #1e1e1e !important;
+    }
+    .merge-label{
+      color:#ddd;
+      font-size: 13px;
+      margin-bottom: 10px;
+    }
+  }
 }
 </style>

From 9929045d4bd2b8a972d4bdc1c9bff4ab91dee7f5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 20 Feb 2024 16:37:11 +0800
Subject: [PATCH 009/374] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionForm.vue     |  2 ++
 .../dicoms/components/Lugano/QuestionList.vue     | 15 +++++++++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 8ee76602..4b3b76b3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -528,6 +528,8 @@ export default {
       }
       if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 0) {
         arr.push(`(Split from ${this.answers.SplitOrMergeLesionName})`)
+      } else if (this.answers.MeltingInToLesionMarks && parseInt(this.answers.SplitOrMergeType) === 1) {
+        arr.push(`(Merge to ${this.answers.MeltingInToLesionMarks})`)
       }
       return arr.join(' ')
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 7ac36f4b..e909fdbf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -64,7 +64,13 @@
                       </el-tooltip>
                       <div style="position: absolute;left: 50px;top: 2px;">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
+
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].MeltingInToLesionMarks}`" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'">
+                              <span class="login-cycle" />
+                            </div>
+                          </el-tooltip>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                             <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
                               {{ item.TableQuestions.Answers[i].lesionPart }}
@@ -1301,6 +1307,15 @@ export default {
   .lesion_list{
     position: relative;
   }
+  .login-cycle{
+    width: 5px;
+    height: 5px;
+    display: inline-block;
+    background-color: #428bca;
+    border-radius: 50%;
+    margin-right: 2px;
+    margin-bottom: 2px;
+  }
   .el-collapse{
     border-bottom:none;
     border-top:none;

From 052fdbcdbf9a80513d5f0562fec3058e9d72c2b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 20 Feb 2024 16:49:59 +0800
Subject: [PATCH 010/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js                     |   3 +
 .../blindResumeInfo/components/Employment.vue |  17 +-
 src/views/blindResumeInfo/info.vue            |   6 +-
 src/views/email-recompose/index.vue           |   2 +-
 src/views/forgetpassword/index.vue            |   2 +-
 src/views/login/index.vue                     |   8 +-
 src/views/research/form.vue                   |  17 +-
 src/views/resumeInfo/components/BasicInfo.vue |  14 +-
 .../resumeInfo/components/Employment.vue      |  18 +-
 src/views/resumeInfo/index.vue                |   2 +-
 src/views/reviewers/components/BasicInfo.vue  |  20 +-
 src/views/reviewers/components/Employment.vue | 179 ++++++-----
 src/views/reviewers/index.vue                 | 289 ++----------------
 src/views/system/user/list/index.vue          | 182 ++++++++++-
 src/views/trials/trials-myinfo/index.vue      |   8 +-
 .../attachments/SPMEnrollment/index.vue       |  10 +-
 .../attachments/enrollment/index.vue          |  10 +-
 .../visit-plan/components/visitPlanForm.vue   |   2 +-
 .../trial-summary/trial-information/index.vue |   4 +-
 .../trials-panel/visit/crc-upload/index.vue   |   6 +-
 .../trials-panel/visit/qc-check/index.vue     |   6 +-
 21 files changed, 369 insertions(+), 436 deletions(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index 6f3d378e..d7a66666 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -78,6 +78,9 @@ const mutations = {
 }
 
 const actions = {
+  changeUserName({ commit }, userName) {
+    commit('SET_USERNAME', userName)
+  },
   // user login
   login({ commit }, userInfo) {
     const { username, password } = userInfo
diff --git a/src/views/blindResumeInfo/components/Employment.vue b/src/views/blindResumeInfo/components/Employment.vue
index 380098a6..c0f5379f 100644
--- a/src/views/blindResumeInfo/components/Employment.vue
+++ b/src/views/blindResumeInfo/components/Employment.vue
@@ -14,27 +14,26 @@
             <span v-else>{{ employment.RankCN }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item :label="$t('resumeInfo:label:Physician')">
-            <span v-if="isEnglish">{{ employment.Physician }}</span>
-            <span v-else>{{ employment.PhysicianCN }}</span>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="6">-->
+<!--          <el-form-item :label="$t('resumeInfo:label:Physician')">-->
+<!--            <span v-if="isEnglish">{{ employment.Physician }}</span>-->
+<!--            <span v-else>{{ employment.PhysicianCN }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Position')">
             <span v-if="isEnglish">{{ employment.Position }}</span>
             <span v-else>{{ employment.PositionCN }}</span>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row>
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Hospital')">
             <span v-if="isEnglish">{{ employment.HospitalName }}</span>
             <span v-else>{{ employment.HospitalNameCN }}</span>
           </el-form-item>
         </el-col>
+      </el-row>
+      <el-row>
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Affiliated')">
             <span v-if="isEnglish">{{ employment.UniversityAffiliated }}</span>
diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue
index e10c07c8..0b1b85c9 100644
--- a/src/views/blindResumeInfo/info.vue
+++ b/src/views/blindResumeInfo/info.vue
@@ -90,11 +90,12 @@ export default {
         this.setLanguage('zh')
         this.$updateDictionary()
       }
-      this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''
+      this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName} ${this.$t('resumeInfo:title:Details')}`:''
     }
   },
   mounted() {
     this.isEnglish = !!((this.$route.query.isEnglish === true || this.$route.query.isEnglish === 'true'))
+    this.isEnglish = this.$i18n.locale === 'zh' ? false : true
     this.doctorId = this.$route.query.doctorId
     this.initForm()
   },
@@ -179,7 +180,8 @@ export default {
               this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
               !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
-              this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
+              this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName} ${this.$t('resumeInfo:title:Details')}`:''
+              // this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
               this.htmlTitle = this.title
               this.initStatus()
               this.initEmploymentInfo()
diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue
index b478b24f..4e123227 100644
--- a/src/views/email-recompose/index.vue
+++ b/src/views/email-recompose/index.vue
@@ -5,7 +5,7 @@
         <!-- 首次登录修改密码 -->
         {{ $t('recompose:title:init') }}
       </div>
-      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="180px">
+      <el-form ref="passwordForm" v-loading="loading" label-position="right" :model="password" :rules="passwordFormRules" label-width="200px">
         <!-- 邮箱 -->
         <el-form-item :label="$t('recompose:form:email')" prop="Email">
           <el-input v-model="password.Email" disabled />
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 83986c47..6b85fe54 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -7,7 +7,7 @@
         ref="resetForm"
         v-loading="formLoading"
         :model="form"
-        label-width="150px"
+        label-width="200px"
         :rules="rules"
         class="demo-ruleForm"
         size="small"
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index ed76f483..38900c47 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -78,7 +78,7 @@
             type="primary"
             style="width:100%;margin-bottom:10px;"
             size="medium"
-            @click.native.prevent="loginIn"
+            @click.native.prevent="handleLogin"
           >
             {{ $t('login:button:login') }}
           </el-button>
@@ -109,7 +109,7 @@
         <span style="color:#428bca">关于</span>
       </a>
     </div>
-<!--    <Vcode :show="isShow" slider-text="拖到滑块完成验证" :imgs="[Img1]" @success="onSuccess" />-->
+    <Vcode :show="isShow" :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
     <el-dialog
       v-if="aboutVisible"
       :visible.sync="aboutVisible"
@@ -230,8 +230,8 @@ export default {
       this.loginType = this.$route.query.loginType
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.onSuccess()
-          // this.isShow = true
+          this.isShow = true
+          // this.onSuccess()
         } else {
           // console.log('error submit!!')
           return false
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 53110a49..c666b5cd 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -23,7 +23,7 @@
             v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
             type="primary"
             size="small"
-            @click="handleSubmit"
+            @click="handleSubmit2"
           >
             {{ $t('trials:researchForm:button:auditPasses') }}
           </el-button>
@@ -245,19 +245,6 @@ export default {
     // 提交
     handleSubmit() {
       if (this.userTypeEnumInt === 0) {
-        // if (this.$refs['researchParticipants'].list.length === 0 && this.$refs['researchEquipments'].list.length === 0) {
-        //   this.$alert(this.$t('trials:researchForm:message:saveWarning'))
-        //   return
-        // }
-        // var list = this.$refs['researchParticipants'].list
-        // var cIdx = list.findIndex(i => parseInt(i.TrialRoleCode) === 1)
-        // var pIdx = list.findIndex(i => parseInt(i.TrialRoleCode) === 4)
-        // if (cIdx === -1 || pIdx === -1) {
-        //   // 提交时校验必须crc角色和影像负责人角色至少有1个
-        //   this.$alert(this.$t('trials:researchForm:message:saveWarning1'))
-        //   return
-        // }
-
         this.loading = true
         this.$refs['baseResearchInfo'].handleSave(true).then(res => {
           this.loading = false
@@ -271,7 +258,7 @@ export default {
     },
     submit() {
       // 是否确认提交
-      this.$confirm(this.$t('trials:researchForm:message:submitWarning'), {
+      this.$confirm(this.userTypeEnumInt === 0 ? this.$t('trials:researchForm:message:submitWarning') : this.$t('trials:researchForm:message:submitWarning2'), {
         type: 'warning',
         distinguishCancelAndClose: true
       }).then(() => {
diff --git a/src/views/resumeInfo/components/BasicInfo.vue b/src/views/resumeInfo/components/BasicInfo.vue
index f20e8a81..6e205bef 100644
--- a/src/views/resumeInfo/components/BasicInfo.vue
+++ b/src/views/resumeInfo/components/BasicInfo.vue
@@ -53,13 +53,13 @@
         </el-col>
       </el-row>
 
-      <el-row>
-        <el-col :span="6">
-          <el-form-item :label="$t('resumeInfo:label:WeChat')">
-            <span>{{ basicInfo.WeChat }}</span>
-          </el-form-item>
-        </el-col>
-      </el-row>
+<!--      <el-row>-->
+<!--        <el-col :span="6">-->
+<!--          <el-form-item :label="$t('resumeInfo:label:WeChat')">-->
+<!--            <span>{{ basicInfo.WeChat }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
+<!--      </el-row>-->
     </el-form>
   </div>
 </template>
diff --git a/src/views/resumeInfo/components/Employment.vue b/src/views/resumeInfo/components/Employment.vue
index 380098a6..ec46e5d9 100644
--- a/src/views/resumeInfo/components/Employment.vue
+++ b/src/views/resumeInfo/components/Employment.vue
@@ -14,27 +14,27 @@
             <span v-else>{{ employment.RankCN }}</span>
           </el-form-item>
         </el-col>
-        <el-col :span="6">
-          <el-form-item :label="$t('resumeInfo:label:Physician')">
-            <span v-if="isEnglish">{{ employment.Physician }}</span>
-            <span v-else>{{ employment.PhysicianCN }}</span>
-          </el-form-item>
-        </el-col>
+<!--        <el-col :span="6">-->
+<!--          <el-form-item :label="$t('resumeInfo:label:Physician')">-->
+<!--            <span v-if="isEnglish">{{ employment.Physician }}</span>-->
+<!--            <span v-else>{{ employment.PhysicianCN }}</span>-->
+<!--          </el-form-item>-->
+<!--        </el-col>-->
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Position')">
             <span v-if="isEnglish">{{ employment.Position }}</span>
             <span v-else>{{ employment.PositionCN }}</span>
           </el-form-item>
         </el-col>
-      </el-row>
-
-      <el-row>
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Hospital')">
             <span v-if="isEnglish">{{ employment.HospitalName }}</span>
             <span v-else>{{ employment.HospitalNameCN }}</span>
           </el-form-item>
         </el-col>
+      </el-row>
+
+      <el-row>
         <el-col :span="6">
           <el-form-item :label="$t('resumeInfo:label:Affiliated')">
             <span v-if="isEnglish">{{ employment.UniversityAffiliated }}</span>
diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue
index 9d5dfda4..98f572b3 100644
--- a/src/views/resumeInfo/index.vue
+++ b/src/views/resumeInfo/index.vue
@@ -102,7 +102,7 @@ export default {
         this.setLanguage('zh')
         this.$updateDictionary()
       }
-      this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''
+      this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName} ${this.$t('resumeInfo:title:Details')}`:''
     }
   },
   mounted() {
diff --git a/src/views/reviewers/components/BasicInfo.vue b/src/views/reviewers/components/BasicInfo.vue
index 8463d6cd..2ebdca92 100644
--- a/src/views/reviewers/components/BasicInfo.vue
+++ b/src/views/reviewers/components/BasicInfo.vue
@@ -22,12 +22,12 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Surname: " prop="LastName">
+              <el-form-item label="Last Name: " prop="LastName">
                 <el-input v-model="basicInfo.LastName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="Given Name: " prop="FirstName">
+              <el-form-item label="First Name: " prop="FirstName">
                 <el-input v-model="basicInfo.FirstName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
@@ -93,13 +93,11 @@
                 <el-input v-model="basicInfo.EMail" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
-            <el-col :span="12">
-              <el-form-item label="WeChat: " prop="WeChat">
-                <el-input v-model="basicInfo.WeChat" :disabled="$route.query.ReviewStatus === '1'" size="small" />
-              </el-form-item>
-            </el-col>
-          </el-row>
-          <el-row>
+<!--            <el-col :span="12">-->
+<!--              <el-form-item label="WeChat: " prop="WeChat">-->
+<!--                <el-input v-model="basicInfo.WeChat" :disabled="$route.query.ReviewStatus === '1'" size="small" />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
             <el-col :span="12">
               <!-- <el-form-item label="Payment Type: " prop="Nation">
                 <el-radio-group v-model="basicInfo.Nation">
@@ -108,7 +106,7 @@
                 </el-radio-group>
               </el-form-item> -->
 
-              <el-form-item label="Payment Type: " prop="Nation">
+              <el-form-item label="Country: " prop="Nation">
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="basicInfo.Nation"
@@ -121,6 +119,8 @@
               </el-form-item>
             </el-col>
           </el-row>
+<!--          <el-row>-->
+<!--          </el-row>-->
           <el-row>
             <el-form-item style="margin-left: 120px">
               <el-button
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 80a142b9..74d09e22 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -170,96 +170,95 @@
             </el-col>
           </el-row>
 
-          <el-row>
-            <el-col :span="14">
-              <el-form-item label="Physician: " prop="PhysicianId" >
-                <el-select
-                  v-model="employmentForm.PhysicianId"
-                  placeholder="select"
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  @change="PhysicianChange"
-                  style="width:100%;"
-                  size="small"
-                >
-                  <el-option
-                    v-for="item of $d.PhysicianOriginal"
-                    :key="item.id"
-                    :label="item.raw.Value"
-                    :value="item.id"
-                  />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="Physician">
-                <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="employmentForm.Physician"
-                  placeholder="Please specify"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="PhysicianCN">
-                <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="employmentForm.PhysicianCN"
-                  placeholder="请用中文注明"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
-
-          <el-row>
-            <el-col :span="14">
-              <el-form-item label="Position: " prop="PositionId">
-                <el-select
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="employmentForm.PositionId"
-                  placeholder="select"
-                  style="width:100%;"
-                  size="small"
-                >
-                  <!-- <el-option
-                    v-for="(key,value) of dictionaryList.Position"
-                    :key="key"
-                    :label="key"
-                    :value="value"
-                  /> -->
-                  <el-option
-                    v-for="item of dictionaryList.Position"
-                    :key="item.Id"
-                    :label="item.Value"
-                    :value="item.Id"
-                  />
-                  <el-option label="Other" :value="otherId" />
-                  <el-option label="None" value="f30a074b-2b47-4a92-97ec-e15086d37883" />
-                </el-select>
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOther">
-                <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="employmentForm.PositionOther"
-                  placeholder="Please specify"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-            <el-col :span="5">
-              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOtherCN">
-                <el-input
-                  :disabled="$route.query.ReviewStatus === '1'"
-                  v-model="employmentForm.PositionOtherCN"
-                  placeholder="请用中文注明"
-                  size="small"
-                />
-              </el-form-item>
-            </el-col>
-          </el-row>
+<!--          <el-row>-->
+<!--            <el-col :span="14">-->
+<!--              <el-form-item label="Physician: " prop="PhysicianId" >-->
+<!--                <el-select-->
+<!--                  v-model="employmentForm.PhysicianId"-->
+<!--                  placeholder="select"-->
+<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+<!--                  @change="PhysicianChange"-->
+<!--                  style="width:100%;"-->
+<!--                  size="small"-->
+<!--                >-->
+<!--                  <el-option-->
+<!--                    v-for="item of $d.PhysicianOriginal"-->
+<!--                    :key="item.id"-->
+<!--                    :label="item.raw.Value"-->
+<!--                    :value="item.id"-->
+<!--                  />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="5">-->
+<!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="Physician">-->
+<!--                <el-input-->
+<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+<!--                  v-model="employmentForm.Physician"-->
+<!--                  placeholder="Please specify"-->
+<!--                  size="small"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="5">-->
+<!--              <el-form-item v-if="$fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === '其它' || $fd('PhysicianOriginal', employmentForm.PhysicianId, 'id') === 'Other'" class="other-item" prop="PhysicianCN">-->
+<!--                <el-input-->
+<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+<!--                  v-model="employmentForm.PhysicianCN"-->
+<!--                  placeholder="请用中文注明"-->
+<!--                  size="small"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
+<!--          <el-row>-->
+<!--            <el-col :span="14">-->
+<!--              <el-form-item label="Position: " prop="PositionId">-->
+<!--                <el-select-->
+<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+<!--                  v-model="employmentForm.PositionId"-->
+<!--                  placeholder="select"-->
+<!--                  style="width:100%;"-->
+<!--                  size="small"-->
+<!--                >-->
+<!--                  &lt;!&ndash; <el-option-->
+<!--                    v-for="(key,value) of dictionaryList.Position"-->
+<!--                    :key="key"-->
+<!--                    :label="key"-->
+<!--                    :value="value"-->
+<!--                  /> &ndash;&gt;-->
+<!--                  <el-option-->
+<!--                    v-for="item of dictionaryList.Position"-->
+<!--                    :key="item.Id"-->
+<!--                    :label="item.Value"-->
+<!--                    :value="item.Id"-->
+<!--                  />-->
+<!--                  <el-option label="Other" :value="otherId" />-->
+<!--                  <el-option label="None" value="f30a074b-2b47-4a92-97ec-e15086d37883" />-->
+<!--                </el-select>-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="5">-->
+<!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOther">-->
+<!--                <el-input-->
+<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+<!--                  v-model="employmentForm.PositionOther"-->
+<!--                  placeholder="Please specify"-->
+<!--                  size="small"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--            <el-col :span="5">-->
+<!--              <el-form-item v-if="employmentForm.PositionId===otherId" class="other-item" prop="PositionOtherCN">-->
+<!--                <el-input-->
+<!--                  :disabled="$route.query.ReviewStatus === '1'"-->
+<!--                  v-model="employmentForm.PositionOtherCN"-->
+<!--                  placeholder="请用中文注明"-->
+<!--                  size="small"-->
+<!--                />-->
+<!--              </el-form-item>-->
+<!--            </el-col>-->
+<!--          </el-row>-->
 
           <el-form-item>
             <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">Save</el-button>
diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue
index 4da79ae3..d2294d89 100644
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@@ -4,14 +4,14 @@
     <div class="search">
       <div class="base-search-form">
         <el-form size="small" :inline="true">
-          <el-form-item label="Name:">
+          <el-form-item :label="$t('reviewers-list:label:Name')">
             <el-input
               v-model="searchData.Name"
               style="width:100px;"
               clearable
             />
           </el-form-item>
-          <el-form-item label="Modality:">
+          <el-form-item :label="$t('reviewers-list:label:Modality')">
             <el-select
               v-model="searchData.ReadingTypeIdList"
               clearable
@@ -33,7 +33,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="Subspeciality:">
+          <el-form-item :label="$t('reviewers-list:label:Subspeciality')">
             <el-select
               v-model="searchData.SubspecialityIdList"
               multiple
@@ -50,21 +50,20 @@
             </el-select>
           </el-form-item>
           <el-form-item>
-            <!-- <el-button type="text" @click="handleMore">More</el-button> -->
-            <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
-            <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+            <el-button type="primary" icon="el-icon-search" @click="handleSearch">{{ $t('common:button:search') }}</el-button>
+            <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">{{ $t('common:button:reset') }}</el-button>
             <el-button
               icon="el-icon-download"
               type="primary"
               :disabled="!(selectArr.length>0)"
               @click="handleDownLoadOffical"
-            >Download CV</el-button>
+            >{{$t('reviewers-list:label:DownloadCV')}}</el-button>
             <el-button
               type="primary"
               icon="el-icon-link"
               @click="showResearchLink"
             >
-              采集链接
+              {{$t('reviewers-list:label:showResearchLink')}}
             </el-button>
           </el-form-item>
         </el-form>
@@ -77,244 +76,10 @@
           style="margin-right:10px;"
           @change="handleIsEnChange"
         />
-        <el-button size="small" icon="el-icon-plus" type="primary" @click="handleNew">New</el-button>
+        <el-button size="small" icon="el-icon-plus" type="primary" @click="handleNew">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
 
-    <!-- 更多搜索条件 -->
-    <el-drawer
-      :visible.sync="isShow"
-      :with-header="false"
-      size="410px"
-    >
-      <div style="padding:10px;">
-        <el-form label-width="160px" size="mini">
-          <el-form-item label="Name">
-            <el-input
-              v-model="searchData.Name"
-              placeholder="Name"
-              style="width:100%;"
-              clearable
-            />
-          </el-form-item>
-          <el-form-item label="Modality">
-            <el-select
-              v-model="searchData.ReadingTypeIdList"
-              placeholder="Modality"
-              clearable
-              multiple
-              style="width:100%;"
-            >
-              <!-- <el-option
-                v-for="(key,value) of dictionaryList.ReadingType"
-                :key="key"
-                :label="key"
-                :value="value"
-              /> -->
-              <el-option
-                v-for="item of dict.type.ReadingType"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Subspeciality">
-            <el-select
-              v-model="searchData.SubspecialityIdList"
-              placeholder="Subspeciality"
-              multiple
-              clearable
-              style="width:100%;"
-            >
-              <!-- <el-option
-                v-for="(key,value) of dictionaryList.Subspeciality"
-                :key="key"
-                :label="key"
-                :value="value"
-              /> -->
-              <el-option
-                v-for="item of dict.type.Subspeciality"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Department">
-            <el-select
-              v-model="searchData.DepartmentId"
-              placeholder="Department"
-              style="width:100%;"
-              clearable
-            >
-              <!-- <el-option
-                v-for="(key,value) of dictionaryList.Department"
-                :key="key"
-                :label="key"
-                :value="value"
-              /> -->
-              <el-option
-                v-for="item of dict.type.Department"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Rank">
-            <el-select
-              v-model="searchData.RankId"
-              placeholder="Rank"
-              style="width:100%;"
-              clearable
-            >
-              <!-- <el-option
-                v-for="(key,value) of dictionaryList.Rank"
-                :key="key"
-                :label="key"
-                :value="value"
-              /> -->
-              <el-option
-                v-for="item of dict.type.Rank"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Position">
-            <el-select
-              v-model="searchData.PositionId"
-              placeholder="Position"
-              style="width:100%;"
-              clearable
-            >
-              <!-- <el-option
-                v-for="(key,value) of dictionaryList.Position"
-                :key="key"
-                :label="key"
-                :value="value"
-              /> -->
-              <el-option
-                v-for="item of dict.type.Position"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Institution">
-            <el-select
-              v-model="searchData.HospitalId"
-              placeholder="Institution"
-              style="width:100%;"
-              clearable
-            >
-              <el-option
-                v-for="(item,index) in hospitalList"
-                :key="index"
-                :label="item.HospitalName"
-                :value="item.Id"
-              />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Review Criteria">
-            <el-select
-              v-model="searchData.EvaluationCriteriaIdList"
-              placeholder="Please select"
-              style="width:100%;"
-              clearable
-              multiple
-            >
-              <!-- <el-option v-for="(key,value) of dictionaryList.ReadingStandard" :key="key" :label="key" :value="value" /> -->
-              <el-option
-                v-for="item of dict.type.ReadingStandard"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-              />
-            </el-select>
-
-          </el-form-item>
-          <el-form-item label="Enrollment">
-            <el-select
-              v-model="searchData.EnrollStatus"
-              placeholder="Enrollment"
-              style="width:100%;"
-              clearable
-            >
-              <el-option key="2" label="Yes" :value="2" />
-              <el-option key="1" label="No" :value="1" />
-            </el-select>
-          </el-form-item>
-          <el-form-item label="Information Confirmed">
-            <el-select
-              v-model="searchData.InformationConfirmed"
-              placeholder="Information Confirmed"
-              style="width:100%;"
-              clearable
-            >
-              <el-option key="1" label="Yes" :value="1" />
-              <el-option key="2" label="No" :value="2" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="Contractor Status">
-            <el-select
-              v-model="searchData.ContractorStatus"
-              placeholder="Contractor Status"
-              style="width:100%;"
-              clearable
-            >
-              <el-option key="1" label="Yes" :value="1" />
-              <el-option key="2" label="No" :value="2" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="Accepting New Trials">
-            <el-select
-              v-model="searchData.AcceptingNewTrial"
-              placeholder="Accepting New Trials"
-              style="width:100%;"
-              clearable
-            >
-              <el-option key="2" label="Yes" :value="true" />
-              <el-option key="1" label="No" :value="false" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="Actively Reading">
-            <el-select
-              v-model="searchData.ActivelyReading"
-              placeholder="Actively Reading"
-              style="width:100%;"
-              clearable
-            >
-              <el-option key="2" label="Yes" :value="true" />
-              <el-option key="1" label="No" :value="false" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item label="Payment Type: ">
-            <el-select
-              v-model="searchData.Nation"
-              clearable
-              style="width:100%;"
-            >
-              <el-option v-for="item of $d.AttendedReviewerType" :value="item.value" :label="item.label" />
-            </el-select>
-          </el-form-item>
-
-          <el-form-item>
-            <el-button type="primary" @click="handleSelectSearch">Search</el-button>
-            <el-button type="primary" @click="handleReset">Reset</el-button>
-            <el-button type="primary" @click="isShow=false">Back</el-button>
-          </el-form-item>
-        </el-form>
-      </div>
-    </el-drawer>
-
     <!-- 医生列表 -->
     <el-table
       v-adaptive="{bottomOffset:55}"
@@ -330,7 +95,7 @@
       <el-table-column
         align="left"
         prop="LastName"
-        label="Name"
+        :label="$t('reviewers-list:table:Name')"
         show-overflow-tooltip
         width="130"
         sortable="custom"
@@ -341,15 +106,15 @@
       </el-table-column>
       <el-table-column
         prop="ChineseName"
-        label="Name CN"
+        :label="$t('reviewers-list:table:NameCN')"
         show-overflow-tooltip
         width="90"
         align="left"
       />
-      <el-table-column prop="ReviewerCode" label="ID" width="80" show-overflow-tooltip sortable="custom" />
-      <el-table-column prop="AccountUserName" label="User Name" width="140" show-overflow-tooltip sortable="custom" />
+      <el-table-column prop="ReviewerCode" :label="$t('reviewers-list:table:ID')" width="80" show-overflow-tooltip sortable="custom" />
+      <el-table-column prop="AccountUserName" :label="$t('reviewers-list:table:UserName')" width="140" show-overflow-tooltip sortable="custom" />
       <el-table-column
-        label="Reading"
+        :label="$t('reviewers-list:table:Reading')"
         width="100"
         show-overflow-tooltip
         sortable="custom"
@@ -370,7 +135,7 @@
         </template>
       </el-table-column>
       <el-table-column
-        label="Finished"
+        :label="$t('reviewers-list:table:Finished')"
         width="100"
         show-overflow-tooltip
         sortable="custom"
@@ -393,7 +158,7 @@
       <el-table-column
         align="left"
         prop="SpecialityId"
-        label="Specialty"
+        :label="$t('reviewers-list:table:Specialty')"
         sortable="custom"
         show-overflow-tooltip
         width="130"
@@ -407,7 +172,7 @@
       <el-table-column
         align="left"
         prop="Subspeciality"
-        label="Subspecialty"
+        :label="$t('reviewers-list:table:Subspecialty')"
         show-overflow-tooltip
         min-width="150"
       >
@@ -422,7 +187,7 @@
       </el-table-column>
       <el-table-column
         prop="HospitalName"
-        label="Institution"
+        :label="$t('reviewers-list:table:Institution')"
         min-width="110"
         align="left"
         sortable="custom"
@@ -436,7 +201,7 @@
       </el-table-column>
       <el-table-column
         prop="City"
-        label="Location"
+        :label="$t('reviewers-list:table:Location')"
         width="110"
         align="left"
         sortable="custom"
@@ -450,7 +215,7 @@
       </el-table-column>
       <el-table-column
         prop="IsVirtual"
-        label="Virtual"
+        :label="$t('reviewers-list:table:Virtual')"
         min-width="80"
         align="left"
         sortable="custom"
@@ -464,7 +229,7 @@
       </el-table-column>
       <el-table-column
         prop="ReviewStatus"
-        label="Confirmed"
+        :label="$t('reviewers-list:table:Confirmed')"
         min-width="80"
         align="left"
         sortable="custom"
@@ -476,27 +241,27 @@
           </span>
         </template>
       </el-table-column>
-      <el-table-column label="Action" min-width="200" align="left" fixed="right">
+      <el-table-column :label="$t('common:action:action')" min-width="200" align="left" fixed="right">
         <template slot-scope="scope">
           <el-button
             size="mini"
             circle
             icon="el-icon-info"
-            title="Detail"
+            :title="$t('reviewers-list:table:Detail')"
             @click="handleDetail(scope.row)"
           />
           <el-button
             size="mini"
             circle
             icon="el-icon-edit-outline"
-            title="Edit"
+            :title="$t('reviewers-list:table:Edit')"
             @click="handleEdit(scope.row)"
           />
           <el-button
             size="mini"
             icon="el-icon-view"
             circle
-            title="盲态简历"
+            :title="$t('reviewers-list:table:Blind')"
             @click="lookResumeInfo(scope.row)"
           />
         </template>
@@ -515,13 +280,13 @@
       <template slot="dialog-body">
         <div>
           <i style="color:#428bca;" class="el-icon-success" />
-          <span>成功创建分享链接</span>
+          <span>{{ $t('reviewers-list:message:msg1')}}</span>
         </div>
         <div style="margin:10px 0;">
-          <span style="">个人简历填写链接：</span><el-input type="textarea"  :autosize="{ minRows: 2, maxRows: 4}" v-model="shareLink" readonly style="width: 100%;margin-top: 10px" />
+          <span style="">{{ $t('reviewers-list:message:msg2') }}</span><el-input type="textarea"  :autosize="{ minRows: 2, maxRows: 4}" v-model="shareLink" readonly style="width: 100%;margin-top: 10px" />
         </div>
         <div>
-          <el-button type="primary" round @click="copyCode">复制链接</el-button>
+          <el-button type="primary" round @click="copyCode">{{ $t('reviewers-list:button:copyCode') }}</el-button>
         </div>
       </template>
     </base-model>
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 383a2c29..325607ce 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -49,11 +49,15 @@
 </template>
 <script>
 import { getUserList, getUserTypeList, deleteSysUser } from '@/api/admin'
-import { searchForm, searchHandle, columns } from './list'
+// import { searchForm, searchHandle, columns } from './list'
 import BoxContent from '@/components/BoxContent'
 import SearchForm from '@/components/BaseForm/search-form'
 import BaseTable from '@/components/BaseTable'
 import tableMixins from '@/mixins/table'
+
+
+// 用户列表查询表单配置信息
+// 用户列表查询表单事件配置信息
 const searchDataDefault = () => {
   return {
     UserName: null,
@@ -75,9 +79,179 @@ export default {
   data() {
     return {
       searchData: searchDataDefault(),
-      searchForm,
-      searchHandle,
-      columns,
+      columns: [
+        { type: 'index' },
+        {
+          prop: 'UserCode',
+          label: this.$t('system:userlist:table:S/N'),
+          width: 100,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'UserName',
+          label: this.$t('system:userlist:table:UserName'),
+          minWidth: 100,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'RealName',
+          label: this.$t('system:userlist:table:RealName'),
+          minWidth: 120,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'Sex',
+          label: this.$t('system:userlist:table:Gender'),
+          hidden: true,
+          slot: 'genderSlot',
+          minWidth: 100,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'Phone',
+          label: this.$t('system:userlist:table:Phone'),
+          minWidth: 120,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'EMail',
+          label: this.$t('system:userlist:table:EMail'),
+          minWidth: 150,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'OrganizationName',
+          label: this.$t('system:userlist:table:Organization'),
+          minWidth: 130,
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'UserType',
+          label: this.$t('system:userlist:table:UserType'),
+          minWidth: 100,
+          sortable: 'custom',
+          showOverflowTooltip: true
+        },
+        {
+          prop: 'IsZhiZhun',
+          label: this.$t('system:userlist:table:InternalOrExternal'),
+          hidden: true,
+          slot: 'isZhiZhunSlot',
+          minWidth: 140,
+          sortable: 'custom',
+          showOverflowTooltip: true },
+        {
+          prop: 'IsTestUser',
+          label: this.$t('system:userlist:table:IsTestUser'),
+          hidden: true,
+          slot: 'isTestUserSlot',
+          minWidth: 120,
+          sortable: 'custom',
+          showOverflowTooltip: true },
+        {
+          prop: 'Status',
+          label: this.$t('system:userlist:table:Status'),
+          hidden: true,
+          slot: 'statusSlot',
+          minWidth: 100,
+          sortable: 'custom',
+          showOverflowTooltip: true },
+        { type: 'operate',
+          label: this.$t('common:action:action'),
+          minWidth: 200,
+          operates: [
+            { name: 'Edit', type: 'primary', emitKey: 'editCb' },
+            { name: 'Delete', type: 'danger', emitKey: 'deleteCb' }
+          ] }
+      ],
+      searchForm: [
+        {
+          type: 'Input',
+          label:  this.$t('system:userlist:label:UserName'),
+          prop: 'UserName',
+          width: '120px',
+          placeholder: ''
+        },
+        {
+          type: 'Input',
+          label: this.$t('system:userlist:label:RealName'),
+          prop: 'RealName',
+          width: '120px',
+          placeholder: ''
+        },
+        {
+          type: 'Input',
+          label: this.$t('system:userlist:label:Phone'),
+          prop: 'Phone',
+          width: '120px',
+          placeholder: ''
+        },
+        {
+          type: 'Input',
+          label: this.$t('system:userlist:label:Organization'),
+          prop: 'OrganizationName',
+          width: '120px',
+          placeholder: ''
+        },
+        {
+          type: 'Select',
+          label: this.$t('system:userlist:label:InternalOrExternal'),
+          prop: 'IsZhiZhun',
+          width: '100px',
+          options: [
+            { label: 'Internal', value: true },
+            { label: 'External', value: false }
+          ],
+          props: { label: 'label', value: 'value' },
+          change: scope => '',
+          placeholder: ''
+        },
+        {
+          type: 'Select',
+          label: this.$t('system:userlist:label:IsTestUser'),
+          prop: 'IsTestUser',
+          width: '100px',
+          options: [
+            { label: 'Yes', value: true },
+            { label: 'No', value: false }
+          ],
+          props: { label: 'label', value: 'value' },
+          change: scope => '',
+          placeholder: ''
+        },
+        {
+          type: 'Select',
+          label: this.$t('system:userlist:label:Status'),
+          prop: 'UserState',
+          width: '100px',
+          options: [
+            { label: 'Enable', value: 1 },
+            { label: 'Disable', value: 0 }
+          ],
+          props: { label: 'label', value: 'value' },
+          change: scope => '',
+          placeholder: ''
+        },
+        {
+          type: 'Select',
+          label: this.$t('system:userlist:label:UserType'),
+          prop: 'UserType',
+          width: '100px',
+          options: [], // 下拉选项
+          props: { label: 'UserType', value: 'Id' }, // 下拉选项配置信息，必填
+          placeholder: ''
+        }
+      ],
+      searchHandle: [
+        { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' },
+        { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search' }
+      ],
       userTypeOptions: [],
       loading: false,
       total: 0,
diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index 3c4b1192..8998992e 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -271,9 +271,11 @@ export default {
     },
     setNewUserName() {
       setNewUserName(this.userForm.UserName).then(() => {
-        this.userForm.UserName = ''
-        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-        this.getUserInfo()
+        this.$store.dispatch('user/changeUserName', this.userForm.UserName).then((res) => {
+          this.userForm.UserName = ''
+          this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
+          this.getUserInfo()
+        })
       })
     },
     setNewPhone() {
diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
index 1cb5814d..cdf56543 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
@@ -8,15 +8,15 @@
       <div v-if="trialInfo" class="trial-wrapper">
         <div class="div-row">
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:indication') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:indication') }}</label>
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}</label>
             <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}</label>
             <el-tooltip
               class="item"
               :content="trialInfo.Modalitys"
@@ -34,11 +34,11 @@
           <!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
           <!--          </div>-->
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}</label>
             <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
             <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index f37ddf25..4dbcad15 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -8,15 +8,15 @@
       <div v-if="trialInfo" class="trial-wrapper">
         <div class="div-row">
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:indication') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:indication') }}</label>
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}</label>
             <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}</label>
             <el-tooltip
               class="item"
               :content="trialInfo.Modalitys"
@@ -34,11 +34,11 @@
 <!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
 <!--          </div>-->
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}:</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}</label>
             <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
 <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
diff --git a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
index 635b2f44..55fbf76f 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
@@ -3,7 +3,7 @@
     ref="visitPlanForm"
     :model="form"
     :rules="rules"
-    label-width="140px"
+    label-width="180px"
     size="small"
   >
     <!-- 访视名称 -->
diff --git a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
index 4f12593b..a3373de8 100644
--- a/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/trial-information/index.vue
@@ -33,7 +33,7 @@
       </el-descriptions-item>
 
       <el-descriptions-item :label="$t('trials:trials-list:form:declarationType')">
-        {{trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).toString()}}
+        {{trialInfo.DeclarationTypeEnumList.map(v => $fd('DeclarationType', v)).join(', ')}}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:phase')">
         {{ trialInfo.Phase }}
@@ -82,7 +82,7 @@
         {{trialInfo.TotalReviewers}}
       </el-descriptions-item>
       <el-descriptions-item :label="$t('trials:trials-list:form:typeofReviewers')">
-        {{trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString()}}
+        {{trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ')}}
       </el-descriptions-item>
 
     </el-descriptions>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 9e60f3bc..d4a823f6 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -229,15 +229,15 @@
             <el-tooltip placement="bottom">
               <div slot="content">
                 <!-- DICOM/Non-DICOM/Clinical data -->
-                <span>{{ $t('trials:crcUpload:label:dicom') }}: {{ scope.row.DicomStudyCount }},</span>
+                <span>{{ $t('trials:crcUpload:label:dicom') }}: {{ scope.row.DicomStudyCount }}, </span>
                 <span v-if="scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0">
-                  <span>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }},</span>
+                  <span>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}, </span>
                   <span>{{ $t('trials:crcUpload:label:clinicalData') }}: {{ scope.row.IsHaveClinicalData?'w/':'w/o' }}</span>
                 </span>
                 <span v-else>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}</span>
               </div>
               <span>
-                {{ scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0?[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount,scope.row.IsHaveClinicalData?'w/':'w/o'].join(', '):[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount].join(', ') }}
+                {{ scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0?[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount,scope.row.IsHaveClinicalData?'w/':'w/o'].join(','):[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount].join(', ') }}
               </span>
             </el-tooltip>
           </template>
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index f79946aa..4d091d30 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -315,7 +315,7 @@
           prop="PreliminaryAuditUserName"
           :label="$t('trials:qcCheck:table:reviewer')"
           show-overflow-tooltip
-          min-width="170"
+          min-width="200"
         >
           <template slot-scope="scope">
             <!-- <span>{{ scope.row.PreliminaryAuditUserName }}</span> -->
@@ -329,7 +329,9 @@
             >
               {{ $t('trials:qcCheck:label:preliminary') }}
             </span>
-            <!-- <span v-if="scope.row.ReviewAuditUserName" /> -->
+            <span v-if="scope.row.ReviewAuditUserName">
+               ,
+            </span>
             <!-- <span>{{ scope.row.ReviewAuditUserName }}</span> -->
             <el-button v-if="scope.row.ReviewAuditUserName" type="text" @click="handleViewReviewQC(scope.row)">
               {{ scope.row.ReviewAuditUserName }}

From dc60128cae0d3668000890c067fbaecd5d9cc370 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 20 Feb 2024 17:11:51 +0800
Subject: [PATCH 011/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                   | 2 +-
 src/components/TrialsTab/index.vue | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.env.development b/.env.development
index d48ca615..d96a6b16 100644
--- a/.env.development
+++ b/.env.development
@@ -33,7 +33,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
 
 # 是否开启文档签署验证 true:是 false:否
-VUE_APP_WORD_FOR_PERMISSION = false
+VUE_APP_WORD_FOR_PERMISSION = true
 
 
 # dicom文件地址
diff --git a/src/components/TrialsTab/index.vue b/src/components/TrialsTab/index.vue
index 7fb3956d..87ce2daa 100644
--- a/src/components/TrialsTab/index.vue
+++ b/src/components/TrialsTab/index.vue
@@ -2,13 +2,13 @@
 <template>
   <div class="trialsTab">
     <el-tabs v-model="trialsTab" @tab-click="clickTab">
-      <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0" :label="$t(item.LanguageMark)" :name="item.path">
+      <el-tab-pane v-for="item of trialsRouter.children.find(v => {return v.name == 'TrialsPanel'}).children" :key="`tab${item.path}`" :disabled="TotalNeedSignTrialDocCount !== 0 && item.path !== '/trials/trials-panel/attachments'" :label="$t(item.LanguageMark)" :name="item.path">
         <el-tabs v-if="!item.tabHiddn" v-model="trialsTabChild" @tab-click="clickTab">
           <el-tab-pane
             v-for="item1 of item.children"
             v-if="TrialConfig && isShow(item1.path)"
             :key="`tab1${item1.path}`"
-            :disabled="TotalNeedSignTrialDocCount !== 0 || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
+            :disabled="TotalNeedSignTrialDocCount !== 0 && item1.path !== '/trials/trials-panel/attachments/self-attachment' || (TrialStatusStr === 'Initializing' && (item1.path === '/trials/trials-panel/setting/personnel-manage' || item1.path === '/trials/trials-panel/setting/qc-question' || item1.path === '/trials/trials-panel/setting/reading-unit' || item1.path === '/trials/trials-panel/setting/medical-audit' || item1.path === '/trials/trials-panel/setting/email-manage'))"
             :label="$t(item1.LanguageMark)"
             :name="item1.path"
           />

From 246e9a5bbde825ace81bbe3d62061dc48029a8cb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 21 Feb 2024 09:10:41 +0800
Subject: [PATCH 012/374] =?UTF-8?q?=E5=BC=B9=E7=AA=97=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue  | 6 +++---
 .../reading/dicoms/components/Lugano/QuestionList.vue       | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 0ba5f76e..29a52afb 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -587,15 +587,15 @@
           </div>
         </el-form-item>
         <el-form-item style="text-align:right;">
-          <!-- 确认 -->
+          <!-- 取消 -->
+          <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
+           <!-- 确认 -->
           <el-button
             type="primary"
             size="mini"
             @click="handleSubmitFusionSeries"
           >
             {{ $t('common:button:confirm') }}</el-button>
-          <!-- 取消 -->
-          <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
         </el-form-item>
       </el-form>
     </el-dialog>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index e909fdbf..8f52d19b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -195,6 +195,8 @@
         </el-table>
       </div>
       <div slot="footer" style="text-align:right;">
+        <!-- 取消 -->
+        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
         <!-- 确认 -->
         <el-button
           type="primary"
@@ -203,8 +205,6 @@
           @click="confirmMerge"
         >
           {{ $t('common:button:confirm') }}</el-button>
-        <!-- 取消 -->
-        <el-button size="mini" @click="merge.visible = false">{{ $t('common:button:cancel') }}</el-button>
       </div>
     </el-dialog>
   </div>

From 7e39c67fc2041eab71e6b64548efcd3061763283 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 09:56:55 +0800
Subject: [PATCH 013/374] 1

---
 .../trials/trials-panel/setting/medical-audit/index.vue  | 4 ++--
 .../setting/personnel-manage/components/site.vue         | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index 6e909a9f..b93e06d7 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -10,7 +10,7 @@
           >
             <!-- 审核问题 -->
             <el-form-item
-              :label="$t('trials:qcCfg:table:questionName')"
+              :label="$t('trials:MIMqcCfg:table:questionName')"
             >
               <el-input
                 v-model="searchData.QuestionName"
@@ -162,7 +162,7 @@
           <!-- 审核问题 -->
           <el-table-column
             prop="QuestionName"
-            :label="$t('trials:qcCfg:table:questionName')"
+            :label="$t('trials:MIMqcCfg:table:questionName')"
             show-overflow-tooltip
           />
           <!-- 审核问题 -->
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index 3d9cb240..55bd2f81 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -165,7 +165,7 @@
       </el-table-column>
       <!-- 授权时间 -->
       <el-table-column
-        prop="UpdateTime"
+        prop="EnabledTime"
         :label="$t('trials:sitesList:table:timeAdded')"
         show-overflow-tooltip
         sortable
@@ -179,6 +179,13 @@
         sortable
         width="210"
       />
+      <el-table-column
+        prop="CreateTime"
+        :label="$t('trials:internalStaff:table:CreateTime')"
+        show-overflow-tooltip
+        sortable
+        width="210"
+      />
       <el-table-column
         v-if="hasPermi(['trials:trials-panel:setting:personnel-manage:edit-site','trials:trials-panel:setting:personnel-manage:remove-site'])"
         :label="$t('common:action:action')"

From 80597d1f981347154c18a76c82421af3aa8ef04f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 10:41:24 +0800
Subject: [PATCH 014/374] 1

---
 .env.development | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.development b/.env.development
index d96a6b16..d48ca615 100644
--- a/.env.development
+++ b/.env.development
@@ -33,7 +33,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = true
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
 
 # 是否开启文档签署验证 true:是 false:否
-VUE_APP_WORD_FOR_PERMISSION = true
+VUE_APP_WORD_FOR_PERMISSION = false
 
 
 # dicom文件地址

From f09901bcf64609fa03199c1b72ea5f95f9e7f080 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 10:48:08 +0800
Subject: [PATCH 015/374] 1

---
 .../trials/trials-workbench/components/consistencyCheck.vue     | 2 +-
 .../trials/trials-workbench/components/imageVerification.vue    | 2 +-
 .../trials/trials-workbench/components/medicalFeedback.vue      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-workbench/components/consistencyCheck.vue b/src/views/trials/trials-workbench/components/consistencyCheck.vue
index 0cfe2205..8ce9b7d4 100644
--- a/src/views/trials/trials-workbench/components/consistencyCheck.vue
+++ b/src/views/trials/trials-workbench/components/consistencyCheck.vue
@@ -61,7 +61,7 @@
       />
       <!-- 待核查量 -->
       <el-table-column
-        :label="$t('trials:trials-list:table:PendingResponseCount')"
+        :label="$t('trials:consistencyCheck:table:PendingResponseCount')"
         prop="ToBeRepliedCount"
         show-overflow-tooltip
         sortable="custom"
diff --git a/src/views/trials/trials-workbench/components/imageVerification.vue b/src/views/trials/trials-workbench/components/imageVerification.vue
index 5f67d2a5..9c169a08 100644
--- a/src/views/trials/trials-workbench/components/imageVerification.vue
+++ b/src/views/trials/trials-workbench/components/imageVerification.vue
@@ -52,7 +52,7 @@
       />
       <!-- 待回复量 -->
       <el-table-column
-        :label="$t('trials:trials-list:table:PendingResponseCount')"
+        :label="$t('trials:imageVerification:table:PendingResponseCount')"
         prop="ToBeReplyedCount"
         show-overflow-tooltip
         sortable="custom"
diff --git a/src/views/trials/trials-workbench/components/medicalFeedback.vue b/src/views/trials/trials-workbench/components/medicalFeedback.vue
index 3e2e54a9..7565c01b 100644
--- a/src/views/trials/trials-workbench/components/medicalFeedback.vue
+++ b/src/views/trials/trials-workbench/components/medicalFeedback.vue
@@ -59,7 +59,7 @@
       />
       <!-- 待回复量 -->
       <el-table-column
-        :label="$t('trials:trials-list:table:PendingResponseCount')"
+        :label="$t('trials:medicalFeedback:table:PendingResponseCount')"
         prop="ToBeReplyedCount"
         show-overflow-tooltip
         sortable="custom"

From c5f86d05578f839d9f2c8dfe6f37ff58df4c3d29 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 21 Feb 2024 13:28:38 +0800
Subject: [PATCH 016/374] =?UTF-8?q?=E8=A2=AB=E8=9E=8D=E5=90=88=E7=9A=84?=
 =?UTF-8?q?=E7=97=85=E7=81=B6=E5=9C=A8=E4=B8=8B=E6=AC=A1=E9=9A=8F=E8=AE=BF?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=8A=B6=E6=80=81=E4=B8=BA=E6=B6=88=E5=A4=B1?=
 =?UTF-8?q?=E4=B8=94=E4=B8=8D=E8=83=BD=E5=86=8D=E6=93=8D=E4=BD=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue | 11 ++++++-----
 .../reading/dicoms/components/Lugano/QuestionList.vue |  9 +++++++--
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 4b3b76b3..0ca86fd8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -88,7 +88,7 @@
             v-model="questionForm[qs.Id]"
             filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
-            :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1'"
+            :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
             :popper-append-to-body="lesionType === 0 ? false :true"
             @change="((val)=>{formItemChange(val, qs)})"
           >
@@ -234,7 +234,7 @@
         </el-form-item>
       </div>
       <div
-        v-if="isCurrentTask && readingTaskState<2 && answers.SplitOrMergeType !== '1'"
+        v-if="isCurrentTask && readingTaskState<2 && (answers.SplitOrMergeType !== '1' && answers.SplitOrMergeType !== '3')"
         class="base-dialog-footer"
         style="text-align:right;margin-top:10px;"
       >
@@ -1706,7 +1706,6 @@ export default {
           this.$set(this.questionForm, lengId, '')
           var shortId = this.getQuestionId(1)
           this.$set(this.questionForm, shortId, '')
-
           var stateId = this.getQuestionId(7)
           this.$set(this.questionForm, stateId, '')
           // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
@@ -1841,8 +1840,10 @@ export default {
         if (this.isCurrentTask && this.readingTaskState < 2) {
           var lesionState = this.getQuestionVal(7)
           if (isNaN(parseInt(lesionState)) && this.answers.IsFristAdd === 'False') {
-            const stateId = this.getQuestionId(7)
-            this.$set(this.questionForm, stateId, 2)
+            if (this.answers.SplitOrMergeType !== '3') {
+              const stateId = this.getQuestionId(7)
+              this.$set(this.questionForm, stateId, 2)
+            }
             var isLymphLesion = this.getQuestionVal(2)
             isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
             const lesionPart = this.getQuestionVal(8)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 8f52d19b..df68e89e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -968,7 +968,8 @@ export default {
         this.$nextTick(() => {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
-            var markTool = this.$refs[refName][0].currentMarkTool
+            var splitOrMergeType = this.$refs[refName][0].answers.SplitOrMergeType
+            var markTool = splitOrMergeType !== '3' ? this.$refs[refName][0].currentMarkTool : ''
             var readingTaskState = this.readingTaskState
             var isMarked = !!this.$refs[refName][0].questionForm.MeasureData
             DicomEvent.$emit('imageLocation', { questionId: this.activeItem.activeCollapseId, rowIndex: this.activeItem.activeRowIndex, visitTaskId: this.visitTaskId, lesionName: this.$refs[refName][0].lesionMark, lesionType: this.$refs[refName][0].lesionType, markTool, readingTaskState, isMarked })
@@ -1137,7 +1138,11 @@ export default {
         this.$nextTick(() => {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (!this.$refs[refName][0].questionForm.MeasureData || (this.$refs[refName][0].questionForm && this.$refs[refName][0].questionForm.MeasureData && measureData.data.uuid === this.$refs[refName][0].questionForm.MeasureData.data.uuid)) {
-            this.$refs[refName][0].setMeasureData(measureData)
+            if (!this.$refs[refName][0].questionForm.MeasureData && this.$refs[refName][0].answers.SplitOrMergeType === '3') {
+              this.createNLTarget(measureData)
+            } else {
+              this.$refs[refName][0].setMeasureData(measureData)
+            }
           } else {
             if (this.isBaseLineTask) {
               var idx = this.tableQuestions.findIndex(item => item.LesionType === 0)

From 9033119fb1b11c928b5aeb0b0a525ef0f4f4efc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 15:43:31 +0800
Subject: [PATCH 017/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/pic-2.png                            | Bin 0 -> 49215 bytes
 src/views/login/index.vue                       |   2 +-
 src/views/research/form.vue                     |   2 +-
 .../visit-plan/components/visitPlanForm.vue     |   6 ++++--
 4 files changed, 6 insertions(+), 4 deletions(-)
 create mode 100644 src/assets/pic-2.png

diff --git a/src/assets/pic-2.png b/src/assets/pic-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..59ad4180742e9ca6d8ebb28c9672f94b3942e88a
GIT binary patch
literal 49215
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

literal 0
HcmV?d00001

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 38900c47..3a96b5b7 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -148,7 +148,7 @@ import { mapGetters, mapMutations } from 'vuex'
 import TopLang from './topLang'
 // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee'
 import Vcode from 'vue-puzzle-vcode'
-import Img1 from '@/assets/pic-1.png'
+import Img1 from '@/assets/pic-2.png'
 export default {
   name: 'Login',
   components: { TopLang, Vcode },
diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index c666b5cd..6e3892b3 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -23,7 +23,7 @@
             v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
             type="primary"
             size="small"
-            @click="handleSubmit2"
+            @click="handleSubmit"
           >
             {{ $t('trials:researchForm:button:auditPasses') }}
           </el-button>
diff --git a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
index 55fbf76f..1e143e79 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
@@ -120,8 +120,8 @@ export default {
         Description: '',
         IsBaseLine: false,
         // BlindName: '',
-        VisitWindowLeft: 0,
-        VisitWindowRight: 0,
+        VisitWindowLeft: -3,
+        VisitWindowRight: 3,
         IsConfirmed: false,
         IsDeleted: false,
         IsHaveFirstConfirmed: false
@@ -173,6 +173,8 @@ export default {
       this.$refs.visitPlanForm.validate((valid) => {
         if (valid) {
           this.isDisabled = true
+          if (!this.form.VisitWindowLeft) this.form.VisitWindowLeft = 0
+          if (!this.form.VisitWindowRight) this.form.VisitWindowRight = 0
           addOrUpdateVisitStage(this.form).then((res) => {
             this.isDisabled = false
             this.$emit('getList')

From a1dc9e40317fb141dbba1439db393e94a7406328 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 16:00:17 +0800
Subject: [PATCH 018/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/resumeInfo/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue
index 98f572b3..aaf5835b 100644
--- a/src/views/resumeInfo/index.vue
+++ b/src/views/resumeInfo/index.vue
@@ -192,7 +192,7 @@ export default {
               this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
               !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
-              this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`
+              this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName} ${this.$t('resumeInfo:title:Details')}`
               this.htmlTitle = this.title
               this.initStatus()
               this.initEmploymentInfo()

From 8d9790f68e52dcfadcbd9ff0031110b9c7fc68e7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 16:19:24 +0800
Subject: [PATCH 019/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json    | 9 +++++++++
 package.json         | 1 +
 src/utils/request.js | 3 +++
 3 files changed, 13 insertions(+)

diff --git a/package-lock.json b/package-lock.json
index 7c02734b..285d43f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11520,6 +11520,15 @@
       "resolved": "https://registry.npmmirror.com/moment/-/moment-2.29.4.tgz",
       "integrity": "sha512-5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="
     },
+    "moment-timezone": {
+      "version": "0.5.45",
+      "resolved": "https://registry.npmmirror.com/moment-timezone/-/moment-timezone-0.5.45.tgz",
+      "integrity": "sha512-HIWmqA86KcmCAhnMAN0wuDOARV/525R2+lOLotuGFzn4HO+FH+/645z2wx0Dt3iDv6/p61SIvKnDstISainhLQ==",
+      "dev": true,
+      "requires": {
+        "moment": "^2.29.4"
+      }
+    },
     "move-concurrently": {
       "version": "1.0.1",
       "resolved": "https://registry.npmmirror.com/move-concurrently/-/move-concurrently-1.0.1.tgz",
diff --git a/package.json b/package.json
index 7d59d226..d568f644 100644
--- a/package.json
+++ b/package.json
@@ -83,6 +83,7 @@
     "eslint-plugin-vue": "^6.2.2",
     "html-webpack-plugin": "3.2.0",
     "minio": "^7.1.3",
+    "moment-timezone": "^0.5.45",
     "node-xlsx": "^0.21.0",
     "runjs": "^4.3.2",
     "script-ext-html-webpack-plugin": "2.1.3",
diff --git a/src/utils/request.js b/src/utils/request.js
index c6b742fb..7f671acc 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -3,6 +3,8 @@ import { Message, MessageBox, Alert } from 'element-ui'
 import store from '@/store'
 import router from '@/router'
 import Vue from 'vue'
+import moment from 'moment-timezone';
+console.log(moment.tz.guess())
 axios.defaults.withCredentials = false
 const service = axios.create({
   baseURL: '/api',
@@ -19,6 +21,7 @@ service.interceptors.request.use(
     config.headers['Content-Type'] = 'application/json;charset=UTF-8'
     var language = zzSessionStorage.getItem('lang')
     config.headers['Accept-Language'] = language === 'en'?'en-US,en;q=0.5':'zh-CN,zh;q=0.9'
+    config.headers['TimeZoneId'] = moment.tz.guess()
     if (store.getters.token) {
       config.headers.Authorization = `Bearer ${store.getters.token}`
     }

From d8cd8d336d25c810e2c78e76bd4d0caa08cd2f94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 16:22:13 +0800
Subject: [PATCH 020/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/blindResumeInfo/info.vue | 4 ++--
 src/views/resumeInfo/index.vue     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue
index 0b1b85c9..23976023 100644
--- a/src/views/blindResumeInfo/info.vue
+++ b/src/views/blindResumeInfo/info.vue
@@ -90,7 +90,7 @@ export default {
         this.setLanguage('zh')
         this.$updateDictionary()
       }
-      this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName} ${this.$t('resumeInfo:title:Details')}`:''
+      this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:''
     }
   },
   mounted() {
@@ -180,7 +180,7 @@ export default {
               this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
               !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
-              this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName} ${this.$t('resumeInfo:title:Details')}`:''
+              this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:''
               // this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
               this.htmlTitle = this.title
               this.initStatus()
diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue
index aaf5835b..9d5dfda4 100644
--- a/src/views/resumeInfo/index.vue
+++ b/src/views/resumeInfo/index.vue
@@ -102,7 +102,7 @@ export default {
         this.setLanguage('zh')
         this.$updateDictionary()
       }
-      this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName} ${this.$t('resumeInfo:title:Details')}`:''
+      this.title =this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`:''
     }
   },
   mounted() {
@@ -192,7 +192,7 @@ export default {
               this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
               !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
-              this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName} ${this.$t('resumeInfo:title:Details')}`
+              this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`
               this.htmlTitle = this.title
               this.initStatus()
               this.initEmploymentInfo()

From 8085585cfafd6ca88463c6c52ff1b12a1c3bc05e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 16:41:11 +0800
Subject: [PATCH 021/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 3a96b5b7..98e72e44 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -109,7 +109,7 @@
         <span style="color:#428bca">关于</span>
       </a>
     </div>
-    <Vcode :show="isShow" :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
+    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
     <el-dialog
       v-if="aboutVisible"
       :visible.sync="aboutVisible"

From e3ffd6d6c9dbf6be99869efd027864c9e4972949 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 16:44:13 +0800
Subject: [PATCH 022/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 98e72e44..6e563c7e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -180,6 +180,7 @@ export default {
       loginType: null,
       location: null,
       isShow: false,
+      showCode: false,
       Img1
     }
   },
@@ -230,8 +231,11 @@ export default {
       this.loginType = this.$route.query.loginType
       this.$refs.loginForm.validate(valid => {
         if (valid) {
-          this.isShow = true
-          // this.onSuccess()
+          if (this.showCode) {
+            this.isShow = true
+          } else {
+            this.onSuccess()
+          }
         } else {
           // console.log('error submit!!')
           return false
@@ -240,6 +244,7 @@ export default {
     },
     loginIn() {
       this.loading = true
+      this.showCode = false
       this.$store.dispatch('user/login', this.loginForm).then((res) => {
         if (!res) {
           // 当前用户为首次登录,请先修改密码之后再次登录
@@ -274,6 +279,7 @@ export default {
         })
       })
         .catch(() => {
+          this.showCode = true
           this.loading = false
         })
     },

From 949a09ac50d6bd6e26424b63cf7045c24460ee81 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 21 Feb 2024 16:52:16 +0800
Subject: [PATCH 023/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/login/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 6e563c7e..1a5d563e 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -109,7 +109,7 @@
         <span style="color:#428bca">关于</span>
       </a>
     </div>
-    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
+    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :success-text="$t('login:button:successText')" :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
     <el-dialog
       v-if="aboutVisible"
       :visible.sync="aboutVisible"

From f30e859e33dff16dd952cf168eb859d17e59b3c3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 09:44:40 +0800
Subject: [PATCH 024/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/resumeInfo/index.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue
index 9d5dfda4..e2fccde9 100644
--- a/src/views/resumeInfo/index.vue
+++ b/src/views/resumeInfo/index.vue
@@ -197,6 +197,7 @@ export default {
               this.initStatus()
               this.initEmploymentInfo()
               this.initSpecialtyInfo()
+              //
             }
           }
         })

From ee15957aa77669f1aa77f0dbc0175095bb8f4005 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 09:47:04 +0800
Subject: [PATCH 025/374] =?UTF-8?q?=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/blindResumeInfo/info.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue
index 23976023..852c990c 100644
--- a/src/views/blindResumeInfo/info.vue
+++ b/src/views/blindResumeInfo/info.vue
@@ -136,6 +136,7 @@ export default {
         } else {
           this.workInfo.Position = this.workInfo.Position
           this.workInfo.PositionCN = this.workInfo.PositionCN
+          //
         }
         this.workInfo.PositionOther = this.workInfo.PositionOther ? 'Other - ' + this.workInfo.PositionOther : 'Other'
       }

From b9eaab19005af7c5a44be8dbc2243b33aee7119d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 09:58:33 +0800
Subject: [PATCH 026/374] 1

---
 src/views/blindResumeInfo/info.vue | 1 -
 src/views/resumeInfo/index.vue     | 3 +--
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/blindResumeInfo/info.vue b/src/views/blindResumeInfo/info.vue
index 852c990c..1790345c 100644
--- a/src/views/blindResumeInfo/info.vue
+++ b/src/views/blindResumeInfo/info.vue
@@ -182,7 +182,6 @@ export default {
               this.doctorInfo = res.Result
               !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
               this.title = this.doctorInfo.BasicInfoView?`${this.doctorInfo.BasicInfoView.BlindName}${this.$t('resumeInfo:title:Details')}`:''
-              // this.title = `${this.doctorInfo.BasicInfoView.BlindName} 's Details`
               this.htmlTitle = this.title
               this.initStatus()
               this.initEmploymentInfo()
diff --git a/src/views/resumeInfo/index.vue b/src/views/resumeInfo/index.vue
index e2fccde9..e5a5dad2 100644
--- a/src/views/resumeInfo/index.vue
+++ b/src/views/resumeInfo/index.vue
@@ -189,15 +189,14 @@ export default {
           this.pageLoading = false
           if (res.IsSuccess) {
             if (res.Result) {
-              this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               this.doctorInfo = res.Result
+              this.holiday = res.Result.InHoliday ? 'Yes' : 'No'
               !this.doctorInfo.ResearchPublicationView ?  this.doctorInfo.ResearchPublicationView = {} : '';
               this.title = `${this.doctorInfo.BasicInfoView.FirstName} ${this.doctorInfo.BasicInfoView.LastName}${this.$t('resumeInfo:title:Details')}`
               this.htmlTitle = this.title
               this.initStatus()
               this.initEmploymentInfo()
               this.initSpecialtyInfo()
-              //
             }
           }
         })

From fa831ed6cc374aeb34782e333d0f86555a8293ed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 13:25:51 +0800
Subject: [PATCH 027/374] 1

---
 src/assets/zzlogo3.png                        | Bin 22294 -> 15219 bytes
 .../trials-layout/components/topLang.vue      |   2 +-
 .../components/uploadNonDicomFiles.vue        |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/assets/zzlogo3.png b/src/assets/zzlogo3.png
index a2fefc7a8bfcd752d42a39762796e670767e2d70..6a21b1c6369c6dc97075324067919a919f2db72d 100644
GIT binary patch
literal 15219
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
AA^-pY

literal 22294
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
Bh1385

diff --git a/src/views/trials/trials-layout/components/topLang.vue b/src/views/trials/trials-layout/components/topLang.vue
index b5002d0a..c3b9caf1 100644
--- a/src/views/trials/trials-layout/components/topLang.vue
+++ b/src/views/trials/trials-layout/components/topLang.vue
@@ -46,7 +46,7 @@ export default {
       this.$updateDictionary()
       console.log(Vue)
       this.$upload()
-      // window.location.reload()
+      window.location.reload()
     }
   }
 }
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index 40e7a2c5..b3abd3d2 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -241,7 +241,7 @@
       <form id="inputForm" ref="uploadForm">
         <el-divider content-position="left">{{ $t('trials:uploadNonDicoms:label:fileType') }}</el-divider>
         <div class="form-group">
-          <div class="upload">
+          <div class="upload" style="margin-right: 10px">
             <input multiple="multiple" webkitdirectory="" directory accept="*/*" type="file" name="uploadFolder" class="select-file" title="" @change="beginScanFiles($event)">
             <div class="btn-select">
               {{ $t('trials:uploadNonDicoms:button:selectFolder') }}

From 89f924d0778ffd629589ef6878bd1017c78502eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 17:05:34 +0800
Subject: [PATCH 028/374] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                                                        | 2 +-
 .../trials/trials-panel/trial-summary/audit-record/index.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.usa b/.env.usa
index 84f3865a..2cd03ed7 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-02-16/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-02-22/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index f649d2ec..e8f5e54e 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -440,7 +440,7 @@
         custom-class="base-dialog-wrapper"
       >
         <el-table
-            v-adaptive="{bottomOffset:300}"
+            v-adaptive="{bottomOffset:40}"
             v-loading="loading"
             :data="list2"
             stripe

From 05cdf17282d3ad2bfe74b4f4deed7d1d7a582198 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 17:09:21 +0800
Subject: [PATCH 029/374] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=A9=BA=E7=99=BD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/trial-summary/audit-record/index.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index e8f5e54e..248b192f 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -440,7 +440,7 @@
         custom-class="base-dialog-wrapper"
       >
         <el-table
-            v-adaptive="{bottomOffset:40}"
+            v-adaptive="{bottomOffset:20}"
             v-loading="loading"
             :data="list2"
             stripe

From 6c0f148a776da87084b545cf3decb2fa55f88e66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 22 Feb 2024 17:18:51 +0800
Subject: [PATCH 030/374] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=A9=BA=E7=99=BD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/trial-summary/upload-monitor/index.vue | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 31ec845f..3b8f8615 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -304,21 +304,18 @@
           <div v-if="lookText.Failed.length">
             <div v-for="item of lookText.Failed">{{item}}</div>
           </div>
-          <div v-else>无</div>
         </div>
         <div style="margin-bottom: 10px;font-size:12px">
           <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Existed')}}：</div>
           <div v-if="lookText.Existed.length">
             <div v-for="item of lookText.Existed">{{item}}</div>
           </div>
-          <div v-else>无</div>
         </div>
         <div style="margin-bottom: 10px;font-size:12px">
           <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Uploaded')}}：</div>
           <div v-if="lookText.Uploaded.length">
             <div v-for="item of lookText.Uploaded">{{item}}</div>
           </div>
-          <div v-else>无</div>
         </div>
       </div>
       <div slot="footer" class="dialog-footer">

From 101dd3210e14efb3a5e7966e5bab4fdd034424cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 09:50:37 +0800
Subject: [PATCH 031/374] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E4=BA=8C=E7=BA=A7?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E7=A9=BA=E7=99=BD=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/checkConfig/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 4e7cd70f..926d69c7 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -33,7 +33,7 @@
       <el-table-column prop="ModuleTypeValueCN" label="模块" show-overflow-tooltip align="left" min-width="230px" />
       <el-table-column prop="Description" label="操作名称" :show-overflow-tooltip="true" min-width="200px">
         <template slot-scope="scope">
-          <span>{{ scope.row.Description }}（{{scope.row.DescriptionCN}}）</span>
+          <span>{{ scope.row.DescriptionCN }}（{{scope.row.Description}}）</span>
         </template>
       </el-table-column>
       <el-table-column prop="DescriptionCN" label="其他" :show-overflow-tooltip="true" min-width="140px">

From 0d9fabb596d47b4d77fe0223cae20ee06ecfb69a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 10:07:15 +0800
Subject: [PATCH 032/374] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=82=AE=E7=AE=B1?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=E4=B8=8D=E8=83=BD=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-myinfo/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index 8998992e..77c36c16 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -100,7 +100,7 @@
           <el-form-item label="" style="position: relative" prop="VerificationCode">
             <el-input v-model="userForm.VerificationCode" :placeholder="$t('trials:researchForm:form:verifyCode')"/>
             <!-- 修改 -->
-            <el-button :disabled="!userForm.EMail || !userForm.VerificationCode || sendDisabled" class="saveBtn" type="primary" size="small" @click="setNewEmail">
+            <el-button :disabled="!userForm.EMail || !userForm.VerificationCode" class="saveBtn" type="primary" size="small" @click="setNewEmail">
               {{ $t('trials:trials-myinfo:button:update') }}
             </el-button>
           </el-form-item>

From 1cb52de265628fe60c9d6d9ca76d8410cd70aea4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 10:27:40 +0800
Subject: [PATCH 033/374] =?UTF-8?q?=E5=8E=BB=E9=99=A4MIM=E5=AF=BC=E8=A1=A8?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/mim-medical-audit/index.vue  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index 65de5ae9..fd209374 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -155,11 +155,6 @@
                   {{ $t('common:button:reset') }}
                 </el-button>
               </el-form-item>
-              <el-form-item>
-                <el-button type="primary" icon="el-icon-download" @click="handleReset">
-                  {{ $t('common:button:export') }}
-                </el-button>
-              </el-form-item>
               <!--导出-->
             </el-form>
           </div>

From 1bf99379a8f8d455b4569cf735f3aaf0aaf80d5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 10:49:44 +0800
Subject: [PATCH 034/374] 1

---
 src/assets/zzlogo3.png | Bin 15219 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/assets/zzlogo3.png

diff --git a/src/assets/zzlogo3.png b/src/assets/zzlogo3.png
deleted file mode 100644
index 6a21b1c6369c6dc97075324067919a919f2db72d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15219
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
AA^-pY


From 791746097d2ff273bf5784183dcea6056951c064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 10:50:25 +0800
Subject: [PATCH 035/374] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87log?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/zzlogo3.png | Bin 0 -> 15219 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 src/assets/zzlogo3.png

diff --git a/src/assets/zzlogo3.png b/src/assets/zzlogo3.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a21b1c6369c6dc97075324067919a919f2db72d
GIT binary patch
literal 15219
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
AA^-pY

literal 0
HcmV?d00001


From 89eaccf1c2b0db5e7547d0a19d97a9cc0db5e52f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 11:08:39 +0800
Subject: [PATCH 036/374] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8B=B1=E6=96=87log?=
 =?UTF-8?q?o?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/zzlogo4.png                          | Bin 0 -> 15219 bytes
 src/views/login/index.vue                       |   2 +-
 .../trials-layout/components/trialsNavbar.vue   |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 src/assets/zzlogo4.png

diff --git a/src/assets/zzlogo4.png b/src/assets/zzlogo4.png
new file mode 100644
index 0000000000000000000000000000000000000000..6a21b1c6369c6dc97075324067919a919f2db72d
GIT binary patch
literal 15219
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
AA^-pY

literal 0
HcmV?d00001

diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index 1a5d563e..2cbf01c9 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -7,7 +7,7 @@
       <div class="login-l">
         <div class="login-logo">
           <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="">
-          <img v-else src="@/assets/zzlogo3.png" alt="">
+          <img v-else src="@/assets/zzlogo4.png" alt="">
         </div>
         <div class="login-image">
           <img src="@/assets/login-bg.png">
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index 6bdf82fc..f91dc235 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -2,7 +2,7 @@
   <div class="trials-navbar" style="position: relative">
     <div class="leftMenu">
       <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="">
-      <img v-else src="@/assets/zzlogo3.png" alt="">
+      <img v-else src="@/assets/zzlogo4.png" alt="">
       <span>
         <!-- 中心影像系统（EICS） -->
         {{ $t('trials:trials:title:eics') }}

From c1a9e848b0516ace804b77345b99f8db7872aadb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 23 Feb 2024 12:59:42 +0800
Subject: [PATCH 037/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 0ca86fd8..1e52c47a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -528,8 +528,8 @@ export default {
       }
       if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 0) {
         arr.push(`(Split from ${this.answers.SplitOrMergeLesionName})`)
-      } else if (this.answers.MeltingInToLesionMarks && parseInt(this.answers.SplitOrMergeType) === 1) {
-        arr.push(`(Merge to ${this.answers.MeltingInToLesionMarks})`)
+      } else if (this.answers.SplitOrMergeLesionName && parseInt(this.answers.SplitOrMergeType) === 1) {
+        arr.push(`(Merge to ${this.answers.SplitOrMergeLesionName})`)
       }
       return arr.join(' ')
     },

From ce3065d88fcfe9575bf04919d770c7b89bbb0e3b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 13:09:50 +0800
Subject: [PATCH 038/374] =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E5=88=B7=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/checkConfig/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 926d69c7..63a91cd9 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -608,11 +608,11 @@
       <div style="padding: 0 40px;display: flex;flex-direction: column">
         <div style="text-align: right;height: 50px;">
           <el-select v-model="copeParams.FromItemId" collapse-tags filterable placeholder="完全拷贝对象" clearable size="small">
-            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.Description" />
+            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" style="margin-right: 10px" @click="handleOverCope(selectRow)">完全拷贝</el-button>
           <el-select v-model="copeParams.DataSourceGuids" multiple collapse-tags filterable placeholder="拷贝对象" clearable size="small">
-            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.Description" />
+            <el-option v-for="item of list" v-if="drawer_cfg.drawerChild && item.ConfigType === 'M' && item.ObjectTypeId === selectRow.ObjectTypeId && item.OptTypeId && item.ChildrenTypeId " :value="item.Id" :label="item.DescriptionCN" />
           </el-select>
           <el-button type="primary" size="mini" @click="handleCope(selectRow)">拷贝</el-button>
           <el-button type="primary" size="mini" @click="handleAdd(selectRow)">新建</el-button>

From 2cc0b81c90b85cecf47a9ca87a2632e60121501f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 14:27:02 +0800
Subject: [PATCH 039/374] =?UTF-8?q?=E5=A4=8D=E5=88=B6=E7=A8=BD=E6=9F=A5?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/checkConfig/index.vue | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/src/views/dictionary/checkConfig/index.vue b/src/views/dictionary/checkConfig/index.vue
index 63a91cd9..03ad0ce1 100644
--- a/src/views/dictionary/checkConfig/index.vue
+++ b/src/views/dictionary/checkConfig/index.vue
@@ -668,6 +668,12 @@
             <el-table-column prop="TrialConfigRelyFieldName" label="依赖字段" min-width="120px" :show-overflow-tooltip="true" />
             <el-table-column label="操作" align="center" min-width="180" class-name="small-padding fixed-width">
               <template slot-scope="scope">
+                <el-button
+                  size="mini"
+                  type="text"
+                  icon="el-icon-edit"
+                  @click="handleCopyData(scope.row)"
+                >复制</el-button>
                 <el-button
                   size="mini"
                   type="text"
@@ -1146,6 +1152,16 @@ export default {
       this.title = '修改'
       this.rowDrop2()
     },
+    handleCopyData (row) {
+      this.$confirm('确定复制该条记录到当前稽查下吗？').then(() => {
+        let params = {...row}
+        delete params.Id
+        addOrUpdateFrontAuditConfig(params).then(() => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.getList()
+        })
+      })
+    },
     /** 提交按钮 */
     submitForm: function() {
       this.$refs['form'].validate(valid => {

From fcc239b54e010cf618869c53ea95fa58d06897e3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 23 Feb 2024 14:33:01 +0800
Subject: [PATCH 040/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue |  8 +++
 .../dicoms/components/Lugano/QuestionForm.vue | 72 +++++++++++++------
 .../dicoms/components/Lugano/QuestionList.vue | 11 +--
 3 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 7fa1137d..8273b0fd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -680,6 +680,14 @@ export default {
       const imageId = this.stack.imageIds[this.stack.currentImageIdIndex]
       ToolStateManager.clearImageIdToolState(imageId)
       cornerstone.updateImage(this.canvas, true)
+      var criterionType = parseInt(localStorage.getItem('CriterionType'))
+      if (this.isFirstChangeTask) {
+        this.disabledMarks = this.getDisabledMarks(this.visitTaskList[idx].MeasureData)
+      } else if (criterionType === 2) {
+        this.disabledMarks = this.getMergeMarks(this.visitTaskList[idx].MeasureData)
+      } else {
+        this.disabledMarks = []
+      }
       return true
     },
     onContextmenu(event) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 1e52c47a..eebc9993 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -470,27 +470,39 @@ export default {
       sdiIncrease = isNaN(parseFloat(sdiIncrease)) ? 0 : parseFloat(sdiIncrease)
 
       if (!this.isBaseLineTask && state === 4 && this.lesionType === 0 && ldi && pddIncrease && ldiIncrease && sdiIncrease) {
-        if (this.splitLesionTargetPDD) {
-          var minPPD = this.getQuestionVal(13)
-          minPPD = parseFloat(minPPD)
-          pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
-        }
-        /** 疾病进展
+        /** 融合主病灶疾病进展
+         * 当前融合靶病灶LDi>15
+         * 相比最低点PPD增加百分比 ≥50％
+        **/
+        if (this.answers.SplitOrMergeType === '4') {
+          if (ldi > 15 && pddIncrease >= 50) {
+            this.stateDisabled = true
+          } else {
+            this.stateDisabled = false
+          }
+        } else {
+          if (this.splitLesionTargetPDD) {
+            var minPPD = this.getQuestionVal(13)
+            minPPD = parseFloat(minPPD)
+            pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+          }
+          /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
          * 相比最低点PPD增加百分比 ≥50％
          * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
         **/
-        if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
-          this.stateDisabled = true
-        } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+          if ((ldi > 15 && ldi <= 20) && (pddIncrease >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+            this.stateDisabled = true
+          } else if ((ldi > 20) && (pddIncrease >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
           /** 疾病进展
            * 当前靶病灶LDi>20 mm
            * 相比最低点PPD增加百分比 ≥50％
            * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
           **/
-          this.stateDisabled = true
-        } else {
-          this.stateDisabled = false
+            this.stateDisabled = true
+          } else {
+            this.stateDisabled = false
+          }
         }
       } else {
         this.stateDisabled = false
@@ -968,32 +980,48 @@ export default {
       }
       /** 疾病进展* **/
       if (!this.isBaseLineTask && ldi && pddIncreaseNum && ldiIncrease && sdiIncrease && this.lesionType === 0 && this.isCurrentTaskAdd === 'False') {
+        if (this.answers.SplitOrMergeType === '4') {
+          /** 融合主病灶疾病进展
+           * 当前融合靶病灶LDi>15
+           * 相比最低点PPD增加百分比 ≥50％
+          **/
+          if (ldi > 15 && pddIncreaseNum >= 50) {
+            console.log('融合主病灶疾病进展')
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else {
+            // 不符合疾病进展是否需要清空修改前疾病进展的状态
+            this.stateDisabled = false
+          }
+        } else {
         /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
          * 相比最低点PPD增加百分比 ≥50％
          * 相比PPD最低点LDi增加值 ≥5 mm 或者 相比PPD最低点SDi增加值≥5 mm
         **/
-        if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
-          const stateId = this.getQuestionId(7)
-          this.$set(this.questionForm, stateId, 4)
-          this.stateDisabled = true
-        } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
+          if ((ldi > 15 && ldi <= 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 5 || sdiIncrease >= 5)) {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else if ((ldi > 20) && (pddIncreaseNum >= 50) && (ldiIncrease >= 10 || sdiIncrease >= 10)) {
           /** 疾病进展
            * 当前靶病灶LDi>20 mm
            * 相比最低点PPD增加百分比 ≥50％
            * 相比PPD最低点LDi增加值 ≥10 mm 或者 相比PPD最低点SDi增加值Sdi ≥10 mm
           **/
-          const stateId = this.getQuestionId(7)
-          this.$set(this.questionForm, stateId, 4)
-          this.stateDisabled = true
-        } else {
+            const stateId = this.getQuestionId(7)
+            this.$set(this.questionForm, stateId, 4)
+            this.stateDisabled = true
+          } else {
           // 不符合疾病进展是否需要清空修改前疾病进展的状态
           // const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
           // if (lesionState === 4) {
           //   const stateId = this.getQuestionId(7)
           //   this.$set(this.questionForm, stateId, null)
           // }
-          this.stateDisabled = false
+            this.stateDisabled = false
+          }
         }
       } else {
         // 不符合疾病进展是否需要清空修改前疾病进展的状态
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index df68e89e..f92dff6c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -66,11 +66,14 @@
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].MeltingInToLesionMarks}`" placement="bottom">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
                             <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'">
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                            <span class="login-cycle" />
+                          </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">
                             <div v-if="item.TableQuestions.Answers[i].lesionPart" style="max-width: 100px;overflow: hidden;">
                               {{ item.TableQuestions.Answers[i].lesionPart }}
@@ -95,7 +98,7 @@
                       </div>
                       <div v-if="item.TableQuestions.Answers[i].IsCurrentTaskAdd === 'False'" style="position: absolute;right: 5px;top: 2px;">
                         <!-- 分裂 -->
-                        <el-tooltip v-show="!!item.TableQuestions.Answers[i].RowId && item.TableQuestions.Answers[i].SplitOrMergeType !== '1' && ((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">
+                        <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)" />
                         </el-tooltip>
 
@@ -708,8 +711,8 @@ export default {
       var params = {
         visitTaskId: this.visitTaskId,
         questionId: this.mergeInfo.questionId,
-        mergeRowId: this.mergeInfo.mergeRowId,
-        meltingInToLesionList: this.mergeList
+        mergeMainRowId: this.mergeInfo.mergeRowId,
+        mergeRowIdList: this.mergeList
       }
       mergeLesion(params).then(res => {
         this.merge.loading = false

From c1faaf9ef0cc1b8cd2986d72a9613ce2cd65c248 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 23 Feb 2024 14:35:55 +0800
Subject: [PATCH 041/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index eebc9993..80a38d01 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -986,7 +986,6 @@ export default {
            * 相比最低点PPD增加百分比 ≥50％
           **/
           if (ldi > 15 && pddIncreaseNum >= 50) {
-            console.log('融合主病灶疾病进展')
             const stateId = this.getQuestionId(7)
             this.$set(this.questionForm, stateId, 4)
             this.stateDisabled = true

From 0c4065102cb619a027a1c621900c39ff82de83bd Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 23 Feb 2024 14:46:54 +0800
Subject: [PATCH 042/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E8=9E=8D?=
 =?UTF-8?q?=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 80a38d01..26f50181 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -474,7 +474,7 @@ export default {
          * 当前融合靶病灶LDi>15
          * 相比最低点PPD增加百分比 ≥50％
         **/
-        if (this.answers.SplitOrMergeType === '4') {
+        if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') {
           if (ldi > 15 && pddIncrease >= 50) {
             this.stateDisabled = true
           } else {
@@ -980,7 +980,7 @@ export default {
       }
       /** 疾病进展* **/
       if (!this.isBaseLineTask && ldi && pddIncreaseNum && ldiIncrease && sdiIncrease && this.lesionType === 0 && this.isCurrentTaskAdd === 'False') {
-        if (this.answers.SplitOrMergeType === '4') {
+        if (this.answers.SplitOrMergeType === '4' || this.answers.SplitOrMergeType === '5') {
           /** 融合主病灶疾病进展
            * 当前融合靶病灶LDi>15
            * 相比最低点PPD增加百分比 ≥50％

From c1008810d66ce5f10343e3d831e0f9b9f4c8fbdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 17:14:39 +0800
Subject: [PATCH 043/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=BB=91=E5=9D=97?=
 =?UTF-8?q?=E5=9C=A8canvas=E5=A4=96=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/customize/CustomizeDicomCanvas.vue      | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 021eb599..2430b365 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -7,7 +7,6 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     style="position:relative;"
     class="cornerstone-element"
-    @mousemove="sliderMousemove"
     @mouseup="sliderMouseup"
     @contextmenu.prevent="onContextmenu"
   >
@@ -328,9 +327,9 @@ export default {
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
     })
-    // document.addEventListener('mousemove', () => {
-    //   this.sliderMousemove()
-    // })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+    })
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : ''

From 82c80b71cc97d928bff7c85db90ed8c3fa6b9a9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 23 Feb 2024 17:15:42 +0800
Subject: [PATCH 044/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=BB=91=E5=9D=97?=
 =?UTF-8?q?=E5=9C=A8canvas=E5=A4=96=E6=BB=91=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomCanvas.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8273b0fd..ff6c26d7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -7,7 +7,6 @@
     element-loading-background="rgba(0, 0, 0, 0.8)"
     style="position:relative;"
     class="cornerstone-element"
-    @mousemove="sliderMousemove"
     @mouseup="sliderMouseup"
     @contextmenu.prevent="onContextmenu"
   >
@@ -338,9 +337,9 @@ export default {
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
     })
-    // document.addEventListener('mousemove', () => {
-    //   this.sliderMousemove()
-    // })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+    })
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.type = this.$router.currentRoute.query.type ? this.$router.currentRoute.query.type : ''

From ef732066f4783e766ab78e94679de7fd5b63fd34 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 26 Feb 2024 13:25:14 +0800
Subject: [PATCH 045/374] =?UTF-8?q?lugano=20suv=E6=B5=8B=E9=87=8F=E5=B7=A5?=
 =?UTF-8?q?=E5=85=B7=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Fusion/TableQuestionItem.vue   |  24 ++
 .../components/Fusion/tools/CircleROITool.js  | 278 ++++++++++++++----
 .../dicoms/components/Lugano/QuestionList.vue |   1 +
 vue.config.js                                 |   2 +-
 4 files changed, 241 insertions(+), 64 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index abbf12c5..7bed9b4f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -730,6 +730,30 @@ export default {
           })
           return
         }
+        // 消失、无法评估状态的病灶限制不能测量SUV值
+        var lesionState = this.getQuestionVal(7)
+        if ((lesionState === 2 || lesionState === 3) && this.questionForm.OtherMeasureData) {
+          this.$confirm(this.$t('评估状态为无法评估或消失的病灶不能测量SUV值！'), {
+            type: 'warning',
+            showCancelButton: false,
+            callback: action => {}
+          })
+          return
+        }
+        // suv测量值可以测量为0，但不能与病灶、肝脏、纵隔血池绑定。
+        if (this.questionForm.OtherMeasureData) {
+          console.log(this.questionForm.OtherMeasureData)
+          var suvmax = this.getQuestionVal(20)
+          if (suvmax === 0) {
+            this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), {
+              type: 'warning',
+              showCancelButton: false,
+              callback: action => {}
+            })
+            return
+          }
+        }
+
         const loading = this.$loading({ fullscreen: true })
         var otherMeasureData = this.questionForm.OtherMeasureData ? Object.assign({}, this.questionForm.OtherMeasureData) : null
         if (otherMeasureData) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
index 467bde77..69a70a6c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
@@ -83,81 +83,81 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
     // )
     // this._getTextLines = this.getTextLines
   }
-  // addNewAnnotation = (evt) => {
-  //   const eventDetail = evt.detail;
-  //   const { currentPoints, element } = eventDetail;
-  //   const worldPos = currentPoints.world;
-  //   // const canvasPos = currentPoints.canvas;
+  addNewAnnotation = (evt) => {
+    const eventDetail = evt.detail;
+    const { currentPoints, element } = eventDetail;
+    const worldPos = currentPoints.world;
+    // const canvasPos = currentPoints.canvas;
 
-  //   const enabledElement = getEnabledElement(element);
-  //   const { viewport, renderingEngine } = enabledElement;
+    const enabledElement = getEnabledElement(element);
+    const { viewport, renderingEngine } = enabledElement;
 
-  //   this.isDrawing = true;
+    this.isDrawing = true;
 
-  //   const camera = viewport.getCamera();
-  //   const { viewPlaneNormal, viewUp } = camera;
+    const camera = viewport.getCamera();
+    const { viewPlaneNormal, viewUp } = camera;
 
-  //   const referencedImageId = this.getReferencedImageId(
-  //     viewport,
-  //     worldPos,
-  //     viewPlaneNormal,
-  //     viewUp
-  //   );
+    const referencedImageId = this.getReferencedImageId(
+      viewport,
+      worldPos,
+      viewPlaneNormal,
+      viewUp
+    );
 
-  //   const FrameOfReferenceUID = viewport.getFrameOfReferenceUID();
+    const FrameOfReferenceUID = viewport.getFrameOfReferenceUID();
 
-  //   const annotation = {
-  //     highlighted: true,
-  //     invalidated: true,
-  //     metadata: {
-  //       toolName: this.getToolName(),
-  //       viewPlaneNormal: [...viewPlaneNormal],
-  //       viewUp: [...viewUp],
-  //       FrameOfReferenceUID,
-  //       referencedImageId,
-  //     },
-  //     data: {
-  //       label: '',
-  //       handles: {
-  //         textBox: {
-  //           hasMoved: false,
-  //           worldPosition: [0, 0, 0],
-  //           worldBoundingBox: {
-  //             topLeft: [0, 0, 0],
-  //             topRight: [0, 0, 0],
-  //             bottomLeft: [0, 0, 0],
-  //             bottomRight: [0, 0, 0],
-  //           },
-  //         },
-  //         points: [[...worldPos], [...worldPos]],
-  //         activeHandleIndex: 1,
-  //       },
-  //       cachedStats: {},
-  //     },
-  //   };
-  //   addAnnotation(annotation, element);
+    const annotation = {
+      highlighted: true,
+      invalidated: true,
+      metadata: {
+        toolName: this.getToolName(),
+        viewPlaneNormal: [...viewPlaneNormal],
+        viewUp: [...viewUp],
+        FrameOfReferenceUID,
+        referencedImageId,
+      },
+      data: {
+        label: '',
+        handles: {
+          textBox: {
+            hasMoved: false,
+            worldPosition: [0, 0, 0],
+            worldBoundingBox: {
+              topLeft: [0, 0, 0],
+              topRight: [0, 0, 0],
+              bottomLeft: [0, 0, 0],
+              bottomRight: [0, 0, 0],
+            },
+          },
+          points: [[...worldPos], [...worldPos]],
+          activeHandleIndex: 1,
+        },
+        cachedStats: {},
+      },
+    };
+    addAnnotation(annotation, element);
 
-  //   const viewportIdsToRender = getViewportIdsWithToolToRender(
-  //     element,
-  //     this.getToolName()
-  //   );
+    const viewportIdsToRender = getViewportIdsWithToolToRender(
+      element,
+      this.getToolName()
+    );
 
-  //   this.editData = {
-  //     annotation,
-  //     viewportIdsToRender,
-  //     newAnnotation: true,
-  //     hasMoved: false,
-  //   };
-  //   this._activateDraw(element);
+    this.editData = {
+      annotation,
+      viewportIdsToRender,
+      newAnnotation: true,
+      hasMoved: false,
+    };
+    this._activateDraw(element);
 
-  //   hideElementCursor(element);
+    hideElementCursor(element);
 
-  //   evt.preventDefault();
+    evt.preventDefault();
 
-  //   triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
 
-  //   return annotation;
-  // };
+    return annotation;
+  };
   renderAnnotation = (enabledElement, svgDrawingHelper) => {
     let renderStatus = false
     const { viewport } = enabledElement
@@ -421,7 +421,159 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
 
     return renderStatus
   };
+  _calculateCachedStats = (
+    annotation,
+    viewport,
+    renderingEngine,
+    enabledElement,
+    modalityUnitOptions
+  ) => {
+    console.log('_calculateCachedStats')
+    const data = annotation.data
+    const { viewportId, renderingEngineId } = enabledElement
+  
+    const { points } = data.handles
+  
+    const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p))
+    const { viewPlaneNormal, viewUp } = viewport.getCamera()
+  
+    const [topLeftCanvas, bottomRightCanvas] = (
+      getCanvasCircleCorners(canvasCoordinates)
+    )
+  
+    const topLeftWorld = viewport.canvasToWorld(topLeftCanvas)
+    const bottomRightWorld = viewport.canvasToWorld(bottomRightCanvas)
+    const { cachedStats } = data
+  
+    const targetIds = Object.keys(cachedStats)
+    const worldPos1 = topLeftWorld
+    const worldPos2 = bottomRightWorld
+    for (let i = 0; i < targetIds.length; i++) {
+      const targetId = targetIds[i]
+  
+      const image = this.getTargetIdImage(targetId, renderingEngine)
+  
+      // If image does not exists for the targetId, skip. This can be due
+      // to various reasons such as if the target was a volumeViewport, and
+      // the volumeViewport has been decached in the meantime.
+      if (!image) {
+        continue
+      }
+  
+      const { dimensions, imageData, metadata } = image
+  
+      const worldPos1Index = transformWorldToIndex(imageData, worldPos1)
+  
+      worldPos1Index[0] = Math.floor(worldPos1Index[0])
+      worldPos1Index[1] = Math.floor(worldPos1Index[1])
+      worldPos1Index[2] = Math.floor(worldPos1Index[2])
+  
+      const worldPos2Index = transformWorldToIndex(imageData, worldPos2)
+  
+      worldPos2Index[0] = Math.floor(worldPos2Index[0])
+      worldPos2Index[1] = Math.floor(worldPos2Index[1])
+      worldPos2Index[2] = Math.floor(worldPos2Index[2])
+  
+      // Check if one of the indexes are inside the volume, this then gives us
+      // Some area to do stats over.
+  
+      if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) {
+        const iMin = Math.min(worldPos1Index[0], worldPos2Index[0])
+        const iMax = Math.max(worldPos1Index[0], worldPos2Index[0])
+  
+        const jMin = Math.min(worldPos1Index[1], worldPos2Index[1])
+        const jMax = Math.max(worldPos1Index[1], worldPos2Index[1])
+  
+        const kMin = Math.min(worldPos1Index[2], worldPos2Index[2])
+        const kMax = Math.max(worldPos1Index[2], worldPos2Index[2])
+  
+        const boundsIJK = [
+          [iMin, iMax],
+          [jMin, jMax],
+          [kMin, kMax]
+        ]
+  
+        const center = [
+          (topLeftWorld[0] + bottomRightWorld[0]) / 2,
+          (topLeftWorld[1] + bottomRightWorld[1]) / 2,
+          (topLeftWorld[2] + bottomRightWorld[2]) / 2
+        ]
+  
+        const ellipseObj = {
+          center,
+          xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
+          yRadius: Math.abs(topLeftWorld[1] - bottomRightWorld[1]) / 2,
+          zRadius: Math.abs(topLeftWorld[2] - bottomRightWorld[2]) / 2
+        }
+        const { worldWidth, worldHeight } = getWorldWidthAndHeightFromTwoPoints(
+          viewPlaneNormal,
+          viewUp,
+          worldPos1,
+          worldPos2
+        )
+        const isEmptyArea = worldWidth === 0 && worldHeight === 0
+        const scale = getCalibratedScale(image)
+        const aspect = getCalibratedAspect(image)
+        const area = Math.abs(
+          Math.PI *
+            (worldWidth / scale / 2) *
+            (worldHeight / aspect / scale / 2)
+        )
+  
+        const modalityUnit = getModalityUnit(
+          metadata.Modality,
+          annotation.metadata.referencedImageId,
+          modalityUnitOptions
+        )
+        const pointsInShape = pointInShapeCallback(
+          imageData,
+          (pointLPS, pointIJK) => pointInEllipse(ellipseObj, pointLPS),
+          this.configuration.statsCalculator.statsCallback,
+          boundsIJK
+        )
+  
+        const stats = this.configuration.statsCalculator.getStatistics()
+  
+        cachedStats[targetId] = {
+          Modality: metadata.Modality,
+          area,
+          mean: stats[1] && stats[1].value ? stats[1].value : null,
+          max: stats[0] && stats[0].value ? stats[0].value : null,
+          stdDev: stats[2] && stats[2].value ? stats[2].value : null,
+          statsArray: stats,
+          pointsInShape: pointsInShape,
+          isEmptyArea,
+          areaUnit: getCalibratedAreaUnits(null, image),
+          radius: worldWidth / 2 / scale,
+          radiusUnit: getCalibratedLengthUnits(null, image),
+          perimeter: (2 * Math.PI * (worldWidth / 2)) / scale,
+          modalityUnit
+        }
+      } else {
+        this.isHandleOutsideImage = false
+  
+        cachedStats[targetId] = {
+          Modality: metadata.Modality
+        }
+      }
+    }
+  
+    annotation.invalidated = false
+  
+    // Dispatching annotation modified
+    const eventType = Enums.Events.ANNOTATION_MODIFIED
+  
+    const eventDetail = {
+      annotation,
+      viewportId,
+      renderingEngineId
+    }
+    triggerEvent(eventTarget, eventType, eventDetail)
+  
+    return cachedStats
+  }
 }
+
 function getCanvasCircleCorners(
   circleCanvasPoints
 ) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index f92dff6c..bc18ae0e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -680,6 +680,7 @@ export default {
     // 融合
     handleMerge(answers, questionId, orderMark) {
       this.lesionData = []
+      this.mergeList = []
       this.merge.visible = true
       this.mergeInfo.questionId = questionId
       this.mergeInfo.mergeRowId = answers.RowId
diff --git a/vue.config.js b/vue.config.js
index 522793bd..2c8ec49a 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -63,7 +63,7 @@ module.exports = {
         // target: 'http://123.56.181.144:8000/api', // 国内测试环境
         // target: 'http://123.56.94.154:8079', // 国内测试环境2
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
-        target: 'http://123.56.94.154:30668',
+        target: 'http://123.56.94.154:30000',
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,

From f6eab06c78172b01a979876d95101c1e4690cb20 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 26 Feb 2024 17:23:16 +0800
Subject: [PATCH 046/374] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |  71 ++++----
 .../dicoms/components/Fusion/QuestionItem.vue |   2 +-
 .../dicoms/components/Fusion/Questions.vue    |  89 +++++-----
 .../components/Fusion/TableQuestionItem.vue   | 167 +++++++++---------
 .../components/Fusion/TableQuestions.vue      |   2 -
 .../components/Fusion/tools/CircleROITool.js  |  10 +-
 6 files changed, 177 insertions(+), 164 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 01a8b054..f9317df0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -690,46 +690,46 @@ export default {
       })
 
       const debouncedCallback = this.debounce((e) => {
-        const { annotation } = e.detail
-        const { cachedStats } = annotation.data
-        var isNotValidAnnotationNum = 0
-        for (const volumeId in cachedStats) {
-          var statObj = cachedStats[volumeId]
-          var arr = Object.keys(statObj)
-          if (arr.length < 2) {
-            ++isNotValidAnnotationNum
-          }
-        }
-        if (isNotValidAnnotationNum === 0) {
-          this.onAnnotationModified(e)
-        } else {
-          // console.log('异常标记：', annotation)
-          // const { remark } = annotation.data
-          // if (remark === 'Liver' || remark === 'Mediastinum') {
-          //   this.$refs['questions'].setOutsideMeasuredData(annotation)
-          // } else {
-          //   this.$refs['tableQuestions'].setOutsideMeasuredData(annotation)
-          // }
-          // 移除标记
-          this.removeAnnotation({ otherMeasureData: annotation })
-          const { remark } = annotation.data
-          // 清除病灶上的标记信息
-          if (remark === 'Liver' || remark === 'Mediastinum') {
-            this.$refs['questions'].clearMeasuredData(remark)
-            // 激活工具
-            this.setNonTargetMeasurementStatus({ status: true, toolName: 'CircleROI' })
-          } else {
-            this.$refs['tableQuestions'].clearMeasuredData()
-            // 激活工具
-            this.setBasicToolActive('CircleROI')
-          }
-        }
+        // const { annotation } = e.detail
+        this.onAnnotationModified(e)
+        // const { cachedStats } = annotation.data
+        // var isNotValidAnnotationNum = 0
+        // for (const volumeId in cachedStats) {
+        //   var statObj = cachedStats[volumeId]
+        //   var arr = Object.keys(statObj)
+        //   if (arr.length < 2) {
+        //     ++isNotValidAnnotationNum
+        //   }
+        // }
+        // if (!annotation.isHandleOutsideImage) {
+        //   this.onAnnotationModified(e)
+        // } else {
+        //   // console.log('异常标记：', annotation)
+        //   // const { remark } = annotation.data
+        //   // if (remark === 'Liver' || remark === 'Mediastinum') {
+        //   //   this.$refs['questions'].setOutsideMeasuredData(annotation)
+        //   // } else {
+        //   //   this.$refs['tableQuestions'].setOutsideMeasuredData(annotation)
+        //   // }
+        //   // 移除标记
+        //   // this.removeAnnotation({ otherMeasureData: annotation })
+        //   // const { remark } = annotation.data
+        //   // // 清除病灶上的标记信息
+        //   // if (remark === 'Liver' || remark === 'Mediastinum') {
+        //   //   this.$refs['questions'].clearMeasuredData(remark)
+        //   //   // 激活工具
+        //   //   this.setNonTargetMeasurementStatus({ status: true, toolName: 'CircleROI' })
+        //   // } else {
+        //   //   this.$refs['tableQuestions'].clearMeasuredData()
+        //   //   // 激活工具
+        //   //   this.setBasicToolActive('CircleROI')
+        //   // }
+        // }
       }, 120)
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_MODIFIED, (e) => {
         debouncedCallback(e)
       })
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_SELECTION_CHANGE, (e) => {
-        console.log(e)
         const { detail } = e
         const { selection } = detail
         if (selection && selection.length > 0) {
@@ -833,7 +833,6 @@ export default {
       if (this.isNonTargetMeasurement || annotation.data.remark === 'Liver' || annotation.data.remark === 'Mediastinum') {
         this.$refs['questions'].setMeasuredData(measureData)
       } else {
-        console.log('onAnnotationAdded')
         this.$refs['tableQuestions'] && this.$refs['tableQuestions'].setMeasuredData(measureData)
       }
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 1ddd5548..3374aeb2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -234,7 +234,7 @@
   </div>
 </template>
 <script>
-import { uploadReadingAnswerImage } from '@/api/trials'
+// import { uploadReadingAnswerImage } from '@/api/trials'
 import { mapGetters } from 'vuex'
 export default {
   name: 'QuestionItem',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 730aef42..1419ed08 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -60,7 +60,8 @@ export default {
       suvmaxId: '',
       questionFormChangeState: false,
       questionFormChangeNum: 0,
-      isInsideVolume: true
+      lungIsInsideVolume: true,
+      liverIsInsideVolume: true
     }
   },
   computed: {
@@ -196,7 +197,7 @@ export default {
     handleSave() {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
-        if (!this.isInsideVolume) {
+        if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
           this.$alert('当前标记在图像外，不允许保存！', '提示', {
             callback: action => {
               this.$message({
@@ -308,7 +309,51 @@ export default {
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
     setMeasuredData(measurement) {
-      this.isInsideVolume = true
+      if (measurement.data.isHandleOutsideImage) {
+        this.setOutsideMeasuredData(measurement)
+      } else {
+        var idx = -1
+        if (this.currentQsId) {
+          // 新增
+          idx = this.measurements.findIndex(i => i.QuestionId === this.currentQsId)
+          this.currentQsId = ''
+        } else {
+          // 编辑
+          idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.data.remark)
+        }
+        if (idx === -1) return
+        var obj = this.measurements[idx]
+        var remark = obj.QuestionType === 51 ? 'Liver' : obj.QuestionType === 52 ? 'Mediastinum' : ''
+        obj.QuestionType === 51 ? this.liverIsInsideVolume = true : obj.QuestionType === 52 ? this.lungIsInsideVolume = true : ''
+        measurement.data.data.remark = remark
+        this.measurements[idx].OtherMeasureData = measurement.data
+        this.measurements[idx].OtherMarkTool = measurement.data.metadata.toolName
+
+        //  添加标记
+        var data = {
+          OtherMeasureData: measurement.data,
+          QuestionId: obj.QuestionId,
+          VisitTaskId: this.visitTaskId,
+          OrderMarkName: remark
+        }
+        if (measurement.type === 'CircleROI') {
+          const suvMax = measurement.suvMax
+          this.$set(this.questionForm, obj.QuestionId, suvMax || null)
+          var pet5PS = this.setpet5PS()
+          this.questionForm[this.pet5PSId] = pet5PS
+          this.calculatePet5PS = pet5PS
+          this.setPet5PSCommentDisplay()
+        }
+        FusionEvent.$emit('addOrUpdateAnnotations', { data })
+        this.questionFormChangeState = true
+      }
+    },
+    setOutsideMeasuredData(measurement) {
+      console.log('setOutsideMeasuredData: ', measurement)
+      if ((measurement.data.remark === 'Liver' && this.liverIsInsideVolume === false) || (measurement.data.remark === 'Mediastinum' && this.lungIsInsideVolume === false)) {
+        return
+      }
+
       var idx = -1
       if (this.currentQsId) {
         // 新增
@@ -321,6 +366,7 @@ export default {
       if (idx === -1) return
       var obj = this.measurements[idx]
       var remark = obj.QuestionType === 51 ? 'Liver' : obj.QuestionType === 52 ? 'Mediastinum' : ''
+      obj.QuestionType === 51 ? this.liverIsInsideVolume = false : obj.QuestionType === 52 ? this.lungIsInsideVolume = false : ''
       measurement.data.data.remark = remark
       this.measurements[idx].OtherMeasureData = measurement.data
       this.measurements[idx].OtherMarkTool = measurement.data.metadata.toolName
@@ -333,43 +379,6 @@ export default {
         OrderMarkName: remark
       }
       if (measurement.type === 'CircleROI') {
-        const suvMax = measurement.suvMax
-        this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-        var pet5PS = this.setpet5PS()
-        this.questionForm[this.pet5PSId] = pet5PS
-        this.calculatePet5PS = pet5PS
-        this.setPet5PSCommentDisplay()
-      }
-      FusionEvent.$emit('addOrUpdateAnnotations', { data })
-      this.questionFormChangeState = true
-    },
-    setOutsideMeasuredData(measurement) {
-      this.isInsideVolume = false
-      var idx = -1
-      if (this.currentQsId) {
-        // 新增
-        idx = this.measurements.findIndex(i => i.QuestionId === this.currentQsId)
-        this.currentQsId = ''
-      } else {
-        // 编辑
-        idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.remark)
-      }
-      if (idx === -1) return
-      var obj = this.measurements[idx]
-      var remark = obj.QuestionType === 51 ? 'Liver' : obj.QuestionType === 52 ? 'Mediastinum' : ''
-      measurement.data.remark = remark
-      this.measurements[idx].OtherMeasureData = measurement
-      this.measurements[idx].OtherMarkTool = measurement.metadata.toolName
-
-      //  添加标记
-      var data = {
-        OtherMeasureData: measurement,
-        QuestionId: obj.QuestionId,
-        VisitTaskId: this.visitTaskId,
-        OrderMarkName: remark
-      }
-      if (measurement.metadata.toolName === 'CircleROI') {
-        // const suvMax = measurement.suvMax
         this.$set(this.questionForm, obj.QuestionId, null)
         var pet5PS = this.setpet5PS()
         this.questionForm[this.pet5PSId] = pet5PS
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 7bed9b4f..68fc9234 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -521,97 +521,104 @@ export default {
       this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
     },
     setMeasureData(measureData, isInit = false) {
-      console.log('setMeasureData')
-      this.isInsideVolume = true
       return new Promise(resolve => {
-        if (measureData) {
-          // 获取SUVmax(20)
-          var SUVmax = measureData.suvMax ? measureData.suvMax : null
-          var suvObj = this.questions.find(i => i.QuestionMark === 20)
-          this.$set(this.questionForm, suvObj.Id, SUVmax)
-          var data = {}
-          measureData.data.data.remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
-          // measureData.data.data.studyId = measureData.studyId
-          // measureData.data.data.seriesId = measureData.seriesId
-          // measureData.data.data.instanceId = measureData.instanceId
-          // measureData.data.data.viewportId = measureData.viewportId
-          // measureData.data.data.questionId = this.parentQsId
-          // measureData.data.data.rowIndex = this.questionForm.RowIndex
-          data = {
-            // OtherStudyId: measureData.studyId,
-            // OtherSeriesId: measureData.seriesId,
-            // OtherInstanceId: measureData.instanceId,
-            OtherMeasureData: measureData.data,
-            QuestionId: this.parentQsId,
-            RowIndex: this.questionForm.RowIndex,
-            RowId: this.questionForm.RowId,
-            VisitTaskId: this.visitTaskId,
-            OrderMarkName: measureData.data.data.remark
-          }
-          FusionEvent.$emit('addOrUpdateAnnotations', { data })
-        }
-        if (!isInit) {
-          // if (this.questionForm.RowId) {
-          //   this.$set(this.questionForm, 'saveTypeEnum', 1)
-          // } else {
-          //   this.$set(this.questionForm, 'saveTypeEnum', 0)
-          // }
-          // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
-          if (this.questionForm.OtherMeasureData) {
-            var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
+        if (measureData.data.isHandleOutsideImage) {
+          this.setOutsideMeasuredData(measureData)
+        } else {
+          this.isInsideVolume = true
 
-            if (annotation && this.firstRenderAnnotation) {
-              for (const k in annotation.data.cachedStats) {
-                if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
-                  this.firstRenderAnnotation = false
-                  break
+          if (measureData) {
+            // 获取SUVmax(20)
+            var SUVmax = measureData.suvMax ? measureData.suvMax : null
+            var suvObj = this.questions.find(i => i.QuestionMark === 20)
+            this.$set(this.questionForm, suvObj.Id, SUVmax)
+            var data = {}
+            measureData.data.data.remark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+            // measureData.data.data.studyId = measureData.studyId
+            // measureData.data.data.seriesId = measureData.seriesId
+            // measureData.data.data.instanceId = measureData.instanceId
+            // measureData.data.data.viewportId = measureData.viewportId
+            // measureData.data.data.questionId = this.parentQsId
+            // measureData.data.data.rowIndex = this.questionForm.RowIndex
+            data = {
+              // OtherStudyId: measureData.studyId,
+              // OtherSeriesId: measureData.seriesId,
+              // OtherInstanceId: measureData.instanceId,
+              OtherMeasureData: measureData.data,
+              QuestionId: this.parentQsId,
+              RowIndex: this.questionForm.RowIndex,
+              RowId: this.questionForm.RowId,
+              VisitTaskId: this.visitTaskId,
+              OrderMarkName: measureData.data.data.remark
+            }
+            FusionEvent.$emit('addOrUpdateAnnotations', { data })
+          }
+          if (!isInit) {
+            // if (this.questionForm.RowId) {
+            //   this.$set(this.questionForm, 'saveTypeEnum', 1)
+            // } else {
+            //   this.$set(this.questionForm, 'saveTypeEnum', 0)
+            // }
+            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+            if (this.questionForm.OtherMeasureData) {
+              var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
+
+              if (annotation && this.firstRenderAnnotation) {
+                for (const k in annotation.data.cachedStats) {
+                  if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
+                    this.firstRenderAnnotation = false
+                    break
+                  }
                 }
               }
-            }
-          } else {
-            this.firstRenderAnnotation = false
-          }
-          if (!this.firstRenderAnnotation) {
-            if (this.questionForm.RowId) {
-              this.$set(this.questionForm, 'saveTypeEnum', 1)
             } else {
-              this.$set(this.questionForm, 'saveTypeEnum', 0)
+              this.firstRenderAnnotation = false
+            }
+            if (!this.firstRenderAnnotation) {
+              if (this.questionForm.RowId) {
+                this.$set(this.questionForm, 'saveTypeEnum', 1)
+              } else {
+                this.$set(this.questionForm, 'saveTypeEnum', 0)
+              }
+            } else {
+              this.$set(this.questionForm, 'saveTypeEnum', 2)
+              this.$emit('close')
             }
-          } else {
-            this.$set(this.questionForm, 'saveTypeEnum', 2)
-            this.$emit('close')
           }
-        }
-        this.$set(this.questionForm, 'OtherMeasureData', measureData.data)
-        var isLymph = this.getQuestionVal(2)
-        isLymph = !isNaN(parseInt(isLymph)) ? parseInt(isLymph) : null
-        const lesionPart = this.getQuestionVal(8)
-        const lesionOrgan = this.getQuestionVal(6)
-        var suvMax = this.getQuestionVal(20)
-        this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-        this.toolType = measureData.type
-        if (this.questionForm.MeasureData) {
-          // if (measureData.type === 'Bidirectional') {
-          //   this.organList = []
-          //   this.getOrganInfoList(1)
-          // } else if (measureData.type === 'Length') {
-          //   // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
-          //   this.organList = []
-          //   this.getOrganInfoList(0)
-          // } else {
-          //   this.organList = []
-          //   this.getOrganInfoList()
-          // }
-          this.organList = []
-          this.getOrganInfoList()
-        } else {
-          this.organList = []
-          this.getOrganInfoList()
+          this.$set(this.questionForm, 'OtherMeasureData', measureData.data)
+          var isLymph = this.getQuestionVal(2)
+          isLymph = !isNaN(parseInt(isLymph)) ? parseInt(isLymph) : null
+          const lesionPart = this.getQuestionVal(8)
+          const lesionOrgan = this.getQuestionVal(6)
+          var suvMax = this.getQuestionVal(20)
+          this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+          this.toolType = measureData.type
+          if (this.questionForm.MeasureData) {
+            // if (measureData.type === 'Bidirectional') {
+            //   this.organList = []
+            //   this.getOrganInfoList(1)
+            // } else if (measureData.type === 'Length') {
+            //   // 直径测量工具 且是靶病灶  器官只能是非淋巴结类型
+            //   this.organList = []
+            //   this.getOrganInfoList(0)
+            // } else {
+            //   this.organList = []
+            //   this.getOrganInfoList()
+            // }
+            this.organList = []
+            this.getOrganInfoList()
+          } else {
+            this.organList = []
+            this.getOrganInfoList()
+          }
         }
         resolve()
       })
     },
     setOutsideMeasuredData(measureData) {
+      if (this.isInsideVolume === false) {
+        return
+      }
       this.isInsideVolume = false
       var suvObj = this.questions.find(i => i.QuestionMark === 20)
       this.$set(this.questionForm, suvObj.Id, '')
@@ -627,7 +634,6 @@ export default {
       const lesionOrgan = this.getQuestionVal(6)
       var suvMax = this.getQuestionVal(20)
       this.$emit('resetQuestions', { isLymphLesion: isLymph, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
-      this.toolType = measureData.type
       if (this.questionForm.MeasureData) {
         this.organList = []
         this.getOrganInfoList()
@@ -742,7 +748,6 @@ export default {
         }
         // suv测量值可以测量为0，但不能与病灶、肝脏、纵隔血池绑定。
         if (this.questionForm.OtherMeasureData) {
-          console.log(this.questionForm.OtherMeasureData)
           var suvmax = this.getQuestionVal(20)
           if (suvmax === 0) {
             this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 4889e51e..5db80056 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -520,7 +520,6 @@ export default {
       return
     },
     getUnSaveTarget() {
-      console.log('getUnSaveTarget')
       this.unSaveTargets = []
       this.tableQuestions.map(item => {
         if (item.TableQuestions && item.TableQuestions.Answers) {
@@ -532,7 +531,6 @@ export default {
           })
         }
       })
-      // console.log(this.unSaveTargets)
       return this.unSaveTargets
     },
     getAllUnSaveLesions() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
index 69a70a6c..216614a5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
@@ -18,7 +18,7 @@ const {
 } = cornerstoneTools
 // const { getWorldWidthAndHeightFromTwoPoints } = utilities.planar
 // const { roundNumber } = utilities
-const { hideElementCursor } = cursors.elementCursor
+const { hideElementCursor,resetElementCursor } = cursors.elementCursor
 const { getAnnotations,addAnnotation } = annotation.state
 const { isAnnotationVisible } = annotation.visibility
 const { isAnnotationLocked } = annotation.locking
@@ -428,7 +428,6 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
     enabledElement,
     modalityUnitOptions
   ) => {
-    console.log('_calculateCachedStats')
     const data = annotation.data
     const { viewportId, renderingEngineId } = enabledElement
   
@@ -549,12 +548,15 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
           perimeter: (2 * Math.PI * (worldWidth / 2)) / scale,
           modalityUnit
         }
+        annotation.isHandleOutsideImage = false
       } else {
-        this.isHandleOutsideImage = false
+        this.isHandleOutsideImage = true
   
         cachedStats[targetId] = {
-          Modality: metadata.Modality
+          Modality: metadata.Modality,
+          areaUnit: getCalibratedAreaUnits(null, image)
         }
+        annotation.isHandleOutsideImage = true
       }
     }
   

From ad7b9054da8040cd759a0a1cbfe8e35da38f3975 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 27 Feb 2024 13:26:14 +0800
Subject: [PATCH 047/374] 1

---
 src/api/dictionary/dictionary.js              |   4 +-
 src/main.js                                   |   8 +-
 src/router/index.js                           |   5 +
 .../components/CriterionQuestionForm.vue      |  95 ++++----
 .../template/components/CriterionsConfig.vue  |   9 +-
 .../template/components/CriterionsTmp.vue     |   6 +-
 .../dictionary/template/components/ECRF.vue   | 218 +++++++++---------
 vue.config.js                                 |   3 +-
 8 files changed, 183 insertions(+), 165 deletions(-)

diff --git a/src/api/dictionary/dictionary.js b/src/api/dictionary/dictionary.js
index e4d9c162..cb2aaec8 100644
--- a/src/api/dictionary/dictionary.js
+++ b/src/api/dictionary/dictionary.js
@@ -22,9 +22,9 @@ export function getBasicDataSelects(param) {
   })
 }
 
-export function getBasicDataAllSelect(params) {
+export function getBasicDataAllSelect(params, isSystem) {
   return request({
-    url: params ? `/Dictionary/getBasicDataAllSelect?TrialReadingCriterionId=${params}` : `/Dictionary/getBasicDataAllSelect`,
+    url: params ? (isSystem ? `/Dictionary/getBasicDataAllSelect?SystemReadingCriterionId=${params}` : `/Dictionary/getBasicDataAllSelect?TrialReadingCriterionId=${params}`) : `/Dictionary/getBasicDataAllSelect`,
     method: 'get'
   })
 }
diff --git a/src/main.js b/src/main.js
index 06d74021..d5e5d04e 100644
--- a/src/main.js
+++ b/src/main.js
@@ -160,10 +160,16 @@ Vue.prototype.fileToBlob = (file) => {
 var _vm
 async function VueInit () {
   var params
+  var res
   if (~window.location.href.indexOf('/readingDicoms') || ~window.location.href.indexOf('/noneDicomReading') || ~window.location.href.indexOf('/criterionquestions') || ~window.location.href.indexOf('/petct')) {
     params = $q('TrialReadingCriterionId')
+    res = await getBasicDataAllSelect(params)
+  } else if (~window.location.href.indexOf('/ecrfPreview')) {
+    params = $q('SystemReadingCriterionId')
+    res = await getBasicDataAllSelect(params, true)
+  } else {
+    res = await getBasicDataAllSelect(params)
   }
-  var res = await getBasicDataAllSelect(params)
   var Internationalization = await getFrontInternationalizationList()
   Vue.prototype.$tl = Internationalization.Result
   let zhMessages = {}, enMessages = {}
diff --git a/src/router/index.js b/src/router/index.js
index bcc946a3..fdaaae06 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -242,6 +242,11 @@ export const constantRoutes = [
     component: () => import('@/views/404'),
     hidden: true
   },
+  {
+    path: '/ecrfPreview',
+    component: () => import('@/views/dictionary/template/components/ECRF'),
+    hidden: true
+  },
   {
     path: '/editUser',
     component: Layout,
diff --git a/src/views/dictionary/template/components/CriterionQuestionForm.vue b/src/views/dictionary/template/components/CriterionQuestionForm.vue
index 8bec7ff2..37267972 100644
--- a/src/views/dictionary/template/components/CriterionQuestionForm.vue
+++ b/src/views/dictionary/template/components/CriterionQuestionForm.vue
@@ -19,6 +19,52 @@
           />
         </el-select>
       </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'group'"
+        label="分组名称"
+        prop="GroupName"
+      >
+        <el-input v-model="form.GroupName" />
+      </el-form-item>
+      <el-form-item
+        label="分组标识"
+        v-if="form.Type === 'group'"
+        prop="GroupClassify"
+      >
+        <el-select
+          v-model="form.GroupClassify"
+          clearable
+        >
+          <el-option
+            v-for="item of groupClassifyList"
+            :key="item.Id"
+            :value="parseInt(item.Code)"
+            :label="item.ValueCN"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type === 'group'"
+        label="分组名称（EN）"
+        prop="GroupEnName"
+      >
+        <el-input v-model="form.GroupEnName" />
+      </el-form-item>
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        label="问题名称"
+        prop="QuestionName"
+      >
+        <el-input v-model="form.QuestionName" />
+      </el-form-item>
+
+      <el-form-item
+        v-if="form.Type !== 'group'"
+        label="问题名称（EN）"
+        prop="QuestionEnName"
+      >
+        <el-input v-model="form.QuestionEnName" />
+      </el-form-item>
       <!-- 数值类型 -->
       <el-form-item
         v-if="form.Type === 'number' || form.Type === 'calculation'"
@@ -75,52 +121,6 @@
           />
         </el-select>
       </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'group'"
-        label="分组名称"
-        prop="GroupName"
-      >
-        <el-input v-model="form.GroupName" />
-      </el-form-item>
-      <el-form-item
-        label="分组标识"
-        prop="GroupClassify"
-      >
-        <el-select
-          v-model="form.GroupClassify"
-          clearable
-        >
-          <el-option
-            v-for="item of groupClassifyList"
-            :key="item.Id"
-            :value="parseInt(item.Code)"
-            :label="item.ValueCN"
-          />
-        </el-select>
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type === 'group'"
-        label="分组名称（EN）"
-        prop="GroupEnName"
-      >
-        <el-input v-model="form.GroupEnName" />
-      </el-form-item>
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称"
-        prop="QuestionName"
-      >
-        <el-input v-model="form.QuestionName" />
-      </el-form-item>
-
-      <el-form-item
-        v-if="form.Type !== 'group'"
-        label="问题名称（EN）"
-        prop="QuestionEnName"
-      >
-        <el-input v-model="form.QuestionEnName" />
-      </el-form-item>
-
       <!-- <el-form-item
         v-if="form.Type === 'select' || form.Type === 'radio'"
         label="选项"
@@ -170,7 +170,7 @@
           placeholder="选项请用‘|’分割多个选项"
         />
       </el-form-item>
-      <el-form-item label="问题分类">
+      <el-form-item label="问题分类" v-if="form.Type !== 'group'">
         <!-- <el-radio-group v-model="form.QuestionClassify">
           <el-radio v-for="item of $d.QuestionClassify" :key="item.id" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group> -->
@@ -406,6 +406,7 @@
       </el-form-item>
       <el-form-item
         label="问题标识"
+        v-if="form.Type !== 'group'"
         prop="QuestionType"
       >
         <el-select
diff --git a/src/views/dictionary/template/components/CriterionsConfig.vue b/src/views/dictionary/template/components/CriterionsConfig.vue
index a374005b..d4d31ade 100644
--- a/src/views/dictionary/template/components/CriterionsConfig.vue
+++ b/src/views/dictionary/template/components/CriterionsConfig.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="criterion-config">
     <el-tabs v-model="activeName">
-      <el-tab-pane label="访视阅片" name="0">
+      <el-tab-pane :label="'访视阅片'" name="0">
         <div class="search-form" style="display:flex;justify-content: space-between;">
           <el-form :inline="true" size="mini" class="base-search-form">
             <el-form-item label="名称">
@@ -18,7 +18,7 @@
               :disabled="list.length === 0"
               size="mini"
               type="primary"
-              @click="preview.visible = true"
+              @click="handlePreview"
             >
               预览
             </el-button>
@@ -200,7 +200,7 @@
       v-if="addOrEdit.visible"
       :visible.sync="addOrEdit.visible"
       :close-on-click-modal="false"
-      :title="addOrEdit.title"
+      :title="`${addOrEdit.title}`"
       width="600px"
       append-to-body
       custom-class="base-dialog-wrapper"
@@ -303,6 +303,9 @@ export default {
     this.getList()
   },
   methods: {
+    handlePreview() {
+      window.open(`/ecrfPreview?SystemReadingCriterionId=${this.criterionId}&lang=${this.$i18n.locale}`)
+    },
     getList() {
       this.loading = true
       this.searchData.ReadingQuestionCriterionSystemId = this.criterionId
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index 966b1130..e4324074 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -83,6 +83,7 @@
           <el-button
             type="primary"
             size="mini"
+            :disabled="scope.row.IsCompleteConfig"
             @click="handleEdit(scope.row)"
           >
             编辑
@@ -104,6 +105,7 @@
           <el-button
             type="danger"
             size="mini"
+            :disabled="scope.row.IsCompleteConfig"
             @click="handleDelete(scope.row)"
           >
             删除
@@ -133,7 +135,7 @@
 
     <el-dialog
       v-if="configVisible"
-      title="eCRF"
+      :title="'eCRF' + `(${rowData.CriterionName})`"
       :visible.sync="configVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
@@ -145,7 +147,7 @@
 
     <el-dialog
       v-if="configBaseDataVisible"
-      title="基础数据配置"
+      :title="'基础数据配置' + `(${rowData.CriterionName})`"
       :visible.sync="configBaseDataVisible"
       :close-on-click-modal="false"
       :fullscreen="true"
diff --git a/src/views/dictionary/template/components/ECRF.vue b/src/views/dictionary/template/components/ECRF.vue
index 97b05b31..913fa765 100644
--- a/src/views/dictionary/template/components/ECRF.vue
+++ b/src/views/dictionary/template/components/ECRF.vue
@@ -1,109 +1,109 @@
-<template>
-  <div v-loading="loading" style="min-height:400px;">
-    <el-form
-      v-if="isRender"
-      ref="questions"
-      size="small"
-      :model="questionForm"
-    >
-      <CriterionFormItem
-        v-for="question of questions"
-        :key="question.Id"
-        :question="question"
-        :question-form="questionForm"
-        :reading-task-state="readingTaskState"
-        :criterion-id="criterionId"
-        @resetFormItemData="resetFormItemData"
-        @setFormItemData="setFormItemData"
-      />
-    </el-form>
-  </div>
-
-</template>
-
-<script>
-
-import { getSystemReadingQuestion } from '@/api/dictionary'
-import CriterionFormItem from './CriterionFormItem'
-
-export default {
-  name: 'EcrfPreview',
-  components: {
-    CriterionFormItem
-  },
-  props: {
-    criterionId: {
-      type: String,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      questions: [],
-      questionForm: {},
-      publicQuestions: [],
-      isRender: false,
-      readingTaskState: 0,
-      activeName: 0
-    }
-  },
-  mounted() {
-    this.getQuestions()
-  },
-  methods: {
-    getQuestions() {
-      this.loading = true
-      var param = {
-        id: this.criterionId
-      }
-      getSystemReadingQuestion(param).then(res => {
-        res.Result.SinglePage.map((v) => {
-          if (v.Type === 'group' && v.Childrens.length === 0) return
-          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
-            this.$set(this.questionForm, v.Id, v.DefaultValue)
-          }
-          if (v.Childrens && v.Childrens.length > 0) {
-            this.setChild(v.Childrens)
-          }
-        })
-        this.questions = res.Result.SinglePage
-
-        this.isRender = true
-        this.loading = false
-      }).catch(() => { this.loading = false })
-    },
-    setChild(obj) {
-      obj.forEach(i => {
-        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
-          this.$set(this.questionForm, i.Id, '')
-        }
-        if (i.Childrens && i.Childrens.length > 0) {
-          this.setChild(i.Childrens)
-        }
-      })
-    },
-    resetFormItemData(v) {
-      this.questionForm[v] = ''
-    },
-    setFormItemData(obj) {
-      this.$set(this.questionForm, obj.key, obj.val)
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-::-webkit-scrollbar {
-    width: 7px;
-    height: 7px;
-  }
-  ::-webkit-scrollbar-thumb {
-    border-radius: 10px;
-    background: #d0d0d0;
-  }
-.tabContent{
-  height:300px;
-  overflow-y: auto;
-
-}
-</style>
+<template>
+  <div v-loading="loading" style="min-height:400px;">
+    <el-form
+      v-if="isRender"
+      ref="questions"
+      size="small"
+      :model="questionForm"
+    >
+      <CriterionFormItem
+        v-for="question of questions"
+        :key="question.Id"
+        :question="question"
+        :question-form="questionForm"
+        :reading-task-state="readingTaskState"
+        :criterion-id="criterionId"
+        @resetFormItemData="resetFormItemData"
+        @setFormItemData="setFormItemData"
+      />
+    </el-form>
+  </div>
+
+</template>
+
+<script>
+
+import { getSystemReadingQuestion } from '@/api/dictionary'
+import CriterionFormItem from './CriterionFormItem'
+import {mapMutations} from "vuex";
+
+export default {
+  name: 'EcrfPreview',
+  components: {
+    CriterionFormItem
+  },
+  data() {
+    return {
+      loading: false,
+      questions: [],
+      questionForm: {},
+      publicQuestions: [],
+      isRender: false,
+      readingTaskState: 0,
+      activeName: 0
+    }
+  },
+  mounted() {
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+    this.$updateDictionary()
+    this.criterionId = this.$route.query.SystemReadingCriterionId
+    this.getQuestions()
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    getQuestions() {
+      this.loading = true
+      var param = {
+        id: this.criterionId
+      }
+      getSystemReadingQuestion(param).then(res => {
+        res.Result.SinglePage.map((v) => {
+          if (v.Type === 'group' && v.Childrens.length === 0) return
+          if (!v.IsPage && v.Type !== 'group' && v.Type !== 'summary') {
+            this.$set(this.questionForm, v.Id, v.DefaultValue)
+          }
+          if (v.Childrens && v.Childrens.length > 0) {
+            this.setChild(v.Childrens)
+          }
+        })
+        this.questions = res.Result.SinglePage
+
+        this.isRender = true
+        this.loading = false
+      }).catch(() => { this.loading = false })
+    },
+    setChild(obj) {
+      obj.forEach(i => {
+        if (i.Type !== 'group' && i.Type !== 'summary' && i.Id) {
+          this.$set(this.questionForm, i.Id, '')
+        }
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.setChild(i.Childrens)
+        }
+      })
+    },
+    resetFormItemData(v) {
+      this.questionForm[v] = ''
+    },
+    setFormItemData(obj) {
+      this.$set(this.questionForm, obj.key, obj.val)
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+::-webkit-scrollbar {
+    width: 7px;
+    height: 7px;
+  }
+  ::-webkit-scrollbar-thumb {
+    border-radius: 10px;
+    background: #d0d0d0;
+  }
+.tabContent{
+  height:300px;
+  overflow-y: auto;
+
+}
+</style>
diff --git a/vue.config.js b/vue.config.js
index 522793bd..c25c05cb 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -63,7 +63,8 @@ module.exports = {
         // target: 'http://123.56.181.144:8000/api', // 国内测试环境
         // target: 'http://123.56.94.154:8079', // 国内测试环境2
         // target: 'http://123.56.94.154:7000', // 国内测试环境2
-        target: 'http://123.56.94.154:30668',
+        // target: 'http://123.56.94.154:30668',
+        target: 'http://123.56.94.154:30000',
         // target: 'http://123.56.181.144:7000',
         changeOrigin: true,
         secure: false,

From 95d1207a4552e02f2680896a0211566fc40133b4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 27 Feb 2024 14:02:54 +0800
Subject: [PATCH 048/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 68fc9234..cfe8d025 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -727,12 +727,7 @@ export default {
         if (!valid) return
         if (!this.isInsideVolume) {
           this.$alert('当前标记在图像外，不允许保存！', '提示', {
-            callback: action => {
-              this.$message({
-                type: 'info',
-                message: `action: ${action}`
-              })
-            }
+            callback: action => {}
           })
           return
         }

From 6eb8957d1c5598c4f779d114fbe1c72dc989219d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 27 Feb 2024 14:05:00 +0800
Subject: [PATCH 049/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index cfe8d025..a1841d85 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -726,7 +726,12 @@ export default {
       this.$refs.measurementForm.validate(async valid => {
         if (!valid) return
         if (!this.isInsideVolume) {
-          this.$alert('当前标记在图像外，不允许保存！', '提示', {
+          // this.$alert('当前标记在图像外，不允许保存！', '提示', {
+          //   callback: action => {}
+          // })
+          this.$confirm(this.$t('当前标记在图像外，不允许保存！'), {
+            type: 'warning',
+            showCancelButton: false,
             callback: action => {}
           })
           return

From 30c411d03fddaddd18ae9e61e859119ed176b488 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 27 Feb 2024 15:01:59 +0800
Subject: [PATCH 050/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/QuestionItem.vue    | 16 +++++++++++++---
 .../dicoms/components/Fusion/Questions.vue       |  5 +++++
 .../components/Fusion/TableQuestionItem.vue      |  8 ++++++--
 3 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 3374aeb2..0a1ebb29 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -33,12 +33,12 @@
               </template>
             </el-input>
             <!-- 测量 -->
-            <el-button v-if="!questionForm[question.Id] && readingTaskState!== 2" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
+            <el-button v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState!== 2)" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
             <!-- 清除标记 -->
-            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
             <el-button
-              v-if="questionForm[question.Id]"
+              v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
               size="mini"
               type="text"
               style="margin-left: -5px;padding: 7px 5px;"
@@ -224,6 +224,8 @@
         :reading-task-state="readingTaskState"
         :question-form="questionForm"
         :visit-task-id="visitTaskId"
+        :lung-is-inside-volume="lungIsInsideVolume"
+        :liver-is-inside-volume="liverIsInsideVolume"
         @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData"
         @addAnnotation="addAnnotation"
@@ -258,6 +260,14 @@ export default {
     visitTaskId: {
       type: String,
       default: ''
+    },
+    lungIsInsideVolume: {
+      type: Boolean,
+      default: true
+    },
+    liverIsInsideVolume: {
+      type: Boolean,
+      default: true
     }
   },
   data() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 1419ed08..bad39d51 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -14,6 +14,8 @@
           :question-form="questionForm"
           :reading-task-state="readingTaskState"
           :visit-task-id="visitTaskId"
+          :lung-is-inside-volume="lungIsInsideVolume"
+          :liver-is-inside-volume="liverIsInsideVolume"
           @setFormItemData="setFormItemData"
           @resetFormItemData="resetFormItemData"
           @addAnnotation="addAnnotation"
@@ -297,6 +299,8 @@ export default {
       this.calculatePet5PS = pet5PS
       this.setPet5PSCommentDisplay()
       FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.measurements[idx].OtherMeasureData, type: 'clear' })
+      var remark = this.measurements[idx].OtherMeasureData.data.remark
+      remark === 'Liver' ? this.liverIsInsideVolume = true : remark === 'Mediastinum' ? this.lungIsInsideVolume = true : ''
       this.measurements.splice(idx, 1)
     },
     locateAnnotation(obj) {
@@ -400,6 +404,7 @@ export default {
       this.currentQsId = this.measurements[idx].QuestionId
       // const { QuestionId, QuestionType } = this.measurements[idx]
       this.questionFormChangeState = true
+      remark === 'Liver' ? this.liverIsInsideVolume = true : remark === 'Mediastinum' ? this.lungIsInsideVolume = true : ''
     },
     resetFormItemData(v) {
       this.questionForm[v] = null
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index a1841d85..7cb8c264 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -627,7 +627,7 @@ export default {
       } else {
         this.$set(this.questionForm, 'saveTypeEnum', 0)
       }
-      this.$set(this.questionForm, 'OtherMeasureData', measureData)
+      this.$set(this.questionForm, 'OtherMeasureData', measureData.data)
       var isLymph = this.getQuestionVal(2)
       isLymph = !isNaN(parseInt(isLymph)) ? parseInt(isLymph) : null
       const lesionPart = this.getQuestionVal(8)
@@ -725,20 +725,24 @@ export default {
     handleSave() {
       this.$refs.measurementForm.validate(async valid => {
         if (!valid) return
+        const loading = this.$loading({ fullscreen: true })
         if (!this.isInsideVolume) {
           // this.$alert('当前标记在图像外，不允许保存！', '提示', {
           //   callback: action => {}
           // })
+          loading.close()
           this.$confirm(this.$t('当前标记在图像外，不允许保存！'), {
             type: 'warning',
             showCancelButton: false,
             callback: action => {}
           })
+
           return
         }
         // 消失、无法评估状态的病灶限制不能测量SUV值
         var lesionState = this.getQuestionVal(7)
         if ((lesionState === 2 || lesionState === 3) && this.questionForm.OtherMeasureData) {
+          loading.close()
           this.$confirm(this.$t('评估状态为无法评估或消失的病灶不能测量SUV值！'), {
             type: 'warning',
             showCancelButton: false,
@@ -750,6 +754,7 @@ export default {
         if (this.questionForm.OtherMeasureData) {
           var suvmax = this.getQuestionVal(20)
           if (suvmax === 0) {
+            loading.close()
             this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), {
               type: 'warning',
               showCancelButton: false,
@@ -759,7 +764,6 @@ export default {
           }
         }
 
-        const loading = this.$loading({ fullscreen: true })
         var otherMeasureData = this.questionForm.OtherMeasureData ? Object.assign({}, this.questionForm.OtherMeasureData) : null
         if (otherMeasureData) {
           for (const k in otherMeasureData.data.cachedStats) {

From 1b905f1f9dbc02b5fe7181b3a1d8d786696dc766 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 27 Feb 2024 15:10:41 +0800
Subject: [PATCH 051/374] 1

---
 .../trials-panel/reading/dicoms/components/Fusion/Questions.vue  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index bad39d51..1b6eabbc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -289,7 +289,6 @@ export default {
     },
 
     removeAnnotation(obj) {
-      console.log('question_removeAnnotation')
       const { Id } = obj
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return

From 29e535a10a83b6e2a3c162fe8f9f537dc54823d9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 27 Feb 2024 15:42:47 +0800
Subject: [PATCH 052/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue      | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 7cb8c264..faeba76e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -880,6 +880,7 @@ export default {
           }
           var suvMax = this.getQuestionVal(20)
           this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
+          this.isInsideVolume = true
         })
         .catch(() => {})
     },
@@ -915,6 +916,7 @@ export default {
       }
       var suvMax = this.getQuestionVal(20)
       this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: anwsers })
+      this.isInsideVolume = true
     },
     handleDelete() {
       // 是否确认删除？

From d224bf87008a712cf85d6e1c0db21f89ba950414 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 27 Feb 2024 16:43:38 +0800
Subject: [PATCH 053/374] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/api/trials.js                             |  24 ++
 src/const/sign-code.vue                       |   1 +
 .../reading-unit/components/QuestionsForm.vue |   2 +-
 .../setting/reading-unit/index.vue            |  58 +++-
 .../components/clinicalData.vue               |   8 +
 .../components/clinicalDataConfirm.vue        |   7 +
 .../components/clinicalDataPM.vue             |   8 +
 .../components/consistencyCheck.vue           |   7 +
 .../components/imageQualityControl.vue        |   7 +
 .../components/imageQuestion.vue              |   7 +
 .../components/imageReupload.vue              |   7 +
 .../components/imageSubmission.vue            |   7 +
 .../components/imageVerification.vue          |   7 +
 .../components/imagesToRead.vue               |   7 +
 .../components/medicalAudit.vue               |   7 +
 .../components/medicalFeedback.vue            |   7 +
 .../components/qcQuestion.vue                 |   7 +
 .../components/rereadApproval.vue             |   7 +
 .../components/reviewerApproval.vue           |   7 +
 .../components/reviewerScreen.vue             |   7 +
 .../components/siteResearch.vue               | 269 +++++++++--------
 .../components/spmRereadApproval.vue          |   7 +
 src/views/trials/trials-workbench/index.vue   | 279 +++++++++---------
 24 files changed, 478 insertions(+), 278 deletions(-)

diff --git a/.env.development b/.env.development
index d48ca615..0819ca53 100644
--- a/.env.development
+++ b/.env.development
@@ -27,7 +27,7 @@ VUE_APP_LOGOUT_FOR_PERMISSION = false
 VUE_APP_LOGOUT_FOR_TIME = 1800
 
 # 是否开启密码正则验证 true:是 false:否
-VUE_APP_PASSWORD_FOR_PERMISSION = true
+VUE_APP_PASSWORD_FOR_PERMISSION = false
 
 # 密码校验规则
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
diff --git a/src/api/trials.js b/src/api/trials.js
index c0d188d7..a2850c76 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1747,6 +1747,22 @@ export function deleteTrialExternalUser(id) {
     method: 'delete'
   })
 }
+
+export function getUserTobeDoneRecord() {
+  return request({
+    url: `/PersonalWorkstation/getUserTobeDoneRecord`,
+    method: 'get'
+  })
+}
+
+export function getNeedSignTrialDocTrialIdList() {
+  return request({
+    url: `/PersonalWorkstation/getNeedSignTrialDocTrialIdList`,
+    method: 'get'
+  })
+}
+
+
 export function getBasicStat() {
   return request({
     url: `/PersonalWorkstation/getBasicStat`,
@@ -3534,3 +3550,11 @@ export function mergeLesion(param) {
     data: param
   })
 }
+
+export function resetAndAsyncCriterion(param) {
+  return request({
+    url: `/Inspection/ReadingCriterion/ResetAndAsyncCriterion`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/const/sign-code.vue b/src/const/sign-code.vue
index 4c309847..102ae04e 100644
--- a/src/const/sign-code.vue
+++ b/src/const/sign-code.vue
@@ -27,6 +27,7 @@ export default
     ReadingUnitConfirmation: 108, // 医学审核问题确认
     MedicalAudit: 215,// 医学审核
     HeavyReadingApproval: 216,// 重阅审批
+    ResetAndAsyncCriterion: 218, //同步签名
   }
 }
 </script>
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 977bf2f0..2de63881 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -167,7 +167,7 @@
           { required: true, message: this.$t('common:ruleMessage:select')}
         ]"
       >
-        <el-input :value="$fd('DigitPlaces', ValueType).toString()" :disabled="true"/>
+        <el-input :value="$fd('DigitPlaces', digitPlaces).toString()" :disabled="true"/>
       </el-form-item>
       <!-- 单位 -->
       <el-form-item
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 6d542f80..a9734d8b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -10,8 +10,8 @@
               icon="el-icon-refresh-left"
               :loading="loading"
               size="mini"
-              v-if="NODE_ENV !== 'prod' && !hasPermi(['role:admin'])"
-              @click="handleSync"
+              v-if="!hasPermi(['role:admin'])"
+              @click="syncSign"
             >
               {{ $t('trials:readingUnit:button:sync') }}
             </el-button>
@@ -84,10 +84,24 @@
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
+    <!--签名框 -->
+    <el-dialog
+      v-if="signVisible2"
+      :visible.sync="signVisible2"
+      :close-on-click-modal="false"
+      width="600px"
+      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>
+      </div>
+      <SignForm ref="signForm" :sign-code-enum="signCode2" @closeDialog="closeSignDialog2" />
+    </el-dialog>
   </div>
 </template>
 <script>
-import { resetTrialCriterionAsyncState, asyncTrialCriterionDictionary, getTrialCriterionList, trialReadingInfoSign, trialReadingInfoSignVerify, verifyeCriterionNeedSynchronize, synchronizeCriterion } from '@/api/trials'
+import { resetAndAsyncCriterion, resetTrialCriterionAsyncState, asyncTrialCriterionDictionary, getTrialCriterionList, trialReadingInfoSign, trialReadingInfoSignVerify, verifyeCriterionNeedSynchronize, synchronizeCriterion } from '@/api/trials'
 import ReadingRules from './components/ReadingRules'
 import ReadingCriterions from './components/ReadingCriterions'
 import ArbitrationRules from './components/ArbitrationRules'
@@ -104,7 +118,9 @@ export default {
       NODE_ENV: process.env.NODE_ENV,
       activeCollapse: ['1', '2', '3', '4', '5'],
       signCode: null,
+      signCode2: null,
       signVisible: false,
+      signVisible2: false,
       currentUser: zzSessionStorage.getItem('userName'),
       isConfirm: true,
       loading: false,
@@ -137,17 +153,33 @@ export default {
     this.getTrialCriterionList()
   },
   methods: {
-    handleSync() {
+    closeSignDialog2(isSign, signInfo) {
+      if (isSign) {
+        this.handleSync(signInfo)
+      } else {
+        this.signVisible2 = false
+      }
+    },
+    syncSign() {
+      const { ResetAndAsyncCriterion } = const_.processSignature
+      this.signCode2 = ResetAndAsyncCriterion
+      this.signVisible2 = true
+    },
+    handleSync(signInfo) {
       // '确定要同步最新标准配置吗？'
-      this.$confirm(this.$t('trials:readingUnit:message:sync')).then(() => {
-        this.loading = true
-        resetTrialCriterionAsyncState(this.TrialReadingCriterionId).then(async res => {
-          await this.asyncTrialCriterionDictionary(this.TrialReadingCriterionId)
-          this.isPaneShow = false
-          this.$nextTick(() => {
-            this.isPaneShow = true
-            this.loading = false
-          })
+      this.loading = true
+      const params = {
+        data: {
+          TrialReadingCriterionId: this.TrialReadingCriterionId
+        },
+        signInfo: signInfo
+      }
+      resetAndAsyncCriterion(params).then(async res => {
+        this.isPaneShow = false
+        this.$nextTick(() => {
+          this.signVisible2 = false
+          this.isPaneShow = true
+          this.loading = false
         })
       })
     },
diff --git a/src/views/trials/trials-workbench/components/clinicalData.vue b/src/views/trials/trials-workbench/components/clinicalData.vue
index f56d24a4..3208cbad 100644
--- a/src/views/trials/trials-workbench/components/clinicalData.vue
+++ b/src/views/trials/trials-workbench/components/clinicalData.vue
@@ -67,6 +67,7 @@
             icon="el-icon-upload"
             v-if="scope.row.ToBeDealedCount !== 0 || scope.row.ReadModuleCount !== 0"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:title:UploadClinicalData')"
             @click="handleUpload(scope.row)"
           />
@@ -74,6 +75,7 @@
             v-if="scope.row.ToBeVisitCount !== 0"
             icon="el-icon-link"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:UploadImage')"
             @click="goVisit(scope.row)"
           />
@@ -371,6 +373,12 @@ const searchDataDefault2 = () => {
 export default {
   name: 'NeedSignDoc',
   components: { Pagination, clinicalDataQuestions, SignForm, BaseContainer },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       formRow: {},
diff --git a/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue b/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue
index 34adde10..6368506c 100644
--- a/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue
+++ b/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue
@@ -66,6 +66,7 @@
           <el-button
             icon="el-icon-upload"
             v-if="scope.row.ToBeDealedCount !== 0 || scope.row.ReadModuleCount !== 0"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             circle
             :title="$t('trials:workbench:title:UploadClinicalData')"
             @click="handleUpload(scope.row)"
@@ -378,6 +379,12 @@ const searchDataDefault2 = () => {
 export default {
   name: 'NeedSignDoc',
   components: { Pagination, clinicalDataQuestions, SignForm, BaseContainer },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       isListShow: false,
diff --git a/src/views/trials/trials-workbench/components/clinicalDataPM.vue b/src/views/trials/trials-workbench/components/clinicalDataPM.vue
index 12e2ade6..523907e0 100644
--- a/src/views/trials/trials-workbench/components/clinicalDataPM.vue
+++ b/src/views/trials/trials-workbench/components/clinicalDataPM.vue
@@ -58,12 +58,14 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:action:sign')"
             @click="handleUpload(scope.row)"
           />
           <el-button
             icon="el-icon-link"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:action:access')"
             @click="goVisit(scope.row)"
           />
@@ -389,6 +391,12 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'NeedSignDoc',
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   components: { Pagination, clinicalDataQuestions, SignForm },
   data() {
     return {
diff --git a/src/views/trials/trials-workbench/components/consistencyCheck.vue b/src/views/trials/trials-workbench/components/consistencyCheck.vue
index 8ce9b7d4..669dbc9e 100644
--- a/src/views/trials/trials-workbench/components/consistencyCheck.vue
+++ b/src/views/trials/trials-workbench/components/consistencyCheck.vue
@@ -75,6 +75,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:action:sign')"
             @click="handleSign(scope.row)"
           />
@@ -98,6 +99,12 @@ const searchDataDefault = () => {
 export default {
   name: 'NeedSignDoc',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/imageQualityControl.vue b/src/views/trials/trials-workbench/components/imageQualityControl.vue
index 81495722..430f3ca4 100644
--- a/src/views/trials/trials-workbench/components/imageQualityControl.vue
+++ b/src/views/trials/trials-workbench/components/imageQualityControl.vue
@@ -72,6 +72,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -95,6 +96,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ImageQC',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/imageQuestion.vue b/src/views/trials/trials-workbench/components/imageQuestion.vue
index 2bd55e4f..09967abc 100644
--- a/src/views/trials/trials-workbench/components/imageQuestion.vue
+++ b/src/views/trials/trials-workbench/components/imageQuestion.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -88,6 +89,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ImageQuestion',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/imageReupload.vue b/src/views/trials/trials-workbench/components/imageReupload.vue
index a18ebfa4..bc92a942 100644
--- a/src/views/trials/trials-workbench/components/imageReupload.vue
+++ b/src/views/trials/trials-workbench/components/imageReupload.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -87,6 +88,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ImageReupload',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/imageSubmission.vue b/src/views/trials/trials-workbench/components/imageSubmission.vue
index 171b3c96..042e861d 100644
--- a/src/views/trials/trials-workbench/components/imageSubmission.vue
+++ b/src/views/trials/trials-workbench/components/imageSubmission.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -88,6 +89,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ImageSubmission',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/imageVerification.vue b/src/views/trials/trials-workbench/components/imageVerification.vue
index 9c169a08..c262eb70 100644
--- a/src/views/trials/trials-workbench/components/imageVerification.vue
+++ b/src/views/trials/trials-workbench/components/imageVerification.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -88,6 +89,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ImageVerification',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/imagesToRead.vue b/src/views/trials/trials-workbench/components/imagesToRead.vue
index e77a22df..1a2698aa 100644
--- a/src/views/trials/trials-workbench/components/imagesToRead.vue
+++ b/src/views/trials/trials-workbench/components/imagesToRead.vue
@@ -79,6 +79,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -102,6 +103,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ImageToRead',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/medicalAudit.vue b/src/views/trials/trials-workbench/components/medicalAudit.vue
index f16a901e..a8471c4e 100644
--- a/src/views/trials/trials-workbench/components/medicalAudit.vue
+++ b/src/views/trials/trials-workbench/components/medicalAudit.vue
@@ -79,6 +79,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -102,6 +103,12 @@ const searchDataDefault = () => {
 export default {
   name: 'MedicalAudit',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/medicalFeedback.vue b/src/views/trials/trials-workbench/components/medicalFeedback.vue
index 7565c01b..7079b40e 100644
--- a/src/views/trials/trials-workbench/components/medicalFeedback.vue
+++ b/src/views/trials/trials-workbench/components/medicalFeedback.vue
@@ -72,6 +72,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -95,6 +96,12 @@ const searchDataDefault = () => {
 export default {
   name: 'MedicalFeedback',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/qcQuestion.vue b/src/views/trials/trials-workbench/components/qcQuestion.vue
index e42dab73..14a836e8 100644
--- a/src/views/trials/trials-workbench/components/qcQuestion.vue
+++ b/src/views/trials/trials-workbench/components/qcQuestion.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -88,6 +89,12 @@ const searchDataDefault = () => {
 export default {
   name: 'QcQuestion',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/rereadApproval.vue b/src/views/trials/trials-workbench/components/rereadApproval.vue
index 1b3688b6..6b730ab0 100644
--- a/src/views/trials/trials-workbench/components/rereadApproval.vue
+++ b/src/views/trials/trials-workbench/components/rereadApproval.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:researchRecord:action:view')"
             @click="handleAudit(scope.row)"
           />
@@ -88,6 +89,12 @@ const searchDataDefault = () => {
 export default {
   name: 'RereadApproval',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/reviewerApproval.vue b/src/views/trials/trials-workbench/components/reviewerApproval.vue
index 3d8c42d0..9dc54ea4 100644
--- a/src/views/trials/trials-workbench/components/reviewerApproval.vue
+++ b/src/views/trials/trials-workbench/components/reviewerApproval.vue
@@ -70,6 +70,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:seletctedReviews:timeline:approval')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ReviewerApproval',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/reviewerScreen.vue b/src/views/trials/trials-workbench/components/reviewerScreen.vue
index ecf0552f..a5e5d5ed 100644
--- a/src/views/trials/trials-workbench/components/reviewerScreen.vue
+++ b/src/views/trials/trials-workbench/components/reviewerScreen.vue
@@ -70,6 +70,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('common:button:confirm')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,12 @@ const searchDataDefault = () => {
 export default {
   name: 'ReviewerScreen',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/siteResearch.vue b/src/views/trials/trials-workbench/components/siteResearch.vue
index cfac58c6..181661f5 100644
--- a/src/views/trials/trials-workbench/components/siteResearch.vue
+++ b/src/views/trials/trials-workbench/components/siteResearch.vue
@@ -1,131 +1,138 @@
-<template>
-  <div class="siteResearch-wrapper">
-    <el-row>
-      <el-col :span="12">
-        <!-- 中心调研 -->
-        <h3>{{ $t('trials:workbench:title:pendingSiteResearch') }}</h3>
-      </el-col>
-      <el-col :span="12" style="text-align:right;">
-        <h3>
-          <Pagination class="page" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;" @pagination="getList" />
-          <!-- 重置 -->
-          <el-button icon="el-icon-refresh-left" circle :title="$t('common:button:reset')" size="small" @click="handleReset" />
-        </h3>
-      </el-col>
-    </el-row>
-    <el-table
-      ref="siteResearchList"
-      v-loading="listLoading"
-      :data="list"
-      :show-header="true"
-      height="calc(100% - 100px)"
-      @sort-change="handleSortByColumn"
-    >
-      <el-table-column type="index" width="40" />
-      <!-- 项目编号 -->
-      <el-table-column
-        :label="$t('trials:workbench:table:trialId')"
-        prop="TrialCode"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <!-- 试验名称 -->
-      <el-table-column
-        :label="$t('trials:workbench:table:experimentName')"
-        prop="ExperimentName"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <!-- 研究方案号 -->
-      <el-table-column
-        :label="$t('trials:workbench:table:researchNo')"
-        prop="ResearchProgramNo"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <!-- 待审批中心数量 -->
-      <el-table-column
-        :label="$t('trials:pendingSiteResearch:table:siteCount')"
-        prop="ApprovalRequiredSiteCount"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        :label="$t('common:action:action')"
-      >
-        <template slot-scope="scope">
-          <el-button
-            icon="el-icon-edit-outline"
-            circle
-            :title="$t('trials:pendingSiteResearch:action:audit')"
-            @click="handleAudit(scope.row)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-  </div>
-</template>
-<script>
-import { getSiteSurveyApprovalList } from '@/api/trials'
-import Pagination from '@/components/Pagination'
-const searchDataDefault = () => {
-  return {
-    pageIndex: 1,
-    pageSize: 20,
-    asc: true,
-    sortField: ''
-  }
-}
-export default {
-  name: 'SiteResearch',
-  components: { Pagination },
-  data() {
-    return {
-      listLoading: false,
-      list: [],
-      listQuery: searchDataDefault(),
-      total: 0
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.listLoading = true
-      getSiteSurveyApprovalList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.total = res.Result.TotalCount
-        this.list = res.Result.CurrentPageData
-      }).catch(() => { this.listLoading = false })
-    },
-    handleAudit(row) {
-      this.$router.push({ path: `/trials/trials-panel/attachments/site-research?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}` })
-    },
-    handleReset() {
-      this.listQuery = searchDataDefault()
-      this.getList()
-      this.$nextTick(() => {
-        this.$refs.siteResearchList.clearSort()
-      })
-    },
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.listQuery.asc = true
-      } else {
-        this.listQuery.asc = false
-      }
-      this.listQuery.sortField = column.prop
-      this.getList()
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-.siteResearch-wrapper{
-  height: 100%;
-}
-
-</style>
+<template>
+  <div class="siteResearch-wrapper">
+    <el-row>
+      <el-col :span="12">
+        <!-- 中心调研 -->
+        <h3>{{ $t('trials:workbench:title:pendingSiteResearch') }}</h3>
+      </el-col>
+      <el-col :span="12" style="text-align:right;">
+        <h3>
+          <Pagination class="page" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;" @pagination="getList" />
+          <!-- 重置 -->
+          <el-button icon="el-icon-refresh-left" circle :title="$t('common:button:reset')" size="small" @click="handleReset" />
+        </h3>
+      </el-col>
+    </el-row>
+    <el-table
+      ref="siteResearchList"
+      v-loading="listLoading"
+      :data="list"
+      :show-header="true"
+      height="calc(100% - 100px)"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+      <!-- 项目编号 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:trialId')"
+        prop="TrialCode"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 试验名称 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:experimentName')"
+        prop="ExperimentName"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 研究方案号 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:researchNo')"
+        prop="ResearchProgramNo"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 待审批中心数量 -->
+      <el-table-column
+        :label="$t('trials:pendingSiteResearch:table:siteCount')"
+        prop="ApprovalRequiredSiteCount"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+      >
+        <template slot-scope="scope">
+          <el-button
+            icon="el-icon-edit-outline"
+            circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :title="$t('trials:pendingSiteResearch:action:audit')"
+            @click="handleAudit(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+<script>
+import { getSiteSurveyApprovalList } from '@/api/trials'
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+  return {
+    pageIndex: 1,
+    pageSize: 20,
+    asc: true,
+    sortField: ''
+  }
+}
+export default {
+  name: 'SiteResearch',
+  components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
+  data() {
+    return {
+      listLoading: false,
+      list: [],
+      listQuery: searchDataDefault(),
+      total: 0
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      getSiteSurveyApprovalList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.total = res.Result.TotalCount
+        this.list = res.Result.CurrentPageData
+      }).catch(() => { this.listLoading = false })
+    },
+    handleAudit(row) {
+      this.$router.push({ path: `/trials/trials-panel/attachments/site-research?trialId=${row.Id}&trialCode=${row.TrialCode}&researchProgramNo=${row.ResearchProgramNo}` })
+    },
+    handleReset() {
+      this.listQuery = searchDataDefault()
+      this.getList()
+      this.$nextTick(() => {
+        this.$refs.siteResearchList.clearSort()
+      })
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.listQuery.asc = true
+      } else {
+        this.listQuery.asc = false
+      }
+      this.listQuery.sortField = column.prop
+      this.getList()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.siteResearch-wrapper{
+  height: 100%;
+}
+
+</style>
diff --git a/src/views/trials/trials-workbench/components/spmRereadApproval.vue b/src/views/trials/trials-workbench/components/spmRereadApproval.vue
index d369ead7..76c735b6 100644
--- a/src/views/trials/trials-workbench/components/spmRereadApproval.vue
+++ b/src/views/trials/trials-workbench/components/spmRereadApproval.vue
@@ -65,6 +65,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
             :title="$t('trials:workbench:table:approve')"
             @click="handleAudit(scope.row)"
           />
@@ -88,6 +89,12 @@ const searchDataDefault = () => {
 export default {
   name: 'RereadApproval',
   components: { Pagination },
+  props: {
+    trialIdList: {
+      type: Array,
+      default() { return [] }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 9b64e4a5..75533b21 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -3,139 +3,135 @@
     <div class="workbench-stats">
       <PanelCount ref="panelCount" @getSignSystemDocCount="getSignSystemDocCount" />
     </div>
-    <div class="workbench-content">
-      <div class="content-wrapper">
-        <!-- PM/APM -->
-        <!-- 阅片期 -->
-        <div v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <clinicalDataPM />
-          </el-card>
-        </div>
-        <!-- 一致性核查 -->
-        <div v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <consistencyCheck />
-          </el-card>
-        </div>
-        <!-- 重阅审批 -->
-        <div v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <RereadApproval />
-          </el-card>
-        </div>
-        <!-- 阅片人筛选 -->
-        <div v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ReviewerScreen />
-          </el-card>
-        </div>
-        <!-- 中心调研 -->
-        <div v-hasPermi="['trials:trials-workbench:attachments:site-research']" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <SiteResearch />
-          </el-card>
-        </div>
-        <!-- 核对临床数据 -->
-        <!-- SPM/CPM -->
-        <!-- 阅片人审批 -->
-        <div v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ReviewerApproval />
-          </el-card>
-        </div>
-        <!-- 重阅审批 -->
-        <div v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <SpmRereadApproval />
-          </el-card>
-        </div>
-
-        <!-- CRC -->
-        <!-- 临床数据录入 -->
-        <div v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <clinicalData />
-          </el-card>
-        </div>
-        <!-- 临床数据确认 -->
-        <div v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <clinicalDataConfirm />
-          </el-card>
-        </div>
-        <!-- 影像质疑 -->
-        <div v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ImageQuestion />
-          </el-card>
-        </div>
-
-        <!-- 核查质疑 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ImageVerification />
-          </el-card>
-        </div>
-        <!-- 影像重传 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ImageReupload />
-          </el-card>
-        </div>
-        <!-- 加急影像提交 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ImageSubmission />
-          </el-card>
-        </div>
-        <!-- IQC -->
-        <!-- 影像质控 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:imageQC'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ImageQualityControl />
-          </el-card>
-        </div>
-        <!-- QC质疑 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <QcQuestion />
-          </el-card>
-        </div>
-        <!-- IR -->
-        <!-- 影像待阅 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <ImagesToRead />
-          </el-card>
-        </div>
-        <!-- 医学反馈 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <MedicalFeedback />
-          </el-card>
-        </div>
-        <!-- MIM -->
-        <!-- 医学审核 -->
-        <div v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <MedicalAudit />
-          </el-card>
-        </div>
-
-        <div v-if="!hasPermi(['role:zys'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <NeedSignTrialDoc />
-          </el-card>
-        </div>
-
-        <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">
-          <el-card :body-style="{ padding: '10px'}" style="height:100%">
-            <NeedSignSysDoc @refreshStats="refreshStats" />
-          </el-card>
+      <div class="workbench-content">
+        <div class="content-wrapper">
+          <!-- PM/APM -->
+          <!-- 阅片期 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <clinicalDataPM :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 一致性核查 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:consistencyCheck'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <consistencyCheck :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 重阅审批 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:rereadApproval'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <RereadApproval :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 阅片人筛选 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:reviewerScreen'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ReviewerScreen :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 中心调研 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:attachments:site-research'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <SiteResearch :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 核对临床数据 -->
+          <!-- SPM/CPM -->
+          <!-- 阅片人审批 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:reviewerApproval'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ReviewerApproval :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 重阅审批 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:spmRereadApproval'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <SpmRereadApproval :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- CRC -->
+          <!-- 临床数据录入 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <clinicalData :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 临床数据确认 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <clinicalDataConfirm :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 影像质疑 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ImageQuestion :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 核查质疑 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ImageVerification :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 影像重传 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ImageReupload :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 加急影像提交 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ImageSubmission :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- IQC -->
+          <!-- 影像质控 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageQC'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ImageQualityControl :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- QC质疑 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <QcQuestion :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- IR -->
+          <!-- 影像待阅 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <ImagesToRead :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- 医学反馈 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <MedicalFeedback :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <!-- MIM -->
+          <!-- 医学审核 -->
+          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <MedicalAudit :trial-id-list="trialIdList" />
+            </el-card>
+          </div>
+          <div v-if="!isSignSystemDoc && !hasPermi(['role:zys'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <NeedSignTrialDoc />
+            </el-card>
+          </div>
+          <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">
+            <el-card :body-style="{ padding: '10px'}" style="height:100%">
+              <NeedSignSysDoc @refreshStats="refreshStats" />
+            </el-card>
+          </div>
         </div>
       </div>
-    </div>
   </div>
 </template>
 
@@ -161,20 +157,39 @@ import QcQuestion from './components/qcQuestion'
 import ImagesToRead from './components/imagesToRead'
 import MedicalFeedback from './components/medicalFeedback'
 import MedicalAudit from './components/medicalAudit'
+
+import { getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList } from '@/api/trials'
+
 export default {
   name: 'WorkBench',
   components: { clinicalDataConfirm, clinicalDataPM, PanelCount, NeedSignTrialDoc, SiteResearch, NeedSignSysDoc, consistencyCheck, clinicalData, RereadApproval, ReviewerScreen, ReviewerApproval, SpmRereadApproval, ImageQuestion, ImageVerification, ImageReupload, ImageSubmission, ImageQualityControl, QcQuestion, ImagesToRead, MedicalFeedback, MedicalAudit },
   data() {
     return {
-      isSignSystemDoc: false
+      isSignSystemDoc: false,
+      trialIdList: []
     }
   },
+  mounted() {
+    this.getUserTobeDoneRecord()
+    this.getNeedSignTrialDocTrialIdList()
+  },
   methods: {
     getSignSystemDocCount(count) {
       this.isSignSystemDoc = count > 0
     },
     refreshStats() {
       this.$refs['panelCount'].getData()
+    },
+    getNeedSignTrialDocTrialIdList() {
+      getNeedSignTrialDocTrialIdList().then(res => {
+        console.log(res)
+        this.trialIdList = res.Result
+      })
+    },
+    getUserTobeDoneRecord() {
+      getUserTobeDoneRecord().then(res => {
+        console.log(res)
+      })
     }
   }
 }

From 1bbdf57fdb3b8b77a6811a20ff036c12e0e0252c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 27 Feb 2024 17:54:01 +0800
Subject: [PATCH 054/374] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/components/ReadingRules.vue           | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 70d04d29..0d16339a 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -131,6 +131,7 @@
           @change="(v) => {
             if (!v) {
                form.IsGlobalReading = v
+               form.IsOncologyReading = v
             }
           }"
         >
@@ -183,7 +184,7 @@
       >
         <el-radio-group
           v-model="form.IsOncologyReading"
-          :disabled="form.IsSystemCriterion || isConfirm || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])"
+          :disabled="!form.IsReadingPeriod || form.IsSystemCriterion || isConfirm || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])"
         >
           <el-radio
             v-for="item of $d.YesOrNo"

From 74a8fa2524df50b2215b7db201f925e9d3ada5d7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 28 Feb 2024 14:14:23 +0800
Subject: [PATCH 055/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index faeba76e..a8d9aeec 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -263,6 +263,7 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
+    console.log(this.getQuestionVal(7))
   },
   beforeDestroy() {
 
@@ -661,7 +662,8 @@ export default {
       var idx = this.questions.findIndex(i => i.QuestionMark === questionMark)
       if (idx > -1) {
         var questionId = this.questions[idx].Id
-        return this.questionForm[questionId]
+        var answer = this.questionForm[questionId] ? this.questionForm[questionId] : this.answers[questionId]
+        return answer
       } else {
         return ''
       }
@@ -723,6 +725,7 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     handleSave() {
+      console.log('handleSave')
       this.$refs.measurementForm.validate(async valid => {
         if (!valid) return
         const loading = this.$loading({ fullscreen: true })
@@ -741,6 +744,8 @@ export default {
         }
         // 消失、无法评估状态的病灶限制不能测量SUV值
         var lesionState = this.getQuestionVal(7)
+        console.log(lesionState)
+        lesionState = parseInt(lesionState)
         if ((lesionState === 2 || lesionState === 3) && this.questionForm.OtherMeasureData) {
           loading.close()
           this.$confirm(this.$t('评估状态为无法评估或消失的病灶不能测量SUV值！'), {

From d3a88c0f55cd8be039189d626ce544f4ed0e2c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 28 Feb 2024 16:59:57 +0800
Subject: [PATCH 056/374] =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |  2 +-
 .../components/EvaluationOfOncologyConfig.vue | 28 +++++++++++++------
 .../reading-unit/components/ReadingRules.vue  |  3 +-
 3 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/.env.development b/.env.development
index 0819ca53..ad322b0d 100644
--- a/.env.development
+++ b/.env.development
@@ -33,7 +33,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = false
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
 
 # 是否开启文档签署验证 true:是 false:否
-VUE_APP_WORD_FOR_PERMISSION = false
+VUE_APP_WORD_FOR_PERMISSION = true
 
 
 # dicom文件地址
diff --git a/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue b/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue
index e3e73313..f95ef251 100644
--- a/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue
+++ b/src/views/dictionary/template/components/EvaluationOfOncologyConfig.vue
@@ -72,7 +72,7 @@
             v-loading="loading"
             style="width: 100%"
             ref="multipleTable"
-            :data="$d.OncologyAssessType"
+            :data="OncologyAssessType"
             stripe
             @selection-change="handleSelectionChange"
           >
@@ -81,13 +81,13 @@
               width="55">
             </el-table-column>
             <el-table-column
-              prop="raw.ValueCN"
+              prop="ValueCN"
               label="中文值"
               show-overflow-tooltip
             >
             </el-table-column>
             <el-table-column
-              prop="raw.Value"
+              prop="Value"
               label="英文值"
               show-overflow-tooltip
             >
@@ -105,7 +105,7 @@
 
 <script>
 import BaseModel from '@/components/BaseModel'
-import { getSystemOncologyInfo, setSystemOncologyInfo } from '@/api/dictionary'
+import { getSystemOncologyInfo, setSystemOncologyInfo, getCriterionDictionary } from '@/api/dictionary'
 export default {
   props: {
     data: {
@@ -132,13 +132,23 @@ export default {
       preview: { visible: false, title: 'eCRF预览' },
       config: { visible: false, title: '肿瘤学阅片结果', appendToBody: true, width: '600px', configType: 0 },
       selectedList: [],
+      OncologyAssessType: [],
       IsOncologyReading: true
     }
   },
   mounted() {
     this.getList()
+    this.getCriterionDictionary()
   },
   methods: {
+    getCriterionDictionary() {
+      getCriterionDictionary({
+        ReadingCriterionId: this.criterionId,
+        DictionaryCode: 'OncologyAssessType'
+      }).then(res => {
+        this.OncologyAssessType = res.Result.OncologyAssessType
+      })
+    },
     toggleSelection(rows) {
       console.log(this.$refs.multipleTable)
       if (rows) {
@@ -173,9 +183,9 @@ export default {
         this.config.title = '肿瘤学阅片结果'
         this.config.visible = true
         this.$nextTick(() => {
-          var a = this.$d.OncologyAssessType.filter(v => {
+          var a = this.OncologyAssessType.filter(v => {
             return !!this.list.find(v1 => {
-              return v1.DictionaryId === v.id
+              return v1.DictionaryId === v.Id
             })
           })
           this.toggleSelection(a)
@@ -184,15 +194,15 @@ export default {
     },
     handleSave() {
       this.loading = true
-      var a = this.$d.OncologyAssessType.filter(v => {
+      var a = this.OncologyAssessType.filter(v => {
         return !!this.list.find(v1 => {
-          return v1.DictionaryId === v.id
+          return v1.DictionaryId === v.Id
         })
       })
       var params = {
         SystemCriterionId: this.criterionId,
         ParentCode: 'OncologyAssessType',
-        DictionaryIds: this.config.configType === 1 ? a.map(v => v.id) : this.selectedList.map(v => v.id),
+        DictionaryIds: this.config.configType === 1 ? a.map(v => v.Id) : this.selectedList.map(v => v.Id),
         IsSystemCriterion: true,
         IsOncologyReading: this.form.IsOncologyReading
       }
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index 0d16339a..ea094e29 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -184,7 +184,7 @@
       >
         <el-radio-group
           v-model="form.IsOncologyReading"
-          :disabled="!form.IsReadingPeriod || form.IsSystemCriterion || isConfirm || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])"
+          :disabled="!form.IsReadingPeriod || !form.IsSystemSetOncology || isConfirm || !hasPermi(['trials:trials-panel:setting:reading-unit:edit'])"
         >
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -379,6 +379,7 @@ export default {
         IsOncologyReading: 0,
         IsReadingTaskViewInOrder: false,
         IsReadingPeriod: false,
+        IsSystemSetOncology: false,
         // IsReadingTaskViewInOrder: null,
         ArbitrationRule: null,
         GlobalUpdateType: null,

From 6a4bffd8abc3e604de3883d69aa85bc4419ec5e6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 29 Feb 2024 09:26:10 +0800
Subject: [PATCH 057/374] =?UTF-8?q?=E9=9D=9E=E9=9D=B6=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E5=88=86=E8=A3=82=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionList.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index bc18ae0e..0cc9bd27 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -62,7 +62,7 @@
                       <el-tooltip v-if="readingTaskState<2 && parseInt(item.TableQuestions.Answers[i].saveTypeEnum) ===1" class="item" effect="dark" :content="$t('trials:reading:button:incompleteInfor')" placement="bottom">
                         <i class="el-icon-warning" style="color:#ff9800" />
                       </el-tooltip>
-                      <div style="position: absolute;left: 50px;top: 2px;">
+                      <div :style="{position: 'absolute',left: item.LesionType === 1 && readingTaskState < 2?'58px':'50px',top: '2px'}">
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">

From 4f9022a18e8ba4875e0df0d1a9f443d558238133 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 29 Feb 2024 10:14:04 +0800
Subject: [PATCH 058/374] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E5=AD=97=E5=85=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/EvaluationOfGlobalConfig.vue      | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue b/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
index 925d597e..25235f6b 100644
--- a/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
+++ b/src/views/dictionary/template/components/EvaluationOfGlobalConfig.vue
@@ -104,7 +104,7 @@
             v-if="config.configType === 2"
             v-loading="loading"
             ref="multipleTable"
-            :data="$d && $d.GlobalAssessType"
+            :data="GlobalAssessType"
             stripe
             @selection-change="handleSelectionChange"
           >
@@ -165,7 +165,7 @@
 
 <script>
 import BaseModel from '@/components/BaseModel'
-import { getAssessType, setAssessType, setDictionaryBaseLineUse, setDictionaryFollowVisitUse, setSystemGlobalInfo, getSystemGlobalInfo } from '@/api/dictionary'
+import { getCriterionDictionary, getAssessType, setAssessType, setDictionaryBaseLineUse, setDictionaryFollowVisitUse, setSystemGlobalInfo, getSystemGlobalInfo } from '@/api/dictionary'
 export default {
   props: {
     data: {
@@ -192,7 +192,8 @@ export default {
       IsMustGlobalReading: false,
       form: {
         IsMustGlobalReading: false
-      }
+      },
+      GlobalAssessType: []
     }
   },
   beforecreate() {
@@ -204,8 +205,17 @@ export default {
   mounted() {
     this.getList()
     this.getSystemGlobalInfo()
+    this.getCriterionDictionary()
   },
   methods: {
+    getCriterionDictionary() {
+      getCriterionDictionary({
+        ReadingCriterionId: this.criterionId,
+        DictionaryCode: 'GlobalAssessType'
+      }).then(res => {
+        this.GlobalAssessType = res.Result.GlobalAssessType
+      })
+    },
     getSystemGlobalInfo() {
       getSystemGlobalInfo({
         SystemCriterionId: this.criterionId

From f21d8871b5b513bb4016d231e74d716ed2aa89dd Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 29 Feb 2024 14:24:45 +0800
Subject: [PATCH 059/374] =?UTF-8?q?=E9=98=85=E7=89=87=E5=AE=8C=E6=88=90?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E5=88=86=E8=A3=82=E8=9E=8D=E5=90=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionList.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 0cc9bd27..7e7802bf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/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)" />

From 9c4fc174d0376268f288da006dbff7cd81c2425d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 29 Feb 2024 15:22:04 +0800
Subject: [PATCH 060/374] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85?=
 =?UTF-8?q?=E7=89=87bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Conclusions.vue                | 54 ++----------
 .../mim-medical-audit/components/Issues.vue   | 12 +--
 .../reading/oncology-review/index.vue         | 87 ++++++++++---------
 3 files changed, 55 insertions(+), 98 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index ac9e0ebf..b204102b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/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"
-      style="width:500px"
+      label-position="left"
+      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"
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
index 6c981529..7875bc00 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
+++ b/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"
diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index a3bb3d83..81cb4eba 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue
@@ -362,44 +362,49 @@ export default {
       }
     },
     handleSave(isPrompt) {
-      this.loading = true
-      // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
-      var isDiffer = this.checkDifferResult()
-      if (isDiffer) {
-        this.loading = false
-        // '肿瘤学阅片结论不能为空！' this.$t('trials:oncologyReview:message:msg1'
-        // '肿瘤学阅片结果与影像学整体肿瘤评估不一致，请填写原因！'
-        this.$confirm(this.$t('trials:oncologyReview:message:msg2'), {
-          type: 'warning',
-          distinguishCancelAndClose: true
-        })
-          .then(() => {
-            return Promise.reject(false)
-          })
-          .catch(action => {
-            return Promise.reject(false)
-          })
-      } else {
+      return new Promise((resolve, reject) => {
         this.loading = true
-        var oncologyQuestionList = []
-        this.oncologyInfo.OncologyVisits.map(item => {
-          if (item.EvaluationResult && !item.IsBaseLine) {
-            oncologyQuestionList.push(
-              {
-                visitTaskId: item.VisitTaskId,
-                evaluationResult: item.EvaluationResult,
-                evaluationReason: item.EvaluationReason
-              }
-            )
+        // var index = this.oncologyInfo.OncologyVisits.findIndex(item => !item.EvaluationResult && !item.IsBaseLine)
+        var isDiffer = this.checkDifferResult()
+        if (isDiffer) {
+          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',
+            showCancelButton: false
+          })
+            .then(() => {
+              reject(false)
+            })
+        } else {
+          this.loading = true
+          var oncologyQuestionList = []
+          this.oncologyInfo.OncologyVisits.map(item => {
+            if (item.EvaluationResult && !item.IsBaseLine) {
+              oncologyQuestionList.push(
+                {
+                  visitTaskId: item.VisitTaskId,
+                  evaluationResult: item.EvaluationResult,
+                  evaluationReason: item.EvaluationReason
+                }
+              )
+            }
+          })
+          var params = {
+            oncologyTaskId: this.visitTaskId,
+            oncologyQuestionList: oncologyQuestionList,
+            globalTaskId: this.oncologyInfo.GlobalTaskId,
+            relatedTaskId: this.oncologyInfo.RelatedTaskId
           }
-        })
-        var params = {
-          oncologyTaskId: this.visitTaskId,
-          oncologyQuestionList: oncologyQuestionList,
-          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
             }

From e7842282bfed09ddc22d7ecfc2452c17d89eda12 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 29 Feb 2024 17:06:50 +0800
Subject: [PATCH 061/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development                              |   2 +-
 src/views/trials/trials-list/index.vue        | 158 +++++++-
 .../components/clinicalData.vue               |  11 +-
 .../components/clinicalDataConfirm.vue        |   9 +-
 .../components/clinicalDataPM.vue             |  11 +-
 .../components/consistencyCheck.vue           |   9 +-
 .../components/imageQualityControl.vue        |   9 +-
 .../components/imageQuestion.vue              |   9 +-
 .../components/imageReupload.vue              |   9 +-
 .../components/imageSubmission.vue            |   9 +-
 .../components/imageVerification.vue          |   9 +-
 .../components/imagesToRead.vue               |   9 +-
 .../components/medicalAudit.vue               |   9 +-
 .../components/medicalFeedback.vue            |   9 +-
 .../components/needSignSysDoc.vue             |   3 +-
 .../components/needSignTrialDoc.vue           |  10 +-
 .../components/qcQuestion.vue                 |   9 +-
 .../components/rereadApproval.vue             |   9 +-
 .../components/reviewerApproval.vue           |   9 +-
 .../components/reviewerScreen.vue             |   9 +-
 .../components/siteResearch.vue               |   9 +-
 .../components/spmRereadApproval.vue          |   9 +-
 src/views/trials/trials-workbench/index.vue   | 347 +++++++++++-------
 23 files changed, 507 insertions(+), 179 deletions(-)

diff --git a/.env.development b/.env.development
index ad322b0d..0819ca53 100644
--- a/.env.development
+++ b/.env.development
@@ -33,7 +33,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = false
 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$
 
 # 是否开启文档签署验证 true:是 false:否
-VUE_APP_WORD_FOR_PERMISSION = true
+VUE_APP_WORD_FOR_PERMISSION = false
 
 
 # dicom文件地址
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 77e4370c..319f9b29 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -353,6 +353,146 @@
           sortable="custom"
           width="180"
         />
+        <el-table-column
+          v-if="hasPermi(['role:crc', 'role:cra'])"
+          prop="CRC_UrgentCount"
+          :label="$t('trials:trials-list:table:CRC_UrgentCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:crc', 'role:cra'])"
+          prop="CRC_QCQuestionCount"
+          :label="$t('trials:trials-list:table:CRC_QCQuestionCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:crc', 'role:cra'])"
+          prop="CRC_CheckQuestionCount"
+          :label="$t('trials:trials-list:table:CRC_CheckQuestionCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:ir'])"
+          prop="IR_UrgentCount"
+          :label="$t('trials:trials-list:table:IR_UrgentCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:ir'])"
+          prop="IR_UnReadCount"
+          :label="$t('trials:trials-list:table:IR_UnReadCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:ir'])"
+          prop="IR_TotalReadCount"
+          :label="$t('trials:trials-list:table:IR_TotalReadCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:ir'])"
+          prop="IR_PMEmailList"
+          :label="$t('trials:trials-list:table:IR_PMEmailList')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        >
+          <template slot-scope="scope">
+            {{scope.row.IR_PMEmailList.join(', ')}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          v-if="hasPermi(['role:iqc'])"
+          prop="IQC_UrgentCount"
+          :label="$t('trials:trials-list:table:IQC_UrgentCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:iqc'])"
+          prop="IQC_ToBeClaimedCount"
+          :label="$t('trials:trials-list:table:IQC_ToBeClaimedCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:iqc'])"
+          prop="IQC_AuditToBeDealedCount"
+          :label="$t('trials:trials-list:table:IQC_AuditToBeDealedCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:iqc'])"
+          prop="IQC_QuestionToBeDealedCount"
+          :label="$t('trials:trials-list:table:IQC_QuestionToBeDealedCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:iqc'])"
+          prop="MIM_UrgentCount"
+          :label="$t('trials:trials-list:table:MIM_UrgentCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:mim'])"
+          prop="MIM_UrgentCount"
+          :label="$t('trials:trials-list:table:MIM_UrgentCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:mim'])"
+          prop="MIM_PendingReviewCount"
+          :label="$t('trials:trials-list:table:MIM_PendingReviewCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:mim'])"
+          prop="MIM_PendingResponseCount"
+          :label="$t('trials:trials-list:table:MIM_PendingResponseCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:spm', 'role:cpm'])"
+          prop="SPM_ReReadingApprovalCount"
+          :label="$t('trials:trials-list:table:SPM_ReReadingApprovalCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
+        <el-table-column
+          v-if="hasPermi(['role:spm', 'role:cpm'])"
+          prop="SPM_ReviewerSelectApprovalCount"
+          :label="$t('trials:trials-list:table:SPM_ReviewerSelectApprovalCount')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        />
         <el-table-column
           prop="CreateTime"
           :label="$t('trials:trials-list:table:createDate')"
@@ -403,15 +543,15 @@
               :title="$t('trials:trials-list:action:abolition')"
               @click.stop="handleAbandon(scope.row)"
             />
-            <!-- 代办详情 -->
-<!--            <el-button-->
-<!--              v-hasPermi="['trials:trials-list:abolish']"-->
-<!--              circle-->
-<!--              icon="el-icon-receiving"-->
-<!--              :disabled="scope.row.TrialStatusStr === 'Initializing'"-->
-<!--              :title="$t('trials:trials-list:action:commission')"-->
-<!--              @click.stop="handleCommission(scope.row)"-->
-<!--            />-->
+<!--             代办详情-->
+            <el-button
+              v-hasPermi="['trials:trials-list:abolish']"
+              circle
+              icon="el-icon-receiving"
+              :disabled="scope.row.TrialStatusStr === 'Initializing'"
+              :title="$t('trials:trials-list:action:commission')"
+              @click.stop="handleCommission(scope.row)"
+            />
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/trials/trials-workbench/components/clinicalData.vue b/src/views/trials/trials-workbench/components/clinicalData.vue
index 3208cbad..00a4779d 100644
--- a/src/views/trials/trials-workbench/components/clinicalData.vue
+++ b/src/views/trials/trials-workbench/components/clinicalData.vue
@@ -17,7 +17,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -67,7 +68,7 @@
             icon="el-icon-upload"
             v-if="scope.row.ToBeDealedCount !== 0 || scope.row.ReadModuleCount !== 0"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:title:UploadClinicalData')"
             @click="handleUpload(scope.row)"
           />
@@ -75,7 +76,7 @@
             v-if="scope.row.ToBeVisitCount !== 0"
             icon="el-icon-link"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:UploadImage')"
             @click="goVisit(scope.row)"
           />
@@ -377,6 +378,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue b/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue
index 6368506c..e66e0df6 100644
--- a/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue
+++ b/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue
@@ -17,7 +17,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -66,7 +67,7 @@
           <el-button
             icon="el-icon-upload"
             v-if="scope.row.ToBeDealedCount !== 0 || scope.row.ReadModuleCount !== 0"
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             circle
             :title="$t('trials:workbench:title:UploadClinicalData')"
             @click="handleUpload(scope.row)"
@@ -383,6 +384,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/clinicalDataPM.vue b/src/views/trials/trials-workbench/components/clinicalDataPM.vue
index 523907e0..2a2615ba 100644
--- a/src/views/trials/trials-workbench/components/clinicalDataPM.vue
+++ b/src/views/trials/trials-workbench/components/clinicalDataPM.vue
@@ -17,7 +17,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -58,14 +59,14 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:action:sign')"
             @click="handleUpload(scope.row)"
           />
           <el-button
             icon="el-icon-link"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:action:access')"
             @click="goVisit(scope.row)"
           />
@@ -395,6 +396,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   components: { Pagination, clinicalDataQuestions, SignForm },
diff --git a/src/views/trials/trials-workbench/components/consistencyCheck.vue b/src/views/trials/trials-workbench/components/consistencyCheck.vue
index 669dbc9e..422b6608 100644
--- a/src/views/trials/trials-workbench/components/consistencyCheck.vue
+++ b/src/views/trials/trials-workbench/components/consistencyCheck.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -75,7 +76,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:action:sign')"
             @click="handleSign(scope.row)"
           />
@@ -103,6 +104,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/imageQualityControl.vue b/src/views/trials/trials-workbench/components/imageQualityControl.vue
index 430f3ca4..c724058f 100644
--- a/src/views/trials/trials-workbench/components/imageQualityControl.vue
+++ b/src/views/trials/trials-workbench/components/imageQualityControl.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -72,7 +73,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -100,6 +101,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/imageQuestion.vue b/src/views/trials/trials-workbench/components/imageQuestion.vue
index 09967abc..1e974265 100644
--- a/src/views/trials/trials-workbench/components/imageQuestion.vue
+++ b/src/views/trials/trials-workbench/components/imageQuestion.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/imageReupload.vue b/src/views/trials/trials-workbench/components/imageReupload.vue
index bc92a942..34220a10 100644
--- a/src/views/trials/trials-workbench/components/imageReupload.vue
+++ b/src/views/trials/trials-workbench/components/imageReupload.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -92,6 +93,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/imageSubmission.vue b/src/views/trials/trials-workbench/components/imageSubmission.vue
index 042e861d..dac15fa1 100644
--- a/src/views/trials/trials-workbench/components/imageSubmission.vue
+++ b/src/views/trials/trials-workbench/components/imageSubmission.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/imageVerification.vue b/src/views/trials/trials-workbench/components/imageVerification.vue
index c262eb70..6e900b1f 100644
--- a/src/views/trials/trials-workbench/components/imageVerification.vue
+++ b/src/views/trials/trials-workbench/components/imageVerification.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/imagesToRead.vue b/src/views/trials/trials-workbench/components/imagesToRead.vue
index 1a2698aa..33259dba 100644
--- a/src/views/trials/trials-workbench/components/imagesToRead.vue
+++ b/src/views/trials/trials-workbench/components/imagesToRead.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -79,7 +80,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -107,6 +108,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/medicalAudit.vue b/src/views/trials/trials-workbench/components/medicalAudit.vue
index a8471c4e..05451b03 100644
--- a/src/views/trials/trials-workbench/components/medicalAudit.vue
+++ b/src/views/trials/trials-workbench/components/medicalAudit.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -79,7 +80,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -107,6 +108,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/medicalFeedback.vue b/src/views/trials/trials-workbench/components/medicalFeedback.vue
index 7079b40e..eca15b95 100644
--- a/src/views/trials/trials-workbench/components/medicalFeedback.vue
+++ b/src/views/trials/trials-workbench/components/medicalFeedback.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -72,7 +73,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -100,6 +101,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index a6b7b118..ed0abda1 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
diff --git a/src/views/trials/trials-workbench/components/needSignTrialDoc.vue b/src/views/trials/trials-workbench/components/needSignTrialDoc.vue
index f99b7f08..ce52780e 100644
--- a/src/views/trials/trials-workbench/components/needSignTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignTrialDoc.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -60,6 +61,7 @@
             icon="el-icon-edit-outline"
             circle
             :title="$t('trials:workbench:action:sign')"
+            :disabled="isSignSystemDoc"
             @click="handleSign(scope.row)"
           />
         </template>
@@ -82,6 +84,12 @@ const searchDataDefault = () => {
 export default {
   name: 'NeedSignDoc',
   components: { Pagination },
+  props: {
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
+    }
+  },
   data() {
     return {
       listLoading: false,
diff --git a/src/views/trials/trials-workbench/components/qcQuestion.vue b/src/views/trials/trials-workbench/components/qcQuestion.vue
index 14a836e8..711c1b1f 100644
--- a/src/views/trials/trials-workbench/components/qcQuestion.vue
+++ b/src/views/trials/trials-workbench/components/qcQuestion.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:button:handle')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/rereadApproval.vue b/src/views/trials/trials-workbench/components/rereadApproval.vue
index 6b730ab0..b64cd088 100644
--- a/src/views/trials/trials-workbench/components/rereadApproval.vue
+++ b/src/views/trials/trials-workbench/components/rereadApproval.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:researchRecord:action:view')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/reviewerApproval.vue b/src/views/trials/trials-workbench/components/reviewerApproval.vue
index 9dc54ea4..98b536ae 100644
--- a/src/views/trials/trials-workbench/components/reviewerApproval.vue
+++ b/src/views/trials/trials-workbench/components/reviewerApproval.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -70,7 +71,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:seletctedReviews:timeline:approval')"
             @click="handleAudit(scope.row)"
           />
@@ -98,6 +99,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/reviewerScreen.vue b/src/views/trials/trials-workbench/components/reviewerScreen.vue
index a5e5d5ed..bf4fd3e7 100644
--- a/src/views/trials/trials-workbench/components/reviewerScreen.vue
+++ b/src/views/trials/trials-workbench/components/reviewerScreen.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -70,7 +71,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('common:button:confirm')"
             @click="handleAudit(scope.row)"
           />
@@ -98,6 +99,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/siteResearch.vue b/src/views/trials/trials-workbench/components/siteResearch.vue
index 181661f5..9acf5f41 100644
--- a/src/views/trials/trials-workbench/components/siteResearch.vue
+++ b/src/views/trials/trials-workbench/components/siteResearch.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -57,7 +58,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:pendingSiteResearch:action:audit')"
             @click="handleAudit(scope.row)"
           />
@@ -84,6 +85,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/components/spmRereadApproval.vue b/src/views/trials/trials-workbench/components/spmRereadApproval.vue
index 76c735b6..101ff67c 100644
--- a/src/views/trials/trials-workbench/components/spmRereadApproval.vue
+++ b/src/views/trials/trials-workbench/components/spmRereadApproval.vue
@@ -18,7 +18,8 @@
       v-loading="listLoading"
       :data="list"
       :show-header="true"
-      height="calc(100% - 100px)"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
@@ -65,7 +66,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :disabled="!!~trialIdList.indexOf(scope.row.TrialId)"
+            :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc"
             :title="$t('trials:workbench:table:approve')"
             @click="handleAudit(scope.row)"
           />
@@ -93,6 +94,10 @@ export default {
     trialIdList: {
       type: Array,
       default() { return [] }
+    },
+    isSignSystemDoc: {
+      type: Boolean,
+      default() { return false }
     }
   },
   data() {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 75533b21..e5441f39 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -3,134 +3,222 @@
     <div class="workbench-stats">
       <PanelCount ref="panelCount" @getSignSystemDocCount="getSignSystemDocCount" />
     </div>
-      <div class="workbench-content">
-        <div class="content-wrapper">
-          <!-- PM/APM -->
-          <!-- 阅片期 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <clinicalDataPM :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 一致性核查 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:consistencyCheck'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <consistencyCheck :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 重阅审批 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:rereadApproval'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <RereadApproval :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 阅片人筛选 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:reviewerScreen'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ReviewerScreen :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 中心调研 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:attachments:site-research'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <SiteResearch :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 核对临床数据 -->
-          <!-- SPM/CPM -->
-          <!-- 阅片人审批 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:reviewerApproval'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ReviewerApproval :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 重阅审批 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:spmRereadApproval'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <SpmRereadApproval :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- CRC -->
-          <!-- 临床数据录入 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <clinicalData :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 临床数据确认 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <clinicalDataConfirm :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 影像质疑 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ImageQuestion :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 核查质疑 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ImageVerification :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 影像重传 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ImageReupload :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 加急影像提交 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ImageSubmission :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- IQC -->
-          <!-- 影像质控 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageQC'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ImageQualityControl :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- QC质疑 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <QcQuestion :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- IR -->
-          <!-- 影像待阅 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <ImagesToRead :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- 医学反馈 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <MedicalFeedback :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <!-- MIM -->
-          <!-- 医学审核 -->
-          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <MedicalAudit :trial-id-list="trialIdList" />
-            </el-card>
-          </div>
-          <div v-if="!isSignSystemDoc && !hasPermi(['role:zys'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <NeedSignTrialDoc />
-            </el-card>
-          </div>
-          <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">
-            <el-card :body-style="{ padding: '10px'}" style="height:100%">
-              <NeedSignSysDoc @refreshStats="refreshStats" />
-            </el-card>
-          </div>
+      <div class="workbench-content" style="height: 100%">
+        <div style="height: 100%">
+          <el-tabs style="height: 100%" tab-position="left">
+            <!-- PM/APM -->
+            <!-- 阅片期 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <clinicalDataPM :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <consistencyCheck :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 重阅审批 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <RereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 阅片人筛选 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ReviewerScreen :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 中心调研 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <SiteResearch :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- SPM/CPM -->
+            <!-- 阅片人审批 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ReviewerApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 重阅审批 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <SpmRereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- CRC -->
+            <!-- 临床数据录入 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 临床数据确认 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 影像质疑 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 核查质疑 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 影像重传 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 加急影像提交 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- IQC -->
+            <!-- 影像质控 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- QC质疑 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- IR -->
+            <!-- 影像待阅 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 医学反馈 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- MIM -->
+            <!-- 医学审核 -->
+            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 项目签署文件 -->
+            <el-tab-pane  v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <NeedSignTrialDoc :is-sign-system-doc="isSignSystemDoc" />
+              </el-card>
+            </el-tab-pane>
+            <!-- 系统签署文件 -->
+            <el-tab-pane v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
+              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+                <NeedSignSysDoc @refreshStats="refreshStats" />
+              </el-card>
+            </el-tab-pane>
+          </el-tabs>
         </div>
+
+
+<!--          &lt;!&ndash; SPM/CPM &ndash;&gt;-->
+<!--          &lt;!&ndash; 阅片人审批 &ndash;&gt;-->
+<!--          &lt;!&ndash; 重阅审批 &ndash;&gt;-->
+<!--          &lt;!&ndash; CRC &ndash;&gt;-->
+<!--          &lt;!&ndash; 临床数据录入 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; 影像质疑 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; 核查质疑 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; 影像重传 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; 加急影像提交 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; IQC &ndash;&gt;-->
+<!--          &lt;!&ndash; 影像质控 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageQC'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; QC质疑 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; IR &ndash;&gt;-->
+<!--          &lt;!&ndash; 影像待阅 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; 医学反馈 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          &lt;!&ndash; MIM &ndash;&gt;-->
+<!--          &lt;!&ndash; 医学审核 &ndash;&gt;-->
+<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          <div v-if="!isSignSystemDoc && !hasPermi(['role:zys'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <NeedSignTrialDoc />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--          <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">-->
+<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--              <NeedSignSysDoc @refreshStats="refreshStats" />-->
+<!--            </el-card>-->
+<!--          </div>-->
+<!--        </div>-->
       </div>
   </div>
 </template>
@@ -166,7 +254,8 @@ export default {
   data() {
     return {
       isSignSystemDoc: false,
-      trialIdList: []
+      trialIdList: [],
+      tabList: {}
     }
   },
   mounted() {
@@ -188,7 +277,7 @@ export default {
     },
     getUserTobeDoneRecord() {
       getUserTobeDoneRecord().then(res => {
-        console.log(res)
+        this.tabList = res.Result
       })
     }
   }

From 8512b91ebd98f165faec127f9dd0267dcaa0e161 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 1 Mar 2024 09:27:49 +0800
Subject: [PATCH 062/374] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Conclusions.vue                |   7 +-
 .../mim-medical-audit/components/FormItem.vue | 139 ++++++++++++++++++
 .../mim-medical-audit/components/Issues.vue   |  21 ++-
 .../reading/oncology-review/index.vue         |   6 +-
 4 files changed, 163 insertions(+), 10 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index b204102b..653f20d3 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/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"
@@ -397,5 +394,9 @@ export default {
       /* 图片在方框内显示长边 */
       object-fit: scale-down !important;
   }
+  .el-radio-group,.el-textarea,.el-input,.el-select{
+    width:300px;
+  }
+
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue
new file mode 100644
index 00000000..05ed238f
--- /dev/null
+++ b/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>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
index 7875bc00..7378472c 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
+++ b/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>
diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index 81cb4eba..89ec83da 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/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 (tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult || (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult && this.oncologyInfo.OncologyVisits[i].EvaluationReason)) {
-              isDiffer = false
-              break
-            } else {
+            if (!(this.oncologyInfo.OncologyVisits[i].EvaluationResult !== '' && (tumorAssessment === this.oncologyInfo.OncologyVisits[i].EvaluationResult || (tumorAssessment !== this.oncologyInfo.OncologyVisits[i].EvaluationResult && this.oncologyInfo.OncologyVisits[i].EvaluationReason)))) {
               isDiffer = true
               break
             }

From de40cb6ec50153aac5f27ebf34bf1c16da884933 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 1 Mar 2024 09:47:55 +0800
Subject: [PATCH 063/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/Conclusions.vue     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 653f20d3..ad7a3a44 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -85,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}">
@@ -385,10 +386,14 @@ 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 {
       /* 图片在方框内显示长边 */

From bd024773bd7f36eab401213e03dfdf8e93f181e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 1 Mar 2024 13:33:37 +0800
Subject: [PATCH 064/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              |   6 +-
 src/layout/components/topLang.vue             |  54 +++++++++
 src/views/reviewers/components/Employment.vue |  12 +-
 src/views/trials/trials-workbench/index.vue   | 104 +++++++++---------
 4 files changed, 116 insertions(+), 60 deletions(-)
 create mode 100644 src/layout/components/topLang.vue

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 88bcd754..b07a3ad2 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -40,6 +40,7 @@
             </el-dropdown-menu>
           </el-dropdown>
         </div>
+        <TopLang></TopLang>
       </div>
     </div>
   </div>
@@ -50,12 +51,15 @@ import {mapGetters, mapMutations} from 'vuex'
 import Breadcrumb from '@/components/Breadcrumb'
 import Hamburger from '@/components/Hamburger'
 import Screenfull from '@/components/Screenfull'
+import TopLang from './topLang'
+
 
 export default {
   components: {
     Breadcrumb,
     Hamburger,
-    Screenfull
+    Screenfull,
+    TopLang
   },
   data() {
     return {
diff --git a/src/layout/components/topLang.vue b/src/layout/components/topLang.vue
new file mode 100644
index 00000000..9a18a56f
--- /dev/null
+++ b/src/layout/components/topLang.vue
@@ -0,0 +1,54 @@
+<template>
+  <el-dropdown
+    style="height:50px;line-height: 60px;"
+    @command="handleSetLanguage"
+  >
+
+    <span class="el-dropdown-link">
+      <svg-icon icon-class="language" style="font-size:25px;margin:0 10px;" />
+      <!-- {{ language==='zh'?'语言：中文':'Language: English' }} -->
+      <!-- <i class="el-icon-arrow-down el-icon--right" /> -->
+    </span>
+    <el-dropdown-menu slot="dropdown">
+      <el-dropdown-item
+        :disabled="language==='zh'"
+        command="zh"
+      >中文
+      </el-dropdown-item>
+      <el-dropdown-item
+        :disabled="language==='en'"
+        command="en"
+      >English
+      </el-dropdown-item>
+    </el-dropdown-menu>
+  </el-dropdown>
+</template>
+
+<script>
+import { mapGetters, mapMutations } from 'vuex'
+
+export default {
+  name: 'TopLang',
+
+  data() {
+    return {}
+  },
+  computed: {
+    ...mapGetters({
+      language: 'language'
+    })
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    handleSetLanguage(lang) {
+      this.$i18n.locale = lang
+      this.setLanguage(lang)
+      this.$updateDictionary()
+      // window.location.reload()
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 74d09e22..94808624 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -376,9 +376,9 @@ export default {
           this.loading = true
           this.isDisabled = true
           const param = {}
-          var o = this.$d.PhysicianOriginal.find(v => {
-            return v.id === this.employmentForm.PhysicianId
-          })
+          // var o = this.$d.PhysicianOriginal.find(v => {
+          //   return v.id === this.employmentForm.PhysicianId
+          // })
           param.Id = this.$route.query.Id
           param.DepartmentId = this.employmentForm.DepartmentId
           param.DepartmentOther = this.employmentForm.DepartmentId === this.otherId ? this.employmentForm.DepartmentOther : ''
@@ -386,9 +386,9 @@ export default {
           param.RankId = this.employmentForm.RankId
           param.RankOther = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOther : ''
           param.RankOtherCN = this.employmentForm.RankId === this.otherId ? this.employmentForm.RankOtherCN : ''
-          param.PhysicianId = this.employmentForm.PhysicianId
-          param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician
-          param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN
+          // param.PhysicianId = this.employmentForm.PhysicianId
+          // param.Physician = o.label !== '其它' && o.label !== 'Other' ? o.raw.Value : this.employmentForm.Physician
+          // param.PhysicianCN = o.label !== '其它' && o.label !== 'Other' ? o.raw.ValueCN : this.employmentForm.PhysicianCN
           param.PositionId = this.employmentForm.PositionId
           param.PositionOther = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOther : ''
           param.PositionOtherCN = this.employmentForm.PositionId === this.otherId ? this.employmentForm.PositionOtherCN : ''
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index e5441f39..52641d85 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -9,127 +9,125 @@
             <!-- PM/APM -->
             <!-- 阅片期 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
                 <clinicalDataPM :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
             </el-tab-pane>
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <consistencyCheck :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 重阅审批 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <RereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 阅片人筛选 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ReviewerScreen :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 中心调研 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <SiteResearch :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- SPM/CPM -->
             <!-- 阅片人审批 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ReviewerApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 重阅审批 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <SpmRereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- CRC -->
             <!-- 临床数据录入 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 临床数据确认 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 影像质疑 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 核查质疑 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 影像重传 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 加急影像提交 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- IQC -->
             <!-- 影像质控 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- QC质疑 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- IR -->
             <!-- 影像待阅 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 医学反馈 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- MIM -->
             <!-- 医学审核 -->
             <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 项目签署文件 -->
             <el-tab-pane  v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <NeedSignTrialDoc :is-sign-system-doc="isSignSystemDoc" />
-              </el-card>
+
             </el-tab-pane>
             <!-- 系统签署文件 -->
             <el-tab-pane v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
-              <el-card :body-style="{ padding: '10px'}" style="height:100%">
+
                 <NeedSignSysDoc @refreshStats="refreshStats" />
-              </el-card>
+
             </el-tab-pane>
           </el-tabs>
         </div>
@@ -141,80 +139,80 @@
 <!--          &lt;!&ndash; CRC &ndash;&gt;-->
 <!--          &lt;!&ndash; 临床数据录入 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 影像质疑 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 核查质疑 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 影像重传 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 加急影像提交 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; IQC &ndash;&gt;-->
 <!--          &lt;!&ndash; 影像质控 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageQC'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; QC质疑 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; IR &ndash;&gt;-->
 <!--          &lt;!&ndash; 影像待阅 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; 医学反馈 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          &lt;!&ndash; MIM &ndash;&gt;-->
 <!--          &lt;!&ndash; 医学审核 &ndash;&gt;-->
 <!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          <div v-if="!isSignSystemDoc && !hasPermi(['role:zys'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <NeedSignTrialDoc />-->
 <!--            </el-card>-->
 <!--          </div>-->
 <!--          <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">-->
-<!--            <el-card :body-style="{ padding: '10px'}" style="height:100%">-->
+<!--          -->
 <!--              <NeedSignSysDoc @refreshStats="refreshStats" />-->
 <!--            </el-card>-->
 <!--          </div>-->

From 7101276aab8b5157983ba52c0b08de4caef22861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 1 Mar 2024 14:53:13 +0800
Subject: [PATCH 065/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/Account.vue  | 78 +++++++++---------
 src/views/system/user/components/UserInfo.vue | 35 ++++----
 src/views/system/user/edit/index.vue          | 80 +++++++++----------
 3 files changed, 96 insertions(+), 97 deletions(-)

diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index 4deb34e4..6d4b96bb 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -1,39 +1,39 @@
-<template>
-  <el-card class="box-card" style="width:800px;" size="small">
-    <!-- <div slot="header" class="clearfix">
-      <span>Security</span>
-    </div> -->
-    <div>
-      <el-button type="danger" @click="handleReset">Reset Password</el-button>
-    </div>
-  </el-card>
-</template>
-<script>
-import { resetPassword } from '@/api/admin'
-export default {
-  name: 'Account',
-  props: {
-    userId: { type: String, default: '' }
-  },
-  methods: {
-    handleReset() {
-      this.$confirm('Sure to reset password?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          resetPassword(this.userId).then(res => {
-            if (res.IsSuccess) {
-              this.$message({
-                message: 'Reset password successfully',
-                type: 'success'
-              })
-            }
-          })
-        })
-    }
-  }
-}
-</script>
+<template>
+  <el-card class="box-card" style="width:800px;" size="small">
+    <!-- <div slot="header" class="clearfix">
+      <span>Security</span>
+    </div> -->
+    <div>
+      <el-button type="danger" @click="handleReset">{{$t('system:userlist:button:ResetPassword')}}</el-button>
+    </div>
+  </el-card>
+</template>
+<script>
+import { resetPassword } from '@/api/admin'
+export default {
+  name: 'Account',
+  props: {
+    userId: { type: String, default: '' }
+  },
+  methods: {
+    handleReset() {
+      this.$confirm('Sure to reset password?', {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+        confirmButtonText: 'Ok',
+        cancelButtonText: 'Cancel'
+      })
+        .then(() => {
+          resetPassword(this.userId).then(res => {
+            if (res.IsSuccess) {
+              this.$message({
+                message: 'Reset password successfully',
+                type: 'success'
+              })
+            }
+          })
+        })
+    }
+  }
+}
+</script>
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 37105f03..4582db64 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -9,41 +9,41 @@
   >
     <el-card class="Basic" shadow="never" size="small">
       <div slot="header" class="clearfix">
-        <span>Basic Information</span>
+        <span>{{ $t('system:userlist:title:Information') }}</span>
       </div>
-      <el-form-item  v-if="user.UserCode" label="S/N: " prop="UserCode">
+      <el-form-item  v-if="user.UserCode" :label="$t('system:userlist:table:S/N')" prop="UserCode">
         <el-input v-model="user.UserCode" disabled />
       </el-form-item>
 
-      <el-form-item label="User ID: " class="my_new_pwd" prop="UserName">
+      <el-form-item :label="$t('system:userlist:table:UserName')" class="my_new_pwd" prop="UserName">
         <el-input v-model="user.UserName" />
       </el-form-item>
 
-      <el-form-item label="Surname: " prop="LastName">
+      <el-form-item :label="$t('system:userlist:table:LastName')" prop="LastName">
         <el-input v-model="user.LastName" />
       </el-form-item>
-      <el-form-item label="Given Name: " prop="FirstName">
+      <el-form-item :label="$t('system:userlist:table:FirstName')" prop="FirstName">
         <el-input v-model="user.FirstName" />
       </el-form-item>
-      <el-form-item label="Gender: " prop="Sex" style="margin-right:40px;">
+      <el-form-item :label="$t('system:userlist:table:Gender')" prop="Sex" style="margin-right:40px;">
         <el-radio-group v-model="user.Sex">
           <el-radio :label="1">Male</el-radio>
           <el-radio :label="0">Female</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item label="Email: " prop="EMail">
+      <el-form-item :label="$t('system:userlist:table:Email')" prop="EMail">
         <el-input v-model="user.EMail" />
       </el-form-item>
-      <el-form-item label="Phone: " prop="Phone">
+      <el-form-item :label="$t('system:userlist:table:Phone')" prop="Phone">
         <el-input v-model="user.Phone" />
       </el-form-item>
-      <el-form-item v-if="type==1" label="Disable:">
+      <el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')">
         <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" />
       </el-form-item>
-      <el-form-item label="IsTestUser:">
+      <el-form-item :label="$t('system:userlist:table:IsTestUser')">
         <el-switch v-model="user.IsTestUser" />
       </el-form-item>
-      <el-form-item label="User Type: " prop="UserTypeId">
+      <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">
         <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
           <el-option
             v-for="(userType,key) of userTypeOptions"
@@ -58,22 +58,21 @@
 
     <el-card class="Affiliation" shadow="never" style="margin-top:10px;" size="small">
       <div slot="header" class="clearfix">
-        <span>Affiliation</span>
+        <span>{{ $t('system:userlist:title:Affiliation') }}</span>
       </div>
       <el-form-item prop="IsZhiZhun">
         <el-radio-group v-model="user.IsZhiZhun" @change="OrgnizationTypeChanged">
-          <el-radio :label="true">Internal</el-radio>
-          <el-radio :label="false">External</el-radio>
+          <el-radio :label="true">{{ $t('system:userlist:title:Internal') }}</el-radio>
+          <el-radio :label="false">{{ $t('system:userlist:title:External') }}</el-radio>
         </el-radio-group>
       </el-form-item>
-      <el-form-item v-show="user.IsZhiZhun === false" label="Organization Name: ">
+      <el-form-item v-show="user.IsZhiZhun === false" :label="$t('system:userlist:table:OrganizationName')">
         <el-input v-model="user.OrganizationName" />
       </el-form-item>
-
-      <el-form-item label="Department: " prop="DepartmentName">
+      <el-form-item :label="$t('system:userlist:table:Department')" prop="DepartmentName">
         <el-input v-model="user.DepartmentName" />
       </el-form-item>
-      <el-form-item label="Position: " prop="PositionName">
+      <el-form-item :label="$t('system:userlist:table:Position')" prop="PositionName">
         <el-input v-model="user.PositionName" />
       </el-form-item>
     </el-card>
diff --git a/src/views/system/user/edit/index.vue b/src/views/system/user/edit/index.vue
index c37fa343..2be70da6 100644
--- a/src/views/system/user/edit/index.vue
+++ b/src/views/system/user/edit/index.vue
@@ -1,40 +1,40 @@
-<template>
-  <div class="edit-container">
-    <el-tabs v-model="activeTab" @tab-click="clickTab">
-      <el-tab-pane label="User " name="user">
-        <user-info :user-id="userId" />
-      </el-tab-pane>
-      <el-tab-pane label="Password " name="account">
-        <Account v-if="load.account" :user-id="userId" />
-      </el-tab-pane>
-    </el-tabs>
-  </div>
-</template>
-<script>
-import UserInfo from '../components/UserInfo'
-import Account from '../components/Account'
-export default {
-  name: 'EditUser',
-  components: { UserInfo, Account },
-  data() {
-    return {
-      activeTab: 'user',
-      userId: '',
-      load: {
-        role: false,
-        account: false
-      }
-    }
-  },
-  created() {
-    this.userId = this.$router.currentRoute.query.Id
-  },
-  methods: {
-    clickTab(tab, event) {
-      if (this.load[tab.name] === false) {
-        this.load[tab.name] = true
-      }
-    }
-  }
-}
-</script>
+<template>
+  <div class="edit-container">
+    <el-tabs v-model="activeTab" @tab-click="clickTab">
+      <el-tab-pane :label="$t('system:userlist:tab:User')" name="user">
+        <user-info :user-id="userId" />
+      </el-tab-pane>
+      <el-tab-pane :label="$t('system:userlist:tab:Password')" name="account">
+        <Account v-if="load.account" :user-id="userId" />
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+<script>
+import UserInfo from '../components/UserInfo'
+import Account from '../components/Account'
+export default {
+  name: 'EditUser',
+  components: { UserInfo, Account },
+  data() {
+    return {
+      activeTab: 'user',
+      userId: '',
+      load: {
+        role: false,
+        account: false
+      }
+    }
+  },
+  created() {
+    this.userId = this.$router.currentRoute.query.Id
+  },
+  methods: {
+    clickTab(tab, event) {
+      if (this.load[tab.name] === false) {
+        this.load[tab.name] = true
+      }
+    }
+  }
+}
+</script>

From 4d63318d8b0346f3cefe569ef3b2dfc7d410ef28 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 1 Mar 2024 15:14:00 +0800
Subject: [PATCH 066/374] 1

---
 src/views/trials/trials-panel/setting/visit-plan/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/visit-plan/index.vue b/src/views/trials/trials-panel/setting/visit-plan/index.vue
index 6f0a6834..19539b68 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/index.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/index.vue
@@ -286,7 +286,7 @@ export default {
         })
     },
     handleAdd() {
-      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: 0, VisitWindowRight: 0, Description: '' }
+      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -3, VisitWindowRight: 3, Description: '' }
       this.timer = new Date().getTime()
       if (this.list.length === 0) {
         this.row.VisitName = 'Baseline'

From 19bc56bb66568b1622b073eb6fb8739d6468dbf4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 4 Mar 2024 14:43:15 +0800
Subject: [PATCH 067/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/index.vue           |   4 +-
 src/layout/components/topLang.vue             |   2 +-
 src/views/reviewers/components/Agreements.vue |  66 ++++----
 src/views/reviewers/components/BasicInfo.vue  |  20 +--
 .../reviewers/components/Credentials.vue      |   8 +-
 .../components/EducationTraining.vue          |  95 ++++++-----
 src/views/reviewers/components/Employment.vue |  16 +-
 .../reviewers/components/GcpCertificate.vue   |  10 +-
 .../components/ResearchPublication.vue        |  11 +-
 src/views/reviewers/components/Resumes.vue    |  46 ++---
 src/views/reviewers/components/Setting.vue    |  68 ++++----
 src/views/reviewers/components/Specialty.vue  |   9 +-
 .../reviewers/components/TrialExperience.vue  |  44 ++---
 src/views/reviewers/edit.vue                  |  25 ++-
 src/views/system/login-log/index.vue          |  19 ++-
 src/views/system/notice/components/from.vue   |  38 ++---
 src/views/system/notice/index.vue             |  84 ++++-----
 src/views/system/role/components/RoleForm.vue |   5 +-
 src/views/system/role/index.vue               |  37 ++--
 src/views/system/role/role.js                 | 159 +++++++++---------
 src/views/system/user/list/index.vue          |   4 +-
 21 files changed, 385 insertions(+), 385 deletions(-)

diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue
index cf3c72c7..9de9ce32 100644
--- a/src/components/UploadFile/index.vue
+++ b/src/components/UploadFile/index.vue
@@ -14,8 +14,8 @@
       :on-exceed="handleExceed"
       accept=".pdf"
     >
-      <el-button size="small" type="primary" :disabled="btnDisabled || $route.query.ReviewStatus === '1'" >Upload</el-button>
-      <span slot="tip" class="el-upload__tip">(must be in pdf format. 1/2 pages, please confirm information integrity)</span>
+      <el-button size="small" type="primary" :disabled="btnDisabled || $route.query.ReviewStatus === '1'" >{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
+      <span slot="tip" class="el-upload__tip">{{$t('system:GcpCertificate:tap:must2') }}</span>
     </el-upload>
   </div>
 </template>
diff --git a/src/layout/components/topLang.vue b/src/layout/components/topLang.vue
index 9a18a56f..540e4bd1 100644
--- a/src/layout/components/topLang.vue
+++ b/src/layout/components/topLang.vue
@@ -44,7 +44,7 @@ export default {
       this.$i18n.locale = lang
       this.setLanguage(lang)
       this.$updateDictionary()
-      // window.location.reload()
+      window.location.reload()
     }
   }
 }
diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index 7226c696..c8a72918 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -1,21 +1,21 @@
 <template>
   <div v-loading="loading" class="resumes-container">
     <div class="resume-content" v-if="!$route.query.ReviewStatus">
-      <p>Consultant Agreement</p>
+      <p>{{$t('system:Agreements:title:Consultant Agreement')}}</p>
       <div class="upload-content">
         <upload-files ref="uploadAgreement" :disabled="$route.query.ReviewStatus === '1'" :doctor-id="doctorId" type="Consultant Agreement" accept=".pdf" @getFileList="getFileList" />
       </div>
-      <p>(must be in pdf format)</p>
+      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
     </div>
     <div v-if="!$route.query.ReviewStatus">
       <el-table :data="agreementList" size="small">
         <el-table-column type="index" width="40" />
-        <el-table-column prop="FileName" label="Consultant Agreement" width="300" />
-        <el-table-column prop="CreateTime" label="Upload Time" width="150" />
-        <el-table-column label="Action" width="400">
+        <el-table-column prop="FileName" :label="$t('system:Agreements:table:Consultant Agreement')" width="300" />
+        <el-table-column prop="CreateTime" :label="$t('system:Agreements:table:Upload Time')" width="150" />
+        <el-table-column :label="$t('common:action:action')" width="400">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handlePreview(scope.row)">View</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">Delete</el-button>
+            <el-button type="text" size="small" @click="handlePreview(scope.row)">{{$t('trials:enrolledReviews:button:view')}}</el-button>
+            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">{{$t('common:button:delete')}}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -24,21 +24,22 @@
       <span style="margin-right: 20px">
         {{$t('trials:enrolledReviews:message:SOW')}}
       </span>
-      <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'"  @click="addCol(0, $t('trials:enrolledReviews:message:SOW'))">Upload</el-button>
+      <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'"  @click="addCol(0, $t('trials:enrolledReviews:message:SOW'))">
+        {{ $t('common:button:upload') }}</el-button>
       <el-button size="small" type="primary" @click="handleDownload('Reviewer_SOW_Template')">
         <i class="el-icon-view el-icon-download"></i>
-        Template
+        {{ $t('common:button:template') }}
       </el-button>
     </div>
     <el-table :data="sowList" size="small">
       <el-table-column type="index" width="40" />
-      <el-table-column label="Criterion Type" width="120">
+      <el-table-column :label="$t('system:Agreements:table:Criterion Type')" width="120">
         <template slot-scope="scope">
           {{ scope.row.CriterionName }}
         </template>
       </el-table-column>
-      <el-table-column prop="FileName" label="Statement of Work" width="400" />
-      <el-table-column prop="IsEnable" label="Is Enable" width="100">
+      <el-table-column prop="FileName" :label="$t('system:Agreements:table:Statement of Work')" width="400" />
+      <el-table-column prop="IsEnable" :label="$t('system:Agreements:table:Is Enable')" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -48,13 +49,14 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="Remark" label="Remark" width="200" />
-      <el-table-column prop="CreateTime" label="Upload Time" width="150" />
-      <el-table-column label="Action" width="400">
+      <el-table-column prop="Remark" :label="$t('system:Agreements:Remark')" width="200" />
+      <el-table-column prop="CreateTime" :label="$t('system:Agreements:Upload Time')" width="150" />
+      <el-table-column :label="$t('common:action:action')" width="400">
         <template slot-scope="scope">
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePreview3(scope.row)">View</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEditCol(scope.row, 0, $t('trials:enrolledReviews:message:SOW'))">Edit</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile3(scope.row)">Delete</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePreview3(scope.row)">{{$t('trials:enrolledReviews:button:view')}}</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEditCol(scope.row, 0, $t('trials:enrolledReviews:message:SOW'))">
+            {{ $t('common:button:edit') }}</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile3(scope.row)">{{ $t('common:button:delete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -66,13 +68,13 @@
     </div>
     <el-table :data="ackSowList" size="small" v-if="!$route.query.ReviewStatus">
       <el-table-column type="index" width="40" />
-      <el-table-column label="Criterion Type" width="120">
+      <el-table-column :label="$t('system:Agreements:table:Criterion Type')" width="120">
         <template slot-scope="scope">
           {{ scope.row.CriterionName }}
         </template>
       </el-table-column>
-      <el-table-column prop="FileName" label="Acknowledgement of SOW" width="400" />
-      <el-table-column prop="IsEnable" label="Is Enable" width="100">
+      <el-table-column prop="FileName" :label="$t('system:Agreements:table:Acknowledgement of SOW')" width="400" />
+      <el-table-column prop="IsEnable" :label="$t('system:Agreements:table:Is Enable')" width="100">
         <template slot-scope="scope">
           <el-switch
             v-model="scope.row.IsEnable"
@@ -82,13 +84,13 @@
           />
         </template>
       </el-table-column>
-      <el-table-column prop="Remark" label="Remark" width="200" />
-      <el-table-column prop="CreateTime" label="Upload Time" width="150" />
+      <el-table-column prop="Remark" :label="$t('system:Agreements:table:Remark')" width="200" />
+      <el-table-column prop="CreateTime" :label="$t('system:Agreements:table:Upload Time')" width="150" />
       <el-table-column label="Action" width="400">
         <template slot-scope="scope">
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePreview3(scope.row)">View</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEditCol(scope.row, 1, $t('trials:enrolledReviews:message:EQC'))">Edit</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile3(scope.row)">Delete</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePreview3(scope.row)">{{$t('common:button:view')}}</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEditCol(scope.row, 1, $t('trials:enrolledReviews:message:EQC'))">{{$t('common:button:edit')}}</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile3(scope.row)">{{$t('common:button:delete')}}</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -101,7 +103,7 @@
           label-width="120px"
           size="small"
         >
-          <el-form-item label="Criterion Type " prop="CriterionType">
+          <el-form-item :label="$t('system:Agreements:label:Criterion Type')" prop="CriterionType">
             <el-select v-model="form.CriterionType">
               <el-option
                 v-for="item of $d.CriterionType"
@@ -111,7 +113,7 @@
               />
             </el-select>
           </el-form-item>
-          <el-form-item label="File" prop="FilePath">
+          <el-form-item :label="$t('system:Agreements:label:File')" prop="FilePath">
             <el-upload
               class="upload-demo"
               action
@@ -126,11 +128,11 @@
               <el-button size="small" type="primary" :disabled="fileList.length > 0">{{$t('common:button:upload')}}</el-button>
             </el-upload>
           </el-form-item>
-          <el-form-item label="Remark">
+          <el-form-item :label="$t('system:Agreements:label:Remark')">
             <el-input v-model="form.Remark"  type="textarea"
                       :autosize="{ minRows: 2, maxRows: 4}"></el-input>
           </el-form-item>
-          <el-form-item label="Is Enable">
+          <el-form-item :label="$t('system:Agreements:label:Is Enable')">
             <el-switch
               v-model="form.IsEnable"
               :active-value="true"
@@ -140,8 +142,8 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
+        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
       </template>
     </BaseModel>
   </div>
diff --git a/src/views/reviewers/components/BasicInfo.vue b/src/views/reviewers/components/BasicInfo.vue
index 2ebdca92..7340d1ca 100644
--- a/src/views/reviewers/components/BasicInfo.vue
+++ b/src/views/reviewers/components/BasicInfo.vue
@@ -15,31 +15,31 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item v-if="basicInfo.ReviewerCode" label="ID: ">
+              <el-form-item v-if="basicInfo.ReviewerCode" :label="$t('system:reviewer:label:Id')">
                 <el-input v-model="basicInfo.ReviewerCode" disabled size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Last Name: " prop="LastName">
+              <el-form-item :label="$t('system:reviewer:label:LastName')"  prop="LastName">
                 <el-input v-model="basicInfo.LastName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="First Name: " prop="FirstName">
+              <el-form-item :label="$t('system:reviewer:label:FirstName')"  prop="FirstName">
                 <el-input v-model="basicInfo.FirstName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Name CN: " prop="ChineseName">
+              <el-form-item :label="$t('system:reviewer:label:NameCN')" prop="ChineseName">
                 <el-input v-model="basicInfo.ChineseName" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="Gender: " prop="Sex">
+              <el-form-item :label="$t('system:reviewer:label:Gender')" prop="Sex">
                 <el-select
                   v-model="basicInfo.Sex"
                   prop="Sex"
@@ -59,12 +59,12 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Phone: " prop="Phone">
+              <el-form-item :label="$t('system:reviewer:label:Phone')" prop="Phone">
                 <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="basicInfo.Phone" size="small" />
               </el-form-item>
             </el-col>
             <el-col :span="12">
-              <el-form-item label="Title: " prop="TitleIds">
+              <el-form-item :label="$t('system:reviewer:label:Title')"  prop="TitleIds">
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="basicInfo.TitleIds[0]"
@@ -89,7 +89,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="EMail: " prop="EMail">
+              <el-form-item :label="$t('system:reviewer:label:Email')"  prop="EMail">
                 <el-input v-model="basicInfo.EMail" :disabled="$route.query.ReviewStatus === '1'" size="small" />
               </el-form-item>
             </el-col>
@@ -106,7 +106,7 @@
                 </el-radio-group>
               </el-form-item> -->
 
-              <el-form-item label="Country: " prop="Nation">
+              <el-form-item :label="$t('system:reviewer:label:Country')" prop="Nation">
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="basicInfo.Nation"
@@ -129,7 +129,7 @@
                 :loading="isDisabled"
                 size="small"
                 @click="handleSave"
-              >Save</el-button>
+              > {{ $t('common:button:save') }}</el-button>
             </el-form-item>
           </el-row>
         </el-form>
diff --git a/src/views/reviewers/components/Credentials.vue b/src/views/reviewers/components/Credentials.vue
index 996aefc2..5e2af223 100644
--- a/src/views/reviewers/components/Credentials.vue
+++ b/src/views/reviewers/components/Credentials.vue
@@ -2,7 +2,7 @@
   <div class="credentials-container">
     <div class="clearfix">
       <el-card class="e-card">
-        <p class="title">Diploma of the highest medical degree 最高医学学位毕业证书
+        <p class="title">{{$t('system:Credentials:title:Diploma of the highest medical degree')}}
         </p>
         <upload-file :doctor-id="doctorId" type="Diploma of the highest medical degree" />
 <!--        <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_DiplomaOfTheHighestMedicalDegree_Template')">-->
@@ -12,7 +12,7 @@
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">Medical Qualification Certificate 医师资格证
+        <p class="title">{{$t('system:Credentials:title:Medical Qualification Certificate')}}
 <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_MedicalQualificationCertificate_Template')">-->
 <!--            <i class="el-icon-view el-icon-download"></i>-->
 <!--            Template-->
@@ -22,7 +22,7 @@
       </el-card>
 
       <el-card class="e-card">
-        <p class="title">Practice License 医师执业证
+        <p class="title">{{$t('system:Credentials:title:Practice License')}}
 <!--          <el-button size="mini" type="primary" style="position: absolute;bottom:10px;right: 10px;" @click="handleDownload('Reviewer_PracticeLicense_Template')">-->
 <!--            <i class="el-icon-view el-icon-download"></i>-->
 <!--            Template-->
@@ -31,7 +31,7 @@
         <upload-file :doctor-id="doctorId" type="Practice License" />
       </el-card>
     </div>
-    <h6 style="line-height:30px;font-size:13px;">Modality Certificate 大型医用设备上岗证</h6>
+    <h6 style="line-height:30px;font-size:13px;">{{$t('system:Credentials:title:Modality Certificate')}}</h6>
     <div class="clearfix">
       <el-card class="e-card">
         <p class="title">CT
diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue
index 0ae527fe..7366de55 100644
--- a/src/views/reviewers/components/EducationTraining.vue
+++ b/src/views/reviewers/components/EducationTraining.vue
@@ -1,8 +1,9 @@
 <template>
   <div v-loading="loading" class="form-container">
     <div class="title-wrapper">
-      <p>Education (in chronological order)</p>
-      <el-button class="add" :disabled="$route.query.ReviewStatus === '1'" size="small" @click="handleAddEducation">Add</el-button>
+      <p>{{ $t('system:reviewer:title:Education') }}</p>
+      <el-button class="add" :disabled="$route.query.ReviewStatus === '1'" size="small" @click="handleAddEducation">
+        {{ $t('common:button:add') }}</el-button>
     </div>
     <el-table
       ref="educationTbl"
@@ -14,29 +15,29 @@
       <el-table-column type="index" width="30" />
       <el-table-column
         prop="BeginDateStr"
-        label="Start"
+        :label="$t('system:EducationTraining:table:Start')"
         min-width="55"
         show-overflow-tooltip
       />
       <el-table-column
         prop="EndDateStr"
-        label="End"
+        :label="$t('system:EducationTraining:table:End')"
         min-width="55"
         show-overflow-tooltip
       />
-      <el-table-column prop="Degree" label="Degree" min-width="70" show-overflow-tooltip>
+      <el-table-column prop="Degree" :label="$t('system:EducationTraining:table:Degree')" min-width="70" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.DegreeCN?`${scope.row.Degree} / ${scope.row.DegreeCN}`:scope.row.Degree }}
         </template>
       </el-table-column>
-      <el-table-column prop="Major" label="Major" min-width="120" show-overflow-tooltip>
+      <el-table-column prop="Major" :label="$t('system:EducationTraining:table:Major')" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.MajorCN?`${scope.row.Major} / ${scope.row.MajorCN}`:scope.row.Major }}
         </template>
       </el-table-column>
       <el-table-column
         prop="Organization"
-        label="Institution"
+        :label="$t('system:EducationTraining:table:Institution')"
         min-width="150"
         show-overflow-tooltip
       >
@@ -44,32 +45,35 @@
           {{ scope.row.OrganizationCN?`${scope.row.Organization} / ${scope.row.OrganizationCN}`:scope.row.Organization }}
         </template>
       </el-table-column>
-      <el-table-column prop="City" label="City" min-width="90" show-overflow-tooltip>
+      <el-table-column prop="City" :label="$t('system:EducationTraining:table:City')" min-width="90" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.CityCN?`${scope.row.City} / ${scope.row.CityCN}`:scope.row.City }}
         </template>
       </el-table-column>
-      <el-table-column prop="Province" label="State/Province" min-width="90" show-overflow-tooltip>
+      <el-table-column prop="Province" :label="$t('system:EducationTraining:table:State/Province')" min-width="90" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.ProvinceCN?`${scope.row.Province} / ${scope.row.ProvinceCN}`:scope.row.Province }}
         </template>
       </el-table-column>
-      <el-table-column prop="Country" label="Country" min-width="80" show-overflow-tooltip>
+      <el-table-column prop="Country" :label="$t('system:EducationTraining:table:Country')" min-width="80" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.CountryCN?`${scope.row.Country} / ${scope.row.CountryCN}`:scope.row.Country }}
         </template>
       </el-table-column>
-      <el-table-column label="Operation" min-width="120">
+      <el-table-column :label="$t('system:EducationTraining:table:Operation')" min-width="120">
         <template slot-scope="scope">
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEducationEdit(scope.row)">Edit</el-button>
-          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEducationDelete(scope.row)">Delete</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEducationEdit(scope.row)">
+            {{ $t('common:button:edit') }}</el-button>
+          <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEducationDelete(scope.row)">
+            {{ $t('common:button:delete') }}</el-button>
         </template>
       </el-table-column>
     </el-table>
 
     <div class="title-wrapper" style="margin-top:40px;">
-      <p>Postgraduate Training (in chronological order)</p>
-      <el-button class="add" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleAddPostgraduate">Add</el-button>
+      <p>{{ $t('system:reviewer:title:Postgraduate') }}</p>
+      <el-button class="add" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleAddPostgraduate">
+        {{ $t('common:button:add') }}</el-button>
     </div>
     <el-table
       ref="postgraduateTbl"
@@ -81,24 +85,24 @@
       <el-table-column type="index" width="30" />
       <el-table-column
         prop="BeginDateStr"
-        label="Start"
+        :label="$t('system:EducationTraining:table:Start')"
         min-width="55"
         show-overflow-tooltip
       />
       <el-table-column
         prop="EndDateStr"
-        label="End"
+        :label="$t('system:EducationTraining:table:End')"
         min-width="55"
         show-overflow-tooltip
       />
-      <el-table-column prop="Training" label="Training" min-width="70" show-overflow-tooltip>
+      <el-table-column prop="Training" :label="$t('system:EducationTraining:table:Training')" min-width="70" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.TrainingCN?`${scope.row.Training} / ${scope.row.TrainingCN}`:scope.row.Training }}
         </template>
       </el-table-column>
       <el-table-column
         prop="Major"
-        label="Specialty/Research Field"
+        :label="$t('system:EducationTraining:table:Specialty/Research Field')"
         min-width="155"
         show-overflow-tooltip
       >
@@ -106,32 +110,32 @@
           {{ scope.row.MajorCN?`${scope.row.Major} / ${scope.row.MajorCN}`:scope.row.Major }}
         </template>
       </el-table-column>
-      <el-table-column prop="Hospital" label="Hospital" min-width="120" show-overflow-tooltip>
+      <el-table-column prop="Hospital" :label="$t('system:EducationTraining:table:Hospital')" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.HospitalCN?`${scope.row.Hospital} / ${scope.row.HospitalCN}`:scope.row.Hospital }}
         </template>
       </el-table-column>
-      <el-table-column prop="School" label="University" min-width="120" show-overflow-tooltip>
+      <el-table-column prop="School" :label="$t('system:EducationTraining:table:University')" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.SchoolCN?`${scope.row.School} / ${scope.row.SchoolCN}`:scope.row.School }}
         </template>
       </el-table-column>
-      <el-table-column prop="City" label="City" min-width="100" show-overflow-tooltip>
+      <el-table-column prop="City" :label="$t('system:EducationTraining:table:City')" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.CityCN?`${scope.row.City} / ${scope.row.CityCN}`:scope.row.City }}
         </template>
       </el-table-column>
-      <el-table-column prop="Province" label="State/Province" min-width="100" show-overflow-tooltip>
+      <el-table-column prop="Province" :label="$t('system:EducationTraining:table:State/Province')" min-width="100" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.ProvinceCN?`${scope.row.Province} / ${scope.row.ProvinceCN}`:scope.row.Province }}
         </template>
       </el-table-column>
-      <el-table-column prop="Country" label="Country" min-width="90" show-overflow-tooltip>
+      <el-table-column prop="Country" :label="$t('system:EducationTraining:table:Country')" min-width="90" show-overflow-tooltip>
         <template slot-scope="scope">
           {{ scope.row.CountryCN?`${scope.row.Country} / ${scope.row.CountryCN}`:scope.row.Country }}
         </template>
       </el-table-column>
-      <el-table-column label="Operation" min-width="120">
+      <el-table-column :label="$t('system:EducationTraining:table:Operation')" min-width="120">
         <template slot-scope="scope">
           <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePostgraduateEdit(scope.row)">Edit</el-button>
           <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handlePostgraduateDelete(scope.row)">Delete</el-button>
@@ -147,7 +151,7 @@
       :close-on-click-modal="false"
     >
       <el-form v-if="educationDialogVisible" ref="educationForm" size="small" label-width="120px" :model="educationForm" :rules="educationRules">
-        <el-form-item label="Start" prop="BeginDate">
+        <el-form-item :label="$t('system:EducationTraining:table:Start')" prop="BeginDate">
           <el-date-picker
             v-model="educationForm.BeginDate"
             type="month"
@@ -158,7 +162,7 @@
             :picker-options="beginPickerOption"
           />
         </el-form-item>
-        <el-form-item label="End" prop="EndDate">
+        <el-form-item :label="$t('system:EducationTraining:table:End')" prop="EndDate">
           <el-date-picker
             v-model="educationForm.EndDate"
             type="month"
@@ -169,8 +173,8 @@
             :picker-options="endpickerOption"
           />
         </el-form-item>
-        <el-form-item label="Degree" prop="Degree">
-          <el-select v-model="educationForm.Degree" placeholder="Please select" size="small">
+        <el-form-item :label="$t('system:EducationTraining:table:Degree')" prop="Degree">
+          <el-select v-model="educationForm.Degree"  size="small">
             <el-option
               v-for="item in degreeOptions"
               :key="item.value"
@@ -180,7 +184,7 @@
           </el-select>
         </el-form-item>
 
-        <el-form-item label="Major" prop="Major">
+        <el-form-item :label="$t('system:EducationTraining:table:Major')" prop="Major">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="educationForm.Major" placeholder="Please specify in English" size="small" />
@@ -190,7 +194,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="Institution" prop="Organization">
+        <el-form-item :label="$t('system:EducationTraining:table:Institution')" prop="Organization">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="educationForm.Organization" placeholder="Please specify in English" size="small" />
@@ -200,7 +204,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="City" prop="City">
+        <el-form-item :label="$t('system:EducationTraining:table:City')" prop="City">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="educationForm.City" placeholder="Please specify in English" size="small" />
@@ -211,7 +215,7 @@
           </el-row>
 
         </el-form-item>
-        <el-form-item label="State/Province" prop="Province">
+        <el-form-item :label="$t('system:EducationTraining:table:State/Province')" prop="Province">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="educationForm.Province" placeholder="Please specify in English" size="small" />
@@ -221,7 +225,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="Country" prop="Country">
+        <el-form-item :label="$t('system:EducationTraining:table:Country')" prop="Country">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="educationForm.Country" placeholder="Please specify in English" size="small" />
@@ -233,7 +237,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" :loading="isDisabled" @click="handleEducationSave">Save</el-button>
+        <el-button type="primary" size="small" :loading="isDisabled" @click="handleEducationSave">{{ $t('common:button:save') }}</el-button>
       </span>
     </el-dialog>
 
@@ -245,7 +249,7 @@
       :close-on-click-modal="false"
     >
       <el-form v-if="postgraduateDialogVisible" ref="postgraduateForm" size="small" label-width="190px" :model="postgraduateForm" :rules="postgraduateRules">
-        <el-form-item label="Start" prop="BeginDate">
+        <el-form-item :label="$t('system:EducationTraining:table:Start')" prop="BeginDate">
           <el-date-picker
             v-model="postgraduateForm.BeginDate"
             type="month"
@@ -256,7 +260,7 @@
             size="small"
           />
         </el-form-item>
-        <el-form-item label="End" prop="EndDate">
+        <el-form-item :label="$t('system:EducationTraining:table:End')" prop="EndDate">
           <el-date-picker
             v-model="postgraduateForm.EndDate"
             type="month"
@@ -267,7 +271,7 @@
             size="small"
           />
         </el-form-item>
-        <el-form-item label="Training" prop="Training">
+        <el-form-item  :label="$t('system:EducationTraining:table:Training')" prop="Training">
           <el-select v-model="postgraduateForm.Training" placeholder="Please select" size="small">
             <el-option
               v-for="item in TrainingOptions"
@@ -277,7 +281,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="Specialty / Research Field" prop="Major">
+        <el-form-item   :label="$t('system:EducationTraining:table:Specialty/Research Field')" prop="Major">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="postgraduateForm.Major" placeholder="Please specify in English" size="small" />
@@ -287,7 +291,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="Hospital" prop="Hospital">
+        <el-form-item :label="$t('system:EducationTraining:table:Hospital')" prop="Hospital">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="postgraduateForm.Hospital" placeholder="Please specify in English" size="small" />
@@ -297,7 +301,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="University" prop="School">
+        <el-form-item :label="$t('system:EducationTraining:table:University')" prop="School">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="postgraduateForm.School" placeholder="Please specify in English" size="small" />
@@ -308,7 +312,7 @@
           </el-row>
         </el-form-item>
 
-        <el-form-item label="City" prop="City">
+        <el-form-item :label="$t('system:EducationTraining:table:City')" prop="City">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="postgraduateForm.City" placeholder="Please specify in English" size="small" />
@@ -318,7 +322,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="State/Province" prop="Province">
+        <el-form-item :label="$t('system:EducationTraining:table:State/Province')"  prop="Province">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="postgraduateForm.Province" placeholder="Please specify in English" size="small" />
@@ -328,7 +332,7 @@
             </el-col>
           </el-row>
         </el-form-item>
-        <el-form-item label="Country" prop="Country">
+        <el-form-item :label="$t('system:EducationTraining:table:Country')" prop="Country">
           <el-row type="flex" justify="space-between">
             <el-col :span="11">
               <el-input v-model="postgraduateForm.Country" placeholder="Please specify in English" size="small" />
@@ -340,7 +344,7 @@
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button size="small" type="primary" :loading="isDisabled" @click="handlePostgraduateSave">Save</el-button>
+        <el-button size="small" type="primary" :loading="isDisabled" @click="handlePostgraduateSave">{{ $t('common:button:save') }}</el-button>
       </span>
     </el-dialog>
   </div>
@@ -528,7 +532,6 @@ export default {
         if (valid) {
           this.isDisabled = true
           this.educationForm.DoctorId = this.$route.query.Id
-
           if (this.educationForm.Degree === 'Bachelor') {
             this.educationForm.DegreeCN = '学士'
           } else if (this.educationForm.Degree === 'Master') {
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 94808624..4ff69d32 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -13,7 +13,7 @@
 
           <el-row>
             <el-col :span="14">
-              <el-form-item label="Hospital: " prop="HospitalId">
+              <el-form-item :label="$t('system:reviewer:label:Hospital')" prop="HospitalId">
                 <el-select
                   v-model="employmentForm.HospitalId"
                   placeholder="select"
@@ -39,7 +39,7 @@
 
           <el-row>
             <el-col :span="14">
-              <el-form-item label="Affiliated University: ">
+              <el-form-item :label="$t('system:reviewer:label:AffiliatedUniversity')">
                 <el-input
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="UniversityAffiliated"
@@ -53,21 +53,21 @@
           </el-row>
           <el-row>
             <el-col :span="14">
-              <el-form-item label="City: ">
+              <el-form-item :label="$t('system:reviewer:label:City')">
                 <el-input  :disabled="$route.query.ReviewStatus === '1'" v-model="City" disabled size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
-              <el-form-item label="State/Province: ">
+              <el-form-item :label="$t('system:reviewer:label:State/Province')">
                 <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Province" disabled size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
-              <el-form-item label="Country: ">
+              <el-form-item :label="$t('system:reviewer:label:Country')">
                 <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Country" disabled size="small" />
               </el-form-item>
             </el-col>
@@ -75,7 +75,7 @@
 
           <el-row>
             <el-col :span="14">
-              <el-form-item label="Department: " prop="DepartmentId">
+              <el-form-item :label="$t('system:reviewer:label:Department')" prop="DepartmentId">
                 <el-select
                   v-model="employmentForm.DepartmentId"
                   placeholder="select"
@@ -123,7 +123,7 @@
 
           <el-row>
             <el-col :span="14">
-              <el-form-item label="Rank: " prop="RankId">
+              <el-form-item :label="$t('system:reviewer:label:Rank')" prop="RankId">
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="employmentForm.RankId"
@@ -261,7 +261,7 @@
 <!--          </el-row>-->
 
           <el-form-item>
-            <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">Save</el-button>
+            <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">{{ $t('common:button:save') }}</el-button>
           </el-form-item>
         </el-form>
       </div>
diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue
index 43e8b015..5eba776d 100644
--- a/src/views/reviewers/components/GcpCertificate.vue
+++ b/src/views/reviewers/components/GcpCertificate.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="gcp-container">
     <el-radio-group v-model="GCP" style="margin-bottom:20px">
-      <el-radio :label="1">Yes</el-radio>
-      <el-radio :label="0">No</el-radio>
+      <el-radio :label="1">{{ $t('system:GcpCertificate:radio:Yes') }}</el-radio>
+      <el-radio :label="0">{{ $t('system:GcpCertificate:radio:No') }}</el-radio>
     </el-radio-group>
     <div v-if="GCP" class="upload-container">
 <!--      <upload-file :doctor-id="doctorId" type="GCP" />-->
@@ -19,13 +19,13 @@
         :on-exceed="handleExceed"
         accept=".pdf"
       >
-        <el-button size="small" type="primary" :loading="btnDisabled">Upload</el-button>
-        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">(must be in pdf format)</span>
+        <el-button size="small" type="primary" :loading="btnDisabled">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
+        <span slot="tip" style="margin-left:10px;" class="el-upload__tip">{{ $t('system:GcpCertificate:tap:must') }}</span>
       </el-upload>
     </div>
     <div>
       <el-button :loading="saveBtnLoading" :disabled="(fileList.length === 0 && GCP === 1)" type="primary" size="small" style="margin-top:20px" @click="handleSaveGCP">
-        Save
+        {{ $t('common:button:save') }}
       </el-button>
     </div>
   </div>
diff --git a/src/views/reviewers/components/ResearchPublication.vue b/src/views/reviewers/components/ResearchPublication.vue
index 7b0362c1..be01fb15 100644
--- a/src/views/reviewers/components/ResearchPublication.vue
+++ b/src/views/reviewers/components/ResearchPublication.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="form-container" style="width:80%;">
     <el-form ref="researchForm" v-loading="loading" label-width="140px" :model="researchForm" size="small">
-      <el-form-item label="Field of Research: ">
+      <el-form-item :label="$t('system:reviewer:label:Field of Research')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
             <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.Research" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
@@ -11,7 +11,7 @@
           </el-col>
         </el-row>
       </el-form-item>
-      <el-form-item label="Grants: ">
+      <el-form-item :label="$t('system:reviewer:label:Grants')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
             <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.Grants" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
@@ -21,7 +21,7 @@
           </el-col>
         </el-row>
       </el-form-item>
-      <el-form-item label="Publications: ">
+      <el-form-item :label="$t('system:reviewer:label:Publications')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
             <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.Publications" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
@@ -31,7 +31,7 @@
           </el-col>
         </el-row>
       </el-form-item>
-      <el-form-item label="Awards & Honors: ">
+      <el-form-item :label="$t('system:reviewer:label:Awards & Honors')">
         <el-row type="flex" justify="space-between">
           <el-col :span="11">
             <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="researchForm.AwardsHonors" type="textarea" rows="5" placeholder="Please specify in English" size="small" />
@@ -42,7 +42,8 @@
         </el-row>
       </el-form-item>
       <el-form-item>
-        <el-button :disabled="$route.query.ReviewStatus === '1'" type="primary" :loading="isDisabled" @click="handleSave">Save</el-button>
+        <el-button :disabled="$route.query.ReviewStatus === '1'" type="primary" :loading="isDisabled" @click="handleSave">
+          {{ $t('common:button:save') }}</el-button>
       </el-form-item>
     </el-form>
   </div>
diff --git a/src/views/reviewers/components/Resumes.vue b/src/views/reviewers/components/Resumes.vue
index 8c6dadfe..269bc3e0 100644
--- a/src/views/reviewers/components/Resumes.vue
+++ b/src/views/reviewers/components/Resumes.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-loading="loading" class="resumes-container">
     <div class="resume-content">
-      <p>Resume</p>
+      <p>{{ $t('system:Resumes:title:Resume') }}</p>
       <div class="upload-content">
         <!-- <upload-files ref="uploadResume" :doctor-id="doctorId" :data-list="resumeList" :language="2" btn-name="Upload(English)" type="Resume" accept=".doc, .docx" @getFileList="getFileList" /> -->
         <div class="uploadFile-container">
@@ -14,21 +14,21 @@
             :file-list="resumeList"
             accept=".doc,.docx"
           >
-            <el-button size="small" type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'">Upload</el-button>
+            <el-button size="small" type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
           </el-upload>
         </div>
       </div>
 
-      <p>(must be in doc,docx format)</p>
+      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
     </div>
     <div class="resumeTbl">
       <el-table :data="resumeListEN" size="small">
         <el-table-column type="index" width="40" />
-        <el-table-column prop="FileName" label="Resume" width="180" show-overflow-tooltip />
-        <el-table-column prop="CreateTime" label="Upload Time" width="150" show-overflow-tooltip />
+        <el-table-column prop="FileName" :label="$t('system:Resumes:table:Resume')" width="180" show-overflow-tooltip />
+        <el-table-column prop="CreateTime" :label="$t('system:Resumes:table:Upload Time')" width="150" show-overflow-tooltip />
         <el-table-column
           prop="IsOfficial"
-          label="Official"
+          :label="$t('system:Resumes:table:Official')"
           width="100"
         >
           <template slot-scope="scope">
@@ -37,7 +37,7 @@
         </el-table-column>
         <el-table-column
           prop="Language"
-          label="Language"
+          :label="$t('system:Resumes:table:Language')"
           width="100"
           show-overflow-tooltip
         >
@@ -46,23 +46,23 @@
             <!-- <el-button size="small" type="text" @click="handleLanguageClick(scope.row)">{{ scope.row.Language===1?'CH':scope.row.Language===2?'EN':'Setting' }}</el-button> -->
           </template>
         </el-table-column>
-        <el-table-column label="Action" width="400">
+        <el-table-column :label="$t('common:action:action')" width="400">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handlePreview(scope.row)">Download</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">Delete</el-button>
+            <el-button type="text" size="small" @click="handlePreview(scope.row)">{{ $t('common:button:download') }}</el-button>
+            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">{{ $t('common:button:delete') }}</el-button>
             <el-button
               type="text"
               size="small"
               :disabled="scope.row.IsOfficial || $route.query.ReviewStatus === '1'"
               @click="handleSetOfiical(scope.row)"
-            >Set as Official</el-button>
+            >{{ $t('system:Resumes:button:Set as Official') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
 
     </div>
     <div class="resume-content" style="margin-top:10px;">
-      <p>中文简历</p>
+      <p>{{ $t('system:Resumes:title:ResumeCN') }}</p>
       <div class="upload-content">
         <div class="uploadFile-container">
           <el-upload
@@ -74,20 +74,20 @@
             :file-list="resumeList"
             accept=".doc, .docx"
           >
-            <el-button size="small" type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'">上传</el-button>
+            <el-button size="small" type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'">{{ $t('system:GcpCertificate:upload:Upload') }}</el-button>
           </el-upload>
         </div>
       </div>
-      <p>(必须是 doc,docx 格式)</p>
+      <p>{{ $t('system:GcpCertificate:tap:must') }}</p>
     </div>
     <div class="resumeTbl">
       <el-table :data="resumeListCN" size="small">
         <el-table-column type="index" width="40" />
-        <el-table-column prop="FileName" label="Resume" width="180" show-overflow-tooltip />
-        <el-table-column prop="CreateTime" label="Upload Time" width="150" show-overflow-tooltip />
+        <el-table-column prop="FileName" :label="$t('system:Resumes:table:Resume')" width="180" show-overflow-tooltip />
+        <el-table-column prop="CreateTime" :label="$t('system:Resumes:table:Upload Time')" width="150" show-overflow-tooltip />
         <el-table-column
           prop="IsOfficial"
-          label="Official"
+          :label="$t('system:Resumes:table:Official')"
           width="100"
         >
           <template slot-scope="scope">
@@ -96,7 +96,7 @@
         </el-table-column>
         <el-table-column
           prop="Language"
-          label="Language"
+          :label="$t('system:Resumes:table:Language')"
           width="100"
           show-overflow-tooltip
         >
@@ -105,16 +105,16 @@
             <!-- <el-button size="small" type="text" @click="handleLanguageClick(scope.row)">{{ scope.row.Language===1?'CH':scope.row.Language===2?'EN':'Setting' }}</el-button> -->
           </template>
         </el-table-column>
-        <el-table-column label="Action" width="400">
+        <el-table-column :label="$t('common:action:action')" width="400">
           <template slot-scope="scope">
-            <el-button type="text" size="small" @click="handlePreview(scope.row)">Download</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">Delete</el-button>
+            <el-button type="text" size="small" @click="handlePreview(scope.row)">{{ $t('common:button:download') }}</el-button>
+            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleRemoveFile(scope.row)">{{ $t('common:button:delete') }}</el-button>
             <el-button
               type="text"
               size="small"
-              :disabled="scope.row.IsOfficial"
+              :disabled="scope.row.IsOfficial || $route.query.ReviewStatus === '1'"
               @click="handleSetOfiical(scope.row)"
-            >Set as Official</el-button>
+            >{{ $t('system:Resumes:button:Set as Official') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue
index e4cf68e1..52f1ce15 100644
--- a/src/views/reviewers/components/Setting.vue
+++ b/src/views/reviewers/components/Setting.vue
@@ -2,68 +2,68 @@
   <div v-loading="loading" class="check-container form-container">
     <el-form ref="checkForm" :model="checkForm" label-width="200px" size="small" :rules="rules">
       <div class="title-wrapper">
-        <p>盲化信息</p>
+        <p>{{$t('system:Setting:title:Blinded information') }}</p>
       </div>
       <div class="check-content">
-        <el-form-item label="Blind Name" prop="BlindName">
+        <el-form-item :label="$t('system:Setting:label:Blind Name')" prop="BlindName">
           <el-input
             v-model="checkForm.BlindName"
             style="width:300px"
           />
         </el-form-item>
-        <el-form-item label="Blind NameCN" prop="BlindNameCN">
+        <el-form-item :label="$t('system:Setting:label:Blind NameCN')" prop="BlindNameCN">
           <el-input
             v-model="checkForm.BlindNameCN"
             style="width:300px"
           />
         </el-form-item>
-        <el-form-item label="Blind Publications" prop="BlindPublications">
+        <el-form-item :label="$t('system:Setting:label:Blind Publications')" prop="BlindPublications">
           <el-input v-model="checkForm.BlindPublications" type="textarea" rows="8" style="width:60%;" size="small" />
         </el-form-item>
       </div>
       <div class="title-wrapper">
-        <p>Setting</p>
+        <p>{{$t('system:Setting:title:Blinded Setting') }}</p>
       </div>
       <div class="check-content">
-          <el-form-item label="Information Confirmed?">
+          <el-form-item :label="$t('system:Setting:label:Information Confirmed?')">
             <el-radio-group v-model="checkForm.ReviewStatus" @change="handleChange">
-              <el-radio :label="1">Yes</el-radio>
-              <el-radio :label="2">No</el-radio>
+              <el-radio :label="1">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
+              <el-radio :label="2">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
             </el-radio-group>
           </el-form-item>
-          <el-form-item label="Contractor Status?">
+          <el-form-item :label="$t('system:Setting:label:Contractor Status?')">
             <el-radio-group v-model="checkForm.CooperateStatus" @change="handleChange">
-              <el-radio :label="1">Yes</el-radio>
-              <el-radio :label="2">No</el-radio>
+              <el-radio :label="1">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
+              <el-radio :label="2">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="Accepting New Trials?">
+          <el-form-item :label="$t('system:Setting:label:Accepting New Trials?')">
             <el-radio-group v-model="checkForm.AcceptingNewTrial" :disabled="radioDisabled">
-              <el-radio :label="true">Yes</el-radio>
-              <el-radio :label="false">No</el-radio>
+              <el-radio :label="true">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
+              <el-radio :label="false">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="Actively Reading?">
+          <el-form-item :label="$t('system:Setting:label:Actively Reading?')">
             <el-radio-group v-model="checkForm.ActivelyReading" :disabled="radioDisabled">
-              <el-radio :label="true">Yes</el-radio>
-              <el-radio :label="false">No</el-radio>
+              <el-radio :label="true">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
+              <el-radio :label="false">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="Is Virtual?">
+          <el-form-item :label="$t('system:Setting:label:Is Virtual?')">
             <el-radio-group v-model="checkForm.IsVirtual" :disabled="radioDisabled">
-              <el-radio :label="true">Yes</el-radio>
-              <el-radio :label="false">No</el-radio>
+              <el-radio :label="true">{{$t('system:Setting:label:Information Confirmed?:Yes')}}</el-radio>
+              <el-radio :label="false">{{$t('system:Setting:label:Information Confirmed?:No')}}</el-radio>
             </el-radio-group>
           </el-form-item>
 
-          <el-form-item label="On Vacation: ">
+          <el-form-item :label="$t('system:Setting:label:On Vacation:')">
             <span style="font-size:12px;margin-right:20px;">{{ checkForm.InHoliday }}</span>
-            <el-button type="text" @click="handleView">Planned Vacation</el-button>
+            <el-button type="text" @click="handleView">{{ $t('system:Setting:Planned Vacation') }}</el-button>
           </el-form-item>
-          <el-form-item label="Comment: " prop="AdminComment">
+          <el-form-item :label="$t('system:Setting:label:Comment:')" prop="AdminComment">
             <el-input
               v-model="checkForm.AdminComment"
               type="textarea"
@@ -73,12 +73,12 @@
           </el-form-item>
 
           <el-form-item style="margin-top:20px">
-            <el-button type="primary" :disabled="isDisabled" @click="handleSave">Save</el-button>
+            <el-button type="primary" :disabled="isDisabled" @click="handleSave">{{ $t('common:button:save') }}</el-button>
           </el-form-item>
       </div>
     </el-form>
     <el-dialog
-      title="Vacation"
+      :label="$t('system:Setting:title:Vacation')"
       :visible.sync="dialogVisible"
       width="50%"
       :close-on-click-modal="false"
@@ -91,29 +91,29 @@
           format="yyyy-MM-dd"
           type="daterange"
           range-separator="to"
-          start-placeholder="Beginning  Date"
-          end-placeholder="End Date"
+          :start-placeholder="$t('system:Setting:label:Beginning Date')"
+          :end-placeholder="$t('system:Setting:label:End Date')"
           size="small"
         />
-        <el-button style="margin-left:10px;" type="primary" size="small" @click="handleAddHoliday">Add</el-button>
+        <el-button style="margin-left:10px;" type="primary" size="small" @click="handleAddHoliday">{{ $t('common:button:add') }}</el-button>
       </div>
       <el-table v-loading="loading2" :data="gridData" size="small">
         <el-table-column type="index" />
         <el-table-column
           property="StartDate"
-          label="Beginning  Date"
+          :label="$t('system:Setting:table:Beginning Date')"
           min-width="120"
           :formatter="beginTimeFormatter"
         />
         <el-table-column
           property="EndDate"
-          label="End Date"
+          :label="$t('system:Setting:table:End Date')"
           min-width="120"
           :formatter="endTimeFormatter"
         />
-        <el-table-column label="Action" fixed="right" min-width="200">
+        <el-table-column :label="$t('common:action:action')" fixed="right" min-width="200">
           <template slot-scope="scope">
-            <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+            <el-button type="text" @click="handleDelete(scope.row)">{{ $t('common:button:delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -204,7 +204,7 @@ export default {
               if (res.IsSuccess) {
                 if (res.Result) { this.checkForm.Id = res.Result }
                 this.isDisabled = false
-                this.$message.success('Saved successfully')
+                this.$message.success(this.$t('common:message:savedSuccessfully'))
               }
             })
             .catch(() => {
@@ -261,8 +261,6 @@ export default {
       this.$confirm('Sure to delete?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
       })
         .then(() => {
           this.loading2 = true
diff --git a/src/views/reviewers/components/Specialty.vue b/src/views/reviewers/components/Specialty.vue
index b362d63b..5a636f12 100644
--- a/src/views/reviewers/components/Specialty.vue
+++ b/src/views/reviewers/components/Specialty.vue
@@ -12,7 +12,7 @@
         >
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Specialty: " prop="SpecialityId">
+              <el-form-item :label="$t('system:reviewer:label:Specialty')" prop="SpecialityId">
                 <el-select
                   v-model="specialtyForm.SpecialityId"
                   :disabled="$route.query.ReviewStatus === '1'"
@@ -59,7 +59,7 @@
           </el-row>
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Subspeciality: " prop="SubspecialityIds">
+              <el-form-item :label="$t('system:reviewer:label:Subspeciality')" prop="SubspecialityIds">
                 <el-select
                   v-model="specialtyForm.SubspecialityIds"
                   :disabled="$route.query.ReviewStatus === '1'"
@@ -116,7 +116,7 @@
 
           <el-row>
             <el-col :span="12">
-              <el-form-item label="Modality: " prop="ReadingTypeIds">
+              <el-form-item :label="$t('system:reviewer:label:Modality')" prop="ReadingTypeIds">
                 <el-select
                   :disabled="$route.query.ReviewStatus === '1'"
                   v-model="specialtyForm.ReadingTypeIds"
@@ -171,7 +171,8 @@
             </el-col>
           </el-row>
           <el-form-item>
-            <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">Save</el-button>
+            <el-button type="primary" :disabled="isDisabled || $route.query.ReviewStatus === '1'" size="small" @click="handleSave">
+              {{ $t('common:button:save') }}</el-button>
           </el-form-item>
         </el-form>
       </div>
diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index 22c4e172..061283b9 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="form-container">
     <div class="title-wrapper">
-      <p>Clinical Trial Experience</p>
+      <p>{{$t('system:TrialExperience:title:Clinical Trial Experience')}}</p>
       <el-button :disabled="$route.query.ReviewStatus === '1'" class="add" size="small" @click="handleAddClinicalTrial">Add</el-button>
     </div>
     <div style="padding:0 40px;">
@@ -13,36 +13,37 @@
         size="small"
       >
         <el-table-column type="index" width="40" />
-        <el-table-column prop="Phase" label="Phase" min-width="50" />
-        <el-table-column prop="EvaluationCriteriaList" label="Review Criteria" min-width="100">
+        <el-table-column prop="Phase" :label="$t('system:TrialExperience:title:Phase')" min-width="50" />
+        <el-table-column prop="EvaluationCriteriaList" :label="$t('system:TrialExperience:title:Review Criteria')" min-width="100">
           <template slot-scope="scope">
             {{ scope.row.EvaluationCriteriaList.length>0? scope.row.EvaluationCriteriaList.join(', '):'' }}
           </template>
         </el-table-column>
-        <el-table-column prop="EvaluationCriteriaList" label="Starting And Ending Date" min-width="100">
+        <el-table-column prop="EvaluationCriteriaList" :label="$t('system:TrialExperience:title:Starting And Ending Date')" min-width="100">
           <template slot-scope="scope">
             <span v-if="scope.row.StartTime">{{ scope.row.StartTime.split('-')[0] }}-{{scope.row.EndTime ? scope.row.EndTime.split('-')[0] : '至今'}}</span>
           </template>
         </el-table-column>
-        <el-table-column prop="VisitReadingCount" label="Visit Reading Count" min-width="70" />
-        <el-table-column prop="EvaluationContent" label="Indication" min-width="70" />
-        <el-table-column label="Operation" min-width="200">
+        <el-table-column prop="VisitReadingCount" :label="$t('system:TrialExperience:title:Visit Reading Count')" min-width="70" />
+        <el-table-column prop="EvaluationContent" :label="$t('system:TrialExperience:Indication')" min-width="70" />
+        <el-table-column :label="$t('system:TrialExperience:Operation')" min-width="200">
           <template slot-scope="scope">
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEdit(scope.row)">Edit</el-button>
-            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleDel(scope.row)">Delete</el-button>
+            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleEdit(scope.row)">
+              {{ $t('common:button:edit') }}</el-button>
+            <el-button type="text" size="small" :disabled="$route.query.ReviewStatus === '1'" @click="handleDel(scope.row)">{{ $t('common:button:delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
     </div>
 
     <div class="title-wrapper" style="margin-top:10px;">
-      <p>GCP Certificate</p>
+      <p>{{$t('system:TrialExperience:title:GCP Certificate')}}</p>
     </div>
     <div style="margin-left:40px;width:40%">
       <gcp-certificate :doctor-id="doctorId" :gcp="GCP" :gcp-id="GCPID" />
     </div>
     <div class="title-wrapper" style="margin-top:10px;">
-      <p>Other Relevant Experience</p>
+      <p>{{$t('system:TrialExperience:title:Other Relevant Experience')}}</p>
     </div>
     <div style="padding:0 40px;">
       <el-row type="flex" justify="space-between">
@@ -59,7 +60,8 @@
           <el-input v-model="OtherClinicalExperienceCN" :disabled="$route.query.ReviewStatus === '1'" type="textarea" rows="5" placeholder="请用中文注明" size="small" />
         </el-col>
       </el-row>
-      <el-button type="primary" size="small" style="margin-top:20px" :disabled="isBtnDisabled || $route.query.ReviewStatus === '1'" @click="handleSaveOtherClinical">Save</el-button>
+      <el-button type="primary" size="small" style="margin-top:20px" :disabled="isBtnDisabled || $route.query.ReviewStatus === '1'" @click="handleSaveOtherClinical">
+        {{ $t('common:button:save') }}</el-button>
     </div>
     <el-dialog v-if="clinicalTrialDialogVisible" :title="clinicalTrialDialogTitle" :visible.sync="clinicalTrialDialogVisible" width="480px" :close-on-click-modal="false">
       <el-form
@@ -70,7 +72,7 @@
         :model="clinicalTrialForm"
         size="small"
       >
-        <el-form-item label="Phase" prop="PhaseId">
+        <el-form-item :label="$t('system:TrialExperience:label:Phase')" prop="PhaseId">
           <el-select v-model="clinicalTrialForm.PhaseId" placeholder="Please select">
             <!-- <el-option
               v-for="(key,value) of dictionaryList.Phase"
@@ -86,7 +88,7 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="Review Criteria" prop="EvaluationCriteriaIdList">
+        <el-form-item :label="$t('system:TrialExperience:label:Review Criteria')" prop="EvaluationCriteriaIdList">
           <el-select
             v-model="clinicalTrialForm.EvaluationCriteriaIdList"
             placeholder="Please select"
@@ -101,29 +103,29 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="Start Time" prop="StartTime">
+        <el-form-item :label="$t('system:TrialExperience:label:Start Time')" prop="StartTime">
           <el-date-picker
             v-model="clinicalTrialForm.StartTime"
             type="year"
-            placeholder="Select Start Time">
+            >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="End Time" prop="EndTime">
+        <el-form-item :label="$t('system:TrialExperience:label:End Time')" prop="EndTime">
           <el-date-picker
             v-model="clinicalTrialForm.EndTime"
             type="year"
-            placeholder="Select End Time">
+            >
           </el-date-picker>
         </el-form-item>
-        <el-form-item label="Visit Reading Count" prop="VisitReadingCount">
+        <el-form-item :label="$t('system:TrialExperience:Visit Reading Count')" prop="VisitReadingCount">
           <el-input style="width: 100%" oninput="value=value.replace(/[^\d]/g,'')" v-model="clinicalTrialForm.VisitReadingCount" controls-position="right" :min="0" />
         </el-form-item>
-        <el-form-item label="Indication" prop="EvaluationContent">
+        <el-form-item :label="$t('system:TrialExperience:Indication')" prop="EvaluationContent">
           <el-input v-model="clinicalTrialForm.EvaluationContent" />
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-        <el-button type="primary" size="small" :loading="isDisabled" @click="handleSave">Save</el-button>
+        <el-button type="primary" size="small" :loading="isDisabled" @click="handleSave">{{ $t('common:button:save') }}</el-button>
       </span>
     </el-dialog>
   </div>
diff --git a/src/views/reviewers/edit.vue b/src/views/reviewers/edit.vue
index dd4c7492..6212899b 100644
--- a/src/views/reviewers/edit.vue
+++ b/src/views/reviewers/edit.vue
@@ -1,39 +1,34 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="active" @tab-click="clickTab">
-      <el-tab-pane label="Basic Info" name="BasicInfo">
+      <el-tab-pane :label="$t('system:reviewer:tab:BasicInfo')" name="BasicInfo">
         <basic-info v-if="load.BasicInfo" />
       </el-tab-pane>
-      <el-tab-pane label="Employment" name="Employment">
-
+      <el-tab-pane :label="$t('system:reviewer:tab:Employment')" name="Employment">
         <Employment v-if="load.Employment" />
-
       </el-tab-pane>
-      <el-tab-pane label="Specialty" name="Specialty">
-
+      <el-tab-pane :label="$t('system:reviewer:tab:Specialty')" name="Specialty">
         <specialty v-if="load.Specialty" />
-
       </el-tab-pane>
-
-      <el-tab-pane label="Education & Training" name="EducationTraining">
+      <el-tab-pane :label="$t('system:reviewer:tab:Education&Training')" name="EducationTraining">
         <education-training v-if="load.EducationTraining" />
       </el-tab-pane>
-      <el-tab-pane label="Research & Publication" name="ResearchPublication">
+      <el-tab-pane :label="$t('system:reviewer:tab:Research&Publication')" name="ResearchPublication">
         <research-publication v-if="load.ResearchPublication" />
       </el-tab-pane>
-      <el-tab-pane label="Trial Experience" name="TrialExperience">
+      <el-tab-pane :label="$t('system:reviewer:tab:TrialExperience')" name="TrialExperience">
         <trial-experience v-if="load.TrialExperience" />
       </el-tab-pane>
-      <el-tab-pane label="Credentials" name="Credentials">
+      <el-tab-pane :label="$t('system:reviewer:tab:Credentials')" name="Credentials">
         <Credentials v-if="load.Credentials" />
       </el-tab-pane>
-      <el-tab-pane label="Resumes" name="Resumes">
+      <el-tab-pane :label="$t('system:reviewer:tab:Resumes')" name="Resumes">
         <Resumes v-if="load.Resumes" />
       </el-tab-pane>
-      <el-tab-pane label="Agreements" name="Agreements">
+      <el-tab-pane :label="$t('system:reviewer:tab:Agreements')" name="Agreements">
         <Agreements v-if="load.Agreements" />
       </el-tab-pane>
-      <el-tab-pane label="Setting" name="Setting">
+      <el-tab-pane :label="$t('system:reviewer:tab:Setting')" name="Setting">
         <Setting v-if="load.Setting" />
       </el-tab-pane>
     </el-tabs>
diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index 6b18a46e..ddc69ffc 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -3,7 +3,7 @@
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
         <el-form-item
-          label="操作类型"
+          :label="$t('system:loginLog:label:OptType')"
           prop="OptType"
         >
           <el-select v-model="searchData.OptType" clearable style="width:120px;">
@@ -27,7 +27,7 @@
           />
         </el-form-item>
         <el-form-item
-          label="错误用户名"
+          :label="$t('system:loginLog:label:LoginFaildName')"
           prop="LoginFaildName"
         >
           <el-input
@@ -38,7 +38,7 @@
           />
         </el-form-item>
         <el-form-item
-          label="创建时间"
+          :label="$t('system:loginLog:label:CreateTime')"
         >
           <el-date-picker
             v-model="datetimerange"
@@ -58,7 +58,7 @@
             size="mini"
             @click="getList"
           >
-            查询
+            {{ $t('common:button:search') }}
           </el-button>
         </el-form-item>
       </el-form>
@@ -75,7 +75,7 @@
           width="50"
         />
         <el-table-column
-          label="操作类型"
+          :label="$t('system:loginLog:table:OptType')"
           prop="OptType"
           min-width="90"
           show-overflow-tooltip
@@ -93,21 +93,21 @@
           show-overflow-tooltip
         />
         <el-table-column
-          label="错误用户名"
+          :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          label="用户名"
+          :label="$t('system:loginLog:table:LoginUserName')"
           prop="LoginUserName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
-          label="用户类型"
+          :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
           min-width="90"
           sortable="custom"
@@ -119,6 +119,7 @@
         </el-table-column>
         <el-table-column
           label="操作用户名"
+          :label="$t('system:loginLog:table:OptUserName')"
           prop="OptUserName"
           min-width="90"
           sortable="custom"
@@ -126,6 +127,7 @@
         />
         <el-table-column
           label="操作用户类型"
+          :label="$t('system:loginLog:table:OptUserType')"
           prop="OptUserTypeEnum"
           min-width="90"
           sortable="custom"
@@ -137,6 +139,7 @@
         </el-table-column>
         <el-table-column
           label="创建时间"
+          :label="$t('system:loginLog:table:CreateTime')"
           prop="CreateTime"
           min-width="90"
           sortable="custom"
diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue
index 248de3e1..65ede6ed 100644
--- a/src/views/system/notice/components/from.vue
+++ b/src/views/system/notice/components/from.vue
@@ -8,8 +8,8 @@
         label-width="120px"
         size="small"
       >
-        <el-form-item label="通知级别: " prop="NoticeLevelEnum">
-          <el-select v-model="form.NoticeLevelEnum" placeholder="通知级别" clearable size="small">
+        <el-form-item  :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
+          <el-select v-model="form.NoticeLevelEnum" clearable size="small">
             <el-option
               v-for="item of dict.type.NoteLevel"
               :key="item.value"
@@ -18,8 +18,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="通知类型: " prop="NoticeTypeEnum">
-          <el-select v-model="form.NoticeTypeEnum" placeholder="通知类型" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeType')" prop="NoticeTypeEnum">
+          <el-select v-model="form.NoticeTypeEnum" clearable size="small">
             <el-option
               v-for="item of dict.type.NoteType"
               :key="item.value"
@@ -28,8 +28,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="适用项目: " prop="ApplicableProjectEnum">
-          <el-select v-model="form.ApplicableProjectEnum" placeholder="适用项目" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:ApplicableProject')" prop="ApplicableProjectEnum">
+          <el-select v-model="form.ApplicableProjectEnum"  clearable size="small">
             <el-option
               v-for="item of dict.type.NoticeApplicableTrial"
               :key="item.value"
@@ -38,8 +38,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="适用角色: " prop="NoticeUserTypeIdList">
-          <el-select v-model="form.NoticeUserTypeIdList" multiple placeholder="使用角色" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeUserTypeIdList')" prop="NoticeUserTypeIdList">
+          <el-select v-model="form.NoticeUserTypeIdList" multiple clearable size="small">
             <el-option
               v-for="item of roleList"
               :key="item.Id"
@@ -48,8 +48,8 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="提醒方式: " prop="NoticeModeEnum">
-          <el-select v-model="form.NoticeModeEnum" placeholder="提醒方式" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeMode')" prop="NoticeModeEnum">
+          <el-select v-model="form.NoticeModeEnum" clearable size="small">
             <el-option
               v-for="item of dict.type.NoticeMode"
               :key="item.value"
@@ -58,35 +58,33 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="开始时间: " prop="Code">
+        <el-form-item :label="$t('system:notice:label:StartDate')" prop="StartDate">
           <el-date-picker
             v-model="form.StartDate"
             type="datetime"
-            placeholder="选择开始时间"
           />
         </el-form-item>
-        <el-form-item label="结束时间: " prop="Code">
+        <el-form-item  :label="$t('system:notice:label:EndDate')" prop="EndDate">
           <el-date-picker
             v-model="form.EndDate"
             type="datetime"
-            placeholder="选择结束时间"
           />
         </el-form-item>
-        <el-form-item v-if="!form.Id" label="是否发布: " prop="Code">
+        <el-form-item v-if="!form.Id" :label="$t('system:notice:label:IsPush')" prop="IsPush">
           <el-switch
             v-model="form.IsPush"
             :active-value="true"
             :inactive-value="false"
           />
         </el-form-item>
-        <el-form-item label="通知内容: " prop="NoticeContent">
+        <el-form-item  :label="$t('system:notice:label:NoticeContent')" prop="NoticeContent">
           <el-input
             v-model="form.NoticeContent"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 4}"
           />
         </el-form-item>
-        <el-form-item label="附件: ">
+        <el-form-item  :label="$t('system:notice:label:file')">
           <el-upload
             class="upload-demo"
             action
@@ -104,8 +102,8 @@
       </el-form>
     </template>
     <template slot="dialog-footer">
-      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+      <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">{{ $t('common:button:cancel') }}</el-button>
+      <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">{{ $t('common:button:save') }}</el-button>
     </template>
   </base-model>
 </template>
@@ -167,7 +165,7 @@ export default {
     },
     beforeUpload() {
       if (this.fileList.length > 0) {
-        this.$alert('最多只能传一个附件')
+        this.$alert(this.$t('system:notice:msg:message1'))
         return
       }
     },
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index 5178b7f9..cd9e8131 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -2,38 +2,38 @@
   <div class="role">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item label="通知级别: " prop="NoticeLevelEnum">
-          <el-select v-model="searchData.NoticeLevelEnum" placeholder="通知级别" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
+          <el-select v-model="searchData.NoticeLevelEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoteLevel"
+              v-for="item of $d.NoteLevel"
               :key="item.value"
               :label="item.label"
               :value="item.raw.Code * 1"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="通知类型: " prop="NoticeTypeEnum">
-          <el-select v-model="searchData.NoticeTypeEnum" placeholder="通知类型" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeType')" prop="NoticeTypeEnum">
+          <el-select v-model="searchData.NoticeTypeEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoteType"
+              v-for="item of $d.NoteType"
               :key="item.value"
               :label="item.label"
-              :value="item.raw.Code * 1"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="适用项目: " prop="ApplicableProjectEnum">
-          <el-select v-model="searchData.ApplicableProjectEnum" placeholder="适用项目" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:ApplicableProject')" prop="ApplicableProjectEnum">
+          <el-select v-model="searchData.ApplicableProjectEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoticeApplicableTrial"
+              v-for="item of $d.NoticeApplicableTrial"
               :key="item.value"
               :label="item.label"
-              :value="item.raw.Code * 1"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="使用角色: " prop="NoticeUserTypeIdList">
-          <el-select v-model="searchData.NoticeUserTypeIdList" multiple placeholder="使用角色" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeUserTypeIdList')" prop="NoticeUserTypeIdList">
+          <el-select v-model="searchData.NoticeUserTypeIdList" multiple clearable size="small">
             <el-option
               v-for="item of roleList"
               :key="item.Id"
@@ -42,99 +42,99 @@
             />
           </el-select>
         </el-form-item>
-        <el-form-item label="提醒方式: " prop="NoticeModeEnum">
-          <el-select v-model="searchData.NoticeModeEnum" placeholder="提醒方式" clearable size="small">
+        <el-form-item :label="$t('system:notice:label:NoticeMode')" prop="NoticeModeEnum">
+          <el-select v-model="searchData.NoticeModeEnum" clearable size="small">
             <el-option
-              v-for="item of dict.type.NoticeMode"
+              v-for="item of $d.NoticeMode"
               :key="item.value"
               :label="item.label"
-              :value="item.raw.Code * 1"
+              :value="item.value"
             />
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
-          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">{{ $t('common:button:search') }}</el-button>
+          <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">{{ $t('common:button:add') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" v-adaptive="{bottomOffset:45}" height="100" :data="list" class="table">
         <el-table-column type="index" width="50" />
-        <el-table-column label="通知级别" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeLevel')" label="通知级别" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ dict.type.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}) ? dict.type.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}).label : '' }}
+            {{ $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}) ? $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="通知类型" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeType')" label="通知类型" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ dict.type.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}) ? dict.type.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}).label : '' }}
+            {{ $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}) ? $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="通知内容" prop="NoticeContent" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeContent')" label="通知内容" prop="NoticeContent" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeContent }}
           </template>
         </el-table-column>
-        <el-table-column label="通知状态" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeState')" label="通知状态" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tag :type="scope.row.ActualNoticeStateEnum === 0 ? 'info' : scope.row.ActualNoticeStateEnum === 1 ? 'success' : 'danger'">
-              {{ dict.type.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}) ? dict.type.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}).label : '' }}
+              {{ $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}) ? $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}).label : '' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column label="适用项目" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:ApplicableProject')" label="适用项目" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ dict.type.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}) ? dict.type.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}).label : '' }}
+            {{ $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}) ? $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="适用角色" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" label="适用角色" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeUserTypeList.map(v => v.UserTypeShortName).toString() }}
           </template>
         </el-table-column>
-        <el-table-column label="提示方式" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeMode')" label="提示方式" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
-            {{ dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}) ? dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}).label : '' }}
+            {{ dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}) ? $d.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column label="保留时长" prop="StartDate" min-width="240" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:StartDate')" label="保留时长" prop="StartDate" min-width="240" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.StartDate }}-{{ scope.row.EndDate }}
           </template>
         </el-table-column>
-        <el-table-column label="发布人" prop="PublishUserName" min-width="100" show-overflow-tooltip />
-        <el-table-column label="发布时间" prop="PublishedTime" min-width="160" show-overflow-tooltip />
-        <el-table-column label="更新时间" prop="UpdateTime" min-width="160" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:PublishUserName')" label="发布人" prop="PublishUserName" min-width="100" show-overflow-tooltip />
+        <el-table-column :label="$t('system:notice:table:PublishedTime')" label="发布时间" prop="PublishedTime" min-width="160" show-overflow-tooltip />
+        <el-table-column :label="$t('system:notice:table:UpdateTime')" label="更新时间" prop="UpdateTime" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.StartDate ? scope.row.StartDate: scope.row.CreateTime }}
           </template>
         </el-table-column>
-        <el-table-column label="附件" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:FileName')" label="附件" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <a :href="OSSclientConfig.basePath + scope.row.FullFilePath" target="_blank" style="color:#428bca">{{ scope.row.FileName }}</a>
           </template>
         </el-table-column>
-        <el-table-column label="操作" fixed="right" prop="UserTypeShortName" min-width="200" show-overflow-tooltip>
+        <el-table-column :label="$t('common:action:action')" fixed="right" prop="UserTypeShortName" min-width="200" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button
               size="mini"
               type="text"
               icon="el-icon-edit-outline"
               @click="handleEdit(scope.row)"
-            >编辑</el-button>
+            >{{$t('common:action:edit')}}</el-button>
             <el-button
               v-if="scope.row.NoticeStateEnum === 0"
               size="mini"
               type="text"
               icon="el-icon-s-promotion"
               @click="handlePush(scope.row)"
-            >发布</el-button>
+            >{{$t('common:action:push')}}</el-button>
             <el-button
               v-if="scope.row.NoticeStateEnum === 1"
               size="mini"
               type="text"
               icon="el-icon-s-release"
               @click="handleGet(scope.row)"
-            >撤回</el-button>
+            >{{$t('common:action:pull')}}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -219,12 +219,12 @@ export default {
     },
     handleEdit(row) {
       this.$nextTick(() => {
-        this.$refs['NoticeForm'].openDialog('编辑', row)
+        this.$refs['NoticeForm'].openDialog(this.$t('common:button:edit'), row)
       })
     },
     handleAdd() {
       this.$nextTick(() => {
-        this.$refs['NoticeForm'].openDialog('新增', {})
+        this.$refs['NoticeForm'].openDialog(this.$t('common:button:add'), {})
       })
     },
     getUserTypeRoleList() {
diff --git a/src/views/system/role/components/RoleForm.vue b/src/views/system/role/components/RoleForm.vue
index ce44f7fe..46aa2bc0 100644
--- a/src/views/system/role/components/RoleForm.vue
+++ b/src/views/system/role/components/RoleForm.vue
@@ -197,8 +197,9 @@ export default {
       getMenuList({}).then(res => {
         const menu = this.toTree(res.Result, '00000000-0000-0000-0000-000000000000')
         this.menuOptions = menu
-        this.form.MenuIds.forEach(v => {
-          this.$nextTick(() => {
+        console.log(this.menuOptions)
+        this.$nextTick(() => {
+          this.form.MenuIds.forEach(v => {
             this.$refs.menu.setChecked(v, true, false)
           })
         })
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index af573cc4..b2fb5ee5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -2,17 +2,16 @@
   <div class="role">
     <div ref="leftContainer" class="left">
       <el-form :inline="true">
-        <el-form-item label="关键字">
+        <el-form-item :label="$t('system:role:title:SearchFilter')">
           <el-input
             v-model="queryParams.SearchFilter"
-            placeholder="请输入关键字"
             clearable
             size="small"
             @keyup.enter.native="getList"
           />
         </el-form-item>
-        <el-form-item label="状态">
-          <el-select v-model="queryParams.GroupId" placeholder="角色组" clearable size="small">
+        <el-form-item :label="$t('system:role:title:Group')">
+          <el-select v-model="queryParams.GroupId" clearable size="small">
             <el-option
               v-for="item of dict.type.UserTypeGroup"
               :key="item.value"
@@ -22,27 +21,27 @@
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">搜索</el-button>
-          <el-button v-hasPermi="['system:role:add']" type="primary" icon="el-icon-plus" size="mini" @click="handleAddRole">新增</el-button>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="getList">{{ $t('common:button:search') }}</el-button>
+          <el-button v-hasPermi="['system:role:add']" type="primary" icon="el-icon-plus" size="mini" @click="handleAddRole">{{ $t('common:button:add') }}</el-button>
         </el-form-item>
       </el-form>
       <el-table v-loading="loading" v-adaptive="{bottomOffset:30}" size="small" height="100" :data="list" class="table">
         <el-table-column type="index" width="50" />
-        <el-table-column label="User Type" prop="UserTypeName" min-width="220" show-overflow-tooltip />
-        <el-table-column label="Shortname" prop="UserTypeShortName" min-width="120" show-overflow-tooltip />
-        <el-table-column label="Group" prop="Note" min-width="80" show-overflow-tooltip>
+        <el-table-column :label="$t('system:role:table:User Type')" prop="UserTypeName" min-width="220" show-overflow-tooltip />
+        <el-table-column :label="$t('system:role:table:Shortname')" prop="UserTypeShortName" min-width="120" show-overflow-tooltip />
+        <el-table-column :label="$t('system:role:table:Group')" prop="Note" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.UserTypeGroupList.map(v => {return v.GroupName}).toString() }}
           </template>
         </el-table-column>
-        <el-table-column label="PermissionStr" prop="PermissionStr" min-width="100" show-overflow-tooltip />
-        <el-table-column label="User Type Enum" prop="UserTypeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:role:table:PermissionStr')" prop="PermissionStr" min-width="100" show-overflow-tooltip />
+        <el-table-column :label="$t('system:role:table:User Type Enum')" prop="UserTypeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $fd('UserType',scope.row.UserTypeEnum) }}
           </template>
         </el-table-column>
-        <el-table-column label="Description" prop="Description" min-width="220" show-overflow-tooltip />
-        <el-table-column label="Action" width="280">
+        <el-table-column :label="$t('system:role:table:Description')" prop="Description" min-width="220" show-overflow-tooltip />
+        <el-table-column :label="$t('common:action:action')" width="280">
           <template slot-scope="scope">
             <el-button
               v-hasPermi="['system:role:edit']"
@@ -50,14 +49,14 @@
               type="text"
               icon="el-icon-edit"
               @click="handleEditRole(scope.row)"
-            >Edit</el-button>
+            >{{ $t('common:button:edit') }}</el-button>
             <el-button
               v-hasPermi="['system:role:delete']"
               size="mini"
               type="text"
               icon="el-icon-delete"
               @click="handleDeleteRole(scope.row)"
-            >Delete</el-button>
+            >{{ $t('common:button:delete') }}</el-button>
           </template>
         </el-table-column>
       </el-table>
@@ -69,12 +68,11 @@
   </div>
 </template>
 <script>
-import { role_columns, model_cfg } from './role'
 import { getUserTypeRoleList, deleteUserTypeRole } from '@/api/admin'
 // import { getDictionary } from '@/api/dictionary/dictionary'
 import RoleForm from './components/RoleForm'
 import tableMixins from '@/mixins/table'
-
+import { model_cfg } from './role'
 export default {
   name: 'Role',
   components: { RoleForm },
@@ -82,7 +80,6 @@ export default {
   mixins: [tableMixins],
   data() {
     return {
-      role_columns,
       model_cfg,
       list: [],
       total: 0,
@@ -124,12 +121,12 @@ export default {
     handleAddRole() {
       this.editRow = {}
       this.model_cfg.visible = true
-      this.model_cfg.title = 'Add'
+      this.model_cfg.title = this.$t('common:button:add')
     },
     handleEditRole(row) {
       this.editRow = row
       this.model_cfg.visible = true
-      this.model_cfg.title = 'Edit'
+      this.model_cfg.title = this.$t('common:button:edit')
     },
     // 分配权限，获取菜单树，并勾选已有菜单权限
     handlePermission(row) {
diff --git a/src/views/system/role/role.js b/src/views/system/role/role.js
index 21c7b2ac..a01d01a1 100644
--- a/src/views/system/role/role.js
+++ b/src/views/system/role/role.js
@@ -1,80 +1,79 @@
-// 角色列表配置信息
-export const role_columns = [
-  { type: 'index' },
-
-  {
-    prop: 'UserType',
-    label: 'User Type',
-    minWidth: 120,
-    showOverflowTooltip: true
-  },
-  {
-    prop: 'UserTypeShortName',
-    label: 'Shortname',
-    minWidth: 100,
-    showOverflowTooltip: true
-  },
-  {
-    prop: 'Type',
-    label: 'Group',
-    hidden: true,
-    minWidth: 100,
-    showOverflowTooltip: true,
-    slot: 'TypeSlot'
-  },
-
-  {
-    prop: 'Description',
-    label: 'Description',
-    minWidth: 100,
-    showOverflowTooltip: true },
-  {
-    type: 'operate',
-    label: 'Action',
-    minWidth: 100,
-    operates: [
-      // { name: 'Permission', type: 'primary', emitKey: 'permission' },
-      { name: 'Edit', type: 'primary', emitKey: 'edit' },
-      { name: 'Delete', type: 'danger', emitKey: 'delete' }
-    ] }
-]
-export const model_cfg = {
-  visible: false,
-  title: '',
-  width: '600px',
-  showClose: true
-}
-export const editRoleForm = [
-  {
-    type: 'Input',
-    label: 'Role Name',
-    prop: 'RoleName',
-    width: '100%',
-    placeholder: ''
-  },
-  {
-    type: 'Input',
-    label: 'Description',
-    prop: 'RoleDescription',
-    width: '100%',
-    placeholder: ''
-  }
-]
-export const editData = {
-  RoleName: null,
-  RoleDescription: null
-}
-export const editRules = {
-  RoleName: [
-    { required: true, message: 'Please specify', trigger: 'blur' },
-    { max: 50, message: 'The maximum length is 50' }
-  ],
-  RoleDescription: [
-    { max: 500, message: 'The maximum length is 500' }
-  ]
-
-}
-export const editHandle = [
-  { label: 'Cancel', type: 'primary', emitKey: 'cancel' },
-  { label: 'Save', type: 'primary', emitKey: 'save' }
-]
+// 角色列表配置信息
+export const role_columns = [
+  { type: 'index' },
+  {
+    prop: 'UserType',
+    label: 'User Type',
+    minWidth: 120,
+    showOverflowTooltip: true
+  },
+  {
+    prop: 'UserTypeShortName',
+    label: 'Shortname',
+    minWidth: 100,
+    showOverflowTooltip: true
+  },
+  {
+    prop: 'Type',
+    label: 'Group',
+    hidden: true,
+    minWidth: 100,
+    showOverflowTooltip: true,
+    slot: 'TypeSlot'
+  },
+
+  {
+    prop: 'Description',
+    label: 'Description',
+    minWidth: 100,
+    showOverflowTooltip: true },
+  {
+    type: 'operate',
+    label: 'Action',
+    minWidth: 100,
+    operates: [
+      // { name: 'Permission', type: 'primary', emitKey: 'permission' },
+      { name: 'Edit', type: 'primary', emitKey: 'edit' },
+      { name: 'Delete', type: 'danger', emitKey: 'delete' }
+    ] }
+]
+export const model_cfg = {
+  visible: false,
+  title: '',
+  width: '600px',
+  showClose: true
+}
+export const editRoleForm = [
+  {
+    type: 'Input',
+    label: 'Role Name',
+    prop: 'RoleName',
+    width: '100%',
+    placeholder: ''
+  },
+  {
+    type: 'Input',
+    label: 'Description',
+    prop: 'RoleDescription',
+    width: '100%',
+    placeholder: ''
+  }
+]
+export const editData = {
+  RoleName: null,
+  RoleDescription: null
+}
+export const editRules = {
+  RoleName: [
+    { required: true, message: 'Please specify', trigger: 'blur' },
+    { max: 50, message: 'The maximum length is 50' }
+  ],
+  RoleDescription: [
+    { max: 500, message: 'The maximum length is 500' }
+  ]
+
+}
+export const editHandle = [
+  { label: 'Cancel', type: 'primary', emitKey: 'cancel' },
+  { label: 'Save', type: 'primary', emitKey: 'save' }
+]
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 325607ce..6ddc7df5 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -15,7 +15,7 @@
         size="mini"
         style="margin-left:auto;height: 28px;position: absolute;bottom: 0;right: 10px"
         @click="handleAddUser"
-      >New</el-button>
+      >{{$t('common:button:new')}}</el-button>
     </div>
     <base-table
       v-loading="loading"
@@ -120,7 +120,7 @@ export default {
         },
         {
           prop: 'EMail',
-          label: this.$t('system:userlist:table:EMail'),
+          label: this.$t('system:userlist:table:Email'),
           minWidth: 150,
           sortable: 'custom',
           showOverflowTooltip: true

From 5859102225c5b62be316a3fd67f301a16e4cecb3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 4 Mar 2024 17:55:47 +0800
Subject: [PATCH 068/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/Conclusions.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index ad7a3a44..63876d52 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -340,7 +340,6 @@ export default {
         var file = await this.fileToBlob(param.file)
         var trialId = this.$route.query.trialId
         const res = await this.OSSclient.put(`/${trialId}/MedicalReview/${param.file.name}`, file)
-        console.log(res)
         this.fileList.push({ name: param.file.name, url: this.$getObjectName(res.url) })
         this.loading = false
       } catch (e) {

From b8384d111a65cf45635030432970b2ec135c1e08 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 4 Mar 2024 17:56:51 +0800
Subject: [PATCH 069/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Conclusions.vue                |  25 +++--
 .../mim-medical-audit/components/FormItem.vue |  15 ++-
 .../mim-medical-audit/components/Issues.vue   |  20 ++--
 .../components/MedicalAudit.vue               | 101 +++++++++++-------
 .../reading/mim-medical-audit/index.vue       |  89 +++++++++++++--
 .../reading/pm-medical-feedback/index.vue     |   2 +-
 6 files changed, 184 insertions(+), 68 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 63876d52..265ce58d 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -18,7 +18,8 @@
       >
         <el-radio-group
           v-model="form.IsHaveQuestion"
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+          @change="isHaveQuestionChange"
         >
           <el-radio
             v-for="item of $d.YesOrNo"
@@ -44,7 +45,7 @@
         <el-input
           v-model="form.Questioning"
           type="textarea"
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         />
       </el-form-item>
       <!-- 审核建议 -->
@@ -58,7 +59,7 @@
       >
         <el-radio-group
           v-model="form.AuditAdviceEnum"
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         >
           <el-radio
             v-for="item of $d.AuditAdvice"
@@ -84,7 +85,7 @@
           :on-remove="handleRemove"
           :file-list="fileList"
 
-          :disabled="isSendMessage || auditState===2 || ![14, 30].includes(userTypeEnumInt)"
+          :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
           style="width:300px"
         >
           <i slot="default" class="el-icon-plus" />
@@ -247,7 +248,6 @@ export default {
           if (!valid) {
             reject()
           } else {
-            this.loading = true
             this.form.IsSendDialog = this.form.IsHaveQuestion
             var files = []
             this.fileList.map(file => {
@@ -260,10 +260,8 @@ export default {
                 this.$emit('getMedicalAuditList')
               }
               this.isSendMessage = this.form.IsHaveQuestion
-              this.loading = false
               resolve()
             }).catch(() => {
-              this.loading = false
               reject()
             })
           }
@@ -296,16 +294,27 @@ export default {
         })
       })
     },
+    validForm() {
+      return new Promise((resolve) => {
+        this.$refs['conclusionsForm'].validate((valid) => {
+          resolve(valid)
+        })
+      })
+    },
     handleReply() {
       this.chatVisible = true
     },
     handleCloseReply() {
       this.closeQuestionVisible = true
     },
+    isHaveQuestionChange(val) {
+      this.$emit('setIsHaveQuestion', val)
+    },
     refresh() {
       this.isClosedDialog = true
       this.$emit('getMedicalAuditList')
       this.$refs['chatForm'].getMessageList()
+      this.$emit('handleSign')
     },
     convertBase64ToBlob(imageEditorBase64) {
       var base64Arr = imageEditorBase64.split(',')
@@ -385,7 +394,7 @@ export default {
   .disabled{
     /deep/ .el-upload--picture-card {
       display: none;
-      
+
     }
   }
   /deep/  .el-upload-list__item {
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue
index 05ed238f..a66fb23f 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/FormItem.vue
@@ -21,7 +21,7 @@
       <el-input
         v-if="question.Type==='input'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       />
       <!-- 多行文本输入框 -->
       <el-input
@@ -29,13 +29,13 @@
         v-model="questionForm[question.Id]"
         type="textarea"
         :autosize="{ minRows: 2, maxRows: 4}"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       />
       <!-- 下拉框 -->
       <el-select
         v-if="question.Type==='select'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         clearable
         @change="((val)=>{formItemChange(val, question)})"
       >
@@ -50,7 +50,7 @@
       <el-radio-group
         v-if="question.Type==='radio'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         @change="((val)=>{formItemChange(val, question)})"
       >
         <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">{{ val }}</el-radio>
@@ -59,7 +59,7 @@
       <el-checkbox-group
         v-if="question.Type==='checkbox'"
         v-model="questionForm[question.Id]"
-        :disabled="auditState >= 2"
+        :disabled="auditState >= 2 || isSendMessage || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       >
         <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">{{ val }}</el-checkbox>
       </el-checkbox-group>
@@ -71,6 +71,7 @@
       :question="item"
       :audit-state="auditState"
       :question-form="questionForm"
+      :is-send-message="isSendMessage"
       @resetFormItemData="resetFormItemData"
     />
   </div>
@@ -94,6 +95,10 @@ export default {
     auditState: {
       type: Number,
       required: true
+    },
+    isSendMessage: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
index 7378472c..f06cfe05 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Issues.vue
@@ -13,7 +13,8 @@
         :key="question.Id"
         :question="question"
         :question-form="questionForm"
-        :audit-state="state"
+        :audit-state="auditState"
+        :is-send-message="isSendMessage"
         @resetFormItemData="resetFormItemData"
       />
 
@@ -43,6 +44,10 @@ export default {
     auditState: {
       type: Number,
       required: true
+    },
+    isSendMessage: {
+      type: Boolean,
+      required: true
     }
   },
   data() {
@@ -52,8 +57,7 @@ export default {
       isRender: false,
       trialId: '',
       readingTaskState: 0,
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
-      state: [14, 30].includes(zzSessionStorage.getItem('userTypeEnumInt') * 1) ? this.auditState : 2
+      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1
     }
   },
   mounted() {
@@ -67,7 +71,6 @@ export default {
           if (!valid) {
             reject()
           } else {
-            this.loading = true
             var answers = []
             for (const k in this.questionForm) {
               answers.push({ id: k, answer: this.questionForm[k] })
@@ -82,10 +85,8 @@ export default {
               if (isPrompt) {
                 this.$message.success(this.$t('common:message:savedSuccessfully'))
               }
-              this.loading = false
               resolve()
             }).catch(() => {
-              this.loading = false
               reject()
             })
           }
@@ -120,6 +121,13 @@ export default {
         })
       })
     },
+    validForm() {
+      return new Promise((resolve) => {
+        this.$refs['questions'].validate((valid) => {
+          resolve(valid)
+        })
+      })
+    },
     getQuestions() {
       this.loading = true
       var questions = []
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index 9a479ef6..87af097b 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -20,6 +20,7 @@
           :question-answer-list="auditInfo.QuestionAnswerList"
           :task-medical-review-id="taskMedicalReviewId"
           :audit-state="auditInfo.AuditState"
+          :is-send-message="isSendMessage"
         />
       </div>
       <div>
@@ -34,29 +35,36 @@
           :subject-code="auditInfo.SubjectCode"
           :task-blind-name="auditInfo.TaskBlindName"
           @getMedicalAuditList="getMedicalAuditList"
+          @setIsHaveQuestion="setIsHaveQuestion"
+          @handleSign="handleSign"
         />
       </div>
     </div>
     <div class="medical-audit-bottom-btn">
       <el-divider />
       <!-- 取消 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo" @click="handleCancel">
+      <!-- <el-button v-if="auditInfo.MedicalReviewInfo" @click="handleCancel">
         {{ $t('common:button:cancel') }}
-      </el-button>
+      </el-button> -->
       <!-- 保存 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="handleSave">
+      <!-- <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="handleSave">
         {{ $t('common:button:save') }}
+      </el-button> -->
+      <!-- 发起质询 -->
+      <!-- hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) -->
+      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && !isSendMessage && isHaveQuestion" type="primary" @click="handleLaunch">
+        {{ $t('trials:medicalFeedback:title:launch') }}
       </el-button>
-      <!-- 质询 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && isSendMessage" type="primary" @click="handleQc">
+      <!-- 质询记录 -->
+      <el-button v-if="isSendMessage" type="primary" @click="handleQc">
         {{ $t('trials:medicalFeedback:title:qaRecord') }}
       </el-button>
       <!-- 审核完成 -->
-      <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="handleAudit">
+      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && (isHaveQuestion === false || (auditInfo.IsClosedDialog && isSendMessage)) && auditInfo.AuditState !== 2" type="primary" @click="handleAudit">
         {{ $t('trials:medicalFeedback:button:auditCompleted') }}
       </el-button>
-
-      <el-button v-if="auditInfo.MedicalReviewInfo && [14, 30].includes(userTypeEnumInt) && auditInfo.AuditState !== 2" type="primary" @click="getNextTask">
+      <!-- 跳过 -->
+      <el-button v-if="hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit']) && auditInfo.AuditState !== 2" type="primary" @click="getNextTask">
         {{ $t('trials:medicalFeedback:button:nextTask') }}
       </el-button>
     </div>
@@ -130,7 +138,8 @@ export default {
       currentUser: zzSessionStorage.getItem('userName'),
       signVisible: false,
       userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
-      isSendMessage: false
+      isSendMessage: false,
+      isHaveQuestion: false
     }
   },
   mounted() {
@@ -146,59 +155,69 @@ export default {
       getMedicalReviewReadingTask(params).then(res => {
         this.auditInfo = { ...res.Result }
         this.isSendMessage = res.Result.IsSendMessage
+        this.isHaveQuestion = res.Result.MedicalReviewInfo.IsHaveQuestion
         this.loading = false
       }).catch(() => {
         this.loading = false
       })
     },
     handleAudit() {
-      if (!this.$refs['auditConclusions'].isClosedDialog && this.$refs['auditConclusions'].form.IsHaveQuestion) {
-        // 请先关闭质询！
-        this.$alert(this.$t('trials:medicalFeedback:message:closeQC'), {
-          callback: action => {}
-        })
-        return
-      }
-      this.loading = true
-      this.$refs['auditIssues'].handleSave(false).then(() => {
-        this.$refs['auditConclusions'].handleSave(false).then(() => {
-          this.loading = false
-          this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
-          const { MedicalAudit } = const_.processSignature
-          this.signCode = MedicalAudit
-          this.signVisible = true
+      if (this.$refs['auditConclusions'].isClosedDialog && this.$refs['auditConclusions'].form.IsHaveQuestion) {
+        this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
+        this.handleSign()
+      } else if (!this.$refs['auditConclusions'].form.IsHaveQuestion) {
+        const loading = this.$loading({ fullscreen: true })
+        this.$refs['auditIssues'].handleSave(false).then(() => {
+          this.$refs['auditConclusions'].handleSave(false).then(() => {
+            this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
+            this.handleSign()
+            loading.close()
+          }).catch(() => {
+            loading.close()
+          })
         }).catch(() => {
-          this.loading = false
+          loading.close()
         })
-      }).catch(() => {
-        this.loading = false
-      })
-      // Promise.all([this.$refs['auditIssues'].handleSave(false), this.$refs['auditConclusions'].handleSave(false)])
-      //   .then(() => {
-      //     this.loading = false
-      //     const { MedicalAudit } = const_.processSignature
-      //     this.signCode = MedicalAudit
-      //     this.signVisible = true
-      //   }).catch(() => {
-      //     this.loading = false
-      //   })
+      }
+    },
+    handleSign() {
+      const { MedicalAudit } = const_.processSignature
+      this.signCode = MedicalAudit
+      this.signVisible = true
     },
     handleSave() {
-      this.loading = true
+      const loading = this.$loading({ fullscreen: true })
       this.$refs['auditIssues'].handleSave(false).then(() => {
         this.$refs['auditConclusions'].handleSave(false).then(() => {
-          this.loading = false
           this.isSendMessage = this.$refs['auditConclusions'].form.IsHaveQuestion
+          this.$emit('getList')
+          loading.close()
         }).catch(() => {
-          this.loading = false
+          loading.close()
         })
       }).catch(() => {
-        this.loading = false
+        loading.close()
       })
     },
+    async handleLaunch() {
+      var auditIssuesValid = await this.$refs['auditIssues'].validForm()
+      var auditConclusionsValid = await this.$refs['auditConclusions'].validForm()
+      if (auditIssuesValid && auditConclusionsValid) {
+        this.$confirm('当前审核结论为“有问题”，是否发起质询？', {
+          type: 'warning',
+          distinguishCancelAndClose: true
+        })
+          .then(() => {
+            this.handleSave()
+          }).catch(() => {})
+      }
+    },
     handleQc() {
       this.$refs['auditConclusions'].handleReply()
     },
+    setIsHaveQuestion(isHaveQuestion) {
+      this.isHaveQuestion = isHaveQuestion
+    },
     // 获取下一任务
     getNextTask() {
       this.loading = true
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index fd209374..c81714cc 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -504,10 +504,37 @@
         @refresh="refresh"
       />
     </el-dialog>
+    <!--签名框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <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>
+      </div>
+      <SignForm
+        ref="signForm"
+        :sign-code-enum="signCode"
+        @closeDialog="closeSignDialog"
+      />
+    </el-dialog>
   </BaseContainer>
 </template>
 <script>
-import { getTrialSiteSelect, getMIMMedicalReviewTaskList, getNextMedicalReviewTask } from '@/api/trials'
+import { getTrialSiteSelect, getMIMMedicalReviewTaskList, getNextMedicalReviewTask, FinishMedicalReview } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import { getDoctorUserSelectList } from '@/api/trials/reading'
 import { getToken } from '@/utils/auth'
@@ -516,7 +543,8 @@ import Pagination from '@/components/Pagination'
 import MedicalAudit from './components/MedicalAudit'
 import ChatForm from './components/ChatForm'
 import CloseQC from './components/CloseQC'
-
+import SignForm from '@/views/trials/components/newSignForm'
+import const_ from '@/const/sign-code'
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
@@ -537,7 +565,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'MIMMedicalAudit',
-  components: { BaseContainer, Pagination, MedicalAudit, ChatForm, CloseQC },
+  components: { BaseContainer, Pagination, MedicalAudit, ChatForm, CloseQC, SignForm },
   data() {
     return {
       list: [],
@@ -555,7 +583,11 @@ export default {
       TrialReadingCriterionId: '0',
       trialCriterionList: [],
       closeQuestionVisible: false,
-      readingWindow: null
+      readingWindow: null,
+      signText: '',
+      signCode: null,
+      currentUser: zzSessionStorage.getItem('userName'),
+      signVisible: false
     }
   },
   watch: {
@@ -583,6 +615,9 @@ export default {
     refresh() {
       this.isClosedDialog = true
       this.$refs['chatForm'].getMessageList()
+      const { MedicalAudit } = const_.processSignature
+      this.signCode = MedicalAudit
+      this.signVisible = true
     },
     handleCloseReply() {
       this.closeQuestionVisible = true
@@ -604,6 +639,46 @@ export default {
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
       }).catch(() => {})
     },
+    // 关闭签名框并设置确认状态
+    closeSignDialog(isSign, signInfo) {
+      if (isSign) {
+        this.signConfirm(signInfo)
+      } else {
+        this.signVisible = false
+      }
+    },
+    // 签名确认
+    signConfirm(signInfo) {
+      this.loading = true
+      const params = {
+        data: {
+          taskMedicalReviewId: this.currentRow.Id
+        },
+        signInfo: signInfo
+      }
+      FinishMedicalReview(params).then(res => {
+        if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$refs['signForm'].btnLoading = false
+          this.signVisible = false
+          this.chatForm.visible = false
+        }
+        this.loading = false
+        this.getList()
+          .then(() => {
+            this.loading = true
+            this.$emit('nextTask', this.taskMedicalReviewId)
+          })
+          .catch(action => {
+
+          })
+      }).catch(_ => {
+        this.loading = false
+        if (this.$refs['signForm']) {
+          this.$refs['signForm'].btnLoading = false
+        }
+      })
+    },
     handleView(row) {
       this.currentRow = { ...row }
       this.auditVisible = true
@@ -622,9 +697,9 @@ export default {
         this.currentRow = { ...row }
         this.auditVisible = true
         // 访视任务，打开阅片页面
-        if (row.ReadingCategory === 1) {
-          this.handleViewReadingPage(row)
-        }
+        // if (row.ReadingCategory === 1) {
+        //   this.handleViewReadingPage(row)
+        // }
       } else {
         // '请先确认医学审核问题模板配置！'
         this.$alert(this.$t('trials:medicalFeedback:message:confirmTemplate'), {
diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
index 9cb3af71..410ea666 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
@@ -346,7 +346,7 @@
             <el-button
               circle
               :title="$t('trials:pmMedicalReview:action:view')"
-              :disabled="scope.row.IsInvalid || scope.row.AuditState !== 2"
+              :disabled="scope.row.IsInvalid "
               icon="el-icon-view"
               @click="handleReadMecialAudit(scope.row)"
             />

From d95e0958eb97669917360e2b7a54b432d88aff0a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 5 Mar 2024 17:20:10 +0800
Subject: [PATCH 070/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E5=9C=A8=E5=90=8E=E7=BB=AD=E8=AE=BF=E8=A7=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionList.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 7e7802bf..a9fdf4e9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -71,7 +71,7 @@
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                             <span class="login-cycle" />
                           </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">

From fb79702a65ad3985a00290bd903700b8fddcfa71 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 5 Mar 2024 17:35:52 +0800
Subject: [PATCH 071/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E5=9C=A8=E5=90=8E=E7=BB=AD=E8=AE=BF=E8=A7=86=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionList.vue       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index a9fdf4e9..800d8694 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -66,12 +66,12 @@
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
-                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1'">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
+                            <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                               <span class="login-cycle" />
                             </div>
                           </el-tooltip>
-                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
+                          <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '4'">
                             <span class="login-cycle" />
                           </div>
                           <el-tooltip v-if="!!item.TableQuestions.Answers[i].lesionPart" class="item" effect="dark" :content="item.TableQuestions.Answers[i].lesionPart" placement="bottom">

From 1d3fa6a83763960f6e33989dde53d9393604977c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 11:09:08 +0800
Subject: [PATCH 072/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9Fbug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/subject/reading-period/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 5d143575..7e6e774e 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -176,7 +176,7 @@
                           <div>
                             {{ $t('trials:readingPeriod:table:clinicalInfo2') }}
                           </div>
-                          <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData)" @click="handleView(scope.row,scope.row.Data[i-1])">
+                          <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData && scope.row.Data[i-1].ModuleType === 3) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData && scope.row.Data[i-1].ModuleType === 5)" @click="handleView(scope.row,scope.row.Data[i-1])">
                             {{ $t('trials:readingPeriod:button:view') }}
                           </el-link>
                           <span v-else>{{ $t('trials:readingPeriod:table:noCD') }}</span>

From d14b23761b95ada427510c0a8c4908fe5f663d3f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 13:55:05 +0800
Subject: [PATCH 073/374] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8B=E8=BD=BD=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Fusion/TableQuestionItem.vue     |  1 -
 .../Fusion/js/convertMultiframeImageIds.js      | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index a8d9aeec..78032cc5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -263,7 +263,6 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
-    console.log(this.getQuestionVal(7))
   },
   beforeDestroy() {
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js
index 728fe73d..2ad747e9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js
@@ -1,13 +1,22 @@
 import { metaData } from '@cornerstonejs/core'
 import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
+var imageIds = [] 
+const maxRequest = 5
 /**
  * preloads imageIds metadata in memory
  **/
 async function prefetchMetadataInformation(imageIdsToPrefetch) {
-  for (let i = 0; i < imageIdsToPrefetch.length; i++) {
-    await cornerstoneDICOMImageLoader.wadouri.loadImage(imageIdsToPrefetch[i])
-      .promise
-  }
+  return new Promise(async(resolve, reject) =>{
+    var taskPromises = []
+    for (let i = 0; i < imageIdsToPrefetch.length; i++) {
+      taskPromises.push(cornerstoneDICOMImageLoader.wadouri.loadImage(imageIdsToPrefetch[i]).promise)
+      if (taskPromises.length >= 6 || i === imageIdsToPrefetch.length - 1) {
+        await Promise.all(taskPromises)
+        taskPromises = []
+      }
+    }
+    resolve()
+  })  
 }
 
 function getFrameInformation(imageId) {

From 91fee13101a93ddb968b4904580bda61ebbd6ea7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 13:58:19 +0800
Subject: [PATCH 074/374] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/js/getModalityUnit.js       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getModalityUnit.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getModalityUnit.js
index b99cd059..adbe5589 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getModalityUnit.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/getModalityUnit.js
@@ -15,7 +15,6 @@ function getModalityUnit(
 }
 
 function _handlePTModality(imageId, options) {
-  console.log(imageId, options)
   if (!options.isPreScaled) {
     return 'raw'
   }

From d42bb57ee44453d1085351607081cdc772cacd43 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 14:03:38 +0800
Subject: [PATCH 075/374] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/js/convertMultiframeImageIds.js    | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js
index 2ad747e9..4d0b3f92 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/convertMultiframeImageIds.js
@@ -1,7 +1,5 @@
 import { metaData } from '@cornerstonejs/core'
 import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
-var imageIds = [] 
-const maxRequest = 5
 /**
  * preloads imageIds metadata in memory
  **/

From a048167ab0adeb9c214ce5b09b4737d54c2f25af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 6 Mar 2024 14:19:03 +0800
Subject: [PATCH 076/374] 1

---
 src/api/trials.js                             |   8 +
 .../components/CriterionDictionary.vue        |   8 +-
 .../template/components/CriterionsTmp.vue     |   2 +-
 src/views/system/login-log/index.vue          |   3 -
 src/views/trials/trials-list/index.vue        |  12 +
 .../enrolled-reviewers/list/index.vue         |  82 ++++++-
 .../components/ReaderRulesForm.vue            |   9 +-
 .../reading/consistency-analysis/index.vue    |  19 +-
 .../medical-audit/components/DefaultQS.vue    |  70 +++---
 .../setting/medical-audit/index.vue           | 116 +++++-----
 src/views/trials/trials-workbench/index.vue   | 209 ++++--------------
 11 files changed, 266 insertions(+), 272 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index a2850c76..5f7674b2 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3558,3 +3558,11 @@ export function resetAndAsyncCriterion(param) {
     data: param
   })
 }
+
+export function batchSetCriterionJoinJoinAnalysis(param) {
+  return request({
+    url: `/DoctorWorkload/batchSetCriterionJoinJoinAnalysis`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/views/dictionary/template/components/CriterionDictionary.vue b/src/views/dictionary/template/components/CriterionDictionary.vue
index 42b35fbd..a2cbdc69 100644
--- a/src/views/dictionary/template/components/CriterionDictionary.vue
+++ b/src/views/dictionary/template/components/CriterionDictionary.vue
@@ -7,6 +7,7 @@
         <el-button
           size="mini"
           type="primary"
+          :disabled="isCompleteConfig"
           @click="handleAdd"
           style="margin-right: 10px;"
         >
@@ -59,12 +60,13 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-button size="small" type="primary" @click="openChildren(scope.row)">
+          <el-button size="small" :disabled="isCompleteConfig" type="primary" @click="openChildren(scope.row)">
             配置
           </el-button>
           <el-button
             type="danger"
             size="small"
+            :disabled="isCompleteConfig"
             @click="handleDelete(scope.row)"
           >
             删除
@@ -151,6 +153,10 @@ export default {
     criterionId: {
       type: String,
       required: true
+    },
+    isCompleteConfig: {
+      type: Boolean,
+      required: true
     }
   },
   components: {
diff --git a/src/views/dictionary/template/components/CriterionsTmp.vue b/src/views/dictionary/template/components/CriterionsTmp.vue
index e4324074..f75e41d8 100644
--- a/src/views/dictionary/template/components/CriterionsTmp.vue
+++ b/src/views/dictionary/template/components/CriterionsTmp.vue
@@ -83,7 +83,6 @@
           <el-button
             type="primary"
             size="mini"
-            :disabled="scope.row.IsCompleteConfig"
             @click="handleEdit(scope.row)"
           >
             编辑
@@ -192,6 +191,7 @@ export default {
       addDialog: { title: '', visible: false }
     }
   },
+
   mounted() {
     this.getList()
   },
diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index ddc69ffc..2e577714 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -118,7 +118,6 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="操作用户名"
           :label="$t('system:loginLog:table:OptUserName')"
           prop="OptUserName"
           min-width="90"
@@ -126,7 +125,6 @@
           show-overflow-tooltip
         />
         <el-table-column
-          label="操作用户类型"
           :label="$t('system:loginLog:table:OptUserType')"
           prop="OptUserTypeEnum"
           min-width="90"
@@ -138,7 +136,6 @@
           </template>
         </el-table-column>
         <el-table-column
-          label="创建时间"
           :label="$t('system:loginLog:table:CreateTime')"
           prop="CreateTime"
           min-width="90"
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 319f9b29..c78ce455 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -377,6 +377,18 @@
           sortable="custom"
           width="160"
         />
+        <el-table-column
+          v-if="hasPermi(['role:ir'])"
+          prop="IR_ReadingCriterionList"
+          :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
+          show-overflow-tooltip
+          sortable="custom"
+          width="160"
+        >
+          <template slot-scope="scope">
+            {{scope.row.IR_ReadingCriterionList.join(', ')}}
+          </template>
+        </el-table-column>
         <el-table-column
           v-if="hasPermi(['role:ir'])"
           prop="IR_UrgentCount"
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index fca6f057..e91be49d 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -110,6 +110,22 @@
               </el-button>
             </template>
           </el-table-column>
+          <el-table-column
+            :label="$t('trials:enrolledReviews:table:consistency-analysis')"
+            width="160"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <el-switch
+                v-model="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"
+                :active-value="true"
+                :inactive-value="false"
+                @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
+              />
+              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis">{{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
+              <span v-else>{{$fd('YesOrNo',false)}}</span>
+            </template>
+          </el-table-column>
           <el-table-column
             :label="$t('trials:enrolledReviews:message:SOW')"
             width="160"
@@ -348,7 +364,8 @@ import {
   deleteReviewerAckSOW,
   updateReviewerReadingType,
   enrollBackOrOut,
-  setEnrollReadingCategory
+  setEnrollReadingCategory,
+  batchSetCriterionJoinJoinAnalysis
 } from '@/api/trials'
 import { addDoctorCriterionFile } from '@/api/reviewers'
 import { uploadFile } from '@/api/attachment'
@@ -438,6 +455,47 @@ export default {
     this.initPage()
   },
   methods: {
+    isConsistencyChange(row, ite, value, showMessage) {
+      this.batchSetCriterionJoinJoinAnalysis(row, ite, value, showMessage)
+    },
+    batchSetCriterionJoinJoinAnalysis(row, ite, value, showMessage) {
+      let params
+      if (row.DoctorCriterionStatusList && row.DoctorCriterionStatusList.length > 0) {
+        if (ite) {
+          let item = row.CriterionCategoryList.find(v => v.TrialReadingCriterionId === ite.TrialReadingCriterionId)
+          if (item) {
+            params = [{
+              Id: item.Id,
+              EnrollId: item.EnrollId,
+              TrialReadingCriterionId: item.TrialReadingCriterionId,
+              IsJoinAnalysis: value
+            }]
+          }
+        } else {
+          params = row.DoctorCriterionStatusList.map(v => {
+            return {
+              Id: v.Id,
+              EnrollId: v.EnrollId,
+              TrialReadingCriterionId: v.TrialReadingCriterionId,
+              IsJoinAnalysis: v.IsJoinAnalysis
+            }
+          })
+        }
+      } else {
+        params = row.CriterionCategoryList.map(v => {
+          return {
+            EnrollId: v.EnrollId,
+            TrialReadingCriterionId: v.TrialReadingCriterionId,
+            IsJoinAnalysis: false
+          }
+        })
+      }
+      batchSetCriterionJoinJoinAnalysis(params).then(res => {
+        if (showMessage) {
+          this.$message.success(this.$t('trials:enrolledReviews:message:batchSetCriterionJoinJoinAnalysis1'))
+        }
+      })
+    },
     go(path) {
       window.open(path)
     },
@@ -589,7 +647,27 @@ export default {
       this.listLoading = true
       getTrialEnrollmentWorkloadStats(this.listQuery).then((res) => {
         this.listLoading = false
-        this.list = res.Result.CurrentPageData
+        let resArray = res.Result.CurrentPageData
+        try {
+          resArray.forEach(v => {
+            if (v.DoctorCriterionStatusList && v.DoctorCriterionStatusList.length === 0) {
+              this.isConsistencyChange(v, null,false, false)
+            }
+            v.CriterionCategoryList.forEach(v1 => {
+              let o = v.DoctorCriterionStatusList.find(v2 => {
+                return v2.TrialReadingCriterionId === v1.TrialReadingCriterionId
+              })
+              if (o) {
+                this.$set(v1, 'Id', o.Id)
+                this.$set(v1, 'IsJoinAnalysis', o.IsJoinAnalysis)
+              }
+            })
+            v.DoctorCriterionStatusList.push({})
+          })
+        } catch (e) {
+          console.log(e)
+        }
+        this.list = resArray
         if (this.list.length > 0) {
           this.TrialReadingCriterionList = this.list[0].TrialReadingCriterionList
         }
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
index f53c98ad..35127cb8 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
@@ -103,13 +103,13 @@ export default {
       form: {
         Id: null,
         TrialId: this.$route.query.trialId,
-        PlanSubjectCount: 0,
-        PlanVisitCount: 0,
-        IntervalWeeks: 0,
+        PlanSubjectCount: 10,
+        PlanVisitCount: 3,
+        IntervalWeeks: 3,
         IsHaveReadingPeriod: null,
         IsGenerateGlobalTask: null,
         BlindTrialSiteCode: '',
-        BlindSubjectNumberOfPlaces: 0,
+        BlindSubjectNumberOfPlaces: 3,
         IsEnable: true,
         Note: ''
       },
@@ -156,6 +156,7 @@ export default {
           this.loading = false
           this.btnLoading = false
           this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$emit('close')
           this.$emit('getList')
         }).catch(() => {
           this.loading = false
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 6dbb33c9..05ecd33c 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -825,7 +825,13 @@ export default {
     },
     clickTab(tab, event) {
      this.loading = true
+     this.title = `${this.$t('trials:selftConsistencyAnalysis:button:config')}(${this.trialCriterionList.find(v => v.TrialReadingCriterionId === this.TrialReadingCriterionId).TrialReadingCriterionName})`
      getSelfConsistentDoctorStatList({TrialId: this.trialId, TrialReadingCriterionId: tab.name}).then(res => {
+         if (res.OtherInfo) {
+           this.ReaderRulesFormVisible = false
+         } else {
+           this.ReaderRulesFormVisible = true
+         }
           // this.ReaderRulesFormVisible = false
           // this.DoctorConsistentRuleSubjectTableVisible = false
           this.TaskConsistentRuleList = res.Result
@@ -838,13 +844,20 @@ export default {
         })
     },
     openTaskConsistentRule(IsSelfAnalysis) {
+      if (this.trialCriterionList.length === 0) {
+        this.$alert(this.$t('trials:trials-panel:consistency-analysis:trialCriterionListLength'))
+        return
+      }
       this.loading = true
       if (IsSelfAnalysis) {
         // '配置自身一致性分析规则'
-        this.title = this.$t('trials:selftConsistencyAnalysis:button:config')
-
+        this.title = `${this.$t('trials:selftConsistencyAnalysis:button:config')}(${this.trialCriterionList.find(v => v.TrialReadingCriterionId === this.TrialReadingCriterionId).TrialReadingCriterionName})`
         getSelfConsistentDoctorStatList({TrialId: this.trialId, TrialReadingCriterionId: this.TrialReadingCriterionId}).then(res => {
-          this.ReaderRulesFormVisible = false
+          if (res.OtherInfo) {
+            this.ReaderRulesFormVisible = false
+          } else {
+            this.ReaderRulesFormVisible = true
+          }
           this.DoctorConsistentRuleSubjectTableVisible = false
           this.TaskConsistentRuleList = res.Result
           this.IsSelfAnalysis = IsSelfAnalysis
diff --git a/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQS.vue b/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQS.vue
index 57ed4389..d69d4d4e 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQS.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQS.vue
@@ -19,21 +19,21 @@
           />
         </el-form-item>
         <!-- 语言类型 -->
-        <el-form-item
-          :label="$t('common:title:languageType')"
-        >
-          <el-select
-            v-model="searchData.LanguageType"
-            clearable style="width:120px;"
-          >
-            <el-option
-              v-for="item of $d.LanguageType"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item-->
+<!--          :label="$t('common:title:languageType')"-->
+<!--        >-->
+<!--          <el-select-->
+<!--            v-model="searchData.LanguageType"-->
+<!--            clearable style="width:120px;"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item of $d.LanguageType"-->
+<!--              :key="item.value"-->
+<!--              :value="item.value"-->
+<!--              :label="item.label"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <!-- 类型 -->
         <el-form-item
           :label="$t('trials:medicalFeedbackCfg:title:taskType')"
@@ -109,16 +109,16 @@
         :label="$t('trials:qcCfg:table:questionName')"
         show-overflow-tooltip
       />
-      <!-- 审核问题 -->
-      <el-table-column
-        prop="LanguageType"
-        :label="$t('common:title:languageType')"
-        show-overflow-tooltip
-      >
-        <template slot-scope="scope">
-          {{ $fd('LanguageType', scope.row.LanguageType) }}
-        </template>
-      </el-table-column>
+<!--      &lt;!&ndash; 审核问题 &ndash;&gt;-->
+<!--      <el-table-column-->
+<!--        prop="LanguageType"-->
+<!--        :label="$t('common:title:languageType')"-->
+<!--        show-overflow-tooltip-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{ $fd('LanguageType', scope.row.LanguageType) }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!-- 类型 -->
       <el-table-column
         prop="Type"
@@ -211,16 +211,16 @@
           {{ $fd('YesOrNo', scope.row.IsRequired) }}
         </template>
       </el-table-column>
-      <!-- 启用状态 -->
-      <el-table-column
-        prop="IsEnable"
-        :label="$t('trials:qcCfg:table:isEnable')"
-        min-width="120"
-      >
-        <template slot-scope="scope">
-          {{ $fd('YesOrNo', scope.row.IsEnable) }}
-        </template>
-      </el-table-column>
+<!--      &lt;!&ndash; 启用状态 &ndash;&gt;-->
+<!--      <el-table-column-->
+<!--        prop="IsEnable"-->
+<!--        :label="$t('trials:qcCfg:table:isEnable')"-->
+<!--        min-width="120"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{ $fd('YesOrNo', scope.row.IsEnable) }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
     </el-table>
     <Pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
   </box-content>
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index b93e06d7..d205dfde 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -19,21 +19,21 @@
               />
             </el-form-item>
             <!-- 语言类型 -->
-            <el-form-item
-              :label="$t('common:title:languageType')"
-            >
-              <el-select
-                v-model="searchData.LanguageType"
-                clearable
-              >
-                <el-option
-                  v-for="item of $d.LanguageType"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                />
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item-->
+<!--              :label="$t('common:title:languageType')"-->
+<!--            >-->
+<!--              <el-select-->
+<!--                v-model="searchData.LanguageType"-->
+<!--                clearable-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item of $d.LanguageType"-->
+<!--                  :key="item.value"-->
+<!--                  :value="item.value"-->
+<!--                  :label="item.label"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <!-- 类型 -->
             <el-form-item
               :label="$t('trials:medicalFeedbackCfg:title:taskType')"
@@ -50,21 +50,21 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item
-              :label="$t('trials:qcCfg:table:isEnable')"
-            >
-              <el-select
-                v-model="searchData.IsEnable"
-                clearable
-              >
-                <el-option
-                  v-for="item of $d.YesOrNo"
-                  :key="item.value"
-                  :value="item.value"
-                  :label="item.label"
-                />
-              </el-select>
-            </el-form-item>
+<!--            <el-form-item-->
+<!--              :label="$t('trials:qcCfg:table:isEnable')"-->
+<!--            >-->
+<!--              <el-select-->
+<!--                v-model="searchData.IsEnable"-->
+<!--                clearable-->
+<!--              >-->
+<!--                <el-option-->
+<!--                  v-for="item of $d.YesOrNo"-->
+<!--                  :key="item.value"-->
+<!--                  :value="item.value"-->
+<!--                  :label="item.label"-->
+<!--                />-->
+<!--              </el-select>-->
+<!--            </el-form-item>-->
             <el-form-item
               :label="$t('trials:qcCfg:table:isRequired')"
             >
@@ -112,14 +112,6 @@
               >
                 {{ $t('trials:qcCfg:button:default') }}
               </el-button>
-              <el-button
-                v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
-                type="primary"
-                icon="el-icon-plus"
-                @click="handleBatchDelete"
-              >
-                {{ $t('common:button:batchDelete') }}
-              </el-button>
               <el-button
                 v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
                 type="primary"
@@ -128,6 +120,15 @@
               >
                 {{ $t('trials:qcCfg:button:custom') }}
               </el-button>
+              <el-button
+                v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
+                :disabled="list.length === 0"
+                type="primary"
+                icon="el-icon-delete"
+                @click="handleBatchDelete"
+              >
+                {{ $t('common:button:batchDelete') }}
+              </el-button>
               <el-button
                 v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
                 :disabled="otherInfo.QuestionCount===0"
@@ -164,17 +165,18 @@
             prop="QuestionName"
             :label="$t('trials:MIMqcCfg:table:questionName')"
             show-overflow-tooltip
+            min-width="260"
           />
-          <!-- 审核问题 -->
-          <el-table-column
-            prop="LanguageType"
-            :label="$t('common:title:languageType')"
-            show-overflow-tooltip
-          >
-            <template slot-scope="scope">
-              {{ $fd('LanguageType', scope.row.LanguageType) }}
-            </template>
-          </el-table-column>
+<!--          &lt;!&ndash; 审核问题 &ndash;&gt;-->
+<!--          <el-table-column-->
+<!--            prop="LanguageType"-->
+<!--            :label="$t('common:title:languageType')"-->
+<!--            show-overflow-tooltip-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ $fd('LanguageType', scope.row.LanguageType) }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
           <!-- 类型 -->
           <el-table-column
             prop="Type"
@@ -234,15 +236,15 @@
               {{ $fd('YesOrNo', scope.row.IsRequired) }}
             </template>
           </el-table-column>
-          <!-- 启用状态 -->
-          <el-table-column
-            prop="IsEnable"
-            :label="$t('trials:qcCfg:table:isEnable')"
-          >
-            <template slot-scope="scope">
-              {{ $fd('YesOrNo', scope.row.IsEnable) }}
-            </template>
-          </el-table-column>
+<!--          &lt;!&ndash; 启用状态 &ndash;&gt;-->
+<!--          <el-table-column-->
+<!--            prop="IsEnable"-->
+<!--            :label="$t('trials:qcCfg:table:isEnable')"-->
+<!--          >-->
+<!--            <template slot-scope="scope">-->
+<!--              {{ $fd('YesOrNo', scope.row.IsEnable) }}-->
+<!--            </template>-->
+<!--          </el-table-column>-->
 
           <el-table-column
             v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 52641d85..5c2d7c95 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -5,218 +5,94 @@
     </div>
       <div class="workbench-content" style="height: 100%">
         <div style="height: 100%">
-          <el-tabs style="height: 100%" tab-position="left">
+          <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
             <!-- PM/APM -->
             <!-- 阅片期 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
-                <clinicalDataPM :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
+                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
-
-                <consistencyCheck :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
+                <consistencyCheck v-if="activeName === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 重阅审批 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">
-
-                <RereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="RereadApproval" v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">
+                <RereadApproval v-if="activeName === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 阅片人筛选 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">
-
-                <ReviewerScreen :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ReviewerScreen" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">
+                <ReviewerScreen v-if="activeName === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 中心调研 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">
-
-                <SiteResearch :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="SiteResearch" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">
+                <SiteResearch v-if="activeName === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- SPM/CPM -->
             <!-- 阅片人审批 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">
-
-                <ReviewerApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ReviewerApproval" v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">
+                <ReviewerApproval v-if="activeName === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 重阅审批 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">
-
-                <SpmRereadApproval :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="SpmRereadApproval" v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">
+                <SpmRereadApproval v-if="activeName === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- CRC -->
             <!-- 临床数据录入 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
-
-                <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="clinicalData" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
+                <clinicalData v-if="activeName === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 临床数据确认 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
-
-                <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
+                <clinicalDataConfirm v-if="activeName === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 影像质疑 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
-
-                <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ImageQuestion" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
+                <ImageQuestion v-if="activeName === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 核查质疑 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">
-
-                <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ImageVerification" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">
+                <ImageVerification v-if="activeName === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 影像重传 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">
-
-                <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ImageReupload" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">
+                <ImageReupload v-if="activeName === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 加急影像提交 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">
-
-                <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ImageSubmission" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">
+                <ImageSubmission v-if="activeName === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- IQC -->
             <!-- 影像质控 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">
-
-                <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ImageQualityControl" v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">
+                <ImageQualityControl v-if="activeName === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- QC质疑 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">
-
-                <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="QcQuestion" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">
+                <QcQuestion v-if="activeName === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- IR -->
             <!-- 影像待阅 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">
-
-                <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="ImagesToRead" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">
+                <ImagesToRead v-if="activeName === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 医学反馈 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">
-
-                <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="MedicalFeedback" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">
+                <MedicalFeedback v-if="activeName === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- MIM -->
             <!-- 医学审核 -->
-            <el-tab-pane v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">
-
-                <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane name="MedicalAudit" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">
+                <MedicalAudit v-if="activeName === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 项目签署文件 -->
-            <el-tab-pane  v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
-
-                <NeedSignTrialDoc :is-sign-system-doc="isSignSystemDoc" />
-
+            <el-tab-pane  name="NeedSignTrialDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
+                <NeedSignTrialDoc v-if="activeName === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 系统签署文件 -->
-            <el-tab-pane v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
-
-                <NeedSignSysDoc @refreshStats="refreshStats" />
-
+            <el-tab-pane name="NeedSignSysDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
+                <NeedSignSysDoc v-if="activeName === 'NeedSignSysDoc'" @refreshStats="refreshStats" />
             </el-tab-pane>
           </el-tabs>
         </div>
-
-
-<!--          &lt;!&ndash; SPM/CPM &ndash;&gt;-->
-<!--          &lt;!&ndash; 阅片人审批 &ndash;&gt;-->
-<!--          &lt;!&ndash; 重阅审批 &ndash;&gt;-->
-<!--          &lt;!&ndash; CRC &ndash;&gt;-->
-<!--          &lt;!&ndash; 临床数据录入 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
-<!--          -->
-<!--              <clinicalData :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:clinicalDataEntry'])" class="item">-->
-<!--          -->
-<!--              <clinicalDataConfirm :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 影像质疑 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbench:imageQuestion'])" class="item">-->
-<!--          -->
-<!--              <ImageQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 核查质疑 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageVerification'])" class="item">-->
-<!--          -->
-<!--              <ImageVerification :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 影像重传 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageReupload'])" class="item">-->
-<!--          -->
-<!--              <ImageReupload :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 加急影像提交 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageSubmission'])" class="item">-->
-<!--          -->
-<!--              <ImageSubmission :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; IQC &ndash;&gt;-->
-<!--          &lt;!&ndash; 影像质控 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imageQC'])" class="item">-->
-<!--          -->
-<!--              <ImageQualityControl :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; QC质疑 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:qcQuestion'])" class="item">-->
-<!--          -->
-<!--              <QcQuestion :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; IR &ndash;&gt;-->
-<!--          &lt;!&ndash; 影像待阅 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:imagesToRead'])" class="item">-->
-<!--          -->
-<!--              <ImagesToRead :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; 医学反馈 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalFeedback'])" class="item">-->
-<!--          -->
-<!--              <MedicalFeedback :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          &lt;!&ndash; MIM &ndash;&gt;-->
-<!--          &lt;!&ndash; 医学审核 &ndash;&gt;-->
-<!--          <div v-if="!isSignSystemDoc && hasPermi(['trials:trials-workbenck:medicalAudit'])" class="item">-->
-<!--          -->
-<!--              <MedicalAudit :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          <div v-if="!isSignSystemDoc && !hasPermi(['role:zys'])" class="item">-->
-<!--          -->
-<!--              <NeedSignTrialDoc />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--          <div v-if="isSignSystemDoc || hasPermi(['role:zys'])" class="item">-->
-<!--          -->
-<!--              <NeedSignSysDoc @refreshStats="refreshStats" />-->
-<!--            </el-card>-->
-<!--          </div>-->
-<!--        </div>-->
       </div>
   </div>
 </template>
@@ -253,7 +129,8 @@ export default {
     return {
       isSignSystemDoc: false,
       trialIdList: [],
-      tabList: {}
+      tabList: {},
+      activeName: ''
     }
   },
   mounted() {

From 8c5a364d23817607f26b3edb0b0dae603269bee8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 15:09:33 +0800
Subject: [PATCH 077/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/ChatForm.vue     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index c787a79e..2604f92a 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,13 +11,13 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
+              <template v-if="record.MedicalDialogCloseEnum!== null">
 
                 <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
 
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && !record.Content">
+              <template v-else-if="!record.Content">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
@@ -50,7 +50,7 @@
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Content">
+              <template v-else-if="record.Content">
                 <div>{{ record.Content }}</div>
               </template>
 
@@ -83,7 +83,7 @@
       </div>
     </div>
     <div
-      v-if="otherInfo && !otherInfo.IsClosedDialog && [14, 30].includes(userTypeEnumInt)"
+      v-if="otherInfo && !otherInfo.IsClosedDialog && hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
       class="chat-message"
     >
       <div class="message">

From 10a1238ab5c0e4471cea2dd97533b3a35c7e7d56 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 16:09:24 +0800
Subject: [PATCH 078/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../medical-feedback/components/ChatForm.vue  | 45 +++++++------------
 .../mim-medical-audit/components/ChatForm.vue | 22 ++++-----
 .../components/MedicalAudit.vue               |  2 +-
 .../reading/mim-medical-audit/index.vue       |  6 +--
 4 files changed, 31 insertions(+), 44 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index d6f5def4..a5634ecd 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -11,20 +11,20 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="[14, 30].includes(record.userTypeEnumInt) && record.MedicalDialogCloseEnum!== null">
-
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
                 <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
+
               </template>
-              <template v-else-if="[14, 30].includes(record.userTypeEnumInt) && !record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
-                  <ol>
+                  <ol style="font-weight: bold;">
                     {{ record.Questioning }}
                   </ol>
                 </div>
-                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:5px;">
+                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:10px;">
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg2') }}
                   <ol>
@@ -37,43 +37,31 @@
                     </li>
                   </ol>
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
                     <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
-
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 为高效解决/处理以上全部医学反馈问题，麻烦您在对该阅片任务的评估准确复核后，明确是否认可医学反馈问题及结论。如不认可医学反馈，请逐条准确完整回复不认可的原因，非常感谢。 -->
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="[14, 30].includes(record.userTypeEnumInt) && record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
                 <div>{{ record.Content }}</div>
               </template>
-              <template v-else>
+
+              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
-                  <!-- 是否认可医学反馈： -->
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
-                <div v-if="record.DoctorUserIdeaEnum===2">
-                  <!-- 原因： -->
-                  {{ $t('trials:medicalFeedback:title:reason') }}{{ record.DisagreeReason }}
-                </div>
-                <div v-if="record.IsApplyHeavyReading !== null">
+                <div v-if="record.DoctorUserIdeaEnum===2"> {{ $t('trials:medicalFeedback:title:reason') }}{{ record.DisagreeReason }}</div>
+                <div v-if="record.MedicalDialogCloseEnum!== null">
                   <!-- 是否申请重阅： -->
                   {{ $t('trials:medicalFeedback:title:isRequestReread') }}{{ $fd('YesOrNo', record.IsApplyHeavyReading) }}
                 </div>
-                <!-- <div v-if="record.ImagePath" style="margin-top:5px;">
-                  本次医学审核相关截图（如适用）如下：
-                  <el-button
-                    type="text"
-                    @click="previewImage(record.ImagePath)"
-                  >{{ record.FileName }}</el-button>
-
-                </div> -->
                 <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:5px;">
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg5') }}
@@ -87,12 +75,6 @@
                     </li>
                   </ol>
                 </div>
-                <!-- <div v-if="!!record.IsApplyHeavyReading">
-                  是否复制阅片表单{{ record.IsApplyHeavyReading ? '是' : '否' }}
-                </div>
-                <div v-if="!!record.IsCopyOrigenalForms">
-                  是否复制后续表单{{ record.IsCopyOrigenalForms ? '是' : '否' }}
-                </div> -->
               </template>
             </div>
           </div>
@@ -324,6 +306,9 @@ export default {
           border-bottom: 8px solid transparent;
         }
       }
+      /deep/.el-button--text{
+        color: #d0d0d0;
+      }
     }
   }
   .chat-message{
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 2604f92a..2c7c203a 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -11,21 +11,20 @@
               <span>({{ record.CreateTime }}) </span>
             </p>
             <div class="info-content">
-              <template v-if="record.MedicalDialogCloseEnum!== null">
-
+              <template v-if="[14, 30].includes(record.UserTypeEnumInt) && (record.MedicalDialogCloseEnum!== null || record.Content)">
                 <div>{{ $t('trials:medicalFeedback:title:closeReasonEnum') }}{{ $fd('MedicalDialogCloseEnum',record.MedicalDialogCloseEnum) }}</div>
                 <div v-if="record.Content">{{ $t('trials:medicalFeedback:title:closereasonRemarks') }}{{ record.Content }}</div>
 
               </template>
-              <template v-else-if="!record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt) && record.Questioning">
                 <div>
                   <!-- 您好，根据医学审核反馈，该阅片任务的评估有如下问题需要您确认或澄清： -->
                   {{ $t('trials:medicalFeedback:message:msg1') }}
-                  <ol>
+                  <ol style="font-weight: bold;">
                     {{ record.Questioning }}
                   </ol>
                 </div>
-                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:5px;">
+                <div v-if="record.FileList && record.FileList.length > 0" style="margin-top:10px;">
                   <!-- 本次医学审核相关截图（如适用）如下： -->
                   {{ $t('trials:medicalFeedback:message:msg2') }}
                   <ol>
@@ -38,23 +37,23 @@
                     </li>
                   </ol>
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
                     <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
                 </div>
-                <div style="margin-top:5px;">
+                <div style="margin-top:10px;">
                   <!-- 为高效解决/处理以上全部医学反馈问题，麻烦您在对该阅片任务的评估准确复核后，明确是否认可医学反馈问题及结论。如不认可医学反馈，请逐条准确完整回复不认可的原因，非常感谢。 -->
                   {{ $t('trials:medicalFeedback:message:msg4') }}
                 </div>
               </template>
-              <template v-else-if="record.Content">
+              <template v-else-if="[14, 30].includes(record.UserTypeEnumInt)">
                 <div>{{ record.Content }}</div>
               </template>
 
-              <template v-else>
+              <template v-else-if="[13].includes(record.UserTypeEnumInt)">
                 <div>
                   {{ $t('trials:medicalFeedback:title:isEndorse') }}{{ $fd('MedicalReviewDoctorUserIdea', record.DoctorUserIdeaEnum) }}
                 </div>
@@ -83,7 +82,7 @@
       </div>
     </div>
     <div
-      v-if="otherInfo && !otherInfo.IsClosedDialog && hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
+      v-if="otherInfo && !otherInfo.IsClosedDialog && [14, 30].includes(userTypeEnumInt)"
       class="chat-message"
     >
       <div class="message">
@@ -351,6 +350,9 @@ export default {
           border-bottom: 8px solid transparent;
         }
       }
+      /deep/.el-button--text{
+        color: #d0d0d0;
+      }
     }
   }
   .chat-message{
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index 87af097b..09909152 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -203,7 +203,7 @@ export default {
       var auditIssuesValid = await this.$refs['auditIssues'].validForm()
       var auditConclusionsValid = await this.$refs['auditConclusions'].validForm()
       if (auditIssuesValid && auditConclusionsValid) {
-        this.$confirm('当前审核结论为“有问题”，是否发起质询？', {
+        this.$confirm(this.$t('trials:medicalFeedback:message:launchqc'), {
           type: 'warning',
           distinguishCancelAndClose: true
         })
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index c81714cc..a3c1fc10 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -697,9 +697,9 @@ export default {
         this.currentRow = { ...row }
         this.auditVisible = true
         // 访视任务，打开阅片页面
-        // if (row.ReadingCategory === 1) {
-        //   this.handleViewReadingPage(row)
-        // }
+        if (row.ReadingCategory === 1) {
+          this.handleViewReadingPage(row)
+        }
       } else {
         // '请先确认医学审核问题模板配置！'
         this.$alert(this.$t('trials:medicalFeedback:message:confirmTemplate'), {

From 1154c700c32508035e4794f566b9733436ecaf97 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 16:53:05 +0800
Subject: [PATCH 079/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/MedicalAudit.vue    | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index 09909152..a02eecfc 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -11,7 +11,7 @@
           :row-data="rowData"
         />
       </div>
-      <div>
+      <div style="margin-top:15px;">
         <!-- 审核问题 -->
         <h3>{{ $t('trials:medicalFeedback:title:auditQuestions') }}</h3>
         <Issues
@@ -23,7 +23,7 @@
           :is-send-message="isSendMessage"
         />
       </div>
-      <div>
+      <div style="margin-top:10px;">
         <!-- 结论 -->
         <h3>{{ $t('trials:medicalFeedback:title:conclusions') }}</h3>
         <Conclusions
@@ -313,6 +313,7 @@ export default {
   height: 100%;
   display: flex;
   flex-direction: column;
+  margin-left: 15px;
 
   .medical-audit-content{
     flex: 1;

From 22c9732382caae3075f2ea1fbf562d8c73394618 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 17:12:15 +0800
Subject: [PATCH 080/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=8F=8A=E5=B8=83=E5=B1=80=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionList.vue | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 800d8694..9903667a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -66,7 +66,7 @@
                         <!-- white-space: nowrap;overflow: hidden;text-overflow: ellipsis; -->
 
                         <div style="font-size: 11px;width:210px;height: 30px;display: flex;justify-content: flex-start;flex-wrap: nowrap;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">
-                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`融向${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
+                          <el-tooltip v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'" class="item" effect="dark" :content="`${$t('trials:reading:message:fused')}${item.TableQuestions.Answers[i].SplitOrMergeLesionName}`" placement="bottom">
                             <div v-if="item.TableQuestions.Answers[i].SplitOrMergeType === '1' || item.TableQuestions.Answers[i].SplitOrMergeType === '3'">
                               <span class="login-cycle" />
                             </div>
@@ -163,20 +163,20 @@
       v-loading="merge.loading"
       :visible.sync="merge.visible"
       :close-on-click-modal="false"
-      title="靶病灶融合"
+      :title="$t('trials:reading:lugano:message:merge')"
       width="500px"
     >
       <div class="merge-table">
         <div class="merge-label">
-          <label>当前病灶： </label>
+          <label>{{$t('trials:reading:lugano:label:currentLesion')}}</label>
           <span>{{ mergeInfo.lesionName }}</span>
           <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
         </div>
-        <div class="merge-label"><label>请选择融合病灶： </label></div>
+        <div class="merge-label"><label>{{$t('trials:reading:lugano:label:selectLesion')}}</label></div>
         <el-table
           :data="lesionData"
           style="width: 450px"
-          size="mini"
+          size="small"
           height="200"
           @selection-change="handleSelectionChange"
         >
@@ -186,12 +186,12 @@
           />
           <el-table-column
             prop="OrderMarkName"
-            label="编号"
-            width="80"
+            :label="$t('trials:reading:lugano:label:lesionNumber')"
+            width="100"
           />
           <el-table-column
             prop="Part"
-            label="部位"
+            :label="$t('trials:reading:lugano:label:lesionLocation')"
             min-width="120"
             show-overflow-tooltip
           />
@@ -1393,6 +1393,9 @@ export default {
       color:#ddd;
       font-size: 13px;
       margin-bottom: 10px;
+      span{
+        font-size: 15px;
+      }
     }
   }
 }

From 7308f43f8144cf264d033b8d1bc32f51a0128d96 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 6 Mar 2024 17:16:13 +0800
Subject: [PATCH 081/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionList.vue        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 9903667a..98a0feb3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -1363,10 +1363,10 @@ export default {
     padding:0 10px;
     /deep/.el-table{
       background-color:  #1e1e1e !important;
-      color: #dfdfdf;
+      color: #383838;
     }
     /deep/.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
-      border-bottom: 1px solid #dfdfdf;
+      border-bottom: 1px solid #383838;
     }
     .el-table--border::after, .el-table--group::after, .el-table::before{
       background-color: #1e1e1e;
@@ -1375,6 +1375,7 @@ export default {
         th{
           background-color:  #1e1e1e !important;
           color: #dfdfdf;
+          border-bottom: 1px solid #383838;
         }
       }
     /deep/.el-table__body-wrapper{

From 5acac110b1a61aceb7465d99960c448735d37fe9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 6 Mar 2024 17:29:13 +0800
Subject: [PATCH 082/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  18 +++
 .../DoctorConsistentRuleSubjectTable.vue      |  11 +-
 .../GroupConsistentRuleSubjectTable.vue       |  10 +-
 .../components/ReaderRulesForm.vue            |  21 ++-
 .../components/VirtualCenter.vue              | 138 ++++++++++++++++++
 .../reading/consistency-analysis/index.vue    |  45 +++++-
 6 files changed, 227 insertions(+), 16 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index 5f7674b2..53546b1c 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3566,3 +3566,21 @@ export function batchSetCriterionJoinJoinAnalysis(param) {
     data: param
   })
 }
+
+export function updateTrialVirtualSiteCode(param) {
+  return request({
+    url: `/TaskConsistentRule/updateTrialVirtualSiteCode`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getUpdateVirtualSiteCodeList(param) {
+  return request({
+    url: `/TaskConsistentRule/getUpdateVirtualSiteCodeList?trialId=${param.trialId}`,
+    method: 'get'
+  })
+}
+
+
+
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue
index 1442dbf4..8ee60ed6 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue
@@ -1,7 +1,7 @@
 /* eslint-disable */
 <template>
   <el-form>
-    <div class="base-dialog-body">
+    <div class="base-dialog-body" v-if="!data.IsAutoAllocateGenerateTask">
       <el-table
         v-loading="loading"
         :data="list"
@@ -48,9 +48,11 @@
           </template>
         </el-table-column>
       </el-table>
+
       <!-- 分页组件 -->
       <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
     </div>
+    <div v-else>{{$t('trials:grouptConsistencyAnalysis:message:createRandom')}}</div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item>
         <!-- 取消 -->
@@ -64,7 +66,7 @@
         </el-button>
         <!-- 生成 -->
         <el-button size="small" type="primary" :loading="btnLoading" @click="save">
-          {{$t('trials:grouptConsistencyAnalysis:button:create')}}
+          {{data.IsAutoAllocateGenerateTask ? $t('trials:grouptConsistencyAnalysis:button:createRandom') : $t('trials:grouptConsistencyAnalysis:button:create')}}
         </el-button>
       </el-form-item>
     </div>
@@ -123,7 +125,7 @@ export default {
       this.SelectList = e
     },
     save () {
-      if (this.SelectList.length === 0) {
+      if (this.SelectList.length === 0 && !this.data.IsAutoAllocateGenerateTask) {
         // '请选择要生成的受试者'
         this.$alert(this.$t('trials:grouptConsistencyAnalysis:message:msg1'))
         return
@@ -133,7 +135,8 @@ export default {
       var params = {
         TaskConsistentRuleId: this.searchData.TaskConsistentRuleId,
         SubejctIdList: this.SelectList.map(v => v.SubjectId),
-        DoctorUserId: this.searchData.DoctorUserId
+        DoctorUserId: this.searchData.DoctorUserId,
+        IsAutoAllocateGenerateTask: this.data.IsAutoAllocateGenerateTask
       }
       confirmGenerateSelfConsistentTask(params).then(res => {
         this.loading = false
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index ba3b0399..3ea5348d 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -52,8 +52,11 @@
         >
           {{ $t('common:button:cancel') }}
         </el-button>
+        <el-button size="small" type="primary" :loading="btnLoading" @click="save(true)">
+          {{$t('trials:grouptConsistencyAnalysis:button:RandomCreate')}}
+        </el-button>
         <!-- 生成 -->
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
+        <el-button size="small" type="primary" :loading="btnLoading" @click="save(false)">
           {{$t('trials:grouptConsistencyAnalysis:button:create')}}
         </el-button>
       </el-form-item>
@@ -131,7 +134,7 @@ export default {
     handleSelectChange(e) {
       this.SelectList = e
     },
-    save () {
+    save (IsAutoAllocateGenerateTask) {
       if (this.SelectList.length === 0) {
         // '请选择要生成的受试者'
         this.$alert(this.$t('trials:grouptConsistencyAnalysis:message:msg1'))
@@ -141,7 +144,8 @@ export default {
       this.loading = true
       var params = {
         TrialId: this.$route.query.trialId,
-        SubejctIdList: this.SelectList.map(v => v.SubjectId)
+        SubejctIdList: this.SelectList.map(v => v.SubjectId),
+        IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask
       }
       confirmGenerateGroupConsistentTask(params).then(res => {
         this.loading = false
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
index 35127cb8..4c429e70 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
@@ -29,7 +29,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" :disabled="isDisable" />
+        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" disabled />
       </el-form-item>
       <!-- 虚拟受试者位数 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
@@ -73,6 +73,18 @@ export default {
         return ''
       }
     },
+    OtherInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    },
+    trialCriterionList: {
+      type: Array,
+      default() {
+        return []
+      }
+    },
     data: {
       type: Object,
       default() {
@@ -142,7 +154,14 @@ export default {
       }).then(res => {
         if (res.Result) {
           this.form = res.Result
+        } else {
+          let o = this.trialCriterionList.find(v => {
+            return v.TrialReadingCriterionId === this.TrialReadingCriterionId
+          })
+          this.form.IsHaveReadingPeriod = o.IsReadingPeriod
+          this.form.IsGenerateGlobalTask = o.IsReadingPeriod
         }
+        this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode
       })
     },
     save() {
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
new file mode 100644
index 00000000..a3ebcedb
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -0,0 +1,138 @@
+/* eslint-disable */
+<template>
+  <el-form
+    ref="taskAllocationRuleDataForm"
+    v-loading="loading"
+    :model="form"
+    size="small"
+    :rules="rules"
+    label-width="170px"
+  >
+    <div class="base-dialog-body" style="position: relative;padding-top: 50px">
+      <el-button @click="openSiteCodeHistory" type="text" style="position: absolute;right: 10px;top: 10px;">{{$t('trials:consistencyAnalysisRule:table:SiteCodeHistory')}}</el-button>
+      <!-- 访视数 -->
+      <el-form-item :label="$t('trials:consistencyAnalysisRule:table:nowSiteCode')">
+        {{ OtherInfo.VitrualSiteCode }}
+      </el-form-item>
+      <!-- 虚拟中心编号 -->
+      <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="VirtualSiteCode">
+        <el-input v-model="form.VirtualSiteCode" style="width: 140px;" />
+      </el-form-item>
+    </div>
+    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <el-form-item>
+        <!-- 取消 -->
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="close"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </el-form-item>
+    </div>
+    <el-dialog
+      v-if="isSiteCodeHistory"
+      :title="$t('trials:consistencyAnalysis:dialog:isSiteCodeHistory')"
+      :visible.sync="isSiteCodeHistory"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper"
+    >
+      <el-table
+        v-loading="loading"
+        :data="list"
+        stripe
+        min-height="300"
+      >
+        <el-table-column
+          show-overflow-tooltip
+          width="80"
+        >
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="VirtualSiteCode"
+          :label="$t('trials:consistencyAnalysis:siteTable:VirtualSiteCode')"
+          show-overflow-tooltip
+          min-width="120"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="Creatime"
+          :label="$t('trials:consistencyAnalysis:siteTable:Creatime')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </el-form>
+</template>
+<script>
+import { updateTrialVirtualSiteCode, getUpdateVirtualSiteCodeList } from '@/api/trials'
+
+export default {
+  name: 'VirtualCenter',
+  props: {
+    OtherInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      form: {
+        TrialId: this.$route.query.trialId,
+        VirtualSiteCode: '',
+      },
+      rules: {
+        VirtualSiteCode: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+      },
+      loading: false,
+      btnLoading: false,
+      isSiteCodeHistory: false,
+      list: []
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    openSiteCodeHistory() {
+      this.isSiteCodeHistory = true
+      getUpdateVirtualSiteCodeList({
+        trialId: this.$route.query.trialId
+      }).then(res => {
+        this.list = res.Result
+      })
+    },
+    save() {
+      this.$refs.taskAllocationRuleDataForm.validate(valid => {
+        if (!valid) return
+        this.btnLoading = true
+        this.loading = true
+        updateTrialVirtualSiteCode(this.form).then(res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.btnLoading = false
+          this.loading = false
+          this.$emit('getList')
+          this.$emit('close')
+        })
+      })
+    },
+    close() { this.$emit('close') }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 05ecd33c..d2d5b496 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -107,6 +107,10 @@
           <el-button type="primary" v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])" @click="openTaskConsistentRule(false)">
             {{$t('trials:consistencyAnalysis:button:group')}}
           </el-button>
+          <!-- 虚拟中心编号 -->
+          <el-button type="primary" v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])" @click="openSite()">
+            {{$t('trials:consistencyAnalysis:button:site')}}
+          </el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -482,7 +486,14 @@
                       circle
                       icon="el-icon-s-check"
                       :title="$t('trials:selftConsistencyAnalysis:button:select')"
-                      @click="openDoctorConsistentRuleSubjectTable(scope.row)"
+                      @click="openDoctorConsistentRuleSubjectTable(scope.row, false)"
+                    />
+                    <!-- 选择 -->
+                    <el-button
+                      circle
+                      icon="el-icon-connection"
+                      :title="$t('trials:grouptConsistencyAnalysis:button:RandomCreate')"
+                      @click="openDoctorConsistentRuleSubjectTable(scope.row, true)"
                     />
                   </template>
                 </el-table-column>
@@ -514,7 +525,7 @@
               <!-- 配置组间一致性分析规则 -->
               {{$t('trials:grouptConsistencyAnalysis:button:config')}}
             </el-button>
-            <GroupConsistentRuleSubjectTable :TrialReadingCriterionId="item.TrialReadingCriterionId"
+            <GroupConsistentRuleSubjectTable v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
             :ref="`GroupConsistentRuleSubjectTable${item.TrialReadingCriterionId}`" style="margin-top: 40px" :IsSelfAnalysis="IsSelfAnalysis" :changeNum="changeNum" @close="() => {ReaderRulesVisible2 = false; ; rowData = {}}" @getList="getList()" />
           </el-tab-pane>
         </el-tabs>
@@ -526,19 +537,31 @@
         width="480px"
         :close-on-click-modal="false"
       >
-        <ReaderRulesForm :isDisable="isDisable" :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :select-list="SelectList" :doctor-user-list="DoctorUserList" :is-self-analysis="IsSelfAnalysis" @close="() => {ReaderRulesFormVisible = false; rowData = {}}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
+        <ReaderRulesForm :other-info="OtherInfo" :isDisable="isDisable" :trial-criterion-list="trialCriterionList" :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :select-list="SelectList" :doctor-user-list="DoctorUserList" :is-self-analysis="IsSelfAnalysis" @close="() => {ReaderRulesFormVisible = false; rowData = {}}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
       </el-dialog>
       <!-- 选择受试者 -->
       <el-dialog
         v-if="DoctorConsistentRuleSubjectTableVisible"
-        :title="$t('trials:consistencyAnalysis:dialog:selectSubject')"
+        :title="rowData.IsAutoAllocateGenerateTask ? $t('trials:consistencyAnalysis:dialog:selectSubjectRandom') : $t('trials:consistencyAnalysis:dialog:selectSubject')"
         :visible.sync="DoctorConsistentRuleSubjectTableVisible"
-        width="1000px"
+        :width="rowData.IsAutoAllocateGenerateTask ? '400px' : '1000px'"
         :close-on-click-modal="false"
       >
         <DoctorConsistentRuleSubjectTable :data="rowData" @close="() => {DoctorConsistentRuleSubjectTableVisible = false; ; rowData = {}}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
       </el-dialog>
       <!-- 申请重阅 -->
+
+      <el-dialog
+        v-if="isOpenSite"
+        :title="$t('trials:consistencyAnalysis:dialog:isOpenSite')"
+        :visible.sync="isOpenSite"
+        width="600px"
+        append-to-body
+        :close-on-click-modal="false"
+        custom-class="base-dialog-wrapper"
+      >
+        <VirtualCenter :other-info="OtherInfo" @getList="getList" @close="isOpenSite=false"></VirtualCenter>
+      </el-dialog>
       <el-dialog
         v-if="ApplyforReasonVisible"
         :title="$t('trials:consistencyAnalysis:dialog:applyReread')"
@@ -605,6 +628,7 @@ import { getSelfAnalysisTaskList_Export, getGroupAnalysisTaskList_Export } from
 import ReaderRulesForm from './components/ReaderRulesForm'
 import DoctorConsistentRuleSubjectTable from './components/DoctorConsistentRuleSubjectTable'
 import GroupConsistentRuleSubjectTable from './components/GroupConsistentRuleSubjectTable'
+import VirtualCenter from './components/VirtualCenter'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
@@ -632,7 +656,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, ReaderRulesForm, DoctorConsistentRuleSubjectTable, GroupConsistentRuleSubjectTable },
+  components: { BaseContainer, Pagination, ReaderRulesForm, DoctorConsistentRuleSubjectTable, GroupConsistentRuleSubjectTable, VirtualCenter },
   data() {
     return {
       TrialReadingCriterionId: null,
@@ -670,7 +694,8 @@ export default {
         RequestReReadingReason: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
       },
       changeNum: 0,
-      openWindow:null
+      openWindow:null,
+      isOpenSite: false
     }
   },
   mounted() {
@@ -685,6 +710,9 @@ export default {
     }
   },
   methods: {
+    openSite() {
+      this.isOpenSite = true
+    },
     handleExport(type) {
       if (!this.searchData.TrialReadingCriterionId) {
         this.$alert(this.$t('trials:consistencyAnalysis:message:selectCriterion'))//'请先选择阅片标准'
@@ -794,9 +822,10 @@ export default {
       this.rowData = {...row}
       this.ReaderRulesFormVisible = true
     },
-    openDoctorConsistentRuleSubjectTable(row) {
+    openDoctorConsistentRuleSubjectTable(row, IsAutoAllocateGenerateTask) {
       this.rowData = {...row}
       this.DoctorConsistentRuleSubjectTableVisible = true
+      this.rowData.IsAutoAllocateGenerateTask = IsAutoAllocateGenerateTask
     },
     addReaderRulesForm(isg) {
       this.isDisable = false

From 644cca6d0f16646b11296f97c12e64c748838e0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 6 Mar 2024 17:50:50 +0800
Subject: [PATCH 083/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/consistency-analysis/index.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index d2d5b496..e2edba42 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -104,7 +104,7 @@
             {{$t('trials:consistencyAnalysis:button:self')}}
           </el-button>
           <!-- 组间一致性分析 -->
-          <el-button type="primary" v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])" @click="openTaskConsistentRule(false)">
+          <el-button :disabled="!OtherInfo.IsHaveDoubleReadCriterion" type="primary" v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])" @click="openTaskConsistentRule(false)">
             {{$t('trials:consistencyAnalysis:button:group')}}
           </el-button>
           <!-- 虚拟中心编号 -->

From bd0f07aaede17349e821f810f2b0356595e28688 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 10:08:38 +0800
Subject: [PATCH 084/374] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=88=AA=E6=AD=A2=E8=AE=BF=E8=A7=86=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/global-review/index.vue     | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index fd7bf318..a8d509f2 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -100,6 +100,12 @@
           show-overflow-tooltip
           width="200"
         />
+        <el-table-column
+          prop="VisitName"
+          :label="$t('trials:globalReview:table:cutOffVisitName')"
+          show-overflow-tooltip
+          width="200"
+        />
         <el-table-column
           :label="$t('common:action:action')"
           width="200"

From 265f8771f5c158bf517c298d5e35dd635f997cd2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 11:25:54 +0800
Subject: [PATCH 085/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                                     |  8 ++++++++
 .../reading/dicoms/components/Fusion/Questions.vue    |  9 +++++++--
 .../dicoms/components/Fusion/TableQuestionItem.vue    | 11 ++++++-----
 3 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 53546b1c..b6b4fa94 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3583,4 +3583,12 @@ export function getUpdateVirtualSiteCodeList(param) {
 }
 
 
+export function getReadingCalculationData(param) {
+  return request({
+    url: `/ReadingImageTask/getReadingCalculationData`,
+    method: 'post',
+    data: param
+  })
+}
+
 
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 1b6eabbc..8df03bba 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -35,7 +35,7 @@
 
 <script>
 
-import { saveImageQuality, getDicomReadingQuestionAnswer } from '@/api/trials'
+import { saveImageQuality, getDicomReadingQuestionAnswer,getReadingCalculationData } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
 import FusionEvent from './FusionEvent'
@@ -63,7 +63,8 @@ export default {
       questionFormChangeState: false,
       questionFormChangeNum: 0,
       lungIsInsideVolume: true,
-      liverIsInsideVolume: true
+      liverIsInsideVolume: true,
+      uptakeFromBaselineId:''
     }
   },
   computed: {
@@ -190,6 +191,10 @@ export default {
             // 修改PET 5PS评分备注
             this.pet5PSCommentsId = i.Id
           }
+          if (i.QuestionType === 56) {
+            // 与基线相比摄取值变化
+            this.uptakeFromBaselineId = i.Id
+          }
           if (i.Childrens && i.Childrens.length > 0) {
             this.setChild(i.Childrens)
           }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 78032cc5..58a7c963 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -724,7 +724,6 @@ export default {
       return new Blob([bytesCode], { type: imgtype })
     },
     handleSave() {
-      console.log('handleSave')
       this.$refs.measurementForm.validate(async valid => {
         if (!valid) return
         const loading = this.$loading({ fullscreen: true })
@@ -733,7 +732,8 @@ export default {
           //   callback: action => {}
           // })
           loading.close()
-          this.$confirm(this.$t('当前标记在图像外，不允许保存！'), {
+          // 当前标记在图像外，不允许保存！
+          this.$confirm(this.$t('trials:reading:lugano:warnning:outsideVolume'), {
             type: 'warning',
             showCancelButton: false,
             callback: action => {}
@@ -743,11 +743,11 @@ export default {
         }
         // 消失、无法评估状态的病灶限制不能测量SUV值
         var lesionState = this.getQuestionVal(7)
-        console.log(lesionState)
         lesionState = parseInt(lesionState)
         if ((lesionState === 2 || lesionState === 3) && this.questionForm.OtherMeasureData) {
           loading.close()
-          this.$confirm(this.$t('评估状态为无法评估或消失的病灶不能测量SUV值！'), {
+          // 评估状态为无法评估或消失的病灶不能测量SUV值！
+          this.$confirm(this.$t('trials:reading:lugano:warnning:cannotMeasuredSUV'), {
             type: 'warning',
             showCancelButton: false,
             callback: action => {}
@@ -759,7 +759,8 @@ export default {
           var suvmax = this.getQuestionVal(20)
           if (suvmax === 0) {
             loading.close()
-            this.$confirm(this.$t('当前病灶suv测量值为0，不允许保存！'), {
+            // 当前病灶suv测量值为0，不允许保存！
+            this.$confirm(this.$t('trials:reading:lugano:warnning:suvis0'), {
               type: 'warning',
               showCancelButton: false,
               callback: action => {}

From ef4fab35b4b43b072f295e37cce3ba019471e83c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 13:34:00 +0800
Subject: [PATCH 086/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=B7=B3=E8=BF=87=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/MedicalAudit.vue                  | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
index a02eecfc..6b705504 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/MedicalAudit.vue
@@ -220,20 +220,8 @@ export default {
     },
     // 获取下一任务
     getNextTask() {
-      this.loading = true
-      this.$refs['auditIssues'].save().then(auditIssuesRes => {
-        if (!auditIssuesRes) {
-          this.disPatchNextTask(false)
-        } else {
-          this.$refs['auditConclusions'].save().then(auditConclusionsRes => {
-            this.disPatchNextTask(!!(auditIssuesRes && auditConclusionsRes))
-          }).catch(_ => {
-            this.loading = false
-          })
-        }
-      }).catch(_ => {
-        this.loading = false
-      })
+      this.disPatchNextTask(this.auditInfo.AuditState >= 2)
+
     },
     disPatchNextTask(isComplete) {
       // '是否确认进入下一个医学审核任务？' : '当前医学审核任务未完成，是否确认进入下一个医学审核任务？'

From c34146ae7609ab031f5255754b15fed122462b96 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 13:37:29 +0800
Subject: [PATCH 087/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=AD=BE=E5=90=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/mim-medical-audit/index.vue  | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index a3c1fc10..c1cd0576 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -661,7 +661,10 @@ export default {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.$refs['signForm'].btnLoading = false
           this.signVisible = false
-          this.chatForm.visible = false
+          this.$nextTick(()=>{
+            this.chatForm.visible = false
+          })
+          
         }
         this.loading = false
         this.getList()

From 84ada9bc737ff5447ecf951993b304cc1da71087 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 7 Mar 2024 13:46:18 +0800
Subject: [PATCH 088/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |   9 ++
 .../components/DefaultQsLang.vue              | 147 ++++++++++++++++++
 .../setting/medical-audit/index.vue           |  11 +-
 3 files changed, 161 insertions(+), 6 deletions(-)
 create mode 100644 src/views/trials/trials-panel/setting/medical-audit/components/DefaultQsLang.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index 53546b1c..f7d96845 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3582,5 +3582,14 @@ export function getUpdateVirtualSiteCodeList(param) {
   })
 }
 
+export function addDefaultQuestions(param) {
+  return request({
+    url: `/ReadingMedicineQuestion/addDefaultQuestions`,
+    method: 'post',
+    data: param
+  })
+}
+
+
 
 
diff --git a/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQsLang.vue b/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQsLang.vue
new file mode 100644
index 00000000..37359397
--- /dev/null
+++ b/src/views/trials/trials-panel/setting/medical-audit/components/DefaultQsLang.vue
@@ -0,0 +1,147 @@
+/* eslint-disable */
+<template>
+  <el-form
+    ref="taskAllocationRuleDataForm"
+    v-loading="loading"
+    :model="form"
+    size="small"
+    :rules="rules"
+    label-width="170px"
+  >
+    <!-- 访视数 -->
+    <el-form-item  :label="$t('trials:medicalAuditSetting:label:DefaultQSLang')" prop="LanguageType">
+      <el-radio-group
+        v-model="form.LanguageType"
+      >
+        <el-radio :label="0">
+          中文
+        </el-radio>
+        <el-radio :label="1">
+          English
+        </el-radio>
+      </el-radio-group>
+    </el-form-item>
+    <div v-if="otherInfo.LanguageType === null"></div>
+    <div v-else-if="otherInfo.LanguageType === form.LanguageType" style="color:#f66;font-size: 12px;padding-left: 170px;"><span class="el-icon-warning"></span>{{ $t('trials:medicalAuditSetting:tap:message1') }}</div>
+    <div v-else style="color:#f66;font-size: 12px;padding-left: 170px;"><span class="el-icon-warning"></span>{{ $t('trials:medicalAuditSetting:tap:message2') }}</div>
+    <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
+      <el-form-item>
+        <!-- 取消 -->
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="close"
+        >
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <!-- 保存 -->
+        <el-button size="small" type="primary" :loading="btnLoading" @click="save">
+          {{ $t('common:button:save') }}
+        </el-button>
+      </el-form-item>
+    </div>
+    <el-dialog
+      v-if="isSiteCodeHistory"
+      :title="$t('trials:consistencyAnalysis:dialog:isSiteCodeHistory')"
+      :visible.sync="isSiteCodeHistory"
+      width="800px"
+      append-to-body
+      :close-on-click-modal="false"
+      custom-class="base-dialog-wrapper"
+    >
+      <el-table
+        v-loading="loading"
+        :data="list"
+        stripe
+        min-height="300"
+      >
+        <el-table-column
+          show-overflow-tooltip
+          width="80"
+        >
+          <template slot-scope="scope">
+            {{scope.$index + 1}}
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="VirtualSiteCode"
+          :label="$t('trials:consistencyAnalysis:siteTable:VirtualSiteCode')"
+          show-overflow-tooltip
+          min-width="120"
+        >
+        </el-table-column>
+        <el-table-column
+          prop="Creatime"
+          :label="$t('trials:consistencyAnalysis:siteTable:Creatime')"
+          show-overflow-tooltip
+          sortable="custom"
+        >
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </el-form>
+</template>
+<script>
+import { addDefaultQuestions } from '@/api/trials'
+
+export default {
+  name: 'VirtualCenter',
+  props: {
+    trialReadingCriterionId: {
+      type: String,
+      default() {
+        return ''
+      }
+    },
+    otherInfo: {
+      type: Object,
+      default() {
+        return {}
+      }
+    }
+  },
+  data() {
+    return {
+      form: {
+        TrialId: this.$route.query.trialId,
+        TrialReadingCriterionId: this.trialReadingCriterionId,
+        LanguageType: 0
+      },
+      rules: {
+        LanguageType: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+      },
+      loading: false,
+      btnLoading: false,
+      isSiteCodeHistory: false,
+      list: []
+    }
+  },
+  mounted() {
+    if (this.otherInfo.LanguageType === null) {
+      this.form.LanguageType = this.$i18n.locale === 'zh' ? 0 : 1
+    } else {
+      this.form.LanguageType = this.otherInfo.LanguageType
+    }
+  },
+  methods: {
+    save() {
+      this.$refs.taskAllocationRuleDataForm.validate(valid => {
+        if (!valid) return
+        this.btnLoading = true
+        this.loading = true
+        addDefaultQuestions(this.form).then(res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.btnLoading = false
+          this.loading = false
+          this.$emit('getList')
+          this.$emit('close')
+        })
+      })
+    },
+    close() { this.$emit('close') }
+  }
+}
+</script>
+<style lang="scss" scoped>
+</style>
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index d205dfde..eed30070 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -275,14 +275,13 @@
     <el-dialog
       v-if="addVisible"
       :visible.sync="addVisible"
-      width="1200px"
+      width="500px"
       :close-on-click-modal="false"
       custom-class="base-dialog-wrapper"
-      :title="$t('trials:qcCfg:button:default')"
+      :title="$t('trials:mimCfg:title:addDefault')"
     >
-      <div class="base-dialog-body">
-        <DefaultQS :trial-reading-criterion-id="trialReadingCriterionId" :current-criterion-type="CurrentCriterionType" @getList="getList" @close="addVisible = false" />
-      </div>
+<!--        <DefaultQS :trial-reading-criterion-id="trialReadingCriterionId" :current-criterion-type="CurrentCriterionType" @getList="getList" @close="addVisible = false" />-->
+        <DefaultQS :other-info="otherInfo" :trial-reading-criterion-id="trialReadingCriterionId" @getList="getList" @close="addVisible = false" />
     </el-dialog>
 
     <!-- 新增/编辑问题 -->
@@ -343,7 +342,7 @@
 import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
-import DefaultQS from './components/DefaultQS'
+import DefaultQS from './components/DefaultQsLang'
 import QSForm from './components/QSForm'
 import Pagination from '@/components/Pagination'
 import QuestionsPreview from './components/QuestionsPreview'

From 3fcefdb1f41131af8a2db3ed34b990d9aa202e79 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 7 Mar 2024 15:10:04 +0800
Subject: [PATCH 089/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/consistency-analysis/index.vue    |  2 +-
 .../components/panelCount.vue                 | 32 +++++++++----------
 src/views/trials/trials-workbench/index.vue   | 29 +++++++++++++++--
 3 files changed, 43 insertions(+), 20 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index e2edba42..05f4845c 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -676,7 +676,7 @@ export default {
       DoctorUserList: [],
       btnLoading: false,
       rowData: {},
-      OtherInfo: null,
+      OtherInfo: {},
       title: null,
       SelectList: [],
       TaskConsistentRuleList: [],
diff --git a/src/views/trials/trials-workbench/components/panelCount.vue b/src/views/trials/trials-workbench/components/panelCount.vue
index f763fca0..e6aa9564 100644
--- a/src/views/trials/trials-workbench/components/panelCount.vue
+++ b/src/views/trials/trials-workbench/components/panelCount.vue
@@ -36,22 +36,22 @@
       </div>
     </el-col>
 
-    <el-col :span="6" class="card-panel-col">
-      <div class="card-panel">
-        <div class="card-panel-icon-wrapper icon-monitor">
-          <svg-icon icon-class="monitor" class-name="card-panel-icon" />
-        </div>
-        <div class="card-panel-description">
-          <div class="card-panel-text">
-            <!-- 待办任务 -->
-            {{ $t('trials:workbench:label:pendingTasksStats') }}
-          </div>
-          <div class="card-panel-num">
-            <countTo :start-val="0" :end-val="taskCount" :duration="3000" />
-          </div>
-        </div>
-      </div>
-    </el-col>
+<!--    <el-col :span="6" class="card-panel-col">-->
+<!--      <div class="card-panel">-->
+<!--        <div class="card-panel-icon-wrapper icon-monitor">-->
+<!--          <svg-icon icon-class="monitor" class-name="card-panel-icon" />-->
+<!--        </div>-->
+<!--        <div class="card-panel-description">-->
+<!--          <div class="card-panel-text">-->
+<!--            &lt;!&ndash; 待办任务 &ndash;&gt;-->
+<!--            {{ $t('trials:workbench:label:pendingTasksStats') }}-->
+<!--          </div>-->
+<!--          <div class="card-panel-num">-->
+<!--            <countTo :start-val="0" :end-val="taskCount" :duration="3000" />-->
+<!--          </div>-->
+<!--        </div>-->
+<!--      </div>-->
+<!--    </el-col>-->
 
     <el-col :span="6" class="card-panel-col">
       <div class="card-panel">
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 5c2d7c95..f030f2e0 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -4,7 +4,10 @@
       <PanelCount ref="panelCount" @getSignSystemDocCount="getSignSystemDocCount" />
     </div>
       <div class="workbench-content" style="height: 100%">
-        <div style="height: 100%">
+        <div style="height: 100%;position: relative">
+          <div style="font-size: 20px;position: absolute;line-height: 40px;text-align: right" :style="{width: width + 'px'}">
+            {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
+          </div>
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
             <!-- PM/APM -->
             <!-- 阅片期 -->
@@ -85,7 +88,7 @@
             </el-tab-pane>
             <!-- 项目签署文件 -->
             <el-tab-pane  name="NeedSignTrialDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
-                <NeedSignTrialDoc v-if="activeName === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
+              <NeedSignTrialDoc v-if="activeName === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
             <!-- 系统签署文件 -->
             <el-tab-pane name="NeedSignSysDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
@@ -130,7 +133,8 @@ export default {
       isSignSystemDoc: false,
       trialIdList: [],
       tabList: {},
-      activeName: ''
+      activeName: '',
+      width: 0
     }
   },
   mounted() {
@@ -138,6 +142,9 @@ export default {
     this.getNeedSignTrialDocTrialIdList()
   },
   methods: {
+    tabClick(e) {
+      console.log(e)
+    },
     getSignSystemDocCount(count) {
       this.isSignSystemDoc = count > 0
     },
@@ -148,6 +155,16 @@ export default {
       getNeedSignTrialDocTrialIdList().then(res => {
         console.log(res)
         this.trialIdList = res.Result
+        this.$nextTick(() => {
+          this.width = document.querySelector('.el-tabs__nav-scroll').clientWidth - 75
+          var list = document.querySelectorAll('div[aria-controls]')
+          list.forEach((v, i) => {
+            if (i === 0) {
+              let item = v.getAttribute('aria-controls')
+              this.activeName = item.split('-')[1]
+            }
+          })
+        })
       })
     },
     getUserTobeDoneRecord() {
@@ -161,6 +178,12 @@ export default {
 
 <style lang="scss">
 .workbench-container{
+  .el-tabs__nav{
+    transform: translateY(40px)!important;
+  }
+  .el-tabs__header{
+    position: relative;
+  }
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;

From 2d50b6f3208e94e2bb4049bb418182db22906c76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 7 Mar 2024 15:31:11 +0800
Subject: [PATCH 090/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AEPDF?=
 =?UTF-8?q?=E6=A8=A1=E7=89=88=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadClinicalData.vue                    | 9 +++------
 .../visit/crc-upload/components/uploadClinicalData.vue   | 9 +++------
 src/views/trials/trials-workbench/index.vue              | 1 +
 3 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/components/clinicalDataQuestions/components/uploadClinicalData.vue b/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
index a523a6c8..69ab47d4 100644
--- a/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
+++ b/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
@@ -237,7 +237,7 @@
               icon="el-icon-download"
               size="small"
               :loading="downloadLoading"
-              @click.native.prevent="handleDownloadTpl(cd.ClinicalDataTrialSetId)"
+              @click.native.prevent="handleDownloadTpl(cd)"
             >
               {{ $t('trials:uploadClinicalData:button:downloadTemplate') }}
             </el-button>
@@ -551,11 +551,8 @@ export default {
           })
         })
     },
-    handleDownloadTpl(clinicalDataTrialSetId) {
-      this.downloadLoading = true
-      DownloadTrialClinicalFile(clinicalDataTrialSetId).then(data => {
-        this.downloadLoading = false
-      }).catch(() => { this.downloadLoading = false })
+    handleDownloadTpl(cd) {
+      window.open(this.OSSclientConfig.basePath + cd.Path)
     }
   }
 
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
index f4060040..cfeeba47 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadClinicalData.vue
@@ -234,7 +234,7 @@
               icon="el-icon-download"
               size="small"
               :loading="downloadLoading"
-              @click.native.prevent="handleDownloadTpl(cd.ClinicalDataTrialSetId)"
+              @click.native.prevent="handleDownloadTpl(cd)"
             >
               {{ $t('trials:uploadClinicalData:button:downloadTemplate') }}
             </el-button>
@@ -607,11 +607,8 @@ export default {
             })
         })
     },
-    handleDownloadTpl(clinicalDataTrialSetId) {
-      this.downloadLoading = true
-      DownloadTrialClinicalFile(clinicalDataTrialSetId).then(data => {
-        this.downloadLoading = false
-      }).catch(() => { this.downloadLoading = false })
+    handleDownloadTpl(cd) {
+      window.open(this.OSSclientConfig.basePath + cd.Path)
     }
   }
 
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index f030f2e0..33f826e9 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -150,6 +150,7 @@ export default {
     },
     refreshStats() {
       this.$refs['panelCount'].getData()
+      this.getNeedSignTrialDocTrialIdList()
     },
     getNeedSignTrialDocTrialIdList() {
       getNeedSignTrialDocTrialIdList().then(res => {

From 2aef040a345decbab1106a6bf6bb73308dcb77c2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 17:33:39 +0800
Subject: [PATCH 091/374] =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E7=BA=BF=E7=9B=B8=E6=AF=94=E6=91=84=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore                                 |  2 +-
 .../dicoms/components/Fusion/Questions.vue    | 25 ++++++++++++++++---
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 3ff12bc3..f8cee48b 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ src/utils/*
 public
 dist
 
-src/*
+# src/*
 src/views/trials/trials-panel/visit/*
 src/App.vue
 src/views/trials/trials-panel/reading/global-review/*
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 8df03bba..05af5533 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -35,7 +35,7 @@
 
 <script>
 
-import { saveImageQuality, getDicomReadingQuestionAnswer,getReadingCalculationData } from '@/api/trials'
+import { saveImageQuality, getDicomReadingQuestionAnswer, getReadingCalculationData } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
 import FusionEvent from './FusionEvent'
@@ -64,7 +64,8 @@ export default {
       questionFormChangeNum: 0,
       lungIsInsideVolume: true,
       liverIsInsideVolume: true,
-      uptakeFromBaselineId:''
+      uptakeFromBaselineId: '',
+      baseLinePET5PS: null
     }
   },
   computed: {
@@ -96,7 +97,7 @@ export default {
     this.visitTaskId = this.$route.query.visitTaskId
     this.readingTaskState = parseInt(this.$route.query.readingTaskState)
     this.isBaseLineTask = this.$route.query.isBaseLineTask === 'true'
-    this.initList()
+    this.initPage()
     FusionEvent.$on('refreshQuestions', () => {
       this.initList()
     })
@@ -131,6 +132,15 @@ export default {
         this.questions = questions
       }
     },
+    async initPage() {
+      if (!this.isBaseLineTask) {
+        this.loading = true
+        var res = await getReadingCalculationData({ visitTaskId: this.visitTaskId })
+        this.baseLinePET5PS = res.Result.BaseLinePET5PS
+        this.loading = false
+      }
+      this.initList()
+    },
     initList() {
       this.loading = true
       var params = {
@@ -205,7 +215,8 @@ export default {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
         if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
-          this.$alert('当前标记在图像外，不允许保存！', '提示', {
+          // 当前标记在图像外
+          this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
             callback: action => {
               this.$message({
                 type: 'info',
@@ -435,6 +446,12 @@ export default {
           }
         }
       }
+      // 自动计算与基线相比摄取值变化
+      if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
+        // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
+        // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
+        this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : '2'
+      }
     },
     setpet5PS() {
       console.log('setpet5PS')

From aea1bf16bf0d31c1cbe0cefb224e6ac72f74c7e4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 7 Mar 2024 17:41:20 +0800
Subject: [PATCH 092/374] =?UTF-8?q?lugano=E5=85=A8=E5=B1=80=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E5=88=97=E5=AE=BD=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/global-review/components/LuganoTable.vue          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index f0e0c245..e35ea11a 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -93,7 +93,7 @@
             prop=""
             :label="qs.questionName"
             show-overflow-tooltip
-            :min-width="index === 3 ? '200' : '200'"
+            width="150"
           >
             <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))">
@@ -284,7 +284,7 @@
       </el-table-column>
       <el-table-column
         :label="$t('common:action:action')"
-        width="100"
+        min-width="150"
       >
         <template slot-scope="scope">
           <el-button

From 299995dd09ff4cb6767aa7c32929356834f8e0cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 7 Mar 2024 17:45:15 +0800
Subject: [PATCH 093/374] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E5=8C=BB=E9=99=A2?=
 =?UTF-8?q?=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../institutions/components/HospitalForm.vue  | 11 +++++----
 src/views/system/notice/index.vue             | 24 +++++++++----------
 src/views/trials/trials-workbench/index.vue   | 20 ++++++++--------
 3 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/src/views/dictionary/institutions/components/HospitalForm.vue b/src/views/dictionary/institutions/components/HospitalForm.vue
index 9c5897c7..0452a4f2 100644
--- a/src/views/dictionary/institutions/components/HospitalForm.vue
+++ b/src/views/dictionary/institutions/components/HospitalForm.vue
@@ -8,12 +8,15 @@
     label-width="170px"
   >
     <div class="base-dialog-body">
-      <el-form-item label="Hospital CN: " prop="SiteId">
-        <el-select v-model="form.SiteId" style="width: 100%" filterable @change="siteChange">
+      <el-form-item label="Site: ">
+        <el-select v-model="form.SiteId" style="width: 100%" clearable filterable @change="siteChange">
           <el-option v-for="item of siteList" :value="item.Id" :key="item.Id" :label="item.SiteName">
           </el-option>
         </el-select>
       </el-form-item>
+      <el-form-item label="Hospital CN: " prop="HospitalNameCN">
+        <el-input v-model="form.HospitalNameCN" />
+      </el-form-item>
       <el-form-item label="Hospital EN: " prop="HospitalName">
         <el-input v-model="form.HospitalName" />
       </el-form-item>
@@ -88,9 +91,7 @@ export default {
       },
       siteList: [],
       rules: {
-        SiteId: [{ required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }],
-        HospitalName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+        HospitalNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
         UniversityAffiliated: [{ max: 100, message: 'The maximum length is 100' }],
         UniversityAffiliatedCN: [{ max: 100, message: 'The maximum length is 100' }],
         Country: [{ required: true, message: 'Please specify', trigger: 'blur' },
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index cd9e8131..ae7382e2 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -59,56 +59,56 @@
       </el-form>
       <el-table v-loading="loading" v-adaptive="{bottomOffset:45}" height="100" :data="list" class="table">
         <el-table-column type="index" width="50" />
-        <el-table-column :label="$t('system:notice:table:NoticeLevel')" label="通知级别" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeLevel')" prop="NoticeLevelEnum" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}) ? $d.NoteLevel.find(v => {return v.raw.Code * 1 === scope.row.NoticeLevelEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeType')" label="通知类型" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeType')" prop="NoticeTypeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}) ? $d.NoteType.find(v => {return v.raw.Code * 1 === scope.row.NoticeTypeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeContent')" label="通知内容" prop="NoticeContent" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeContent')" prop="NoticeContent" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeContent }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeState')" label="通知状态" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeState')" prop="NoticeStateEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             <el-tag :type="scope.row.ActualNoticeStateEnum === 0 ? 'info' : scope.row.ActualNoticeStateEnum === 1 ? 'success' : 'danger'">
               {{ $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}) ? $d.NoticeState.find(v => {return v.raw.Code * 1 === scope.row.ActualNoticeStateEnum}).label : '' }}
             </el-tag>
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:ApplicableProject')" label="适用项目" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:ApplicableProject')" prop="ApplicableProjectEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}) ? $d.NoticeApplicableTrial.find(v => {return v.raw.Code * 1 === scope.row.ApplicableProjectEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" label="适用角色" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeUserTypeList')" prop="NoticeUserTypeList" min-width="80" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.NoticeUserTypeList.map(v => v.UserTypeShortName).toString() }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:NoticeMode')" label="提示方式" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:NoticeMode')" prop="NoticeModeEnum" min-width="100" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}) ? $d.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}).label : '' }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:StartDate')" label="保留时长" prop="StartDate" min-width="240" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:StartDate')" prop="StartDate" min-width="240" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.StartDate }}-{{ scope.row.EndDate }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:PublishUserName')" label="发布人" prop="PublishUserName" min-width="100" show-overflow-tooltip />
-        <el-table-column :label="$t('system:notice:table:PublishedTime')" label="发布时间" prop="PublishedTime" min-width="160" show-overflow-tooltip />
-        <el-table-column :label="$t('system:notice:table:UpdateTime')" label="更新时间" prop="UpdateTime" min-width="160" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:PublishUserName')" prop="PublishUserName" min-width="100" show-overflow-tooltip />
+        <el-table-column :label="$t('system:notice:table:PublishedTime')" prop="PublishedTime" min-width="160" show-overflow-tooltip />
+        <el-table-column :label="$t('system:notice:table:UpdateTime')" prop="UpdateTime" min-width="160" show-overflow-tooltip>
           <template slot-scope="scope">
             {{ scope.row.StartDate ? scope.row.StartDate: scope.row.CreateTime }}
           </template>
         </el-table-column>
-        <el-table-column :label="$t('system:notice:table:FileName')" label="附件" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
+        <el-table-column :label="$t('system:notice:table:FileName')" fixed="right" prop="FileName" min-width="120" show-overflow-tooltip>
           <template slot-scope="scope">
             <a :href="OSSclientConfig.basePath + scope.row.FullFilePath" target="_blank" style="color:#428bca">{{ scope.row.FileName }}</a>
           </template>
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 33f826e9..ed5e1ebf 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -11,9 +11,9 @@
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
             <!-- PM/APM -->
             <!-- 阅片期 -->
-            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">
-                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
+<!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
+<!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
             <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
                 <consistencyCheck v-if="activeName === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
             </el-tab-pane>
@@ -40,13 +40,13 @@
             </el-tab-pane>
             <!-- CRC -->
             <!-- 临床数据录入 -->
-            <el-tab-pane name="clinicalData" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">
-                <clinicalData v-if="activeName === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 临床数据确认 -->
-            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">
-                <clinicalDataConfirm v-if="activeName === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
+<!--            <el-tab-pane name="clinicalData" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">-->
+<!--                <clinicalData v-if="activeName === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
+<!--            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">-->
+<!--                <clinicalDataConfirm v-if="activeName === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
             <!-- 影像质疑 -->
             <el-tab-pane name="ImageQuestion" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
                 <ImageQuestion v-if="activeName === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />

From 2dc2383d9df15fc028cad2a26a1557583aa3254c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 8 Mar 2024 09:58:45 +0800
Subject: [PATCH 094/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4=E5=8F=8A=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 185 +++++++++---------
 .../dicoms/components/Lugano/QuestionList.vue |   7 +-
 2 files changed, 96 insertions(+), 96 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 29a52afb..9de839a6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -466,7 +466,7 @@
       width="850px"
     >
 
-      <el-form ref="fusionForm" :model="fusionForm" label-width="80px">
+      <el-form ref="fusionForm" :model="fusionForm">
         <!-- 检查 -->
         <el-form-item
           :label="$t('trials:lugano:fusionDialog:label:study')"
@@ -491,105 +491,104 @@
         <!-- 融合图像 -->
         <el-form-item
           :label="$t('trials:lugano:fusionDialog:label:fusionImages')"
-        >
-          <div style="display: flex;flex-direction: row;justify-content: space-between;margin-top: 10px;" class="series-table">
+        />
+        <div style="display: flex;flex-direction: row;justify-content: space-between;margin-bottom:10px;" class="series-table">
 
-            <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
-              <!-- CT/MRI序列 -->
-              <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ctSeries') }}</h3>
-              <el-table
-                ref="ctSeries"
-                :data="ctSeries"
-                :show-header="false"
-                style="width: 340px"
-                size="mini"
-                height="300"
-                :default-sort="{prop: 'instanceCount', order: 'descending'}"
-                @selection-change="handleCTSelectionChange"
-                @select="handleCTSelect"
+          <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
+            <!-- CT/MRI序列 -->
+            <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ctSeries') }}</h3>
+            <el-table
+              ref="ctSeries"
+              :data="ctSeries"
+              :show-header="false"
+              style="width: 380px"
+              size="mini"
+              height="300"
+              :default-sort="{prop: 'instanceCount', order: 'descending'}"
+              @selection-change="handleCTSelectionChange"
+              @select="handleCTSelect"
+            >
+
+              <el-table-column
+                type="selection"
+                width="30"
+              />
+              <el-table-column
+                label=""
+                width="100"
               >
-
-                <el-table-column
-                  type="selection"
-                  width="30"
-                />
-                <el-table-column
-                  label=""
-                  width="100"
-                >
-                  <template slot-scope="scope">
-                    <el-image
-                      style="width: 60px; height: 60px"
-                      :src="scope.row.previewImageUrl"
-                      fit="fit"
-                      crossorigin="anonymous"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label=""
-                  min-width="50"
-                  show-overflow-tooltip
-                >
-                  <template slot-scope="scope">
-                    <div>#{{ scope.row.seriesNumber }} </div>
-                    <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images  T: {{ parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
-                    <div>{{ scope.row.description }}</div>
-                  </template>
-                </el-table-column>
-
-              </el-table>
-            </div>
-
-            <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
-              <!-- PET序列 -->
-              <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ptSeries') }}</h3>
-              <el-table
-                ref="petSeries"
-                :data="petSeries"
-                :show-header="false"
-                style="width: 340px"
-                size="mini"
-                height="300"
-                @selection-change="handlePTSelectionChange"
-                @select="handlePTSelect"
+                <template slot-scope="scope">
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="scope.row.previewImageUrl"
+                    fit="fit"
+                    crossorigin="anonymous"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                label=""
+                min-width="50"
+                show-overflow-tooltip
               >
-                <el-table-column
-                  type="selection"
-                  width="30"
-                />
-                <el-table-column
-                  label=""
-                  width="100"
-                >
-                  <template slot-scope="scope">
-                    <el-image
-                      style="width: 60px; height: 60px"
-                      :src="scope.row.previewImageUrl"
-                      fit="fit"
-                      crossorigin="anonymous"
-                    />
-                  </template>
-                </el-table-column>
-                <el-table-column
-                  label=""
-                  min-width="50"
-                  show-overflow-tooltip
-                >
-                  <template slot-scope="scope">
-                    <div>#{{ scope.row.seriesNumber }} </div>
-                    <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images  T: {{ parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
-                    <div>{{ scope.row.description }}</div>
-                  </template>
-                </el-table-column>
-              </el-table>
-            </div>
+                <template slot-scope="scope">
+                  <div>#{{ scope.row.seriesNumber }} </div>
+                  <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images  T: {{ parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
+                  <div>{{ scope.row.description }}</div>
+                </template>
+              </el-table-column>
+
+            </el-table>
           </div>
-        </el-form-item>
+
+          <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
+            <!-- PET序列 -->
+            <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ptSeries') }}</h3>
+            <el-table
+              ref="petSeries"
+              :data="petSeries"
+              :show-header="false"
+              style="width: 380px"
+              size="mini"
+              height="300"
+              @selection-change="handlePTSelectionChange"
+              @select="handlePTSelect"
+            >
+              <el-table-column
+                type="selection"
+                width="30"
+              />
+              <el-table-column
+                label=""
+                width="100"
+              >
+                <template slot-scope="scope">
+                  <el-image
+                    style="width: 60px; height: 60px"
+                    :src="scope.row.previewImageUrl"
+                    fit="fit"
+                    crossorigin="anonymous"
+                  />
+                </template>
+              </el-table-column>
+              <el-table-column
+                label=""
+                min-width="50"
+                show-overflow-tooltip
+              >
+                <template slot-scope="scope">
+                  <div>#{{ scope.row.seriesNumber }} </div>
+                  <div>{{ scope.row.modality }}: {{ scope.row.instanceCount }} images  T: {{ parseFloat(scope.row.sliceThickness).toFixed(digitPlaces) }}</div>
+                  <div>{{ scope.row.description }}</div>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+        </div>
         <el-form-item style="text-align:right;">
           <!-- 取消 -->
           <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
-           <!-- 确认 -->
+          <!-- 确认 -->
           <el-button
             type="primary"
             size="mini"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 98a0feb3..e8edf58f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -168,11 +168,11 @@
     >
       <div class="merge-table">
         <div class="merge-label">
-          <label>{{$t('trials:reading:lugano:label:currentLesion')}}</label>
+          <label>{{ $t('trials:reading:lugano:label:currentLesion') }}</label>
           <span>{{ mergeInfo.lesionName }}</span>
           <span style="margin-left:10px">{{ mergeInfo.lesionPart }}</span>
         </div>
-        <div class="merge-label"><label>{{$t('trials:reading:lugano:label:selectLesion')}}</label></div>
+        <div class="merge-label"><label>{{ $t('trials:reading:lugano:label:selectLesion') }}</label></div>
         <el-table
           :data="lesionData"
           style="width: 450px"
@@ -699,7 +699,8 @@ export default {
       })
     },
     confirmMerge() {
-      this.$confirm('融合后将无法撤销, 是否继续?', '提示', {
+    // '融合后将无法撤销, 是否继续?'
+      this.$confirm(this.$t('trials:reading:lugano:warnning:fuse'), {
         type: 'warning'
       }).then(() => {
         this.lesionMerge()

From 25c14bc46311c696a23cce78d4a3abfbe08933a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 10:07:35 +0800
Subject: [PATCH 095/374] AWS

---
 src/views/trials/trials-list/index.vue        | 51 +++++++++----------
 .../components/ManualAllocationTable.vue      | 12 ++---
 .../reading/read-task-allocation/index.vue    |  2 +-
 3 files changed, 32 insertions(+), 33 deletions(-)

diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index c78ce455..853f075d 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -297,22 +297,21 @@
           :label="$t('trials:trials-list:table:experimentName')"
           show-overflow-tooltip
           sortable="custom"
-          min-width="160"
+          min-width="240"
         />
-
         <el-table-column
           prop="Sponsor"
           :label="$t('trials:trials-list:table:sponsor')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="120"
         />
         <el-table-column
           prop="TrialStatusStr"
           :label="$t('trials:trials-list:table:status')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="120"
         >
           <template slot-scope="scope">
             <el-tag v-if="scope.row.TrialStatusStr === 'Initializing'" type="info">{{ $fd('TrialStatusEnum', scope.row.TrialStatusStr) }}</el-tag>
@@ -327,7 +326,7 @@
           :label="$t('trials:trials-list:table:ExpetiedTaskCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="120"
         />
         <el-table-column
           v-if="hasPermi(['role:pm', 'role:apm'])"
@@ -335,7 +334,7 @@
           :label="$t('trials:trials-list:table:ReReadingApprovalCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="180"
+          min-width="180"
         />
         <el-table-column
           v-if="hasPermi(['role:pm', 'role:apm'])"
@@ -343,7 +342,7 @@
           :label="$t('trials:trials-list:table:PendingReconciliationCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="200"
+          min-width="140"
         />
         <el-table-column
           v-if="hasPermi(['role:pm', 'role:apm'])"
@@ -351,7 +350,7 @@
           :label="$t('trials:trials-list:table:PendingResponseCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="180"
+          min-width="140"
         />
         <el-table-column
           v-if="hasPermi(['role:crc', 'role:cra'])"
@@ -359,7 +358,7 @@
           :label="$t('trials:trials-list:table:CRC_UrgentCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:crc', 'role:cra'])"
@@ -367,7 +366,7 @@
           :label="$t('trials:trials-list:table:CRC_QCQuestionCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:crc', 'role:cra'])"
@@ -375,7 +374,7 @@
           :label="$t('trials:trials-list:table:CRC_CheckQuestionCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:ir'])"
@@ -383,7 +382,7 @@
           :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         >
           <template slot-scope="scope">
             {{scope.row.IR_ReadingCriterionList.join(', ')}}
@@ -395,7 +394,7 @@
           :label="$t('trials:trials-list:table:IR_UrgentCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:ir'])"
@@ -403,7 +402,7 @@
           :label="$t('trials:trials-list:table:IR_UnReadCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:ir'])"
@@ -411,7 +410,7 @@
           :label="$t('trials:trials-list:table:IR_TotalReadCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="170"
         />
         <el-table-column
           v-if="hasPermi(['role:ir'])"
@@ -419,7 +418,7 @@
           :label="$t('trials:trials-list:table:IR_PMEmailList')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="170"
         >
           <template slot-scope="scope">
             {{scope.row.IR_PMEmailList.join(', ')}}
@@ -431,7 +430,7 @@
           :label="$t('trials:trials-list:table:IQC_UrgentCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="140"
         />
         <el-table-column
           v-if="hasPermi(['role:iqc'])"
@@ -439,7 +438,7 @@
           :label="$t('trials:trials-list:table:IQC_ToBeClaimedCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="140"
         />
         <el-table-column
           v-if="hasPermi(['role:iqc'])"
@@ -447,7 +446,7 @@
           :label="$t('trials:trials-list:table:IQC_AuditToBeDealedCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="140"
         />
         <el-table-column
           v-if="hasPermi(['role:iqc'])"
@@ -455,7 +454,7 @@
           :label="$t('trials:trials-list:table:IQC_QuestionToBeDealedCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:iqc'])"
@@ -463,7 +462,7 @@
           :label="$t('trials:trials-list:table:MIM_UrgentCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:mim'])"
@@ -471,7 +470,7 @@
           :label="$t('trials:trials-list:table:MIM_UrgentCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:mim'])"
@@ -479,7 +478,7 @@
           :label="$t('trials:trials-list:table:MIM_PendingReviewCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:mim'])"
@@ -487,7 +486,7 @@
           :label="$t('trials:trials-list:table:MIM_PendingResponseCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:spm', 'role:cpm'])"
@@ -495,7 +494,7 @@
           :label="$t('trials:trials-list:table:SPM_ReReadingApprovalCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           v-if="hasPermi(['role:spm', 'role:cpm'])"
@@ -503,7 +502,7 @@
           :label="$t('trials:trials-list:table:SPM_ReviewerSelectApprovalCount')"
           show-overflow-tooltip
           sortable="custom"
-          width="160"
+          min-width="160"
         />
         <el-table-column
           prop="CreateTime"
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue b/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue
index 615edc9d..8375b0c0 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/components/ManualAllocationTable.vue
@@ -70,7 +70,7 @@
     <el-table-column
       prop="PlanSubjectCount"
       :label="$t('trials:reviewAssign:assignReader:table:plannedSubjectCount')"
-      min-width="130"
+      min-width="120"
       show-overflow-tooltip
     >
     </el-table-column>
@@ -78,7 +78,7 @@
     <el-table-column
       prop="AssignedSubjectCount"
       :label="$t('trials:reviewAssign:assignReader:table:assignedSubjectCount')"
-      min-width="140"
+      min-width="120"
       show-overflow-tooltip
     >
     </el-table-column>
@@ -86,7 +86,7 @@
     <el-table-column
       prop="UserName"
       :label="$t('trials:reviewAssign:assignReader:table:readingType')"
-      min-width="260"
+      min-width="280"
       show-overflow-tooltip
     >
       <template slot-scope="scope">
@@ -101,7 +101,7 @@
     <el-table-column
       prop="WaitDealAllTaskCount"
       :label="$t('trials:reviewAssign:assignReader:table:pengdingTaskCount')"
-      min-width="180"
+      min-width="120"
       show-overflow-tooltip
     >
     </el-table-column>
@@ -109,7 +109,7 @@
     <el-table-column
       prop="WaitDealTrialTaskCount"
       :label="$t('trials:reviewAssign:assignReader:table:pengdingTrialsTaskCount')"
-      min-width="180"
+      min-width="120"
       show-overflow-tooltip
     >
     </el-table-column>
@@ -117,7 +117,7 @@
     <el-table-column
       prop=""
       :label="$t('trials:reviewAssign:assignReader:table:averageReadingTime')"
-      min-width="260"
+      min-width="120"
       show-overflow-tooltip
     >
     </el-table-column>
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 61863608..4bc4568c 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -411,7 +411,7 @@
               v-if="manualAllocationVisible"
               :title="$t('trials:reviewAssign:dialog:assignReader')"
               :visible.sync="manualAllocationVisible"
-              width="1610px"
+              width="1320px"
               :close-on-click-modal="false"
             >
               <ManualAllocationTable :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :reading-type="ReadingType" :SubjectAssignSelectList="SubjectAssignSelectList" @close="() => {manualAllocationVisible = false}" @getList="getList"></ManualAllocationTable>

From ab0744d55088514f250aa3b1ea19bcc471f492c0 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 8 Mar 2024 11:05:59 +0800
Subject: [PATCH 096/374] =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E6=91=84=E5=8F=96?=
 =?UTF-8?q?=E5=80=BC=E5=8F=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .eslintignore                                                   | 2 +-
 .../trials-panel/reading/dicoms/components/Fusion/Questions.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index f8cee48b..3ff12bc3 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -4,7 +4,7 @@ src/utils/*
 public
 dist
 
-# src/*
+src/*
 src/views/trials/trials-panel/visit/*
 src/App.vue
 src/views/trials/trials-panel/reading/global-review/*
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 05af5533..38393016 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -450,7 +450,7 @@ export default {
       if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
         // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
         // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
-        this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : '2'
+        this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : this.questionForm[this.pet5PSId] < this.baseLinePET5PS ? '2' : ''
       }
     },
     setpet5PS() {

From b574da9edf4de8a14ad016668445a22b8862686d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 13:05:33 +0800
Subject: [PATCH 097/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/index.vue           |   2 +-
 src/components/UploadFiles/index.vue          |   7 +-
 src/layout/components/Navbar.vue              |   6 -
 src/router/index.js                           |   7 +-
 src/views/admin/menu/index.vue                | 273 ++++----
 src/views/admin/role/index.vue                |   7 +-
 src/views/admin/user/components/Account.vue   |  77 +--
 src/views/admin/user/list/index.vue           |   7 +-
 src/views/dashboard/bigdata.vue               |   3 +-
 .../components/SignatureTemplate/index.vue    |   3 +-
 src/views/dictionary/dictionary/index.vue     |   7 +-
 src/views/dictionary/email/index.vue          |   7 +-
 .../institutions/components/CROs.vue          |   7 +-
 .../institutions/components/Hospitals.vue     | 511 +++++++-------
 .../institutions/components/Sites.vue         |   7 +-
 .../institutions/components/Sponsors.vue      |   7 +-
 .../dictionary/newdictionary/bool/index.vue   |   7 +-
 .../components/DictionaryChild.vue            |   7 +-
 .../dictionary/newdictionary/config/index.vue |   7 +-
 .../dictionary/newdictionary/enum/index.vue   |   7 +-
 .../list/components/DictionaryChild.vue       |   7 +-
 .../dictionary/newdictionary/list/index.vue   |   7 +-
 .../dictionary/newdictionary/select/index.vue |   7 +-
 .../newdictionary/setting/index.vue           |   7 +-
 .../dictionary/sign/components/SceneList.vue  | 323 +++++----
 src/views/dictionary/sign/index.vue           | 457 ++++++-------
 .../template/components/Anonymization.vue     |   7 +-
 .../components/DictionaryTypeConfig.vue       |   7 +-
 .../template/components/IncreaseFields.vue    |   7 +-
 .../template/components/QcQuestions.vue       |   7 +-
 src/views/dictionary/template/list.vue        | 375 +++++-----
 src/views/dictionary/template/setting.vue     | 363 +++++-----
 .../template/sign/components/SceneList.vue    | 323 +++++----
 src/views/dictionary/template/sign/index.vue  | 457 ++++++-------
 .../financials/monthlyPayment/adjustment.vue  | 483 +++++++------
 .../components/ExchangeRate.vue               | 396 +++++------
 .../components/RankBasedRates.vue             | 647 +++++++++---------
 .../monthlyPayment/components/TrialsData.vue  |   5 +-
 .../monthlyPayment/components/UploadSow.vue   |   2 +-
 .../components/EducationTraining.vue          |   6 +-
 .../reviewers/components/GcpCertificate.vue   |   2 +-
 src/views/reviewers/components/Resumes.vue    |   7 +-
 src/views/reviewers/components/Setting.vue    |   9 +-
 .../reviewers/components/TrialExperience.vue  |   8 +-
 src/views/reviewers/index.vue                 |  23 +-
 src/views/system/login-log/index.vue          |  19 +-
 src/views/system/role/index.vue               |   7 +-
 src/views/system/user/components/Account.vue  |  13 +-
 src/views/system/user/list/index.vue          |  41 +-
 .../components/UploadAcksow.vue               |   2 +-
 .../components/DictionaryTypeConfig.vue       |   7 +-
 src/views/user/account.vue                    |  50 +-
 src/views/user/editInfo.vue                   | 512 +++++++-------
 src/views/user/myInfo.vue                     | 389 ++++++++++-
 54 files changed, 3147 insertions(+), 2801 deletions(-)

diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue
index 9de9ce32..564c5ee4 100644
--- a/src/components/UploadFile/index.vue
+++ b/src/components/UploadFile/index.vue
@@ -129,7 +129,7 @@ export default {
               this.fileList = []
               this.$emit('getFileList', '', '')
               this.$message({
-                message: 'Deleted successfully!',
+                message: this.$t('common:message:deletedSuccessfully'),
                 type: 'success'
               })
             }
diff --git a/src/components/UploadFiles/index.vue b/src/components/UploadFiles/index.vue
index 0c8c4e59..475be8ef 100644
--- a/src/components/UploadFiles/index.vue
+++ b/src/components/UploadFiles/index.vue
@@ -9,7 +9,7 @@
       :file-list="fileList"
       :accept="accept"
     >
-      <el-button size="small" type="primary" :disabled="isDisabled">Upload</el-button>
+      <el-button size="small" type="primary" :disabled="isDisabled">{{ $t('common:button:upload') }}</el-button>
     </el-upload>
   </div>
 </template>
@@ -143,8 +143,7 @@ export default {
       this.$confirm('Sure to remove?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       }).then(() => {
         deleteAttachment(file.Id, file.Path)
           .then(res => {
@@ -152,7 +151,7 @@ export default {
               this.fileList.splice(this.fileList.findIndex(item => item.Id === file.Id), 1)
               this.$emit('getFileList', this.fileList)
               this.$message({
-                message: 'Deleted successfully!',
+                message: this.$t('common:message:deletedSuccessfully'),
                 type: 'success'
               })
             }
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index b07a3ad2..4229b463 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -31,9 +31,6 @@
               <el-dropdown-item v-if="!isReviewer">
                 <span style="display:block;" @click="editInfo">Edit Info</span>
               </el-dropdown-item>
-              <el-dropdown-item>
-                <span style="display:block;" @click="account">Account</span>
-              </el-dropdown-item>
               <el-dropdown-item divided>
                 <span style="display:block;" @click="logout">Log Out</span>
               </el-dropdown-item>
@@ -93,9 +90,6 @@ export default {
     editInfo() {
       this.$router.push({ name: 'BaiscInfo' })
     },
-    account() {
-      this.$router.push({ name: 'Account' })
-    }
   }
 }
 </script>
diff --git a/src/router/index.js b/src/router/index.js
index fdaaae06..804e033e 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -255,12 +255,7 @@ export const constantRoutes = [
     children: [{
       path: 'baiscInfo',
       name: 'BaiscInfo',
-      component: () => import('@/views/user/editInfo')
-    },
-    {
-      path: 'account',
-      name: 'Account',
-      component: () => import('@/views/user/account')
+      component: () => import('@/views/user/myInfo')
     }
     ]
   }
diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue
index fe5387e1..10a648c5 100644
--- a/src/views/admin/menu/index.vue
+++ b/src/views/admin/menu/index.vue
@@ -1,137 +1,136 @@
-<template>
-  <div class="app-container menu">
-    <el-tree
-      :props="defaultProps"
-      :data="treeData"
-      node-key="Id"
-      :default-expand-all="true"
-      :expand-on-click-node="false"
-      style="width:80%;"
-    >
-      <span slot-scope="{ node, data }" class="custom-tree-node">
-        <span v-if="data.FunctionName">{{ node.label }} --------------------(Function)</span>
-        <span v-else>{{ node.label }}</span>
-        <span>
-          <el-button type="text" icon="el-icon-plus" size="small" @click="() => append(data)">Append</el-button>
-          <el-button
-            type="text"
-            icon="el-icon-edit"
-            size="small"
-            @click="() => edit(data)"
-          >Edit</el-button>
-          <el-button type="text" icon="el-icon-delete" size="small" @click="() => remove(data)">Delete</el-button>
-        </span>
-      </span>
-    </el-tree>
-    <menu-form v-if="model_cfg.visible" :form="currenNode" width="500px" @close="closeModel" />
-  </div>
-</template>
-<script>
-import { getMenuFunction, deleteMenuFunction } from '@/api/admin'
-import MenuForm from './components/MenuForm'
-import { model_cfg } from './menu'
-export default {
-  name: 'Menu',
-  components: { MenuForm },
-  data() {
-    return {
-      model_cfg,
-      treeData: [],
-      defaultProps: {
-        label: 'MenuName',
-        children: 'Children'
-      },
-      dialogVisible: false,
-      title: '',
-      currenNode: {},
-      nodeId: '',
-      parentId: ''
-    }
-  },
-  mounted() {
-    this.getlist()
-  },
-  methods: {
-    // 获取菜单数据
-    getlist() {
-      const loading = this.$loading({
-        target: document.querySelector('.menu'),
-        fullscreen: false,
-        lock: true,
-        text: 'Loading',
-        spinner: 'el-icon-loading'
-      })
-      getMenuFunction().then(res => {
-        loading.close()
-        this.treeData = res.Result
-      }).catch(() => { loading.close() })
-    },
-    // 添加菜单
-    append(node) {
-      this.currenNode = {}
-      this.currenNode.ParentId = node.Id
-      this.currenNode.Status = 1
-      // this.currenNode.ShowOrder = 0
-      this.nodeId = node.Id
-      this.model_cfg.title = 'Append'
-      this.model_cfg.visible = true
-    },
-    // 编辑菜单
-    edit(node) {
-      // eslint-disable-next-line no-unused-vars
-      const { Children, CreateTime, CreateUserId, UpdateTime, UpdateUserId, ...obj } = JSON.parse(JSON.stringify(node))
-      obj.MetaBreadcrumb = obj.MetaBreadcrumb ? 1 : 0
-      obj.Hidden = obj.Hidden ? 1 : 0
-      this.currenNode = obj
-      this.nodeId = node.Id
-      this.model_cfg.title = 'Edit'
-      this.model_cfg.visible = true
-    },
-    // 移除菜单
-    remove(node) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteMenuFunction(node.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.getlist()
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    // 关闭弹窗
-    closeModel() {
-      this.model_cfg.visible = false
-      this.getlist()
-    }
-  }
-}
-</script>
-<style lang="scss">
-.menu{
-  .el-tree {
-  margin-top: 20px;
-  }
-  .el-tree-node{
-    margin-top: 5px;
-  }
-  .custom-tree-node {
-    flex: 1;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    font-size: 14px;
-    padding-right: 8px;
-  }
-  .el-dialog__body{
-    padding: 10px;
-  }
-}
-
-</style>
+<template>
+  <div class="app-container menu">
+    <el-tree
+      :props="defaultProps"
+      :data="treeData"
+      node-key="Id"
+      :default-expand-all="true"
+      :expand-on-click-node="false"
+      style="width:80%;"
+    >
+      <span slot-scope="{ node, data }" class="custom-tree-node">
+        <span v-if="data.FunctionName">{{ node.label }} --------------------(Function)</span>
+        <span v-else>{{ node.label }}</span>
+        <span>
+          <el-button type="text" icon="el-icon-plus" size="small" @click="() => append(data)">Append</el-button>
+          <el-button
+            type="text"
+            icon="el-icon-edit"
+            size="small"
+            @click="() => edit(data)"
+          >Edit</el-button>
+          <el-button type="text" icon="el-icon-delete" size="small" @click="() => remove(data)">Delete</el-button>
+        </span>
+      </span>
+    </el-tree>
+    <menu-form v-if="model_cfg.visible" :form="currenNode" width="500px" @close="closeModel" />
+  </div>
+</template>
+<script>
+import { getMenuFunction, deleteMenuFunction } from '@/api/admin'
+import MenuForm from './components/MenuForm'
+import { model_cfg } from './menu'
+export default {
+  name: 'Menu',
+  components: { MenuForm },
+  data() {
+    return {
+      model_cfg,
+      treeData: [],
+      defaultProps: {
+        label: 'MenuName',
+        children: 'Children'
+      },
+      dialogVisible: false,
+      title: '',
+      currenNode: {},
+      nodeId: '',
+      parentId: ''
+    }
+  },
+  mounted() {
+    this.getlist()
+  },
+  methods: {
+    // 获取菜单数据
+    getlist() {
+      const loading = this.$loading({
+        target: document.querySelector('.menu'),
+        fullscreen: false,
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading'
+      })
+      getMenuFunction().then(res => {
+        loading.close()
+        this.treeData = res.Result
+      }).catch(() => { loading.close() })
+    },
+    // 添加菜单
+    append(node) {
+      this.currenNode = {}
+      this.currenNode.ParentId = node.Id
+      this.currenNode.Status = 1
+      // this.currenNode.ShowOrder = 0
+      this.nodeId = node.Id
+      this.model_cfg.title = 'Append'
+      this.model_cfg.visible = true
+    },
+    // 编辑菜单
+    edit(node) {
+      // eslint-disable-next-line no-unused-vars
+      const { Children, CreateTime, CreateUserId, UpdateTime, UpdateUserId, ...obj } = JSON.parse(JSON.stringify(node))
+      obj.MetaBreadcrumb = obj.MetaBreadcrumb ? 1 : 0
+      obj.Hidden = obj.Hidden ? 1 : 0
+      this.currenNode = obj
+      this.nodeId = node.Id
+      this.model_cfg.title = 'Edit'
+      this.model_cfg.visible = true
+    },
+    // 移除菜单
+    remove(node) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteMenuFunction(node.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.getlist()
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    // 关闭弹窗
+    closeModel() {
+      this.model_cfg.visible = false
+      this.getlist()
+    }
+  }
+}
+</script>
+<style lang="scss">
+.menu{
+  .el-tree {
+  margin-top: 20px;
+  }
+  .el-tree-node{
+    margin-top: 5px;
+  }
+  .custom-tree-node {
+    flex: 1;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    font-size: 14px;
+    padding-right: 8px;
+  }
+  .el-dialog__body{
+    padding: 10px;
+  }
+}
+
+</style>
diff --git a/src/views/admin/role/index.vue b/src/views/admin/role/index.vue
index 96fc5c79..69272c1f 100644
--- a/src/views/admin/role/index.vue
+++ b/src/views/admin/role/index.vue
@@ -89,16 +89,15 @@ export default {
       })
     },
     handleDeleteRole(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       }).then(() => {
         deleteUserTypeRole(row.Id).then((res) => {
           if (res.IsSuccess) {
             this.list.splice(this.list.findIndex((item) => item.Id === row.Id), 1)
-            this.$message.success('Deleted successfully!')
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
           }
         })
       })
diff --git a/src/views/admin/user/components/Account.vue b/src/views/admin/user/components/Account.vue
index 4deb34e4..4ee4bfeb 100644
--- a/src/views/admin/user/components/Account.vue
+++ b/src/views/admin/user/components/Account.vue
@@ -1,39 +1,38 @@
-<template>
-  <el-card class="box-card" style="width:800px;" size="small">
-    <!-- <div slot="header" class="clearfix">
-      <span>Security</span>
-    </div> -->
-    <div>
-      <el-button type="danger" @click="handleReset">Reset Password</el-button>
-    </div>
-  </el-card>
-</template>
-<script>
-import { resetPassword } from '@/api/admin'
-export default {
-  name: 'Account',
-  props: {
-    userId: { type: String, default: '' }
-  },
-  methods: {
-    handleReset() {
-      this.$confirm('Sure to reset password?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          resetPassword(this.userId).then(res => {
-            if (res.IsSuccess) {
-              this.$message({
-                message: 'Reset password successfully',
-                type: 'success'
-              })
-            }
-          })
-        })
-    }
-  }
-}
-</script>
+<template>
+  <el-card class="box-card" style="width:800px;" size="small">
+    <!-- <div slot="header" class="clearfix">
+      <span>Security</span>
+    </div> -->
+    <div>
+      <el-button type="danger" @click="handleReset">Reset Password</el-button>
+    </div>
+  </el-card>
+</template>
+<script>
+import { resetPassword } from '@/api/admin'
+export default {
+  name: 'Account',
+  props: {
+    userId: { type: String, default: '' }
+  },
+  methods: {
+    handleReset() {
+      this.$confirm('Sure to reset password?', {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          resetPassword(this.userId).then(res => {
+            if (res.IsSuccess) {
+              this.$message({
+                message: 'Reset password successfully',
+                type: 'success'
+              })
+            }
+          })
+        })
+    }
+  }
+}
+</script>
diff --git a/src/views/admin/user/list/index.vue b/src/views/admin/user/list/index.vue
index e1baab23..5adadd1c 100644
--- a/src/views/admin/user/list/index.vue
+++ b/src/views/admin/user/list/index.vue
@@ -113,18 +113,17 @@ export default {
     },
     // 删除用户
     handleDeleteUser(data) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deleteSysUser(data.Id)
             .then(res => {
               if (res.IsSuccess) {
                 this.users.splice(this.users.findIndex(item => item.Id === data.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             })
         })
diff --git a/src/views/dashboard/bigdata.vue b/src/views/dashboard/bigdata.vue
index f4cb4bd8..e551f087 100644
--- a/src/views/dashboard/bigdata.vue
+++ b/src/views/dashboard/bigdata.vue
@@ -126,8 +126,7 @@ export default {
       this.$confirm('Sure to sign out', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.$store.dispatch('user/logout').then(res => {
diff --git a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
index 2494d0a5..3a09238c 100644
--- a/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
+++ b/src/views/dictionary/attachment/components/SignatureTemplate/index.vue
@@ -244,8 +244,7 @@ export default {
       this.$confirm('是否确认废除此文件?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
diff --git a/src/views/dictionary/dictionary/index.vue b/src/views/dictionary/dictionary/index.vue
index a09eeb2c..8545735d 100644
--- a/src/views/dictionary/dictionary/index.vue
+++ b/src/views/dictionary/dictionary/index.vue
@@ -125,18 +125,17 @@ export default {
     },
     // 删除字典表配置信息
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deleteDictionary(row.Id)
             .then(res => {
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
                 this.$store.dispatch('global/setDictionary', {})
               }
             })
diff --git a/src/views/dictionary/email/index.vue b/src/views/dictionary/email/index.vue
index fc4396f4..39e068ae 100644
--- a/src/views/dictionary/email/index.vue
+++ b/src/views/dictionary/email/index.vue
@@ -239,18 +239,17 @@ export default {
     },
     // 删除
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deleteEmailNoticeConfig(row.Id)
             .then(res => {
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             })
         })
diff --git a/src/views/dictionary/institutions/components/CROs.vue b/src/views/dictionary/institutions/components/CROs.vue
index 711d1f73..cdb145d0 100644
--- a/src/views/dictionary/institutions/components/CROs.vue
+++ b/src/views/dictionary/institutions/components/CROs.vue
@@ -139,11 +139,10 @@ export default {
     },
     // 删除CRO
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -152,7 +151,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => {
               this.loading = false
diff --git a/src/views/dictionary/institutions/components/Hospitals.vue b/src/views/dictionary/institutions/components/Hospitals.vue
index fde25635..06235ea0 100644
--- a/src/views/dictionary/institutions/components/Hospitals.vue
+++ b/src/views/dictionary/institutions/components/Hospitals.vue
@@ -1,256 +1,255 @@
-<template>
-  <box-content>
-    <div class="search">
-      <el-form :inline="true" size="small" class="base-search-form">
-        <el-form-item label="Hospital:">
-          <el-input v-model="searchData.HospitalName" style="width:100px;" />
-        </el-form-item>
-        <el-form-item label="Province:">
-          <el-input v-model="searchData.Province" style="width:100px;" />
-        </el-form-item>
-        <el-form-item label="City:">
-          <el-input v-model="searchData.City" style="width:100px;" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
-          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
-        </el-form-item>
-      </el-form>
-      <span style="margin-left:auto;">
-        <el-button
-          size="small"
-          type="primary"
-          style="margin-left:auto;"
-          icon="el-icon-plus"
-          @click="handleAddHospital"
-        >New</el-button>
-      </span>
-    </div>
-    <!-- hospital列表 -->
-    <el-table
-      v-loading="loading"
-      v-adaptive="{bottomOffset:60}"
-      :data="list"
-      stripe
-      height="100"
-      @sort-change="handleSortByColumn"
-    >
-      <el-table-column type="index" width="40" />
-      <el-table-column
-        prop="HospitalName"
-        label="Hospital"
-        min-width="120"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="HospitalNameCN"
-        label="Hospital CN"
-        min-width="120"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="UniversityAffiliated"
-        label="University Affiliated"
-        min-width="170"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="UniversityAffiliatedCN"
-        label="University Affiliated CN"
-        min-width="170"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-
-      <el-table-column
-        prop="Country"
-        label="Country"
-        width="120"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="CountryCN"
-        label="Country CN"
-        width="140"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="Province"
-        label="Province"
-        width="120"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="ProvinceCN"
-        label="Province CN"
-        width="140"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="City"
-        label="City"
-        width="120"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="CityCN"
-        label="City CN"
-        width="120"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-
-      <el-table-column label="Action" width="150">
-        <template slot-scope="scope">
-          <el-button
-            circle
-            icon="el-icon-edit-outline"
-            title="编辑"
-            @click="handleEdit(scope.row)"
-          />
-          <el-button
-            circle
-            icon="el-icon-delete"
-            title="删除"
-            @click="handleDelete(scope.row)"
-          />
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
-
-    <el-dialog
-      v-if="editDialog.visible"
-      :visible.sync="editDialog.visible"
-      :close-on-click-modal="false"
-      :title="editDialog.title"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
-      <hospital-form v-if="editDialog.visible" :data="rowData" @close="close" @getList="getList" />
-    </el-dialog>
-
-  </box-content>
-</template>
-<script>
-
-import { getHospitalPageList, deleteHospital } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import Pagination from '@/components/Pagination'
-import HospitalForm from './HospitalForm'
-const searchDataDefault = () => {
-  return {
-    HospitalName: '',
-    Province: '',
-    City: '',
-    PageIndex: 1,
-    PageSize: 20,
-    Asc: true,
-    SortField: ''
-  }
-}
-export default {
-  name: 'Hospitals',
-  components: { BoxContent, Pagination, HospitalForm },
-  data() {
-    return {
-      searchData: searchDataDefault(),
-      editDialog: { visible: false, title: '' },
-      list: [],
-      total: 0,
-      loading: false,
-      rowData: {}
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    // 获取医院列表信息
-    getList() {
-      this.loading = true
-      getHospitalPageList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    // 新增医院信息
-    handleAddHospital() {
-      this.rowData = {}
-      this.editDialog.title = 'Add'
-      this.editDialog.visible = true
-    },
-    // 修改医院信息
-    handleEdit(row) {
-      this.rowData = row
-      this.editDialog.title = 'Edit'
-      this.editDialog.visible = true
-    },
-    // 删除医院信息
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          this.loading = true
-          deleteHospital(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-              this.loading = false
-            }).catch(() => {
-              this.loading = false
-            })
-        })
-    },
-    // 查询
-    handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 重置列表
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
-    },
-    // 指定排序字段，对列表进行排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 关闭模态框
-    close() {
-      this.editDialog.visible = false
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.hospitals{
-  height: 100%;
-}
-</style>
+<template>
+  <box-content>
+    <div class="search">
+      <el-form :inline="true" size="small" class="base-search-form">
+        <el-form-item label="Hospital:">
+          <el-input v-model="searchData.HospitalName" style="width:100px;" />
+        </el-form-item>
+        <el-form-item label="Province:">
+          <el-input v-model="searchData.Province" style="width:100px;" />
+        </el-form-item>
+        <el-form-item label="City:">
+          <el-input v-model="searchData.City" style="width:100px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" @click="handleSearch">Search</el-button>
+          <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">Reset</el-button>
+        </el-form-item>
+      </el-form>
+      <span style="margin-left:auto;">
+        <el-button
+          size="small"
+          type="primary"
+          style="margin-left:auto;"
+          icon="el-icon-plus"
+          @click="handleAddHospital"
+        >New</el-button>
+      </span>
+    </div>
+    <!-- hospital列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:60}"
+      :data="list"
+      stripe
+      height="100"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+      <el-table-column
+        prop="HospitalName"
+        label="Hospital"
+        min-width="120"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="HospitalNameCN"
+        label="Hospital CN"
+        min-width="120"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="UniversityAffiliated"
+        label="University Affiliated"
+        min-width="170"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="UniversityAffiliatedCN"
+        label="University Affiliated CN"
+        min-width="170"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+
+      <el-table-column
+        prop="Country"
+        label="Country"
+        width="120"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="CountryCN"
+        label="Country CN"
+        width="140"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Province"
+        label="Province"
+        width="120"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="ProvinceCN"
+        label="Province CN"
+        width="140"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="City"
+        label="City"
+        width="120"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="CityCN"
+        label="City CN"
+        width="120"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+
+      <el-table-column label="Action" width="150">
+        <template slot-scope="scope">
+          <el-button
+            circle
+            icon="el-icon-edit-outline"
+            title="编辑"
+            @click="handleEdit(scope.row)"
+          />
+          <el-button
+            circle
+            icon="el-icon-delete"
+            title="删除"
+            @click="handleDelete(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+
+    <el-dialog
+      v-if="editDialog.visible"
+      :visible.sync="editDialog.visible"
+      :close-on-click-modal="false"
+      :title="editDialog.title"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+    >
+      <hospital-form v-if="editDialog.visible" :data="rowData" @close="close" @getList="getList" />
+    </el-dialog>
+
+  </box-content>
+</template>
+<script>
+
+import { getHospitalPageList, deleteHospital } from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import Pagination from '@/components/Pagination'
+import HospitalForm from './HospitalForm'
+const searchDataDefault = () => {
+  return {
+    HospitalName: '',
+    Province: '',
+    City: '',
+    PageIndex: 1,
+    PageSize: 20,
+    Asc: true,
+    SortField: ''
+  }
+}
+export default {
+  name: 'Hospitals',
+  components: { BoxContent, Pagination, HospitalForm },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      editDialog: { visible: false, title: '' },
+      list: [],
+      total: 0,
+      loading: false,
+      rowData: {}
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 获取医院列表信息
+    getList() {
+      this.loading = true
+      getHospitalPageList(this.searchData).then(res => {
+        this.loading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => {
+        this.loading = false
+      })
+    },
+    // 新增医院信息
+    handleAddHospital() {
+      this.rowData = {}
+      this.editDialog.title = 'Add'
+      this.editDialog.visible = true
+    },
+    // 修改医院信息
+    handleEdit(row) {
+      this.rowData = row
+      this.editDialog.title = 'Edit'
+      this.editDialog.visible = true
+    },
+    // 删除医院信息
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          this.loading = true
+          deleteHospital(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+              this.loading = false
+            }).catch(() => {
+              this.loading = false
+            })
+        })
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 重置列表
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    // 指定排序字段，对列表进行排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 关闭模态框
+    close() {
+      this.editDialog.visible = false
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.hospitals{
+  height: 100%;
+}
+</style>
diff --git a/src/views/dictionary/institutions/components/Sites.vue b/src/views/dictionary/institutions/components/Sites.vue
index 09daef6e..cadc28d2 100644
--- a/src/views/dictionary/institutions/components/Sites.vue
+++ b/src/views/dictionary/institutions/components/Sites.vue
@@ -213,11 +213,10 @@ export default {
     },
     // 删除Site
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -227,7 +226,7 @@ export default {
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
                 this.$store.dispatch('global/setSite', {})
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => {
               this.loading = false
diff --git a/src/views/dictionary/institutions/components/Sponsors.vue b/src/views/dictionary/institutions/components/Sponsors.vue
index db31ad96..f1292653 100644
--- a/src/views/dictionary/institutions/components/Sponsors.vue
+++ b/src/views/dictionary/institutions/components/Sponsors.vue
@@ -139,11 +139,10 @@ export default {
     },
     // 删除Sponsor
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -152,7 +151,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => {
               this.loading = false
diff --git a/src/views/dictionary/newdictionary/bool/index.vue b/src/views/dictionary/newdictionary/bool/index.vue
index 31a6fd70..bf3ca8d3 100644
--- a/src/views/dictionary/newdictionary/bool/index.vue
+++ b/src/views/dictionary/newdictionary/bool/index.vue
@@ -182,11 +182,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -195,7 +194,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/components/DictionaryChild.vue b/src/views/dictionary/newdictionary/components/DictionaryChild.vue
index 93b39132..5e9a7493 100644
--- a/src/views/dictionary/newdictionary/components/DictionaryChild.vue
+++ b/src/views/dictionary/newdictionary/components/DictionaryChild.vue
@@ -154,11 +154,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -167,7 +166,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/config/index.vue b/src/views/dictionary/newdictionary/config/index.vue
index 0355d9ce..c1a0dcf3 100644
--- a/src/views/dictionary/newdictionary/config/index.vue
+++ b/src/views/dictionary/newdictionary/config/index.vue
@@ -183,11 +183,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -196,7 +195,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/enum/index.vue b/src/views/dictionary/newdictionary/enum/index.vue
index fc0f0a3c..a4683819 100644
--- a/src/views/dictionary/newdictionary/enum/index.vue
+++ b/src/views/dictionary/newdictionary/enum/index.vue
@@ -182,11 +182,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -195,7 +194,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue b/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue
index 68e4be05..f843d92c 100644
--- a/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue
+++ b/src/views/dictionary/newdictionary/list/components/DictionaryChild.vue
@@ -153,11 +153,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -166,7 +165,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/list/index.vue b/src/views/dictionary/newdictionary/list/index.vue
index 1d99476e..4c45bb6f 100644
--- a/src/views/dictionary/newdictionary/list/index.vue
+++ b/src/views/dictionary/newdictionary/list/index.vue
@@ -206,11 +206,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -219,7 +218,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/select/index.vue b/src/views/dictionary/newdictionary/select/index.vue
index 3ab7d358..acca8552 100644
--- a/src/views/dictionary/newdictionary/select/index.vue
+++ b/src/views/dictionary/newdictionary/select/index.vue
@@ -183,11 +183,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -196,7 +195,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/newdictionary/setting/index.vue b/src/views/dictionary/newdictionary/setting/index.vue
index b50f5803..be1d6fb5 100644
--- a/src/views/dictionary/newdictionary/setting/index.vue
+++ b/src/views/dictionary/newdictionary/setting/index.vue
@@ -122,11 +122,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -135,7 +134,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/sign/components/SceneList.vue b/src/views/dictionary/sign/components/SceneList.vue
index c5892828..eb67bce5 100644
--- a/src/views/dictionary/sign/components/SceneList.vue
+++ b/src/views/dictionary/sign/components/SceneList.vue
@@ -1,162 +1,161 @@
-<template>
-  <box-content>
-    <!-- 搜索框 -->
-    <div class="search">
-      <span style="margin-left:auto;">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleAdd"
-        >
-          Add
-        </el-button>
-      </span>
-
-    </div>
-
-    <!-- 受试者列表 -->
-    <el-table
-      v-loading="loading"
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      height="100"
-      style="width:100%"
-    >
-      <el-table-column type="index" width="40" />
-
-      <el-table-column
-        prop="Code"
-        label="编号"
-        sortable="custom"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Name"
-        label="场景类型"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="Value"
-        label="签名内容(EN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="ValueCN"
-        label="签名内容(CN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="UpdateTime"
-        label="更新时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-
-      <el-table-column
-        prop="CreateTime"
-        label="创建时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column label="Action" width="200" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
-            Edit
-          </el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 场景配置 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="700px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <SceneConfigForm :parent-id="parentId" :data="rowData" @closeDialog="closeDialog" @getList="getList" />
-    </el-dialog>
-  </box-content>
-</template>
-<script>
-import { getChildList, deleteSystemBasicData } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import SceneConfigForm from './SceneConfigForm'
-
-export default {
-  name: 'SignTemplate',
-  components: { BoxContent, SceneConfigForm },
-  props: {
-    parentId: {
-      type: String,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      list: [],
-      rowData: {},
-      title: '',
-      editVisible: false
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    // 获取受试者列表
-    getList() {
-      this.loading = true
-      getChildList(this.parentId).then(res => {
-        this.loading = false
-        this.list = res.Result
-      }).catch(() => { this.loading = false })
-    },
-    // 新增
-    handleAdd() {
-      this.rowData = {}
-      this.title = 'Add'
-      this.editVisible = true
-    },
-    // 编辑
-    handleEdit(row) {
-      this.rowData = { ...row }
-      this.title = 'Edit'
-      this.editVisible = true
-    },
-    // 删除
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteSystemBasicData(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    // 关闭新增、编辑框
-    closeDialog() {
-      this.editVisible = false
-    }
-  }
-}
-</script>
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <span style="margin-left:auto;">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handleAdd"
+        >
+          Add
+        </el-button>
+      </span>
+
+    </div>
+
+    <!-- 受试者列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:45}"
+      :data="list"
+      stripe
+      height="100"
+      style="width:100%"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Code"
+        label="编号"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Name"
+        label="场景类型"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Value"
+        label="签名内容(EN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ValueCN"
+        label="签名内容(CN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="UpdateTime"
+        label="更新时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+
+      <el-table-column
+        prop="CreateTime"
+        label="创建时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column label="Action" width="200" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleEdit(scope.row)"
+          >
+            Edit
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 场景配置 -->
+    <el-dialog
+      v-if="editVisible"
+      :visible.sync="editVisible"
+      :close-on-click-modal="false"
+      :title="title"
+      width="700px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <SceneConfigForm :parent-id="parentId" :data="rowData" @closeDialog="closeDialog" @getList="getList" />
+    </el-dialog>
+  </box-content>
+</template>
+<script>
+import { getChildList, deleteSystemBasicData } from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import SceneConfigForm from './SceneConfigForm'
+
+export default {
+  name: 'SignTemplate',
+  components: { BoxContent, SceneConfigForm },
+  props: {
+    parentId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      rowData: {},
+      title: '',
+      editVisible: false
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 获取受试者列表
+    getList() {
+      this.loading = true
+      getChildList(this.parentId).then(res => {
+        this.loading = false
+        this.list = res.Result
+      }).catch(() => { this.loading = false })
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {}
+      this.title = 'Add'
+      this.editVisible = true
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row }
+      this.title = 'Edit'
+      this.editVisible = true
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteSystemBasicData(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    // 关闭新增、编辑框
+    closeDialog() {
+      this.editVisible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/dictionary/sign/index.vue b/src/views/dictionary/sign/index.vue
index 07236d35..7e84582b 100644
--- a/src/views/dictionary/sign/index.vue
+++ b/src/views/dictionary/sign/index.vue
@@ -1,229 +1,228 @@
-<template>
-  <box-content>
-    <!-- 搜索框 -->
-    <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
-          <el-input v-model="searchData.Code" style="width:100px;" />
-        </el-form-item>
-        <el-form-item label="模板:">
-          <el-input v-model="searchData.Name" style="width:100px;" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
-        </el-form-item>
-      </el-form>
-      <span style="margin-left:auto;">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleAdd"
-        >
-          New
-        </el-button>
-      </span>
-
-    </div>
-
-    <!-- 受试者列表 -->
-    <el-table
-      v-loading="loading"
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      height="100"
-      style="width:100%"
-      @sort-change="handleSortByColumn"
-    >
-      <el-table-column type="index" width="40" />
-
-      <el-table-column
-        prop="Code"
-        label="Code"
-        sortable="custom"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Name"
-        label="模板"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="Value"
-        label="签名内容(EN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="ValueCN"
-        label="签名内容(CN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="UpdateTime"
-        label="更新时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-
-      <el-table-column
-        prop="CreateTime"
-        label="创建时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column label="Action" width="200" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
-            Edit
-          </el-button>
-          <el-button
-            type="text"
-            @click="handleConfig(scope.row)"
-          >
-            场景配置
-          </el-button>
-
-          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
-
-    <!-- 新增、编辑 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="700px"
-      custom-class="base-dialog-wrapper"
-    >
-      <SignTemplateForm :data="rowData" @closeDialog="closeDialog" @getList="getList" />
-    </el-dialog>
-
-    <!-- 场景配置 -->
-    <el-dialog
-      v-if="configVisible"
-      :visible.sync="configVisible"
-      title="场景配置"
-      :fullscreen="true"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <SceneList :parent-id="rowData.Id" @closeDialog="closeDialog" />
-    </el-dialog>
-  </box-content>
-</template>
-<script>
-import { getSystemBasicDataList, deleteSystemBasicData } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import SignTemplateForm from './components/SignTemplateForm'
-import SceneList from './components/SceneList'
-import Pagination from '@/components/Pagination'
-const searchDataDefault = () => {
-  return {
-    Code: '',
-    Name: '',
-    PageIndex: 1,
-    PageSize: 20
-  }
-}
-export default {
-  name: 'SignTemplate',
-  components: { BoxContent, SignTemplateForm, Pagination, SceneList },
-  data() {
-    return {
-      searchData: searchDataDefault(),
-      loading: false,
-      list: [],
-      total: 0,
-      rowData: {},
-      title: '',
-      editVisible: false,
-      configVisible: false
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    // 获取受试者列表
-    getList() {
-      this.loading = true
-      getSystemBasicDataList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
-    },
-    // 新增
-    handleAdd() {
-      this.rowData = {}
-      this.title = 'Add'
-      this.editVisible = true
-    },
-    // 编辑
-    handleEdit(row) {
-      this.rowData = { ...row }
-      this.title = 'Edit'
-      this.editVisible = true
-    },
-    // 删除
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteSystemBasicData(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    // 场景配置
-    handleConfig(row) {
-      this.rowData = { ...row }
-      this.configVisible = true
-    },
-    // 查询
-    handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 重置
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
-    },
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 关闭新增、编辑框
-    closeDialog() {
-      this.editVisible = false
-    }
-  }
-}
-</script>
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item label="编号:">
+          <el-input v-model="searchData.Code" style="width:100px;" />
+        </el-form-item>
+        <el-form-item label="模板:">
+          <el-input v-model="searchData.Name" style="width:100px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
+        </el-form-item>
+      </el-form>
+      <span style="margin-left:auto;">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handleAdd"
+        >
+          New
+        </el-button>
+      </span>
+
+    </div>
+
+    <!-- 受试者列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:45}"
+      :data="list"
+      stripe
+      height="100"
+      style="width:100%"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Code"
+        label="Code"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Name"
+        label="模板"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Value"
+        label="签名内容(EN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ValueCN"
+        label="签名内容(CN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="UpdateTime"
+        label="更新时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+
+      <el-table-column
+        prop="CreateTime"
+        label="创建时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column label="Action" width="200" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleEdit(scope.row)"
+          >
+            Edit
+          </el-button>
+          <el-button
+            type="text"
+            @click="handleConfig(scope.row)"
+          >
+            场景配置
+          </el-button>
+
+          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+
+    <!-- 新增、编辑 -->
+    <el-dialog
+      v-if="editVisible"
+      :visible.sync="editVisible"
+      :close-on-click-modal="false"
+      :title="title"
+      width="700px"
+      custom-class="base-dialog-wrapper"
+    >
+      <SignTemplateForm :data="rowData" @closeDialog="closeDialog" @getList="getList" />
+    </el-dialog>
+
+    <!-- 场景配置 -->
+    <el-dialog
+      v-if="configVisible"
+      :visible.sync="configVisible"
+      title="场景配置"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <SceneList :parent-id="rowData.Id" @closeDialog="closeDialog" />
+    </el-dialog>
+  </box-content>
+</template>
+<script>
+import { getSystemBasicDataList, deleteSystemBasicData } from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import SignTemplateForm from './components/SignTemplateForm'
+import SceneList from './components/SceneList'
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+  return {
+    Code: '',
+    Name: '',
+    PageIndex: 1,
+    PageSize: 20
+  }
+}
+export default {
+  name: 'SignTemplate',
+  components: { BoxContent, SignTemplateForm, Pagination, SceneList },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      rowData: {},
+      title: '',
+      editVisible: false,
+      configVisible: false
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 获取受试者列表
+    getList() {
+      this.loading = true
+      getSystemBasicDataList(this.searchData).then(res => {
+        this.loading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { this.loading = false })
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {}
+      this.title = 'Add'
+      this.editVisible = true
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row }
+      this.title = 'Edit'
+      this.editVisible = true
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteSystemBasicData(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    // 场景配置
+    handleConfig(row) {
+      this.rowData = { ...row }
+      this.configVisible = true
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 关闭新增、编辑框
+    closeDialog() {
+      this.editVisible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/dictionary/template/components/Anonymization.vue b/src/views/dictionary/template/components/Anonymization.vue
index d976aca0..d202154b 100644
--- a/src/views/dictionary/template/components/Anonymization.vue
+++ b/src/views/dictionary/template/components/Anonymization.vue
@@ -162,11 +162,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -175,7 +174,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/template/components/DictionaryTypeConfig.vue b/src/views/dictionary/template/components/DictionaryTypeConfig.vue
index 3bf49d6d..676cba40 100644
--- a/src/views/dictionary/template/components/DictionaryTypeConfig.vue
+++ b/src/views/dictionary/template/components/DictionaryTypeConfig.vue
@@ -137,11 +137,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -150,7 +149,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/template/components/IncreaseFields.vue b/src/views/dictionary/template/components/IncreaseFields.vue
index 2a52609c..c653fafb 100644
--- a/src/views/dictionary/template/components/IncreaseFields.vue
+++ b/src/views/dictionary/template/components/IncreaseFields.vue
@@ -170,11 +170,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -183,7 +182,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/template/components/QcQuestions.vue b/src/views/dictionary/template/components/QcQuestions.vue
index d2e4d574..9e16395e 100644
--- a/src/views/dictionary/template/components/QcQuestions.vue
+++ b/src/views/dictionary/template/components/QcQuestions.vue
@@ -217,11 +217,10 @@ export default {
     },
     // 删除受试者
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -230,7 +229,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/dictionary/template/list.vue b/src/views/dictionary/template/list.vue
index e75d8c16..6a49fe98 100644
--- a/src/views/dictionary/template/list.vue
+++ b/src/views/dictionary/template/list.vue
@@ -1,188 +1,187 @@
-<template>
-  <div class="template-wrapper">
-    <div class="left-wrapper">
-      <box-content>
-        <div class="search">
-          <SearchForm
-            size="mini"
-            :that="this"
-            :search-data="searchData"
-            :search-form="template_form"
-            :search-handle="template_handle"
-            @search="handleSearch"
-            @reset="handleReset"
-          />
-          <span style="margin-left:auto;">
-            <el-button type="primary" size="small" style="margin-left:auto;" @click="handleAdd">New</el-button>
-            <el-button type="primary" size="small" @click="handleSetting">Setting</el-button>
-          </span>
-        </div>
-        <base-table
-          v-loading="loading"
-          :columns="template_cols"
-          :list="list"
-          :search-data="searchData"
-          :total="total"
-          @getList="getList"
-          @items="handleView"
-          @edit="handleEdit"
-          @delete="handleDelete"
-          @sortByColumn="sortByColumn"
-        />
-      </box-content>
-    </div>
-    <div class="right-wrapper">
-      <div v-if="template.Name">
-        <span>Name:</span>
-        <el-input v-model="template.Name" size="small" style="width:150px;" readonly />
-      </div>
-      <el-table v-if="template.Name" ref="itemList" v-loading="itemLoading" :data="itmeList" class="table" size="small" @select="onTableSelect">
-        <el-table-column type="selection" width="50" />
-        <el-table-column type="index" width="40" />
-        <el-table-column prop="Name" label="Item" show-overflow-tooltip />
-      </el-table>
-
-    </div>
-    <template-form v-if="template_model.visible" :data="rowData" @close="closeModel" />
-  </div>
-</template>
-<script>
-import { getQaTemplateList, deleteQATemplate, getQaTemplateConfigList, configQATemplateItem } from '@/api/dictionary'
-import { template_cols, template_form, template_handle, template_model } from './template'
-import BoxContent from '@/components/BoxContent'
-import SearchForm from '@/components/BaseForm/search-form'
-import BaseTable from '@/components/BaseTable'
-import TemplateForm from './components/TemplateForm'
-import tableMixins from '@/mixins/table'
-const searchDataDefault = () => {
-  return {
-    Name: '',
-    PageIndex: 1,
-    PageSize: 20
-  }
-}
-export default {
-  name: 'TemplateList',
-  components: { BoxContent, SearchForm, BaseTable, TemplateForm },
-  mixins: [tableMixins],
-  data() {
-    return {
-      template_cols,
-      template_form,
-      template_handle,
-      template_model,
-      searchData: searchDataDefault(),
-      list: [],
-      total: 0,
-      loading: false,
-      rowData: {},
-      template: {},
-      itmeList: [],
-      itemLoading: false
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      getQaTemplateList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-        this.template = {}
-        this.itmeList = []
-      })
-    },
-    handleAdd() {
-      this.rowData = {}
-      this.template_model.title = 'New'
-      this.template_model.visible = true
-    },
-    handleSetting() {
-      this.$router.push({ name: 'TemplateOfSetting' })
-    },
-    handleEdit(row) {
-      this.rowData = row
-      this.template_model.title = 'Edit'
-      this.template_model.visible = true
-    },
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteQATemplate(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    handleView(row) {
-      this.template = row
-      this.itemLoading = true
-      getQaTemplateConfigList(row.Id, row.ModalityId).then(res => {
-        this.itmeList = res.Result
-        this.itmeList.forEach(val => {
-          this.$nextTick(
-            function() {
-              this.$refs.itemList.toggleRowSelection(val, val.IsSelect)
-            }.bind(this)
-          )
-        })
-        this.itemLoading = false
-      })
-    },
-    onTableSelect(rows, row) {
-      const param = {
-        qaTemplateItemId: row.Id,
-        qaTemplateId: this.template.Id,
-        isSelect: rows.indexOf(row) !== -1
-      }
-      configQATemplateItem(param).then(res => {
-        this.$message.success('Updated successfully')
-      })
-    },
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
-      this.template = {}
-      this.itmeList = []
-    },
-    closeModel() {
-      this.template_model.visible = false
-      this.getList()
-    }
-  }
-}
-</script>
-<style lang="scss">
-.template-wrapper{
-  height: 100%;
-  display: flex;
-  .left-wrapper{
-    width: 0;
-    flex-grow: 4;
-    border-right: 1px solid #ccc;
-  }
-  .right-wrapper{
-    width: 0;
-    flex-grow: 3;
-    padding: 5px;
-    thead{
-      .el-table-column--selection{
-        .cell {
-          display: none;
-        }
-      }
-    }
-  }
-}
-</style>
+<template>
+  <div class="template-wrapper">
+    <div class="left-wrapper">
+      <box-content>
+        <div class="search">
+          <SearchForm
+            size="mini"
+            :that="this"
+            :search-data="searchData"
+            :search-form="template_form"
+            :search-handle="template_handle"
+            @search="handleSearch"
+            @reset="handleReset"
+          />
+          <span style="margin-left:auto;">
+            <el-button type="primary" size="small" style="margin-left:auto;" @click="handleAdd">New</el-button>
+            <el-button type="primary" size="small" @click="handleSetting">Setting</el-button>
+          </span>
+        </div>
+        <base-table
+          v-loading="loading"
+          :columns="template_cols"
+          :list="list"
+          :search-data="searchData"
+          :total="total"
+          @getList="getList"
+          @items="handleView"
+          @edit="handleEdit"
+          @delete="handleDelete"
+          @sortByColumn="sortByColumn"
+        />
+      </box-content>
+    </div>
+    <div class="right-wrapper">
+      <div v-if="template.Name">
+        <span>Name:</span>
+        <el-input v-model="template.Name" size="small" style="width:150px;" readonly />
+      </div>
+      <el-table v-if="template.Name" ref="itemList" v-loading="itemLoading" :data="itmeList" class="table" size="small" @select="onTableSelect">
+        <el-table-column type="selection" width="50" />
+        <el-table-column type="index" width="40" />
+        <el-table-column prop="Name" label="Item" show-overflow-tooltip />
+      </el-table>
+
+    </div>
+    <template-form v-if="template_model.visible" :data="rowData" @close="closeModel" />
+  </div>
+</template>
+<script>
+import { getQaTemplateList, deleteQATemplate, getQaTemplateConfigList, configQATemplateItem } from '@/api/dictionary'
+import { template_cols, template_form, template_handle, template_model } from './template'
+import BoxContent from '@/components/BoxContent'
+import SearchForm from '@/components/BaseForm/search-form'
+import BaseTable from '@/components/BaseTable'
+import TemplateForm from './components/TemplateForm'
+import tableMixins from '@/mixins/table'
+const searchDataDefault = () => {
+  return {
+    Name: '',
+    PageIndex: 1,
+    PageSize: 20
+  }
+}
+export default {
+  name: 'TemplateList',
+  components: { BoxContent, SearchForm, BaseTable, TemplateForm },
+  mixins: [tableMixins],
+  data() {
+    return {
+      template_cols,
+      template_form,
+      template_handle,
+      template_model,
+      searchData: searchDataDefault(),
+      list: [],
+      total: 0,
+      loading: false,
+      rowData: {},
+      template: {},
+      itmeList: [],
+      itemLoading: false
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      getQaTemplateList(this.searchData).then(res => {
+        this.loading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+        this.template = {}
+        this.itmeList = []
+      })
+    },
+    handleAdd() {
+      this.rowData = {}
+      this.template_model.title = 'New'
+      this.template_model.visible = true
+    },
+    handleSetting() {
+      this.$router.push({ name: 'TemplateOfSetting' })
+    },
+    handleEdit(row) {
+      this.rowData = row
+      this.template_model.title = 'Edit'
+      this.template_model.visible = true
+    },
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteQATemplate(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    handleView(row) {
+      this.template = row
+      this.itemLoading = true
+      getQaTemplateConfigList(row.Id, row.ModalityId).then(res => {
+        this.itmeList = res.Result
+        this.itmeList.forEach(val => {
+          this.$nextTick(
+            function() {
+              this.$refs.itemList.toggleRowSelection(val, val.IsSelect)
+            }.bind(this)
+          )
+        })
+        this.itemLoading = false
+      })
+    },
+    onTableSelect(rows, row) {
+      const param = {
+        qaTemplateItemId: row.Id,
+        qaTemplateId: this.template.Id,
+        isSelect: rows.indexOf(row) !== -1
+      }
+      configQATemplateItem(param).then(res => {
+        this.$message.success('Updated successfully')
+      })
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+      this.template = {}
+      this.itmeList = []
+    },
+    closeModel() {
+      this.template_model.visible = false
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss">
+.template-wrapper{
+  height: 100%;
+  display: flex;
+  .left-wrapper{
+    width: 0;
+    flex-grow: 4;
+    border-right: 1px solid #ccc;
+  }
+  .right-wrapper{
+    width: 0;
+    flex-grow: 3;
+    padding: 5px;
+    thead{
+      .el-table-column--selection{
+        .cell {
+          display: none;
+        }
+      }
+    }
+  }
+}
+</style>
diff --git a/src/views/dictionary/template/setting.vue b/src/views/dictionary/template/setting.vue
index e5dec22a..c4ee732f 100644
--- a/src/views/dictionary/template/setting.vue
+++ b/src/views/dictionary/template/setting.vue
@@ -1,182 +1,181 @@
-<template>
-  <box-content>
-    <div class="search">
-      <SearchForm
-        size="mini"
-        :that="this"
-        :search-data="searchData"
-        :search-form="setting_form"
-        :search-handle="setting_handle"
-        @search="handleSearch"
-        @reset="handleReset"
-      />
-      <span style="margin-left:auto;">
-        <el-button type="primary" size="small" style="margin-left:auto;" @click="handleAdd">New</el-button>
-      </span>
-    </div>
-    <base-table
-      v-loading="loading"
-      :columns="setting_cols"
-      :list="list"
-      :search-data="searchData"
-      :total="total"
-      @getList="getList"
-      @edit="handleEdit"
-      @delete="handleDelete"
-      @sortByColumn="sortByColumn"
-    >
-      <!-- 选择自定义slot -->
-      <template slot="modalitySlot" slot-scope="{scope}">
-        {{ scope.row.ModalityList && scope.row.ModalityList.length>0?scope.row.ModalityList.join(', '):'' }}
-      </template>
-    </base-table>
-    <setting-form v-if="setting_model.visible" :data="rowData" @close="closeModel" />
-  </box-content>
-</template>
-<script>
-
-import { getQATemplateItemList, deleteQATemplateItem } from '@/api/dictionary'
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
-import { setting_cols, setting_form, setting_handle, setting_model } from './template'
-import BoxContent from '@/components/BoxContent'
-import SearchForm from '@/components/BaseForm/search-form'
-import BaseTable from '@/components/BaseTable'
-import SettingForm from './components/SettingForm.vue'
-const searchDataDefault = () => {
-  return {
-    ModalityId: '',
-    PageIndex: 1,
-    PageSize: 20
-  }
-}
-export default {
-  name: 'TemplateSettings',
-  components: { BoxContent, SearchForm, BaseTable, SettingForm },
-  data() {
-    return {
-      setting_cols,
-      setting_form,
-      setting_handle,
-      setting_model,
-      list: [],
-      loading: false,
-      total: 0,
-      searchData: searchDataDefault(),
-      rowData: {},
-      readingType: {}
-    }
-  },
-  mounted() {
-    this.getList()
-    this.getInfo()
-  },
-  methods: {
-    getList() {
-      this.loading = true
-      getQATemplateItemList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
-    },
-    findItemIndex(key) {
-      return this.setting_form.findIndex(value => value.prop && value.prop === key
-      )
-    },
-    async getInfo() {
-      await this.getDicData()
-      if (this.readingType.length > 0) {
-        const index = this.findItemIndex('ModalityId')
-        this.$set(this.setting_form[index], 'options', this.readingType)
-      }
-    },
-    getDicData() {
-      getBasicDataSelects(['ReadingType']).then(res => {
-        const { ReadingType } = { ...res.Result }
-        this.readingType = ReadingType || {}
-      }).catch(() => {})
-    },
-    handleAdd() {
-      this.rowData = {}
-      this.setting_model.title = 'Add'
-      this.setting_model.visible = true
-    },
-    handleEdit(row) {
-      this.rowData = row
-      this.setting_model.title = 'Add'
-      this.setting_model.visible = true
-    },
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteQATemplateItem(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    sortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
-    },
-    closeModel() {
-      this.setting_model.visible = false
-      this.getList()
-    }
-  }
-}
-</script>
-<style lang="scss">
-.template-setting{
-  height: 100%;
-  .el-header{
-    .filter-container{
-      margin-top: 10px;
-      display: flex;
-      align-items: center;
-      span{
-        font-size:13px;
-        margin-right:5px;
-      }
-      .mr{
-        margin-right: 5px;
-        width: 120px;
-      }
-    }
-  }
-  .el-main{
-    height:calc(100% - 40px);
-    padding: 0 20px;
-    .data-table{
-      height: 100%;
-    }
-  }
-  .el-footer{
-    padding: 0 20px;
-  }
-  .el-dialog__header{
-    padding:10px;
-  }
-  .el-dialog__body{
-    padding:10px;
-  }
-}
-</style>
+<template>
+  <box-content>
+    <div class="search">
+      <SearchForm
+        size="mini"
+        :that="this"
+        :search-data="searchData"
+        :search-form="setting_form"
+        :search-handle="setting_handle"
+        @search="handleSearch"
+        @reset="handleReset"
+      />
+      <span style="margin-left:auto;">
+        <el-button type="primary" size="small" style="margin-left:auto;" @click="handleAdd">New</el-button>
+      </span>
+    </div>
+    <base-table
+      v-loading="loading"
+      :columns="setting_cols"
+      :list="list"
+      :search-data="searchData"
+      :total="total"
+      @getList="getList"
+      @edit="handleEdit"
+      @delete="handleDelete"
+      @sortByColumn="sortByColumn"
+    >
+      <!-- 选择自定义slot -->
+      <template slot="modalitySlot" slot-scope="{scope}">
+        {{ scope.row.ModalityList && scope.row.ModalityList.length>0?scope.row.ModalityList.join(', '):'' }}
+      </template>
+    </base-table>
+    <setting-form v-if="setting_model.visible" :data="rowData" @close="closeModel" />
+  </box-content>
+</template>
+<script>
+
+import { getQATemplateItemList, deleteQATemplateItem } from '@/api/dictionary'
+import { getBasicDataSelects } from '@/api/dictionary/dictionary'
+import { setting_cols, setting_form, setting_handle, setting_model } from './template'
+import BoxContent from '@/components/BoxContent'
+import SearchForm from '@/components/BaseForm/search-form'
+import BaseTable from '@/components/BaseTable'
+import SettingForm from './components/SettingForm.vue'
+const searchDataDefault = () => {
+  return {
+    ModalityId: '',
+    PageIndex: 1,
+    PageSize: 20
+  }
+}
+export default {
+  name: 'TemplateSettings',
+  components: { BoxContent, SearchForm, BaseTable, SettingForm },
+  data() {
+    return {
+      setting_cols,
+      setting_form,
+      setting_handle,
+      setting_model,
+      list: [],
+      loading: false,
+      total: 0,
+      searchData: searchDataDefault(),
+      rowData: {},
+      readingType: {}
+    }
+  },
+  mounted() {
+    this.getList()
+    this.getInfo()
+  },
+  methods: {
+    getList() {
+      this.loading = true
+      getQATemplateItemList(this.searchData).then(res => {
+        this.loading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { this.loading = false })
+    },
+    findItemIndex(key) {
+      return this.setting_form.findIndex(value => value.prop && value.prop === key
+      )
+    },
+    async getInfo() {
+      await this.getDicData()
+      if (this.readingType.length > 0) {
+        const index = this.findItemIndex('ModalityId')
+        this.$set(this.setting_form[index], 'options', this.readingType)
+      }
+    },
+    getDicData() {
+      getBasicDataSelects(['ReadingType']).then(res => {
+        const { ReadingType } = { ...res.Result }
+        this.readingType = ReadingType || {}
+      }).catch(() => {})
+    },
+    handleAdd() {
+      this.rowData = {}
+      this.setting_model.title = 'Add'
+      this.setting_model.visible = true
+    },
+    handleEdit(row) {
+      this.rowData = row
+      this.setting_model.title = 'Add'
+      this.setting_model.visible = true
+    },
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteQATemplateItem(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    sortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    closeModel() {
+      this.setting_model.visible = false
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss">
+.template-setting{
+  height: 100%;
+  .el-header{
+    .filter-container{
+      margin-top: 10px;
+      display: flex;
+      align-items: center;
+      span{
+        font-size:13px;
+        margin-right:5px;
+      }
+      .mr{
+        margin-right: 5px;
+        width: 120px;
+      }
+    }
+  }
+  .el-main{
+    height:calc(100% - 40px);
+    padding: 0 20px;
+    .data-table{
+      height: 100%;
+    }
+  }
+  .el-footer{
+    padding: 0 20px;
+  }
+  .el-dialog__header{
+    padding:10px;
+  }
+  .el-dialog__body{
+    padding:10px;
+  }
+}
+</style>
diff --git a/src/views/dictionary/template/sign/components/SceneList.vue b/src/views/dictionary/template/sign/components/SceneList.vue
index c5892828..eb67bce5 100644
--- a/src/views/dictionary/template/sign/components/SceneList.vue
+++ b/src/views/dictionary/template/sign/components/SceneList.vue
@@ -1,162 +1,161 @@
-<template>
-  <box-content>
-    <!-- 搜索框 -->
-    <div class="search">
-      <span style="margin-left:auto;">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleAdd"
-        >
-          Add
-        </el-button>
-      </span>
-
-    </div>
-
-    <!-- 受试者列表 -->
-    <el-table
-      v-loading="loading"
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      height="100"
-      style="width:100%"
-    >
-      <el-table-column type="index" width="40" />
-
-      <el-table-column
-        prop="Code"
-        label="编号"
-        sortable="custom"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Name"
-        label="场景类型"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="Value"
-        label="签名内容(EN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="ValueCN"
-        label="签名内容(CN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="UpdateTime"
-        label="更新时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-
-      <el-table-column
-        prop="CreateTime"
-        label="创建时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column label="Action" width="200" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
-            Edit
-          </el-button>
-          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 场景配置 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="700px"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <SceneConfigForm :parent-id="parentId" :data="rowData" @closeDialog="closeDialog" @getList="getList" />
-    </el-dialog>
-  </box-content>
-</template>
-<script>
-import { getChildList, deleteSystemBasicData } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import SceneConfigForm from './SceneConfigForm'
-
-export default {
-  name: 'SignTemplate',
-  components: { BoxContent, SceneConfigForm },
-  props: {
-    parentId: {
-      type: String,
-      required: true
-    }
-  },
-  data() {
-    return {
-      loading: false,
-      list: [],
-      rowData: {},
-      title: '',
-      editVisible: false
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    // 获取受试者列表
-    getList() {
-      this.loading = true
-      getChildList(this.parentId).then(res => {
-        this.loading = false
-        this.list = res.Result
-      }).catch(() => { this.loading = false })
-    },
-    // 新增
-    handleAdd() {
-      this.rowData = {}
-      this.title = 'Add'
-      this.editVisible = true
-    },
-    // 编辑
-    handleEdit(row) {
-      this.rowData = { ...row }
-      this.title = 'Edit'
-      this.editVisible = true
-    },
-    // 删除
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteSystemBasicData(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    // 关闭新增、编辑框
-    closeDialog() {
-      this.editVisible = false
-    }
-  }
-}
-</script>
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <span style="margin-left:auto;">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handleAdd"
+        >
+          Add
+        </el-button>
+      </span>
+
+    </div>
+
+    <!-- 受试者列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:45}"
+      :data="list"
+      stripe
+      height="100"
+      style="width:100%"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Code"
+        label="编号"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Name"
+        label="场景类型"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Value"
+        label="签名内容(EN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ValueCN"
+        label="签名内容(CN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="UpdateTime"
+        label="更新时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+
+      <el-table-column
+        prop="CreateTime"
+        label="创建时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column label="Action" width="200" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleEdit(scope.row)"
+          >
+            Edit
+          </el-button>
+          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 场景配置 -->
+    <el-dialog
+      v-if="editVisible"
+      :visible.sync="editVisible"
+      :close-on-click-modal="false"
+      :title="title"
+      width="700px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <SceneConfigForm :parent-id="parentId" :data="rowData" @closeDialog="closeDialog" @getList="getList" />
+    </el-dialog>
+  </box-content>
+</template>
+<script>
+import { getChildList, deleteSystemBasicData } from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import SceneConfigForm from './SceneConfigForm'
+
+export default {
+  name: 'SignTemplate',
+  components: { BoxContent, SceneConfigForm },
+  props: {
+    parentId: {
+      type: String,
+      required: true
+    }
+  },
+  data() {
+    return {
+      loading: false,
+      list: [],
+      rowData: {},
+      title: '',
+      editVisible: false
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 获取受试者列表
+    getList() {
+      this.loading = true
+      getChildList(this.parentId).then(res => {
+        this.loading = false
+        this.list = res.Result
+      }).catch(() => { this.loading = false })
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {}
+      this.title = 'Add'
+      this.editVisible = true
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row }
+      this.title = 'Edit'
+      this.editVisible = true
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteSystemBasicData(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    // 关闭新增、编辑框
+    closeDialog() {
+      this.editVisible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/dictionary/template/sign/index.vue b/src/views/dictionary/template/sign/index.vue
index 07236d35..7e84582b 100644
--- a/src/views/dictionary/template/sign/index.vue
+++ b/src/views/dictionary/template/sign/index.vue
@@ -1,229 +1,228 @@
-<template>
-  <box-content>
-    <!-- 搜索框 -->
-    <div class="search">
-      <el-form :inline="true" size="mini" class="base-search-form">
-        <el-form-item label="编号:">
-          <el-input v-model="searchData.Code" style="width:100px;" />
-        </el-form-item>
-        <el-form-item label="模板:">
-          <el-input v-model="searchData.Name" style="width:100px;" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" @click="handleReset">Reset</el-button>
-          <el-button type="primary" @click="handleSearch">Search</el-button>
-        </el-form-item>
-      </el-form>
-      <span style="margin-left:auto;">
-        <el-button
-          type="primary"
-          size="mini"
-          @click="handleAdd"
-        >
-          New
-        </el-button>
-      </span>
-
-    </div>
-
-    <!-- 受试者列表 -->
-    <el-table
-      v-loading="loading"
-      v-adaptive="{bottomOffset:45}"
-      :data="list"
-      stripe
-      height="100"
-      style="width:100%"
-      @sort-change="handleSortByColumn"
-    >
-      <el-table-column type="index" width="40" />
-
-      <el-table-column
-        prop="Code"
-        label="Code"
-        sortable="custom"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="Name"
-        label="模板"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column
-        prop="Value"
-        label="签名内容(EN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="ValueCN"
-        label="签名内容(CN)"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        prop="UpdateTime"
-        label="更新时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-
-      <el-table-column
-        prop="CreateTime"
-        label="创建时间"
-        show-overflow-tooltip
-        sortable="custom"
-      />
-      <el-table-column label="Action" width="200" fixed="right">
-        <template slot-scope="scope">
-          <el-button
-            type="text"
-            @click="handleEdit(scope.row)"
-          >
-            Edit
-          </el-button>
-          <el-button
-            type="text"
-            @click="handleConfig(scope.row)"
-          >
-            场景配置
-          </el-button>
-
-          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
-
-        </template>
-      </el-table-column>
-    </el-table>
-
-    <!-- 分页组件 -->
-    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
-
-    <!-- 新增、编辑 -->
-    <el-dialog
-      v-if="editVisible"
-      :visible.sync="editVisible"
-      :close-on-click-modal="false"
-      :title="title"
-      width="700px"
-      custom-class="base-dialog-wrapper"
-    >
-      <SignTemplateForm :data="rowData" @closeDialog="closeDialog" @getList="getList" />
-    </el-dialog>
-
-    <!-- 场景配置 -->
-    <el-dialog
-      v-if="configVisible"
-      :visible.sync="configVisible"
-      title="场景配置"
-      :fullscreen="true"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-    >
-      <SceneList :parent-id="rowData.Id" @closeDialog="closeDialog" />
-    </el-dialog>
-  </box-content>
-</template>
-<script>
-import { getSystemBasicDataList, deleteSystemBasicData } from '@/api/dictionary'
-import BoxContent from '@/components/BoxContent'
-import SignTemplateForm from './components/SignTemplateForm'
-import SceneList from './components/SceneList'
-import Pagination from '@/components/Pagination'
-const searchDataDefault = () => {
-  return {
-    Code: '',
-    Name: '',
-    PageIndex: 1,
-    PageSize: 20
-  }
-}
-export default {
-  name: 'SignTemplate',
-  components: { BoxContent, SignTemplateForm, Pagination, SceneList },
-  data() {
-    return {
-      searchData: searchDataDefault(),
-      loading: false,
-      list: [],
-      total: 0,
-      rowData: {},
-      title: '',
-      editVisible: false,
-      configVisible: false
-    }
-  },
-  mounted() {
-    this.getList()
-  },
-  methods: {
-    // 获取受试者列表
-    getList() {
-      this.loading = true
-      getSystemBasicDataList(this.searchData).then(res => {
-        this.loading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.loading = false })
-    },
-    // 新增
-    handleAdd() {
-      this.rowData = {}
-      this.title = 'Add'
-      this.editVisible = true
-    },
-    // 编辑
-    handleEdit(row) {
-      this.rowData = { ...row }
-      this.title = 'Edit'
-      this.editVisible = true
-    },
-    // 删除
-    handleDelete(row) {
-      this.$confirm('Sure to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteSystemBasicData(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-    },
-    // 场景配置
-    handleConfig(row) {
-      this.rowData = { ...row }
-      this.configVisible = true
-    },
-    // 查询
-    handleSearch() {
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 重置
-    handleReset() {
-      this.searchData = searchDataDefault()
-      this.getList()
-    },
-    // 排序
-    handleSortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.searchData.Asc = true
-      } else {
-        this.searchData.Asc = false
-      }
-      this.searchData.SortField = column.prop
-      this.searchData.PageIndex = 1
-      this.getList()
-    },
-    // 关闭新增、编辑框
-    closeDialog() {
-      this.editVisible = false
-    }
-  }
-}
-</script>
+<template>
+  <box-content>
+    <!-- 搜索框 -->
+    <div class="search">
+      <el-form :inline="true" size="mini" class="base-search-form">
+        <el-form-item label="编号:">
+          <el-input v-model="searchData.Code" style="width:100px;" />
+        </el-form-item>
+        <el-form-item label="模板:">
+          <el-input v-model="searchData.Name" style="width:100px;" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="handleReset">Reset</el-button>
+          <el-button type="primary" @click="handleSearch">Search</el-button>
+        </el-form-item>
+      </el-form>
+      <span style="margin-left:auto;">
+        <el-button
+          type="primary"
+          size="mini"
+          @click="handleAdd"
+        >
+          New
+        </el-button>
+      </span>
+
+    </div>
+
+    <!-- 受试者列表 -->
+    <el-table
+      v-loading="loading"
+      v-adaptive="{bottomOffset:45}"
+      :data="list"
+      stripe
+      height="100"
+      style="width:100%"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+
+      <el-table-column
+        prop="Code"
+        label="Code"
+        sortable="custom"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="Name"
+        label="模板"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column
+        prop="Value"
+        label="签名内容(EN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="ValueCN"
+        label="签名内容(CN)"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        prop="UpdateTime"
+        label="更新时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+
+      <el-table-column
+        prop="CreateTime"
+        label="创建时间"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <el-table-column label="Action" width="200" fixed="right">
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleEdit(scope.row)"
+          >
+            Edit
+          </el-button>
+          <el-button
+            type="text"
+            @click="handleConfig(scope.row)"
+          >
+            场景配置
+          </el-button>
+
+          <el-button type="text" @click="handleDelete(scope.row)">Delete</el-button>
+
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 分页组件 -->
+    <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize" @pagination="getList" />
+
+    <!-- 新增、编辑 -->
+    <el-dialog
+      v-if="editVisible"
+      :visible.sync="editVisible"
+      :close-on-click-modal="false"
+      :title="title"
+      width="700px"
+      custom-class="base-dialog-wrapper"
+    >
+      <SignTemplateForm :data="rowData" @closeDialog="closeDialog" @getList="getList" />
+    </el-dialog>
+
+    <!-- 场景配置 -->
+    <el-dialog
+      v-if="configVisible"
+      :visible.sync="configVisible"
+      title="场景配置"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <SceneList :parent-id="rowData.Id" @closeDialog="closeDialog" />
+    </el-dialog>
+  </box-content>
+</template>
+<script>
+import { getSystemBasicDataList, deleteSystemBasicData } from '@/api/dictionary'
+import BoxContent from '@/components/BoxContent'
+import SignTemplateForm from './components/SignTemplateForm'
+import SceneList from './components/SceneList'
+import Pagination from '@/components/Pagination'
+const searchDataDefault = () => {
+  return {
+    Code: '',
+    Name: '',
+    PageIndex: 1,
+    PageSize: 20
+  }
+}
+export default {
+  name: 'SignTemplate',
+  components: { BoxContent, SignTemplateForm, Pagination, SceneList },
+  data() {
+    return {
+      searchData: searchDataDefault(),
+      loading: false,
+      list: [],
+      total: 0,
+      rowData: {},
+      title: '',
+      editVisible: false,
+      configVisible: false
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    // 获取受试者列表
+    getList() {
+      this.loading = true
+      getSystemBasicDataList(this.searchData).then(res => {
+        this.loading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { this.loading = false })
+    },
+    // 新增
+    handleAdd() {
+      this.rowData = {}
+      this.title = 'Add'
+      this.editVisible = true
+    },
+    // 编辑
+    handleEdit(row) {
+      this.rowData = { ...row }
+      this.title = 'Edit'
+      this.editVisible = true
+    },
+    // 删除
+    handleDelete(row) {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteSystemBasicData(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+    },
+    // 场景配置
+    handleConfig(row) {
+      this.rowData = { ...row }
+      this.configVisible = true
+    },
+    // 查询
+    handleSearch() {
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 重置
+    handleReset() {
+      this.searchData = searchDataDefault()
+      this.getList()
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.searchData.Asc = true
+      } else {
+        this.searchData.Asc = false
+      }
+      this.searchData.SortField = column.prop
+      this.searchData.PageIndex = 1
+      this.getList()
+    },
+    // 关闭新增、编辑框
+    closeDialog() {
+      this.editVisible = false
+    }
+  }
+}
+</script>
diff --git a/src/views/financials/monthlyPayment/adjustment.vue b/src/views/financials/monthlyPayment/adjustment.vue
index d62af939..e6f1f9b0 100644
--- a/src/views/financials/monthlyPayment/adjustment.vue
+++ b/src/views/financials/monthlyPayment/adjustment.vue
@@ -1,242 +1,241 @@
-<template>
-  <div class="app-container adjustment-container data-list">
-    <div class="filter-container">
-      <el-input v-model="listQuery.Reviewer" style="width:220px" size="small" placeholder="Reviewer ID" class="mr" />
-      <el-date-picker
-        v-model="listQuery.BeginMonth"
-        size="small"
-        placeholder="Beginning date"
-        type="month"
-        value-format="yyyy-MM"
-        disabled
-        class="mr"
-      />
-      <el-button size="small" type="text" @click="handleReset">Reset</el-button>
-      <el-button type="primary" size="small" @click="handleSearch">Search</el-button>
-      <el-button style="margin-left:auto" type="primary" size="small" @click="handleNew">New</el-button>
-    </div>
-    <div class="data-table">
-      <el-table
-        v-loading="listLoading"
-        stripe
-        :data="list"
-        height="100%"
-        size="small"
-        @sort-change="sortByColumn"
-      >
-        <el-table-column type="index" width="50" />
-        <el-table-column
-          prop="LastName"
-          label="Name"
-          min-width="100"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">{{ scope.row.LastName + ' / ' + scope.row.FirstName }}</template>
-        </el-table-column>
-        <el-table-column
-          prop="ChineseName"
-          label="Name CN"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="ReviewerCode"
-          label="Reviewer ID"
-          min-width="110"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <el-table-column
-          prop="AdjustPaymentUSD"
-          label="Amount($)"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">{{ scope.row.AdjustPaymentUSD | rounding }}</template>
-        </el-table-column>
-        <el-table-column
-          prop="AdjustPaymentCNY"
-          label="Amount(￥)"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.AdjustPaymentCNY | rounding }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column prop="Note" label="Note" min-width="120" show-overflow-tooltip />
-        <el-table-column
-          prop="YearMonth"
-          label="Adjust Month"
-          min-width="120"
-          sortable="custom"
-          show-overflow-tooltip
-        />
-        <el-table-column label="Action">
-          <template slot-scope="scope">
-            <el-button size="small" type="text" :disabled="scope.row.IsLock" @click="handleEdit(scope.row)">Edit</el-button>
-            <el-button
-              size="small"
-              type="text"
-              :disabled="scope.row.IsLock"
-              @click="handleDelete(scope.row)"
-            >Delete</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="pagination">
-      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
-    </div>
-    <el-dialog
-      :title="title"
-      :visible.sync="dialogVisible"
-      :close-on-click-modal="false"
-      width="600px"
-    >
-      <adjustment-form
-        :key="timer"
-        :row="row"
-        :date="date"
-        :exchange-rate="exchangeRate"
-        @closeDialog="closeDialog"
-        @getList="getList"
-      />
-    </el-dialog>
-  </div>
-</template>
-<script>
-import Pagination from '@/components/Pagination'
-import AdjustmentForm from './components/AdjustmentForm'
-import { getPaymentAdjustmentList, deletePaymentAdjustment } from '@/api/financials'
-import { FormatTime } from '@/utils/formatter'
-export default {
-  filters: {
-    rounding(value) {
-      return value ? Number(value).toFixed(2) : value
-    }
-  },
-  components: { Pagination, AdjustmentForm },
-  data() {
-    return {
-      listQuery: {
-        TrialCode: '',
-        Reviewer: '',
-        BeginMonth: '',
-        EndMonth: '',
-        PageIndex: 1,
-        PageSize: 20,
-        Asc: false,
-        SortField: ''
-      },
-      listLoading: false,
-      list: [],
-      total: 0,
-      exchangeRate: '',
-      date: '',
-      timer: '',
-      dialogVisible: false,
-      title: '',
-      row: ''
-    }
-  },
-  mounted() {
-    this.date = this.$router.currentRoute.query.date
-    this.listQuery.BeginMonth = this.date
-    this.listQuery.EndMonth = this.date
-    // this.exchangeRate = this.$router.currentRoute.query.exchangeRate ? parseInt(this.$router.currentRoute.query.exchangeRate) : 0
-    this.exchangeRate = this.$router.currentRoute.query.exchangeRate ? this.$router.currentRoute.query.exchangeRate : 0
-    this.getList()
-  },
-  methods: {
-    getList() {
-      this.listLoading = true
-      getPaymentAdjustmentList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      })
-    },
-    handleNew() {
-      this.title = 'New'
-      this.row = {}
-      this.timer = new Date().getTime()
-      this.dialogVisible = true
-    },
-    handleEdit(row) {
-      this.title = 'Edit'
-      this.row = JSON.parse(JSON.stringify(row))
-      this.timer = new Date().getTime()
-      this.dialogVisible = true
-    },
-    handleDelete(row) {
-      this.$confirm('Confirm to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deletePaymentAdjustment(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.indexOf(row), 1)
-                this.total = this.total - 1
-                this.$message.success('Deleted successfully !')
-              }
-            })
-        })
-    },
-    handleSearch() {
-      this.listQuery.PageIndex = 1
-      this.getList()
-    },
-    handleReset() {
-      this.listQuery.PageIndex = 1
-      this.listQuery.Reviewer = ''
-      this.getList()
-    },
-    sortByColumn(column) {
-      if (column.order === 'ascending') {
-        this.listQuery.Asc = true
-      } else {
-        this.listQuery.Asc = false
-      }
-      this.listQuery.SortField = column.prop
-      this.listQuery.PageIndex = 1
-      this.getList()
-    },
-    closeDialog() {
-      this.dialogVisible = false
-    },
-    adjustMonthFormatter(row) {
-      if (row.AdjustedYearMonth) {
-        const date = new Date(row.AdjustedYearMonth)
-        return FormatTime(date, 'yyyy-MM')
-      } else {
-        return ''
-      }
-    }
-  }
-}
-</script>
-<style lang="scss">
-.adjustment-container{
-
-  .filter-container{
-    display: flex;
-    align-items: center;
-    .mr{
-      margin-right:5px;
-    }
-  }
-  .list-container{
-    height: calc(100% - 80px);
-  }
-}
-</style>
-
+<template>
+  <div class="app-container adjustment-container data-list">
+    <div class="filter-container">
+      <el-input v-model="listQuery.Reviewer" style="width:220px" size="small" placeholder="Reviewer ID" class="mr" />
+      <el-date-picker
+        v-model="listQuery.BeginMonth"
+        size="small"
+        placeholder="Beginning date"
+        type="month"
+        value-format="yyyy-MM"
+        disabled
+        class="mr"
+      />
+      <el-button size="small" type="text" @click="handleReset">Reset</el-button>
+      <el-button type="primary" size="small" @click="handleSearch">Search</el-button>
+      <el-button style="margin-left:auto" type="primary" size="small" @click="handleNew">New</el-button>
+    </div>
+    <div class="data-table">
+      <el-table
+        v-loading="listLoading"
+        stripe
+        :data="list"
+        height="100%"
+        size="small"
+        @sort-change="sortByColumn"
+      >
+        <el-table-column type="index" width="50" />
+        <el-table-column
+          prop="LastName"
+          label="Name"
+          min-width="100"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">{{ scope.row.LastName + ' / ' + scope.row.FirstName }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="ChineseName"
+          label="Name CN"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="ReviewerCode"
+          label="Reviewer ID"
+          min-width="110"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column
+          prop="AdjustPaymentUSD"
+          label="Amount($)"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">{{ scope.row.AdjustPaymentUSD | rounding }}</template>
+        </el-table-column>
+        <el-table-column
+          prop="AdjustPaymentCNY"
+          label="Amount(￥)"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.AdjustPaymentCNY | rounding }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column prop="Note" label="Note" min-width="120" show-overflow-tooltip />
+        <el-table-column
+          prop="YearMonth"
+          label="Adjust Month"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        />
+        <el-table-column label="Action">
+          <template slot-scope="scope">
+            <el-button size="small" type="text" :disabled="scope.row.IsLock" @click="handleEdit(scope.row)">Edit</el-button>
+            <el-button
+              size="small"
+              type="text"
+              :disabled="scope.row.IsLock"
+              @click="handleDelete(scope.row)"
+            >Delete</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="pagination">
+      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+    </div>
+    <el-dialog
+      :title="title"
+      :visible.sync="dialogVisible"
+      :close-on-click-modal="false"
+      width="600px"
+    >
+      <adjustment-form
+        :key="timer"
+        :row="row"
+        :date="date"
+        :exchange-rate="exchangeRate"
+        @closeDialog="closeDialog"
+        @getList="getList"
+      />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination'
+import AdjustmentForm from './components/AdjustmentForm'
+import { getPaymentAdjustmentList, deletePaymentAdjustment } from '@/api/financials'
+import { FormatTime } from '@/utils/formatter'
+export default {
+  filters: {
+    rounding(value) {
+      return value ? Number(value).toFixed(2) : value
+    }
+  },
+  components: { Pagination, AdjustmentForm },
+  data() {
+    return {
+      listQuery: {
+        TrialCode: '',
+        Reviewer: '',
+        BeginMonth: '',
+        EndMonth: '',
+        PageIndex: 1,
+        PageSize: 20,
+        Asc: false,
+        SortField: ''
+      },
+      listLoading: false,
+      list: [],
+      total: 0,
+      exchangeRate: '',
+      date: '',
+      timer: '',
+      dialogVisible: false,
+      title: '',
+      row: ''
+    }
+  },
+  mounted() {
+    this.date = this.$router.currentRoute.query.date
+    this.listQuery.BeginMonth = this.date
+    this.listQuery.EndMonth = this.date
+    // this.exchangeRate = this.$router.currentRoute.query.exchangeRate ? parseInt(this.$router.currentRoute.query.exchangeRate) : 0
+    this.exchangeRate = this.$router.currentRoute.query.exchangeRate ? this.$router.currentRoute.query.exchangeRate : 0
+    this.getList()
+  },
+  methods: {
+    getList() {
+      this.listLoading = true
+      getPaymentAdjustmentList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      })
+    },
+    handleNew() {
+      this.title = 'New'
+      this.row = {}
+      this.timer = new Date().getTime()
+      this.dialogVisible = true
+    },
+    handleEdit(row) {
+      this.title = 'Edit'
+      this.row = JSON.parse(JSON.stringify(row))
+      this.timer = new Date().getTime()
+      this.dialogVisible = true
+    },
+    handleDelete(row) {
+      this.$confirm('Confirm to delete?', {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deletePaymentAdjustment(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.indexOf(row), 1)
+                this.total = this.total - 1
+                this.$message.success('Deleted successfully !')
+              }
+            })
+        })
+    },
+    handleSearch() {
+      this.listQuery.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery.PageIndex = 1
+      this.listQuery.Reviewer = ''
+      this.getList()
+    },
+    sortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.listQuery.Asc = true
+      } else {
+        this.listQuery.Asc = false
+      }
+      this.listQuery.SortField = column.prop
+      this.listQuery.PageIndex = 1
+      this.getList()
+    },
+    closeDialog() {
+      this.dialogVisible = false
+    },
+    adjustMonthFormatter(row) {
+      if (row.AdjustedYearMonth) {
+        const date = new Date(row.AdjustedYearMonth)
+        return FormatTime(date, 'yyyy-MM')
+      } else {
+        return ''
+      }
+    }
+  }
+}
+</script>
+<style lang="scss">
+.adjustment-container{
+
+  .filter-container{
+    display: flex;
+    align-items: center;
+    .mr{
+      margin-right:5px;
+    }
+  }
+  .list-container{
+    height: calc(100% - 80px);
+  }
+}
+</style>
+
diff --git a/src/views/financials/monthlyPayment/components/ExchangeRate.vue b/src/views/financials/monthlyPayment/components/ExchangeRate.vue
index e21c515d..c2da9188 100644
--- a/src/views/financials/monthlyPayment/components/ExchangeRate.vue
+++ b/src/views/financials/monthlyPayment/components/ExchangeRate.vue
@@ -1,198 +1,198 @@
-<template>
-  <div class="app-container exchange-rate data-list">
-    <div class="filter-container">
-      <el-date-picker
-        v-model="listQuery.SearchMonth"
-        size="small"
-        placeholder="Search Month"
-        value-format="yyyy-MM"
-        format="yyyy-MM"
-        type="month"
-        style="width:150px;margin-right:5px"
-        :picker-options="pickerOption"
-      />
-      <el-button size="small" type="text" @click="handleReset">Reset</el-button>
-      <el-button type="primary" size="small" @click="handleSearch">Search</el-button>
-      <el-button style="margin-left:auto" type="primary" size="small" @click="handleNew">New</el-button>
-    </div>
-    <div class="list-container">
-      <el-table
-        v-loading="listLoading"
-        :data="list"
-        stripe
-        class="table"
-        height="100%"
-        size="small"
-      >
-        <el-table-column type="index" width="50" />
-
-        <el-table-column prop="YearMonth" label="Month" min-width="60" show-overflow-tooltip />
-        <el-table-column prop="Rate" label="Rate" min-width="60" show-overflow-tooltip />
-        <el-table-column prop="UpdateTime" label="Update Time" min-width="70" show-overflow-tooltip />
-
-        <el-table-column fixed="right" label="Action" min-width="150">
-          <template slot-scope="scope" min-width="130">
-            <el-button
-              size="small"
-              type="text"
-              @click="handleEdit(scope.row)"
-            >Edit</el-button>
-            <el-button
-              size="small"
-              type="text"
-              @click="handleDelete(scope.row)"
-            >Delete</el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-    </div>
-    <div class="pagination">
-      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
-    </div>
-    <el-dialog
-      :key="timer"
-      :title="title"
-      :visible.sync="dialogVisible"
-      width="500px"
-      :close-on-click-modal="false"
-      size="small"
-    >
-      <el-form ref="rateForm" label-width="150px" :rules="rules" :model="form" size="small">
-        <el-form-item label="Month: " prop="YearMonth">
-          <el-date-picker
-            v-model="form.YearMonth"
-            type="month"
-            value-format="yyyy-MM"
-            :disabled="form.Id !=''&& form.Id !=undefined"
-          />
-        </el-form-item>
-        <el-form-item label="Exchange Rate: " prop="Rate">
-          <el-input v-model="form.Rate" type="number" />
-        </el-form-item>
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">Cancel</el-button>
-        <el-button type="primary" :disabled="btnDisabled" size="small" @click="handleSave">Ok</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import { getRateList, addOrUpdateExchangeRate, deleteExchangeRate } from '@/api/financials'
-import Pagination from '@/components/Pagination'
-export default {
-  name: 'ExchangeRate',
-  components: { Pagination },
-  data() {
-    return {
-      listQuery: { SearchMonth: '', PageIndex: 1, PageSize: 20 },
-      list: [],
-      listLoading: false,
-      total: 0,
-      dialogVisible: false,
-      title: '',
-      timer: '',
-      form: {},
-      rules: {
-        Rate: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        YearMonth: [{ required: true, message: 'Please specify', trigger: 'blur' }]
-      },
-      btnDisabled: false,
-      pickerOption: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
-      }
-    }
-  },
-  mounted() { this.getList() },
-  methods: {
-    getList() {
-      this.listLoading = true
-      getRateList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.listLoading = false })
-    },
-    handleNew() {
-      this.form = {}
-      this.title = 'Add'
-      this.timer = new Date().getTime()
-      this.dialogVisible = true
-    },
-    handleEdit(row) {
-      this.title = 'Edit'
-      this.form = JSON.parse(JSON.stringify(row))
-      this.timer = new Date().getTime()
-      this.dialogVisible = true
-    },
-    handleSave() {
-      this.$refs.rateForm.validate(valid => {
-        if (valid) {
-          this.btnDisabled = true
-          const param = {
-            Rate: this.form.Rate,
-            YearMonth: this.form.YearMonth
-          }
-          this.form.Id ? param.Id = this.form.Id : ''
-          addOrUpdateExchangeRate(param).then(res => {
-            if (res.IsSuccess) {
-              this.getList()
-              this.$message.success('Updated successfully!')
-              this.dialogVisible = false
-            }
-            this.btnDisabled = false
-          })
-            .catch(() => { this.btnDisabled = false })
-        }
-      })
-    },
-    handleDelete(row) {
-      this.$confirm('Confirm to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Yes',
-        cancelButtonText: 'No'
-      })
-        .then(() => {
-          deleteExchangeRate(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-        })
-        .catch(action => {})
-    },
-    handleSearch() {
-      this.listQuery.PageIndex = 1
-      this.getList()
-    },
-    handleReset() {
-      this.listQuery.SearchMonth = ''
-      this.listQuery.PageIndex = 1
-      this.getList()
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.exchange-rate{
-  padding: 0;
-  .filter-container{
-    display: flex;
-    align-items: center;
-  }
-  .list-container{
-    height: calc(100% - 70px);
-  }
-  .el-date-editor.el-input{
-    width: 100%;
-  }
-  .el-date-editor.el-input__inner {
-    width: 100%;
-  }
-}
-</style>
+<template>
+  <div class="app-container exchange-rate data-list">
+    <div class="filter-container">
+      <el-date-picker
+        v-model="listQuery.SearchMonth"
+        size="small"
+        placeholder="Search Month"
+        value-format="yyyy-MM"
+        format="yyyy-MM"
+        type="month"
+        style="width:150px;margin-right:5px"
+        :picker-options="pickerOption"
+      />
+      <el-button size="small" type="text" @click="handleReset">Reset</el-button>
+      <el-button type="primary" size="small" @click="handleSearch">Search</el-button>
+      <el-button style="margin-left:auto" type="primary" size="small" @click="handleNew">New</el-button>
+    </div>
+    <div class="list-container">
+      <el-table
+        v-loading="listLoading"
+        :data="list"
+        stripe
+        class="table"
+        height="100%"
+        size="small"
+      >
+        <el-table-column type="index" width="50" />
+
+        <el-table-column prop="YearMonth" label="Month" min-width="60" show-overflow-tooltip />
+        <el-table-column prop="Rate" label="Rate" min-width="60" show-overflow-tooltip />
+        <el-table-column prop="UpdateTime" label="Update Time" min-width="70" show-overflow-tooltip />
+
+        <el-table-column fixed="right" label="Action" min-width="150">
+          <template slot-scope="scope" min-width="130">
+            <el-button
+              size="small"
+              type="text"
+              @click="handleEdit(scope.row)"
+            >Edit</el-button>
+            <el-button
+              size="small"
+              type="text"
+              @click="handleDelete(scope.row)"
+            >Delete</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <div class="pagination">
+      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+    </div>
+    <el-dialog
+      :key="timer"
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="500px"
+      :close-on-click-modal="false"
+      size="small"
+    >
+      <el-form ref="rateForm" label-width="150px" :rules="rules" :model="form" size="small">
+        <el-form-item label="Month: " prop="YearMonth">
+          <el-date-picker
+            v-model="form.YearMonth"
+            type="month"
+            value-format="yyyy-MM"
+            :disabled="form.Id !=''&& form.Id !=undefined"
+          />
+        </el-form-item>
+        <el-form-item label="Exchange Rate: " prop="Rate">
+          <el-input v-model="form.Rate" type="number" />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">Cancel</el-button>
+        <el-button type="primary" :disabled="btnDisabled" size="small" @click="handleSave">Ok</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getRateList, addOrUpdateExchangeRate, deleteExchangeRate } from '@/api/financials'
+import Pagination from '@/components/Pagination'
+export default {
+  name: 'ExchangeRate',
+  components: { Pagination },
+  data() {
+    return {
+      listQuery: { SearchMonth: '', PageIndex: 1, PageSize: 20 },
+      list: [],
+      listLoading: false,
+      total: 0,
+      dialogVisible: false,
+      title: '',
+      timer: '',
+      form: {},
+      rules: {
+        Rate: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        YearMonth: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+      },
+      btnDisabled: false,
+      pickerOption: {
+        disabledDate: time => {
+          return time.getTime() > Date.now()
+        }
+      }
+    }
+  },
+  mounted() { this.getList() },
+  methods: {
+    getList() {
+      this.listLoading = true
+      getRateList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { this.listLoading = false })
+    },
+    handleNew() {
+      this.form = {}
+      this.title = 'Add'
+      this.timer = new Date().getTime()
+      this.dialogVisible = true
+    },
+    handleEdit(row) {
+      this.title = 'Edit'
+      this.form = JSON.parse(JSON.stringify(row))
+      this.timer = new Date().getTime()
+      this.dialogVisible = true
+    },
+    handleSave() {
+      this.$refs.rateForm.validate(valid => {
+        if (valid) {
+          this.btnDisabled = true
+          const param = {
+            Rate: this.form.Rate,
+            YearMonth: this.form.YearMonth
+          }
+          this.form.Id ? param.Id = this.form.Id : ''
+          addOrUpdateExchangeRate(param).then(res => {
+            if (res.IsSuccess) {
+              this.getList()
+              this.$message.success('Updated successfully!')
+              this.dialogVisible = false
+            }
+            this.btnDisabled = false
+          })
+            .catch(() => { this.btnDisabled = false })
+        }
+      })
+    },
+    handleDelete(row) {
+      this.$confirm('Confirm to delete?', {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+        confirmButtonText: 'Yes',
+        cancelButtonText: 'No'
+      })
+        .then(() => {
+          deleteExchangeRate(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+        })
+        .catch(action => {})
+    },
+    handleSearch() {
+      this.listQuery.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery.SearchMonth = ''
+      this.listQuery.PageIndex = 1
+      this.getList()
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.exchange-rate{
+  padding: 0;
+  .filter-container{
+    display: flex;
+    align-items: center;
+  }
+  .list-container{
+    height: calc(100% - 70px);
+  }
+  .el-date-editor.el-input{
+    width: 100%;
+  }
+  .el-date-editor.el-input__inner {
+    width: 100%;
+  }
+}
+</style>
diff --git a/src/views/financials/monthlyPayment/components/RankBasedRates.vue b/src/views/financials/monthlyPayment/components/RankBasedRates.vue
index 18063b63..3fa65d11 100644
--- a/src/views/financials/monthlyPayment/components/RankBasedRates.vue
+++ b/src/views/financials/monthlyPayment/components/RankBasedRates.vue
@@ -1,324 +1,323 @@
-<template>
-  <div class="rates-container">
-    <div class="title">
-      <p>Rank-Based Rates</p>
-      <el-button
-        type="primary"
-        class="addBtn"
-        size="small"
-        @click="handleAdd"
-      >New</el-button>
-    </div>
-    <el-table
-      v-loading="listLoading"
-      size="small"
-      :data="list"
-      max-height="300"
-      stripe
-      class="table"
-    >
-      <el-table-column type="index" width="40" />
-      <el-table-column prop="RankName" label="Rank" show-overflow-tooltip min-width="100" />
-      <el-table-column prop="Training" label="Training ($)" min-width="90" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.Training | rounding }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column prop="RefresherTraining" label="Refresher Training ($)" min-width="130" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.RefresherTraining | rounding }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="Timepoint" align="center">
-        <el-table-column
-          prop="Timepoint"
-          label="Regular ($)"
-          min-width="90"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.Timepoint | rounding }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="TimepointIn48H"
-          label="48-hour ($)"
-          min-width="90"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.TimepointIn48H | rounding }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="TimepointIn24H"
-          label="24-hour ($)"
-          min-width="90"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.TimepointIn24H | rounding }}</span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column label="Adjudication" align="center">
-        <el-table-column
-          prop="Adjudication"
-          label="Regular ($)"
-          min-width="90"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.Adjudication | rounding }}</span>
-          </template>
-        </el-table-column>
-
-        <el-table-column
-          prop="AdjudicationIn48H"
-          label="48-hour ($)"
-          min-width="90"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.AdjudicationIn48H | rounding }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column
-          prop="AdjudicationIn24H"
-          label="24-hour ($)"
-          min-width="90"
-          show-overflow-tooltip
-        >
-          <template slot-scope="scope">
-            <span>{{ scope.row.AdjudicationIn24H | rounding }}</span>
-          </template>
-        </el-table-column>
-      </el-table-column>
-      <el-table-column prop="Global" label="Global ($)" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.Global | rounding }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column prop="Downtime" label="Downtime ($)" min-width="100" show-overflow-tooltip>
-        <template slot-scope="scope">
-          <span>{{ scope.row.Downtime | rounding }}</span>
-        </template>
-      </el-table-column>
-
-      <el-table-column
-        fixed="right"
-        label="Action"
-        min-width="100"
-      >
-        <template slot-scope="scope" min-width="130">
-          <el-button
-            size="small"
-            type="text"
-            @click="handleEdit(scope.row)"
-          >Edit</el-button>
-          <el-button
-            size="small"
-            type="text"
-            @click="handleDelete(scope.row)"
-          >Delete</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <pagination style="text-align:right;margin-top:5px;" :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
-
-    <el-dialog
-      :key="timer"
-      :title="title"
-      :visible.sync="dialogVisible"
-      width="500px"
-      :close-on-click-modal="false"
-    >
-      <el-form ref="baseRateForm" label-width="190px" :rules="rules" :model="baseRateForm" size="small">
-        <el-form-item label="Rank: " prop="RankName">
-          <el-input v-model="baseRateForm.RankName" />
-        </el-form-item>
-        <el-form-item label="Training ($): " prop="Training">
-          <!-- <el-input v-model="baseRateForm.Training" type="number" /> -->
-          <el-input-number v-model="baseRateForm.Training" style="width:100%;" :min="0" />
-        </el-form-item>
-        <el-form-item label="Refresher Training ($): " prop="RefresherTraining">
-          <el-input-number v-model="baseRateForm.RefresherTraining" style="width:100%;" :min="0" />
-        </el-form-item>
-        <el-form-item label="Timepoint ($): " prop="Timepoint">
-          <!-- <el-input v-model="baseRateForm.Timepoint" type="number"  /> -->
-          <el-input-number v-model="baseRateForm.Timepoint" style="width:100%;" :min="0" @input="timepointChange" />
-        </el-form-item>
-
-        <el-form-item label="Timepoint 48H ($): " prop="TimepointIn48H">
-          <!-- <el-input v-model="baseRateForm.TimepointIn48H" type="number" /> -->
-          <el-input-number v-model="baseRateForm.TimepointIn48H" style="width:100%;" :min="0" />
-        </el-form-item>
-        <el-form-item label="Timepoint 24H ($): " prop="TimepointIn24H">
-          <!-- <el-input v-model="baseRateForm.TimepointIn24H" type="number" /> -->
-          <el-input-number v-model="baseRateForm.TimepointIn24H" style="width:100%;" :min="0" />
-        </el-form-item>
-        <el-form-item label="Adjudication ($): " prop="Adjudication">
-          <!-- <el-input v-model="baseRateForm.Adjudication" type="number" /> -->
-          <el-input-number v-model="baseRateForm.Adjudication" style="width:100%;" :min="0" />
-        </el-form-item>
-
-        <el-form-item label="Adjudication 48H ($): " prop="AdjudicationIn48H">
-          <!-- <el-input v-model="baseRateForm.AdjudicationIn48H" type="number" /> -->
-          <el-input-number v-model="baseRateForm.AdjudicationIn48H" style="width:100%;" :min="0" />
-        </el-form-item>
-        <el-form-item label="Adjudication 24H ($): " prop="AdjudicationIn24H">
-          <!-- <el-input v-model="baseRateForm.AdjudicationIn24H" type="number" /> -->
-          <el-input-number v-model="baseRateForm.AdjudicationIn24H" style="width:100%;" :min="0" />
-        </el-form-item>
-        <el-form-item label="Global ($): " prop="Global">
-          <el-input v-model="baseRateForm.Global" disabled type="number" />
-        </el-form-item>
-
-        <el-form-item label="Downtime ($): " prop="Downtime">
-          <el-input-number v-model="baseRateForm.Downtime" style="width:100%;" :min="0" />
-          <!-- <el-input v-model="baseRateForm.Downtime" type="number" /> -->
-        </el-form-item>
-
-      </el-form>
-      <span slot="footer" class="dialog-footer">
-        <el-button size="small" @click="dialogVisible = false">Cancel</el-button>
-        <el-button type="primary" :disabled="btnDisabled" size="small" @click="handleSave">Ok</el-button>
-      </span>
-    </el-dialog>
-  </div>
-</template>
-<script>
-import Pagination from '@/components/Pagination'
-import { getRankPriceList, addOrUpdateRankPrice, deleteRankPrice } from '@/api/financials'
-const getListQueryDefault = () => {
-  return {
-    PageSize: 20,
-    PageIndex: 1,
-    Asc: false,
-    SortField: ''
-  }
-}
-export default {
-  name: 'RankBasedRates',
-  components: { Pagination },
-  filters: {
-    rounding(value) {
-      return value ? Number(value).toFixed(2) : value
-    }
-  },
-  data() {
-    return {
-      listQuery: getListQueryDefault(),
-      list: [],
-      listLoading: false,
-      total: 0,
-      baseRateForm: {},
-      dialogVisible: false,
-      btnDisabled: false,
-      title: '',
-      timer: '',
-      rules: {
-        RankName: [
-          { required: true, message: 'Please specify', trigger: 'blur' },
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        Training: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        Timepoint: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        TimepointIn24H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        TimepointIn48H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        Adjudication: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        AdjudicationIn24H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        AdjudicationIn48H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        Global: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        Downtime: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        RefresherTraining: [{ required: true, message: 'Please specify', trigger: 'blur' }]
-      }
-    }
-  },
-  mounted() { this.getList() },
-  methods: {
-    getList() {
-      this.listLoading = true
-      getRankPriceList(this.listQuery).then(res => {
-        this.listLoading = false
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { this.listLoading = false })
-    },
-    handleAdd() {
-      this.baseRateForm = {}
-      this.timer = new Date().getTime()
-      this.title = 'Add'
-      this.dialogVisible = true
-    },
-    handleEdit(row) {
-      this.title = 'Edit'
-      this.timer = new Date().getTime()
-      this.baseRateForm = JSON.parse(JSON.stringify(row))
-      this.dialogVisible = true
-    },
-    handleDelete(row) {
-      this.$confirm('Confirm to delete?', {
-        type: 'warning',
-        distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
-      })
-        .then(() => {
-          deleteRankPrice(row.Id)
-            .then(res => {
-              if (res.IsSuccess) {
-                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
-              }
-            })
-            .catch(err => {
-              console.log(err)
-            })
-        })
-    },
-    handleSave() {
-      this.$refs.baseRateForm.validate(valid => {
-        if (valid) {
-          this.btnDisabled = true
-          addOrUpdateRankPrice(this.baseRateForm).then(res => {
-            this.getList()
-            this.btnDisabled = false
-            this.$message.success('Saved successfully!')
-            this.dialogVisible = false
-          }).catch(() => { this.btnDisabled = false })
-        }
-      })
-    },
-    timepointChange() {
-      this.baseRateForm.Global = this.baseRateForm.Timepoint / 2
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.rates-container {
-  .title {
-    position: relative;
-    height: 35px;
-    line-height: 35px;
-    background: #e4ebf1;
-    border-left: 3px solid #0fc8e0;
-    padding-left: 5px;
-    margin-bottom:10px;
-    font-size: 13px;
-    p{
-      margin: 0;
-    }
-    .addBtn {
-      position: absolute;
-      right: 0px;
-      top: 50%;
-      height: 30px;
-      margin-top: -15px;
-    }
-  }
-}
-</style>
+<template>
+  <div class="rates-container">
+    <div class="title">
+      <p>Rank-Based Rates</p>
+      <el-button
+        type="primary"
+        class="addBtn"
+        size="small"
+        @click="handleAdd"
+      >New</el-button>
+    </div>
+    <el-table
+      v-loading="listLoading"
+      size="small"
+      :data="list"
+      max-height="300"
+      stripe
+      class="table"
+    >
+      <el-table-column type="index" width="40" />
+      <el-table-column prop="RankName" label="Rank" show-overflow-tooltip min-width="100" />
+      <el-table-column prop="Training" label="Training ($)" min-width="90" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.Training | rounding }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column prop="RefresherTraining" label="Refresher Training ($)" min-width="130" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.RefresherTraining | rounding }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="Timepoint" align="center">
+        <el-table-column
+          prop="Timepoint"
+          label="Regular ($)"
+          min-width="90"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.Timepoint | rounding }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="TimepointIn48H"
+          label="48-hour ($)"
+          min-width="90"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.TimepointIn48H | rounding }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="TimepointIn24H"
+          label="24-hour ($)"
+          min-width="90"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.TimepointIn24H | rounding }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column label="Adjudication" align="center">
+        <el-table-column
+          prop="Adjudication"
+          label="Regular ($)"
+          min-width="90"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.Adjudication | rounding }}</span>
+          </template>
+        </el-table-column>
+
+        <el-table-column
+          prop="AdjudicationIn48H"
+          label="48-hour ($)"
+          min-width="90"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.AdjudicationIn48H | rounding }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column
+          prop="AdjudicationIn24H"
+          label="24-hour ($)"
+          min-width="90"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            <span>{{ scope.row.AdjudicationIn24H | rounding }}</span>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column prop="Global" label="Global ($)" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.Global | rounding }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column prop="Downtime" label="Downtime ($)" min-width="100" show-overflow-tooltip>
+        <template slot-scope="scope">
+          <span>{{ scope.row.Downtime | rounding }}</span>
+        </template>
+      </el-table-column>
+
+      <el-table-column
+        fixed="right"
+        label="Action"
+        min-width="100"
+      >
+        <template slot-scope="scope" min-width="130">
+          <el-button
+            size="small"
+            type="text"
+            @click="handleEdit(scope.row)"
+          >Edit</el-button>
+          <el-button
+            size="small"
+            type="text"
+            @click="handleDelete(scope.row)"
+          >Delete</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <pagination style="text-align:right;margin-top:5px;" :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+
+    <el-dialog
+      :key="timer"
+      :title="title"
+      :visible.sync="dialogVisible"
+      width="500px"
+      :close-on-click-modal="false"
+    >
+      <el-form ref="baseRateForm" label-width="190px" :rules="rules" :model="baseRateForm" size="small">
+        <el-form-item label="Rank: " prop="RankName">
+          <el-input v-model="baseRateForm.RankName" />
+        </el-form-item>
+        <el-form-item label="Training ($): " prop="Training">
+          <!-- <el-input v-model="baseRateForm.Training" type="number" /> -->
+          <el-input-number v-model="baseRateForm.Training" style="width:100%;" :min="0" />
+        </el-form-item>
+        <el-form-item label="Refresher Training ($): " prop="RefresherTraining">
+          <el-input-number v-model="baseRateForm.RefresherTraining" style="width:100%;" :min="0" />
+        </el-form-item>
+        <el-form-item label="Timepoint ($): " prop="Timepoint">
+          <!-- <el-input v-model="baseRateForm.Timepoint" type="number"  /> -->
+          <el-input-number v-model="baseRateForm.Timepoint" style="width:100%;" :min="0" @input="timepointChange" />
+        </el-form-item>
+
+        <el-form-item label="Timepoint 48H ($): " prop="TimepointIn48H">
+          <!-- <el-input v-model="baseRateForm.TimepointIn48H" type="number" /> -->
+          <el-input-number v-model="baseRateForm.TimepointIn48H" style="width:100%;" :min="0" />
+        </el-form-item>
+        <el-form-item label="Timepoint 24H ($): " prop="TimepointIn24H">
+          <!-- <el-input v-model="baseRateForm.TimepointIn24H" type="number" /> -->
+          <el-input-number v-model="baseRateForm.TimepointIn24H" style="width:100%;" :min="0" />
+        </el-form-item>
+        <el-form-item label="Adjudication ($): " prop="Adjudication">
+          <!-- <el-input v-model="baseRateForm.Adjudication" type="number" /> -->
+          <el-input-number v-model="baseRateForm.Adjudication" style="width:100%;" :min="0" />
+        </el-form-item>
+
+        <el-form-item label="Adjudication 48H ($): " prop="AdjudicationIn48H">
+          <!-- <el-input v-model="baseRateForm.AdjudicationIn48H" type="number" /> -->
+          <el-input-number v-model="baseRateForm.AdjudicationIn48H" style="width:100%;" :min="0" />
+        </el-form-item>
+        <el-form-item label="Adjudication 24H ($): " prop="AdjudicationIn24H">
+          <!-- <el-input v-model="baseRateForm.AdjudicationIn24H" type="number" /> -->
+          <el-input-number v-model="baseRateForm.AdjudicationIn24H" style="width:100%;" :min="0" />
+        </el-form-item>
+        <el-form-item label="Global ($): " prop="Global">
+          <el-input v-model="baseRateForm.Global" disabled type="number" />
+        </el-form-item>
+
+        <el-form-item label="Downtime ($): " prop="Downtime">
+          <el-input-number v-model="baseRateForm.Downtime" style="width:100%;" :min="0" />
+          <!-- <el-input v-model="baseRateForm.Downtime" type="number" /> -->
+        </el-form-item>
+
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button size="small" @click="dialogVisible = false">Cancel</el-button>
+        <el-button type="primary" :disabled="btnDisabled" size="small" @click="handleSave">Ok</el-button>
+      </span>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import Pagination from '@/components/Pagination'
+import { getRankPriceList, addOrUpdateRankPrice, deleteRankPrice } from '@/api/financials'
+const getListQueryDefault = () => {
+  return {
+    PageSize: 20,
+    PageIndex: 1,
+    Asc: false,
+    SortField: ''
+  }
+}
+export default {
+  name: 'RankBasedRates',
+  components: { Pagination },
+  filters: {
+    rounding(value) {
+      return value ? Number(value).toFixed(2) : value
+    }
+  },
+  data() {
+    return {
+      listQuery: getListQueryDefault(),
+      list: [],
+      listLoading: false,
+      total: 0,
+      baseRateForm: {},
+      dialogVisible: false,
+      btnDisabled: false,
+      title: '',
+      timer: '',
+      rules: {
+        RankName: [
+          { required: true, message: 'Please specify', trigger: 'blur' },
+          { max: 50, message: 'The maximum length is 50' }
+        ],
+        Training: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Timepoint: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        TimepointIn24H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        TimepointIn48H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Adjudication: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        AdjudicationIn24H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        AdjudicationIn48H: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Global: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Downtime: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        RefresherTraining: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+      }
+    }
+  },
+  mounted() { this.getList() },
+  methods: {
+    getList() {
+      this.listLoading = true
+      getRankPriceList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { this.listLoading = false })
+    },
+    handleAdd() {
+      this.baseRateForm = {}
+      this.timer = new Date().getTime()
+      this.title = 'Add'
+      this.dialogVisible = true
+    },
+    handleEdit(row) {
+      this.title = 'Edit'
+      this.timer = new Date().getTime()
+      this.baseRateForm = JSON.parse(JSON.stringify(row))
+      this.dialogVisible = true
+    },
+    handleDelete(row) {
+      this.$confirm('Confirm to delete?', {
+        type: 'warning',
+        distinguishCancelAndClose: true,
+
+      })
+        .then(() => {
+          deleteRankPrice(row.Id)
+            .then(res => {
+              if (res.IsSuccess) {
+                this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
+              }
+            })
+            .catch(err => {
+              console.log(err)
+            })
+        })
+    },
+    handleSave() {
+      this.$refs.baseRateForm.validate(valid => {
+        if (valid) {
+          this.btnDisabled = true
+          addOrUpdateRankPrice(this.baseRateForm).then(res => {
+            this.getList()
+            this.btnDisabled = false
+            this.$message.success('Saved successfully!')
+            this.dialogVisible = false
+          }).catch(() => { this.btnDisabled = false })
+        }
+      })
+    },
+    timepointChange() {
+      this.baseRateForm.Global = this.baseRateForm.Timepoint / 2
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.rates-container {
+  .title {
+    position: relative;
+    height: 35px;
+    line-height: 35px;
+    background: #e4ebf1;
+    border-left: 3px solid #0fc8e0;
+    padding-left: 5px;
+    margin-bottom:10px;
+    font-size: 13px;
+    p{
+      margin: 0;
+    }
+    .addBtn {
+      position: absolute;
+      right: 0px;
+      top: 50%;
+      height: 30px;
+      margin-top: -15px;
+    }
+  }
+}
+</style>
diff --git a/src/views/financials/monthlyPayment/components/TrialsData.vue b/src/views/financials/monthlyPayment/components/TrialsData.vue
index 61853543..f87b9ddb 100644
--- a/src/views/financials/monthlyPayment/components/TrialsData.vue
+++ b/src/views/financials/monthlyPayment/components/TrialsData.vue
@@ -340,11 +340,10 @@ export default {
     },
     handleView(row) { row.SowFullPath ? window.open(row.SowFullPath, '_blank') : '' },
     handleDeleteSOW(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           const param = { SowPath: row.SowPath, TrialId: row.TrialId }
diff --git a/src/views/financials/monthlyPayment/components/UploadSow.vue b/src/views/financials/monthlyPayment/components/UploadSow.vue
index f24d6a2c..be7c3083 100644
--- a/src/views/financials/monthlyPayment/components/UploadSow.vue
+++ b/src/views/financials/monthlyPayment/components/UploadSow.vue
@@ -92,7 +92,7 @@ export default {
           if (res.IsSuccess) {
             this.fileList = []
             this.$message({
-              message: 'Deleted successfully!',
+              message: this.$t('common:message:deletedSuccessfully'),
               type: 'success'
             })
             this.$emit('getFileList', this.fileList)
diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue
index 7366de55..476ab668 100644
--- a/src/views/reviewers/components/EducationTraining.vue
+++ b/src/views/reviewers/components/EducationTraining.vue
@@ -567,8 +567,7 @@ export default {
       this.$confirm('Confirm to delete?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deleteEducationInfo(row.Id)
@@ -636,8 +635,7 @@ export default {
       this.$confirm('Confirm to delete?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deletePostgraduateInfo(row.Id)
diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue
index 5eba776d..e4dd1d85 100644
--- a/src/views/reviewers/components/GcpCertificate.vue
+++ b/src/views/reviewers/components/GcpCertificate.vue
@@ -181,7 +181,7 @@ export default {
               this.fileList = []
               this.GCPID = ''
               this.$message({
-                message: 'Deleted successfully!',
+                message: this.$t('common:message:deletedSuccessfully'),
                 type: 'success'
               })
             }
diff --git a/src/views/reviewers/components/Resumes.vue b/src/views/reviewers/components/Resumes.vue
index 269bc3e0..f2d1f199 100644
--- a/src/views/reviewers/components/Resumes.vue
+++ b/src/views/reviewers/components/Resumes.vue
@@ -266,11 +266,10 @@ export default {
       }
     },
     handleRemoveFile(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       }).then(() => {
         deleteAttachment(row.Id, row.Path)
           .then(res => {
@@ -278,7 +277,7 @@ export default {
               this.resumeList.splice(this.resumeList.findIndex(item => item.Id === row.Id), 1)
               this.filterByLanguage()
               this.$message({
-                message: 'Deleted successfully!',
+                message: this.$t('common:message:deletedSuccessfully'),
                 type: 'success'
               })
             }
diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue
index 52f1ce15..c252232e 100644
--- a/src/views/reviewers/components/Setting.vue
+++ b/src/views/reviewers/components/Setting.vue
@@ -78,7 +78,7 @@
       </div>
     </el-form>
     <el-dialog
-      :label="$t('system:Setting:title:Vacation')"
+      :title="$t('system:Setting:title:Vacation')"
       :visible.sync="dialogVisible"
       width="50%"
       :close-on-click-modal="false"
@@ -87,6 +87,7 @@
       <div>
         <el-date-picker
           v-model="daterange"
+          style="width: 360px"
           value-format="yyyy-MM-dd"
           format="yyyy-MM-dd"
           type="daterange"
@@ -117,7 +118,7 @@
           </template>
         </el-table-column>
       </el-table>
-      <div class="pagination">
+      <div class="pagination" style="padding: 10px 0;text-align: right">
         <el-pagination
           background
           layout="total,sizes,prev, pager, next"
@@ -258,7 +259,7 @@ export default {
       }
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
       })
@@ -272,7 +273,7 @@ export default {
                   this.gridData.splice(index, 1)
                   this.totalItems = this.totalItems - 1
                 }
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
               this.loading2 = false
             })
diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index 061283b9..bc5e5e00 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -2,7 +2,7 @@
   <div class="form-container">
     <div class="title-wrapper">
       <p>{{$t('system:TrialExperience:title:Clinical Trial Experience')}}</p>
-      <el-button :disabled="$route.query.ReviewStatus === '1'" class="add" size="small" @click="handleAddClinicalTrial">Add</el-button>
+      <el-button :disabled="$route.query.ReviewStatus === '1'" class="add" size="small" @click="handleAddClinicalTrial">{{$t('common:button:add')}}</el-button>
     </div>
     <div style="padding:0 40px;">
       <el-table
@@ -73,7 +73,7 @@
         size="small"
       >
         <el-form-item :label="$t('system:TrialExperience:label:Phase')" prop="PhaseId">
-          <el-select v-model="clinicalTrialForm.PhaseId" placeholder="Please select">
+          <el-select v-model="clinicalTrialForm.PhaseId">
             <!-- <el-option
               v-for="(key,value) of dictionaryList.Phase"
               :key="value"
@@ -91,7 +91,6 @@
         <el-form-item :label="$t('system:TrialExperience:label:Review Criteria')" prop="EvaluationCriteriaIdList">
           <el-select
             v-model="clinicalTrialForm.EvaluationCriteriaIdList"
-            placeholder="Please select"
             multiple
           >
             <!-- <el-option v-for="(key,value) of dictionaryList.ReadingStandard" :key="value" :label="key" :value="value" /> -->
@@ -267,8 +266,7 @@ export default {
       this.$confirm('Confirm to delete?', {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'OK',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deleteTrialExperience(row.Id)
diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue
index d2294d89..2c0b329d 100644
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@@ -69,13 +69,13 @@
         </el-form>
       </div>
       <span style="margin-left:auto;">
-        <el-switch
-          v-model="isEN"
-          active-text="EN"
-          inactive-text="中文"
-          style="margin-right:10px;"
-          @change="handleIsEnChange"
-        />
+<!--        <el-switch-->
+<!--          v-model="isEN"-->
+<!--          active-text="EN"-->
+<!--          inactive-text="中文"-->
+<!--          style="margin-right:10px;"-->
+<!--          @change="handleIsEnChange"-->
+<!--        />-->
         <el-button size="small" icon="el-icon-plus" type="primary" @click="handleNew">{{$t('common:button:new')}}</el-button>
       </span>
     </div>
@@ -367,17 +367,20 @@ export default {
       },
       tokenKey: getToken(),
       share_model: { visible: false, title: '', width: '500px' },
-      shareLink: null
+      shareLink: null,
+      isEnglish: false
     }
   },
   dicts: ['ReadingType', 'Subspeciality', 'Department', 'Rank', 'Position', 'ReadingStandard'],
   computed: {
-    ...mapGetters(['hospitalList', 'reviewersQuery', 'isEnglish'])
+    ...mapGetters(['hospitalList', 'reviewersQuery'])
   },
   created() {
-    this.isEN = this.isEnglish
     this.reviewersQuery ? this.listQuery = this.reviewersQuery : ''
     this.initPage()
+    // this.isEnglish = !!((this.$route.query.isEnglish === true || this.$route.query.isEnglish === 'true'))
+    this.isEnglish = this.$i18n.locale === 'zh' ? false : true
+    this.isEN = this.isEnglish
   },
   methods: {
     copyCode() {
diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index 2e577714..bf3a21db 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -43,9 +43,6 @@
           <el-date-picker
             v-model="datetimerange"
             type="datetimerange"
-            range-separator="至"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
             value-format="yyyy-MM-dd HH:mm:ss"
             :default-time="['00:00:00', '23:59:59']"
             @change="handleDatetimeChange"
@@ -77,7 +74,7 @@
         <el-table-column
           :label="$t('system:loginLog:table:OptType')"
           prop="OptType"
-          min-width="90"
+          min-width="150"
           show-overflow-tooltip
           sortable="custom"
         >
@@ -88,28 +85,28 @@
         <el-table-column
           label="IP"
           prop="IP"
-          min-width="90"
+          min-width="150"
           sortable="custom"
           show-overflow-tooltip
         />
         <el-table-column
           :label="$t('system:loginLog:table:LoginFaildName')"
           prop="LoginFaildName"
-          min-width="90"
+          min-width="180"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           :label="$t('system:loginLog:table:LoginUserName')"
           prop="LoginUserName"
-          min-width="90"
+          min-width="140"
           show-overflow-tooltip
           sortable="custom"
         />
         <el-table-column
           :label="$t('system:loginLog:table:LoginUserType')"
           prop="LoginUserTypeEnum"
-          min-width="90"
+          min-width="120"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -120,14 +117,14 @@
         <el-table-column
           :label="$t('system:loginLog:table:OptUserName')"
           prop="OptUserName"
-          min-width="90"
+          min-width="200"
           sortable="custom"
           show-overflow-tooltip
         />
         <el-table-column
           :label="$t('system:loginLog:table:OptUserType')"
           prop="OptUserTypeEnum"
-          min-width="90"
+          min-width="200"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -138,7 +135,7 @@
         <el-table-column
           :label="$t('system:loginLog:table:CreateTime')"
           prop="CreateTime"
-          min-width="90"
+          min-width="180"
           sortable="custom"
           show-overflow-tooltip
         />
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index b2fb5ee5..e2ff6b68 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -136,16 +136,15 @@ export default {
       // })
     },
     handleDeleteRole(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       }).then(() => {
         deleteUserTypeRole(row.Id).then((res) => {
           if (res.IsSuccess) {
             this.list.splice(this.list.findIndex((item) => item.Id === row.Id), 1)
-            this.$message.success('Deleted successfully!')
+            this.$message.success(this.$t('common:message:deletedSuccessfully'))
           }
         })
       })
diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index 6d4b96bb..fa36de65 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -13,23 +13,20 @@ import { resetPassword } from '@/api/admin'
 export default {
   name: 'Account',
   props: {
-    userId: { type: String, default: '' }
+    userId: { type: String, default: '' },
   },
   methods: {
     handleReset() {
-      this.$confirm('Sure to reset password?', {
+      this.$confirm(this.$t('system:userlist:message:ResetPassword'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
       })
         .then(() => {
           resetPassword(this.userId).then(res => {
             if (res.IsSuccess) {
-              this.$message({
-                message: 'Reset password successfully',
-                type: 'success'
-              })
+              let msg = this.$t('system:userlist:message:ResetPassword2')
+              msg = msg.replace('xxx', this.$route.query.userName)
+              this.$alert(msg)
             }
           })
         })
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 6ddc7df5..950dab35 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -9,13 +9,14 @@
         :search-handle="searchHandle"
         @search="handleSearch"
         @reset="handleReset"
+        @new="handleAddUser"
       />
-      <el-button
-        type="primary"
-        size="mini"
-        style="margin-left:auto;height: 28px;position: absolute;bottom: 0;right: 10px"
-        @click="handleAddUser"
-      >{{$t('common:button:new')}}</el-button>
+<!--      <el-button-->
+<!--        type="primary"-->
+<!--        size="mini"-->
+<!--        style="margin-left:auto;height: 28px;position: absolute;bottom: 0;right: 10px"-->
+<!--        @click="handleAddUser"-->
+<!--      >{{$t('common:button:new')}}</el-button>-->
     </div>
     <base-table
       v-loading="loading"
@@ -166,8 +167,8 @@ export default {
           label: this.$t('common:action:action'),
           minWidth: 200,
           operates: [
-            { name: 'Edit', type: 'primary', emitKey: 'editCb' },
-            { name: 'Delete', type: 'danger', emitKey: 'deleteCb' }
+            { name: this.$t('common:button:edit'), type: 'primary', emitKey: 'editCb' },
+            { name: this.$t('common:button:delete'), type: 'danger', emitKey: 'deleteCb' }
           ] }
       ],
       searchForm: [
@@ -205,8 +206,8 @@ export default {
           prop: 'IsZhiZhun',
           width: '100px',
           options: [
-            { label: 'Internal', value: true },
-            { label: 'External', value: false }
+            { label: this.$t('system:userlist:label:InternalOrExternal:Internal'), value: true },
+            { label: this.$t('system:userlist:label:InternalOrExternal:External'), value: false }
           ],
           props: { label: 'label', value: 'value' },
           change: scope => '',
@@ -218,8 +219,8 @@ export default {
           prop: 'IsTestUser',
           width: '100px',
           options: [
-            { label: 'Yes', value: true },
-            { label: 'No', value: false }
+            { label: this.$t('system:userlist:label:IsTestUser:Yes'), value: true },
+            { label: this.$t('system:userlist:label:IsTestUser:No'), value: false }
           ],
           props: { label: 'label', value: 'value' },
           change: scope => '',
@@ -231,8 +232,8 @@ export default {
           prop: 'UserState',
           width: '100px',
           options: [
-            { label: 'Enable', value: 1 },
-            { label: 'Disable', value: 0 }
+            { label: this.$t('system:userlist:label:Status:Enable'), value: 1 },
+            { label: this.$t('system:userlist:label:Status:Disable'), value: 0 }
           ],
           props: { label: 'label', value: 'value' },
           change: scope => '',
@@ -250,7 +251,8 @@ export default {
       ],
       searchHandle: [
         { label: this.$t('common:button:reset'), type: 'primary', emitKey: 'reset' },
-        { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search' }
+        { label: this.$t('common:button:search'), type: 'primary', emitKey: 'search' },
+        { label: this.$t('common:button:new'), type: 'primary', emitKey: 'new' }
       ],
       userTypeOptions: [],
       loading: false,
@@ -289,22 +291,21 @@ export default {
     },
     // 编辑用户
     handleEditUser(data) {
-      this.$router.push({ path: '/system/user/edit', query: { Id: data.Id }})
+      this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName }})
     },
     // 删除用户
     handleDeleteUser(data) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           deleteSysUser(data.Id)
             .then(res => {
               if (res.IsSuccess) {
                 this.users.splice(this.users.findIndex(item => item.Id === data.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             })
         })
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue b/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue
index 2e640e82..36e2e063 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/components/UploadAcksow.vue
@@ -94,7 +94,7 @@ export default {
             if (res.IsSuccess) {
               this.fileList = []
               this.$message({
-                message: 'Deleted successfully!',
+                message: this.$t('common:message:deletedSuccessfully'),
                 type: 'success'
               })
               this.$emit('getFileList', this.fileList)
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue b/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue
index 3bf49d6d..676cba40 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/DictionaryTypeConfig.vue
@@ -137,11 +137,10 @@ export default {
       })
     },
     handleDelete(row) {
-      this.$confirm('Sure to delete?', {
+      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
         distinguishCancelAndClose: true,
-        confirmButtonText: 'Ok',
-        cancelButtonText: 'Cancel'
+
       })
         .then(() => {
           this.loading = true
@@ -150,7 +149,7 @@ export default {
               this.loading = false
               if (res.IsSuccess) {
                 this.list.splice(this.list.findIndex(item => item.Id === row.Id), 1)
-                this.$message.success('Deleted successfully!')
+                this.$message.success(this.$t('common:message:deletedSuccessfully'))
               }
             }).catch(() => { this.loading = false })
         })
diff --git a/src/views/user/account.vue b/src/views/user/account.vue
index bea9261c..69c8d5e9 100644
--- a/src/views/user/account.vue
+++ b/src/views/user/account.vue
@@ -1,30 +1,30 @@
 <template>
   <div class="app-container">
-    <el-card class="Security" style="width:800px;">
-      <div slot="header" class="clearfix">
-        <span>Security</span>
-      </div>
-      <el-form
-        ref="userAccount"
-        :model="user"
-        :rules="userFormRules"
-        label-width="150px"
-        style="width:600px;"
-      >
-        <el-form-item label="Current Password" prop="OldPassWord">
-          <el-input v-model="user.OldPassWord" type="password" />
-        </el-form-item>
-        <el-form-item label="New Password" prop="NewPassWord">
-          <el-input v-model="user.NewPassWord" type="password" />
-        </el-form-item>
-        <el-form-item label="Confirm Password" prop="ConfirmPassWord">
-          <el-input v-model="user.ConfirmPassWord" type="password" />
-        </el-form-item>
-        <el-form-item>
-          <el-button type="primary" size="small" @click="save">save</el-button>
-        </el-form-item>
-      </el-form>
-    </el-card>
+<!--    <el-card class="Security" style="width:800px;">-->
+<!--      <div slot="header" class="clearfix">-->
+<!--        <span>Security</span>-->
+<!--      </div>-->
+<!--      <el-form-->
+<!--        ref="userAccount"-->
+<!--        :model="user"-->
+<!--        :rules="userFormRules"-->
+<!--        label-width="150px"-->
+<!--        style="width:600px;"-->
+<!--      >-->
+<!--        <el-form-item label="Current Password" prop="OldPassWord">-->
+<!--          <el-input v-model="user.OldPassWord" type="password" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="New Password" prop="NewPassWord">-->
+<!--          <el-input v-model="user.NewPassWord" type="password" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item label="Confirm Password" prop="ConfirmPassWord">-->
+<!--          <el-input v-model="user.ConfirmPassWord" type="password" />-->
+<!--        </el-form-item>-->
+<!--        <el-form-item>-->
+<!--          <el-button type="primary" size="small" @click="save">save</el-button>-->
+<!--        </el-form-item>-->
+<!--      </el-form>-->
+<!--    </el-card>-->
   </div>
 </template>
 <script>
diff --git a/src/views/user/editInfo.vue b/src/views/user/editInfo.vue
index bc2ef636..d2738a8a 100644
--- a/src/views/user/editInfo.vue
+++ b/src/views/user/editInfo.vue
@@ -1,247 +1,265 @@
-<template>
-  <div class="app-container">
-    <el-form
-      ref="userForm"
-      size="small"
-      :model="user"
-      :rules="userFormRules"
-      label-width="150px"
-      style="width:800px;"
-    >
-      <el-card class="Basic" shadow="never" size="small">
-        <div slot="header" class="clearfix">
-          <span>Basic Information</span>
-        </div>
-        <el-form-item v-if="user.Code" label="ID: " prop="Code">
-          <el-input v-model="user.Code" disabled />
-        </el-form-item>
-
-        <el-form-item label="User Name: " prop="UserName">
-          <el-input v-model="user.UserName" disabled />
-        </el-form-item>
-
-        <!-- <el-form-item label="Real Name: " prop="RealName">
-          <el-input v-model="user.RealName" />
-        </el-form-item> -->
-        <el-form-item v-if="user.UserTypeEnum !== 8" label="Surname: " prop="LastName">
-          <el-input v-model="user.LastName" />
-        </el-form-item>
-        <el-form-item v-if="user.UserTypeEnum !== 8" label="Given Name: " prop="FirstName">
-          <el-input v-model="user.FirstName" />
-        </el-form-item>
-        <el-form-item label="Gender: " prop="Sex" style="margin-right:40px;">
-          <el-radio-group v-model="user.Sex">
-            <el-radio :label="1">Male</el-radio>
-            <el-radio :label="0">Female</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item label="Email: " prop="EMail">
-          <el-input v-model="user.EMail" />
-        </el-form-item>
-        <el-form-item label="Phone: ">
-          <el-input v-model="user.Phone" />
-        </el-form-item>
-        <el-form-item v-if="user.UserTypeEnum !== 8" label="Disable">
-          <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" disabled />
-        </el-form-item>
-        <!-- <el-form-item label="User Type: " prop="UserTypeId">
-          <el-select v-model="user.UserTypeId" size="small" placeholder="Please select" disabled>
-            <el-option
-              v-for="(value,key) of dictionaryList.UserType"
-              :key="key"
-              :label="value"
-              :value="key"
-            />
-          </el-select>
-        </el-form-item> -->
-        <!-- <el-form-item label="User Type: " prop="UserTypeId">
-          <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;">
-            <el-option
-              v-for="(userType,key) of userTypeOptions"
-              :key="key"
-              :label="userType.UserType"
-              :value="userType.Id"
-            />
-          </el-select>
-        </el-form-item> -->
-
-        <el-form-item label="User Type: " prop="UserType">
-          <el-input v-model="user.UserType" disabled />
-        </el-form-item>
-      </el-card>
-
-      <el-card v-if="user.UserTypeEnum !== 8" class="Affiliation" shadow="never" style="margin-top:10px;" size="small">
-        <div slot="header" class="clearfix">
-          <span>Affiliation</span>
-        </div>
-        <el-form-item prop="IsZhiZhun">
-          <el-radio-group v-model="user.IsZhiZhun">
-            <el-radio :label="true">Internal</el-radio>
-            <el-radio :label="false">External</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item v-show="user.IsZhiZhun === false" label="Organization Name: " prop="OrganizationName">
-          <el-input v-model="user.OrganizationName" />
-        </el-form-item>
-        <!-- <el-form-item label="Orgnization Type: " prop="OrganizationTypeId">
-          <el-select
-            v-model="user.OrganizationTypeId"
-            placeholder="Please select"
-            @change="handelOrgnizationTypeChange"
-          >
-            <el-option
-              v-for="(value,key) of dictionaryList.InstitutionalType"
-              :key="key"
-              :label="value"
-              :value="key"
-            />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item v-show="user.OrganizationTypeId" label="Orgnization: " prop="OrganizationId">
-          <el-select v-model="user.OrganizationId" placeholder="Please select">
-            <el-option
-              v-for="(item) of OrganizationOptions"
-              :key="item.Id"
-              :label="item.InstitutionName"
-              :value="item.Id"
-            />
-          </el-select>
-        </el-form-item> -->
-
-        <el-form-item label="Department: " prop="DepartmentName">
-          <el-input v-model="user.DepartmentName" />
-        </el-form-item>
-        <el-form-item label="Position: " prop="PositionName">
-          <el-input v-model="user.PositionName" />
-        </el-form-item>
-      </el-card>
-      <el-form-item>
-        <el-button
-          type="primary"
-          size="small"
-          :disabled="isDisabled"
-          style="margin:10px 15px"
-          @click="handleSave"
-        >Save</el-button>
-      </el-form-item>
-
-    </el-form>
-  </div>
-</template>
-<script>
-import { getUserTypeList, getInstitutionList, getUser, addUser, updateUser } from '@/api/admin.js'
-import store from '@/store'
-import { mapGetters } from 'vuex'
-export default {
-  data() {
-    return {
-      user: {},
-      userFormRules: {
-        UserName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        UserTypeId: [{ required: true, message: 'Please Select', trigger: ['blur', 'change'] }],
-        // OrganizationId: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        // OrganizationTypeId: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        // RealName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        IsZhiZhun: [{ required: true, message: 'Please Select', trigger: ['blur', 'change'] }],
-        OrganizationName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        LastName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-        FirstName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
-
-        // Phone: [
-        //   { max: 20, min: 7, message: 'The length is 7 to 20' }
-        // ],
-        EMail: [
-          {
-            required: true,
-            message: 'Please input the email address',
-            trigger: 'blur'
-          },
-          {
-            type: 'email',
-            message: 'Please input the correct email address',
-            trigger: ['blur', 'change']
-          },
-          { max: 50, message: 'The maximum length is 50' }
-        ],
-        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        Status: [{ required: true, message: 'Please specify', trigger: 'blur' }]
-      },
-      // OrganizationOptions: [],
-      userTypeOptions: [],
-      isDisabled: false
-    }
-  },
-  computed: {
-    ...mapGetters(['userId'])
-  },
-  mounted() {
-    // this.getUserTypeList()
-    this.initPage()
-  },
-  methods: {
-    handleSave() {
-      this.$refs.userForm.validate(valid => {
-        if (valid) {
-          this.isDisabled = true
-          const selectedUserType = this.userTypeOptions.filter((item) => {
-            return item.Id === this.user.UserTypeId
-          })
-          if (selectedUserType.length > 0) {
-            this.user.userTypeEnum = selectedUserType[0].UserTypeEnum
-          }
-          if (this.user.IsZhiZhun === true) {
-            this.user.OrganizationName = 'ZhiZhun'
-          }
-          if (this.user.Id) {
-            updateUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$message.success('Updated successfully')
-            }).catch(() => { this.isDisabled = false })
-          } else {
-            addUser(this.user).then(res => {
-              this.isDisabled = false
-              this.$emit('getUserId', res.Result.Id)
-              this.$message.success('Added successfully')
-            }).catch(() => { this.isDisabled = false })
-          }
-        }
-      })
-    },
-    getUserInfo() {
-      getUser(this.userId).then(res => {
-        this.user = res.Result
-        // res.Result.OrganizationTypeId !== '00000000-0000-0000-0000-000000000000' ? this.getOrgnizationList(res.Result.OrganizationTypeId) : this.user.OrganizationTypeId = ''
-      })
-    },
-    getUserTypeList() {
-      getUserTypeList().then(res => {
-        if (res.IsSuccess) {
-          this.userTypeOptions = res.Result
-        }
-      })
-    },
-    handelOrgnizationTypeChange(val) {
-      if (val) {
-        this.user.OrganizationId = ''
-        this.getOrgnizationList(val)
-      }
-    },
-    getOrgnizationList(OrganizationTypeId) {
-      getInstitutionList(OrganizationTypeId).then(res => {
-        if (res.IsSuccess) {
-          this.OrganizationOptions = res.Result
-        }
-      })
-    },
-    async initPage() {
-      this.userId === '' ? await store.dispatch('user/getInfo') : ''
-
-      if (this.userId === '') {
-        await store.dispatch('user/getInfo')
-      }
-      this.getUserInfo()
-    }
-  }
-}
-</script>
+<template>
+  <div class="app-container">
+    <el-card class="Security" style="width:800px;">
+      <div slot="header" class="clearfix">
+        <span>Security</span>
+      </div>
+      <el-form
+        ref="userForm"
+        size="small"
+        :model="user"
+        :rules="userFormRules"
+        label-width="210px"
+        style="width:600px;"
+      >
+          <el-form-item v-if="user.Code" label="ID: " prop="Code">
+            <el-input v-model="user.Code" disabled />
+          </el-form-item>
+
+          <el-form-item label="User Name: " prop="UserName">
+            <el-input v-model="user.UserName" disabled />
+          </el-form-item>
+          <el-form-item v-if="user.UserTypeEnum !== 8" label="Surname: " prop="LastName">
+            <el-input v-model="user.LastName" />
+          </el-form-item>
+          <el-form-item v-if="user.UserTypeEnum !== 8" label="Given Name: " prop="FirstName">
+            <el-input v-model="user.FirstName" />
+          </el-form-item>
+          <el-form-item label="Gender: " prop="Sex" style="margin-right:40px;">
+            <el-radio-group v-model="user.Sex">
+              <el-radio :label="1">Male</el-radio>
+              <el-radio :label="0">Female</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="Email: " prop="EMail">
+            <el-input v-model="user.EMail" />
+          </el-form-item>
+          <el-form-item label="Phone: ">
+            <el-input v-model="user.Phone" />
+          </el-form-item>
+          <el-form-item v-if="user.UserTypeEnum !== 8" label="Disable">
+            <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" disabled />
+          </el-form-item>
+          <!-- <el-form-item label="User Type: " prop="UserTypeId">
+            <el-select v-model="user.UserTypeId" size="small" placeholder="Please select" disabled>
+              <el-option
+                v-for="(value,key) of dictionaryList.UserType"
+                :key="key"
+                :label="value"
+                :value="key"
+              />
+            </el-select>
+          </el-form-item> -->
+          <!-- <el-form-item label="User Type: " prop="UserTypeId">
+            <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;">
+              <el-option
+                v-for="(userType,key) of userTypeOptions"
+                :key="key"
+                :label="userType.UserType"
+                :value="userType.Id"
+              />
+            </el-select>
+          </el-form-item> -->
+
+          <el-form-item label="User Type: " prop="UserType">
+            <el-input v-model="user.UserType" disabled />
+          </el-form-item>
+
+<!--          <div slot="header" class="clearfix">-->
+<!--            <span>Affiliation</span>-->
+<!--          </div>-->
+          <el-form-item prop="IsZhiZhun">
+            <el-radio-group v-model="user.IsZhiZhun">
+              <el-radio :label="true">Internal</el-radio>
+              <el-radio :label="false">External</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item v-show="user.IsZhiZhun === false" label="Organization Name: " prop="OrganizationName">
+            <el-input v-model="user.OrganizationName" />
+          </el-form-item>
+          <!-- <el-form-item label="Orgnization Type: " prop="OrganizationTypeId">
+            <el-select
+              v-model="user.OrganizationTypeId"
+              placeholder="Please select"
+              @change="handelOrgnizationTypeChange"
+            >
+              <el-option
+                v-for="(value,key) of dictionaryList.InstitutionalType"
+                :key="key"
+                :label="value"
+                :value="key"
+              />
+            </el-select>
+          </el-form-item>
+
+          <el-form-item v-show="user.OrganizationTypeId" label="Orgnization: " prop="OrganizationId">
+            <el-select v-model="user.OrganizationId" placeholder="Please select">
+              <el-option
+                v-for="(item) of OrganizationOptions"
+                :key="item.Id"
+                :label="item.InstitutionName"
+                :value="item.Id"
+              />
+            </el-select>
+          </el-form-item> -->
+
+          <el-form-item label="Department: " prop="DepartmentName">
+            <el-input v-model="user.DepartmentName" />
+          </el-form-item>
+          <el-form-item label="Position: " prop="PositionName">
+            <el-input v-model="user.PositionName" />
+          </el-form-item>
+        <el-form-item>
+          <el-button
+            type="primary"
+            size="small"
+            :disabled="isDisabled"
+            style="margin:10px 15px"
+            @click="handleSave"
+          >Save</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+    <el-card class="Security" style="width:800px;">
+      <div slot="header" class="clearfix">
+        <span>Security</span>
+      </div>
+      <el-form
+        ref="userAccount"
+        :model="user"
+        :rules="userFormRules"
+        label-width="210px"
+        style="width:600px;"
+      >
+        <el-form-item label="Current Password" prop="OldPassWord">
+          <el-input v-model="user.OldPassWord" type="password" />
+        </el-form-item>
+        <el-form-item label="New Password" prop="NewPassWord">
+          <el-input v-model="user.NewPassWord" type="password" />
+        </el-form-item>
+        <el-form-item label="Confirm New Password" prop="ConfirmPassWord">
+          <el-input v-model="user.ConfirmPassWord" type="password" />
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" size="small" @click="save">save</el-button>
+        </el-form-item>
+      </el-form>
+    </el-card>
+  </div>
+</template>
+<script>
+import { getUserTypeList, getInstitutionList, getUser, addUser, updateUser } from '@/api/admin.js'
+import store from '@/store'
+import { mapGetters } from 'vuex'
+export default {
+  data() {
+    return {
+      user: {},
+      userFormRules: {
+        UserName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        UserTypeId: [{ required: true, message: 'Please Select', trigger: ['blur', 'change'] }],
+        // OrganizationId: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        // OrganizationTypeId: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        // RealName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        IsZhiZhun: [{ required: true, message: 'Please Select', trigger: ['blur', 'change'] }],
+        OrganizationName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        LastName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+        FirstName: [{ required: true, message: 'Please specify', trigger: 'blur' }, { max: 50, message: 'The maximum length is 50' }],
+
+        // Phone: [
+        //   { max: 20, min: 7, message: 'The length is 7 to 20' }
+        // ],
+        EMail: [
+          {
+            required: true,
+            message: 'Please input the email address',
+            trigger: 'blur'
+          },
+          {
+            type: 'email',
+            message: 'Please input the correct email address',
+            trigger: ['blur', 'change']
+          },
+          { max: 50, message: 'The maximum length is 50' }
+        ],
+        Sex: [{ required: true, message: 'Please specify', trigger: 'blur' }],
+        Status: [{ required: true, message: 'Please specify', trigger: 'blur' }]
+      },
+      // OrganizationOptions: [],
+      userTypeOptions: [],
+      isDisabled: false
+    }
+  },
+  computed: {
+    ...mapGetters(['userId'])
+  },
+  mounted() {
+    // this.getUserTypeList()
+    this.initPage()
+  },
+  methods: {
+    handleSave() {
+      this.$refs.userForm.validate(valid => {
+        if (valid) {
+          this.isDisabled = true
+          const selectedUserType = this.userTypeOptions.filter((item) => {
+            return item.Id === this.user.UserTypeId
+          })
+          if (selectedUserType.length > 0) {
+            this.user.userTypeEnum = selectedUserType[0].UserTypeEnum
+          }
+          if (this.user.IsZhiZhun === true) {
+            this.user.OrganizationName = 'ZhiZhun'
+          }
+          if (this.user.Id) {
+            updateUser(this.user).then(res => {
+              this.isDisabled = false
+              this.$message.success('Updated successfully')
+            }).catch(() => { this.isDisabled = false })
+          } else {
+            addUser(this.user).then(res => {
+              this.isDisabled = false
+              this.$emit('getUserId', res.Result.Id)
+              this.$message.success('Added successfully')
+            }).catch(() => { this.isDisabled = false })
+          }
+        }
+      })
+    },
+    getUserInfo() {
+      getUser(this.userId).then(res => {
+        this.user = res.Result
+        // res.Result.OrganizationTypeId !== '00000000-0000-0000-0000-000000000000' ? this.getOrgnizationList(res.Result.OrganizationTypeId) : this.user.OrganizationTypeId = ''
+      })
+    },
+    getUserTypeList() {
+      getUserTypeList().then(res => {
+        if (res.IsSuccess) {
+          this.userTypeOptions = res.Result
+        }
+      })
+    },
+    handelOrgnizationTypeChange(val) {
+      if (val) {
+        this.user.OrganizationId = ''
+        this.getOrgnizationList(val)
+      }
+    },
+    getOrgnizationList(OrganizationTypeId) {
+      getInstitutionList(OrganizationTypeId).then(res => {
+        if (res.IsSuccess) {
+          this.OrganizationOptions = res.Result
+        }
+      })
+    },
+    async initPage() {
+      this.userId === '' ? await store.dispatch('user/getInfo') : ''
+
+      if (this.userId === '') {
+        await store.dispatch('user/getInfo')
+      }
+      this.getUserInfo()
+    }
+  }
+}
+</script>
diff --git a/src/views/user/myInfo.vue b/src/views/user/myInfo.vue
index 13d4993b..4496b4a5 100644
--- a/src/views/user/myInfo.vue
+++ b/src/views/user/myInfo.vue
@@ -1,11 +1,392 @@
 <template>
-  <div />
+  <div class="trial-myinfo">
+    <div class="trial-myinfo-left">
+      <div class="trial-myinfo-left-top">
+        <div class="trial-myinfo-head">
+          <!-- 个人头像 -->
+          {{ $t('trials:trials-myinfo:title:avater') }}
+        </div>
+        <div class="trial-myinfo-body">
+          <div>
+            {{ user.LastName }}
+          </div>
+        </div>
+      </div>
+      <div class="trial-myinfo-left-bottom">
+        <div class="trial-myinfo-head">
+          <!-- 用户基本信息 -->
+          {{ $t('trials:trials-myinfo:title:basicInfo') }}
+        </div>
+        <el-form ref="userForm" label-position="right" :model="user" :rules="userFormRules" label-width="120px">
+          <el-form-item v-if="user.Code" label="ID: " prop="Code">
+            <el-input v-model="user.Code" disabled />
+          </el-form-item>
+          <!-- 姓 -->
+          <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:surname')" prop="LastName">
+            <el-input v-model="user.LastName" :placeholder="$t('trials:trials-myinfo:form:surname')"/>
+          </el-form-item>
+          <!-- 名 -->
+          <el-form-item :disabled="user.UserTypeEnum === 8" :label="$t('trials:trials-myinfo:form:givenname')" prop="FirstName">
+            <el-input v-model="user.FirstName" :placeholder="$t('trials:trials-myinfo:form:givenname')"/>
+          </el-form-item>
+          <!-- 性别 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:gender')" prop="Sex" style="margin-right:40px;">
+            <el-radio-group v-model="user.Sex">
+              <el-radio :label="1">Male</el-radio>
+              <el-radio :label="0">Female</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <!-- 单位 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:organization')" prop="OrganizationName">
+            <el-input v-model="user.OrganizationName" :placeholder="$t('trials:trials-myinfo:form:organization')"/>
+          </el-form-item>
+          <!-- 部门 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:department')" prop="DepartmentName">
+            <el-input v-model="user.DepartmentName" :placeholder="$t('trials:trials-myinfo:form:organization')"/>
+          </el-form-item>
+          <!-- 职位 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:position')" prop="PositionName">
+            <el-input v-model="user.PositionName" :placeholder="$t('trials:trials-myinfo:form:position')"/>
+          </el-form-item>
+        </el-form>
+        <!-- 保存 -->
+        <el-button
+          class="trial-info-btn"
+          type="primary"
+          size="small"
+          @click="handleSave"
+        >
+          {{ $t('trials:trials-myinfo:button:save') }}
+        </el-button>
+      </div>
+    </div>
+    <div class="trial-myinfo-right">
+      <div class="trial-myinfo-right-box">
+        <div class="trial-myinfo-head">
+          <!-- 账号信息 -->
+          {{ $t('trials:trials-myinfo:title:accountInfo') }}
+        </div>
+        <el-form label-position="right" label-width="180px">
+          <!-- 用户名 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:userName')" style="margin-bottom: 5px;" prop="UserName">
+            <span>{{ user.UserName }}</span>
+          </el-form-item>
+          <el-form-item label="" style="position: relative" prop="UserName">
+            <el-input v-model="userForm.UserName" :placeholder="$t('trials:trials-myinfo:form:userName')"/>
+            <!-- 修改 -->
+            <el-button :disabled="!userForm.UserName" class="saveBtn" type="primary" size="small" @click="setNewUserName">
+              {{ $t('trials:trials-myinfo:button:update') }}
+            </el-button>
+          </el-form-item>
+          <!-- 电话 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:phone')" style="margin-bottom: 5px;" prop="UserName">
+            <span>{{ user.Phone }}</span>
+          </el-form-item>
+          <el-form-item label="" style="position: relative" prop="UserName">
+            <el-input v-model="userForm.Phone" :placeholder="$t('trials:trials-myinfo:form:phone')"/>
+            <!-- 修改 -->
+            <el-button :disabled="!userForm.Phone" class="saveBtn" type="primary" size="small" @click="setNewPhone">
+              {{ $t('trials:trials-myinfo:button:update') }}
+            </el-button>
+          </el-form-item>
+          <!-- 邮箱 -->
+          <el-form-item :label="$t('trials:trials-myinfo:form:email')" style="margin-bottom: 5px;" prop="UserName">
+            <span>{{ user.EMail }}</span>
+          </el-form-item>
+          <el-form-item label="" style="margin-bottom: 10px;position: relative" prop="EMail">
+            <el-input v-model="userForm.EMail" @input="handleEmailChange" :placeholder="$t('trials:trials-myinfo:form:email')"/>
+            <el-button class="sendCode" :disabled="sendDisabled" type="primary" size="mini" @click="sendVerificationCode">{{ sendTitle }}</el-button>
+          </el-form-item>
+          <el-form-item label="" style="position: relative" prop="VerificationCode">
+            <el-input v-model="userForm.VerificationCode" :placeholder="$t('trials:researchForm:form:verifyCode')"/>
+            <!-- 修改 -->
+            <el-button :disabled="!userForm.EMail || !userForm.VerificationCode" class="saveBtn" type="primary" size="small" @click="setNewEmail">
+              {{ $t('trials:trials-myinfo:button:update') }}
+            </el-button>
+          </el-form-item>
+        </el-form>
+      </div>
+      <div class="trial-myinfo-right-box">
+        <div class="trial-myinfo-head">
+          <!-- 修改密码 -->
+          {{ $t('trials:trials-myinfo:title:updatePaasord') }}
+        </div>
+        <el-form ref="passwordForm" label-position="right" :model="password" :rules="passwordFormRules" label-width="180px">
+          <!-- 旧密码 -->
+          <el-form-item :label="$t('recompose:form:oldPassword')" prop="OldPassWord">
+            <el-input v-model="password.OldPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:oldPassword')"/>
+          </el-form-item>
+          <!-- 新密码 -->
+          <el-form-item class="my_new_pwd" :label="$t('recompose:form:newPassword')" prop="NewPassWord">
+            <el-input v-model="password.NewPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:newPassword')"/>
+          </el-form-item>
+          <!-- 确认密码 -->
+          <el-form-item :label="$t('recompose:form:confirmPassword')" prop="ConfirmPassWord">
+            <el-input v-model="password.ConfirmPassWord" type="password" show-password auto-complete="new-password" :placeholder="$t('recompose:form:confirmPassword')"/>
+          </el-form-item>
+        </el-form>
+        <el-button
+          type="primary"
+          size="small"
+          class="trial-info-btn"
+          @click="save"
+        >
+          {{ $t('trials:trials-myinfo:button:save') }}
+        </el-button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
-export default {}
+import { getUserTypeList, getUser, updateUser, modifyPassword } from '@/api/admin.js'
+import { sendVerificationCode, setNewEmail, setNewPhone, setNewUserName } from '@/api/system/user.js'
+import md5 from 'js-md5'
+var timer = ''
+var countdown = 60
+import store from '@/store'
+import {mapGetters, mapMutations} from 'vuex'
+
+export default {
+  name: 'TrialsMyinfo',
+  data() {
+    return {
+      userTypeOptions: [],
+      user: {},
+      password: {},
+      userForm: {},
+      sendDisabled: true,
+      sendTitle: this.$t('trials:trials-myinfo:button:getVCode'),
+      userFormRules: {
+        UserName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        UserTypeId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
+        IsZhiZhun: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur', 'change'] }],
+        OrganizationName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        LastName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
+        FirstName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }, { max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50` }],
+        Sex: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        Status: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }]
+      },
+      passwordFormRules: {
+        OldPassWord: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' }],
+        NewPassWord: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            trigger: 'blur',
+            validator: this.$validatePassword
+          },
+        ],
+        ConfirmPassWord: [
+          { required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
+          {
+            required: true,
+            trigger: 'blur',
+            validator: this.$validatePassword
+          },
+        ]
+      }
+    }
+  },
+  computed: {
+    ...mapGetters(['userId', 'name'])
+  },
+  mounted() {
+    this.getUserInfo()
+    this.getUserTypeList()
+  },
+  methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
+    handleSave() {
+      this.$refs.userForm.validate(valid => {
+        console.log(valid)
+        if (valid) {
+          this.isDisabled = true
+          const selectedUserType = this.userTypeOptions.filter((item) => {
+            return item.Id === this.user.UserTypeId
+          })
+          if (selectedUserType.length > 0) {
+            this.user.userTypeEnum = selectedUserType[0].UserTypeEnum
+          }
+          // if (this.user.IsZhiZhun === true) {
+          //   this.user.OrganizationName = 'ZhiZhun'
+          // }
+          if (this.user.Id) {
+            updateUser(this.user).then(res => {
+              this.isDisabled = false
+              this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
+              this.getUserInfo()
+            }).catch(() => { this.isDisabled = false })
+          }
+        }
+      })
+    },
+    handleEmailChange() {
+      var reg = /^[A-Za-z0-9]+([_\.][A-Za-z0-9]+)*@([A-Za-z0-9\-]+\.)+[A-Za-z]{2,6}$/
+      if (this.userForm.EMail && reg.test(this.userForm.EMail)) {
+        this.sendDisabled = false
+      } else {
+        this.sendDisabled = true
+      }
+    },
+    sendVerificationCode() {
+      sendVerificationCode(this.userForm.EMail).then(() => {
+        this.settime(this)
+        // 发送成功
+        this.$message.success(this.$t('trials:trials-myinfo:message:sendSuccessfully'))
+      })
+    },
+    save() {
+      this.$refs.passwordForm.validate(valid => {
+        if (valid) {
+          if (this.password.NewPassWord !== this.password.ConfirmPassWord) {
+            this.$alert(this.$t('passwordReset:formRule:passwordsDiffer'))
+            return
+          }
+          const param = {
+            UserId: this.userId,
+            NewPassWord: md5(this.password.NewPassWord),
+            OldPassWord: md5(this.password.OldPassWord)
+          }
+          modifyPassword(param).then(res => {
+            if (res.IsSuccess) {
+              // 修改成功,请重新登录账号
+              this.$message.success(this.$t('trials:trials-myinfo:message:modifyPWSuccessfully'))
+              setTimeout(() => {
+                this.logout()
+              }, 1000)
+            }
+          })
+        }
+      })
+    },
+    setNewEmail() {
+      setNewEmail(this.userForm.EMail, this.userForm.VerificationCode).then(() => {
+        this.userForm.EMail = ''
+        this.userForm.VerificationCode = ''
+        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
+        this.getUserInfo()
+      })
+    },
+    setNewUserName() {
+      setNewUserName(this.userForm.UserName).then(() => {
+        this.$store.dispatch('user/changeUserName', this.userForm.UserName).then((res) => {
+          this.userForm.UserName = ''
+          this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
+          this.getUserInfo()
+        })
+      })
+    },
+    setNewPhone() {
+      setNewPhone(this.userForm.Phone).then(() => {
+        this.userForm.Phone = ''
+        this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
+        this.getUserInfo()
+      })
+    },
+    getUserInfo() {
+      const loading = this.$loading({
+        fullscreen: false,
+        lock: true,
+        text: 'Loading',
+        spinner: 'el-icon-loading',
+        background: 'rgba(0, 0, 0, 0.07)'
+      })
+      getUser(this.userId).then(async res => {
+        this.user = res.Result
+        /* eslint-disable */
+        zzSessionStorage.setItem('realName', this.user.RealName)
+        await store.dispatch('user/updateInfo')
+        loading.close()
+      }).catch(() => { loading.close() })
+    },
+    settime(obj) {
+      if (countdown === 0) {
+        obj.sendDisabled = false
+        obj.sendTitle = this.$t('trials:trials-myinfo:button:getVCode')// '获取验证码'
+        countdown = 60
+        clearTimeout(timer)
+        return
+      } else {
+        obj.sendDisabled = true
+        obj.sendTitle = `${this.$t('trials:trials-myinfo:button:wait')}(${countdown}s)`
+        countdown--
+        // eslint-disable-next-line no-self-assign
+        countdown = countdown
+        timer = setTimeout(function() {
+          obj.settime(obj)
+        }, 1000)
+      }
+    },
+    getUserTypeList() {
+      getUserTypeList().then(res => {
+        if (res.IsSuccess) {
+          this.userTypeOptions = res.Result
+        }
+      })
+    },
+    async logout() {
+      /* eslint-disable */
+      var loginType = zzSessionStorage.getItem('loginType')
+      await this.$store.dispatch('user/logout')
+      if (loginType) {
+        this.$router.push(`/login?loginType=${loginType}`)
+      } else {
+        this.$router.push(`/login`)
+      }
+      this.$i18n.locale = 'zh'
+      this.setLanguage('zh')
+      this.$updateDictionary()
+    }
+  }
+}
 </script>
 
-<style scoped>
-
+<style lang="scss">
+.trial-myinfo{
+  background: #f3f3f3;
+  flex: 1;overflow: auto;display: flex;flex-direction: row;justify-content: space-around;
+  .trial-myinfo-head{
+    position: absolute;top: 40px;left: -10%;font-size: 14px;
+  }
+  .trial-myinfo-left{
+    overflow: auto;
+    background: #fff;width: calc(50% - 9px);margin: 6px 0;
+    padding-bottom: 50px;
+    .trial-myinfo-left-top{
+      width: 70%;padding-top: 100px;position: relative;margin: 0 auto;margin-bottom: 10px;
+      .trial-myinfo-body{
+        width:160px;height:160px;border-radius: 50%;background: #428bca;display: flex;justify-content: center;align-items: center;
+        div{
+          color:#fff;font-size: 30px;
+        }
+      }
+    }
+  }
+  .saveBtn{
+    position: absolute;right: -10px;top:2px;transform: translateX(100%)
+  }
+  .trial-info-btn{
+    position: absolute;bottom: -60px;left: calc(100% + 10px);min-width: 97px;
+  }
+  .trial-myinfo-left-bottom{
+    width: 70%;padding-top: 100px;position: relative;margin: 0 auto;
+  }
+  .trial-myinfo-right{
+    overflow: auto;
+    background: #fff;width: calc(50% - 9px);margin: 6px 0;
+    padding-bottom: 50px;
+    .sendCode {
+      position: absolute;right: -10px;top: 50%;transform: translate(100%, -50%);
+    }
+    .trial-myinfo-right-box{
+      width: 70%;padding-top: 100px;position: relative;margin: 0 auto;
+    }
+  }
+}
+</style>
+<style scoped>
+/deep/ .is-error.my_new_pwd{
+  margin-bottom: 40px;
+}
 </style>

From 15f0154b5de16f7870c385178ffaf0959dc7fa0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 13:18:28 +0800
Subject: [PATCH 098/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/admin/menu/index.vue              | 3 +--
 src/views/trials/trials-workbench/index.vue | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/admin/menu/index.vue b/src/views/admin/menu/index.vue
index 10a648c5..53741216 100644
--- a/src/views/admin/menu/index.vue
+++ b/src/views/admin/menu/index.vue
@@ -91,8 +91,7 @@ export default {
     remove(node) {
       this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
         type: 'warning',
-        distinguishCancelAndClose: true,
-
+        distinguishCancelAndClose: true
       })
         .then(() => {
           deleteMenuFunction(node.Id)
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index ed5e1ebf..1c3cd561 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -5,7 +5,7 @@
     </div>
       <div class="workbench-content" style="height: 100%">
         <div style="height: 100%;position: relative">
-          <div style="font-size: 20px;position: absolute;line-height: 40px;text-align: right" :style="{width: width + 'px'}">
+          <div style="font-size: 20px;position: absolute;line-height: 40px;text-align: right;white-space: nowrap;" :style="{width: width + 'px'}">
             {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
           </div>
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">

From 0728220a2d43058d90acac9687a9d398e84923dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 13:29:52 +0800
Subject: [PATCH 099/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/form.vue                 | 3 ++-
 src/views/trials/trials-workbench/index.vue | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 6e3892b3..26e4199e 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -274,7 +274,8 @@ export default {
             if (this.userTypeEnumInt !== 0) {
               this.$emit('refreshPage')
             }
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            // this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
           }
         }).catch(() => { this.loading = false })
       }).catch(() => {})
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 1c3cd561..615e80c7 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -5,7 +5,7 @@
     </div>
       <div class="workbench-content" style="height: 100%">
         <div style="height: 100%;position: relative">
-          <div style="font-size: 20px;position: absolute;line-height: 40px;text-align: right;white-space: nowrap;" :style="{width: width + 'px'}">
+          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 40px;text-align: right;white-space: nowrap;" :style="{width: width + 'px'}">
             {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
           </div>
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
@@ -157,7 +157,7 @@ export default {
         console.log(res)
         this.trialIdList = res.Result
         this.$nextTick(() => {
-          this.width = document.querySelector('.el-tabs__nav-scroll').clientWidth - 75
+          this.width = document.querySelector('.el-tabs__nav-scroll').clientWidth - 20
           var list = document.querySelectorAll('div[aria-controls]')
           list.forEach((v, i) => {
             if (i === 0) {
@@ -184,6 +184,7 @@ export default {
   }
   .el-tabs__header{
     position: relative;
+    width: 260px!important;
   }
   ::-webkit-scrollbar {
     width: 7px;

From d5e41679c4042a523b9d66ade1466b993abcaf2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 13:56:52 +0800
Subject: [PATCH 100/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              | 4 ++--
 src/views/system/user/components/Account.vue  | 1 +
 src/views/system/user/components/UserInfo.vue | 2 +-
 src/views/system/user/list/index.vue          | 2 +-
 src/views/trials/trials-workbench/index.vue   | 4 ++--
 5 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 4229b463..9ce11fc3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -29,10 +29,10 @@
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
               <el-dropdown-item v-if="!isReviewer">
-                <span style="display:block;" @click="editInfo">Edit Info</span>
+                <span style="display:block;" @click="editInfo">{{$t('system:navbar:button:Profile')}}</span>
               </el-dropdown-item>
               <el-dropdown-item divided>
-                <span style="display:block;" @click="logout">Log Out</span>
+                <span style="display:block;" @click="logout">{{$t('system:navbar:button:Log Out')}}</span>
               </el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index fa36de65..e09e4f0b 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -26,6 +26,7 @@ export default {
             if (res.IsSuccess) {
               let msg = this.$t('system:userlist:message:ResetPassword2')
               msg = msg.replace('xxx', this.$route.query.userName)
+              msg = msg.replace('yyy', this.$route.query.email)
               this.$alert(msg)
             }
           })
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index 4582db64..e126cfd6 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -38,7 +38,7 @@
         <el-input v-model="user.Phone" />
       </el-form-item>
       <el-form-item v-if="type==1" :label="$t('system:userlist:table:Disable')">
-        <el-switch v-model="user.Status" :active-value="0" :inactive-value="1" />
+        <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
         <el-switch v-model="user.IsTestUser" />
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 950dab35..8ce40a31 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -291,7 +291,7 @@ export default {
     },
     // 编辑用户
     handleEditUser(data) {
-      this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName }})
+      this.$router.push({ path: '/system/user/edit', query: { Id: data.Id, userName: data.UserName, email: data.EMail }})
     },
     // 删除用户
     handleDeleteUser(data) {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 615e80c7..550b2585 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -5,7 +5,7 @@
     </div>
       <div class="workbench-content" style="height: 100%">
         <div style="height: 100%;position: relative">
-          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 40px;text-align: right;white-space: nowrap;" :style="{width: width + 'px'}">
+          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">
             {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
           </div>
           <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
@@ -180,7 +180,7 @@ export default {
 <style lang="scss">
 .workbench-container{
   .el-tabs__nav{
-    transform: translateY(40px)!important;
+    transform: translateY(60px)!important;
   }
   .el-tabs__header{
     position: relative;

From 2ed3dd137602d987d443a5c017dbb2a16d0a290c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 14:30:33 +0800
Subject: [PATCH 101/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Agreements.vue  |  2 +-
 src/views/system/notice/components/from.vue    |  2 +-
 src/views/system/user/components/UserInfo.vue  | 18 ++++++++++++++++++
 src/views/system/user/list/index.vue           |  6 +++---
 .../attachments/SPMEnrollment/index.vue        |  4 ++--
 .../attachments/enrollment/index.vue           |  4 ++--
 6 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index c8a72918..70ddc037 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -64,7 +64,7 @@
       <span style="margin-right: 20px">
           {{$t('trials:enrolledReviews:message:EQC')}}
       </span>
-      <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'" @click="addCol(1, $t('trials:enrolledReviews:message:EQC'))">Upload</el-button>
+      <el-button size="small" type="primary" :disabled="$route.query.ReviewStatus === '1'" @click="addCol(1, $t('trials:enrolledReviews:message:EQC'))">{{$t('common:button:upload')}}</el-button>
     </div>
     <el-table :data="ackSowList" size="small" v-if="!$route.query.ReviewStatus">
       <el-table-column type="index" width="40" />
diff --git a/src/views/system/notice/components/from.vue b/src/views/system/notice/components/from.vue
index 65ede6ed..cc08001e 100644
--- a/src/views/system/notice/components/from.vue
+++ b/src/views/system/notice/components/from.vue
@@ -5,7 +5,7 @@
         ref="NoticeForm"
         :model="form"
         :rules="rules"
-        label-width="120px"
+        label-width="180px"
         size="small"
       >
         <el-form-item  :label="$t('system:notice:label:NoticeLevel')" prop="NoticeLevelEnum">
diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index e126cfd6..af0286b4 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -105,11 +105,29 @@ export default {
     }
   },
   methods: {
+    updateQueryParam(param, newValue,wurl) {
+      // 获取当前URL
+      let url = wurl || window.location.href;
+
+      // 正则表达式匹配参数
+      let regex = new RegExp('([?&])' + param + '=.*?(&|$)');
+      let separator = url.indexOf('?') !== -1 ? '&' : '?';
+
+      // 如果参数存在，替换它，如果不存在，添加它
+      if (regex.test(url)) {
+        return url.replace(regex, '$1' + param + '=' + newValue + '$2');
+      } else {
+        return url + separator + param + '=' + newValue;
+      }
+    },
     handleSave() {
       this.$refs.userForm.validate(valid => {
         if (valid) {
           this.isDisabled = true
           const selectedUserType = this.userTypeOptions.filter(item => item.Id === this.user.UserTypeId)
+          let newUrl = this.updateQueryParam('userName', this.user.UserName)
+          newUrl = this.updateQueryParam('email', this.user.EMail, newUrl)
+          window.history.pushState({ path: newUrl }, '', newUrl)
           if (selectedUserType.length > 0) {
             this.user.UserTypeEnum = selectedUserType[0].UserTypeEnum
           }
diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue
index 8ce40a31..f347279f 100644
--- a/src/views/system/user/list/index.vue
+++ b/src/views/system/user/list/index.vue
@@ -37,13 +37,13 @@
         {{ scope.row.RoleNameList.map(role => role.RoleName).join(',') }}
       </template>
       <template slot="isZhiZhunSlot" slot-scope="{scope}">
-        {{scope.row.IsZhiZhun ? 'Internal' : 'External'}}
+        {{scope.row.IsZhiZhun ? $t('system:userlist:table:InternalOrExternal:Internal') : $t('system:userlist:table:InternalOrExternal:External')}}
       </template>
       <template slot="isTestUserSlot" slot-scope="{scope}">
-        {{scope.row.IsTestUser ? 'Yes' : 'No'}}
+        {{scope.row.IsTestUser ? $t('system:userlist:table:IsTestUser:Yes') : $t('system:userlist:table:IsTestUser:No')}}
       </template>
       <template slot="statusSlot" slot-scope="{scope}">
-        {{ scope.row.Status?'Enable':'Disable' }}
+        {{ scope.row.Status? $t('system:userlist:table:Status:Enable') : $t('system:userlist:table:Status:Disable') }}
       </template>
     </base-table>
   </box-content>
diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
index cdf56543..bdf3da96 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
@@ -8,7 +8,7 @@
       <div v-if="trialInfo" class="trial-wrapper">
         <div class="div-row">
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:indication') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
@@ -38,7 +38,7 @@
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
             <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
             <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index 4dbcad15..534ad4f7 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -8,7 +8,7 @@
       <div v-if="trialInfo" class="trial-wrapper">
         <div class="div-row">
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:indication') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:indication:') }}</label>
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
@@ -38,7 +38,7 @@
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
             <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
 <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>

From f413ca60f3a5f0a2445ab1c5172abdd6fdf84d14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 15:00:37 +0800
Subject: [PATCH 102/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/Account.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index e09e4f0b..c2ff3b7c 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -9,6 +9,7 @@
   </el-card>
 </template>
 <script>
+import { params } from '@/utils/ruoyi'
 import { resetPassword } from '@/api/admin'
 export default {
   name: 'Account',
@@ -17,7 +18,7 @@ export default {
   },
   methods: {
     handleReset() {
-      this.$confirm(this.$t('system:userlist:message:ResetPassword'), {
+      this.$confirm(this.$t('system:userlist:message:ResetPassword').replace('xxx', params('userName')), {
         type: 'warning',
         distinguishCancelAndClose: true,
       })
@@ -25,8 +26,8 @@ export default {
           resetPassword(this.userId).then(res => {
             if (res.IsSuccess) {
               let msg = this.$t('system:userlist:message:ResetPassword2')
-              msg = msg.replace('xxx', this.$route.query.userName)
-              msg = msg.replace('yyy', this.$route.query.email)
+              msg = msg.replace('xxx', params('userName'))
+              msg = msg.replace('yyy', params('email'))
               this.$alert(msg)
             }
           })

From 8dedf6ee42eae9c3a69bfc3ed52971106d6b74e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 15:01:06 +0800
Subject: [PATCH 103/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Setting.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue
index c252232e..54ba4aed 100644
--- a/src/views/reviewers/components/Setting.vue
+++ b/src/views/reviewers/components/Setting.vue
@@ -166,7 +166,6 @@ export default {
       rules: {
         AdminComment: [{ max: 500, message: 'The maximum length is 500' }],
         BlindName: [{ required: true, message: 'Please specify', trigger: 'blur' }],
-        BlindNameCN: [{ required: true, message: 'Please specify', trigger: 'blur' }]
       },
       doctorId: this.$route.query.Id,
       isDisabled: false,

From ad993672246bf5e93ca3e9f7a79714401c592f1f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 16:42:16 +0800
Subject: [PATCH 104/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/UserInfo.vue  |  4 +++-
 .../attachments/SPMEnrollment/index.vue        |  6 +++---
 .../attachments/enrollment/index.vue           |  6 +++---
 .../setting/medical-audit/index.vue            | 18 +-----------------
 .../components/staffExternalForm.vue           |  2 +-
 .../qc-check/components/qualityAssurance.vue   |  2 ++
 .../trials-panel/visit/qc-check/index.vue      |  4 ++--
 7 files changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index af0286b4..ac899317 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -41,7 +41,9 @@
         <el-switch v-model="user.Status" :active-value="1" :inactive-value="0" />
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
-        <el-switch v-model="user.IsTestUser" />
+        <el-radio-group v-model="user.IsTestUser">
+          <el-radio v-for="item of $d.NoOrYes" :label="item.value">{{ item.label }}</el-radio>
+        </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">
         <el-select ref="userType" v-model="user.UserTypeId" size="small" placeholder="Please select" style="width:100%;" :disabled="user.CanEditUserType === false">
diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
index bdf3da96..5f92e8f6 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
@@ -12,11 +12,11 @@
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
             <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:modality:') }}</label>
             <el-tooltip
               class="item"
               :content="trialInfo.Modalitys"
@@ -34,7 +34,7 @@
           <!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
           <!--          </div>-->
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index 534ad4f7..3269b96a 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -12,11 +12,11 @@
             <span>{{$fd('Indication', trialInfo.IndicationEnum)}}{{trialInfo.Indication ? '-' + trialInfo.Indication : '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:criterion') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:criterion:') }}</label>
             <span>{{ (trialInfo.CriterionList && trialInfo.CriterionList.length>0)? trialInfo.CriterionList.join(', '): '' }}</span>
           </div>
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:modality') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:modality:') }}</label>
             <el-tooltip
               class="item"
               :content="trialInfo.Modalitys"
@@ -34,7 +34,7 @@
 <!--            <span>{{ $fd('ReadingMethod', trialInfo.ReadingType) }}</span>-->
 <!--          </div>-->
           <div class="div-col">
-            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers') }}</label>
+            <label class="el-label">{{ $t('trials:trials-list:form:totalReviewers:') }}</label>
             <span>{{ trialInfo.TotalReviewers }}</span>
           </div>
           <div class="div-col">
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index eed30070..f031f933 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -18,22 +18,6 @@
                 style="width:120px;"
               />
             </el-form-item>
-            <!-- 语言类型 -->
-<!--            <el-form-item-->
-<!--              :label="$t('common:title:languageType')"-->
-<!--            >-->
-<!--              <el-select-->
-<!--                v-model="searchData.LanguageType"-->
-<!--                clearable-->
-<!--              >-->
-<!--                <el-option-->
-<!--                  v-for="item of $d.LanguageType"-->
-<!--                  :key="item.value"-->
-<!--                  :value="item.value"-->
-<!--                  :label="item.label"-->
-<!--                />-->
-<!--              </el-select>-->
-<!--            </el-form-item>-->
             <!-- 类型 -->
             <el-form-item
               :label="$t('trials:medicalFeedbackCfg:title:taskType')"
@@ -80,7 +64,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item style="margin-top: 10px">
+            <el-form-item>
               <el-button
                 type="primary"
                 icon="el-icon-search"
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
index fa211bf4..280eac3c 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staffExternalForm.vue
@@ -53,7 +53,7 @@
             sortable="custom"
             min-width="100"
           >
-            <template slot-scope="scope">{{ scope.row.LastName + '/' + scope.row.FirstName }}</template>
+            <template slot-scope="scope">{{ scope.row.LastName + ' / ' + scope.row.FirstName }}</template>
           </el-table-column>
           <el-table-column
             prop="UserType"
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 49ca0b3c..b8418ee0 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -176,6 +176,7 @@
                     :disabled="scope.row.IsDeleted || isAudit"
                     @change="changeReadingStatus($event, scope.row)"
                   />
+                  <span>{{$fd('YesOrNo', scope.row.IsReading)}}</span>
                 </template>
               </el-table-column>
               <!-- 是否删除  复审时删除的序列不可再次编辑 -->
@@ -189,6 +190,7 @@
                     :disabled="isAudit"
                     @change="changeDeleteStatus($event, scope.row)"
                   />
+                  <span>{{$fd('YesOrNo', scope.row.IsDeleted)}}</span>
                 </template>
               </el-table-column>
               <el-table-column
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 4d091d30..c5ac6174 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -229,9 +229,9 @@
           <template slot-scope="scope">
             <el-tooltip placement="bottom">
               <div slot="content">
-                <span>{{ $t('trials:crcUpload:label:dicom') }}: {{ scope.row.DicomStudyCount }},</span>
+                <span>{{ $t('trials:crcUpload:label:dicom') }}: {{ scope.row.DicomStudyCount }}, </span>
                 <span v-if="scope.row.IsBaseLine && OtherInfo.ClinicalInformationTransmissionEnum > 0">
-                  <span>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }},</span>
+                  <span>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}, </span>
                   <span>{{ $t('trials:crcUpload:label:clinicalData') }}: {{ scope.row.IsHaveClinicalData?'w/':'w/o' }}</span>
                 </span>
                 <span v-else>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}</span>

From 5d113f128f0e3b1e23e28ce6c8e8f9f59e212bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 17:02:37 +0800
Subject: [PATCH 105/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-list/index.vue           | 16 ++++++++--------
 .../qc-check/components/qualityAssurance.vue     |  6 ++++--
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 853f075d..40854bbb 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -555,14 +555,14 @@
               @click.stop="handleAbandon(scope.row)"
             />
 <!--             代办详情-->
-            <el-button
-              v-hasPermi="['trials:trials-list:abolish']"
-              circle
-              icon="el-icon-receiving"
-              :disabled="scope.row.TrialStatusStr === 'Initializing'"
-              :title="$t('trials:trials-list:action:commission')"
-              @click.stop="handleCommission(scope.row)"
-            />
+<!--            <el-button-->
+<!--              v-hasPermi="['trials:trials-list:abolish']"-->
+<!--              circle-->
+<!--              icon="el-icon-receiving"-->
+<!--              :disabled="scope.row.TrialStatusStr === 'Initializing'"-->
+<!--              :title="$t('trials:trials-list:action:commission')"-->
+<!--              @click.stop="handleCommission(scope.row)"-->
+<!--            />-->
           </template>
         </el-table-column>
       </el-table>
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index b8418ee0..2e992780 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -175,8 +175,9 @@
                     v-model="scope.row.IsReading"
                     :disabled="scope.row.IsDeleted || isAudit"
                     @change="changeReadingStatus($event, scope.row)"
+                    :active-text="$fd('YesOrNo', true)"
+                    :inactive-text="$fd('YesOrNo', false)"
                   />
-                  <span>{{$fd('YesOrNo', scope.row.IsReading)}}</span>
                 </template>
               </el-table-column>
               <!-- 是否删除  复审时删除的序列不可再次编辑 -->
@@ -189,8 +190,9 @@
                     v-model="scope.row.IsDeleted"
                     :disabled="isAudit"
                     @change="changeDeleteStatus($event, scope.row)"
+                    :active-text="$fd('YesOrNo', true)"
+                    :inactive-text="$fd('YesOrNo', false)"
                   />
-                  <span>{{$fd('YesOrNo', scope.row.IsDeleted)}}</span>
                 </template>
               </el-table-column>
               <el-table-column

From 451fa0078d82ad3529e3e8c2def0d93e18adc912 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 17:17:02 +0800
Subject: [PATCH 106/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index efc385e2..96f6b938 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -403,6 +403,7 @@ export default {
         data.isReading = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = this.$t('trials:audit:message:changeSeriesStatus').replace('yyy', this.$fd('YesOrNo', data.isReading))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'
@@ -430,6 +431,7 @@ export default {
         data.isDeleted = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = this.$t('trials:audit:message:changeSeriesStatus').replace('yyy', this.$fd('YesOrNo', data.isDeleted))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'

From 81bc7f281de9ff9a054140b98979553f68815fe7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 8 Mar 2024 17:27:00 +0800
Subject: [PATCH 107/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue                          | 4 ++--
 src/views/dicom-show/dicom-visit.vue                          | 2 ++
 .../visit/qc-check/components/qualityAssurance.vue            | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 96f6b938..24e8e2ac 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -403,7 +403,7 @@ export default {
         data.isReading = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
-      message = this.$t('trials:audit:message:changeSeriesStatus').replace('yyy', this.$fd('YesOrNo', data.isReading))
+      message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'
@@ -431,7 +431,7 @@ export default {
         data.isDeleted = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
-      message = this.$t('trials:audit:message:changeSeriesStatus').replace('yyy', this.$fd('YesOrNo', data.isDeleted))
+      message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'
diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 27788f7e..68fd4e1f 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -353,6 +353,7 @@ export default {
         data.isReading = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !data.isReading))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'
@@ -380,6 +381,7 @@ export default {
         data.isDeleted = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !data.isDeleted))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 2e992780..365da61e 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1262,6 +1262,7 @@ export default {
         row.IsReading = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !row.IsReading))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'
@@ -1287,6 +1288,7 @@ export default {
         row.IsDeleted = true
       }
       var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
+      message = message.replace('yyy', this.$fd('YesOrNo', !row.IsDeleted))
       this.$confirm(message, {
         distinguishCancelAndClose: true,
         type: 'warning'

From b2290ca7398cb43effaae606f3bce969c3d1153f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 09:09:33 +0800
Subject: [PATCH 108/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=AE=A1=E7=AE=97=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/dicoms/components/Questions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index efb69398..af74c9a6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -315,7 +315,7 @@ export default {
     async getSplenicState() {
       try {
         var spleenLength = this.questionForm[this.spleenLengthId]
-        spleenLength = isNaN(parseFloat(spleenLength)) ? 0 : parseFloat(spleenLength)
+        spleenLength = isNaN(parseFloat(spleenLength)) ? -1 : parseFloat(spleenLength)
         const result = await getSplenicState(this.visitTaskId, spleenLength)
         return { isSuccess: true, result: result.Result }
       } catch (e) {

From 313bc28a96527147eaa87bbcf7617bce6ca1f514 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 10:53:16 +0800
Subject: [PATCH 109/374] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/StudyList.vue      | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 102d20ef..2f0070d4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -718,7 +718,9 @@ export default {
         // requestPoolManager.startTaskTimer()
         this.imageList.map(image => {
           requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
-            this.imageLoaded(image, res.data.string('x0020000e'))
+            if(res){
+              this.imageLoaded(image, res.data.string('x0020000e'))
+            }
           })
         })
         requestPoolManager.sortTaskPool()

From 10fdbc427dcdc796d0d85551e0a06e141ffad8d6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 11:08:31 +0800
Subject: [PATCH 110/374] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E9=A1=B5=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=8E=86=E5=8F=B2=E5=BD=B1=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/QuestionItem.vue          | 3 ++-
 .../trials-panel/reading/dicoms/components/ReportPage.vue      | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 0a1ebb29..088e03e4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -41,7 +41,8 @@
               v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
               size="mini"
               type="text"
-              style="margin-left: -5px;padding: 7px 5px;"
+              style="padding: '7px 5px'"
+              :style="{marginLeft: readingTaskState!== 2?'-5px':'5px'}"
               @click="locateAnnotation(question)"
             >{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
           </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index 1b3ea62b..a7f99c49 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -730,13 +730,14 @@ export default {
         this.openWindow.close()
       }
       var token = getToken()
+      var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var subjectCode = this.$router.currentRoute.query.subjectCode
       var subjectId = this.$router.currentRoute.query.subjectId
       var trialId = this.$router.currentRoute.query.trialId
       var isReadingTaskViewInOrder = this.$router.currentRoute.query.isReadingTaskViewInOrder
       var criterionType = this.$router.currentRoute.query.criterionType
       var readingTool = this.$router.currentRoute.query.readingTool
-      var path = `/readingDicoms?trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
+      var path = `/readingDicoms?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&subjectCode=${subjectCode}&subjectId=${subjectId}&visitTaskId=${task.VisitTaskId}&isReadingTaskViewInOrder=${isReadingTaskViewInOrder}&criterionType=${criterionType}&readingTool=${readingTool}&TokenKey=${token}`
       const routeData = this.$router.resolve({ path })
       this.openWindow = window.open(routeData.href, '_blank')
     },

From 64691a28330e9c210ef9c8a1a0f3ab31846ec6b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 11 Mar 2024 13:32:52 +0800
Subject: [PATCH 111/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=BE=85?=
 =?UTF-8?q?=E5=8A=9E=E4=BB=BB=E5=8A=A1=E6=8D=A2=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                               | 2 +-
 src/views/trials/trials-list/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.usa b/.env.usa
index 2cd03ed7..ddf1f125 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-02-22/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-08/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 40854bbb..27673440 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -512,7 +512,7 @@
           width="180"
         />
         <el-table-column
-          label=""
+          :label="$t('common:action:action')"
           width="260"
           align="left"
           fixed="right"

From d0e67f6937aa808a4e23c0cea04fc0c27fbb9999 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 14:05:28 +0800
Subject: [PATCH 112/374] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E9=BB=98=E8=AE=A4=E6=BF=80=E6=B4=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestions.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 5db80056..0d8c28c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -571,7 +571,7 @@ export default {
           const refName = `${this.activeItem.activeCollapseId}_${this.activeItem.activeRowIndex}`
           if (this.$refs[refName][0].questionForm.IsDicomReading !== false) {
             var markTool = 'CircleROI'
-            var isMarked = !!this.$refs[refName][0].questionForm.OtherMeasureData || this.$refs[refName][0].questionForm.saveTypeEnum === 2
+            var isMarked = !!this.$refs[refName][0].questionForm.OtherMeasureData
           }
           FusionEvent.$emit('imageLocation', { otherMeasureData: this.$refs[refName][0].questionForm.OtherMeasureData, markTool, isMarked })
         })

From 2a4ddaf6f25c8e1ec0092cf0013b1c317f58e606 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 14:51:18 +0800
Subject: [PATCH 113/374] =?UTF-8?q?=E9=9D=9E=E8=A1=A8=E6=A0=BC=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E6=B8=85=E9=99=A4=E7=97=85=E7=81=B6=EF=BC=8C=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=AE=9A=E4=BD=8D=E5=8F=8A=E7=A1=AE=E8=AE=A4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |  1 +
 .../dicoms/components/Fusion/QuestionItem.vue | 20 ++++++++++++------
 .../dicoms/components/Fusion/Questions.vue    | 15 ++++++++++---
 .../dicoms/components/QuestionItem.vue        | 21 ++++++++++++-------
 .../reading/dicoms/components/Questions.vue   | 15 ++++++++++---
 5 files changed, 53 insertions(+), 19 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index f9317df0..8fd4f03d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -803,6 +803,7 @@ export default {
     },
     removeAnnotation(obj) {
       const { otherMeasureData, type } = obj
+      if(!otherMeasureData || !otherMeasureData.data) return
       const { data } = otherMeasureData
       const i = this.measureDatas.findIndex(item => item.OtherMeasureData && item.OtherMeasureData.data.remark === data.remark)
       if (i > -1) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 088e03e4..2d55e452 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -229,15 +229,13 @@
         :liver-is-inside-volume="liverIsInsideVolume"
         @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData"
-        @addAnnotation="addAnnotation"
-        @removeAnnotation="removeAnnotation"
-        @locateAnnotation="locateAnnotation"
       />
     </template>
   </div>
 </template>
 <script>
 // import { uploadReadingAnswerImage } from '@/api/trials'
+import FusionEvent from './FusionEvent'
 import { mapGetters } from 'vuex'
 export default {
   name: 'QuestionItem',
@@ -328,13 +326,23 @@ export default {
       this.$emit('setFormItemData', obj)
     },
     addAnnotation(question) {
-      this.$emit('addAnnotation', question)
+      FusionEvent.$emit('addAnnotation', question)
     },
     removeAnnotation(question) {
-      this.$emit('removeAnnotation', question)
+      FusionEvent.$emit('locateAnnotation', question)
+      // 是否确认清除标记？
+      this.$confirm(this.$t('trials:reading:warnning:msg47'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          FusionEvent.$emit('removeAnnotation', question)
+        })
+        .catch(() => {})
+      
     },
     locateAnnotation(question) {
-      this.$emit('locateAnnotation', question)
+      FusionEvent.$emit('locateAnnotation', question)
     },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) return
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 38393016..25828b31 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -18,9 +18,6 @@
           :liver-is-inside-volume="liverIsInsideVolume"
           @setFormItemData="setFormItemData"
           @resetFormItemData="resetFormItemData"
-          @addAnnotation="addAnnotation"
-          @removeAnnotation="removeAnnotation"
-          @locateAnnotation="locateAnnotation"
         />
       </template>
       <el-form-item v-if="readingTaskState < 2">
@@ -105,10 +102,22 @@ export default {
       console.log('resetSuvQuestions')
       this.resetSuvQuestions()
     })
+    FusionEvent.$on('addAnnotation', obj => {
+      this.addAnnotation(obj)
+    })
+    FusionEvent.$on('removeAnnotation', obj => {
+      this.removeAnnotation(obj)
+    })
+    FusionEvent.$on('locateAnnotation', obj => {
+      this.locateAnnotation(obj)
+    })
   },
   beforeDestroy() {
     FusionEvent.$off('refreshQuestions')
     FusionEvent.$off('resetSuvQuestions')
+    FusionEvent.$off('addAnnotation')
+    FusionEvent.$off('removeAnnotation')
+    FusionEvent.$off('locateAnnotation')
   },
   methods: {
     getQuestions1() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index d767269c..aefe4d32 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -271,14 +271,12 @@
       :visit-task-id="visitTaskId"
       @setFormItemData="setFormItemData"
       @resetFormItemData="resetFormItemData"
-      @addAnnotation="addAnnotation"
-      @removeAnnotation="removeAnnotation"
-      @locateAnnotation="locateAnnotation"
     />
   </div>
 </template>
 <script>
-import { uploadReadingAnswerImage } from '@/api/trials'
+// import { uploadReadingAnswerImage } from '@/api/trials'
+import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
 export default {
   name: 'QuestionItem',
@@ -368,13 +366,22 @@ export default {
       this.$emit('setFormItemData', obj)
     },
     addAnnotation(question) {
-      this.$emit('addAnnotation', question)
+      DicomEvent.$emit('addAnnotation', question)
     },
     removeAnnotation(question) {
-      this.$emit('removeAnnotation', question)
+      DicomEvent.$emit('locateAnnotation', question)
+      // 是否确认清除标记？
+      this.$confirm(this.$t('trials:reading:warnning:msg47'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          DicomEvent.$emit('removeAnnotation', question)
+        })
+        .catch(() => {})
     },
     locateAnnotation(question) {
-      this.$emit('locateAnnotation', question)
+      DicomEvent.$emit('locateAnnotation', question)
     },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) return
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index af74c9a6..a28ff948 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -16,9 +16,6 @@
         :visit-task-id="visitTaskId"
         @setFormItemData="setFormItemData"
         @resetFormItemData="resetFormItemData"
-        @addAnnotation="addAnnotation"
-        @removeAnnotation="removeAnnotation"
-        @locateAnnotation="locateAnnotation"
       />
 
       <el-form-item v-if="readingTaskState < 2 && !isFirstChangeTask">
@@ -113,9 +110,21 @@ export default {
     DicomEvent.$on('handleSaveQuestions', readingTaskState => {
       this.handleSave()
     })
+    DicomEvent.$on('addAnnotation', obj => {
+      this.addAnnotation(obj)
+    })
+    DicomEvent.$on('removeAnnotation', obj => {
+      this.removeAnnotation(obj)
+    })
+    DicomEvent.$on('locateAnnotation', obj => {
+      this.locateAnnotation(obj)
+    })
   },
   beforeDestroy() {
     DicomEvent.$off('setReadingState')
+    DicomEvent.$off('addAnnotation')
+    DicomEvent.$off('removeAnnotation')
+    DicomEvent.$off('locateAnnotation')
   },
   methods: {
     async getQuestions(visitTaskId) {

From c23e9fb0817a9899c5d2217a37fe330167c27a46 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 11 Mar 2024 15:52:21 +0800
Subject: [PATCH 114/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E5=B8=83=E5=B1=80=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/AdReview.vue       | 1 +
 .../reading/mim-medical-audit/components/GlobalReview.vue   | 6 ++++--
 .../reading/mim-medical-audit/components/OncologyReview.vue | 3 ++-
 .../reading/mim-medical-audit/components/VisitReview.vue    | 3 ++-
 4 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index f5b393e9..b0774885 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -66,6 +66,7 @@
       <el-table-column
         :label="$t('trials:adReview:table:view')"
         width="200"
+        fixed="right"
       >
         <template slot-scope="scope">
           <!-- 查看R1详情 -->
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 7bccdc62..d669b34d 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -103,7 +103,8 @@
 
       <el-table-column
         :label="$t('common:action:action')"
-        width="200"
+        width="100"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
@@ -204,7 +205,8 @@
 
       <el-table-column
         :label="$t('common:action:action')"
-        width="200"
+        width="120"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
index 5f66ba89..a83da997 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
@@ -136,7 +136,8 @@
       <el-table-column
         v-if="oncologyInfo.IsShowDetail"
         :label="$t('common:action:action')"
-        width="100"
+        width="120"
+        fixed="right"
       >
         <template slot-scope="scope">
           <!-- 查看详情 -->
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
index 5d48ab8c..4b878160 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
@@ -63,7 +63,8 @@
       prop="ArmEnum"
       :label="$t('trials:medicalFeedback:title:currentReader')"
       show-overflow-tooltip
-      width="100"
+      width="120"
+      fixed="right"
     >
       <template slot-scope="scope">
         <el-button

From 0ac75d7c44f09d71908a69eb31428aec07439a59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 11 Mar 2024 17:54:02 +0800
Subject: [PATCH 115/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-myinfo/index.vue    |  12 +-
 src/views/trials/trials-workbench/index.css |   0
 src/views/trials/trials-workbench/index.vue | 570 ++++++++++++++++----
 3 files changed, 457 insertions(+), 125 deletions(-)
 create mode 100644 src/views/trials/trials-workbench/index.css

diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index 77c36c16..fc455524 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -355,12 +355,12 @@ export default {
       padding-bottom: 50px;
       .trial-myinfo-left-top{
         width: 70%;padding-top: 100px;position: relative;margin: 0 auto;margin-bottom: 10px;
-        .trial-myinfo-body{
-          width:160px;height:160px;border-radius: 50%;background: #428bca;display: flex;justify-content: center;align-items: center;
-          div{
-            color:#fff;font-size: 30px;
-          }
-        }
+      }
+    }
+    .trial-myinfo-body{
+      width:160px;height:160px;border-radius: 50%;background: #428bca;display: flex;justify-content: center;align-items: center;
+      div{
+        color:#fff;font-size: 30px;
       }
     }
     .saveBtn{
diff --git a/src/views/trials/trials-workbench/index.css b/src/views/trials/trials-workbench/index.css
new file mode 100644
index 00000000..e69de29b
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 550b2585..7cf2b107 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -1,101 +1,382 @@
+<style>
+.user-status-item{
+  width: 100px;
+  height: 32px;
+  line-height: 1;
+  font-size: .75rem;
+  color: #333;
+  background: #fff;
+  border: 1px solid #ddd;
+  border-radius: 16px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  cursor: pointer;
+  padding: 0 8px;
+}
+.my_select_box{
+  margin-bottom: 12px;
+  margin-top: 12px;
+  padding: 0 12px 0 20px;
+  cursor: pointer;
+  min-height: 36px;
+  display: flex;
+  align-items: center;
+  border-radius: 5px;
+}
+.my_select_box_content{
+  color: #333;
+  font-size: .875rem;
+}
+.my_select_box:hover{
+  background: #f5f5f5;
+}
+.my_select_box.selected {
+  color:#6698ff;
+  background: rgba(102, 152, 255, .1);
+}
+.my_select_box.selected .my_select_box_content {
+  color:#6698ff;
+}
+.my_select_title{
+  height: 48px;
+  padding: 0 8px;
+  display: flex;
+  font-size: .75rem;
+  align-items: center;
+  color: #999;
+}
+.my_select .my_select_box {
+  margin-top: 0!important;
+}
+</style>
 <template>
   <div class="workbench-container">
-    <div class="workbench-stats">
-      <PanelCount ref="panelCount" @getSignSystemDocCount="getSignSystemDocCount" />
-    </div>
-      <div class="workbench-content" style="height: 100%">
-        <div style="height: 100%;position: relative">
-          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">
-            {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})
+<!--    <div class="workbench-stats">-->
+<!--      <PanelCount ref="panelCount" @getSignSystemDocCount="getSignSystemDocCount" />-->
+<!--    </div>-->
+      <div class="workbench-content" style="height: 100%;display: flex">
+        <div class="workbench-content-left" style="width: 259px;border-right: 1px solid #eee;background: #fbfbfb">
+          <div style="padding: 12px">
+            <div class="user-profile-wrapper" style="padding: 24px 0 24px 12px;">
+              <div style="display: flex;align-items: center;margin-bottom: 20px;" class="user-info">
+                <div style="margin-right: 0.75rem;background: #428bca;width: 44px;height: 44px;border-radius: 50%;line-height: 44px;text-align: center;font-size: 12px;color:#fff;">
+                  {{ user.LastName }}
+                </div>
+                <div class="user-description" style="">
+                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span>，下午好</div>
+                  <div style="font-size: .75rem;line-height: 18px;color:#999">今天是3月11日，星期一</div>
+                </div>
+              </div>
+              <div class="user-status" style="display: flex">
+                <div class="user-status-item" @click="$router.push('/trials/trials-myinfo')" style="margin-right: 0.75rem">
+                  <span class="el-icon-setting" style="margin-right: 0.5rem"></span>
+                  <span>个人中心</span>
+                </div>
+                <div class="user-status-item" @click="$router.push('/trials/trials-notice')">
+                  <span class="el-icon-bell" style="margin-right: 0.5rem"></span>
+                  <span style="margin-right: 0.5rem">｜</span>
+                  <span>12</span>
+                </div>
+              </div>
+            </div>
+            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
+            <div class="my_select_box" @click="$router.push('/trials/trials-list')">
+              <div class="my_select_box_content">
+                <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                <span>项目列表</span>
+              </div>
+            </div>
+            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
+            <div class="my_select_title">待办</div>
+            <div class="my_select">
+              <!-- PM/APM -->
+              <!-- 阅片期 -->
+              <div class="my_select_box" :class="{selected: selected === 'consistencyCheck'}" tab-data="consistencyCheck" @click="selected = 'consistencyCheck'" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-folder-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:tab:consistencyCheck') }}<span style="margin:0 0.25rem">·</span>{{tabList.PM_CheckCount}}</span>
+                </div>
+              </div>
+              <!-- 重阅审批 -->
+              <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="hasPermi(['trials:trials-workbench:rereadApproval'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:trials-panel:attachments:reReadingTracking') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_ReReadingApprovalCount }}</span>
+                </div>
+              </div>
+              <!-- 阅片人筛选 -->
+              <div class="my_select_box" :class="{selected: selected === 'ReviewerScreen'}" tab-data="ReviewerScreen" @click="selected = 'ReviewerScreen'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-user" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:trials-list:PendingDetails:ReviewerSelection') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_ReviewerSelectCount }}</span>
+                </div>
+              </div>
+              <!-- 中心调研 -->
+              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:pendingSiteResearch') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_SiteSurveryCount }}</span>
+                </div>
+              </div>
+              <!-- SPM/CPM -->
+              <!-- 阅片人审批 -->
+              <div class="my_select_box" :class="{selected: selected === 'ReviewerApproval'}" tab-data="ReviewerApproval" @click="selected = 'ReviewerApproval'" v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-user" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:sysDocBeSigned:table:reviewerApproval') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SPM_ReviewerApprovalCount }}</span>
+                </div>
+              </div>
+              <!-- 重阅审批 -->
+              <div class="my_select_box" :class="{selected: selected === 'SpmRereadApproval'}" tab-data="SpmRereadApproval" @click="selected = 'SpmRereadApproval'" v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:trials-panel:attachments:reReadingTracking') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SPM_ReReadingApprovalCount }}</span>
+                </div>
+              </div>
+              <!-- CRC -->
+              <!-- 影像质疑 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImageQuestion'}" tab-data="ImageQuestion" @click="selected = 'ImageQuestion'" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:tab:crcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageQuestionCount }}</span>
+                </div>
+              </div>
+              <!-- 核查质疑 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImageVerification'}" tab-data="ImageVerification" @click="selected = 'ImageVerification'" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:sysDocBeSigned:table:ImageCheck') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_CheckQuestionCount }}</span>
+                </div>
+              </div>
+              <!-- 影像重传 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImageReupload'}" tab-data="ImageReupload" @click="selected = 'ImageReupload'" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:ImageRetransmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageReUploadCount }}</span>
+                </div>
+              </div>
+              <!-- 加急影像提交 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImageSubmission'}" tab-data="ImageSubmission" @click="selected = 'ImageSubmission'" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageSubmitCount }}</span>
+                </div>
+              </div>
+              <!-- IQC -->
+              <!-- 影像质控 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImageQualityControl'}" tab-data="ImageQualityControl" @click="selected = 'ImageQualityControl'" v-if="hasPermi(['trials:trials-workbenck:imageQC'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:tab:dicomsQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_IamgeQCCount }}</span>
+                </div>
+              </div>
+              <!-- QC质疑 -->
+              <div class="my_select_box" :class="{selected: selected === 'QcQuestion'}" tab-data="QcQuestion" @click="selected = 'QcQuestion'" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:tab:qcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_QCQuestionCount }}</span>
+                </div>
+              </div>
+              <!-- IR -->
+              <!-- 影像待阅 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImagesToRead'}" tab-data="ImagesToRead" @click="selected = 'ImagesToRead'" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:tab:pendingReadingTasks') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_IamgeWaitReadingCount }}</span>
+                </div>
+              </div>
+              <!-- 医学反馈 -->
+              <div class="my_select_box" :class="{selected: selected === 'MedicalFeedback'}" tab-data="MedicalFeedback" @click="selected = 'MedicalFeedback'" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:trials-panel:tab:medicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_MedicalReviewCount }}</span>
+                </div>
+              </div>
+              <!-- MIM -->
+              <!-- 医学审核 -->
+              <div class="my_select_box" :class="{selected: selected === 'MedicalAudit'}" tab-data="MedicalAudit" @click="selected = 'MedicalAudit'" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:trials-panel:tab:pmMedicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.MIM_MedicalReviewCount }}</span>
+                </div>
+              </div>
+              <!-- 项目签署文件 -->
+              <div class="my_select_box" :class="{selected: selected === 'NeedSignTrialDoc'}" tab-data="NeedSignTrialDoc" @click="selected = 'NeedSignTrialDoc'" v-if="!hasPermi(['role:zys'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:trialDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialWaitSignDocCount }}</span>
+                </div>
+              </div>
+              <!-- 系统签署文件 -->
+              <div class="my_select_box" :class="{selected: selected === 'NeedSignSysDoc'}" tab-data="NeedSignSysDoc" @click="selected = 'NeedSignSysDoc'" v-if="!hasPermi(['role:zys'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:sysDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysWaitSignDocCount }}</span>
+                </div>
+              </div>
+            </div>
+            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
+            <div class="my_select_title">我的</div>
+            <div class="my_select">
+              <!-- 项目已签署文件 -->
+              <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="!hasPermi(['role:zys'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:trialDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialWaitSignDocCount }}</span>
+                </div>
+              </div>
+              <!-- 系统已签署文件 -->
+              <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="!hasPermi(['role:zys'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span>{{ $t('trials:workbench:title:sysDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysWaitSignDocCount }}</span>
+                </div>
+              </div>
+            </div>
           </div>
-          <el-tabs v-model="activeName" style="height: 100%" tab-position="left">
-            <!-- PM/APM -->
-            <!-- 阅片期 -->
-<!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
-<!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+        </div>
+        <div style="width: auto;flex:1;padding: 0 20px">
+          <!-- PM/APM -->
+          <!-- 阅片期 -->
+          <!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
+          <!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+          <!--            </el-tab-pane>-->
+            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!--             重阅审批 -->
+            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!--             阅片人筛选 -->
+            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!--             中心调研 -->
+            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!--             SPM/CPM -->
+          <!--             阅片人审批 -->
+            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!--             重阅审批 -->
+            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!--             CRC -->
+          <!--             临床数据录入 -->
+<!--            <clinicalData v-if="selected === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+          <!--             临床数据确认 -->
+<!--            <clinicalDataConfirm v-if="selected === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+          <!-- 影像质疑 -->
+            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 核查质疑 -->
+            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 影像重传 -->
+            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 加急影像提交 -->
+            <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- IQC -->
+          <!-- 影像质控 -->
+            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- QC质疑 -->
+            <QcQuestion v-if="selected === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- IR -->
+          <!-- 影像待阅 -->
+            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 医学反馈 -->
+            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- MIM -->
+          <!-- 医学审核 -->
+            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 项目签署文件 -->
+            <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 系统签署文件 -->
+            <NeedSignSysDoc v-if="selected === 'NeedSignSysDoc'" @refreshStats="refreshStats" />
+        </div>
+<!--        <div v-show="false" style="height: 100%;position: relative">-->
+<!--          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">-->
+<!--            {{ $t('trials:workbench:label:pendingTasksStats') }} ({{tabList.TotalCount}})-->
+<!--          </div>-->
+<!--          <el-tabs v-model="activeName" style="height: 100%" tab-position="left">-->
+<!--            &lt;!&ndash; PM/APM &ndash;&gt;-->
+<!--            &lt;!&ndash; 阅片期 &ndash;&gt;-->
+<!--&lt;!&ndash;            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">&ndash;&gt;-->
+<!--&lt;!&ndash;                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />&ndash;&gt;-->
+<!--&lt;!&ndash;            </el-tab-pane>&ndash;&gt;-->
+<!--            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">-->
+<!--                <consistencyCheck v-if="activeName === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-tab-pane>-->
-            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])" :label="`${$t('trials:tab:consistencyCheck')} (${tabList.PM_CheckCount})`">
-                <consistencyCheck v-if="activeName === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 重阅审批 -->
-            <el-tab-pane name="RereadApproval" v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">
-                <RereadApproval v-if="activeName === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 阅片人筛选 -->
-            <el-tab-pane name="ReviewerScreen" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">
-                <ReviewerScreen v-if="activeName === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 中心调研 -->
-            <el-tab-pane name="SiteResearch" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">
-                <SiteResearch v-if="activeName === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- SPM/CPM -->
-            <!-- 阅片人审批 -->
-            <el-tab-pane name="ReviewerApproval" v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">
-                <ReviewerApproval v-if="activeName === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 重阅审批 -->
-            <el-tab-pane name="SpmRereadApproval" v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">
-                <SpmRereadApproval v-if="activeName === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- CRC -->
-            <!-- 临床数据录入 -->
+<!--&lt;!&ndash;             重阅审批 &ndash;&gt;-->
+<!--            <el-tab-pane name="RereadApproval" v-if="hasPermi(['trials:trials-workbench:rereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.PM_ReReadingApprovalCount})`">-->
+<!--                <RereadApproval v-if="activeName === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--&lt;!&ndash;             阅片人筛选 &ndash;&gt;-->
+<!--            <el-tab-pane name="ReviewerScreen" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:trials-list:PendingDetails:ReviewerSelection')} (${tabList.PM_ReviewerSelectCount})`">-->
+<!--                <ReviewerScreen v-if="activeName === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--&lt;!&ndash;             中心调研 &ndash;&gt;-->
+<!--            <el-tab-pane name="SiteResearch" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])" :label="`${$t('trials:workbench:title:pendingSiteResearch')} (${tabList.PM_SiteSurveryCount})`">-->
+<!--                <SiteResearch v-if="activeName === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--&lt;!&ndash;             SPM/CPM &ndash;&gt;-->
+<!--&lt;!&ndash;             阅片人审批 &ndash;&gt;-->
+<!--            <el-tab-pane name="ReviewerApproval" v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])" :label="`${$t('trials:sysDocBeSigned:table:reviewerApproval')} (${tabList.SPM_ReviewerApprovalCount})`">-->
+<!--                <ReviewerApproval v-if="activeName === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--&lt;!&ndash;             重阅审批 &ndash;&gt;-->
+<!--            <el-tab-pane name="SpmRereadApproval" v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])" :label="`${$t('trials:trials-panel:attachments:reReadingTracking')} (${tabList.SPM_ReReadingApprovalCount})`">-->
+<!--                <SpmRereadApproval v-if="activeName === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--&lt;!&ndash;             CRC &ndash;&gt;-->
+<!--&lt;!&ndash;             临床数据录入 &ndash;&gt;-->
 <!--            <el-tab-pane name="clinicalData" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:workbench:title:ClinicalDataEnter')} (${tabList.CRC_ClinicalDataTobeDoneCount})`">-->
 <!--                <clinicalData v-if="activeName === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-tab-pane>-->
-<!--            &lt;!&ndash; 临床数据确认 &ndash;&gt;-->
+<!--&lt;!&ndash;             临床数据确认 &ndash;&gt;-->
 <!--            <el-tab-pane name="consistencyCheck" v-if="hasPermi(['trials:trials-workbench:clinicalDataEntry'])" :label="`${$t('trials:audit:tab:clinicalDataconfirm')} (${tabList.CRC_ClinialDataTobeConfirmCount})`">-->
 <!--                <clinicalDataConfirm v-if="activeName === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
 <!--            </el-tab-pane>-->
-            <!-- 影像质疑 -->
-            <el-tab-pane name="ImageQuestion" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">
-                <ImageQuestion v-if="activeName === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 核查质疑 -->
-            <el-tab-pane name="ImageVerification" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">
-                <ImageVerification v-if="activeName === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 影像重传 -->
-            <el-tab-pane name="ImageReupload" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">
-                <ImageReupload v-if="activeName === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 加急影像提交 -->
-            <el-tab-pane name="ImageSubmission" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">
-                <ImageSubmission v-if="activeName === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- IQC -->
-            <!-- 影像质控 -->
-            <el-tab-pane name="ImageQualityControl" v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">
-                <ImageQualityControl v-if="activeName === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- QC质疑 -->
-            <el-tab-pane name="QcQuestion" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">
-                <QcQuestion v-if="activeName === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- IR -->
-            <!-- 影像待阅 -->
-            <el-tab-pane name="ImagesToRead" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">
-                <ImagesToRead v-if="activeName === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 医学反馈 -->
-            <el-tab-pane name="MedicalFeedback" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">
-                <MedicalFeedback v-if="activeName === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- MIM -->
-            <!-- 医学审核 -->
-            <el-tab-pane name="MedicalAudit" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">
-                <MedicalAudit v-if="activeName === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 项目签署文件 -->
-            <el-tab-pane  name="NeedSignTrialDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">
-              <NeedSignTrialDoc v-if="activeName === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
-            </el-tab-pane>
-            <!-- 系统签署文件 -->
-            <el-tab-pane name="NeedSignSysDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">
-                <NeedSignSysDoc v-if="activeName === 'NeedSignSysDoc'" @refreshStats="refreshStats" />
-            </el-tab-pane>
-          </el-tabs>
-        </div>
+<!--            &lt;!&ndash; 影像质疑 &ndash;&gt;-->
+<!--            <el-tab-pane name="ImageQuestion" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])" :label="`${$t('trials:tab:crcQuality')} (${tabList.CRC_ImageQuestionCount})`">-->
+<!--                <ImageQuestion v-if="activeName === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 核查质疑 &ndash;&gt;-->
+<!--            <el-tab-pane name="ImageVerification" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])" :label="`${$t('trials:sysDocBeSigned:table:ImageCheck')} (${tabList.CRC_CheckQuestionCount})`">-->
+<!--                <ImageVerification v-if="activeName === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 影像重传 &ndash;&gt;-->
+<!--            <el-tab-pane name="ImageReupload" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])" :label="`${$t('trials:workbench:title:ImageRetransmission')} (${tabList.CRC_ImageReUploadCount})`">-->
+<!--                <ImageReupload v-if="activeName === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 加急影像提交 &ndash;&gt;-->
+<!--            <el-tab-pane name="ImageSubmission" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])" :label="`${$t('trials:workbench:title:ExpeditedImageSubmission')} (${tabList.CRC_ImageSubmitCount})`">-->
+<!--                <ImageSubmission v-if="activeName === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; IQC &ndash;&gt;-->
+<!--            &lt;!&ndash; 影像质控 &ndash;&gt;-->
+<!--            <el-tab-pane name="ImageQualityControl" v-if="hasPermi(['trials:trials-workbenck:imageQC'])" :label="`${$t('trials:tab:dicomsQuality')} (${tabList.IQC_IamgeQCCount})`">-->
+<!--                <ImageQualityControl v-if="activeName === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; QC质疑 &ndash;&gt;-->
+<!--            <el-tab-pane name="QcQuestion" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])" :label="`${$t('trials:tab:qcQuality')} (${tabList.IQC_QCQuestionCount})`">-->
+<!--                <QcQuestion v-if="activeName === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; IR &ndash;&gt;-->
+<!--            &lt;!&ndash; 影像待阅 &ndash;&gt;-->
+<!--            <el-tab-pane name="ImagesToRead" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])" :label="`${$t('trials:tab:pendingReadingTasks')} (${tabList.IR_IamgeWaitReadingCount})`">-->
+<!--                <ImagesToRead v-if="activeName === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 医学反馈 &ndash;&gt;-->
+<!--            <el-tab-pane name="MedicalFeedback" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])" :label="`${$t('trials:trials-panel:tab:medicalFeedback')} (${tabList.IR_MedicalReviewCount})`">-->
+<!--                <MedicalFeedback v-if="activeName === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; MIM &ndash;&gt;-->
+<!--            &lt;!&ndash; 医学审核 &ndash;&gt;-->
+<!--            <el-tab-pane name="MedicalAudit" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])" :label="`${$t('trials:trials-panel:tab:pmMedicalFeedback')} (${tabList.MIM_MedicalReviewCount})`">-->
+<!--                <MedicalAudit v-if="activeName === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 项目签署文件 &ndash;&gt;-->
+<!--            <el-tab-pane  name="NeedSignTrialDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:trialDocBeSigned')} (${tabList.TrialWaitSignDocCount})`">-->
+<!--              <NeedSignTrialDoc v-if="activeName === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />-->
+<!--            </el-tab-pane>-->
+<!--            &lt;!&ndash; 系统签署文件 &ndash;&gt;-->
+<!--            <el-tab-pane name="NeedSignSysDoc" v-if="!hasPermi(['role:zys'])" :label="`${$t('trials:workbench:title:sysDocBeSigned')} (${tabList.SysWaitSignDocCount})`">-->
+<!--                <NeedSignSysDoc v-if="activeName === 'NeedSignSysDoc'" @refreshStats="refreshStats" />-->
+<!--            </el-tab-pane>-->
+<!--          </el-tabs>-->
+<!--        </div>-->
       </div>
   </div>
 </template>
@@ -122,26 +403,62 @@ import QcQuestion from './components/qcQuestion'
 import ImagesToRead from './components/imagesToRead'
 import MedicalFeedback from './components/medicalFeedback'
 import MedicalAudit from './components/medicalAudit'
+import './index.css'
 
-import { getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList } from '@/api/trials'
+import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList} from '@/api/trials'
+import { getUser } from '@/api/admin'
+import {mapGetters} from "vuex";
 
 export default {
   name: 'WorkBench',
-  components: { clinicalDataConfirm, clinicalDataPM, PanelCount, NeedSignTrialDoc, SiteResearch, NeedSignSysDoc, consistencyCheck, clinicalData, RereadApproval, ReviewerScreen, ReviewerApproval, SpmRereadApproval, ImageQuestion, ImageVerification, ImageReupload, ImageSubmission, ImageQualityControl, QcQuestion, ImagesToRead, MedicalFeedback, MedicalAudit },
+  components: {
+    clinicalDataConfirm,
+    clinicalDataPM,
+    PanelCount,
+    NeedSignTrialDoc,
+    SiteResearch,
+    NeedSignSysDoc,
+    consistencyCheck,
+    clinicalData,
+    RereadApproval,
+    ReviewerScreen,
+    ReviewerApproval,
+    SpmRereadApproval,
+    ImageQuestion,
+    ImageVerification,
+    ImageReupload,
+    ImageSubmission,
+    ImageQualityControl,
+    QcQuestion,
+    ImagesToRead,
+    MedicalFeedback,
+    MedicalAudit
+  },
   data() {
     return {
       isSignSystemDoc: false,
       trialIdList: [],
       tabList: {},
       activeName: '',
-      width: 0
+      width: 0,
+      user: {},
+      selected: null
     }
   },
+  computed: {
+    ...mapGetters(['userId', 'name'])
+  },
   mounted() {
     this.getUserTobeDoneRecord()
     this.getNeedSignTrialDocTrialIdList()
+    this.getUserInfo()
   },
   methods: {
+    getUserInfo() {
+      getUser(this.userId).then(async res => {
+        this.user = res.Result
+      }).catch(() => { loading.close() })
+    },
     tabClick(e) {
       console.log(e)
     },
@@ -157,12 +474,11 @@ export default {
         console.log(res)
         this.trialIdList = res.Result
         this.$nextTick(() => {
-          this.width = document.querySelector('.el-tabs__nav-scroll').clientWidth - 20
-          var list = document.querySelectorAll('div[aria-controls]')
+          var list = document.querySelectorAll('div[tab-data]')
           list.forEach((v, i) => {
             if (i === 0) {
-              let item = v.getAttribute('aria-controls')
-              this.activeName = item.split('-')[1]
+              let item = v.getAttribute('tab-data')
+              this.selected = item
             }
           })
         })
@@ -178,22 +494,26 @@ export default {
 </script>
 
 <style lang="scss">
-.workbench-container{
-  .el-tabs__nav{
-    transform: translateY(60px)!important;
+.workbench-container {
+  .el-tabs__nav {
+    transform: translateY(60px) !important;
   }
-  .el-tabs__header{
+
+  .el-tabs__header {
     position: relative;
-    width: 260px!important;
+    width: 260px !important;
   }
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
+
   display: flex;
   flex-direction: column;
   width: 100%;
@@ -201,29 +521,34 @@ export default {
   background-color: #fff;
   overflow-x: hidden;
 
-  .workbench-stats{
+  .workbench-stats {
     height: 120px;
   }
-  .workbench-content{
+
+  .workbench-content {
     flex: 1;
     overflow-y: auto;
-    .content-wrapper{
+
+    .content-wrapper {
       width: 100%;
       height: 100%;
       display: flex;
       flex-flow: wrap;
       padding: 5px;
-      .item{
+
+      .item {
         width: 50%;
         height: 500px;
         padding: 5px;
         box-sizing: border-box;
-        .el-card__body{
+
+        .el-card__body {
           height: 100%;
         }
       }
     }
   }
+
   .table-row__p {
     color: #53646f;
     font-size: 13px;
@@ -231,17 +556,20 @@ export default {
     line-height: 18px;
     margin-bottom: 0px;
   }
+
   .table-row__span {
     color: #9eabb4;
     font-weight: 300;
     font-size: 12px;
   }
-  .el-row{
-    .el-col{
-      padding:5px;
+
+  .el-row {
+    .el-col {
+      padding: 5px;
     }
   }
-  .status:before{
+
+  .status:before {
     content: '';
     margin-bottom: 0;
     width: 9px;
@@ -250,43 +578,47 @@ export default {
     margin-right: 7px;
     border-radius: 50%;
   }
-  .status--red:before{
+
+  .status--red:before {
     background-color: #e36767;
   }
 
-  .status--red{
+  .status--red {
     color: #e36767;
   }
 
-  .status--blue:before{
+  .status--blue:before {
     background-color: #3fd2ea;
   }
 
-  .status--blue{
+  .status--blue {
     color: #3fd2ea;
   }
 
-  .status--yellow:before{
+  .status--yellow:before {
     background-color: #ecce4e;
   }
 
-  .status--yellow{
+  .status--yellow {
     color: #ecce4e;
   }
 
-  .status--green{
+  .status--green {
     color: #6cdb56;
   }
-  .status--green:before{
+
+  .status--green:before {
     background-color: #6cdb56;
   }
 
-  .status--grey{
+  .status--grey {
     color: #9eabb4;
   }
-  .status--grey:before{
+
+  .status--grey:before {
     background-color: #9eabb4;
   }
+
   .chart-wrapper {
     background: #fff;
     padding: 16px 16px 0;

From 70adad29e479de6227f1457713dc96e625c73f7f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 11 Mar 2024 18:15:09 +0800
Subject: [PATCH 116/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/NeedSignedTrialDoc.vue         | 240 ++++++++++++++++
 .../components/needSignSysDoc.vue             |  29 +-
 .../components/needSignedSysDoc.vue           | 267 ++++++++++++++++++
 src/views/trials/trials-workbench/index.vue   |  24 +-
 4 files changed, 551 insertions(+), 9 deletions(-)
 create mode 100644 src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
 create mode 100644 src/views/trials/trials-workbench/components/needSignedSysDoc.vue

diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
new file mode 100644
index 00000000..ed0abda1
--- /dev/null
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@@ -0,0 +1,240 @@
+<template>
+  <div class="needSignSys-wrapper">
+    <el-row>
+      <el-col :span="12">
+        <!-- 待签署的系统文件 -->
+        <h3>{{ $t('trials:workbench:title:sysDocBeSigned') }}</h3>
+      </el-col>
+      <el-col :span="12" style="text-align:right;">
+        <h3>
+          <Pagination class="page" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;" @pagination="getList" />
+          <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')" @click="handleReset" />
+        </h3>
+      </el-col>
+    </el-row>
+    <!--  -->
+    <el-table
+      ref="needSignSysList"
+      v-loading="listLoading"
+      :data="list"
+      :show-header="true"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:fileType')"
+        prop="FileType"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:fileName')"
+        prop="Name"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:uploadTime')"
+        prop="UpdateTime"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+        width="140"
+      >
+        <template slot-scope="scope">
+          <el-button
+            icon="el-icon-edit-outline"
+            circle
+            :title="$t('trials:workbench:action:sign')"
+            @click="handleSign(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 预览/签署文件 -->
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :title="title"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <span v-if="!currentIsConfirm" style="position: fixed;right: 75px;top: 14px;">
+        <span style="color:red;margin-right:10px;">
+          <!-- 请仔细阅读文件，并签名确认 -->
+          {{ $t('common:message:signTip') }}
+          <span v-show="duration < currentMinMinutes * 60">{{ `(${currentMinMinutes * 60 - duration}s)` }}</span>
+        </span>
+
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="timer !== null || duration === 0"
+          :loading="btnLoading"
+          @click="handleConfirm"
+        >
+          {{ $t('common:button:sign') }}
+        </el-button>
+      </span>
+
+      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" @getList="getList" />
+      </div>
+    </el-dialog>
+
+    <!-- 签名弹框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      append-to-body
+    >
+      <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>
+      </div>
+      <SignForm :is-system-doc="currentRow.IsSystemDoc" :document-id="currentRow.Id" :file-name="fileName" @closeDialog="closeSignDialog" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getWaitSignSysDocList, setSystemDocFirstViewTime } from '@/api/trials'
+import Pagination from '@/components/Pagination'
+import PreviewFile from '@/components/PreviewFile/index'
+import SignForm from '@/views/trials/trials-panel/attachments/self-attachment/components/SignForm'
+const searchDataDefault = () => {
+  return {
+    pageIndex: 1,
+    pageSize: 20,
+    asc: true,
+    sortField: ''
+  }
+}
+export default {
+  name: 'NeedSignSysDoc',
+  components: { Pagination, PreviewFile, SignForm },
+  data() {
+    return {
+      listQuery: searchDataDefault(),
+      listLoading: false,
+      list: [],
+      total: 0,
+      previewVisible: false,
+      signVisible: false,
+      currentMinMinutes: 0,
+      duration: 0,
+      timer: null,
+      btnLoading: false,
+      fileName: '',
+      currentPath: '',
+      currentType: '',
+      currentIsConfirm: false,
+      currentUser: zzSessionStorage.getItem('userName'),
+      currentRow: {}
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  destroyed() {
+    if (this.timer) {
+      this.stopTimer()
+    }
+  },
+  methods: {
+    getList() {
+      getWaitSignSysDocList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.total = res.Result.TotalCount
+        this.list = res.Result.CurrentPageData
+      }).catch(() => { this.listLoading = false })
+    },
+    handleSign(row) {
+      this.currentRow = { ...row }
+      const { Name, FullFilePath, SignViewMinimumMinutes } = row
+      this.currentPath = FullFilePath
+      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentMinMinutes = SignViewMinimumMinutes
+      this.currentIsConfirm = false
+      this.title = Name
+      this.fileName = Name.slice(0, Name.lastIndexOf('.'))
+      this.listLoading = true
+      setSystemDocFirstViewTime(row.Id).then(res => {
+        this.listLoading = false
+        this.previewVisible = true
+        const _this = this
+        setTimeout(() => {
+          _this.initTimer()
+        }, 1000)
+      }).catch(() => {
+        this.listLoading = false
+      })
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.listQuery.asc = true
+      } else {
+        this.listQuery.asc = false
+      }
+      this.listQuery.sortField = column.prop
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = searchDataDefault()
+      this.getList()
+      this.$nextTick(() => {
+        this.$refs.needSignSysList.clearSort()
+      })
+    },
+    // 签名
+    handleConfirm() {
+      this.signVisible = true
+    },
+    // 关闭签名弹窗
+    closeSignDialog(isSave) {
+      this.signVisible = false
+      if (isSave) {
+        this.currentIsConfirm = true
+        this.getList()
+        this.$emit('refreshStats')
+      }
+    },
+    // 初始化计时器,清除上一次的数据
+    initTimer() {
+      if (this.currentMinMinutes > 0 && !this.currentIsConfirm) {
+        this.duration = 0
+        if (this.timer) {
+          this.stopTimer()
+        }
+        this.startTimer()
+      }
+    },
+    // 开启计时器
+    startTimer() {
+      this.timer = setInterval(() => {
+        this.duration++
+        if (this.duration >= this.currentMinMinutes * 60) {
+          this.stopTimer()
+        }
+      }, 1000)
+    },
+    // 清楚计时器
+    stopTimer() {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.needSignSys-wrapper{
+  height: 100%;
+}
+
+</style>
diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index ed0abda1..8328f65e 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <!-- 待签署的系统文件 -->
-        <h3>{{ $t('trials:workbench:title:sysDocBeSigned') }}</h3>
+        <h3>{{ !isSigned ? $t('trials:workbench:title:sysDocBeSigned') : $t('trials:workbench:title:sysDocSigned') }}</h3>
       </el-col>
       <el-col :span="12" style="text-align:right;">
         <h3>
@@ -43,9 +43,18 @@
         width="140"
       >
         <template slot-scope="scope">
+          <!-- 预览 -->
+          <el-button
+            icon="el-icon-view"
+            circle
+            v-if="isSigned"
+            :title="$t('trials:self-attachment:action:preview')"
+            @click="handlePreview(scope.row)"
+          />
           <el-button
             icon="el-icon-edit-outline"
             circle
+            v-if="!isSigned"
             :title="$t('trials:workbench:action:sign')"
             @click="handleSign(scope.row)"
           />
@@ -117,6 +126,12 @@ const searchDataDefault = () => {
 export default {
   name: 'NeedSignSysDoc',
   components: { Pagination, PreviewFile, SignForm },
+  props: {
+    isSigned: {
+      type: Boolean,
+      default() { return false }
+    }
+  },
   data() {
     return {
       listQuery: searchDataDefault(),
@@ -146,7 +161,19 @@ export default {
     }
   },
   methods: {
+    // 预览
+    handlePreview(row) {
+      this.currentRow = { ...row }
+      const { Name, FullFilePath, SignViewMinimumMinutes } = row
+      this.currentPath = FullFilePath
+      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentMinMinutes = SignViewMinimumMinutes
+      this.currentIsConfirm = true
+      this.title = Name
+      this.previewVisible = true
+    },
     getList() {
+      this.listQuery.IsSigned = this.isSigned
       getWaitSignSysDocList(this.listQuery).then(res => {
         this.listLoading = false
         this.total = res.Result.TotalCount
diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
new file mode 100644
index 00000000..8328f65e
--- /dev/null
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@@ -0,0 +1,267 @@
+<template>
+  <div class="needSignSys-wrapper">
+    <el-row>
+      <el-col :span="12">
+        <!-- 待签署的系统文件 -->
+        <h3>{{ !isSigned ? $t('trials:workbench:title:sysDocBeSigned') : $t('trials:workbench:title:sysDocSigned') }}</h3>
+      </el-col>
+      <el-col :span="12" style="text-align:right;">
+        <h3>
+          <Pagination class="page" :total="total" :page.sync="listQuery.pageIndex" :limit.sync="listQuery.pageSize" layout="total, sizes, prev, pager, next" :background="false" style="display: inline-block;" @pagination="getList" />
+          <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')" @click="handleReset" />
+        </h3>
+      </el-col>
+    </el-row>
+    <!--  -->
+    <el-table
+      ref="needSignSysList"
+      v-loading="listLoading"
+      :data="list"
+      :show-header="true"
+      v-adaptive="{bottomOffset:45}"
+      height="100"
+      @sort-change="handleSortByColumn"
+    >
+      <el-table-column type="index" width="40" />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:fileType')"
+        prop="FileType"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:fileName')"
+        prop="Name"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        :label="$t('trials:sysDocBeSigned:table:uploadTime')"
+        prop="UpdateTime"
+        show-overflow-tooltip
+      />
+      <el-table-column
+        :label="$t('common:action:action')"
+        width="140"
+      >
+        <template slot-scope="scope">
+          <!-- 预览 -->
+          <el-button
+            icon="el-icon-view"
+            circle
+            v-if="isSigned"
+            :title="$t('trials:self-attachment:action:preview')"
+            @click="handlePreview(scope.row)"
+          />
+          <el-button
+            icon="el-icon-edit-outline"
+            circle
+            v-if="!isSigned"
+            :title="$t('trials:workbench:action:sign')"
+            @click="handleSign(scope.row)"
+          />
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <!-- 预览/签署文件 -->
+    <el-dialog
+      v-if="previewVisible"
+      :visible.sync="previewVisible"
+      :title="title"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <span v-if="!currentIsConfirm" style="position: fixed;right: 75px;top: 14px;">
+        <span style="color:red;margin-right:10px;">
+          <!-- 请仔细阅读文件，并签名确认 -->
+          {{ $t('common:message:signTip') }}
+          <span v-show="duration < currentMinMinutes * 60">{{ `(${currentMinMinutes * 60 - duration}s)` }}</span>
+        </span>
+
+        <el-button
+          size="small"
+          type="primary"
+          :disabled="timer !== null || duration === 0"
+          :loading="btnLoading"
+          @click="handleConfirm"
+        >
+          {{ $t('common:button:sign') }}
+        </el-button>
+      </span>
+
+      <div class="base-modal-body" style="border:2px solid #ccc;padding: 10px">
+        <PreviewFile v-if="previewVisible" :file-path="currentPath" :file-type="currentType" @getList="getList" />
+      </div>
+    </el-dialog>
+
+    <!-- 签名弹框 -->
+    <el-dialog
+      v-if="signVisible"
+      :visible.sync="signVisible"
+      :close-on-click-modal="false"
+      width="600px"
+      append-to-body
+    >
+      <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>
+      </div>
+      <SignForm :is-system-doc="currentRow.IsSystemDoc" :document-id="currentRow.Id" :file-name="fileName" @closeDialog="closeSignDialog" />
+    </el-dialog>
+  </div>
+</template>
+<script>
+import { getWaitSignSysDocList, setSystemDocFirstViewTime } from '@/api/trials'
+import Pagination from '@/components/Pagination'
+import PreviewFile from '@/components/PreviewFile/index'
+import SignForm from '@/views/trials/trials-panel/attachments/self-attachment/components/SignForm'
+const searchDataDefault = () => {
+  return {
+    pageIndex: 1,
+    pageSize: 20,
+    asc: true,
+    sortField: ''
+  }
+}
+export default {
+  name: 'NeedSignSysDoc',
+  components: { Pagination, PreviewFile, SignForm },
+  props: {
+    isSigned: {
+      type: Boolean,
+      default() { return false }
+    }
+  },
+  data() {
+    return {
+      listQuery: searchDataDefault(),
+      listLoading: false,
+      list: [],
+      total: 0,
+      previewVisible: false,
+      signVisible: false,
+      currentMinMinutes: 0,
+      duration: 0,
+      timer: null,
+      btnLoading: false,
+      fileName: '',
+      currentPath: '',
+      currentType: '',
+      currentIsConfirm: false,
+      currentUser: zzSessionStorage.getItem('userName'),
+      currentRow: {}
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  destroyed() {
+    if (this.timer) {
+      this.stopTimer()
+    }
+  },
+  methods: {
+    // 预览
+    handlePreview(row) {
+      this.currentRow = { ...row }
+      const { Name, FullFilePath, SignViewMinimumMinutes } = row
+      this.currentPath = FullFilePath
+      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentMinMinutes = SignViewMinimumMinutes
+      this.currentIsConfirm = true
+      this.title = Name
+      this.previewVisible = true
+    },
+    getList() {
+      this.listQuery.IsSigned = this.isSigned
+      getWaitSignSysDocList(this.listQuery).then(res => {
+        this.listLoading = false
+        this.total = res.Result.TotalCount
+        this.list = res.Result.CurrentPageData
+      }).catch(() => { this.listLoading = false })
+    },
+    handleSign(row) {
+      this.currentRow = { ...row }
+      const { Name, FullFilePath, SignViewMinimumMinutes } = row
+      this.currentPath = FullFilePath
+      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentMinMinutes = SignViewMinimumMinutes
+      this.currentIsConfirm = false
+      this.title = Name
+      this.fileName = Name.slice(0, Name.lastIndexOf('.'))
+      this.listLoading = true
+      setSystemDocFirstViewTime(row.Id).then(res => {
+        this.listLoading = false
+        this.previewVisible = true
+        const _this = this
+        setTimeout(() => {
+          _this.initTimer()
+        }, 1000)
+      }).catch(() => {
+        this.listLoading = false
+      })
+    },
+    // 排序
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.listQuery.asc = true
+      } else {
+        this.listQuery.asc = false
+      }
+      this.listQuery.sortField = column.prop
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = searchDataDefault()
+      this.getList()
+      this.$nextTick(() => {
+        this.$refs.needSignSysList.clearSort()
+      })
+    },
+    // 签名
+    handleConfirm() {
+      this.signVisible = true
+    },
+    // 关闭签名弹窗
+    closeSignDialog(isSave) {
+      this.signVisible = false
+      if (isSave) {
+        this.currentIsConfirm = true
+        this.getList()
+        this.$emit('refreshStats')
+      }
+    },
+    // 初始化计时器,清除上一次的数据
+    initTimer() {
+      if (this.currentMinMinutes > 0 && !this.currentIsConfirm) {
+        this.duration = 0
+        if (this.timer) {
+          this.stopTimer()
+        }
+        this.startTimer()
+      }
+    },
+    // 开启计时器
+    startTimer() {
+      this.timer = setInterval(() => {
+        this.duration++
+        if (this.duration >= this.currentMinMinutes * 60) {
+          this.stopTimer()
+        }
+      }, 1000)
+    },
+    // 清楚计时器
+    stopTimer() {
+      clearInterval(this.timer)
+      this.timer = null
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.needSignSys-wrapper{
+  height: 100%;
+}
+
+</style>
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 7cf2b107..ff9fb26d 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -76,7 +76,7 @@
                 <div class="user-status-item" @click="$router.push('/trials/trials-notice')">
                   <span class="el-icon-bell" style="margin-right: 0.5rem"></span>
                   <span style="margin-right: 0.5rem">｜</span>
-                  <span>12</span>
+                  <span>{{ tabList.SysNoticeUnReadCount }}</span>
                 </div>
               </div>
             </div>
@@ -84,7 +84,7 @@
             <div class="my_select_box" @click="$router.push('/trials/trials-list')">
               <div class="my_select_box_content">
                 <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                <span>项目列表</span>
+                <span>我的项目</span>
               </div>
             </div>
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
@@ -209,7 +209,7 @@
                 </div>
               </div>
               <!-- 系统签署文件 -->
-              <div class="my_select_box" :class="{selected: selected === 'NeedSignSysDoc'}" tab-data="NeedSignSysDoc" @click="selected = 'NeedSignSysDoc'" v-if="!hasPermi(['role:zys'])">
+              <div class="my_select_box" :class="{selected: selected === 'NeedSignSysDoc'}" tab-data="NeedSignSysDoc" @click="$nextTick(() => selected = 'NeedSignSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:workbench:title:sysDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysWaitSignDocCount }}</span>
@@ -220,17 +220,17 @@
             <div class="my_select_title">我的</div>
             <div class="my_select">
               <!-- 项目已签署文件 -->
-              <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="!hasPermi(['role:zys'])">
+              <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:trialDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialWaitSignDocCount }}</span>
+                  <span>{{ $t('trials:workbench:title:trialDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialSignedDocCount }}</span>
                 </div>
               </div>
               <!-- 系统已签署文件 -->
-              <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="!hasPermi(['role:zys'])">
+              <div class="my_select_box" :class="{selected: selected === 'NeedSignedSysDoc'}" tab-data="NeedSignedSysDoc" @click="$nextTick(() => selected = 'NeedSignedSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:sysDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysWaitSignDocCount }}</span>
+                  <span>{{ $t('trials:workbench:title:sysDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysSignedDocCount }}</span>
                 </div>
               </div>
             </div>
@@ -284,6 +284,10 @@
             <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->
             <NeedSignSysDoc v-if="selected === 'NeedSignSysDoc'" @refreshStats="refreshStats" />
+          <!-- 项目签署文件 -->
+          <NeedSignedTrialDoc v-if="selected === 'NeedSignedTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
+          <!-- 系统签署文件 -->
+          <NeedSignedSysDoc v-if="selected === 'NeedSignedSysDoc'" :is-signed="true" @refreshStats="refreshStats" />
         </div>
 <!--        <div v-show="false" style="height: 100%;position: relative">-->
 <!--          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">-->
@@ -386,6 +390,7 @@ import PanelCount from './components/panelCount'
 import NeedSignTrialDoc from './components/needSignTrialDoc'
 import SiteResearch from './components/siteResearch'
 import NeedSignSysDoc from './components/needSignSysDoc'
+import NeedSignedSysDoc from './components/needSignedSysDoc'
 import consistencyCheck from './components/consistencyCheck'
 import clinicalData from './components/clinicalData'
 import clinicalDataConfirm from './components/clinicalDataConfirm'
@@ -403,6 +408,7 @@ import QcQuestion from './components/qcQuestion'
 import ImagesToRead from './components/imagesToRead'
 import MedicalFeedback from './components/medicalFeedback'
 import MedicalAudit from './components/medicalAudit'
+import NeedSignedTrialDoc from './components/NeedSignedTrialDoc'
 import './index.css'
 
 import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList} from '@/api/trials'
@@ -432,7 +438,9 @@ export default {
     QcQuestion,
     ImagesToRead,
     MedicalFeedback,
-    MedicalAudit
+    MedicalAudit,
+    NeedSignedTrialDoc,
+    NeedSignedSysDoc
   },
   data() {
     return {

From 283533ff6dab65721941901a6a2091f3eca5cdc2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Mon, 11 Mar 2024 18:22:04 +0800
Subject: [PATCH 117/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index ff9fb26d..f25f7e92 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -64,8 +64,8 @@
                   {{ user.LastName }}
                 </div>
                 <div class="user-description" style="">
-                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span>，下午好</div>
-                  <div style="font-size: .75rem;line-height: 18px;color:#999">今天是3月11日，星期一</div>
+                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span>，{{ hoursTip }}</div>
+                  <div style="font-size: .75rem;line-height: 18px;color:#999">今天是{{new Date().getMonth() + 1}}月{{new Date().getDate()}}日，{{ dayOfWeek }}</div>
                 </div>
               </div>
               <div class="user-status" style="display: flex">
@@ -450,7 +450,9 @@ export default {
       activeName: '',
       width: 0,
       user: {},
-      selected: null
+      selected: null,
+      dayOfWeek: null,
+      hoursTip: null
     }
   },
   computed: {
@@ -460,6 +462,19 @@ export default {
     this.getUserTobeDoneRecord()
     this.getNeedSignTrialDocTrialIdList()
     this.getUserInfo()
+    const days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+    const date = new Date();
+    this.dayOfWeek = days[date.getDay()];
+    let date2=(new Date()).getHours();
+    let hoursTip = "";
+    if(date2>=6&&date2<12){
+      hoursTip="上午好"
+    }else if(date2>=12&&date2<18){
+      hoursTip="下午好"
+    }else{
+      hoursTip="晚上好"
+    }
+    this.hoursTip = hoursTip
   },
   methods: {
     getUserInfo() {

From 277ffa5def352c20872b27b33cbdf1fd760796bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 09:25:26 +0800
Subject: [PATCH 118/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  7 +++++
 .../components/NeedSignedTrialDoc.vue         |  4 +--
 src/views/trials/trials-workbench/index.vue   | 28 +++++++++----------
 3 files changed, 23 insertions(+), 16 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 1a974b52..ba8d97a6 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3600,4 +3600,11 @@ export function getReadingCalculationData(param) {
   })
 }
 
+export function getTrialSignDocumentList(param) {
+  return request({
+    url: `/TrialDocument/getTrialSignDocumentList?IsSigned=true&PageIndex=${param.pageIndex}&PageSize=${param.pageSize}`,
+    method: 'get'
+  })
+}
+
 
diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
index ed0abda1..d8c18a5d 100644
--- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@@ -102,7 +102,7 @@
   </div>
 </template>
 <script>
-import { getWaitSignSysDocList, setSystemDocFirstViewTime } from '@/api/trials'
+import { getWaitSignSysDocList, setSystemDocFirstViewTime, getTrialSignDocumentList  } from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import PreviewFile from '@/components/PreviewFile/index'
 import SignForm from '@/views/trials/trials-panel/attachments/self-attachment/components/SignForm'
@@ -147,7 +147,7 @@ export default {
   },
   methods: {
     getList() {
-      getWaitSignSysDocList(this.listQuery).then(res => {
+      getTrialSignDocumentList(this.listQuery).then(res => {
         this.listLoading = false
         this.total = res.Result.TotalCount
         this.list = res.Result.CurrentPageData
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index f25f7e92..89aab584 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -71,7 +71,7 @@
               <div class="user-status" style="display: flex">
                 <div class="user-status-item" @click="$router.push('/trials/trials-myinfo')" style="margin-right: 0.75rem">
                   <span class="el-icon-setting" style="margin-right: 0.5rem"></span>
-                  <span>个人中心</span>
+                  <span>{{$t('trials:trials-myinfo:title:accountInfo')}}</span>
                 </div>
                 <div class="user-status-item" @click="$router.push('/trials/trials-notice')">
                   <span class="el-icon-bell" style="margin-right: 0.5rem"></span>
@@ -84,11 +84,11 @@
             <div class="my_select_box" @click="$router.push('/trials/trials-list')">
               <div class="my_select_box_content">
                 <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                <span>我的项目</span>
+                <span>{{ $t('trials:tab:trials') }}</span>
               </div>
             </div>
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_title">待办</div>
+            <div class="my_select_title">{{ $t('trials:workbench:title:padding') }}</div>
             <div class="my_select">
               <!-- PM/APM -->
               <!-- 阅片期 -->
@@ -138,28 +138,28 @@
               <!-- 影像质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageQuestion'}" tab-data="ImageQuestion" @click="selected = 'ImageQuestion'" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-chat-dot-square" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:tab:crcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageQuestionCount }}</span>
                 </div>
               </div>
               <!-- 核查质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageVerification'}" tab-data="ImageVerification" @click="selected = 'ImageVerification'" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-money" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:sysDocBeSigned:table:ImageCheck') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_CheckQuestionCount }}</span>
                 </div>
               </div>
               <!-- 影像重传 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageReupload'}" tab-data="ImageReupload" @click="selected = 'ImageReupload'" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-upload" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:workbench:title:ImageRetransmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageReUploadCount }}</span>
                 </div>
               </div>
               <!-- 加急影像提交 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageSubmission'}" tab-data="ImageSubmission" @click="selected = 'ImageSubmission'" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-circle-check" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageSubmitCount }}</span>
                 </div>
               </div>
@@ -167,14 +167,14 @@
               <!-- 影像质控 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageQualityControl'}" tab-data="ImageQualityControl" @click="selected = 'ImageQualityControl'" v-if="hasPermi(['trials:trials-workbenck:imageQC'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:tab:dicomsQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_IamgeQCCount }}</span>
                 </div>
               </div>
               <!-- QC质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'QcQuestion'}" tab-data="QcQuestion" @click="selected = 'QcQuestion'" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-chat-dot-square" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:tab:qcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_QCQuestionCount }}</span>
                 </div>
               </div>
@@ -182,14 +182,14 @@
               <!-- 影像待阅 -->
               <div class="my_select_box" :class="{selected: selected === 'ImagesToRead'}" tab-data="ImagesToRead" @click="selected = 'ImagesToRead'" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-collection" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:tab:pendingReadingTasks') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_IamgeWaitReadingCount }}</span>
                 </div>
               </div>
               <!-- 医学反馈 -->
               <div class="my_select_box" :class="{selected: selected === 'MedicalFeedback'}" tab-data="MedicalFeedback" @click="selected = 'MedicalFeedback'" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:trials-panel:tab:medicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_MedicalReviewCount }}</span>
                 </div>
               </div>
@@ -197,7 +197,7 @@
               <!-- 医学审核 -->
               <div class="my_select_box" :class="{selected: selected === 'MedicalAudit'}" tab-data="MedicalAudit" @click="selected = 'MedicalAudit'" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])">
                 <div class="my_select_box_content">
-                  <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span>{{ $t('trials:trials-panel:tab:pmMedicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.MIM_MedicalReviewCount }}</span>
                 </div>
               </div>
@@ -217,7 +217,7 @@
               </div>
             </div>
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_title">我的</div>
+            <div class="my_select_title">{{ $t('trials:workbench:title:my') }}</div>
             <div class="my_select">
               <!-- 项目已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
@@ -411,7 +411,7 @@ import MedicalAudit from './components/medicalAudit'
 import NeedSignedTrialDoc from './components/NeedSignedTrialDoc'
 import './index.css'
 
-import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList} from '@/api/trials'
+import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList, getTrialSignDocumentList} from '@/api/trials'
 import { getUser } from '@/api/admin'
 import {mapGetters} from "vuex";
 

From 727d4f8c19931b54613b1dbe3ad5a4fda64f192d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 11:26:01 +0800
Subject: [PATCH 119/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                                            | 5 +++--
 .../consistency-analysis/components/VirtualCenter.vue        | 1 +
 .../trials-workbench/components/NeedSignedTrialDoc.vue       | 3 ++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index ba8d97a6..7a33e701 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3602,8 +3602,9 @@ export function getReadingCalculationData(param) {
 
 export function getTrialSignDocumentList(param) {
   return request({
-    url: `/TrialDocument/getTrialSignDocumentList?IsSigned=true&PageIndex=${param.pageIndex}&PageSize=${param.pageSize}`,
-    method: 'get'
+    url: `/TrialDocument/getTrialSignDocumentList`,
+    method: 'post',
+    data: param
   })
 }
 
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index a3ebcedb..7b6965bb 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -7,6 +7,7 @@
     size="small"
     :rules="rules"
     label-width="170px"
+    @submit.native.prevent
   >
     <div class="base-dialog-body" style="position: relative;padding-top: 50px">
       <el-button @click="openSiteCodeHistory" type="text" style="position: absolute;right: 10px;top: 10px;">{{$t('trials:consistencyAnalysisRule:table:SiteCodeHistory')}}</el-button>
diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
index d8c18a5d..00ee4a89 100644
--- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@@ -3,7 +3,7 @@
     <el-row>
       <el-col :span="12">
         <!-- 待签署的系统文件 -->
-        <h3>{{ $t('trials:workbench:title:sysDocBeSigned') }}</h3>
+        <h3>{{ $t('trials:workbench:title:trialDocSigned') }}</h3>
       </el-col>
       <el-col :span="12" style="text-align:right;">
         <h3>
@@ -108,6 +108,7 @@ import PreviewFile from '@/components/PreviewFile/index'
 import SignForm from '@/views/trials/trials-panel/attachments/self-attachment/components/SignForm'
 const searchDataDefault = () => {
   return {
+    IsSigned: true,
     pageIndex: 1,
     pageSize: 20,
     asc: true,

From 058bf39c6ef16fed37a04cf7e5ed5a077fc73481 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 12 Mar 2024 14:09:26 +0800
Subject: [PATCH 120/374] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E9=A1=B5=E7=AD=BE=E7=9A=84=E8=AF=B7=E6=B1=82=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index 7f671acc..c8fa0594 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -62,7 +62,11 @@ service.interceptors.response.use(
         MessageBox.confirm(res.ErrorMessage,  {
           type: 'warning',
           showCancelButton: false,
-          callback: action => {}
+          callback: action => {
+            if(res.Code === 6) {
+              window.close()
+            }
+          }
         })
       }
       return Promise.reject(res)

From 691492656761d4a466e04d980f3c15f054a57b8f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 15:19:36 +0800
Subject: [PATCH 121/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../GroupConsistentRuleSubjectTable.vue       |  5 +++
 .../components/VirtualCenter.vue              |  2 +-
 .../reading/consistency-analysis/index.vue    |  3 +-
 .../components/NeedSignedTrialDoc.vue         | 42 ++++++++++++++++---
 src/views/trials/trials-workbench/index.vue   | 14 +++----
 5 files changed, 52 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index 3ea5348d..c0dc2460 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -164,6 +164,11 @@ export default {
       this.loading = true
       this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
       getGroupConsistentRuleSubjectList(this.searchData).then(res => {
+        if (res.OtherInfo) {
+          this.$emit('setReaderRulesFormVisible', false)
+        } else {
+          this.$emit('setReaderRulesFormVisible', true)
+        }
         this.loading = false
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index 7b6965bb..ad435593 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -17,7 +17,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="VirtualSiteCode">
-        <el-input v-model="form.VirtualSiteCode" style="width: 140px;" />
+        <el-input v-model="form.VirtualSiteCode" style="width: 140px;" @input="(v)=>(form.VirtualSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 05f4845c..355c31b9 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -525,7 +525,7 @@
               <!-- 配置组间一致性分析规则 -->
               {{$t('trials:grouptConsistencyAnalysis:button:config')}}
             </el-button>
-            <GroupConsistentRuleSubjectTable v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
+            <GroupConsistentRuleSubjectTable @setReaderRulesFormVisible="(v) => {ReaderRulesFormVisible = v}" v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
             :ref="`GroupConsistentRuleSubjectTable${item.TrialReadingCriterionId}`" style="margin-top: 40px" :IsSelfAnalysis="IsSelfAnalysis" :changeNum="changeNum" @close="() => {ReaderRulesVisible2 = false; ; rowData = {}}" @getList="getList()" />
           </el-tab-pane>
         </el-tabs>
@@ -536,6 +536,7 @@
         :visible.sync="ReaderRulesFormVisible"
         width="480px"
         :close-on-click-modal="false"
+        append-to-body
       >
         <ReaderRulesForm :other-info="OtherInfo" :isDisable="isDisable" :trial-criterion-list="trialCriterionList" :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :select-list="SelectList" :doctor-user-list="DoctorUserList" :is-self-analysis="IsSelfAnalysis" @close="() => {ReaderRulesFormVisible = false; rowData = {}}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
       </el-dialog>
diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
index 00ee4a89..e141696b 100644
--- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@@ -23,6 +23,27 @@
       @sort-change="handleSortByColumn"
     >
       <el-table-column type="index" width="40" />
+      <!-- 项目编号 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:trialId')"
+        prop="TrialCode"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 试验名称 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:experimentName')"
+        prop="ExperimentName"
+        show-overflow-tooltip
+        sortable="custom"
+      />
+      <!-- 研究方案号 -->
+      <el-table-column
+        :label="$t('trials:workbench:table:researchNo')"
+        prop="ResearchProgramNo"
+        show-overflow-tooltip
+        sortable="custom"
+      />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileType')"
         prop="FileType"
@@ -34,8 +55,8 @@
         show-overflow-tooltip
       />
       <el-table-column
-        :label="$t('trials:sysDocBeSigned:table:uploadTime')"
-        prop="UpdateTime"
+        :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
+        prop="ConfirmTime"
         show-overflow-tooltip
       />
       <el-table-column
@@ -44,10 +65,10 @@
       >
         <template slot-scope="scope">
           <el-button
-            icon="el-icon-edit-outline"
+            icon="el-icon-view"
             circle
-            :title="$t('trials:workbench:action:sign')"
-            @click="handleSign(scope.row)"
+            :title="$t('trials:self-attachment:action:preview')"
+            @click="handlePreview(scope.row)"
           />
         </template>
       </el-table-column>
@@ -147,6 +168,17 @@ export default {
     }
   },
   methods: {
+    // 预览
+    handlePreview(row) {
+      this.currentRow = { ...row }
+      const { Name, FullFilePath, SignViewMinimumMinutes } = row
+      this.currentPath = FullFilePath
+      this.currentType = row.Name ? Name.substring(Name.lastIndexOf('.') + 1).toLocaleLowerCase() : ''
+      this.currentMinMinutes = SignViewMinimumMinutes
+      this.currentIsConfirm = true
+      this.title = Name
+      this.previewVisible = true
+    },
     getList() {
       getTrialSignDocumentList(this.listQuery).then(res => {
         this.listLoading = false
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 89aab584..e97b3d7a 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -80,13 +80,13 @@
                 </div>
               </div>
             </div>
-            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_box" @click="$router.push('/trials/trials-list')">
-              <div class="my_select_box_content">
-                <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                <span>{{ $t('trials:tab:trials') }}</span>
-              </div>
-            </div>
+<!--            <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>-->
+<!--            <div class="my_select_box" @click="$router.push('/trials/trials-list')">-->
+<!--              <div class="my_select_box_content">-->
+<!--                <span class="el-icon-box" style="padding: 4px;margin: 4px;color: #6698ff"></span>-->
+<!--                <span>{{ $t('trials:tab:trials') }}</span>-->
+<!--              </div>-->
+<!--            </div>-->
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
             <div class="my_select_title">{{ $t('trials:workbench:title:padding') }}</div>
             <div class="my_select">

From 73a054ad27fc633083a85304ed8c5885dc8f801c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 15:29:37 +0800
Subject: [PATCH 122/374] =?UTF-8?q?=E9=82=AE=E7=AE=B1@=E8=A2=AB=E8=BD=AC%4?=
 =?UTF-8?q?0=E7=9A=84bug=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/Account.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/components/Account.vue b/src/views/system/user/components/Account.vue
index c2ff3b7c..83045fcf 100644
--- a/src/views/system/user/components/Account.vue
+++ b/src/views/system/user/components/Account.vue
@@ -28,7 +28,7 @@ export default {
               let msg = this.$t('system:userlist:message:ResetPassword2')
               msg = msg.replace('xxx', params('userName'))
               msg = msg.replace('yyy', params('email'))
-              this.$alert(msg)
+              this.$alert(decodeURIComponent(msg))
             }
           })
         })

From 22e22c3901e5c45aa1f3528b2565e5a06a5a27fb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 12 Mar 2024 15:41:16 +0800
Subject: [PATCH 123/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E5=9E=82=E7=9B=B4?=
 =?UTF-8?q?=E5=BE=84=E6=B5=8B=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue |  5 ++
 .../dicoms/components/Lugano/QuestionList.vue |  5 +-
 .../dicoms/components/QuestionItem.vue        | 11 +---
 .../reading/dicoms/components/Questions.vue   | 59 +++++++++++++++----
 4 files changed, 58 insertions(+), 22 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index ff6c26d7..c99788d6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -789,6 +789,7 @@ export default {
             measureData.data = toolState.data[i]
             measureData.type = toolType
             measureData.thick = this.dicomInfo.thick
+            measureData.location = this.dicomInfo.location
             var uuid = toolState.data[i].uuid
             var idx = this.measureData.findIndex(item => item.MeasureData && item.MeasureData.data && item.MeasureData.data.uuid === uuid)
             if (idx > -1) {
@@ -1036,6 +1037,7 @@ export default {
                 measureData.data = toolState.data[i]
                 measureData.type = toolType
                 measureData.thick = this.dicomInfo.thick
+                measureData.location = this.dicomInfo.location
                 measureData.ww = Math.round(viewport.voi.windowWidth)
                 measureData.wc = Math.round(viewport.voi.windowCenter)
                 measureData.data.active = false
@@ -1357,6 +1359,7 @@ export default {
         measureData.data = e.detail.measurementData
         measureData.type = e.detail.toolName
         measureData.thick = this.dicomInfo.thick
+        measureData.location = this.dicomInfo.location
         measureData.ww = Math.round(viewport.voi.windowWidth)
         measureData.wc = Math.round(viewport.voi.windowCenter)
 
@@ -1373,6 +1376,7 @@ export default {
         measureData.data = e.detail.measurementData
         measureData.type = e.detail.toolName
         measureData.thick = this.dicomInfo.thick
+        measureData.location = this.dicomInfo.location
         measureData.ww = Math.round(viewport.voi.windowWidth)
         measureData.wc = Math.round(viewport.voi.windowCenter)
         const canvas = this.canvas.querySelector('canvas')
@@ -1487,6 +1491,7 @@ export default {
           measureData.data = measurementData
           measureData.type = toolType
           measureData.thick = this.dicomInfo.thick
+          measureData.location = this.dicomInfo.location
           measureData.ww = Math.round(viewport.voi.windowWidth)
           measureData.wc = Math.round(viewport.voi.windowCenter)
           measureData.data.active = false
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index e8edf58f..0ea0d2b2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -1118,7 +1118,7 @@ export default {
       }
     },
     modifyMeasuredData(measureObj) {
-      if (measureObj.measureData.data.remark === 'Spleen') {
+      if (measureObj.measureData.data.remark === 'Spleen Tip' || measureObj.measureData.data.remark === 'Spleen Floor') {
         this.$refs['ecrf3'].setMeasuredData(measureObj.measureData)
         this.isNonTargetMeasurement = false
       } else {
@@ -1133,7 +1133,7 @@ export default {
     },
     // 设置测量数据
     setMeasuredData(measureData) {
-      if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen') {
+      if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen Tip' || measureData.data.remark === 'Spleen Floor') {
         this.$refs['ecrf3'].setMeasuredData(measureData)
         this.isNonTargetMeasurement = false
         return
@@ -1397,6 +1397,7 @@ export default {
       margin-bottom: 10px;
       span{
         font-size: 15px;
+        color: red;
       }
     }
   }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index aefe4d32..3ea9d642 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -25,14 +25,7 @@
         ]"
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
-        <template v-if="question.QuestionType === 48">
-          <!-- question.QuestionType === 51 || question.QuestionType === 52 -->
-          <!-- <el-input
-            v-if="question.Type==='calculation'"
-            v-model="questionForm[question.Id]"
-            disabled
-            style="width: 100px;"
-          /> -->
+        <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
           <div style="display: flex;flex-direction: row;justify-content: flex-start;">
             <el-input
               v-if="question.Type==='calculation'"
@@ -53,7 +46,7 @@
           </div>
         </template>
 
-        <template v-else-if="question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
+        <template v-else-if="question.QuestionType === 48 || question.QuestionType === 51 || question.QuestionType === 52 || question.QuestionType === 53">
           <el-input
             v-if="question.Type==='calculation'"
             v-model="questionForm[question.Id]"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index a28ff948..2fbacd0e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -74,6 +74,8 @@ export default {
       spleenStatusId: '',
       spleenLengthId: '',
       spleenCommentsId: '',
+      spleenTipId: '',
+      spleenFloorId: '',
       isBaseLineTask: false,
       criterionType: null,
       spleenInfo: null,
@@ -167,13 +169,21 @@ export default {
               this.spleenStatusId = v.Id
             }
             if (v.QuestionType === 48) {
-              // 脾脏长度
+              // 脾脏垂直径
               this.spleenLengthId = v.Id
             }
             if (v.QuestionType === 58) {
               // 修改脾脏状态备注
               this.spleenCommentsId = v.Id
             }
+            if (v.QuestionType === 60) {
+              // 脾尖位置
+              this.spleenTipId = v.Id
+            }
+            if (v.QuestionType === 61) {
+              // 脾底位置
+              this.spleenFloorId = v.Id
+            }
           }
           if (v.Childrens.length > 0) {
             this.setChild(v.Childrens)
@@ -210,6 +220,14 @@ export default {
             // 修改脾脏状态备注
             this.spleenCommentsId = i.Id
           }
+          if (i.QuestionType === 60) {
+            // 脾尖位置
+            this.spleenTipId = i.Id
+          }
+          if (i.QuestionType === 61) {
+            // 脾底位置
+            this.spleenFloorId = i.Id
+          }
         }
         if (i.Childrens && i.Childrens.length > 0) {
           this.setChild(i.Childrens)
@@ -225,17 +243,22 @@ export default {
           var currentSpleenStatus = this.questionForm[this.spleenStatusId]
           var currentSpleenLength = this.questionForm[this.spleenLengthId]
           currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
-          var idx = this.measurements.findIndex(i => i.QuestionType === 48)
+          var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+          var slIdx = this.measurements.findIndex(i => i.QuestionType === 60)
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => {}
             })
-          } else if (currentSpleenLength === 5 && idx > -1 && this.measurements[idx].MeasureData) {
+          } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
             // 若有标记，状态不可为“无法评估”
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => {}
             })
+          } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
+            this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
+              callback: _ => {}
+            })
           } else {
             this.saveQuestionsList()
           }
@@ -384,15 +407,14 @@ export default {
       const { Id, QuestionType } = obj
       this.currentQsId = Id
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
-      var orderMarkName = QuestionType === 48 ? 'Spleen' : ''
+      var orderMarkName = QuestionType === 60 ? 'Spleen Tip' : QuestionType === 61 ? 'Spleen Floor' : ''
       if (idx === -1) {
-        // 脾脏长度(48); 肝脏血池SUVmax(51); 纵膈血池SUVmax(52)
         this.measurements.push({ QuestionId: Id, QuestionType: QuestionType, StudyId: '', SeriesId: '', InstanceId: '', MarkTool: '', PicturePath: '', NumberOfFrames: '', MeasureData: '', OrderMarkName: orderMarkName })
       }
 
       // 脾脏长度  直径测量
       this.$emit('setNonTargetMeasurementStatus', { status: true })
-      DicomEvent.$emit('imageLocation', { questionId: Id, visitTaskId: this.visitTaskId, lesionName: orderMarkName, markTool: 'Length', readingTaskState: this.readingTaskState, isMarked: false })
+      DicomEvent.$emit('imageLocation', { questionId: Id, visitTaskId: this.visitTaskId, lesionName: orderMarkName, markTool: 'ArrowAnnotate', readingTaskState: this.readingTaskState, isMarked: false })
     },
     async removeAnnotation(obj) {
       const { Id } = obj
@@ -426,7 +448,7 @@ export default {
         idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.remark)
       }
       if (idx === -1) return
-      var remark = this.measurements[idx].QuestionType === 48 ? 'Spleen' : ''
+      var remark = this.measurements[idx].QuestionType === 60 ? 'Spleen Tip' : this.measurements[idx].QuestionType === 61 ? 'Spleen Floor' : ''
       measurement.data.remark = remark
       this.measurements[idx].StudyId = measurement.studyId
       this.measurements[idx].SeriesId = measurement.seriesId
@@ -451,10 +473,12 @@ export default {
         OrderMarkName: measurement.data.remark,
         frame: isNaN(parseInt(measurement.frame)) ? 0 : measurement.frame
       }
-      if (measurement.type === 'Length') {
-        const length = measurement.data.length ? measurement.data.length : null
-        this.$set(this.questionForm, this.measurements[idx].QuestionId, length || null)
-        if (this.measurements[idx].QuestionType === 48) {
+      if (measurement.type === 'ArrowAnnotate') {
+        const location = measurement.location ? measurement.location : null
+        this.$set(this.questionForm, this.measurements[idx].QuestionId, location || null)
+        if (this.measurements[idx].QuestionType === 60 || this.measurements[idx].QuestionType === 61) {
+          var length = this.getSpleenL()
+          this.$set(this.questionForm, this.spleenLengthId, length)
           var status = this.setSpleenStatus(length)
           this.$set(this.questionForm, this.spleenStatusId, status)
           this.calculateSpleenStatus = status
@@ -474,6 +498,19 @@ export default {
         DicomEvent.$emit('questionFormChange', true)
       }
     },
+    getSpleenL() {
+      var length = null
+      // 脾尖位置
+      var st = this.questionForm[this.spleenTipId]
+      st = isNaN(parseFloat(st)) ? null : parseFloat(st)
+      // 脾底位置
+      var sf = this.questionForm[this.spleenFloorId]
+      sf = isNaN(parseFloat(sf)) ? null : parseFloat(sf)
+      if (st && sf) {
+        length = Math.abs(st - sf)
+      }
+      return length
+    },
     setSpleenStatus(length) {
       console.log('setSpleenStatus')
       var status = ''

From 88887e5d928ec4b9b535ecba376d299b749da7d8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 12 Mar 2024 16:02:50 +0800
Subject: [PATCH 124/374] =?UTF-8?q?lugano=E8=A1=A8=E5=8D=95=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E6=8C=89=E9=92=AE=E6=9C=AA=E6=9B=B4=E6=94=B9=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=97=B6=E7=A6=81=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/QuestionItem.vue         |  6 +++---
 .../reading/dicoms/components/Questions.vue            | 10 ++++++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 3ea9d642..476b07a2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -337,11 +337,11 @@ export default {
       // if (parseInt(v) !== 5) {
       //   return
       // }
-      if (question.QuestionType === 49) {
-        this.$emit('setFormItemData', { key: question.Id, val: v })
-      }
+      
       if (question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
+      }else{
+        this.$emit('setFormItemData', { key: question.Id, val: v })
       }
     },
     resetChild(obj) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 2fbacd0e..056c9fe2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -20,7 +20,7 @@
 
       <el-form-item v-if="readingTaskState < 2 && !isFirstChangeTask">
         <div style="text-align:right">
-          <el-button size="mini" :disabled="!questionFormChangeState" :type="questionFormChangeState ? 'primary' : null" @click="handleSave">{{ $t('common:button:save') }}</el-button>
+          <el-button size="mini" :disabled="!questionFormChangeState || (!formChanged && groupClassify > 0)" :type="questionFormChangeState || (!formChanged && groupClassify > 0) ? 'primary' : null" @click="handleSave">{{ $t('common:button:save') }}</el-button>
         </div>
       </el-form-item>
     </el-form>
@@ -79,7 +79,8 @@ export default {
       isBaseLineTask: false,
       criterionType: null,
       spleenInfo: null,
-      calculateSpleenStatus: ''
+      calculateSpleenStatus: '',
+      formChanged:false
     }
   },
   computed: {
@@ -323,6 +324,7 @@ export default {
             })
           }
         }
+        this.formChanged = false
       }).catch(() => {
         this.loading = false
       })
@@ -429,6 +431,7 @@ export default {
       DicomEvent.$emit('getMeasureData')
       this.calculateSpleenStatus = ''
       this.setSpleenCommentDisplay()
+      this.formChanged = true
     },
     locateAnnotation(obj) {
       const { Id } = obj
@@ -497,6 +500,7 @@ export default {
       if (this.isQulityIssues) {
         DicomEvent.$emit('questionFormChange', true)
       }
+      this.formChanged = true
     },
     getSpleenL() {
       var length = null
@@ -591,12 +595,14 @@ export default {
           this.removeAnnotation({ Id: this.spleenLengthId })
         }
       }
+      this.formChanged = true
     },
     setFormItemData(obj) {
       this.questionForm[obj.key] = obj.val
       if (obj.key === this.spleenStatusId) {
         this.setSpleenCommentDisplay()
       }
+      this.formChanged = true
     },
     isJSONString(str) {
       try {

From 9aa68bf5f40032b0fbc02dbd5619036df50aa24e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 16:13:53 +0800
Subject: [PATCH 125/374] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/components/ReadingRules.vue            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
index ea094e29..0bcb858b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue
@@ -127,7 +127,7 @@
       >
         <el-radio-group
           v-model="form.IsReadingPeriod"
-          :disabled="isConfirm || (!hasPermi(['trials:trials-panel:setting:reading-unit:edit']))"
+          :disabled="isConfirm || IsMustGlobalReading || (!hasPermi(['trials:trials-panel:setting:reading-unit:edit']))"
           @change="(v) => {
             if (!v) {
                form.IsGlobalReading = v

From 661f0e5dfbded1126ef12c85142972b1ac56fdf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 16:36:52 +0800
Subject: [PATCH 126/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index e97b3d7a..41fa6467 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -27,6 +27,9 @@
 .my_select_box_content{
   color: #333;
   font-size: .875rem;
+  white-space:nowrap;
+  overflow:hidden;
+  text-overflow:ellipsis;
 }
 .my_select_box:hover{
   background: #f5f5f5;
@@ -65,7 +68,7 @@
                 </div>
                 <div class="user-description" style="">
                   <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span>，{{ hoursTip }}</div>
-                  <div style="font-size: .75rem;line-height: 18px;color:#999">今天是{{new Date().getMonth() + 1}}月{{new Date().getDate()}}日，{{ dayOfWeek }}</div>
+                  <div style="font-size: .75rem;line-height: 18px;color:#999">{{$t('common:date:today')}}{{new Date().getMonth() + 1}}{{$t('common:date:month')}}{{new Date().getDate()}}{{$t('common:date:day')}}，{{ dayOfWeek }}</div>
                 </div>
               </div>
               <div class="user-status" style="display: flex">
@@ -462,17 +465,17 @@ export default {
     this.getUserTobeDoneRecord()
     this.getNeedSignTrialDocTrialIdList()
     this.getUserInfo()
-    const days = ['星期日', '星期一', '星期二', '星期三', '星期四', '星期五', '星期六'];
+    const days = [this.$t('common:date:Sunday'), this.$t('common:date:Monday'), this.$t('common:date:Tuesday'), this.$t('common:date:Wednesday'), this.$t('common:date:Thursday'), this.$t('common:date:Friday'), this.$t('common:date:Saturday')];
     const date = new Date();
     this.dayOfWeek = days[date.getDay()];
     let date2=(new Date()).getHours();
     let hoursTip = "";
     if(date2>=6&&date2<12){
-      hoursTip="上午好"
+      hoursTip= this.$t('common:date:good morning')
     }else if(date2>=12&&date2<18){
-      hoursTip="下午好"
+      hoursTip=this.$t('common:date:good afternoon')
     }else{
-      hoursTip="晚上好"
+      hoursTip=this.$t('common:date:good evening')
     }
     this.hoursTip = hoursTip
   },

From f66f0da07ecfc4ccc0a4210b0e8c60b4f8970518 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 16:46:56 +0800
Subject: [PATCH 127/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/setting/medical-audit/components/QSForm.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue b/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
index f62d9ef7..52882344 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
@@ -260,6 +260,11 @@ export default {
           this.parentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
         }
       }
+      if (this.$i18n.locale === 'zh') {
+        this.form.LanguageType = 0
+      } else {
+        this.form.LanguageType = 1
+      }
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {

From 2ff15bc2b8bdfcc77a887156ab4686b26180b3b0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 17:09:37 +0800
Subject: [PATCH 128/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/components/needSignSysDoc.vue | 2 +-
 .../trials/trials-workbench/components/needSignTrialDoc.vue     | 2 +-
 .../trials/trials-workbench/components/needSignedSysDoc.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index 8328f65e..4ee9f3b0 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -55,7 +55,7 @@
             icon="el-icon-edit-outline"
             circle
             v-if="!isSigned"
-            :title="$t('trials:workbench:action:sign')"
+            :title="$t('trials:needSignSysDoc:action:sign')"
             @click="handleSign(scope.row)"
           />
         </template>
diff --git a/src/views/trials/trials-workbench/components/needSignTrialDoc.vue b/src/views/trials/trials-workbench/components/needSignTrialDoc.vue
index ce52780e..9abcf117 100644
--- a/src/views/trials/trials-workbench/components/needSignTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignTrialDoc.vue
@@ -60,7 +60,7 @@
           <el-button
             icon="el-icon-edit-outline"
             circle
-            :title="$t('trials:workbench:action:sign')"
+            :title="$t('trials:needSignTrialDoc:action:sign')"
             :disabled="isSignSystemDoc"
             @click="handleSign(scope.row)"
           />
diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
index 8328f65e..816f3502 100644
--- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@@ -55,7 +55,7 @@
             icon="el-icon-edit-outline"
             circle
             v-if="!isSigned"
-            :title="$t('trials:workbench:action:sign')"
+            :title="$t('trials:needSignedSysDoc:action:sign')"
             @click="handleSign(scope.row)"
           />
         </template>

From d91f07bba62aaca41a4a92137681489f052936bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 17:40:07 +0800
Subject: [PATCH 129/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/consistency-analysis/index.vue    | 12 ++++-
 src/views/trials/trials-workbench/index.vue   | 49 +++++++++++--------
 2 files changed, 38 insertions(+), 23 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 355c31b9..dda1011f 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -439,7 +439,7 @@
                 <el-table-column
                   prop="IsHaveReadingPeriod"
                   :label="$t('trials:selftConsistencyAnalysis:table:isReadingPeriod')"
-                  width="180"
+                  width="120"
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
@@ -451,7 +451,7 @@
                 <el-table-column
                   prop="IsGenerateGlobalTask"
                   :label="$t('trials:selftConsistencyAnalysis:table:isGenerateGlobalTask')"
-                  width="180"
+                  width="120"
                   show-overflow-tooltip
                 >
                   <template slot-scope="scope">
@@ -467,6 +467,14 @@
                   show-overflow-tooltip
                 >
                 </el-table-column>
+                <!-- 可分配样本量 -->
+                <el-table-column
+                  prop="CanGeneratedSubejctCount"
+                  :label="$t('trials:selftConsistencyAnalysis:table:CanGeneratedSubejctCount')"
+                  width="120"
+                  show-overflow-tooltip
+                >
+                </el-table-column>
                 <!-- 已生成受试者数 -->
                 <el-table-column
                   prop="GeneratedSubjectCount"
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 41fa6467..5abed804 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -28,8 +28,15 @@
   color: #333;
   font-size: .875rem;
   white-space:nowrap;
+  display: flex;
+  align-items: center;
+}
+.my_select_box_content_text{
+  display: inline-block;
+  white-space:nowrap;
   overflow:hidden;
   text-overflow:ellipsis;
+  max-width: 150px;
 }
 .my_select_box:hover{
   background: #f5f5f5;
@@ -67,8 +74,8 @@
                   {{ user.LastName }}
                 </div>
                 <div class="user-description" style="">
-                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span>，{{ hoursTip }}</div>
-                  <div style="font-size: .75rem;line-height: 18px;color:#999">{{$t('common:date:today')}}{{new Date().getMonth() + 1}}{{$t('common:date:month')}}{{new Date().getDate()}}{{$t('common:date:day')}}，{{ dayOfWeek }}</div>
+                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span></div>
+                  <div style="font-size: .75rem;line-height: 18px;color:#999">{{new Date().getFullYear()}}{{$t('common:date:today')}}{{new Date().getMonth() + 1}}{{$t('common:date:month')}}{{new Date().getDate()}}{{$t('common:date:day')}}，{{ dayOfWeek }}</div>
                 </div>
               </div>
               <div class="user-status" style="display: flex">
@@ -98,28 +105,28 @@
               <div class="my_select_box" :class="{selected: selected === 'consistencyCheck'}" tab-data="consistencyCheck" @click="selected = 'consistencyCheck'" v-if="hasPermi(['trials:trials-workbench:consistencyCheck'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-folder-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:consistencyCheck') }}<span style="margin:0 0.25rem">·</span>{{tabList.PM_CheckCount}}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:consistencyCheck') }}</span><span style="margin:0 0.25rem">·</span><span>{{tabList.PM_CheckCount}}</span>
                 </div>
               </div>
               <!-- 重阅审批 -->
               <div class="my_select_box" :class="{selected: selected === 'RereadApproval'}" tab-data="RereadApproval" @click="selected = 'RereadApproval'" v-if="hasPermi(['trials:trials-workbench:rereadApproval'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:attachments:reReadingTracking') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_ReReadingApprovalCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:attachments:reReadingTracking') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_ReReadingApprovalCount }}</span>
                 </div>
               </div>
               <!-- 阅片人筛选 -->
               <div class="my_select_box" :class="{selected: selected === 'ReviewerScreen'}" tab-data="ReviewerScreen" @click="selected = 'ReviewerScreen'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-user" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-list:PendingDetails:ReviewerSelection') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_ReviewerSelectCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-list:PendingDetails:ReviewerSelection') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_ReviewerSelectCount }}</span>
                 </div>
               </div>
               <!-- 中心调研 -->
               <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:pendingSiteResearch') }}<span style="margin:0 0.25rem">·</span>{{ tabList.PM_SiteSurveryCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_SiteSurveryCount }}</span>
                 </div>
               </div>
               <!-- SPM/CPM -->
@@ -127,14 +134,14 @@
               <div class="my_select_box" :class="{selected: selected === 'ReviewerApproval'}" tab-data="ReviewerApproval" @click="selected = 'ReviewerApproval'" v-if="hasPermi(['trials:trials-workbench:reviewerApproval'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-user" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:sysDocBeSigned:table:reviewerApproval') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SPM_ReviewerApprovalCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:sysDocBeSigned:table:reviewerApproval') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SPM_ReviewerApprovalCount }}</span>
                 </div>
               </div>
               <!-- 重阅审批 -->
               <div class="my_select_box" :class="{selected: selected === 'SpmRereadApproval'}" tab-data="SpmRereadApproval" @click="selected = 'SpmRereadApproval'" v-if="hasPermi(['trials:trials-workbench:spmRereadApproval'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:attachments:reReadingTracking') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SPM_ReReadingApprovalCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:attachments:reReadingTracking') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SPM_ReReadingApprovalCount }}</span>
                 </div>
               </div>
               <!-- CRC -->
@@ -142,28 +149,28 @@
               <div class="my_select_box" :class="{selected: selected === 'ImageQuestion'}" tab-data="ImageQuestion" @click="selected = 'ImageQuestion'" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-chat-dot-square" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:crcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageQuestionCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:crcQuality') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageQuestionCount }}</span>
                 </div>
               </div>
               <!-- 核查质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageVerification'}" tab-data="ImageVerification" @click="selected = 'ImageVerification'" v-if="hasPermi(['trials:trials-workbenck:imageVerification'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-money" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:sysDocBeSigned:table:ImageCheck') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_CheckQuestionCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:sysDocBeSigned:table:ImageCheck') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_CheckQuestionCount }}</span>
                 </div>
               </div>
               <!-- 影像重传 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageReupload'}" tab-data="ImageReupload" @click="selected = 'ImageReupload'" v-if="hasPermi(['trials:trials-workbenck:imageReupload'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-upload" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:ImageRetransmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageReUploadCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ImageRetransmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageReUploadCount }}</span>
                 </div>
               </div>
               <!-- 加急影像提交 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageSubmission'}" tab-data="ImageSubmission" @click="selected = 'ImageSubmission'" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-circle-check" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}<span style="margin:0 0.25rem">·</span>{{ tabList.CRC_ImageSubmitCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageSubmitCount }}</span>
                 </div>
               </div>
               <!-- IQC -->
@@ -171,14 +178,14 @@
               <div class="my_select_box" :class="{selected: selected === 'ImageQualityControl'}" tab-data="ImageQualityControl" @click="selected = 'ImageQualityControl'" v-if="hasPermi(['trials:trials-workbenck:imageQC'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:dicomsQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_IamgeQCCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:dicomsQuality') }}<span style="margin:0 0.25rem"></span>·</span><span>{{ tabList.IQC_IamgeQCCount }}</span>
                 </div>
               </div>
               <!-- QC质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'QcQuestion'}" tab-data="QcQuestion" @click="selected = 'QcQuestion'" v-if="hasPermi(['trials:trials-workbenck:qcQuestion'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-chat-dot-square" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:qcQuality') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IQC_QCQuestionCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:qcQuality') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.IQC_QCQuestionCount }}</span>
                 </div>
               </div>
               <!-- IR -->
@@ -186,14 +193,14 @@
               <div class="my_select_box" :class="{selected: selected === 'ImagesToRead'}" tab-data="ImagesToRead" @click="selected = 'ImagesToRead'" v-if="hasPermi(['trials:trials-workbenck:imagesToRead'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-collection" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:tab:pendingReadingTasks') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_IamgeWaitReadingCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:tab:pendingReadingTasks') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.IR_IamgeWaitReadingCount }}</span>
                 </div>
               </div>
               <!-- 医学反馈 -->
               <div class="my_select_box" :class="{selected: selected === 'MedicalFeedback'}" tab-data="MedicalFeedback" @click="selected = 'MedicalFeedback'" v-if="hasPermi(['trials:trials-workbenck:medicalFeedback'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:tab:medicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.IR_MedicalReviewCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:tab:medicalFeedback') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.IR_MedicalReviewCount }}</span>
                 </div>
               </div>
               <!-- MIM -->
@@ -201,21 +208,21 @@
               <div class="my_select_box" :class="{selected: selected === 'MedicalAudit'}" tab-data="MedicalAudit" @click="selected = 'MedicalAudit'" v-if="hasPermi(['trials:trials-workbenck:medicalAudit'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-document-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:trials-panel:tab:pmMedicalFeedback') }}<span style="margin:0 0.25rem">·</span>{{ tabList.MIM_MedicalReviewCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:trials-panel:tab:pmMedicalFeedback') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.MIM_MedicalReviewCount }}</span>
                 </div>
               </div>
               <!-- 项目签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignTrialDoc'}" tab-data="NeedSignTrialDoc" @click="selected = 'NeedSignTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:trialDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialWaitSignDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocBeSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialWaitSignDocCount }}</span>
                 </div>
               </div>
               <!-- 系统签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignSysDoc'}" tab-data="NeedSignSysDoc" @click="$nextTick(() => selected = 'NeedSignSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:sysDocBeSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysWaitSignDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocBeSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysWaitSignDocCount }}</span>
                 </div>
               </div>
             </div>
@@ -226,14 +233,14 @@
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-receiving" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:trialDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.TrialSignedDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:trialDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.TrialSignedDocCount }}</span>
                 </div>
               </div>
               <!-- 系统已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedSysDoc'}" tab-data="NeedSignedSysDoc" @click="$nextTick(() => selected = 'NeedSignedSysDoc')" v-if="!hasPermi(['role:zys'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-data-line" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span>{{ $t('trials:workbench:title:sysDocSigned') }}<span style="margin:0 0.25rem">·</span>{{ tabList.SysSignedDocCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:sysDocSigned') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.SysSignedDocCount }}</span>
                 </div>
               </div>
             </div>

From 0928fef04c2b34928619e4cade0dbffc5407f956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Tue, 12 Mar 2024 18:02:48 +0800
Subject: [PATCH 130/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=94=B9?=
 =?UTF-8?q?=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/consistency-analysis/index.vue       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index dda1011f..65cd3f8c 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -533,7 +533,7 @@
               <!-- 配置组间一致性分析规则 -->
               {{$t('trials:grouptConsistencyAnalysis:button:config')}}
             </el-button>
-            <GroupConsistentRuleSubjectTable @setReaderRulesFormVisible="(v) => {ReaderRulesFormVisible = v}" v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
+            <GroupConsistentRuleSubjectTable @setReaderRulesFormVisible="(v) => {ReaderRulesFormVisible = v;isDisable = false }" v-if="TrialReadingCriterionId === item.TrialReadingCriterionId" :TrialReadingCriterionId="item.TrialReadingCriterionId"
             :ref="`GroupConsistentRuleSubjectTable${item.TrialReadingCriterionId}`" style="margin-top: 40px" :IsSelfAnalysis="IsSelfAnalysis" :changeNum="changeNum" @close="() => {ReaderRulesVisible2 = false; ; rowData = {}}" @getList="getList()" />
           </el-tab-pane>
         </el-tabs>
@@ -546,7 +546,7 @@
         :close-on-click-modal="false"
         append-to-body
       >
-        <ReaderRulesForm :other-info="OtherInfo" :isDisable="isDisable" :trial-criterion-list="trialCriterionList" :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :select-list="SelectList" :doctor-user-list="DoctorUserList" :is-self-analysis="IsSelfAnalysis" @close="() => {ReaderRulesFormVisible = false; rowData = {}}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
+        <ReaderRulesForm :other-info="OtherInfo" :isDisable="isDisable" :trial-criterion-list="trialCriterionList" :TrialReadingCriterionId="TrialReadingCriterionId" :data="rowData" :select-list="SelectList" :doctor-user-list="DoctorUserList" :is-self-analysis="IsSelfAnalysis" @close="() => {ReaderRulesFormVisible = false; rowData = {};}" @getList="openTaskConsistentRule(IsSelfAnalysis)" />
       </el-dialog>
       <!-- 选择受试者 -->
       <el-dialog

From ae77e4f048807c4dfe29b4f40beb39beb38e532f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 13 Mar 2024 09:30:49 +0800
Subject: [PATCH 131/374] =?UTF-8?q?=E8=84=BE=E5=B0=96=E3=80=81=E8=84=BE?=
 =?UTF-8?q?=E5=BA=95=E6=A0=87=E8=AE=B0=E5=91=BD=E5=90=8D=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionList.vue |  4 +--
 .../reading/dicoms/components/Questions.vue   | 26 +++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 0ea0d2b2..16cb7e1f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -1118,7 +1118,7 @@ export default {
       }
     },
     modifyMeasuredData(measureObj) {
-      if (measureObj.measureData.data.remark === 'Spleen Tip' || measureObj.measureData.data.remark === 'Spleen Floor') {
+      if (measureObj.measureData.data.remark === 'Spleen Top' || measureObj.measureData.data.remark === 'Spleen Bottom') {
         this.$refs['ecrf3'].setMeasuredData(measureObj.measureData)
         this.isNonTargetMeasurement = false
       } else {
@@ -1133,7 +1133,7 @@ export default {
     },
     // 设置测量数据
     setMeasuredData(measureData) {
-      if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen Tip' || measureData.data.remark === 'Spleen Floor') {
+      if (this.isNonTargetMeasurement || measureData.data.remark === 'Spleen Top' || measureData.data.remark === 'Spleen Bottom') {
         this.$refs['ecrf3'].setMeasuredData(measureData)
         this.isNonTargetMeasurement = false
         return
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 056c9fe2..5c02b2e5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -74,8 +74,8 @@ export default {
       spleenStatusId: '',
       spleenLengthId: '',
       spleenCommentsId: '',
-      spleenTipId: '',
-      spleenFloorId: '',
+      spleenTopId: '',
+      spleenBottomId: '',
       isBaseLineTask: false,
       criterionType: null,
       spleenInfo: null,
@@ -179,11 +179,11 @@ export default {
             }
             if (v.QuestionType === 60) {
               // 脾尖位置
-              this.spleenTipId = v.Id
+              this.spleenTopId = v.Id
             }
             if (v.QuestionType === 61) {
               // 脾底位置
-              this.spleenFloorId = v.Id
+              this.spleenBottomId = v.Id
             }
           }
           if (v.Childrens.length > 0) {
@@ -223,11 +223,11 @@ export default {
           }
           if (i.QuestionType === 60) {
             // 脾尖位置
-            this.spleenTipId = i.Id
+            this.spleenTopId = i.Id
           }
           if (i.QuestionType === 61) {
             // 脾底位置
-            this.spleenFloorId = i.Id
+            this.spleenBottomId = i.Id
           }
         }
         if (i.Childrens && i.Childrens.length > 0) {
@@ -409,7 +409,7 @@ export default {
       const { Id, QuestionType } = obj
       this.currentQsId = Id
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
-      var orderMarkName = QuestionType === 60 ? 'Spleen Tip' : QuestionType === 61 ? 'Spleen Floor' : ''
+      var orderMarkName = QuestionType === 60 ? 'Spleen Top' : QuestionType === 61 ? 'Spleen Bottom' : ''
       if (idx === -1) {
         this.measurements.push({ QuestionId: Id, QuestionType: QuestionType, StudyId: '', SeriesId: '', InstanceId: '', MarkTool: '', PicturePath: '', NumberOfFrames: '', MeasureData: '', OrderMarkName: orderMarkName })
       }
@@ -451,7 +451,7 @@ export default {
         idx = this.measurements.findIndex(i => i.OrderMarkName === measurement.data.remark)
       }
       if (idx === -1) return
-      var remark = this.measurements[idx].QuestionType === 60 ? 'Spleen Tip' : this.measurements[idx].QuestionType === 61 ? 'Spleen Floor' : ''
+      var remark = this.measurements[idx].QuestionType === 60 ? 'Spleen Top' : this.measurements[idx].QuestionType === 61 ? 'Spleen Bottom' : ''
       measurement.data.remark = remark
       this.measurements[idx].StudyId = measurement.studyId
       this.measurements[idx].SeriesId = measurement.seriesId
@@ -505,13 +505,13 @@ export default {
     getSpleenL() {
       var length = null
       // 脾尖位置
-      var st = this.questionForm[this.spleenTipId]
+      var st = this.questionForm[this.spleenTopId]
       st = isNaN(parseFloat(st)) ? null : parseFloat(st)
       // 脾底位置
-      var sf = this.questionForm[this.spleenFloorId]
-      sf = isNaN(parseFloat(sf)) ? null : parseFloat(sf)
-      if (st && sf) {
-        length = Math.abs(st - sf)
+      var sb = this.questionForm[this.spleenBottomId]
+      sb = isNaN(parseFloat(sb)) ? null : parseFloat(sb)
+      if (st && sb) {
+        length = Math.abs(st - sb)
       }
       return length
     },

From 8afaf8a39ec6b972da07a7f6db3cfc5953700f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 10:50:24 +0800
Subject: [PATCH 132/374] 1

---
 .../DoctorConsistentRuleSubjectTable.vue      | 22 +++++------
 .../reading-unit/components/OncologyForm.vue  |  2 +-
 .../setting/reading-unit/index.vue            | 37 ++++++++++++++-----
 3 files changed, 40 insertions(+), 21 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue
index 8ee60ed6..93e25300 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/DoctorConsistentRuleSubjectTable.vue
@@ -36,17 +36,17 @@
           show-overflow-tooltip
         />
         <!-- 是否受到退回影响 -->
-        <el-table-column
-          prop="IsReReadingOrBackInfluenceAnalysis"
-          :label="$t('trials:grouptConsistencyAnalysis:table:backImpact')"
-          min-width="160"
-          sortable="custom"
-          show-overflow-tooltip>
-          <template slot-scope="scope">
-            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>
-            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>
-          </template>
-        </el-table-column>
+<!--        <el-table-column-->
+<!--          prop="IsReReadingOrBackInfluenceAnalysis"-->
+<!--          :label="$t('trials:grouptConsistencyAnalysis:table:backImpact')"-->
+<!--          min-width="160"-->
+<!--          sortable="custom"-->
+<!--          show-overflow-tooltip>-->
+<!--          <template slot-scope="scope">-->
+<!--            <el-tag v-if="!scope.row.IsReReadingOrBackInfluenceAnalysis" type="danger">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
+<!--            <el-tag v-if="scope.row.IsReReadingOrBackInfluenceAnalysis" type="primary">{{ $fd('YesOrNo', scope.row.IsReReadingOrBackInfluenceAnalysis) }}</el-tag>-->
+<!--          </template>-->
+<!--        </el-table-column>-->
       </el-table>
 
       <!-- 分页组件 -->
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/OncologyForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/OncologyForm.vue
index f47f81c2..3fc4534d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/OncologyForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/OncologyForm.vue
@@ -192,8 +192,8 @@ export default {
               this.form[k] = res.Result[k]
             }
           }
-          this.isSign = res.Result.IsSign
         }
+        this.isSign = res.Result.IsSign
         this.form.OncologyAssessIdsStr = this.form.OncologyAssessIds.map(v => this.$fd('OncologyAssessType', v, 'id')).toString()
         this.loading = false
       }).catch(() => {
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index a9734d8b..7ac84b03 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -317,15 +317,34 @@ export default {
       }
       trialReadingInfoSign(params).then(res => {
         if (res.IsSuccess) {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          this.isConfirm = true
-          this.$refs['readingRules' + this.TrialReadingCriterionId][0].initPage()
-          this.$refs['readingCriterions' + this.TrialReadingCriterionId][0].initPage()
-          this.$refs['arbitrationRules' + this.TrialReadingCriterionId][0].getList()
-          this.$refs['globalReading' + this.TrialReadingCriterionId][0].initForm()
-          this.$refs['oncologyForm' + this.TrialReadingCriterionId][0].initForm()
+          try {
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.isConfirm = true
+            try {
+              this.$refs['readingRules' + this.TrialReadingCriterionId][0].initPage()
+            } catch (e) {
+            }
+            try {
+              this.$refs['readingCriterions' + this.TrialReadingCriterionId][0].initPage()
+            } catch (e) {
+            }
+            try {
+              this.$refs['arbitrationRules' + this.TrialReadingCriterionId][0].getList()
+            } catch (e) {
+            }
+            try {
+              this.$refs['globalReading' + this.TrialReadingCriterionId][0].initForm()
+            } catch (e) {
+            }
+            try {
+              this.$refs['oncologyForm' + this.TrialReadingCriterionId][0].initForm()
+            } catch (e) {
+            }
+            this.$refs['signForm'].btnLoading = false
+            this.signVisible = false
+          } catch (e) {
+            console.log(e)
+          }
         }
         this.loading = false
       }).catch(_ => {

From d15eab1a8ef0912b7a337c85599936332087926e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 11:07:40 +0800
Subject: [PATCH 133/374] 1

---
 src/views/trials/trials-panel/enrolled-reviewers/list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index e91be49d..ef65591c 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -651,7 +651,7 @@ export default {
         try {
           resArray.forEach(v => {
             if (v.DoctorCriterionStatusList && v.DoctorCriterionStatusList.length === 0) {
-              this.isConsistencyChange(v, null,false, false)
+              this.isConsistencyChange(v, null,true, false)
             }
             v.CriterionCategoryList.forEach(v1 => {
               let o = v.DoctorCriterionStatusList.find(v2 => {

From f126d8c40b8316710f9acf1c890ecaff270e5e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 11:13:52 +0800
Subject: [PATCH 134/374] =?UTF-8?q?=E7=BB=84=E9=97=B4=E4=B8=80=E8=87=B4?=
 =?UTF-8?q?=E6=80=A7=20=E5=8E=9F=E9=98=85=E7=89=87=E4=BA=BA=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GroupConsistentRuleSubjectTable.vue   | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index c0dc2460..44283154 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -27,6 +27,18 @@
           sortable="custom"
           show-overflow-tooltip
         />
+        <!-- 原阅片人 -->
+        <el-table-column
+          prop="SubjectCode"
+          :label="$t('trials:grouptConsistencyAnalysis:table:DoctorUserList')"
+          min-width="120"
+          sortable="custom"
+          show-overflow-tooltip
+        >
+          <template slot-scope="scope">
+            {{scope.row.DoctorUserList.map(v => {return `${v.UserName} (${v.FullName})`}).join(', ')}}
+          </template>
+        </el-table-column>
         <!-- 符合规则访视数 -->
         <el-table-column
           prop="ValidVisitCount"

From e96a4a4d7b4f08047ee8ffe38de3c2bbbe73d152 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 13 Mar 2024 11:47:14 +0800
Subject: [PATCH 135/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=98=BE=E7=A4=BA=E7=9A=84=E8=AE=BF=E8=A7=86?=
 =?UTF-8?q?=E5=8F=8A=E6=A3=80=E6=9F=A5=E4=BF=A1=E6=81=AF=E4=B8=8E=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E9=AB=98=E4=BA=AE=E7=AA=97=E5=8F=A3=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 50 +++++++++++++++----
 .../trials-panel/reading/dicoms/index.vue     |  2 +-
 2 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 9de839a6..92a5efe9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -462,11 +462,23 @@
       v-if="fusionSeries.visible"
       :visible.sync="fusionSeries.visible"
       :close-on-click-modal="false"
-      :title="$t('trials:lugano:dialogTitle:fusion')"
       width="850px"
     >
-
-      <el-form ref="fusionForm" :model="fusionForm">
+      <div slot="title">
+        <span>{{ $t('trials:lugano:dialogTitle:fusion') }}</span>
+      </div>
+      <el-form ref="fusionForm" :model="fusionForm" label-width="120px" label-position="left">
+        <!-- 任务名称 -->
+        <el-form-item
+          :label="$t('trials:lugano:fusionDialog:label:taskBlindName')"
+          prop="taskBlindName"
+        >
+          <el-input
+            v-model="fusionForm.taskBlindName"
+            :disabled="true"
+            style="width:200px"
+          />
+        </el-form-item>
         <!-- 检查 -->
         <el-form-item
           :label="$t('trials:lugano:fusionDialog:label:study')"
@@ -489,9 +501,7 @@
           </el-select>
         </el-form-item>
         <!-- 融合图像 -->
-        <el-form-item
-          :label="$t('trials:lugano:fusionDialog:label:fusionImages')"
-        />
+        <label style="color: #dfdfdf;line-height: 36px;vertical-align: middle;font-size: 14px;">{{ $t('trials:lugano:fusionDialog:label:fusionImages') }}</label>
         <div style="display: flex;flex-direction: row;justify-content: space-between;margin-bottom:10px;" class="series-table">
 
           <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
@@ -778,7 +788,8 @@ export default {
       studyList: [],
       digitPlaces: 2,
       activeCanvasWW: null,
-      activeCanvasWC: null
+      activeCanvasWC: null,
+      activeTaskInfo: {}
     }
   },
 
@@ -799,12 +810,30 @@ export default {
       }
     },
     lastCanvasTaskId: {
+      immediate: true,
+      handler(v) {
+        // if (v) {
+        //   console.log('lastCanvasTaskId')
+        //   const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v)
+        //   if (i < 0) return
+        //   var studyList = this.visitTaskList[i].StudyList || []
+        //   studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
+        //   if (studyList.length === 0) return
+        //   this.studyList = studyList
+        // } else {
+        //   this.studyList = []
+        // }
+      }
+    },
+    activeSeries: {
       immediate: true,
       handler(v) {
         if (v) {
-          console.log('lastCanvasTaskId')
-          const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v)
+          this.activeTaskInfo.taskName = v.taskBlindName
+          this.activeTaskInfo.visitTaskId = v.visitTaskId
+          const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v.visitTaskId)
           if (i < 0) return
+          this.activeTaskInfo.visitTaskIndex = i
           var studyList = this.visitTaskList[i].StudyList || []
           studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
           if (studyList.length === 0) return
@@ -1667,7 +1696,6 @@ export default {
         if (!this.wwwcList[this.currentDicomCanvasIndex]) {
           this.wwwcList[this.currentDicomCanvasIndex] = '1'
         }
-        // var stack = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack
         this.$refs['container'].focus()
         // if (stack.studyId) {
         //   DicomEvent.$emit('toggleVisitList', stack)
@@ -1874,7 +1902,7 @@ export default {
         this.$alert(this.$t('components:uploadvideo:message:xf4'))
         return
       }
-      const i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.lastCanvasTaskId)
+      const i = this.activeTaskInfo.visitTaskIndex
       if (i < 0) return
       if (this.studyList.length > 0) {
         this.fusionForm.studyID = this.studyList[0].StudyId
diff --git a/src/views/trials/trials-panel/reading/dicoms/index.vue b/src/views/trials/trials-panel/reading/dicoms/index.vue
index 6d97b47d..32c6a026 100644
--- a/src/views/trials/trials-panel/reading/dicoms/index.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/index.vue
@@ -568,7 +568,7 @@ export default {
     height:80%;
   }
   /deep/.el-dialog__body{
-      padding: 10px;
+      padding: 20px;
       height: calc(100% - 120px);
     }
   .el-dialog__header{

From 72c6b433b6c3e823bb71bea0f4f45440e15d5968 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 13 Mar 2024 13:18:08 +0800
Subject: [PATCH 136/374] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=BF=E7=9F=AD?=
 =?UTF-8?q?=E5=BE=84=E5=B7=A5=E5=85=B7=E6=A0=87=E6=B3=A8=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/tools/Bidirectional/renderToolData.js        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js b/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js
index 03925d59..1d209e8d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js
+++ b/src/views/trials/trials-panel/reading/dicoms/tools/Bidirectional/renderToolData.js
@@ -156,7 +156,7 @@ const getTextBoxText = (data, rowPixelSpacing, colPixelSpacing) => {
   }
 
   const lengthText = ` L ${data.longestDiameter}${suffix}`
-  const widthText = ` W ${data.shortestDiameter}${suffix}`
+  const widthText = ` S ${data.shortestDiameter}${suffix}`
 
   const { labels } = data
 

From e457df9325dbeb7bd7ddcd550876ef757ae57879 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 13:28:35 +0800
Subject: [PATCH 137/374] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=BF=9B=E5=BA=A6?=
 =?UTF-8?q?=E6=9D=A1=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadDicomFiles2.vue          | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 07a295fe..88c41778 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -1171,6 +1171,28 @@ export default {
                         dicomInfo.failedFileCount++
                         Record.Existed.push(name)
                         Record.FileCount++
+                      } else if (o.myPath) {
+                        instanceList.push({
+                          studyInstanceUid: dicomInfo.studyUid,
+                          seriesInstanceUid: v.seriesUid,
+                          sopInstanceUid: o.instanceUid,
+                          instanceNumber: o.instanceNumber,
+                          instanceTime: o.instanceTime,
+                          imageRows: o.imageRows,
+                          imageColumns: o.imageColumns,
+                          sliceLocation: o.sliceLocation,
+                          sliceThickness: o.sliceThickness,
+                          numberOfFrames: o.numberOfFrames,
+                          pixelSpacing: o.pixelSpacing,
+                          imagerPixelSpacing: o.imagerPixelSpacing,
+                          frameOfReferenceUID: o.frameOfReferenceUID,
+                          windowCenter: o.windowCenter,
+                          windowWidth: o.windowWidth,
+                          path: o.myPath
+                        })
+                        Record.Uploaded.push(name)
+                        dicomInfo.failedFileCount++
+                        Record.FileCount++
                       } else {
                         let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
                         let res = await dcmUpload(path, o.file, config)
@@ -1213,6 +1235,7 @@ export default {
                             windowWidth: o.windowWidth,
                             path: scope.$getObjectName(res.url)
                           })
+                          o.myPath = scope.$getObjectName(res.url)
                           Record.Uploaded.push(name)
                           dicomInfo.failedFileCount++
                           Record.FileCount++

From d9b5d76ac741192323b41308d0e932b86bef7415 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 13 Mar 2024 13:54:22 +0800
Subject: [PATCH 138/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E6=A0=87=E8=AE=B0?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue        | 11 +++++++++--
 .../reading/dicoms/components/Fusion/PetCt.vue       | 12 +++++++++---
 .../reading/dicoms/components/QuestionItem.vue       |  4 ++--
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 92a5efe9..4ca04daa 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -339,6 +339,7 @@
               :is-reading-task-view-in-order="isReadingTaskViewInOrder"
               :current-dicom-canvas-index="currentDicomCanvasIndex"
               :custom-wwc-tpl="customWwcTpl"
+              :data-canvas-uid="`dicomCanvas${i-1}`"
               @setCornerstoneStyle="setCornerstoneStyle(i-1)"
               @setMeasureData="setMeasureData"
               @modifyMeasureData="modifyMeasureData"
@@ -636,6 +637,7 @@ import Hotkeys from './Hotkeys'
 import WL from './WL'
 import Others from './Others'
 import DicomEvent from './DicomEvent'
+import html2canvas from 'html2canvas'
 export default {
   name: 'DicomViewer',
   components: {
@@ -887,9 +889,14 @@ export default {
       }
       console.log('getMeasureData')
     })
-    DicomEvent.$on('getScreenshots', (callback) => {
+    DicomEvent.$on('getScreenshots', async(callback) => {
       if (this.currentDicomCanvasIndex > -1) {
-        var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
+        // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
+        const divForDownloadViewport = document.querySelector(
+          `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
+        )
+        var canvas = await html2canvas(divForDownloadViewport)
+        var base64Str = canvas.toDataURL('image/png', 1)
         callback(base64Str)
       }
       console.log('getScreenshots')
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 8fd4f03d..1ac3f6e0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -375,6 +375,7 @@ import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransf
 import vtkPiecewiseFunction from '@kitware/vtk.js/Common/DataModel/PiecewiseFunction'
 // import vtkOrientationMarkerWidget from '@kitware/vtk.js/Interaction/Widgets/OrientationMarkerWidget'
 import { mat4, vec3 } from 'gl-matrix'
+import html2canvas from 'html2canvas'
 // import vtkColorTransferFunction from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction'
 // import vtkMath from '@kitware/vtk.js/Common/Core/Math'
 import CircleROITool from './tools/CircleROITool'
@@ -596,8 +597,13 @@ export default {
       this.imageLocation(obj)
     })
     FusionEvent.$on('getScreenshots', async(callback) => {
-      var base64Str = await this.$refs['FUSION_AXIAL'].getScreenshots()
-      callback(base64Str)
+      // var base64Str = await this.$refs['FUSION_AXIAL'].getScreenshots()
+      const divForDownloadViewport = document.querySelector(
+        '.dicom-container'
+      )
+      var canvas = await html2canvas(divForDownloadViewport)
+      var pictureBaseStr = canvas.toDataURL('image/png', 1)
+      callback(pictureBaseStr)
     })
   },
   destroyed() {
@@ -803,7 +809,7 @@ export default {
     },
     removeAnnotation(obj) {
       const { otherMeasureData, type } = obj
-      if(!otherMeasureData || !otherMeasureData.data) return
+      if (!otherMeasureData || !otherMeasureData.data) return
       const { data } = otherMeasureData
       const i = this.measureDatas.findIndex(item => item.OtherMeasureData && item.OtherMeasureData.data.remark === data.remark)
       if (i > -1) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 476b07a2..dd73622f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -337,10 +337,10 @@ export default {
       // if (parseInt(v) !== 5) {
       //   return
       // }
-      
+
       if (question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
-      }else{
+      } else {
         this.$emit('setFormItemData', { key: question.Id, val: v })
       }
     },

From 3b7f1419569ac2498bd142fa73c567064d5d25b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 14:28:09 +0800
Subject: [PATCH 139/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 5abed804..1ae096cd 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -74,7 +74,7 @@
                   {{ user.LastName }}
                 </div>
                 <div class="user-description" style="">
-                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 75px">{{user.RealName}}</span></div>
+                  <div style="font-size: .875rem;color: #333;line-height: 22px;display: flex;margin-bottom: 0.25rem;"><span style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;max-width: 150px">{{user.RealName}}</span></div>
                   <div style="font-size: .75rem;line-height: 18px;color:#999">{{new Date().getFullYear()}}{{$t('common:date:today')}}{{new Date().getMonth() + 1}}{{$t('common:date:month')}}{{new Date().getDate()}}{{$t('common:date:day')}}，{{ dayOfWeek }}</div>
                 </div>
               </div>

From d131953bebd81a105b9f63dc8b1aa54d59095d42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 14:45:43 +0800
Subject: [PATCH 140/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GroupConsistentRuleSubjectTable.vue          | 3 ++-
 src/views/trials/trials-workbench/index.vue                 | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index 44283154..973b72c6 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -157,7 +157,8 @@ export default {
       var params = {
         TrialId: this.$route.query.trialId,
         SubejctIdList: this.SelectList.map(v => v.SubjectId),
-        IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask
+        IsAutoAllocateGenerateTask: IsAutoAllocateGenerateTask,
+        TrialReadingCriterionId: this.TrialReadingCriterionId
       }
       confirmGenerateGroupConsistentTask(params).then(res => {
         this.loading = false
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 1ae096cd..fcd0f9ae 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -70,7 +70,7 @@
           <div style="padding: 12px">
             <div class="user-profile-wrapper" style="padding: 24px 0 24px 12px;">
               <div style="display: flex;align-items: center;margin-bottom: 20px;" class="user-info">
-                <div style="margin-right: 0.75rem;background: #428bca;width: 44px;height: 44px;border-radius: 50%;line-height: 44px;text-align: center;font-size: 12px;color:#fff;">
+                <div style="margin-right: 0.75rem;background: #428bca;width: 44px;height: 44px;border-radius: 50%;line-height: 44px;text-align: center;font-size: 12px;color:#fff;overflow: hidden">
                   {{ user.LastName }}
                 </div>
                 <div class="user-description" style="">
@@ -98,7 +98,7 @@
 <!--              </div>-->
 <!--            </div>-->
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_title">{{ $t('trials:workbench:title:padding') }}</div>
+            <div class="my_select_title" style="font-size: 18px">{{ $t('trials:workbench:title:padding') }}</div>
             <div class="my_select">
               <!-- PM/APM -->
               <!-- 阅片期 -->
@@ -227,7 +227,7 @@
               </div>
             </div>
             <div class="thy-divider" style="border-top: 1px solid #eee;margin: 0;"></div>
-            <div class="my_select_title">{{ $t('trials:workbench:title:my') }}</div>
+            <div class="my_select_title" style="font-size: 18px">{{ $t('trials:workbench:title:my') }}</div>
             <div class="my_select">
               <!-- 项目已签署文件 -->
               <div class="my_select_box" :class="{selected: selected === 'NeedSignedTrialDoc'}" tab-data="NeedSignedTrialDoc" @click="selected = 'NeedSignedTrialDoc'" v-if="!hasPermi(['role:zys'])">

From c73c84b15d93a74fb05a377c8fff7a58e2237a7e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 15:49:48 +0800
Subject: [PATCH 141/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GroupConsistentRuleSubjectTable.vue        | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
index 973b72c6..01a41c65 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/GroupConsistentRuleSubjectTable.vue
@@ -64,7 +64,7 @@
         >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="save(true)">
+        <el-button size="small" type="primary" :disabled="!IsAllowAutoAllocate" :loading="btnLoading" @click="save(true)">
           {{$t('trials:grouptConsistencyAnalysis:button:RandomCreate')}}
         </el-button>
         <!-- 生成 -->
@@ -129,7 +129,8 @@ export default {
       loading: false,
       trialId: this.$route.query.trialId,
       SelectList: [],
-      btnLoading: false
+      btnLoading: false,
+      IsAllowAutoAllocate: true
     }
   },
   mounted() {
@@ -177,11 +178,12 @@ export default {
       this.loading = true
       this.searchData.TrialReadingCriterionId = this.TrialReadingCriterionId
       getGroupConsistentRuleSubjectList(this.searchData).then(res => {
-        if (res.OtherInfo) {
+        if (res.OtherInfo.Rule) {
           this.$emit('setReaderRulesFormVisible', false)
         } else {
           this.$emit('setReaderRulesFormVisible', true)
         }
+        this.IsAllowAutoAllocate = res.OtherInfo.IsAllowAutoAllocate
         this.loading = false
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount

From ccf5830fa0aea78facefcb962fdcc0da25c8e865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 16:21:49 +0800
Subject: [PATCH 142/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/consistency-analysis/components/VirtualCenter.vue  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index ad435593..1f02ceca 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -128,6 +128,9 @@ export default {
           this.loading = false
           this.$emit('getList')
           this.$emit('close')
+        }).catch(() => {
+          this.loading = false
+          this.btnLoading = false
         })
       })
     },

From 56a8e738d386b851f923324b353573f4b8df5794 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 16:38:33 +0800
Subject: [PATCH 143/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                               |  9 +++++++++
 .../setting/medical-audit/index.vue             | 17 +++++++++++------
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 7a33e701..5d554956 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3608,4 +3608,13 @@ export function getTrialSignDocumentList(param) {
   })
 }
 
+export function verifyIsCanConfirm(param) {
+  return request({
+    url: `/ReadingMedicineQuestion/verifyIsCanConfirm`,
+    method: 'post',
+    data: param
+  })
+}
+
+
 
diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index f031f933..a84ac8b8 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -323,7 +323,7 @@
   </box-content>
 </template>
 <script>
-import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion } from '@/api/trials'
+import { batchDeteteCriterionMedicineQuestion, getReadingMedicineTrialQuestionList, deleteReadingMedicineTrialQuestion, confirmReadingMedicineQuestion, verifyReadingMedicineQuestion, verifyIsCanConfirm } from '@/api/trials'
 import { getTrialCriterionList } from '@/api/trials/reading'
 import BoxContent from '@/components/BoxContent'
 import DefaultQS from './components/DefaultQsLang'
@@ -489,11 +489,16 @@ export default {
         return
       }
       this.loading = true
-      verifyReadingMedicineQuestion({ trialId: this.trialId, TrialReadingCriterionId: this.trialReadingCriterionId }).then(res => {
-        this.loading = false
-        const { MedicalAuditConfirmation } = const_.processSignature
-        this.signCode = MedicalAuditConfirmation
-        this.signVisible = true
+      verifyIsCanConfirm({
+        TrialReadingCriterionId: this.trialReadingCriterionId
+      }).then(res => {
+        console.log(res)
+        verifyReadingMedicineQuestion({ trialId: this.trialId, TrialReadingCriterionId: this.trialReadingCriterionId }).then(res => {
+          this.loading = false
+          const { MedicalAuditConfirmation } = const_.processSignature
+          this.signCode = MedicalAuditConfirmation
+          this.signVisible = true
+        }).catch(() => { this.loading = false })
       }).catch(() => { this.loading = false })
     },
     // 关闭签名框并设置确认状态

From 78685918a9ce667146edee5ca1b168dc10f1c44a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Wed, 13 Mar 2024 17:50:33 +0800
Subject: [PATCH 144/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/visit-plan/components/visitPlanForm.vue       | 4 ++--
 .../trials/trials-panel/setting/visit-plan/index.vue      | 8 ++++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
index 1e143e79..81b47015 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/components/visitPlanForm.vue
@@ -120,8 +120,8 @@ export default {
         Description: '',
         IsBaseLine: false,
         // BlindName: '',
-        VisitWindowLeft: -3,
-        VisitWindowRight: 3,
+        VisitWindowLeft: -5,
+        VisitWindowRight: 5,
         IsConfirmed: false,
         IsDeleted: false,
         IsHaveFirstConfirmed: false
diff --git a/src/views/trials/trials-panel/setting/visit-plan/index.vue b/src/views/trials/trials-panel/setting/visit-plan/index.vue
index 19539b68..783c2bd4 100644
--- a/src/views/trials/trials-panel/setting/visit-plan/index.vue
+++ b/src/views/trials/trials-panel/setting/visit-plan/index.vue
@@ -103,7 +103,7 @@
         >
           <template slot-scope="scope">
             <span v-show="scope.row.VisitWindowLeft!==0 || scope.row.VisitWindowRight!==0">
-              {{ `${scope.row.VisitWindowLeft}${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight}${$t('trials:visitPlan:table:day')}` }}
+              {{ `${scope.row.VisitWindowLeft} ${$t('trials:visitPlan:table:day')} ~ ${scope.row.VisitWindowRight} ${$t('trials:visitPlan:table:day')}` }}
             </span>
           </template>
         </el-table-column>
@@ -286,7 +286,7 @@ export default {
         })
     },
     handleAdd() {
-      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -3, VisitWindowRight: 3, Description: '' }
+      this.row = { TrialId: this.trialId, Id: '', IsBaseLine: false, BlindName: '', VisitWindowLeft: -5, VisitWindowRight: 5, Description: '' }
       this.timer = new Date().getTime()
       if (this.list.length === 0) {
         this.row.VisitName = 'Baseline'
@@ -300,6 +300,10 @@ export default {
         this.row.VisitName = this.list[this.list.length - 1].VisitName.split(' ')[0] + ' ' + (this.list[this.list.length - 1].VisitNum + 1)
         this.row.VisitNum = this.list[this.list.length - 1].VisitNum + 1
         this.row.VisitDay = this.list[this.list.length - 1].VisitDay - this.list[this.list.length - 2].VisitDay + this.list[this.list.length - 1].VisitDay
+        if (this.list[this.list.length - 1].VisitWindowLeft && this.list[this.list.length - 1].VisitWindowRight) {
+          this.row.VisitWindowLeft = this.list[this.list.length - 1].VisitWindowLeft
+          this.row.VisitWindowRight = this.list[this.list.length - 1].VisitWindowRight
+        }
       }
       this.visit_model.title = this.$t('common:button:add')
       this.visit_model.visible = true

From 68ea60857d5887e9c7e9bc8833b1f6dcd1961f56 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 09:27:06 +0800
Subject: [PATCH 145/374] =?UTF-8?q?ea=E6=9D=83=E9=99=90=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/SPMEnrollment/components/Approval.vue           | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
index 744192bc..481a3f4c 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
@@ -8,6 +8,7 @@
           type="primary"
           :disabled="approveIdArr.length==0"
           @click="handleApprove()"
+          v-hasPermi="['trials:trials-panel:attachments:SPMEnrollment:button-agree']"
         >
           {{ $t('trials:seletctedReviews:button:approve') }}
         </el-button>
@@ -110,6 +111,7 @@
             />
             <!-- 同意 -->
             <el-button
+              v-hasPermi="['trials:trials-panel:attachments:SPMEnrollment:button-agree']"
               :disabled="scope.row.DoctorTrialState === 8"
               icon="el-icon-check"
               circle

From 157b65c507f1afd23b74821351318db3595acf30 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 10:23:26 +0800
Subject: [PATCH 146/374] =?UTF-8?q?ea=E3=80=81qa=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 23 ++++++++++++++-----
 .../reading/pm-medical-feedback/index.vue     |  3 +++
 2 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index ef65591c..820f29da 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -29,6 +29,7 @@
           width="150"
           prop="FirstName"
           sortable="custom"
+          v-if="!hasPermi(['role:ea'])"
         >
           <template slot-scope="scope">
             <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.DoctorId}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
@@ -39,6 +40,7 @@
           prop="ChineseName"
           sortable="custom"
           :label="$t('trials:enrolledReviews:table:nameCN')"
+          v-if="!hasPermi(['role:ea'])"
           width="120"
           show-overflow-tooltip
         />
@@ -46,7 +48,7 @@
         <el-table-column
           prop="UserName"
           :label="$t('trials:enrolledReviews:table:userName')"
-          width="150"
+          :width="hasPermi(['role:ea'])?300:150"
           sortable="custom"
           show-overflow-tooltip
         />
@@ -54,7 +56,7 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          width="200"
+          :width="hasPermi(['role:ea'])?320:200"
           sortable="custom"
           show-overflow-tooltip
         >
@@ -77,6 +79,7 @@
                 :active-value="true"
                 :inactive-value="false"
                 @change="(v) => {return isEnableChange(scope.row, v)}"
+                :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
               <span>{{$fd('IsEnable', scope.row.IsEnable)}}</span>
             </div>
@@ -84,6 +87,7 @@
         </el-table-column>
         <el-table-column
           v-for="ite of TrialReadingCriterionList"
+          :key="ite"
           :label="ite.TrialReadingCriterionName"
           width="360"
           header-align="center"
@@ -95,7 +99,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []">
+              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item">
                 <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
                 <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
                 <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
@@ -121,6 +125,7 @@
                 :active-value="true"
                 :inactive-value="false"
                 @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
+                :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
               <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis">{{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
               <span v-else>{{$fd('YesOrNo',false)}}</span>
@@ -253,9 +258,15 @@
           default-first-option
           style="width: 70%"
         >
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" />
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
-          <el-option v-for="item of $d.ReadingCategory" v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+          <template v-for="item of $d.ReadingCategory">
+            <el-option  v-if="item.value === 1" :key="item.id" :value="1" :label="$fd('ReadingCategory', 1) + ' & ' + $fd('ReadingCategory', 2)" /> 
+          </template>
+          <template v-for="item of $d.ReadingCategory">
+            <el-option  v-if="item.value === 4 && IsArbitrationReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 4)" />
+          </template>
+          <template v-for="item of $d.ReadingCategory">
+            <el-option  v-if="item.value === 5 && IsOncologyReading" :key="item.id" :value="item.value" :label="$fd('ReadingCategory', 5)" />
+          </template>
         </el-select>
       </template>
       <template slot="dialog-footer">
diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
index 410ea666..b3319fc4 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue
@@ -355,6 +355,7 @@
               circle
               :title="$t('trials:pmMedicalReview:action:failure')"
               :disabled="scope.row.IsInvalid || !!scope.row.AuditSignTime"
+              v-hasPermi="['trials:trials-panel:reading:pm-medical-feedback:failure']"
               icon="el-icon-close"
               @click="setMedicalReviewInvalid(scope.row)"
             />
@@ -363,6 +364,7 @@
               :title="$t('trials:pmMedicalReview:action:assign')"
               :disabled="!!scope.row.MedicalManagerUser || scope.row.IsInvalid || !!scope.row.AuditSignTime"
               icon="el-icon-thumb"
+              v-hasPermi="['trials:trials-panel:reading:pm-medical-feedback:assign']"
               @click="assignMedicalReviewTask(scope.row, 1)"
             />
             <el-button
@@ -370,6 +372,7 @@
               :title="$t('trials:pmMedicalReview:action:cancelAssign')"
               :disabled="!scope.row.MedicalManagerUser || scope.row.IsInvalid || !!scope.row.AuditSignTime"
               icon="el-icon-refresh-left"
+              v-hasPermi="['trials:trials-panel:reading:pm-medical-feedback:cancelAssign']"
               @click="assignMedicalReviewTask(scope.row, 3)"
             />
           </template>

From 84ade87b25047ecc4eab68d1533567d029825561 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 10:59:42 +0800
Subject: [PATCH 147/374] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/read-task-allocation/index.vue    | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 4bc4568c..6efe208d 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -7,7 +7,7 @@
           <div slot="search-container">
             <el-form :inline="true">
               <el-form-item :label="$t('trials:reviewAssign:table:siteCode')">
-                <el-select v-model="searchData.SiteId" clearable filterable style="width:120px;">
+                <el-select v-model="searchData.SiteId" clearable filterable style="width:240px;">
                   <el-option
                     v-for="(item,index) of siteOptions"
                     :key="'taskSearchData' + index"
@@ -18,13 +18,25 @@
               </el-form-item>
               <!-- 受试者编号 -->
               <el-form-item :label="$t('trials:reviewAssign:table:subjectCode')">
-                <el-input v-model="searchData.SubjectCode" style="width:100px;" />
+                <el-input v-model="searchData.SubjectCode" style="width:240px;" />
               </el-form-item>
               <!-- 阅片人 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:reader')">
-                <el-select v-model="searchData.DoctorUserId" clearable style="width:120px;">
+                <el-select v-model="searchData.DoctorUserId" clearable style="width:240px;">
                   <el-option v-for="item of DoctorUserList" :key="'taskSearchData' + item.DoctorUserId" :value="item.DoctorUserId" :label="`${item.UserName}(${item.FullName})`" />
                 </el-select>
+              </el-form-item>
+                <!-- 分配状态 -->
+              <el-form-item :label="$t('trials:reviewAssign:searchForm:status')">
+                <el-select v-model="searchData.SubjectAllocateState" clearable style="width:240px;">
+                  <el-option v-for="item of $d.SubjectAllocateState" :key=" item.id" :value="item.value" :label="item.label" />
+                </el-select>
+              </el-form-item>
+                <!-- 分配角色 -->
+              <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
+                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
+                  <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
+                </el-select>
               </el-form-item>
               <!-- 查询 -->
               <el-form-item>
@@ -514,7 +526,9 @@ const taskSearchDataDefault = () => {
     ReadingCategory: null,
     TaskAllocationState: null,
     BeginAllocateDate: null,
-    EndAllocateDate: null
+    EndAllocateDate: null,
+    SubjectAllocateState:null,
+    ArmList:[]
   }
 }
 export default {

From 37c415c0efafa95840fb0785d7c25b35d43f2dfb Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 11:09:48 +0800
Subject: [PATCH 148/374] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/read-task-allocation/index.vue         | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 6efe208d..c0597784 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -34,7 +34,7 @@
               </el-form-item>
                 <!-- 分配角色 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
-                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
+                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple :disabled="!searchData.SubjectAllocateState">
                   <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
                 </el-select>
               </el-form-item>
@@ -506,7 +506,9 @@ const searchDataDefault = () => {
     DoctorUserId: null,
     IsHaveAssigned: null,
     IsAssignConfirmed: null,
-    TrialReadingCriterionId: null
+    TrialReadingCriterionId: null,
+    SubjectAllocateState:null,
+    ArmList:[]
   }
 }
 const taskSearchDataDefault = () => {
@@ -599,6 +601,14 @@ export default {
       if (v) {
         this.getList()
       }
+    },
+    "searchData.SubjectAllocateState":{
+      handler(){
+        if(!this.searchData.SubjectAllocateState){
+          this.searchData.ArmList = [];
+        }
+      },
+      // immediate:true
     }
   },
   mounted() {

From 46ea20a9f5f65dc823491f0c165b58e466a35e58 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 13:49:38 +0800
Subject: [PATCH 149/374] =?UTF-8?q?=E3=80=90=E9=98=85=E7=89=87=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=86=E9=85=8D=E3=80=91=E5=A2=9E=E5=8A=A0=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=8F=96=E6=B6=88=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E6=9D=A1=E4=BB=B6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/read-task-allocation/index.vue     | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index c0597784..3518df45 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -34,7 +34,7 @@
               </el-form-item>
                 <!-- 分配角色 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
-                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple :disabled="!searchData.SubjectAllocateState">
+                <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
                   <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
                 </el-select>
               </el-form-item>
@@ -602,14 +602,14 @@ export default {
         this.getList()
       }
     },
-    "searchData.SubjectAllocateState":{
-      handler(){
-        if(!this.searchData.SubjectAllocateState){
-          this.searchData.ArmList = [];
-        }
-      },
-      // immediate:true
-    }
+    // "searchData.SubjectAllocateState":{
+    //   handler(){
+    //     if(!this.searchData.SubjectAllocateState){
+    //       this.searchData.ArmList = [];
+    //     }
+    //   },
+    //   // immediate:true
+    // }
   },
   mounted() {
     this.getDoctorUserSelectList()

From eadd5b022311aff47facbf928317bacc76420506 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 13:54:16 +0800
Subject: [PATCH 150/374] =?UTF-8?q?spm=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E4=BF=A1=E6=81=AF=E5=B1=95=E7=A4=BA=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/SPMEnrollment/components/Approval.vue           | 2 +-
 .../trials/trials-panel/attachments/SPMEnrollment/index.vue     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
index 481a3f4c..25938b70 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/components/Approval.vue
@@ -62,7 +62,7 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).toString() }}
+            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).join(", ") }}
           </template>
         </el-table-column>
         <el-table-column
diff --git a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
index 5f92e8f6..e15c62e7 100644
--- a/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/SPMEnrollment/index.vue
@@ -39,7 +39,7 @@
           </div>
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
-            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
+            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(", ") }}</span>
             <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
           <div class="div-col">

From 145655f8fc735f63a3ccce1ddc22923d8f450d52 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 14:09:03 +0800
Subject: [PATCH 151/374] =?UTF-8?q?spm=E5=B7=A5=E4=BD=9C=E5=8F=B0=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94=E5=85=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index fcd0f9ae..6deb05af 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -123,7 +123,7 @@
                 </div>
               </div>
               <!-- 中心调研 -->
-              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:reviewerScreen'])">
+              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_SiteSurveryCount }}</span>

From 7f9589427f06a5e03b0ff06e1ac9c99c7fde04dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 14 Mar 2024 14:11:51 +0800
Subject: [PATCH 152/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8?=
 =?UTF-8?q?=E6=9F=A5=E9=BB=98=E8=AE=A4=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/enrolled-reviewers/list/index.vue      | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 820f29da..59cb32cb 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -497,7 +497,7 @@ export default {
           return {
             EnrollId: v.EnrollId,
             TrialReadingCriterionId: v.TrialReadingCriterionId,
-            IsJoinAnalysis: false
+            IsJoinAnalysis: value
           }
         })
       }
@@ -505,6 +505,7 @@ export default {
         if (showMessage) {
           this.$message.success(this.$t('trials:enrolledReviews:message:batchSetCriterionJoinJoinAnalysis1'))
         }
+        this.initPage()
       })
     },
     go(path) {

From dfaa2554276828ac45555b01ca820c3d7cbdc5c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 14 Mar 2024 14:39:25 +0800
Subject: [PATCH 153/374] =?UTF-8?q?IQC=E5=8E=BB=E9=99=A4=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/qc-question/components/QsForm.vue | 36 +++++++------
 .../setting/qc-question/index.vue             | 54 +++++++++----------
 2 files changed, 48 insertions(+), 42 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue b/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
index a3b5886a..df5d19b2 100644
--- a/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/components/QsForm.vue
@@ -17,21 +17,21 @@
           v-model="form.QuestionName"
         />
       </el-form-item>
-      <el-form-item
-        :label="$t('common:title:languageType')"
-        prop="LanguageType"
-      >
-        <el-select
-          v-model="form.LanguageType"
-        >
-          <el-option
-            v-for="item of $d.LanguageType"
-            :key="item.value"
-            :value="item.value"
-            :label="item.label"
-          />
-        </el-select>
-      </el-form-item>
+<!--      <el-form-item-->
+<!--        :label="$t('common:title:languageType')"-->
+<!--        prop="LanguageType"-->
+<!--      >-->
+<!--        <el-select-->
+<!--          v-model="form.LanguageType"-->
+<!--        >-->
+<!--          <el-option-->
+<!--            v-for="item of $d.LanguageType"-->
+<!--            :key="item.value"-->
+<!--            :value="item.value"-->
+<!--            :label="item.label"-->
+<!--          />-->
+<!--        </el-select>-->
+<!--      </el-form-item>-->
       <!-- 类型 -->
       <el-form-item
         :label="$t('trials:qcCfg:table:type')"
@@ -223,6 +223,7 @@ export default {
   mounted() {
     this.trialId = this.$route.query.trialId
     this.initForm()
+
   },
   methods: {
     async initForm() {
@@ -236,6 +237,11 @@ export default {
           this.parentTriggerValOptions = this.parentOptions[index].TypeValue.split('|')
         }
       }
+      if (this.$i18n.locale === 'zh') {
+        this.form.LanguageType = 0
+      } else {
+        this.form.LanguageType = 1
+      }
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (this.data.hasOwnProperty(k)) {
diff --git a/src/views/trials/trials-panel/setting/qc-question/index.vue b/src/views/trials/trials-panel/setting/qc-question/index.vue
index 88fe8759..a0d8800e 100644
--- a/src/views/trials/trials-panel/setting/qc-question/index.vue
+++ b/src/views/trials/trials-panel/setting/qc-question/index.vue
@@ -8,23 +8,23 @@
           <el-input v-model="searchData.QuestionName" clearable style="width:120px;" />
         </el-form-item>
         <!-- 语言类型 -->
-        <el-form-item
-          :label="$t('common:title:languageType')"
-          style="margin-top: 10px"
-        >
-          <el-select
-            v-model="searchData.LanguageType"
-            clearable
-            style="width:120px;"
-          >
-            <el-option
-              v-for="item of $d.LanguageType"
-              :key="item.value"
-              :value="item.value"
-              :label="item.label"
-            />
-          </el-select>
-        </el-form-item>
+<!--        <el-form-item-->
+<!--          :label="$t('common:title:languageType')"-->
+<!--          style="margin-top: 10px"-->
+<!--        >-->
+<!--          <el-select-->
+<!--            v-model="searchData.LanguageType"-->
+<!--            clearable-->
+<!--            style="width:120px;"-->
+<!--          >-->
+<!--            <el-option-->
+<!--              v-for="item of $d.LanguageType"-->
+<!--              :key="item.value"-->
+<!--              :value="item.value"-->
+<!--              :label="item.label"-->
+<!--            />-->
+<!--          </el-select>-->
+<!--        </el-form-item>-->
         <!-- 类型 -->
         <el-form-item :label="$t('trials:qcCfg:table:type')" style="margin-top: 10px">
           <el-select v-model="searchData.Type" clearable style="width:120px;">
@@ -120,16 +120,16 @@
         show-overflow-tooltip
       />
       <!-- 审核问题 -->
-      <el-table-column
-        prop="LanguageType"
-        :label="$t('common:title:languageType')"
-        show-overflow-tooltip
-        width="100"
-      >
-        <template slot-scope="scope">
-          {{ $fd('LanguageType', scope.row.LanguageType) }}
-        </template>
-      </el-table-column>
+<!--      <el-table-column-->
+<!--        prop="LanguageType"-->
+<!--        :label="$t('common:title:languageType')"-->
+<!--        show-overflow-tooltip-->
+<!--        width="100"-->
+<!--      >-->
+<!--        <template slot-scope="scope">-->
+<!--          {{ $fd('LanguageType', scope.row.LanguageType) }}-->
+<!--        </template>-->
+<!--      </el-table-column>-->
       <!-- 类型 -->
       <el-table-column
         prop="Type"

From 9a63a206d58c5d0e6417f114e22d57c8b49ea5f5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 14:44:15 +0800
Subject: [PATCH 154/374] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D=E5=92=8C=E6=A3=80=E6=9F=A5?=
 =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=85=A8=E9=80=89=E6=A0=87=E8=AF=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/logicalConfig.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index f8af25ef..db472eea 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -538,7 +538,7 @@
           :data="$d.Bodypart"
           stripe
           height="450"
-          row-key="Id"
+          row-key="id"
           @select="handleBodyPartSelectionChange"
         >
           <el-table-column
@@ -589,7 +589,7 @@
           :data="$d.Modality"
           stripe
           height="450"
-          row-key="Id"
+          row-key="id"
           class="criterion-table"
           @select="handleSelectionChange"
         >

From 54c7bb055ab787ad868caf90082108ccd52157fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 14:58:30 +0800
Subject: [PATCH 155/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E4=B8=AD?=
 =?UTF-8?q?=E5=BF=83=E8=B0=83=E7=A0=94=E6=95=B0=E9=87=8F=E5=88=86=E8=A7=92?=
 =?UTF-8?q?=E8=89=B2=E7=BB=9F=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 6deb05af..7487c99c 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -126,7 +126,7 @@
               <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.PM_SiteSurveryCount }}</span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{hasPermi(['role:pm'])? tabList.PM_SiteSurveryCount : tabList.SPM_SiteSurveryCount }}</span>
                 </div>
               </div>
               <!-- SPM/CPM -->

From a675d5d79e6aed9ca5c377bfb340d2ecf199fc7b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 15:04:15 +0800
Subject: [PATCH 156/374] =?UTF-8?q?pm=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=83=A8=E5=88=86=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/attachments/enrollment/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/index.vue b/src/views/trials/trials-panel/attachments/enrollment/index.vue
index 3269b96a..2bbeacbd 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/index.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/index.vue
@@ -39,7 +39,7 @@
           </div>
           <div class="div-col">
             <label class="el-label">{{ $t('trials:trials-list:form:typeofReviewers:') }}</label>
-            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).toString() }}</span>
+            <span>{{ trialInfo.AttendedReviewerTypeEnumList.map(v => $fd('AttendedReviewerType', v)).join(', ') }}</span>
 <!--            <span>{{ $fd('AttendedReviewerType', trialInfo.AttendedReviewerType) }}</span>-->
           </div>
           <div class="div-col">

From 8c38700b51c70286e85bd7d89f2c5706288ce101 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 14 Mar 2024 15:22:52 +0800
Subject: [PATCH 157/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E6=9F=A5=E7=9C=8Bsuv?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E5=8E=86=E5=8F=B2=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             | 10 ++-
 src/router/index.js                           |  7 ++
 .../components/Fusion/HistoryScreenshot.vue   | 82 +++++++++++++++++++
 .../components/Fusion/TableQuestionItem.vue   | 28 ++++++-
 4 files changed, 123 insertions(+), 4 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index 7a33e701..b941d8eb 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -1762,7 +1762,6 @@ export function getNeedSignTrialDocTrialIdList() {
   })
 }
 
-
 export function getBasicStat() {
   return request({
     url: `/PersonalWorkstation/getBasicStat`,
@@ -3590,8 +3589,6 @@ export function addDefaultQuestions(param) {
   })
 }
 
-
-
 export function getReadingCalculationData(param) {
   return request({
     url: `/ReadingImageTask/getReadingCalculationData`,
@@ -3608,4 +3605,11 @@ export function getTrialSignDocumentList(param) {
   })
 }
 
+export function getPreviousOtherPicturePath(param) {
+  return request({
+    url: `/ReadingImageTask/getPreviousOtherPicturePath`,
+    method: 'post',
+    data: param
+  })
+}
 
diff --git a/src/router/index.js b/src/router/index.js
index 804e033e..34f8e9ae 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -139,6 +139,13 @@ export const constantRoutes = [
     hidden: true,
     component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt')
   },
+
+  {
+    path: '/historyScreenshot',
+    name: 'historyScreenshot',
+    hidden: true,
+    component: () => import('@/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot')
+  },
   {
     path: '/visitDicomReview',
     name: 'visitDicomReview',
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
new file mode 100644
index 00000000..16a21dbb
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -0,0 +1,82 @@
+<template>
+  <div class="history_screenshot">
+    <h3 class="info">
+      <span>{{ subjectCode }}</span>
+      <span style="margin-left:10px;">{{ title }}</span>
+    </h3>
+    <template v-if="historyInfo">
+      <el-timeline v-viewer>
+        <el-timeline-item
+          v-for="i in historyInfo"
+          :key="i.VisitTaskId"
+          :timestamp="i.TaskBlindName"
+          placement="top"
+        >
+          <el-card shadow="never">
+            <img
+              crossorigin="anonymous"
+              :src="i.OtherPicturePath"
+              alt="Image"
+            >
+          </el-card>
+        </el-timeline-item>
+      </el-timeline>
+    </template>
+  </div>
+</template>
+<script>
+import { getPreviousOtherPicturePath } from '@/api/trials'
+import { changeURLStatic } from '@/utils/history.js'
+import store from '@/store'
+import Viewer from 'v-viewer'
+export default {
+  name: 'HistoryScreenshot',
+  data() {
+    return {
+      subjectCode: '',
+      title: '',
+      lesionId: '',
+      historyInfo: null
+    }
+  },
+  mounted() {
+    if (this.$router.currentRoute.query.TokenKey) {
+      store.dispatch('user/setToken', this.$route.query.TokenKey)
+      changeURLStatic('TokenKey', '')
+    }
+    this.lesionId = this.$route.query.rowId
+    this.subjectCode = this.$route.query.subjectCode
+    this.title = this.$route.query.lesionName
+    if (!this.lesionId) return
+    this.initializeViewer()
+    this.getScreenshot()
+  },
+  methods: {
+    getScreenshot() {
+      const loading = this.$loading({ fullscreen: true })
+      getPreviousOtherPicturePath({ rowId: this.lesionId }).then(res => {
+        this.historyInfo = res.Result
+        loading.close()
+      }).catch(() => { loading.close() })
+    },
+    initializeViewer() {
+      Viewer.setDefaults({
+        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true, prev: true, next: true }
+      })
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.history_screenshot{
+  padding: 20px 100px 20px 20px;
+  .info{
+    margin-left: 35px;
+  }
+  img{
+    width: 100px;
+    height: 100px;
+    cursor: pointer;
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 58a7c963..e81dee5f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -137,8 +137,26 @@
               {{ val }}
             </el-radio>
           </el-radio-group>
+          <template v-if="qs.QuestionMark === 20 && qs.Type==='calculation'">
+            <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+              <el-input
+                v-if="qs.Type==='calculation'"
+                v-model="questionForm[qs.Id]"
+                disabled
+                style="width:120px;"
+              >
+                <template v-if="qs.Unit" slot="append">
+                  {{ $fd('ValueUnit', parseInt(qs.Unit)) }}
+                </template>
+              </el-input>
+              <!-- <span style="color:#409eff;cursor: pointer" @click="previewImages(answers.RowId)">
+                {{ $t('trials:lugano:button:suvscreenshot') }}
+              </span> -->
+              <el-button type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+            </div>
+          </template>
           <el-input
-            v-if="qs.Type==='calculation'"
+            v-else-if="qs.Type==='calculation' && qs.QuestionMark !== 20"
             v-model="questionForm[qs.Id]"
             disabled
           >
@@ -187,6 +205,7 @@
 import { submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
 // import { uploadPrintscreen } from '@/api/reading'
 import store from '@/store'
+import { getToken } from '@/utils/auth'
 import FusionEvent from './FusionEvent'
 export default {
   name: 'MeasurementForm',
@@ -988,6 +1007,13 @@ export default {
           this.$emit('close')
         }
       }
+    },
+    previewImages(rowId) {
+      var token = getToken()
+      var subjectCode = this.$route.query.subjectCode
+      var path = `/historyScreenshot?rowId=${rowId}&subjectCode=${subjectCode}&lesionName=${this.lesionName}&TokenKey=${token}`
+      const routeData = this.$router.resolve({ path })
+      window.open(routeData.href, '_blank')
     }
   }
 }

From b707c09d2dc15c7a5459475c9aad66bc760b22f8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 14 Mar 2024 15:32:08 +0800
Subject: [PATCH 158/374] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E7=97=85=E7=81=B6=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E6=88=AA?=
 =?UTF-8?q?=E5=9B=BE=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/api/trials.js b/src/api/trials.js
index b941d8eb..d203e257 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3613,3 +3613,11 @@ export function getPreviousOtherPicturePath(param) {
   })
 }
 
+export function verifyIsCanConfirm(param) {
+  return request({
+    url: `/ReadingMedicineQuestion/verifyIsCanConfirm`,
+    method: 'post',
+    data: param
+  })
+}
+

From 77e1eba8d59fedc5c3c09dd13cf104357b8848f7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 15:43:17 +0800
Subject: [PATCH 159/374] =?UTF-8?q?pm=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=E9=83=A8=E5=88=86=E4=BF=A1=E6=81=AF=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E9=97=B4=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/enrollment/components/Selection.vue             | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 6e6c2db2..3e0369ca 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -214,7 +214,7 @@
           min-width="150"
         >
           <template slot-scope="scope">
-            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).toString() }}
+            {{ scope.row.SubspecialityIds.map(v => {return $fd('Subspeciality', v, 'id')}).join(', ') }}
             <!--            {{ scope.row.SubspecialityList.length > 0 ? scope.row.SubspecialityList.join(', ') : '' }}-->
           </template>
         </el-table-column>

From 9fc1628cce86a5cb5b3b48f78fcb578a4e5a12a7 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 16:42:47 +0800
Subject: [PATCH 160/374] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E4=BA=BA=E5=91=98?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=88=E6=9D=83=E6=97=B6=E9=97=B4=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/setting/personnel-manage/components/site.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
index 55bd2f81..ac49de13 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/site.vue
@@ -376,7 +376,7 @@
             </template>
           </el-table-column>
           <el-table-column
-            prop="UpdateTime"
+            prop="CreateTime"
             :label="$t('trials:internalStaff:table:authorizationTime')"
             show-overflow-tooltip
             sortable="custom"

From c08db443c9802bf4203e9f064f807ed819868bc1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 17:03:01 +0800
Subject: [PATCH 161/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E6=8C=89=E9=92=AE=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/setting/medical-audit/index.vue    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index a84ac8b8..0552a4ea 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -11,6 +11,7 @@
             <!-- 审核问题 -->
             <el-form-item
               :label="$t('trials:MIMqcCfg:table:questionName')"
+              style="margin-top: 10px"
             >
               <el-input
                 v-model="searchData.QuestionName"
@@ -21,6 +22,7 @@
             <!-- 类型 -->
             <el-form-item
               :label="$t('trials:medicalFeedbackCfg:title:taskType')"
+              style="margin-top: 10px"
             >
               <el-select
                 v-model="searchData.ReadingCategory"
@@ -51,6 +53,7 @@
 <!--            </el-form-item>-->
             <el-form-item
               :label="$t('trials:qcCfg:table:isRequired')"
+              style="margin-top: 10px"
             >
               <el-select
                 v-model="searchData.IsRequired"
@@ -64,7 +67,7 @@
                 />
               </el-select>
             </el-form-item>
-            <el-form-item>
+            <el-form-item style="margin-top: 10px">
               <el-button
                 type="primary"
                 icon="el-icon-search"
@@ -127,7 +130,7 @@
         </div>
         <el-table
           v-if="isShow"
-          v-adaptive="{bottomOffset:75}"
+          v-adaptive="{bottomOffset:45}"
           :data="list"
           stripe
           height="100"

From 4290f51ce198fc4ca7c5044ece7d64e81877504d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 14 Mar 2024 17:18:37 +0800
Subject: [PATCH 162/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=A0=BC=E9=AB=98?=
 =?UTF-8?q?=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/setting/medical-audit/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index 0552a4ea..52c9afbb 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -130,7 +130,7 @@
         </div>
         <el-table
           v-if="isShow"
-          v-adaptive="{bottomOffset:45}"
+          v-adaptive="{bottomOffset:85}"
           :data="list"
           stripe
           height="100"

From f487792d8e8420644026a9fbe99e4bc2ebe33dde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 14 Mar 2024 17:34:49 +0800
Subject: [PATCH 163/374] =?UTF-8?q?IQC=E5=8E=BB=E9=99=A4=E8=AF=AD=E8=A8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/consistency-analysis/index.vue  | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 65cd3f8c..1690cdb1 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -493,6 +493,7 @@
                     <el-button
                       circle
                       icon="el-icon-s-check"
+                      :disabled="scope.row.CanGeneratedSubejctCount === 0"
                       :title="$t('trials:selftConsistencyAnalysis:button:select')"
                       @click="openDoctorConsistentRuleSubjectTable(scope.row, false)"
                     />
@@ -500,6 +501,7 @@
                     <el-button
                       circle
                       icon="el-icon-connection"
+                      :disabled="scope.row.CanGeneratedSubejctCount === 0"
                       :title="$t('trials:grouptConsistencyAnalysis:button:RandomCreate')"
                       @click="openDoctorConsistentRuleSubjectTable(scope.row, true)"
                     />

From 586d406b4aa5db5b70180f688a16171c8b3c1dae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Thu, 14 Mar 2024 17:58:27 +0800
Subject: [PATCH 164/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E9=99=90?=
 =?UTF-8?q?=E5=88=B6=E6=88=91=E7=9A=84=E9=A1=B9=E7=9B=AE=E8=BF=9B=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 7487c99c..dee37ee8 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -419,6 +419,7 @@ import ImagesToRead from './components/imagesToRead'
 import MedicalFeedback from './components/medicalFeedback'
 import MedicalAudit from './components/medicalAudit'
 import NeedSignedTrialDoc from './components/NeedSignedTrialDoc'
+import store from '@/store'
 import './index.css'
 
 import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList, getTrialSignDocumentList} from '@/api/trials'
@@ -518,8 +519,9 @@ export default {
       })
     },
     getUserTobeDoneRecord() {
-      getUserTobeDoneRecord().then(res => {
+      getUserTobeDoneRecord().then(async res => {
         this.tabList = res.Result
+        await store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount)
       })
     }
   }

From c266b9fcf14ae021cde1929dadf0e9bef98a6f55 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 15 Mar 2024 08:59:20 +0800
Subject: [PATCH 165/374] =?UTF-8?q?=E7=89=88=E6=9C=AC=E6=97=A5=E6=9C=9F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.usa b/.env.usa
index ddf1f125..b076b647 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-08/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-14/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false

From 40f142e1d213e39db082c64fa2e8a2a59dda69d4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMBP.lan>
Date: Fri, 15 Mar 2024 10:07:52 +0800
Subject: [PATCH 166/374] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue     | 3 +--
 .../reading/dicoms/components/IRecist/QuestionForm.vue         | 3 +--
 .../reading/dicoms/components/Lugano/QuestionForm.vue          | 3 +--
 .../reading/dicoms/components/PCWG/QuestionForm.vue            | 2 +-
 .../trials-panel/reading/dicoms/components/Questions.vue       | 2 +-
 .../reading/dicoms/components/Recist/QuestionForm.vue          | 2 +-
 .../reading/dicoms/components/RecistBM/QuestionForm.vue        | 3 +--
 7 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index e81dee5f..26107a99 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -801,8 +801,7 @@ export default {
           var picturePath = ''
           if (val && otherMeasureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-
-            picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
           var answers = []
           var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 3101ade3..19421a3c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1964,8 +1964,7 @@ export default {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-
-            picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
           var answers = []
           var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 26f50181..1028bf66 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1649,8 +1649,7 @@ export default {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-
-            picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
           var answers = []
           var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index f1995d9f..add6aa5f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -694,7 +694,7 @@ export default {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-            picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
           var answers = []
           var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 5c02b2e5..e741d938 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -361,7 +361,7 @@ export default {
       for (let i = 0; i < this.measurements.length; i++) {
         if (this.measurements[i].pictureBaseStr) {
           var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, this.measurements[i].pictureBaseStr)
-          this.measurements[i].PicturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+          this.measurements[i].PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           this.measurements[i].pictureBaseStr = ''
         }
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 33a5076a..54e56644 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1328,7 +1328,7 @@ export default {
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
 
-            picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
           var answers = []
           var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index 14347ddd..f782e925 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -974,8 +974,7 @@ export default {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-
-            picturePath = pictureObj.isSuccess ? pictureObj.result.url : ''
+            picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
           var answers = []
           var reg = new RegExp(/^[0-9a-zA-Z]{8}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{4}-[0-9a-zA-Z]{12}$/)

From eb4d058c8a816ef18e5644d106ac6b9984be0870 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 15 Mar 2024 10:33:57 +0800
Subject: [PATCH 167/374] =?UTF-8?q?=E5=88=86=E9=85=8D=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4GR,=E9=83=A8=E5=88=86=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/self-attachment/index.vue     |   4 +-
 .../trials-panel/clinical-data/index.vue      |   2 +-
 .../reading/read-task-allocation/index.vue    |   4 +-
 .../reading/reading-tracking/index.vue        |  19 +--
 .../personnel-manage/components/staff.vue     |   4 +-
 .../setting/reading-unit/index.vue            | 112 +++++++++---------
 .../components/ClinicalQuestionTableForm.vue  |   4 +-
 .../components/criterionQuestionForm.vue      |   4 +-
 .../trial-config/components/urgentConfig.vue  |   8 +-
 .../components/taskAllocation.vue             |   4 +-
 .../subject/brain-metastasis/index.vue        |   1 +
 .../components/SubjectStatusForm.vue          |   2 +-
 .../subject-list/components/SubjectsForm.vue  |   2 +-
 .../trial-summary/audit-record/index.vue      |  92 +++++++-------
 .../trial-summary/upload-monitor/index.vue    |   6 +-
 .../components/crcSendMessage.vue             |   4 +-
 .../components/crcSendMessageNew.vue          |   2 +-
 .../trials-panel/visit/crc-question/index.vue |   6 +-
 .../trials-panel/visit/crc-upload/index.vue   |   6 +-
 .../trials-panel/visit/forward-list/index.vue |   4 +-
 .../qc-check/components/clinicalData.vue      |   2 +-
 .../trials-panel/visit/qc-question/index.vue  |   6 +-
 22 files changed, 162 insertions(+), 136 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index cff606da..485edc30 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -24,7 +24,9 @@
         <!-- 是否签署 -->
         <el-form-item :label="$t('trials:self-attachment:table:isSign')">
           <el-select v-model="searchData.IsSign" clearable style="width:120px;">
-            <el-option v-for="item of $d.YesOrNo" v-if="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" />
+            <template v-for="item of $d.YesOrNo">
+              <el-option  v-if="item.raw.ValueCN !== '无'" :label="item.label" :value="item.value" :key="item.id"/>
+            </template>
           </el-select>
         </el-form-item>
         <el-form-item>
diff --git a/src/views/trials/trials-panel/clinical-data/index.vue b/src/views/trials/trials-panel/clinical-data/index.vue
index c17a7135..695fafec 100644
--- a/src/views/trials/trials-panel/clinical-data/index.vue
+++ b/src/views/trials/trials-panel/clinical-data/index.vue
@@ -57,7 +57,7 @@
             :reading-id="selected.ReadingId"
             :clinical-form-id="selected.ClinicalFormId"
             :open-type="'look'"
-            @close=""
+            @close="false"
           />
         </div>
         <div
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
index 3518df45..db244df7 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/index.vue
@@ -35,7 +35,9 @@
                 <!-- 分配角色 -->
               <el-form-item :label="$t('trials:reviewAssign:searchForm:role')">
                 <el-select v-model="searchData.ArmList" clearable style="width:240px;" multiple>
-                  <el-option v-for="item of $d.ArmEnum" :key="item.id" :value="item.value" :label="item.label" />
+                  <template v-for="item of $d.ArmEnum">
+                    <el-option  :key="item.id" :value="item.value" :label="item.label" v-if="item.label!=='GR'"/>
+                  </template>
                 </el-select>
               </el-form-item>
               <!-- 查询 -->
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index 4d14a104..cd3cd9fb 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -841,15 +841,16 @@
             ]"
           >
             <el-radio-group v-model="urgentForm.TaskUrgentType" @change="handleTaskUrgentTypeChange">
-              <el-radio
-                v-for="item of $d.TaskUrgentType"
-                :key="`TaskUrgentType${item.value}`"
-                :label="item.value"
-                v-if="!(!OtherInfo.IsPDProgressView && item.value === 2) && !(!OtherInfo.IsEnrollementQualificationConfirm && item.value === 1)"
-                :disabled="(rowData.VisitTaskNum === 0 && item.value === 2) || (rowData.VisitTaskNum !== 0 && item.value === 1)"
-              >
-                {{ item.label }}
-              </el-radio>
+              <template v-for="item of $d.TaskUrgentType">
+                <el-radio
+                  :key="`TaskUrgentType${item.value}`"
+                  :label="item.value"
+                  v-if="!(!OtherInfo.IsPDProgressView && item.value === 2) && !(!OtherInfo.IsEnrollementQualificationConfirm && item.value === 1)"
+                  :disabled="(rowData.VisitTaskNum === 0 && item.value === 2) || (rowData.VisitTaskNum !== 0 && item.value === 1)"
+                >
+                  {{ item.label }}
+                </el-radio>
+              </template>
             </el-radio-group>
           </el-form-item>
           <!-- 备注 -->
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
index 131f816d..7fccbceb 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/staff.vue
@@ -31,7 +31,7 @@
         <!-- 状态 -->
         <el-form-item :label="$t('trials:staff:table:status')">
           <el-select v-model="listQuery.IsDeleted" clearable class="mr">
-            <el-option v-for="item of $d.IsUserExitTrial" :label="item.label" :value="item.value" />
+            <el-option v-for="item of $d.IsUserExitTrial" :label="item.label" :value="item.value" :key="item.id" />
 <!--            <el-option label="加入" :value="false" />-->
           </el-select>
         </el-form-item>
@@ -225,7 +225,7 @@
           <!-- Status -->
           <el-form-item :label="$t('trials:staff:table:status')" prop="isDeleted">
             <el-radio-group v-model="statusForm.isDeleted" @change="handleIsDeletedChanged">
-              <el-radio v-for="item of $d.IsUserExitTrial" :label="item.value">{{ item.label }}</el-radio>
+              <el-radio v-for="item of $d.IsUserExitTrial" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
             </el-radio-group>
           </el-form-item>
           <!-- 退出日期 -->
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index 7ac84b03..faa24bf4 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -2,61 +2,63 @@
   <div v-loading="loading" class="reading-unit-wrapper">
     <div v-if="isShow" class="content">
       <el-tabs v-model="TrialReadingCriterionId" type="border-card">
-        <el-tab-pane v-for="item of trialCriterionList" v-if="isPaneShow" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
-          <div style="text-align: right;padding-bottom: 10px">
-            <!-- 同步当前标准 -->
-            <el-button
-              type="primary"
-              icon="el-icon-refresh-left"
-              :loading="loading"
-              size="mini"
-              v-if="!hasPermi(['role:admin'])"
-              @click="syncSign"
-            >
-              {{ $t('trials:readingUnit:button:sync') }}
-            </el-button>
-          </div>
-          <el-collapse v-model="activeCollapse" class="setting-config">
-            <!-- 阅片规则 -->
-            <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
-              <ReadingRules
-                :ref="`readingRules${item.TrialReadingCriterionId}`"
-                :trial-reading-criterion-id="TrialReadingCriterionId"
-                @setConfirm="setConfirm"
-                @reloadArbitrationRules="reloadArbitrationRules"
-                @setArbitrationReading="setArbitrationReading"
-                @setAdditionalAssessment="setAdditionalAssessment"
-                @setIsClinicalReading="setIsClinicalReading"
-                @setGlobalReading="setGlobalReading"
-                @setOncologyReading="setOncologyReading"
-                @setDigitPlaces="setDigitPlaces"
-              />
-            </el-collapse-item>
-            <!-- 阅片标准 -->
-            <el-collapse-item :title="$t('trials:readingUnit:readingCriterion')" name="2">
-              <ReadingCriterions
-                :ref="`readingCriterions${item.TrialReadingCriterionId}`"
-                :trial-reading-criterion-id="TrialReadingCriterionId"
-                :digit-places="digitPlaces"
-                :is-additional-assessment="isAdditionalAssessment"
-                @reloadArbitrationRules="reloadArbitrationRules"
-              />
-            </el-collapse-item>
-            <!-- 全局阅片 -->
-            <el-collapse-item v-if="isGlobalReading && CriterionType !== 10" :title="$t('trials:readingUnit:GlobalReading')" name="5">
-              <GlobalReading :ref="`globalReading${item.TrialReadingCriterionId}`" :trial-reading-criterion-id="TrialReadingCriterionId" />
-            </el-collapse-item>
-            <!-- 仲裁规则 -->
-            <el-collapse-item v-if="isArbitrationReading" :title="$t('trials:readingUnit:adRules')" name="3">
-              <ArbitrationRules :ref="`arbitrationRules${item.TrialReadingCriterionId}`" :trial-reading-criterion-id="TrialReadingCriterionId" />
-            </el-collapse-item>
-            <!-- 肿瘤学阅片配置 -->
-            <!-- v-if="isClinicalReading" -->
-            <el-collapse-item v-if="isOncologyReading" :title="$t('trials:readingUnit:oncologyReading')" name="4">
-              <OncologyForm :ref="`oncologyForm${item.TrialReadingCriterionId}`" :trial-reading-criterion-id="TrialReadingCriterionId" />
-            </el-collapse-item>
-          </el-collapse>
-        </el-tab-pane>
+        <template v-for="item of trialCriterionList">
+          <el-tab-pane  v-if="isPaneShow" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
+            <div style="text-align: right;padding-bottom: 10px">
+              <!-- 同步当前标准 -->
+              <el-button
+                type="primary"
+                icon="el-icon-refresh-left"
+                :loading="loading"
+                size="mini"
+                v-if="!hasPermi(['role:admin'])"
+                @click="syncSign"
+              >
+                {{ $t('trials:readingUnit:button:sync') }}
+              </el-button>
+            </div>
+            <el-collapse v-model="activeCollapse" class="setting-config">
+              <!-- 阅片规则 -->
+              <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
+                <ReadingRules
+                  :ref="`readingRules${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId"
+                  @setConfirm="setConfirm"
+                  @reloadArbitrationRules="reloadArbitrationRules"
+                  @setArbitrationReading="setArbitrationReading"
+                  @setAdditionalAssessment="setAdditionalAssessment"
+                  @setIsClinicalReading="setIsClinicalReading"
+                  @setGlobalReading="setGlobalReading"
+                  @setOncologyReading="setOncologyReading"
+                  @setDigitPlaces="setDigitPlaces"
+                />
+              </el-collapse-item>
+              <!-- 阅片标准 -->
+              <el-collapse-item :title="$t('trials:readingUnit:readingCriterion')" name="2">
+                <ReadingCriterions
+                  :ref="`readingCriterions${item.TrialReadingCriterionId}`"
+                  :trial-reading-criterion-id="TrialReadingCriterionId"
+                  :digit-places="digitPlaces"
+                  :is-additional-assessment="isAdditionalAssessment"
+                  @reloadArbitrationRules="reloadArbitrationRules"
+                />
+              </el-collapse-item>
+              <!-- 全局阅片 -->
+              <el-collapse-item v-if="isGlobalReading && CriterionType !== 10" :title="$t('trials:readingUnit:GlobalReading')" name="5">
+                <GlobalReading :ref="`globalReading${item.TrialReadingCriterionId}`" :trial-reading-criterion-id="TrialReadingCriterionId" />
+              </el-collapse-item>
+              <!-- 仲裁规则 -->
+              <el-collapse-item v-if="isArbitrationReading" :title="$t('trials:readingUnit:adRules')" name="3">
+                <ArbitrationRules :ref="`arbitrationRules${item.TrialReadingCriterionId}`" :trial-reading-criterion-id="TrialReadingCriterionId" />
+              </el-collapse-item>
+              <!-- 肿瘤学阅片配置 -->
+              <!-- v-if="isClinicalReading" -->
+              <el-collapse-item v-if="isOncologyReading" :title="$t('trials:readingUnit:oncologyReading')" name="4">
+                <OncologyForm :ref="`oncologyForm${item.TrialReadingCriterionId}`" :trial-reading-criterion-id="TrialReadingCriterionId" />
+              </el-collapse-item>
+            </el-collapse>
+          </el-tab-pane>
+        </template>
       </el-tabs>
     </div>
 
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionTableForm.vue b/src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionTableForm.vue
index 1f0518ef..3f637090 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionTableForm.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/ClinicalQuestionTableForm.vue
@@ -73,7 +73,9 @@
         prop="IsRequired"
       >
         <el-radio-group v-model="form.IsRequired">
-          <el-radio v-for="item of $d.QuestionRequired" v-if="item.value !== 1" :label="item.value">{{ item.label }}</el-radio>
+          <template v-for="item of $d.QuestionRequired">
+            <el-radio v-if="item.value !== 1" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
+          </template>
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('trials:qcCfg:table:order')" prop="ShowOrder">
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/criterionQuestionForm.vue b/src/views/trials/trials-panel/setting/trial-config/components/criterionQuestionForm.vue
index 56676571..eeca76f4 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/criterionQuestionForm.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/criterionQuestionForm.vue
@@ -77,13 +77,13 @@
 
       <el-form-item v-if="form.Type !== 'group'" label="是否必填">
         <el-radio-group v-model="form.IsRequired">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
       <el-form-item v-if="form.Type === 'select' || form.Type === 'radio'" label="是否裁判问题">
         <el-radio-group v-model="form.IsJudgeQuestion">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
 
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue
index ceea1a4e..7ecedc31 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/urgentConfig.vue
@@ -16,7 +16,7 @@
           v-model="form.IsEnrollementQualificationConfirm"
           :disabled="form.IsTrialUrgentConfirmed && !isEdit"
         >
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 疾病进展确认评估 -->
@@ -25,7 +25,7 @@
           v-model="form.IsPDProgressView"
           :disabled="form.IsTrialUrgentConfirmed && !isEdit"
         >
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 启用项目加急 -->
@@ -34,7 +34,7 @@
           v-model="form.IsUrgent"
           :disabled="form.IsTrialUrgentConfirmed && !isEdit"
         >
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 启用受试者加急 -->
@@ -43,7 +43,7 @@
           v-model="form.IsSubjectExpeditedView"
           :disabled="form.IsTrialUrgentConfirmed && !isEdit"
         >
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item>
diff --git a/src/views/trials/trials-panel/subject/brain-metastasis/components/taskAllocation.vue b/src/views/trials/trials-panel/subject/brain-metastasis/components/taskAllocation.vue
index adb07b6e..fa7a1e91 100644
--- a/src/views/trials/trials-panel/subject/brain-metastasis/components/taskAllocation.vue
+++ b/src/views/trials/trials-panel/subject/brain-metastasis/components/taskAllocation.vue
@@ -54,7 +54,9 @@
         <!-- 任务类型 -->
         <el-form-item style="margin-bottom:10px" :label="$t('trials:reviewAssign:readingTask:table:taskType')">
           <el-select v-model="searchData.ReadingCategory" clearable style="width:120px;">
-            <el-option v-for="item of $d.ReadingCategory" v-if="item.value !== 4" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label" />
+            <template v-for="item of $d.ReadingCategory">
+              <el-option v-if="item.value !== 4" :key="'ReadingCategory' + item.label" :value="item.value" :label="item.label"/>
+            </template>
           </el-select>
         </el-form-item>
         <!-- 分配状态 -->
diff --git a/src/views/trials/trials-panel/subject/brain-metastasis/index.vue b/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
index 9cb9aaab..cd051265 100644
--- a/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
+++ b/src/views/trials/trials-panel/subject/brain-metastasis/index.vue
@@ -93,6 +93,7 @@
                 v-for="(item, index) of OtherInfo"
                 :label="$i18n.locale === 'zh' ? item.QuestionName : item.QuestionEnName"
                 show-overflow-tooltip
+                :key="item.QuestionId"
               >
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" :content="getReadingEvaluationList(item.QuestionId, scope.row.ReadingEvaluationList)" placement="top">
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
index 06b19526..aac3a7bc 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectStatusForm.vue
@@ -11,7 +11,7 @@
       <!-- Status -->
       <el-form-item :label="$t('trials:subject:table:status')" prop="Status">
         <el-radio-group v-model="form.Status" :disabled="originalStatus === 2">
-          <el-radio v-for="item of $d.Subject_Visit_Status" :label="item.value">{{item.label}}</el-radio>
+          <el-radio v-for="item of $d.Subject_Visit_Status" :label="item.value" :key="item.id">{{item.label}}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- Out Visit Date -->
diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue
index eedfbe5d..617d9cb0 100644
--- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue
+++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue
@@ -66,7 +66,7 @@
       <!-- 是否加急 -->
       <el-form-item v-if="otherInfo.IsSubjectExpeditedView" :label="$t('trials:subject:table:isUrgent')">
         <el-radio-group v-model="form.IsUrgent">
-          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value" :key="item.id">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
     </div>
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 248b192f..e50e3a3b 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -336,7 +336,9 @@
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue" :ref="scope.row.oldValue" :images="imagesList">
                     <!-- 查看图片 -->
                      <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
-                       <img v-if="scope.row.DataType === 'ImageList'" v-for="item of scope.row.oldValue" :src="item" v-show="false" crossorigin="anonymous" alt="">
+                       <template v-for="item of scope.row.oldValue">
+                          <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="item" v-show="false" crossorigin="anonymous" alt="">
+                       </template>
                      <img v-if="scope.row.DataType === 'Image'" :src="scope.row.oldValue" v-show="false" crossorigin="anonymous" alt="">
                    </viewer>
                   <span v-else>
@@ -363,7 +365,9 @@
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue" :ref="scope.row.newValue" :images="imagesList">
                     <!-- 查看图片 -->
                      <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
-                     <img v-if="scope.row.DataType === 'ImageList'" v-for="item of scope.row.newValue" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                     <template v-for="item of scope.row.newValue">
+                        <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                     </template>
                      <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">
 <!--                     <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
                    </viewer>
@@ -380,11 +384,12 @@
             size="small"
           >
             <el-table-column
-              v-for="item of tableList"
+              v-for="(item,index) of tableList"
               :prop="item.ColumnValue"
               :label="item.IsMerge ? item.MergeColumnName : item.headName"
               align="center"
               show-overflow-tooltip
+              :key="'tableList' + index"
             >
               <template v-if="!item.IsMerge" slot-scope="scope">
                 <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
@@ -394,25 +399,27 @@
                 </viewer>
                 <span v-else>{{scope.row[item.ColumnValue]}}</span>
               </template>
-              <el-table-column
-                v-if="item.IsMerge"
-                v-for="(ite, index) of item.ChildrenList"
-                :prop="ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue"
-                :label="ite.headName"
-                align="center"
-                show-overflow-tooltip
-              >
-                <template slot-scope="scope">
-                  <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]">
-                    <!-- 查看图片 -->
-                    <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
-                      {{$t('trials:auditRecord:title:viewImage')}}
-                    </span>
-                    <img :src="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
-                  </viewer>
-                  <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
-                </template>
-              </el-table-column>
+              <template v-for="(ite, index) of item.ChildrenList">
+                <el-table-column
+                  v-if="item.IsMerge"
+                  :prop="ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue"
+                  :label="ite.headName"
+                  align="center"
+                  show-overflow-tooltip
+                  :key="'ChildrenList' + index"
+                >
+                  <template slot-scope="scope">
+                    <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]">
+                      <!-- 查看图片 -->
+                      <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                        {{$t('trials:auditRecord:title:viewImage')}}
+                      </span>
+                      <img :src="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                    </viewer>
+                    <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
+                  </template>
+                </el-table-column>
+              </template>
             </el-table-column>
           </el-table>
           <div v-if="otherData.length > 0" style="margin-top: 20px;margin-bottom: 10px;">
@@ -656,34 +663,37 @@
             size="small"
           >
             <el-table-column
-              v-for="item of tableList"
+              v-for="(item,index) of tableList"
               :prop="item.ColumnValue"
               :label="item.IsMerge ? item.MergeColumnName : item.headName"
               align="center"
               show-overflow-tooltip
+              :key="'tableList' + index"
             >
-              <el-table-column
-                v-if="item.IsMerge"
-                v-for="(ite, index) of item.ChildrenList"
-                :prop="ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue"
-                :label="ite.headName"
-                align="center"
-                show-overflow-tooltip
-              >
-                <template slot-scope="scope">
+              <template v-for="(ite, index) of item.ChildrenList">
+                <el-table-column
+                  v-if="item.IsMerge"
+                  :prop="ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue"
+                  :label="ite.headName"
+                  align="center"
+                  show-overflow-tooltip
+                  :key="'ChildrenList' + index"
+                >
+                  <template slot-scope="scope">
+                    <!-- 查看图片 -->
+                    <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                      {{$t('trials:auditRecord:title:viewImage')}}
+                    </span>
+                    <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
+                  </template>
+                </el-table-column>
+                <template v-else slot-scope="scope">
                   <!-- 查看图片 -->
-                  <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                  <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
                     {{$t('trials:auditRecord:title:viewImage')}}
                   </span>
-                  <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
+                  <span v-else :key="'ChildrenList' + index">{{scope.row[item.ColumnValue]}}</span>
                 </template>
-              </el-table-column>
-              <template v-else slot-scope="scope">
-                <!-- 查看图片 -->
-                <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])">
-                  {{$t('trials:auditRecord:title:viewImage')}}
-                </span>
-                <span v-else>{{scope.row[item.ColumnValue]}}</span>
               </template>
             </el-table-column>
           </el-table>
diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 3b8f8615..1904fe8b 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -302,19 +302,19 @@
         <div style="margin-bottom: 10px;font-size:12px">
           <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Failed')}}：</div>
           <div v-if="lookText.Failed.length">
-            <div v-for="item of lookText.Failed">{{item}}</div>
+            <div v-for="item of lookText.Failed" :key="item">{{item}}</div>
           </div>
         </div>
         <div style="margin-bottom: 10px;font-size:12px">
           <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Existed')}}：</div>
           <div v-if="lookText.Existed.length">
-            <div v-for="item of lookText.Existed">{{item}}</div>
+            <div v-for="item of lookText.Existed" :key="item">{{item}}</div>
           </div>
         </div>
         <div style="margin-bottom: 10px;font-size:12px">
           <div style="font-size: 14px;margin-bottom: 5px">{{$t('trials:uploadDicomList:table:Uploaded')}}：</div>
           <div v-if="lookText.Uploaded.length">
-            <div v-for="item of lookText.Uploaded">{{item}}</div>
+            <div v-for="item of lookText.Uploaded" :key="item">{{item}}</div>
           </div>
         </div>
       </div>
diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessage.vue b/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessage.vue
index 8fc8313f..f54b6903 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessage.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessage.vue
@@ -7,7 +7,7 @@
       <div style="font-size: 16px;margin-bottom: 10px;">{{ $t('trials:consistencyCheck:title:message2') }}</div>
       <div style="padding-left: 10px;">
         <el-checkbox-group v-model="checkedOne" style="display: flex;flex-direction: column">
-          <el-checkbox v-for="(item, index) of crcMessageInfo.arrayOnelist" style="margin-bottom: 10px" :label="index"><span v-html="item">{{ item }}</span></el-checkbox>
+          <el-checkbox v-for="(item, index) of crcMessageInfo.arrayOnelist" style="margin-bottom: 10px" :label="index" :key="'arrayOnelist' + index"><span v-html="item"></span></el-checkbox>
         </el-checkbox-group>
       </div>
       <div style="margin-top: 20px;color:#F56C6C">
@@ -40,7 +40,7 @@
       </div>
       <div style="padding-left: 10px;">
         <el-checkbox-group v-model="checkedTwo" style="display: flex;flex-direction: column">
-          <el-checkbox v-for="(item, index) of crcMessageInfo.arrayTwolist" style="margin-bottom: 10px" :label="index"><span v-html="item">{{ item }}</span></el-checkbox>
+          <el-checkbox v-for="(item, index) of crcMessageInfo.arrayTwolist" style="margin-bottom: 10px" :label="index" :key="'arrayOnelist' + index"><span v-html="item"></span></el-checkbox>
         </el-checkbox-group>
       </div>
       <div style="margin-top: 20px;color:#F56C6C">
diff --git a/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessageNew.vue b/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessageNew.vue
index ee4e5e06..04fe00c6 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessageNew.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/components/crcSendMessageNew.vue
@@ -142,7 +142,7 @@
               v-model="typeInfo.Modality"
               style="width: 100%"
             >
-              <el-option v-for="item of $d.Modality" :label="item.raw.Value" :value="item.value" />
+              <el-option v-for="item of $d.Modality" :label="item.raw.Value" :value="item.value" :key="item.id"/>
             </el-select>
           </el-form-item>
         </div>
diff --git a/src/views/trials/trials-panel/visit/crc-question/index.vue b/src/views/trials/trials-panel/visit/crc-question/index.vue
index 168a3bb4..6b788c9a 100644
--- a/src/views/trials/trials-panel/visit/crc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-question/index.vue
@@ -44,17 +44,17 @@
         <!-- 是否超限 -->
         <el-form-item :label="$t('trials:crcQuestion:table:isOverTime')">
           <el-select v-model="searchData.IsOverTime" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:crcQuestion:table:isClose')">
           <el-select v-model="searchData.IsClosed" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('trials:crcQuestion:table:reuploadSatus')">
           <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
-            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" :key="item.id"/>
           </el-select>
         </el-form-item>
         <el-form-item>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index d4a823f6..4e38cce9 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -846,7 +846,7 @@
     >
       <div class="base-dialog-body">
         <div v-if="!IsHaveTableQuestion">
-          <div v-for="item of beConfirmList">
+          <div v-for="(item,index) of beConfirmList" :key="'beConfirmList' + index">
             <el-divider content-position="left">{{ item.ClinicalDataSetName }}</el-divider>
             <el-table
               v-loading="listLoading"
@@ -860,6 +860,7 @@
                 :label="ite.QuestionName"
                 show-overflow-tooltip
                 width="120"
+                :key="ite.Id"
               />
             </el-table>
           </div>
@@ -893,7 +894,7 @@
               :reading-id="selected.ReadingId"
               :clinical-form-id="selected.ClinicalFormId"
               :open-type="'look'"
-              @close=""
+              @close="false"
             />
           </div>
         </div>
@@ -956,6 +957,7 @@
           :label="item.QuestionName"
           show-overflow-tooltip
           width="120"
+          :key="item.Id"
         />
         <el-table-column
           :label="$t('common:action:action')"
diff --git a/src/views/trials/trials-panel/visit/forward-list/index.vue b/src/views/trials/trials-panel/visit/forward-list/index.vue
index f69a9d92..c6886429 100644
--- a/src/views/trials/trials-panel/visit/forward-list/index.vue
+++ b/src/views/trials/trials-panel/visit/forward-list/index.vue
@@ -44,7 +44,9 @@
         <!-- 转发状态 -->
         <el-form-item :label="$t('trials:dicomForward:table:forwardStatus')">
           <el-select v-model="searchData.ForwardState" clearable style="width:120px">
-            <el-option v-for="item of $d.ForwardStateEnum" v-if="item.value !== 0" :value="item.value" :label="item.label" />
+            <template v-for="item of $d.ForwardStateEnum">
+              <el-option v-if="item.value !== 0" :value="item.value" :label="item.label" :key="item.id"/>
+            </template>
           </el-select>
         </el-form-item>
         <el-form-item>
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/clinicalData.vue b/src/views/trials/trials-panel/visit/qc-check/components/clinicalData.vue
index 01daaf43..918243d4 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/clinicalData.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/clinicalData.vue
@@ -170,7 +170,7 @@
             :reading-id="cd.ReadingId"
             :clinical-form-id="cd.ClinicalFromList[0].ClinicalFormId"
             :open-type="'look'"
-            @close=""
+            @close="false"
           />
         </div>
       </el-tab-pane>
diff --git a/src/views/trials/trials-panel/visit/qc-question/index.vue b/src/views/trials/trials-panel/visit/qc-question/index.vue
index 54f98c47..9c65cd77 100644
--- a/src/views/trials/trials-panel/visit/qc-question/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-question/index.vue
@@ -60,19 +60,19 @@
         <!-- 是否重传 -->
         <el-form-item :label="$t('trials:qcQuality:table:ReuploadEnum')">
           <el-select v-model="searchData.ReuploadEnum" clearable style="width:120px">
-            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.ReuploadEnum" :value="item.value" :label="item.label" :key="item.id"/>
           </el-select>
         </el-form-item>
         <!-- 是否超限 -->
         <el-form-item :label="$t('trials:qcQuality:table:isOverTime')">
           <el-select v-model="searchData.IsOverTime" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
           </el-select>
         </el-form-item>
         <!-- 是否关闭 -->
         <el-form-item :label="$t('trials:qcQuality:table:isClosed')">
           <el-select v-model="searchData.IsClosed" clearable style="width:120px">
-            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" />
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.id"/>
           </el-select>
         </el-form-item>
         <!-- 查询 -->

From 531c2a5146439bee3db2117cfb986ddf2b629b40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMacBook-Pro.local>
Date: Sat, 16 Mar 2024 14:49:57 +0800
Subject: [PATCH 168/374] =?UTF-8?q?=E6=98=AF=E5=90=A6=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=8F=8D=E5=90=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/user/components/UserInfo.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue
index ac899317..5769d106 100644
--- a/src/views/system/user/components/UserInfo.vue
+++ b/src/views/system/user/components/UserInfo.vue
@@ -42,7 +42,7 @@
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:IsTestUser')">
         <el-radio-group v-model="user.IsTestUser">
-          <el-radio v-for="item of $d.NoOrYes" :label="item.value">{{ item.label }}</el-radio>
+          <el-radio v-for="item of $d.YesOrNo" :label="item.value">{{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <el-form-item :label="$t('system:userlist:table:UserType')" prop="UserTypeId">

From ce5bbaaa4a3ee59a84d2e4409bd839b583c69f81 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 18 Mar 2024 11:01:09 +0800
Subject: [PATCH 169/374] =?UTF-8?q?=E7=AE=80=E5=8E=86=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E9=83=A8=E5=88=86=E4=B8=AD=E8=8B=B1=E6=96=87?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Employment.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 4ff69d32..568fec7e 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -141,7 +141,7 @@
                   <el-option
                     v-for="item of $d.Rank"
                     :key="item.id"
-                    :label="item.raw.Value"
+                    :label="item.label"
                     :value="item.id"
                   />
 <!--                  <el-option label="Other" :value="otherId" />-->
@@ -344,6 +344,7 @@ export default {
   },
   mounted() {
     this.initEmployment()
+    console.log(this.$d.Rank,"$d.Rank");
   },
   methods: {
     RankChange(val) {

From 94b0aeb23928ae6cfa667ba9665d76d6036f16a5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 18 Mar 2024 11:01:54 +0800
Subject: [PATCH 170/374] =?UTF-8?q?=E5=8F=96=E6=B6=88console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Employment.vue | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 568fec7e..0ad731c8 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -344,7 +344,6 @@ export default {
   },
   mounted() {
     this.initEmployment()
-    console.log(this.$d.Rank,"$d.Rank");
   },
   methods: {
     RankChange(val) {

From b6f46cec28616b4f19e1ba910341a4086528c613 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 11:04:02 +0800
Subject: [PATCH 171/374] =?UTF-8?q?lugano=E6=A0=87=E5=87=86=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E5=88=86=E8=A3=82=EF=BC=8C=E5=88=86=E8=A3=82=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97=E7=96=BE=E7=97=85?=
 =?UTF-8?q?=E8=BF=9B=E5=B1=95=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue  | 10 +++++++++-
 .../reading/dicoms/components/Lugano/QuestionList.vue  |  6 ++++++
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 1028bf66..1f9974dd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -341,7 +341,9 @@ export default {
       currentMarkTool: '',
       digitPlaces: 2,
       stateDisabled: false,
-      splitLesionTargetPDD: null
+      splitLesionTargetPDD: null,
+      splitLesionTargetLDi: null,
+      splitLesionTargetSDi: null
     }
   },
   mounted() {
@@ -462,6 +464,9 @@ export default {
       state = isNaN(parseInt(state)) ? 0 : parseInt(state)
       var ldi = this.getQuestionVal(0)// 长径
       ldi = isNaN(parseFloat(ldi)) ? 0 : ldi
+      if (this.lesionType === 0 && params && params.splitLesionTargetLDi) {
+        this.splitLesionTargetLDi = ldi + params.splitLesionTargetLDi
+      }
       var pddIncrease = this.getQuestionVal(17) // 相比最低点PPD增加百分比
       pddIncrease = isNaN(parseFloat(pddIncrease)) ? 0 : parseFloat(pddIncrease)
       var ldiIncrease = this.getQuestionVal(18)// 相比PPD最低点LDi增加值
@@ -486,6 +491,9 @@ export default {
             minPPD = parseFloat(minPPD)
             pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
           }
+          if (this.splitLesionTargetPDD) {
+            ldi = this.splitLesionTargetLDi
+          }
           /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
          * 相比最低点PPD增加百分比 ≥50％
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 16cb7e1f..13bed71a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -337,6 +337,8 @@ export default {
           console.log(refName)
           var params = {}
           params.splitLesionTargetPPD = i.AllPPD
+          params.splitLesionTargetLDi = i.AllLDi
+          params.splitLesionTargetSDi = i.AllSDi
           this.$refs[refName] && this.$refs[refName][0].initForm(params)
         })
       }
@@ -400,6 +402,8 @@ export default {
                 var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
                 if (idx > -1) {
                   params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                  params.splitLesionTargetLDi = this.splitTargetLesions[idx].AllLDi
+                  params.splitLesionTargetSDi = this.splitTargetLesions[idx].AllSDi
                 }
               }
               this.$refs[refName] && this.$refs[refName][0].initForm(params)
@@ -535,6 +539,8 @@ export default {
                     var idx = this.splitTargetLesions.findIndex(v => v.RowId === i.RowId)
                     if (idx > -1) {
                       params.splitLesionTargetPPD = this.splitTargetLesions[idx].AllPPD
+                      params.splitLesionTargetLDi = this.splitTargetLesions[idx].AllLDi
+                      params.splitLesionTargetSDi = this.splitTargetLesions[idx].AllSDi
                     }
                   }
                   this.$refs[refName] && this.$refs[refName][0].initForm(params)

From 76392409f66e8fd54b54374b1202de77e286daca Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 18 Mar 2024 13:12:43 +0800
Subject: [PATCH 172/374] =?UTF-8?q?=E5=8C=BB=E9=99=A2=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E4=B8=AD=E8=8B=B1=E6=96=87=E8=87=AA=E5=8A=A8=E5=B8=A6=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dictionary/institutions/components/HospitalForm.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/dictionary/institutions/components/HospitalForm.vue b/src/views/dictionary/institutions/components/HospitalForm.vue
index 0452a4f2..504d4c89 100644
--- a/src/views/dictionary/institutions/components/HospitalForm.vue
+++ b/src/views/dictionary/institutions/components/HospitalForm.vue
@@ -117,7 +117,8 @@ export default {
       this.siteList.forEach(o => {
         if (o.Id === v) {
           this.form.CityCN = o.City
-          this.form.HospitalNameCN = o.SiteName
+          this.form.HospitalNameCN = o.SiteNameCN
+          this.form.HospitalName = o.SiteName
           this.form.ProvinceCN = o.Province
           this.form.CountryCN = o.Country
         }

From 0cca8f71b43d0d694a84e6f3c0f08aa428590dbb Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 13:55:56 +0800
Subject: [PATCH 173/374] =?UTF-8?q?lugano=E6=A0=87=E5=87=86=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E5=88=97=E8=A1=A8=E6=B7=BB=E5=8A=A0=E6=97=A2=E5=BE=80?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0=E6=88=AA=E5=9B=BE=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Fusion/HistoryScreenshot.vue   | 344 ++++++++++++--
 .../dicoms/components/Fusion/ImageViewer.vue  | 446 ++++++++++++++++++
 .../reading/dicoms/components/Questions.vue   |   2 +-
 3 files changed, 739 insertions(+), 53 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index 16a21dbb..f1189507 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -1,82 +1,322 @@
 <template>
-  <div class="history_screenshot">
-    <h3 class="info">
-      <span>{{ subjectCode }}</span>
-      <span style="margin-left:10px;">{{ title }}</span>
-    </h3>
-    <template v-if="historyInfo">
-      <el-timeline v-viewer>
-        <el-timeline-item
-          v-for="i in historyInfo"
-          :key="i.VisitTaskId"
-          :timestamp="i.TaskBlindName"
-          placement="top"
-        >
-          <el-card shadow="never">
-            <img
-              crossorigin="anonymous"
-              :src="i.OtherPicturePath"
-              alt="Image"
-            >
-          </el-card>
-        </el-timeline-item>
-      </el-timeline>
-    </template>
+  <div class="image_preview-wrapper">
+
+    <div class="image-viewer-wrapper">
+      <!-- 预览图像 -->
+      <ImageViewer
+        v-if="previewVisible"
+        :on-switch="
+          (index) => {
+            selected(index)
+          }
+        "
+        :initial-index="currentIndex"
+        :url-list="previewImages"
+      />
+    </div>
+    <div class="thumbnail-wrapper" style="z-index:999;background-color:#fff;">
+      <div class="">
+        <div class="img-wrapper">
+          <el-button
+            icon="el-icon-d-arrow-left"
+            plain
+            class="left to"
+            :disabled="disabledPrev"
+            @click="toRight"
+          />
+          <div ref="imagesWrapper" class="images">
+            <div v-if="noData" class="empty-text">
+              <slot name="empty">暂无数据</slot>
+            </div>
+            <div v-show="!noData" class="items" :style="itemsStyle">
+              <div
+                v-for="(item, index) in previewImages"
+                :key="index"
+                class="item-img"
+                :style="imgSize"
+                :class="{
+                  'is-active': index === currentIndex
+                }"
+                @click="selected(index)"
+              >
+                <img crossorigin="anonymous" :src="`${item.PicturePath}`">
+                <p class="item-date">
+                  {{ `${item.TaskBlindName}` }}
+                </p>
+              </div>
+            </div>
+          </div>
+          <el-button
+            icon="el-icon-d-arrow-right"
+            :disabled="disabledNext"
+            plain
+            class="right to"
+            @click="Left"
+          />
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 <script>
 import { getPreviousOtherPicturePath } from '@/api/trials'
 import { changeURLStatic } from '@/utils/history.js'
 import store from '@/store'
-import Viewer from 'v-viewer'
+import ImageViewer from './ImageViewer'
 export default {
-  name: 'HistoryScreenshot',
+  name: 'Preview',
+  components: {
+    ImageViewer
+  },
   data() {
     return {
-      subjectCode: '',
-      title: '',
-      lesionId: '',
-      historyInfo: null
+      currentIndex: 0,
+      previewVisible: true,
+      translateX: 0,
+      pageSize: 0, // 一页展示的图片数
+      previewImages: [],
+      imgSize: { width: '120px', height: '120px' }
     }
   },
+  computed: {
+    // 偏移度数
+    itemsStyle() {
+      return {
+        transform: `translateX(${-this.translateX}px)`
+      }
+    },
+    // 每一项宽度
+    itemWidth() {
+      return parseInt(this.imgSize.width.replace('px', '')) + 8
+    },
+    disabledPrev() {
+      // 禁用前一页按钮
+      return this.translateX <= 0
+    },
+    disabledNext() {
+      // 禁用后一页按钮
+      return (
+        this.translateX >= (this.previewImages.length - this.pageSize) * this.itemWidth
+      )
+    },
+    noData() {
+      return this.previewImages.length === 0
+    },
+    dataLength() {
+      return this.previewImages.length
+    }
+
+  },
   mounted() {
     if (this.$router.currentRoute.query.TokenKey) {
       store.dispatch('user/setToken', this.$route.query.TokenKey)
       changeURLStatic('TokenKey', '')
     }
     this.lesionId = this.$route.query.rowId
-    this.subjectCode = this.$route.query.subjectCode
-    this.title = this.$route.query.lesionName
-    if (!this.lesionId) return
-    this.initializeViewer()
-    this.getScreenshot()
+    this.initPage()
   },
   methods: {
-    getScreenshot() {
-      const loading = this.$loading({ fullscreen: true })
-      getPreviousOtherPicturePath({ rowId: this.lesionId }).then(res => {
-        this.historyInfo = res.Result
-        loading.close()
-      }).catch(() => { loading.close() })
+    async initPage() {
+      await this.getScreenshot()
+      this.pageSize = this.wrapperWidth() / this.itemWidth
+      const scope = this
+      window.onresize = function() {
+        scope.pageSize = scope.wrapperWidth() / scope.itemWidth
+        scope.selected(scope.currentIndex)
+      }
     },
-    initializeViewer() {
-      Viewer.setDefaults({
-        toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true, prev: true, next: true }
+    getScreenshot() {
+      return new Promise(resolve => {
+        const loading = this.$loading({ fullscreen: true })
+        getPreviousOtherPicturePath({ rowId: this.lesionId }).then(res => {
+          this.previewImages = res.Result
+          loading.close()
+          resolve()
+        }).catch(() => {
+          loading.close()
+          resolve()
+        })
       })
+    },
+    toRight() {
+      if (this.translateX < this.pageSize * this.itemWidth) {
+        this.translateX = 0
+      } else {
+        this.translateX = this.translateX - this.pageSize * this.itemWidth
+      }
+    },
+    Left() {
+      this.translateX = this.translateX + this.pageSize * this.itemWidth
+      const maxTrans = this.itemWidth * (this.dataLength - this.pageSize)
+      if (this.translateX > maxTrans) {
+        this.translateX = maxTrans
+      }
+    },
+    selected(index) {
+      const center = this.pageSize >> 1
+      // 最后一页的中间位置
+      const lastCenter = this.dataLength - center
+
+      if (index > center && index < lastCenter) {
+        // 与相册中间相差的图片数量
+        const step = index - center
+        // 将点击图片移动到中间
+        this.translateX = this.itemWidth * step
+      } else {
+        const maxTrans = this.itemWidth * (this.dataLength - this.pageSize)
+        this.translateX = index <= center ? 0 : maxTrans
+      }
+      if (this.currentIndex !== index) {
+        this.currentIndex = index
+      }
+    },
+    wrapperWidth() {
+      if (this.$refs.imagesWrapper) {
+        return this.$refs.imagesWrapper.offsetWidth
+      }
+      return 0
     }
+
   }
 }
 </script>
-<style lang="scss" scoped>
-.history_screenshot{
-  padding: 20px 100px 20px 20px;
-  .info{
-    margin-left: 35px;
+
+<style lang="scss">
+.image_preview-wrapper{
+  width: 100%;
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+
+.image-viewer-wrapper{
+  flex: 1;
+}
+.thumbnail-wrapper{
+  height: 130px;
+}
+.img-content{
+  position: absolute;
+  left: 0;
+  bottom: 10px;
+  width: 100%;
+}
+.img-wrapper {
+  display: flex;
+  position: relative;
+  margin: 0 20px;
+  height: 120px;
+  .to {
+    width: 32px;
+    height: 100%;
+    padding: 0;
   }
-  img{
-    width: 100px;
-    height: 100px;
-    cursor: pointer;
+  .images::before {
+    position: absolute;
+    z-index: 5;
+    top: 0;
+    height: 100%;
+    width: 84px;
+    content: '';
+    pointer-events: none;
+    background: -webkit-gradient(
+      linear,
+      left top,
+      right top,
+      from(#fff),
+      color-stop(50%, rgba(0, 0, 0, 0))
+    );
+    background: -o-linear-gradient(left, #fff, rgba(0, 0, 0, 0) 50%);
+    background: linear-gradient(90deg, #fff, rgba(0, 0, 0, 0) 50%);
+  }
+  .images::after {
+    position: absolute;
+    z-index: 5;
+    top: 0;
+    height: 100%;
+    right: 0;
+    width: 84px;
+    content: '';
+    pointer-events: none;
+    background: -webkit-gradient(
+      linear,
+      right top,
+      left top,
+      from(#fff),
+      color-stop(50%, rgba(0, 0, 0, 0))
+    );
+    background: -o-linear-gradient(right, #fff, rgba(0, 0, 0, 0) 50%);
+    background: linear-gradient(270deg, #fff, rgba(0, 0, 0, 0) 50%);
+  }
+  .images {
+    position: relative;
+    overflow: hidden;
+    width: 100%;
+    height: 100%;
+    margin: 0 2px;
+    .empty-text {
+      color: rgb(158, 158, 158);
+      height: 100%;
+      display: flex;
+      align-items: center;
+      justify-content: center;
+    }
+    .items {
+      position: absolute;
+      top: 0;
+      left: 0;
+      display: flex;
+      // width: 6000px;
+      height: 100%;
+      align-items: center;
+      transition: transform 0.25s ease;
+      .item-img {
+        display: inline-block;
+        box-sizing: border-box;
+        position: relative;
+        margin-right: 8px;
+        border: 2px solid rgba(0, 0, 0, 0);
+        cursor: pointer;
+        .item-date {
+          bottom: 0px;
+          position: absolute;
+          width: 100%;
+          height: 24px;
+          background: rgba(0, 0, 0, 0.2);
+          text-align: center;
+          line-height: 24px;
+          color: white;
+        }
+        img {
+          width: 100%;
+          height: 100%;
+        }
+      }
+      .item-img:hover::after {
+        // border-color: #409EFF;
+        opacity: 0;
+      }
+      .item-img::after {
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        content: '';
+        opacity: 0.2;
+        pointer-events: none;
+        -webkit-transition: opacity 0.3s ease;
+        -o-transition: opacity 0.3s ease;
+        transition: opacity 0.3s ease;
+        background-color: #fff;
+      }
+      .is-active {
+        border-color: #409eff;
+      }
+      .is-active:after {
+        opacity: 0;
+      }
+    }
   }
 }
+}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
new file mode 100644
index 00000000..d0028c49
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
@@ -0,0 +1,446 @@
+/* eslint-disable no-unused-vars */
+<template>
+  <div style="width:100%;height:100%;">
+    <transition name="viewer-fade">
+      <div v-show="urlList.length > 0" ref="image-viewer__wrapper" tabindex="-1" class="image-viewer__wrapper" :style="{ 'z-index':5 }">
+        <span v-if="urlList[index]" class="image-viewer_desc">
+          {{ `${urlList[index].TaskBlindName}` }}
+        </span>
+        <!-- 关闭 -->
+        <span class="image-viewer__btn image-viewer__close" @click="hide">
+          <i class="el-icon-close" />
+        </span>
+        <!-- Arrow -->
+        <template v-if="!isSingle">
+          <span
+            class="image-viewer__btn image-viewer__prev"
+            :class="{ 'is-disabled': !infinite && isFirst }"
+            @click="prev"
+          >
+            <i class="el-icon-arrow-left" />
+          </span>
+          <span
+            class="el-image-viewer__btn el-image-viewer__next"
+            :class="{ 'is-disabled': !infinite && isLast }"
+            @click="next"
+          >
+            <i class="el-icon-arrow-right" />
+          </span>
+        </template>
+        <!-- 工具栏 -->
+        <div class="image-viewer__btn image-viewer__actions">
+          <div class="image-viewer__actions__inner">
+            <i class="el-icon-zoom-out" @click="handleActions('zoomOut')" />
+            <i class="el-icon-zoom-in" @click="handleActions('zoomIn')" />
+            <i class="el-image-viewer__actions__divider" />
+            <i class="el-icon-c-scale-to-original" @click="toggleMode" />
+            <i class="el-image-viewer__actions__divider" />
+            <i class="el-icon-refresh-left" @click="handleActions('anticlocelise')" />
+            <i class="el-icon-refresh-right" @click="handleActions('clocelise')" />
+          </div>
+        </div>
+        <!-- 图片 -->
+        <div id="image-viewer__canvas" class="image-viewer__canvas">
+          <img
+            v-for="(item, i) in urlList"
+            v-show="i === index"
+            :ref="`img${i}`"
+            :key="item.VisitTaskId"
+            crossorigin="anonymous"
+            :src="`${item.PicturePath}`"
+            :style="imgStyle"
+            style="max-width:100%;max-height: 100%;"
+            @load="handleImgLoad"
+            @error="handleImgError"
+            @mousedown="handleMouseDown"
+          >
+
+        </div>
+      </div>
+    </transition>
+
+  </div>
+
+</template>
+
+<script>
+import { on, off } from 'element-ui/src/utils/dom'
+import { rafThrottle, isFirefox } from 'element-ui/src/utils/util'
+
+const mousewheelEventName = isFirefox() ? 'DOMMouseScroll' : 'mousewheel'
+
+export default {
+  name: 'ImageViewer',
+  props: {
+    urlList: {
+      type: Array,
+      default: () => []
+    },
+    onSwitch: {
+      type: Function,
+      default: () => {}
+    },
+    onClose: {
+      type: Function,
+      default: () => {}
+    },
+    initialIndex: {
+      type: Number,
+      default: 0
+    }
+  },
+
+  data() {
+    return {
+      index: this.initialIndex,
+      isShow: false,
+      infinite: true,
+      loading: false,
+      transform: {
+        scale: 1,
+        deg: 0,
+        offsetX: 0,
+        offsetY: 0,
+        enableTransition: false
+      }
+    }
+  },
+  computed: {
+    isSingle() {
+      return this.urlList.length <= 1
+    },
+    isFirst() {
+      return this.index === 0
+    },
+    isLast() {
+      return this.index === this.urlList.length - 1
+    },
+
+    imgStyle() {
+      const { scale, deg, offsetX, offsetY, enableTransition } = this.transform
+      const style = {
+        transform: `scale(${scale}) rotate(${deg}deg)`,
+        transition: enableTransition ? 'transform .3s' : '',
+        'margin-left': `${offsetX}px`,
+        'margin-top': `${offsetY}px`
+      }
+      return style
+    }
+  },
+  watch: {
+    initialIndex: {
+      immediate: true,
+      handler(val) {
+        this.index = val
+      }
+    },
+    index: {
+      immediate: true,
+      handler(val) {
+        this.reset()
+        this.onSwitch(val)
+      }
+    }
+  },
+  mounted() {
+    document.getElementById('image-viewer__canvas').onmousewheel = (event) => {
+      if (event.deltaY > 0) {
+        // 缩小
+        this.handleActions('zoomOut', {
+          zoomRate: 0.015,
+          enableTransition: false
+        })
+      } else {
+        // 放大
+        this.handleActions('zoomIn', {
+          zoomRate: 0.015,
+          enableTransition: false
+        })
+      }
+      return false
+    }
+    this.deviceSupportInstall()
+  },
+  methods: {
+    hide() {
+      this.deviceSupportUninstall()
+      this.onClose()
+    },
+    deviceSupportInstall() {
+      this._keyDownHandler = e => {
+        e.stopPropagation()
+        const keyCode = e.keyCode
+        switch (keyCode) {
+          // ESC
+          case 27:
+            this.hide()
+            break
+          // SPACE
+          case 32:
+            this.toggleMode()
+            break
+          // LEFT_ARROW
+          case 37:
+            this.prev()
+            break
+          // UP_ARROW
+          case 38:
+            this.handleActions('zoomIn')
+            break
+          // RIGHT_ARROW
+          case 39:
+            this.next()
+            break
+          // DOWN_ARROW
+          case 40:
+            this.handleActions('zoomOut')
+            break
+        }
+      }
+      this._mouseWheelHandler = rafThrottle(e => {
+        const delta = e.wheelDelta ? e.wheelDelta : -e.detail
+        if (delta > 0) {
+          this.handleActions('zoomIn', {
+            zoomRate: 0.015,
+            enableTransition: false
+          })
+        } else {
+          this.handleActions('zoomOut', {
+            zoomRate: 0.015,
+            enableTransition: false
+          })
+        }
+      })
+      on(document, 'keydown', this._keyDownHandler)
+
+      on(document, mousewheelEventName, null)
+      // on(document, mousewheelEventName, this._mouseWheelHandler)
+    },
+    deviceSupportUninstall() {
+      off(document, 'keydown', this._keyDownHandler)
+      off(document, mousewheelEventName, this._mouseWheelHandler)
+      this._keyDownHandler = null
+      this._mouseWheelHandler = null
+    },
+    handleImgLoad(e) {
+      this.loading = false
+    },
+    handleImgError(e) {
+      this.loading = false
+      e.target.alt = '加载失败'
+    },
+    handleMouseDown(e) {
+      if (this.loading || e.button !== 0) return
+
+      const { offsetX, offsetY } = this.transform
+      const startX = e.pageX
+      const startY = e.pageY
+      this._dragHandler = rafThrottle(ev => {
+        this.transform.offsetX = offsetX + ev.pageX - startX
+        this.transform.offsetY = offsetY + ev.pageY - startY
+      })
+      on(document, 'mousemove', this._dragHandler)
+      on(document, 'mouseup', ev => {
+        off(document, 'mousemove', this._dragHandler)
+      })
+
+      e.preventDefault()
+    },
+    reset() {
+      this.transform = {
+        scale: 1,
+        deg: 0,
+        offsetX: 0,
+        offsetY: 0,
+        enableTransition: false
+      }
+    },
+    toggleMode() {
+      if (this.loading) return
+      this.reset()
+    },
+    prev() {
+      if (this.isFirst && !this.infinite) return
+      const len = this.urlList.length
+      this.index = (this.index - 1 + len) % len
+    },
+    next() {
+      if (this.isLast && !this.infinite) return
+      const len = this.urlList.length
+      this.index = (this.index + 1) % len
+    },
+    handleActions(action, options = {}) {
+      if (this.loading) return
+      const { zoomRate, rotateDeg, enableTransition } = {
+        zoomRate: 0.2,
+        rotateDeg: 90,
+        enableTransition: true,
+        ...options
+      }
+      const { transform } = this
+      switch (action) {
+        case 'zoomOut':
+          if (transform.scale > 0.2) {
+            transform.scale = parseFloat((transform.scale - zoomRate).toFixed(3))
+          }
+          break
+        case 'zoomIn':
+          if (transform.scale < 5) {
+            transform.scale = parseFloat((transform.scale + zoomRate).toFixed(3))
+          }
+          break
+        case 'clocelise':
+          transform.deg += rotateDeg
+          break
+        case 'anticlocelise':
+          transform.deg -= rotateDeg
+          break
+      }
+      transform.enableTransition = enableTransition
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+
+.image-viewer__wrapper{
+    position: relative;
+    top:0;
+    right:0;
+    bottom:0;
+    left:0;
+    width: 100%;
+    height: 100%;
+}
+.image-viewer__btn{
+    position:absolute;
+    z-index:1;
+    display:flex;
+    align-items:center;
+    justify-content:center;
+    border-radius:50%;
+    opacity:.8;
+    cursor:pointer;
+    box-sizing:border-box;
+    user-select:none
+}
+
+.image-viewer__close{
+  display: none;
+    top:40px;
+    right:40px;
+    width:40px;
+    height:40px;
+    font-size:40px
+}
+.image-viewer_desc{
+  position:absolute;
+  top:20px;
+  left:40px;
+  font-size:20px;
+  padding: 5px;
+  height: 30px;
+  // width: 70px;
+  line-height: 20px;
+  text-align: center;
+  color: #606266;
+  font-weight: bold;
+  // color: #fff;
+  // background-color: #606266;
+  // border-color: #fff;
+  z-index: 1;
+  // border-radius: 5%;
+  // border-radius: 2%;
+}
+.image-viewer__canvas{
+    position: absolute;
+    top: 50%;
+    transform: translateY(-50%);
+    width:100%;
+    height:85%;
+    display:flex;
+    justify-content:center;
+    align-items:center
+}
+.image-viewer__actions{
+    left:50%;
+    bottom:30px;
+    transform:translateX(-50%);
+    width:282px;
+    height:44px;
+    padding:0 23px;
+    background-color:#606266;
+    border-color:#fff;
+    border-radius:22px
+}
+.image-viewer__actions__inner{
+    width:100%;
+    height:100%;
+    text-align:justify;
+    cursor:default;
+    font-size:23px;
+    color:#fff;
+    display:flex;
+    align-items:center;
+    justify-content:space-around;
+    i{
+      cursor: pointer;
+    }
+}
+.image-viewer__next,.image-viewer__prev{
+    top:50%;
+    width:44px;
+    height:44px;
+    font-size:24px;
+    color:#fff;
+    background-color:#606266;
+    border-color:#fff
+}
+.image-viewer__prev{
+    transform:translateY(-50%);
+    left:40px
+}
+.image-viewer__next{
+    transform:translateY(-50%);
+    right:40px;
+    text-indent:2px
+}
+.image-viewer__mask{
+    position:absolute;
+    width:100%;
+    height:100%;
+    top:0;
+    left:0;
+    opacity:.5;
+    // background:#000
+
+}
+.viewer-fade-enter-active{
+    animation:viewer-fade-in .3s
+}
+.viewer-fade-leave-active{
+    animation:viewer-fade-out .3s
+}
+
+@keyframes viewer-fade-in{
+    0%{
+        transform:translate3d(0,-20px,0);
+        opacity:0
+    }
+    100%{
+        transform:translate3d(0,0,0);
+        opacity:1
+    }
+}
+
+@keyframes viewer-fade-out{
+    0%{
+        transform:translate3d(0,0,0);
+        opacity:1
+    }
+    100%{
+        transform:translate3d(0,-20px,0);
+        opacity:0
+    }
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index e741d938..cdf2ebad 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -80,7 +80,7 @@ export default {
       criterionType: null,
       spleenInfo: null,
       calculateSpleenStatus: '',
-      formChanged:false
+      formChanged: false
     }
   },
   computed: {

From a048572403a8847d8dbe3459b7781835fd1b7a42 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 15:05:07 +0800
Subject: [PATCH 174/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E6=88=AA?=
 =?UTF-8?q?=E5=9B=BE=E9=A2=84=E8=A7=88=E8=B7=AF=E5=BE=84=E7=94=B1=E7=BB=9D?=
 =?UTF-8?q?=E5=AF=B9=E8=B7=AF=E5=BE=84=E6=94=B9=E4=B8=BA=E7=9B=B8=E5=AF=B9?=
 =?UTF-8?q?=E8=B7=AF=E5=BE=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/HistoryScreenshot.vue    | 2 +-
 .../reading/dicoms/components/Fusion/ImageViewer.vue          | 2 +-
 .../reading/dicoms/components/Lugano/QuestionForm.vue         | 4 ++--
 .../trials-panel/reading/dicoms/components/Questions.vue      | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index f1189507..617c6d71 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -39,7 +39,7 @@
                 }"
                 @click="selected(index)"
               >
-                <img crossorigin="anonymous" :src="`${item.PicturePath}`">
+                <img crossorigin="anonymous" :src="`${OSSclientConfig.basePath}${item.PicturePath}`">
                 <p class="item-date">
                   {{ `${item.TaskBlindName}` }}
                 </p>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
index d0028c49..0925dac7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
@@ -47,7 +47,7 @@
             :ref="`img${i}`"
             :key="item.VisitTaskId"
             crossorigin="anonymous"
-            :src="`${item.PicturePath}`"
+            :src="`${OSSclientConfig.basePath}${item.PicturePath}`"
             :style="imgStyle"
             style="max-width:100%;max-height: 100%;"
             @load="handleImgLoad"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 1f9974dd..f005cf22 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -194,7 +194,7 @@
                 v-if="answers.OtherPicturePath"
                 ref="viewer"
                 style="margin:0 10px;"
-                :images="[answers.OtherPicturePath]"
+                :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]"
               >
                 <span style="color:#409eff;cursor: pointer" @click="previewImage()">
                   {{ $t('trials:lugano:button:suvscreenshot') }}
@@ -202,7 +202,7 @@
                 <img
                   v-show="false"
                   crossorigin="anonymous"
-                  :src="answers.OtherPicturePath"
+                  :src="`${OSSclientConfig.basePath}${answers.OtherPicturePath}`"
                   alt="Image"
                 >
               </viewer>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index cdf2ebad..752bad7b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -643,7 +643,7 @@ export default {
     /deep/ .el-button--mini, .el-button--mini.is-round {
     padding: 7px 10px;
   }
-    .el-form-item__content
+    /deep/ .el-form-item__content
     .el-select{
       width: 100%;
     }

From cd45362a07bfabb4bbd19d3b4539d07f06787a9a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 15:53:29 +0800
Subject: [PATCH 175/374] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E4=B8=AA=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E6=B8=B2=E6=9F=93=E6=97=B6=EF=BC=8C=E4=B8=8D=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue     | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 1ac3f6e0..40ce69da 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -516,7 +516,8 @@ export default {
       loadingText: '',
       initAnnotations: [],
       activeCanvasWW: null,
-      activeCanvasWC: null
+      activeCanvasWC: null,
+
     }
   },
   computed: {
@@ -598,11 +599,13 @@ export default {
     })
     FusionEvent.$on('getScreenshots', async(callback) => {
       // var base64Str = await this.$refs['FUSION_AXIAL'].getScreenshots()
+      const loading = this.$loading({ fullscreen: true })
       const divForDownloadViewport = document.querySelector(
         '.dicom-container'
       )
       var canvas = await html2canvas(divForDownloadViewport)
       var pictureBaseStr = canvas.toDataURL('image/png', 1)
+      loading.close()
       callback(pictureBaseStr)
     })
   },
@@ -696,8 +699,13 @@ export default {
       })
 
       const debouncedCallback = this.debounce((e) => {
-        // const { annotation } = e.detail
-        this.onAnnotationModified(e)
+        const { annotation } = e.detail
+        const { remark } = annotation.data
+        if(this.initAnnotations.length > 0 && this.initAnnotations[0].orderMark === remark && !this.initAnnotations[0].isInit){
+          this.initAnnotations[0].isInit = true
+        }else{
+          this.onAnnotationModified(e)
+        }
         // const { cachedStats } = annotation.data
         // var isNotValidAnnotationNum = 0
         // for (const volumeId in cachedStats) {

From dc6340f65c113e0fb6c26ec27fdd073824bb9248 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 16:06:38 +0800
Subject: [PATCH 176/374] =?UTF-8?q?slice=20location=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=80=BC=E6=A0=B9=E6=8D=AE=E9=A1=B9=E7=9B=AE=E6=A0=87=E5=87=86?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E7=9A=84=E4=BF=9D=E7=95=99=E5=B0=8F=E6=95=B0?=
 =?UTF-8?q?=E4=BD=8D=E6=95=B0=E8=BF=9B=E8=A1=8C=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue            | 2 +-
 .../trials-panel/reading/dicoms/components/Questions.vue | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index c99788d6..1d5af629 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -99,7 +99,7 @@
     </div>
 
     <div class="info-instance">
-      <div v-show="dicomInfo.location">Location: {{ dicomInfo.location }}</div>
+      <div v-if="dicomInfo.location">Location: {{ Number(dicomInfo.location).toFixed(digitPlaces) }}</div>
       <div v-show="dicomInfo.thick">Slice Thickness: {{ dicomInfo.thick }}mm</div>
       <div v-show="dicomInfo.wwwc">WW/WL: {{ dicomInfo.wwwc }}</div>
     </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 752bad7b..50b83e84 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -80,7 +80,8 @@ export default {
       criterionType: null,
       spleenInfo: null,
       calculateSpleenStatus: '',
-      formChanged: false
+      formChanged: false,
+      digitPlaces:null
     }
   },
   computed: {
@@ -106,6 +107,8 @@ export default {
     }
   },
   mounted() {
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
     this.criterionType = parseInt(localStorage.getItem('CriterionType'))
     DicomEvent.$on('setReadingState', readingTaskState => {
       this.readingTaskState = readingTaskState
@@ -477,7 +480,7 @@ export default {
         frame: isNaN(parseInt(measurement.frame)) ? 0 : measurement.frame
       }
       if (measurement.type === 'ArrowAnnotate') {
-        const location = measurement.location ? measurement.location : null
+        const location = measurement.location ? Number(measurement.location).toFixed(this.digitPlaces) : null
         this.$set(this.questionForm, this.measurements[idx].QuestionId, location || null)
         if (this.measurements[idx].QuestionType === 60 || this.measurements[idx].QuestionType === 61) {
           var length = this.getSpleenL()
@@ -511,7 +514,7 @@ export default {
       var sb = this.questionForm[this.spleenBottomId]
       sb = isNaN(parseFloat(sb)) ? null : parseFloat(sb)
       if (st && sb) {
-        length = Math.abs(st - sb)
+        length = Math.abs(st - sb).toFixed(this.digitPlaces)
       }
       return length
     },

From af9ad7279861aaffe06c7e50c879e4c309271553 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 17:26:24 +0800
Subject: [PATCH 177/374] =?UTF-8?q?=E5=88=86=E8=A3=82=E4=B8=BB=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E7=8A=B6=E6=80=81=E8=AE=A1=E7=AE=97=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |   6 +-
 .../components/Fusion/tools/CircleROITool.js  | 115 +++++++++---------
 .../dicoms/components/Lugano/QuestionForm.vue |  24 ++--
 .../reading/dicoms/components/Questions.vue   |   2 +-
 4 files changed, 78 insertions(+), 69 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 40ce69da..fe738c5e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -516,7 +516,7 @@ export default {
       loadingText: '',
       initAnnotations: [],
       activeCanvasWW: null,
-      activeCanvasWC: null,
+      activeCanvasWC: null
 
     }
   },
@@ -701,9 +701,9 @@ export default {
       const debouncedCallback = this.debounce((e) => {
         const { annotation } = e.detail
         const { remark } = annotation.data
-        if(this.initAnnotations.length > 0 && this.initAnnotations[0].orderMark === remark && !this.initAnnotations[0].isInit){
+        if (this.initAnnotations.length > 0 && this.initAnnotations[0].orderMark === remark && !this.initAnnotations[0].isInit) {
           this.initAnnotations[0].isInit = true
-        }else{
+        } else {
           this.onAnnotationModified(e)
         }
         // const { cachedStats } = annotation.data
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
index 216614a5..be6f8f6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/tools/CircleROITool.js
@@ -18,8 +18,8 @@ const {
 } = cornerstoneTools
 // const { getWorldWidthAndHeightFromTwoPoints } = utilities.planar
 // const { roundNumber } = utilities
-const { hideElementCursor,resetElementCursor } = cursors.elementCursor
-const { getAnnotations,addAnnotation } = annotation.state
+const { hideElementCursor } = cursors.elementCursor
+const { getAnnotations, addAnnotation } = annotation.state
 const { isAnnotationVisible } = annotation.visibility
 const { isAnnotationLocked } = annotation.locking
 const drawHandlesSvg = drawing.drawHandles
@@ -84,27 +84,27 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
     // this._getTextLines = this.getTextLines
   }
   addNewAnnotation = (evt) => {
-    const eventDetail = evt.detail;
-    const { currentPoints, element } = eventDetail;
-    const worldPos = currentPoints.world;
+    const eventDetail = evt.detail
+    const { currentPoints, element } = eventDetail
+    const worldPos = currentPoints.world
     // const canvasPos = currentPoints.canvas;
 
-    const enabledElement = getEnabledElement(element);
-    const { viewport, renderingEngine } = enabledElement;
+    const enabledElement = getEnabledElement(element)
+    const { viewport, renderingEngine } = enabledElement
 
-    this.isDrawing = true;
+    this.isDrawing = true
 
-    const camera = viewport.getCamera();
-    const { viewPlaneNormal, viewUp } = camera;
+    const camera = viewport.getCamera()
+    const { viewPlaneNormal, viewUp } = camera
 
     const referencedImageId = this.getReferencedImageId(
       viewport,
       worldPos,
       viewPlaneNormal,
       viewUp
-    );
+    )
 
-    const FrameOfReferenceUID = viewport.getFrameOfReferenceUID();
+    const FrameOfReferenceUID = viewport.getFrameOfReferenceUID()
 
     const annotation = {
       highlighted: true,
@@ -114,7 +114,7 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
         viewPlaneNormal: [...viewPlaneNormal],
         viewUp: [...viewUp],
         FrameOfReferenceUID,
-        referencedImageId,
+        referencedImageId
       },
       data: {
         label: '',
@@ -126,43 +126,43 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
               topLeft: [0, 0, 0],
               topRight: [0, 0, 0],
               bottomLeft: [0, 0, 0],
-              bottomRight: [0, 0, 0],
-            },
+              bottomRight: [0, 0, 0]
+            }
           },
           points: [[...worldPos], [...worldPos]],
-          activeHandleIndex: 1,
+          activeHandleIndex: 1
         },
-        cachedStats: {},
-      },
-    };
-    addAnnotation(annotation, element);
+        cachedStats: {}
+      }
+    }
+    addAnnotation(annotation, element)
 
     const viewportIdsToRender = getViewportIdsWithToolToRender(
       element,
       this.getToolName()
-    );
+    )
 
     this.editData = {
       annotation,
       viewportIdsToRender,
       newAnnotation: true,
-      hasMoved: false,
-    };
-    this._activateDraw(element);
+      hasMoved: false
+    }
+    this._activateDraw(element)
 
-    hideElementCursor(element);
+    hideElementCursor(element)
 
-    evt.preventDefault();
+    evt.preventDefault()
 
-    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender);
+    triggerAnnotationRenderForViewportIds(renderingEngine, viewportIdsToRender)
 
-    return annotation;
+    return annotation
   };
   renderAnnotation = (enabledElement, svgDrawingHelper) => {
     let renderStatus = false
     const { viewport } = enabledElement
     const { element } = viewport
-   
+
     let annotations = getAnnotations(this.getToolName(), element)
 
     if (!annotations || (annotations && annotations.length === 0)) {
@@ -195,7 +195,7 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
       // const { points, activeHandleIndex } = handles
       const { points } = handles
       var activeHandleIndex = null
-      if(annotation.highlighted && !annotation.isLocked && annotation.isVisible){
+      if (annotation.highlighted && !annotation.isLocked && annotation.isVisible) {
         activeHandleIndex = 1
       }
 
@@ -249,7 +249,6 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
           modalityUnitOptions
         )
       } else if (annotation.invalidated) {
-
         this._throttledCalculateCachedStats(
           annotation,
           viewport,
@@ -430,74 +429,74 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
   ) => {
     const data = annotation.data
     const { viewportId, renderingEngineId } = enabledElement
-  
+
     const { points } = data.handles
-  
+
     const canvasCoordinates = points.map((p) => viewport.worldToCanvas(p))
     const { viewPlaneNormal, viewUp } = viewport.getCamera()
-  
+
     const [topLeftCanvas, bottomRightCanvas] = (
       getCanvasCircleCorners(canvasCoordinates)
     )
-  
+
     const topLeftWorld = viewport.canvasToWorld(topLeftCanvas)
     const bottomRightWorld = viewport.canvasToWorld(bottomRightCanvas)
     const { cachedStats } = data
-  
+
     const targetIds = Object.keys(cachedStats)
     const worldPos1 = topLeftWorld
     const worldPos2 = bottomRightWorld
     for (let i = 0; i < targetIds.length; i++) {
       const targetId = targetIds[i]
-  
+
       const image = this.getTargetIdImage(targetId, renderingEngine)
-  
+
       // If image does not exists for the targetId, skip. This can be due
       // to various reasons such as if the target was a volumeViewport, and
       // the volumeViewport has been decached in the meantime.
       if (!image) {
         continue
       }
-  
+
       const { dimensions, imageData, metadata } = image
-  
+
       const worldPos1Index = transformWorldToIndex(imageData, worldPos1)
-  
+
       worldPos1Index[0] = Math.floor(worldPos1Index[0])
       worldPos1Index[1] = Math.floor(worldPos1Index[1])
       worldPos1Index[2] = Math.floor(worldPos1Index[2])
-  
+
       const worldPos2Index = transformWorldToIndex(imageData, worldPos2)
-  
+
       worldPos2Index[0] = Math.floor(worldPos2Index[0])
       worldPos2Index[1] = Math.floor(worldPos2Index[1])
       worldPos2Index[2] = Math.floor(worldPos2Index[2])
-  
+
       // Check if one of the indexes are inside the volume, this then gives us
       // Some area to do stats over.
-  
+
       if (this._isInsideVolume(worldPos1Index, worldPos2Index, dimensions)) {
         const iMin = Math.min(worldPos1Index[0], worldPos2Index[0])
         const iMax = Math.max(worldPos1Index[0], worldPos2Index[0])
-  
+
         const jMin = Math.min(worldPos1Index[1], worldPos2Index[1])
         const jMax = Math.max(worldPos1Index[1], worldPos2Index[1])
-  
+
         const kMin = Math.min(worldPos1Index[2], worldPos2Index[2])
         const kMax = Math.max(worldPos1Index[2], worldPos2Index[2])
-  
+
         const boundsIJK = [
           [iMin, iMax],
           [jMin, jMax],
           [kMin, kMax]
         ]
-  
+
         const center = [
           (topLeftWorld[0] + bottomRightWorld[0]) / 2,
           (topLeftWorld[1] + bottomRightWorld[1]) / 2,
           (topLeftWorld[2] + bottomRightWorld[2]) / 2
         ]
-  
+
         const ellipseObj = {
           center,
           xRadius: Math.abs(topLeftWorld[0] - bottomRightWorld[0]) / 2,
@@ -518,7 +517,7 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
             (worldWidth / scale / 2) *
             (worldHeight / aspect / scale / 2)
         )
-  
+
         const modalityUnit = getModalityUnit(
           metadata.Modality,
           annotation.metadata.referencedImageId,
@@ -530,9 +529,9 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
           this.configuration.statsCalculator.statsCallback,
           boundsIJK
         )
-  
+
         const stats = this.configuration.statsCalculator.getStatistics()
-  
+
         cachedStats[targetId] = {
           Modality: metadata.Modality,
           area,
@@ -551,7 +550,7 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
         annotation.isHandleOutsideImage = false
       } else {
         this.isHandleOutsideImage = true
-  
+
         cachedStats[targetId] = {
           Modality: metadata.Modality,
           areaUnit: getCalibratedAreaUnits(null, image)
@@ -559,19 +558,19 @@ class CircleROITool extends cornerstoneTools.CircleROITool {
         annotation.isHandleOutsideImage = true
       }
     }
-  
+
     annotation.invalidated = false
-  
+
     // Dispatching annotation modified
     const eventType = Enums.Events.ANNOTATION_MODIFIED
-  
+
     const eventDetail = {
       annotation,
       viewportId,
       renderingEngineId
     }
     triggerEvent(eventTarget, eventType, eventDetail)
-  
+
     return cachedStats
   }
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index f005cf22..b4500f3e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -450,13 +450,15 @@ export default {
         const lesionState = !isNaN(parseInt(this.getQuestionVal(7))) ? parseInt(this.getQuestionVal(7)) : ''
         this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, lesionShort, lesionState, saveTypeEnum: this.questionForm.saveTypeEnum, lesionLength, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
       }
-      if (this.lesionType === 0 && params && params.splitLesionTargetPPD) {
+      if (this.lesionType === 0 && params) {
         // ppd
 
         var ppd = this.getQuestionVal(12)
         ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
 
         this.splitLesionTargetPDD = ppd + params.splitLesionTargetPPD
+        this.splitLesionTargetLDi = params.splitLesionTargetLDi
+        this.splitLesionTargetSDi = params.splitLesionTargetSDi
       }
 
       // 如果当前病灶状态为“疾病进展”，且满足疾病进展的条件，则状态不允许更改
@@ -464,9 +466,6 @@ export default {
       state = isNaN(parseInt(state)) ? 0 : parseInt(state)
       var ldi = this.getQuestionVal(0)// 长径
       ldi = isNaN(parseFloat(ldi)) ? 0 : ldi
-      if (this.lesionType === 0 && params && params.splitLesionTargetLDi) {
-        this.splitLesionTargetLDi = ldi + params.splitLesionTargetLDi
-      }
       var pddIncrease = this.getQuestionVal(17) // 相比最低点PPD增加百分比
       pddIncrease = isNaN(parseFloat(pddIncrease)) ? 0 : parseFloat(pddIncrease)
       var ldiIncrease = this.getQuestionVal(18)// 相比PPD最低点LDi增加值
@@ -490,10 +489,17 @@ export default {
             var minPPD = this.getQuestionVal(13)
             minPPD = parseFloat(minPPD)
             pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+            ldi = this.splitLesionTargetLDi + ldi
+            var minLDi = this.getQuestionVal(15)
+            ldiIncrease = ldi - minLDi
+            var sdi = this.getQuestionVal(1)// 短径
+            sdi = isNaN(parseFloat(sdi)) ? 0 : sdi
+            sdi = this.splitLesionTargetSDi + sdi
+            var minSDi = this.getQuestionVal(16)
+            sdiIncrease = sdi - minSDi
           }
-          if (this.splitLesionTargetPDD) {
-            ldi = this.splitLesionTargetLDi
-          }
+          // if(this.)
+
           /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
          * 相比最低点PPD增加百分比 ≥50％
@@ -983,6 +989,10 @@ export default {
       var pddIncreaseNum = null
       if (this.splitLesionTargetPDD) {
         pddIncreaseNum = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+        ldi = this.splitLesionTargetLDi + ldi
+        ldiIncrease = ldi - minLDi
+        sdi = this.splitLesionTargetSDi + sdi
+        sdiIncrease = sdi - minSDi
       } else {
         pddIncreaseNum = ((((ppd - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 50b83e84..c8939620 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -81,7 +81,7 @@ export default {
       spleenInfo: null,
       calculateSpleenStatus: '',
       formChanged: false,
-      digitPlaces:null
+      digitPlaces: null
     }
   },
   computed: {

From 0ae82ff145e622308d2cb3dcdf0f71fcb8119694 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 18 Mar 2024 17:35:27 +0800
Subject: [PATCH 178/374] =?UTF-8?q?=E5=88=86=E8=A3=82=E5=90=8EPPD=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionForm.vue   | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index b4500f3e..13005348 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -341,7 +341,7 @@ export default {
       currentMarkTool: '',
       digitPlaces: 2,
       stateDisabled: false,
-      splitLesionTargetPDD: null,
+      splitLesionTargetPPD: null,
       splitLesionTargetLDi: null,
       splitLesionTargetSDi: null
     }
@@ -456,7 +456,7 @@ export default {
         var ppd = this.getQuestionVal(12)
         ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
 
-        this.splitLesionTargetPDD = ppd + params.splitLesionTargetPPD
+        this.splitLesionTargetPPD = ppd + params.splitLesionTargetPPD
         this.splitLesionTargetLDi = params.splitLesionTargetLDi
         this.splitLesionTargetSDi = params.splitLesionTargetSDi
       }
@@ -485,10 +485,10 @@ export default {
             this.stateDisabled = false
           }
         } else {
-          if (this.splitLesionTargetPDD) {
+          if (this.splitLesionTargetPPD) {
             var minPPD = this.getQuestionVal(13)
             minPPD = parseFloat(minPPD)
-            pddIncrease = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+            pddIncrease = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
             ldi = this.splitLesionTargetLDi + ldi
             var minLDi = this.getQuestionVal(15)
             ldiIncrease = ldi - minLDi
@@ -987,8 +987,8 @@ export default {
         this.$set(this.questionForm, sdiIncreaseObj.Id, 'NA')
       }
       var pddIncreaseNum = null
-      if (this.splitLesionTargetPDD) {
-        pddIncreaseNum = ((((this.splitLesionTargetPDD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
+      if (this.splitLesionTargetPPD) {
+        pddIncreaseNum = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
         ldi = this.splitLesionTargetLDi + ldi
         ldiIncrease = ldi - minLDi
         sdi = this.splitLesionTargetSDi + sdi
@@ -1050,11 +1050,6 @@ export default {
         this.stateDisabled = false
       }
     },
-    setSplitLesionTargetPPD(v) {
-      var ppd = this.getQuestionVal(12)
-      ppd = isNaN(parseFloat(ppd)) ? 0 : parseFloat(ppd)
-      this.splitLesionTargetPDD = ppd + v
-    },
     returnFloat(num) {
       if (num) return
       var value = Math.round(parseFloat(num) * 100) / 100

From 18c31112b3179dc14817c68890ebe6b2ecf74c8f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 19 Mar 2024 09:22:58 +0800
Subject: [PATCH 179/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E5=88=86?=
 =?UTF-8?q?=E8=A3=82=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue        | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 13005348..01de6a7d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -485,7 +485,7 @@ export default {
             this.stateDisabled = false
           }
         } else {
-          if (this.splitLesionTargetPPD) {
+          if (this.lesionType === 0 && this.answers.SplitOrMergeType === '2' && this.splitLesionTargetPPD) {
             var minPPD = this.getQuestionVal(13)
             minPPD = parseFloat(minPPD)
             pddIncrease = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
@@ -498,7 +498,6 @@ export default {
             var minSDi = this.getQuestionVal(16)
             sdiIncrease = sdi - minSDi
           }
-          // if(this.)
 
           /** 疾病进展
          * 15mm<当前靶病灶LDi≤20mm
@@ -987,7 +986,7 @@ export default {
         this.$set(this.questionForm, sdiIncreaseObj.Id, 'NA')
       }
       var pddIncreaseNum = null
-      if (this.splitLesionTargetPPD) {
+      if (this.lesionType === 0 && this.answers.SplitOrMergeType === '2' && this.splitLesionTargetPPD) {
         pddIncreaseNum = ((((this.splitLesionTargetPPD - minPPD) / minPPD)) * 100).toFixed(this.digitPlaces)
         ldi = this.splitLesionTargetLDi + ldi
         ldiIncrease = ldi - minLDi

From 3524e7730c0975d6c4218b5b536c93e6e043f683 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 19 Mar 2024 12:14:53 +0800
Subject: [PATCH 180/374] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/research/form.vue                   | 18 +++++++++++-------
 src/views/reviewers/components/Employment.vue |  7 +++----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/src/views/research/form.vue b/src/views/research/form.vue
index 26e4199e..daa58125 100644
--- a/src/views/research/form.vue
+++ b/src/views/research/form.vue
@@ -14,7 +14,7 @@
             v-if="(state === 0 && userTypeEnumInt === 0)"
             type="primary"
             size="small"
-            @click="handleSubmit"
+            @click="handleSubmit('submit')"
           >
             {{ $t('trials:researchForm:button:submit') }}
           </el-button>
@@ -23,7 +23,7 @@
             v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))"
             type="primary"
             size="small"
-            @click="handleSubmit"
+            @click="handleSubmit('approve')"
           >
             {{ $t('trials:researchForm:button:auditPasses') }}
           </el-button>
@@ -243,17 +243,17 @@ export default {
       }).catch(() => { this.loading = false })
     },
     // 提交
-    handleSubmit() {
+    handleSubmit(type) {
       if (this.userTypeEnumInt === 0) {
         this.loading = true
         this.$refs['baseResearchInfo'].handleSave(true).then(res => {
           this.loading = false
           if (res) {
-            this.submit()
+            this.submit(type)
           }
         }).catch(() => { this.loading = false })
       } else {
-        this.submit()
+        this.submit(type)
       }
     },
     submit() {
@@ -275,7 +275,11 @@ export default {
               this.$emit('refreshPage')
             }
             // this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+            if(type === 'approve'){
+              this.$message.success(this.$t('common:message:approvedSuccessfully'))
+            }else{
+              this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully'))
+            }
           }
         }).catch(() => { this.loading = false })
       }).catch(() => {})
@@ -308,7 +312,7 @@ export default {
           if (res.IsSuccess) {
             this.initPage()
             this.$emit('refreshPage')
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$message.success(this.$t('common:message:approvedSuccessfully'))
           }
         }).catch(() => {
           this.loading = false
diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue
index 0ad731c8..24bbeea7 100644
--- a/src/views/reviewers/components/Employment.vue
+++ b/src/views/reviewers/components/Employment.vue
@@ -45,7 +45,6 @@
                   v-model="UniversityAffiliated"
                   type="textarea"
                   autosize
-                  disabled
                   size="small"
                 />
               </el-form-item>
@@ -54,21 +53,21 @@
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:City')">
-                <el-input  :disabled="$route.query.ReviewStatus === '1'" v-model="City" disabled size="small" />
+                <el-input  :disabled="$route.query.ReviewStatus === '1'" v-model="City"  size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:State/Province')">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Province" disabled size="small" />
+                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Province"  size="small" />
               </el-form-item>
             </el-col>
           </el-row>
           <el-row>
             <el-col :span="14">
               <el-form-item :label="$t('system:reviewer:label:Country')">
-                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Country" disabled size="small" />
+                <el-input :disabled="$route.query.ReviewStatus === '1'" v-model="Country"  size="small" />
               </el-form-item>
             </el-col>
           </el-row>

From d5594e87b2c328bd5cf90a9f31ce402b76cb0e35 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 19 Mar 2024 17:45:32 +0800
Subject: [PATCH 181/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=8D=B3=E9=A6=96=E6=AC=A1=E8=87=AA=E8=BA=AB/?=
 =?UTF-8?q?=E7=BB=84=E9=97=B4=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=97=B6=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consistency-analysis/components/ReaderRulesForm.vue     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
index 4c429e70..951adaa8 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
@@ -29,7 +29,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" disabled />
+        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" :disabled="Result.BlindTrialSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
       <!-- 虚拟受试者位数 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
@@ -125,6 +125,7 @@ export default {
         IsEnable: true,
         Note: ''
       },
+      Result:{}, // 接口返回弹窗数据，用于虚拟中心可编辑校验
       rules: {
         IsHaveReadingPeriod: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
         IsGenerateGlobalTask: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }],
@@ -153,7 +154,8 @@ export default {
         TrialReadingCriterionId: this.TrialReadingCriterionId
       }).then(res => {
         if (res.Result) {
-          this.form = res.Result
+          this.form = res.Result;
+          this.Result = JSON.parse(JSON.stringify(res.Result));
         } else {
           let o = this.trialCriterionList.find(v => {
             return v.TrialReadingCriterionId === this.TrialReadingCriterionId

From ee049b4017da4966f1fc6cd0ac40d1fbf778aeb5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 20 Mar 2024 09:21:11 +0800
Subject: [PATCH 182/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=8D=B3=E9=A6=96=E6=AC=A1=E8=87=AA=E8=BA=AB/?=
 =?UTF-8?q?=E7=BB=84=E9=97=B4=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?=
 =?UTF-8?q?=E6=97=B6=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83=E7=BC=96=E5=8F=B7?=
 =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consistency-analysis/components/ReaderRulesForm.vue  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
index 951adaa8..013d54ef 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
@@ -29,7 +29,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" :disabled="Result.BlindTrialSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
+        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
       <!-- 虚拟受试者位数 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
@@ -146,6 +146,13 @@ export default {
     // }
     this.getFrom()
   },
+  watch:{
+    "OtherInfo.VitrualSiteCode":{
+      handler(){
+        this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode;
+      }
+    }
+  },
   methods: {
     getFrom() {
       getConsistentRule({

From f34f7a06564bab1eb33eaea096fd9e969dbaf6b4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 20 Mar 2024 09:51:37 +0800
Subject: [PATCH 183/374] =?UTF-8?q?lugano=E8=9E=8D=E5=90=88=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E5=8E=86=E5=8F=B2=E8=AE=BF=E8=A7=86=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=9F=A5=E7=9C=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             |  15 +
 src/icons/svg/record.svg                      |   1 +
 .../reading/dicoms/components/DicomViewer.vue |  10 +-
 .../dicoms/components/Fusion/FusionForm.vue   | 324 ++++++++++++++++++
 .../dicoms/components/Fusion/PetCt.vue        | 111 ++++--
 .../components/Fusion/TableQuestionItem.vue   |   7 +-
 6 files changed, 440 insertions(+), 28 deletions(-)
 create mode 100644 src/icons/svg/record.svg
 create mode 100644 src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue

diff --git a/src/api/trials.js b/src/api/trials.js
index d203e257..57b4ffd5 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -3621,3 +3621,18 @@ export function verifyIsCanConfirm(param) {
   })
 }
 
+export function getPTAndCtSeries(param) {
+  return request({
+    url: `/SubjectVisit/getPTAndCtSeries`,
+    method: 'post',
+    data: param
+  })
+}
+
+export function getDicomSeriesInfo(param) {
+  return request({
+    url: `/SubjectVisit/getDicomSeriesInfo`,
+    method: 'post',
+    data: param
+  })
+}
diff --git a/src/icons/svg/record.svg b/src/icons/svg/record.svg
new file mode 100644
index 00000000..bf326e83
--- /dev/null
+++ b/src/icons/svg/record.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1710814433132" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="6202" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M509.48 9.666C232.874 9.666 8.666 233.874 8.666 510.48c0 276.618 224.206 500.818 500.814 500.818 276.618 0 500.818-224.202 500.818-500.818 0-276.606-224.2-500.814-500.818-500.814z m0 896.198c-218.384 0-395.378-176.994-395.378-395.382 0-218.384 176.996-395.378 395.378-395.378 218.388 0 395.382 176.996 395.382 395.378 0.002 218.388-176.992 395.382-395.382 395.382z m26.362-390.848v-189.042c0-29.136-23.578-52.718-52.718-52.718s-52.716 23.582-52.716 52.718v210.87c0 0.18 0.012 0.356 0.014 0.534 0.006 0.686 0.018 1.37 0.052 2.054 0.026 0.52 0.072 1.036 0.112 1.55 0.026 0.334 0.042 0.666 0.076 1 0.06 0.632 0.142 1.258 0.226 1.884 0.028 0.21 0.05 0.422 0.08 0.63 0.102 0.698 0.222 1.388 0.35 2.076 0.026 0.136 0.046 0.276 0.074 0.412 0.142 0.732 0.304 1.458 0.476 2.178 0.022 0.098 0.042 0.196 0.068 0.292 0.182 0.744 0.382 1.48 0.596 2.21l0.068 0.244c0.22 0.74 0.46 1.474 0.71 2.202l0.078 0.228c0.256 0.732 0.532 1.454 0.818 2.17 0.032 0.076 0.06 0.154 0.09 0.23 0.292 0.718 0.602 1.428 0.926 2.13l0.104 0.228c0.334 0.716 0.684 1.424 1.05 2.124 0.032 0.058 0.06 0.12 0.09 0.178 0.386 0.732 0.79 1.454 1.208 2.164l0.044 0.078a52.9 52.9 0 0 0 8.716 11.054l148.508 148.506c20.594 20.598 53.956 20.598 74.548 0 20.586-20.586 20.586-53.95 0-74.542l-133.648-133.642z" fill="#FFFFFF" p-id="6203"></path></svg>
\ No newline at end of file
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 4ca04daa..a758c5ab 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -463,11 +463,9 @@
       v-if="fusionSeries.visible"
       :visible.sync="fusionSeries.visible"
       :close-on-click-modal="false"
+      :title="$t('trials:lugano:dialogTitle:fusion') "
       width="850px"
     >
-      <div slot="title">
-        <span>{{ $t('trials:lugano:dialogTitle:fusion') }}</span>
-      </div>
       <el-form ref="fusionForm" :model="fusionForm" label-width="120px" label-position="left">
         <!-- 任务名称 -->
         <el-form-item
@@ -1993,14 +1991,14 @@ export default {
       })
     },
     fusion() {
-      sessionStorage.setItem('ctSeriesInfo', JSON.stringify(this.ctSeriesInfo))
-      sessionStorage.setItem('petSeriesInfo', JSON.stringify(this.petSeriesInfo))
+      // sessionStorage.setItem('ctSeriesInfo', JSON.stringify(this.ctSeriesInfo))
+      // sessionStorage.setItem('petSeriesInfo', JSON.stringify(this.petSeriesInfo))
       this.fusionSeries.visible = false
       var token = getToken()
       var trialReadingCriterionId = this.$router.currentRoute.query.TrialReadingCriterionId
       var trialId = this.$router.currentRoute.query.trialId
       var digitPlaces = Number(localStorage.getItem('digitPlaces'))
-      var path = `/petct?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&visitTaskId=${this.fusionForm.visitTaskId}&taskBlindName=${this.fusionForm.taskBlindName}&subjectCode=${this.fusionForm.subjectCode}&readingTaskState=${this.fusionForm.readingTaskState}&isBaseLineTask=${this.fusionForm.isBaseLineTask}&isCurrentTask=${this.fusionForm.isCurrentTask}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&digitPlaces=${digitPlaces}&TokenKey=${token}&lang=${this.$i18n.locale}`
+      var path = `/petct?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&visitTaskId=${this.fusionForm.visitTaskId}&taskBlindName=${this.fusionForm.taskBlindName}&subjectCode=${this.fusionForm.subjectCode}&readingTaskState=${this.fusionForm.readingTaskState}&isBaseLineTask=${this.fusionForm.isBaseLineTask}&isCurrentTask=${this.fusionForm.isCurrentTask}&isReadingShowSubjectInfo=${this.isReadingShowSubjectInfo}&studyId=${this.fusionForm.studyID}&ctseriesId=${this.ctSeriesInfo.seriesId}&ptseriesId=${this.petSeriesInfo.seriesId}&digitPlaces=${digitPlaces}&TokenKey=${token}&lang=${this.$i18n.locale}`
       var routeData = this.$router.resolve({ path })
       if (this.petctWindow) {
         this.petctWindow.close()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
new file mode 100644
index 00000000..6296bb66
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
@@ -0,0 +1,324 @@
+<template>
+  <el-form ref="fusionForm" :model="fusionForm" label-width="120px" label-position="left">
+    <!-- 任务名称 -->
+    <el-form-item
+      :label="$t('trials:lugano:fusionDialog:label:taskBlindName')"
+      prop="taskBlindName"
+    >
+      <el-select
+        v-model="fusionForm.visitTaskId"
+        clearable
+        @change="handleTaskIdChange"
+      >
+        <el-option
+          v-for="item in taskList"
+          :key="item.VisitTaskId"
+          :label="item.TaskBlindName"
+          :value="item.VisitTaskId"
+        />
+      </el-select>
+    </el-form-item>
+    <!-- 检查 -->
+    <el-form-item
+      :label="$t('trials:lugano:fusionDialog:label:study')"
+      prop="studyId"
+      :rules="[
+        { required: true, message: $t('common:ruleMessage:select'), trigger: 'blur' }
+      ]"
+    >
+      <el-select
+        v-model="fusionForm.studyId"
+        clearable
+        @change="handleStudyIdChange"
+      >
+        <el-option
+          v-for="item in studyList"
+          :key="item.StudyId"
+          :label="item.StudyCode"
+          :value="item.StudyId"
+        />
+      </el-select>
+    </el-form-item>
+    <!-- 融合图像 -->
+    <label style="color: #dfdfdf;line-height: 36px;vertical-align: middle;font-size: 14px;">{{ $t('trials:lugano:fusionDialog:label:fusionImages') }}</label>
+    <div style="display: flex;flex-direction: row;justify-content: space-between;margin-bottom:10px;" class="series-table">
+
+      <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
+        <!-- CT/MRI序列 -->
+        <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ctSeries') }}</h3>
+        <el-table
+          ref="ctSeries"
+          :data="ctSeries"
+          :show-header="false"
+          style="width: 380px"
+          size="mini"
+          height="300"
+          :default-sort="{prop: 'instanceCount', order: 'descending'}"
+          @selection-change="handleCTSelectionChange"
+          @select="handleCTSelect"
+        >
+
+          <el-table-column
+            type="selection"
+            width="30"
+          />
+          <el-table-column
+            label=""
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-image
+                style="width: 60px; height: 60px"
+                :src="`${OSSclientConfig.basePath}${scope.row.ImageResizePath}`"
+                fit="fit"
+                crossorigin="anonymous"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label=""
+            min-width="50"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div>#{{ scope.row.SeriesNumber }} </div>
+              <div>{{ scope.row.Modality }}: {{ scope.row.InstanceCount }} images  T: {{ parseFloat(scope.row.SliceThickness).toFixed(digitPlaces) }}</div>
+              <div>{{ scope.row.Description }}</div>
+            </template>
+          </el-table-column>
+
+        </el-table>
+      </div>
+
+      <div style="border: 1px solid #5e5e5e;border-radius: 5px;padding: 0 10px;">
+        <!-- PET序列 -->
+        <h3 style="color:#ddd">{{ $t('trials:lugano:fusionDialog:label:ptSeries') }}</h3>
+        <el-table
+          ref="petSeries"
+          :data="petSeries"
+          :show-header="false"
+          style="width: 380px"
+          size="mini"
+          height="300"
+          @selection-change="handlePTSelectionChange"
+          @select="handlePTSelect"
+        >
+          <el-table-column
+            type="selection"
+            width="30"
+          />
+          <el-table-column
+            label=""
+            width="100"
+          >
+            <template slot-scope="scope">
+              <el-image
+                style="width: 60px; height: 60px"
+                :src="`${OSSclientConfig.basePath}${scope.row.ImageResizePath}`"
+                fit="fit"
+                crossorigin="anonymous"
+              />
+            </template>
+          </el-table-column>
+          <el-table-column
+            label=""
+            min-width="50"
+            show-overflow-tooltip
+          >
+            <template slot-scope="scope">
+              <div>#{{ scope.row.SeriesNumber }} </div>
+              <div>{{ scope.row.Modality }}: {{ scope.row.InstanceCount }} images  T: {{ parseFloat(scope.row.SliceThickness).toFixed(digitPlaces) }}</div>
+              <div>{{ scope.row.Description }}</div>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </div>
+    <el-form-item style="text-align:right;">
+      <!-- 取消 -->
+      <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
+      <!-- 确认 -->
+      <el-button
+        type="primary"
+        size="mini"
+        @click="handleSubmitFusionSeries"
+      >
+        {{ $t('common:button:confirm') }}</el-button>
+    </el-form-item>
+  </el-form>
+</template>
+<script>
+import { getPTAndCtSeries } from '@/api/trials'
+import { getToken } from '@/utils/auth'
+export default {
+  name: 'FusionForm',
+  data() {
+    return {
+      fusionForm: {
+        visitTaskId: '',
+        studyId: '',
+        taskBlindName: '',
+        isBaseLineTask: null,
+        ctSeriesInfo: {},
+        petSeriesInfo: {}
+      },
+      visitTaskId: '',
+      taskList: [],
+      studyList: [],
+      ctSeries: [],
+      petSeries: [],
+      petctWindow: null,
+      digitPlaces: 2
+    }
+  },
+  mounted() {
+    var digitPlaces = Number(localStorage.getItem('digitPlaces'))
+    this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    this.visitTaskId = this.$route.query.visitTaskId
+    this.getSeriesInfo()
+  },
+  methods: {
+    getSeriesInfo() {
+      const loading = this.$loading({ fullscreen: true })
+      getPTAndCtSeries({ visitTaskId: this.visitTaskId }).then(res => {
+        this.taskList = res.Result
+        this.initForm()
+        loading.close()
+      }).catch(() => {
+        loading.close()
+      })
+    },
+    initForm() {
+      if (this.taskList.length === 0) return
+      this.fusionForm.visitTaskId = this.taskList[0].VisitTaskId
+      this.fusionForm.taskBlindName = this.taskList[0].TaskBlindName
+      this.fusionForm.isBaseLineTask = this.taskList[0].IsBaseLineTask
+
+      this.studyList = this.taskList[0].StudyInfoList
+      const studyIdx = this.taskList[0].StudyInfoList.findIndex(i => i.StudyId === this.taskList[0].StudyId)
+      this.fusionForm.studyId = this.studyList[studyIdx].StudyId
+      this.ctSeries = this.studyList[studyIdx].CTSeriesList
+      this.petSeries = this.studyList[studyIdx].PTSeriesList
+      const ctSexiesIdx = this.ctSeries.findIndex(i => i.Id === this.taskList[0].CTSeriesId)
+
+      const ptSexiesIdx = this.petSeries.findIndex(i => i.Id === this.taskList[0].PTSeriesId)
+
+      this.$nextTick(() => {
+        this.fusionForm.ctSeriesInfo = Object.assign({}, this.ctSeries[ctSexiesIdx])
+        this.fusionForm.petSeriesInfo = Object.assign({}, this.petSeries[ptSexiesIdx])
+        this.$refs.ctSeries.toggleRowSelection(this.ctSeries[ctSexiesIdx])
+        this.$refs.petSeries.toggleRowSelection(this.petSeries[ptSexiesIdx])
+      })
+    },
+    handleSubmitFusionSeries() {
+      this.$refs['fusionForm'].validate((valid) => {
+        if (!valid) return
+        if (Object.keys(this.fusionForm.ctSeriesInfo).length === 0 || Object.keys(this.fusionForm.petSeriesInfo).length === 0) {
+          // '请选择序列信息！'
+          this.$confirm(this.$t('trials:lugano:fusionDialog:message:checkSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
+            showCancelButton: false,
+            type: 'warning'
+          }).then(() => {}).catch(() => {})
+          return
+        }
+        var count = Math.abs(this.fusionForm.ctSeriesInfo.instanceCount - this.fusionForm.petSeriesInfo.instanceCount)
+        if (count > 10) {
+          // '选择的两组序列，影像数存在较大差距, 是否继续?'
+          this.$confirm(this.$t('trials:lugano:fusionDialog:message:validSeries'), this.$t('trials:lugano:fusionDialog:warning'), {
+            type: 'warning'
+          }).then(() => {
+            this.fusion()
+          }).catch(() => {})
+        } else {
+          this.fusion()
+        }
+      })
+    },
+    fusion() {
+      const token = getToken()
+      const trialReadingCriterionId = this.$route.query.TrialReadingCriterionId
+      const trialId = this.$route.query.trialId
+      const digitPlaces = Number(localStorage.getItem('digitPlaces'))
+      const isReadingShowSubjectInfo = this.$route.query.isReadingShowSubjectInfo
+      const subjectCode = this.$route.query.subjectCode
+      const path = `/petct?TrialReadingCriterionId=${trialReadingCriterionId}&trialId=${trialId}&visitTaskId=${this.fusionForm.visitTaskId}&taskBlindName=${this.fusionForm.taskBlindName}&subjectCode=${subjectCode}&readingTaskState=2&isBaseLineTask=${this.fusionForm.isBaseLineTask}&isCurrentTask=false&isReadingShowSubjectInfo=${isReadingShowSubjectInfo}&studyId=${this.fusionForm.studyId}&ctseriesId=${this.fusionForm.ctSeriesInfo.Id}&ptseriesId=${this.fusionForm.petSeriesInfo.Id}&digitPlaces=${digitPlaces}&TokenKey=${token}&lang=${this.$i18n.locale}`
+      var routeData = this.$router.resolve({ path })
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+      this.petctWindow = window.open(routeData.href, '_blank')
+      this.$emit('close')
+    },
+    handleTaskIdChange(v) {
+      var idx = this.taskList.findIndex(i => i.VisitTaskId === v)
+      this.studyList = idx > -1 ? this.taskList[idx].StudyInfoList : []
+      this.fusionForm.taskBlindName = idx > -1 ? this.taskList[idx].TaskBlindName : ''
+      this.fusionForm.isBaseLineTask = idx > -1 ? this.taskList[idx].IsBaseLineTask : null
+    },
+    handleStudyIdChange(v) {
+      var idx = this.studyList.findIndex(i => i.StudyId === v)
+      this.ctSeries = idx > -1 ? this.studyList[idx].CTSeriesList : []
+      this.petSeries = idx > -1 ? this.studyList[idx].PTSeriesList : []
+    },
+    handleCTSelectionChange(rows) {
+      if (rows.length > 0) {
+        this.fusionForm.ctSeriesInfo = Object.assign({}, rows[0])
+      } else {
+        this.fusionForm.ctSeriesInfo = {}
+      }
+    },
+    handleCTSelect(selection) {
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.ctSeries.toggleRowSelection(del_row, false)
+      }
+    },
+    handlePTSelectionChange(rows) {
+      if (rows.length > 0) {
+        this.fusionForm.petSeriesInfo = Object.assign({}, rows[0])
+      } else {
+        this.fusionForm.petSeriesInfo = {}
+      }
+    },
+    handlePTSelect(selection) {
+      if (selection.length > 1) {
+        const del_row = selection.shift()
+        this.$refs.petSeries.toggleRowSelection(del_row, false)
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.series-table{
+  /deep/.el-table{
+    background-color:  #1e1e1e !important;
+    color: #dfdfdf;
+  }
+  /deep/.el-table td.el-table__cell, .el-table th.el-table__cell.is-leaf{
+    border-bottom: 1px solid #dfdfdf;
+  }
+  .el-table--border::after, .el-table--group::after, .el-table::before{
+    background-color: #1e1e1e;
+  }
+  /deep/.el-table__header-wrapper{
+    th{
+      background-color:  #1e1e1e !important;
+      color: #dfdfdf;
+    }
+  }
+  /deep/.el-table__body-wrapper{
+    tr{
+      background-color:  #1e1e1e !important;
+      color: #dfdfdf;
+    }
+    tr:hover > td{
+      background-color:  #1e1e1e !important;
+    }
+  }
+  /deep/.el-table__empty-block{
+    background-color:  #1e1e1e !important;
+  }
+}
+
+</style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index fe738c5e..5139808a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -149,18 +149,6 @@
         </el-tooltip>
       </template>
 
-      <!-- <el-tooltip v-if="isCurrentTask" class="item" effect="dark" content="圆形测量" placement="bottom">
-        <div class="tool-wrapper">
-          <div
-            class="icon"
-            :class="[activeTool==='Probe'?'tool_active':'']"
-            data-tool="Probe"
-          >
-            <svg-icon icon-class="oval" class="svg-icon" @click.prevent="setBasicToolActive('Probe')" />
-          </div>
-          <div class="text">探针</div>
-        </div>
-      </el-tooltip> -->
       <!-- 重置 -->
       <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:reset')}`" placement="bottom">
         <div class="tool-wrapper">
@@ -226,6 +214,18 @@
         </div>
       </el-tooltip>
 
+      <el-tooltip v-if="isCurrentTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom" style="margin-left:20px">
+        <div class="tool-wrapper">
+          <div
+            class="icon"
+            @click.prevent="historyRecord"
+          >
+            <svg-icon icon-class="record" class="svg-icon" />
+          </div>
+          <div class="text">{{ $t('trials:lugano:button:record') }}</div>
+        </div>
+      </el-tooltip>
+
     <!-- 截屏 -->
     <!-- <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:screenShot')}`" placement="bottom">
         <div class="tool-wrapper">
@@ -330,6 +330,14 @@
     >
       <CustomWwwcForm :ww="activeCanvasWW" :wc="activeCanvasWC" @close="customWwc.visible = false" @setWwwc="setWwwc" />
     </el-dialog>
+    <el-dialog
+      :visible.sync="fusion.visible"
+      :close-on-click-modal="false"
+      :title="$t('trials:lugano:button:record')"
+      width="850px"
+    >
+      <FusionForm @close="fusion.visible = false" />
+    </el-dialog>
   </div>
 </template>
 <script>
@@ -352,7 +360,6 @@ import {
 import * as cornerstone3D from '@cornerstonejs/core'
 import * as cornerstoneTools from '@cornerstonejs/tools'
 import initLibraries from './js/initLibraries'
-
 import { createImageIdsAndCacheMetaData } from './js/createImageIdsAndCacheMetaData'
 import setCtTransferFunctionForVolumeActor from './js/setCtTransferFunctionForVolumeActor'
 import { setCtMappingRange } from './js/setCtTransferFunctionForVolumeActor'
@@ -367,7 +374,8 @@ import Viewport from './Viewport'
 import Questions from './Questions'
 import TableQuestions from './TableQuestions'
 import CustomWwwcForm from './../CustomWwwcForm'
-import { getTableAnswerRowInfoList } from '@/api/trials'
+import FusionForm from './FusionForm.vue'
+import { getTableAnswerRowInfoList, getDicomSeriesInfo } from '@/api/trials'
 import FusionEvent from './FusionEvent'
 // import { ColorMaps } from '@kitware/vtk.js/Common/Core/ColorMaps'
 import vtkColorMaps from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps'
@@ -458,7 +466,8 @@ export default {
     Viewport,
     Questions,
     TableQuestions,
-    CustomWwwcForm
+    CustomWwwcForm,
+    FusionForm
   },
   data() {
     return {
@@ -516,8 +525,8 @@ export default {
       loadingText: '',
       initAnnotations: [],
       activeCanvasWW: null,
-      activeCanvasWC: null
-
+      activeCanvasWC: null,
+      fusion: { visible: false } // 历史记录融合调窗
     }
   },
   computed: {
@@ -552,7 +561,7 @@ export default {
     this.isReadingShowSubjectInfo = this.$route.query.isReadingShowSubjectInfo === 'true'
     this.subjectCode = this.$route.query.subjectCode
     this.taskBlindName = this.$route.query.taskBlindName
-    this.isCurrentTask = this.$route.query.isReadingShowSubjectInfo === 'true'
+    this.isCurrentTask = this.$route.query.isCurrentTask === 'true'
     this.customWwc = { visible: false, title: this.$t('trials:reading:dagTitle:wwwcCustom') }
     const digitPlaces = parseInt(this.$route.query.digitPlaces)
     this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces
@@ -665,9 +674,11 @@ export default {
       // console.log(colormaps, registerColormap)
       // colormaps.forEach(registerColormap)
       renderingEngine = new RenderingEngine(renderingEngineId)
+      var ctseriesId = this.$route.query.ctseriesId
+      this.ctSeries = await this.getSeriesInfo(ctseriesId)
 
-      this.ctSeries = JSON.parse(sessionStorage.getItem('ctSeriesInfo'))
-      this.petSeries = JSON.parse(sessionStorage.getItem('petSeriesInfo'))
+      var ptseriesId = this.$route.query.ptseriesId
+      this.petSeries = await this.getSeriesInfo(ptseriesId)
       await this.getImages()
 
       // 设置viewport
@@ -757,6 +768,36 @@ export default {
       this.loadingText = ''
       this.loading = false
     },
+    getSeriesInfo(seriesId) {
+      return new Promise(resolve => {
+        getDicomSeriesInfo({ seriesId }).then(res => {
+          var series = res.Result
+          var imageIds = series.InstancePathList.map(path => `wadouri:${localStorage.getItem('location') !== 'USA' ? this.OSSclientConfig.basePath : this.OSSclientConfig.basePath}${path}`
+          )
+          resolve({
+            imageIds: imageIds,
+            instanceList: series.InstanceList,
+            seriesId: series.Id,
+            imageIdIndex: 0,
+            seriesUid: series.SeriesInstanceUid,
+            seriesNumber: series.SeriesNumber,
+            sliceThickness: series.SliceThickness,
+            modality: series.Modality,
+            description: series.Description,
+            instanceCount: series.InstanceCount,
+            studyId: this.$route.query.studyId,
+            taskBlindName: this.$route.query.taskBlindName,
+            visitTaskId: this.$route.query.visitTaskId
+          })
+        })
+      })
+      // var idx = series.findIndex(i => i.seriesId === seriesId)
+      // if (idx > -1) {
+      //   return series[idx]
+      // } else {
+      //   return {}
+      // }
+    },
     getAnnotations() {
       return new Promise(resolve => {
         const viewportIds = ['PT_AXIAL', 'CT_AXIAL', 'FUSION_AXIAL']
@@ -2057,6 +2098,9 @@ export default {
         }
       })
     },
+    historyRecord() {
+      this.fusion.visible = true
+    },
     async receiveMsg(event) {
       if (event.data.type === 'readingPageUpdate') {
         this.$refs['questions'].initList()
@@ -2066,6 +2110,14 @@ export default {
         this.viewportRender()
       } else if (event.data.type === 'readingPageStateUpdate') {
         this.readingTaskState = event.data.data.readingTaskState
+        if (this.readingTaskState === 2) {
+          window.close()
+        }
+      } else if (event.data.type === 'setReadingState') {
+        this.readingTaskState = event.data.data.readingTaskState
+        if (this.readingTaskState === 2) {
+          window.close()
+        }
       }
     },
     startTimer() {
@@ -2095,6 +2147,25 @@ export default {
     height: 100%;
     background-color: #000;
     padding: 5px 2px;
+    /deep/.el-dialog {
+      background: #1e1e1e;
+      border: 1px solid #ddd;
+      color: #ddd;
+      .el-dialog__title{
+        color:#fff;
+      }
+      .el-input .el-input__inner{
+        background-color: transparent;
+        color: #ddd;
+        border: 1px solid #5e5e5e;
+      }
+      .el-input.is-disabled .el-input__inner{
+        background-color: #646464a1;
+      }
+      .el-form-item__label{
+        color: #dfdfdf
+      }
+    }
   }
   ::-webkit-scrollbar {
     width: 5px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 26107a99..010b2071 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -812,7 +812,6 @@ export default {
               }
             }
           }
-
           var params = {
             questionId: this.parentQsId,
             rowId: this.questionForm.RowId,
@@ -822,12 +821,15 @@ export default {
             otherMeasureData: otherMeasureData ? JSON.stringify(otherMeasureData) : '',
             answerList: answers,
             isCanEditPosition: this.questionForm.IsCanEditPosition,
+            otherStudyId: this.$route.query.studyId,
             // otherStudyId: otherMeasureData ? otherMeasureData.data.studyId : '',
             // otherSeriesId: otherMeasureData ? otherMeasureData.data.seriesId : '',
             otherInstanceId: otherMeasureData ? otherMeasureData.data.instanceId : '',
             // numberOfFrames: measureData && !isNaN(parseInt(this.questionForm.MeasureData.frame)) ? parseInt(this.questionForm.MeasureData.frame) : 0,
             otherPicturePath: picturePath,
-            organInfoId: this.questionForm.OrganInfoId
+            organInfoId: this.questionForm.OrganInfoId,
+            ptSeriesId: otherMeasureData ? this.$route.query.ptseriesId : '',
+            ctSeriesId: otherMeasureData ? this.$route.query.ctseriesId : ''
           }
           if (this.questionForm.IsDicomReading === false) {
             params.isDicomReading = false
@@ -969,6 +971,7 @@ export default {
                   // '删除成功！'
                   this.$message.success(this.$t('common:message:deletedSuccessfully'))
                   loading.close()
+                  window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
                 }
               }).catch(() => { loading.close() })
           } else {

From 9577d1d90ed1d0daf6ef8af3f66349433ae80631 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 20 Mar 2024 10:11:28 +0800
Subject: [PATCH 184/374] =?UTF-8?q?lugano=E7=97=85=E7=81=B6=E6=A0=87?=
 =?UTF-8?q?=E8=AE=B0=E6=97=A0=E6=88=AA=E5=9B=BE=E6=97=B6=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/HistoryScreenshot.vue | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index 617c6d71..829c039f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -26,7 +26,7 @@
           />
           <div ref="imagesWrapper" class="images">
             <div v-if="noData" class="empty-text">
-              <slot name="empty">暂无数据</slot>
+              <slot name="empty">{{ $t('trials:lugano:message:nodata') }}</slot>
             </div>
             <div v-show="!noData" class="items" :style="itemsStyle">
               <div
@@ -130,6 +130,11 @@ export default {
         const loading = this.$loading({ fullscreen: true })
         getPreviousOtherPicturePath({ rowId: this.lesionId }).then(res => {
           this.previewImages = res.Result
+          if (this.previewImages.length === 0) {
+            this.$alert(this.$t('trials:lugano:message:noScreenshot'), this.$t('trials:lugano:message:warnTip'), {
+              callback: action => {}
+            })
+          }
           loading.close()
           resolve()
         }).catch(() => {

From 20480cfad6af0799ec3078a40b5d2410541ba126 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 20 Mar 2024 10:13:25 +0800
Subject: [PATCH 185/374] =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=97=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=97=B6=E7=82=B9=E5=87=BB=E7=A1=AE=E8=AE=A4=E5=85=B3?=
 =?UTF-8?q?=E9=97=AD=E5=BD=93=E5=89=8D=E9=A1=B5=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/HistoryScreenshot.vue    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index 829c039f..1329d054 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -132,7 +132,9 @@ export default {
           this.previewImages = res.Result
           if (this.previewImages.length === 0) {
             this.$alert(this.$t('trials:lugano:message:noScreenshot'), this.$t('trials:lugano:message:warnTip'), {
-              callback: action => {}
+              callback: action => {
+                window.close()
+              }
             })
           }
           loading.close()

From a51d6136336e0c2e6123950e6ff7149c3997d455 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 20 Mar 2024 13:44:27 +0800
Subject: [PATCH 186/374] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95?=
 =?UTF-8?q?=E8=9E=8D=E5=90=88=E8=A1=A8=E5=8D=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/FusionForm.vue   | 27 ++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
index 6296bb66..d5cfff33 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
@@ -160,7 +160,10 @@ export default {
         taskBlindName: '',
         isBaseLineTask: null,
         ctSeriesInfo: {},
-        petSeriesInfo: {}
+        petSeriesInfo: {},
+        defaultStudyId: '',
+        defaultCTSeriesId: '',
+        defaultPTSeriesId: ''
       },
       visitTaskId: '',
       taskList: [],
@@ -197,6 +200,9 @@ export default {
       this.studyList = this.taskList[0].StudyInfoList
       const studyIdx = this.taskList[0].StudyInfoList.findIndex(i => i.StudyId === this.taskList[0].StudyId)
       this.fusionForm.studyId = this.studyList[studyIdx].StudyId
+      this.fusionForm.defaultStudyId = this.taskList[0].StudyId
+      this.fusionForm.defaultCTSeriesId = this.taskList[0].CTSeriesId
+      this.fusionForm.defaultPTSeriesId = this.taskList[0].PTSeriesId
       this.ctSeries = this.studyList[studyIdx].CTSeriesList
       this.petSeries = this.studyList[studyIdx].PTSeriesList
       const ctSexiesIdx = this.ctSeries.findIndex(i => i.Id === this.taskList[0].CTSeriesId)
@@ -254,11 +260,30 @@ export default {
       this.studyList = idx > -1 ? this.taskList[idx].StudyInfoList : []
       this.fusionForm.taskBlindName = idx > -1 ? this.taskList[idx].TaskBlindName : ''
       this.fusionForm.isBaseLineTask = idx > -1 ? this.taskList[idx].IsBaseLineTask : null
+      this.studyList = idx > -1 ? this.taskList[idx].StudyInfoList : null
+      this.fusionForm.studyId = ''
+      this.fusionForm.defaultStudyId = idx > -1 ? this.taskList[idx].StudyId : ''
+      this.fusionForm.defaultCTSeriesId = idx > -1 ? this.taskList[idx].CTSeriesId : ''
+      this.fusionForm.defaultPTSeriesId = idx > -1 ? this.taskList[idx].PTSeriesId : ''
+      this.ctSeries = []
+      this.petSeries = []
     },
     handleStudyIdChange(v) {
       var idx = this.studyList.findIndex(i => i.StudyId === v)
       this.ctSeries = idx > -1 ? this.studyList[idx].CTSeriesList : []
       this.petSeries = idx > -1 ? this.studyList[idx].PTSeriesList : []
+      if (v === this.fusionForm.defaultStudyId) {
+        this.$nextTick(() => {
+          const ctSexiesIdx = this.ctSeries.findIndex(i => i.Id === this.fusionForm.defaultCTSeriesId)
+          const ptSexiesIdx = this.petSeries.findIndex(i => i.Id === this.fusionForm.defaultPTSeriesId)
+          this.fusionForm.ctSeriesInfo = Object.assign({}, this.ctSeries[ctSexiesIdx])
+          this.fusionForm.petSeriesInfo = Object.assign({}, this.petSeries[ptSexiesIdx])
+          this.$refs.ctSeries.clearSelection()
+          this.$refs.ctSeries.toggleRowSelection(this.ctSeries[ctSexiesIdx])
+          this.$refs.petSeries.clearSelection()
+          this.$refs.petSeries.toggleRowSelection(this.petSeries[ptSexiesIdx])
+        })
+      }
     },
     handleCTSelectionChange(rows) {
       if (rows.length > 0) {

From 7bbf60dd7cc26b2e3d0709397ae7fae9ca96a843 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Mar 2024 14:15:00 +0800
Subject: [PATCH 187/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E5=88=A4=E6=96=AD=E6=98=AF=E5=90=A6=E6=8B=A5?=
 =?UTF-8?q?=E6=9C=89=E4=B8=8B=E4=B8=80=E4=BB=BB=E5=8A=A1=E9=80=BB=E8=BE=91?=
 =?UTF-8?q?=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/qc-check/components/qualityAssurance.vue     |  4 ++--
 src/views/trials/trials-panel/visit/qc-check/index.vue | 10 ++++++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 365da61e..bfd8d2f9 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1417,7 +1417,7 @@ export default {
             trialId: this.trialId,
             SubjectId: this.data.SubjectId
           }).then(res => {
-            if (res.Result) {
+            if (res.Result&&res.Result.VisitId) {
               this.$confirm(this.$t('trials:qcQuality:title:title2', '', {
                 showCancelButton: false
               })).then(() => {
@@ -1426,7 +1426,7 @@ export default {
                   SubjectId: this.data.SubjectId
                 }).then(res => {
                   this.$emit('getList')
-                  this.$emit('nextTask')
+                  this.$emit('nextTask',res.Result.VisitId);
                 })
               })
             } else {
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index c5ac6174..332b6862 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -923,9 +923,15 @@ export default {
             })
         }).catch(() => {})
     },
-    nextTask() {
+    nextTask(visitId = null) {
       this.loading = true
-      getNextQCInfo({ trialId: this.trialId }).then(res => {
+      let obj = {
+        trialId: this.trialId
+      }
+      if(visitId){
+        obj.visitId = visitId;
+      }
+      getNextQCInfo(obj).then(res => {
         this.loading = false
         this.qcVisible = false
         if (res.Result) {

From c31a92fbaa26e71486e19e1e6fceddae567a4308 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 21 Mar 2024 14:45:59 +0800
Subject: [PATCH 188/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E6=8E=A7?=
 =?UTF-8?q?=E6=97=A0=E5=90=8E=E7=BB=AD=E4=BB=BB=E5=8A=A1=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/qc-check/components/qualityAssurance.vue  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index bfd8d2f9..6021d0b3 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1430,6 +1430,7 @@ export default {
                 })
               })
             } else {
+              this.$emit('getList')
               this.$alert('没有后续质控任务')
             }
           })

From 994598c216ce29cb6c2f1eef688ea240290df925 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 13:26:04 +0800
Subject: [PATCH 189/374] =?UTF-8?q?=E7=BA=B5=E9=9A=94=E8=A1=80=E6=B1=A0?=
 =?UTF-8?q?=E3=80=81=E8=82=9D=E8=84=8F=E8=A1=80=E6=B1=A0=E3=80=81=E8=84=BE?=
 =?UTF-8?q?=E5=B0=96=E3=80=81=E8=84=BE=E5=BA=95=E6=A0=87=E8=AE=B0=E4=BF=9D?=
 =?UTF-8?q?=E5=AD=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue | 128 +++++-----
 .../reading/dicoms/components/DicomViewer.vue | 241 ++++++++++--------
 .../components/Fusion/HistoryScreenshot.vue   |  12 +-
 .../dicoms/components/Fusion/PetCt.vue        |  59 +++--
 .../dicoms/components/Fusion/QuestionItem.vue |  21 +-
 .../dicoms/components/Fusion/Questions.vue    | 168 ++++++++++--
 .../components/Fusion/TableQuestionItem.vue   |   2 +-
 .../dicoms/components/Fusion/Viewport.vue     |   7 +
 .../components/IRecist/QuestionForm.vue       |   4 +-
 .../dicoms/components/Lugano/QuestionForm.vue |   9 +-
 .../dicoms/components/PCWG/QuestionForm.vue   |   2 +-
 .../dicoms/components/QuestionItem.vue        |  17 +-
 .../reading/dicoms/components/Questions.vue   | 155 ++++++++---
 .../dicoms/components/Recist/QuestionForm.vue |   4 +-
 .../components/RecistBM/QuestionForm.vue      |   4 +-
 .../reading/dicoms/components/ReportPage.vue  |   1 +
 .../reading/dicoms/components/StudyList.vue   |   4 +-
 .../dicoms/customize/CustomizeStudyList.vue   |   2 +-
 18 files changed, 563 insertions(+), 277 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 1d5af629..4d263a4a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -1127,8 +1127,8 @@ export default {
         //   resolve()
         // })
         cornerstone.loadAndCacheImage(this.stack.imageIds[this.stack.currentImageIdIndex])
-          .then(image => {
-            scope.onFirstImageLoaded(image)
+          .then(async image => {
+            await scope.onFirstImageLoaded(image)
             resolve()
           })
           .catch((error) => {
@@ -1141,84 +1141,86 @@ export default {
     },
     onFirstImageLoaded(image) {
       console.log('onFirstImageLoaded')
+      return new Promise(async resolve => {
+        const element = this.$refs.canvas
+        var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
+        cornerstone.displayImage(this.canvas, image, viewport)
 
-      const element = this.$refs.canvas
-      var viewport = cornerstone.getDefaultViewportForImage(this.canvas, image)
-      cornerstone.displayImage(this.canvas, image, viewport)
+        if (!this.toolState.initialized) {
+          this.toolState.initialized = true
+          const toolButtons = document.querySelectorAll('[data-tool]')
 
-      if (!this.toolState.initialized) {
-        this.toolState.initialized = true
-        const toolButtons = document.querySelectorAll('[data-tool]')
-
-        // const scope = this
-        Array.from(toolButtons).forEach((toolBtn) => {
+          // const scope = this
+          Array.from(toolButtons).forEach((toolBtn) => {
           // Add the tool
-          const toolName = toolBtn.getAttribute('data-tool')
-          const apiTool = cornerstoneTools[`${toolName}Tool`]
-          if (apiTool) {
-            const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool)
+            const toolName = toolBtn.getAttribute('data-tool')
+            const apiTool = cornerstoneTools[`${toolName}Tool`]
+            if (apiTool) {
+              const toolAlreadyAddedToElement = cornerstoneTools.getToolForElement(element, apiTool)
 
-            if (!toolAlreadyAddedToElement) {
-              if (toolName === 'Length') {
-                cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
-              } else if (toolName === 'Bidirectional') {
+              if (!toolAlreadyAddedToElement) {
+                if (toolName === 'Length') {
+                  cornerstoneTools.addToolForElement(element, LengthTool, { configuration: { handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true, digits: this.digitPlaces, drawHandles: true }})
+                } else if (toolName === 'Bidirectional') {
                 // cornerstoneTools.addToolForElement(element, BidirectionalTool, { digits: this.digitPlaces })
                 // , handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true
-                cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
-              } else if (toolName === 'ArrowAnnotate') {
-                cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
-              } else if (toolName === 'RectangleRoi') {
-                cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
-              } else {
-                cornerstoneTools.addToolForElement(element, apiTool)
+                  cornerstoneTools.addToolForElement(element, BidirectionalTool, { configuration: { digits: this.digitPlaces, hideHandlesIfMoving: true }})
+                } else if (toolName === 'ArrowAnnotate') {
+                  cornerstoneTools.addToolForElement(element, ArrowAnnotateTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                } else if (toolName === 'RectangleRoi') {
+                  cornerstoneTools.addToolForElement(element, RectangleRoiTool, { configuration: { allowEmptyLabel: true, handleRadius: false, drawHandlesOnHover: true, hideHandlesIfMoving: true }})
+                } else {
+                  cornerstoneTools.addToolForElement(element, apiTool)
+                }
               }
             }
+          })
+          if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) {
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
           }
-        })
-        if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.WwwcRegionTool)) {
-          cornerstoneTools.addToolForElement(element, cornerstoneTools.WwwcRegionTool)
-        }
-        if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
-          cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
-        }
-        cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
+          if (!cornerstoneTools.getToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)) {
+            cornerstoneTools.addToolForElement(element, cornerstoneTools.StackScrollMouseWheelTool)
+          }
+          cornerstoneTools.setToolActiveForElement(element, 'StackScrollMouseWheel', {})
 
-        if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) {
-          cornerstoneTools.addToolForElement(element, ScaleOverlayTool)
-        }
-        cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {})
-        cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
-          mouseButtonMask: 2
-        })
-        cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', {
-          mouseButtonMask: 4
-        })
+          if (!cornerstoneTools.getToolForElement(element, ScaleOverlayTool)) {
+            cornerstoneTools.addToolForElement(element, ScaleOverlayTool)
+          }
+          cornerstoneTools.setToolActiveForElement(element, 'ScaleOverlay', {})
+          cornerstoneTools.setToolActiveForElement(this.canvas, 'Zoom', {
+            mouseButtonMask: 2
+          })
+          cornerstoneTools.setToolActiveForElement(this.canvas, 'Pan', {
+            mouseButtonMask: 4
+          })
 
         // if (!cornerstoneTools.getToolForElement(element, OrientationMarkersTool)) {
         //   cornerstoneTools.addToolForElement(element, OrientationMarkersTool)
         // }
         // cornerstoneTools.setToolActiveForElement(element, 'OrientationMarkers', { })
-      }
+        }
 
-      // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
-      cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip'])
-      cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
-      // cornerstoneTools.stackPrefetch.enable(this.canvas)
-      cornerstone.updateImage(element, true)
+        // cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'stackPrefetch', 'playClip'])
+        cornerstoneTools.addStackStateManager(this.canvas, ['stack', 'playClip'])
+        cornerstoneTools.addToolState(this.canvas, 'stack', this.stack)
+        // cornerstoneTools.stackPrefetch.enable(this.canvas)
+        cornerstone.updateImage(element, true)
 
-      this.stack.firstImageLoading = false
-      this.toolState.dicomInfoVisible = true
-      var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
-      var frame = null
-      if (instanceId.includes('?frame=')) {
-        frame = instanceId.split('?frame=')[1]
-        instanceId = instanceId.split('?frame=')[0]
-      }
-      this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
-      instanceId = instanceId.split('.')[0]
-      this.stack.instanceId = instanceId
-      this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
-      this.resetWwwc()
+        this.stack.firstImageLoading = false
+        this.toolState.dicomInfoVisible = true
+        var instanceId = image.imageId.split('/')[image.imageId.split('/').length - 1]
+        var frame = null
+        if (instanceId.includes('?frame=')) {
+          frame = instanceId.split('?frame=')[1]
+          instanceId = instanceId.split('?frame=')[0]
+        }
+        this.stack.frame = !isNaN(parseInt(frame)) ? parseInt(frame) : 0
+        instanceId = instanceId.split('.')[0]
+        this.stack.instanceId = instanceId
+        this.height = (this.stack.currentImageIdIndex) * 100 / (this.stack.imageIds.length - 1)
+        this.resetWwwc()
+        resolve()
+      })
     },
     onNewImage(e) {
       console.log('cornerstonenewimage')
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index a758c5ab..da9f3f3e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -828,7 +828,7 @@ export default {
     activeSeries: {
       immediate: true,
       handler(v) {
-        if (v) {
+        if (v && v.isCurrentTask && this.studyList.length === 0) {
           this.activeTaskInfo.taskName = v.taskBlindName
           this.activeTaskInfo.visitTaskId = v.visitTaskId
           const i = this.visitTaskList.findIndex(i => i.VisitTaskId === v.visitTaskId)
@@ -838,8 +838,6 @@ export default {
           studyList = studyList.filter(i => !i.IsCriticalSequence && i.Modalities.indexOf('CT') !== -1 && i.Modalities.indexOf('PT') !== -1)
           if (studyList.length === 0) return
           this.studyList = studyList
-        } else {
-          this.studyList = []
         }
       }
     }
@@ -887,24 +885,48 @@ export default {
       }
       console.log('getMeasureData')
     })
-    DicomEvent.$on('getScreenshots', async(callback) => {
+    DicomEvent.$on('getScreenshots', async(measuredData, callback) => {
       if (this.currentDicomCanvasIndex > -1) {
-        // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
-        const divForDownloadViewport = document.querySelector(
-          `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
-        )
-        var canvas = await html2canvas(divForDownloadViewport)
-        var base64Str = canvas.toDataURL('image/png', 1)
-        callback(base64Str)
+        if (!measuredData) return
+        await this.imageLocation(measuredData)
+        setTimeout(async() => {
+          // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
+          const divForDownloadViewport = document.querySelector(
+            `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
+          )
+          var canvas = await html2canvas(divForDownloadViewport)
+          var base64Str = canvas.toDataURL('image/png', 1)
+          console.log('getScreenshots')
+          callback(base64Str)
+        }, 50)
       }
-      console.log('getScreenshots')
     })
-    DicomEvent.$on('imageLocation', measuredData => {
-      if (!measuredData) return
-      this.imageLocation(measuredData)
+    DicomEvent.$on('imageLocation', async(measuredData) => {
+      return new Promise(async resolve => {
+        if (!measuredData) return
+        await this.imageLocation(measuredData)
 
-      console.log('imageLocation')
+        console.log('imageLocation')
+        resolve()
+      })
     })
+    // DicomEvent.$on('imageLocation', async(measuredData, callback) => {
+    //   if (measuredData) {
+    //     await this.imageLocation(measuredData)
+    //   }
+    //   console.log('imageLocation')
+    //   this.$nextTick(() => {
+    //     if (callback) {
+    //       callback()
+    //     }
+    //   })
+    // })
+    // DicomEvent.$on('imageLocation', measuredData => {
+    //   if (!measuredData) return
+    //   this.imageLocation(measuredData)
+
+    //   console.log('imageLocation')
+    // })
     DicomEvent.$on('setReadingState', readingTaskState => {
       this.canvasObj[this.currentDicomCanvasIndex].readingTaskState = readingTaskState
       if (this.activeTool) {
@@ -934,6 +956,11 @@ export default {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
     })
+    DicomEvent.$on('reload', () => {
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+    })
   },
   beforeDestroy() {
     DicomEvent.$off('updateImage')
@@ -945,6 +972,7 @@ export default {
     DicomEvent.$off('setMeasuredToolsPassive')
     DicomEvent.$off('readingPageUpdate')
     DicomEvent.$off('setReadingState')
+    DicomEvent.$off('reload')
     if (this.petctWindow) {
       this.petctWindow.close()
     }
@@ -1302,108 +1330,117 @@ export default {
 
     // 最后一个窗口显示当前访视下病灶所在的影像序列
     // 其他窗口显示该病灶第一次出现的序列信息
-    async imageLocation(obj) {
-      var loading = null
-      var loadImagePromises = []
-      var isScrollSync = this.isScrollSync
-      if (this.isScrollSync) {
+    imageLocation(obj) {
+      return new Promise(async resolve => {
+        var loading = null
+        var loadImagePromises = []
+        var isScrollSync = this.isScrollSync
+        if (this.isScrollSync) {
         // 取消滚动同步
-        this.isScrollSync = false
-      }
+          this.isScrollSync = false
+        }
 
-      var activeCanvasTaskId = obj.visitTaskId
+        var activeCanvasTaskId = obj.visitTaskId
 
-      var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId)
-      if (index === -1) return
+        var index = this.visitTaskList.findIndex(i => i.VisitTaskId === activeCanvasTaskId)
+        if (index === -1) {
+          resolve()
+          return
+        }
 
-      var firstAddSeries = null
-      var currentAddSeries = null
-      if (this.isReadingTaskViewInOrder) {
+        var firstAddSeries = null
+        var currentAddSeries = null
+        if (this.isReadingTaskViewInOrder) {
         // 有序
         // 获取病灶第一次出现的访视序列
-        var firstAddVisitTaskId = null
+          var firstAddVisitTaskId = null
 
-        var idx = this.visitTaskList[index].MeasureData.findIndex(item => {
-          return item.OrderMarkName === obj.lesionName
-        })
-        if (idx > -1) {
-          firstAddVisitTaskId = this.visitTaskList[index].MeasureData[idx].FristAddTaskId
-        }
-        if (firstAddVisitTaskId) {
-          var taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === firstAddVisitTaskId)
-          if (taskIdx > -1 && !this.visitTaskList[taskIdx].IsInit) {
-            loading = this.$loading({ fullscreen: true })
-            if (!this.visitTaskList[taskIdx].measureDataInit) {
-              await store.dispatch('reading/getMeasuredData', this.visitTaskList[taskIdx].VisitTaskId)
-            }
-            if (!this.visitTaskList[taskIdx].studyListInit) {
-              await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[taskIdx].VisitId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId, taskBlindName: this.visitTaskList[taskIdx].TaskBlindName })
-            }
-            if (!this.visitTaskList[taskIdx].readingQuestionsInit) {
-              await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
-            }
-            if (!this.visitTaskList[taskIdx].questionsInit) {
-              await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
-            }
-
-            await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
+          var idx = this.visitTaskList[index].MeasureData.findIndex(item => {
+            return item.OrderMarkName === obj.lesionName
+          })
+          if (idx > -1) {
+            firstAddVisitTaskId = this.visitTaskList[index].MeasureData[idx].FristAddTaskId
           }
-          if (this.CriterionType === 3 && obj.lesionType === 7 && obj.fromMark) {
-            const measureDataInfo = Object.assign({}, obj)
-            measureDataInfo.lesionName = obj.fromMark
-            firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, measureDataInfo)
-          } else {
-            firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, obj)
-          }
-        }
-        // 获取当前访视病灶所在的序列
-        currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
-        if (!firstAddSeries && currentAddSeries) {
-        // 存在首次出现的病灶及当前病灶
-          firstAddSeries = currentAddSeries
-        } else if (!firstAddSeries && !currentAddSeries) {
-        // 当前新病灶，且未画标记则显示当前的序列信息，不做处理
-          loading && loading.close()
-          this.isScrollSync = isScrollSync
-          this.setToolToTarget(obj)
-          return
-        } else if (firstAddSeries && !currentAddSeries) {
-        // 当前访视序列与首次出现病灶的序列对齐
-          currentAddSeries = this.getLinkedSeries(firstAddSeries, activeCanvasTaskId)
+          if (firstAddVisitTaskId) {
+            var taskIdx = this.visitTaskList.findIndex(i => i.VisitTaskId === firstAddVisitTaskId)
+            if (taskIdx > -1 && !this.visitTaskList[taskIdx].IsInit) {
+              loading = this.$loading({ fullscreen: true })
+              if (!this.visitTaskList[taskIdx].measureDataInit) {
+                await store.dispatch('reading/getMeasuredData', this.visitTaskList[taskIdx].VisitTaskId)
+              }
+              if (!this.visitTaskList[taskIdx].studyListInit) {
+                await store.dispatch('reading/getStudyInfo', { trialId: this.trialId, subjectVisitId: this.visitTaskList[taskIdx].VisitId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId, taskBlindName: this.visitTaskList[taskIdx].TaskBlindName })
+              }
+              if (!this.visitTaskList[taskIdx].readingQuestionsInit) {
+                await store.dispatch('reading/getReadingQuestionAndAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
+              }
+              if (!this.visitTaskList[taskIdx].questionsInit) {
+                await store.dispatch('reading/getDicomReadingQuestionAnswer', { trialId: this.trialId, visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
+              }
 
+              await store.dispatch('reading/setStatus', { visitTaskId: this.visitTaskList[taskIdx].VisitTaskId })
+            }
+            if (this.CriterionType === 3 && obj.lesionType === 7 && obj.fromMark) {
+              const measureDataInfo = Object.assign({}, obj)
+              measureDataInfo.lesionName = obj.fromMark
+              firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, measureDataInfo)
+            } else {
+              firstAddSeries = this.getSeriesInfoByMark(firstAddVisitTaskId, obj)
+            }
+          }
+          // 获取当前访视病灶所在的序列
+          currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
+          if (!firstAddSeries && currentAddSeries) {
+            // 存在首次出现的病灶及当前病灶
+            firstAddSeries = currentAddSeries
+          } else if (!firstAddSeries && !currentAddSeries) {
+            // 当前新病灶，且未画标记则显示当前的序列信息，不做处理
+            loading && loading.close()
+            this.isScrollSync = isScrollSync
+            this.setToolToTarget(obj)
+            resolve()
+            return
+          } else if (firstAddSeries && !currentAddSeries) {
+            // 当前访视序列与首次出现病灶的序列对齐
+            currentAddSeries = this.getLinkedSeries(firstAddSeries, activeCanvasTaskId)
+
+            if (!currentAddSeries) {
+              // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
+              currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
+            }
+          }
+        } else {
+        // 无序
+          currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
           if (!currentAddSeries) {
           // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
             currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
           }
+          firstAddSeries = currentAddSeries
         }
-      } else {
-        // 无序
-        currentAddSeries = this.getSeriesInfoByMark(activeCanvasTaskId, obj)
-        if (!currentAddSeries) {
-          // 未找到对齐的，则就显示当前最后一个窗口现实的序列信息
-          currentAddSeries = this.$refs[`dicomCanvas${this.maxCanvas - 1}`][0].series
-        }
-        firstAddSeries = currentAddSeries
-      }
 
-      for (let i = 0; i < this.maxCanvas; i++) {
-        if (i === this.maxCanvas - 1) {
-          loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries))
-          this.currentDicomCanvasIndex = i
-          this.activeSeries = currentAddSeries
-          store.dispatch('reading/setActiveSeries', currentAddSeries)
-        } else {
-          loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries))
+        for (let i = 0; i < this.maxCanvas; i++) {
+          if (i === this.maxCanvas - 1) {
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(currentAddSeries))
+            this.currentDicomCanvasIndex = i
+            this.activeSeries = currentAddSeries
+            store.dispatch('reading/setActiveSeries', currentAddSeries)
+          } else {
+            loadImagePromises.push(this.$refs[`dicomCanvas${i}`][0].loadImageStack(firstAddSeries))
+          }
         }
-      }
-      Promise.all(loadImagePromises)
-        .then(() => {
-          this.isScrollSync = isScrollSync
-          this.setToolToTarget(obj)
-        })
-      if (loading) {
-        loading.close()
-      }
+        Promise.all(loadImagePromises)
+          .then(() => {
+            this.isScrollSync = isScrollSync
+            this.setToolToTarget(obj)
+            resolve()
+          }).catch(() => {
+            resolve()
+          })
+        if (loading) {
+          loading.close()
+        }
+      })
     },
     setToolToTarget(obj) {
       if (obj.readingTaskState < 2 && obj.markTool && !obj.isMarked) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index 1329d054..42553e66 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -75,7 +75,10 @@ export default {
       translateX: 0,
       pageSize: 0, // 一页展示的图片数
       previewImages: [],
-      imgSize: { width: '120px', height: '120px' }
+      imgSize: { width: '120px', height: '120px' },
+      lesionId: '',
+      visitTaskId: '',
+      questionType: null
     }
   },
   computed: {
@@ -112,7 +115,10 @@ export default {
       store.dispatch('user/setToken', this.$route.query.TokenKey)
       changeURLStatic('TokenKey', '')
     }
-    this.lesionId = this.$route.query.rowId
+    this.lesionId = this.$route.query.rowId ? this.$route.query.rowId : ''
+    this.visitTaskId = this.$route.query.visitTaskId ? this.$route.query.visitTaskId : ''
+    var questionType = this.$route.query.questionType
+    this.questionType = questionType ? Number(questionType) : null
     this.initPage()
   },
   methods: {
@@ -128,7 +134,7 @@ export default {
     getScreenshot() {
       return new Promise(resolve => {
         const loading = this.$loading({ fullscreen: true })
-        getPreviousOtherPicturePath({ rowId: this.lesionId }).then(res => {
+        getPreviousOtherPicturePath({ rowId: this.lesionId, visitTaskId: this.visitTaskId, questionType: this.questionType }).then(res => {
           this.previewImages = res.Result
           if (this.previewImages.length === 0) {
             this.$alert(this.$t('trials:lugano:message:noScreenshot'), this.$t('trials:lugano:message:warnTip'), {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 5139808a..dbc65232 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -483,6 +483,7 @@ export default {
         { label: this.$t('trials:reading:button:rotateTurnRight'), val: 5 }// 右转90度
       ],
       isCurrentTask: false,
+      isBaseLineTask: false,
       ctSeries: {},
       petSeries: {},
       renderingEngineId: renderingEngineId,
@@ -562,6 +563,7 @@ export default {
     this.subjectCode = this.$route.query.subjectCode
     this.taskBlindName = this.$route.query.taskBlindName
     this.isCurrentTask = this.$route.query.isCurrentTask === 'true'
+    this.isBaseLineTask = this.$route.query.isCurrentTask === 'true'
     this.customWwc = { visible: false, title: this.$t('trials:reading:dagTitle:wwwcCustom') }
     const digitPlaces = parseInt(this.$route.query.digitPlaces)
     this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces
@@ -606,9 +608,10 @@ export default {
       console.log('imageLocation')
       this.imageLocation(obj)
     })
-    FusionEvent.$on('getScreenshots', async(callback) => {
+    FusionEvent.$on('getScreenshots', async(measuredData, callback) => {
       // var base64Str = await this.$refs['FUSION_AXIAL'].getScreenshots()
       const loading = this.$loading({ fullscreen: true })
+      await this.imageLocation(measuredData)
       const divForDownloadViewport = document.querySelector(
         '.dicom-container'
       )
@@ -712,8 +715,9 @@ export default {
       const debouncedCallback = this.debounce((e) => {
         const { annotation } = e.detail
         const { remark } = annotation.data
-        if (this.initAnnotations.length > 0 && this.initAnnotations[0].orderMark === remark && !this.initAnnotations[0].isInit) {
-          this.initAnnotations[0].isInit = true
+        var idx = this.initAnnotations.findIndex(i => i.orderMark === remark)
+        if (this.initAnnotations.length > 0 && idx > -1 && this.initAnnotations[idx].orderMark === remark && !this.initAnnotations[idx].isInit) {
+          this.initAnnotations[idx].isInit = true
         } else {
           this.onAnnotationModified(e)
         }
@@ -1972,28 +1976,33 @@ export default {
       })
     },
     imageLocation(obj) {
-      this.setToolToTarget(obj)
-      if (!obj.otherMeasureData) return
-      this.isLocate = true
-      const { metadata } = obj.otherMeasureData
-      var imageArr = metadata.referencedImageId.split('/')
-      var instanceId = imageArr[imageArr.length - 1]
-      var viewportId = null
-      // var seriesId = data.seriesId
-      // var instanceId = data.instanceId
-      var index = -1
-      index = this.petSeries.instanceList.findIndex(i => i === instanceId)
-      if (index > -1) {
-        viewportId = 'PT_AXIAL'
-        this.$refs[viewportId].scroll(index)
-        return
-      }
-      index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
-      if (index > -1) {
-        viewportId = 'CT_AXIAL'
-        this.$refs[viewportId].scroll(index)
-        return
-      }
+      return new Promise(resolve => {
+        console.log('imageLocation')
+        this.setToolToTarget(obj)
+        if (!obj.otherMeasureData) {
+          resolve()
+          return
+        }
+        this.isLocate = true
+        const { metadata } = obj.otherMeasureData
+        var imageArr = metadata.referencedImageId.split('/')
+        var instanceId = imageArr[imageArr.length - 1]
+        var viewportId = null
+        // var seriesId = data.seriesId
+        // var instanceId = data.instanceId
+        var index = -1
+        index = this.petSeries.instanceList.findIndex(i => i === instanceId)
+        if (index > -1) {
+          viewportId = 'PT_AXIAL'
+          this.$refs[viewportId].scroll(index)
+        }
+        index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
+        if (index > -1) {
+          viewportId = 'CT_AXIAL'
+          this.$refs[viewportId].scroll(index)
+        }
+        resolve()
+      })
     },
     setToolToTarget(obj) {
       var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 2d55e452..9db13b4a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -35,16 +35,24 @@
             <!-- 测量 -->
             <el-button v-if="(!questionForm[question.Id] && ((question.QuestionType === 51 && liverIsInsideVolume) || (question.QuestionType === 52 && lungIsInsideVolume)) && readingTaskState!== 2)" size="mini" type="text" @click="addAnnotation(question)">{{ $t('trials:lugano:button:addAnnotation') }}</el-button>
             <!-- 清除标记 -->
-            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
+            <el-button v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume)) && readingTaskState!== 2" size="mini" type="text" style="padding: 7px 5px;margin-left:5px;" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
             <el-button
               v-if="(questionForm[question.Id] || (question.QuestionType === 51 && !liverIsInsideVolume) || (question.QuestionType === 52 && !lungIsInsideVolume))"
               size="mini"
               type="text"
-              style="padding: '7px 5px'"
-              :style="{marginLeft: readingTaskState!== 2?'-5px':'5px'}"
+              style="padding: '7px 5px';margin-left:-5px;"
               @click="locateAnnotation(question)"
             >{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <!-- 保存 -->
+            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
+              <!-- 未保存 -->
+              <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                <i class="el-icon-warning" style="color:red" />
+              </el-tooltip>
+              {{ $t('common:button:save') }}
+            </el-button>
+            <el-button v-if="!question.IsBaseLineTask" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="viewAnnotations(question)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
           </div>
         </template>
         <template v-else-if="question.QuestionType === 53">
@@ -339,11 +347,16 @@ export default {
           FusionEvent.$emit('removeAnnotation', question)
         })
         .catch(() => {})
-      
     },
     locateAnnotation(question) {
       FusionEvent.$emit('locateAnnotation', question)
     },
+    saveAnnotation(question) {
+      FusionEvent.$emit('saveAnnotation', question)
+    },
+    viewAnnotations(question) {
+      FusionEvent.$emit('viewAnnotations', question)
+    },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) return
       const loading = this.$loading({
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 25828b31..fe8a227a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -33,9 +33,11 @@
 <script>
 
 import { saveImageQuality, getDicomReadingQuestionAnswer, getReadingCalculationData } from '@/api/trials'
+import { getToken } from '@/utils/auth'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
 import FusionEvent from './FusionEvent'
+
 export default {
   name: 'ECRF',
   components: {
@@ -103,6 +105,7 @@ export default {
       this.resetSuvQuestions()
     })
     FusionEvent.$on('addAnnotation', obj => {
+      this.$set(obj, 'SaveEnum', 0)
       this.addAnnotation(obj)
     })
     FusionEvent.$on('removeAnnotation', obj => {
@@ -111,6 +114,13 @@ export default {
     FusionEvent.$on('locateAnnotation', obj => {
       this.locateAnnotation(obj)
     })
+    FusionEvent.$on('saveAnnotation', obj => {
+      this.saveAnnotation(obj)
+    })
+    FusionEvent.$on('viewAnnotations', obj => {
+      console.log('viewAnnotations')
+      this.viewAnnotations(obj)
+    })
   },
   beforeDestroy() {
     FusionEvent.$off('refreshQuestions')
@@ -193,10 +203,12 @@ export default {
           if (i.QuestionType === 51) {
             // 肝脏血池SUVmax(51);
             this.liverSuvmaxId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
           if (i.QuestionType === 52) {
             // 纵膈血池SUVmax(52);
             this.lungSuvmaxId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
           if (i.QuestionType === 53) {
             // SUVmax;
@@ -223,18 +235,7 @@ export default {
     handleSave() {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
-        if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
-          // 当前标记在图像外
-          this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
-            callback: action => {
-              this.$message({
-                type: 'info',
-                message: `action: ${action}`
-              })
-            }
-          })
-          return
-        }
+
         // 肝脏血池SUVmax
         const liverSUVmax = !isNaN(parseFloat(this.questionForm[this.liverSuvmaxId])) ? parseFloat(this.questionForm[this.liverSuvmaxId]) : 0
         // 纵膈血池SUVmax
@@ -268,22 +269,22 @@ export default {
       for (const k in this.questionForm) {
         answers.push({ id: k, answer: this.questionForm[k] })
       }
-      var questionMarkInfoList = []
-      this.measurements.forEach(item => {
-        var i = Object.assign({}, item)
-        if (i.OtherMeasureData) {
-          for (const k in i.OtherMeasureData.data.cachedStats) {
-            i.OtherMeasureData.data.cachedStats[k].pointsInShape = []
-          }
-          i.OtherMeasureData = JSON.stringify(i.OtherMeasureData)
-        }
+      // var questionMarkInfoList = []
+      // this.measurements.forEach(item => {
+      //   var i = Object.assign({}, item)
+      //   if (i.OtherMeasureData) {
+      //     for (const k in i.OtherMeasureData.data.cachedStats) {
+      //       i.OtherMeasureData.data.cachedStats[k].pointsInShape = []
+      //     }
+      //     i.OtherMeasureData = JSON.stringify(i.OtherMeasureData)
+      //   }
 
-        questionMarkInfoList.push(i)
-      })
+      //   questionMarkInfoList.push(i)
+      // })
       var params = {
         visitTaskId: this.visitTaskId,
-        answers: answers,
-        questionMarkInfoList
+        answers: answers
+        // questionMarkInfoList
       }
       saveImageQuality(params).then(async res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -336,6 +337,70 @@ export default {
 
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
+    saveAnnotation(question) {
+      if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
+        // 当前标记在图像外
+        this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
+          callback: action => {
+            this.$message({
+              type: 'info',
+              message: `action: ${action}`
+            })
+          }
+        })
+        return
+      }
+      const loading = this.$loading({ fullscreen: true })
+
+      // 获取截图
+      var answers = []
+      var questionMarkInfoList = []
+      var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
+      if (!annotationObj) {
+        loading.close()
+        return
+      }
+      FusionEvent.$emit('getScreenshots', { otherMeasureData: annotationObj.OtherMeasureData }, async val => {
+        var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+        var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+
+        if (annotationObj && annotationObj.OtherMeasureData) {
+          var otherMeasureData = Object.assign({}, annotationObj.OtherMeasureData)
+          for (const k in otherMeasureData.data.cachedStats) {
+            otherMeasureData.data.cachedStats[k].pointsInShape = []
+          }
+          annotationObj.OtherMeasureData = JSON.stringify(otherMeasureData)
+          annotationObj.OtherPicturePath = picturePath
+          questionMarkInfoList.push(annotationObj)
+        }
+        for (const k in this.questionForm) {
+          if (k === question.Id) {
+            answers.push({ id: k, answer: this.questionForm[k] })
+            break
+          }
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers,
+          questionMarkInfoList
+        }
+        saveImageQuality(params).then(async res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          loading.close()
+          this.$set(question, 'SaveEnum', 0)
+          window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+        }).catch(() => {
+          loading.close()
+        })
+      })
+    },
+    viewAnnotations(question) {
+      var token = getToken()
+      var subjectCode = this.$route.query.subjectCode
+      var path = `/historyScreenshot?&subjectCode=${subjectCode}&visitTaskId=${this.visitTaskId}&questionType=${question.QuestionType}&TokenKey=${token}`
+      const routeData = this.$router.resolve({ path })
+      window.open(routeData.href, '_blank')
+    },
     setMeasuredData(measurement) {
       if (measurement.data.isHandleOutsideImage) {
         this.setOutsideMeasuredData(measurement)
@@ -374,6 +439,19 @@ export default {
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true
+        this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+      }
+    },
+    setQuestionStatus(obj, questionType) {
+      console.log(obj, questionType)
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].QuestionType === questionType) {
+          this.$set(obj[i], 'SaveEnum', 1)
+          break
+        }
+        if (obj[i].Childrens && obj[i].Childrens.length > 0) {
+          this.setQuestionStatus(obj[i].Childrens, questionType)
+        }
       }
     },
     setOutsideMeasuredData(measurement) {
@@ -415,6 +493,7 @@ export default {
       }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
+      this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
     },
     clearMeasuredData(remark) {
       var idx = this.measurements.findIndex(i => i.OrderMarkName === remark)
@@ -538,6 +617,45 @@ export default {
           this.setSuvChild(i.Childrens)
         }
       })
+    },
+    async uploadScreenshots(fileName, file) {
+      try {
+        file = this.convertBase64ToBlob(file)
+        var trialId = this.$route.query.trialId
+        var subjectId = this.$route.query.trialId
+        const result = await this.OSSclient.put(`/${trialId}/Read/${subjectId}/Visit/${fileName}.png`, file)
+        return { isSuccess: true, result: result }
+      } catch (e) {
+        console.log(e)
+        return { isSuccess: false, result: e }
+      }
+    },
+    convertBase64ToBlob(imageEditorBase64) {
+      var base64Arr = imageEditorBase64.split(',')
+      var imgtype = ''
+      var base64String = ''
+      if (base64Arr.length > 1) {
+        // 如果是图片base64，去掉头信息
+        base64String = base64Arr[1]
+        imgtype = base64Arr[0].substring(
+          base64Arr[0].indexOf(':') + 1,
+          base64Arr[0].indexOf(';')
+        )
+      }
+      // 将base64解码
+      var bytes = atob(base64String)
+      // var bytes = base64;
+      var bytesCode = new ArrayBuffer(bytes.length)
+      // 转换为类型化数组
+      var byteArray = new Uint8Array(bytesCode)
+
+      // 将base64转换为ascii码
+      for (var i = 0; i < bytes.length; i++) {
+        byteArray[i] = bytes.charCodeAt(i)
+      }
+
+      // 生成Blob对象（文件对象）
+      return new Blob([bytesCode], { type: imgtype })
     }
   }
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 010b2071..ef92f27a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -794,7 +794,7 @@ export default {
             otherMeasureData.data.cachedStats[k].pointsInShape = []
           }
         }
-        FusionEvent.$emit('getScreenshots', async val => {
+        FusionEvent.$emit('getScreenshots', { otherMeasureData: this.questionForm.OtherMeasureData }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index d9ce1003..1a920846 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -205,11 +205,17 @@ export default {
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
     })
+    // document.addEventListener('mousewheel', (e) => {
+    //   this.mousewheel(e)
+    // })
   },
   destroyed() {
 
   },
   methods: {
+    // mousewheel(e){
+    //   console.log(e)
+    // },
     handleVolumeNewImage(e) {
       const { imageIndex } = e.detail
       this.seriesInfo.imageIdIndex = imageIndex
@@ -297,6 +303,7 @@ export default {
       var zoom = viewport.getZoom()
       if (!zoom) return
       this.imageInfo.zoom = zoom.toFixed(4)
+      // console.log(e)
     },
     handleVOIModified(e) {
       renderingEngine = getRenderingEngine(this.renderingEngineId)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 19421a3c..300cceac 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -519,7 +519,7 @@ export default {
             item.Answer = this.questionForm[item.Id]
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
 
           DicomEvent.$emit('imageLocation', obj)
           var type = null
@@ -1957,7 +1957,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 01de6a7d..1dff7ca5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -640,7 +640,7 @@ export default {
             item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
           DicomEvent.$emit('imageLocation', obj)
           var type = null
           if (this.questionForm.RowId) {
@@ -1653,8 +1653,13 @@ export default {
             }
           }
         }
+        // DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionName, lesionType: this.lesionType }, () => {
+        //   console.log(11111)
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        // })
+        // await DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionName, lesionType: this.lesionType })
+        // console.log(5555)
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index add6aa5f..be980aff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -690,7 +690,7 @@ export default {
           }
         }
         const loading = this.$loading({ fullscreen: true })
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index dd73622f..c3b56d6c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -15,6 +15,7 @@
     </div>
     <template v-else-if="((question.QuestionType === 56 || question.QuestionType === 57) && question.IsBaseLineTask)" />
     <template v-else>
+
       <el-form-item
         v-if="(question.ShowQuestion===1 && question.ParentTriggerValueList.includes(String(questionForm[question.ParentId]))) || question.ShowQuestion===0 "
         :label="`${question.QuestionName}`"
@@ -26,7 +27,8 @@
         :class="[question.Type==='group'?'mb':question.Type==='upload'?'uploadWrapper':'']"
       >
         <template v-if="question.QuestionType === 60 || question.QuestionType === 61">
-          <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+          <div style="display: flex;flex-direction: row;justify-content: flex-start;align-items: center;">
+
             <el-input
               v-if="question.Type==='calculation'"
               v-model="questionForm[question.Id]"
@@ -42,7 +44,15 @@
             <!-- 清除标记 -->
             <el-button v-if="questionForm[question.Id]&& readingTaskState!== 2" size="mini" type="text" @click="removeAnnotation(question)">{{ $t('trials:lugano:button:clearAnnotation') }}</el-button>
             <!-- 定位 -->
-            <el-button v-if="questionForm[question.Id]" size="mini" type="text" style="margin-left: -5px;" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
+            <!-- 保存 -->
+            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" @click="saveAnnotation(question)">
+              <!-- 未保存 -->
+              <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
+                <i class="el-icon-warning" style="color:red" />
+              </el-tooltip>
+              {{ $t('common:button:save') }}
+            </el-button>
           </div>
         </template>
 
@@ -361,6 +371,9 @@ export default {
     addAnnotation(question) {
       DicomEvent.$emit('addAnnotation', question)
     },
+    saveAnnotation(question) {
+      DicomEvent.$emit('saveAnnotation', question)
+    },
     removeAnnotation(question) {
       DicomEvent.$emit('locateAnnotation', question)
       // 是否确认清除标记？
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index c8939620..6705149f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -113,24 +113,31 @@ export default {
     DicomEvent.$on('setReadingState', readingTaskState => {
       this.readingTaskState = readingTaskState
     })
-    DicomEvent.$on('handleSaveQuestions', readingTaskState => {
-      this.handleSave()
-    })
-    DicomEvent.$on('addAnnotation', obj => {
-      this.addAnnotation(obj)
-    })
-    DicomEvent.$on('removeAnnotation', obj => {
-      this.removeAnnotation(obj)
-    })
-    DicomEvent.$on('locateAnnotation', obj => {
-      this.locateAnnotation(obj)
-    })
+    if (this.groupClassify === 3) {
+      DicomEvent.$on('addAnnotation', obj => {
+        this.$set(obj, 'SaveEnum', 1)
+        this.addAnnotation(obj)
+      })
+      DicomEvent.$on('removeAnnotation', obj => {
+        this.removeAnnotation(obj)
+      })
+      DicomEvent.$on('saveAnnotation', obj => {
+        this.saveAnnotation(obj)
+      })
+
+      DicomEvent.$on('locateAnnotation', obj => {
+        this.locateAnnotation(obj)
+      })
+    }
   },
   beforeDestroy() {
     DicomEvent.$off('setReadingState')
-    DicomEvent.$off('addAnnotation')
-    DicomEvent.$off('removeAnnotation')
-    DicomEvent.$off('locateAnnotation')
+    if (this.groupClassify === 3) {
+      DicomEvent.$off('addAnnotation')
+      DicomEvent.$off('removeAnnotation')
+      DicomEvent.$off('saveAnnotation')
+      DicomEvent.$off('locateAnnotation')
+    }
   },
   methods: {
     async getQuestions(visitTaskId) {
@@ -227,10 +234,12 @@ export default {
           if (i.QuestionType === 60) {
             // 脾尖位置
             this.spleenTopId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
           if (i.QuestionType === 61) {
             // 脾底位置
             this.spleenBottomId = i.Id
+            this.$set(i, 'SaveEnum', 0)
           }
         }
         if (i.Childrens && i.Childrens.length > 0) {
@@ -276,10 +285,6 @@ export default {
       this.loading = true
       var answers = []
       var imageQuality = null
-      if (this.groupClassify === 3) {
-        await this.uploadScreenshot()
-      }
-
       for (const k in this.questionForm) {
         answers.push({ id: k, answer: this.questionForm[k] })
         if (k === this.imageQualityId) {
@@ -291,17 +296,17 @@ export default {
         answers: answers
 
       }
-      if (this.groupClassify === 3) {
-        var questionMarkInfoList = []
-        this.measurements.forEach(item => {
-          var i = Object.assign({}, item)
-          if (i.MeasureData) {
-            i.MeasureData = JSON.stringify(i.MeasureData)
-          }
-          questionMarkInfoList.push(i)
-        })
-        params.questionMarkInfoList = questionMarkInfoList
-      }
+      // if (this.groupClassify === 3) {
+      //   var questionMarkInfoList = []
+      //   this.measurements.forEach(item => {
+      //     var i = Object.assign({}, item)
+      //     if (i.MeasureData) {
+      //       i.MeasureData = JSON.stringify(i.MeasureData)
+      //     }
+      //     questionMarkInfoList.push(i)
+      //   })
+      //   params.questionMarkInfoList = questionMarkInfoList
+      // }
 
       saveImageQuality(params).then(async res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
@@ -359,16 +364,6 @@ export default {
         return { isSuccess: false, result: e }
       }
     },
-    // 上传截图
-    async uploadScreenshot() {
-      for (let i = 0; i < this.measurements.length; i++) {
-        if (this.measurements[i].pictureBaseStr) {
-          var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, this.measurements[i].pictureBaseStr)
-          this.measurements[i].PicturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-          this.measurements[i].pictureBaseStr = ''
-        }
-      }
-    },
     async uploadScreenshots(fileName, file) {
       try {
         file = this.convertBase64ToBlob(file)
@@ -436,6 +431,73 @@ export default {
       this.setSpleenCommentDisplay()
       this.formChanged = true
     },
+    saveAnnotation(question) {
+      this.loading = true
+      // 获取截图
+      var answers = []
+      var questionMarkInfoList = []
+      var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
+      if (!annotationObj) {
+        this.loading = false
+        return
+      }
+      DicomEvent.$emit('getScreenshots', { questionId: annotationObj.Id, visitTaskId: this.visitTaskId, lesionName: annotationObj.OrderMarkName, markTool: annotationObj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!annotationObj.MeasureData }, async val => {
+        var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+        var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+        if (annotationObj && annotationObj.MeasureData) {
+          annotationObj.MeasureData = JSON.stringify(annotationObj.MeasureData)
+          annotationObj.PicturePath = picturePath
+          questionMarkInfoList.push(annotationObj)
+        }
+        for (const k in this.questionForm) {
+          if (k === question.Id) {
+            answers.push({ id: k, answer: this.questionForm[k] })
+            break
+          }
+        }
+        var params = {
+          visitTaskId: this.visitTaskId,
+          answers,
+          questionMarkInfoList
+        }
+        saveImageQuality(params).then(async res => {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.loading = false
+          this.$set(question, 'SaveEnum', 0)
+          DicomEvent.$emit('getReportInfo', true)
+        }).catch(() => {
+          this.loading = false
+        })
+      })
+
+      // if (this.criterionType === 2 && this.groupClassify === 3) {
+      //   var currentSpleenStatus = this.questionForm[this.spleenStatusId]
+      //   var currentSpleenLength = this.questionForm[this.spleenLengthId]
+      //   currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
+      //   var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+      //   var slIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+      //   if (currentSpleenLength && currentSpleenStatus === 5) {
+      //     // '脾脏状态为不可评估，不需要添加标记!'
+      //     this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+      //       callback: _ => {}
+      //     })
+      //   } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
+      //     // 若有标记，状态不可为“无法评估”
+      //     this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
+      //       callback: _ => {}
+      //     })
+      //   } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
+      //     this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
+      //       callback: _ => {}
+      //     })
+      //   } else {
+      //     this.saveQuestionsList()
+      //   }
+      // } else {
+      //   this.saveQuestionsList()
+      // }
+      // this.saveQuestionsList()
+    },
     locateAnnotation(obj) {
       const { Id } = obj
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
@@ -504,6 +566,19 @@ export default {
         DicomEvent.$emit('questionFormChange', true)
       }
       this.formChanged = true
+      this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+    },
+    setQuestionStatus(obj, questionType) {
+      console.log(obj, questionType)
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].QuestionType === questionType) {
+          this.$set(obj[i], 'SaveEnum', 1)
+          break
+        }
+        if (obj[i].Childrens && obj[i].Childrens.length > 0) {
+          this.setQuestionStatus(obj[i].Childrens, questionType)
+        }
+      }
     },
     getSpleenL() {
       var length = null
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 54e56644..35537094 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -496,7 +496,7 @@ export default {
             item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
           DicomEvent.$emit('imageLocation', obj)
           var type = null
           if (this.questionForm.RowId) {
@@ -1319,7 +1319,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index f782e925..f1bef7f1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -454,7 +454,7 @@ export default {
             item.Answer = this.questionForm[item.Id] ? this.questionForm[item.Id] : ''
             arr.push(item)
           })
-          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionType: this.lesionType }
+          var obj = { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }
           DicomEvent.$emit('imageLocation', obj)
           var type = null
           if (this.questionForm.RowId) {
@@ -970,7 +970,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index a7f99c49..a7995639 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -690,6 +690,7 @@ export default {
           await store.dispatch('reading/setCurrentReadingTaskState', 2)
           var isAutoTask = await this.getAutoTaskVal()
           if (isAutoTask) {
+            DicomEvent.$emit('reload')
             // DicomEvent.$emit('getNextTask')
             window.location.reload()
           } else {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 2f0070d4..5831172b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -78,7 +78,7 @@
                   </p>
 
                   <div class="flex-div">
-                    <div v-if="measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
+                    <div v-if="measureData && measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
                       <!-- 有标注 -->
                       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')" placement="right">
                         <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />
@@ -718,7 +718,7 @@ export default {
         // requestPoolManager.startTaskTimer()
         this.imageList.map(image => {
           requestPoolManager.loadAndCacheImagePlus(image.imageId, image.seriesId, image.priority).then(res => {
-            if(res){
+            if (res) {
               this.imageLoaded(image, res.data.string('x0020000e'))
             }
           })
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 6f199749..9d846ebe 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -78,7 +78,7 @@
                   </p>
 
                   <div class="flex-div">
-                    <div v-if="measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
+                    <div v-if="measureData && measureData.findIndex(v=>v.SeriesId === series.seriesId && v.MeasureData) > -1">
                       <!-- 有标注 -->
                       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:marked')" placement="right">
                         <i class="el-icon-star-on" style="font-size: 16px;color: #ff5722;" />

From 0cd33687ee350fc23983df45bc065c096a8b76a7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 13:26:50 +0800
Subject: [PATCH 190/374] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=BB=93=E6=9E=9C=E6=97=B6=E9=AA=8C=E8=AF=81=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E6=9C=89=E6=A0=87=E6=B3=A8=E6=B5=8B=E9=87=8F=E4=B8=BA=E5=AE=8C?=
 =?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 30 +++++++++++++++----
 .../reading/dicoms/components/Questions.vue   | 26 ++++++++++++++--
 2 files changed, 48 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index fe8a227a..8dbf49ec 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -105,10 +105,11 @@ export default {
       this.resetSuvQuestions()
     })
     FusionEvent.$on('addAnnotation', obj => {
-      this.$set(obj, 'SaveEnum', 0)
+      this.$set(obj, 'SaveEnum', 1)
       this.addAnnotation(obj)
     })
     FusionEvent.$on('removeAnnotation', obj => {
+      this.$set(obj, 'SaveEnum', 0)
       this.removeAnnotation(obj)
     })
     FusionEvent.$on('locateAnnotation', obj => {
@@ -235,7 +236,12 @@ export default {
     handleSave() {
       this.$refs['questions'].validate((valid) => {
         if (!valid) return
-
+        // 是否有标记未保存
+        var existUnSave = this.checkAnnotationStatus(this.questions)
+        if (existUnSave) {
+          this.$alert(this.$t('trials:lugano:message:saveWarning1'))
+          return
+        }
         // 肝脏血池SUVmax
         const liverSUVmax = !isNaN(parseFloat(this.questionForm[this.liverSuvmaxId])) ? parseFloat(this.questionForm[this.liverSuvmaxId]) : 0
         // 纵膈血池SUVmax
@@ -295,6 +301,18 @@ export default {
         this.loading = false
       })
     },
+    checkAnnotationStatus(obj) {
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].SaveEnum === 1) {
+          return true
+        }
+        if (obj[i].Childrens && obj[i].Childrens.length > 0) {
+          if (this.checkAnnotationStatus(obj[i].Childrens)) {
+            return true
+          }
+        }
+      }
+    },
     addAnnotation(obj) {
       const { Id, QuestionType } = obj
       this.currentQsId = Id
@@ -443,19 +461,19 @@ export default {
       }
     },
     setQuestionStatus(obj, questionType) {
-      console.log(obj, questionType)
       for (let i = 0; i < obj.length; i++) {
         if (obj[i].QuestionType === questionType) {
           this.$set(obj[i], 'SaveEnum', 1)
-          break
+          return true
         }
         if (obj[i].Childrens && obj[i].Childrens.length > 0) {
-          this.setQuestionStatus(obj[i].Childrens, questionType)
+          if (this.setQuestionStatus(obj[i].Childrens, questionType)) {
+            return true
+          }
         }
       }
     },
     setOutsideMeasuredData(measurement) {
-      console.log('setOutsideMeasuredData: ', measurement)
       if ((measurement.data.remark === 'Liver' && this.liverIsInsideVolume === false) || (measurement.data.remark === 'Mediastinum' && this.lungIsInsideVolume === false)) {
         return
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 6705149f..a3948634 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -119,6 +119,7 @@ export default {
         this.addAnnotation(obj)
       })
       DicomEvent.$on('removeAnnotation', obj => {
+        this.$set(obj, 'SaveEnum', 0)
         this.removeAnnotation(obj)
       })
       DicomEvent.$on('saveAnnotation', obj => {
@@ -251,8 +252,15 @@ export default {
     handleSave() {
       this.$refs['questions'].validate(async(valid) => {
         if (!valid) return
+
         // lugano标准校验脾脏状态是否符合要求
         if (this.criterionType === 2 && this.groupClassify === 3) {
+          // 是否有标记未保存
+          var existUnSave = this.checkAnnotationStatus(this.questions)
+          if (existUnSave) {
+            this.$alert(this.$t('trials:lugano:message:saveWarning'))
+            return
+          }
           var currentSpleenStatus = this.questionForm[this.spleenStatusId]
           var currentSpleenLength = this.questionForm[this.spleenLengthId]
           currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
@@ -337,6 +345,18 @@ export default {
         this.loading = false
       })
     },
+    checkAnnotationStatus(obj) {
+      for (let i = 0; i < obj.length; i++) {
+        if (obj[i].SaveEnum === 1) {
+          return true
+        }
+        if (obj[i].Childrens && obj[i].Childrens.length > 0) {
+          if (this.checkAnnotationStatus(obj[i].Childrens)) {
+            return true
+          }
+        }
+      }
+    },
     setSpleenCommentDisplay() {
       if (this.spleenCommentsId && this.spleenStatusId) {
         for (let i = 0; i < this.questions[0].Childrens.length; i++) {
@@ -573,10 +593,12 @@ export default {
       for (let i = 0; i < obj.length; i++) {
         if (obj[i].QuestionType === questionType) {
           this.$set(obj[i], 'SaveEnum', 1)
-          break
+          return true
         }
         if (obj[i].Childrens && obj[i].Childrens.length > 0) {
-          this.setQuestionStatus(obj[i].Childrens, questionType)
+          if (this.setQuestionStatus(obj[i].Childrens, questionType)) {
+            return true
+          }
         }
       }
     },

From 49d3247f2718eef53b785711eb2f222e2c431a2a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 13:49:45 +0800
Subject: [PATCH 191/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/dicoms/components/Questions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index a3948634..75bc7176 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -265,7 +265,7 @@ export default {
           var currentSpleenLength = this.questionForm[this.spleenLengthId]
           currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
           var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
-          var slIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+          var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {

From 83c441b7dec100e4fc2e3c137c6c15bec4bb4b41 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 14:00:39 +0800
Subject: [PATCH 192/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E8=AF=AD=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue           | 2 +-
 .../trials-panel/reading/dicoms/components/Questions.vue     | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 8dbf49ec..701dbbf3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -239,7 +239,7 @@ export default {
         // 是否有标记未保存
         var existUnSave = this.checkAnnotationStatus(this.questions)
         if (existUnSave) {
-          this.$alert(this.$t('trials:lugano:message:saveWarning1'))
+          this.$alert(this.$t('trials:lugano:message:saveWarning1'),this.$t('trials:lugano:fusionDialog:warning'))
           return
         }
         // 肝脏血池SUVmax
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 75bc7176..f6109239 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -258,7 +258,7 @@ export default {
           // 是否有标记未保存
           var existUnSave = this.checkAnnotationStatus(this.questions)
           if (existUnSave) {
-            this.$alert(this.$t('trials:lugano:message:saveWarning'))
+            this.$alert(this.$t('trials:lugano:message:saveWarning'),this.$t('trials:lugano:fusionDialog:warning'))
             return
           }
           var currentSpleenStatus = this.questionForm[this.spleenStatusId]
@@ -441,8 +441,9 @@ export default {
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return
       this.$set(this.questionForm, Id, '')
-      if (this.measurements[idx].QuestionType === 48) {
+      if (obj.QuestionType === 60 || obj.QuestionType === 61) {
         this.$set(this.questionForm, this.spleenStatusId, '')
+        this.$set(this.questionForm, this.spleenLengthId, '')
       }
       await store.dispatch('reading/removeNonTargetMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measurements[idx].MeasureData, questionId: Id })
       this.measurements.splice(idx, 1)

From a86c4bdd0ee7bd8d5cc11953e2879cb74292aa34 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 16:52:47 +0800
Subject: [PATCH 193/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        | 22 ++-----------------
 .../dicoms/components/Fusion/Questions.vue    | 13 ++++++-----
 .../dicoms/components/Lugano/QuestionForm.vue |  5 +++--
 .../reading/dicoms/components/Questions.vue   | 13 ++++++-----
 4 files changed, 20 insertions(+), 33 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index dbc65232..5cc0df6f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -1978,7 +1978,7 @@ export default {
     imageLocation(obj) {
       return new Promise(resolve => {
         console.log('imageLocation')
-        this.setToolToTarget(obj)
+        this.setToolToTarget()
         if (!obj.otherMeasureData) {
           resolve()
           return
@@ -2005,24 +2005,7 @@ export default {
       })
     },
     setToolToTarget(obj) {
-      var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]
-      if (this.readingTaskState < 2 && obj.markTool && !obj.isMarked) {
-        toolGroupIds.forEach((toolGroupId) => {
-          const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-          if (this.activeTool) {
-            toolGroup.setToolPassive(this.activeTool)
-          }
-          toolGroup.setToolActive(obj.markTool, {
-            bindings: [
-              {
-                mouseButton: MouseBindings.Primary // Left Click
-              }
-            ]
-          })
-        })
-        this.activeTool = obj.markTool
-      } else {
-        if (this.activeTool === obj.markTool) {
+      if (this.activeTool) {
           toolGroupIds.forEach((toolGroupId) => {
             const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
 
@@ -2030,7 +2013,6 @@ export default {
           })
           this.activeTool = ''
         }
-      }
       this.isNonTargetMeasurement = false
     },
     getTargetIdImage(
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 701dbbf3..da3a28b4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -378,18 +378,19 @@ export default {
         loading.close()
         return
       }
-      FusionEvent.$emit('getScreenshots', { otherMeasureData: annotationObj.OtherMeasureData }, async val => {
+       var obj = Object.assign({},annotationObj)
+      FusionEvent.$emit('getScreenshots', { otherMeasureData: obj.OtherMeasureData }, async val => {
         var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
         var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
 
-        if (annotationObj && annotationObj.OtherMeasureData) {
-          var otherMeasureData = Object.assign({}, annotationObj.OtherMeasureData)
+        if (obj && obj.OtherMeasureData) {
+          var otherMeasureData = Object.assign({}, obj.OtherMeasureData)
           for (const k in otherMeasureData.data.cachedStats) {
             otherMeasureData.data.cachedStats[k].pointsInShape = []
           }
-          annotationObj.OtherMeasureData = JSON.stringify(otherMeasureData)
-          annotationObj.OtherPicturePath = picturePath
-          questionMarkInfoList.push(annotationObj)
+          obj.OtherMeasureData = JSON.stringify(otherMeasureData)
+          obj.OtherPicturePath = picturePath
+          questionMarkInfoList.push(obj)
         }
         for (const k in this.questionForm) {
           if (k === question.Id) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 1dff7ca5..0e1d6d8d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -5,7 +5,7 @@
     v-loading="loading"
     :model="questionForm"
     size="mini"
-    class="measurement-form"
+    class="measurement-form" 
   >
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
@@ -179,6 +179,7 @@
           </el-radio-group>
           <template v-if="qs.QuestionMark === 20">
             <div style="display: flex;flex-direction: row;justify-content: flex-start;">
+              
               <el-input
                 v-if="qs.Type==='calculation'"
                 v-model="questionForm[qs.Id]"
@@ -197,7 +198,7 @@
                 :images="[`${OSSclientConfig.basePath}${answers.OtherPicturePath}`]"
               >
                 <span style="color:#409eff;cursor: pointer" @click="previewImage()">
-                  {{ $t('trials:lugano:button:suvscreenshot') }}
+                  {{ $t('trials:lugano:button:suvscreenshot1') }}
                 </span>
                 <img
                   v-show="false"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index f6109239..4827806e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -462,13 +462,16 @@ export default {
         this.loading = false
         return
       }
-      DicomEvent.$emit('getScreenshots', { questionId: annotationObj.Id, visitTaskId: this.visitTaskId, lesionName: annotationObj.OrderMarkName, markTool: annotationObj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!annotationObj.MeasureData }, async val => {
+      var obj = Object.assign({},annotationObj)
+      DicomEvent.$emit('getScreenshots', { questionId: obj.Id, visitTaskId: this.visitTaskId, lesionName: obj.OrderMarkName, markTool: obj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!obj.MeasureData }, async val => {
         var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
         var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-        if (annotationObj && annotationObj.MeasureData) {
-          annotationObj.MeasureData = JSON.stringify(annotationObj.MeasureData)
-          annotationObj.PicturePath = picturePath
-          questionMarkInfoList.push(annotationObj)
+        
+        if (obj && obj.MeasureData) {
+          var annotation = Object.assign({},obj.MeasureData)
+          obj.MeasureData = JSON.stringify(annotation)
+          obj.PicturePath = picturePath
+          questionMarkInfoList.push(obj)
         }
         for (const k in this.questionForm) {
           if (k === question.Id) {

From d18d61ee01dd983cf3daf4946b70c3d89886db39 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 16:58:59 +0800
Subject: [PATCH 194/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Fusion/TableQuestionItem.vue   | 64 +++++++++++--------
 1 file changed, 36 insertions(+), 28 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index ef92f27a..cf5a5eef 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -572,36 +572,44 @@ export default {
             }
             FusionEvent.$emit('addOrUpdateAnnotations', { data })
           }
-          if (!isInit) {
-            // if (this.questionForm.RowId) {
-            //   this.$set(this.questionForm, 'saveTypeEnum', 1)
-            // } else {
-            //   this.$set(this.questionForm, 'saveTypeEnum', 0)
-            // }
-            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
-            if (this.questionForm.OtherMeasureData) {
-              var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
+          // if (!isInit) {
+          //   // if (this.questionForm.RowId) {
+          //   //   this.$set(this.questionForm, 'saveTypeEnum', 1)
+          //   // } else {
+          //   //   this.$set(this.questionForm, 'saveTypeEnum', 0)
+          //   // }
+          //   // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+          //   if (this.questionForm.OtherMeasureData) {
+          //     var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
 
-              if (annotation && this.firstRenderAnnotation) {
-                for (const k in annotation.data.cachedStats) {
-                  if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
-                    this.firstRenderAnnotation = false
-                    break
-                  }
-                }
-              }
+          //     if (annotation && this.firstRenderAnnotation) {
+          //       for (const k in annotation.data.cachedStats) {
+          //         if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
+          //           this.firstRenderAnnotation = false
+          //           break
+          //         }
+          //       }
+          //     }
+          //   } else {
+          //     this.firstRenderAnnotation = false
+          //   }
+          //   if (!this.firstRenderAnnotation) {
+          //     if (this.questionForm.RowId) {
+          //       this.$set(this.questionForm, 'saveTypeEnum', 1)
+          //     } else {
+          //       this.$set(this.questionForm, 'saveTypeEnum', 0)
+          //     }
+          //   } else {
+          //     this.$set(this.questionForm, 'saveTypeEnum', 2)
+          //     this.$emit('close')
+          //   }
+          // }
+          if (!isInit) {
+            // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
+            if (this.questionForm.RowId) {
+              this.$set(this.questionForm, 'saveTypeEnum', 1)
             } else {
-              this.firstRenderAnnotation = false
-            }
-            if (!this.firstRenderAnnotation) {
-              if (this.questionForm.RowId) {
-                this.$set(this.questionForm, 'saveTypeEnum', 1)
-              } else {
-                this.$set(this.questionForm, 'saveTypeEnum', 0)
-              }
-            } else {
-              this.$set(this.questionForm, 'saveTypeEnum', 2)
-              this.$emit('close')
+              this.$set(this.questionForm, 'saveTypeEnum', 0)
             }
           }
           this.$set(this.questionForm, 'OtherMeasureData', measureData.data)

From f960eeb445a8a3721aee2fda6c5ff65482c14118 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 17:35:28 +0800
Subject: [PATCH 195/374] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/VisitReview.vue         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
index 4b878160..5b07d688 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/VisitReview.vue
@@ -64,7 +64,6 @@
       :label="$t('trials:medicalFeedback:title:currentReader')"
       show-overflow-tooltip
       width="120"
-      fixed="right"
     >
       <template slot-scope="scope">
         <el-button

From 16f943dd50c1bc395b4676cd564eabf8b5d78c56 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 22 Mar 2024 17:43:54 +0800
Subject: [PATCH 196/374] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E7=9A=84=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/OncologyReview.vue      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
index a83da997..62dd583c 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/OncologyReview.vue
@@ -137,7 +137,6 @@
         v-if="oncologyInfo.IsShowDetail"
         :label="$t('common:action:action')"
         width="120"
-        fixed="right"
       >
         <template slot-scope="scope">
           <!-- 查看详情 -->

From 3fbc2710a3489a39b4e4c959f9768c6443688942 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 25 Mar 2024 12:20:41 +0800
Subject: [PATCH 197/374] =?UTF-8?q?=E5=BD=93=E4=B8=8A=E4=BC=A0=E4=BA=86pet?=
 =?UTF-8?q?=E5=BA=8F=E5=88=97=E5=9B=BE=E5=83=8F=E6=97=B6=EF=BC=8C=E6=A0=A1?=
 =?UTF-8?q?=E9=AA=8C=E6=8F=90=E9=86=92=E4=B8=8A=E4=BC=A0PET=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadDicomFiles2.vue          | 46 +++++++++++++++++--
 .../trials-panel/visit/crc-upload/index.vue   |  2 +-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 88c41778..65a893dd 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -506,7 +506,7 @@
 </template>
 <script>
 import {
-  dicomUploadInProgress, batchVerifyStudyAllowUpload, getSubjectVisitUploadedStudyList, deleteStudyList, updateModality, preArchiveDicomStudy, addOrUpdateArchiveStudy
+  dicomUploadInProgress, batchVerifyStudyAllowUpload, getSubjectVisitUploadedStudyList, deleteStudyList, updateModality, preArchiveDicomStudy, addOrUpdateArchiveStudy,getCRCClinicalData
 } from '@/api/trials'
 import store from '@/store'
 import * as dicomParser from 'dicom-parser'
@@ -538,6 +538,10 @@ export default {
     subjectId: {
       type: String,
       required: true
+    },
+    activeName:{
+       type: String,
+      required: true
     }
   },
   data() {
@@ -631,8 +635,37 @@ export default {
     format(v) {
       return v
     },
+    // 获取临床数据
+    getClinicalData() {
+      // this.data.TrialId = this.$route.query.trialId
+      var param = {
+        subjectVisitId: this.subjectVisitId,
+        trialId: this.trialId,
+        subjectId: this.data.SubjectId,
+        isBaseLine: this.data.IsBaseLine
+      }
+      getCRCClinicalData(param).then(res => {
+        if(res.IsSuccess){
+          let flag = res.Result.some(item=>item.ClinicalDataLevel===4&&item.PDFFileList.length===0)
+          if(flag){
+          this.$confirm(this.$t("trials:crc-upload:confirm:message"), this.$t('trials:uploadDicomList:label:prompt'), {
+              confirmButtonText: this.$t('trials:reviewTrack:impactList:save'),
+              cancelButtonText: this.$t("common:button:cancel"),
+              type: 'warning'
+            }).then(() => {
+              this.$emit("update:activeName",'clinical-data');
+            }).catch(() => {         
+            });
+          }
+        }
+        // this.clinicalDatas = res.Result
+        // this.loading = false
+      }).catch(() => {
+        // this.loading = false
+      })
+    },
     // 获取已上传的dicom影像
-    getStudyInfo() {
+    getStudyInfo(submitFlag=false) {
       this.studyLoading = true
       getSubjectVisitUploadedStudyList(this.subjectVisitId).then(res => {
         this.studyList = res.Result
@@ -641,7 +674,12 @@ export default {
           this.relationInfo.BodyPartTypes ? this.relationInfo.BodyPartTypes.split('|') : []
         this.trialModalitys =
           this.relationInfo.Modalitys ? this.relationInfo.Modalitys.split('|') : []
-        this.studyLoading = false
+        this.studyLoading = false;
+        let flag = res.Result.some(item=>item.Modalities==='PET-CT'||item.ModalityForEdit==='PET-CT'||item.ModalityForEdit==='CT、PT'||item.Modalities==='CT、PT')
+        console.log(submitFlag,'submitFlag')
+        if(flag&&submitFlag){
+          this.getClinicalData();
+        }
       }).catch(() => { this.studyLoading = false })
     },
     // 预览单个检查影像
@@ -1323,7 +1361,7 @@ export default {
                   scope.studyErrorList.push(dicomInfo.accNumber)
                 }
                 scope.uploadQueues[index].uploadState.record = Record
-                scope.getStudyInfo()
+                scope.getStudyInfo(true)
                 if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {
                   scope.$emit('getList')
                 }
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 4e38cce9..9faa834b 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -479,7 +479,7 @@
         <el-tabs v-model="activeName" type="border-card" style="flex:1;">
           <!-- DICOM影像上传 -->
           <el-tab-pane :label="$t('trials:uploadedDicoms:tab:uploadDicoms')" name="dicom">
-            <upload-dicom-files2 v-if="uploadVisible2" :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" />
+            <upload-dicom-files2 v-if="uploadVisible2" :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
             <upload-dicom-files v-else :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" @setOpenWindow="setOpenWindow"/>
           </el-tab-pane>
           <!-- 非DICOM影像上传 -->

From 5df5836571278cadbfef2c7270f4a572b69d3179 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 25 Mar 2024 13:20:50 +0800
Subject: [PATCH 198/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mim-medical-audit/components/Conclusions.vue     |  2 +-
 .../crc-upload/components/uploadDicomFiles2.vue      | 12 +++++-------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 265ce58d..8fdb2328 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -22,7 +22,7 @@
           @change="isHaveQuestionChange"
         >
           <el-radio
-            v-for="item of $d.YesOrNo"
+            v-for="item of $d.IsPass"
             :key="'IsHaveQuestion' + item.value"
             :label="item.value"
           >
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 65a893dd..9cdc8048 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -675,11 +675,6 @@ export default {
         this.trialModalitys =
           this.relationInfo.Modalitys ? this.relationInfo.Modalitys.split('|') : []
         this.studyLoading = false;
-        let flag = res.Result.some(item=>item.Modalities==='PET-CT'||item.ModalityForEdit==='PET-CT'||item.ModalityForEdit==='CT、PT'||item.Modalities==='CT、PT')
-        console.log(submitFlag,'submitFlag')
-        if(flag&&submitFlag){
-          this.getClinicalData();
-        }
       }).catch(() => { this.studyLoading = false })
     },
     // 预览单个检查影像
@@ -1353,7 +1348,6 @@ export default {
             if (logRes && logRes.url) {
               params.study.instanceCount = dicomInfo.failedFileCount
               params.RecordPath = scope.$getObjectName(logRes.url)
-              console.log(JSON.stringify(params))
               addOrUpdateArchiveStudy(params).then(res => {
                 if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
                   scope.$message.success(scope.$t('trials:uploadDicomList:label:uploaded'))
@@ -1361,7 +1355,11 @@ export default {
                   scope.studyErrorList.push(dicomInfo.accNumber)
                 }
                 scope.uploadQueues[index].uploadState.record = Record
-                scope.getStudyInfo(true)
+                let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT';
+                if(flag){
+                  scope.getClinicalData();
+                }
+                scope.getStudyInfo()
                 if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {
                   scope.$emit('getList')
                 }

From eed3cac20e3f46bf6cdca52c62ceb9c7676f86bd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 25 Mar 2024 15:03:11 +0800
Subject: [PATCH 199/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/reading-period/components/ClinicalData.vue        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index 2225a8ec..43259ec2 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -1,7 +1,8 @@
 <template>
   <div class="clinical-data_content">
     <el-tabs type="card" v-model="clinicalType" v-if="!(data.IsVisit || data.IsBaseLine)">
-      <el-tab-pane v-for="item in $d.GetClinicalType" :key="item.Id" :label="item.label" :name="item.value.toString()">
+      <template v-for="item in $d.GetClinicalType">
+      <el-tab-pane :key="item.Id" :label="item.label" :name="item.value.toString()" v-if="item.value===1">
         <div v-if="item.value === 1">
           <h4 style="margin:0">
             <!-- 提示： -->
@@ -210,6 +211,7 @@
           </el-dialog>
         </div>
       </el-tab-pane>
+      </template>
     </el-tabs>
     <div v-else>
       <div class="top">

From 5e56098750a2d003d84f376446e3af69952fbe06 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 25 Mar 2024 15:12:48 +0800
Subject: [PATCH 200/374] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=BC=B9=E6=A1=86=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consistency-analysis/components/VirtualCenter.vue  | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index 1f02ceca..da493dbb 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -9,11 +9,13 @@
     label-width="170px"
     @submit.native.prevent
   >
-    <div class="base-dialog-body" style="position: relative;padding-top: 50px">
-      <el-button @click="openSiteCodeHistory" type="text" style="position: absolute;right: 10px;top: 10px;">{{$t('trials:consistencyAnalysisRule:table:SiteCodeHistory')}}</el-button>
+    <div class="base-dialog-body" style="position: relative;padding-top: 20px">
       <!-- 访视数 -->
       <el-form-item :label="$t('trials:consistencyAnalysisRule:table:nowSiteCode')">
-        {{ OtherInfo.VitrualSiteCode }}
+        <div style="display:flex;align-items:center;justify-content: space-between;">
+          <span>{{ OtherInfo.VitrualSiteCode }}</span>
+          <el-button @click="openSiteCodeHistory" type="text">{{$t('trials:consistencyAnalysisRule:table:SiteCodeHistory')}}</el-button>
+        </div>
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="VirtualSiteCode">
@@ -50,7 +52,7 @@
         v-loading="loading"
         :data="list"
         stripe
-        min-height="300"
+        height="300"
       >
         <el-table-column
           show-overflow-tooltip

From f17c2302673de17257174e1f547bd513ed7ef1e5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 25 Mar 2024 15:43:45 +0800
Subject: [PATCH 201/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85tip=E5=AD=97=E6=AE=B5=E6=9B=BF=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-period/components/ClinicalData.vue    | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index 43259ec2..732b7fee 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -10,7 +10,7 @@
           </h4>
           <h5>
             <!-- 当前访视/阅片期需要采集“临床数据名称”。请采集临床数据后，按照模板上传，并签名确认。 -->
-            {{ $t('trials:readingPeriod:cd:title:tips1') }}
+            {{ tips1 }}
           </h5>
           <h5>
             {{ $t('trials:readingPeriod:cd:title:tips2') }}
@@ -430,6 +430,7 @@ export default {
       otherInfo: {},
       spanArr: [],
       pos: 0,
+      tips1:null,
     }
   },
   mounted() {
@@ -484,7 +485,17 @@ export default {
       }
       this.loading = true
       getReadingClinicalDataList(this.searchData).then(res => {
-        this.list = res.Result
+        this.list = res.Result;
+        let message ="";
+        this.list.forEach((item,index)=>{
+          if(index<1){
+            message += item.ClinicalDataSetName;
+          }else{
+            message =message + "、" + item.ClinicalDataSetName;
+          }
+        })
+        this.tips1 = this.$t('trials:readingPeriod:cd:title:tips1').replace('临床数据名称',message);
+        this.tips1 = this.tips1.replace("xxx",message);
         this.pos = 0
         this.getSpanArr(this.list)
         this.otherInfo = res.OtherInfo

From c2dc340a1defbd4688e708ceb68b692716bfea07 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 25 Mar 2024 16:22:45 +0800
Subject: [PATCH 202/374] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B0=B4=E5=8D=B0?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.development           | 3 +++
 .env.prod                  | 3 +++
 .env.uat                   | 3 +++
 .env.usa                   | 3 +++
 package.json               | 2 +-
 src/main.js                | 1 +
 static/pdfjs/web/viewer.js | 3 ++-
 7 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/.env.development b/.env.development
index 0819ca53..1795b787 100644
--- a/.env.development
+++ b/.env.development
@@ -35,6 +35,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!
 # 是否开启文档签署验证 true:是 false:否
 VUE_APP_WORD_FOR_PERMISSION = false
 
+# 公司名称
+VUE_APP_COMPANY_NAME = "Extensive Imaging"
+
 
 # dicom文件地址
 VUE_APP_DICOM_PATH = 'https://zyypacs.oss-cn-shanghai.aliyuncs.com'
diff --git a/.env.prod b/.env.prod
index 9b2fc4e8..49d97ae9 100644
--- a/.env.prod
+++ b/.env.prod
@@ -29,6 +29,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!
 # 是否开启文档签署验证 true:是 false:否
 VUE_APP_WORD_FOR_PERMISSION = true
 
+# 公司名称
+VUE_APP_COMPANY_NAME = "Extensive Imaging"
+
 # dicom文件地址
 # VUE_APP_DICOM_PATH = 'http://101.132.193.237:7080'
 VUE_APP_DICOM_PATH = 'https://zyypacs-prod.oss-cn-shanghai.aliyuncs.com'
diff --git a/.env.uat b/.env.uat
index e0ad567f..1f04b231 100644
--- a/.env.uat
+++ b/.env.uat
@@ -31,6 +31,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!
 # 是否开启文档签署验证 true:是 false:否
 VUE_APP_WORD_FOR_PERMISSION = true
 
+# 公司名称
+VUE_APP_COMPANY_NAME = "Extensive Imaging"
+
 # dicom文件地址
 VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com'
 
diff --git a/.env.usa b/.env.usa
index b076b647..833c876c 100644
--- a/.env.usa
+++ b/.env.usa
@@ -28,6 +28,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!
 # 是否开启文档签署验证 true:是 false:否
 VUE_APP_WORD_FOR_PERMISSION = true
 
+# 公司名称
+VUE_APP_COMPANY_NAME = "Elevate Imaging"
+
 # dicom文件地址
 VUE_APP_DICOM_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com'
 
diff --git a/package.json b/package.json
index d568f644..21b0480e 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
   "name": "EICS",
   "version": "1.0.0",
   "scripts": {
-    "dev": "vue-cli-service serve --open",
+    "dev": "vue-cli-service serve --open --mode development",
     "build": "vue-cli-service build",
     "build:prod": "vue-cli-service  build --mode prod",
     "build:uat": "vue-cli-service  build --mode uat",
diff --git a/src/main.js b/src/main.js
index d5e5d04e..29ba2ca3 100644
--- a/src/main.js
+++ b/src/main.js
@@ -332,6 +332,7 @@ async function VueInit () {
   }
   const h = _vm.$createElement
   /* eslint-disable */
+  window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME;
   waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => {
       var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh'
       if ( _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') {
diff --git a/static/pdfjs/web/viewer.js b/static/pdfjs/web/viewer.js
index 3bc2cac4..b964aba8 100644
--- a/static/pdfjs/web/viewer.js
+++ b/static/pdfjs/web/viewer.js
@@ -12370,7 +12370,8 @@ class PDFPageView {
           c.style.fontWeight = '900'
           c.style.color = "rgba(0, 191, 255, 0.1)";
           // c.innerText = text;//text为水印内容，可以在viewer.html中传入，也可以直接替换成固定的字符串如：c.innerText = "这是一个水印";
-          c.innerText = `Extensive Imaging_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
+          console.log(window.VUE_APP_COMPANY_NAME)
+          c.innerText = `${window.VUE_APP_COMPANY_NAME }_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`;
           cover.appendChild(c);
         }
       }

From 88da86504d150bfed66cfd1aeaefa4513674a170 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Mar 2024 10:09:34 +0800
Subject: [PATCH 203/374] =?UTF-8?q?=E6=9C=AA=E4=B8=8A=E4=BC=A0=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE=E7=9A=84pet-ct=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0tip=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadDicomFiles2.vue          | 35 +++++++++++++++----
 1 file changed, 28 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 9cdc8048..3620c002 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -60,6 +60,12 @@
             </div>
             <span class="el-icon-warning" style="color: #cbb024;cursor: pointer" v-if="scope.row.IsHaveUploadFailed"></span>
           </el-tooltip>
+          <el-tooltip placement="top" v-if="scope.row.notClinicaData">
+            <div slot="content">
+              {{ $t('trials:crc-upload:confirm:message') }}
+            </div>
+            <span class="el-icon-warning" style="color: red;cursor: pointer"></span>
+          </el-tooltip>
           {{scope.row.StudyCode}}
         </template>
       </el-table-column>
@@ -310,14 +316,14 @@
               <div style="max-height: 500px;overflow-y: auto">
                 {{$t('trials:uploadDicomList:table:Existed')}}:
                 <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div v-for="item of scope.row.uploadState.record.Existed" style="font-size: 12px;color:#baa72a">{{item}}</div>
+                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item" style="font-size: 12px;color:#baa72a">{{item}}</div>
                 </div>
                 <div v-else>
                   &nbsp;
                 </div>
                 {{$t('trials:uploadDicomList:table:Uploaded')}}:
                 <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div v-for="item of scope.row.uploadState.record.Uploaded" style="font-size: 12px;color:#24b837">{{item}}</div>
+                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item" style="font-size: 12px;color:#24b837">{{item}}</div>
                 </div>
                 <div v-else>
                   &nbsp;
@@ -325,7 +331,7 @@
                 <br>
                 {{$t('trials:uploadDicomList:table:Failed')}}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div v-for="item of scope.row.uploadState.record.Failed" style="font-size: 12px;color:#f66">{{item}}</div>
+                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item" style="font-size: 12px;color:#f66">{{item}}</div>
                 </div>
                 <div v-else>
                   &nbsp;
@@ -636,7 +642,7 @@ export default {
       return v
     },
     // 获取临床数据
-    getClinicalData() {
+    getClinicalData(showConfirm = false, data = []) {
       // this.data.TrialId = this.$route.query.trialId
       var param = {
         subjectVisitId: this.subjectVisitId,
@@ -648,6 +654,16 @@ export default {
         if(res.IsSuccess){
           let flag = res.Result.some(item=>item.ClinicalDataLevel===4&&item.PDFFileList.length===0)
           if(flag){
+          if(!showConfirm){
+            data.forEach(item =>{
+              item.notClinicaData = false;
+              if(item.Modalities==="CT、PT"||item.Modalities==="PT、CT"||item.Modalities==="PET-CT"){
+                item.notClinicaData = true;
+              }
+            })
+            this.studyList = data;
+            return false;
+          }
           this.$confirm(this.$t("trials:crc-upload:confirm:message"), this.$t('trials:uploadDicomList:label:prompt'), {
               confirmButtonText: this.$t('trials:reviewTrack:impactList:save'),
               cancelButtonText: this.$t("common:button:cancel"),
@@ -656,6 +672,9 @@ export default {
               this.$emit("update:activeName",'clinical-data');
             }).catch(() => {         
             });
+          }else{
+            if(showConfirm) return;
+            this.studyList = data;
           }
         }
         // this.clinicalDatas = res.Result
@@ -665,16 +684,17 @@ export default {
       })
     },
     // 获取已上传的dicom影像
-    getStudyInfo(submitFlag=false) {
+    getStudyInfo() {
       this.studyLoading = true
       getSubjectVisitUploadedStudyList(this.subjectVisitId).then(res => {
-        this.studyList = res.Result
+        // this.studyList = res.Result
         this.relationInfo = res.OtherInfo
         this.trialBodyPartTypes =
           this.relationInfo.BodyPartTypes ? this.relationInfo.BodyPartTypes.split('|') : []
         this.trialModalitys =
           this.relationInfo.Modalitys ? this.relationInfo.Modalitys.split('|') : []
         this.studyLoading = false;
+        this.getClinicalData(false,res.Result);
       }).catch(() => { this.studyLoading = false })
     },
     // 预览单个检查影像
@@ -1356,8 +1376,9 @@ export default {
                 }
                 scope.uploadQueues[index].uploadState.record = Record
                 let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT';
+                // let flag = params.study.seriesList.some(item=>item.modality==='PT');
                 if(flag){
-                  scope.getClinicalData();
+                  scope.getClinicalData(true);
                 }
                 scope.getStudyInfo()
                 if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {

From 33747d13174bc5b6b83c5d8961496a388389be5c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Mar 2024 12:17:18 +0800
Subject: [PATCH 204/374] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E4=BF=AE=E6=94=B9=E8=AE=B0=E5=BD=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/consistency-analysis/components/VirtualCenter.vue  | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index da493dbb..1b159222 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -141,4 +141,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+::v-deep .base-dialog-wrapper .el-dialog__body{
+  padding-bottom: 30px;
+}
 </style>

From 9bc0b7b02a9263df16c0f982a1a09c90e436bfcf Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 26 Mar 2024 13:51:24 +0800
Subject: [PATCH 205/374] =?UTF-8?q?MIP=E6=B7=BB=E5=8A=A0=E6=97=8B=E8=BD=AC?=
 =?UTF-8?q?=E6=8B=96=E6=8B=BD=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomCanvas.vue |   2 +-
 .../dicoms/components/Fusion/PetCt.vue        |  13 +-
 .../dicoms/components/Fusion/Viewport.vue     | 182 +++++++++++++++---
 .../reading/dicoms/components/Questions.vue   |   8 +-
 4 files changed, 166 insertions(+), 39 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 4d263a4a..8ce2f9b6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -660,7 +660,7 @@ export default {
       if (PX < 0) return
       if (PX > boxHeight) return
       var height = PX * 100 / boxHeight
-      var index = Math.trunc(this.stack.imageIds.length * this.height / 100)
+      var index = Math.trunc(this.stack.imageIds.length * height / 100)
       index = index > this.stack.imageIds.length ? this.stack.imageIds.length : index < 0 ? 0 : index
       // if (!cornerstone.imageCache.getImageLoadObject(this.stack.imageIds[index])) return
       this.height = height
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 5cc0df6f..d07be5d5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -2006,13 +2006,14 @@ export default {
     },
     setToolToTarget(obj) {
       if (this.activeTool) {
-          toolGroupIds.forEach((toolGroupId) => {
-            const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]
+        toolGroupIds.forEach((toolGroupId) => {
+          const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
 
-            toolGroup.setToolPassive(this.activeTool)
-          })
-          this.activeTool = ''
-        }
+          toolGroup.setToolPassive(this.activeTool)
+        })
+        this.activeTool = ''
+      }
       this.isNonTargetMeasurement = false
     },
     getTargetIdImage(
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 1a920846..fb78b20f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -2,7 +2,6 @@
   <div
     class="viewport_container"
     :class="['item',activeIndex === index?'item_active':'']"
-    @mousemove="sliderMousemove"
     @mouseup="sliderMouseup"
   >
     <div :id="`viewport${index}`" ref="viewportCanvas" style="height: 100%;width:100%" />
@@ -63,8 +62,8 @@
       <div v-show="seriesInfo.sliceThickness && index !== 3">Slice Thickness: {{ Number(seriesInfo.sliceThickness).toFixed(2) }}mm</div>
       <div v-show="imageInfo.wwwc ">WW/WL: {{ imageInfo.wwwc }}</div>
     </div>
-    <div v-if="index!==4" ref="sliderBox" class="slider_box" :style="{background: index === 2?'#ddd':'#333'}" @click.stop="goViewer($event)">
-      <div :style="{top: sliderBoxHeight + '%'}" class="box" @mousedown.stop="sliderMousedown($event)" />
+    <div v-if="index !== 4" ref="sliderBox" class="slider_box" :style="{background: index === 2?'#ddd':'#333'}" @click.stop="goViewer($event)">
+      <div :style="{top: sliderBoxHeight + '%'}" class="box" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
     </div>
     <div style="position: absolute;left: 50%;top: 30px;color: #f44336;transform: translateX(-50%);">
       {{ markers.top }}
@@ -81,7 +80,9 @@
     </div>
     <div v-if="presetName" class="color_bar">
       <canvas id="colorBar_Canvas" />
-
+    </div>
+    <div v-if="index === 4" id="rotateBar" ref="rotateBar" class="rotate_slider_box" @click.stop="clickRotate($event)">
+      <div id="rotateSlider" :style="{left: rotateBarLeft + 'px'}" class="box" @click.stop.prevent="() => {return}" @mousedown.stop="rotateBarMousedown($event)" />
     </div>
   </div>
 </template>
@@ -95,11 +96,12 @@ import {
 
 import {
   utilities as toolsUtilities,
-  annotation
+  annotation,
+  Enums as toolsEnums
   // cursors
 } from '@cornerstonejs/tools'
 import vtkColorMaps from '@kitware/vtk.js/Rendering/Core/ColorTransferFunction/ColorMaps'
-import { vec3 } from 'gl-matrix'
+import { vec3, mat4 } from 'gl-matrix'
 import html2canvas from 'html2canvas'
 const { getColormap } = utilities.colormap
 const {
@@ -167,11 +169,19 @@ export default {
         wwwc: null
       },
       sliderBoxHeight: 0,
+
       sliderInfo: {
         oldB: null,
         oldM: null,
         isMove: false
       },
+      rotateAngle: 0,
+      rotateBarLeft: 0,
+      rotateBarInfo: {
+        initX: null,
+        initLeft: null,
+        isMove: false
+      },
       isFirstRender: true,
       defaultWindowLevel: {},
       presetName: '',
@@ -197,25 +207,29 @@ export default {
     element.addEventListener(VOLUME_NEW_IMAGE, this.handleVolumeNewImage)
     element.addEventListener(Enums.Events.CAMERA_MODIFIED, this.handleCameraModified)
     element.addEventListener(Enums.Events.VOI_MODIFIED, this.handleVOIModified)
-    if (this.index !== 4) {
-      element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.handleMouseMove)
-    }
+    element.addEventListener(toolsEnums.Events.MOUSE_WHEEL, this.handletoolsMouseWheel)
+
+    element.addEventListener('CORNERSTONE_TOOLS_MOUSE_MOVE', this.handleMouseMove)
+
     element.addEventListener('mouseleave', this.handleMouseLeave)
 
     document.addEventListener('mouseup', () => {
       this.sliderMouseup()
+      if (this.index === 4) {
+        this.rotateBarMouseup()
+      }
+    })
+    document.addEventListener('mousemove', (e) => {
+      this.sliderMousemove(e)
+      if (this.index === 4) {
+        this.rotateBarMousemove(e)
+      }
     })
-    // document.addEventListener('mousewheel', (e) => {
-    //   this.mousewheel(e)
-    // })
   },
   destroyed() {
 
   },
   methods: {
-    // mousewheel(e){
-    //   console.log(e)
-    // },
     handleVolumeNewImage(e) {
       const { imageIndex } = e.detail
       this.seriesInfo.imageIdIndex = imageIndex
@@ -300,6 +314,7 @@ export default {
       renderingEngine = getRenderingEngine(this.renderingEngineId)
       viewport = renderingEngine.getViewport(this.viewportId)
       if (!viewport) return
+
       var zoom = viewport.getZoom()
       if (!zoom) return
       this.imageInfo.zoom = zoom.toFixed(4)
@@ -309,6 +324,7 @@ export default {
       renderingEngine = getRenderingEngine(this.renderingEngineId)
       viewport = renderingEngine.getViewport(this.viewportId)
       if (!viewport) return
+
       var properties = viewport.getProperties()
       if (properties && properties.voiRange) {
         var { lower, upper } = properties.voiRange
@@ -320,17 +336,19 @@ export default {
       }
     },
     handleMouseMove(e) {
-      const { currentPoints } = e.detail
-      const worldPoint = currentPoints.world
-      const { imageData } = this.volume
-      const index = imageData.worldToIndex(worldPoint)
+      if (this.index !== 4) {
+        const { currentPoints } = e.detail
+        const worldPoint = currentPoints.world
+        const { imageData } = this.volume
+        const index = imageData.worldToIndex(worldPoint)
 
-      index[0] = Math.floor(index[0])
-      index[1] = Math.floor(index[1])
-      index[2] = Math.floor(index[2])
-      this.mousePosition.index = index
+        index[0] = Math.floor(index[0])
+        index[1] = Math.floor(index[1])
+        index[2] = Math.floor(index[2])
+        this.mousePosition.index = index
 
-      this.mousePosition.value = this.getValue(this.volume, worldPoint)
+        this.mousePosition.value = this.getValue(this.volume, worldPoint)
+      }
     },
     getValue(volume, worldPos) {
       const { dimensions, scalarData, imageData } = volume
@@ -357,7 +375,6 @@ export default {
       this.mousePosition.value = null
     },
     goViewer(e) {
-      // console.log(e)
       var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
       this.sliderBoxHeight = height
       var index = Math.trunc(this.seriesInfo.imageIds.length * this.sliderBoxHeight / 100)
@@ -365,6 +382,7 @@ export default {
         this.scroll(index)
       }
     },
+
     sliderMousedown(e) {
       var boxHeight = this.$refs['sliderBox'].clientHeight
       this.sliderInfo.oldB = parseInt(e.srcElement.style.top) * boxHeight / 100
@@ -378,16 +396,103 @@ export default {
       if (!this.sliderInfo.isMove) return
       var PX = this.sliderInfo.oldB - (this.sliderInfo.oldM - e.clientY)
       var boxHeight = this.$refs['sliderBox'].clientHeight
+      // 滚动翻页
       if (PX < 0) return
       if (PX > boxHeight) return
-      var height = PX * 100 / boxHeight
-      var index = Math.trunc(this.seriesInfo.imageIds.length * this.sliderBoxHeight / 100)
+      const height = PX * 100 / boxHeight
+      var index = Math.trunc(this.seriesInfo.imageIds.length * height / 100)
       index = index > this.seriesInfo.imageIds.length ? this.seriesInfo.imageIds.length : index < 0 ? 0 : index
       this.sliderBoxHeight = height
       if (this.seriesInfo.imageIdIndex !== index) {
         this.scroll(index)
       }
     },
+    handletoolsMouseWheel(e) {
+      const { viewportId, wheel } = e.detail
+      if (viewportId === 'PET_MIP_CORONAL') {
+        const container = document.getElementById('rotateBar')
+        const slider = document.getElementById('rotateSlider')
+        const containerWidth = container.offsetWidth
+        const sliderWidth = slider.offsetWidth
+        const maxX = containerWidth - sliderWidth
+        const { direction } = wheel
+        console.log(containerWidth - sliderWidth)
+        var x = Math.trunc(30 * ((containerWidth - sliderWidth) / 360))
+        if (direction > 0 && (this.rotateBarLeft + x) > maxX) {
+          this.rotateBarLeft = x - (containerWidth - sliderWidth - this.rotateBarLeft)
+        } else if (direction < 0 && (this.rotateBarLeft < x)) {
+          this.rotateBarLeft = containerWidth - (x - this.rotateBarLeft + sliderWidth)
+        } else {
+          this.rotateBarLeft = x * direction + this.rotateBarLeft
+        }
+      }
+    },
+    rotateBarMousemove(e) {
+      // 滚动旋转
+      if (!this.rotateBarInfo.isMove) return
+      const container = document.getElementById('rotateBar')
+      const slider = document.getElementById('rotateSlider')
+      const containerWidth = container.offsetWidth
+      const sliderWidth = slider.offsetWidth
+      let x = Math.trunc(e.clientX - this.rotateBarInfo.initX + this.rotateBarInfo.initLeft)
+      if (x < 0) x = 0
+      if (x > containerWidth - sliderWidth) x = containerWidth - sliderWidth
+      const deltaX = x - this.rotateBarLeft
+      const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      this.rotate(angle)
+      this.rotateBarLeft = x
+    },
+    rotateBarMousedown(e) {
+      console.log('rotateBarMousedown')
+      this.rotateBarInfo.initLeft = e.srcElement.offsetLeft
+      this.rotateBarInfo.initX = e.clientX
+      this.rotateBarInfo.isMove = true
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
+    },
+    rotate(angle) {
+      renderingEngine = getRenderingEngine(this.renderingEngineId)
+      viewport = renderingEngine.getViewport(this.viewportId)
+      const camera = viewport.getCamera()
+      const { viewUp, position, focalPoint } = camera
+      const [cx, cy, cz] = focalPoint
+      const [ax, ay, az] = [0, 0, 1]
+      const newPosition = [0, 0, 0]
+      const newFocalPoint = [0, 0, 0]
+      const newViewUp = [0, 0, 0]
+
+      const transform = mat4.identity(new Float32Array(16))
+      mat4.translate(transform, transform, [cx, cy, cz])
+      mat4.rotate(transform, transform, angle, [ax, ay, az])
+      mat4.translate(transform, transform, [-cx, -cy, -cz])
+      vec3.transformMat4(newPosition, position, transform)
+      vec3.transformMat4(newFocalPoint, focalPoint, transform)
+
+      mat4.identity(transform)
+      mat4.rotate(transform, transform, angle, [ax, ay, az])
+      vec3.transformMat4(newViewUp, viewUp, transform)
+
+      viewport.setCamera({
+        position: newPosition,
+        viewUp: newViewUp,
+        focalPoint: newFocalPoint
+      })
+
+      viewport.render()
+    },
+    clickRotate(e) {
+      // console.log('clickRotate')
+      // const container = document.getElementById('rotateBar')
+      // const containerWidth = container.offsetWidth
+      // const slider = document.getElementById('rotateSlider')
+      // const sliderWidth = slider.offsetWidth
+      // const x = e.clientX - this.rotateBarInfo.initX + this.rotateBarInfo.initLeft
+      // const deltaX = x - this.rotateBarLeft
+      // const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      // this.rotate(angle)
+      // this.rotateBarLeft = x
+    },
     scroll(index) {
       renderingEngine = getRenderingEngine(this.renderingEngineId)
       viewport = renderingEngine.getViewport(this.viewportId)
@@ -403,7 +508,9 @@ export default {
       })
       renderingEngine.render()
     },
-
+    rotateBarMouseup(e) {
+      this.rotateBarInfo.isMove = false
+    },
     sliderMouseup(e) {
       this.sliderInfo.isMove = false
     },
@@ -549,6 +656,25 @@ export default {
     z-index: 1;
     // background: #f44336;
   }
+  .rotate_slider_box{
+    position: absolute;
+    width: 380px;
+    height: 10px;
+    bottom: 5px;
+    left: 50%;
+    transform: translateX(-50%);
+    background: #333;
+    cursor: pointer;
+    .box{
+      z-index:10;
+      background: #9e9e9e;
+      height: 100%;
+      width: 20px;
+      position: absolute;
+      top: 0;
+      cursor: move
+    }
+  }
   // .my_slider_box:after{
   //   content: '';
   //   position: absolute;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 4827806e..90ef1335 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -258,7 +258,7 @@ export default {
           // 是否有标记未保存
           var existUnSave = this.checkAnnotationStatus(this.questions)
           if (existUnSave) {
-            this.$alert(this.$t('trials:lugano:message:saveWarning'),this.$t('trials:lugano:fusionDialog:warning'))
+            this.$alert(this.$t('trials:lugano:message:saveWarning'), this.$t('trials:lugano:fusionDialog:warning'))
             return
           }
           var currentSpleenStatus = this.questionForm[this.spleenStatusId]
@@ -462,13 +462,13 @@ export default {
         this.loading = false
         return
       }
-      var obj = Object.assign({},annotationObj)
+      var obj = Object.assign({}, annotationObj)
       DicomEvent.$emit('getScreenshots', { questionId: obj.Id, visitTaskId: this.visitTaskId, lesionName: obj.OrderMarkName, markTool: obj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!obj.MeasureData }, async val => {
         var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
         var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-        
+
         if (obj && obj.MeasureData) {
-          var annotation = Object.assign({},obj.MeasureData)
+          var annotation = Object.assign({}, obj.MeasureData)
           obj.MeasureData = JSON.stringify(annotation)
           obj.PicturePath = picturePath
           questionMarkInfoList.push(obj)

From d74a4506c92fe6e8ec036110c5651d04c5814304 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 26 Mar 2024 14:38:13 +0800
Subject: [PATCH 206/374] =?UTF-8?q?=E6=97=8B=E8=BD=AC=E6=8B=96=E6=8B=BD?=
 =?UTF-8?q?=E6=9D=A1=E6=B7=BB=E5=8A=A0=E7=82=B9=E5=87=BB=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Viewport.vue     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index fb78b20f..0b72eed8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -416,7 +416,7 @@ export default {
         const sliderWidth = slider.offsetWidth
         const maxX = containerWidth - sliderWidth
         const { direction } = wheel
-        console.log(containerWidth - sliderWidth)
+
         var x = Math.trunc(30 * ((containerWidth - sliderWidth) / 360))
         if (direction > 0 && (this.rotateBarLeft + x) > maxX) {
           this.rotateBarLeft = x - (containerWidth - sliderWidth - this.rotateBarLeft)
@@ -483,15 +483,15 @@ export default {
     },
     clickRotate(e) {
       // console.log('clickRotate')
-      // const container = document.getElementById('rotateBar')
-      // const containerWidth = container.offsetWidth
-      // const slider = document.getElementById('rotateSlider')
-      // const sliderWidth = slider.offsetWidth
-      // const x = e.clientX - this.rotateBarInfo.initX + this.rotateBarInfo.initLeft
-      // const deltaX = x - this.rotateBarLeft
-      // const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
-      // this.rotate(angle)
-      // this.rotateBarLeft = x
+      const container = document.getElementById('rotateBar')
+      const containerWidth = container.offsetWidth
+      const slider = document.getElementById('rotateSlider')
+      const sliderWidth = slider.offsetWidth
+      const x = Math.trunc(e.offsetX)
+      const deltaX = x - this.rotateBarLeft
+      const angle = Math.sin((deltaX * (360 / (containerWidth - sliderWidth))) * Math.PI / 180)
+      this.rotate(angle)
+      this.rotateBarLeft = x
     },
     scroll(index) {
       renderingEngine = getRenderingEngine(this.renderingEngineId)

From 7db7e91468dd4eb486a7f62fc7b94cde817da36b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 26 Mar 2024 14:59:13 +0800
Subject: [PATCH 207/374] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=EF=BC=9A=E8=8E=B7=E5=8F=96=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=A0=B9=E6=8D=AE=E9=98=85=E7=89=87=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=BF=9B=E8=A1=8C=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/processConfig.vue        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index efc20484..34b98fff 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -1017,7 +1017,8 @@ export default {
         // CriterionIds: [],
         TrialCriterionNamesStr: '',
         TrialCriterionIds: [],
-        TrialCriterionNames: []
+        TrialCriterionNames: [],
+        TrialCriterionIdEnums:[]
       },
       rules: {
         ClinicalDataSetNamesStr: [
@@ -1335,7 +1336,7 @@ export default {
     getClinicalDataList(isSelect = false) {
       return new Promise((resolve, reject) => {
         this.listLoading = true
-        getTrialClinicalDataTrialSetList({ trialId: this.form.TrialId }).then(res => {
+        getTrialClinicalDataTrialSetList({ trialId: this.form.TrialId, criterionIds: this.form.TrialCriterionIds }).then(res => {
           this.clinicalDataList = res.Result
           this.listLoading = false
           if (isSelect) {

From 92d34d59f413e64c7b476a9d0266f0a00ec34e90 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Mar 2024 15:59:17 +0800
Subject: [PATCH 208/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AEdisabled=E6=94=BE?=
 =?UTF-8?q?=E5=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/consistency-analysis/index.vue     | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 1690cdb1..2a1d3552 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -339,17 +339,15 @@
           width="110"
         >
           <template slot-scope="scope">
-            <!-- 查看阅片结果 -->
+            <!-- 查看阅片结果:disabled="scope.row.ReadingTaskState !== 2" -->
             <el-button
-              :disabled="scope.row.ReadingTaskState !== 2"
               icon="el-icon-view"
               circle
               :title="$t('trials:consistencyAnalysis:action:view')"
               @click="lookReadingResults(scope.row)"
             />
-            <!-- 设置为失效 -->
+            <!-- 设置为失效  !scope.row.IsReReadingOrBackInfluenceAnalysis|| scope.row.TaskState === 1-->
             <el-button
-              :disabled="!scope.row.IsReReadingOrBackInfluenceAnalysis || scope.row.TaskState === 1"
               v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])"
               icon="el-icon-close"
               circle

From 33f5bcb079e3fd892aca440f4467796330e92fa2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Mar 2024 15:59:53 +0800
Subject: [PATCH 209/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E7=AD=9B=E6=9F=A5=E9=98=85=E7=89=87=E4=BA=BA=E6=8E=92=E5=BA=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GenerateMedicalReviewTaskList.vue                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue
index 121c4dd8..c6eaa25b 100644
--- a/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue
+++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/components/GenerateMedicalReviewTaskList.vue
@@ -191,7 +191,7 @@
         </el-table-column>
         <!-- 阅片人 -->
         <el-table-column
-          prop="UserName"
+           prop="DoctorUser.UserName"
           :label="$t('trials:pmMedicalReview:select:reader')"
           width="120"
           sortable="custom"

From 9233dff4ba66eec2038b820beb4a344b7a62f65a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 26 Mar 2024 17:10:51 +0800
Subject: [PATCH 210/374] =?UTF-8?q?=E5=9F=BA=E7=BA=BF=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E5=8E=86=E5=8F=B2=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |  2 +-
 .../js/initCornerstoneDICOMImageLoader.js     | 32 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index d07be5d5..d9cdd7df 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -214,7 +214,7 @@
         </div>
       </el-tooltip>
 
-      <el-tooltip v-if="isCurrentTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom" style="margin-left:20px">
+      <el-tooltip v-if="!isBaseLineTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom" style="margin-left:20px">
         <div class="tool-wrapper">
           <div
             class="icon"
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js
index 5230450e..584e981d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js
@@ -16,28 +16,28 @@ export default function initCornerstoneDICOMImageLoader() {
   cornerstoneDICOMImageLoader.external.cornerstone = cornerstone
   cornerstoneDICOMImageLoader.external.dicomParser = dicomParser
   cornerstoneDICOMImageLoader.configure({
-    useWebWorkers: false,
+    useWebWorkers: true,
     decodeConfig: {
       convertFloatPixelDataToInt: false,
       use16BitDataType: preferSizeOverAccuracy || useNorm16Texture
     }
   })
-  // let maxWebWorkers = 1
+  let maxWebWorkers = 1
 
-  // if (navigator.hardwareConcurrency) {
-  //   maxWebWorkers = Math.min(navigator.hardwareConcurrency, 7)
-  // }
+  if (navigator.hardwareConcurrency) {
+    maxWebWorkers = Math.min(navigator.hardwareConcurrency, 7)
+  }
 
-  // var config = {
-  //   maxWebWorkers,
-  //   startWebWorkersOnDemand: false,
-  //   taskConfiguration: {
-  //     decodeTask: {
-  //       initializeCodecsOnStartup: false,
-  //       strict: false
-  //     }
-  //   }
-  // }
+  var config = {
+    maxWebWorkers,
+    startWebWorkersOnDemand: false,
+    taskConfiguration: {
+      decodeTask: {
+        initializeCodecsOnStartup: false,
+        strict: false
+      }
+    }
+  }
 
-  // cornerstoneDICOMImageLoader.webWorkerManager.initialize(config)
+  cornerstoneDICOMImageLoader.webWorkerManager.initialize(config)
 }

From e6107ffe709b64a52abf687b9a1f9883f8ea598c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Mar 2024 17:31:01 +0800
Subject: [PATCH 211/374] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/medical-feedback/index.vue             |  4 ++--
 .../mim-medical-audit/components/ChatForm.vue      |  2 +-
 .../personnel-manage/components/siteForm.vue       |  1 -
 .../reading-period/components/ClinicalData.vue     | 14 ++++++++------
 .../visit/crc-question/components/chatForm.vue     |  2 +-
 .../trials/trials-panel/visit/crc-upload/index.vue |  2 +-
 .../visit/qc-check/components/chatForm.vue         |  2 +-
 7 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/index.vue b/src/views/trials/trials-panel/reading/medical-feedback/index.vue
index c394a2ec..4bfca415 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/index.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/index.vue
@@ -291,9 +291,9 @@
                     icon="el-icon-edit-outline"
                     @click="handleReadMecialAudit(scope.row)"
                   />
-                  <!-- 回复 -->
+                  <!-- 回复:disabled="!scope.row.IsHaveQuestion || scope.row.IsInvalid" -->
                   <el-button
-                    :disabled="!scope.row.IsHaveQuestion || scope.row.IsInvalid"
+                    
                     circle
                     :title="$t('trials:medicalFeedback:table:reply')"
                     icon="el-icon-chat-dot-round"
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 2c7c203a..176d1e99 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -41,7 +41,7 @@
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
-                    <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
+                    <span style="color:rgb(255,255,0)">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
                 </div>
                 <div style="margin-top:10px;">
diff --git a/src/views/trials/trials-panel/setting/personnel-manage/components/siteForm.vue b/src/views/trials/trials-panel/setting/personnel-manage/components/siteForm.vue
index b74335d1..b52f2422 100644
--- a/src/views/trials/trials-panel/setting/personnel-manage/components/siteForm.vue
+++ b/src/views/trials/trials-panel/setting/personnel-manage/components/siteForm.vue
@@ -27,7 +27,6 @@
             size="mini"
             :disabled="selectArr.length === 0"
             :loading="assignLoadStatus"
-            icon="el-icon-plus"
             @click="handleAssign"
           >
             {{ $t('trials:sitesList:dialogButton:addSite') }}
diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index 732b7fee..f48d2208 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -1,10 +1,9 @@
 <template>
   <div class="clinical-data_content">
     <el-tabs type="card" v-model="clinicalType" v-if="!(data.IsVisit || data.IsBaseLine)">
-      <template v-for="item in $d.GetClinicalType">
-      <el-tab-pane :key="item.Id" :label="item.label" :name="item.value.toString()" v-if="item.value===1">
-        <div v-if="item.value === 1">
-          <h4 style="margin:0">
+      <div>
+        <!--style="margin:0"-->
+          <h4>
             <!-- 提示： -->
             {{ $t('trials:readingPeriod:cd:title:tips') }}
           </h4>
@@ -209,9 +208,12 @@
             </div>
             <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
           </el-dialog>
-        </div>
+      </div>
+      <!-- <template v-for="item in $d.GetClinicalType">
+      <el-tab-pane :key="item.Id" :label="item.label" :name="item.value.toString()" v-if="item.value===1">
+ 
       </el-tab-pane>
-      </template>
+      </template> -->
     </el-tabs>
     <div v-else>
       <div class="top">
diff --git a/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue b/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
index aa90d07f..acd4a418 100644
--- a/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/crc-question/components/chatForm.vue
@@ -243,7 +243,7 @@ export default {
                         <p>
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
-                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}}</p>`
+                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
       const userId = zzSessionStorage.getItem('userId')
       recordContent.push(
         {
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 9faa834b..126463df 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -324,7 +324,7 @@
             />
             <!-- 上传2 -->
             <el-button
-              icon="el-icon-s-promotion"
+              icon="el-icon-upload2"
               v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']"
               :disabled="scope.row.SubmitState*1 === 2 || scope.row.VisitExecuted === 2 ||scope.row.IsLostVisit"
               circle
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
index 37bca56a..b5f75be6 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
@@ -173,7 +173,7 @@ export default {
                         <p>
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
-                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
+                        <p style='color:rgb(255,255,0)'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
       const userId = zzSessionStorage.getItem('userId')
       recordContent.push(
         {

From 0df518f0257090b0b524dd321c754b353eeae913 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 26 Mar 2024 17:52:30 +0800
Subject: [PATCH 212/374] =?UTF-8?q?suv=E6=B5=8B=E9=87=8F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E6=A0=87=E6=B3=A8=E6=97=B6=E9=BB=98=E8=AE=A4=E6=BF=80=E6=B4=BB?=
 =?UTF-8?q?=E5=B7=A5=E5=85=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        | 30 +++++++++++++++----
 1 file changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index d9cdd7df..36cd79c8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -1978,7 +1978,8 @@ export default {
     imageLocation(obj) {
       return new Promise(resolve => {
         console.log('imageLocation')
-        this.setToolToTarget()
+        obj.markTool = obj.markTool ? obj.markTool : 'CircleROI'
+        this.setToolToTarget(obj)
         if (!obj.otherMeasureData) {
           resolve()
           return
@@ -2005,14 +2006,31 @@ export default {
       })
     },
     setToolToTarget(obj) {
-      if (this.activeTool) {
-        var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]
+      var toolGroupIds = [ctToolGroupId, ptToolGroupId, fusionToolGroupId]
+      if (this.readingTaskState < 2 && obj.markTool && !obj.otherMeasureData) {
         toolGroupIds.forEach((toolGroupId) => {
           const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
-
-          toolGroup.setToolPassive(this.activeTool)
+          if (this.activeTool) {
+            toolGroup.setToolPassive(this.activeTool)
+          }
+          toolGroup.setToolActive(obj.markTool, {
+            bindings: [
+              {
+                mouseButton: MouseBindings.Primary // Left Click
+              }
+            ]
+          })
         })
-        this.activeTool = ''
+        this.activeTool = obj.markTool
+      } else {
+        if (this.activeTool === obj.markTool) {
+          toolGroupIds.forEach((toolGroupId) => {
+            const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+
+            toolGroup.setToolPassive(this.activeTool)
+          })
+          this.activeTool = ''
+        }
       }
       this.isNonTargetMeasurement = false
     },

From 2cd92b1dcdd0054fe456e5f0986b95f4e4fb1924 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 26 Mar 2024 17:58:30 +0800
Subject: [PATCH 213/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=AF=BC=E5=87=BA=E6=8C=89=E9=92=AE=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/exportList.vue                 | 60 +++++++++++++++++++
 .../reading/consistency-analysis/index.vue    | 39 ++++++++----
 2 files changed, 89 insertions(+), 10 deletions(-)
 create mode 100644 src/views/trials/trials-panel/reading/consistency-analysis/components/exportList.vue

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/exportList.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/exportList.vue
new file mode 100644
index 00000000..217dce6b
--- /dev/null
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/exportList.vue
@@ -0,0 +1,60 @@
+<template>
+  <div style="text-align: left">
+    <el-tabs type="border-card" v-model="TrialReadingCriterionId" style="height:300px">
+      <el-tab-pane :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId" v-for="i of trialCriterionList" :key="i.TrialReadingCriterionId">
+        <div class="message">
+          <span>{{$t('trials:consistencyAnalysis:button:exportSelf')}}</span>
+            <el-button type="primary" icon="el-icon-download" @click="handleExport(1)" size="mini">
+            {{$t('common:button:export')}}
+            </el-button>
+        </div>
+        <div class="message">
+          <span>{{$t('trials:consistencyAnalysis:button:exportGroup')}}</span>
+            <el-button type="primary" icon="el-icon-download" @click="handleExport(2)" size="mini">
+            {{$t('common:button:export')}}
+            </el-button>
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+  </div>
+</template>
+
+<script>
+import { getTrialCriterionList } from '@/api/trials/reading'
+
+export default {
+name: "exportList",
+  data() {
+    return {
+      TrialReadingCriterionId: null,
+      trialId: null,
+    }
+  },
+  mounted() {
+    this.trialId =this.$route.query.trialId
+    this.getTrialCriterionList()
+  },
+  methods: {
+    handleExport(type) {
+      this.$emit("handleExport",type,this.TrialReadingCriterionId)
+    },
+    getTrialCriterionList() {
+      getTrialCriterionList(this.trialId).then(res => {
+        this.trialCriterionList = res.Result
+        this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
+      }).catch(() => {})
+    }
+  }
+}
+</script>
+
+<style scoped>
+.message{
+  display:flex;
+  align-items:center;
+  line-height:60px;
+}
+.message span{
+  margin-right:20px;
+}
+</style>
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 2a1d3552..45053807 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -91,14 +91,12 @@
           <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
             {{ $t('common:button:reset') }}
           </el-button>
-          <el-button type="primary" icon="el-icon-download" @click="handleExport(1)">
-<!--            {{ $t('common:button:export') }}{{$t('trials:consistencyAnalysis:button:self')}}-->
+          <!-- <el-button type="primary" icon="el-icon-download" @click="handleExport(1)">
             {{$t('trials:consistencyAnalysis:button:exportSelf')}}
           </el-button>
           <el-button type="primary" icon="el-icon-download" @click="handleExport(2)">
-<!--            {{ $t('common:button:export') }}{{$t('trials:consistencyAnalysis:button:group')}}-->
             {{$t('trials:consistencyAnalysis:button:exportGroup')}}
-          </el-button>
+          </el-button> -->
           <!-- 自身一致性分析 -->
           <el-button type="primary" v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])" @click="openTaskConsistentRule(true)">
             {{$t('trials:consistencyAnalysis:button:self')}}
@@ -111,6 +109,10 @@
           <el-button type="primary" v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])" @click="openSite()">
             {{$t('trials:consistencyAnalysis:button:site')}}
           </el-button>
+          <!--导出-->
+           <el-button type="primary" icon="el-icon-download" @click="exportVisible = true">
+            {{$t('common:button:export')}}
+          </el-button>
         </el-form-item>
       </el-form>
     </template>
@@ -628,6 +630,14 @@
           </el-button>
         </div>
       </el-dialog>
+      <el-dialog
+        v-if="exportVisible"
+        :title="$t('trials:reviewTrack:button:export')"
+        :visible.sync="exportVisible"
+        :close-on-click-modal="false"
+        append-to-body>
+        <exportList :trial-reading-criterion-id="TrialReadingCriterionId" @handleExport="handleExport"/>
+      </el-dialog>
     </template>
   </BaseContainer>
 </template>
@@ -641,6 +651,7 @@ import VirtualCenter from './components/VirtualCenter'
 import BaseContainer from '@/components/BaseContainer'
 import Pagination from '@/components/Pagination'
 import { getToken } from '@/utils/auth'
+import exportList from './components/exportList.vue'
 const searchDataDefault = () => {
   return {
     PageIndex: 1,
@@ -665,7 +676,7 @@ const searchDataDefault = () => {
 }
 export default {
   name: 'TrialsNotice',
-  components: { BaseContainer, Pagination, ReaderRulesForm, DoctorConsistentRuleSubjectTable, GroupConsistentRuleSubjectTable, VirtualCenter },
+  components: {exportList, BaseContainer, Pagination, ReaderRulesForm, DoctorConsistentRuleSubjectTable, GroupConsistentRuleSubjectTable, VirtualCenter },
   data() {
     return {
       TrialReadingCriterionId: null,
@@ -704,7 +715,9 @@ export default {
       },
       changeNum: 0,
       openWindow:null,
-      isOpenSite: false
+      isOpenSite: false,
+
+      exportVisible:false
     }
   },
   mounted() {
@@ -722,16 +735,22 @@ export default {
     openSite() {
       this.isOpenSite = true
     },
-    handleExport(type) {
-      if (!this.searchData.TrialReadingCriterionId) {
+    handleExport(type,TrialReadingCriterionId) {
+      // if (!this.searchData.TrialReadingCriterionId) {
+      //   this.$alert(this.$t('trials:consistencyAnalysis:message:selectCriterion'))//'请先选择阅片标准'
+      //   return
+      // }
+      if (!TrialReadingCriterionId) {
         this.$alert(this.$t('trials:consistencyAnalysis:message:selectCriterion'))//'请先选择阅片标准'
         return
       }
+      let obj = JSON.parse(JSON.stringify(this.searchData));
+      obj.TrialReadingCriterionId = TrialReadingCriterionId;
       if (type === 1) {
-        getSelfAnalysisTaskList_Export(this.searchData).then(res => {
+        getSelfAnalysisTaskList_Export(obj).then(res => {
         }).catch(() => { this.loading = false })
       } else {
-        getGroupAnalysisTaskList_Export(this.searchData).then(res => {
+        getGroupAnalysisTaskList_Export(obj).then(res => {
         }).catch(() => { this.loading = false })
       }
     },

From 3ea4617d4584789f85208323e4d3cef4c2681e5e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 27 Mar 2024 11:02:15 +0800
Subject: [PATCH 214/374] =?UTF-8?q?=E9=98=85=E7=89=87=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue         |  5 +++--
 .../dicoms/components/Fusion/HistoryScreenshot.vue    | 10 +++++-----
 .../reading/dicoms/components/Fusion/ImageViewer.vue  |  4 ++--
 .../reading/dicoms/components/Fusion/PetCt.vue        |  2 +-
 .../reading/dicoms/components/Fusion/Questions.vue    | 11 ++++++++---
 5 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index da9f3f3e..f108525a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -2252,8 +2252,9 @@ export default {
         border: 1px solid rgba(255, 255, 255, 0.21);
         position: relative;
         &_active{
-          // border: 2px solid #ffeb3b;fff
-          border: 1px dashed #428bca;
+          // border: 2px solid #ffeb3b;fff;#428bca
+          // border: 1.5px dashed #ffeb3b;
+          border: 1px dashed rgb(250, 250, 0);
 
         }
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index 42553e66..d32363ee 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="image_preview-wrapper">
+  <div class="screenshot_preview-wrapper">
 
     <div class="image-viewer-wrapper">
       <!-- 预览图像 -->
@@ -14,7 +14,7 @@
         :url-list="previewImages"
       />
     </div>
-    <div class="thumbnail-wrapper" style="z-index:999;background-color:#fff;">
+    <div class="thumbnail-wrapper" style="z-index:999;background-color:#000;">
       <div class="">
         <div class="img-wrapper">
           <el-button
@@ -194,13 +194,13 @@ export default {
 }
 </script>
 
-<style lang="scss">
-.image_preview-wrapper{
+<style lang="scss" >
+.screenshot_preview-wrapper{
   width: 100%;
   height: 100%;
   display: flex;
   flex-direction: column;
-
+  background-color: #000;
 .image-viewer-wrapper{
   flex: 1;
 }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
index 0925dac7..5893cdc5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/ImageViewer.vue
@@ -343,7 +343,7 @@ export default {
   // width: 70px;
   line-height: 20px;
   text-align: center;
-  color: #606266;
+  color: #ddd;
   font-weight: bold;
   // color: #fff;
   // background-color: #606266;
@@ -364,7 +364,7 @@ export default {
 }
 .image-viewer__actions{
     left:50%;
-    bottom:30px;
+    bottom:15px;
     transform:translateX(-50%);
     width:282px;
     height:44px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 36cd79c8..295304c7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -2381,7 +2381,7 @@ export default {
         position: relative;
         &_active{
           // border: 2px solid #ffeb3b;fff
-          border: 1px dashed #428bca;
+          border: 1px dashed rgb(250, 250, 0);
 
         }
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index da3a28b4..fd991db0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -239,7 +239,7 @@ export default {
         // 是否有标记未保存
         var existUnSave = this.checkAnnotationStatus(this.questions)
         if (existUnSave) {
-          this.$alert(this.$t('trials:lugano:message:saveWarning1'),this.$t('trials:lugano:fusionDialog:warning'))
+          this.$alert(this.$t('trials:lugano:message:saveWarning1'), this.$t('trials:lugano:fusionDialog:warning'))
           return
         }
         // 肝脏血池SUVmax
@@ -378,7 +378,7 @@ export default {
         loading.close()
         return
       }
-       var obj = Object.assign({},annotationObj)
+      var obj = Object.assign({}, annotationObj)
       FusionEvent.$emit('getScreenshots', { otherMeasureData: obj.OtherMeasureData }, async val => {
         var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
         var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
@@ -557,7 +557,12 @@ export default {
       if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
         // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
         // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
-        this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : this.questionForm[this.pet5PSId] < this.baseLinePET5PS ? '2' : ''
+        if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
+          this.questionForm[this.uptakeFromBaselineId] = '1'
+        } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
+          this.questionForm[this.uptakeFromBaselineId] = '2'
+        }
+        // this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : this.questionForm[this.pet5PSId] < this.baseLinePET5PS ? '2' : ''
       }
     },
     setpet5PS() {

From 9d47ae2561265904c262c3f2d595a9ac52b3ac3e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 27 Mar 2024 13:58:07 +0800
Subject: [PATCH 215/374] =?UTF-8?q?=E6=8F=90=E9=86=92=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=A4=9A=E6=AC=A1=E5=BC=B9=E5=87=BA=E9=97=AE=E9=A2=98=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/dcmUpload/anonymization.js              |  2 +-
 .../crc-upload/components/uploadDicomFiles2.vue   | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/src/utils/dcmUpload/anonymization.js b/src/utils/dcmUpload/anonymization.js
index a018d399..30e805ed 100644
--- a/src/utils/dcmUpload/anonymization.js
+++ b/src/utils/dcmUpload/anonymization.js
@@ -54,7 +54,7 @@ export const anonymization = function (file, config) {
             }
           }
         }
-        console.log(dataset)
+        // console.log(dataset)
         let newDicomFile = dataset.write()
         const bufferArray = new Uint8Array(newDicomFile)
         const blob = new Blob([bufferArray], { type: 'application/octet-stream' })
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 3620c002..0429300e 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -581,7 +581,8 @@ export default {
       trialBodyPartTypes: [],
       trialModalitys: [],
       myInterval: [],
-      studyErrorList: []
+      studyErrorList: [],
+      confirmFlag:false
     }
   },
   mounted() {
@@ -669,8 +670,10 @@ export default {
               cancelButtonText: this.$t("common:button:cancel"),
               type: 'warning'
             }).then(() => {
+              this.confirmFlag = false;
               this.$emit("update:activeName",'clinical-data');
-            }).catch(() => {         
+            }).catch(() => {       
+              this.confirmFlag = false;  
             });
           }else{
             if(showConfirm) return;
@@ -940,7 +943,7 @@ export default {
     beginUploadQueues() {
       this.scanState = 'uploading'
       this.studyErrorList = []
-      console.log(this.uploadQueues, this.selectArr)
+      // console.log(this.uploadQueues, this.selectArr)
       this.warningArr = []
       for (let i = 0; i < this.selectArr.length; ++i) {
         const index = this.selectArr[i].studyIndex
@@ -1078,6 +1081,7 @@ export default {
           })
           this.$refs.pathClear.value = ''
           this.btnLoading = false
+          // console.log(11111);
           if (this.studyErrorList.length > 0) {
             let msg = this.$t('trials:uploadDicomFiles2:message:studyErrorList')
             msg = msg.replaceAll('xxx', this.studyErrorList.join('、'))
@@ -1087,6 +1091,9 @@ export default {
               this.beginUploadQueues()
             })
           }
+          if(this.confirmFlag){
+            this.getClinicalData(true);
+          }
         })
       }).catch(_ => { this.btnLoading = false })
     },
@@ -1378,7 +1385,7 @@ export default {
                 let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT';
                 // let flag = params.study.seriesList.some(item=>item.modality==='PT');
                 if(flag){
-                  scope.getClinicalData(true);
+                  scope.confirmFlag = true;
                 }
                 scope.getStudyInfo()
                 if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {

From 05bc41f5e2286cb5dc14b0559438ffa1c8f157c0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 27 Mar 2024 13:58:29 +0800
Subject: [PATCH 216/374] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=8E=92=E5=BA=8F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/trial-summary/login-log/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index ed72ab3c..e42c483d 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -156,7 +156,7 @@ const searchDataDefault = () => {
     LoginFaildName: '',
     BeginDate: '',
     EndDate: '',
-    Asc: true,
+    Asc: false,
     SortField: '',
     PageIndex: 1,
     PageSize: 20

From 5e2522147fe90c8988a3c7bf38ec90369295f941 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 27 Mar 2024 14:32:03 +0800
Subject: [PATCH 217/374] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-workbench/components/NeedSignedTrialDoc.vue    | 8 ++++++--
 .../trials/trials-workbench/components/needSignSysDoc.vue | 8 ++++++--
 .../trials-workbench/components/needSignedSysDoc.vue      | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
index e141696b..bd102f68 100644
--- a/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
+++ b/src/views/trials/trials-workbench/components/NeedSignedTrialDoc.vue
@@ -21,6 +21,7 @@
       v-adaptive="{bottomOffset:45}"
       height="100"
       @sort-change="handleSortByColumn"
+      :default-sort ="{prop: 'ConfirmTime', order: 'descending'}"
     >
       <el-table-column type="index" width="40" />
       <!-- 项目编号 -->
@@ -48,16 +49,19 @@
         :label="$t('trials:sysDocBeSigned:table:fileType')"
         prop="FileType"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileName')"
         prop="Name"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:ConfirmTime')"
         prop="ConfirmTime"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('common:action:action')"
@@ -132,8 +136,8 @@ const searchDataDefault = () => {
     IsSigned: true,
     pageIndex: 1,
     pageSize: 20,
-    asc: true,
-    sortField: ''
+    asc: false,
+    sortField: 'ConfirmTime'
   }
 }
 export default {
diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index 4ee9f3b0..3f9f81e8 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -21,22 +21,26 @@
       v-adaptive="{bottomOffset:45}"
       height="100"
       @sort-change="handleSortByColumn"
+      :default-sort ="{prop: 'UpdateTime', order: 'descending'}"
     >
       <el-table-column type="index" width="40" />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileType')"
         prop="FileType"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileName')"
         prop="Name"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
         prop="UpdateTime"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('common:action:action')"
@@ -119,8 +123,8 @@ const searchDataDefault = () => {
   return {
     pageIndex: 1,
     pageSize: 20,
-    asc: true,
-    sortField: ''
+    asc: false,
+    sortField: 'UpdateTime'
   }
 }
 export default {
diff --git a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
index 816f3502..31e97e91 100644
--- a/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignedSysDoc.vue
@@ -21,22 +21,26 @@
       v-adaptive="{bottomOffset:45}"
       height="100"
       @sort-change="handleSortByColumn"
+      :default-sort ="{prop: 'UpdateTime', order: 'descending'}"
     >
       <el-table-column type="index" width="40" />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileType')"
         prop="FileType"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:fileName')"
         prop="Name"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('trials:sysDocBeSigned:table:uploadTime')"
         prop="UpdateTime"
         show-overflow-tooltip
+        sortable="custom"
       />
       <el-table-column
         :label="$t('common:action:action')"
@@ -119,8 +123,8 @@ const searchDataDefault = () => {
   return {
     pageIndex: 1,
     pageSize: 20,
-    asc: true,
-    sortField: ''
+    asc: false,
+    sortField: 'UpdateTime'
   }
 }
 export default {

From 1724e020f6f89468c49f9dc71a69337cb6716d79 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 27 Mar 2024 14:39:22 +0800
Subject: [PATCH 218/374] =?UTF-8?q?=E9=83=A8=E5=88=86=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E6=8E=92=E5=BA=8F=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=96=B0=E5=A2=9E=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/trial-summary/audit-record/index.vue     | 3 ++-
 .../trials/trials-panel/trial-summary/login-log/index.vue | 8 +++++++-
 .../trials-panel/trial-summary/upload-monitor/index.vue   | 3 ++-
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index e50e3a3b..0b99516d 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -117,6 +117,7 @@
         @sort-change="handleSortChange"
         stripe
         height="100"
+        :default-sort ="{prop: 'CreateTime', order: 'descending'}"
       >
         <el-table-column type="index" width="40" fixed="left" align="left" />
         <!-- 研究方案号 -->
@@ -748,7 +749,7 @@ export default {
   data() {
     const searchDataDefault = () => {
       return {
-        SortField: '',
+        SortField: 'CreateTime',
         Asc: false,
         PageIndex: 1,
         PageSize: 20,
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index e42c483d..ce24e71f 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -69,6 +69,7 @@
         :data="list"
         class="table"
         @sort-change="handleSortByColumn"
+        :default-sort ="{prop: 'CreateTime', order: 'descending'}"
       >
         <el-table-column
           type="index"
@@ -90,6 +91,7 @@
           prop="IP"
           min-width="90"
           show-overflow-tooltip
+          sortable="custom"
         />
         <el-table-column
           :label="$t('trials:loginLog:table:incorrectUserName')"
@@ -110,6 +112,7 @@
           prop="LoginUserTypeEnum"
           min-width="90"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             {{ $fd('UserType',scope.row.LoginUserTypeEnum) }}
@@ -120,12 +123,14 @@
           prop="optUserName"
           min-width="90"
           show-overflow-tooltip
+          sortable="custom"
         />
         <el-table-column
           :label="$t('trials:loginLog:table:optUserType')"
           prop="OptUserTypeEnum"
           min-width="90"
           show-overflow-tooltip
+          sortable="custom"
         >
           <template slot-scope="scope">
             {{ $fd('UserType',scope.row.OptUserTypeEnum) }}
@@ -136,6 +141,7 @@
           prop="CreateTime"
           min-width="90"
           show-overflow-tooltip
+          sortable="custom"
         />
       </el-table>
        <!-- 分页组件 -->
@@ -157,7 +163,7 @@ const searchDataDefault = () => {
     BeginDate: '',
     EndDate: '',
     Asc: false,
-    SortField: '',
+    SortField: 'CreateTime',
     PageIndex: 1,
     PageSize: 20
   }
diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index 1904fe8b..a58aeb4d 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -90,6 +90,7 @@
         stripe
         height="100"
         @sort-change="handleSortByColumn"
+        :default-sort ="{prop: 'ArchiveFinishedTime', order: 'descending'}"
       >
         <el-table-column type="index" width="40" align="left" />
         <!-- 中心编号 -->
@@ -337,7 +338,7 @@ import BaseModel from '@/components/BaseModel'
 import axios from "axios";
 const searchDataDefault = () => {
   return {
-    SortField: '',
+    SortField: 'ArchiveFinishedTime',
     Asc: false,
     PageIndex: 1,
     PageSize: 20,

From f4842ba34d055b28feee9e4c7070dbadd1cd6cde Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 27 Mar 2024 14:54:06 +0800
Subject: [PATCH 219/374] =?UTF-8?q?MIP=E5=9B=BE=E7=A7=BB=E9=99=A4VOLUME=5F?=
 =?UTF-8?q?NEW=5FIMAGE=E7=9B=91=E5=90=AC=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue | 18 ++++++++++--------
 .../dicoms/components/Fusion/Viewport.vue      |  4 +++-
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 295304c7..4c14176d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -691,9 +691,9 @@ export default {
       this.setUpToolGroups()
 
       this.setUpSynchronizers()
-      this.$refs['CT_AXIAL'].scroll(0)
-      this.$refs['PT_AXIAL'].scroll(0)
-      this.$refs['FUSION_AXIAL'].scroll(0)
+      // this.$refs['CT_AXIAL'].scroll(0)
+      // this.$refs['PT_AXIAL'].scroll(0)
+      // this.$refs['FUSION_AXIAL'].scroll(0)
       const viewport = renderingEngine.getViewport('CT_AXIAL')
       if (viewport) {
         this.defaultCamera = viewport.getCamera()
@@ -1996,12 +1996,14 @@ export default {
         if (index > -1) {
           viewportId = 'PT_AXIAL'
           this.$refs[viewportId].scroll(index)
+        }else{
+          index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
+          if (index > -1) {
+            viewportId = 'CT_AXIAL'
+            this.$refs[viewportId].scroll(index)
+          }
         }
-        index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
-        if (index > -1) {
-          viewportId = 'CT_AXIAL'
-          this.$refs[viewportId].scroll(index)
-        }
+        
         resolve()
       })
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 0b72eed8..9c96b17d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -232,7 +232,9 @@ export default {
   methods: {
     handleVolumeNewImage(e) {
       const { imageIndex } = e.detail
-      this.seriesInfo.imageIdIndex = imageIndex
+      if(this.viewportId === e.detail.viewportId && this.index !== 4){
+        this.seriesInfo.imageIdIndex = imageIndex
+      }
       renderingEngine = getRenderingEngine(this.renderingEngineId)
       viewport = renderingEngine.getViewport(this.viewportId)
 

From c745756c8c2257446fc4a75e09c9685dd151c562 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 27 Mar 2024 15:09:44 +0800
Subject: [PATCH 220/374] =?UTF-8?q?=E9=87=8D=E9=98=85=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E8=A1=A8=E5=8D=95=E6=A0=87=E8=AE=B0=E6=B8=B2=E6=9F=93=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 4c14176d..6a070362 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -527,7 +527,8 @@ export default {
       initAnnotations: [],
       activeCanvasWW: null,
       activeCanvasWC: null,
-      fusion: { visible: false } // 历史记录融合调窗
+      fusion: { visible: false }, // 历史记录融合调窗
+      // initFirstAnnotation:false
     }
   },
   computed: {
@@ -709,18 +710,20 @@ export default {
         }
       })
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_ADDED, (e) => {
+        console.log('ANNOTATION_ADDED')
         this.onAnnotationAdded(e)
       })
 
       const debouncedCallback = this.debounce((e) => {
-        const { annotation } = e.detail
-        const { remark } = annotation.data
-        var idx = this.initAnnotations.findIndex(i => i.orderMark === remark)
-        if (this.initAnnotations.length > 0 && idx > -1 && this.initAnnotations[idx].orderMark === remark && !this.initAnnotations[idx].isInit) {
-          this.initAnnotations[idx].isInit = true
-        } else {
-          this.onAnnotationModified(e)
-        }
+        this.onAnnotationModified(e)
+        // const { annotation } = e.detail
+        // const { remark } = annotation.data
+        // var idx = this.initAnnotations.findIndex(i => i.orderMark === remark)
+        // if (this.initAnnotations.length > 0 && idx > -1 && this.initAnnotations[idx].orderMark === remark && !this.initAnnotations[idx].isInit) {
+        //   this.initAnnotations[idx].isInit = true
+        // } else {
+        //   this.onAnnotationModified(e)
+        // }
         // const { cachedStats } = annotation.data
         // var isNotValidAnnotationNum = 0
         // for (const volumeId in cachedStats) {
@@ -756,6 +759,7 @@ export default {
         // }
       }, 120)
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_MODIFIED, (e) => {
+        console.log('ANNOTATION_MODIFIED')
         debouncedCallback(e)
       })
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_SELECTION_CHANGE, (e) => {

From 4fabe3fa14e92129a7f6efe80a4d5f26426a682d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 27 Mar 2024 16:45:09 +0800
Subject: [PATCH 221/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E5=B7=A5=E5=85=B7?=
 =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E5=9B=BE=E5=83=8F=E5=8A=9F=E8=83=BD=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/DicomViewer.vue | 19 +++++++++++++++++--
 .../dicoms/components/Fusion/PetCt.vue        |  6 +++---
 .../dicoms/components/Fusion/Viewport.vue     |  2 +-
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index f108525a..5f18ffed 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -1866,8 +1866,23 @@ export default {
       this.$refs['measurementList'].modifyMeasuredData(data)
       this.activeTool = ''
     },
-    saveImage() {
-      this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
+    async saveImage() {
+      // this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].saveImage()
+      // canvas为转换后的Canvas对象
+      const divForDownloadViewport = document.querySelector(
+        `div[data-canvas-uid="dicomCanvas${this.currentDicomCanvasIndex}"]`
+      )
+      var canvas = await html2canvas(divForDownloadViewport)
+      let oImg = new Image()
+      oImg = canvas.toDataURL('image/png', 1)// 导出图片
+      var oA = document.createElement('a')
+      var subjectCode = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].subjectCode
+      var taskBlindName = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack.taskBlindName
+      oA.download = `${subjectCode}_${taskBlindName}`// 设置下载的文件名，默认是'下载'
+      oA.href = oImg
+      document.body.appendChild(oA)
+      oA.click()
+      oA.remove() // 下载之后把创建的元素删除
     },
     // 设置窗宽/窗位
     setDicomCanvasWwwc(v) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 6a070362..eda2ef90 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -527,7 +527,7 @@ export default {
       initAnnotations: [],
       activeCanvasWW: null,
       activeCanvasWC: null,
-      fusion: { visible: false }, // 历史记录融合调窗
+      fusion: { visible: false } // 历史记录融合调窗
       // initFirstAnnotation:false
     }
   },
@@ -2000,14 +2000,14 @@ export default {
         if (index > -1) {
           viewportId = 'PT_AXIAL'
           this.$refs[viewportId].scroll(index)
-        }else{
+        } else {
           index = this.ctSeries.instanceList.findIndex(i => i === instanceId)
           if (index > -1) {
             viewportId = 'CT_AXIAL'
             this.$refs[viewportId].scroll(index)
           }
         }
-        
+
         resolve()
       })
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 9c96b17d..29bbade4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -232,7 +232,7 @@ export default {
   methods: {
     handleVolumeNewImage(e) {
       const { imageIndex } = e.detail
-      if(this.viewportId === e.detail.viewportId && this.index !== 4){
+      if (this.viewportId === e.detail.viewportId && this.index !== 4) {
         this.seriesInfo.imageIdIndex = imageIndex
       }
       renderingEngine = getRenderingEngine(this.renderingEngineId)

From 595da0a7de019268a8d29f38f94e289066ca28b1 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 27 Mar 2024 18:06:07 +0800
Subject: [PATCH 222/374] =?UTF-8?q?=E9=A2=84=E8=A7=88=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuestionFormItem.vue           | 32 +++++++++++++++----
 1 file changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
index 2c4f5256..571c2f3a 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
@@ -433,6 +433,7 @@ export default {
       this.addOrEdit.visible = false
     },
     logic(rules, num = 0) {
+      console.log(rules,'rules')
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -522,6 +523,7 @@ export default {
           // find的自动计算值number
           console.log('find', find)
           if (find) {
+            console.log(v,'111111')
             var num = this.logic(v)
             if (num !== false) {
               this.$emit('setFormItemData', { key: v.QuestionId, val: num })
@@ -535,6 +537,7 @@ export default {
           })
           // find的自动计算值number
           if (find) {
+            console.log(v,'222222')
             var num = this.logic(v)
             if (num !== false) {
               this.$emit('setFormItemData', { key: v.QuestionId, val: num })
@@ -548,23 +551,40 @@ export default {
       this.question.TableQuestions.Questions.forEach(v => {
         if (v.Type === 'number' && v.DataSource === 1) {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions)
-          var num
+          var num, minArr=[],maxArr=[],arr=[]
           CalculateQuestions.forEach((o, i) => {
             if (i === 0) {
-              num = this.QuestionsForm[o.TableQuestionId]
+              num = parseFloat(this.QuestionsForm[o.TableQuestionId])
+              minArr = [num];
+              maxArr = [num];
+              arr = [num];
             } else {
               switch (v.CustomCalculateMark) {
                 case 1:
-                  num += this.QuestionsForm[o.TableQuestionId]
+                  num += parseFloat(this.QuestionsForm[o.TableQuestionId])
                   break
                 case 2:
-                  num -= this.QuestionsForm[o.TableQuestionId]
+                  num -= parseFloat(this.QuestionsForm[o.TableQuestionId])
                   break
                 case 3:
-                  num *= this.QuestionsForm[o.TableQuestionId]
+                  num *= parseFloat(this.QuestionsForm[o.TableQuestionId])
                   break
                 case 4:
-                  num /= this.QuestionsForm[o.TableQuestionId]
+                  num /= parseFloat(this.QuestionsForm[o.TableQuestionId])
+                  break
+              case 7:
+                  arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
+                  num += parseFloat(this.QuestionsForm[o.TableQuestionId])
+                  num = arr.length === 0 ? 0 : num / arr.length
+                  break
+                case 8:
+                  maxArr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
+                  num = maxArr.length === 0 ? 0 : Math.max(...maxArr)
+                  break
+                case 9:
+                  minArr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
+                  num = minArr.length === 0 ? 0 : Math.min(...minArr)
+                  // console.log('min', this.questionForm[o.QuestionId], arr, num)
                   break
               }
             }

From 372213c7e5d7d7291a5d8052e23462ee7229e917 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 28 Mar 2024 08:58:33 +0800
Subject: [PATCH 223/374] =?UTF-8?q?=E9=A2=84=E8=A7=88=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuestionFormItem.vue           | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
index 571c2f3a..0f68c31c 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
@@ -433,7 +433,6 @@ export default {
       this.addOrEdit.visible = false
     },
     logic(rules, num = 0) {
-      console.log(rules,'rules')
       try {
         if (rules.CalculateQuestionList.length === 0) {
           return false
@@ -452,8 +451,6 @@ export default {
                   })
                   break
                 case 6:
-                  console.log(this.questionForm[o.QuestionId])
-                  console.log(this.questionForm)
                   this.questionForm[o.QuestionId].forEach((q, qi) => {
                     if (qi === 0) {
                       num = parseFloat(q[o.TableQuestionId])
@@ -516,14 +513,12 @@ export default {
     formItemNumberChange(questionId, isTable) {
       if (isTable) {
         this.calculationList.forEach((v, i) => {
-          console.log(v, i)
           var find = v.CalculateQuestionList.filter(o => {
             return o.QuestionId === questionId
           })
           // find的自动计算值number
           console.log('find', find)
           if (find) {
-            console.log(v,'111111')
             var num = this.logic(v)
             if (num !== false) {
               this.$emit('setFormItemData', { key: v.QuestionId, val: num })
@@ -537,7 +532,6 @@ export default {
           })
           // find的自动计算值number
           if (find) {
-            console.log(v,'222222')
             var num = this.logic(v)
             if (num !== false) {
               this.$emit('setFormItemData', { key: v.QuestionId, val: num })
@@ -551,12 +545,10 @@ export default {
       this.question.TableQuestions.Questions.forEach(v => {
         if (v.Type === 'number' && v.DataSource === 1) {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions)
-          var num, minArr=[],maxArr=[],arr=[]
+          var num,arr=[]
           CalculateQuestions.forEach((o, i) => {
             if (i === 0) {
               num = parseFloat(this.QuestionsForm[o.TableQuestionId])
-              minArr = [num];
-              maxArr = [num];
               arr = [num];
             } else {
               switch (v.CustomCalculateMark) {
@@ -578,12 +570,12 @@ export default {
                   num = arr.length === 0 ? 0 : num / arr.length
                   break
                 case 8:
-                  maxArr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
-                  num = maxArr.length === 0 ? 0 : Math.max(...maxArr)
+                  arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
+                  num = arr.length === 0 ? 0 : Math.max(...arr)
                   break
                 case 9:
-                  minArr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
-                  num = minArr.length === 0 ? 0 : Math.min(...minArr)
+                  arr.push(parseFloat(this.QuestionsForm[o.TableQuestionId]))
+                  num = arr.length === 0 ? 0 : Math.min(...arr)
                   // console.log('min', this.questionForm[o.QuestionId], arr, num)
                   break
               }
@@ -646,7 +638,6 @@ export default {
       this.$emit('setFormItemData', obj)
     },
     async uploadScreenshot(param) {
-      console.log(this.visitTaskId)
       if (!this.visitTaskId) {
         const loading = this.$loading({
           target: document.querySelector('.ecrf-wrapper'),

From 88cc255c56ebd1056804ff9e315d565746c55119 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 09:30:23 +0800
Subject: [PATCH 224/374] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/study/index.vue            | 2 +-
 src/views/trials/trials-panel/visit/crc-upload/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/study/index.vue b/src/views/trials/trials-panel/study/index.vue
index a87226fd..387c91f5 100644
--- a/src/views/trials/trials-panel/study/index.vue
+++ b/src/views/trials/trials-panel/study/index.vue
@@ -113,7 +113,7 @@
             <div style="display: flex;align-items: center">
               <div v-if="scope.row.Modalities">{{ scope.row.Modalities }}({{ scope.row.Count }}), </div>
               <div v-else style="color:#f44336;">N/A, </div>
-              <div v-if="scope.row.Bodypart" style="margin:0 3px;">{{ getBodyPart(scope.row.Bodypart) }}, </div>
+              <div v-if="scope.row.Bodypart" style="margin:0 3px;">{{ scope.row.Bodypart }}, </div>
               <div v-else style="color:#f44336;margin:0 3px;">N/A, </div>
               <div v-if="scope.row.StudyTime">{{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }} </div>
               <div v-else style="color:#f44336;">N/A </div>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 126463df..e6f179fa 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -237,7 +237,7 @@
                 <span v-else>{{ $t('trials:crcUpload:label:noneDicom') }}: {{ scope.row.NoneDicomStudyCount }}</span>
               </div>
               <span>
-                {{ scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0?[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount,scope.row.IsHaveClinicalData?'w/':'w/o'].join(','):[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount].join(', ') }}
+                {{ scope.row.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0?[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount,scope.row.IsHaveClinicalData?'w/':'w/o'].join(', '):[scope.row.DicomStudyCount,scope.row.NoneDicomStudyCount].join(', ') }}
               </span>
             </el-tooltip>
           </template>

From fd5cce0ed93b61366b4bfe3307ee656527375431 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 09:41:42 +0800
Subject: [PATCH 225/374] =?UTF-8?q?=E7=95=8C=E9=9D=A2=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue                             | 5 +++--
 src/views/trials/trials-layout/components/trialsNavbar.vue   | 5 +++--
 .../setting/trial-config/components/processConfig.vue        | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9ce11fc3..d8a1ad17 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -23,8 +23,9 @@
         <div style="margin-left:20px;">
           <el-dropdown class="dropdown-container" trigger="click">
             <span class="el-dropdown-link">
-              {{ name }}
-              <span v-if="userTypeShortName">({{ userTypeShortName }})</span>
+              {{ `${name} (${userTypeShortName})` }}
+              <!-- {{ name }}
+              <span v-if="userTypeShortName"> ({{ userTypeShortName }}) </span> -->
               <i class="el-icon-caret-bottom" />
             </span>
             <el-dropdown-menu slot="dropdown" class="user-dropdown">
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index f91dc235..f0654cac 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -40,8 +40,9 @@
         <el-submenu index="4" class="my_info">
           <span slot="title">
             <i class="el-icon-s-custom" />
-            <span>{{ userName }}</span>
-            <span v="userTypeShortName">({{ userTypeShortName }})</span>
+            {{ `${name} (${userTypeShortName})` }}
+            <!-- <span>{{ userName }}</span>
+            <span v="userTypeShortName">({{ userTypeShortName }})</span> -->
           </span>
           <!-- 账户信息 -->
           <el-menu-item v-if="!hasPermi(['role:air'])" index="4-2">{{ $t('trials:trials-myinfo:title:accountInfo') }}</el-menu-item>
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 34b98fff..270116a3 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -661,7 +661,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ scope.row.TrialCriterionNameList.toString() }}
+              {{ scope.row.TrialCriterionNameList.join(', ') }}
             </template>
           </el-table-column>
           <!-- 模板名称 -->

From db7498938f8bb5cda93420be3266241d59602623 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 10:24:31 +0800
Subject: [PATCH 226/374] =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 10 +++++-----
 .../trial-config/components/logicalConfig.vue | 19 +++++++++++--------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 59cb32cb..e097df4a 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -81,13 +81,13 @@
                 @change="(v) => {return isEnableChange(scope.row, v)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span>{{$fd('IsEnable', scope.row.IsEnable)}}</span>
+              <span> {{$fd('IsEnable', scope.row.IsEnable)}}</span>
             </div>
           </template>
         </el-table-column>
         <el-table-column
           v-for="ite of TrialReadingCriterionList"
-          :key="ite"
+          :key="ite.TrialReadingCriterionName"
           :label="ite.TrialReadingCriterionName"
           width="360"
           header-align="center"
@@ -99,7 +99,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item">
+              <span v-for="item of scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}) ? scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).ReadingCategorys : []" :key="item.TrialReadingCriterionId">
                 <el-tag v-if="item === 1" type="primary">{{ $fd('ReadingCategory', item) + ' & ' + $fd('ReadingCategory', 2) }}</el-tag>
                 <!--              <el-tag v-if="item === 2" type="info">{{ $fd('ReadingCategory', item) }}</el-tag>-->
                 <el-tag v-if="item === 4" type="danger">{{ $fd('ReadingCategory', item) }}</el-tag>
@@ -127,8 +127,8 @@
                 @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis">{{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
-              <span v-else>{{$fd('YesOrNo',false)}}</span>
+              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
+              <span v-else> {{$fd('YesOrNo',false)}}</span>
             </template>
           </el-table-column>
           <el-table-column
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index db472eea..9713d05a 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -727,7 +727,7 @@ export default {
   methods: {
     handleConfirmModality() {
       this.form.ModalityList = Object.assign([], this.selectedList.map(v => v.value))
-      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', '|')
+      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ')
       this.modalityListVisible = false
     },
     handleSelectionChange(val) {
@@ -781,7 +781,7 @@ export default {
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
         return this.$fd('Bodypart', i)
       })
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', '|')
+      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
       this.bodyPartListVisible = false
     },
     // 配置信息保存
@@ -791,7 +791,7 @@ export default {
         this.loading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
-        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
+        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
         configTrialBasicInfo(params).then(res => {
           this.loading = false
           if (res.IsSuccess) {
@@ -842,7 +842,7 @@ export default {
         this.btnLoading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
-        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
+        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
         configTrialBasicInfo(params).then(res => {
           this.btnLoading = false
           if (res.IsSuccess) {
@@ -865,7 +865,7 @@ export default {
     signConfirm(signInfo) {
       this.loading = true
       var obj = Object.assign({}, this.form)
-      obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
+      obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
       const params = {
         data: obj,
         signInfo: signInfo
@@ -978,12 +978,12 @@ export default {
           this.form[k] = res[k]
         }
       }
-      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', '|')
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split('|')
+      this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ')
+      this.form.BodyPartTypeList = this.form.BodyPartTypes.split(' | ')
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
         return this.$fd('Bodypart', i)
       })
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', '|')
+      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
       // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
       this.initialForm = { ...this.form }
       this.loading = false
@@ -1104,5 +1104,8 @@ export default {
   .fontColor{
     color: red;
   }
+  ::v-deep .el-table__header-wrapper .el-checkbox {
+    display: none !important;
+  }
 }
 </style>

From 0e5d1fb71872e789b773f4f28f133b7959033439 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 10:53:10 +0800
Subject: [PATCH 227/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E5=8E=86=E5=8F=B2?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=90=8C=E6=97=B6=E5=8F=AA=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E4=B8=80=E4=B8=AA=E7=AA=97=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/Fusion/HistoryScreenshot.vue       |  5 +++++
 .../reading/dicoms/components/Fusion/PetCt.vue    | 15 ++++++++++++++-
 .../dicoms/components/Fusion/Questions.vue        |  3 +--
 .../components/Fusion/TableQuestionItem.vue       |  3 +--
 4 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
index d32363ee..c1ea5f88 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/HistoryScreenshot.vue
@@ -151,6 +151,11 @@ export default {
         })
       })
     },
+    receiveMsg(event) {
+      if (event.data.type === 'setReadingState' || event.data.type === 'closeHistoryScreenshot') {
+        window.close()
+      }
+    },
     toRight() {
       if (this.translateX < this.pageSize * this.itemWidth) {
         this.translateX = 0
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index eda2ef90..9fc36654 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -527,7 +527,8 @@ export default {
       initAnnotations: [],
       activeCanvasWW: null,
       activeCanvasWC: null,
-      fusion: { visible: false } // 历史记录融合调窗
+      fusion: { visible: false }, // 历史记录融合调窗
+      screenshotWindow: null
       // initFirstAnnotation:false
     }
   },
@@ -621,6 +622,13 @@ export default {
       loading.close()
       callback(pictureBaseStr)
     })
+    FusionEvent.$on('viewHistoryScreenshot', (path) => {
+      if (this.screenshotWindow) {
+        this.screenshotWindow.close()
+      }
+      const routeData = this.$router.resolve({ path })
+      this.screenshotWindow = window.open(routeData.href, '_blank')
+    })
   },
   destroyed() {
     cornerstoneTools.destroy()
@@ -2127,11 +2135,16 @@ export default {
       } else if (event.data.type === 'readingPageStateUpdate') {
         this.readingTaskState = event.data.data.readingTaskState
         if (this.readingTaskState === 2) {
+          FusionEvent.$emit('closeHistoryScreenshot')
+          if (this.screenshotWindow) {
+            this.screenshotWindow.close()
+          }
           window.close()
         }
       } else if (event.data.type === 'setReadingState') {
         this.readingTaskState = event.data.data.readingTaskState
         if (this.readingTaskState === 2) {
+          FusionEvent.$emit('closeHistoryScreenshot')
           window.close()
         }
       }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index fd991db0..a1d38c19 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -417,8 +417,7 @@ export default {
       var token = getToken()
       var subjectCode = this.$route.query.subjectCode
       var path = `/historyScreenshot?&subjectCode=${subjectCode}&visitTaskId=${this.visitTaskId}&questionType=${question.QuestionType}&TokenKey=${token}`
-      const routeData = this.$router.resolve({ path })
-      window.open(routeData.href, '_blank')
+      FusionEvent.$emit('viewHistoryScreenshot', path)
     },
     setMeasuredData(measurement) {
       if (measurement.data.isHandleOutsideImage) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index cf5a5eef..2a42a448 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -1022,8 +1022,7 @@ export default {
       var token = getToken()
       var subjectCode = this.$route.query.subjectCode
       var path = `/historyScreenshot?rowId=${rowId}&subjectCode=${subjectCode}&lesionName=${this.lesionName}&TokenKey=${token}`
-      const routeData = this.$router.resolve({ path })
-      window.open(routeData.href, '_blank')
+      FusionEvent.$emit('viewHistoryScreenshot', path)
     }
   }
 }

From 7e1165888b179aa52ac22c747656c73a5a622a60 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 11:19:15 +0800
Subject: [PATCH 228/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=98=AF=E5=90=A6?=
 =?UTF-8?q?=E5=AE=8C=E5=A4=87=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/reading-period/index.vue            | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 7e6e774e..32d7981a 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -54,6 +54,17 @@
                   clearable
                 />
               </el-form-item>
+              
+              <el-form-item :label="$t('trials:readingPeriod:table:completeClinicalData')">
+                <el-select v-model="searchData.CompleteClinicalData" clearable style="width:120px">
+                  <el-option
+                    v-for="item of $d.CompleteClinicalDataEnum"
+                    :key="item.value"
+                    :value="item.value"
+                    :label="item.label"
+                  />
+                </el-select>
+              </el-form-item>
               <el-form-item>
                 <el-button type="primary" icon="el-icon-search" @click="handleSearch">
                   {{ $t('common:button:search') }}
@@ -173,7 +184,10 @@
                       <div v-if="otherInfo.ExistClinicalData" style="display: flex;justify-content: space-between;border-bottom: 1px solid #d9d9d9;margin-bottom: 8px;padding-bottom: 8px">
                         <div style="display: flex;justify-content: space-between;width: 100%">
                           <!-- 临床资料 -->
-                          <div>
+                          <div> 
+                            <el-tooltip v-if="scope.row.Data[i-1].CompleteClinicalData!==1" class="item" effect="dark" :content="$t('trials:readingPeriod:table:clinicalDataNotComplete')" placement="bottom">
+                              <i class="el-icon-warning" style="color:red" />
+                            </el-tooltip>
                             {{ $t('trials:readingPeriod:table:clinicalInfo2') }}
                           </div>
                           <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData && scope.row.Data[i-1].ModuleType === 3) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData && scope.row.Data[i-1].ModuleType === 5)" @click="handleView(scope.row,scope.row.Data[i-1])">
@@ -355,6 +369,7 @@ const searchDataDefault = () => {
     ModuleType: null,
     ReadingStatus: null,
     Name: '',
+    CompleteClinicalData: '',
     PageIndex: 1,
     PageSize: 20
   }

From 07a32b9b2aa1c6ea42187cf5ea503c945b99c088 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 11:39:19 +0800
Subject: [PATCH 229/374] =?UTF-8?q?=E5=8E=BB=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue    | 2 +-
 .../trials-panel/reading/dicoms/components/Fusion/Viewport.vue | 3 ---
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 9fc36654..64b09e8d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -630,7 +630,7 @@ export default {
       this.screenshotWindow = window.open(routeData.href, '_blank')
     })
   },
-  destroyed() {
+  beforeDestroy() {
     cornerstoneTools.destroy()
     eventTarget.reset()
     cache.purgeCache()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 29bbade4..849757b8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -225,9 +225,6 @@ export default {
         this.rotateBarMousemove(e)
       }
     })
-  },
-  destroyed() {
-
   },
   methods: {
     handleVolumeNewImage(e) {

From 0de0e887b43fd2585af57abcc038ab109d981440 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 13:15:13 +0800
Subject: [PATCH 230/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=88=AA=E5=9B=BE=E6=96=87=E4=BB=B6=E5=91=BD=E5=90=8D=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 5f18ffed..6a2a2060 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -1878,7 +1878,8 @@ export default {
       var oA = document.createElement('a')
       var subjectCode = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].subjectCode
       var taskBlindName = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].stack.taskBlindName
-      oA.download = `${subjectCode}_${taskBlindName}`// 设置下载的文件名，默认是'下载'
+      var timestamp = Date.now()
+      oA.download = `${subjectCode}_${taskBlindName}_${timestamp}`// 设置下载的文件名，默认是'下载'
       oA.href = oImg
       document.body.appendChild(oA)
       oA.click()

From 1a9f6c37b863de693d9a5ef3a13a21614ad781b7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 13:26:36 +0800
Subject: [PATCH 231/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=A7=86=E8=A7=92?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AFslice=20Location=E6=B7=BB=E5=8A=A0=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomCanvas.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
index 8ce2f9b6..1ad5f6ee 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomCanvas.vue
@@ -99,8 +99,8 @@
     </div>
 
     <div class="info-instance">
-      <div v-if="dicomInfo.location">Location: {{ Number(dicomInfo.location).toFixed(digitPlaces) }}</div>
-      <div v-show="dicomInfo.thick">Slice Thickness: {{ dicomInfo.thick }}mm</div>
+      <div v-if="dicomInfo.location">Location: {{ `${Number(dicomInfo.location).toFixed(digitPlaces)} mm` }}</div>
+      <div v-show="dicomInfo.thick">Slice Thickness: {{ `${dicomInfo.thick} mm` }}</div>
       <div v-show="dicomInfo.wwwc">WW/WL: {{ dicomInfo.wwwc }}</div>
     </div>
 

From 06b3632bf86b79b838d9b286e17687fd79706e63 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 28 Mar 2024 14:06:02 +0800
Subject: [PATCH 232/374] =?UTF-8?q?PET-CT=E6=84=9F=E5=8F=B9=E5=8F=B7?=
 =?UTF-8?q?=E6=8F=90=E7=A4=BA=E5=8F=8A=E6=97=B6=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadDicomFiles2.vue          | 23 ++++++++-----------
 .../trials-panel/visit/crc-upload/index.vue   |  2 +-
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 0429300e..ed20b0c1 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -591,6 +591,7 @@ export default {
       this.form = { ...this.data }
     }
     this.getStudyInfo()
+    this.uploadQueues=[];
   },
   beforeDestroy() {
     this.myInterval.forEach(v => {
@@ -654,17 +655,14 @@ export default {
       getCRCClinicalData(param).then(res => {
         if(res.IsSuccess){
           let flag = res.Result.some(item=>item.ClinicalDataLevel===4&&item.PDFFileList.length===0)
-          if(flag){
-          if(!showConfirm){
-            data.forEach(item =>{
-              item.notClinicaData = false;
-              if(item.Modalities==="CT、PT"||item.Modalities==="PT、CT"||item.Modalities==="PET-CT"){
-                item.notClinicaData = true;
-              }
-            })
-            this.studyList = data;
-            return false;
-          }
+          data.forEach(item =>{
+            item.notClinicaData = false;
+            if((item.Modalities==="CT、PT"||item.Modalities==="PT、CT"||item.Modalities==="PET-CT")&& flag){
+              item.notClinicaData = true;
+            }
+          })
+          this.studyList = data;
+          if(flag&&showConfirm){
           this.$confirm(this.$t("trials:crc-upload:confirm:message"), this.$t('trials:uploadDicomList:label:prompt'), {
               confirmButtonText: this.$t('trials:reviewTrack:impactList:save'),
               cancelButtonText: this.$t("common:button:cancel"),
@@ -675,9 +673,6 @@ export default {
             }).catch(() => {       
               this.confirmFlag = false;  
             });
-          }else{
-            if(showConfirm) return;
-            this.studyList = data;
           }
         }
         // this.clinicalDatas = res.Result
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 126463df..4e449d55 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -479,7 +479,7 @@
         <el-tabs v-model="activeName" type="border-card" style="flex:1;">
           <!-- DICOM影像上传 -->
           <el-tab-pane :label="$t('trials:uploadedDicoms:tab:uploadDicoms')" name="dicom">
-            <upload-dicom-files2 v-if="uploadVisible2" :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
+            <upload-dicom-files2 v-if="uploadVisible2&&activeName==='dicom'" :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" :activeName.sync="activeName"/>
             <upload-dicom-files v-else :data="rowData" :subject-id="rowData.SubjectId" :subject-visit-id="rowData.Id" @getList="getList" @close="closeUpload" @setOpenWindow="setOpenWindow"/>
           </el-tab-pane>
           <!-- 非DICOM影像上传 -->

From 711373075ce76a8c87e55dbae589b29d1a3d1c0d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 15:37:06 +0800
Subject: [PATCH 233/374] =?UTF-8?q?=E8=84=BE=E5=B0=96=E3=80=81=E8=84=BE?=
 =?UTF-8?q?=E5=BA=95=E6=A0=87=E6=B3=A8=E6=B7=BB=E5=8A=A0=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/App.vue                                   |  4 ++--
 .../attachments/self-attachment/index.vue     |  7 ++++++-
 .../components/Fusion/TableQuestionItem.vue   |  2 +-
 .../reading/dicoms/components/Questions.vue   | 21 +++++++++++++++++++
 .../trial-config/components/logicalConfig.vue |  8 ++++---
 5 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/src/App.vue b/src/App.vue
index 03b14177..1d5e9db3 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -148,8 +148,8 @@ export default {
       } else {
         this.tableData = Object.assign([], this.arr)
       }
-      console.log(JSON.stringify(this.$path))
-      console.log(JSON.stringify(this.tableData))
+      // console.log(JSON.stringify(this.$path))
+      // console.log(JSON.stringify(this.tableData))
     }
   }
 }
diff --git a/src/views/trials/trials-panel/attachments/self-attachment/index.vue b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
index 485edc30..66e23a16 100644
--- a/src/views/trials/trials-panel/attachments/self-attachment/index.vue
+++ b/src/views/trials/trials-panel/attachments/self-attachment/index.vue
@@ -325,12 +325,17 @@ export default {
     closeSignDialog(isSave) {
       this.signVisible = false
       if (isSave) {
+        this.currentIsConfirm = true
         this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
           getNextUnSignDocument({
             TrialId: this.trialId
           }).then(res => {
             if (!res.Result) {
-              this.currentIsConfirm = true
+              // 文档签署已完成，是否关闭弹窗？
+              this.$confirm(this.$t('trials:self-attachment:message:closeDocument')).then(() => {
+                this.previewVisible = false
+              }).catch(()=>{})
+              
             } else {
               this.handleSign(res.Result)
             }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 2a42a448..41e22c99 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -152,7 +152,7 @@
               <!-- <span style="color:#409eff;cursor: pointer" @click="previewImages(answers.RowId)">
                 {{ $t('trials:lugano:button:suvscreenshot') }}
               </span> -->
-              <el-button type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
+              <el-button v-if="!isBaseLineTask" type="text" @click="previewImages(answers.RowId)">{{ $t('trials:lugano:button:suvscreenshot') }}</el-button>
             </div>
           </template>
           <el-input
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 90ef1335..bf103de7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -261,11 +261,14 @@ export default {
             this.$alert(this.$t('trials:lugano:message:saveWarning'), this.$t('trials:lugano:fusionDialog:warning'))
             return
           }
+
           var currentSpleenStatus = this.questionForm[this.spleenStatusId]
           var currentSpleenLength = this.questionForm[this.spleenLengthId]
           currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
           var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
           var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
+          var chenckVaild = this.checkAnnotationValid(stIdx, slIdx)
+
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
             this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
@@ -280,6 +283,11 @@ export default {
             this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => {}
             })
+          } else if (!chenckVaild) {
+            // 校验标记是否在同一序列的不同图像上
+            this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
+              callback: _ => {}
+            })
           } else {
             this.saveQuestionsList()
           }
@@ -357,6 +365,19 @@ export default {
         }
       }
     },
+    checkAnnotationValid(stIdx, slIdx) {
+      var isValid = true
+      if (stIdx > -1 && slIdx > -1 && this.measurements[stIdx].MeasureData && this.measurements[slIdx].MeasureData) {
+        var stSeriesId = this.measurements[stIdx].SeriesId
+        var stInstanceId = this.measurements[stIdx].InstanceId
+        var slSeriesId = this.measurements[slIdx].SeriesId
+        var slInstanceId = this.measurements[slIdx].InstanceId
+        if (!(stSeriesId && stInstanceId && slSeriesId && slInstanceId && stSeriesId === slSeriesId && stInstanceId !== slInstanceId)) {
+          isValid = false
+        }
+      }
+      return isValid
+    },
     setSpleenCommentDisplay() {
       if (this.spleenCommentsId && this.spleenStatusId) {
         for (let i = 0; i < this.questions[0].Childrens.length; i++) {
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index 9713d05a..f1c7664f 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -781,7 +781,7 @@ export default {
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
         return this.$fd('Bodypart', i)
       })
-      this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
+      this.form.BodyPartTypes = bodyPartTypes.join(' | ')
       this.bodyPartListVisible = false
     },
     // 配置信息保存
@@ -791,7 +791,9 @@ export default {
         this.loading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
+        console.log(this.form.BodyPartTypeList)
         params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
+        
         configTrialBasicInfo(params).then(res => {
           this.loading = false
           if (res.IsSuccess) {
@@ -979,9 +981,9 @@ export default {
         }
       }
       this.form.ModalityListStr = this.form.ModalityList.toString().replaceAll(',', ' | ')
-      this.form.BodyPartTypeList = this.form.BodyPartTypes.split(' | ')
+      this.form.BodyPartTypeList = this.form.BodyPartTypes.split('|')
       var bodyPartTypes = this.form.BodyPartTypeList.map(i => {
-        return this.$fd('Bodypart', i)
+        return this.$fd('Bodypart', i.trim())
       })
       this.form.BodyPartTypes = bodyPartTypes.toString().replaceAll(',', ' | ')
       // this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')

From 1812877f8823c988a2267f7945f91ff29557c5fe Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 15:38:42 +0800
Subject: [PATCH 234/374] =?UTF-8?q?=E5=8E=BB=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/logicalConfig.vue            | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index f1c7664f..222e2bd8 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -791,7 +791,6 @@ export default {
         this.loading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
-        console.log(this.form.BodyPartTypeList)
         params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
         
         configTrialBasicInfo(params).then(res => {

From d4ea8bb4d58ef559efefd6013109c781da428cd6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 16:24:37 +0800
Subject: [PATCH 235/374] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/qc-check/components/qualityAssurance.vue           | 5 ++++-
 src/views/trials/trials-panel/visit/qc-check/index.vue       | 1 +
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 6021d0b3..7cd75989 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1430,8 +1430,11 @@ export default {
                 })
               })
             } else {
+              // 没有后续质控任务
               this.$emit('getList')
-              this.$alert('没有后续质控任务')
+              this.$confirm(this.$t('trials:qcQuality:title:closeQCDialog')).then(() => {
+                this.$emit('close')
+              }).catch(()=>{})
             }
           })
         }
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 332b6862..3a1081fc 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -491,6 +491,7 @@
           @getList="getList"
           @nextTask="nextTask"
           @openManuals="openManuals"
+          @close="qcVisible = false"
         />
       </div>
     </el-dialog>

From 3eeefaaa2cf56ecd4a62bbf8bec924fb295866ca Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 17:02:03 +0800
Subject: [PATCH 236/374] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D?=
 =?UTF-8?q?=E5=88=86=E5=89=B2=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/logicalConfig.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index 222e2bd8..905cb224 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -791,7 +791,7 @@ export default {
         this.loading = true
         // 保存配置信息
         var params = Object.assign({}, this.form)
-        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
+        params.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
         
         configTrialBasicInfo(params).then(res => {
           this.loading = false
@@ -866,7 +866,7 @@ export default {
     signConfirm(signInfo) {
       this.loading = true
       var obj = Object.assign({}, this.form)
-      obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', ' | ')
+      obj.BodyPartTypes = this.form.BodyPartTypeList.toString().replaceAll(',', '|')
       const params = {
         data: obj,
         signInfo: signInfo

From fe40027765412d54d2da310fd625ca4aaa9c4bde Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 17:14:06 +0800
Subject: [PATCH 237/374] =?UTF-8?q?=E9=80=BB=E8=BE=91=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/logicalConfig.vue          | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
index 905cb224..9b742f0f 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue
@@ -1105,8 +1105,5 @@ export default {
   .fontColor{
     color: red;
   }
-  ::v-deep .el-table__header-wrapper .el-checkbox {
-    display: none !important;
-  }
 }
 </style>

From 431d8a0682fa8bb5c36a475c434f272e06e4845f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 28 Mar 2024 17:53:26 +0800
Subject: [PATCH 238/374] =?UTF-8?q?lugano=E5=8E=BB=E9=99=A4=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue           | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index a1d38c19..0b4b2cf4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -360,10 +360,7 @@ export default {
         // 当前标记在图像外
         this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
           callback: action => {
-            this.$message({
-              type: 'info',
-              message: `action: ${action}`
-            })
+            
           }
         })
         return

From 1f3cb0284afb9a2a03a80e8e271e2330b3e73342 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 09:14:52 +0800
Subject: [PATCH 239/374] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue          | 6 +++---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue  | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 0b4b2cf4..17f09335 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -293,7 +293,7 @@ export default {
         // questionMarkInfoList
       }
       saveImageQuality(params).then(async res => {
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 1000 })
         window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
         this.loading = false
         this.questionFormChangeState = false
@@ -360,7 +360,7 @@ export default {
         // 当前标记在图像外
         this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
           callback: action => {
-            
+
           }
         })
         return
@@ -401,7 +401,7 @@ export default {
           questionMarkInfoList
         }
         saveImageQuality(params).then(async res => {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
+          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 1000 })
           loading.close()
           this.$set(question, 'SaveEnum', 0)
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 41e22c99..4150b260 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -849,7 +849,7 @@ export default {
           }
           submitTableQuestion(params).then(async res => {
           // 保存成功！
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
+            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 1000 })
             this.currentMarkTool = otherMeasureData ? otherMeasureData.type : ''
             // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
 

From c7d362e1d07d215cba175755bbd028833b81eec3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 09:23:22 +0800
Subject: [PATCH 240/374] =?UTF-8?q?=E6=B6=88=E6=81=AF=E6=8F=90=E7=A4=BA?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E6=97=B6=E9=97=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue        | 8 +++++---
 .../dicoms/components/Fusion/TableQuestionItem.vue        | 4 ++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 17f09335..56f8ff39 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -293,10 +293,11 @@ export default {
         // questionMarkInfoList
       }
       saveImageQuality(params).then(async res => {
-        this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 1000 })
         window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
         this.loading = false
         this.questionFormChangeState = false
+        this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+        
       }).catch(() => {
         this.loading = false
       })
@@ -401,10 +402,11 @@ export default {
           questionMarkInfoList
         }
         saveImageQuality(params).then(async res => {
-          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 1000 })
-          loading.close()
           this.$set(question, 'SaveEnum', 0)
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
+          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+          loading.close()
+          
         }).catch(() => {
           loading.close()
         })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 4150b260..13a86d68 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -848,8 +848,6 @@ export default {
             params.rowId = ''
           }
           submitTableQuestion(params).then(async res => {
-          // 保存成功！
-            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 1000 })
             this.currentMarkTool = otherMeasureData ? otherMeasureData.type : ''
             // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
 
@@ -868,6 +866,8 @@ export default {
             FusionEvent.$emit('resetSuvQuestions')
             window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
             this.$emit('close')
+            loading.close()
+            this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
           }).catch(() => { loading.close() })
         })
       })

From 3083ee1e8bfd1607694341cda6baa46c64fc9412 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 09:44:16 +0800
Subject: [PATCH 241/374] =?UTF-8?q?=E8=82=9D=E8=84=8F=E8=A1=80=E6=B1=A0?=
 =?UTF-8?q?=E7=BA=B5=E9=9A=94=E8=A1=80=E6=B1=A0=E4=BF=9D=E5=AD=98=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 56f8ff39..7f64b4c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -357,7 +357,7 @@ export default {
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
     saveAnnotation(question) {
-      if (!this.lungIsInsideVolume || !this.liverIsInsideVolume) {
+      if((question.QuestionType === 51 && !this.liverIsInsideVolume) || (question.QuestionType === 52 && !this.lungIsInsideVolume)){
         // 当前标记在图像外
         this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
           callback: action => {
@@ -404,8 +404,8 @@ export default {
         saveImageQuality(params).then(async res => {
           this.$set(question, 'SaveEnum', 0)
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
-          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
           loading.close()
+          this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
           
         }).catch(() => {
           loading.close()

From 82e5142bac4fa4f9d1be04817949949433b80c54 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 10:17:29 +0800
Subject: [PATCH 242/374] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E4=BF=9D=E5=AD=98=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 34 ++++++++++++++-----
 .../components/Fusion/TableQuestionItem.vue   | 18 +++++++++-
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 7f64b4c6..2a46a734 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -64,7 +64,9 @@ export default {
       lungIsInsideVolume: true,
       liverIsInsideVolume: true,
       uptakeFromBaselineId: '',
-      baseLinePET5PS: null
+      baseLinePET5PS: null,
+      liverRender: true,
+      lungRender: true
     }
   },
   computed: {
@@ -98,7 +100,7 @@ export default {
     this.isBaseLineTask = this.$route.query.isBaseLineTask === 'true'
     this.initPage()
     FusionEvent.$on('refreshQuestions', () => {
-      this.initList()
+      this.initList(false)
     })
     FusionEvent.$on('resetSuvQuestions', () => {
       console.log('resetSuvQuestions')
@@ -159,9 +161,9 @@ export default {
         this.baseLinePET5PS = res.Result.BaseLinePET5PS
         this.loading = false
       }
-      this.initList()
+      this.initList(true)
     },
-    initList() {
+    initList(isInit) {
       this.loading = true
       var params = {
         trialId: this.trialId,
@@ -188,6 +190,11 @@ export default {
         res.OtherInfo.QuestionMarkInfoList.forEach(i => {
           if (i.OtherMeasureData) {
             i.OtherMeasureData = JSON.parse(i.OtherMeasureData)
+            if (i.QuestionType === 51 && isInit) {
+              this.liverRender = false
+            } else if (i.QuestionType === 52 && isInit) {
+              this.lungRender = false
+            }
           }
           this.measurements.push(i)
         })
@@ -297,7 +304,6 @@ export default {
         this.loading = false
         this.questionFormChangeState = false
         this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-        
       }).catch(() => {
         this.loading = false
       })
@@ -357,7 +363,7 @@ export default {
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
     saveAnnotation(question) {
-      if((question.QuestionType === 51 && !this.liverIsInsideVolume) || (question.QuestionType === 52 && !this.lungIsInsideVolume)){
+      if ((question.QuestionType === 51 && !this.liverIsInsideVolume) || (question.QuestionType === 52 && !this.lungIsInsideVolume)) {
         // 当前标记在图像外
         this.$alert(this.$t('trials:reading:lugano:warnning:outsideVolume'), this.$t('trials:lugano:fusionDialog:warning'), {
           callback: action => {
@@ -406,7 +412,6 @@ export default {
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
           loading.close()
           this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
-          
         }).catch(() => {
           loading.close()
         })
@@ -456,7 +461,20 @@ export default {
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true
-        this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+        if (obj.QuestionType === 51) {
+          if (!this.liverRender) {
+            this.liverRender = true
+          } else {
+            this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+          }
+        }
+        if (obj.QuestionType === 52) {
+          if (!this.lungRender) {
+            this.lungRender = true
+          } else {
+            this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
+          }
+        }
       }
     },
     setQuestionStatus(obj, questionType) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 13a86d68..1527ea88 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -607,7 +607,23 @@ export default {
           if (!isInit) {
             // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）
             if (this.questionForm.RowId) {
-              this.$set(this.questionForm, 'saveTypeEnum', 1)
+              if (this.questionForm.OtherMeasureData && this.firstRenderAnnotation) {
+                var annotation = Object.assign({}, this.questionForm.OtherMeasureData)
+
+                if (annotation && this.firstRenderAnnotation) {
+                  for (const k in annotation.data.cachedStats) {
+                    if (annotation.data.cachedStats[k].pointsInShape.length !== 0) {
+                      this.firstRenderAnnotation = false
+                      break
+                    }
+                  }
+                }
+              }
+              if (this.firstRenderAnnotation) {
+                this.$set(this.questionForm, 'saveTypeEnum', 2)
+              } else {
+                this.$set(this.questionForm, 'saveTypeEnum', 1)
+              }
             } else {
               this.$set(this.questionForm, 'saveTypeEnum', 0)
             }

From efa7c61fe404186f6e28296659309f5719d06243 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 10:20:54 +0800
Subject: [PATCH 243/374] =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=B8=B2=E6=9F=93?=
 =?UTF-8?q?=E4=B8=8D=E6=9B=B4=E6=96=B0=E6=A0=87=E8=AF=86=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 2a46a734..4c30c1c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -461,19 +461,12 @@ export default {
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true
-        if (obj.QuestionType === 51) {
-          if (!this.liverRender) {
-            this.liverRender = true
-          } else {
-            this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
-          }
-        }
-        if (obj.QuestionType === 52) {
-          if (!this.lungRender) {
-            this.lungRender = true
-          } else {
-            this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
-          }
+        if (obj.QuestionType === 51 && !this.liverRender) {
+          this.liverRender = true
+        } else if (obj.QuestionType === 52 && !this.lungRender) {
+          this.lungRender = true
+        } else {
+          this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
         }
       }
     },

From 5bcd7cfa59490b2ce79fde3383c8185c7499e084 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 10:36:20 +0800
Subject: [PATCH 244/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=98=AF=E5=90=A6=E5=AE=8C=E5=A4=87?=
 =?UTF-8?q?=E4=B8=BA=E5=90=A6=E6=98=AF=E6=98=BE=E7=A4=BA=E6=84=9F=E5=8F=B9?=
 =?UTF-8?q?=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/subject/reading-period/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 32d7981a..e2ce87bb 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -185,7 +185,7 @@
                         <div style="display: flex;justify-content: space-between;width: 100%">
                           <!-- 临床资料 -->
                           <div> 
-                            <el-tooltip v-if="scope.row.Data[i-1].CompleteClinicalData!==1" class="item" effect="dark" :content="$t('trials:readingPeriod:table:clinicalDataNotComplete')" placement="bottom">
+                            <el-tooltip v-if="scope.row.Data[i-1].CompleteClinicalData===0" class="item" effect="dark" :content="$t('trials:readingPeriod:table:clinicalDataNotComplete')" placement="bottom">
                               <i class="el-icon-warning" style="color:red" />
                             </el-tooltip>
                             {{ $t('trials:readingPeriod:table:clinicalInfo2') }}

From 9aaf2e4ad5e605df2860310bc8280cdc6d99293e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 11:33:23 +0800
Subject: [PATCH 245/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E5=85=B3=E9=97=AD=E5=8E=86=E5=8F=B2=E8=AE=B0=E5=BD=95=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E5=90=8C=E6=97=B6=E5=85=B3=E9=97=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue    | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 64b09e8d..966700e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -631,6 +631,9 @@ export default {
     })
   },
   beforeDestroy() {
+    if (this.screenshotWindow) {
+      this.screenshotWindow.close()
+    }
     cornerstoneTools.destroy()
     eventTarget.reset()
     cache.purgeCache()

From f4b2c8a6a4ca90e301210ebba5ba74521366f360 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 12:15:27 +0800
Subject: [PATCH 246/374] =?UTF-8?q?lugano=E6=8A=A5=E5=91=8A=E9=A1=B5pdd?=
 =?UTF-8?q?=E6=A0=87=E7=BA=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/ReportPage.vue       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index a7995639..c78e306a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -93,7 +93,7 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">
+              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) ? '#f66' : '#fff'}">
                 <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
                   <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">

From 12db7821537cc6f00b4ae0e99f0b1b2dc447a57c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 12:16:22 +0800
Subject: [PATCH 247/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=8E=86=E5=8F=B2=E8=9E=8D=E5=90=88=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 966700e6..21ff6235 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -565,7 +565,7 @@ export default {
     this.subjectCode = this.$route.query.subjectCode
     this.taskBlindName = this.$route.query.taskBlindName
     this.isCurrentTask = this.$route.query.isCurrentTask === 'true'
-    this.isBaseLineTask = this.$route.query.isCurrentTask === 'true'
+    this.isBaseLineTask = this.$route.query.isBaseLineTask === 'true'
     this.customWwc = { visible: false, title: this.$t('trials:reading:dagTitle:wwwcCustom') }
     const digitPlaces = parseInt(this.$route.query.digitPlaces)
     this.digitPlaces = digitPlaces === -1 ? 2 : digitPlaces

From 7b475b487347cd6ea523600e11eaf7ef0e68bf1d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 12:56:00 +0800
Subject: [PATCH 248/374] =?UTF-8?q?=E5=85=B3=E9=97=AD=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E5=85=B3=E9=97=AD=E5=8E=86=E5=8F=B2=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue            | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 21ff6235..47cadf5f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -629,8 +629,15 @@ export default {
       const routeData = this.$router.resolve({ path })
       this.screenshotWindow = window.open(routeData.href, '_blank')
     })
+    window.addEventListener("beforeunload",() => {
+      if (this.screenshotWindow) {
+        this.screenshotWindow.close()
+      }
+    })
+   
   },
   beforeDestroy() {
+    console.log('beforeDestroy',this.screenshotWindow)
     if (this.screenshotWindow) {
       this.screenshotWindow.close()
     }
@@ -645,6 +652,7 @@ export default {
     FusionEvent.$off('removeAnnotation')
     FusionEvent.$off('imageLocation')
     FusionEvent.$off('getScreenshots')
+    window.removeEventListener("beforeunload")
   },
   methods: {
 

From 5729f2246e2a4c6e155bd6a6814d87051dcef794 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 13:01:02 +0800
Subject: [PATCH 249/374] =?UTF-8?q?=E5=88=A0=E9=99=A4console?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 47cadf5f..17452b1a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -637,7 +637,6 @@ export default {
    
   },
   beforeDestroy() {
-    console.log('beforeDestroy',this.screenshotWindow)
     if (this.screenshotWindow) {
       this.screenshotWindow.close()
     }

From 10ff7f31d8e5b55c547361312f3dd061dd0033a7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 13:36:50 +0800
Subject: [PATCH 250/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E8=AE=BF?=
 =?UTF-8?q?=E8=A7=86=E7=BA=A7=E5=88=AB=E7=9A=84=E4=BB=BB=E5=8A=A1=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0=E6=A3=80=E6=9F=A5=E7=BA=A7=E5=88=AB=E7=9A=84=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/subject/reading-period/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index e2ce87bb..5cb27645 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -190,7 +190,7 @@
                             </el-tooltip>
                             {{ $t('trials:readingPeriod:table:clinicalInfo2') }}
                           </div>
-                          <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData && scope.row.Data[i-1].ModuleType === 3) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData && scope.row.Data[i-1].ModuleType === 5)" @click="handleView(scope.row,scope.row.Data[i-1])">
+                          <el-link type="danger" v-if="(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsSubjectClinicalData && scope.row.Data[i-1].IsBaseLine) ||(scope.row.Data[i-1].IsVisit && otherInfo.IsExistsVisitClinicalData) || (scope.row.Data[i-1].IsVisit && otherInfo.IsExistsStudyClinicalData) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsReadingClinicalData && scope.row.Data[i-1].ModuleType === 3) || (!scope.row.Data[i-1].IsVisit && otherInfo.IsExistsOncologyReadClinicalData && scope.row.Data[i-1].ModuleType === 5)" @click="handleView(scope.row,scope.row.Data[i-1])">
                             {{ $t('trials:readingPeriod:button:view') }}
                           </el-link>
                           <span v-else>{{ $t('trials:readingPeriod:table:noCD') }}</span>

From c0519613e24072b62e09c8ed226ebab84247d79a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 14:48:57 +0800
Subject: [PATCH 251/374] =?UTF-8?q?=E5=BE=85=E7=AD=BE=E7=BD=B2=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=96=87=E4=BB=B6=E6=B7=BB=E5=8A=A0=E8=8E=B7=E5=8F=96?=
 =?UTF-8?q?=E4=B8=8B=E4=B8=80=E7=AD=BE=E7=BD=B2=E6=96=87=E6=A1=A3=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/needSignSysDoc.vue             | 24 ++++++++++++++++---
 src/views/trials/trials-workbench/index.vue   |  6 ++---
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
index 3f9f81e8..1a84d446 100644
--- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue
+++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue
@@ -115,7 +115,7 @@
   </div>
 </template>
 <script>
-import { getWaitSignSysDocList, setSystemDocFirstViewTime } from '@/api/trials'
+import { getWaitSignSysDocList,getNextUnSignDocument, setSystemDocFirstViewTime } from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import PreviewFile from '@/components/PreviewFile/index'
 import SignForm from '@/views/trials/trials-panel/attachments/self-attachment/components/SignForm'
@@ -231,8 +231,26 @@ export default {
       this.signVisible = false
       if (isSave) {
         this.currentIsConfirm = true
-        this.getList()
-        this.$emit('refreshStats')
+        // this.getList()
+        // this.$emit('refreshStats')
+        this.$confirm(this.$t('trials:self-attachment:message:nextDocument')).then(res => {
+          getNextUnSignDocument({}).then(res => {
+            if (!res.Result) {
+              // 文档签署已完成，是否关闭弹窗？
+              this.$confirm(this.$t('trials:self-attachment:message:closeDocument')).then(() => {
+                this.previewVisible = false
+              }).catch(()=>{})
+              
+            } else {
+              this.handleSign(res.Result)
+            }
+            this.getList()
+            this.$emit('refreshStats')
+          })
+        }).catch(() => {
+          this.currentIsConfirm = true
+          this.getList()
+        })
       }
     },
     // 初始化计时器,清除上一次的数据
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index dee37ee8..0f2a8f36 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -293,7 +293,7 @@
           <!-- 项目签署文件 -->
             <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->
-            <NeedSignSysDoc v-if="selected === 'NeedSignSysDoc'" @refreshStats="refreshStats" />
+            <NeedSignSysDoc v-if="selected === 'NeedSignSysDoc'" @refreshStats="--tabList.SysWaitSignDocCount" />
           <!-- 项目签署文件 -->
           <NeedSignedTrialDoc v-if="selected === 'NeedSignedTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->
@@ -422,7 +422,7 @@ import NeedSignedTrialDoc from './components/NeedSignedTrialDoc'
 import store from '@/store'
 import './index.css'
 
-import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList, getTrialSignDocumentList} from '@/api/trials'
+import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList,getWaitSignSysDocList, getTrialSignDocumentList} from '@/api/trials'
 import { getUser } from '@/api/admin'
 import {mapGetters} from "vuex";
 
@@ -500,7 +500,7 @@ export default {
       this.isSignSystemDoc = count > 0
     },
     refreshStats() {
-      this.$refs['panelCount'].getData()
+      // this.$refs['panelCount'].getData()
       this.getNeedSignTrialDocTrialIdList()
     },
     getNeedSignTrialDocTrialIdList() {

From cd0e62fbef4b4e925f2956b33372c01b32c2099a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 15:02:43 +0800
Subject: [PATCH 252/374] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        | 28 +++++++++----------
 1 file changed, 13 insertions(+), 15 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 17452b1a..b3d5b00e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -161,6 +161,17 @@
           <div class="text">{{ $t('trials:reading:button:reset') }}</div>
         </div>
       </el-tooltip>
+      <el-tooltip v-if="!isBaseLineTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom" >
+        <div class="tool-wrapper">
+          <div
+            class="icon"
+            @click.prevent="historyRecord"
+          >
+            <svg-icon icon-class="record" class="svg-icon" />
+          </div>
+          <div class="text">{{ $t('trials:lugano:button:record') }}</div>
+        </div>
+      </el-tooltip>
       <!-- 伪彩 -->
       <el-tooltip class="item" effect="dark" :content="$t('trials:lugano:button:colormap')" placement="bottom">
         <div class="colorBar" style="display:flex;justify-content: flex-start;align-items: center;position: relative;" @mouseleave="isSlideMoving = false">
@@ -214,18 +225,6 @@
         </div>
       </el-tooltip>
 
-      <el-tooltip v-if="!isBaseLineTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom" style="margin-left:20px">
-        <div class="tool-wrapper">
-          <div
-            class="icon"
-            @click.prevent="historyRecord"
-          >
-            <svg-icon icon-class="record" class="svg-icon" />
-          </div>
-          <div class="text">{{ $t('trials:lugano:button:record') }}</div>
-        </div>
-      </el-tooltip>
-
     <!-- 截屏 -->
     <!-- <el-tooltip class="item" effect="dark" :content="`${$t('trials:reading:button:screenShot')}`" placement="bottom">
         <div class="tool-wrapper">
@@ -629,12 +628,11 @@ export default {
       const routeData = this.$router.resolve({ path })
       this.screenshotWindow = window.open(routeData.href, '_blank')
     })
-    window.addEventListener("beforeunload",() => {
+    window.addEventListener('beforeunload', () => {
       if (this.screenshotWindow) {
         this.screenshotWindow.close()
       }
     })
-   
   },
   beforeDestroy() {
     if (this.screenshotWindow) {
@@ -651,7 +649,7 @@ export default {
     FusionEvent.$off('removeAnnotation')
     FusionEvent.$off('imageLocation')
     FusionEvent.$off('getScreenshots')
-    window.removeEventListener("beforeunload")
+    window.removeEventListener('beforeunload')
   },
   methods: {
 

From d3244cee7c578f95da23ee9753155ceb9a28a549 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 29 Mar 2024 16:22:58 +0800
Subject: [PATCH 253/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E8=A7=86=E5=8F=A3?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E4=BF=A1=E6=81=AF=E6=A0=BC=E5=BC=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Viewport.vue             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 849757b8..93d92891 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -58,8 +58,8 @@
       class="imageInfo_wrapper_r"
       :style="{color:index%2 == 1 ? '#ddd' : '#666'}"
     >
-      <div v-show="imageInfo.location && index !== 3 ">Location: {{ imageInfo.location }}</div>
-      <div v-show="seriesInfo.sliceThickness && index !== 3">Slice Thickness: {{ Number(seriesInfo.sliceThickness).toFixed(2) }}mm</div>
+      <div v-show="imageInfo.location && index !== 3 ">Location: {{ `${imageInfo.location} mm` }}</div>
+      <div v-show="seriesInfo.sliceThickness && index !== 3">Slice Thickness: {{ `${Number(seriesInfo.sliceThickness).toFixed(2)} mm` }}</div>
       <div v-show="imageInfo.wwwc ">WW/WL: {{ imageInfo.wwwc }}</div>
     </div>
     <div v-if="index !== 4" ref="sliderBox" class="slider_box" :style="{background: index === 2?'#ddd':'#333'}" @click.stop="goViewer($event)">

From 2c97e1d4419aa4cd826fca4b35484108ed2f47ad Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 29 Mar 2024 17:14:42 +0800
Subject: [PATCH 254/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E5=AF=BC=E5=87=BA=E5=BC=B9=E6=A1=86=E5=A4=A7=E5=B0=8F?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/consistency-analysis/index.vue   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 45053807..e6f612f4 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -635,6 +635,7 @@
         :title="$t('trials:reviewTrack:button:export')"
         :visible.sync="exportVisible"
         :close-on-click-modal="false"
+        width="35%"
         append-to-body>
         <exportList :trial-reading-criterion-id="TrialReadingCriterionId" @handleExport="handleExport"/>
       </el-dialog>

From a8fa74b270bca1daec333030796f09eab6555d59 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 1 Apr 2024 09:25:45 +0800
Subject: [PATCH 255/374] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=90=AF=E7=94=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa                                                        | 2 +-
 src/views/trials/trials-panel/enrolled-reviewers/list/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.env.usa b/.env.usa
index 833c876c..03bb19dd 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-14/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-29/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index e097df4a..7c4c72af 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -81,7 +81,7 @@
                 @change="(v) => {return isEnableChange(scope.row, v)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span> {{$fd('IsEnable', scope.row.IsEnable)}}</span>
+              <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span>
             </div>
           </template>
         </el-table-column>

From cdf26294d04e625be4ec7c270af12d5eaaff858f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 1 Apr 2024 11:04:04 +0800
Subject: [PATCH 256/374] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BA=BA=E9=A1=B5=E9=9D=A2=EF=BC=8C=E5=90=AF=E7=94=A8=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E7=9A=84=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/enrolled-reviewers/list/index.vue   | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 7c4c72af..1c34d898 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -69,7 +69,7 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:status')"
-          width="100"
+          width="140"
           sortable="custom"
         >
           <template slot-scope="scope">
@@ -78,10 +78,12 @@
                 v-model="scope.row.IsEnable"
                 :active-value="true"
                 :inactive-value="false"
+                :active-text="$fd('IsEnable', true)"
+                :inactive-text="$fd('IsEnable', false)"
                 @change="(v) => {return isEnableChange(scope.row, v)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span>
+              <!-- <span :style="{color:scope.row.IsEnable?'#409eff':'#dcdfe6'}"> {{$fd('IsEnable', scope.row.IsEnable)}}</span> -->
             </div>
           </template>
         </el-table-column>
@@ -124,11 +126,13 @@
                 v-model="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"
                 :active-value="true"
                 :inactive-value="false"
+                :active-text="$fd('YesOrNo', true)"
+                :inactive-text="$fd('YesOrNo', false)"
                 @change="(v) => {return isConsistencyChange(scope.row, ite, v, true)}"
                 :disabled="!hasPermi(['trials:trials-panel:enrolled-reviewers:list:edit'])"
               />
-              <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
-              <span v-else> {{$fd('YesOrNo',false)}}</span>
+              <!-- <span v-if="scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis"> {{$fd('YesOrNo', scope.row.CriterionCategoryList.find(v => {return v.TrialReadingCriterionId === ite.TrialReadingCriterionId}).IsJoinAnalysis)}}</span>
+              <span v-else> {{$fd('YesOrNo',false)}}</span> -->
             </template>
           </el-table-column>
           <el-table-column

From cafd40d83e0f38fd811aa6d7ac3d4c3fd4650c15 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 1 Apr 2024 11:04:48 +0800
Subject: [PATCH 257/374] =?UTF-8?q?iqc=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8A=A0=E6=80=A5=E9=87=8F=E5=B1=95=E7=A4=BA=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-list/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 27673440..0ac10255 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -457,7 +457,7 @@
           min-width="160"
         />
         <el-table-column
-          v-if="hasPermi(['role:iqc'])"
+          v-if="hasPermi(['role:mim'])"
           prop="MIM_UrgentCount"
           :label="$t('trials:trials-list:table:MIM_UrgentCount')"
           show-overflow-tooltip

From a9cbdf9b0850fd473916495ae5ded43314445c7b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 1 Apr 2024 11:14:20 +0800
Subject: [PATCH 258/374] =?UTF-8?q?crc=E5=8A=A0=E6=80=A5=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=8F=9C=E5=8D=95=E4=BD=8D=E7=BD=AE=E5=8F=98?=
 =?UTF-8?q?=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 0f2a8f36..7251cd9a 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -247,6 +247,8 @@
           </div>
         </div>
         <div style="width: auto;flex:1;padding: 0 20px">
+          <!-- 加急影像提交 -->
+          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
           <!-- PM/APM -->
           <!-- 阅片期 -->
           <!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
@@ -275,8 +277,6 @@
             <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 影像重传 -->
             <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
-          <!-- 加急影像提交 -->
-            <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
           <!-- IQC -->
           <!-- 影像质控 -->
             <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />

From 7278841b0c02d6b86fdfcae4e5dd94afa5a21773 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 1 Apr 2024 11:24:49 +0800
Subject: [PATCH 259/374] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E9=87=8D=E8=BD=BD=E6=97=B6=E5=85=B3=E9=97=AD=E5=AD=90=E9=A1=B5?=
 =?UTF-8?q?=E7=AD=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue  | 6 ++++++
 .../trials-panel/reading/dicoms/components/ReportPage.vue   | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 6a2a2060..e155569b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -961,6 +961,11 @@ export default {
         this.petctWindow.close()
       }
     })
+    window.addEventListener('beforeunload', () => {
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+    })
   },
   beforeDestroy() {
     DicomEvent.$off('updateImage')
@@ -976,6 +981,7 @@ export default {
     if (this.petctWindow) {
       this.petctWindow.close()
     }
+    window.removeEventListener('beforeunload')
   },
   methods: {
     getWwcTpl() {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
index c78e306a..2e9560ba 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue
@@ -690,7 +690,7 @@ export default {
           await store.dispatch('reading/setCurrentReadingTaskState', 2)
           var isAutoTask = await this.getAutoTaskVal()
           if (isAutoTask) {
-            DicomEvent.$emit('reload')
+            // DicomEvent.$emit('reload')
             // DicomEvent.$emit('getNextTask')
             window.location.reload()
           } else {
@@ -709,7 +709,7 @@ export default {
           }
 
           window.opener.postMessage('refreshTaskList', window.location)
-          DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 })
+          // DicomEvent.$emit('readingPageStateUpdate', { readingTaskState: 2 })
         }
         this.loading = false
       }).catch(() => {

From e4fa9c7afd79a4c063a85ca1d775e300e5e071c2 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 1 Apr 2024 11:37:55 +0800
Subject: [PATCH 260/374] =?UTF-8?q?ir=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-list/index.vue | 30 ++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 0ac10255..83f35e19 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -43,7 +43,29 @@
             />
           </el-select>
         </el-form-item>
-
+        <!-- 阅片标准 -->
+        <el-form-item :label="$t('trials:trials-list:table:IR_ReadingCriterionList')" v-if="hasPermi(['role:ir'])">
+          <el-select
+            v-model="searchData.CriterionType"
+            style="width:150px;"
+            clearable
+          >
+            <el-option
+              v-for="(item) in $d.CriterionType"
+              :key="item.id"
+              :label="item.label"
+              :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <!-- 联系人 -->
+        <el-form-item :label="$t('trials:trials-list:table:IR_PMEmailList')" v-if="hasPermi(['role:ir'])">
+           <el-input
+            v-model="searchData.PM_EMail"
+            style="width:100px;"
+            clearable
+          />
+        </el-form-item>
         <el-form-item>
           <!-- <el-button type="text" @click="isShow = !isShow">More</el-button> -->
           <!-- Search -->
@@ -381,7 +403,6 @@
           prop="IR_ReadingCriterionList"
           :label="$t('trials:trials-list:table:IR_ReadingCriterionList')"
           show-overflow-tooltip
-          sortable="custom"
           min-width="160"
         >
           <template slot-scope="scope">
@@ -417,7 +438,6 @@
           prop="IR_PMEmailList"
           :label="$t('trials:trials-list:table:IR_PMEmailList')"
           show-overflow-tooltip
-          sortable="custom"
           min-width="170"
         >
           <template slot-scope="scope">
@@ -643,7 +663,9 @@ const searchDataDefault = () => {
     PageIndex: 1,
     PageSize: 20,
     Asc: false,
-    SortField: ''
+    SortField: '',
+    CriterionType:null,
+    PM_EMail:null,
   }
 }
 export default {

From 773aa65116199788ec51ff1341e76f88bd322aed Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 1 Apr 2024 13:17:20 +0800
Subject: [PATCH 261/374] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=B0=E5=A2=9Erev?=
 =?UTF-8?q?iewer=E6=97=B6=E8=8E=B7=E5=8F=96=E6=96=87=E4=BB=B6=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/index.vue               | 1 +
 src/components/UploadFiles/index.vue              | 1 +
 src/views/reviewers/components/GcpCertificate.vue | 1 +
 src/views/reviewers/components/Resumes.vue        | 1 +
 4 files changed, 4 insertions(+)

diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue
index 564c5ee4..d875cf90 100644
--- a/src/components/UploadFile/index.vue
+++ b/src/components/UploadFile/index.vue
@@ -45,6 +45,7 @@ export default {
   },
   methods: {
     initFileList() {
+      if(!this.doctorId) return
       getAttachmentByType(this.doctorId, this.type)
         .then(res => {
           if (res.IsSuccess) {
diff --git a/src/components/UploadFiles/index.vue b/src/components/UploadFiles/index.vue
index 475be8ef..8d714045 100644
--- a/src/components/UploadFiles/index.vue
+++ b/src/components/UploadFiles/index.vue
@@ -39,6 +39,7 @@ export default {
     }
   },
   mounted() {
+    if(!this.doctorId) return
     this.initFileList()
   },
   methods: {
diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue
index e4dd1d85..fa56dc4a 100644
--- a/src/views/reviewers/components/GcpCertificate.vue
+++ b/src/views/reviewers/components/GcpCertificate.vue
@@ -97,6 +97,7 @@ export default {
       })
     },
     initFileList() {
+      if(!this.doctorId) return
       getAttachmentByType(this.doctorId, 'GCP')
         .then(res => {
           if (res.IsSuccess) {
diff --git a/src/views/reviewers/components/Resumes.vue b/src/views/reviewers/components/Resumes.vue
index f2d1f199..33486ca5 100644
--- a/src/views/reviewers/components/Resumes.vue
+++ b/src/views/reviewers/components/Resumes.vue
@@ -163,6 +163,7 @@ export default {
     }
   },
   created() {
+    if(!this.doctorId) return
     this.getResumeList()
   },
   methods: {

From 1351a9192cdb9ff0918102f828f5867c39328944 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 1 Apr 2024 13:57:32 +0800
Subject: [PATCH 262/374] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AD=9B?=
 =?UTF-8?q?=E9=80=89=EF=BC=8C=E4=B8=8B=E8=BD=BD=E7=AE=80=E5=8E=86=E4=B8=BA?=
 =?UTF-8?q?=E7=A9=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrollment/components/Submission.vue          | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
index 5827918d..c6d00f80 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
@@ -156,7 +156,8 @@ export default {
       submitIdArr: [],
       dialogVisible: false,
       language: 2,
-      token: store.getters.token
+      token: store.getters.token,
+      selectTable: {}
     }
   },
   created() { this.initPage() },
@@ -275,14 +276,18 @@ export default {
     },
     handleDownloadResumes() {
       getTrialDoctorOfficialResume({
-        doctorIdList: this.list.map(v => {return v.Id}),
+        doctorIdList:this.selectTable.Id?[this.selectTable.Id]: this.list.map(v => {return v.Id}),
         language: this.language
       }).then(async res => {
+        this.selectTable = {};
         for (let i = 0; res.Result.length > i; i++) {
           let item = res.Result[i]
           await this.handleBatchDown(item)
         }
         this.dialogVisible = false
+      }).catch(err=>{
+        this.dialogVisible = false;
+        this.selectTable= {};
       })
       // this.dialogVisible = false
       // const arr = []
@@ -294,7 +299,11 @@ export default {
     downloadResume(arr) {
       downloadResume(this.$route.query.trialId, this.language, arr).then(res => { window.open(res.Result) })
     },
-    handleDownload(row) { this.downloadResume([row.Id]) }
+    handleDownload(row) { 
+      // this.downloadResume([row.Id]) 
+      this.dialogVisible = true;
+      this.selectTable = row;
+    }
   }
 }
 </script>

From 990c152a99e36b4615c3c3c3b06191fc7f58cf70 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 1 Apr 2024 15:17:29 +0800
Subject: [PATCH 263/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0pdf=E6=96=87=E4=BB=B6=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/crc-upload/components/previousFiles.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
index e19925cc..340d6874 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
@@ -98,7 +98,8 @@ export default {
       this.addFileList = []
       for (var i = 0; i < this.selectArr.length; ++i) {
         const file = await this.fileToBlob(this.selectArr[i])
-        const res = await this.OSSclient.put(`/${this.trialId}/ClinicalData/${this.selectArr[i].name}`, file)
+        var timestamp = Date.now()
+        const res = await this.OSSclient.put(`/${this.trialId}/ClinicalData/${timestamp}${this.selectArr[i].name}`, file)
         this.addFileList.push({ fileName: this.selectArr[i].name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
       }
       this.saveClinicalData()

From 7969db76fe27cb10cc66dd4451d8c1bc3a318580 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 1 Apr 2024 15:18:29 +0800
Subject: [PATCH 264/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0pdf=E6=97=B6=E6=96=87=E4=BB=B6=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E6=B7=BB=E5=8A=A0=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/visit/crc-upload/components/previousFiles.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
index 340d6874..1a865863 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
@@ -99,7 +99,7 @@ export default {
       for (var i = 0; i < this.selectArr.length; ++i) {
         const file = await this.fileToBlob(this.selectArr[i])
         var timestamp = Date.now()
-        const res = await this.OSSclient.put(`/${this.trialId}/ClinicalData/${timestamp}${this.selectArr[i].name}`, file)
+        const res = await this.OSSclient.put(`/${this.trialId}/ClinicalData/${timestamp}_${this.selectArr[i].name}`, file)
         this.addFileList.push({ fileName: this.selectArr[i].name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
       }
       this.saveClinicalData()

From fa2bf66dd1afc4f17863e92a003ccffaabee5f7d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 2 Apr 2024 15:15:13 +0800
Subject: [PATCH 265/374] =?UTF-8?q?=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E7=BC=96=E5=8F=B7=E6=B7=BB=E5=8A=A0=E8=BE=93=E5=85=A5=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E9=99=90=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../consistency-analysis/components/ReaderRulesForm.vue  | 2 +-
 .../consistency-analysis/components/VirtualCenter.vue    | 2 +-
 .../trials-panel/reading/consistency-analysis/index.vue  | 9 ++++++++-
 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
index 013d54ef..fda4de75 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue
@@ -29,7 +29,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="BlindTrialSiteCode">
-        <el-input v-model="form.BlindTrialSiteCode" style="width: 140px;" :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
+        <el-input v-model="form.BlindTrialSiteCode" maxlength="10" style="width: 140px;" :disabled="!!Result.BlindTrialSiteCode || !!OtherInfo.VitrualSiteCode" @input="(v)=>(form.BlindTrialSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
       <!-- 虚拟受试者位数 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:subjectNum')" prop="BlindSubjectNumberOfPlaces">
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
index 1b159222..727194db 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/VirtualCenter.vue
@@ -19,7 +19,7 @@
       </el-form-item>
       <!-- 虚拟中心编号 -->
       <el-form-item  :label="$t('trials:consistencyAnalysisRule:table:siteCode')" prop="VirtualSiteCode">
-        <el-input v-model="form.VirtualSiteCode" style="width: 140px;" @input="(v)=>(form.VirtualSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
+        <el-input v-model="form.VirtualSiteCode" maxlength="10" style="width: 140px;" @input="(v)=>(form.VirtualSiteCode = v.replace(/[^\a-\z\A-\Z0-9]/g, ''))"/>
       </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index e6f612f4..6dd07667 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -110,7 +110,7 @@
             {{$t('trials:consistencyAnalysis:button:site')}}
           </el-button>
           <!--导出-->
-           <el-button type="primary" icon="el-icon-download" @click="exportVisible = true">
+           <el-button type="primary" icon="el-icon-download" @click="openExport()">
             {{$t('common:button:export')}}
           </el-button>
         </el-form-item>
@@ -901,6 +901,13 @@ export default {
           this.loading = false
         })
     },
+    openExport(){
+      if (this.trialCriterionList.length === 0) {
+        this.$alert(this.$t('trials:trials-panel:consistency-analysis:trialCriterionListLength'))
+        return
+      }
+      this.exportVisible = true;
+    },
     openTaskConsistentRule(IsSelfAnalysis) {
       if (this.trialCriterionList.length === 0) {
         this.$alert(this.$t('trials:trials-panel:consistency-analysis:trialCriterionListLength'))

From 9b601c0f9a8a13e8a203e95081a07aced6e47016 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 2 Apr 2024 17:05:47 +0800
Subject: [PATCH 266/374] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=B7=A5=E4=BD=9C?=
 =?UTF-8?q?=E5=8F=B0=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8=E6=9F=A5=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E5=88=97=E5=A4=B4=E9=97=B4=E8=B7=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-workbench/components/consistencyCheck.vue  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-workbench/components/consistencyCheck.vue b/src/views/trials/trials-workbench/components/consistencyCheck.vue
index 422b6608..b58da16d 100644
--- a/src/views/trials/trials-workbench/components/consistencyCheck.vue
+++ b/src/views/trials/trials-workbench/components/consistencyCheck.vue
@@ -29,6 +29,7 @@
         prop="TrialCode"
         show-overflow-tooltip
         sortable="custom"
+        min-width="110"
       />
       <!-- 试验名称 -->
       <el-table-column
@@ -36,6 +37,7 @@
         prop="ExperimentName"
         show-overflow-tooltip
         sortable="custom"
+        min-width="110"
       />
       <!-- 研究方案号 -->
       <el-table-column
@@ -43,6 +45,7 @@
         prop="ResearchProgramNo"
         show-overflow-tooltip
         sortable="custom"
+        min-width="110"
       />
       <!-- 加急量 -->
       <el-table-column
@@ -50,7 +53,7 @@
         prop="UrgentCount"
         show-overflow-tooltip
         sortable="custom"
-        width="90"
+        min-width="110"
       />
       <!-- 待核查量 -->
       <el-table-column
@@ -58,7 +61,7 @@
         prop="ToBeCheckedCount"
         show-overflow-tooltip
         sortable="custom"
-        width="110"
+        min-width="110"
       />
       <!-- 待核查量 -->
       <el-table-column
@@ -66,11 +69,11 @@
         prop="ToBeRepliedCount"
         show-overflow-tooltip
         sortable="custom"
-        width="110"
+        min-width="110"
       />
       <el-table-column
         :label="$t('common:action:action')"
-        width="100"
+        min-width="110"
       >
         <template slot-scope="scope">
           <el-button

From 90c1123113fb95fc6ea70d3b1da79d1b4eb3a5a0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Apr 2024 10:27:47 +0800
Subject: [PATCH 267/374] =?UTF-8?q?=E5=A4=B4=E9=83=A8=E5=90=8D=E7=A7=B0?=
 =?UTF-8?q?=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98=E8=A7=A3=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-layout/components/trialsNavbar.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index f0654cac..f1b1b9a3 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -3,7 +3,7 @@
     <div class="leftMenu">
       <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="">
       <img v-else src="@/assets/zzlogo4.png" alt="">
-      <span>
+      <span style="white-space:nowrap;">
         <!-- 中心影像系统（EICS） -->
         {{ $t('trials:trials:title:eics') }}
       </span>

From 72b7cdbc7163da556f0a1183f5e84c514bd2043c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Apr 2024 13:01:56 +0800
Subject: [PATCH 268/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=88=A4=E6=96=AD=E6=9D=A1=E4=BB=B6=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/visit/crc-upload/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index db39098c..7982c2d6 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -491,7 +491,7 @@
           </el-tab-pane>
           <!-- 临床数据采集 -->
           <el-tab-pane
-            v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData"
+            v-if="rowData.IsBaseLine  && otherInfo.IsHaveSubjectClinicalData"
             :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
             name="clinical-data"
           >
@@ -499,7 +499,7 @@
           </el-tab-pane>
           <!-- 临床数据采集2 -->
           <el-tab-pane
-            v-if="!rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveVisitClinicalData"
+            v-if="!rowData.IsBaseLine  && otherInfo.IsHaveVisitClinicalData"
             :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
             name="clinical-data"
           >

From bcf69f6194e18e51e8f6b80e52f43c8b03419aa9 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 3 Apr 2024 13:02:23 +0800
Subject: [PATCH 269/374] =?UTF-8?q?=E5=85=A8=E5=B1=80=E7=B1=BB=E5=9E=8B?=
 =?UTF-8?q?=E7=9A=84=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E5=8E=BB=E9=99=A4=E6=93=8D=E4=BD=9C=E5=88=97=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/GlobalReview.vue        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index d669b34d..f152b3fd 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -104,7 +104,6 @@
       <el-table-column
         :label="$t('common:action:action')"
         width="100"
-        fixed="right"
       >
         <template slot-scope="scope">
           <el-button

From 1d1805f8cc02a10a04c5856efe41dfe1b4022334 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Apr 2024 13:34:03 +0800
Subject: [PATCH 270/374] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E4=B8=8D=E6=B7=BB=E5=8A=A0=E9=BB=98=E8=AE=A4=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/setting/medical-audit/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/index.vue b/src/views/trials/trials-panel/setting/medical-audit/index.vue
index 52c9afbb..0b51316d 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/index.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/index.vue
@@ -92,7 +92,7 @@
                 {{ $t('common:button:preview') }}
               </el-button>
               <el-button
-                v-if="!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
+                v-if="i.CriterionType!==0&&!otherInfo.IsConfirmMedicineQuestion && hasPermi(['trials:trials-panel:setting:medical-audit:confirm'])"
                 type="primary"
                 icon="el-icon-plus"
                 @click="handleAdd"

From f34de6073f3f0189e6bc794a31f52f448f09f3bd Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 3 Apr 2024 14:09:12 +0800
Subject: [PATCH 271/374] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E5=BC=B9=E7=AA=97=E6=B7=BB=E5=8A=A0=E5=8F=96=E6=B6=88=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/FusionForm.vue          | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
index d5cfff33..e9823540 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
@@ -136,7 +136,7 @@
     </div>
     <el-form-item style="text-align:right;">
       <!-- 取消 -->
-      <el-button size="mini" @click="fusionSeries.visible = false">{{ $t('common:button:cancel') }}</el-button>
+      <el-button size="mini" @click="handleCancel">{{ $t('common:button:cancel') }}</el-button>
       <!-- 确认 -->
       <el-button
         type="primary"
@@ -255,6 +255,9 @@ export default {
       this.petctWindow = window.open(routeData.href, '_blank')
       this.$emit('close')
     },
+    handleCancel(){
+      this.$emit('close')
+    },
     handleTaskIdChange(v) {
       var idx = this.taskList.findIndex(i => i.VisitTaskId === v)
       this.studyList = idx > -1 ? this.taskList[idx].StudyInfoList : []

From 4f51946c3f4c7453ed2ef2a18c6e653549a16377 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Apr 2024 16:13:17 +0800
Subject: [PATCH 272/374] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/ReviewersResearch.vue     | 11 +++++++++--
 src/views/reviewers/ReviewersResearchForm.vue |  6 ++++++
 src/views/reviewers/components/BasicInfo.vue  |  2 +-
 src/views/reviewers/index.vue                 |  2 +-
 4 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/views/reviewers/ReviewersResearch.vue b/src/views/reviewers/ReviewersResearch.vue
index 84b8f39d..cf78879a 100644
--- a/src/views/reviewers/ReviewersResearch.vue
+++ b/src/views/reviewers/ReviewersResearch.vue
@@ -3,7 +3,8 @@
     <div class="box-wrapper">
       <h2 style="text-align:center;">
         <!-- 中心调研表 -->
-        独立阅片人信息填写
+        <!-- 独立阅片人信息填写 -->
+        {{$t("trials:researchForm:form:title")}}
       </h2>
       <el-card shadow="hover" style="padding-top: 40px">
         <el-form
@@ -58,6 +59,7 @@ import { sendVerifyCode, verifySendCode, getTrialSurveyInitInfo } from '@/api/re
 import { verifyEmialGetDoctorInfo, sendEmialVerifyCode } from '@/api/reviewers'
 import { login, getUserMenuTree, getUserPermissions } from '@/api/user'
 import store from '@/store'
+import {  mapMutations } from 'vuex'
 export default {
   data() {
     var checkPhone = (rule, value, callback) => {
@@ -149,9 +151,14 @@ export default {
       isHaveSiteSurveyRecord: false
     }
   },
+  created(){
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+  },
   mounted() {
   },
   methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     // 提交
     onSubmit() {
       this.$refs['resetForm'].validate(valid => {
@@ -176,7 +183,7 @@ export default {
             store.dispatch('user/setTree', menuTree.Result)
             store.dispatch('user/setPermissions', permissions.Result)
             // this.$router.push({ path: `/researchForm?trialId=${this.trialId}&trialSiteSurveyId=${res.Result.TrialSiteSurveyId}` })
-            this.$router.push({path: `/ReviewersResearchForm?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''}&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus}`})
+            this.$router.push({path: `/ReviewersResearchForm?Id=${res.Result.DoctorId ? res.Result.DoctorId : ''}&tabActive=BasicInfo&ReviewStatus=${res.Result.ReviewStatus}&lang=${this.$route.query.lang}`})
           }).catch(() => {
             this.btnLoading = false
             this.sendDisabled = false
diff --git a/src/views/reviewers/ReviewersResearchForm.vue b/src/views/reviewers/ReviewersResearchForm.vue
index ae9b9908..a71bffa7 100644
--- a/src/views/reviewers/ReviewersResearchForm.vue
+++ b/src/views/reviewers/ReviewersResearchForm.vue
@@ -44,6 +44,7 @@ import Resumes from './components/Resumes'
 import Agreements from './components/Agreements'
 import Setting from './components/Setting'
 import { changeURLStatic, getQueryString } from '@/utils/history.js'
+import {  mapMutations } from 'vuex'
 export default {
   components: {
     BasicInfo,
@@ -74,6 +75,10 @@ export default {
       }
     }
   },
+  created(){
+    this.$i18n.locale = this.$route.query.lang
+    this.setLanguage(this.$route.query.lang)
+  },
   mounted() {
     this.active = this.$route.query.tabActive
     if (this.$route.query.Id === '' && this.active !== 'BasicInfo') {
@@ -82,6 +87,7 @@ export default {
     this.load[this.active] = true
   },
   methods: {
+    ...mapMutations({ setLanguage: 'lang/setLanguage' }),
     clickTab(tab, event) {
       if (this.load[tab.name] === false) {
         this.load[tab.name] = true
diff --git a/src/views/reviewers/components/BasicInfo.vue b/src/views/reviewers/components/BasicInfo.vue
index 7340d1ca..80a76aad 100644
--- a/src/views/reviewers/components/BasicInfo.vue
+++ b/src/views/reviewers/components/BasicInfo.vue
@@ -114,7 +114,7 @@
                   clearable
                   class="mr"
                 >
-                  <el-option v-for="item of $d.AttendedReviewerType" :value="item.value" :label="item.label" />
+                  <el-option v-for="item of $d.AttendedReviewerType" :value="item.value" :label="item.label" :key="item.id"/>
                 </el-select>
               </el-form-item>
             </el-col>
diff --git a/src/views/reviewers/index.vue b/src/views/reviewers/index.vue
index 2c0b329d..58e4ee40 100644
--- a/src/views/reviewers/index.vue
+++ b/src/views/reviewers/index.vue
@@ -405,7 +405,7 @@ export default {
     },
     showResearchLink() {
       const trialId = this.trialId
-      this.shareLink = `${location.protocol}//${location.host}/ReviewersResearch`
+      this.shareLink = `${location.protocol}//${location.host}/ReviewersResearch?lang=${this.$store.getters.language}`
       this.share_model.visible = true
     },
     lookResumeInfo(row) {

From ada50a7e73ed23bcefac0f560a79634b7d4b2f55 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Wed, 3 Apr 2024 16:13:46 +0800
Subject: [PATCH 273/374] =?UTF-8?q?crc=E5=B7=A5=E4=BD=9C=E5=8F=B0=E5=B7=A6?=
 =?UTF-8?q?=E4=BE=A7=E8=8F=9C=E5=8D=95=E9=A1=BA=E5=BA=8F=E5=8F=98=E6=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 7251cd9a..d26f95a0 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -145,6 +145,13 @@
                 </div>
               </div>
               <!-- CRC -->
+              <!-- 加急影像提交 -->
+              <div class="my_select_box" :class="{selected: selected === 'ImageSubmission'}" tab-data="ImageSubmission" @click="selected = 'ImageSubmission'" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])">
+                <div class="my_select_box_content">
+                  <span class="el-icon-circle-check" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageSubmitCount }}</span>
+                </div>
+              </div>
               <!-- 影像质疑 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageQuestion'}" tab-data="ImageQuestion" @click="selected = 'ImageQuestion'" v-if="hasPermi(['trials:trials-workbench:imageQuestion'])">
                 <div class="my_select_box_content">
@@ -166,13 +173,6 @@
                   <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ImageRetransmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageReUploadCount }}</span>
                 </div>
               </div>
-              <!-- 加急影像提交 -->
-              <div class="my_select_box" :class="{selected: selected === 'ImageSubmission'}" tab-data="ImageSubmission" @click="selected = 'ImageSubmission'" v-if="hasPermi(['trials:trials-workbenck:imageSubmission'])">
-                <div class="my_select_box_content">
-                  <span class="el-icon-circle-check" style="padding: 4px;margin: 4px;color: #6698ff"></span>
-                  <span class="my_select_box_content_text">{{ $t('trials:workbench:title:ExpeditedImageSubmission') }}</span><span style="margin:0 0.25rem">·</span><span>{{ tabList.CRC_ImageSubmitCount }}</span>
-                </div>
-              </div>
               <!-- IQC -->
               <!-- 影像质控 -->
               <div class="my_select_box" :class="{selected: selected === 'ImageQualityControl'}" tab-data="ImageQualityControl" @click="selected = 'ImageQualityControl'" v-if="hasPermi(['trials:trials-workbenck:imageQC'])">

From b461716195c9b892a2a5d11fa1ce0f58234025f7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 7 Apr 2024 13:20:02 +0800
Subject: [PATCH 274/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/FusionForm.vue   |  2 +-
 .../reading/dicoms/components/Questions.vue   | 27 +++++--------------
 2 files changed, 7 insertions(+), 22 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
index e9823540..dd323acf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/FusionForm.vue
@@ -255,7 +255,7 @@ export default {
       this.petctWindow = window.open(routeData.href, '_blank')
       this.$emit('close')
     },
-    handleCancel(){
+    handleCancel() {
       this.$emit('close')
     },
     handleTaskIdChange(v) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index bf103de7..db50618b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -647,14 +647,10 @@ export default {
         if (this.isBaseLineTask) {
           // 直径≤130mm时，系统默认脾脏状态为“正常”
           if (length <= 130) {
-            // this.$set(this.questionForm, this.spleenStatusId, '1')
-            // this.calculateSpleenStatus = '1'
             status = '1'
           }
           // 直径>130mm时，系统默认脾脏状态为“肿大”
           if (length > 130) {
-            // this.$set(this.questionForm, this.spleenStatusId, '6')
-            // this.calculateSpleenStatus = '6'
             status = '6'
           }
         } else {
@@ -664,21 +660,21 @@ export default {
           if (this.spleenInfo.BaseLineSpleenLength) {
             percentFormBaseline = diffFromBaseline * 100 / (this.spleenInfo.BaseLineSpleenLength - 130)
           }
-          if (this.spleenInfo.BaseLineSpleenLength > 130 && diffFromBaseline >= 10 && percentFormBaseline > 50) {
+          if (length <= 130) {
+            // 当前访视的垂直径≤130mm
+            // 系统默认脾脏状态为“正常”
+            status = '1'
+          } else if (this.spleenInfo.BaseLineSpleenLength > 130 && diffFromBaseline >= 10 && percentFormBaseline > 50) {
             // 1、基线 垂直径>130 mm
             // 2、与基线相比脾垂直径变化值≥10 mm
             // 3、与基线相比脾肿大增加的百分比>50％
             // 系统默认脾脏状态为“显著增大”
-            // this.$set(this.questionForm, this.spleenStatusId, '4')
-            // this.calculateSpleenStatus = '4'
             status = '4'
           } else if (this.spleenInfo.BaseLineSpleenLength <= 130 && diffFromBaseline >= 20 && length > 130) {
             // 1、基线垂直径≤130mm
             // 2、与基线相比脾垂直径变化值≥20 mm
             // 3、当前垂直径>130 mm
             // 系统默认脾脏状态为“显著增大”
-            // this.$set(this.questionForm, this.spleenStatusId, '4')
-            // this.calculateSpleenStatus = '4'
             status = '4'
           } else if (this.spleenInfo.BaseLineSpleenLength > 130 && this.spleenInfo.LowSpleenLength <= 130 && length - this.spleenInfo.LowSpleenLength >= 20 && length > 130) {
             // 1、基线 垂直径>130 mm
@@ -686,25 +682,14 @@ export default {
             // 3、与最低点相比脾脏垂直径的增加值≥20 mm
             // 4、当前垂直径>130 mm
             // 系统默认脾脏状态为“显著增大”
-            // this.$set(this.questionForm, this.spleenStatusId, '4')
-            // this.calculateSpleenStatus = '4'
             status = '4'
-          } else if (length < 130) {
-            // 当前访视的垂直径≤130mm
-            // 系统默认脾脏状态为“正常”
-            // this.$set(this.questionForm, this.spleenStatusId, '1')
-            // this.calculateSpleenStatus = '1'
-            status = '1'
           } else if (this.spleenInfo.BaseLineState === '6' && percentFormBaseline < -50) {
             // 1、基线期 状态为“肿大”
             // 2、与基线相比脾肿大增加的百分比小于-50％
             // 系统默认脾脏状态为“部分缓解”
-            // this.$set(this.questionForm, this.spleenStatusId, '2')
-            // this.calculateSpleenStatus = '2'
             status = '2'
           } else {
-            // this.$set(this.questionForm, this.spleenStatusId, '3')
-            // this.calculateSpleenStatus = '3'
+            // 系统默认脾脏状态为“稳定”
             status = '3'
           }
         }

From 8164ef38eb4bdc3bdd7d592f52bcfae32db4e23c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 7 Apr 2024 13:37:01 +0800
Subject: [PATCH 275/374] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=98=85=E7=89=87=E6=A0=87=E5=87=86=E5=8F=98=E5=8C=96=E6=B8=85?=
 =?UTF-8?q?=E9=99=A4=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/processConfig.vue     | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 270116a3..0bed1d78 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -1577,11 +1577,17 @@ export default {
       })
     },
     handleConfirmCriterion() {
+      if(this.selectedCriterions !== this.form.TrialCriterionNames){
+        // 清空临床数据配置信息
+        this.form.ClinicalDataSetNames = []
+        this.form.ClinicalDataTrialSetIds = []
+        this.form.ClinicalDataSetNamesStr = ''
+      }
       this.form.TrialCriterionNames = this.selectedCriterions
       this.form.TrialCriterionIds = this.selectCriterionIds
       this.form.TrialCriterionNamesStr = this.form.TrialCriterionNames.join(', ')
       this.criterionListVisible = false
-      console.log(this.form)
+      // 清空
     },
 
     changeCriterionStatus(callback, row) {

From 4896aabe3dd2a7ead193a035d262f91cfd8ea03e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 7 Apr 2024 13:55:32 +0800
Subject: [PATCH 276/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/processConfig.vue      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 0bed1d78..a188f637 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -1476,11 +1476,15 @@ export default {
     },
     handleSetCriterion() {
       this.criterionListVisible = true
+      this.selectedCriterions = []
+      this.selectCriterionIds = []
       this.$nextTick(() => {
         for (let i = 0; i < this.form.TrialCriterionIds.length; i++) {
           var index = this.criterionList.findIndex(item => item.Id === this.form.TrialCriterionIds[i])
           if (index > -1) {
             this.$refs['criterionList'].toggleRowSelection(this.criterionList[index], true)
+            this.selectedCriterions.push(this.criterionList[index].CriterionName)
+            this.selectCriterionIds.push(this.criterionList[index].Id)
           }
         }
       })
@@ -1577,7 +1581,7 @@ export default {
       })
     },
     handleConfirmCriterion() {
-      if(this.selectedCriterions !== this.form.TrialCriterionNames){
+      if(this.selectedCriterions.join(', ') !== this.form.TrialCriterionNamesStr){
         // 清空临床数据配置信息
         this.form.ClinicalDataSetNames = []
         this.form.ClinicalDataTrialSetIds = []
@@ -1587,7 +1591,6 @@ export default {
       this.form.TrialCriterionIds = this.selectCriterionIds
       this.form.TrialCriterionNamesStr = this.form.TrialCriterionNames.join(', ')
       this.criterionListVisible = false
-      // 清空
     },
 
     changeCriterionStatus(callback, row) {

From dd006a62697a7e1a8e2c2c0ffd9a2b2bfeb3ef95 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 7 Apr 2024 14:02:47 +0800
Subject: [PATCH 277/374] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E7=BA=A7=E5=88=AB?=
 =?UTF-8?q?=E7=9A=84=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E4=B8=8D=E5=85=81?=
 =?UTF-8?q?=E8=AE=B8=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/processConfig.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index a188f637..0506a2ec 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -702,7 +702,7 @@
                 v-if="isEdit"
                 :title="$t('common:button:edit')"
                 icon="el-icon-edit"
-                :disabled="TrialStatusStr !=='Initializing'"
+                :disabled="TrialStatusStr !=='Initializing' || !!scope.row.SystemClinicalDataSetId"
                 @click="handleEditClinicalData(scope.row)"
               >
               </el-button>
@@ -712,7 +712,7 @@
                 v-if="isEdit"
                 :title="$t('common:button:delete')"
                 icon="el-icon-delete"
-                :disabled="TrialStatusStr !=='Initializing' || form.ClinicalDataSetNames.indexOf(scope.row.ClinicalDataSetName)> -1"
+                :disabled="TrialStatusStr !=='Initializing' || form.ClinicalDataSetNames.indexOf(scope.row.ClinicalDataSetName)> -1 || !!scope.row.SystemClinicalDataSetId"
                 @click="handleDeleteClinicalData(scope.row)"
               >
               </el-button>

From c2aad16566718cceab5b7c43d9a5677990028c83 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 7 Apr 2024 14:29:01 +0800
Subject: [PATCH 278/374] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=98=85=E7=89=87=E6=A0=87=E5=87=86=E5=9B=BD?=
 =?UTF-8?q?=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/clinicalDataForm.vue        | 2 +-
 .../setting/trial-config/components/processConfig.vue           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
index 3c343b18..5d38fc10 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
@@ -85,7 +85,7 @@
       </el-form-item>
       <!--  阅片标准 -->
       <el-form-item
-        :label="$t('trials:processCfg:title:criterion')"
+        :label="$t('trials:processCfg:label:criterion')"
         prop="TrialCriterionIdList"
       >
         <el-select
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 0506a2ec..f0b98273 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -657,7 +657,7 @@
           <!-- 阅片标准 -->
           <el-table-column
             prop="CriterionEnumList"
-            :label="$t('trials:processCfg:title:criterion')"
+            :label="$t('trials:processCfg:table:criterion')"
             show-overflow-tooltip
           >
             <template slot-scope="scope">

From d5cb03209a9148fef9ec52def5c4295b6b3f7c3d Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 8 Apr 2024 10:39:01 +0800
Subject: [PATCH 279/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE=E8=A1=A8=E6=A0=BC=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E4=B8=BA=E7=A9=BA=E6=97=B6tip=E5=B1=95=E7=A4=BA=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=E5=86=85=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/ClinicalData.vue               | 34 +++++++++++++++++--
 1 file changed, 32 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index f48d2208..f694767b 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -391,7 +391,7 @@
   </div>
 </template>
 <script>
-import { getReadingClinicalDataList, deleteReadingClinicalData, ReadClinicalDataSign } from '@/api/trials'
+import { getReadingClinicalDataList, deleteReadingClinicalData, ReadClinicalDataSign,getTrialClinicalDataSelect } from '@/api/trials'
 import AddOrEditCD from './AddOrEditCD'
 import Verification from './Verification'
 import SignForm from '@/views/trials/components/newSignForm'
@@ -448,6 +448,33 @@ export default {
     })
   },
   methods: {
+      getClinicalDatas() {
+      return new Promise((resolve, reject) => {
+        let message='';
+        let currentData = Object.assign({}, { TrialId: this.data.TrialId, ReadingId: this.data.Id, IsVisit: this.data.IsVisit, SubjectId: this.data.SubjectId, IsBaseLine: this.data.IsBaseLine })
+        var param = {
+          trialId: currentData.TrialId,
+          IsVisit: currentData.IsVisit,
+          ReadingId: currentData.ReadingId,
+          SubjectId: currentData.SubjectId,
+          ReadingClinicalDataId: currentData.Id ? currentData.Id : '',
+          IsBaseLine: currentData.IsBaseLine,
+          TrialReadingCriterionId: this.trialReadingCriterionId
+        }
+        getTrialClinicalDataSelect(param).then(res => {
+          res.Result.forEach((item,index)=>{
+          if(index<1){
+            message += item.ClinicalDataSetName;
+          }else{
+            message =message + "、" + item.ClinicalDataSetName;
+          }
+        })
+          resolve(message)
+        }).catch(() => {
+          reject()
+        })
+      })
+    },
     objectSpanMethod({ row, column, rowIndex, columnIndex }) {
       if (columnIndex === 6 && row.IsNeedMerge) {
         const _row = this.spanArr[rowIndex]
@@ -486,7 +513,7 @@ export default {
         this.searchData.GetClinicalType = this.clinicalType
       }
       this.loading = true
-      getReadingClinicalDataList(this.searchData).then(res => {
+      getReadingClinicalDataList(this.searchData).then(async res => {
         this.list = res.Result;
         let message ="";
         this.list.forEach((item,index)=>{
@@ -496,6 +523,9 @@ export default {
             message =message + "、" + item.ClinicalDataSetName;
           }
         })
+        if(message===""||!message){
+          message = await this.getClinicalDatas();
+        }
         this.tips1 = this.$t('trials:readingPeriod:cd:title:tips1').replace('临床数据名称',message);
         this.tips1 = this.tips1.replace("xxx",message);
         this.pos = 0

From 91ee95270751ef785aae607eb758218c47eea1cf Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 13:54:42 +0800
Subject: [PATCH 280/374] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2ecr?=
 =?UTF-8?q?f=E8=A1=A8=E5=8D=95=E4=BF=9D=E5=AD=98=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                                  |  9 +++++++++
 .../reading/dicoms/components/Fusion/Questions.vue |  7 ++++---
 .../dicoms/components/Lugano/QuestionList.vue      |  2 ++
 .../reading/dicoms/components/Questions.vue        | 14 ++++++++++----
 4 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 57b4ffd5..0b468434 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -2810,6 +2810,15 @@ export function saveImageQuality(param) {
     data: param
   })
 }
+
+export function saveTaskQuestion(saveQuestionType, param) {
+  return request({
+    url: `/SaveTaskQuestion/${saveQuestionType}`,
+    method: 'post',
+    data: param
+  })
+}
+
 export function deleteReadingRowAnswer(param) {
   return request({
     url: `/ReadingImageTask/deleteReadingRowAnswer`,
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 4c30c1c6..eb0e8767 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -32,7 +32,7 @@
 
 <script>
 
-import { saveImageQuality, getDicomReadingQuestionAnswer, getReadingCalculationData } from '@/api/trials'
+import { saveTaskQuestion, getDicomReadingQuestionAnswer, getReadingCalculationData } from '@/api/trials'
 import { getToken } from '@/utils/auth'
 import QuestionItem from './QuestionItem'
 import { mapGetters } from 'vuex'
@@ -299,7 +299,7 @@ export default {
         answers: answers
         // questionMarkInfoList
       }
-      saveImageQuality(params).then(async res => {
+      saveTaskQuestion(1, params).then(async res => {
         window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
         this.loading = false
         this.questionFormChangeState = false
@@ -407,7 +407,8 @@ export default {
           answers,
           questionMarkInfoList
         }
-        saveImageQuality(params).then(async res => {
+        const qsType = question.QuestionType === 51 ? 2 : question.QuestionType === 52 ? 3 : null
+        saveTaskQuestion(qsType, params).then(async res => {
           this.$set(question, 'SaveEnum', 0)
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
           loading.close()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 13bed71a..89302040 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -146,6 +146,7 @@
         :group-classify="2"
         :is-qulity-issues="false"
         style="margin-top:20px"
+        :question-type="6"
         @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
       />
       <!-- 脾脏评估 -->
@@ -155,6 +156,7 @@
         :question-form-change-num="0"
         :group-classify="3"
         :is-qulity-issues="false"
+        :question-type="7"
         @setNonTargetMeasurementStatus="setNonTargetMeasurementStatus"
       />
     </div>
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index db50618b..0f14feb6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -30,7 +30,7 @@
 
 <script>
 // import { uploadPrintscreen } from '@/api/reading'
-import { saveImageQuality, getSplenicState, getSplenicVerify } from '@/api/trials'
+import { saveTaskQuestion, getSplenicState, getSplenicVerify } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
@@ -60,6 +60,10 @@ export default {
     isQulityIssues: {
       type: Boolean,
       default: true
+    },
+    questionType: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -204,7 +208,8 @@ export default {
         }
         // this.questions = questions
       }
-      if (this.spleenLengthId && this.spleenInfo) {
+
+      if (this.spleenLengthId && this.spleenInfo && this.readingTaskState < 2) {
         this.calculateSpleenStatus = this.setSpleenStatus(this.questionForm[this.spleenLengthId])
         this.setSpleenCommentDisplay()
       }
@@ -324,7 +329,7 @@ export default {
       //   params.questionMarkInfoList = questionMarkInfoList
       // }
 
-      saveImageQuality(params).then(async res => {
+      saveTaskQuestion(this.questionType, params).then(async res => {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         var trialId = this.$route.query.trialId
         await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
@@ -505,7 +510,8 @@ export default {
           answers,
           questionMarkInfoList
         }
-        saveImageQuality(params).then(async res => {
+        const qsType = question.QuestionType === 60 ? 4 : question.QuestionType === 61 ? 5 : null
+        saveTaskQuestion(qsType, params).then(async res => {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.loading = false
           this.$set(question, 'SaveEnum', 0)

From 59543a383cc979f3e0c9dc39382f43fd6ac33cd8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 14:03:07 +0800
Subject: [PATCH 281/374] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2ecr?=
 =?UTF-8?q?f=E8=A1=A8=E5=8D=95=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index b3d5b00e..9f116a0f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -2138,7 +2138,7 @@ export default {
         this.$refs['questions'].initList()
         this.$refs['tableQuestions'].initList()
         this.isLocate = true
-        await this.getAnnotations()
+        // await this.getAnnotations()
         this.viewportRender()
       } else if (event.data.type === 'readingPageStateUpdate') {
         this.readingTaskState = event.data.data.readingTaskState

From c8e7645fa55a476aeb2a4e20f3d827a66256a42a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 14:09:29 +0800
Subject: [PATCH 282/374] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=B5=E9=9D=A2FDG?=
 =?UTF-8?q?-PET=E8=AF=84=E4=BC=B0=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 9f116a0f..cfcb3a07 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -2135,7 +2135,7 @@ export default {
     },
     async receiveMsg(event) {
       if (event.data.type === 'readingPageUpdate') {
-        this.$refs['questions'].initList()
+        // this.$refs['questions'].initList()
         this.$refs['tableQuestions'].initList()
         this.isLocate = true
         // await this.getAnnotations()

From 55085438aa88e3be116610c79a9c446cf7d309c4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 14:50:47 +0800
Subject: [PATCH 283/374] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=97=B6=E5=8F=AA=E5=88=B7=E6=96=B0=E7=97=85=E7=81=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=83=A8=E5=88=86=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        |  4 +--
 .../components/Fusion/TableQuestionItem.vue   | 33 +++++++++++--------
 .../components/Fusion/TableQuestions.vue      | 18 +++++-----
 3 files changed, 31 insertions(+), 24 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index cfcb3a07..e1e5d6f2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -161,7 +161,7 @@
           <div class="text">{{ $t('trials:reading:button:reset') }}</div>
         </div>
       </el-tooltip>
-      <el-tooltip v-if="!isBaseLineTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom" >
+      <el-tooltip v-if="!isBaseLineTask" class="item" effect="dark" :content="$t('trials:lugano:button:record')" placement="bottom">
         <div class="tool-wrapper">
           <div
             class="icon"
@@ -2136,7 +2136,7 @@ export default {
     async receiveMsg(event) {
       if (event.data.type === 'readingPageUpdate') {
         // this.$refs['questions'].initList()
-        this.$refs['tableQuestions'].initList()
+        this.$refs['tableQuestions'].initList(true)
         this.isLocate = true
         // await this.getAnnotations()
         this.viewportRender()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 1527ea88..3e6b7a8a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -287,7 +287,7 @@ export default {
 
   },
   methods: {
-    async initForm() {
+    async initForm(isRerender = false) {
       const loading = this.$loading({ fullscreen: true })
       this.questions.forEach(item => {
         if (item.QuestionClassify === 0) {
@@ -301,22 +301,27 @@ export default {
           if (this.isBaseLineTask && item.QuestionMark === 7 && this.lesionType === 1) {
             val = 0
           }
-
-          this.$set(this.questionForm, item.Id, val)
+          if (!isRerender || (isRerender && item.QuestionMark !== 20)) {
+            this.$set(this.questionForm, item.Id, val)
+          }
         }
       })
       this.$set(this.questionForm, 'MeasureData', this.answers.MeasureData ? JSON.parse(this.answers.MeasureData) : '')
-      this.$set(this.questionForm, 'OtherMeasureData', this.answers.OtherMeasureData ? JSON.parse(this.answers.OtherMeasureData) : '')
+      if (!isRerender) {
+        this.$set(this.questionForm, 'OtherMeasureData', this.answers.OtherMeasureData ? JSON.parse(this.answers.OtherMeasureData) : '')
+      }
       this.$set(this.questionForm, 'RowIndex', this.answers.RowIndex ? this.answers.RowIndex : '')
       this.$set(this.questionForm, 'RowId', this.answers.RowId ? this.answers.RowId : '')
       this.$set(this.questionForm, 'OrganInfoId', this.answers.OrganInfoId ? this.answers.OrganInfoId : '')
 
       // saveTypeEnum 0：未保存过（新建病灶）；1：已保存，信息不完整（随访初始化病灶/分裂病灶，通过状态判断）；2：已保存，信息完整
       var lesionState = this.getQuestionVal(7)
-      if (this.questionForm.RowId) {
-        this.$set(this.questionForm, 'saveTypeEnum', isNaN(parseInt(lesionState)) ? 1 : 2)
-      } else {
-        this.$set(this.questionForm, 'saveTypeEnum', 0)
+      if (!isRerender) {
+        if (this.questionForm.RowId) {
+          this.$set(this.questionForm, 'saveTypeEnum', isNaN(parseInt(lesionState)) ? 1 : 2)
+        } else {
+          this.$set(this.questionForm, 'saveTypeEnum', 0)
+        }
       }
       this.$set(this.questionForm, 'IsCanEditPosition', this.answers.IsCanEditPosition === 'True')
       this.$set(this.questionForm, 'IsDicomReading', this.answers.IsDicomReading !== 'False')
@@ -359,13 +364,13 @@ export default {
       if (this.answers.IsFristAdd === 'True' && this.answers.SplitOrMergeType === '0' && isNaN(parseInt(this.getQuestionVal(7)))) {
         const stateId = this.getQuestionId(7)
         this.$set(this.questionForm, stateId, 0)
-        var isLymphLesion = this.getQuestionVal(2)
-        isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
-        const lesionPart = this.getQuestionVal(8)
-        const lesionOrgan = this.getQuestionVal(6)
-        const suvMax = this.getQuestionVal(20)
-        this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
       }
+      var isLymphLesion = this.getQuestionVal(2)
+      isLymphLesion = !isNaN(parseInt(isLymphLesion)) ? parseInt(isLymphLesion) : null
+      const lesionPart = this.getQuestionVal(8)
+      const lesionOrgan = this.getQuestionVal(6)
+      const suvMax = this.getQuestionVal(20)
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, suvMax, saveTypeEnum: this.questionForm.saveTypeEnum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
       this.isRender = true
       loading.close()
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 0d8c28c6..2bcc5ff6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -170,7 +170,7 @@ export default {
   beforeDestroy() {
   },
   methods: {
-    initList() {
+    initList(isRerender = false) {
       this.loading = true
       this.activeName = ''
       this.activeItem.activeRowIndex = null
@@ -180,13 +180,13 @@ export default {
         visitTaskId: this.visitTaskId
       }
       getReadingQuestionAndAnswer(params).then(res => {
-        this.questions = this.getQuestions(res.Result.SinglePage)
+        this.questions = this.getQuestions(res.Result.SinglePage, isRerender)
         this.getTableQuestions()
         this.$nextTick(() => {
           this.tableQuestions.forEach(item => {
             item.TableQuestions.Answers.forEach(i => {
               var refName = `${item.Id}_${i.RowIndex}`
-              this.$refs[refName] && this.$refs[refName][0].initForm()
+              this.$refs[refName] && this.$refs[refName][0].initForm(isRerender)
             })
           })
         })
@@ -217,7 +217,7 @@ export default {
       }
     },
 
-    getQuestions(questions) {
+    getQuestions(questions, isRerender) {
       questions.forEach(item => {
         if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {
           item.TableQuestions.Answers.forEach(answerObj => {
@@ -230,10 +230,12 @@ export default {
             var lesionState = this.getQuestionAnswer(item.TableQuestions.Questions, 7, answerObj)
             lesionState = !isNaN(parseInt(lesionState)) ? parseInt(lesionState) : ''
             this.$set(answerObj, 'lesionState', lesionState)
-            if (answerObj.RowId) {
-              this.$set(answerObj, 'saveTypeEnum', 2)
-            } else {
-              this.$set(answerObj, 'saveTypeEnum', 0)
+            if (!isRerender) {
+              if (answerObj.RowId) {
+                this.$set(answerObj, 'saveTypeEnum', 2)
+              } else {
+                this.$set(answerObj, 'saveTypeEnum', 0)
+              }
             }
           })
         }

From 63a4a56feb446dd92bb261143aa88f4ae749020c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 16:39:44 +0800
Subject: [PATCH 284/374] =?UTF-8?q?PetCt=E9=A1=B5=E9=9D=A2viewport?=
 =?UTF-8?q?=E5=9B=BE=E5=83=8F=E4=BB=A5=E6=9C=80=E5=A4=A7=E7=9A=84=E5=9B=BE?=
 =?UTF-8?q?=E5=83=8F=E5=BC=A0=E6=95=B0=E6=BB=9A=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue | 18 ++++++++++++------
 .../dicoms/components/Fusion/Viewport.vue      | 10 +++++-----
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index e1e5d6f2..8dea8a6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -628,11 +628,7 @@ export default {
       const routeData = this.$router.resolve({ path })
       this.screenshotWindow = window.open(routeData.href, '_blank')
     })
-    window.addEventListener('beforeunload', () => {
-      if (this.screenshotWindow) {
-        this.screenshotWindow.close()
-      }
-    })
+    window.addEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
   },
   beforeDestroy() {
     if (this.screenshotWindow) {
@@ -649,7 +645,7 @@ export default {
     FusionEvent.$off('removeAnnotation')
     FusionEvent.$off('imageLocation')
     FusionEvent.$off('getScreenshots')
-    window.removeEventListener('beforeunload')
+    window.removeEventListener('beforeunload', e => { this.beforeUnloadHandler(e) })
   },
   methods: {
 
@@ -699,6 +695,11 @@ export default {
 
       var ptseriesId = this.$route.query.ptseriesId
       this.petSeries = await this.getSeriesInfo(ptseriesId)
+
+      const maxCount = Math.max(this.ctSeries.imageIds.length, this.petSeries.imageIds.length)
+      this.$set(this.ctSeries, 'imageMaxLength', maxCount)
+      this.$set(this.petSeries, 'imageMaxLength', maxCount)
+
       await this.getImages()
 
       // 设置viewport
@@ -2133,6 +2134,11 @@ export default {
     historyRecord() {
       this.fusion.visible = true
     },
+    beforeUnloadHandler() {
+      if (this.screenshotWindow) {
+        this.screenshotWindow.close()
+      }
+    },
     async receiveMsg(event) {
       if (event.data.type === 'readingPageUpdate') {
         // this.$refs['questions'].initList()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
index 93d92891..423eb519 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Viewport.vue
@@ -17,7 +17,7 @@
       <div v-if="index === 1 || index === 2">
         Series: #{{ seriesInfo.seriesNumber }}
       </div>
-      <div v-if="index !== 4">Image: #{{ `${seriesInfo.imageIdIndex + 1} / ${seriesInfo.imageIds.length}` }}</div>
+      <div v-if="index !== 4">Image: #{{ `${seriesInfo.imageIdIndex + 1} / ${seriesInfo.imageMaxLength}` }}</div>
       <div v-if="index === 1 || index === 2">{{ seriesInfo.modality }}</div>
     </div>
     <!-- 描述信息 -->
@@ -247,7 +247,7 @@ export default {
           this.imageInfo.size = `${imagePlaneModule.columns}*${imagePlaneModule.rows}`
           this.imageInfo.location = imagePlaneModule.sliceLocation
           this.getOrientationMarker()
-          this.sliderBoxHeight = imageIndex * 100 / (this.seriesInfo.imageIds.length - 1)
+          this.sliderBoxHeight = imageIndex * 100 / (this.seriesInfo.imageMaxLength - 1)
         }
 
         var properties = viewport.getProperties()
@@ -376,7 +376,7 @@ export default {
     goViewer(e) {
       var height = e.offsetY * 100 / this.$refs['sliderBox'].clientHeight
       this.sliderBoxHeight = height
-      var index = Math.trunc(this.seriesInfo.imageIds.length * this.sliderBoxHeight / 100)
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * this.sliderBoxHeight / 100)
       if (this.seriesInfo.imageIdIndex !== index) {
         this.scroll(index)
       }
@@ -399,8 +399,8 @@ export default {
       if (PX < 0) return
       if (PX > boxHeight) return
       const height = PX * 100 / boxHeight
-      var index = Math.trunc(this.seriesInfo.imageIds.length * height / 100)
-      index = index > this.seriesInfo.imageIds.length ? this.seriesInfo.imageIds.length : index < 0 ? 0 : index
+      var index = Math.trunc(this.seriesInfo.imageMaxLength * height / 100)
+      index = index > this.seriesInfo.imageMaxLength ? this.seriesInfo.imageMaxLength : index < 0 ? 0 : index
       this.sliderBoxHeight = height
       if (this.seriesInfo.imageIdIndex !== index) {
         this.scroll(index)

From 94e80cbb3852718601c56665b6c9e20bc319113b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 8 Apr 2024 17:11:10 +0800
Subject: [PATCH 285/374] =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E7=9A=84=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=82=B9=E5=87=BB=E8=AE=BF=E8=A7=86=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/GlobalReview.vue               | 22 +++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index f152b3fd..c6d3bd62 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -20,7 +20,16 @@
         :label="$t('trials:medicalFeedback:table:taskBlindName')"
         show-overflow-tooltip
         width="150"
-      />
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row.VisitTaskId)"
+          >
+            {{ scope.row.BlindName }}
+          </el-button>
+        </template>
+      </el-table-column>
       <!-- 访视点计数 -->
       <el-table-column
         :label="$t('trials:medicalFeedback:table:visitPointCount')"
@@ -126,7 +135,16 @@
         :label="$t('trials:globalReview:table:visitName')"
         show-overflow-tooltip
         width="150"
-      />
+      >
+        <template slot-scope="scope">
+          <el-button
+            type="text"
+            @click="handleView(scope.row.VisitTaskId)"
+          >
+            {{ scope.row.BlindName }}
+          </el-button>
+        </template>
+      </el-table-column>
       <!-- 评估结果 -->
       <el-table-column
         :label="$t('trials:globalReview:table:evaluationRes')"

From 606d637d210ca03f7773b33717549f3cd84aef2c Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 9 Apr 2024 11:01:21 +0800
Subject: [PATCH 286/374] =?UTF-8?q?admin=E8=A7=92=E8=89=B2=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index d26f95a0..1a4ef747 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -123,7 +123,7 @@
                 </div>
               </div>
               <!-- 中心调研 -->
-              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])">
+              <div class="my_select_box" :class="{selected: selected === 'SiteResearch'}" tab-data="SiteResearch" @click="selected = 'SiteResearch'" v-if="hasPermi(['trials:trials-workbench:attachments:site-research'])&&!hasPermi(['role:admin'])">
                 <div class="my_select_box_content">
                   <span class="el-icon-edit-outline" style="padding: 4px;margin: 4px;color: #6698ff"></span>
                   <span class="my_select_box_content_text">{{ $t('trials:workbench:title:pendingSiteResearch') }}</span><span style="margin:0 0.25rem">·</span><span>{{hasPermi(['role:pm'])? tabList.PM_SiteSurveryCount : tabList.SPM_SiteSurveryCount }}</span>

From 0accca7ec131868f01c9c961f7f58b2fa9ccf250 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 10 Apr 2024 15:13:28 +0800
Subject: [PATCH 287/374] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E7=82=B9=E5=87=BB=E9=87=8D=E7=BD=AE=E6=88=96?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E6=9F=A5=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../attachments/reReading-tracking/index.vue      |  1 +
 .../site-research/components/users.vue            | 15 ++++++++++-----
 .../reading/consistency-analysis/index.vue        |  1 +
 .../Fusion/js/initCornerstoneDICOMImageLoader.js  |  6 +++++-
 .../reading/dicoms/components/StudyList.vue       |  5 ++++-
 .../trial-summary/login-log/index.vue             |  1 +
 .../trial-summary/upload-monitor/index.vue        |  3 ---
 .../visit/consistency-check/index.vue             |  1 -
 8 files changed, 22 insertions(+), 11 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue b/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue
index 03802439..5db7c2b5 100644
--- a/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue
+++ b/src/views/trials/trials-panel/attachments/reReading-tracking/index.vue
@@ -763,6 +763,7 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.timeList = null
       this.searchData = searchDataDefault()
       this.getList()
     },
diff --git a/src/views/trials/trials-panel/attachments/site-research/components/users.vue b/src/views/trials/trials-panel/attachments/site-research/components/users.vue
index 0450702f..0d499592 100644
--- a/src/views/trials/trials-panel/attachments/site-research/components/users.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/components/users.vue
@@ -21,7 +21,7 @@
         <!-- 角色 -->
         <el-form-item :label="$t('trials:researchStaff:table:role')">
           <el-select
-            v-model="searchData.TrialRoleNameId"
+            v-model="searchData.TrialRoleCode"
             style="width:120px;"
             clearable
           >
@@ -29,7 +29,7 @@
               v-for="item of dict.type.SiteSurvey_UserRoles"
               :key="item.value"
               :label="item.label"
-              :value="item.value"
+              :value="parseInt(item.raw.Code)"
             />
           </el-select>
         </el-form-item>
@@ -164,12 +164,16 @@
         </el-table-column>
         <!-- 角色 -->
         <el-table-column
-          prop="TrialRoleName"
+          prop="TrialRoleCode"
           :label="$t('trials:researchStaff:table:role')"
           show-overflow-tooltip
           sortable="custom"
           min-width="100"
-        />
+        >
+          <template slot-scope="scope">
+            {{ $fd('SiteSurvey_UserRoles',scope.row.TrialRoleCode) }}
+          </template>
+        </el-table-column>
         <!-- 电话号码 -->
         <el-table-column
           prop="Phone"
@@ -259,7 +263,7 @@ const searchDataDefault = () => {
     SiteId: '',
     UserTypeId: '',
     IsGenerateAccount: null,
-    TrialRoleNameId: '',
+    TrialRoleCode: '',
     UserName: '',
     OrganizationName: '',
     FormWriterKeyInfo: '',
@@ -292,6 +296,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.dict.type.SiteSurvey_UserRoles)
     this.getList()
     this.getSite()
     this.getUserType()
diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 6dd07667..9bc78021 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -978,6 +978,7 @@ export default {
       this.getList()
     },
     handleReset() {
+      this.timeList = null
       this.searchData = searchDataDefault()
       this.getList()
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js
index 584e981d..4af21a97 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/js/initCornerstoneDICOMImageLoader.js
@@ -4,7 +4,11 @@ import * as cornerstoneTools from '@cornerstonejs/tools'
 import cornerstoneDICOMImageLoader from '@cornerstonejs/dicom-image-loader'
 import intel from './d-intel.json'
 cornerstone.init({
-  gpuTier: intel
+  gpuTier: intel,
+  rendering: {
+    // useCPURendering: false,
+    useNorm16Texture: true
+  }
 })
 cornerstone.Settings.getRuntimeSettings().set('useCursors', false)
 window.cornerstone = cornerstone
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index 5831172b..cb0b2f8e 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -236,11 +236,14 @@ export default {
     cornerstone.events.addEventListener('cornerstoneimageloaded', this.cornerstoneImageLoaded)
     // cornerstone.events.addEventListener('cornerstoneimagecachefull', this.cornerstoneimagecachefull)
     // cornerstone.events.addEventListener('cornerstoneimagecachechanged', this.cornerstoneimagecachechanged)
+    window.addEventListener('beforeunload', e => {
+      cornerstone.imageCache.purgeCache()
+    })
   },
   beforeDestroy() {
-    console.log('study---beforeDestroy')
     cornerstone.imageCache.purgeCache()
     DicomEvent.$off('refreshStudyListMeasureData')
+    window.removeEventListener('beforeunload', e => { cornerstone.imageCache.purgeCache() })
   },
   methods: {
     initStudyInfo() {
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index ce24e71f..2f6f6087 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -210,6 +210,7 @@ export default {
     },
     // 重置列表查询
     handleReset() {
+      this.datetimerange = null
       this.searchData = searchDataDefault()
       this.getList()
     },
diff --git a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
index a58aeb4d..fb9a1014 100644
--- a/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/upload-monitor/index.vue
@@ -183,7 +183,6 @@
           min-width="120"
           :label="$t('trials:uploadMonitor:table:uploadInterval')"
           show-overflow-tooltip
-          sortable="custom"
         >
           <template slot-scope="scope">
             {{scope.row.UploadIntervalStr}}
@@ -195,7 +194,6 @@
           min-width="120"
           :label="$t('trials:uploadMonitor:table:archiveInterval')"
           show-overflow-tooltip
-          sortable="custom"
         >
           <template slot-scope="scope">
             {{scope.row.ArchiveIntervalStr}}
@@ -207,7 +205,6 @@
           min-width="100"
            :label="$t('trials:uploadMonitor:table:totalTime')"
           show-overflow-tooltip
-          sortable="custom"
         >
           <template slot-scope="scope">
             {{scope.row.TimeInterval}}
diff --git a/src/views/trials/trials-panel/visit/consistency-check/index.vue b/src/views/trials/trials-panel/visit/consistency-check/index.vue
index 7a5a659f..d8331851 100644
--- a/src/views/trials/trials-panel/visit/consistency-check/index.vue
+++ b/src/views/trials/trials-panel/visit/consistency-check/index.vue
@@ -165,7 +165,6 @@
           :label="$t('trials:consistencyCheck:table:modality')"
           show-overflow-tooltip
           width="140"
-          sortable="custom"
         >
           <template slot-scope="scope">
             <span>{{ scope.row.Modalitys }}</span>

From bfdd137cba20c352fb929234364c4e9f90aa93a3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 10 Apr 2024 15:21:32 +0800
Subject: [PATCH 288/374] =?UTF-8?q?=E5=AF=86=E7=A0=81=E9=87=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E9=AA=8C=E8=AF=81=E7=A0=81=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E6=B7=BB=E5=8A=A0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/forgetpassword/index.vue            | 28 ++++++++++---------
 .../reading/mim-medical-audit/index.vue       |  6 ++--
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 6b85fe54..c38b5683 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -31,7 +31,7 @@
         <el-form-item :label="$t('trials:researchForm:form:verifyCode')" required>
           <el-col :span="18">
             <el-form-item prop="VerificationCode">
-              <el-input v-model="form.VerificationCode"  autocomplete="off" />
+              <el-input v-model="form.VerificationCode" autocomplete="off" />
             </el-form-item>
           </el-col>
           <el-col :span="6" style="text-align:right;">
@@ -122,17 +122,17 @@ export default {
         }
       }
     }
-    var validatePass = (rule, value, callback) => {
-      if (value === '') {
-        // 请输入密码
-        callback(new Error(this.$t('passwordReset:formRule:password')))
-      } else {
-        if (this.CheckPass !== '') {
-          this.$refs.resetForm.validateField('CheckPass')
-        }
-        callback()
-      }
-    }
+    // var validatePass = (rule, value, callback) => {
+    //   if (value === '') {
+    //     // 请输入密码
+    //     callback(new Error(this.$t('passwordReset:formRule:password')))
+    //   } else {
+    //     if (this.CheckPass !== '') {
+    //       this.$refs.resetForm.validateField('CheckPass')
+    //     }
+    //     callback()
+    //   }
+    // }
     var validatePass2 = (rule, value, callback) => {
       if (value === '' || value === undefined) {
         // 请再次输入密码
@@ -205,6 +205,8 @@ export default {
       verifyAnonymousVerifyCode(this.form.EmailOrPhone, this.form.VerificationCode).then(res => {
         this.formLoading = false
         this.users = res.Result
+        // 验证成功
+        this.$message.success(this.$t('passwordReset:message:verifiedSuccessfully'))
       }).catch(() => { this.formLoading = false })
     },
     handleEmailChange() {
@@ -268,7 +270,7 @@ export default {
 /*/deep/ .is-error{*/
 /*  margin-bottom: 40px;*/
 /*}*/
-/deep/ .is-error.my_new_pwd{
+.is-error.my_new_pwd{
   margin-bottom: 40px;
 }
 </style>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
index c1cd0576..3b55d618 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue
@@ -63,7 +63,7 @@
                 :label="$t('trials:medicalFeedback:table:taskBlindName')"
               >
                 <el-input
-                  v-model="searchData.TaskName"
+                  v-model="searchData.TaskBlindName"
                   style="width:100px;"
                   clearable
                 />
@@ -554,6 +554,7 @@ const searchDataDefault = () => {
     SubjectId: '',
     SubjectCode: '',
     TaskName: '',
+    TaskBlindName: '',
     IsUrgent: null,
     DoctorUserId: '',
     ReadingCategory: null,
@@ -661,10 +662,9 @@ export default {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.$refs['signForm'].btnLoading = false
           this.signVisible = false
-          this.$nextTick(()=>{
+          this.$nextTick(() => {
             this.chatForm.visible = false
           })
-          
         }
         this.loading = false
         this.getList()

From 6f0cfb01222d1860a9234e581bf2baa9ac371a62 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 10 Apr 2024 15:37:52 +0800
Subject: [PATCH 289/374] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8C=BB=E5=AD=A6?=
 =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E9=A1=B5=E9=9D=A2=E9=85=8D=E7=BD=AE=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=97=AE=E9=A2=98=E4=BF=9D=E5=AD=98=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/setting/medical-audit/components/QSForm.vue     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue b/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
index 52882344..c68c9e40 100644
--- a/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
+++ b/src/views/trials/trials-panel/setting/medical-audit/components/QSForm.vue
@@ -64,7 +64,6 @@
 
       <!-- 任务类型 -->
       <el-form-item
-        v-if="form.Type === 'select' || form.Type === 'radio'"
         :label="$t('trials:medicalFeedbackCfg:title:taskType')"
         prop="ReadingCategory"
       >

From c29b60cbbecc3095bf9698e0a9397714f27d01d4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 10 Apr 2024 16:45:17 +0800
Subject: [PATCH 290/374] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E9=A1=B5=E9=9D=A2=E6=9D=83=E9=99=90=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A=E9=94=99=E8=AF=AF=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/uploadClinicalData.vue                 |  8 +++-----
 .../trials/trials-panel/setting/attachment/index.vue  |  5 +++--
 .../visit/crc-upload/components/studyInfo.vue         |  6 +++---
 .../visit/crc-upload/components/uploadDicomFiles.vue  |  2 +-
 .../visit/crc-upload/components/uploadDicomFiles2.vue |  2 +-
 .../crc-upload/components/uploadNonDicomFiles.vue     | 11 ++++++-----
 6 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/components/clinicalDataQuestions/components/uploadClinicalData.vue b/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
index 69ab47d4..86819648 100644
--- a/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
+++ b/src/components/clinicalDataQuestions/components/uploadClinicalData.vue
@@ -64,7 +64,7 @@
               </template>
             </el-table-column>
             <el-table-column
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:edit']) && allowAddOrEdit"
               :label="$t('common:action:action')"
               min-width="120"
             >
@@ -81,7 +81,6 @@
                 <!-- 移除 -->
                 <el-button
                   v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-                  v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -127,7 +126,7 @@
             </el-table-column>
 
             <el-table-column
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:edit']) && allowAddOrEdit"
               :label="$t('common:action:action')"
               min-width="200"
             >
@@ -144,7 +143,6 @@
                 <!-- 移除 -->
                 <el-button
                   v-if="data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload)"
-                  v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
                   icon="el-icon-delete"
                   circle
                   :title="$t('common:button:delete')"
@@ -200,7 +198,7 @@
             </el-table-column>
 
             <el-table-column
-              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:upload']) && allowAddOrEdit"
+              v-if="hasPermi(['trials:trials-panel:visit:crc-upload:edit']) && allowAddOrEdit"
               :label="$t('common:action:action')"
               min-width="200"
             >
diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue
index 205f01ef..43b3be99 100644
--- a/src/views/trials/trials-panel/setting/attachment/index.vue
+++ b/src/views/trials/trials-panel/setting/attachment/index.vue
@@ -11,9 +11,9 @@
           >
             <el-option
               v-for="item of $d.Trial_Document"
-              :key="item.value"
+              :key="item.id"
               :label="item.label"
-              :value="item.value"
+              :value="item.id"
             />
           </el-select>
         </el-form-item>
@@ -238,6 +238,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$d.Trial_Document)
     this.trialId = this.$route.query.trialId
     this.getList()
   },
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
index d16d646b..f7ab1997 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
@@ -4,7 +4,7 @@
       <!-- 删除 -->
       <el-button
         v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-        v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+        v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
         :disabled="deleteArr.length === 0"
         type="primary"
         size="small"
@@ -111,7 +111,7 @@
           <el-button
             icon="el-icon-edit-outline"
             v-if=" (data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             title="编辑"
             circle
             :disabled="scope.row.IsDeleted"
@@ -120,7 +120,7 @@
           <!-- 删除 -->
           <el-button
             v-if=" (data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
             icon="el-icon-delete"
             :title="$t('trials:uploadedDicoms:action:delete')"
             circle
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue
index 06176b12..b6f8b694 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles.vue
@@ -108,7 +108,7 @@
           <!-- 编辑 -->
           <el-button
             icon="el-icon-edit-outline"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             :title="$t('common:button:edit')"
             circle
             :disabled="scope.row.IsDeleted"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index ed20b0c1..e73af7d0 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -135,7 +135,7 @@
           <!-- 编辑 -->
           <el-button
             icon="el-icon-edit-outline"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload2']"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             :title="$t('common:button:edit')"
             circle
             :disabled="scope.row.IsDeleted"
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index b3abd3d2..d94586c3 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -2,7 +2,7 @@
   <div v-loading="loading" class="non-dicom-wrapper">
     <!-- <h4 class="box-title">既往放疗史</h4> -->
     <div style="text-align:right">
-      <el-button v-if="(allowAddOrEdit)" icon="el-icon-plus" type="primary" size="small" @click.native.prevent="handleAdd">
+      <el-button v-if="(allowAddOrEdit)" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']" icon="el-icon-plus" type="primary" size="small" @click.native.prevent="handleAdd">
         {{ $t('common:button:new') }}
       </el-button>
       <el-button
@@ -65,8 +65,8 @@
                   />
                   <!-- 删除 -->
                   <el-button
-                    v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-                    v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+                    v-if="allowAddOrEdit"
+                    v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
                     icon="el-icon-delete"
                     circle
                     :title="$t('trials:uploadNonDicoms:action:delete')"
@@ -135,6 +135,7 @@
           <!-- 编辑 -->
           <el-button
             v-if="(allowAddOrEdit)"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             icon="el-icon-edit-outline"
             circle
             :title="$t('trials:uploadNonDicoms:action:edit')"
@@ -142,8 +143,8 @@
           />
           <!-- 删除 -->
           <el-button
-            v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:upload']"
+            v-if="allowAddOrEdit"
+            v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
             icon="el-icon-delete"
             circle
             :title="$t('trials:uploadNonDicoms:action:delete')"

From c04aaf2db6646aeadc6a68777b9e17518ad8cc00 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 11 Apr 2024 13:38:42 +0800
Subject: [PATCH 291/374] =?UTF-8?q?=E6=9C=89pet=E5=BD=B1=E5=83=8F=E4=BD=86?=
 =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=9E=8D=E5=90=88/=E6=97=A0=E6=B3=95?=
 =?UTF-8?q?=E6=B5=8B=E9=87=8F=E7=9A=84=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                             | 14 ++++++++
 src/store/getters.js                          |  1 +
 src/store/modules/reading.js                  |  7 +++-
 .../reading/dicoms/components/DicomViewer.vue | 16 +++++++++-
 .../components/Fusion/TableQuestionItem.vue   |  3 +-
 .../components/IRecist/QuestionForm.vue       |  2 +-
 .../dicoms/components/Lugano/QuestionForm.vue | 29 ++++++++++-------
 .../dicoms/components/QuestionItem.vue        |  2 ++
 .../reading/dicoms/components/Questions.vue   | 32 +++++++++++++++++--
 .../dicoms/components/Recist/QuestionForm.vue |  2 +-
 .../components/RecistBM/QuestionForm.vue      |  2 +-
 11 files changed, 89 insertions(+), 21 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index 0b468434..fcf4e657 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -2810,7 +2810,21 @@ export function saveImageQuality(param) {
     data: param
   })
 }
+export function getIsSuvMaxLesion(param) {
+  return request({
+    url: `/LuganoCalculate/getIsSuvMaxLesion`,
+    method: 'post',
+    data: param
+  })
+}
 
+export function getCanChooseNotMerge(param) {
+  return request({
+    url: `/LuganoCalculate/getCanChooseNotMerge`,
+    method: 'post',
+    data: param
+  })
+}
 export function saveTaskQuestion(saveQuestionType, param) {
   return request({
     url: `/SaveTaskQuestion/${saveQuestionType}`,
diff --git a/src/store/getters.js b/src/store/getters.js
index 817ebfa3..e79727d6 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -40,6 +40,7 @@ const getters = {
   activeSeries: state => state.reading.activeSeries,
   lastCanvasTaskId: state => state.reading.lastCanvasTaskId,
   imageQuality: state => state.reading.imageQuality,
+  imageQualityIssues: state => state.reading.imageQualityIssues,
   language: state => state.lang.language,
   TotalNeedSignSystemDocCount: state => state.user.TotalNeedSignSystemDocCount,
   TotalNeedSignTrialDocCount: state => state.user.TotalNeedSignTrialDocCount,
diff --git a/src/store/modules/reading.js b/src/store/modules/reading.js
index c6491f63..467b4655 100644
--- a/src/store/modules/reading.js
+++ b/src/store/modules/reading.js
@@ -29,7 +29,8 @@ const getDefaultState = () => {
     currentReadingTaskState: 2,
     activeSeries: {},
     lastCanvasTaskId: '',
-    imageQuality: null
+    imageQuality: null,
+    imageQualityIssues: null
   }
 }
 function getQuestions(questions) {
@@ -183,6 +184,7 @@ const actions = {
       state.activeSeries = {}
       state.lastCanvasTaskId = ''
       state.imageQuality = null
+      state.imageQualityIssues = null
       resolve()
     })
   },
@@ -875,6 +877,9 @@ const actions = {
   setImageQuality({ state }, imageQuality) {
     state.imageQuality = isNaN(parseInt(imageQuality)) ? null : parseInt(imageQuality)
   },
+  setImageQualityIssues({ state }, imageQualityIssues) {
+    state.imageQualityIssues = isNaN(parseInt(imageQualityIssues)) ? null : parseInt(imageQualityIssues)
+  },
   addQuestionMeasuredData({ state }, obj) {
     return new Promise(resolve => {
       var index = state.visitTaskList.findIndex(i => i.VisitTaskId === obj.visitTaskId)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index e155569b..151ba2b6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -794,7 +794,7 @@ export default {
   },
 
   computed: {
-    ...mapGetters(['visitTaskList', 'currentReadingTaskState', 'lastCanvasTaskId'])
+    ...mapGetters(['visitTaskList', 'currentReadingTaskState', 'lastCanvasTaskId', 'imageQualityIssues'])
   },
   watch: {
     currentReadingTaskState: {
@@ -840,6 +840,10 @@ export default {
           this.studyList = studyList
         }
       }
+    },
+    imageQualityIssues: {
+      immediate: true,
+      handler(v) {}
     }
 
   },
@@ -961,6 +965,11 @@ export default {
         this.petctWindow.close()
       }
     })
+    DicomEvent.$on('closePetct', () => {
+      if (this.petctWindow) {
+        this.petctWindow.close()
+      }
+    })
     window.addEventListener('beforeunload', () => {
       if (this.petctWindow) {
         this.petctWindow.close()
@@ -978,6 +987,7 @@ export default {
     DicomEvent.$off('readingPageUpdate')
     DicomEvent.$off('setReadingState')
     DicomEvent.$off('reload')
+    DicomEvent.$off('closePetct')
     if (this.petctWindow) {
       this.petctWindow.close()
     }
@@ -1966,6 +1976,10 @@ export default {
         this.$alert(this.$t('components:uploadvideo:message:xf4'))
         return
       }
+      if (this.imageQualityIssues && parseInt(this.imageQualityIssues) === 6) {
+        this.$alert(this.$t('trials:lugano:message:fusionWarn'))
+        return
+      }
       const i = this.activeTaskInfo.visitTaskIndex
       if (i < 0) return
       if (this.studyList.length > 0) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 3e6b7a8a..d23dc4c2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -828,7 +828,7 @@ export default {
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
           var picturePath = ''
-          if (val && otherMeasureData) {
+          if (val && otherMeasureData && this.questionForm.IsDicomReading) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
             picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
@@ -842,6 +842,7 @@ export default {
             }
           }
           var params = {
+            computationTrigger: -3,
             questionId: this.parentQsId,
             rowId: this.questionForm.RowId,
             rowIndex: this.answers.RowIndex,
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 300cceac..624016e5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1962,7 +1962,7 @@ export default {
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
           var picturePath = ''
-          if (val && measureData) {
+          if (val && measureData && this.questionForm.IsDicomReading) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
             picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 0e1d6d8d..ca2d94f0 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -5,7 +5,7 @@
     v-loading="loading"
     :model="questionForm"
     size="mini"
-    class="measurement-form" 
+    class="measurement-form"
   >
     <div class="base-dialog-body">
       <div style="display: flex;justify-content: space-between;">
@@ -179,7 +179,7 @@
           </el-radio-group>
           <template v-if="qs.QuestionMark === 20">
             <div style="display: flex;flex-direction: row;justify-content: flex-start;">
-              
+
               <el-input
                 v-if="qs.Type==='calculation'"
                 v-model="questionForm[qs.Id]"
@@ -267,7 +267,7 @@
   </el-form>
 </template>
 <script>
-import { submitTableQuestion, deleteReadingRowAnswer } from '@/api/trials'
+import { submitTableQuestion, deleteReadingRowAnswer, getIsSuvMaxLesion } from '@/api/trials'
 // import { uploadPrintscreen } from '@/api/reading'
 import DicomEvent from './../DicomEvent'
 import store from '@/store'
@@ -1654,18 +1654,12 @@ export default {
             }
           }
         }
-        // DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionName, lesionType: this.lesionType }, () => {
-        //   console.log(11111)
-
-        // })
-        // await DicomEvent.$emit('imageLocation', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionName, lesionType: this.lesionType })
-        // console.log(5555)
         DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
           var picturePath = ''
-          if (val && measureData) {
+          if (val && measureData && this.questionForm.IsDicomReading) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
             picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }
@@ -1680,6 +1674,7 @@ export default {
           }
 
           var params = {
+            computationTrigger: -2,
             questionId: this.parentQsId,
             rowId: this.questionForm.RowId,
             rowIndex: this.answers.RowIndex,
@@ -1789,9 +1784,19 @@ export default {
         })
         .catch(() => {})
     },
-    handleDelete() {
+    async handleDelete() {
+      let message = this.$t('trials:reading:warnning:msg48')
+      // 判断该病灶的suvmax是否是最大的
+      const suvMax = this.getQuestionVal(20)
+      if (this.questionForm.RowId && !!suvMax) {
+        const res = await getIsSuvMaxLesion({ visitTaskId: this.visitTaskId, rowId: this.questionForm.RowId })
+        if (res.IsSuccess && res.Result.IsSuvMaxLesion) {
+          message = this.$t('trials:reading:warnning:msg58')
+        }
+      }
+
       // 是否确认删除？
-      this.$confirm(this.$t('trials:reading:warnning:msg48'), {
+      this.$confirm(message, {
         type: 'warning',
         distinguishCancelAndClose: true
       })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index c3b56d6c..70e85abe 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -73,6 +73,7 @@
           v-else-if="question.Type==='input'"
           v-model="questionForm[question.Id]"
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
+          @change="((val)=>{formItemChange(val, question)})"
         />
         <!-- 多行文本输入框 -->
         <el-input
@@ -81,6 +82,7 @@
           type="textarea"
           :autosize="{ minRows: 2, maxRows: 4}"
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
+          @change="((val)=>{formItemChange(val, question)})"
         />
         <!-- 下拉框 -->
         <el-select
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 0f14feb6..7d9bb92c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -30,7 +30,7 @@
 
 <script>
 // import { uploadPrintscreen } from '@/api/reading'
-import { saveTaskQuestion, getSplenicState, getSplenicVerify } from '@/api/trials'
+import { saveTaskQuestion, getSplenicState, getSplenicVerify, getCanChooseNotMerge } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
@@ -74,6 +74,7 @@ export default {
       readingTaskState: 2,
       visitTaskId: '',
       imageQualityId: '',
+      imageQualityIssuesId: '',
       measurements: [],
       spleenStatusId: '',
       spleenLengthId: '',
@@ -180,6 +181,11 @@ export default {
               this.imageQualityId = v.Id
               // store.dispatch('reading/setImageQuality', v.Answer ? v.Answer : null)
             }
+            if (v.QuestionType === 67) {
+              // 影像质量问题
+              this.imageQualityIssuesId = v.Id
+            }
+
             if (v.QuestionType === 49) {
               // 脾脏状态
               this.spleenStatusId = v.Id
@@ -208,7 +214,9 @@ export default {
         }
         // this.questions = questions
       }
-
+      if (this.imageQualityIssuesId) {
+        store.dispatch('reading/setImageQualityIssues', this.questionForm[this.imageQualityIssuesId])
+      }
       if (this.spleenLengthId && this.spleenInfo && this.readingTaskState < 2) {
         this.calculateSpleenStatus = this.setSpleenStatus(this.questionForm[this.spleenLengthId])
         this.setSpleenCommentDisplay()
@@ -225,6 +233,10 @@ export default {
             this.imageQualityId = i.Id
             // store.dispatch('reading/setImageQuality', i.Answer ? i.Answer : null)
           }
+          if (i.QuestionType === 67) {
+            // 影像质量问题
+            this.imageQualityIssuesId = i.Id
+          }
           if (i.QuestionType === 49) {
             // 脾脏状态
             this.spleenStatusId = i.Id
@@ -257,7 +269,6 @@ export default {
     handleSave() {
       this.$refs['questions'].validate(async(valid) => {
         if (!valid) return
-
         // lugano标准校验脾脏状态是否符合要求
         if (this.criterionType === 2 && this.groupClassify === 3) {
           // 是否有标记未保存
@@ -296,6 +307,15 @@ export default {
           } else {
             this.saveQuestionsList()
           }
+        } else if (this.criterionType === 2 && this.groupClassify === 1 && this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
+          // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
+          const res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
+          if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
+            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'))
+            return
+          } else {
+            this.saveQuestionsList()
+          }
         } else {
           this.saveQuestionsList()
         }
@@ -330,6 +350,12 @@ export default {
       // }
 
       saveTaskQuestion(this.questionType, params).then(async res => {
+        if (this.imageQualityIssuesId) {
+          store.dispatch('reading/setImageQualityIssues', this.questionForm[this.imageQualityIssuesId])
+          if (this.questionForm[this.imageQualityIssuesId] && parseInt(this.questionForm[this.imageQualityIssuesId]) === 6) {
+            DicomEvent.$emit('closePetct')
+          }
+        }
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         var trialId = this.$route.query.trialId
         await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index 35537094..dcc86e2b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1325,7 +1325,7 @@ export default {
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
 
           var picturePath = ''
-          if (val && measureData) {
+          if (val && measureData && this.questionForm.IsDicomReading) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
 
             picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index f1bef7f1..2e104760 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -972,7 +972,7 @@ export default {
 
         DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
           var picturePath = ''
-          if (val && measureData) {
+          if (val && measureData && this.questionForm.IsDicomReading) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
             picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           }

From d8401d57f7cdcebd4cf69b6ff09a960c679226bc Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 11 Apr 2024 14:22:04 +0800
Subject: [PATCH 292/374] =?UTF-8?q?=E5=9C=A8=E9=98=85=E7=89=87=E4=BA=BA?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=BD=B1=E5=83=8F=E8=B4=A8=E9=87=8F=E4=B8=BA?=
 =?UTF-8?q?PET-CT=E5=BD=B1=E5=83=8F=E6=97=A0=E6=B3=95=E8=9E=8D=E5=90=88?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=97=B6=EF=BC=8C=E5=BC=B9?=
 =?UTF-8?q?=E6=A1=86=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Questions.vue | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 7d9bb92c..1d1e2940 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -314,7 +314,14 @@ export default {
             this.$alert(this.$t('trials:lugano:saveQuestions:warning1'))
             return
           } else {
-            this.saveQuestionsList()
+            // 如果设置为PET-CT影像无法融合，则FDG-PET评估会被设置为NE。
+            this.$confirm(this.$t('trials:lugano:saveQuestions:warning2'), {
+              type: 'warning',
+              distinguishCancelAndClose: true
+            })
+              .then(() => {
+                this.saveQuestionsList()
+              })
           }
         } else {
           this.saveQuestionsList()

From 6740e584aee2412a0038301bd137eef2b2e867d5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 11 Apr 2024 15:34:46 +0800
Subject: [PATCH 293/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E8=AE=BF=E8=A7=86=E8=80=85=E7=BA=A7=E5=88=AB=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/visit/crc-upload/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index 7982c2d6..f3108d4a 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -491,7 +491,7 @@
           </el-tab-pane>
           <!-- 临床数据采集 -->
           <el-tab-pane
-            v-if="rowData.IsBaseLine  && otherInfo.IsHaveSubjectClinicalData"
+            v-if="rowData.IsBaseLine  && (otherInfo.IsHaveSubjectClinicalData||otherInfo.IsHaveVisitClinicalData)"
             :label="$t('trials:uploadClinicalData:tab:uploadClinicalData')"
             name="clinical-data"
           >
@@ -1365,6 +1365,7 @@ export default {
         this.list = res.Result.CurrentPageData
         this.total = res.Result.TotalCount
         this.otherInfo = res.OtherInfo
+        console.log(this.otherInfo)
       }).catch(() => { this.loading = false })
     },
     // 新建计划外的访视信息

From 15cc9c00be96e771a907a89b204d456106d06c76 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 11 Apr 2024 15:48:36 +0800
Subject: [PATCH 294/374] =?UTF-8?q?dicom=E4=B8=8A=E4=BC=A0=E6=97=B6?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4DICOMDIR=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/crc-upload/components/uploadDicomFiles2.vue      | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index e73af7d0..854f06da 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -728,10 +728,14 @@ export default {
         var p = new Promise(function(resolve) {
           resolve()
         })
+        var validFilesCount = 0
         for (var i = 0; i < files.length; ++i) {
           (function(index) {
             p = p.then(function() {
-              return scope.parseDicomFile(files[index])
+              if(files[index].name.indexOf('DICOMDIR') === -1){
+                validFilesCount = validFilesCount + 1
+                return scope.parseDicomFile(files[index])
+              }
             })
           })(i)
         }
@@ -742,6 +746,7 @@ export default {
           scope.scanState = 'finished'
           scope.isScan = true
         })
+        
       }
     },
     // 按序列UUID本地归档

From 892b71c0112deb4d2ce1520e4d546dbcf2d1dbea Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 11 Apr 2024 16:51:51 +0800
Subject: [PATCH 295/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E4=BF=9D=E5=AD=98=E5=89=8D=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/trials.js                                   |  8 ++++++++
 .../trial-config/components/processConfig.vue       | 13 ++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/src/api/trials.js b/src/api/trials.js
index fcf4e657..1cdb1ff0 100644
--- a/src/api/trials.js
+++ b/src/api/trials.js
@@ -2902,6 +2902,14 @@ export function asyncTrialCriterionDictionary(param) {
   })
 }
 
+export function configTrialProcessInfoVerification(param) {
+  return request({
+    url: `/TrialConfig/configTrialProcessInfoVerification`,
+    method: 'post',
+    data: param
+  })
+}
+
 export function getTrialEmailNoticeConfigList(param) {
   return request({
     url: `/TrialEmailNoticeConfig/getTrialEmailNoticeConfigList`,
diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index f0b98273..7fedad58 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -966,7 +966,7 @@
   </div>
 </template>
 <script>
-import { getTrialCriterionSelectList, configTrialProcessInfo, getTrialClinicalDataTrialSetList, deleteClinicalTrialSetData, DownloadTrialClinicalFile, getReadingQuestionCriterionTrialList, addOrUpdateReadingQuestionCriterionTrial, deleteReadingQuestionCriterionTrial, setTrialReadingQuestionCriterionIsIsCompleteConfig } from '@/api/trials'
+import { getTrialCriterionSelectList, configTrialProcessInfo, getTrialClinicalDataTrialSetList, deleteClinicalTrialSetData, DownloadTrialClinicalFile, getReadingQuestionCriterionTrialList, addOrUpdateReadingQuestionCriterionTrial, deleteReadingQuestionCriterionTrial, setTrialReadingQuestionCriterionIsIsCompleteConfig,configTrialProcessInfoVerification } from '@/api/trials'
 import { ConfigTrialProcessInfoConfirm } from '@/api/trials/setting'
 import SignForm from '@/views/trials/components/newSignForm'
 import Pagination from '@/components/Pagination'
@@ -1117,8 +1117,9 @@ export default {
     },
     // 配置信息保存
     handleSave() {
-      this.$refs['processConfigForm'].validate((valid) => {
+      this.$refs['processConfigForm'].validate(async(valid) => {
         if (!valid) return
+        await configTrialProcessInfoVerification(this.form)
         this.loading = true
         // 保存配置信息
         configTrialProcessInfo(this.form).then(res => {
@@ -1133,8 +1134,9 @@ export default {
 
     // 打开配置信息确认框
     handleConfirm() {
-      this.$refs['processConfigForm'].validate((valid) => {
+      this.$refs['processConfigForm'].validate(async(valid) => {
         if (!valid) return
+        await configTrialProcessInfoVerification(this.form)
         this.getConfigArr()
         this.confirmVisible = true
       })
@@ -1142,8 +1144,9 @@ export default {
 
     // 打开配置信息更新框
     handleUpdate() {
-      this.$refs['processConfigForm'].validate((valid) => {
+      this.$refs['processConfigForm'].validate(async (valid) => {
         if (!valid) return
+        await configTrialProcessInfoVerification(this.form)
         this.getConfigArr()
         this.updateVisible = true
       })
@@ -1184,7 +1187,7 @@ export default {
       }
     },
     // 签名并确认
-    signConfirm(signInfo) {
+    async signConfirm(signInfo) {
       this.loading = true
       var params = {
         data: this.form,

From 3283f7f5f2da94f976beaec5200debd2c561f0f3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 10:37:16 +0800
Subject: [PATCH 296/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E9=85=8D=E7=BD=AE=E6=A0=A1=E9=AA=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-config/components/processConfig.vue | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
index 7fedad58..eef426fa 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/processConfig.vue
@@ -1119,7 +1119,6 @@ export default {
     handleSave() {
       this.$refs['processConfigForm'].validate(async(valid) => {
         if (!valid) return
-        await configTrialProcessInfoVerification(this.form)
         this.loading = true
         // 保存配置信息
         configTrialProcessInfo(this.form).then(res => {
@@ -1136,7 +1135,6 @@ export default {
     handleConfirm() {
       this.$refs['processConfigForm'].validate(async(valid) => {
         if (!valid) return
-        await configTrialProcessInfoVerification(this.form)
         this.getConfigArr()
         this.confirmVisible = true
       })
@@ -1146,7 +1144,6 @@ export default {
     handleUpdate() {
       this.$refs['processConfigForm'].validate(async (valid) => {
         if (!valid) return
-        await configTrialProcessInfoVerification(this.form)
         this.getConfigArr()
         this.updateVisible = true
       })
@@ -1370,11 +1367,23 @@ export default {
       }
       this.selectClinicalDataArr = arr
     },
-    handleConfirmClinicalData() {
-      this.form.ClinicalDataSetNames = this.selectedCD
-      this.form.ClinicalDataTrialSetIds = this.selectClinicalDataArr
-      this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
-      this.clinicalDataVisible = false
+    async handleConfirmClinicalData() {
+      // 验证临床数据配置
+      try {
+        let params = {
+          trialId: this.form.TrialId,
+          trialCriterionIds: this.form.TrialCriterionIds,
+          clinicalDataTrialSetIds: this.selectClinicalDataArr
+        }
+        await configTrialProcessInfoVerification(params)
+
+        this.form.ClinicalDataSetNames = this.selectedCD
+        this.form.ClinicalDataTrialSetIds = this.selectClinicalDataArr
+        this.form.ClinicalDataSetNamesStr = this.form.ClinicalDataSetNames.join(', ')
+        this.clinicalDataVisible = false
+      } catch (e) {
+        console.log(e)
+      }
     },
     async handleSetCD() {
       this.clinicalDataVisible = true

From db1d2cc4e1509da0c3e4601298ed7fc3dfcf6652 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 11:42:42 +0800
Subject: [PATCH 297/374] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=9B=BE=E7=89=87=E5=8A=9F=E8=83=BD=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/audit-record/index.vue      | 80 +++++++++++++++----
 1 file changed, 63 insertions(+), 17 deletions(-)

diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 0b99516d..838f6bbf 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -334,13 +334,13 @@
                   <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue" :ref="scope.row.oldValue" :images="imagesList">
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
                     <!-- 查看图片 -->
                      <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
                        <template v-for="item of scope.row.oldValue">
-                          <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="item" v-show="false" crossorigin="anonymous" alt="">
+                          <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
                        </template>
-                     <img v-if="scope.row.DataType === 'Image'" :src="scope.row.oldValue" v-show="false" crossorigin="anonymous" alt="">
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.oldValue" v-show="false" crossorigin="anonymous" alt="">
                    </viewer>
                   <span v-else>
                     {{ scope.row.oldValue }}
@@ -363,7 +363,7 @@
                   <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
-                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue" :ref="scope.row.newValue" :images="imagesList">
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
                     <!-- 查看图片 -->
                      <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
                      <template v-for="item of scope.row.newValue">
@@ -633,13 +633,35 @@
               :label="OptType === 'Add' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:beforeDeletion') : $t('trials:auditRecord:title:beforeModification')"
               show-overflow-tooltip
             >
-              <template slot-scope="scope">
+              <!-- <template slot-scope="scope">
                 <span>
                   <a v-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">{{scope.row.oldValue}}</a>
                   <span v-else>
                     {{ scope.row.oldValue }}
                   </span>
                 </span>
+              </template> -->
+              <template slot-scope="scope">
+                 <span>
+                  <!-- 查看详情 -->
+                   <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
+                    {{$t('common:button:download')}}
+                  </a>
+                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
+                    {{$t('trials:auditRecord:title:viewDetail')}}
+                  </a>
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.oldValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.oldValue instanceof Array ? `(${scope.row.oldValue.length})` : ''}}</span>
+                       <template v-for="item of scope.row.oldValue">
+                          <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                       </template>
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.oldValue" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
+                  <span v-else>
+                    {{ scope.row.oldValue }}
+                  </span>
+                </span>
               </template>
             </el-table-column>
             <!-- OptType === 'Add' || OptType === 'Init' ? '值' : OptType === 'Delete' ? '删除后' : '修改后' -->
@@ -648,11 +670,32 @@
               :label="OptType === 'Add' || OptType === 'Init' ? $t('trials:auditRecord:title:fieldValue') : OptType === 'Delete' ? $t('trials:auditRecord:title:afterDeletion') : $t('trials:auditRecord:title:afterModification')"
               show-overflow-tooltip
             >
-              <template slot-scope="scope">
+              <!-- <template slot-scope="scope">
                 <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
                   <a v-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">{{scope.row.newValue}}</a>
                   <span v-else>{{ scope.row.newValue }}</span>
                 </span>
+              </template> -->
+              <template slot-scope="scope">
+                <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
+                  <!-- 查看详情 -->
+                  <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
+                    {{$t('common:button:download')}}
+                  </a>
+                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
+                    {{$t('trials:auditRecord:title:viewDetail')}}
+                  </a>
+                   <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row.newValue)">{{$t('trials:auditRecord:title:viewImage')}}{{scope.row.newValue instanceof Array ? `(${scope.row.newValue.length})` : ''}}</span>
+                     <template v-for="item of scope.row.newValue">
+                        <img v-if="scope.row.DataType === 'ImageList'" :key="item" :src="OSSclientConfig.basePath + item" v-show="false" crossorigin="anonymous" alt="">
+                     </template>
+                     <img v-if="scope.row.DataType === 'Image'" :src="OSSclientConfig.basePath + scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">
+<!--                     <img :src="scope.row.newValue" v-show="false" crossorigin="anonymous" alt="">-->
+                   </viewer>
+                  <span v-else>{{ scope.row.newValue }}</span>
+                </span>
               </template>
             </el-table-column>
           </el-table>
@@ -817,16 +860,19 @@ export default {
   methods: {
     openImage(url) {
       console.log(url)
-      if (url instanceof Array) {
-        this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
-      } else {
-        this.imagesList = [this.OSSclientConfig.basePath + url]
-      }
-      if(this.$refs[url][0]) {
-        this.$refs[url][0].$viewer.show()
-      } else {
-        this.$refs[url].$viewer.show()
-      }
+      
+      this.$nextTick(()=>{
+        if (url instanceof Array) {
+          this.imagesList = url.map(v => this.OSSclientConfig.basePath + v)
+        } else {
+          this.imagesList = [this.OSSclientConfig.basePath + url]
+        }
+          if(this.$refs[url][0]) {
+          this.$refs[url][0].$viewer.show()
+        } else {
+          this.$refs[url].$viewer.show()
+        }
+      })
     },
     getTrialCriterionList() {
       getTrialCriterionList(this.trialId, false).then(res => {
@@ -1135,6 +1181,7 @@ export default {
         item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
         this[auditData].push(item)
       })
+      console.log(this[auditData])
     },
     getJSON(row) {
       return new Promise(resolve => {
@@ -1175,7 +1222,6 @@ export default {
         console.log(res)
         var configList2 = res.Result
         this.formatting(configList2, JsonDetail.Data, ParentJson ? ParentJson.Data : null, JsonDetail.CommonData, row, 'auditData2')
-        console.log(this.auditData2)
         this.otherData2 = []
         if (row.IsSign) {
           // 签名信息

From 425782e015443268a90459028b82a520d640e22e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 13:43:43 +0800
Subject: [PATCH 298/374] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=8F=8A=E8=B7=AF=E7=94=B1=E8=B7=B3=E8=BD=AC?=
 =?UTF-8?q?=E6=9F=A5=E7=9C=8Bbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                             |  4 ++
 .../trial-summary/audit-record/index.vue      | 42 ++++++++++++-------
 2 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 3086972f..5a09cd1e 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -21,6 +21,7 @@ router.beforeEach(async(to, from, next) => {
   const hasToken = getToken()
   Vue.prototype.toPath = to.path
   Vue.prototype.$path = []
+  console.log(11222)
   if (hasToken) {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {
@@ -56,6 +57,9 @@ router.beforeEach(async(to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录whiteList中，直接进入
+      if (to.path === '/readingDicoms'){
+        OSSclient()
+      }
       next()
     } else {
       if (to.path === '/researchForm') {
diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
index 838f6bbf..66ff948e 100644
--- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue
@@ -311,6 +311,7 @@
             border
             style="width: 100%"
             size="small"
+            max-height="400"
           >
           <!-- 字段名 -->
             <el-table-column
@@ -328,10 +329,10 @@
               <template slot-scope="scope">
                  <span>
                   <!-- 查看详情 -->
-                   <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
+                   <a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue"  style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
@@ -357,10 +358,10 @@
               <template slot-scope="scope">
                 <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
                   <!-- 查看详情 -->
-                  <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
+                  <a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
@@ -396,7 +397,7 @@
                 <viewer v-if="item.IsPicture" :images="imagesList" :ref="scope.row[item.ColumnValue]">
                   <!-- 查看图片 -->
                   <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
-                  <img :src="scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                  <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                 </viewer>
                 <span v-else>{{scope.row[item.ColumnValue]}}</span>
               </template>
@@ -415,7 +416,7 @@
                       <span style="color:#409eff;cursor: pointer" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
                         {{$t('trials:auditRecord:title:viewImage')}}
                       </span>
-                      <img :src="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                      <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
                     </viewer>
                     <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
                   </template>
@@ -619,6 +620,7 @@
             border
             style="width: 100%"
             size="small"
+            max-height="400"
           >
           <!-- 字段名 -->
             <el-table-column
@@ -644,10 +646,10 @@
               <template slot-scope="scope">
                  <span>
                   <!-- 查看详情 -->
-                   <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue">
+                   <a v-if="scope.row.DataType === 'OSS' && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.oldValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.oldValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.oldValue && scope.row.oldValue !== '--'" target="_blank" :href="scope.row.oldValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.oldValue && scope.row.oldValue !== '--'" :ref="scope.row.oldValue" :images="imagesList">
@@ -679,10 +681,10 @@
               <template slot-scope="scope">
                 <span :style="{ color: scope.row.newValue !== scope.row.oldValue ? '#f66' : null }">
                   <!-- 查看详情 -->
-                  <a v-if="scope.row.DataType === 'OSS'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue">
+                  <a v-if="scope.row.DataType === 'OSS' && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="OSSclientConfig.basePath + scope.row.newValue" style="color:#409eff;">
                     {{$t('common:button:download')}}
                   </a>
-                  <a v-else-if="scope.row.DataType === 'Link' || scope.row.DataType === 'Router'" target="_blank" :href="scope.row.newValue">
+                  <a v-else-if="(scope.row.DataType === 'Link' || scope.row.DataType === 'Router') && scope.row.newValue && scope.row.newValue !== '--'" target="_blank" :href="scope.row.newValue" style="color:#409eff;">
                     {{$t('trials:auditRecord:title:viewDetail')}}
                   </a>
                    <viewer v-else-if="(scope.row.DataType === 'Image' || scope.row.DataType === 'ImageList') && scope.row.newValue && scope.row.newValue !== '--'" :ref="scope.row.newValue" :images="imagesList">
@@ -725,17 +727,27 @@
                 >
                   <template slot-scope="scope">
                     <!-- 查看图片 -->
-                    <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
+                    <!-- <span v-if="ite.IsPicture" @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">
                       {{$t('trials:auditRecord:title:viewImage')}}
-                    </span>
+                    </span> -->
+                    <viewer v-if="ite.IsPicture && ite.IsPicture !== '--'" :ref="scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" :images="imagesList">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                     <img :src="OSSclientConfig.basePath + scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
                     <span v-else>{{scope.row[ite.ListName ? ite.ListName + ite.ColumnValue + index : ite.ColumnValue]}}</span>
                   </template>
                 </el-table-column>
                 <template v-else slot-scope="scope">
                   <!-- 查看图片 -->
-                  <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
+                  <!-- <span v-if="item.IsPicture" @click="openImage(scope.row[item.ColumnValue])" :key="'ChildrenList' + index">
                     {{$t('trials:auditRecord:title:viewImage')}}
-                  </span>
+                  </span> -->
+                   <viewer v-if="item.IsPicture && item.IsPicture !== '--'" :ref="scope.row[item.ColumnValue]" :images="imagesList" :key="'ChildrenList' + index">
+                    <!-- 查看图片 -->
+                     <span style="color:#409eff;cursor: pointer"  @click="openImage(scope.row[item.ColumnValue])">{{$t('trials:auditRecord:title:viewImage')}}</span>
+                     <img :src="OSSclientConfig.basePath + scope.row[item.ColumnValue]" v-show="false" crossorigin="anonymous" alt="">
+                   </viewer>
                   <span v-else :key="'ChildrenList' + index">{{scope.row[item.ColumnValue]}}</span>
                 </template>
               </template>
@@ -1181,7 +1193,7 @@ export default {
         item.Enum = this.$i18n.locale === 'zh' ? v.ValueCN : v.Value
         this[auditData].push(item)
       })
-      console.log(this[auditData])
+      console.log(this[auditData],this.tableListData,this.tableList)
     },
     getJSON(row) {
       return new Promise(resolve => {

From 3a69256a040d136db14faa35b9522812cdc8366c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 13:58:11 +0800
Subject: [PATCH 299/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BC=98=E5=8C=96=EF=BC=9A=E6=98=BE=E8=91=97?=
 =?UTF-8?q?=E5=A2=9E=E5=A4=A7=E5=92=8C=E9=83=A8=E5=88=86=E7=BC=93=E8=A7=A3?=
 =?UTF-8?q?=E5=9D=87=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=BD=93=E5=89=8D=E5=9E=82?=
 =?UTF-8?q?=E7=9B=B4=E5=BE=84>130=20mm=E7=9A=84=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/permission.js b/src/permission.js
index 5a09cd1e..8efb10f3 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -21,7 +21,6 @@ router.beforeEach(async(to, from, next) => {
   const hasToken = getToken()
   Vue.prototype.toPath = to.path
   Vue.prototype.$path = []
-  console.log(11222)
   if (hasToken) {
     if (to.path === '/login' || to.path === '/recompose' || to.path === '/email-recompose' || to.path === '/error' || to.path === '/ReviewersResearchForm' || to.path === '/ReviewersResearch') {
       if (to.path === '/ReviewersResearch') {

From e7d799ceb5b8dcedc89e5f11b9fa4d364afa65f2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 13:59:00 +0800
Subject: [PATCH 300/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Questions.vue    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 1d1e2940..a1d5bd0d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -703,10 +703,11 @@ export default {
             // 当前访视的垂直径≤130mm
             // 系统默认脾脏状态为“正常”
             status = '1'
-          } else if (this.spleenInfo.BaseLineSpleenLength > 130 && diffFromBaseline >= 10 && percentFormBaseline > 50) {
+          } else if (this.spleenInfo.BaseLineSpleenLength > 130 && diffFromBaseline >= 10 && percentFormBaseline > 50 && length > 130) {
             // 1、基线 垂直径>130 mm
             // 2、与基线相比脾垂直径变化值≥10 mm
             // 3、与基线相比脾肿大增加的百分比>50％
+            // 4、当前垂直径>130 mm
             // 系统默认脾脏状态为“显著增大”
             status = '4'
           } else if (this.spleenInfo.BaseLineSpleenLength <= 130 && diffFromBaseline >= 20 && length > 130) {
@@ -722,9 +723,10 @@ export default {
             // 4、当前垂直径>130 mm
             // 系统默认脾脏状态为“显著增大”
             status = '4'
-          } else if (this.spleenInfo.BaseLineState === '6' && percentFormBaseline < -50) {
+          } else if (this.spleenInfo.BaseLineState === '6' && percentFormBaseline < -50 && length > 130) {
             // 1、基线期 状态为“肿大”
             // 2、与基线相比脾肿大增加的百分比小于-50％
+            // 3、当前垂直径>130 mm
             // 系统默认脾脏状态为“部分缓解”
             status = '2'
           } else {

From 790e828257ed4b59bde5c56b8cecb1dc946e0623 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 14:02:28 +0800
Subject: [PATCH 301/374] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E7=AA=97=E5=AD=97?=
 =?UTF-8?q?=E4=BD=93=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/ChatForm.vue           | 2 +-
 .../trials/trials-panel/visit/qc-check/components/chatForm.vue  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 176d1e99..2c7c203a 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -41,7 +41,7 @@
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
-                    <span style="color:rgb(255,255,0)">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
+                    <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
                 </div>
                 <div style="margin-top:10px;">
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
index b5f75be6..37bca56a 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
@@ -173,7 +173,7 @@ export default {
                         <p>
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
-                        <p style='color:rgb(255,255,0)'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
+                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
       const userId = zzSessionStorage.getItem('userId')
       recordContent.push(
         {

From 33e836cd815ce7bffd88fc8c9b7f59e45c336912 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 14:44:56 +0800
Subject: [PATCH 302/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E5=A4=87=E6=B3=A8=E6=98=BE=E9=9A=90bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/reading/dicoms/components/Questions.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index a1d5bd0d..cb0816d7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -164,7 +164,7 @@ export default {
             }
             this.measurements.push(i)
           })
-          if (!this.isBaseLineTask && isChangeVisitTask) {
+          if (isChangeVisitTask) {
             const { Result } = await getSplenicVerify(visitTaskId)
             this.spleenInfo = Result
           }

From b4f58fddb7eba0a61807bd04451f6977929616a7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 15:20:03 +0800
Subject: [PATCH 303/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E4=B8=8D=E9=87=8D=E6=96=B0=E8=8E=B7=E5=8F=96=E6=A0=87=E6=B3=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestions.vue         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 2bcc5ff6..6c6b8c28 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -829,7 +829,7 @@ export default {
     async close(questionsObj) {
       if (questionsObj) {
         this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
-        FusionEvent.$emit('getAnnotations')
+        // FusionEvent.$emit('getAnnotations')
         FusionEvent.$emit('refreshQuestions')
       }
       this.activeItem.activeRowIndex = null

From 06761092e3eea2a4cc24403c7165fa50b6b9ce74 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 16:56:57 +0800
Subject: [PATCH 304/374] =?UTF-8?q?PET=205PS=E8=AF=84=E5=88=86=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E8=AE=A1=E7=AE=97=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 23 +++++++++---------
 .../components/Fusion/TableQuestions.vue      | 24 -------------------
 2 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index eb0e8767..be54c48b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -545,6 +545,16 @@ export default {
       this.questionForm[obj.key] = obj.val
       if (obj.key === this.pet5PSId) {
         this.setPet5PSCommentDisplay()
+        // 自动计算与基线相比摄取值变化
+        if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
+          // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
+          // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
+          if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
+            this.questionForm[this.uptakeFromBaselineId] = '1'
+          } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
+            this.questionForm[this.uptakeFromBaselineId] = '2'
+          }
+        }
       }
     },
     setPet5PSCommentDisplay() {
@@ -563,17 +573,6 @@ export default {
           }
         }
       }
-      // 自动计算与基线相比摄取值变化
-      if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
-        // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
-        // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
-        if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
-          this.questionForm[this.uptakeFromBaselineId] = '1'
-        } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
-          this.questionForm[this.uptakeFromBaselineId] = '2'
-        }
-        // this.questionForm[this.uptakeFromBaselineId] = this.questionForm[this.pet5PSId] > this.baseLinePET5PS ? '1' : this.questionForm[this.pet5PSId] < this.baseLinePET5PS ? '2' : ''
-      }
     },
     setpet5PS() {
       console.log('setpet5PS')
@@ -623,7 +622,7 @@ export default {
             this.setSuvChild(v.Childrens)
           }
           var pet5PS = this.setpet5PS()
-          this.questionForm[this.pet5PSId] = pet5PS
+          // this.questionForm[this.pet5PSId] = pet5PS
           this.calculatePet5PS = pet5PS
           this.setPet5PSCommentDisplay()
           this.questionFormChangeState = true
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 6c6b8c28..91104b60 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -193,30 +193,6 @@ export default {
         this.loading = false
       }).catch(() => { this.loading = false })
     },
-    async initList1() {
-      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
-      if (i > -1) {
-        this.visitTaskId = this.visitTaskList[i].VisitTaskId
-        this.taskBlindName = this.visitTaskList[i].TaskBlindName
-        this.readingTaskState = this.visitTaskList[i].ReadingTaskState
-        this.isBaseLineTask = this.visitTaskList[i].IsBaseLineTask
-        this.isCurrentTask = this.visitTaskList[i].IsCurrentTask
-        this.activeName = ''
-        this.activeItem.activeRowIndex = null
-        this.activeItem.activeCollapseId = null
-        this.questions = this.visitTaskList[i].ReadingQuestions
-        this.$nextTick(() => {
-          this.getTableQuestions()
-          this.tableQuestions.forEach(item => {
-            item.TableQuestions.Answers.forEach(i => {
-              var refName = `${item.Id}_${i.RowIndex}`
-              this.$refs[refName] && this.$refs[refName][0].initForm()
-            })
-          })
-        })
-      }
-    },
-
     getQuestions(questions, isRerender) {
       questions.forEach(item => {
         if (item.Type === 'table' && item.TableQuestions && item.TableQuestions.Answers.length > 0) {

From 62dd650447d7e226d7a48ce5f04a5fee724fb151 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 17:24:51 +0800
Subject: [PATCH 305/374] =?UTF-8?q?=E5=BD=93=E7=BA=B5=E9=9A=94=E6=88=96?=
 =?UTF-8?q?=E8=82=9D=E8=84=8F=E8=A1=80=E6=B1=A0suvmax=E6=9C=AA=E5=8F=91?=
 =?UTF-8?q?=E7=94=9F=E6=94=B9=E5=8F=98=E6=97=B6=E4=B8=8D=E8=AE=A1=E7=AE=97?=
 =?UTF-8?q?PET=205PS=E8=AF=84=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/PetCt.vue      |  2 +-
 .../reading/dicoms/components/Fusion/Questions.vue  | 13 ++++++++-----
 .../dicoms/components/Fusion/TableQuestionItem.vue  |  3 ++-
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 8dea8a6d..dd7c24a3 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -776,7 +776,7 @@ export default {
         // }
       }, 120)
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_MODIFIED, (e) => {
-        console.log('ANNOTATION_MODIFIED')
+        // console.log('ANNOTATION_MODIFIED')
         debouncedCallback(e)
       })
       eventTarget.addEventListener(cornerstoneTools.Enums.Events.ANNOTATION_SELECTION_CHANGE, (e) => {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index be54c48b..e9aa831d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -454,11 +454,14 @@ export default {
         }
         if (measurement.type === 'CircleROI') {
           const suvMax = measurement.suvMax
-          this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-          var pet5PS = this.setpet5PS()
-          this.questionForm[this.pet5PSId] = pet5PS
-          this.calculatePet5PS = pet5PS
-          this.setPet5PSCommentDisplay()
+          
+          if(this.questionForm[obj.QuestionId] !== suvMax){
+            var pet5PS = this.setpet5PS()
+            this.questionForm[this.pet5PSId] = pet5PS
+            this.calculatePet5PS = pet5PS
+            this.setPet5PSCommentDisplay()
+            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
+          }
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index d23dc4c2..111993b8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -624,7 +624,8 @@ export default {
                   }
                 }
               }
-              if (this.firstRenderAnnotation) {
+              var lesionState = this.getQuestionVal(7)
+              if (this.firstRenderAnnotation && !isNaN(parseInt(lesionState))) {
                 this.$set(this.questionForm, 'saveTypeEnum', 2)
               } else {
                 this.$set(this.questionForm, 'saveTypeEnum', 1)

From 4ca0f35cadb9e89095cca46f8d37685424212124 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 12 Apr 2024 17:30:45 +0800
Subject: [PATCH 306/374] =?UTF-8?q?=E8=9E=8D=E5=90=88=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=8A=B6=E6=80=81=E5=8E=BB=E9=99=A4=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E4=BF=A1=E6=81=AF=E4=B8=8D=E5=AE=8C=E6=95=B4=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 111993b8..667b2b1d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -318,7 +318,7 @@ export default {
       var lesionState = this.getQuestionVal(7)
       if (!isRerender) {
         if (this.questionForm.RowId) {
-          this.$set(this.questionForm, 'saveTypeEnum', isNaN(parseInt(lesionState)) ? 1 : 2)
+          this.$set(this.questionForm, 'saveTypeEnum', 2)
         } else {
           this.$set(this.questionForm, 'saveTypeEnum', 0)
         }
@@ -625,7 +625,7 @@ export default {
                 }
               }
               var lesionState = this.getQuestionVal(7)
-              if (this.firstRenderAnnotation && !isNaN(parseInt(lesionState))) {
+              if (this.firstRenderAnnotation) {
                 this.$set(this.questionForm, 'saveTypeEnum', 2)
               } else {
                 this.$set(this.questionForm, 'saveTypeEnum', 1)

From c02ce4b3507ce876958bd9e19ca897ad760cd8fa Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 12 Apr 2024 17:45:42 +0800
Subject: [PATCH 307/374] =?UTF-8?q?PET-CT=E4=B8=B4=E5=BA=8A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=9A=84=E4=B8=8A=E4=BC=A0=E4=B8=8E=E4=B8=B4=E5=BA=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=87=87=E9=9B=86Tab=E7=9A=84=E7=9A=84?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=85=B3=E7=B3=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../crc-upload/components/previousFiles.vue   |  136 +-
 .../components/uploadDicomFiles2.vue          | 2227 ++++++++++-------
 .../components/uploadPetClinicalData.vue      |  723 ++++++
 .../trials-panel/visit/crc-upload/index.vue   |    8 +-
 .../qc-check/components/qualityAssurance.vue  | 1879 +++++++++-----
 .../trials-panel/visit/qc-check/index.vue     |    4 +-
 6 files changed, 3342 insertions(+), 1635 deletions(-)
 create mode 100644 src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
index 1a865863..190daa75 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/previousFiles.vue
@@ -1,21 +1,34 @@
 <template>
   <div class="previous-files-wrapper">
-
     <!-- 多文件上传 -->
     <form id="inputForm" ref="uploadForm">
       <!-- 必须是PDF格式 -->
-<!--      <el-divider content-position="left">{{ $t('trials:attachment:message:pdf') }}</el-divider>-->
+      <!--      <el-divider content-position="left">{{ $t('trials:attachment:message:pdf') }}</el-divider>-->
       <div class="form-group">
-        <div id="directoryInputWrapper" class="btn btn-link" style="position: relative;overflow: hidden;display: inline-block;">
-          <el-button size="small">{{ $t('trials:uploadClinicalData:button:selectFile') }}</el-button>
+        <div
+          id="directoryInputWrapper"
+          class="btn btn-link"
+          style="position: relative; overflow: hidden; display: inline-block"
+        >
+          <el-button size="small">{{
+            $t("trials:uploadClinicalData:button:selectFile")
+          }}</el-button>
           <input
             type="file"
             name="file"
             multiple
-            style="position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0;cursor: pointer;"
+            style="
+              position: absolute;
+              top: 0;
+              left: 0;
+              width: 100%;
+              height: 100%;
+              opacity: 0;
+              cursor: pointer;
+            "
             :accept="faccept.join(',')"
             @change="beginScanFiles($event)"
-          >
+          />
           <!-- <span>共扫描了，符合要求的有</span> -->
         </div>
       </div>
@@ -28,17 +41,14 @@
       height="300"
       @selection-change="handleSelectionChange"
     >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+      <el-table-column type="selection" width="55" />
       <el-table-column
         prop="name"
         :label="$t('trials:uploadClinicalData:table:fileName')"
         min-width="180"
       />
     </el-table>
-    <div style="text-align:right;padding: 10px 0px">
+    <div style="text-align: right; padding: 10px 0px">
       <!-- 上传 -->
       <el-button
         size="small"
@@ -47,66 +57,93 @@
         :loading="btnLoading"
         @click="handleUploadFile"
       >
-        {{ $t('trials:uploadClinicalData:button:uploadFile') }}
+        {{ $t("trials:uploadClinicalData:button:uploadFile") }}
       </el-button>
     </div>
   </div>
 </template>
 <script>
 // import { uploadVisitClinicalData } from '@/api/trials'
-import { addOrUpdateReadingClinicalData, uploadClinicalData } from '@/api/trials'
+import {
+  addOrUpdateReadingClinicalData,
+  uploadClinicalData,
+} from "@/api/trials";
 export default {
   props: {
     data: {
       type: Object,
-      default() { return {} }
+      default() {
+        return {};
+      },
     },
     subjectVisitId: {
       type: String,
-      required: true
-    }
+      required: true,
+    },
+    studyData: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
   },
   data() {
     return {
       fileList: [],
       btnLoading: false,
       // faccept: ['.pdf', '.png', 'jpg', 'jpeg'],
-      faccept: ['.pdf'],
+      faccept: [".pdf"],
       trialId: this.$route.query.trialId,
       selectArr: [],
-      addFileList: []
-    }
+      addFileList: [],
+    };
   },
   methods: {
     beginScanFiles(e) {
-      var files = e.target.files
+      var files = e.target.files;
       for (var i = 0; i < files.length; ++i) {
-        const fileName = files[i].name
-        var extendName = fileName.substring(fileName.lastIndexOf('.')).toLocaleLowerCase()
+        const fileName = files[i].name;
+        var extendName = fileName
+          .substring(fileName.lastIndexOf("."))
+          .toLocaleLowerCase();
         if (this.faccept.indexOf(extendName) !== -1) {
-          this.fileList.push(files[i])
+          this.fileList.push(files[i]);
         }
       }
+      this.$nextTick(() => {
+        this.handleAllSelect();
+      });
+    },
+    // 表格全选
+    handleAllSelect() {
+      this.$refs.filesTable.toggleAllSelection();
     },
     // 获取待上传文件信息
     handleSelectionChange(selection) {
-      this.selectArr = selection
+      this.selectArr = selection;
     },
 
     async handleUploadFile() {
-      this.btnLoading = true
-      this.addFileList = []
+      this.btnLoading = true;
+      this.addFileList = [];
       for (var i = 0; i < this.selectArr.length; ++i) {
-        const file = await this.fileToBlob(this.selectArr[i])
-        var timestamp = Date.now()
-        const res = await this.OSSclient.put(`/${this.trialId}/ClinicalData/${timestamp}_${this.selectArr[i].name}`, file)
-        this.addFileList.push({ fileName: this.selectArr[i].name, path: this.$getObjectName(res.url), url: this.$getObjectName(res.url) })
+        const file = await this.fileToBlob(this.selectArr[i]);
+        var timestamp = Date.now();
+        const res = await this.OSSclient.put(
+          `/${this.trialId}/ClinicalData/${timestamp}_${this.selectArr[i].name}`,
+          file
+        );
+        this.addFileList.push({
+          fileName: this.selectArr[i].name,
+          path: this.$getObjectName(res.url),
+          url: this.$getObjectName(res.url),
+        });
       }
-      this.saveClinicalData()
-      this.btnLoading = false
+      this.saveClinicalData();
+      this.btnLoading = false;
     },
     saveClinicalData() {
-      this.btnLoading = true
+      this.btnLoading = true;
       var param = {
         id: this.data.Id,
         trialId: this.trialId,
@@ -115,18 +152,25 @@ export default {
         clinicalDataTrialSetId: this.data.ClinicalDataTrialSetId,
         isVisit: true,
         deleteFileIds: [],
-        addFileList: this.addFileList
+        addFileList: this.addFileList,
+      };
+      if (this.studyData.StudyId) {
+        param.StudyId = this.studyData.StudyId;
       }
-      addOrUpdateReadingClinicalData(param).then(response => {
-        this.btnLoading = false
-        // 刷新文件列表并关闭弹窗
-        this.$emit('closeUpDialog')
-        this.$emit('refresh')
-        this.$message.success(this.$t('trials:uploadClinicalData:message:uploadSuccessfully'))
-      }).catch(() => {
-        this.btnLoading = false
-      })
-    }
-  }
-}
+      addOrUpdateReadingClinicalData(param)
+        .then((response) => {
+          this.btnLoading = false;
+          // 刷新文件列表并关闭弹窗
+          this.$emit("closeUpDialog");
+          this.$emit("refresh");
+          this.$message.success(
+            this.$t("trials:uploadClinicalData:message:uploadSuccessfully")
+          );
+        })
+        .catch(() => {
+          this.btnLoading = false;
+        });
+    },
+  },
+};
 </script>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 854f06da..180c5a55 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -1,8 +1,10 @@
 <template>
   <div class="upload-dicom-files-wrapper">
     <!-- 已上传的dicom影像记录 -->
-    <el-divider content-position="left">{{$t('trials:uploadedDicoms:title:dicomUploaded')}}</el-divider>
-    <div class="functions" style="text-align:right">
+    <el-divider content-position="left">{{
+      $t("trials:uploadedDicoms:title:dicomUploaded")
+    }}</el-divider>
+    <div class="functions" style="text-align: right">
       <!-- //批量删除已上传的影像 -->
       <el-button
         :disabled="deleteArr.length === 0"
@@ -11,7 +13,7 @@
         icon="el-icon-delete"
         @click="handleBatchDelete"
       >
-        {{ $t('trials:uploadedDicoms:action:delete') }}
+        {{ $t("trials:uploadedDicoms:action:delete") }}
       </el-button>
       <!-- 预览 -->
       <el-button
@@ -21,7 +23,7 @@
         :disabled="studyList.length === 0"
         @click="handlePreviewAllFiles"
       >
-        {{ $t('trials:uploadedDicoms:action:preview') }}
+        {{ $t("trials:uploadedDicoms:action:preview") }}
       </el-button>
     </div>
     <el-table
@@ -32,10 +34,7 @@
       max-height="250"
       @selection-change="handleUploadedSelectionChange"
     >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
+      <el-table-column type="selection" width="55" />
       <!-- 检查编号 -->
       <el-table-column
         prop="StudyCode"
@@ -44,29 +43,45 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <el-tooltip placement="top" v-if="(() => {
-            var r = false
-            if (scope.row.IsHaveUploadFailed) {
-              uploadQueues.forEach((v) => {
-                if (v.dicomInfo.studyUid === scope.row.StudyInstanceUid && v.uploadState.record && v.uploadState.record.Failed.length){
-                  r = true
+          <el-tooltip
+            placement="top"
+            v-if="
+              (() => {
+                var r = false;
+                if (scope.row.IsHaveUploadFailed) {
+                  uploadQueues.forEach((v) => {
+                    if (
+                      v.dicomInfo.studyUid === scope.row.StudyInstanceUid &&
+                      v.uploadState.record &&
+                      v.uploadState.record.Failed.length
+                    ) {
+                      r = true;
+                    }
+                  });
                 }
-              })
-            }
-            return r
-          })()">
+                return r;
+              })()
+            "
+          >
             <div slot="content">
-              {{ $t('trials:uploadDicomList:table:status4') }}
+              {{ $t("trials:uploadDicomList:table:status4") }}
             </div>
-            <span class="el-icon-warning" style="color: #cbb024;cursor: pointer" v-if="scope.row.IsHaveUploadFailed"></span>
+            <span
+              class="el-icon-warning"
+              style="color: #cbb024; cursor: pointer"
+              v-if="scope.row.IsHaveUploadFailed"
+            ></span>
           </el-tooltip>
-          <el-tooltip placement="top" v-if="scope.row.notClinicaData">
+          <el-tooltip placement="top" v-if="!scope.row.IsCompleteClinicalData">
             <div slot="content">
-              {{ $t('trials:crc-upload:confirm:message') }}
+              {{ $t("trials:crc-upload:confirm:message") }}
             </div>
-            <span class="el-icon-warning" style="color: red;cursor: pointer"></span>
+            <span
+              class="el-icon-warning"
+              style="color: red; cursor: pointer"
+            ></span>
           </el-tooltip>
-          {{scope.row.StudyCode}}
+          {{ scope.row.StudyCode }}
         </template>
       </el-table-column>
       <!-- 检查类型 -->
@@ -87,7 +102,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPartForEdit)}}
+          {{ getBodyPart(scope.row.BodyPartForEdit) }}
         </template>
       </el-table-column>
       <!-- 序列数量 -->
@@ -112,7 +127,11 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD'):'' }}
+          {{
+            scope.row.StudyTime
+              ? moment(scope.row.StudyTime).format("YYYY-MM-DD")
+              : ""
+          }}
         </template>
       </el-table-column>
       <!-- 上传时间 -->
@@ -122,7 +141,11 @@
         min-width="80"
         show-overflow-tooltip
       />
-      <el-table-column :label="$t('common:action:action')" min-width="260" fixed="right">
+      <el-table-column
+        :label="$t('common:action:action')"
+        min-width="260"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <!-- 预览 -->
           <el-button
@@ -132,6 +155,17 @@
             circle
             @click="handleViewStudy(scope.row)"
           />
+          <!-- 上传临床数据 -->
+          <el-button
+            icon="el-icon-upload2"
+            v-if="
+              ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
+              relationInfo.IsHaveStudyClinicalData
+            "
+            :title="$t('trials:workbench:title:UploadClinicalData')"
+            circle
+            @click="handleUploadPetData(scope.row)"
+          />
           <!-- 编辑 -->
           <el-button
             icon="el-icon-edit-outline"
@@ -149,21 +183,31 @@
             circle
             @click="handleDeleteStudy(scope.row)"
           />
-<!--          <el-button-->
-<!--            icon="el-icon-toilet-paper"-->
-<!--            circle-->
-<!--            :title="$t('trials:uploadDicomFiles:button:historical')"-->
-<!--            @click="handleHistorical(scope.row)"-->
-<!--          />-->
+          <!--          <el-button-->
+          <!--            icon="el-icon-toilet-paper"-->
+          <!--            circle-->
+          <!--            :title="$t('trials:uploadDicomFiles:button:historical')"-->
+          <!--            @click="handleHistorical(scope.row)"-->
+          <!--          />-->
         </template>
       </el-table-column>
     </el-table>
     <!-- 多文件上传 -->
     <form id="inputForm" ref="uploadForm" enctype="multipart/form-data">
-      <el-divider content-position="left">{{ $t('trials:uploadedDicoms:title:dicomFilesOnly') }}</el-divider>
+      <el-divider content-position="left">{{
+        $t("trials:uploadedDicoms:title:dicomFilesOnly")
+      }}</el-divider>
       <div class="form-group">
         <div id="directoryInputWrapper" class="btn btn-link file-input">
-          <el-button type="primary" :disabled="btnLoading" :loading="btnLoading" size="small">{{ $t('trials:uploadedDicomsicom:button:selectFolder') }}</el-button>
+          <el-button
+            type="primary"
+            :disabled="btnLoading"
+            :loading="btnLoading"
+            size="small"
+            >{{
+              $t("trials:uploadedDicomsicom:button:selectFolder")
+            }}</el-button
+          >
           <input
             type="file"
             name="file"
@@ -172,7 +216,7 @@
             webkitdirectory
             multiple
             @change="beginScanFiles($event)"
-          >
+          />
         </div>
       </div>
     </form>
@@ -181,7 +225,7 @@
     <el-table
       ref="dicomFilesTable"
       :data="uploadQueues"
-      :row-key="row => row.studyIndex"
+      :row-key="(row) => row.studyIndex"
       class="dicomFiles-table"
       @selection-change="handleSelectionChange"
     >
@@ -190,53 +234,60 @@
         width="55"
         :selectable="handleSelectable"
       />
-      <el-table-column
-        type="index"
-        width="40"
-      />
+      <el-table-column type="index" width="40" />
       <el-table-column min-width="200" show-overflow-tooltip>
         <template slot="header">
           <el-tooltip placement="top">
             <div slot="content">
-              {{ $t('trials:uploadDicomList:table:studyDetail1') }}<br>
-              {{ $t('trials:uploadDicomList:table:studyDetail2') }}<br>
-              {{ $t('trials:uploadedDicoms:table:studyDate') }}
+              {{ $t("trials:uploadDicomList:table:studyDetail1") }}<br />
+              {{ $t("trials:uploadDicomList:table:studyDetail2") }}<br />
+              {{ $t("trials:uploadedDicoms:table:studyDate") }}
             </div>
-            <span>{{ $t('trials:uploadDicomList:table:studyInfo') }}</span>
+            <span>{{ $t("trials:uploadDicomList:table:studyInfo") }}</span>
           </el-tooltip>
         </template>
         <template slot-scope="scope">
-          <div style="line-height:15px;">
+          <div style="line-height: 15px">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight:500;">Acc:</span> {{ scope.row.dicomInfo.accNumber }}</span>
-                <span v-else style="color:#f44336;">N/A</span>
+                <span v-if="scope.row.dicomInfo.accNumber"
+                  ><span style="font-weight: 500">Acc:</span>
+                  {{ scope.row.dicomInfo.accNumber }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
               </div>
-              <div style="display: inline-block;margin-right:2px">
-                <span v-if="scope.row.dicomInfo.modality.length>0"> {{ scope.row.dicomInfo.modality.join('、') }},</span>
-                <span v-else style="color:#f44336;">N/A,</span>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.dicomInfo.modality.length > 0">
+                  {{ scope.row.dicomInfo.modality.join("、") }},</span
+                >
+                <span v-else style="color: #f44336">N/A,</span>
               </div>
-              <div style="display: inline-block;margin-right:2px">
-                <span v-if="scope.row.seriesList.length">{{ scope.row.seriesList.length }} Series,</span>
-                <span v-else style="color:#f44336;">N/A,</span>
+              <div style="display: inline-block; margin-right: 2px">
+                <span v-if="scope.row.seriesList.length"
+                  >{{ scope.row.seriesList.length }} Series,</span
+                >
+                <span v-else style="color: #f44336">N/A,</span>
               </div>
-              <div style="display: inline-block;">
-                <span v-if="scope.row.fileList.length">{{ scope.row.fileList.length }} Instances</span>
-                <span v-else style="color:#f44336;">N/A</span>
+              <div style="display: inline-block">
+                <span v-if="scope.row.fileList.length"
+                  >{{ scope.row.fileList.length }} Instances</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
 
             <div>
-              <div style="display: inline-block;margin-right:2px">
+              <div style="display: inline-block; margin-right: 2px">
                 <span v-if="scope.row.dicomInfo.bodyPart">
                   {{ scope.row.dicomInfo.bodyPart }},
                 </span>
-                <span v-else style="color:#f44336;">N/A, </span>
+                <span v-else style="color: #f44336">N/A, </span>
               </div>
-              <div style="display: inline-block;">
+              <div style="display: inline-block">
                 <span v-if="scope.row.dicomInfo.description">
-                  {{ scope.row.dicomInfo.description }}</span>
-                <span v-else style="color:#f44336;">N/A</span>
+                  {{ scope.row.dicomInfo.description }}</span
+                >
+                <span v-else style="color: #f44336">N/A</span>
               </div>
             </div>
             <div>
@@ -249,44 +300,87 @@
         <template slot="header">
           <el-tooltip placement="top">
             <div slot="content">
-              {{ $t('trials:uploadDicomList:table:pId') }}<br>
-              {{ $t('trials:uploadDicomList:table:patientName') }}<br>
-              {{ $t('trials:uploadDicomList:table:pInfo') }}
+              {{ $t("trials:uploadDicomList:table:pId") }}<br />
+              {{ $t("trials:uploadDicomList:table:patientName") }}<br />
+              {{ $t("trials:uploadDicomList:table:pInfo") }}
             </div>
-            <span>{{ $t('trials:uploadDicomList:table:patientInfo') }}</span>
+            <span>{{ $t("trials:uploadDicomList:table:patientInfo") }}</span>
           </el-tooltip>
         </template>
         <template slot-scope="scope">
-          <div style="line-height:15px;">
+          <div style="line-height: 15px">
             <div>
-              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight:500;">PID: </span>{{ scope.row.dicomInfo.patientId }}</span>
-              <span v-else style="color:#f44336;">N/A</span>
+              <span v-if="scope.row.dicomInfo.patientId"
+                ><span style="font-weight: 500">PID: </span
+                >{{ scope.row.dicomInfo.patientId }}</span
+              >
+              <span v-else style="color: #f44336">N/A</span>
             </div>
             <div>
-              <span :class="[scope.row.dicomInfo.patientName?'':'colorOfRed']">
-                {{ scope.row.dicomInfo.patientName?scope.row.dicomInfo.patientName:'N/A' }}
+              <span
+                :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientName
+                    ? scope.row.dicomInfo.patientName
+                    : "N/A"
+                }}
               </span>
             </div>
             <div>
-              <span :class="[scope.row.dicomInfo.patientSex?'':'colorOfRed']">
-                {{ scope.row.dicomInfo.patientSex?scope.row.dicomInfo.patientSex:'N/A' }},
+              <span
+                :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientSex
+                    ? scope.row.dicomInfo.patientSex
+                    : "N/A"
+                }},
               </span>
 
-              <span :class="[scope.row.dicomInfo.patientAge?'':'colorOfRed']">
-                {{ scope.row.dicomInfo.patientAge?scope.row.dicomInfo.patientAge:'N/A' }},
+              <span
+                :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']"
+              >
+                {{
+                  scope.row.dicomInfo.patientAge
+                    ? scope.row.dicomInfo.patientAge
+                    : "N/A"
+                }},
               </span>
 
-              <span :class="[scope.row.dicomInfo.patientBirthDate?'':'colorOfRed']">
-                {{ scope.row.dicomInfo.patientBirthDate?scope.row.dicomInfo.patientBirthDate:'N/A' }}
+              <span
+                :class="[
+                  scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed',
+                ]"
+              >
+                {{
+                  scope.row.dicomInfo.patientBirthDate
+                    ? scope.row.dicomInfo.patientBirthDate
+                    : "N/A"
+                }}
               </span>
             </div>
           </div>
         </template>
       </el-table-column>
-      <el-table-column :label="$t('trials:uploadDicomList:table:failedFileCount')" min-width="120" show-overflow-tooltip>
+      <el-table-column
+        :label="$t('trials:uploadDicomList:table:failedFileCount')"
+        min-width="120"
+        show-overflow-tooltip
+      >
         <template slot-scope="scope">
-          <el-progress color="#409eff" :percentage="scope.row.dicomInfo.failedFileCount * 100 / scope.row.dicomInfo.fileCount" :show-text="false" />
-          <span>{{ scope.row.dicomInfo.failedFileCount }} / {{scope.row.dicomInfo.fileCount}}</span>
+          <el-progress
+            color="#409eff"
+            :percentage="
+              (scope.row.dicomInfo.failedFileCount * 100) /
+              scope.row.dicomInfo.fileCount
+            "
+            :show-text="false"
+          />
+          <span
+            >{{ scope.row.dicomInfo.failedFileCount }} /
+            {{ scope.row.dicomInfo.fileCount }}</span
+          >
         </template>
       </el-table-column>
 
@@ -296,13 +390,50 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          <span v-if="!scope.row.dicomInfo.failedFileCount && !scope.row.dicomInfo.isInit">
-            {{$t('trials:uploadDicomList:table:status1')}}</span>
-          <span style="color:#409eff" v-else-if="!scope.row.dicomInfo.failedFileCount && scope.row.dicomInfo.isInit && btnLoading">{{$t('trials:uploadDicomList:table:status2')}}</span>
-          <span style="color:#409eff" v-else-if="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record">{{$t('trials:uploadDicomList:table:status2')}}</span>
-          <span style="color:#2cc368" v-else-if="scope.row.dicomInfo.failedFileCount === scope.row.dicomInfo.fileCount">{{$t('trials:uploadDicomList:table:status3')}}</span>
-          <span style="color:#f66" v-else-if="scope.row.uploadState.record && scope.row.uploadState.record.fileCount === 0">{{$t('trials:uploadDicomList:table:status5')}}</span>
-          <span style="color:#f66" v-else >{{ $t('trials:uploadDicomList:table:Failed') }}</span>
+          <span
+            v-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              !scope.row.dicomInfo.isInit
+            "
+          >
+            {{ $t("trials:uploadDicomList:table:status1") }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              !scope.row.dicomInfo.failedFileCount &&
+              scope.row.dicomInfo.isInit &&
+              btnLoading
+            "
+            >{{ $t("trials:uploadDicomList:table:status2") }}</span
+          >
+          <span
+            style="color: #409eff"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount && !scope.row.uploadState.record
+            "
+            >{{ $t("trials:uploadDicomList:table:status2") }}</span
+          >
+          <span
+            style="color: #2cc368"
+            v-else-if="
+              scope.row.dicomInfo.failedFileCount ===
+              scope.row.dicomInfo.fileCount
+            "
+            >{{ $t("trials:uploadDicomList:table:status3") }}</span
+          >
+          <span
+            style="color: #f66"
+            v-else-if="
+              scope.row.uploadState.record &&
+              scope.row.uploadState.record.fileCount === 0
+            "
+            >{{ $t("trials:uploadDicomList:table:status5") }}</span
+          >
+          <span style="color: #f66" v-else>{{
+            $t("trials:uploadDicomList:table:Failed")
+          }}</span>
         </template>
       </el-table-column>
       <el-table-column
@@ -313,49 +444,76 @@
         <template slot-scope="scope">
           <el-tooltip placement="top" v-if="scope.row.uploadState.record">
             <div slot="content">
-              <div style="max-height: 500px;overflow-y: auto">
-                {{$t('trials:uploadDicomList:table:Existed')}}:
+              <div style="max-height: 500px; overflow-y: auto">
+                {{ $t("trials:uploadDicomList:table:Existed") }}:
                 <div v-if="scope.row.uploadState.record.Existed.length">
-                  <div v-for="item of scope.row.uploadState.record.Existed" :key="item" style="font-size: 12px;color:#baa72a">{{item}}</div>
+                  <div
+                    v-for="item of scope.row.uploadState.record.Existed"
+                    :key="item"
+                    style="font-size: 12px; color: #baa72a"
+                  >
+                    {{ item }}
+                  </div>
                 </div>
-                <div v-else>
-                  &nbsp;
-                </div>
-                {{$t('trials:uploadDicomList:table:Uploaded')}}:
+                <div v-else>&nbsp;</div>
+                {{ $t("trials:uploadDicomList:table:Uploaded") }}:
                 <div v-if="scope.row.uploadState.record.Uploaded.length">
-                  <div v-for="item of scope.row.uploadState.record.Uploaded" :key="item" style="font-size: 12px;color:#24b837">{{item}}</div>
+                  <div
+                    v-for="item of scope.row.uploadState.record.Uploaded"
+                    :key="item"
+                    style="font-size: 12px; color: #24b837"
+                  >
+                    {{ item }}
+                  </div>
                 </div>
-                <div v-else>
-                  &nbsp;
-                </div>
-                <br>
-                {{$t('trials:uploadDicomList:table:Failed')}}:
+                <div v-else>&nbsp;</div>
+                <br />
+                {{ $t("trials:uploadDicomList:table:Failed") }}:
                 <div v-if="scope.row.uploadState.record.Failed.length">
-                  <div v-for="item of scope.row.uploadState.record.Failed" :key="item" style="font-size: 12px;color:#f66">{{item}}</div>
-                </div>
-                <div v-else>
-                  &nbsp;
+                  <div
+                    v-for="item of scope.row.uploadState.record.Failed"
+                    :key="item"
+                    style="font-size: 12px; color: #f66"
+                  >
+                    {{ item }}
+                  </div>
                 </div>
+                <div v-else>&nbsp;</div>
               </div>
             </div>
             <el-button size="mini" style="cursor: pointer">
-              <span style="font-size: 12px;color:#baa72a">{{ scope.row.uploadState.record.Existed.length }}</span>
+              <span style="font-size: 12px; color: #baa72a">{{
+                scope.row.uploadState.record.Existed.length
+              }}</span>
               /
-              <span style="font-size: 12px;color:#24b837">{{ scope.row.uploadState.record.Uploaded.length }}</span>
+              <span style="font-size: 12px; color: #24b837">{{
+                scope.row.uploadState.record.Uploaded.length
+              }}</span>
               /
-              <span style="font-size: 12px;color:#f66">{{ scope.row.uploadState.record.Failed.length }}</span>
+              <span style="font-size: 12px; color: #f66">{{
+                scope.row.uploadState.record.Failed.length
+              }}</span>
             </el-button>
           </el-tooltip>
         </template>
       </el-table-column>
-      <el-table-column v-show="isScan" :label="$t('common:action:action')" width="200">
+      <el-table-column
+        v-show="isScan"
+        :label="$t('common:action:action')"
+        width="200"
+      >
         <template slot-scope="scope">
           <!-- 预览 -->
-<!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
+          <!--          :disabled="scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && scope.row.dicomInfo.failedFileCount !== 0"-->
           <el-button
             icon="el-icon-view"
             circle
-            :disabled="scope.row.uploadState.stateCode !== '' && (scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record)"
+            :disabled="
+              scope.row.uploadState.stateCode !== '' &&
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount &&
+              !scope.row.uploadState.record
+            "
             :title="$t('trials:uploadedDicoms:action:preview')"
             size="small"
             @click="handlePreview(scope.row.dicomInfo.studyUid)"
@@ -366,13 +524,18 @@
             circle
             :title="$t('trials:uploadedDicoms:action:delete')"
             size="small"
-            :disabled="scope.row.uploadState.stateCode !== '' && (scope.row.dicomInfo.failedFileCount < scope.row.dicomInfo.fileCount && !scope.row.uploadState.record)"
+            :disabled="
+              scope.row.uploadState.stateCode !== '' &&
+              scope.row.dicomInfo.failedFileCount <
+                scope.row.dicomInfo.fileCount &&
+              !scope.row.uploadState.record
+            "
             @click="handleDelete(scope.$index, scope.row)"
           />
         </template>
       </el-table-column>
     </el-table>
-    <div style="text-align:right;padding: 10px 0px">
+    <div style="text-align: right; padding: 10px 0px">
       <!-- 关闭 -->
       <!-- <el-button :disabled="btnLoading" size="small" type="primary" @click="cancel">
         {{ $t('trials:uploadDicomList:button:close') }}
@@ -385,7 +548,7 @@
         :loading="btnLoading"
         @click="beginUploadQueues"
       >
-        {{ $t('trials:uploadDicomList:button:upload') }}
+        {{ $t("trials:uploadDicomList:button:upload") }}
       </el-button>
     </div>
 
@@ -399,7 +562,21 @@
     >
       <DicomPreview :uid="uid" />
     </el-dialog>
-
+    <!--pet-ct临床数据上传-->
+    <el-dialog
+      v-if="petVisible"
+      :show-close="true"
+      :visible.sync="petVisible"
+      append-to-body
+    >
+      <uploadPetClinicalData
+        :subject-visit-id="data.Id"
+        :data="data"
+        :studyData="studyData"
+        :allow-add-or-edit="true"
+        @getStudyInfo="getStudyInfo"
+      />
+    </el-dialog>
     <!-- 校验警告信息模态框 -->
     <el-dialog
       v-if="warning_cfg.visible"
@@ -410,14 +587,18 @@
       title="Warning"
       custom-class="warning-dialog"
     >
-      <div style="border:1px solid #e0e0e0;padding:10px;">
+      <div style="border: 1px solid #e0e0e0; padding: 10px">
         <!-- Information from DICOM headers not consistent with that of this subject -->
-        <div style="color: red;font-size:14px;margin-bottom:10px;">
-          {{ $t('trials:uploadDicomList:message:informationConsistent') }}:
+        <div style="color: red; font-size: 14px; margin-bottom: 10px">
+          {{ $t("trials:uploadDicomList:message:informationConsistent") }}:
         </div>
-        <div v-for="(item,i) in warningArr" :key="item.index">
-          <div>{{ `(${i+1}). ACC: ${item.accNumber}` }}</div>
-          <div v-for="(warning,index) in item.warnings" :key="index" style="margin:10px 0px;font-size:13px;">
+        <div v-for="(item, i) in warningArr" :key="item.index">
+          <div>{{ `(${i + 1}). ACC: ${item.accNumber}` }}</div>
+          <div
+            v-for="(warning, index) in item.warnings"
+            :key="index"
+            style="margin: 10px 0px; font-size: 13px"
+          >
             <ul>
               <li>{{ warning }}</li>
             </ul>
@@ -426,10 +607,10 @@
       </div>
       <div slot="footer" class="base-modal-footer">
         <el-button size="small" type="primary" @click="handleCancelWarnVisible">
-          {{ $t('common:button:cancel') }}
+          {{ $t("common:button:cancel") }}
         </el-button>
         <el-button size="small" type="primary" @click="handleContinueUpload">
-          {{ $t('trials:uploadDicomList:button:upload') }}
+          {{ $t("trials:uploadDicomList:button:upload") }}
         </el-button>
       </div>
     </el-dialog>
@@ -442,14 +623,24 @@
       custom-class="base-dialog-wrapper"
       width="600px"
     >
-      <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
+      <div
+        style="
+          padding: 10px;
+          border: 1px solid #e0e0e0;
+          max-height: 650px;
+          overflow-y: auto;
+        "
+      >
         <el-form ref="studyForm" :model="studyForm" label-width="100px">
           <!-- 检查编号 -->
           <el-form-item :label="$t('trials:audit:table:studyId')">
             <el-input v-model="studyForm.StudyCode" disabled />
           </el-form-item>
           <!-- 检查类型 -->
-          <el-form-item v-if="studyForm.IsDicomData" :label="$t('trials:audit:table:modality')">
+          <el-form-item
+            v-if="studyForm.IsDicomData"
+            :label="$t('trials:audit:table:modality')"
+          >
             <el-input v-model="studyForm.Modalities" disabled />
           </el-form-item>
           <!-- 检查类型 -->
@@ -458,11 +649,21 @@
             :label="$t('trials:audit:table:modality')"
             prop="Modalities"
             :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-              ]"
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
+            ]"
           >
             <el-radio-group v-model="studyForm.Modality">
-              <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m" style="margin-bottom: 15px;" />
+              <el-radio
+                v-for="m in trialModalitys"
+                v-show="m !== ''"
+                :key="m"
+                :label="m"
+                style="margin-bottom: 15px"
+              />
             </el-radio-group>
           </el-form-item>
           <!-- 检查部位 -->
@@ -470,11 +671,20 @@
             :label="$t('trials:audit:table:bodyPart')"
             prop="BodyPartForEdit"
             :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-              ]"
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
+            ]"
           >
             <el-checkbox-group v-model="studyForm.BodyPartForEdit">
-              <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{$fd('Bodypart',bodyPart)}}</el-checkbox>
+              <el-checkbox
+                v-for="bodyPart in trialBodyPartTypes"
+                :key="bodyPart"
+                :label="bodyPart"
+                >{{ $fd("Bodypart", bodyPart) }}</el-checkbox
+              >
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -482,7 +692,10 @@
             <el-input v-model="studyForm.SeriesCount" disabled />
           </el-form-item>
           <!-- 图像数量 -->
-          <el-form-item v-if="studyForm.InstanceCount" :label="$t('trials:audit:table:instanceCount')">
+          <el-form-item
+            v-if="studyForm.InstanceCount"
+            :label="$t('trials:audit:table:instanceCount')"
+          >
             <el-input v-model="studyForm.InstanceCount" disabled />
           </el-form-item>
           <!-- 检查日期 -->
@@ -493,76 +706,98 @@
               type="date"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="editStudyInfoVisible = false">
-          {{ $t('common:button:cancel') }}
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="editStudyInfoVisible = false"
+        >
+          {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button :loading="btnLoading" size="small" type="primary" @click="handleUpdateStudyInfo">
-          {{ $t('common:button:save') }}
+        <el-button
+          :loading="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleUpdateStudyInfo"
+        >
+          {{ $t("common:button:save") }}
         </el-button>
       </div>
     </el-dialog>
   </div>
-
 </template>
 <script>
 import {
-  dicomUploadInProgress, batchVerifyStudyAllowUpload, getSubjectVisitUploadedStudyList, deleteStudyList, updateModality, preArchiveDicomStudy, addOrUpdateArchiveStudy,getCRCClinicalData
-} from '@/api/trials'
-import store from '@/store'
-import * as dicomParser from 'dicom-parser'
-import * as cornerstone from 'cornerstone-core'
-import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-cornerstoneWADOImageLoader.external.dicomParser = dicomParser
-cornerstoneWADOImageLoader.external.cornerstone = cornerstone
-import * as signalR from '@microsoft/signalr'
-import DicomPreview from '@/views/dicom-show/dicom-preview'
-import dicomStore from '@/utils/dicom-store'
-import { getToken } from '@/utils/auth'
-import {dcmUpload} from '@/utils/dcmUpload/dcmUpload'
-import { convertBytes } from '@/utils/dicom-character-set';
-import moment from 'moment'
+  dicomUploadInProgress,
+  batchVerifyStudyAllowUpload,
+  getSubjectVisitUploadedStudyList,
+  deleteStudyList,
+  updateModality,
+  preArchiveDicomStudy,
+  addOrUpdateArchiveStudy,
+  getCRCClinicalData,
+} from "@/api/trials";
+import * as dicomParser from "dicom-parser";
+import * as cornerstone from "cornerstone-core";
+import * as cornerstoneWADOImageLoader from "cornerstone-wado-image-loader";
+cornerstoneWADOImageLoader.external.dicomParser = dicomParser;
+cornerstoneWADOImageLoader.external.cornerstone = cornerstone;
+import DicomPreview from "@/views/dicom-show/dicom-preview";
+import uploadPetClinicalData from "./uploadPetClinicalData.vue";
+import dicomStore from "@/utils/dicom-store";
+import { getToken } from "@/utils/auth";
+import { dcmUpload } from "@/utils/dcmUpload/dcmUpload";
+import { convertBytes } from "@/utils/dicom-character-set";
+import moment from "moment";
 export default {
-  name: 'UploadDicomFiles',
-  components: { DicomPreview },
+  name: "UploadDicomFiles",
+  components: { DicomPreview, uploadPetClinicalData },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     subjectVisitId: {
       type: String,
-      required: true
+      required: true,
     },
     subjectId: {
       type: String,
-      required: true
+      required: true,
+    },
+    activeName: {
+      type: String,
+      required: true,
     },
-    activeName:{
-       type: String,
-      required: true
-    }
   },
   data() {
     return {
       editStudyInfoVisible: false,
-      studyForm: { StudyCode: '', IsDicomData: true, Modalities: '', BodyPartForEdit: [], SeriesCount: null, StudyTime: '' },
+      studyForm: {
+        StudyCode: "",
+        IsDicomData: true,
+        Modalities: "",
+        BodyPartForEdit: [],
+        SeriesCount: null,
+        StudyTime: "",
+      },
       uploadQueues: dicomStore.studyList, // 上传队列
       selectArr: [], // 已勾选待上传文件
-      scanState: '', // 当前上传队列上传状态
+      scanState: "", // 当前上传队列上传状态
       form: {
-        SiteName: '',
-        SubjectName: '',
-        VisitName: '',
-        SubjectId: '',
-        VisitNum: null
+        SiteName: "",
+        SubjectName: "",
+        VisitName: "",
+        SubjectId: "",
+        VisitNum: null,
       },
       btnLoading: false,
       previewVisible: false,
@@ -572,7 +807,7 @@ export default {
       studyLoading: false,
       studyList: [],
       deleteArr: [],
-      trialId: '',
+      trialId: "",
       moment,
       uploadCount: 0,
       uploadedCount: 0,
@@ -582,574 +817,665 @@ export default {
       trialModalitys: [],
       myInterval: [],
       studyErrorList: [],
-      confirmFlag:false
-    }
+      confirmFlag: false,
+
+      // pet-ct临床数据上传
+      petVisible: false,
+      studyData: [],
+    };
   },
   mounted() {
-    this.trialId = this.$route.query.trialId
+    this.trialId = this.$route.query.trialId;
     if (Object.keys(this.data).length) {
-      this.form = { ...this.data }
+      this.form = { ...this.data };
     }
-    this.getStudyInfo()
-    this.uploadQueues=[];
+    this.getStudyInfo();
+    this.uploadQueues = [];
   },
   beforeDestroy() {
-    this.myInterval.forEach(v => {
-      clearInterval(v)
-    })
-    this.myInterval = []
+    this.myInterval.forEach((v) => {
+      clearInterval(v);
+    });
+    this.myInterval = [];
   },
   methods: {
     handleHistorical(row) {
-      this.$router.push(`/trials/trials-panel/trial-summary/upload-monitor?trialId=${this.trialId}&trialCode=${this.$route.query.trialCode}&${this.$route.query.researchProgramNo}&studyCode=${row.StudyCode}`)
+      this.$router.push(
+        `/trials/trials-panel/trial-summary/upload-monitor?trialId=${this.trialId}&trialCode=${this.$route.query.trialCode}&${this.$route.query.researchProgramNo}&studyCode=${row.StudyCode}`
+      );
     },
     // 打开检查信息编辑框
     handleEditStudy(row) {
-      this.editStudyInfoVisible = true
-      this.studyForm = { ...row }
-      var bodyPart = []
-      if (this.studyForm.BodyPartForEdit.indexOf('|') !== -1) {
-        bodyPart = this.studyForm.BodyPartForEdit.split('|')
-      } else if (this.studyForm.BodyPartForEdit !== '') {
-        bodyPart.push(this.studyForm.BodyPartForEdit)
+      this.editStudyInfoVisible = true;
+      this.studyForm = { ...row };
+      var bodyPart = [];
+      if (this.studyForm.BodyPartForEdit.indexOf("|") !== -1) {
+        bodyPart = this.studyForm.BodyPartForEdit.split("|");
+      } else if (this.studyForm.BodyPartForEdit !== "") {
+        bodyPart.push(this.studyForm.BodyPartForEdit);
       }
-      this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
-      this.studyForm.BodyPartForEdit = bodyPart
+      this.$set(this.studyForm, "Modality", row.ModalityForEdit);
+      this.studyForm.BodyPartForEdit = bodyPart;
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
-      this.$refs['studyForm'].validate((valid) => {
-        if (!valid) return
-        this.btnLoading = true
-        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join('|')
+      this.$refs["studyForm"].validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join("|");
         // this.studyForm.Modality = this.studyForm.Modalities
         var params = {
           id: this.studyForm.StudyId,
           subjectVisitId: this.data.Id,
           type: 1,
           modality: this.studyForm.Modality,
-          bodyPart: this.studyForm.BodyPart
-        }
-        updateModality(this.data.TrialId, params).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.getStudyInfo()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.editStudyInfoVisible = false
-          }
-        }).catch(() => { this.btnLoading = false })
-      })
-    },
-    format(v) {
-      return v
-    },
-    // 获取临床数据
-    getClinicalData(showConfirm = false, data = []) {
-      // this.data.TrialId = this.$route.query.trialId
-      var param = {
-        subjectVisitId: this.subjectVisitId,
-        trialId: this.trialId,
-        subjectId: this.data.SubjectId,
-        isBaseLine: this.data.IsBaseLine
-      }
-      getCRCClinicalData(param).then(res => {
-        if(res.IsSuccess){
-          let flag = res.Result.some(item=>item.ClinicalDataLevel===4&&item.PDFFileList.length===0)
-          data.forEach(item =>{
-            item.notClinicaData = false;
-            if((item.Modalities==="CT、PT"||item.Modalities==="PT、CT"||item.Modalities==="PET-CT")&& flag){
-              item.notClinicaData = true;
+          bodyPart: this.studyForm.BodyPart,
+        };
+        updateModality(this.data.TrialId, params)
+          .then((res) => {
+            this.btnLoading = false;
+            if (res.IsSuccess) {
+              this.getStudyInfo();
+              this.$message.success(
+                this.$t("common:message:savedSuccessfully")
+              );
+              this.editStudyInfoVisible = false;
             }
           })
-          this.studyList = data;
-          if(flag&&showConfirm){
-          this.$confirm(this.$t("trials:crc-upload:confirm:message"), this.$t('trials:uploadDicomList:label:prompt'), {
-              confirmButtonText: this.$t('trials:reviewTrack:impactList:save'),
-              cancelButtonText: this.$t("common:button:cancel"),
-              type: 'warning'
-            }).then(() => {
-              this.confirmFlag = false;
-              this.$emit("update:activeName",'clinical-data');
-            }).catch(() => {       
-              this.confirmFlag = false;  
-            });
-          }
-        }
-        // this.clinicalDatas = res.Result
-        // this.loading = false
-      }).catch(() => {
-        // this.loading = false
-      })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
+    },
+    format(v) {
+      return v;
     },
     // 获取已上传的dicom影像
     getStudyInfo() {
-      this.studyLoading = true
-      getSubjectVisitUploadedStudyList(this.subjectVisitId).then(res => {
-        // this.studyList = res.Result
-        this.relationInfo = res.OtherInfo
-        this.trialBodyPartTypes =
-          this.relationInfo.BodyPartTypes ? this.relationInfo.BodyPartTypes.split('|') : []
-        this.trialModalitys =
-          this.relationInfo.Modalitys ? this.relationInfo.Modalitys.split('|') : []
-        this.studyLoading = false;
-        this.getClinicalData(false,res.Result);
-      }).catch(() => { this.studyLoading = false })
+      this.studyLoading = true;
+      getSubjectVisitUploadedStudyList(this.subjectVisitId)
+        .then((res) => {
+          // this.studyList = res.Result
+          this.relationInfo = res.OtherInfo;
+          this.trialBodyPartTypes = this.relationInfo.BodyPartTypes
+            ? this.relationInfo.BodyPartTypes.split("|")
+            : [];
+          this.trialModalitys = this.relationInfo.Modalitys
+            ? this.relationInfo.Modalitys.split("|")
+            : [];
+          this.studyLoading = false;
+          this.studyList = res.Result;
+        })
+        .catch(() => {
+          this.studyLoading = false;
+        });
+    },
+    // 弹框提示pet-ct临床数据未上传
+    petDataTip() {
+      if (this.confirmFlag) {
+        this.confirmFlag = false;
+        this.$confirm(
+          this.$t("trials:crc-upload:confirm:message"),
+          this.$t("trials:uploadDicomList:label:prompt"),
+          {
+            confirmButtonText: this.$t("trials:reviewTrack:impactList:save"),
+            // cancelButtonText: this.$t("common:button:cancel"),
+            type: "warning",
+            showCancelButton: false,
+          }
+        )
+          .then(() => {
+            this.confirmFlag = false;
+          })
+          .catch(() => {
+            this.confirmFlag = false;
+          });
+      }
     },
     // 预览单个检查影像
     handleViewStudy(row) {
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`
-      })
-      window.open(routeData.href, '_blank')
+        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`,
+      });
+      window.open(routeData.href, "_blank");
+    },
+    // 打开上传pet临床数据弹框
+    handleUploadPetData(row) {
+      this.studyData = row;
+      this.petVisible = true;
     },
     // 预览所有影像
     handlePreviewAllFiles() {
-      var token = getToken()
-      if (this.$route.path === '/trials/trials-panel/visit/crc-question') {
+      var token = getToken();
+      if (this.$route.path === "/trials/trials-panel/visit/crc-question") {
         var routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.SubjectVisitId}&TokenKey=${token}`
-        })
+          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.SubjectVisitId}&TokenKey=${token}`,
+        });
       } else {
         var routeData = this.$router.resolve({
-          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`
-        })
+          path: `/showvisitdicoms?trialId=${this.trialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`,
+        });
       }
-      window.open(routeData.href, '_blank')
+      window.open(routeData.href, "_blank");
     },
     // 扫描待上传文件
     beginScanFiles(e) {
-      var files = e.target.files
+      var files = e.target.files;
       if (files.length > 0) {
-        var checkFiles = [...files]
-        var scope = this
-        scope.scanState = ''
-        scope.isScan = false
-        var p = new Promise(function(resolve) {
-          resolve()
-        })
-        var validFilesCount = 0
+        var checkFiles = [...files];
+        var scope = this;
+        scope.scanState = "";
+        scope.isScan = false;
+        var p = new Promise(function (resolve) {
+          resolve();
+        });
+        var validFilesCount = 0;
         for (var i = 0; i < files.length; ++i) {
-          (function(index) {
-            p = p.then(function() {
-              if(files[index].name.indexOf('DICOMDIR') === -1){
-                validFilesCount = validFilesCount + 1
-                return scope.parseDicomFile(files[index])
+          (function (index) {
+            p = p.then(function () {
+              if (files[index].name.indexOf("DICOMDIR") === -1) {
+                validFilesCount = validFilesCount + 1;
+                return scope.parseDicomFile(files[index]);
               }
-            })
-          })(i)
+            });
+          })(i);
         }
-        p.then(function(result) {
+        p.then(function (result) {
           scope.uploadQueues.forEach((v, i) => {
-            scope.$refs.dicomFilesTable.toggleRowSelection(v, true)
-          })
-          scope.scanState = 'finished'
-          scope.isScan = true
-        })
-        
+            scope.$refs.dicomFilesTable.toggleRowSelection(v, true);
+          });
+          scope.scanState = "finished";
+          scope.isScan = true;
+        });
       }
     },
     // 按序列UUID本地归档
     parseDicomFile(file) {
-      var scope = this
-      return new Promise(function(resolve, reject) {
-        if (scope.scanState === 'cancelling') {
-          resolve()
-          return
+      var scope = this;
+      return new Promise(function (resolve, reject) {
+        if (scope.scanState === "cancelling") {
+          resolve();
+          return;
         }
-        var reader = new FileReader()
-        reader.onload = function(e) {
+        var reader = new FileReader();
+        reader.onload = function (e) {
           try {
-            var data = dicomParser.parseDicom(new Uint8Array(e.target.result))
-            var modality = data.string('x00080060') || ''
-            var studyUid = data.string('x0020000d')
-            var pixelDataElement = data.elements.x7fe00010
-            var studyIndex = 0
+            var data = dicomParser.parseDicom(new Uint8Array(e.target.result));
+            var modality = data.string("x00080060") || "";
+            var studyUid = data.string("x0020000d");
+            var pixelDataElement = data.elements.x7fe00010;
+            var studyIndex = 0;
             while (
               studyIndex < scope.uploadQueues.length &&
               scope.uploadQueues[studyIndex].dicomInfo.studyUid !== studyUid &&
-              (pixelDataElement || modality === 'SR') && modality != ''
-              ) {
-              ++studyIndex
+              (pixelDataElement || modality === "SR") &&
+              modality != ""
+            ) {
+              ++studyIndex;
             }
             if (studyIndex >= scope.uploadQueues.length) {
-              var date = data.string('x00080020')
-              var time = data.string('x00080030')
-              var studyTime = ''
+              var date = data.string("x00080020");
+              var time = data.string("x00080030");
+              var studyTime = "";
               if (date) {
-                date = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)}`
+                date = `${date.substring(0, 4)}-${date.substring(
+                  4,
+                  6
+                )}-${date.substring(6, 8)}`;
               }
               if (time) {
-                time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
+                time = `${time.substring(0, 2)}:${time.substring(
+                  2,
+                  4
+                )}:${time.substring(4, 6)}`;
               }
-              if(date){
-                studyTime = time ? `${date} ${time}` : `${date} 00:00:00`
+              if (date) {
+                studyTime = time ? `${date} ${time}` : `${date} 00:00:00`;
               }
               const patientNameElement = data.elements.x00100010;
-              const patientNameBytes = new Uint8Array(data.byteArray.buffer, patientNameElement ? patientNameElement.dataOffset : 0, patientNameElement ? patientNameElement.length : 0);
-              const patientNameStr = convertBytes(data.string('x00080005'), patientNameBytes);
+              const patientNameBytes = new Uint8Array(
+                data.byteArray.buffer,
+                patientNameElement ? patientNameElement.dataOffset : 0,
+                patientNameElement ? patientNameElement.length : 0
+              );
+              const patientNameStr = convertBytes(
+                data.string("x00080005"),
+                patientNameBytes
+              );
               scope.uploadQueues.push({
                 studyIndex: studyIndex,
                 seriesList: [],
                 fileList: [],
                 dicomInfo: {
-                  studyId: data.string('x00200010'),
+                  studyId: data.string("x00200010"),
                   studyUid: studyUid,
-                  patientId: data.string('x00100020'),
+                  patientId: data.string("x00100020"),
                   patientName: patientNameStr,
-                  patientAge: data.string('x00101010') ? data.string('x00101010') : '',
-                  patientSex: data.string('x00100040') ? data.string('x00100040') : '',
-                  patientBirthDate: data.string('x00100030'),
-                  hospitalName: data.string('x00080080'),
-                  accNumber: data.string('x00080050'),
-                  bodyPart: data.string('x00180015') || '',
+                  patientAge: data.string("x00101010")
+                    ? data.string("x00101010")
+                    : "",
+                  patientSex: data.string("x00100040")
+                    ? data.string("x00100040")
+                    : "",
+                  patientBirthDate: data.string("x00100030"),
+                  hospitalName: data.string("x00080080"),
+                  accNumber: data.string("x00080050"),
+                  bodyPart: data.string("x00180015") || "",
                   modality: [],
-                  institutionName: data.string('x00080080'),
-                  description: data.string('x00081030'),
+                  institutionName: data.string("x00080080"),
+                  description: data.string("x00081030"),
                   //0008,0032
-                  acquisitionTime: data.string('x00080032'),
-                  acquisitionNumber: data.string('x00200012'),
-                  triggerTime: data.string('x00181060'),
+                  acquisitionTime: data.string("x00080032"),
+                  acquisitionNumber: data.string("x00200012"),
+                  triggerTime: data.string("x00181060"),
                   studyTime: studyTime,
                   VisitInfo: {},
                   SubjectInfo: {},
                   failedFileCount: 0,
                   fileSize: 0,
                   fileCount: 0,
-                  isInit: false
+                  isInit: false,
                 },
 
                 uploadState: {
                   selected: false,
-                  stateCode: '',
+                  stateCode: "",
                   beginUploadTime: {},
-                  progressValue: 0
-                }
-              })
+                  progressValue: 0,
+                },
+              });
             }
-            var modality = scope.uploadQueues[studyIndex].dicomInfo.modality
-            var currentModality = data.string('x00080060')
+            var modality = scope.uploadQueues[studyIndex].dicomInfo.modality;
+            var currentModality = data.string("x00080060");
             if (!(modality.indexOf(currentModality) > -1)) {
-              modality.push(currentModality)
+              modality.push(currentModality);
             }
-            var fileList = scope.uploadQueues[studyIndex].fileList
-            var instanceUid = data.string('x00080018')
-            var instanceIndex = 0
+            var fileList = scope.uploadQueues[studyIndex].fileList;
+            var instanceUid = data.string("x00080018");
+            var instanceIndex = 0;
             while (
               instanceIndex < fileList.length &&
               fileList[instanceIndex].instanceUid !== instanceUid &&
-              (pixelDataElement || modality === 'SR')
-              ) {
-              ++instanceIndex
+              (pixelDataElement || modality === "SR")
+            ) {
+              ++instanceIndex;
             }
             if (instanceIndex >= fileList.length) {
               fileList.push({
                 instanceUid: instanceUid,
-                file: file
-              })
+                file: file,
+              });
             }
-            scope.uploadQueues[studyIndex].dicomInfo.fileCount = fileList.length
-            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce((prev, next) => {
-              return prev + next.file.size;
-            }, 0)
+            scope.uploadQueues[studyIndex].dicomInfo.fileCount =
+              fileList.length;
+            scope.uploadQueues[studyIndex].dicomInfo.fileSize = fileList.reduce(
+              (prev, next) => {
+                return prev + next.file.size;
+              },
+              0
+            );
 
-            var seriesUid = data.string('x0020000e')
-            var seriesList = scope.uploadQueues[studyIndex].seriesList
-            var seriesItem = seriesList.find(function(item) {
-              return item.seriesUid === seriesUid
-            })
-            if (!seriesItem && (pixelDataElement || modality === 'SR')) {
-              var date = data.string('x00080021')
-              var time = data.string('x00080031')
-              var seriesTime = ''
+            var seriesUid = data.string("x0020000e");
+            var seriesList = scope.uploadQueues[studyIndex].seriesList;
+            var seriesItem = seriesList.find(function (item) {
+              return item.seriesUid === seriesUid;
+            });
+            if (!seriesItem && (pixelDataElement || modality === "SR")) {
+              var date = data.string("x00080021");
+              var time = data.string("x00080031");
+              var seriesTime = "";
               if (date) {
-                date = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)}`
+                date = `${date.substring(0, 4)}-${date.substring(
+                  4,
+                  6
+                )}-${date.substring(6, 8)}`;
               }
               if (time) {
-                time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
+                time = `${time.substring(0, 2)}:${time.substring(
+                  2,
+                  4
+                )}:${time.substring(4, 6)}`;
               }
-              if(date){
-                seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`
+              if (date) {
+                seriesTime = time ? `${date} ${time}` : `${date} 00:00:00`;
               }
               const seriesDescriptionElement = data.elements.x0008103e;
-              const seriesDescriptionBytes = new Uint8Array(data.byteArray.buffer, seriesDescriptionElement ? seriesDescriptionElement.dataOffset : 0, seriesDescriptionElement ? seriesDescriptionElement.length : 0);
-              const seriesDescriptionStr = convertBytes(data.string('x00080005'), seriesDescriptionBytes);
+              const seriesDescriptionBytes = new Uint8Array(
+                data.byteArray.buffer,
+                seriesDescriptionElement
+                  ? seriesDescriptionElement.dataOffset
+                  : 0,
+                seriesDescriptionElement ? seriesDescriptionElement.length : 0
+              );
+              const seriesDescriptionStr = convertBytes(
+                data.string("x00080005"),
+                seriesDescriptionBytes
+              );
               seriesItem = {
                 seriesUid: seriesUid,
-                seriesNumber: data.intString('x00200011') || 1,
-                modality: data.string('x00080060') || '',
+                seriesNumber: data.intString("x00200011") || 1,
+                modality: data.string("x00080060") || "",
                 description: seriesDescriptionStr,
                 seriesTime: seriesTime,
-                sliceThickness: data.string('x00180050') || '',
-                imagePositionPatient: data.string('x00200032') || '',
-                imageOrientationPatient: data.string('x00200037') || '',
-                sequenceName: data.string('x00180024') || '',
-                protocolName: data.string('x00181030') || '',
-                imagerPixelSpacing: data.string('x00181164') || '',
+                sliceThickness: data.string("x00180050") || "",
+                imagePositionPatient: data.string("x00200032") || "",
+                imageOrientationPatient: data.string("x00200037") || "",
+                sequenceName: data.string("x00180024") || "",
+                protocolName: data.string("x00181030") || "",
+                imagerPixelSpacing: data.string("x00181164") || "",
                 instanceList: [],
-              }
-              seriesList.push(seriesItem)
+              };
+              seriesList.push(seriesItem);
             }
-            var instanceList = seriesItem.instanceList
-            var instanceItem = instanceList.find(function(item) {
-              return item.instanceUid === instanceUid
-            })
+            var instanceList = seriesItem.instanceList;
+            var instanceItem = instanceList.find(function (item) {
+              return item.instanceUid === instanceUid;
+            });
             if (!instanceItem) {
-              var date = data.string('x00080023')
-              var time = data.string('x00080033')
-              var instanceTime = ''
+              var date = data.string("x00080023");
+              var time = data.string("x00080033");
+              var instanceTime = "";
               if (date) {
-                date = `${date.substring(0, 4)}-${date.substring(4, 6)}-${date.substring(6, 8)}`
+                date = `${date.substring(0, 4)}-${date.substring(
+                  4,
+                  6
+                )}-${date.substring(6, 8)}`;
               }
               if (time) {
-                time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
+                time = `${time.substring(0, 2)}:${time.substring(
+                  2,
+                  4
+                )}:${time.substring(4, 6)}`;
               }
-              if(date){
-                instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`
+              if (date) {
+                instanceTime = time ? `${date} ${time}` : `${date} 00:00:00`;
               }
               instanceItem = {
                 instanceUid: instanceUid,
-                instanceNumber: data.intString('x00200013') || 1,
-                frameCount: data.intString('x00280008') || 1,
+                instanceNumber: data.intString("x00200013") || 1,
+                frameCount: data.intString("x00280008") || 1,
                 instanceTime: instanceTime,
-                imageRows: data.uint16('x00280010') || 0,
-                imageColumns: data.uint16('x00280011') || 0,
-                sliceLocation: data.intString('x00201041') || 0,
-                sliceThickness: data.string('x00180050') || '',
-                numberOfFrames: data.intString('x00280008') || 0,
-                pixelSpacing: data.string('x00280030') || '',
-                imagerPixelSpacing: data.string('x00181164') || '',
-                frameOfReferenceUID: data.string('x00200052') || '',
-                windowCenter: data.string('x00281050') || '',
-                windowWidth: data.string('x00281051') || '',
-                modality: data.string('x00080060') || '',
-                file: file
-              }
-              instanceList.push(instanceItem)
+                imageRows: data.uint16("x00280010") || 0,
+                imageColumns: data.uint16("x00280011") || 0,
+                sliceLocation: data.intString("x00201041") || 0,
+                sliceThickness: data.string("x00180050") || "",
+                numberOfFrames: data.intString("x00280008") || 0,
+                pixelSpacing: data.string("x00280030") || "",
+                imagerPixelSpacing: data.string("x00181164") || "",
+                frameOfReferenceUID: data.string("x00200052") || "",
+                windowCenter: data.string("x00281050") || "",
+                windowWidth: data.string("x00281051") || "",
+                modality: data.string("x00080060") || "",
+                file: file,
+              };
+              instanceList.push(instanceItem);
             }
-            resolve()
+            resolve();
           } catch (error) {
-            console.log(error)
-            resolve()
+            console.log(error);
+            resolve();
           }
-        }
-        reader.onerror = function(e) {
-          resolve()
-        }
-        reader.readAsArrayBuffer(file)
-      })
+        };
+        reader.onerror = function (e) {
+          resolve();
+        };
+        reader.readAsArrayBuffer(file);
+      });
     },
     // 上传之前校验基本信息及检查是否已上传
     beginUploadQueues() {
-      this.scanState = 'uploading'
-      this.studyErrorList = []
+      this.scanState = "uploading";
+      this.studyErrorList = [];
       // console.log(this.uploadQueues, this.selectArr)
-      this.warningArr = []
+      this.warningArr = [];
       for (let i = 0; i < this.selectArr.length; ++i) {
-        const index = this.selectArr[i].studyIndex
-        this.uploadQueues[index].uploadState.stateCode = 'uploading'
-        this.verifyBasicInfos(index)
+        const index = this.selectArr[i].studyIndex;
+        this.uploadQueues[index].uploadState.stateCode = "uploading";
+        this.verifyBasicInfos(index);
       }
       if (this.warningArr.length) {
-        this.warning_cfg.visible = true
-        this.btnLoading = false
+        this.warning_cfg.visible = true;
+        this.btnLoading = false;
       } else {
-        this.verifyStudy()
+        this.verifyStudy();
       }
     },
     // 校验影像中检查时间、性别是否与受试者匹配
     verifyBasicInfos(index) {
-      var warnings = []
-      if (this.uploadQueues[index].dicomInfo.patientSex && this.form.SubjectSex) {
-        if (this.uploadQueues[index].dicomInfo.patientSex.substr(0, 1) !== this.form.SubjectSex.substr(0, 1)) {
-          warnings.push(this.$t('trials:uploadDicomList:message:genderConsistent'))
+      var warnings = [];
+      if (
+        this.uploadQueues[index].dicomInfo.patientSex &&
+        this.form.SubjectSex
+      ) {
+        if (
+          this.uploadQueues[index].dicomInfo.patientSex.substr(0, 1) !==
+          this.form.SubjectSex.substr(0, 1)
+        ) {
+          warnings.push(
+            this.$t("trials:uploadDicomList:message:genderConsistent")
+          );
         }
       }
       if (warnings.length > 0) {
-        this.warningArr.push({ index: this.uploadQueues[index].studyIndex + 1, accNumber: this.uploadQueues[index].dicomInfo.accNumber, warnings: warnings })
+        this.warningArr.push({
+          index: this.uploadQueues[index].studyIndex + 1,
+          accNumber: this.uploadQueues[index].dicomInfo.accNumber,
+          warnings: warnings,
+        });
       }
     },
     // 校验该检查是否上传过
     verifyStudy() {
-      this.btnLoading = true
-      var studyList = []
-      this.selectArr.forEach(item => {
+      this.btnLoading = true;
+      var studyList = [];
+      this.selectArr.forEach((item) => {
         if (!item.uploadState.selected) {
-          studyList.push({ studyInstanceUid: item.dicomInfo.studyUid, studyDate: item.dicomInfo.studyTime })
+          studyList.push({
+            studyInstanceUid: item.dicomInfo.studyUid,
+            studyDate: item.dicomInfo.studyTime,
+          });
         }
-      })
+      });
       var param = {
         trialId: this.trialId,
         subjectId: this.subjectId,
         subjectVisitId: this.subjectVisitId,
         visitNum: this.form.VisitNum,
-        studyInstanceUidList: studyList
-      }
-      batchVerifyStudyAllowUpload(param).then(async (res) => {
-        var messageArr = []
-        res.Result.forEach((item) => {
-          const i = this.uploadQueues.findIndex((value) => value.dicomInfo.studyUid === item.StudyInstanceUid)
-          let instanceUidList = []
-          item.UploadedSeriesList.forEach(v => {
-            v.SOPInstanceUIDList.forEach(v1 => {
-              instanceUidList.push(v1)
-            })
-          })
-          // isReUploadinstanceUidList1.includes(instanceUidList2)
-          try {
-            this.uploadQueues[i].seriesList.forEach(v => {
-              let o = item.UploadedSeriesList.find(v1 => {
-                return v.seriesUid === v1.SeriesId
-                // v.instanceList.forEach(v2 => {
-                //   let o2 = v1.SOPInstanceUIDList.find(v3 => {
-                //     return v3 === v2.instanceUid
-                //   })
-                //   if (!!o2) {
-                //     v2.isReUpload = true
-                //   }
-                // })
-              })
-              if (!!o) {
-                v.isReUpload = true
-              }
-            })
-            this.uploadQueues[i].seriesList.forEach(v => {
-              v.instanceList.forEach(v2 => {
-                let o2 = instanceUidList.find(v3 => {
-                  return v3 === v2.instanceUid
-                })
-                if (!!o2) {
-                  v2.isReUpload = true
+        studyInstanceUidList: studyList,
+      };
+      batchVerifyStudyAllowUpload(param)
+        .then(async (res) => {
+          var messageArr = [];
+          res.Result.forEach((item) => {
+            const i = this.uploadQueues.findIndex(
+              (value) => value.dicomInfo.studyUid === item.StudyInstanceUid
+            );
+            let instanceUidList = [];
+            item.UploadedSeriesList.forEach((v) => {
+              v.SOPInstanceUIDList.forEach((v1) => {
+                instanceUidList.push(v1);
+              });
+            });
+            // isReUploadinstanceUidList1.includes(instanceUidList2)
+            try {
+              this.uploadQueues[i].seriesList.forEach((v) => {
+                let o = item.UploadedSeriesList.find((v1) => {
+                  return v.seriesUid === v1.SeriesId;
+                  // v.instanceList.forEach(v2 => {
+                  //   let o2 = v1.SOPInstanceUIDList.find(v3 => {
+                  //     return v3 === v2.instanceUid
+                  //   })
+                  //   if (!!o2) {
+                  //     v2.isReUpload = true
+                  //   }
+                  // })
+                });
+                if (!!o) {
+                  v.isReUpload = true;
                 }
-              })
-            })
-          } catch (e) {
-            console.log(e)
-          }
-          // 不能上传或不能重传时，收集校验结果提示,并取消勾选,设置上传状态
-          if (item.ErrorMesseage) {
-            this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload
-            this.$refs.dicomFilesTable.toggleRowSelection(this.uploadQueues[i])
-            this.uploadQueues[i].uploadState.selected = true
-            const msg = `${item.ErrorMesseage}`
-            messageArr.push(msg)
-          }
+              });
+              this.uploadQueues[i].seriesList.forEach((v) => {
+                v.instanceList.forEach((v2) => {
+                  let o2 = instanceUidList.find((v3) => {
+                    return v3 === v2.instanceUid;
+                  });
+                  if (!!o2) {
+                    v2.isReUpload = true;
+                  }
+                });
+              });
+            } catch (e) {
+              console.log(e);
+            }
+            // 不能上传或不能重传时，收集校验结果提示,并取消勾选,设置上传状态
+            if (item.ErrorMesseage) {
+              this.uploadQueues[i].uploadState.AllowReUpload =
+                item.AllowReUpload;
+              this.$refs.dicomFilesTable.toggleRowSelection(
+                this.uploadQueues[i]
+              );
+              this.uploadQueues[i].uploadState.selected = true;
+              const msg = `${item.ErrorMesseage}`;
+              messageArr.push(msg);
+            }
 
-          // 可以重传时，记录需要被覆盖的检查ID
-          if (item.AllowReUpload) {
-            this.uploadQueues[i].AbandonStudyId = item.StudyInfo ? item.StudyInfo.Id : ''
-          }
-          this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload
-        })
+            // 可以重传时，记录需要被覆盖的检查ID
+            if (item.AllowReUpload) {
+              this.uploadQueues[i].AbandonStudyId = item.StudyInfo
+                ? item.StudyInfo.Id
+                : "";
+            }
+            this.uploadQueues[i].uploadState.AllowReUpload = item.AllowReUpload;
+          });
 
-        if (messageArr.length > 0) {
-          var li = messageArr.map(msg => { return `<li>${msg}</li>` })
-          const content = `
+          if (messageArr.length > 0) {
+            var li = messageArr.map((msg) => {
+              return `<li>${msg}</li>`;
+            });
+            const content = `
                         <div>
                         <ol>
-                        ${li.join('')}
+                        ${li.join("")}
                         </ol>
-                        </div>`
-          this.$alert(content, this.$t('trials:uploadDicomList:label:prompt'),
-            {
-              confirmButtonText: this.$t('trials:uploadDicomList:label:confirm'),
-              dangerouslyUseHTMLString: true,
-              callback: (action) => {}
-            })
-          this.btnLoading = false
-        }
-        var results = []
-        this.uploadCount = this.selectArr.length
-        this.uploadedCount = 0
-        for (let i = 0; i < this.selectArr.length; i++) {
-          const index = this.selectArr[i].studyIndex
-          if (!this.uploadQueues[index].uploadState.selected) {
-            await this.archiveStudy(index, res.OtherInfo)
+                        </div>`;
+            this.$alert(
+              content,
+              this.$t("trials:uploadDicomList:label:prompt"),
+              {
+                confirmButtonText: this.$t(
+                  "trials:uploadDicomList:label:confirm"
+                ),
+                dangerouslyUseHTMLString: true,
+                callback: (action) => {},
+              }
+            );
+            this.btnLoading = false;
           }
-        }
-        this.$set(this, 'uploadQueues', [...this.uploadQueues.filter(v => {
-          return !v.uploadState.record || (v.uploadState.record && !!v.uploadState.record.Failed.length)
-        })])
-        this.$nextTick(() => {
-          this.selectArr = []
-          this.uploadQueues.forEach((v, i) => {
-            if (v.uploadState.record) {
-              v.uploadState.selected = false
-              this.$refs.dicomFilesTable.toggleRowSelection(v, true)
+          var results = [];
+          this.uploadCount = this.selectArr.length;
+          this.uploadedCount = 0;
+          for (let i = 0; i < this.selectArr.length; i++) {
+            const index = this.selectArr[i].studyIndex;
+            if (!this.uploadQueues[index].uploadState.selected) {
+              await this.archiveStudy(index, res.OtherInfo);
             }
-            v.studyIndex = i
-          })
-          this.$refs.pathClear.value = ''
-          this.btnLoading = false
-          // console.log(11111);
-          if (this.studyErrorList.length > 0) {
-            let msg = this.$t('trials:uploadDicomFiles2:message:studyErrorList')
-            msg = msg.replaceAll('xxx', this.studyErrorList.join('、'))
-            this.$confirm(msg, this.$t('trials:hotkeys:message:tip'), {
-              confirmButtonText: this.$t('trials:uploadDicomFiles2:button:reupload')
-            }).then(() => {
-              this.beginUploadQueues()
-            })
-          }
-          if(this.confirmFlag){
-            this.getClinicalData(true);
           }
+          this.$set(this, "uploadQueues", [
+            ...this.uploadQueues.filter((v) => {
+              return (
+                !v.uploadState.record ||
+                (v.uploadState.record && !!v.uploadState.record.Failed.length)
+              );
+            }),
+          ]);
+          this.$nextTick(() => {
+            this.selectArr = [];
+            this.uploadQueues.forEach((v, i) => {
+              if (v.uploadState.record) {
+                v.uploadState.selected = false;
+                this.$refs.dicomFilesTable.toggleRowSelection(v, true);
+              }
+              v.studyIndex = i;
+            });
+            this.$refs.pathClear.value = "";
+            this.btnLoading = false;
+            // console.log(11111);
+            if (this.studyErrorList.length > 0) {
+              let msg = this.$t(
+                "trials:uploadDicomFiles2:message:studyErrorList"
+              );
+              msg = msg.replaceAll("xxx", this.studyErrorList.join("、"));
+              this.$confirm(msg, this.$t("trials:hotkeys:message:tip"), {
+                confirmButtonText: this.$t(
+                  "trials:uploadDicomFiles2:button:reupload"
+                ),
+              }).then(() => {
+                this.beginUploadQueues();
+              });
+            }
+            if (this.confirmFlag) {
+              this.petDataTip();
+            }
+          });
         })
-      }).catch(_ => { this.btnLoading = false })
+        .catch((_) => {
+          this.btnLoading = false;
+        });
     },
     objectToQuery() {
-      let obj = arguments[0]
-      let prefix = arguments[1]
-      if (typeof obj !== 'object') return ''
-      const attrs = Object.keys(obj)
+      let obj = arguments[0];
+      let prefix = arguments[1];
+      if (typeof obj !== "object") return "";
+      const attrs = Object.keys(obj);
       return attrs.reduce((query, attr, index) => {
         // 判断是否是第一层第一个循环
-        if (index === 0 && !prefix) query += '?'
-        if (typeof obj[attr] === 'object') {
-          const subPrefix = prefix ? `${prefix}[${attr}]` : attr
-          query += this.objectToQuery(obj[attr], subPrefix)
+        if (index === 0 && !prefix) query += "?";
+        if (typeof obj[attr] === "object") {
+          const subPrefix = prefix ? `${prefix}[${attr}]` : attr;
+          query += this.objectToQuery(obj[attr], subPrefix);
         } else {
           if (prefix) {
-            query += `${prefix}[${attr}]=${obj[attr]}`
+            query += `${prefix}[${attr}]=${obj[attr]}`;
           } else {
-            query += `${attr}=${obj[attr]}`
+            query += `${attr}=${obj[attr]}`;
           }
         }
         // 判断是否是第一层最后一个循环
-        if (index !== attrs.length - 1) query += '&'
-        return query
-      }, '')
+        if (index !== attrs.length - 1) query += "&";
+        return query;
+      }, "");
     },
     canvasToBlob(canvas) {
-      return new Promise(resolve => {
+      return new Promise((resolve) => {
         canvas.toBlob((blob) => {
-          resolve(blob)
+          resolve(blob);
         });
-      })
+      });
     },
     dicomToPng(imageId, width, height) {
-        return new Promise(resolve => {
-          cornerstone.loadImage(imageId).then(async (image) => {
-            let canvas = document.createElement('canvas');
-            canvas.width = width
-            canvas.height = height
-            if (image) {
-              cornerstone.renderToCanvas(canvas, image);
-              // 将 Canvas 图像对象转换为 PNG 格式
-              let blob = await this.canvasToBlob(canvas)
-              resolve(blob)
-            } else {
-              resolve()
-            }
-          })
-        }).catch(reason => {
-          reason()
-        })
+      return new Promise((resolve) => {
+        cornerstone.loadImage(imageId).then(async (image) => {
+          let canvas = document.createElement("canvas");
+          canvas.width = width;
+          canvas.height = height;
+          if (image) {
+            cornerstone.renderToCanvas(canvas, image);
+            // 将 Canvas 图像对象转换为 PNG 格式
+            let blob = await this.canvasToBlob(canvas);
+            resolve(blob);
+          } else {
+            resolve();
+          }
+        });
+      }).catch((reason) => {
+        reason();
+      });
     },
     // 上传影像并归档
     archiveStudy(index, config) {
-      var scope = this
-      return new Promise(function(resolve, reject) {
+      var scope = this;
+      return new Promise(function (resolve, reject) {
         try {
           preArchiveDicomStudy({
             trialId: scope.trialId,
@@ -1159,448 +1485,500 @@ export default {
             // failedFileCount: scope.uploadQueues[index].dicomInfo.failedFileCount,
             fileSize: scope.uploadQueues[index].dicomInfo.fileSize,
             fileCount: scope.uploadQueues[index].dicomInfo.fileCount,
-            IsDicomReUpload: scope.uploadQueues[index].uploadState.AllowReUpload
-          }).then(async res => {
-            scope.uploadQueues[index].dicomInfo.failedFileCount = 0
-            scope.$set(scope.uploadQueues[index].dicomInfo, 'isInit', true)
-            let dicomInfo = scope.uploadQueues[index].dicomInfo
-            let seriesNum = scope.uploadQueues[index].seriesList.length
-            let fileNum = scope.uploadQueues[index].fileList.length
-            let seriesList = scope.uploadQueues[index].seriesList
-            let fileList = scope.uploadQueues[index].fileList
-            dicomInfo.seriesNum = seriesNum
-            dicomInfo.fileNum = fileNum
-            dicomInfo.siteId = scope.data.SiteId
-            dicomInfo.subjectId = scope.data.SubjectId
-            dicomInfo.subjectVisitId = scope.subjectVisitId
-            let t = setInterval(() => {
-              dicomUploadInProgress({
+            IsDicomReUpload:
+              scope.uploadQueues[index].uploadState.AllowReUpload,
+          })
+            .then(async (res) => {
+              scope.uploadQueues[index].dicomInfo.failedFileCount = 0;
+              scope.$set(scope.uploadQueues[index].dicomInfo, "isInit", true);
+              let dicomInfo = scope.uploadQueues[index].dicomInfo;
+              let seriesNum = scope.uploadQueues[index].seriesList.length;
+              let fileNum = scope.uploadQueues[index].fileList.length;
+              let seriesList = scope.uploadQueues[index].seriesList;
+              let fileList = scope.uploadQueues[index].fileList;
+              dicomInfo.seriesNum = seriesNum;
+              dicomInfo.fileNum = fileNum;
+              dicomInfo.siteId = scope.data.SiteId;
+              dicomInfo.subjectId = scope.data.SubjectId;
+              dicomInfo.subjectVisitId = scope.subjectVisitId;
+              let t = setInterval(() => {
+                dicomUploadInProgress({
+                  trialId: scope.trialId,
+                  studyInstanceUid: dicomInfo.studyUid,
+                }).then((res) => {});
+              }, 5000);
+              scope.myInterval.push(t);
+              let Record = {
+                Failed: [],
+                Existed: [],
+                Uploaded: [],
+                FileCount: 0,
+              };
+              let params = {
                 trialId: scope.trialId,
-                studyInstanceUid: dicomInfo.studyUid
-              }).then(res => {
-              })
-            }, 5000)
-            scope.myInterval.push(t)
-            let Record = {
-              Failed: [],
-              Existed: [],
-              Uploaded: [],
-              FileCount: 0
-            }
-            let params = {
-              trialId: scope.trialId,
-              siteId: scope.data.SiteId,
-              subjectId: scope.subjectId,
-              subjectVisitId: scope.subjectVisitId,
-              studyMonitorId: res.Result,
-              failedFileCount: 0,
-              RecordPath: null,
-              study: {
-                studyId: dicomInfo.studyId,
-                studyInstanceUid: dicomInfo.studyUid,
-                studyTime: dicomInfo.studyTime,
-                description: dicomInfo.description,
-                seriesCount: dicomInfo.seriesNum,
-                instanceCount: dicomInfo.fileNum,
-                institutionName: dicomInfo.institutionName,
-                patientId: config.DicomStoreInfo.SubjectCode,
-                patientName: '',
-                patientAge: '',
-                patientSex: config.DicomStoreInfo.SubjectSex,
-                accessionNumber: dicomInfo.accNumber,
-                patientBirthDate: '',
-                acquisitionTime: dicomInfo.acquisitionTime,
-                acquisitionNumber: dicomInfo.acquisitionNumber,
-                triggerTime: dicomInfo.triggerTime,
-                bodyPartExamined: '',
-                seriesList: [],
-              }
-            }
-            let arr = []
-            for (let i = 0; i < seriesList.length; i++) {
-              let v = seriesList[i]
-              let instanceList = []
-              let ImageResizePath
-              for (let ii = 0; ii < v.instanceList.length; ii++) {
-                arr.push((function (){
-                  return new Promise(async resolve1 => {
-                    try {
-                      let o = v.instanceList[ii]
-                      let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`
-                      if (o.isReUpload) {
-                        dicomInfo.failedFileCount++
-                        Record.Existed.push(name)
-                        Record.FileCount++
-                      } else if (o.myPath) {
-                        instanceList.push({
-                          studyInstanceUid: dicomInfo.studyUid,
-                          seriesInstanceUid: v.seriesUid,
-                          sopInstanceUid: o.instanceUid,
-                          instanceNumber: o.instanceNumber,
-                          instanceTime: o.instanceTime,
-                          imageRows: o.imageRows,
-                          imageColumns: o.imageColumns,
-                          sliceLocation: o.sliceLocation,
-                          sliceThickness: o.sliceThickness,
-                          numberOfFrames: o.numberOfFrames,
-                          pixelSpacing: o.pixelSpacing,
-                          imagerPixelSpacing: o.imagerPixelSpacing,
-                          frameOfReferenceUID: o.frameOfReferenceUID,
-                          windowCenter: o.windowCenter,
-                          windowWidth: o.windowWidth,
-                          path: o.myPath
-                        })
-                        Record.Uploaded.push(name)
-                        dicomInfo.failedFileCount++
-                        Record.FileCount++
-                      } else {
-                        let path = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${scope.getGuid(dicomInfo.studyUid + v.seriesUid + o.instanceUid + params.trialId)}`
-                        let res = await dcmUpload(path, o.file, config)
-                        if (!res || !res.url) {
-                          params.failedFileCount++
-                        } else {
-                          if (ii === 0 && o.modality !== 'SR') {
-                            try {
-                              let fileId = cornerstoneWADOImageLoader.wadouri.fileManager.add(
-                                o.file
-                              )
-                              let blob = await scope.dicomToPng(fileId, o.imageColumns, o.imageRows)
-                              let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
-                              let OSSclient = scope.OSSclient
-                              let seriesRes = await OSSclient.put(thumbnailPath, blob)
-                              if (seriesRes && seriesRes.url) {
-                                ImageResizePath = scope.$getObjectName(seriesRes.url)
+                siteId: scope.data.SiteId,
+                subjectId: scope.subjectId,
+                subjectVisitId: scope.subjectVisitId,
+                studyMonitorId: res.Result,
+                failedFileCount: 0,
+                RecordPath: null,
+                study: {
+                  studyId: dicomInfo.studyId,
+                  studyInstanceUid: dicomInfo.studyUid,
+                  studyTime: dicomInfo.studyTime,
+                  description: dicomInfo.description,
+                  seriesCount: dicomInfo.seriesNum,
+                  instanceCount: dicomInfo.fileNum,
+                  institutionName: dicomInfo.institutionName,
+                  patientId: config.DicomStoreInfo.SubjectCode,
+                  patientName: "",
+                  patientAge: "",
+                  patientSex: config.DicomStoreInfo.SubjectSex,
+                  accessionNumber: dicomInfo.accNumber,
+                  patientBirthDate: "",
+                  acquisitionTime: dicomInfo.acquisitionTime,
+                  acquisitionNumber: dicomInfo.acquisitionNumber,
+                  triggerTime: dicomInfo.triggerTime,
+                  bodyPartExamined: "",
+                  seriesList: [],
+                },
+              };
+              let arr = [];
+              for (let i = 0; i < seriesList.length; i++) {
+                let v = seriesList[i];
+                let instanceList = [];
+                let ImageResizePath;
+                for (let ii = 0; ii < v.instanceList.length; ii++) {
+                  arr.push(
+                    (function () {
+                      return new Promise(async (resolve1) => {
+                        try {
+                          let o = v.instanceList[ii];
+                          let name = `${v.instanceList[ii].file.webkitRelativePath}_${v.instanceList[ii].instanceUid}`;
+                          if (o.isReUpload) {
+                            dicomInfo.failedFileCount++;
+                            Record.Existed.push(name);
+                            Record.FileCount++;
+                          } else if (o.myPath) {
+                            instanceList.push({
+                              studyInstanceUid: dicomInfo.studyUid,
+                              seriesInstanceUid: v.seriesUid,
+                              sopInstanceUid: o.instanceUid,
+                              instanceNumber: o.instanceNumber,
+                              instanceTime: o.instanceTime,
+                              imageRows: o.imageRows,
+                              imageColumns: o.imageColumns,
+                              sliceLocation: o.sliceLocation,
+                              sliceThickness: o.sliceThickness,
+                              numberOfFrames: o.numberOfFrames,
+                              pixelSpacing: o.pixelSpacing,
+                              imagerPixelSpacing: o.imagerPixelSpacing,
+                              frameOfReferenceUID: o.frameOfReferenceUID,
+                              windowCenter: o.windowCenter,
+                              windowWidth: o.windowWidth,
+                              path: o.myPath,
+                            });
+                            Record.Uploaded.push(name);
+                            dicomInfo.failedFileCount++;
+                            Record.FileCount++;
+                          } else {
+                            let path = `/${params.trialId}/Image/${
+                              params.siteId
+                            }/${params.subjectId}/${params.subjectVisitId}/${
+                              dicomInfo.studyUid
+                            }/${scope.getGuid(
+                              dicomInfo.studyUid +
+                                v.seriesUid +
+                                o.instanceUid +
+                                params.trialId
+                            )}`;
+                            let res = await dcmUpload(path, o.file, config);
+                            if (!res || !res.url) {
+                              params.failedFileCount++;
+                            } else {
+                              if (ii === 0 && o.modality !== "SR") {
+                                try {
+                                  let fileId =
+                                    cornerstoneWADOImageLoader.wadouri.fileManager.add(
+                                      o.file
+                                    );
+                                  let blob = await scope.dicomToPng(
+                                    fileId,
+                                    o.imageColumns,
+                                    o.imageRows
+                                  );
+                                  let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`;
+                                  let OSSclient = scope.OSSclient;
+                                  let seriesRes = await OSSclient.put(
+                                    thumbnailPath,
+                                    blob
+                                  );
+                                  if (seriesRes && seriesRes.url) {
+                                    ImageResizePath = scope.$getObjectName(
+                                      seriesRes.url
+                                    );
+                                  }
+                                } catch (e) {
+                                  console.log(e);
+                                }
                               }
-                            } catch (e) {
-                              console.log(e)
+                            }
+                            if (res && res.url) {
+                              instanceList.push({
+                                studyInstanceUid: dicomInfo.studyUid,
+                                seriesInstanceUid: v.seriesUid,
+                                sopInstanceUid: o.instanceUid,
+                                instanceNumber: o.instanceNumber,
+                                instanceTime: o.instanceTime,
+                                imageRows: o.imageRows,
+                                imageColumns: o.imageColumns,
+                                sliceLocation: o.sliceLocation,
+                                sliceThickness: o.sliceThickness,
+                                numberOfFrames: o.numberOfFrames,
+                                pixelSpacing: o.pixelSpacing,
+                                imagerPixelSpacing: o.imagerPixelSpacing,
+                                frameOfReferenceUID: o.frameOfReferenceUID,
+                                windowCenter: o.windowCenter,
+                                windowWidth: o.windowWidth,
+                                path: scope.$getObjectName(res.url),
+                              });
+                              o.myPath = scope.$getObjectName(res.url);
+                              Record.Uploaded.push(name);
+                              dicomInfo.failedFileCount++;
+                              Record.FileCount++;
+                            } else {
+                              Record.Failed.push(name);
+                              Record.FileCount++;
                             }
                           }
+                          resolve1();
+                        } catch (e) {
+                          console.log(e);
+                          resolve1();
                         }
-                        if (res && res.url) {
-                          instanceList.push({
-                            studyInstanceUid: dicomInfo.studyUid,
-                            seriesInstanceUid: v.seriesUid,
-                            sopInstanceUid: o.instanceUid,
-                            instanceNumber: o.instanceNumber,
-                            instanceTime: o.instanceTime,
-                            imageRows: o.imageRows,
-                            imageColumns: o.imageColumns,
-                            sliceLocation: o.sliceLocation,
-                            sliceThickness: o.sliceThickness,
-                            numberOfFrames: o.numberOfFrames,
-                            pixelSpacing: o.pixelSpacing,
-                            imagerPixelSpacing: o.imagerPixelSpacing,
-                            frameOfReferenceUID: o.frameOfReferenceUID,
-                            windowCenter: o.windowCenter,
-                            windowWidth: o.windowWidth,
-                            path: scope.$getObjectName(res.url)
-                          })
-                          o.myPath = scope.$getObjectName(res.url)
-                          Record.Uploaded.push(name)
-                          dicomInfo.failedFileCount++
-                          Record.FileCount++
-                        } else {
-                          Record.Failed.push(name)
-                          Record.FileCount++
-                        }
-                      }
-                      resolve1()
-                    } catch (e) {
-                      console.log(e)
-                      resolve1()
-                    }
-                  })
-                })())
-                if (arr.length >= 66 || ii === v.instanceList.length - 1) {
-                  await Promise.all(arr)
-                  arr = []
-                }
-              }
-              params.study.seriesList.push({
-                studyInstanceUid: dicomInfo.studyUid,
-                seriesInstanceUid: v.seriesUid,
-                seriesNumber: v.seriesNumber,
-                seriesTime: v.seriesTime,
-                sliceThickness: v.sliceThickness,
-                imagePositionPatient: v.imagePositionPatient,
-                imageOrientationPatient: v.imageOrientationPatient,
-                sequenceName: v.sequenceName,
-                protocolName: v.protocolName,
-                imagerPixelSpacing: v.imagerPixelSpacing,
-                acquisitionTime: dicomInfo.acquisitionTime,
-                acquisitionNumber: dicomInfo.acquisitionNumber,
-                triggerTime: dicomInfo.triggerTime,
-                modality: v.modality,
-                description: v.description,
-                instanceCount: v.instanceList.length,
-                bodyPartExamined: dicomInfo.bodyPart,
-                instanceList: instanceList,
-                ImageResizePath: ImageResizePath,
-              })
-            }
-            let text = JSON.stringify(Record)
-            let logJsonBlob = scope.generateTxtFile(text)
-            let logJsonObjectName = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`
-            let logRes
-            try {
-              logRes = await scope.OSSclient.put(logJsonObjectName, logJsonBlob)
-            } catch (e) {
-              scope.uploadQueues[index].uploadState.record = Record
-              scope.studyErrorList.push(dicomInfo.accNumber)
-              clearInterval(t)
-              resolve()
-            }
-            for (let i = 0; i < seriesList.length; i++) {
-              let v = seriesList[i]
-              let o = params.study.seriesList.find(o => {
-                return o.seriesInstanceUid === v.seriesUid
-              })
-              if (o && !o.ImageResizePath) {
-                let fileId = cornerstoneWADOImageLoader.wadouri.fileManager.add(
-                  v.instanceList[0].file
-                )
-                let blob = await scope.dicomToPng(fileId, v.instanceList[0].imageColumns, v.instanceList[0].imageRows)
-                let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`
-                let OSSclient = scope.OSSclient
-                try {
-                  let seriesRes = await OSSclient.put(thumbnailPath, blob)
-                  if (seriesRes && seriesRes.url) {
-                    o.ImageResizePath = scope.$getObjectName(seriesRes.url)
+                      });
+                    })()
+                  );
+                  if (arr.length >= 66 || ii === v.instanceList.length - 1) {
+                    await Promise.all(arr);
+                    arr = [];
+                  }
+                }
+                params.study.seriesList.push({
+                  studyInstanceUid: dicomInfo.studyUid,
+                  seriesInstanceUid: v.seriesUid,
+                  seriesNumber: v.seriesNumber,
+                  seriesTime: v.seriesTime,
+                  sliceThickness: v.sliceThickness,
+                  imagePositionPatient: v.imagePositionPatient,
+                  imageOrientationPatient: v.imageOrientationPatient,
+                  sequenceName: v.sequenceName,
+                  protocolName: v.protocolName,
+                  imagerPixelSpacing: v.imagerPixelSpacing,
+                  acquisitionTime: dicomInfo.acquisitionTime,
+                  acquisitionNumber: dicomInfo.acquisitionNumber,
+                  triggerTime: dicomInfo.triggerTime,
+                  modality: v.modality,
+                  description: v.description,
+                  instanceCount: v.instanceList.length,
+                  bodyPartExamined: dicomInfo.bodyPart,
+                  instanceList: instanceList,
+                  ImageResizePath: ImageResizePath,
+                });
+              }
+              let text = JSON.stringify(Record);
+              let logJsonBlob = scope.generateTxtFile(text);
+              let logJsonObjectName = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${params.studyMonitorId}.txt`;
+              let logRes;
+              try {
+                logRes = await scope.OSSclient.put(
+                  logJsonObjectName,
+                  logJsonBlob
+                );
+              } catch (e) {
+                scope.uploadQueues[index].uploadState.record = Record;
+                scope.studyErrorList.push(dicomInfo.accNumber);
+                clearInterval(t);
+                resolve();
+              }
+              for (let i = 0; i < seriesList.length; i++) {
+                let v = seriesList[i];
+                let o = params.study.seriesList.find((o) => {
+                  return o.seriesInstanceUid === v.seriesUid;
+                });
+                if (o && !o.ImageResizePath) {
+                  let fileId =
+                    cornerstoneWADOImageLoader.wadouri.fileManager.add(
+                      v.instanceList[0].file
+                    );
+                  let blob = await scope.dicomToPng(
+                    fileId,
+                    v.instanceList[0].imageColumns,
+                    v.instanceList[0].imageRows
+                  );
+                  let thumbnailPath = `/${params.trialId}/Image/${params.siteId}/${params.subjectId}/${params.subjectVisitId}/${dicomInfo.studyUid}/${v.seriesUid}.png`;
+                  let OSSclient = scope.OSSclient;
+                  try {
+                    let seriesRes = await OSSclient.put(thumbnailPath, blob);
+                    if (seriesRes && seriesRes.url) {
+                      o.ImageResizePath = scope.$getObjectName(seriesRes.url);
+                    }
+                  } catch (e) {
+                    console.log(e);
                   }
-                } catch (e) {
-                  console.log(e)
                 }
               }
-            }
-            if (logRes && logRes.url) {
-              params.study.instanceCount = dicomInfo.failedFileCount
-              params.RecordPath = scope.$getObjectName(logRes.url)
-              addOrUpdateArchiveStudy(params).then(res => {
-                if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
-                  scope.$message.success(scope.$t('trials:uploadDicomList:label:uploaded'))
-                } else {
-                  scope.studyErrorList.push(dicomInfo.accNumber)
-                }
-                scope.uploadQueues[index].uploadState.record = Record
-                let flag = res.Result=== 'PET-CT' || res.Result==='CT、PT' || res.Result === 'PT、CT';
-                // let flag = params.study.seriesList.some(item=>item.modality==='PT');
-                if(flag){
-                  scope.confirmFlag = true;
-                }
-                scope.getStudyInfo()
-                if (scope.$route.path !== '/trials/trials-panel/visit/crc-question') {
-                  scope.$emit('getList')
-                }
-                clearInterval(t)
-                resolve()
-              }).catch((res) => {
-                scope.uploadQueues[index].uploadState.record = Record
-                scope.studyErrorList.push(dicomInfo.accNumber)
-                clearInterval(t)
-                resolve()
-              })
-            } else {
-              scope.uploadQueues[index].uploadState.record = Record
-              scope.studyErrorList.push(dicomInfo.accNumber)
-              clearInterval(t)
-              resolve()
-            }
-          }).catch(() => {
-            let Record = {
-              Failed: [],
-              Existed: [],
-              Uploaded: [],
-              FileCount: 0
-            }
-            let fileList = scope.uploadQueues[index].fileList
-            fileList.forEach(v => {
-              Record.Failed.push(v.webkitRelativePath)
+              if (logRes && logRes.url) {
+                params.study.instanceCount = dicomInfo.failedFileCount;
+                params.RecordPath = scope.$getObjectName(logRes.url);
+                addOrUpdateArchiveStudy(params)
+                  .then((res) => {
+                    if (dicomInfo.failedFileCount === dicomInfo.fileCount) {
+                      scope.$message.success(
+                        scope.$t("trials:uploadDicomList:label:uploaded")
+                      );
+                    } else {
+                      scope.studyErrorList.push(dicomInfo.accNumber);
+                    }
+                    scope.uploadQueues[index].uploadState.record = Record;
+                    let flag =
+                      res.Result === "PET-CT" ||
+                      res.Result === "CT、PT" ||
+                      res.Result === "PT、CT";
+                    // let flag = params.study.seriesList.some(item=>item.modality==='PT');
+                    if (flag) {
+                      scope.confirmFlag = true;
+                    }
+                    scope.getStudyInfo();
+                    if (
+                      scope.$route.path !==
+                      "/trials/trials-panel/visit/crc-question"
+                    ) {
+                      scope.$emit("getList");
+                    }
+                    clearInterval(t);
+                    resolve();
+                  })
+                  .catch((res) => {
+                    scope.uploadQueues[index].uploadState.record = Record;
+                    scope.studyErrorList.push(dicomInfo.accNumber);
+                    clearInterval(t);
+                    resolve();
+                  });
+              } else {
+                scope.uploadQueues[index].uploadState.record = Record;
+                scope.studyErrorList.push(dicomInfo.accNumber);
+                clearInterval(t);
+                resolve();
+              }
             })
-            scope.uploadQueues[index].uploadState.record = Record
-            scope.studyErrorList.push(dicomInfo.accNumber)
-            resolve()
-          })
+            .catch(() => {
+              let Record = {
+                Failed: [],
+                Existed: [],
+                Uploaded: [],
+                FileCount: 0,
+              };
+              let fileList = scope.uploadQueues[index].fileList;
+              fileList.forEach((v) => {
+                Record.Failed.push(v.webkitRelativePath);
+              });
+              scope.uploadQueues[index].uploadState.record = Record;
+              scope.studyErrorList.push(dicomInfo.accNumber);
+              resolve();
+            });
         } catch (e) {
-          console.log(e)
-          resolve()
+          console.log(e);
+          resolve();
         }
-      })
+      });
     },
     generateTxtFile(text) {
-      let blob = new Blob(["\ufeff", text], {type: 'text/plain'})
-      return blob
+      let blob = new Blob(["\ufeff", text], { type: "text/plain" });
+      return blob;
     },
     // warning弹框取消按钮回调
     handleCancelWarnVisible() {
-      this.warning_cfg.visible = false
+      this.warning_cfg.visible = false;
       for (var i = 0; i < this.selectArr.length; ++i) {
-        const index = this.selectArr[i].studyIndex
-        this.uploadQueues[index].uploadState.stateCode = ''
+        const index = this.selectArr[i].studyIndex;
+        this.uploadQueues[index].uploadState.stateCode = "";
       }
     },
     // 忽略warning继续上传
     handleContinueUpload() {
-      this.warning_cfg.visible = false
-      this.verifyStudy()
+      this.warning_cfg.visible = false;
+      this.verifyStudy();
     },
     // 预览影像
     handlePreview(uid) {
-      this.previewVisible = true
-      this.uid = uid
+      this.previewVisible = true;
+      this.uid = uid;
     },
     // 删除影像列表中的某个影像
     handleDelete(index, row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          this.$refs.uploadForm.reset()
-          this.uploadQueues.splice(index, 1)
-          this.uploadQueues.forEach((v, i) => {
-            if (v.uploadState.record) {
-              v.uploadState.selected = false
-              this.$refs.dicomFilesTable.toggleRowSelection(v, true)
-            }
-            v.studyIndex = i
-          })
-          this.handleSelectionChange(this.uploadQueues)
-        })
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.$refs.uploadForm.reset();
+        this.uploadQueues.splice(index, 1);
+        this.uploadQueues.forEach((v, i) => {
+          if (v.uploadState.record) {
+            v.uploadState.selected = false;
+            this.$refs.dicomFilesTable.toggleRowSelection(v, true);
+          }
+          v.studyIndex = i;
+        });
+        this.handleSelectionChange(this.uploadQueues);
+      });
     },
     // 当选择项发生变化时收集待上传文件数据
     handleSelectionChange(selection) {
       selection.sort((n1, n2) => {
-        return n1.studyIndex - n2.studyIndex
-      })
-      this.selectArr = selection
+        return n1.studyIndex - n2.studyIndex;
+      });
+      this.selectArr = selection;
     },
     // 根据是否上传状态决定CheckBox 是否可以勾选
     handleSelectable(row) {
       if (row.uploadState.selected || this.btnLoading) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     // 收集已上传文件列表勾选项
     handleUploadedSelectionChange(selection) {
-      this.deleteArr = []
-      selection.forEach(item => {
-        this.deleteArr.push(item.StudyId)
-      })
+      this.deleteArr = [];
+      selection.forEach((item) => {
+        this.deleteArr.push(item.StudyId);
+      });
     },
     // 批量删除已上传的影像
     handleBatchDelete() {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true
+          this.studyLoading = true;
           deleteStudyList(this.trialId, this.subjectVisitId, this.deleteArr)
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo()
-                if (this.$route.path !== '/trials/trials-panel/visit/crc-question') {
-                  this.$emit('getList')
+                this.getStudyInfo();
+                if (
+                  this.$route.path !== "/trials/trials-panel/visit/crc-question"
+                ) {
+                  this.$emit("getList");
                 }
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+                this.$message.success(
+                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+                );
               }
-            }).catch(() => {
-            this.studyLoading = true
-          })
-        }).catch(() => {})
+            })
+            .catch(() => {
+              this.studyLoading = true;
+            });
+        })
+        .catch(() => {});
     },
     // 删除已上传的某个检查
     handleDeleteStudy(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true
+          this.studyLoading = true;
           deleteStudyList(this.trialId, this.subjectVisitId, [row.StudyId])
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo()
-                if (this.$route.path !== '/trials/trials-panel/visit/crc-question') {
-                  this.$emit('getList')
+                this.getStudyInfo();
+                if (
+                  this.$route.path !== "/trials/trials-panel/visit/crc-question"
+                ) {
+                  this.$emit("getList");
                 }
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+                this.$message.success(
+                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+                );
               }
-            }).catch(() => {
-            this.studyLoading = true
-          })
-        }).catch(() => {})
+            })
+            .catch(() => {
+              this.studyLoading = true;
+            });
+        })
+        .catch(() => {});
     },
     // cancel按钮回调
     cancel() {
-      this.scanState = 'cancelling'
+      this.scanState = "cancelling";
       // 关闭上传模态框
-      this.$emit('close')
+      this.$emit("close");
     },
     compare(start, end) {
-      start = new Date(start)
-      start = start.getTime()
-      end = new Date(end)
-      end = end.getTime()
-      var time = 0
+      start = new Date(start);
+      start = start.getTime();
+      end = new Date(end);
+      end = end.getTime();
+      var time = 0;
       if (start > end) {
-        time = start - end
+        time = start - end;
       } else {
-        time = end - start
+        time = end - start;
       }
-      return Math.floor(time / 86400000)
+      return Math.floor(time / 86400000);
     },
     exportFailedFiles(errorFiles) {
-      var elementA = document.createElement('a')
-      var str = ''
+      var elementA = document.createElement("a");
+      var str = "";
       errorFiles.forEach((el) => {
-        str += el + '\n'
-      })
-      elementA.setAttribute('href', 'data:text/html;charset=utf-8,' + str)
-      elementA.setAttribute('download', +new Date() + '.txt')
-      elementA.style.display = 'none'
-      document.body.appendChild(elementA)
-      elementA.click()
-      document.body.removeChild(elementA)
+        str += el + "\n";
+      });
+      elementA.setAttribute("href", "data:text/html;charset=utf-8," + str);
+      elementA.setAttribute("download", +new Date() + ".txt");
+      elementA.style.display = "none";
+      document.body.appendChild(elementA);
+      elementA.click();
+      document.body.removeChild(elementA);
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return 'delete-row'
+        return "delete-row";
       } else {
-        return ''
+        return "";
       }
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return ''
-      var separator = ','
-      if (bodyPart.indexOf('|') > -1) {
-        separator = '|'
-      } else if (bodyPart.indexOf(',') > -1) {
-        separator = ','
-      } else if (bodyPart.indexOf('，') > -1) {
-        separator = '，'
+      if (!bodyPart) return "";
+      var separator = ",";
+      if (bodyPart.indexOf("|") > -1) {
+        separator = "|";
+      } else if (bodyPart.indexOf(",") > -1) {
+        separator = ",";
+      } else if (bodyPart.indexOf("，") > -1) {
+        separator = "，";
       }
-      var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim())
-      })
-      return newArr.join(' | ')
-    }
-  }
-}
+      var arr = bodyPart.split(separator);
+      var newArr = arr.map((i) => {
+        return this.$fd("Bodypart", i.trim());
+      });
+      return newArr.join(" | ");
+    },
+  },
+};
 </script>
 <style lang="scss">
-.upload-dicom-files-wrapper{
-  .dicomFiles-table{
-    .el-table__body-wrapper{
+.upload-dicom-files-wrapper {
+  .dicomFiles-table {
+    .el-table__body-wrapper {
       height: 300px;
       overflow-y: auto;
     }
   }
-  .delete-row{
+  .delete-row {
     text-decoration-line: line-through;
     color: #c0c4cc;
   }
@@ -1616,7 +1994,7 @@ export default {
     overflow: hidden;
     display: inline-block;
   }
-  #inputForm .file-input input[type='file'] {
+  #inputForm .file-input input[type="file"] {
     position: absolute;
     top: 0;
     left: 0;
@@ -1637,9 +2015,8 @@ export default {
   #inputForm .text-left {
     text-align: left;
   }
-  .colorOfRed{
-    color:#f44336;
+  .colorOfRed {
+    color: #f44336;
   }
 }
-
 </style>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
new file mode 100644
index 00000000..7969e031
--- /dev/null
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue
@@ -0,0 +1,723 @@
+<template>
+  <div v-loading="loading" class="clinical-data-wrapper">
+    <el-tabs type="border-card">
+      <el-tab-pane
+        v-for="cd in clinicalDatas"
+        :key="cd.ClinicalDataTrialSetId"
+        :label="
+          $i18n.locale === 'zh'
+            ? cd.ClinicalDataSetName
+            : cd.ClinicalDataSetEnName
+        "
+      >
+        <!-- 格式化录入 -->
+        <div v-if="cd.ClinicalUploadType === 0">
+          <!-- 既往放疗史 -->
+          <h4>{{ $t("trials:uploadClinicalData:title:pastTreatment") }}</h4>
+          <div v-if="allowAddOrEdit" style="text-align: right">
+            <!-- 新增 -->
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="small"
+              @click.native.prevent="
+                addPreviousHistory(cd.ClinicalDataTrialSetId)
+              "
+            >
+              {{ $t("common:button:new") }}
+            </el-button>
+          </div>
+
+          <el-table
+            :data="cd.ClinicalTableData.PreviousHistoryList"
+            style="width: 100%"
+          >
+            <el-table-column type="index" width="50" />
+            <!-- 放疗部位 -->
+            <el-table-column
+              prop="Position"
+              :label="$t('trials:uploadClinicalData:table:bodyPart')"
+            />
+            <!-- 开始日期 -->
+            <el-table-column
+              prop="StartTime"
+              :label="$t('trials:uploadClinicalData:table:beginDate')"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.StartTime
+                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+            <!-- 结束日期 -->
+            <el-table-column
+              prop="EndTime"
+              :label="$t('trials:uploadClinicalData:table:endDate')"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.EndTime
+                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+            <!-- 病灶是否PD -->
+            <el-table-column
+              prop="IsPD"
+              :label="$t('trials:uploadClinicalData:table:isPD')"
+            >
+              <template slot-scope="scope">
+                {{ $fd("IsPdEnum", scope.row.IsPD) }}
+              </template>
+            </el-table-column>
+            <el-table-column
+              v-if="allowAddOrEdit"
+              :label="$t('common:action:action')"
+              min-width="120"
+            >
+              <template slot-scope="scope">
+                <!-- 编辑 -->
+                <el-button
+                  v-if="allowAddOrEdit"
+                  icon="el-icon-edit-outline"
+                  circle
+                  :title="$t('common:button:edit')"
+                  size="small"
+                  @click.native.prevent="editRow(scope.row, 1)"
+                />
+                <!-- 移除 -->
+                <el-button
+                  v-if="
+                    data.SubmitState * 1 < 2 ||
+                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                  "
+                  icon="el-icon-delete"
+                  circle
+                  :title="$t('common:button:delete')"
+                  size="small"
+                  @click.native.prevent="deletePreviousHistory(scope.row)"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!-- 既往手术史 -->
+          <h4>{{ $t("trials:uploadClinicalData:title:pastSurgery") }}</h4>
+          <div v-if="allowAddOrEdit" style="text-align: right">
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="small"
+              @click="addPreviousSurgery(cd.ClinicalDataTrialSetId)"
+            >
+              {{ $t("common:button:new") }}
+            </el-button>
+          </div>
+          <el-table
+            :data="cd.ClinicalTableData.PreviousSurgeryList"
+            style="width: 100%"
+          >
+            <el-table-column type="index" width="50" />
+            <!-- 手术名称 -->
+            <el-table-column
+              prop="OperationName"
+              :label="$t('trials:uploadClinicalData:table:surgeryName')"
+            />
+            <!-- 手术日期 -->
+            <el-table-column
+              prop="OperationTime"
+              :label="$t('trials:uploadClinicalData:table:surgeryDate')"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.OperationTime
+                    ? moment(scope.row.OperationTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              v-if="allowAddOrEdit"
+              :label="$t('common:action:action')"
+              min-width="200"
+            >
+              <template slot-scope="scope">
+                <!-- 编辑 -->
+                <el-button
+                  v-if="allowAddOrEdit"
+                  icon="el-icon-edit-outline"
+                  circle
+                  :title="$t('common:button:edit')"
+                  size="small"
+                  @click.native.prevent="editRow(scope.row, 2)"
+                />
+                <!-- 移除 -->
+                <el-button
+                  v-if="
+                    data.SubmitState * 1 < 2 ||
+                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                  "
+                  icon="el-icon-delete"
+                  circle
+                  :title="$t('common:button:delete')"
+                  size="small"
+                  @click.native.prevent="deletePreviousSurgery(scope.row)"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+          <!-- 既往其他治疗史 -->
+          <h4>{{ $t("trials:uploadClinicalData:title:others") }}</h4>
+          <div v-if="allowAddOrEdit" style="text-align: right">
+            <!-- 新增 -->
+            <el-button
+              type="primary"
+              icon="el-icon-plus"
+              size="small"
+              @click="addPreviousOther(cd.ClinicalDataTrialSetId)"
+            >
+              {{ $t("common:button:new") }}
+            </el-button>
+          </div>
+          <el-table
+            :data="cd.ClinicalTableData.PreviousOtherList"
+            style="width: 100%"
+          >
+            <el-table-column type="index" width="50" />
+            <!-- 治疗类型 -->
+            <el-table-column
+              prop="TreatmentType"
+              :label="$t('trials:uploadClinicalData:table:treatmentType')"
+            />
+            <!-- 开始日期 -->
+            <el-table-column
+              prop="StartTime"
+              :label="$t('trials:uploadClinicalData:table:treatmentbeginDate')"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.StartTime
+                    ? moment(scope.row.StartTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+            <!-- 结束日期 -->
+            <el-table-column
+              prop="EndTime"
+              :label="$t('trials:uploadClinicalData:table:treatmentendDate')"
+            >
+              <template slot-scope="scope">
+                {{
+                  scope.row.EndTime
+                    ? moment(scope.row.EndTime).format("YYYY-MM-DD")
+                    : ""
+                }}
+              </template>
+            </el-table-column>
+
+            <el-table-column
+              v-if="allowAddOrEdit"
+              :label="$t('common:action:action')"
+              min-width="200"
+            >
+              <template slot-scope="scope">
+                <!-- 编辑 -->
+                <el-button
+                  v-if="allowAddOrEdit"
+                  icon="el-icon-edit-outline"
+                  circle
+                  :title="$t('common:button:edit')"
+                  size="small"
+                  @click.native.prevent="editRow(scope.row, 3)"
+                />
+                <!-- 移除 -->
+                <el-button
+                  v-if="
+                    data.SubmitState * 1 < 2 ||
+                    (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+                  "
+                  icon="el-icon-delete"
+                  circle
+                  :title="$t('common:button:delete')"
+                  size="small"
+                  @click.native.prevent="deletePreviousOther(scope.row)"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- PDF录入 -->
+        <div v-if="cd.ClinicalUploadType === 1">
+          <div v-if="allowAddOrEdit" style="text-align: right">
+            <!-- 下载模板 -->
+            <el-button
+              v-if="cd.Path"
+              type="primary"
+              icon="el-icon-download"
+              size="small"
+              :loading="downloadLoading"
+              @click.native.prevent="handleDownloadTpl(cd)"
+            >
+              {{ $t("trials:uploadClinicalData:button:downloadTemplate") }}
+            </el-button>
+            <!-- 新增 -->
+            <el-button
+              icon="el-icon-plus"
+              type="primary"
+              size="small"
+              @click.native.prevent="addFile(cd.Id, cd.ClinicalDataTrialSetId)"
+            >
+              {{ $t("common:button:new") }}
+            </el-button>
+          </div>
+          <el-table :data="cd.PDFFileList" style="width: 100%" height="300">
+            <el-table-column type="index" width="50" />
+            <!-- 文件名称 -->
+            <el-table-column
+              prop="FileName"
+              :label="$t('trials:uploadClinicalData:table:fileName')"
+              width="250"
+            />
+            <!-- 上传时间 -->
+            <el-table-column
+              prop="CreateTime"
+              :label="$t('trials:uploadClinicalData:table:uploadedTime')"
+              width="200"
+            />
+            <el-table-column :label="$t('common:action:action')" width="200">
+              <template slot-scope="scope">
+                <!-- 预览 -->
+                <el-button
+                  icon="el-icon-view"
+                  circle
+                  :title="$t('trials:uploadClinicalData:action:preview')"
+                  size="small"
+                  @click.native.prevent="preview(scope.row)"
+                />
+                <!-- 移除 -->
+                <el-button
+                  v-if="allowAddOrEdit"
+                  icon="el-icon-delete"
+                  circle
+                  :title="$t('common:button:delete')"
+                  size="small"
+                  @click.native.prevent="deleteFile(scope.row.Id)"
+                />
+              </template>
+            </el-table-column>
+          </el-table>
+        </div>
+        <!-- PDF录入 -->
+        <div v-if="cd.ClinicalUploadType === 2">
+          <clinicalDataQuestions
+            v-if="cd.ClinicalFromList.length > 0"
+            :data="cd"
+            :trial-clinical-id="cd.ClinicalDataTrialSetId"
+            :is-viewer="false"
+            :visit-id="subjectVisitId"
+            :subject-id="data.SubjectId"
+            :trial-id="trialId"
+            :clinical-form-id="cd.ClinicalFromList[0].ClinicalFormId"
+            :open-type="allowAddOrEdit ? 'edit' : 'look'"
+            @close="getClinicalData"
+          />
+          <clinicalDataQuestions
+            v-else
+            :data="cd"
+            :trial-clinical-id="cd.ClinicalDataTrialSetId"
+            :is-viewer="!allowAddOrEdit"
+            :visit-id="subjectVisitId"
+            :subject-id="data.SubjectId"
+            :trial-id="trialId"
+            :open-type="'add'"
+            @close="getClinicalData"
+          />
+        </div>
+      </el-tab-pane>
+    </el-tabs>
+
+    <!-- 既往放疗史 -->
+    <el-dialog
+      v-if="prVisible"
+      :visible.sync="prVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadClinicalData:title:pastTreatment')"
+      width="600px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <PreviousRadiotherapy
+        v-if="prVisible"
+        :data="currentRow"
+        :subject-visit-id="subjectVisitId"
+        @closePRDialog="closePRDialog"
+        @refresh="refresh"
+      />
+    </el-dialog>
+    <!-- 既往手术史  -->
+    <el-dialog
+      v-if="psVisible"
+      :visible.sync="psVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadClinicalData:title:pastSurgery')"
+      width="600px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <PreviousSurgery
+        v-if="psVisible"
+        :data="currentRow"
+        :parent-data="data"
+        :subject-visit-id="subjectVisitId"
+        @closePSDialog="closePSDialog"
+        @refresh="refresh"
+      />
+    </el-dialog>
+    <!-- 既往其他治疗史 -->
+    <el-dialog
+      v-if="poVisible"
+      :visible.sync="poVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadClinicalData:title:others')"
+      width="600px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <PreviousOther
+        v-if="poVisible"
+        :data="currentRow"
+        :parent-data="data"
+        :subject-visit-id="subjectVisitId"
+        @closePODialog="closePODialog"
+        @refresh="refresh"
+      />
+    </el-dialog>
+    <!-- 上传文件 -->
+    <el-dialog
+      v-if="upVisible"
+      :visible.sync="upVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:uploadClinicalData:title:uploadFile')"
+      width="600px"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <PreviousFiles
+        v-if="upVisible"
+        :data="currentRow"
+        :parent-data="data"
+        :subject-visit-id="subjectVisitId"
+        :studyData="studyData"
+        @closeUpDialog="closeUpDialog"
+        @refresh="refresh"
+      />
+    </el-dialog>
+    <!-- 预览文件 -->
+    <el-dialog
+      v-if="previewObj.visible"
+      :visible.sync="previewObj.visible"
+      :title="previewObj.fileName"
+      :fullscreen="true"
+      append-to-body
+      custom-class="base-dialog-wrapper"
+    >
+      <div
+        class="base-modal-body"
+        style="border: 2px solid #ccc; padding: 10px"
+      >
+        <PreviewFile
+          v-if="previewObj.visible"
+          :file-path="previewObj.filePath"
+          :file-type="previewObj.fileType"
+        />
+      </div>
+    </el-dialog>
+  </div>
+</template>
+<script>
+import {
+  deleteReadingClinicalDataPDF,
+  deletePreviousHistory,
+  deletePreviousOther,
+  deletePreviousSurgery,
+} from "@/api/trials";
+import { getCRCClinicalData } from "@/api/trials";
+import PreviousRadiotherapy from "./previousRadiotherapy";
+import PreviousSurgery from "./previousSurgery";
+import PreviousOther from "./previousOther";
+import PreviousFiles from "./previousFiles";
+import clinicalDataQuestions from "@/components/clinicalDataQuestions";
+import PreviewFile from "@/components/PreviewFile/index";
+import moment from "moment";
+export default {
+  name: "uploadPetClinicalData",
+  components: {
+    PreviousRadiotherapy,
+    PreviousSurgery,
+    PreviousOther,
+    PreviousFiles,
+    clinicalDataQuestions,
+    PreviewFile,
+  },
+  props: {
+    data: {
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    studyData: {
+      required: true,
+      type: Object,
+      default() {
+        return {};
+      },
+    },
+    subjectVisitId: {
+      type: String,
+      required: true,
+    },
+    enumType: {
+      type: Number,
+      default: 0,
+    },
+    allowAddOrEdit: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      isShow: false,
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
+      loading: false,
+      PreviousHistoryList: [],
+      PreviousSurgeryList: [],
+      PreviousOtherList: [],
+      PreviousPDFList: [],
+      fileList: [],
+      currentRow: {},
+      prVisible: false,
+      psVisible: false,
+      poVisible: false,
+      upVisible: false,
+      trialId: this.$route.query.trialId,
+      moment,
+      downloadLoading: false,
+      clinicalDatas: [],
+      previewObj: { visible: false, filePath: "", fileType: "" },
+    };
+  },
+  mounted() {
+    this.getClinicalData();
+  },
+  methods: {
+    getClinicalData() {
+      this.loading = true;
+      this.data.TrialId = this.$route.query.trialId;
+      var param = {
+        StudyId: this.studyData.StudyId,
+      };
+      getCRCClinicalData(param)
+        .then((res) => {
+          this.clinicalDatas = res.Result;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
+    },
+    // 打开编辑框
+    editRow(row, type) {
+      if (type === 1) {
+        this.prVisible = true;
+      } else if (type === 2) {
+        this.psVisible = true;
+      } else if (type === 3) {
+        this.poVisible = true;
+      }
+      this.currentRow = { ...row };
+      this.currentRow.TrialId = this.$route.query.trialId;
+    },
+    // 根据ID删除既往放疗史
+    deletePreviousHistory(row) {
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deletePreviousHistory(
+          this.$route.query.trialId,
+          this.subjectVisitId,
+          row.Id
+        )
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+              this.$emit("getStudyInfo");
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
+    },
+    // 根据ID删除既往手术史
+    deletePreviousSurgery(row) {
+      console.log(this.$route.query.trialId);
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        // row.Type = '既往手术史'
+        this.loading = true;
+        deletePreviousSurgery(
+          this.$route.query.trialId,
+          this.subjectVisitId,
+          row.Id
+        )
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+              this.$emit("getStudyInfo");
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
+    },
+    // 根据ID删除既往其他资料史
+    deletePreviousOther(row) {
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        // row.Type = '既往其他治疗史'
+        this.loading = true;
+        deletePreviousOther(
+          this.$route.query.trialId,
+          this.subjectVisitId,
+          row.Id
+        )
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+              this.$emit("getStudyInfo");
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
+    },
+    // 文件预览
+    preview(row) {
+      if (!row.Path) return;
+      this.previewObj.fileName = row.FileName;
+      this.previewObj.filePath = row.Path;
+      this.previewObj.fileType = "pdf";
+      this.previewObj.visible = true;
+      // window.open(this.OSSclientConfig.basePath + path, '_blank')
+    },
+    addPreviousHistory(clinicalDataTrialSetId) {
+      console.log(clinicalDataTrialSetId);
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.prVisible = true;
+    },
+    addPreviousSurgery(clinicalDataTrialSetId) {
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.psVisible = true;
+    },
+    addPreviousOther(clinicalDataTrialSetId) {
+      this.currentRow = { ClinicalDataTrialSetId: clinicalDataTrialSetId };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.poVisible = true;
+    },
+    // 关闭既往放疗史窗口并刷新列表
+    closePRDialog() {
+      this.prVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
+    },
+    closePSDialog() {
+      this.psVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
+    },
+    closePODialog() {
+      this.poVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
+    },
+    closeUpDialog() {
+      this.upVisible = false;
+      this.currentRow.TrialId = this.$route.query.trialId;
+    },
+    refresh() {
+      this.getClinicalData();
+      this.$emit("getStudyInfo");
+    },
+    // 添加文件
+    addFile(id, clinicalDataTrialSetId) {
+      this.currentRow = {
+        Id: id,
+        ClinicalDataTrialSetId: clinicalDataTrialSetId,
+        SubjectId: this.data.SubjectId,
+      };
+      this.currentRow.TrialId = this.$route.query.trialId;
+      this.upVisible = true;
+    },
+    // 删除文件
+    deleteFile(id) {
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
+      }).then(() => {
+        this.loading = true;
+        deleteReadingClinicalDataPDF(id)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              this.getClinicalData();
+              this.$emit("getStudyInfo");
+              this.$message.success(
+                this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+              );
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+          });
+      });
+    },
+    handleDownloadTpl(cd) {
+      window.open(this.OSSclientConfig.basePath + cd.Path);
+    },
+  },
+};
+</script>
+<style lang="scss">
+.clinical-data-wrapper {
+  .box-title {
+    padding: 12px;
+    margin-bottom: 10px;
+    background-color: #dcdfe6;
+  }
+}
+</style>
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index f3108d4a..7395520a 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -572,16 +572,16 @@
           <UploadNonDicomFiles v-if="rowData.Id" :data="rowData" :subject-visit-id="rowData.Id" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :allow-add-or-edit="false" @getList="getList"/>
         </el-card>
         <!-- 临床数据 -->
-        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-title" style="margin-top:10px;">
+        <h4 v-if="rowData.IsBaseLine && (otherInfo.IsHaveSubjectClinicalData||otherInfo.IsHaveVisitClinicalData)" class="box-title" style="margin-top:10px;">
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
-        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-card">
+        <el-card v-if="rowData.IsBaseLine  && (otherInfo.IsHaveSubjectClinicalData||otherInfo.IsHaveVisitClinicalData)" class="box-card">
           <UploadClinicalData v-if="rowData.Id && rowData.IsBaseLine" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="false" :data="rowData" :subject-visit-id="rowData.Id" @getList="getList" />
         </el-card>
-        <h4 v-if="!rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveVisitClinicalData" class="box-title" style="margin-top:10px;">
+        <h4 v-if="!rowData.IsBaseLine &&  otherInfo.IsHaveVisitClinicalData" class="box-title" style="margin-top:10px;">
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
-        <el-card v-if="!rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveVisitClinicalData" class="box-card">
+        <el-card v-if="!rowData.IsBaseLine  && otherInfo.IsHaveVisitClinicalData" class="box-card">
           <UploadClinicalData v-if="rowData.Id" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="false" :data="rowData" :subject-visit-id="rowData.Id" @getList="getList" />
         </el-card>
       </div>
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 7cd75989..9d6891db 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1,50 +1,68 @@
 <template>
   <div v-loading="loading" class="qa-wrapper">
-
-    <div class="qa-content" style="position:relative">
-      <div v-if="existsManual" style="position: absolute;right: 20px;top: 10px;z-index: 9;">
-        <el-button type="text" @click="openManuals">{{$t('trials:reading:button:handbooks')}}</el-button>
+    <div class="qa-content" style="position: relative">
+      <div
+        v-if="existsManual"
+        style="position: absolute; right: 20px; top: 10px; z-index: 9"
+      >
+        <el-button type="text" @click="openManuals">{{
+          $t("trials:reading:button:handbooks")
+        }}</el-button>
       </div>
       <!-- 所有检查信息 -->
-      <el-card shadow="hover" style="min-height:600px;">
+      <el-card shadow="hover" style="min-height: 600px">
         <el-tabs v-model="activeName" type="card">
           <!-- DICOM影像 -->
-          <el-tab-pane v-if="data.DicomStudyCount > 0" :label="$t('trials:audit:tab:dicoms')" name="dicom">
+          <el-tab-pane
+            v-if="data.DicomStudyCount > 0"
+            :label="$t('trials:audit:tab:dicoms')"
+            name="dicom"
+          >
             <el-row>
               <el-col :span="12">
                 <!-- 检查信息 -->
-                <h3>{{ $t('trials:audit:title:dicoms') }}</h3>
+                <h3>{{ $t("trials:audit:title:dicoms") }}</h3>
               </el-col>
               <el-col :span="12">
-
-                <div v-show="isHaveFirstGiveMedicineDate" style="text-align:right;">
+                <div
+                  v-show="isHaveFirstGiveMedicineDate"
+                  style="text-align: right"
+                >
                   <!-- 访视窗口期 -->
                   <h4>
-                    {{ $t('trials:audit:tip:visitWindow') }}:
-                    <span v-if="!!baseDate" style="font-weight:normal;">
+                    {{ $t("trials:audit:tip:visitWindow") }}:
+                    <span v-if="!!baseDate" style="font-weight: normal">
                       {{ `${upperLimit}~${lowerLimit}` }}
                     </span>
                     <!-- 访视基准日期或窗口未设置 -->
-                    <span v-else>{{ $t('trials:audit:tip:visitWindowNotSet') }}</span>
+                    <span v-else>{{
+                      $t("trials:audit:tip:visitWindowNotSet")
+                    }}</span>
                   </h4>
-
                 </div>
               </el-col>
             </el-row>
-            <div style="text-align:right;">
+            <div style="text-align: right">
               <!-- 预览所有影像 -->
-              <el-button size="small" type="primary" style="margin-left:10px;" @click="handleViewImages">
-                {{ $t('trials:audit:button:previewAllDiocms') }}
+              <el-button
+                size="small"
+                type="primary"
+                style="margin-left: 10px"
+                @click="handleViewImages"
+              >
+                {{ $t("trials:audit:button:previewAllDiocms") }}
               </el-button>
               <!-- 预览阅片影像 -->
-              <el-button size="small" type="primary" style="margin-left:10px;" @click="handleViewReadingImages">
-                {{ $t('trials:audit:button:previewReadingDiocms') }}
+              <el-button
+                size="small"
+                type="primary"
+                style="margin-left: 10px"
+                @click="handleViewReadingImages"
+              >
+                {{ $t("trials:audit:button:previewReadingDiocms") }}
               </el-button>
             </div>
-            <el-table
-              :data="studyList"
-              :row-class-name="tableRowClassName"
-            >
+            <el-table :data="studyList" :row-class-name="tableRowClassName">
               <!-- 检查编号 -->
               <el-table-column
                 prop="StudyCode"
@@ -85,20 +103,35 @@
                 :label="$t('trials:audit:table:studyDate')"
               >
                 <template slot-scope="scope">
-                  <el-tooltip class="item" effect="dark" :content="$t('trials:audit:message:qsOverWindow')" placement="bottom">
+                  <el-tooltip
+                    class="item"
+                    effect="dark"
+                    :content="$t('trials:audit:message:qsOverWindow')"
+                    placement="bottom"
+                  >
                     <i
-                      v-if="isHaveFirstGiveMedicineDate && !!baseDate && scope.row.StudyTime && (moment(scope.row.StudyTime).format('YYYY-MM-DD')>lowerLimit || moment(scope.row.StudyTime).format('YYYY-MM-DD')<upperLimit) "
+                      v-if="
+                        isHaveFirstGiveMedicineDate &&
+                        !!baseDate &&
+                        scope.row.StudyTime &&
+                        (moment(scope.row.StudyTime).format('YYYY-MM-DD') >
+                          lowerLimit ||
+                          moment(scope.row.StudyTime).format('YYYY-MM-DD') <
+                            upperLimit)
+                      "
                       class="el-icon-warning"
-                      style="color: #f44336;font-size: 16px;"
+                      style="color: #f44336; font-size: 16px"
                     />
                   </el-tooltip>
 
-                  <span>{{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD') : '' }}</span>
+                  <span>{{
+                    scope.row.StudyTime
+                      ? moment(scope.row.StudyTime).format("YYYY-MM-DD")
+                      : ""
+                  }}</span>
                 </template>
               </el-table-column>
-              <el-table-column
-                :label="$t('common:action:action')"
-              >
+              <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
                   <!-- 预览 -->
                   <el-button
@@ -108,6 +141,19 @@
                     :disabled="scope.row.IsDeleted"
                     @click="handlePreviewStudy(scope.row)"
                   />
+                  <!-- 预览PET-CT数据 -->
+                  <el-button
+                    icon="el-icon-folder"
+                    :title="$t('trials:audit:tab:clinicalData')"
+                    v-if="
+                      ['PT、CT', 'CT、PT', 'PET-CT'].includes(
+                        scope.row.Modalities
+                      ) && IsHaveStudyClinicalData
+                    "
+                    circle
+                    :disabled="scope.row.IsDeleted"
+                    @click="handlePreviewClinicalData(scope.row)"
+                  />
                   <!-- 编辑 -->
                   <el-button
                     icon="el-icon-edit-outline"
@@ -120,11 +166,8 @@
               </el-table-column>
             </el-table>
             <!-- 序列信息 -->
-            <h3>{{ $t('trials:audit:title:series') }}</h3>
-            <el-table
-              :data="seriesList"
-              :row-class-name="tableRowClassName"
-            >
+            <h3>{{ $t("trials:audit:title:series") }}</h3>
+            <el-table :data="seriesList" :row-class-name="tableRowClassName">
               <!-- 序列号 -->
               <el-table-column
                 prop="SeriesNumber"
@@ -139,7 +182,6 @@
               <el-table-column
                 prop="Modality"
                 :label="$t('trials:audit:table:seriesModality')"
-
                 show-overflow-tooltip
               />
               <!-- 图像数量 -->
@@ -151,18 +193,20 @@
               <el-table-column
                 prop="SeriesTime"
                 :label="$t('trials:audit:table:seriesOfStudyDate')"
-
                 show-overflow-tooltip
               >
                 <template slot-scope="scope">
-                  {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD') : '' }}
+                  {{
+                    scope.row.StudyTime
+                      ? moment(scope.row.StudyTime).format("YYYY-MM-DD")
+                      : ""
+                  }}
                 </template>
               </el-table-column>
               <!-- 上传时间 -->
               <el-table-column
                 prop="CreateTime"
                 :label="$t('trials:audit:table:seriesOfUploadedDate')"
-
                 show-overflow-tooltip
               />
               <!-- 是否阅片 -->
@@ -195,9 +239,7 @@
                   />
                 </template>
               </el-table-column>
-              <el-table-column
-                :label="$t('common:action:action')"
-              >
+              <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
                   <!-- 预览 -->
                   <el-button
@@ -207,33 +249,50 @@
                     :disabled="scope.row.IsDeleted"
                     @click="handlePreviewInstance(scope.row)"
                   />
-
                 </template>
               </el-table-column>
             </el-table>
           </el-tab-pane>
           <!-- 非DICOM影像 -->
-          <el-tab-pane v-if="data.NoneDicomStudyCount > 0" :label="$t('trials:audit:tab:nonDicoms')" name="none-dicom">
+          <el-tab-pane
+            v-if="data.NoneDicomStudyCount > 0"
+            :label="$t('trials:audit:tab:nonDicoms')"
+            name="none-dicom"
+          >
             <el-row>
               <!-- 检查信息 -->
-              <el-col :span="12"><h3>{{ $t('trials:audit:title:nonDicomsTitle') }}</h3></el-col>
+              <el-col :span="12"
+                ><h3>{{ $t("trials:audit:title:nonDicomsTitle") }}</h3></el-col
+              >
               <el-col :span="12">
-                <div v-show="isHaveFirstGiveMedicineDate" style="text-align:right;">
+                <div
+                  v-show="isHaveFirstGiveMedicineDate"
+                  style="text-align: right"
+                >
                   <!-- 访视窗口期 -->
-                  <h4>{{ $t('trials:audit:tip:nonDicomsVisitWindow') }}:
-                    <span v-if="!!baseDate" style="font-weight:normal;">
+                  <h4>
+                    {{ $t("trials:audit:tip:nonDicomsVisitWindow") }}:
+                    <span v-if="!!baseDate" style="font-weight: normal">
                       {{ `${upperLimit}~${lowerLimit}` }}
                     </span>
                     <!-- 访视基准日期或窗口未设置 -->
-                    <span v-else>{{ $t('trials:audit:tip:visitWindowNotSet') }}</span>
+                    <span v-else>{{
+                      $t("trials:audit:tip:visitWindowNotSet")
+                    }}</span>
                   </h4>
                 </div>
               </el-col>
             </el-row>
-            <div style="text-align:right;">
+            <div style="text-align: right">
               <!-- 预览 -->
-              <el-button size="small" :disabled="noneDicomStudyList.length === 0" type="primary" style="margin-left:10px;" @click="handleViewAllNoneDicoms">
-                {{ $t('trials:audit:tip:nonDicomsPreviewAll') }}
+              <el-button
+                size="small"
+                :disabled="noneDicomStudyList.length === 0"
+                type="primary"
+                style="margin-left: 10px"
+                @click="handleViewAllNoneDicoms"
+              >
+                {{ $t("trials:audit:tip:nonDicomsPreviewAll") }}
               </el-button>
             </div>
             <el-table :data="noneDicomStudyList">
@@ -262,31 +321,39 @@
                 :label="$t('trials:audit:table:nonDicomsFileCount')"
               >
                 <template slot-scope="scope">
-                  <el-popover v-if="scope.row.FileCount" trigger="click" placement="bottom">
-                    <el-table :data="scope.row.NoneDicomStudyFileList" height="300" size="small">
+                  <el-popover
+                    v-if="scope.row.FileCount"
+                    trigger="click"
+                    placement="bottom"
+                  >
+                    <el-table
+                      :data="scope.row.NoneDicomStudyFileList"
+                      height="300"
+                      size="small"
+                    >
                       <!-- 文件名称 -->
                       <el-table-column
                         prop="FileName"
                         :label="$t('trials:audit:table:nonDicomsFileName')"
                         width="200"
                       />
-                      <el-table-column :label="$t('common:action:action')" width="120">
+                      <el-table-column
+                        :label="$t('common:action:action')"
+                        width="120"
+                      >
                         <template slot-scope="files">
                           <!-- 预览 -->
                           <el-button
                             type="text"
                             @click.native.prevent="previewFile(files.row)"
                           >
-                            {{ $t('trials:audit:button:nonDicomsPreview') }}
+                            {{ $t("trials:audit:button:nonDicomsPreview") }}
                           </el-button>
-
                         </template>
                       </el-table-column>
                     </el-table>
                     <div slot="reference" class="name-wrapper">
-                      <el-button
-                        type="text"
-                      >
+                      <el-button type="text">
                         {{ scope.row.FileCount }}
                       </el-button>
                     </div>
@@ -301,11 +368,21 @@
               >
                 <template slot-scope="scope">
                   <i
-                    v-if="isHaveFirstGiveMedicineDate && !!baseDate && scope.row.ImageDate && (moment(scope.row.ImageDate).format('YYYY-MM-DD')>lowerLimit || moment(scope.row.ImageDate).format('YYYY-MM-DD')<upperLimit)"
+                    v-if="
+                      isHaveFirstGiveMedicineDate &&
+                      !!baseDate &&
+                      scope.row.ImageDate &&
+                      (moment(scope.row.ImageDate).format('YYYY-MM-DD') >
+                        lowerLimit ||
+                        moment(scope.row.ImageDate).format('YYYY-MM-DD') <
+                          upperLimit)
+                    "
                     class="el-icon-warning"
-                    style="color: #f44336;font-size: 16px;"
+                    style="color: #f44336; font-size: 16px"
                   />
-                  <span>{{ moment(scope.row.ImageDate).format('YYYY-MM-DD') }}</span>
+                  <span>{{
+                    moment(scope.row.ImageDate).format("YYYY-MM-DD")
+                  }}</span>
                 </template>
               </el-table-column>
               <!-- 更新时间 -->
@@ -313,17 +390,17 @@
                 prop="UpdateTime"
                 :label="$t('trials:audit:table:nonDicomsUpdateTime')"
               />
-              <el-table-column
-                :label="$t('common:action:action')"
-              >
+              <el-table-column :label="$t('common:action:action')">
                 <template slot-scope="scope">
                   <!-- 预览 -->
                   <el-button
                     icon="el-icon-view"
                     :title="$t('trials:audit:button:nonDicomsPreview')"
                     circle
-                    :disabled="scope.row.FileCount===0"
-                    @click.native.prevent="handlePreviewNoneDicomFiles(scope.row)"
+                    :disabled="scope.row.FileCount === 0"
+                    @click.native.prevent="
+                      handlePreviewNoneDicomFiles(scope.row)
+                    "
                   />
                   <!-- 编辑 -->
                   <el-button
@@ -339,18 +416,33 @@
           </el-tab-pane>
           <!-- 临床数据 -->
           <!-- data.IsBaseLine && relationInfo.TrialClinicalInformationTransmissionEnum*1>0 && data.IsHaveClinicalData -->
-          <el-tab-pane v-if="data.IsHaveClinicalData" :label="$t('trials:audit:tab:clinicalData')" name="clinical-data">
-            <ClinicalData v-if="Object.keys(subjectClinicalData).length>0" :data="data" style="margin-top:5px;" :subject-clinical-data="subjectClinicalData" :enum-type="relationInfo.TrialClinicalInformationTransmissionEnum*1" :subject-visit-id="data.Id" :is-audit="isAudit" :subject-id="data.SubjectId" />
+          <el-tab-pane
+            v-if="data.IsHaveClinicalData"
+            :label="$t('trials:audit:tab:clinicalData')"
+            name="clinical-data"
+          >
+            <ClinicalData
+              v-if="Object.keys(subjectClinicalData).length > 0"
+              :data="data"
+              style="margin-top: 5px"
+              :subject-clinical-data="subjectClinicalData"
+              :enum-type="
+                relationInfo.TrialClinicalInformationTransmissionEnum * 1
+              "
+              :subject-visit-id="data.Id"
+              :is-audit="isAudit"
+              :subject-id="data.SubjectId"
+            />
           </el-tab-pane>
         </el-tabs>
       </el-card>
 
       <!-- 审核问题 -->
       <!-- select/input/textarea/radio -->
-      <el-card shadow="hover" style="margin-top:10px;">
+      <el-card shadow="hover" style="margin-top: 10px">
         <!-- 审核问题 -->
-        <h3>{{ $t('trials:audit:title:questions') }}</h3>
-        <div v-if="qCQuestionAnswerList.length > 0" style="overflow-y: auto;">
+        <h3>{{ $t("trials:audit:title:questions") }}</h3>
+        <div v-if="qCQuestionAnswerList.length > 0" style="overflow-y: auto">
           <QuestionForm
             ref="questions"
             :trial-id="trialId"
@@ -362,7 +454,7 @@
           />
         </div>
         <!-- 暂无数据 -->
-        <h3 v-else>{{ $t('trials:audit:message:noData') }}</h3>
+        <h3 v-else>{{ $t("trials:audit:message:noData") }}</h3>
       </el-card>
 
       <!-- 发起质疑 -->
@@ -375,28 +467,30 @@
         custom-class="base-dialog-wrapper"
         width="1000px"
       >
-        <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
-          <el-form v-if="qcVisible" ref="qcForm" :model="qcForm" label-width="180px" size="small">
+        <div
+          style="
+            padding: 10px;
+            border: 1px solid #e0e0e0;
+            max-height: 650px;
+            overflow-y: auto;
+          "
+        >
+          <el-form
+            v-if="qcVisible"
+            ref="qcForm"
+            :model="qcForm"
+            label-width="180px"
+            size="small"
+          >
             <el-form-item :label="$t('trials:audit:form:questionContent')">
               <!-- :header-row-style="{display:'none'}" -->
-              <el-table
-                :data="qcForm.qcContent"
-                style="width: 100%"
-              >
-                <el-table-column
-                  prop="isSelect"
-                  label=""
-                  width="40"
-                >
+              <el-table :data="qcForm.qcContent" style="width: 100%">
+                <el-table-column prop="isSelect" label="" width="40">
                   <template slot-scope="scope">
                     <el-checkbox v-model="scope.row.isSelect" />
                   </template>
                 </el-table-column>
-                <el-table-column
-                  prop="keyName"
-                  label=""
-                  width="180"
-                >
+                <el-table-column prop="keyName" label="" width="180">
                   <template slot-scope="scope">
                     <span v-html="scope.row.keyName"></span>
                   </template>
@@ -441,20 +535,29 @@
                 size="small"
                 clearable
                 default-time="23:59:59"
-                style="width:100%"
+                style="width: 100%"
               />
             </el-form-item>
-
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
           <!-- 取消 -->
-          <el-button :disabled="btnLoading" size="small" type="primary" @click="qcVisible = false">
-            {{ $t('common:button:cancel') }}
+          <el-button
+            :disabled="btnLoading"
+            size="small"
+            type="primary"
+            @click="qcVisible = false"
+          >
+            {{ $t("common:button:cancel") }}
           </el-button>
           <!-- 保存 -->
-          <el-button size="small" type="primary" :loading="btnLoading" @click="handleSaveQC">
-            {{ $t('common:button:save') }}
+          <el-button
+            size="small"
+            type="primary"
+            :loading="btnLoading"
+            @click="handleSaveQC"
+          >
+            {{ $t("common:button:save") }}
           </el-button>
         </div>
       </el-dialog>
@@ -469,8 +572,13 @@
         width="80%"
         :title="$t('trials:audit:dialogTitle:historicalQuestions')"
       >
-        <div style="text-align:right;">
-          <el-button icon="el-icon-refresh-left" circle :title="$t('trials:audit:button:refreshHistoryQs')" @click="getHistoryInfo" />
+        <div style="text-align: right">
+          <el-button
+            icon="el-icon-refresh-left"
+            circle
+            :title="$t('trials:audit:button:refreshHistoryQs')"
+            @click="getHistoryInfo"
+          />
         </div>
         <el-table
           v-loading="historyLoading"
@@ -486,7 +594,12 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              <el-button :style="{color:scope.row.IsClosed?'':'red'}" type="text" @click="handleReply(scope.row)">{{ scope.row.ChallengeCode }}</el-button>
+              <el-button
+                :style="{ color: scope.row.IsClosed ? '' : 'red' }"
+                type="text"
+                @click="handleReply(scope.row)"
+                >{{ scope.row.ChallengeCode }}</el-button
+              >
             </template>
           </el-table-column>
           <!-- 质疑状态 -->
@@ -497,7 +610,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd('IsClosed', scope.row.IsClosed) }}
+              {{ $fd("IsClosed", scope.row.IsClosed) }}
             </template>
           </el-table-column>
           <!-- 创建时间 -->
@@ -538,9 +651,15 @@
           >
             <template slot-scope="scope">
               <span v-if="scope.row.ReuploadEnum === 0">--</span>
-              <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
-              <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
-              <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{ $fd('ReuploadEnum', scope.row.ReuploadEnum) }}</el-tag>
+              <el-tag v-else-if="scope.row.ReuploadEnum === 1" type="danger">{{
+                $fd("ReuploadEnum", scope.row.ReuploadEnum)
+              }}</el-tag>
+              <el-tag v-else-if="scope.row.ReuploadEnum === 2" type="warning">{{
+                $fd("ReuploadEnum", scope.row.ReuploadEnum)
+              }}</el-tag>
+              <el-tag v-else-if="scope.row.ReuploadEnum === 3" type="primary">{{
+                $fd("ReuploadEnum", scope.row.ReuploadEnum)
+              }}</el-tag>
             </template>
           </el-table-column>
           <!-- 重传完成时间 -->
@@ -566,7 +685,7 @@
             show-overflow-tooltip
           >
             <template slot-scope="scope">
-              {{ $fd('YesOrNo', scope.row.IsOverTime) }}
+              {{ $fd("YesOrNo", scope.row.IsOverTime) }}
             </template>
           </el-table-column>
           <!-- 关闭时间 -->
@@ -576,7 +695,11 @@
             min-width="150"
             show-overflow-tooltip
           />
-          <el-table-column :label="$t('common:action:action')" fixed="right" min-width="160">
+          <el-table-column
+            :label="$t('common:action:action')"
+            fixed="right"
+            min-width="160"
+          >
             <template slot-scope="scope">
               <!-- 回复 -->
               <el-button
@@ -584,7 +707,7 @@
                 :disabled="scope.row.IsClosed || isAudit"
                 @click="handleReply(scope.row)"
               >
-                {{ $t('trials:qcQuality:action:reply') }}
+                {{ $t("trials:qcQuality:action:reply") }}
               </el-button>
               <!-- 关闭 -->
               <el-button
@@ -592,7 +715,7 @@
                 :disabled="scope.row.IsClosed || isAudit"
                 @click="handleCloseQC(scope.row)"
               >
-                {{ $t('trials:qcQuality:action:close') }}
+                {{ $t("trials:qcQuality:action:close") }}
               </el-button>
             </template>
           </el-table-column>
@@ -607,9 +730,18 @@
         custom-class="base-dialog-wrapper"
         append-to-body
         width="800px"
-        :title="$t('trials:qcQuality:dialogTitle:reply') + `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`"
+        :title="
+          $t('trials:qcQuality:dialogTitle:reply') +
+          `(${currentQCRow.SubjectCode} ${currentQCRow.VisitName})`
+        "
       >
-        <chat-form :data="currentQCRow" :sign-text="relationInfo.TrialImageQCSignText" :clinical-enum="relationInfo.ClinicalInformationTransmissionEnum" @close="chatVisible = false" @getDialogList="getDialogList" />
+        <chat-form
+          :data="currentQCRow"
+          :sign-text="relationInfo.TrialImageQCSignText"
+          :clinical-enum="relationInfo.ClinicalInformationTransmissionEnum"
+          @close="chatVisible = false"
+          @getDialogList="getDialogList"
+        />
       </el-dialog>
 
       <!-- 更新检查拍片部位信息 -->
@@ -622,14 +754,24 @@
         custom-class="base-dialog-wrapper"
         width="600px"
       >
-        <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
+        <div
+          style="
+            padding: 10px;
+            border: 1px solid #e0e0e0;
+            max-height: 650px;
+            overflow-y: auto;
+          "
+        >
           <el-form ref="studyForm" :model="studyForm" label-width="100px">
             <!-- 检查编号 -->
             <el-form-item :label="$t('trials:audit:table:studyId')">
               <el-input v-model="studyForm.StudyCode" disabled />
             </el-form-item>
             <!-- 检查类型 -->
-            <el-form-item v-if="studyForm.IsDicomData" :label="$t('trials:audit:table:modality')">
+            <el-form-item
+              v-if="studyForm.IsDicomData"
+              :label="$t('trials:audit:table:modality')"
+            >
               <el-input v-model="studyForm.Modalities" disabled />
             </el-form-item>
             <!-- 检查类型 -->
@@ -638,11 +780,21 @@
               :label="$t('trials:audit:table:modality')"
               prop="Modalities"
               :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+                {
+                  required: true,
+                  message: $t('common:ruleMessage:specify'),
+                  trigger: 'blur',
+                },
               ]"
             >
               <el-radio-group v-model="studyForm.Modality">
-                <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m" style="margin-bottom: 15px;" />
+                <el-radio
+                  v-for="m in trialModalitys"
+                  v-show="m !== ''"
+                  :key="m"
+                  :label="m"
+                  style="margin-bottom: 15px"
+                />
               </el-radio-group>
             </el-form-item>
             <!-- 检查部位 -->
@@ -650,11 +802,20 @@
               :label="$t('trials:audit:table:bodyPart')"
               prop="BodyPartForEdit"
               :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+                {
+                  required: true,
+                  message: $t('common:ruleMessage:specify'),
+                  trigger: 'blur',
+                },
               ]"
             >
               <el-checkbox-group v-model="studyForm.BodyPartForEdit">
-                <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{ $fd('Bodypart',bodyPart) }}</el-checkbox>
+                <el-checkbox
+                  v-for="bodyPart in trialBodyPartTypes"
+                  :key="bodyPart"
+                  :label="bodyPart"
+                  >{{ $fd("Bodypart", bodyPart) }}</el-checkbox
+                >
               </el-checkbox-group>
             </el-form-item>
             <!-- 序列数量 -->
@@ -662,7 +823,10 @@
               <el-input v-model="studyForm.SeriesCount" disabled />
             </el-form-item>
             <!-- 图像数量 -->
-            <el-form-item v-if="studyForm.InstanceCount" :label="$t('trials:audit:table:instanceCount')">
+            <el-form-item
+              v-if="studyForm.InstanceCount"
+              :label="$t('trials:audit:table:instanceCount')"
+            >
               <el-input v-model="studyForm.InstanceCount" disabled />
             </el-form-item>
             <!-- 检查日期 -->
@@ -673,17 +837,27 @@
                 type="date"
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
-                style="width:100%;"
+                style="width: 100%"
               />
             </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button :disabled="btnLoading" size="small" type="primary" @click="editStudyInfoVisible = false">
-            {{ $t('common:button:cancel') }}
+          <el-button
+            :disabled="btnLoading"
+            size="small"
+            type="primary"
+            @click="editStudyInfoVisible = false"
+          >
+            {{ $t("common:button:cancel") }}
           </el-button>
-          <el-button :loading="btnLoading" size="small" type="primary" @click="handleUpdateStudyInfo">
-            {{ $t('common:button:save') }}
+          <el-button
+            :loading="btnLoading"
+            size="small"
+            type="primary"
+            @click="handleUpdateStudyInfo"
+          >
+            {{ $t("common:button:save") }}
           </el-button>
         </div>
       </el-dialog>
@@ -698,10 +872,19 @@
         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: 18px">{{
+            $t("common:dialogTitle:sign")
+          }}</span>
+          <span style="font-size: 12px; margin-left: 5px">{{
+            `(${$t("common:label:sign")}${currentUser})`
+          }}</span>
         </div>
-        <SignForm ref="signForm" :sign-code-enum="signCode" :subject-visit-id="data.Id" @closeDialog="closeSignDialog" />
+        <SignForm
+          ref="signForm"
+          :sign-code-enum="signCode"
+          :subject-visit-id="data.Id"
+          @closeDialog="closeSignDialog"
+        />
       </el-dialog>
       <!-- 编辑非Dicom文件 -->
       <el-dialog
@@ -713,8 +896,19 @@
         custom-class="base-dialog-wrapper"
         width="600px"
       >
-        <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
-          <el-form ref="noneDicomForm" :model="noneDicomForm" label-width="100px">
+        <div
+          style="
+            padding: 10px;
+            border: 1px solid #e0e0e0;
+            max-height: 650px;
+            overflow-y: auto;
+          "
+        >
+          <el-form
+            ref="noneDicomForm"
+            :model="noneDicomForm"
+            label-width="100px"
+          >
             <!-- 检查编号 -->
             <el-form-item :label="$t('trials:audit:table:nonDicomsStudyId')">
               <el-input v-model="noneDicomForm.CodeView" disabled />
@@ -724,11 +918,21 @@
               :label="$t('trials:audit:table:nonDicomsModality')"
               prop="Modality"
               :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+                {
+                  required: true,
+                  message: $t('common:ruleMessage:specify'),
+                  trigger: 'blur',
+                },
               ]"
             >
               <el-radio-group v-model="noneDicomForm.Modality">
-                <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m" style="margin-bottom: 15px;" />
+                <el-radio
+                  v-for="m in trialModalitys"
+                  v-show="m !== ''"
+                  :key="m"
+                  :label="m"
+                  style="margin-bottom: 15px"
+                />
               </el-radio-group>
             </el-form-item>
             <!-- 检查部位 -->
@@ -736,11 +940,20 @@
               :label="$t('trials:audit:table:nonDicomsBodypart')"
               prop="BodyParts"
               :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
+                {
+                  required: true,
+                  message: $t('common:ruleMessage:specify'),
+                  trigger: 'blur',
+                },
               ]"
             >
               <el-checkbox-group v-model="noneDicomForm.BodyParts">
-                <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{ $fd('Bodypart',bodyPart) }}</el-checkbox>
+                <el-checkbox
+                  v-for="bodyPart in trialBodyPartTypes"
+                  :key="bodyPart"
+                  :label="bodyPart"
+                  >{{ $fd("Bodypart", bodyPart) }}</el-checkbox
+                >
               </el-checkbox-group>
             </el-form-item>
             <!-- 检查日期 -->
@@ -755,17 +968,27 @@
                 :picker-options="pickerOption"
                 value-format="yyyy-MM-dd"
                 format="yyyy-MM-dd"
-                style="width:100%;"
+                style="width: 100%"
               />
             </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button :disabled="btnLoading" size="small" type="primary" @click="editNoneDicomVisible = false">
-            {{ $t('common:button:cancel') }}
+          <el-button
+            :disabled="btnLoading"
+            size="small"
+            type="primary"
+            @click="editNoneDicomVisible = false"
+          >
+            {{ $t("common:button:cancel") }}
           </el-button>
-          <el-button :loading="btnLoading" size="small" type="primary" @click="handleUpdateNoneDicomInfo">
-            {{ $t('common:button:save') }}
+          <el-button
+            :loading="btnLoading"
+            size="small"
+            type="primary"
+            @click="handleUpdateNoneDicomInfo"
+          >
+            {{ $t("common:button:save") }}
           </el-button>
         </div>
       </el-dialog>
@@ -780,7 +1003,14 @@
         width="600px"
         :title="$t('trials:qcQuality:dialogTitle:closeQuestion')"
       >
-        <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
+        <div
+          style="
+            padding: 10px;
+            border: 1px solid #e0e0e0;
+            max-height: 650px;
+            overflow-y: auto;
+          "
+        >
           <el-form
             ref="closeQuestionForm"
             :model="closeQuestionForm"
@@ -791,14 +1021,18 @@
               :label="$t('trials:qcQuality:label:closeReason')"
               prop="Type"
               :rules="[
-                { required: true, message: $t('common:ruleMessage:select')},
+                { required: true, message: $t('common:ruleMessage:select') },
               ]"
             >
               <el-radio-group v-model="closeQuestionForm.Type">
                 <!-- 问题已解决 -->
-                <el-radio :label="1">{{ $t('trials:qcQuality:radio:reason1') }}</el-radio>
+                <el-radio :label="1">{{
+                  $t("trials:qcQuality:radio:reason1")
+                }}</el-radio>
                 <!-- 问题无法解决强制关闭质疑 -->
-                <el-radio :label="2">{{ $t('trials:qcQuality:radio:reason2') }}</el-radio>
+                <el-radio :label="2">{{
+                  $t("trials:qcQuality:radio:reason2")
+                }}</el-radio>
                 <!--                &lt;!&ndash; 其他 &ndash;&gt;-->
                 <!--                <el-radio :label="3">{{ $t('trials:qcQuality:radio:reason3') }}</el-radio>-->
               </el-radio-group>
@@ -808,23 +1042,33 @@
               :label="$t('trials:consistencyCheck:label:closereason')"
               prop="Remake"
               :rules="[
-                { required: true, message: $t('common:ruleMessage:specify')},
+                { required: true, message: $t('common:ruleMessage:specify') },
               ]"
             >
               <el-input
                 v-model="closeQuestionForm.Remake"
                 type="textarea"
-                :autosize="{ minRows: 2, maxRows: 4}"
+                :autosize="{ minRows: 2, maxRows: 4 }"
               />
             </el-form-item>
           </el-form>
         </div>
         <div slot="footer" class="dialog-footer">
-          <el-button :disabled="closeBtnLoading" size="small" type="primary" @click="closeQuestionVisible = false">
-            {{ $t('common:button:cancel') }}
+          <el-button
+            :disabled="closeBtnLoading"
+            size="small"
+            type="primary"
+            @click="closeQuestionVisible = false"
+          >
+            {{ $t("common:button:cancel") }}
           </el-button>
-          <el-button :loading="closeBtnLoading" size="small" type="primary" @click="handleCloseQuestion">
-            {{ $t('common:button:save') }}
+          <el-button
+            :loading="closeBtnLoading"
+            size="small"
+            type="primary"
+            @click="handleCloseQuestion"
+          >
+            {{ $t("common:button:save") }}
           </el-button>
         </div>
       </el-dialog>
@@ -836,84 +1080,159 @@
         append-to-body
         width="565px"
       >
-        <div v-loading="imgObj.loading" class="base-modal-body" style="border:2px solid #ccc;padding: 10px;">
+        <div
+          v-loading="imgObj.loading"
+          class="base-modal-body"
+          style="border: 2px solid #ccc; padding: 10px"
+        >
           <el-image
             :src="`/api${imgObj.url}`"
             fit="fit"
-            style="height:500px;width:500px"
+            style="height: 500px; width: 500px"
             @error="imgObj.loading = false"
             @load="imgObj.loading = false"
           />
         </div>
-
       </el-dialog>
     </div>
     <div class="function-wrapper">
       <!-- 保存 -->
-      <el-button :disabled="isAudit" size="small" type="primary" round @click="handleSave">
-        {{ $t('trials:audit:button:save') }}
+      <el-button
+        :disabled="isAudit"
+        size="small"
+        type="primary"
+        round
+        @click="handleSave"
+      >
+        {{ $t("trials:audit:button:save") }}
       </el-button>
       <!-- 发质疑 -->
-      <el-button :disabled="isAudit" size="small" type="primary" round @click="handleQC">
-        {{ $t('trials:audit:button:question') }}
+      <el-button
+        :disabled="isAudit"
+        size="small"
+        type="primary"
+        round
+        @click="handleQC"
+      >
+        {{ $t("trials:audit:button:question") }}
       </el-button>
       <!-- 历史质疑 -->
       <el-button size="small" type="primary" round @click="handleHistoryQC">
-        {{ `${$t('trials:audit:button:historicalQuestions')}(${relationInfo.TotalChallengeCount !== undefined ?relationInfo.TotalChallengeCount:0}, ${relationInfo.NotClosedChallengeCount !== undefined?relationInfo.NotClosedChallengeCount:0})` }}
+        {{
+          `${$t("trials:audit:button:historicalQuestions")}(${
+            relationInfo.TotalChallengeCount !== undefined
+              ? relationInfo.TotalChallengeCount
+              : 0
+          }, ${
+            relationInfo.NotClosedChallengeCount !== undefined
+              ? relationInfo.NotClosedChallengeCount
+              : 0
+          })`
+        }}
       </el-button>
 
       <!-- 审核通过 -->
-      <el-button :disabled="isAudit" size="small" type="primary" round @click="handleQCState(8)">
-        {{ $t('trials:audit:button:auditPassed') }}
+      <el-button
+        :disabled="isAudit"
+        size="small"
+        type="primary"
+        round
+        @click="handleQCState(8)"
+      >
+        {{ $t("trials:audit:button:auditPassed") }}
       </el-button>
       <!-- 审核终止 -->
       <!--      <el-button :disabled="isAudit" size="small" type="primary" round @click="handleQCState(7)">-->
       <!--        {{ $t('trials:audit:button:auditFailed') }}-->
       <!--      </el-button>-->
     </div>
-
+    <!--pet-ct临床数据预览-->
+    <el-dialog
+      v-if="petVisible"
+      :show-close="true"
+      :visible.sync="petVisible"
+      append-to-body
+    >
+      <uploadPetClinicalData
+        :subject-visit-id="data.Id"
+        :data="data"
+        :studyData="rowData"
+        :allow-add-or-edit="false"
+      />
+    </el-dialog>
   </div>
 </template>
 <script>
-import { collectNextIQCQuality, getNextIQCQuality, getVisitQCInfo, getQCQuestionAnswerList, getHistoryChallengeList, getVisitQCStudyAndSeriesList, getNoneDicomStudyList, verifyCanQCPassedOrFailed, verifyQCCanAddChallenge, setSeriesStatus, addOrUpdateNoneDicomStudy, addOrUpdateQCQuestionAnswerList, addOrUpdateQCChallenge, closeQCChallenge, updateModality, getQCChallengeDialogList } from '@/api/trials'
-import { qCPassedOrFailed } from '@/api/trials/visit'
-import { getBasicDataSelects } from '@/api/dictionary/dictionary'
-import ChatForm from './chatForm'
-import QuestionForm from './questions'
-import moment from 'moment'
-import ClinicalData from './clinicalData'
-import SignForm from '@/views/trials/components/newSignForm'
-import { getToken } from '@/utils/auth'
-import const_ from '@/const/sign-code'
+import {
+  collectNextIQCQuality,
+  getNextIQCQuality,
+  getVisitQCInfo,
+  getQCQuestionAnswerList,
+  getHistoryChallengeList,
+  getVisitQCStudyAndSeriesList,
+  getNoneDicomStudyList,
+  verifyCanQCPassedOrFailed,
+  verifyQCCanAddChallenge,
+  setSeriesStatus,
+  addOrUpdateNoneDicomStudy,
+  addOrUpdateQCQuestionAnswerList,
+  addOrUpdateQCChallenge,
+  closeQCChallenge,
+  updateModality,
+  getQCChallengeDialogList,
+} from "@/api/trials";
+import { qCPassedOrFailed } from "@/api/trials/visit";
+import { getBasicDataSelects } from "@/api/dictionary/dictionary";
+import ChatForm from "./chatForm";
+import QuestionForm from "./questions";
+import moment from "moment";
+import ClinicalData from "./clinicalData";
+import SignForm from "@/views/trials/components/newSignForm";
+import { getToken } from "@/utils/auth";
+import const_ from "@/const/sign-code";
+import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
 export default {
-  name: 'QualityAssurance',
-  components: { ChatForm, ClinicalData, QuestionForm, SignForm },
+  name: "QualityAssurance",
+  components: {
+    ChatForm,
+    ClinicalData,
+    QuestionForm,
+    SignForm,
+    uploadPetClinicalData,
+  },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
+        return {};
+      },
     },
     disabled: {
       type: Boolean,
-      default: false
+      default: false,
     },
     qType: {
       type: Number,
-      default: 1
-    }
+      default: 1,
+    },
   },
   data() {
     return {
-      activeName: this.data.DicomStudyCount > 0 ? 'dicom' : 'none-dicom',
+      activeName: this.data.DicomStudyCount > 0 ? "dicom" : "none-dicom",
       questionForm: {},
       qCQuestionAnswerList: [],
       studyList: [],
       seriesList: [],
       relationInfo: {},
       noneDicomStudyList: [],
-      qcForm: { subjectVisitId: '', challengeType: '', content: '', actionContent: '', deadlineTime: '', qcContent: '' },
+      qcForm: {
+        subjectVisitId: "",
+        challengeType: "",
+        content: "",
+        actionContent: "",
+        deadlineTime: "",
+        qcContent: "",
+      },
       qcVisible: false,
       chatVisible: false,
       loading: false,
@@ -922,170 +1241,238 @@ export default {
       historyList: [],
       historyLoading: false,
       editStudyInfoVisible: false,
-      studyForm: { StudyCode: '', IsDicomData: true, Modalities: '', BodyPartForEdit: [], SeriesCount: null, StudyTime: '' },
+      studyForm: {
+        StudyCode: "",
+        IsDicomData: true,
+        Modalities: "",
+        BodyPartForEdit: [],
+        SeriesCount: null,
+        StudyTime: "",
+      },
       currentQCRow: {},
       isAudit: false, // 审核过之后功能按钮禁用标识
-      qcType: '',
+      qcType: "",
       trialBodyPartTypes: [],
       trialModalitys: [],
       signVisible: false,
-      signCode: '',
+      signCode: "",
       auditState: null,
-      currentNoneDicomId: '',
+      currentNoneDicomId: "",
       editNoneDicomVisible: false,
-      noneDicomForm: { Id: '', CodeView: '', BodyParts: [], Modality: '', ImageDate: '' },
+      noneDicomForm: {
+        Id: "",
+        CodeView: "",
+        BodyParts: [],
+        Modality: "",
+        ImageDate: "",
+      },
       subjectClinicalData: {},
       moment,
       currentQCType: null,
-      currentUser: zzSessionStorage.getItem('userName'),
+      currentUser: zzSessionStorage.getItem("userName"),
       pickerOption: {
-        disabledDate: time => {
-          return time.getTime() > Date.now()
-        }
+        disabledDate: (time) => {
+          return time.getTime() > Date.now();
+        },
       },
       isHaveFirstGiveMedicineDate: false,
-      baseDate: '',
-      upperLimit: '', // 超期上限
-      lowerLimit: '', // 超期下限
-      closeQuestionForm: { Id: '', SubjectVisitId: '', Type: null, Reason: '', Remake: '' },
+      baseDate: "",
+      upperLimit: "", // 超期上限
+      lowerLimit: "", // 超期下限
+      closeQuestionForm: {
+        Id: "",
+        SubjectVisitId: "",
+        Type: null,
+        Reason: "",
+        Remake: "",
+      },
       closeBtnLoading: false,
       closeQuestionVisible: false,
-      trialId: '',
+      trialId: "",
       dictionaryList: {},
       currentSeriesIsReading: false,
       currentSeriesIsDeleted: false,
-      imgObj: { url: '', visible: false, loading: false },
+      imgObj: { url: "", visible: false, loading: false },
       open: null,
-      existsManual: false
-    }
+      existsManual: false,
+
+      // pet-ct临床数据
+      petVisible: false,
+      rowData: {},
+      IsHaveStudyClinicalData: false,
+    };
   },
   mounted() {
     if (this.disabled) {
-      this.isAudit = true
-      this.currentQCType = this.qType
+      this.isAudit = true;
+      this.currentQCType = this.qType;
     } else {
-      this.currentQCType = this.data.AuditState < 6 ? 1 : 2
+      this.currentQCType = this.data.AuditState < 6 ? 1 : 2;
     }
-    window.addEventListener('message', this.receiveMsg)
+    window.addEventListener("message", this.receiveMsg);
 
-    this.trialId = this.$route.query.trialId
-    this.getQCInfo()
-    this.getDicData()
+    this.trialId = this.$route.query.trialId;
+    this.getQCInfo();
+    this.getDicData();
     // this.handleViewImages()
     // this.handleViewAllNoneDicoms()
   },
   beforeDestroy() {
     if (this.open) {
-      this.open.close()
+      this.open.close();
     }
   },
   methods: {
     // 获取QC界面基本信息
     getQCInfo() {
-      this.loading = true
-      getVisitQCInfo(this.data.Id, this.data.QCProcessEnum, this.currentQCType).then(res => {
-        this.existsManual = res.Result.ExistsManual
-        this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList
-        this.studyList = res.Result.StudyList
-        this.seriesList = res.Result.SeriesList
-        this.noneDicomStudyList = res.Result.NoneDicomStudyList
-        this.relationInfo = res.Result.RelationInfo
-        this.trialBodyPartTypes =
-        this.relationInfo.TrialBodyPartTypes ? this.relationInfo.TrialBodyPartTypes.trim().split('|') : []
-        this.trialModalitys =
-        this.relationInfo.TrialModalitys ? this.relationInfo.TrialModalitys.trim().split('|') : []
-        this.subjectClinicalData = res.Result.SubjectClinicalData
-        this.baseDate = res.Result.RelationInfo.SubjectFirstGiveMedicineTime
-        if (this.baseDate) {
-          const uDay = res.Result.RelationInfo.VisitDay * 1 + res.Result.RelationInfo.VisitWindowLeft * 1
-          this.upperLimit = moment(this.baseDate, 'YYYY-MM-DD').add(uDay, 'days').format('YYYY-MM-DD')
-          const lDay = res.Result.RelationInfo.VisitDay * 1 + res.Result.RelationInfo.VisitWindowRight * 1
-          this.lowerLimit = moment(this.baseDate, 'YYYY-MM-DD').add(lDay, 'days').format('YYYY-MM-DD')
-        }
-        this.isHaveFirstGiveMedicineDate = res.Result.RelationInfo.IsHaveFirstGiveMedicineDate
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
+      this.loading = true;
+      getVisitQCInfo(this.data.Id, this.data.QCProcessEnum, this.currentQCType)
+        .then((res) => {
+          this.existsManual = res.Result.ExistsManual;
+          this.qCQuestionAnswerList = res.Result.QCQuestionAnswerList;
+          this.IsHaveStudyClinicalData = res.Result.IsHaveStudyClinicalData;
+          this.studyList = res.Result.StudyList;
+          this.seriesList = res.Result.SeriesList;
+          this.noneDicomStudyList = res.Result.NoneDicomStudyList;
+          this.relationInfo = res.Result.RelationInfo;
+          this.trialBodyPartTypes = this.relationInfo.TrialBodyPartTypes
+            ? this.relationInfo.TrialBodyPartTypes.trim().split("|")
+            : [];
+          this.trialModalitys = this.relationInfo.TrialModalitys
+            ? this.relationInfo.TrialModalitys.trim().split("|")
+            : [];
+          this.subjectClinicalData = res.Result.SubjectClinicalData;
+          this.baseDate = res.Result.RelationInfo.SubjectFirstGiveMedicineTime;
+          if (this.baseDate) {
+            const uDay =
+              res.Result.RelationInfo.VisitDay * 1 +
+              res.Result.RelationInfo.VisitWindowLeft * 1;
+            this.upperLimit = moment(this.baseDate, "YYYY-MM-DD")
+              .add(uDay, "days")
+              .format("YYYY-MM-DD");
+            const lDay =
+              res.Result.RelationInfo.VisitDay * 1 +
+              res.Result.RelationInfo.VisitWindowRight * 1;
+            this.lowerLimit = moment(this.baseDate, "YYYY-MM-DD")
+              .add(lDay, "days")
+              .format("YYYY-MM-DD");
+          }
+          this.isHaveFirstGiveMedicineDate =
+            res.Result.RelationInfo.IsHaveFirstGiveMedicineDate;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 刷新审核问题列表
     getCheckList() {
-      this.loading = true
-      getQCQuestionAnswerList(this.trialId, this.data.Id, this.data.QCProcessEnum, this.currentQCType).then(res => {
-        this.loading = false
-        res.Result.forEach((element, index) => {
-          // this.qCQuestionAnswerList
-          this.$set(this.qCQuestionAnswerList[index], 'Id', element.Id)
+      this.loading = true;
+      getQCQuestionAnswerList(
+        this.trialId,
+        this.data.Id,
+        this.data.QCProcessEnum,
+        this.currentQCType
+      )
+        .then((res) => {
+          this.loading = false;
+          res.Result.forEach((element, index) => {
+            // this.qCQuestionAnswerList
+            this.$set(this.qCQuestionAnswerList[index], "Id", element.Id);
+          });
         })
-      }).catch(() => {
-        this.loading = false
-      })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 保存审核问题
     handleSave(isMessage) {
-      return new Promise(resolve => {
-        this.$refs['questions'].submit().then(res => {
-          var answerList = []
-          res.forEach(item => {
-            var index = this.qCQuestionAnswerList.findIndex(v => v.TrialQCQuestionConfigureId === item.Id)
-            if (index > -1) {
-              answerList.push({ id: this.qCQuestionAnswerList[index].Id, answer: item.answer, trialQCQuestionConfigureId: item.Id })
-            }
-          })
-          this.loading = true
-          addOrUpdateQCQuestionAnswerList(this.trialId, this.data.Id, this.data.QCProcessEnum, this.currentQCType, answerList).then(res => {
-            this.loading = false
-            if (res.IsSuccess) {
-              if (isMessage !== true) {
-                this.$message.success(this.$t('common:message:savedSuccessfully'))
+      return new Promise((resolve) => {
+        this.$refs["questions"]
+          .submit()
+          .then((res) => {
+            var answerList = [];
+            res.forEach((item) => {
+              var index = this.qCQuestionAnswerList.findIndex(
+                (v) => v.TrialQCQuestionConfigureId === item.Id
+              );
+              if (index > -1) {
+                answerList.push({
+                  id: this.qCQuestionAnswerList[index].Id,
+                  answer: item.answer,
+                  trialQCQuestionConfigureId: item.Id,
+                });
               }
-              this.getCheckList()
-              resolve(true)
-            }
-          }).catch(() => {
-            this.loading = false
-            resolve(false)
+            });
+            this.loading = true;
+            addOrUpdateQCQuestionAnswerList(
+              this.trialId,
+              this.data.Id,
+              this.data.QCProcessEnum,
+              this.currentQCType,
+              answerList
+            )
+              .then((res) => {
+                this.loading = false;
+                if (res.IsSuccess) {
+                  if (isMessage !== true) {
+                    this.$message.success(
+                      this.$t("common:message:savedSuccessfully")
+                    );
+                  }
+                  this.getCheckList();
+                  resolve(true);
+                }
+              })
+              .catch(() => {
+                this.loading = false;
+                resolve(false);
+              });
           })
-        }).catch(() => {
-          this.loading = false
-          resolve(false)
-        })
-      })
+          .catch(() => {
+            this.loading = false;
+            resolve(false);
+          });
+      });
     },
     // 保存质疑
     handleSaveQC() {
-      this.$refs['qcForm'].validate((valid) => {
-        if (!valid) return
-        this.btnLoading = true
-        this.qcForm.subjectVisitId = this.data.Id
-        var contents = []
-        var types = []
-        var actions = []
-        this.qcForm.qcContent.forEach(item => {
+      this.$refs["qcForm"].validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.qcForm.subjectVisitId = this.data.Id;
+        var contents = [];
+        var types = [];
+        var actions = [];
+        this.qcForm.qcContent.forEach((item) => {
           if (item.isSelect) {
-            types.push(`${item.keyName}`)
-            var str = `${item.keyName} <br>`
+            types.push(`${item.keyName}`);
+            var str = `${item.keyName} <br>`;
             if (item.keyValue) {
               // 问题总结
-              str = `${str}${this.$t('trials:audit:form:questionSummary')}：${item.keyValue}<br>`
+              str = `${str}${this.$t("trials:audit:form:questionSummary")}：${
+                item.keyValue
+              }<br>`;
             }
             if (item.actionContent) {
               // 行动事项
-              actions.push(`${item.actionContent}`)
-              str = `${str}${this.$t('trials:audit:form:actionMatters')}：${item.actionContent}<br>`
+              actions.push(`${item.actionContent}`);
+              str = `${str}${this.$t("trials:audit:form:actionMatters")}：${
+                item.actionContent
+              }<br>`;
             }
-            contents.push(str)
+            contents.push(str);
           }
-        })
+        });
         if (contents.length === 0) {
           // 质疑内容不能为空！
-          this.$alert(this.$t('trials:audit:message:qsContentIsNull'))
-          this.btnLoading = false
-          return
+          this.$alert(this.$t("trials:audit:message:qsContentIsNull"));
+          this.btnLoading = false;
+          return;
         } else {
-          this.qcForm.content = contents.join('|')
-          this.qcForm.challengeType = types.join('|')
-          this.qcForm.actionContent = actions.join('|')
+          this.qcForm.content = contents.join("|");
+          this.qcForm.challengeType = types.join("|");
+          this.qcForm.actionContent = actions.join("|");
         }
         var params = {
           challengeType: this.qcForm.challengeType,
@@ -1093,595 +1480,771 @@ export default {
           content: this.qcForm.content,
           actionContent: this.qcForm.actionContent,
           reuploadEnum: 0,
-          deadlineTime: this.qcForm.deadlineTime
-        }
-        addOrUpdateQCChallenge(this.trialId, this.data.QCProcessEnum, this.currentQCType, params).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.qcVisible = false
-            this.relationInfo.TotalChallengeCount++
-            this.relationInfo.NotClosedChallengeCount++
-          }
-        }).catch(() => { this.btnLoading = false })
-      })
+          deadlineTime: this.qcForm.deadlineTime,
+        };
+        addOrUpdateQCChallenge(
+          this.trialId,
+          this.data.QCProcessEnum,
+          this.currentQCType,
+          params
+        )
+          .then((res) => {
+            this.btnLoading = false;
+            if (res.IsSuccess) {
+              this.$message.success(
+                this.$t("common:message:savedSuccessfully")
+              );
+              this.qcVisible = false;
+              this.relationInfo.TotalChallengeCount++;
+              this.relationInfo.NotClosedChallengeCount++;
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     // 打开发起质疑弹窗
     handleQC() {
-      this.loading = true
+      this.loading = true;
       // 检验qc审核问题是否保存，否则不允许发质疑
-      verifyQCCanAddChallenge(this.trialId, this.data.Id, this.currentQCType).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          this.renderQCForm()
-        }
-      }).catch(() => { this.loading = false })
+      verifyQCCanAddChallenge(this.trialId, this.data.Id, this.currentQCType)
+        .then((res) => {
+          this.loading = false;
+          if (res.IsSuccess) {
+            this.renderQCForm();
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     handleQCVerify() {
-      this.loading = true
-      return new Promise(resolve => {
-        verifyQCCanAddChallenge(this.trialId, this.data.Id, this.currentQCType).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            resolve(true)
-          } else {
-            resolve(false)
-          }
-        }).catch(() => {
-          this.loading = false
-          resolve(false)
-        })
-      })
+      this.loading = true;
+      return new Promise((resolve) => {
+        verifyQCCanAddChallenge(this.trialId, this.data.Id, this.currentQCType)
+          .then((res) => {
+            this.loading = false;
+            if (res.IsSuccess) {
+              resolve(true);
+            } else {
+              resolve(false);
+            }
+          })
+          .catch(() => {
+            this.loading = false;
+            resolve(false);
+          });
+      });
     },
     // 渲染发质疑窗口
     renderQCForm() {
-      var contents = []
-      const challengeType = this.dictionaryList['ChallengeType']
-      challengeType.forEach(i => {
-        contents.push({ keyName: i.Value, keyValue: '', isSelect: false })
-      })
-      var isHyperwindow = false
+      var contents = [];
+      const challengeType = this.dictionaryList["ChallengeType"];
+      challengeType.forEach((i) => {
+        contents.push({ keyName: i.Value, keyValue: "", isSelect: false });
+      });
+      var isHyperwindow = false;
       if (this.isHaveFirstGiveMedicineDate && !!this.baseDate) {
-        isHyperwindow = this.isHyperwindow()
+        isHyperwindow = this.isHyperwindow();
       }
       if (isHyperwindow) {
-        contents.push({ keyName: this.$t('trials:audit:message:qsOverWindow'), keyValue: `${this.$t('trials:audit:message:qsOverWindow1')}：${this.upperLimit}~${this.lowerLimit}，${this.$t('trials:audit:message:qsOverWindow2')}：${moment(this.relationInfo.EarliestScanDate).format('YYYY-MM-DD')}~${moment(this.relationInfo.LatestScanDate).format('YYYY-MM-DD')},${this.$t('trials:audit:message:qsOverWindow3')}`, isSelect: false, actionContent: this.$t('trials:audit:message:qsOverWindow4') })
+        contents.push({
+          keyName: this.$t("trials:audit:message:qsOverWindow"),
+          keyValue: `${this.$t("trials:audit:message:qsOverWindow1")}：${
+            this.upperLimit
+          }~${this.lowerLimit}，${this.$t(
+            "trials:audit:message:qsOverWindow2"
+          )}：${moment(this.relationInfo.EarliestScanDate).format(
+            "YYYY-MM-DD"
+          )}~${moment(this.relationInfo.LatestScanDate).format(
+            "YYYY-MM-DD"
+          )},${this.$t("trials:audit:message:qsOverWindow3")}`,
+          isSelect: false,
+          actionContent: this.$t("trials:audit:message:qsOverWindow4"),
+        });
       }
-      this.qcForm.qcContent = contents
-      const day = this.relationInfo.TrialChangeDefalutDays
-      this.qcForm.deadlineTime = moment().add(day * 1, 'days').format('YYYY-MM-DD HH:mm:ss')
-      this.qcVisible = true
+      this.qcForm.qcContent = contents;
+      const day = this.relationInfo.TrialChangeDefalutDays;
+      this.qcForm.deadlineTime = moment()
+        .add(day * 1, "days")
+        .format("YYYY-MM-DD HH:mm:ss");
+      this.qcVisible = true;
     },
     isHyperwindow() {
-      var isHyperwindow = false
-      if (this.relationInfo.EarliestScanDate < this.upperLimit || this.relationInfo.LatestScanDate > this.lowerLimit) {
-        isHyperwindow = true
+      var isHyperwindow = false;
+      if (
+        this.relationInfo.EarliestScanDate < this.upperLimit ||
+        this.relationInfo.LatestScanDate > this.lowerLimit
+      ) {
+        isHyperwindow = true;
       }
-      return isHyperwindow
+      return isHyperwindow;
     },
     // 获取字典数据
     getDicData() {
-      getBasicDataSelects(['ChallengeType']).then(res => {
-        this.dictionaryList = { ...res.Result }
-      })
+      getBasicDataSelects(["ChallengeType"]).then((res) => {
+        this.dictionaryList = { ...res.Result };
+      });
     },
     // 打开历史质疑弹窗
     handleHistoryQC() {
-      this.historyVisible = true
-      this.getHistoryInfo()
+      this.historyVisible = true;
+      this.getHistoryInfo();
     },
     // 获取历史质疑记录
     getHistoryInfo() {
-      this.historyLoading = true
-      getHistoryChallengeList(this.data.Id, this.data.QCProcessEnum, this.currentQCType).then(res => {
-        this.historyList = res.Result
-        this.historyLoading = false
-      }).catch(() => { this.historyLoading = false })
+      this.historyLoading = true;
+      getHistoryChallengeList(
+        this.data.Id,
+        this.data.QCProcessEnum,
+        this.currentQCType
+      )
+        .then((res) => {
+          this.historyList = res.Result;
+          this.historyLoading = false;
+        })
+        .catch(() => {
+          this.historyLoading = false;
+        });
     },
 
     // 回复质疑
     handleReply(row) {
-      this.historyLoading = true
-      getQCChallengeDialogList(row.Id).then(res => {
-        this.historyLoading = false
-        if (res.IsSuccess) {
-          if (res.Result.length > 0) { Object.assign(row, res.Result[0]) }
-          this.currentQCRow = { ...row }
-          this.chatVisible = true
-        }
-      }).catch(() => { this.historyLoading = false })
+      this.historyLoading = true;
+      getQCChallengeDialogList(row.Id)
+        .then((res) => {
+          this.historyLoading = false;
+          if (res.IsSuccess) {
+            if (res.Result.length > 0) {
+              Object.assign(row, res.Result[0]);
+            }
+            this.currentQCRow = { ...row };
+            this.chatVisible = true;
+          }
+        })
+        .catch(() => {
+          this.historyLoading = false;
+        });
     },
     getDialogList() {
-      this.historyLoading = true
-      getQCChallengeDialogList(this.currentQCRow.Id).then(res => {
-        this.historyLoading = false
-        if (res.IsSuccess && res.Result.length > 0) {
-          var i = this.historyList.findIndex(item => item.Id === this.currentQCRow.Id)
-          if (i > -1) {
-            this.currentQCRow = Object.assign(this.historyList[i], res.Result[0])
+      this.historyLoading = true;
+      getQCChallengeDialogList(this.currentQCRow.Id)
+        .then((res) => {
+          this.historyLoading = false;
+          if (res.IsSuccess && res.Result.length > 0) {
+            var i = this.historyList.findIndex(
+              (item) => item.Id === this.currentQCRow.Id
+            );
+            if (i > -1) {
+              this.currentQCRow = Object.assign(
+                this.historyList[i],
+                res.Result[0]
+              );
+            }
           }
-        }
-      }).catch(() => { this.historyLoading = false })
+        })
+        .catch(() => {
+          this.historyLoading = false;
+        });
     },
     // 关闭质疑
     handleCloseQuestion() {
-      this.$refs['closeQuestionForm'].validate((valid) => {
-        if (!valid) return
-        this.closeBtnLoading = true
+      this.$refs["closeQuestionForm"].validate((valid) => {
+        if (!valid) return;
+        this.closeBtnLoading = true;
         if (this.closeQuestionForm.Type === 1) {
           // 问题已解决
-          this.closeQuestionForm.Reason = this.$t('trials:qcQuality:message:problemSolved')
+          this.closeQuestionForm.Reason = this.$t(
+            "trials:qcQuality:message:problemSolved"
+          );
         } else if (this.closeQuestionForm.Type === 2) {
           // 问题无法解决强制关闭质疑，已提醒中心下次注意
-          this.closeQuestionForm.Reason = `${this.$t('trials:qcQuality:message:problemNotSolved')}<br/><br/>${this.$t('trials:consistencyCheck:label:closereason')}:${this.closeQuestionForm.Remake}`
+          this.closeQuestionForm.Reason = `${this.$t(
+            "trials:qcQuality:message:problemNotSolved"
+          )}<br/><br/>${this.$t("trials:consistencyCheck:label:closereason")}:${
+            this.closeQuestionForm.Remake
+          }`;
         }
         var params = {
           TrialId: this.data.TrialId,
           QcChallengeId: this.closeQuestionForm.Id,
           SubjectVisitId: this.data.Id,
           CloseEnum: this.closeQuestionForm.Type,
-          CloseReason: this.closeQuestionForm.Reason
-        }
+          CloseReason: this.closeQuestionForm.Reason,
+        };
         closeQCChallenge(params)
-          .then(res => {
-            this.closeBtnLoading = false
+          .then((res) => {
+            this.closeBtnLoading = false;
             if (res.IsSuccess) {
-              this.getHistoryInfo()
-              this.$message.success(this.$t('trials:qcQuality:message:closedSuccessfully'))
-              this.closeQuestionVisible = false
-              this.relationInfo.NotClosedChallengeCount--
+              this.getHistoryInfo();
+              this.$message.success(
+                this.$t("trials:qcQuality:message:closedSuccessfully")
+              );
+              this.closeQuestionVisible = false;
+              this.relationInfo.NotClosedChallengeCount--;
             }
-          }).catch(() => {
-            this.closeBtnLoading = false
           })
-      })
+          .catch(() => {
+            this.closeBtnLoading = false;
+          });
+      });
     },
     // 打开关闭质疑框并初始化
     handleCloseQC(row) {
-      this.closeQuestionForm = Object.assign(this.closeQuestionForm, row)
-      this.closeQuestionForm.CurrentQCType = this.currentQCType
-      this.closeQuestionForm.AuditState = this.data.AuditState
-      this.closeQuestionForm.TrialQCProcess = this.data.QCProcessEnum
-      this.closeQuestionForm.Type = null
-      this.closeQuestionForm.Reason = ''
-      this.closeQuestionForm.Remake = ''
-      this.closeQuestionVisible = true
+      this.closeQuestionForm = Object.assign(this.closeQuestionForm, row);
+      this.closeQuestionForm.CurrentQCType = this.currentQCType;
+      this.closeQuestionForm.AuditState = this.data.AuditState;
+      this.closeQuestionForm.TrialQCProcess = this.data.QCProcessEnum;
+      this.closeQuestionForm.Type = null;
+      this.closeQuestionForm.Reason = "";
+      this.closeQuestionForm.Remake = "";
+      this.closeQuestionVisible = true;
     },
     // 打开质疑记录弹窗
     handleQCInfo(row) {
-      this.currentQCRow = { ...row }
-      this.chatVisible = true
+      this.currentQCRow = { ...row };
+      this.chatVisible = true;
     },
     changeReadingStatus(callback, row) {
-      let statusStr = ''
+      let statusStr = "";
       if (callback) {
-        statusStr = this.$t('trials:audit:label:setSeriesReading')
-        row.IsReading = false
+        statusStr = this.$t("trials:audit:label:setSeriesReading");
+        row.IsReading = false;
       } else {
-        statusStr = this.$t('trials:audit:label:setSeriesNotReading')
-        row.IsReading = true
+        statusStr = this.$t("trials:audit:label:setSeriesNotReading");
+        row.IsReading = true;
       }
-      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
-      message = message.replace('yyy', this.$fd('YesOrNo', !row.IsReading))
+      var message = this.$t("trials:audit:message:changeSeriesStatus").replace(
+        "xxx",
+        statusStr
+      );
+      message = message.replace("yyy", this.$fd("YesOrNo", !row.IsReading));
       this.$confirm(message, {
         distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = row.IsReading ? 1 : 2
-        this.loading = true
-        setSeriesStatus(this.trialId, this.data.Id, row.StudyId, row.Id, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.getStudyInfo()
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+        type: "warning",
+      })
+        .then(() => {
+          const state = row.IsReading ? 1 : 2;
+          this.loading = true;
+          setSeriesStatus(
+            this.trialId,
+            this.data.Id,
+            row.StudyId,
+            row.Id,
+            state
+          )
+            .then((res) => {
+              this.loading = false;
+              if (res.IsSuccess) {
+                this.$message.success(
+                  this.$t("common:message:savedSuccessfully")
+                );
+                this.getStudyInfo();
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {});
     },
     changeDeleteStatus(callback, row) {
-      let statusStr = ''
+      let statusStr = "";
       if (callback) {
-        statusStr = this.$t('trials:audit:label:setSeriesDeleted')
-        row.IsDeleted = false
+        statusStr = this.$t("trials:audit:label:setSeriesDeleted");
+        row.IsDeleted = false;
       } else {
-        statusStr = this.$t('trials:audit:label:setSeriesNotDelete')
-        row.IsDeleted = true
+        statusStr = this.$t("trials:audit:label:setSeriesNotDelete");
+        row.IsDeleted = true;
       }
-      var message = this.$t('trials:audit:message:changeSeriesStatus').replace('xxx', statusStr)
-      message = message.replace('yyy', this.$fd('YesOrNo', !row.IsDeleted))
+      var message = this.$t("trials:audit:message:changeSeriesStatus").replace(
+        "xxx",
+        statusStr
+      );
+      message = message.replace("yyy", this.$fd("YesOrNo", !row.IsDeleted));
       this.$confirm(message, {
         distinguishCancelAndClose: true,
-        type: 'warning'
-      }).then(() => {
-        const state = row.IsDeleted ? 5 : 4
-        this.loading = true
-        setSeriesStatus(this.trialId, this.data.Id, row.StudyId, row.Id, state).then(res => {
-          this.loading = false
-          if (res.IsSuccess) {
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.getStudyInfo()
-          }
-        }).catch(() => { this.loading = false })
-      }).catch(() => {})
+        type: "warning",
+      })
+        .then(() => {
+          const state = row.IsDeleted ? 5 : 4;
+          this.loading = true;
+          setSeriesStatus(
+            this.trialId,
+            this.data.Id,
+            row.StudyId,
+            row.Id,
+            state
+          )
+            .then((res) => {
+              this.loading = false;
+              if (res.IsSuccess) {
+                this.$message.success(
+                  this.$t("common:message:savedSuccessfully")
+                );
+                this.getStudyInfo();
+              }
+            })
+            .catch(() => {
+              this.loading = false;
+            });
+        })
+        .catch(() => {});
     },
     receiveMsg(event) {
-      if (event.data.type === 'refreshSeriesList') {
-        this.getStudyInfo()
+      if (event.data.type === "refreshSeriesList") {
+        this.getStudyInfo();
       }
     },
     // 刷新检查新
     getStudyInfo() {
-      this.loading = true
-      getVisitQCStudyAndSeriesList(this.data.Id).then(res => {
-        this.loading = false
-        this.studyList = res.Result.StudyList
-        this.seriesList = res.Result.SeriesList
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      getVisitQCStudyAndSeriesList(this.data.Id)
+        .then((res) => {
+          this.loading = false;
+          this.studyList = res.Result.StudyList;
+          this.seriesList = res.Result.SeriesList;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 设置qc通过/不通过
     async handleQCState(auditState) {
       if (auditState === 7) {
-        this.signCode = this.getSignCode(auditState)
-        this.signVisible = true
-        this.auditState = auditState
-        return
+        this.signCode = this.getSignCode(auditState);
+        this.signVisible = true;
+        this.auditState = auditState;
+        return;
       }
       if (auditState === 8) {
-        var isgo = true
-        var isgoList = []
-        this.studyList.forEach(v => {
+        var isgo = true;
+        var isgoList = [];
+        this.studyList.forEach((v) => {
           if (!v.BodyPartForEdit) {
-            isgo = false
-            isgoList.push(v.StudyCode)
+            isgo = false;
+            isgoList.push(v.StudyCode);
           }
-        })
+        });
         if (!isgo) {
           // `请补充检查${isgoList.toString()}的检查部位！`
-          this.$confirm(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.join('、 ')), '',{
-            showCancelButton: false
-          })
-          return
+          this.$confirm(
+            this.$t("trials:qcQuality:title:title1").replace(
+              "xxx",
+              isgoList.join("、 ")
+            ),
+            "",
+            {
+              showCancelButton: false,
+            }
+          );
+          return;
         }
       }
-      this.loading = true
-      var isVerify = await this.handleSave(true)
+      this.loading = true;
+      var isVerify = await this.handleSave(true);
       if (!isVerify) {
-        return
+        return;
       }
       // 验证是否关闭所有质疑
-      verifyCanQCPassedOrFailed(this.trialId, this.data.Id).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          this.signCode = this.getSignCode(auditState)
-          this.signVisible = true
-          this.auditState = auditState
-        }
-      }).catch(() => { this.loading = false })
+      verifyCanQCPassedOrFailed(this.trialId, this.data.Id)
+        .then((res) => {
+          this.loading = false;
+          if (res.IsSuccess) {
+            this.signCode = this.getSignCode(auditState);
+            this.signVisible = true;
+            this.auditState = auditState;
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     getSignCode(auditState) {
       if (this.relationInfo.TrialQCProcessEnum === 1 && auditState === 8) {
         // 单审通过
-        const { QCSingleReviewPassed } = const_.processSignature
-        return QCSingleReviewPassed
-      } else if (this.relationInfo.TrialQCProcessEnum === 1 && auditState === 7) {
+        const { QCSingleReviewPassed } = const_.processSignature;
+        return QCSingleReviewPassed;
+      } else if (
+        this.relationInfo.TrialQCProcessEnum === 1 &&
+        auditState === 7
+      ) {
         // 单审不通过
-        const { QCSingleReviewFailed } = const_.processSignature
-        return QCSingleReviewFailed
-      } else if (this.relationInfo.TrialQCProcessEnum === 2 && auditState === 8 && this.currentQCType === 1) {
+        const { QCSingleReviewFailed } = const_.processSignature;
+        return QCSingleReviewFailed;
+      } else if (
+        this.relationInfo.TrialQCProcessEnum === 2 &&
+        auditState === 8 &&
+        this.currentQCType === 1
+      ) {
         // 初审通过
-        const { PreliminaryReviewOfQCPassed } = const_.processSignature
-        return PreliminaryReviewOfQCPassed
-      } else if (this.relationInfo.TrialQCProcessEnum === 2 && auditState === 7 && this.currentQCType === 1) {
+        const { PreliminaryReviewOfQCPassed } = const_.processSignature;
+        return PreliminaryReviewOfQCPassed;
+      } else if (
+        this.relationInfo.TrialQCProcessEnum === 2 &&
+        auditState === 7 &&
+        this.currentQCType === 1
+      ) {
         // 初审不通过
-        const { PreliminaryReviewOfQCFailed } = const_.processSignature
-        return PreliminaryReviewOfQCFailed
-      } else if (this.relationInfo.TrialQCProcessEnum === 2 && auditState === 8 && this.currentQCType === 2) {
+        const { PreliminaryReviewOfQCFailed } = const_.processSignature;
+        return PreliminaryReviewOfQCFailed;
+      } else if (
+        this.relationInfo.TrialQCProcessEnum === 2 &&
+        auditState === 8 &&
+        this.currentQCType === 2
+      ) {
         // 复审通过
-        const { SecondaryReviewOfQCPassed } = const_.processSignature
-        return SecondaryReviewOfQCPassed
-      } else if (this.relationInfo.TrialQCProcessEnum === 2 && auditState === 7 && this.currentQCType === 2) {
+        const { SecondaryReviewOfQCPassed } = const_.processSignature;
+        return SecondaryReviewOfQCPassed;
+      } else if (
+        this.relationInfo.TrialQCProcessEnum === 2 &&
+        auditState === 7 &&
+        this.currentQCType === 2
+      ) {
         // 复审不通过
-        const { SecondaryReviewOfQCFailed } = const_.processSignature
-        return SecondaryReviewOfQCFailed
+        const { SecondaryReviewOfQCFailed } = const_.processSignature;
+        return SecondaryReviewOfQCFailed;
       }
     },
     // 关闭签名框
     closeSignDialog(isSign, signInfo) {
       if (isSign) {
-        this.setQCStatus(signInfo)
+        this.setQCStatus(signInfo);
       } else {
-        this.signVisible = false
+        this.signVisible = false;
       }
     },
     // 设置qc审核状态
     async setQCStatus(signInfo) {
-      this.loading = true
+      this.loading = true;
       var params = {
         data: {
           TrialId: this.trialId,
           SubjectVisitId: this.data.Id,
-          AuditState: this.auditState
+          AuditState: this.auditState,
         },
-        signInfo: signInfo
-      }
-      qCPassedOrFailed(params).then(res => {
-        this.loading = false
-        if (res.IsSuccess) {
-          this.$refs['signForm'].btnLoading = false
-          this.signVisible = false
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          // this.getQCInfo()
-          this.isAudit = true
-          this.$forceUpdate()
-          getNextIQCQuality({
-            trialId: this.trialId,
-            SubjectId: this.data.SubjectId
-          }).then(res => {
-            if (res.Result&&res.Result.VisitId) {
-              this.$confirm(this.$t('trials:qcQuality:title:title2', '', {
-                showCancelButton: false
-              })).then(() => {
-                collectNextIQCQuality({
-                  trialId: this.trialId,
-                  SubjectId: this.data.SubjectId
-                }).then(res => {
-                  this.$emit('getList')
-                  this.$emit('nextTask',res.Result.VisitId);
-                })
-              })
-            } else {
-              // 没有后续质控任务
-              this.$emit('getList')
-              this.$confirm(this.$t('trials:qcQuality:title:closeQCDialog')).then(() => {
-                this.$emit('close')
-              }).catch(()=>{})
-            }
-          })
-        }
-      }).catch(() => {
-        this.loading = false
-        this.$refs['signForm'].btnLoading = false
-      })
+        signInfo: signInfo,
+      };
+      qCPassedOrFailed(params)
+        .then((res) => {
+          this.loading = false;
+          if (res.IsSuccess) {
+            this.$refs["signForm"].btnLoading = false;
+            this.signVisible = false;
+            this.$message.success(this.$t("common:message:savedSuccessfully"));
+            // this.getQCInfo()
+            this.isAudit = true;
+            this.$forceUpdate();
+            getNextIQCQuality({
+              trialId: this.trialId,
+              SubjectId: this.data.SubjectId,
+            }).then((res) => {
+              if (res.Result && res.Result.VisitId) {
+                this.$confirm(
+                  this.$t("trials:qcQuality:title:title2", "", {
+                    showCancelButton: false,
+                  })
+                ).then(() => {
+                  collectNextIQCQuality({
+                    trialId: this.trialId,
+                    SubjectId: this.data.SubjectId,
+                  }).then((res) => {
+                    this.$emit("getList");
+                    this.$emit("nextTask", res.Result.VisitId);
+                  });
+                });
+              } else {
+                // 没有后续质控任务
+                this.$emit("getList");
+                this.$confirm(this.$t("trials:qcQuality:title:closeQCDialog"))
+                  .then(() => {
+                    this.$emit("close");
+                  })
+                  .catch(() => {});
+              }
+            });
+          }
+        })
+        .catch(() => {
+          this.loading = false;
+          this.$refs["signForm"].btnLoading = false;
+        });
     },
     getNextQCInfo() {
       // '是否确认进入下一个质控任务？'
-      var message = this.$t('trials:qcQuality:title:title2')
+      var message = this.$t("trials:qcQuality:title:title2");
 
       this.$confirm(message, {
-        type: 'warning',
-        distinguishCancelAndClose: true
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.loading = true
-          this.$emit('nextTask')
-        })
-        .catch(action => {
-          this.loading = false
+          this.loading = true;
+          this.$emit("nextTask");
         })
+        .catch((action) => {
+          this.loading = false;
+        });
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return 'delete-row'
+        return "delete-row";
       } else {
-        return ''
+        return "";
       }
     },
     // 打开检查信息编辑框
     handleEditStudy(row) {
-      this.editStudyInfoVisible = true
-      this.studyForm = { ...row }
-      var bodyPart = []
-      if (this.studyForm.BodyPartForEdit.indexOf('|') !== -1) {
-        bodyPart = this.studyForm.BodyPartForEdit.split('|')
-      } else if (this.studyForm.BodyPartForEdit !== '') {
-        bodyPart.push(this.studyForm.BodyPartForEdit)
+      this.editStudyInfoVisible = true;
+      this.studyForm = { ...row };
+      var bodyPart = [];
+      if (this.studyForm.BodyPartForEdit.indexOf("|") !== -1) {
+        bodyPart = this.studyForm.BodyPartForEdit.split("|");
+      } else if (this.studyForm.BodyPartForEdit !== "") {
+        bodyPart.push(this.studyForm.BodyPartForEdit);
       }
-      this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
+      this.$set(this.studyForm, "Modality", row.ModalityForEdit);
       // this.studyForm.Modality = row.ModalityForEdit
-      this.studyForm.BodyPartForEdit = bodyPart
+      this.studyForm.BodyPartForEdit = bodyPart;
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
-      this.$refs['studyForm'].validate((valid) => {
-        if (!valid) return
-        this.btnLoading = true
-        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join('|')
+      this.$refs["studyForm"].validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join("|");
         // this.studyForm.Modality = this.studyForm.Modalities
         var params = {
           id: this.studyForm.StudyId,
           subjectVisitId: this.data.Id,
           type: 1,
           modality: this.studyForm.Modality,
-          bodyPart: this.studyForm.BodyPart
-        }
-        updateModality(this.data.TrialId, params).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.getStudyInfo()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.editStudyInfoVisible = false
-          }
-        }).catch(() => { this.btnLoading = false })
-      })
+          bodyPart: this.studyForm.BodyPart,
+        };
+        updateModality(this.data.TrialId, params)
+          .then((res) => {
+            this.btnLoading = false;
+            if (res.IsSuccess) {
+              this.getStudyInfo();
+              this.$message.success(
+                this.$t("common:message:savedSuccessfully")
+              );
+              this.editStudyInfoVisible = false;
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     // 设置重传时刷新历史质疑列表及影响指控列表
     refreshList() {
       // 如果是复审时候设置重传，需要将当前审核状态设置为初审，且刷新页面数据并关闭历史质疑和质疑记录窗口
       if (this.currentQCType === 2) {
-        this.currentQCType = 1
+        this.currentQCType = 1;
         // this.getQCInfo()
-        this.getHistoryInfo()
+        this.getHistoryInfo();
       } else {
         // 如果是初审时候设置重传，不影响
-        this.getHistoryInfo()
+        this.getHistoryInfo();
       }
-      this.$emit('getList')
+      this.$emit("getList");
     },
 
     // 打开非Dicom信息编辑框
     handleEditNoneDicomInfo(row) {
-      const { CodeView, Id, BodyPart, Modality, ImageDate } = { ...row }
-      this.noneDicomForm.CodeView = CodeView
-      this.noneDicomForm.Id = Id
-      this.noneDicomForm.BodyPart = BodyPart
-      this.noneDicomForm.Modality = Modality
-      this.noneDicomForm.ImageDate = ImageDate
-      this.noneDicomForm.BodyParts = BodyPart.split(', ')
-      this.editNoneDicomVisible = true
+      const { CodeView, Id, BodyPart, Modality, ImageDate } = { ...row };
+      this.noneDicomForm.CodeView = CodeView;
+      this.noneDicomForm.Id = Id;
+      this.noneDicomForm.BodyPart = BodyPart;
+      this.noneDicomForm.Modality = Modality;
+      this.noneDicomForm.ImageDate = ImageDate;
+      this.noneDicomForm.BodyParts = BodyPart.split(", ");
+      this.editNoneDicomVisible = true;
     },
     // 更新非Dicom部位/拍片类型信息
     handleUpdateNoneDicomInfo() {
-      this.$refs.noneDicomForm.validate(valid => {
-        if (!valid) return
-        this.btnLoading = true
-        this.noneDicomForm.BodyPart = this.noneDicomForm.BodyParts.join(', ')
-        this.noneDicomForm.TrialId = this.trialId
-        this.noneDicomForm.SiteId = this.data.SiteId
-        this.noneDicomForm.SubjectId = this.data.SubjectId
-        this.noneDicomForm.SubjectVisitId = this.data.Id
-        addOrUpdateNoneDicomStudy(this.noneDicomForm).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.getNoneDicomList()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.editNoneDicomVisible = false
-          }
-        }).catch(() => {
-          this.btnLoading = false
-        })
-      })
+      this.$refs.noneDicomForm.validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.noneDicomForm.BodyPart = this.noneDicomForm.BodyParts.join(", ");
+        this.noneDicomForm.TrialId = this.trialId;
+        this.noneDicomForm.SiteId = this.data.SiteId;
+        this.noneDicomForm.SubjectId = this.data.SubjectId;
+        this.noneDicomForm.SubjectVisitId = this.data.Id;
+        addOrUpdateNoneDicomStudy(this.noneDicomForm)
+          .then((res) => {
+            this.btnLoading = false;
+            if (res.IsSuccess) {
+              this.getNoneDicomList();
+              this.$message.success(
+                this.$t("common:message:savedSuccessfully")
+              );
+              this.editNoneDicomVisible = false;
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     // 获取非Dicom检查信息
     getNoneDicomList() {
-      this.loading = true
-      getNoneDicomStudyList(this.data.Id).then(res => {
-        this.noneDicomStudyList = res.Result
-        this.loading = false
-      }).catch(() => { this.loading = false })
+      this.loading = true;
+      getNoneDicomStudyList(this.data.Id)
+        .then((res) => {
+          this.noneDicomStudyList = res.Result;
+          this.loading = false;
+        })
+        .catch(() => {
+          this.loading = false;
+        });
     },
     // 预览文件
     previewFile(row) {
       // window.open(row.FullFilePath, '_blank')
-      this.imgObj.url = row.FullFilePath
-      this.imgObj.loading = true
-      this.imgObj.visible = true
+      this.imgObj.url = row.FullFilePath;
+      this.imgObj.loading = true;
+      this.imgObj.visible = true;
     },
     // 预览所有影像
     handleViewImages() {
       if (this.open) {
-        this.open.close()
+        this.open.close();
       }
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${this.isAudit ? 0 : 1}&TokenKey=${token}`
-      })
-      this.open = window.open(routeData.href, '_blank')
+        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${
+          this.data.VisitName
+        }(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&showDelete=${
+          this.isAudit ? 0 : 1
+        }&TokenKey=${token}`,
+      });
+      this.open = window.open(routeData.href, "_blank");
     },
     // 预览阅片影像
     handleViewReadingImages() {
       if (this.open) {
-        this.open.close()
+        this.open.close();
       }
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isReading=1&TokenKey=${token}`
-      })
-      this.open = window.open(routeData.href, '_blank')
+        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&isReading=1&TokenKey=${token}`,
+      });
+      this.open = window.open(routeData.href, "_blank");
+    },
+    // 预览临床数据
+    handlePreviewClinicalData(row) {
+      this.rowData = row;
+      this.petVisible = true;
     },
     // 预览某个检查
     handlePreviewStudy(row) {
       if (this.open) {
-        this.open.close()
+        this.open.close();
       }
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${this.data.Id}&studyId=${row.StudyId}&showDelete=${this.isAudit ? 0 : 1}&TokenKey=${token}&type=Study`
-      })
-      this.open = window.open(routeData.href, '_blank')
+        path: `/showdicom?trialId=${this.trialId}&subjectVisitId=${
+          this.data.Id
+        }&studyId=${row.StudyId}&showDelete=${
+          this.isAudit ? 0 : 1
+        }&TokenKey=${token}&type=Study`,
+      });
+      this.open = window.open(routeData.href, "_blank");
     },
     // 预览某个序列
     handlePreviewInstance(row) {
       try {
         if (this.open) {
-          this.open.close()
+          this.open.close();
         }
-        var token = getToken()
+        var token = getToken();
         const routeData = this.$router.resolve({
-          path: `/showdicom?trialId=${this.trialId}&studyId=${row.StudyId}&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${row.Id}&seriesNumber=${row.SeriesNumber}&showDelete=${this.isAudit ? 0 : 1}&subjectVisitId=${this.data.Id}&type=Series&TokenKey=${token}&description=${row.Description}`
-        })
-        this.open = window.open(routeData.href, '_blank')
+          path: `/showdicom?trialId=${this.trialId}&studyId=${
+            row.StudyId
+          }&studyCode=${row.StudyCode}&modality=${row.Modality}&seriesId=${
+            row.Id
+          }&seriesNumber=${row.SeriesNumber}&showDelete=${
+            this.isAudit ? 0 : 1
+          }&subjectVisitId=${
+            this.data.Id
+          }&type=Series&TokenKey=${token}&description=${row.Description}`,
+        });
+        this.open = window.open(routeData.href, "_blank");
       } catch (e) {
-        console.log(e)
+        console.log(e);
       }
     },
     // 预览所有检查下非Dicom文件
     handleViewAllNoneDicoms() {
       if (this.open) {
-        this.open.close()
+        this.open.close();
       }
       // this.previewAllNoneDicomVisible = true
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${this.data.Id}&TokenKey=${token}`
-      })
-      this.open = window.open(routeData.href, '_blank')
+        path: `/showNoneDicoms?subjectVisitId=${this.data.Id}&TokenKey=${token}`,
+      });
+      this.open = window.open(routeData.href, "_blank");
     },
     // 预览单个检查下非Dicom文件
     handlePreviewNoneDicomFiles(row) {
       if (this.open) {
-        this.open.close()
+        this.open.close();
       }
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showNoneDicoms?subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}`
-      })
-      this.open = window.open(routeData.href, '_blank')
+        path: `/showNoneDicoms?subjectVisitId=${this.data.Id}&studyId=${row.Id}&TokenKey=${token}`,
+      });
+      this.open = window.open(routeData.href, "_blank");
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return ''
-      var separator = ','
-      if (bodyPart.indexOf('|') > -1) {
-        separator = '|'
-      } else if (bodyPart.indexOf(',') > -1) {
-        separator = ','
-      } else if (bodyPart.indexOf('，') > -1) {
-        separator = '，'
+      if (!bodyPart) return "";
+      var separator = ",";
+      if (bodyPart.indexOf("|") > -1) {
+        separator = "|";
+      } else if (bodyPart.indexOf(",") > -1) {
+        separator = ",";
+      } else if (bodyPart.indexOf("，") > -1) {
+        separator = "，";
       }
-      var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim())
-      })
-      return newArr.join(' | ')
+      var arr = bodyPart.split(separator);
+      var newArr = arr.map((i) => {
+        return this.$fd("Bodypart", i.trim());
+      });
+      return newArr.join(" | ");
     },
     openManuals() {
-      this.$emit('openManuals')
-    }
-  }
-}
+      this.$emit("openManuals");
+    },
+  },
+};
 </script>
 <style lang="scss" scoped>
-  .qa-wrapper{
-    display: flex;
-    flex-flow: column;
-    height: 100%;
-    border: 1px solid #fff;
-    padding: 10px;
-    box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
-    .function-wrapper{
-      text-align: right;
-    }
-    .qa-content{
-      flex: 1;
-      margin-top: 10px;
-      overflow-y: auto;
-    }
-    /deep/ .delete-row{
-      text-decoration-line: line-through;
-      color: #c0c4cc;
-    }
-    /deep/ .el-card{
-      padding: 10px;
-    }
+.qa-wrapper {
+  display: flex;
+  flex-flow: column;
+  height: 100%;
+  border: 1px solid #fff;
+  padding: 10px;
+  box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
+  .function-wrapper {
+    text-align: right;
   }
+  .qa-content {
+    flex: 1;
+    margin-top: 10px;
+    overflow-y: auto;
+  }
+  /deep/ .delete-row {
+    text-decoration-line: line-through;
+    color: #c0c4cc;
+  }
+  /deep/ .el-card {
+    padding: 10px;
+  }
+}
 </style>
diff --git a/src/views/trials/trials-panel/visit/qc-check/index.vue b/src/views/trials/trials-panel/visit/qc-check/index.vue
index 3a1081fc..61841713 100644
--- a/src/views/trials/trials-panel/visit/qc-check/index.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/index.vue
@@ -581,10 +581,10 @@
           </el-card>
         </div>
 
-        <div v-if="OtherInfo.ClinicalInformationTransmissionEnum > 0">
+        <div>
           <!-- 临床数据 -->
           <h4 class="box-title" style="margin-top:10px;">{{ $t('trials:audit:tab:clinicalData') }}</h4>
-          <el-card v-if="OtherInfo.ClinicalInformationTransmissionEnum > 0" class="box-card">
+          <el-card  class="box-card">
             <UploadClinicalData v-if="rowData.Id" :enum-type="OtherInfo.ClinicalInformationTransmissionEnum" :data="rowData" :subject-visit-id="rowData.Id" :allow-add-or-edit="false" />
           </el-card>
         </div>

From 14d71fc3f9b44e00f4ef1840bf441a5a7f186c71 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 09:21:12 +0800
Subject: [PATCH 308/374] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE=E6=9F=A5=E7=9C=8B?=
 =?UTF-8?q?=E5=8F=8A=E4=B8=8A=E4=BC=A0=E6=97=B6=E5=9F=BA=E7=BA=BF=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E8=AE=BF=E8=A7=86=E7=BA=A7=E5=88=AB=E4=B8=B4=E5=BA=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/StudyList.vue   |  2 +-
 .../dicoms/customize/CustomizeDicomCanvas.vue | 23 ++++++++++++++++++-
 .../dicoms/customize/CustomizeStudyList.vue   |  2 +-
 .../trials-panel/visit/crc-upload/index.vue   |  4 ++--
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
index cb0b2f8e..886fc4c1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/StudyList.vue
@@ -485,7 +485,7 @@ export default {
         idx > -1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0]
       }
       if (seriesInfo) {
-        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount))
+        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length))
         seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0
         obj.studyIndex = seriesInfo.studyIndex
         obj.seriesIndex = seriesInfo.seriesIndex
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
index 2430b365..3a4bc8a1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -10,6 +10,13 @@
     @mouseup="sliderMouseup"
     @contextmenu.prevent="onContextmenu"
   >
+    <!-- 临床数据 -->
+    <div v-if="stack.isExistsClinicalData" class="info-cd" @click.stop="handleViewCD($event)">
+      <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
+        <svg-icon icon-class="documentation" class="svg-icon" />
+      </el-tooltip>
+
+    </div>
     <!-- 切换访视 -->
     <div
       v-if="stack.imageRendered && isReadingTaskViewInOrder"
@@ -1920,6 +1927,12 @@ export default {
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
+    },
+    handleViewCD(e) {
+      DicomEvent.$emit('previewCD', this.stack.visitTaskId)
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
     }
 
   }
@@ -2008,7 +2021,15 @@ export default {
     font-size: 14px;
   }
 }
-
+.info-cd{
+  position: absolute;
+  left: 10px;
+  top: 5px;
+  text-align: left;
+  color: #ddd;
+  font-size: 18px;
+  cursor: pointer;
+}
 .info-series {
   position: absolute;
   left: 10px;
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index 9d846ebe..f3fe708b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -476,7 +476,7 @@ export default {
         idx > -1 ? seriesInfo = seriesList[idx] : seriesInfo = seriesList[0]
       }
       if (seriesInfo) {
-        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.instanceCount))
+        const index = Math.floor(seriesInfo.imageIds.length * ((baseObj.series.imageIdIndex + 1) / baseObj.series.imageIds.length))
         seriesInfo.imageIdIndex = index > 0 ? index - 1 : 0
         obj.studyIndex = seriesInfo.studyIndex
         obj.seriesIndex = seriesInfo.seriesIndex
diff --git a/src/views/trials/trials-panel/visit/crc-upload/index.vue b/src/views/trials/trials-panel/visit/crc-upload/index.vue
index f3108d4a..f3b09025 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/index.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/index.vue
@@ -572,10 +572,10 @@
           <UploadNonDicomFiles v-if="rowData.Id" :data="rowData" :subject-visit-id="rowData.Id" :body-parts="otherInfo.BodyPartTypes" :modalities="otherInfo.Modalitys" :allow-add-or-edit="false" @getList="getList"/>
         </el-card>
         <!-- 临床数据 -->
-        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-title" style="margin-top:10px;">
+        <h4 v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && (otherInfo.IsHaveSubjectClinicalData ||otherInfo.IsHaveVisitClinicalData)" class="box-title" style="margin-top:10px;">
           {{ $t('trials:crcUpload:label:clinicalData') }}
         </h4>
-        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveSubjectClinicalData" class="box-card">
+        <el-card v-if="rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && (otherInfo.IsHaveSubjectClinicalData || otherInfo.IsHaveVisitClinicalData)" class="box-card">
           <UploadClinicalData v-if="rowData.Id && rowData.IsBaseLine" :enum-type="otherInfo.ClinicalInformationTransmissionEnum" :allow-add-or-edit="false" :data="rowData" :subject-visit-id="rowData.Id" @getList="getList" />
         </el-card>
         <h4 v-if="!rowData.IsBaseLine && otherInfo.ClinicalInformationTransmissionEnum > 0 && otherInfo.IsHaveVisitClinicalData" class="box-title" style="margin-top:10px;">

From 15a7b6d1ac4c36effaa4e0a7dbc04ec2f3885c0e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 10:19:20 +0800
Subject: [PATCH 309/374] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=99=BB=E5=BD=95=E7=94=A8=E6=88=B7=E5=92=8C?=
 =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trial-summary/login-log/index.vue         | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index 2f6f6087..e381dac5 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -37,6 +37,31 @@
             style="width:120px;"
           />
         </el-form-item>
+        <el-form-item
+          :label="$t('trials:loginLog:table:userName')"
+          prop="LoginUserName"
+        >
+          <el-input
+            v-model="searchData.LoginUserName"
+            size="small"
+            clearable
+            style="width:120px;"
+          />
+        </el-form-item>
+        <el-form-item
+          :label="$t('trials:loginLog:table:userType')"
+          prop="OptType"
+        >
+          <el-select v-model="searchData.LoginUserTypeEnum" clearable style="width:120px;">
+            <el-option
+              v-for="item of $d.UserType"
+              v-show="item.value !== 7 && item.value !== 8"
+              :key="'UserType' + item.label"
+              :value="item.value"
+              :label="item.label"
+            />
+          </el-select>
+        </el-form-item>
         <el-form-item
           :label="$t('trials:loginLog:table:createTime')"
         >
@@ -120,7 +145,7 @@
         </el-table-column>
         <el-table-column
           :label="$t('trials:loginLog:table:optUserName')"
-          prop="optUserName"
+          prop="OptUserName"
           min-width="90"
           show-overflow-tooltip
           sortable="custom"
@@ -160,6 +185,8 @@ const searchDataDefault = () => {
     OptType: null,
     Ip: '',
     LoginFaildName: '',
+    LoginUserName: '',
+    LoginUserTypeEnum: null,
     BeginDate: '',
     EndDate: '',
     Asc: false,

From 2f722f8c0e5c51f7f8dd6134aec11a0ebf6cd08a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 11:06:35 +0800
Subject: [PATCH 310/374] =?UTF-8?q?=E5=BE=85=E9=98=85=E5=92=8C=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E8=B7=9F=E8=B8=AA=E5=8E=BB=E9=99=A4=E9=83=A8=E5=88=86?=
 =?UTF-8?q?=E6=8E=92=E5=BA=8F=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/reading-task/index.vue     | 1 -
 src/views/trials/trials-panel/reading/reading-tracking/index.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/reading-task/index.vue b/src/views/trials/trials-panel/reading/reading-task/index.vue
index 716a2633..8de89eb8 100644
--- a/src/views/trials/trials-panel/reading/reading-task/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-task/index.vue
@@ -40,7 +40,6 @@
                 :label="$t('trials:consistencyCheck:table:isUrgent')"
                 show-overflow-tooltip
                 min-width="100"
-                sortable="custom"
               >
                 <template slot-scope="scope">
                   <el-tag :type="scope.row.UrgentColor === 1 ? 'danger' : scope.row.UrgentColor === 2 ? 'warning' : 'primary'">{{ $fd('YesOrNo', scope.row.IsUrgent) }}</el-tag>
diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
index cd3cd9fb..5c24fdd2 100644
--- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue
+++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue
@@ -187,7 +187,6 @@
           prop="CompleteClinicalDataEnum"
           :label="$t('trials:reviewTrack:table:completeClinicalDataEnum')"
           width="160"
-          sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">

From 6fa4a6349cc0853c228e7287025cf2b809c80ab3 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 11:28:10 +0800
Subject: [PATCH 311/374] =?UTF-8?q?=E4=BC=9A=E8=AF=9D=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E5=AD=97=E4=BD=93=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/medical-feedback/components/ChatForm.vue      | 8 +++++++-
 .../reading/mim-medical-audit/components/ChatForm.vue     | 8 +++++++-
 .../trials-panel/visit/qc-check/components/chatForm.vue   | 8 +++++++-
 3 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
index a5634ecd..d1ae5fd7 100644
--- a/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/medical-feedback/components/ChatForm.vue
@@ -41,7 +41,7 @@
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
-                    <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
+                    <span class="word_highLight">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
                 </div>
                 <div style="margin-top:10px;">
@@ -259,6 +259,9 @@ export default {
           border-top: 8px solid transparent;
           border-bottom: 8px solid transparent;
         }
+        .word_highLight{
+          color: red;
+        }
       }
     }
     .word-my{
@@ -305,6 +308,9 @@ export default {
           border-top: 8px solid transparent;
           border-bottom: 8px solid transparent;
         }
+        .word_highLight{
+          color: yellow;
+        }
       }
       /deep/.el-button--text{
         color: #d0d0d0;
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
index 2c7c203a..4fd2d188 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/ChatForm.vue
@@ -41,7 +41,7 @@
                   <!-- 根据本项目《独立影像评估章程》的相关约定，该类问题医学审核建议为： -->
                   {{ $t('trials:medicalFeedback:message:msg3') }}
                   <ol>
-                    <span style="color:red">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
+                    <span class="word_highLight">{{ $fd('AuditAdvice', record.AuditAdviceEnum) }}</span>
                   </ol>
                 </div>
                 <div style="margin-top:10px;">
@@ -303,6 +303,9 @@ export default {
           border-top: 8px solid transparent;
           border-bottom: 8px solid transparent;
         }
+        .word_highLight{
+          color: red;
+        }
       }
     }
     .word-my{
@@ -349,6 +352,9 @@ export default {
           border-top: 8px solid transparent;
           border-bottom: 8px solid transparent;
         }
+        .word_highLight{
+          color: yellow;
+        }
       }
       /deep/.el-button--text{
         color: #d0d0d0;
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
index 37bca56a..5790901c 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/chatForm.vue
@@ -173,7 +173,7 @@ export default {
                         <p>
                         ${this.$t('trials:qcQuality:dialogTips:tip')}
                         </p>
-                        <p style='color:red'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
+                        <p class='word_highLight'>${this.$t('trials:qcQuality:dialog:deadline')}: ${this.data.DeadlineTime ? this.data.DeadlineTime : this.$t('trials:qcQuality:dialog:none')}</p>`
       const userId = zzSessionStorage.getItem('userId')
       recordContent.push(
         {
@@ -337,6 +337,9 @@ export default {
           border-top: 8px solid transparent;
           border-bottom: 8px solid transparent;
         }
+        .word_highLight{
+          color: red;
+        }
       }
     }
     .word-my{
@@ -382,6 +385,9 @@ export default {
           border-top: 8px solid transparent;
           border-bottom: 8px solid transparent;
         }
+        .word_highLight{
+          color: yellow;
+        }
       }
     }
   }

From 17ed3d4dca97c7ebc66f1978a7dd640fdafcfa8a Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Apr 2024 11:44:24 +0800
Subject: [PATCH 312/374] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E9=A1=B5tab=E5=9B=BD=E9=99=85=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/ReviewersResearchForm.vue | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/views/reviewers/ReviewersResearchForm.vue b/src/views/reviewers/ReviewersResearchForm.vue
index a71bffa7..75a32702 100644
--- a/src/views/reviewers/ReviewersResearchForm.vue
+++ b/src/views/reviewers/ReviewersResearchForm.vue
@@ -1,32 +1,33 @@
 <template>
   <div class="app-container">
     <el-tabs v-model="active" :before-leave="checkLeave" @tab-click="clickTab">
-      <el-tab-pane label="Basic Info" name="BasicInfo">
+      <el-tab-pane :label="$t('system:reviewer:tab:BasicInfo')" name="BasicInfo">
         <basic-info v-if="load.BasicInfo" />
       </el-tab-pane>
-      <el-tab-pane label="Employment" name="Employment">
+      <el-tab-pane :label="$t('system:reviewer:tab:Employment')" name="Employment">
         <Employment v-if="load.Employment" />
       </el-tab-pane>
-      <el-tab-pane label="Specialty" name="Specialty">
+      <el-tab-pane :label="$t('system:reviewer:tab:Specialty')" name="Specialty">
         <specialty v-if="load.Specialty" />
       </el-tab-pane>
-
-      <el-tab-pane label="Education & Training" name="EducationTraining">
+      <!--Education & Training-->
+      <el-tab-pane :label="$t('system:reviewer:tab:Education&Training')" name="EducationTraining">
         <education-training v-if="load.EducationTraining" />
       </el-tab-pane>
-      <el-tab-pane label="Research & Publication" name="ResearchPublication">
+      <!--Research & Publication-->
+      <el-tab-pane :label="$t('system:reviewer:tab:Research&Publication')" name="ResearchPublication">
         <research-publication v-if="load.ResearchPublication" />
       </el-tab-pane>
-      <el-tab-pane label="Trial Experience" name="TrialExperience">
+      <el-tab-pane :label="$t('system:reviewer:tab:TrialExperience')" name="TrialExperience">
         <trial-experience v-if="load.TrialExperience" />
       </el-tab-pane>
-      <el-tab-pane label="Credentials" name="Credentials">
+      <el-tab-pane :label="$t('system:reviewer:tab:Credentials')" name="Credentials">
         <Credentials v-if="load.Credentials" />
       </el-tab-pane>
-      <el-tab-pane label="Resumes" name="Resumes">
+      <el-tab-pane :label="$t('system:reviewer:tab:Resumes')" name="Resumes">
         <Resumes v-if="load.Resumes" />
       </el-tab-pane>
-      <el-tab-pane label="Agreements" name="Agreements">
+      <el-tab-pane :label="$t('system:reviewer:tab:Agreements')" name="Agreements">
         <Agreements v-if="load.Agreements" />
       </el-tab-pane>
     </el-tabs>

From bf131e09e4213ca271d2a75e61b682f529041187 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Apr 2024 13:13:51 +0800
Subject: [PATCH 313/374] =?UTF-8?q?=E7=AE=80=E5=8E=86=E9=87=87=E9=9B=86?=
 =?UTF-8?q?=E8=B7=B3=E8=BD=AC=E8=B7=AF=E7=94=B1=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/ReviewersResearchForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/reviewers/ReviewersResearchForm.vue b/src/views/reviewers/ReviewersResearchForm.vue
index 75a32702..e4d9d8ae 100644
--- a/src/views/reviewers/ReviewersResearchForm.vue
+++ b/src/views/reviewers/ReviewersResearchForm.vue
@@ -95,7 +95,7 @@ export default {
       }
       changeURLStatic('tabActive', tab.name)
       const id = getQueryString('Id')
-      this.$router.push({ path: `/ReviewersResearchForm?Id=${id}&tabActive=${tab.name}&ReviewStatus=${getQueryString('ReviewStatus')}` })
+      this.$router.push({ path: `/ReviewersResearchForm?Id=${id}&tabActive=${tab.name}&ReviewStatus=${getQueryString('ReviewStatus')}&lang=${this.$i18n.locale}` })
     },
     checkLeave() {
       const id = getQueryString('Id')

From 917f95030b1dbc56bf55db32d70dd3863b637f23 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 15 Apr 2024 13:47:25 +0800
Subject: [PATCH 314/374] =?UTF-8?q?pet-ct=E4=B8=B4=E5=BA=8A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9C=AA=E4=B8=8A=E4=BC=A0=E5=BC=B9=E6=A1=86=E5=88=A4?=
 =?UTF-8?q?=E6=96=AD=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/crc-upload/components/uploadDicomFiles2.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index 180c5a55..fa0d7c7e 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -1746,7 +1746,7 @@ export default {
                       res.Result === "CT、PT" ||
                       res.Result === "PT、CT";
                     // let flag = params.study.seriesList.some(item=>item.modality==='PT');
-                    if (flag) {
+                    if (flag && scope.relationInfo.IsHaveStudyClinicalData) {
                       scope.confirmFlag = true;
                     }
                     scope.getStudyInfo();

From cb24021c0dc2c1dbd7b3b469567f81c600929170 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 13:48:59 +0800
Subject: [PATCH 315/374] =?UTF-8?q?=E7=97=85=E7=81=B6=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E6=97=B6=E5=88=B7=E6=96=B0=E8=84=BE=E8=84=8F?=
 =?UTF-8?q?=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue     | 2 +-
 .../reading/dicoms/components/Fusion/TableQuestions.vue         | 2 +-
 .../reading/dicoms/components/Lugano/QuestionList.vue           | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index dd7c24a3..9f337f33 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -825,7 +825,7 @@ export default {
     },
     getAnnotations() {
       return new Promise(resolve => {
-        const viewportIds = ['PT_AXIAL', 'CT_AXIAL', 'FUSION_AXIAL']
+        const viewportIds = ['FUSION_AXIAL']
         viewportIds.map(v => {
           const viewport = renderingEngine.getViewport(v)
           if (viewport) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 91104b60..1ab66d5a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -805,7 +805,7 @@ export default {
     async close(questionsObj) {
       if (questionsObj) {
         this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
-        // FusionEvent.$emit('getAnnotations')
+        FusionEvent.$emit('getAnnotations')
         FusionEvent.$emit('refreshQuestions')
       }
       this.activeItem.activeRowIndex = null
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
index 89302040..3ef2b4b7 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionList.vue
@@ -552,6 +552,7 @@ export default {
           })
           await store.dispatch('reading/refreshMeasuredData', this.visitTaskId)
           DicomEvent.$emit('getMeasureData')
+          this.$refs['ecrf3'].getQuestions(this.visitTaskId)
           loading.close()
           resolve()
         } catch (e) { console.log(e) }

From 56783a6f3adc3937fa69bcccb0e89136c2f93a78 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 14:09:55 +0800
Subject: [PATCH 316/374] =?UTF-8?q?=E9=9D=9Edicom=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E5=8F=8A=E9=98=85=E7=89=87=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/permission.js                                              | 2 +-
 .../visit/crc-upload/components/uploadNonDicomFiles.vue        | 1 +
 .../visit/qc-check/components/qualityAssurance.vue             | 3 ++-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/permission.js b/src/permission.js
index 8efb10f3..c1d1f2d5 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -56,7 +56,7 @@ router.beforeEach(async(to, from, next) => {
     /* has no token*/
     if (whiteList.indexOf(to.path) !== -1) {
       // 在免登录whiteList中，直接进入
-      if (to.path === '/readingDicoms'){
+      if (to.path === '/readingDicoms' || to.path === '/noneDicomReading'){
         OSSclient()
       }
       next()
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
index d94586c3..75d6cc3c 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadNonDicomFiles.vue
@@ -623,6 +623,7 @@ export default {
         if (this.faccept.indexOf(extendName) !== -1) {
           files[i].id = `${files[i].lastModified}${files[i].name}`
           this.fileList.push(files[i])
+          this.$refs.filesTable.toggleRowSelection(files[i], true)
         }
       }
       this.resetUploadForm()
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 9d6891db..72501241 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -1086,7 +1086,8 @@
           style="border: 2px solid #ccc; padding: 10px"
         >
           <el-image
-            :src="`/api${imgObj.url}`"
+            :src="`${OSSclientConfig.basePath}${imgObj.url}`"
+            crossorigin="anonymous"
             fit="fit"
             style="height: 500px; width: 500px"
             @error="imgObj.loading = false"

From 7d2fdd222a713cf3fd566fb895dd952ab4977510 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 15 Apr 2024 14:27:15 +0800
Subject: [PATCH 317/374] =?UTF-8?q?=E5=BD=B1=E5=83=8F=E8=B4=A8=E9=87=8F?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=B8=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8=E6=97=B6?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E8=9E=8D=E5=90=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue   | 5 -----
 .../trials-panel/reading/dicoms/components/Questions.vue     | 3 ++-
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 151ba2b6..0b3a2c09 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -960,11 +960,6 @@ export default {
       if (!this.petctWindow) return
       this.petctWindow.postMessage({ type: 'setReadingState', data: data }, window.location)
     })
-    DicomEvent.$on('reload', () => {
-      if (this.petctWindow) {
-        this.petctWindow.close()
-      }
-    })
     DicomEvent.$on('closePetct', () => {
       if (this.petctWindow) {
         this.petctWindow.close()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index cb0816d7..520cf1d5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -372,7 +372,7 @@ export default {
           DicomEvent.$emit('questionFormChange', false)
         }
         DicomEvent.$emit('getReportInfo', true)
-        DicomEvent.$emit('readingPageUpdate', {})
+        // DicomEvent.$emit('readingPageUpdate', {})
         var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
         if (idx > -1 && !this.visitTaskList[idx].IsBaseLineTask) {
           if (parseInt(imageQuality) === 2) {
@@ -381,6 +381,7 @@ export default {
             }).then(() => {
               store.dispatch('reading/setImageQuality', imageQuality)
               DicomEvent.$emit('handleImageQualityAbnormal')
+              DicomEvent.$emit('readingPageUpdate', {})
             }).catch(() => {
 
             })

From fc0ea89d74b6c948a38abb3e19ddee90572fabf5 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Tue, 16 Apr 2024 10:33:02 +0800
Subject: [PATCH 318/374] =?UTF-8?q?=E8=AE=BF=E8=A7=86=E8=AF=A6=E6=83=85?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A3=80=E6=9F=A5=E4=B8=B4=E5=BA=8A=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=9F=A5=E7=9C=8B=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../visit/crc-upload/components/studyInfo.vue | 389 ++++++++++++------
 .../visit/qc-check/components/dicomFiles.vue  | 229 +++++++----
 2 files changed, 397 insertions(+), 221 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
index f7ab1997..a1a2cce9 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/studyInfo.vue
@@ -1,9 +1,12 @@
 <template>
   <div class="study-info">
-    <div class="functions" style="text-align:right">
+    <div class="functions" style="text-align: right">
       <!-- 删除 -->
       <el-button
-        v-if="(data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+        v-if="
+          data.SubmitState * 1 < 2 ||
+          (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+        "
         v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
         :disabled="deleteArr.length === 0"
         type="primary"
@@ -11,7 +14,7 @@
         icon="el-icon-delete"
         @click="handleBatchDelete"
       >
-        {{ $t('trials:uploadedDicoms:action:delete') }}
+        {{ $t("trials:uploadedDicoms:action:delete") }}
       </el-button>
       <!-- 预览 -->
       <el-button
@@ -21,7 +24,7 @@
         icon="el-icon-view"
         @click="handlePreviewAllFiles"
       >
-        {{ $t('trials:uploadedDicoms:action:preview') }}
+        {{ $t("trials:uploadedDicoms:action:preview") }}
       </el-button>
     </div>
     <el-table
@@ -33,7 +36,7 @@
       @selection-change="handleSelectionChange"
     >
       <el-table-column
-        v-if="!(data.SubmitState*1 === 2) || data.IsQCConfirmedReupload"
+        v-if="!(data.SubmitState * 1 === 2) || data.IsQCConfirmedReupload"
         type="selection"
         width="55"
       />
@@ -62,7 +65,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{  getBodyPart(scope.row.BodyPartForEdit)}}
+          {{ getBodyPart(scope.row.BodyPartForEdit) }}
         </template>
       </el-table-column>
       <!-- 序列数量 -->
@@ -87,7 +90,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
+          {{ moment(scope.row.StudyTime).format("YYYY-MM-DD") }}
         </template>
       </el-table-column>
       <!-- 上传时间 -->
@@ -97,7 +100,11 @@
         min-width="80"
         show-overflow-tooltip
       />
-      <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
+      <el-table-column
+        :label="$t('common:action:action')"
+        min-width="100"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <!-- 预览 -->
           <el-button
@@ -107,10 +114,25 @@
             circle
             @click="handleViewStudy(scope.row)"
           />
+          <!-- 预览PET-CT数据 -->
+          <el-button
+            icon="el-icon-folder"
+            :title="$t('trials:audit:tab:clinicalData')"
+            v-if="
+              ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
+              relationInfo.IsHaveStudyClinicalData
+            "
+            circle
+            :disabled="scope.row.IsDeleted"
+            @click="handlePreviewClinicalData(scope.row)"
+          />
           <!-- 编辑 -->
           <el-button
             icon="el-icon-edit-outline"
-            v-if=" (data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+            v-if="
+              data.SubmitState * 1 < 2 ||
+              (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+            "
             v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
             title="编辑"
             circle
@@ -119,7 +141,10 @@
           />
           <!-- 删除 -->
           <el-button
-            v-if=" (data.SubmitState*1 < 2 || (data.SubmitState === 2 && data.IsQCConfirmedReupload))"
+            v-if="
+              data.SubmitState * 1 < 2 ||
+              (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+            "
             v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
             icon="el-icon-delete"
             :title="$t('trials:uploadedDicoms:action:delete')"
@@ -138,14 +163,24 @@
       custom-class="base-dialog-wrapper"
       width="600px"
     >
-      <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
+      <div
+        style="
+          padding: 10px;
+          border: 1px solid #e0e0e0;
+          max-height: 650px;
+          overflow-y: auto;
+        "
+      >
         <el-form ref="studyForm" :model="studyForm" label-width="100px">
           <!-- 检查编号 -->
           <el-form-item :label="$t('trials:audit:table:studyId')">
             <el-input v-model="studyForm.StudyCode" disabled />
           </el-form-item>
           <!-- 检查类型 -->
-          <el-form-item v-if="studyForm.IsDicomData" :label="$t('trials:audit:table:modality')">
+          <el-form-item
+            v-if="studyForm.IsDicomData"
+            :label="$t('trials:audit:table:modality')"
+          >
             <el-input v-model="studyForm.Modalities" disabled />
           </el-form-item>
           <!-- 检查类型 -->
@@ -154,11 +189,21 @@
             :label="$t('trials:audit:table:modality')"
             prop="Modalities"
             :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-              ]"
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
+            ]"
           >
             <el-radio-group v-model="studyForm.Modalities">
-              <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m" style="margin-bottom: 15px;" />
+              <el-radio
+                v-for="m in trialModalitys"
+                v-show="m !== ''"
+                :key="m"
+                :label="m"
+                style="margin-bottom: 15px"
+              />
             </el-radio-group>
           </el-form-item>
           <!-- 检查部位 -->
@@ -166,11 +211,20 @@
             :label="$t('trials:audit:table:bodyPart')"
             prop="BodyPartForEdit"
             :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-              ]"
+              {
+                required: true,
+                message: $t('common:ruleMessage:specify'),
+                trigger: 'blur',
+              },
+            ]"
           >
             <el-checkbox-group v-model="studyForm.BodyPartForEdit">
-              <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{$fd('Bodypart',bodyPart)}}</el-checkbox>
+              <el-checkbox
+                v-for="bodyPart in trialBodyPartTypes"
+                :key="bodyPart"
+                :label="bodyPart"
+                >{{ $fd("Bodypart", bodyPart) }}</el-checkbox
+              >
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -178,7 +232,10 @@
             <el-input v-model="studyForm.SeriesCount" disabled />
           </el-form-item>
           <!-- 图像数量 -->
-          <el-form-item v-if="studyForm.InstanceCount" :label="$t('trials:audit:table:instanceCount')">
+          <el-form-item
+            v-if="studyForm.InstanceCount"
+            :label="$t('trials:audit:table:instanceCount')"
+          >
             <el-input v-model="studyForm.InstanceCount" disabled />
           </el-form-item>
           <!-- 检查日期 -->
@@ -189,40 +246,77 @@
               type="date"
               value-format="yyyy-MM-dd"
               format="yyyy-MM-dd"
-              style="width:100%;"
+              style="width: 100%"
             />
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="editStudyInfoVisible = false">
-          {{ $t('common:button:cancel') }}
+        <el-button
+          :disabled="btnLoading"
+          size="small"
+          type="primary"
+          @click="editStudyInfoVisible = false"
+        >
+          {{ $t("common:button:cancel") }}
         </el-button>
-        <el-button :loading="btnLoading" size="small" type="primary" @click="handleUpdateStudyInfo">
-          {{ $t('common:button:save') }}
+        <el-button
+          :loading="btnLoading"
+          size="small"
+          type="primary"
+          @click="handleUpdateStudyInfo"
+        >
+          {{ $t("common:button:save") }}
         </el-button>
       </div>
     </el-dialog>
+    <!--pet-ct临床数据上传-->
+    <el-dialog
+      v-if="petVisible"
+      :show-close="true"
+      :visible.sync="petVisible"
+      append-to-body
+    >
+      <uploadPetClinicalData
+        :subject-visit-id="data.Id"
+        :data="data"
+        :studyData="rowData"
+        :allow-add-or-edit="false"
+      />
+    </el-dialog>
   </div>
 </template>
 <script>
-import { getSubjectVisitUploadedStudyList, deleteStudyList, updateModality } from '@/api/trials'
-import moment from 'moment'
-import { getToken } from '@/utils/auth'
+import {
+  getSubjectVisitUploadedStudyList,
+  deleteStudyList,
+  updateModality,
+} from "@/api/trials";
+import moment from "moment";
+import { getToken } from "@/utils/auth";
+import uploadPetClinicalData from "./uploadPetClinicalData.vue";
 export default {
-  name: 'StudyInfo',
+  name: "StudyInfo",
+  components: { uploadPetClinicalData },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
-    }
+        return {};
+      },
+    },
   },
   data() {
     return {
       editStudyInfoVisible: false,
-      studyForm: { StudyCode: '', IsDicomData: true, Modalities: '', BodyPartForEdit: [], SeriesCount: null, StudyTime: '' },
+      studyForm: {
+        StudyCode: "",
+        IsDicomData: true,
+        Modalities: "",
+        BodyPartForEdit: [],
+        SeriesCount: null,
+        StudyTime: "",
+      },
       deleteArr: [],
       studyLoading: false,
       studyList: [],
@@ -231,169 +325,198 @@ export default {
       relationInfo: null,
       trialBodyPartTypes: [],
       trialModalitys: [],
-      btnLoading: false
-    }
+      btnLoading: false,
+
+      // pet-ctlinc数据
+      petVisible: false,
+      rowData: {},
+    };
   },
   mounted() {
-    this.getStudyInfo()
+    this.getStudyInfo();
   },
   methods: {
+    // 预览临床数据
+    handlePreviewClinicalData(row) {
+      this.rowData = row;
+      this.petVisible = true;
+    },
     // 打开检查信息编辑框
     handleEditStudy(row) {
-      this.editStudyInfoVisible = true
-      this.studyForm = { ...row }
-      var bodyPart = []
-      if (this.studyForm.BodyPartForEdit.indexOf('|') !== -1) {
-        bodyPart = this.studyForm.BodyPartForEdit.split('|')
-      } else if (this.studyForm.BodyPartForEdit !== '') {
-        bodyPart.push(this.studyForm.BodyPartForEdit)
+      this.editStudyInfoVisible = true;
+      this.studyForm = { ...row };
+      var bodyPart = [];
+      if (this.studyForm.BodyPartForEdit.indexOf("|") !== -1) {
+        bodyPart = this.studyForm.BodyPartForEdit.split("|");
+      } else if (this.studyForm.BodyPartForEdit !== "") {
+        bodyPart.push(this.studyForm.BodyPartForEdit);
       }
-      this.studyForm.BodyPartForEdit = bodyPart
+      this.studyForm.BodyPartForEdit = bodyPart;
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
-      this.$refs['studyForm'].validate((valid) => {
-        if (!valid) return
-        this.btnLoading = true
-        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join('|')
-        this.studyForm.Modality = this.studyForm.Modalities
+      this.$refs["studyForm"].validate((valid) => {
+        if (!valid) return;
+        this.btnLoading = true;
+        this.studyForm.BodyPart = this.studyForm.BodyPartForEdit.join("|");
+        this.studyForm.Modality = this.studyForm.Modalities;
         var params = {
           id: this.studyForm.StudyId,
           subjectVisitId: this.data.Id,
           type: 1,
           modality: this.studyForm.Modality,
-          bodyPart: this.studyForm.BodyPart
-        }
-        updateModality(this.data.TrialId, params).then(res => {
-          this.btnLoading = false
-          if (res.IsSuccess) {
-            this.getStudyInfo()
-            this.$message.success(this.$t('common:message:savedSuccessfully'))
-            this.editStudyInfoVisible = false
-          }
-        }).catch(() => { this.btnLoading = false })
-      })
+          bodyPart: this.studyForm.BodyPart,
+        };
+        updateModality(this.data.TrialId, params)
+          .then((res) => {
+            this.btnLoading = false;
+            if (res.IsSuccess) {
+              this.getStudyInfo();
+              this.$message.success(
+                this.$t("common:message:savedSuccessfully")
+              );
+              this.editStudyInfoVisible = false;
+            }
+          })
+          .catch(() => {
+            this.btnLoading = false;
+          });
+      });
     },
     getStudyInfo() {
-      this.studyLoading = true
-      getSubjectVisitUploadedStudyList(this.data.Id).then(res => {
-        this.studyList = res.Result
-        this.studyLoading = false
-        this.relationInfo = res.OtherInfo
-        console.log(this.relationInfo)
-        this.trialBodyPartTypes =
-          this.relationInfo.BodyPartTypes ? this.relationInfo.BodyPartTypes.split('|') : []
-        this.trialModalitys =
-          this.relationInfo.Modalitys ? this.relationInfo.Modalitys.split('|') : []
-        console.log(this.trialBodyPartTypes)
-        console.log(this.trialModalitys)
-      }).catch(() => { this.studyLoading = false })
+      this.studyLoading = true;
+      getSubjectVisitUploadedStudyList(this.data.Id)
+        .then((res) => {
+          this.studyList = res.Result;
+          this.studyLoading = false;
+          this.relationInfo = res.OtherInfo;
+          console.log(this.relationInfo);
+          this.trialBodyPartTypes = this.relationInfo.BodyPartTypes
+            ? this.relationInfo.BodyPartTypes.split("|")
+            : [];
+          this.trialModalitys = this.relationInfo.Modalitys
+            ? this.relationInfo.Modalitys.split("|")
+            : [];
+          console.log(this.trialBodyPartTypes);
+          console.log(this.trialModalitys);
+        })
+        .catch(() => {
+          this.studyLoading = false;
+        });
     },
     // 批量删除
     handleBatchDelete() {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true
+          this.studyLoading = true;
           deleteStudyList(this.trialId, this.data.Id, this.deleteArr)
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo()
-                this.$emit('getList')
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+                this.getStudyInfo();
+                this.$emit("getList");
+                this.$message.success(
+                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+                );
               }
-            }).catch(() => {
-              this.studyLoading = true
             })
-        }).catch(() => {})
+            .catch(() => {
+              this.studyLoading = true;
+            });
+        })
+        .catch(() => {});
     },
     // 预览所有影像
     handlePreviewAllFiles() {
-      var tokenKey = getToken()
+      var tokenKey = getToken();
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${tokenKey}`
-      })
-      var newWindow = window.open(routeData.href, '_blank')
-      this.$emit('setOpenWindow',newWindow)
+        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${tokenKey}`,
+      });
+      var newWindow = window.open(routeData.href, "_blank");
+      this.$emit("setOpenWindow", newWindow);
     },
     // 预览影像
     handleViewStudy(row) {
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`
-      })
-      var newWindow =window.open(routeData.href, '_blank')
-      this.$emit('setOpenWindow',newWindow)
+        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`,
+      });
+      var newWindow = window.open(routeData.href, "_blank");
+      this.$emit("setOpenWindow", newWindow);
     },
     // 删除某个检查
     handleDeleteStudy(row) {
-      this.$confirm(this.$t('trials:uploadedDicoms:message:deleteMes'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:uploadedDicoms:message:deleteMes"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true
+          this.studyLoading = true;
           deleteStudyList(this.trialId, this.data.Id, [row.StudyId])
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo()
-                this.$emit('getList')
-                this.$message.success(this.$t('trials:uploadedDicoms:message:deleteSuccessfully'))
+                this.getStudyInfo();
+                this.$emit("getList");
+                this.$message.success(
+                  this.$t("trials:uploadedDicoms:message:deleteSuccessfully")
+                );
               }
-            }).catch(() => {
-              this.studyLoading = true
             })
-        }).catch(() => {})
+            .catch(() => {
+              this.studyLoading = true;
+            });
+        })
+        .catch(() => {});
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return ''
-      var separator = ','
-      if (bodyPart.indexOf('|') > -1) {
-        separator = '|'
-      } else if (bodyPart.indexOf(',') > -1) {
-        separator = ','
-      } else if (bodyPart.indexOf('，') > -1) {
-        separator = '，'
+      if (!bodyPart) return "";
+      var separator = ",";
+      if (bodyPart.indexOf("|") > -1) {
+        separator = "|";
+      } else if (bodyPart.indexOf(",") > -1) {
+        separator = ",";
+      } else if (bodyPart.indexOf("，") > -1) {
+        separator = "，";
       }
-      var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim())
-      })
-      return newArr.join(' | ')
+      var arr = bodyPart.split(separator);
+      var newArr = arr.map((i) => {
+        return this.$fd("Bodypart", i.trim());
+      });
+      return newArr.join(" | ");
     },
     // 获取勾选项
     handleSelectionChange(val) {
-      this.deleteArr = []
-      val.forEach(item => {
-        this.deleteArr.push(item.StudyId)
-      })
+      this.deleteArr = [];
+      val.forEach((item) => {
+        this.deleteArr.push(item.StudyId);
+      });
     },
     // 设置已删除行勾选状态
     hasDeleted(row) {
       if (row.IsDeleted) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return 'delete-row'
+        return "delete-row";
       } else {
-        return ''
+        return "";
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="scss">
-.study-info{
-  .delete-row{
-      text-decoration-line: line-through;
-      color: #c0c4cc;
-    }
+.study-info {
+  .delete-row {
+    text-decoration-line: line-through;
+    color: #c0c4cc;
+  }
 }
 </style>
diff --git a/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue b/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue
index 8feb10fc..9efe607b 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/dicomFiles.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="study-info">
-    <div class="functions" style="text-align:right">
+    <div class="functions" style="text-align: right">
       <!-- 预览 -->
       <el-button
         type="primary"
@@ -9,7 +9,7 @@
         icon="el-icon-view"
         @click="handlePreviewAllFiles"
       >
-        {{ $t('trials:audit:action:preview') }}
+        {{ $t("trials:audit:action:preview") }}
       </el-button>
     </div>
     <el-table
@@ -27,25 +27,25 @@
         min-width="80"
         show-overflow-tooltip
       />
-<!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
-<!--      <el-table-column-->
-<!--        prop="Modalities"-->
-<!--        :label="$t('trials:audit:table:modality')"-->
-<!--        min-width="80"-->
-<!--        show-overflow-tooltip-->
-<!--      />-->
-<!--      &lt;!&ndash; 检查部位 &ndash;&gt;-->
-<!--      <el-table-column-->
-<!--        prop="BodyPartExamined"-->
-<!--        :label="$t('trials:audit:table:bodyPart')"-->
-<!--        min-width="100"-->
-<!--        show-overflow-tooltip-->
-<!--      >-->
-<!--        <template slot-scope="scope">-->
-<!--          {{ getBodyPart(scope.row.BodyPartExamined) }}-->
-<!--        </template>-->
-<!--      </el-table-column>-->
-<!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
+      <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
+      <!--      <el-table-column-->
+      <!--        prop="Modalities"-->
+      <!--        :label="$t('trials:audit:table:modality')"-->
+      <!--        min-width="80"-->
+      <!--        show-overflow-tooltip-->
+      <!--      />-->
+      <!--      &lt;!&ndash; 检查部位 &ndash;&gt;-->
+      <!--      <el-table-column-->
+      <!--        prop="BodyPartExamined"-->
+      <!--        :label="$t('trials:audit:table:bodyPart')"-->
+      <!--        min-width="100"-->
+      <!--        show-overflow-tooltip-->
+      <!--      >-->
+      <!--        <template slot-scope="scope">-->
+      <!--          {{ getBodyPart(scope.row.BodyPartExamined) }}-->
+      <!--        </template>-->
+      <!--      </el-table-column>-->
+      <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
       <el-table-column
         prop="ModalityForEdit"
         :label="$t('trials:audit:table:modality')"
@@ -63,7 +63,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{  getBodyPart(scope.row.BodyPartForEdit)}}
+          {{ getBodyPart(scope.row.BodyPartForEdit) }}
         </template>
       </el-table-column>
       <!-- 序列数量 -->
@@ -88,7 +88,7 @@
         show-overflow-tooltip
       >
         <template slot-scope="scope">
-          {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
+          {{ moment(scope.row.StudyTime).format("YYYY-MM-DD") }}
         </template>
       </el-table-column>
       <!-- 上传时间 -->
@@ -98,7 +98,11 @@
         min-width="80"
         show-overflow-tooltip
       />
-      <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
+      <el-table-column
+        :label="$t('common:action:action')"
+        min-width="100"
+        fixed="right"
+      >
         <template slot-scope="scope">
           <!-- 预览 -->
           <el-button
@@ -108,129 +112,178 @@
             circle
             @click="handleViewStudy(scope.row)"
           />
+          <!-- 预览PET-CT数据 -->
+          <el-button
+            icon="el-icon-folder"
+            :title="$t('trials:audit:tab:clinicalData')"
+            v-if="
+              ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
+              relationInfo.IsHaveStudyClinicalData
+            "
+            circle
+            :disabled="scope.row.IsDeleted"
+            @click="handlePreviewClinicalData(scope.row)"
+          />
         </template>
       </el-table-column>
     </el-table>
+    <!--pet-ct临床数据预览-->
+    <el-dialog
+      v-if="petVisible"
+      :show-close="true"
+      :visible.sync="petVisible"
+      append-to-body
+    >
+      <uploadPetClinicalData
+        :subject-visit-id="data.Id"
+        :data="data"
+        :studyData="rowData"
+        :allow-add-or-edit="false"
+      />
+    </el-dialog>
   </div>
 </template>
 <script>
-import { getSubjectVisitUploadedStudyList, deleteStudyList } from '@/api/trials'
-import { getToken } from '@/utils/auth'
-import moment from 'moment'
+import {
+  getSubjectVisitUploadedStudyList,
+  deleteStudyList,
+} from "@/api/trials";
+import { getToken } from "@/utils/auth";
+import uploadPetClinicalData from "@/views/trials/trials-panel/visit/crc-upload/components/uploadPetClinicalData.vue";
+import moment from "moment";
 export default {
-  name: 'StudyInfo',
+  name: "StudyInfo",
+  components: { uploadPetClinicalData },
   props: {
     data: {
       type: Object,
       default() {
-        return {}
-      }
-    }
+        return {};
+      },
+    },
   },
   data() {
     return {
-      userTypeEnumInt: zzSessionStorage.getItem('userTypeEnumInt') * 1,
+      userTypeEnumInt: zzSessionStorage.getItem("userTypeEnumInt") * 1,
       deleteArr: [],
       studyLoading: false,
       studyList: [],
       trialId: this.$route.query.trialId,
-      moment
-    }
+      moment,
+      // pet-ct临床数据
+      petVisible: false,
+      rowData: {},
+      relationInfo: {},
+    };
   },
   mounted() {
-    this.getStudyInfo()
+    this.getStudyInfo();
   },
   methods: {
+    // 预览临床数据
+    handlePreviewClinicalData(row) {
+      this.rowData = row;
+      this.petVisible = true;
+    },
     getStudyInfo() {
-      this.studyLoading = true
-      getSubjectVisitUploadedStudyList(this.data.Id).then(res => {
-        this.studyList = res.Result
-        this.studyLoading = false
-      }).catch(() => { this.studyLoading = false })
+      this.studyLoading = true;
+      getSubjectVisitUploadedStudyList(this.data.Id)
+        .then((res) => {
+          this.studyList = res.Result;
+          this.relationInfo = res.OtherInfo;
+          this.studyLoading = false;
+        })
+        .catch(() => {
+          this.studyLoading = false;
+        });
     },
     // 批量删除
     handleBatchDelete() {
-      this.$confirm(this.$t('trials:qcCheck:message:delete'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
+      this.$confirm(this.$t("trials:qcCheck:message:delete"), {
+        type: "warning",
+        distinguishCancelAndClose: true,
       })
         .then(() => {
-          this.studyLoading = true
+          this.studyLoading = true;
           deleteStudyList(this.trialId, this.data.Id, this.deleteArr)
-            .then(res => {
+            .then((res) => {
               if (res.IsSuccess) {
-                this.getStudyInfo()
-                this.$emit('getList')
-                this.$message.success(this.$t('trials:qcCheck:message:deletedSuccessfully'))
+                this.getStudyInfo();
+                this.$emit("getList");
+                this.$message.success(
+                  this.$t("trials:qcCheck:message:deletedSuccessfully")
+                );
               }
-            }).catch(() => {
-              this.studyLoading = true
             })
-        }).catch(() => {})
+            .catch(() => {
+              this.studyLoading = true;
+            });
+        })
+        .catch(() => {});
     },
     // 预览所有影像
     handlePreviewAllFiles() {
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`
-      })
-      window.open(routeData.href, '_blank')
+        path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`,
+      });
+      window.open(routeData.href, "_blank");
     },
     // 预览影像
     handleViewStudy(row) {
-      var token = getToken()
+      var token = getToken();
       const routeData = this.$router.resolve({
-        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`
-      })
-      window.open(routeData.href, '_blank')
+        path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`,
+      });
+      window.open(routeData.href, "_blank");
     },
     getBodyPart(bodyPart) {
-      if (!bodyPart) return ''
-      var separator = ','
-      if (bodyPart.indexOf('|') > -1) {
-        separator = '|'
-      } else if (bodyPart.indexOf(',') > -1) {
-        separator = ','
-      } else if (bodyPart.indexOf('，') > -1) {
-        separator = '，'
+      if (!bodyPart) return "";
+      var separator = ",";
+      if (bodyPart.indexOf("|") > -1) {
+        separator = "|";
+      } else if (bodyPart.indexOf(",") > -1) {
+        separator = ",";
+      } else if (bodyPart.indexOf("，") > -1) {
+        separator = "，";
       }
-      var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
-        return this.$fd('Bodypart', i.trim())
-      })
-      return newArr.join(' | ')
+      var arr = bodyPart.split(separator);
+      var newArr = arr.map((i) => {
+        return this.$fd("Bodypart", i.trim());
+      });
+      return newArr.join(" | ");
     },
     // 获取勾选项
     handleSelectionChange(val) {
-      this.deleteArr = []
-      val.forEach(item => {
-        this.deleteArr.push(item.StudyId)
-      })
+      this.deleteArr = [];
+      val.forEach((item) => {
+        this.deleteArr.push(item.StudyId);
+      });
     },
     // 设置已删除行勾选状态
     hasDeleted(row) {
       if (row.IsDeleted) {
-        return false
+        return false;
       } else {
-        return true
+        return true;
       }
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
       if (row.IsDeleted) {
-        return 'delete-row'
+        return "delete-row";
       } else {
-        return ''
+        return "";
       }
-    }
-  }
-}
+    },
+  },
+};
 </script>
 <style lang="scss">
-.study-info{
-  .delete-row{
-      text-decoration-line: line-through;
-      color: #c0c4cc;
-    }
+.study-info {
+  .delete-row {
+    text-decoration-line: line-through;
+    color: #c0c4cc;
+  }
 }
 </style>

From a576204ac3176c626c519bafbba1a42b2d79b517 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 16 Apr 2024 14:19:50 +0800
Subject: [PATCH 319/374] =?UTF-8?q?lugano=E6=A0=87=E5=87=86=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E8=AF=84=E4=BC=B0=E8=A1=A8=E5=8D=95=E6=BB=9A=E5=8A=A8?=
 =?UTF-8?q?=E6=97=B6=E4=B8=8B=E6=8B=89=E6=A1=86=E8=A7=A6=E5=8F=91=E5=A4=B1?=
 =?UTF-8?q?=E5=8E=BB=E7=84=A6=E7=82=B9=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Lugano/QuestionForm.vue    | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index ca2d94f0..e821112a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -31,8 +31,8 @@
             v-model="questionForm.LesionType"
             filterable
             :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
-            :popper-append-to-body="lesionType === 0 ? false :true"
             @change="((val)=>{lesionTypeChange(val)})"
+            :ref="`select_LesionType`"
           >
 
             <el-option
@@ -89,8 +89,8 @@
             filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
             :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
-            :popper-append-to-body="lesionType === 0 ? false :true"
             @change="((val)=>{formItemChange(val, qs)})"
+            :ref="`select_${qs.Id}`"
           >
             <template v-if="qs.QuestionMark === 8" #prefix>
               <span style="padding-left: 5px;">
@@ -356,11 +356,23 @@ export default {
     })
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
+    window.addEventListener('scroll', this.scrollHandle , true)
   },
   beforeDestroy() {
     DicomEvent.$off('handleImageQualityAbnormal')
+    window.removeEventListener('scroll', this.scrollHandle , true)
   },
   methods: {
+    scrollHandle() {
+      for(let k in this.$refs) {
+        if(k.indexOf('select_') === -1) continue
+        if(this.$refs[k] instanceof Array){
+          this.$refs[k][0].blur()
+        }else{
+          this.$refs[k].blur()
+        }
+      }
+    },
     initializeViewer() {
       Viewer.setDefaults({
         toolbar: { zoomIn: true, zoomOut: true, rotateLeft: true, rotateRight: true, flipHorizontal: true, flipVertical: true }

From 236f07e46b960824f5e3989192bb6e3a9457faa4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 16 Apr 2024 18:00:03 +0800
Subject: [PATCH 320/374] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E7=99=BB=E5=87=BA?=
 =?UTF-8?q?=E5=9C=BA=E6=99=AF=E8=A1=A5=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/request.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/request.js b/src/utils/request.js
index c8fa0594..685f7ff3 100644
--- a/src/utils/request.js
+++ b/src/utils/request.js
@@ -78,7 +78,7 @@ service.interceptors.response.use(
     var message = ''
     if (error && error.response) {
       const status = error.response.status
-      if (error.response.data && error.response.data.Code === -1) {
+      if (error.response.data && (error.response.data.Code === -1 || error.response.data.Code === -2)) {
         store.dispatch('user/logout').then(() => {
           router.push(`/login`)
           this.$i18n.locale = 'zh'

From 967edf73786bf73aa7303d9fa8ef38c1645c3382 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 17 Apr 2024 10:15:58 +0800
Subject: [PATCH 321/374] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=98=85=E7=89=87=E6=A0=87=E5=87=86loading?=
 =?UTF-8?q?=E5=8A=A0=E8=BD=BDbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/setting/reading-unit/index.vue     | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index faa24bf4..f5272c33 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -98,7 +98,7 @@
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
         <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
       </div>
-      <SignForm ref="signForm" :sign-code-enum="signCode2" @closeDialog="closeSignDialog2" />
+      <SignForm ref="signForm2" :sign-code-enum="signCode2" @closeDialog="closeSignDialog2" />
     </el-dialog>
   </div>
 </template>
@@ -176,13 +176,16 @@ export default {
         },
         signInfo: signInfo
       }
-      resetAndAsyncCriterion(params).then(async res => {
+      resetAndAsyncCriterion(params).then(res => {
         this.isPaneShow = false
         this.$nextTick(() => {
           this.signVisible2 = false
           this.isPaneShow = true
           this.loading = false
         })
+      }).catch(() => {
+        this.$refs['signForm2'].btnLoading = false
+        this.loading = false
       })
     },
     asyncTrialCriterionDictionary(TrialReadingCriterionId) {

From 08f0d76aa73b304c5c54ab15281550d024ae7ddd Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Apr 2024 11:11:03 +0800
Subject: [PATCH 322/374] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E6=98=BE=E7=A4=BA=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials/trials-panel/attachments/site-research/index.vue   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue
index 80baa9cd..019be925 100644
--- a/src/views/trials/trials-panel/attachments/site-research/index.vue
+++ b/src/views/trials/trials-panel/attachments/site-research/index.vue
@@ -208,11 +208,11 @@
             <el-button
               :disabled="scope.row.State !== 3"
               circle
-              :title="$t('trials:researchRecord:action:view')"
+              :title="$t('common:button:view')"
               icon="el-icon-view"
               @click="handleViewResearchList(scope.row)"
             />
-            <!-- 查看 -->
+            <!-- 审批 -->
             <el-button
               v-hasPermi="['trials:trials-panel:attachments:site-research:auidt']"
               :disabled="scope.row.State === 0 || scope.row.State === 3"

From 138ea2cfb80a1c1b1afabe818c23c4889ca667f7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 14:25:40 +0800
Subject: [PATCH 323/374] =?UTF-8?q?=E6=8F=90=E7=A4=BA=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=8F=8A=E5=BD=B1=E5=83=8F=E8=AF=84=E4=BC=B0=E8=AE=BE=E7=BD=AE?=
 =?UTF-8?q?pet=205PS=E8=AF=84=E5=88=86=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue          | 4 ++--
 .../trials-panel/reading/dicoms/components/Questions.vue    | 6 +++++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index e9aa831d..d9e9a5e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -456,11 +456,11 @@ export default {
           const suvMax = measurement.suvMax
           
           if(this.questionForm[obj.QuestionId] !== suvMax){
+            this.setPet5PSCommentDisplay()
+            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
             var pet5PS = this.setpet5PS()
             this.questionForm[this.pet5PSId] = pet5PS
             this.calculatePet5PS = pet5PS
-            this.setPet5PSCommentDisplay()
-            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
           }
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 520cf1d5..59cef3ee 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -311,7 +311,11 @@ export default {
           // 保存影响质量问题分组，如果质量问题为PET-CT影像无法融合则验证是否可以保存
           const res = await getCanChooseNotMerge({ visitTaskId: this.visitTaskId })
           if (res.IsSuccess && !res.Result.IsCanChooseNotMerge) {
-            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'))
+            // this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {showCancelButton: false})
+            this.$alert(this.$t('trials:lugano:saveQuestions:warning1'), this.$t('trials:lugano:fusionDialog:warning'), {
+              showCancelButton: false,
+              callback: action => {}
+            })
             return
           } else {
             // 如果设置为PET-CT影像无法融合，则FDG-PET评估会被设置为NE。

From 0ad25e273af8b29efd5117e2b0dd73b7dbca9ab5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 14:29:20 +0800
Subject: [PATCH 324/374] =?UTF-8?q?pet=205PS=E8=AF=84=E5=88=86=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index d9e9a5e6..a74502d5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -457,11 +457,11 @@ export default {
           
           if(this.questionForm[obj.QuestionId] !== suvMax){
             this.setPet5PSCommentDisplay()
-            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-            var pet5PS = this.setpet5PS()
-            this.questionForm[this.pet5PSId] = pet5PS
-            this.calculatePet5PS = pet5PS
           }
+          this.$set(this.questionForm, obj.QuestionId, suvMax || null)
+          var pet5PS = this.setpet5PS()
+          this.questionForm[this.pet5PSId] = pet5PS
+          this.calculatePet5PS = pet5PS
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true

From 1b5c62df751e5ce486081bb68fae11020e4490b2 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 14:31:31 +0800
Subject: [PATCH 325/374] =?UTF-8?q?pet=205ps=E8=AF=84=E5=88=86=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue        | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index a74502d5..d9e9a5e6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -457,11 +457,11 @@ export default {
           
           if(this.questionForm[obj.QuestionId] !== suvMax){
             this.setPet5PSCommentDisplay()
+            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
+            var pet5PS = this.setpet5PS()
+            this.questionForm[this.pet5PSId] = pet5PS
+            this.calculatePet5PS = pet5PS
           }
-          this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-          var pet5PS = this.setpet5PS()
-          this.questionForm[this.pet5PSId] = pet5PS
-          this.calculatePet5PS = pet5PS
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true

From db0d5f7ff67efc1a9aaae0fde014ece2222d9aee Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Thu, 18 Apr 2024 15:01:48 +0800
Subject: [PATCH 326/374] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E4=B8=B4=E5=BA=8A?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=8C=89=E9=92=AE=E5=9B=BE=E6=A0=87=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../qc-check/components/qualityAssurance.vue  | 24 ++++++++++++-------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
index 72501241..d57020c4 100644
--- a/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
+++ b/src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue
@@ -141,9 +141,18 @@
                     :disabled="scope.row.IsDeleted"
                     @click="handlePreviewStudy(scope.row)"
                   />
+                  <!-- 编辑 -->
+                  <el-button
+                    icon="el-icon-edit-outline"
+                    :title="$t('trials:audit:action:edit')"
+                    circle
+                    :disabled="isAudit || scope.row.IsDeleted"
+                    @click="handleEditStudy(scope.row)"
+                  />
                   <!-- 预览PET-CT数据 -->
                   <el-button
-                    icon="el-icon-folder"
+                    type="primary"
+                    icon="el-icon-document tip-i"
                     :title="$t('trials:audit:tab:clinicalData')"
                     v-if="
                       ['PT、CT', 'CT、PT', 'PET-CT'].includes(
@@ -154,14 +163,6 @@
                     :disabled="scope.row.IsDeleted"
                     @click="handlePreviewClinicalData(scope.row)"
                   />
-                  <!-- 编辑 -->
-                  <el-button
-                    icon="el-icon-edit-outline"
-                    :title="$t('trials:audit:action:edit')"
-                    circle
-                    :disabled="isAudit || scope.row.IsDeleted"
-                    @click="handleEditStudy(scope.row)"
-                  />
                 </template>
               </el-table-column>
             </el-table>
@@ -2248,4 +2249,9 @@ export default {
     padding: 10px;
   }
 }
+::v-deep .tip-i{
+  &::before{
+    color: #fff !important;
+  }
+}
 </style>

From 7dbe8c92e187c8eee1a62ec3e9bcc804f7c08f89 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 15:24:45 +0800
Subject: [PATCH 327/374] =?UTF-8?q?=E6=9C=AC=E5=9C=B0=E5=BD=B1=E5=83=8F?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-preview.vue                 | 10 +++++++---
 .../visit/crc-upload/components/uploadDicomFiles2.vue  |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/src/views/dicom-show/dicom-preview.vue b/src/views/dicom-show/dicom-preview.vue
index b3242fe0..5002dcf3 100644
--- a/src/views/dicom-show/dicom-preview.vue
+++ b/src/views/dicom-show/dicom-preview.vue
@@ -63,7 +63,7 @@
 import * as dicomParser from 'dicom-parser'
 import * as cornerstone from 'cornerstone-core'
 import * as cornerstoneWADOImageLoader from 'cornerstone-wado-image-loader'
-import dicomStore from '@/utils/dicom-store.js'
+import dicomStore from '@/utils/dicom-store'
 import dicomViewer from '@/components/Dicom/DicomViewer'
 import dicomPreview from '@/components/Dicom/DicomPreview'
 
@@ -86,6 +86,10 @@ export default {
     uid: {
       type: String,
       default: ''
+    },
+    studyList: {
+      type: Array,
+      default: []
     }
   },
 
@@ -102,7 +106,7 @@ export default {
     var totalHeight = window.innerHeight || document.body.clientHeight
     var wrapper = this.$refs['preview-wrapper']
     wrapper.style.height = (totalHeight - 70) + 'px'
-    if (!dicomStore.studyList || !this.uid) return
+    if (!this.studyList || !this.uid) return
     this.loadStudy()
   },
 
@@ -120,7 +124,7 @@ export default {
       return newObj
     },
     loadStudy() {
-      var studyList = dicomStore.studyList
+      var studyList = this.studyList
       var studyUid = this.uid
       var studyItem = studyList.find(function(item) {
         return item.dicomInfo.studyUid === studyUid
diff --git a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
index fa0d7c7e..decc6093 100644
--- a/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
+++ b/src/views/trials/trials-panel/visit/crc-upload/components/uploadDicomFiles2.vue
@@ -560,7 +560,7 @@
       :visible.sync="previewVisible"
       append-to-body
     >
-      <DicomPreview :uid="uid" />
+      <DicomPreview :uid="uid" :studyList="uploadQueues"/>
     </el-dialog>
     <!--pet-ct临床数据上传-->
     <el-dialog

From 28b644a0ce3fd8c0e63b4678455142f5327a8b9e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 15:57:39 +0800
Subject: [PATCH 328/374] =?UTF-8?q?=E9=9D=B6=E7=97=85=E7=81=B6=E8=AF=84?=
 =?UTF-8?q?=E4=BC=B0=E5=88=97=E8=A1=A8=E4=B8=8B=E6=8B=89=E6=A1=86=E6=BB=9A?=
 =?UTF-8?q?=E5=8A=A8=E4=BA=8B=E4=BB=B6=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue     | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index e821112a..66eb3c82 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -18,7 +18,7 @@
           <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="handleClose" />
         </div>
       </div>
-      <div style="height: 420px;overflow-y: auto;overflow-x: hidden;">
+      <div style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
         <el-form-item
           :label="$t('trials:reading:title:lesionType')"
           prop="LesionType"
@@ -356,11 +356,13 @@ export default {
     })
     var digitPlaces = Number(localStorage.getItem('digitPlaces'))
     this.digitPlaces = digitPlaces === -1 ? this.digitPlaces : digitPlaces
-    window.addEventListener('scroll', this.scrollHandle , true)
+    // var container = document.getElementById('qs_container')
+    // container.addEventListener('scroll', this.scrollHandle , true)
   },
   beforeDestroy() {
     DicomEvent.$off('handleImageQualityAbnormal')
-    window.removeEventListener('scroll', this.scrollHandle , true)
+    // var container = document.getElementById('qs_container')
+    // container.removeEventListener('scroll', this.scrollHandle , true)
   },
   methods: {
     scrollHandle() {

From 8618b188aed96b6d51e426bde69e062bdacec3a7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 18 Apr 2024 16:45:45 +0800
Subject: [PATCH 329/374] =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E7=BA=BF=E6=91=84?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=8F=98=E5=8C=96=E8=87=AA=E5=8A=A8=E8=AE=A1?=
 =?UTF-8?q?=E7=AE=97=E9=80=BB=E8=BE=91=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 33 +++++++++++--------
 .../dicoms/components/Lugano/QuestionForm.vue | 12 +++----
 2 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index d9e9a5e6..25dd73e2 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -348,6 +348,7 @@ export default {
       this.questionForm[this.pet5PSId] = pet5PS
       this.calculatePet5PS = pet5PS
       this.setPet5PSCommentDisplay()
+      this.setUptakeFormBaseline()
       FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.measurements[idx].OtherMeasureData, type: 'clear' })
       var remark = this.measurements[idx].OtherMeasureData.data.remark
       remark === 'Liver' ? this.liverIsInsideVolume = true : remark === 'Mediastinum' ? this.lungIsInsideVolume = true : ''
@@ -454,13 +455,14 @@ export default {
         }
         if (measurement.type === 'CircleROI') {
           const suvMax = measurement.suvMax
-          
-          if(this.questionForm[obj.QuestionId] !== suvMax){
+
+          if (this.questionForm[obj.QuestionId] !== suvMax) {
             this.setPet5PSCommentDisplay()
             this.$set(this.questionForm, obj.QuestionId, suvMax || null)
             var pet5PS = this.setpet5PS()
             this.questionForm[this.pet5PSId] = pet5PS
             this.calculatePet5PS = pet5PS
+            this.setUptakeFormBaseline()
           }
         }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
@@ -517,11 +519,12 @@ export default {
         OrderMarkName: remark
       }
       if (measurement.type === 'CircleROI') {
+        this.setPet5PSCommentDisplay()
         this.$set(this.questionForm, obj.QuestionId, null)
         var pet5PS = this.setpet5PS()
         this.questionForm[this.pet5PSId] = pet5PS
         this.calculatePet5PS = pet5PS
-        this.setPet5PSCommentDisplay()
+        this.setUptakeFormBaseline()
       }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
@@ -535,6 +538,7 @@ export default {
       this.questionForm[this.pet5PSId] = pet5PS
       this.calculatePet5PS = pet5PS
       this.setPet5PSCommentDisplay()
+      this.setUptakeFormBaseline()
       this.measurements[idx].OtherMeasureData = ''
       this.currentQsId = this.measurements[idx].QuestionId
       // const { QuestionId, QuestionType } = this.measurements[idx]
@@ -548,16 +552,7 @@ export default {
       this.questionForm[obj.key] = obj.val
       if (obj.key === this.pet5PSId) {
         this.setPet5PSCommentDisplay()
-        // 自动计算与基线相比摄取值变化
-        if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
-          // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
-          // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
-          if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
-            this.questionForm[this.uptakeFromBaselineId] = '1'
-          } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
-            this.questionForm[this.uptakeFromBaselineId] = '2'
-          }
-        }
+        this.setUptakeFormBaseline()
       }
     },
     setPet5PSCommentDisplay() {
@@ -577,6 +572,18 @@ export default {
         }
       }
     },
+    setUptakeFormBaseline() {
+      // 自动计算与基线相比摄取值变化
+      if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
+        // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
+        // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
+        if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
+          this.questionForm[this.uptakeFromBaselineId] = '1'
+        } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
+          this.questionForm[this.uptakeFromBaselineId] = '2'
+        }
+      }
+    },
     setpet5PS() {
       console.log('setpet5PS')
       // 无需标记，自主选择   1分
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 66eb3c82..407c2ec6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -28,11 +28,11 @@
         >
           <!-- 下拉框 -->
           <el-select
+            :ref="`select_LesionType`"
             v-model="questionForm.LesionType"
             filterable
             :disabled="!isCurrentTask || readingTaskState>=2 || !isBaseLineTask || answers.SplitOrMergeType === '1'"
             @change="((val)=>{lesionTypeChange(val)})"
-            :ref="`select_LesionType`"
           >
 
             <el-option
@@ -85,12 +85,12 @@
 
           <el-select
             v-if="qs.Type==='select'"
+            :ref="`select_${qs.Id}`"
             v-model="questionForm[qs.Id]"
             filterable
             :placeholder="qs.QuestionMark === 8 ? $t('common:placeholder:selectorsearch') : $t('common:placeholder:select')"
             :disabled="!isCurrentTask || readingTaskState>=2 || qs.QuestionMark === 0 || qs.QuestionMark === 1 || qs.QuestionMark === 2 || qs.QuestionMark === 5 || (qs.QuestionMark === 6 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName))|| (qs.QuestionMark === 8 && (isCurrentTaskAdd === 'False'|| !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 10 && (isCurrentTaskAdd === 'False' || (isCurrentTaskAdd === 'True' && !questionForm.IsCanEditPosition) || !!answers.SplitOrMergeLesionName)) || (qs.QuestionMark === 7 && stateDisabled) || answers.SplitOrMergeType === '1' || (qs.QuestionMark === 7 && answers.SplitOrMergeType === '3')"
             @change="((val)=>{formItemChange(val, qs)})"
-            :ref="`select_${qs.Id}`"
           >
             <template v-if="qs.QuestionMark === 8" #prefix>
               <span style="padding-left: 5px;">
@@ -366,11 +366,11 @@ export default {
   },
   methods: {
     scrollHandle() {
-      for(let k in this.$refs) {
-        if(k.indexOf('select_') === -1) continue
-        if(this.$refs[k] instanceof Array){
+      for (const k in this.$refs) {
+        if (k.indexOf('select_') === -1) continue
+        if (this.$refs[k] instanceof Array) {
           this.$refs[k][0].blur()
-        }else{
+        } else {
           this.$refs[k].blur()
         }
       }

From 3646acf378d73e36a2ddfcd1f846f7f42495096b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Apr 2024 11:09:16 +0800
Subject: [PATCH 330/374] =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E7=BA=BF=E6=91=84?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=8F=98=E5=8C=96bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue     | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 25dd73e2..7307673c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -574,13 +574,17 @@ export default {
     },
     setUptakeFormBaseline() {
       // 自动计算与基线相比摄取值变化
-      if (!this.isBaseLineTask && this.questionForm[this.pet5PSId] > 0) {
-        // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
-        // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
-        if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
-          this.questionForm[this.uptakeFromBaselineId] = '1'
-        } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
-          this.questionForm[this.uptakeFromBaselineId] = '2'
+      if (!this.isBaseLineTask) {
+        if (this.questionForm[this.pet5PSId] > 0) {
+          // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
+          // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
+          if (this.questionForm[this.pet5PSId] > this.baseLinePET5PS) {
+            this.questionForm[this.uptakeFromBaselineId] = '1'
+          } else if (this.questionForm[this.pet5PSId] < this.baseLinePET5PS) {
+            this.questionForm[this.uptakeFromBaselineId] = '2'
+          }
+        } else if (this.questionForm[this.pet5PSId] === '' || this.questionForm[this.pet5PSId] === null) {
+          this.questionForm[this.uptakeFromBaselineId] = ''
         }
       }
     },

From 227f583e7a5a42fe0eb151e9e95d4836078f6181 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Apr 2024 11:15:53 +0800
Subject: [PATCH 331/374] =?UTF-8?q?pet-5ps=E8=AF=84=E5=88=86=E4=B8=BA2?=
 =?UTF-8?q?=E5=88=86=E8=AE=A1=E7=AE=97=E8=A7=84=E5=88=99=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 7307673c..55afeaaf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -609,8 +609,8 @@ export default {
         // 纵隔血池SUVmax<本访视点病灶的max SUVmax（所有病灶中最大的）≤1*肝脏血池SUVmax    3分
         // this.questionForm[this.pet5PSId] = '3'
         return '3'
-      } else if (maxSUVmax !== null && lungSUVmax !== null && maxSUVmax < lungSUVmax) {
-        // 本访视点病灶的SUVmax（所有病灶中最大的）<纵隔血池SUVmax     2分
+      } else if (maxSUVmax !== null && lungSUVmax !== null && maxSUVmax <= lungSUVmax) {
+        // 本访视点病灶的SUVmax（所有病灶中最大的）<=纵隔血池SUVmax     2分
         // this.questionForm[this.pet5PSId] = '2'
         return '2'
       } else {

From d96c4c743bec5053cb8f003f41c50e5831364608 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Apr 2024 15:15:04 +0800
Subject: [PATCH 332/374] =?UTF-8?q?=E6=A0=87=E8=AE=B0=E5=AE=9A=E4=BD=8D?=
 =?UTF-8?q?=E9=87=8D=E5=A4=8D=E8=A7=A6=E5=8F=91=E4=BB=A3=E7=A0=81=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue  | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index 9f337f33..d62064dd 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -602,11 +602,6 @@ export default {
       this.removeAnnotation(obj)
     })
     FusionEvent.$on('imageLocation', (obj) => {
-      console.log('imageLocation')
-      this.imageLocation(obj)
-    })
-    FusionEvent.$on('imageLocation', (obj) => {
-      console.log('imageLocation')
       this.imageLocation(obj)
     })
     FusionEvent.$on('getScreenshots', async(measuredData, callback) => {

From 5ec96c76bf5c7f0ca1aa933502d356f631367905 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Apr 2024 15:46:41 +0800
Subject: [PATCH 333/374] =?UTF-8?q?=E5=A4=9A=E8=A1=8C=E6=96=87=E6=9C=AC?=
 =?UTF-8?q?=E6=A1=86=E9=99=90=E5=88=B6=E5=AD=97=E7=AC=A6=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/Fusion/PetCt.vue     | 1 -
 .../reading/dicoms/components/Fusion/QuestionItem.vue           | 1 +
 .../reading/dicoms/components/Fusion/TableQuestionItem.vue      | 1 +
 .../reading/dicoms/components/Lugano/QuestionForm.vue           | 1 +
 .../trials-panel/reading/dicoms/components/QuestionItem.vue     | 1 +
 .../reading/mim-medical-audit/components/Conclusions.vue        | 2 ++
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index d62064dd..aad9ad18 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -690,7 +690,6 @@ export default {
 
       var ptseriesId = this.$route.query.ptseriesId
       this.petSeries = await this.getSeriesInfo(ptseriesId)
-
       const maxCount = Math.max(this.ctSeries.imageIds.length, this.petSeries.imageIds.length)
       this.$set(this.ctSeries, 'imageMaxLength', maxCount)
       this.$set(this.petSeries, 'imageMaxLength', maxCount)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 9db13b4a..7336fc8d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -78,6 +78,7 @@
           v-model="questionForm[question.Id]"
           type="textarea"
           :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
           :disabled="readingTaskState >= 2"
         />
         <!-- 下拉框 -->
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
index 667b2b1d..0fd43d8b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestionItem.vue
@@ -79,6 +79,7 @@
             v-model="questionForm[qs.Id]"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 4}"
+            maxlength="500"
             :disabled="!isCurrentTask || readingTaskState>=2"
             @change="((val)=>{formItemChange(val, qs)})"
           />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 407c2ec6..2ed456cf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -77,6 +77,7 @@
             v-model="questionForm[qs.Id]"
             type="textarea"
             :autosize="{ minRows: 2, maxRows: 4}"
+            maxlength="500"
             :disabled="!isCurrentTask || readingTaskState>=2 || answers.SplitOrMergeType === '1'"
             @change="((val)=>{formItemChange(val, qs)})"
           />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 70e85abe..021f4fb1 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -81,6 +81,7 @@
           v-model="questionForm[question.Id]"
           type="textarea"
           :autosize="{ minRows: 2, maxRows: 4}"
+          maxlength="500"
           :disabled="readingTaskState >= 2 || isFirstChangeTask"
           @change="((val)=>{formItemChange(val, question)})"
         />
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
index 8fdb2328..07ed536d 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/Conclusions.vue
@@ -45,6 +45,8 @@
         <el-input
           v-model="form.Questioning"
           type="textarea"
+          :autosize="{ minRows: 3, maxRows: 5}"
+          maxlength="500"
           :disabled="isSendMessage || auditState===2 || !hasPermi(['trials:trials-panel:reading:mim-medical-audit:edit'])"
         />
       </el-form-item>

From 300a9ad53613ae78b565387e271c4768d62fc24f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Apr 2024 15:57:17 +0800
Subject: [PATCH 334/374] =?UTF-8?q?=E4=B8=8E=E5=9F=BA=E7=BA=BF=E6=91=84?=
 =?UTF-8?q?=E5=8F=96=E5=80=BC=E5=8F=98=E5=8C=96=E6=95=B0=E5=80=BC=E7=BB=B4?=
 =?UTF-8?q?=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue           | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 55afeaaf..4d606b7c 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -575,6 +575,7 @@ export default {
     setUptakeFormBaseline() {
       // 自动计算与基线相比摄取值变化
       if (!this.isBaseLineTask) {
+        console.log('setUptakeFormBaseline: ',this.questionForm[this.pet5PSId],this.baseLinePET5PS)
         if (this.questionForm[this.pet5PSId] > 0) {
           // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
           // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
@@ -659,6 +660,10 @@ export default {
           // PET 5PS评分;
           this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
         }
+        if (i.QuestionType === 56) {
+          // 与基线相比摄取值变化;
+          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+        }
 
         if (i.Childrens && i.Childrens.length > 0) {
           this.setSuvChild(i.Childrens)

From f3f826d60a50dff42cf7437394785e1b1eec1399 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 19 Apr 2024 17:06:12 +0800
Subject: [PATCH 335/374] =?UTF-8?q?=E4=BF=9D=E5=AD=98=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E5=8F=AA=E6=9B=B4=E6=96=B0SUVmax=E6=89=80=E5=9C=A8=E7=97=85?=
 =?UTF-8?q?=E7=81=B6=E5=8F=8A=E7=97=85=E7=81=B6=E6=9C=80=E5=A4=A7SUV?=
 =?UTF-8?q?=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 4d606b7c..fe2f8416 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -637,9 +637,10 @@ export default {
             this.setSuvChild(v.Childrens)
           }
           var pet5PS = this.setpet5PS()
-          // this.questionForm[this.pet5PSId] = pet5PS
+          this.questionForm[this.pet5PSId] = pet5PS
           this.calculatePet5PS = pet5PS
           this.setPet5PSCommentDisplay()
+           this.setUptakeFormBaseline()
           this.questionFormChangeState = true
         })
 
@@ -656,14 +657,14 @@ export default {
           // SUVmax所在病灶;
           this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
         }
-        if (i.QuestionType === 55) {
-          // PET 5PS评分;
-          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
-        }
-        if (i.QuestionType === 56) {
-          // 与基线相比摄取值变化;
-          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
-        }
+        // if (i.QuestionType === 55) {
+        //   // PET 5PS评分;
+        //   this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+        // }
+        // if (i.QuestionType === 56) {
+        //   // 与基线相比摄取值变化;
+        //   this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+        // }
 
         if (i.Childrens && i.Childrens.length > 0) {
           this.setSuvChild(i.Childrens)

From 96c35e1736b26d716905810bc83f8b57f84837c6 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 22 Apr 2024 10:17:12 +0800
Subject: [PATCH 336/374] =?UTF-8?q?=E5=9C=A8=E8=B4=A6=E5=8F=B7=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF=E7=BC=93=E5=AD=98?=
 =?UTF-8?q?=E4=B8=AD=E7=9A=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-myinfo/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index fc455524..fd73d236 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -269,8 +269,9 @@ export default {
         this.getUserInfo()
       })
     },
-    setNewUserName() {
+    setNewUserName() { 
       setNewUserName(this.userForm.UserName).then(() => {
+        zzSessionStorage.setItem('userName', this.userForm.UserName)
         this.$store.dispatch('user/changeUserName', this.userForm.UserName).then((res) => {
           this.userForm.UserName = ''
           this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))

From be6fdf227725ff48f3cc2065dee706b9614b8a74 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 23 Apr 2024 10:11:00 +0800
Subject: [PATCH 337/374] =?UTF-8?q?=E9=80=80=E5=87=BA=E8=B4=A6=E5=8F=B7?=
 =?UTF-8?q?=E6=97=B6=E8=B0=83=E7=94=A8=E9=80=80=E5=87=BA=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/user.js                               |  7 ++++++-
 src/store/modules/user.js                     | 19 ++++++++++++-------
 .../trials-layout/components/trialsNavbar.vue |  2 +-
 3 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/src/api/user.js b/src/api/user.js
index 0ccb3ec4..aa9354c5 100644
--- a/src/api/user.js
+++ b/src/api/user.js
@@ -7,7 +7,12 @@ export function login(data) {
     data
   })
 }
-
+export function loginOut() {
+  return request({
+    url: `/User/loginOut`,
+    method: 'get'
+  })
+}
 export function getAllDictionary() {
   return request({
     url: '/dictionary/getAllDictionary',
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index d7a66666..cb033368 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -1,5 +1,5 @@
 import { getToken, setToken, removeToken, setName, removeName } from '@/utils/auth'
-import { login, getUserMenuTree, getUserPermissions } from '@/api/user'
+import { login,loginOut,getUserMenuTree, getUserPermissions } from '@/api/user'
 
 import { resetRouter } from '@/router'
 import md5 from 'js-md5'
@@ -178,12 +178,17 @@ const actions = {
     commit('SET_NAME', zzSessionStorage.getItem('realName'))
   },
   // user logout
-  logout({ commit, state }) {
-    removeToken() // must remove  token  first
-    resetRouter()
-    removeName()
-    zzSessionStorage.clear()
-    commit('RESET_STATE')
+  async logout({ commit, state }) {
+    try{
+      await loginOut()
+      removeToken() // must remove  token  first
+      resetRouter()
+      removeName()
+      zzSessionStorage.clear()
+      commit('RESET_STATE')
+    }catch(e){
+      console.log(e)
+    }
   },
   setToken({ commit }, token) {
     commit('SET_TOKEN', token)
diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index f1b1b9a3..c91235da 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -129,7 +129,7 @@ export default {
       this.$store.dispatch('app/toggleSideBar')
     },
     async logout() {
-      await this.$store.dispatch('user/logout')
+      await this.$store.dispatch('user/logout') 
       this.$router.push(`/login`)
       this.$i18n.locale = 'zh'
       this.setLanguage('zh')

From 1fdbdc4103ab28222fe3f37f884c78bebffbbd92 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 23 Apr 2024 16:05:09 +0800
Subject: [PATCH 338/374] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E8=8E=B7=E5=8F=96=E7=97=85=E7=81=B6bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=8F=8A=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7=E5=90=8D?=
 =?UTF-8?q?=E7=99=BB=E5=87=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-myinfo/index.vue              | 11 +++++------
 .../reading/dicoms/customize/CustomizeStudyList.vue   |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index fd73d236..6605731b 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -271,11 +271,13 @@ export default {
     },
     setNewUserName() { 
       setNewUserName(this.userForm.UserName).then(() => {
-        zzSessionStorage.setItem('userName', this.userForm.UserName)
         this.$store.dispatch('user/changeUserName', this.userForm.UserName).then((res) => {
+          this.user.UserName = this.userForm.UserName
           this.userForm.UserName = ''
-          this.$message.success(this.$t('trials:trials-myinfo:message:updateSuccessfully'))
-          this.getUserInfo()
+          this.$message.success(this.$t('trials:trials-myinfo:message:modifyPWSuccessfully'))
+          setTimeout(() => {
+            this.logout()
+          }, 1000)
         })
       })
     },
@@ -387,7 +389,4 @@ export default {
   }
 </style>
 <style scoped>
-/deep/ .is-error.my_new_pwd{
-  margin-bottom: 40px;
-}
 </style>
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
index f3fe708b..3b2fd7c6 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeStudyList.vue
@@ -393,7 +393,7 @@ export default {
 
         if (bsIdx > -1) {
           var trialId = this.$router.currentRoute.query.trialId
-          await store.dispatch('reading/getMeasuredData', this.visitTaskList[bsIdx].VisitTaskId)
+          await store.dispatch('reading/getCustomizeMeasuredData', this.visitTaskList[bsIdx].VisitTaskId)
           await store.dispatch('reading/getStudyInfo', { trialId: trialId, subjectVisitId: this.visitTaskList[bsIdx].VisitId, visitTaskId: this.visitTaskList[bsIdx].VisitTaskId, taskBlindName: this.visitTaskList[bsIdx].TaskBlindName })
 
           const firstObj = this.getFirstMarkedSeries(this.visitTaskList[bsIdx].MeasureData, [...this.visitTaskList[bsIdx].StudyList])

From 0e33b606813e9899b2b6ce8a7e8005717a0ee497 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 23 Apr 2024 16:29:01 +0800
Subject: [PATCH 339/374] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E5=8F=8A=E9=98=85=E7=89=87=E5=8D=95=E5=85=83=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E5=92=8C=E5=88=86=E9=85=8D=E9=98=85=E7=89=87=E4=BA=BA?=
 =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/enrolled-reviewers/list/index.vue | 12 ++++++++----
 .../components/ClearAudienceList.vue               | 14 +++++++-------
 .../reading-unit/components/QuestionsForm.vue      |  9 +++++++--
 3 files changed, 22 insertions(+), 13 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 1c34d898..9571dac0 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -346,10 +346,10 @@
           label-width="120px"
           size="small"
         >
-          <el-form-item label="Criterion Type " prop="CriterionType">
+          <el-form-item :label="$t('trials:enrolledReviews:table:criterionName')" prop="CriterionType">
             <el-input v-model="form.CriterionName" disabled />
           </el-form-item>
-          <el-form-item label="File" prop="FilePath">
+          <el-form-item :label="$t('trials:enrolledReviews:table:file')" prop="FilePath">
             <el-upload
               class="upload-demo"
               action
@@ -367,8 +367,12 @@
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">Cancel</el-button>
-        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">Save</el-button>
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancle">
+          {{ $t('common:button:cancel') }}
+        </el-button>
+        <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
+          {{ $t('common:button:save') }}
+        </el-button>
       </template>
     </BaseModel>
   </BaseContainer>
diff --git a/src/views/trials/trials-panel/reading/read-task-allocation/components/ClearAudienceList.vue b/src/views/trials/trials-panel/reading/read-task-allocation/components/ClearAudienceList.vue
index 8fd62532..977e029f 100644
--- a/src/views/trials/trials-panel/reading/read-task-allocation/components/ClearAudienceList.vue
+++ b/src/views/trials/trials-panel/reading/read-task-allocation/components/ClearAudienceList.vue
@@ -98,12 +98,12 @@ export default {
         return {}
       }
     },
-    readingType: {
-      type: Number,
-      default() {
-        return 0
-      }
-    }
+    // readingType: {
+    //   type: Number,
+    //   default() {
+    //     return 0
+    //   }
+    // }
   },
   data() {
     return {
@@ -142,7 +142,7 @@ export default {
           this.$set(v, 'IsCancelAssign', true)
           if (i + 1 === this.list.length) {
             // this.form.Note += `取消${this.$fd('ArmEnum', v.ArmEnum)}阅片人${v.DoctorUser.UserName}(${v.DoctorUser.FullName});`
-            trials:reviewAssign:clearReader:title:cancelReader
+            // trials:reviewAssign:clearReader:title:cancelReader
             this.form.Note += `${this.$t('trials:reviewAssign:clearReader:title:cancelReader')}(${this.$fd('ArmEnum', v.ArmEnum)} ${v.DoctorUser.UserName}(${v.DoctorUser.FullName});`
           } else {
             // this.form.Note += `取消${this.$fd('ArmEnum', v.ArmEnum)}阅片人${v.DoctorUser.UserName}(${v.DoctorUser.FullName});\n`
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 2de63881..d695a680 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -76,7 +76,7 @@
       </el-form-item>
       <!-- 文件类型 -->
       <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
-                    prop="DataSource">
+                    prop="FileType">
         <el-checkbox-group
           v-model="form.FileType"
           @change="(v) => {
@@ -803,7 +803,12 @@ export default {
           trigger: ['blur', 'change']
         }],
         GroupName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
-          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}]
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
+        FileType: [{
+          required: true,
+          message: this.$t('common:ruleMessage:select'),
+          trigger: ['blur', 'change']
+        }]
       },
       loading: false,
       dicList: [],

From 1825ac34e1fa23f0c8dc34600c607b9d64f3bb3f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 24 Apr 2024 12:57:45 +0800
Subject: [PATCH 340/374] =?UTF-8?q?=E8=84=BE=E8=84=8F=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=92=8CPET=205PS=E8=AF=84=E4=BC=B0=E9=80=BB=E8=BE=91=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 138 ++++++++++--------
 .../reading/dicoms/components/Questions.vue   |  96 ++++++++----
 .../reading-unit/components/QuestionsForm.vue |  15 +-
 3 files changed, 149 insertions(+), 100 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index fe2f8416..40daaef4 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -159,6 +159,7 @@ export default {
         this.loading = true
         var res = await getReadingCalculationData({ visitTaskId: this.visitTaskId })
         this.baseLinePET5PS = res.Result.BaseLinePET5PS
+        this.calculatePet5PS = res.Result.CalculatePET5PS
         this.loading = false
       }
       this.initList(true)
@@ -184,7 +185,6 @@ export default {
           }
         })
         this.questions = questions
-        this.calculatePet5PS = this.setpet5PS()
         this.setPet5PSCommentDisplay()
         this.measurements = []
         res.OtherInfo.QuestionMarkInfoList.forEach(i => {
@@ -249,23 +249,7 @@ export default {
           this.$alert(this.$t('trials:lugano:message:saveWarning1'), this.$t('trials:lugano:fusionDialog:warning'))
           return
         }
-        // 肝脏血池SUVmax
-        const liverSUVmax = !isNaN(parseFloat(this.questionForm[this.liverSuvmaxId])) ? parseFloat(this.questionForm[this.liverSuvmaxId]) : 0
-        // 纵膈血池SUVmax
-        const lungSUVmax = !isNaN(parseFloat(this.questionForm[this.lungSuvmaxId])) ? parseFloat(this.questionForm[this.lungSuvmaxId]) : 0
-        // const pet5PS = !isNaN(parseInt(this.questionForm[this.pet5PSId])) ? parseInt(this.questionForm[this.pet5PSId]) : 0
-        if (liverSUVmax && lungSUVmax && (liverSUVmax <= lungSUVmax)) {
-          // '当前肝脏血池SUVmax≤纵隔血池血池SUVmax，请确认！'
-          this.$confirm(this.$t('trials:lugano:message:validLung'), this.$t('trials:lugano:fusionDialog:warning'), {
-            type: 'warning'
-          }).then(() => {
-            this.saveQuestionsForm()
-          }).catch(() => {
-
-          })
-        } else {
-          this.saveQuestionsForm()
-        }
+        this.saveQuestionsForm()
         // else if (pet5PS > 1 && (!liverSUVmax || !lungSUVmax)) {
         //   this.$alert('pet 5ps评分不为1，X或者NE，需要进行标记！', '提示', {
         //     // confirmButtonText: '确定',
@@ -344,11 +328,11 @@ export default {
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return
       this.$set(this.questionForm, Id, '')
-      var pet5PS = this.setpet5PS()
-      this.questionForm[this.pet5PSId] = pet5PS
-      this.calculatePet5PS = pet5PS
-      this.setPet5PSCommentDisplay()
-      this.setUptakeFormBaseline()
+      // var pet5PS = this.setpet5PS()
+      // this.questionForm[this.pet5PSId] = pet5PS
+      // this.calculatePet5PS = pet5PS
+      // this.setPet5PSCommentDisplay()
+      // this.setUptakeFormBaseline()
       FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.measurements[idx].OtherMeasureData, type: 'clear' })
       var remark = this.measurements[idx].OtherMeasureData.data.remark
       remark === 'Liver' ? this.liverIsInsideVolume = true : remark === 'Mediastinum' ? this.lungIsInsideVolume = true : ''
@@ -373,8 +357,26 @@ export default {
         })
         return
       }
-      const loading = this.$loading({ fullscreen: true })
+      // 肝脏血池SUVmax
+      const liverSUVmax = !isNaN(parseFloat(this.questionForm[this.liverSuvmaxId])) ? parseFloat(this.questionForm[this.liverSuvmaxId]) : 0
+      // 纵膈血池SUVmax
+      const lungSUVmax = !isNaN(parseFloat(this.questionForm[this.lungSuvmaxId])) ? parseFloat(this.questionForm[this.lungSuvmaxId]) : 0
+      // const pet5PS = !isNaN(parseInt(this.questionForm[this.pet5PSId])) ? parseInt(this.questionForm[this.pet5PSId]) : 0
+      if (liverSUVmax && lungSUVmax && (liverSUVmax <= lungSUVmax)) {
+        // '当前肝脏血池SUVmax≤纵隔血池血池SUVmax，请确认！'
+        this.$confirm(this.$t('trials:lugano:message:validLung'), this.$t('trials:lugano:fusionDialog:warning'), {
+          type: 'warning'
+        }).then(() => {
+          this.handleSaveAnnotation(question)
+        }).catch(() => {
 
+        })
+      } else {
+        this.handleSaveAnnotation(question)
+      }
+    },
+    handleSaveAnnotation(question) {
+      const loading = this.$loading({ fullscreen: true })
       // 获取截图
       var answers = []
       var questionMarkInfoList = []
@@ -414,6 +416,7 @@ export default {
           window.opener.postMessage({ type: 'petctLesionUpdate' }, window.location)
           loading.close()
           this.$message({ message: this.$t('common:message:savedSuccessfully'), type: 'success', duration: 2000 })
+          this.resetSuvQuestions(1)
         }).catch(() => {
           loading.close()
         })
@@ -454,17 +457,20 @@ export default {
           OrderMarkName: remark
         }
         if (measurement.type === 'CircleROI') {
-          const suvMax = measurement.suvMax
-
-          if (this.questionForm[obj.QuestionId] !== suvMax) {
-            this.setPet5PSCommentDisplay()
-            this.$set(this.questionForm, obj.QuestionId, suvMax || null)
-            var pet5PS = this.setpet5PS()
-            this.questionForm[this.pet5PSId] = pet5PS
-            this.calculatePet5PS = pet5PS
-            this.setUptakeFormBaseline()
-          }
+          this.$set(this.questionForm, obj.QuestionId, measurement.suvMax || null)
         }
+        // if (measurement.type === 'CircleROI') {
+        //   const suvMax = measurement.suvMax
+
+        //   if (this.questionForm[obj.QuestionId] !== suvMax) {
+        //     this.setPet5PSCommentDisplay()
+        //     this.$set(this.questionForm, obj.QuestionId, suvMax || null)
+        //     var pet5PS = this.setpet5PS()
+        //     this.questionForm[this.pet5PSId] = pet5PS
+        //     this.calculatePet5PS = pet5PS
+        //     this.setUptakeFormBaseline()
+        //   }
+        // }
         FusionEvent.$emit('addOrUpdateAnnotations', { data })
         this.questionFormChangeState = true
         if (obj.QuestionType === 51 && !this.liverRender) {
@@ -519,13 +525,16 @@ export default {
         OrderMarkName: remark
       }
       if (measurement.type === 'CircleROI') {
-        this.setPet5PSCommentDisplay()
         this.$set(this.questionForm, obj.QuestionId, null)
-        var pet5PS = this.setpet5PS()
-        this.questionForm[this.pet5PSId] = pet5PS
-        this.calculatePet5PS = pet5PS
-        this.setUptakeFormBaseline()
       }
+      // if (measurement.type === 'CircleROI') {
+      //   this.setPet5PSCommentDisplay()
+      //   this.$set(this.questionForm, obj.QuestionId, null)
+      //   var pet5PS = this.setpet5PS()
+      //   this.questionForm[this.pet5PSId] = pet5PS
+      //   this.calculatePet5PS = pet5PS
+      //   this.setUptakeFormBaseline()
+      // }
       FusionEvent.$emit('addOrUpdateAnnotations', { data })
       this.questionFormChangeState = true
       this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
@@ -534,11 +543,11 @@ export default {
       var idx = this.measurements.findIndex(i => i.OrderMarkName === remark)
       if (idx === -1) return
       this.$set(this.questionForm, this.measurements[idx].QuestionId, '')
-      var pet5PS = this.setpet5PS()
-      this.questionForm[this.pet5PSId] = pet5PS
-      this.calculatePet5PS = pet5PS
-      this.setPet5PSCommentDisplay()
-      this.setUptakeFormBaseline()
+      // var pet5PS = this.setpet5PS()
+      // this.questionForm[this.pet5PSId] = pet5PS
+      // this.calculatePet5PS = pet5PS
+      // this.setPet5PSCommentDisplay()
+      // this.setUptakeFormBaseline()
       this.measurements[idx].OtherMeasureData = ''
       this.currentQsId = this.measurements[idx].QuestionId
       // const { QuestionId, QuestionType } = this.measurements[idx]
@@ -575,7 +584,7 @@ export default {
     setUptakeFormBaseline() {
       // 自动计算与基线相比摄取值变化
       if (!this.isBaseLineTask) {
-        console.log('setUptakeFormBaseline: ',this.questionForm[this.pet5PSId],this.baseLinePET5PS)
+        console.log('setUptakeFormBaseline: ', this.questionForm[this.pet5PSId], this.baseLinePET5PS)
         if (this.questionForm[this.pet5PSId] > 0) {
           // 当前访视的PET 5ps评分大于基线的PET 5ps评分   增大
           // 当前访视的PET 5ps评分小于基线的PET 5ps评分   减小
@@ -619,7 +628,7 @@ export default {
         return ''
       }
     },
-    resetSuvQuestions() {
+    resetSuvQuestions(type = 0) {
       this.loading = true
       var params = {
         trialId: this.trialId,
@@ -634,40 +643,41 @@ export default {
           //   this.$set(this.questionForm, v.Id, v.Answer ? v.Answer : null)
           // }
           if (v.Childrens.length > 0) {
-            this.setSuvChild(v.Childrens)
+            this.setSuvChild(v.Childrens, type)
           }
-          var pet5PS = this.setpet5PS()
-          this.questionForm[this.pet5PSId] = pet5PS
-          this.calculatePet5PS = pet5PS
-          this.setPet5PSCommentDisplay()
-           this.setUptakeFormBaseline()
+          // var pet5PS = this.setpet5PS()
+          // this.questionForm[this.pet5PSId] = pet5PS
+          // this.calculatePet5PS = pet5PS
+          // this.setPet5PSCommentDisplay()
+          // this.setUptakeFormBaseline()
           this.questionFormChangeState = true
         })
 
         this.loading = false
       }).catch(() => { this.loading = false })
     },
-    setSuvChild(obj) {
+    setSuvChild(obj, type) {
       obj.forEach(i => {
-        if (i.QuestionType === 53) {
+        if (i.QuestionType === 53 && !type) {
           // SUVmax;
           this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
         }
-        if (i.QuestionType === 54) {
+        if (i.QuestionType === 54 && !type) {
           // SUVmax所在病灶;
           this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
         }
-        // if (i.QuestionType === 55) {
-        //   // PET 5PS评分;
-        //   this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
-        // }
-        // if (i.QuestionType === 56) {
-        //   // 与基线相比摄取值变化;
-        //   this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
-        // }
+        if (i.QuestionType === 55) {
+          // PET 5PS评分;
+          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+          this.calculatePet5PS = i.Answer
+        }
+        if (i.QuestionType === 56) {
+          // 与基线相比摄取值变化;
+          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+        }
 
         if (i.Childrens && i.Childrens.length > 0) {
-          this.setSuvChild(i.Childrens)
+          this.setSuvChild(i.Childrens, type)
         }
       })
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 59cef3ee..a60bf11b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -30,7 +30,7 @@
 
 <script>
 // import { uploadPrintscreen } from '@/api/reading'
-import { saveTaskQuestion, getSplenicState, getSplenicVerify, getCanChooseNotMerge } from '@/api/trials'
+import { saveTaskQuestion, getSplenicState, getSplenicVerify, getCanChooseNotMerge, getDicomReadingQuestionAnswer } from '@/api/trials'
 import QuestionItem from './QuestionItem'
 import DicomEvent from './DicomEvent'
 import { mapGetters } from 'vuex'
@@ -146,12 +146,12 @@ export default {
     }
   },
   methods: {
-    async getQuestions(visitTaskId) {
+    async getQuestions(visitTaskId, isRefresh = false) {
       var isChangeVisitTask = this.visitTaskId !== visitTaskId
       this.visitTaskId = visitTaskId
       // const loading = this.$loading({ fullscreen: true })
       var idx = this.visitTaskList.findIndex(i => i.VisitTaskId === visitTaskId)
-      this.questions = []
+      var qs = []
       if (idx > -1) {
         this.isBaseLineTask = this.visitTaskList[idx].IsBaseLineTask
         this.readingTaskState = this.visitTaskList[idx].ReadingTaskState
@@ -164,7 +164,7 @@ export default {
             }
             this.measurements.push(i)
           })
-          if (isChangeVisitTask) {
+          if (isChangeVisitTask || isRefresh) {
             const { Result } = await getSplenicVerify(visitTaskId)
             this.spleenInfo = Result
           }
@@ -210,15 +210,15 @@ export default {
           if (v.Childrens.length > 0) {
             this.setChild(v.Childrens)
           }
-          this.questions.push(v)
+          qs.push(v)
         }
-        // this.questions = questions
+        this.questions = Object.assign([], qs)
       }
       if (this.imageQualityIssuesId) {
         store.dispatch('reading/setImageQualityIssues', this.questionForm[this.imageQualityIssuesId])
       }
       if (this.spleenLengthId && this.spleenInfo && this.readingTaskState < 2) {
-        this.calculateSpleenStatus = this.setSpleenStatus(this.questionForm[this.spleenLengthId])
+        this.calculateSpleenStatus = this.spleenInfo.SplenicStatus
         this.setSpleenCommentDisplay()
       }
       // loading.close()
@@ -370,7 +370,7 @@ export default {
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         var trialId = this.$route.query.trialId
         await store.dispatch('reading/refreshDicomReadingQuestionAnswer', { trialId: trialId, visitTaskId: this.visitTaskId })
-        this.getQuestions(this.visitTaskId)
+        this.getQuestions(this.visitTaskId, true)
         this.loading = false
         if (this.isQulityIssues) {
           DicomEvent.$emit('questionFormChange', false)
@@ -505,15 +505,15 @@ export default {
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return
       this.$set(this.questionForm, Id, '')
-      if (obj.QuestionType === 60 || obj.QuestionType === 61) {
-        this.$set(this.questionForm, this.spleenStatusId, '')
-        this.$set(this.questionForm, this.spleenLengthId, '')
-      }
+      // if (obj.QuestionType === 60 || obj.QuestionType === 61) {
+      //   this.$set(this.questionForm, this.spleenStatusId, '')
+      //   this.$set(this.questionForm, this.spleenLengthId, '')
+      // }
       await store.dispatch('reading/removeNonTargetMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measurements[idx].MeasureData, questionId: Id })
       this.measurements.splice(idx, 1)
       DicomEvent.$emit('getMeasureData')
-      this.calculateSpleenStatus = ''
-      this.setSpleenCommentDisplay()
+      // this.calculateSpleenStatus = ''
+      // this.setSpleenCommentDisplay()
       this.formChanged = true
     },
     saveAnnotation(question) {
@@ -551,6 +551,7 @@ export default {
         const qsType = question.QuestionType === 60 ? 4 : question.QuestionType === 61 ? 5 : null
         saveTaskQuestion(qsType, params).then(async res => {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
+          await this.setQuestions()
           this.loading = false
           this.$set(question, 'SaveEnum', 0)
           DicomEvent.$emit('getReportInfo', true)
@@ -633,13 +634,13 @@ export default {
       if (measurement.type === 'ArrowAnnotate') {
         const location = measurement.location ? Number(measurement.location).toFixed(this.digitPlaces) : null
         this.$set(this.questionForm, this.measurements[idx].QuestionId, location || null)
-        if (this.measurements[idx].QuestionType === 60 || this.measurements[idx].QuestionType === 61) {
-          var length = this.getSpleenL()
-          this.$set(this.questionForm, this.spleenLengthId, length)
-          var status = this.setSpleenStatus(length)
-          this.$set(this.questionForm, this.spleenStatusId, status)
-          this.calculateSpleenStatus = status
-        }
+        // if (this.measurements[idx].QuestionType === 60 || this.measurements[idx].QuestionType === 61) {
+        //   var length = this.getSpleenL()
+        //   this.$set(this.questionForm, this.spleenLengthId, length)
+        //   var status = this.setSpleenStatus(length)
+        //   this.$set(this.questionForm, this.spleenStatusId, status)
+        //   this.calculateSpleenStatus = status
+        // }
 
         // if (this.measurements[idx].QuestionType === 48 && length <= 130 && this.isBaseLineTask) {
         //   // 脾脏状态设置默认值为正常
@@ -744,13 +745,13 @@ export default {
     },
     resetFormItemData(v) {
       this.questionForm[v] = null
-      if (v === this.spleenLengthId) {
-        var spleenStatus = this.questionForm[this.spleenStatusId]
-        spleenStatus = isNaN(parseInt(spleenStatus)) ? null : parseInt(spleenStatus)
-        if (spleenStatus === 5) {
-          this.removeAnnotation({ Id: this.spleenLengthId })
-        }
-      }
+      // if (v === this.spleenLengthId) {
+      //   var spleenStatus = this.questionForm[this.spleenStatusId]
+      //   spleenStatus = isNaN(parseInt(spleenStatus)) ? null : parseInt(spleenStatus)
+      //   if (spleenStatus === 5) {
+      //     this.removeAnnotation({ Id: this.spleenLengthId })
+      //   }
+      // }
       this.formChanged = true
     },
     setFormItemData(obj) {
@@ -760,6 +761,45 @@ export default {
       }
       this.formChanged = true
     },
+    setQuestions() {
+      return new Promise(resolve => {
+        var params = {
+          trialId: this.$route.query.trialId,
+          visitTaskId: this.visitTaskId
+        }
+        getDicomReadingQuestionAnswer(params).then(res => {
+          var questions = []
+          for (var i = 0; i < res.Result.length; i++) {
+            var v = res.Result[i]
+            if (v.Type === 'group' && v.GroupClassify !== this.groupClassify) continue
+            questions.push(v)
+          }
+          questions.map((v) => {
+            if (v.Type === 'group' && v.Childrens.length === 0) return
+            if (v.Childrens.length > 0) {
+              this.setQSChild(v.Childrens)
+            }
+          })
+          resolve()
+        })
+      })
+    },
+    setQSChild(obj) {
+      obj.forEach(i => {
+        if (i.QuestionType === 49) {
+          // 脾脏状态;
+          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+          this.calculateSpleenStatus = i.Answer
+        }
+        if (i.QuestionType === 48) {
+          // 脾脏长度;
+          this.$set(this.questionForm, i.Id, i.Answer ? i.Answer : null)
+        }
+        if (i.Childrens && i.Childrens.length > 0) {
+          this.setQSChild(i.Childrens)
+        }
+      })
+    },
     isJSONString(str) {
       try {
         JSON.stringify(JSON.parse(str))
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index d695a680..5ae6c821 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -75,8 +75,12 @@
         />
       </el-form-item>
       <!-- 文件类型 -->
-      <el-form-item v-if="form.Type === 'upload'" :label="$t('trials:readingUnit:qsList:title:FileType')"
-                    prop="FileType">
+      <el-form-item 
+        v-if="form.Type === 'upload'" 
+        :label="$t('trials:readingUnit:qsList:title:FileType')"
+        prop="FileType"
+        :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }]"
+      >
         <el-checkbox-group
           v-model="form.FileType"
           @change="(v) => {
@@ -803,12 +807,7 @@ export default {
           trigger: ['blur', 'change']
         }],
         GroupName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
-          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
-        FileType: [{
-          required: true,
-          message: this.$t('common:ruleMessage:select'),
-          trigger: ['blur', 'change']
-        }]
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}]
       },
       loading: false,
       dicList: [],

From afd362ba72a45259799a564c932e8738f13196e4 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 24 Apr 2024 15:58:28 +0800
Subject: [PATCH 341/374] =?UTF-8?q?=E8=82=9D=E8=84=8F=E8=AF=84=E4=BC=B0?=
 =?UTF-8?q?=E5=92=8CPET5PS=E8=AF=84=E4=BC=B0=E9=80=BB=E8=BE=91=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/QuestionItem.vue   |  2 +-
 .../dicoms/components/Fusion/Questions.vue      | 17 +++++++++++++++++
 .../reading/dicoms/components/QuestionItem.vue  |  2 +-
 .../reading/dicoms/components/Questions.vue     | 16 ++++++++++++++++
 4 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
index 7336fc8d..d620d7d8 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/QuestionItem.vue
@@ -45,7 +45,7 @@
               @click="locateAnnotation(question)"
             >{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
             <!-- 保存 -->
-            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
+            <el-button v-if="readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" style="padding: '7px 5px';margin-left:-5px;" @click="saveAnnotation(question)">
               <!-- 未保存 -->
               <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                 <i class="el-icon-warning" style="color:red" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 40daaef4..ef4f0f3f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -328,6 +328,10 @@ export default {
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return
       this.$set(this.questionForm, Id, '')
+
+      if (!this.questionForm[this.liverSuvmaxId] && !this.questionForm[this.lungSuvmaxId]) {
+        this.clearPet5PS()
+      }
       // var pet5PS = this.setpet5PS()
       // this.questionForm[this.pet5PSId] = pet5PS
       // this.calculatePet5PS = pet5PS
@@ -336,6 +340,7 @@ export default {
       FusionEvent.$emit('removeAnnotation', { otherMeasureData: this.measurements[idx].OtherMeasureData, type: 'clear' })
       var remark = this.measurements[idx].OtherMeasureData.data.remark
       remark === 'Liver' ? this.liverIsInsideVolume = true : remark === 'Mediastinum' ? this.lungIsInsideVolume = true : ''
+      this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
       this.measurements.splice(idx, 1)
     },
     locateAnnotation(obj) {
@@ -347,6 +352,18 @@ export default {
 
       FusionEvent.$emit('imageLocation', { otherMeasureData: otherMeasureData })
     },
+    clearPet5PS() {
+      this.questionForm[this.pet5PSId] = ''
+      this.questionForm[this.uptakeFromBaselineId] = ''
+      for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
+        if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
+          this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
+          this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
+          this.questionForm[this.pet5PSCommentsId] = ''
+          break
+        }
+      }
+    },
     saveAnnotation(question) {
       if ((question.QuestionType === 51 && !this.liverIsInsideVolume) || (question.QuestionType === 52 && !this.lungIsInsideVolume)) {
         // 当前标记在图像外
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
index 021f4fb1..2e6fdb8f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/QuestionItem.vue
@@ -46,7 +46,7 @@
             <!-- 定位 -->
             <el-button v-if="questionForm[question.Id]" size="mini" type="text" @click="locateAnnotation(question)">{{ $t('trials:lugano:button:locateAnnotation') }}</el-button>
             <!-- 保存 -->
-            <el-button v-if="questionForm[question.Id] && readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" @click="saveAnnotation(question)">
+            <el-button v-if="readingTaskState!== 2 && question.SaveEnum === 1" size="mini" type="text" @click="saveAnnotation(question)">
               <!-- 未保存 -->
               <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:unsaved')" placement="bottom">
                 <i class="el-icon-warning" style="color:red" />
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index a60bf11b..84e3efad 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -505,17 +505,33 @@ export default {
       var idx = this.measurements.findIndex(i => i.QuestionId === Id)
       if (idx === -1) return
       this.$set(this.questionForm, Id, '')
+      if (!this.questionForm[this.spleenTopId] && !this.questionForm[this.spleenBottomId]) {
+        this.clearSpleenStatus()
+      }
       // if (obj.QuestionType === 60 || obj.QuestionType === 61) {
       //   this.$set(this.questionForm, this.spleenStatusId, '')
       //   this.$set(this.questionForm, this.spleenLengthId, '')
       // }
       await store.dispatch('reading/removeNonTargetMeasuredData', { visitTaskId: this.visitTaskId, measureData: this.measurements[idx].MeasureData, questionId: Id })
+      this.setQuestionStatus(this.questions, this.measurements[idx].QuestionType)
       this.measurements.splice(idx, 1)
       DicomEvent.$emit('getMeasureData')
       // this.calculateSpleenStatus = ''
       // this.setSpleenCommentDisplay()
       this.formChanged = true
     },
+    clearSpleenStatus() {
+      this.$set(this.questionForm, this.spleenStatusId, '')
+      this.$set(this.questionForm, this.spleenLengthId, '')
+      for (let i = 0; i < this.questions[0].Childrens.length; i++) {
+        if (this.questions[0].Childrens[i].QuestionType === 58) {
+          this.questions[0].Childrens[i].ShowQuestion = 2
+          this.questions[0].Childrens[i].IsRequired = 3
+          this.questionForm[this.spleenCommentsId] = ''
+          break
+        }
+      }
+    },
     saveAnnotation(question) {
       this.loading = true
       // 获取截图

From 612724cbea986acc3dcb666739f2cac98a247f31 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 24 Apr 2024 16:25:19 +0800
Subject: [PATCH 342/374] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E6=9C=AA=E6=A0=87?=
 =?UTF-8?q?=E6=B3=A8=E7=97=85=E7=81=B6=E4=BF=A1=E6=81=AF=E5=88=99=E4=B8=8D?=
 =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=88=AA=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/PetCt.vue        | 22 +++---
 .../dicoms/components/Fusion/Questions.vue    | 15 ++--
 .../reading/dicoms/components/Questions.vue   | 76 +++++++------------
 3 files changed, 48 insertions(+), 65 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
index aad9ad18..1220cbb9 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/PetCt.vue
@@ -606,15 +606,19 @@ export default {
     })
     FusionEvent.$on('getScreenshots', async(measuredData, callback) => {
       // var base64Str = await this.$refs['FUSION_AXIAL'].getScreenshots()
-      const loading = this.$loading({ fullscreen: true })
-      await this.imageLocation(measuredData)
-      const divForDownloadViewport = document.querySelector(
-        '.dicom-container'
-      )
-      var canvas = await html2canvas(divForDownloadViewport)
-      var pictureBaseStr = canvas.toDataURL('image/png', 1)
-      loading.close()
-      callback(pictureBaseStr)
+      if (!measuredData) {
+        callback()
+      } else {
+        const loading = this.$loading({ fullscreen: true })
+        await this.imageLocation(measuredData)
+        const divForDownloadViewport = document.querySelector(
+          '.dicom-container'
+        )
+        var canvas = await html2canvas(divForDownloadViewport)
+        var pictureBaseStr = canvas.toDataURL('image/png', 1)
+        loading.close()
+        callback(pictureBaseStr)
+      }
     })
     FusionEvent.$on('viewHistoryScreenshot', (path) => {
       if (this.screenshotWindow) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index ef4f0f3f..3a8dbca5 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -398,16 +398,13 @@ export default {
       var answers = []
       var questionMarkInfoList = []
       var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
-      if (!annotationObj) {
-        loading.close()
-        return
-      }
-      var obj = Object.assign({}, annotationObj)
-      FusionEvent.$emit('getScreenshots', { otherMeasureData: obj.OtherMeasureData }, async val => {
-        var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-        var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-
+      var obj = annotationObj ? Object.assign({}, annotationObj) : null
+      FusionEvent.$emit('getScreenshots', { otherMeasureData: obj ? obj.OtherMeasureData : null }, async val => {
+        var pictureObj = null
+        var picturePath = null
         if (obj && obj.OtherMeasureData) {
+          pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+          picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
           var otherMeasureData = Object.assign({}, obj.OtherMeasureData)
           for (const k in otherMeasureData.data.cachedStats) {
             otherMeasureData.data.cachedStats[k].pointsInShape = []
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 84e3efad..0a7251fc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -535,18 +535,28 @@ export default {
     saveAnnotation(question) {
       this.loading = true
       // 获取截图
-      var answers = []
-      var questionMarkInfoList = []
       var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
       if (!annotationObj) {
-        this.loading = false
-        return
+        this.saveQuestions(question)
+      } else {
+        var obj = Object.assign({}, annotationObj)
+        DicomEvent.$emit('getScreenshots', { questionId: obj.Id, visitTaskId: this.visitTaskId, lesionName: obj.OrderMarkName, markTool: obj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!obj.MeasureData }, async val => {
+          try {
+            var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
+            var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
+            this.saveQuestions(question, obj, picturePath)
+          } catch (e) {
+            console.log(e)
+            this.loading = false
+          }
+        })
       }
-      var obj = Object.assign({}, annotationObj)
-      DicomEvent.$emit('getScreenshots', { questionId: obj.Id, visitTaskId: this.visitTaskId, lesionName: obj.OrderMarkName, markTool: obj.MarkTool, readingTaskState: this.readingTaskState, isMarked: !!obj.MeasureData }, async val => {
-        var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
-        var picturePath = pictureObj.isSuccess ? this.$getObjectName(pictureObj.result.url) : ''
-
+    },
+    async saveQuestions(question, obj, picturePath) {
+      try {
+        this.loading = true
+        var answers = []
+        var questionMarkInfoList = []
         if (obj && obj.MeasureData) {
           var annotation = Object.assign({}, obj.MeasureData)
           obj.MeasureData = JSON.stringify(annotation)
@@ -565,44 +575,16 @@ export default {
           questionMarkInfoList
         }
         const qsType = question.QuestionType === 60 ? 4 : question.QuestionType === 61 ? 5 : null
-        saveTaskQuestion(qsType, params).then(async res => {
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-          await this.setQuestions()
-          this.loading = false
-          this.$set(question, 'SaveEnum', 0)
-          DicomEvent.$emit('getReportInfo', true)
-        }).catch(() => {
-          this.loading = false
-        })
-      })
-
-      // if (this.criterionType === 2 && this.groupClassify === 3) {
-      //   var currentSpleenStatus = this.questionForm[this.spleenStatusId]
-      //   var currentSpleenLength = this.questionForm[this.spleenLengthId]
-      //   currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
-      //   var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
-      //   var slIdx = this.measurements.findIndex(i => i.QuestionType === 60)
-      //   if (currentSpleenLength && currentSpleenStatus === 5) {
-      //     // '脾脏状态为不可评估，不需要添加标记!'
-      //     this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
-      //       callback: _ => {}
-      //     })
-      //   } else if (currentSpleenStatus === 5 && ((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData))) {
-      //     // 若有标记，状态不可为“无法评估”
-      //     this.$alert(this.$t('trials:lugano:message:validSpleen1'), this.$t('trials:lugano:fusionDialog:warning'), {
-      //       callback: _ => {}
-      //     })
-      //   } else if (((stIdx > -1 && this.measurements[stIdx].MeasureData) || (slIdx > -1 && this.measurements[slIdx].MeasureData)) && !currentSpleenLength) {
-      //     this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
-      //       callback: _ => {}
-      //     })
-      //   } else {
-      //     this.saveQuestionsList()
-      //   }
-      // } else {
-      //   this.saveQuestionsList()
-      // }
-      // this.saveQuestionsList()
+        await saveTaskQuestion(qsType, params)
+        this.$message.success(this.$t('common:message:savedSuccessfully'))
+        await this.setQuestions()
+        this.loading = false
+        this.$set(question, 'SaveEnum', 0)
+        DicomEvent.$emit('getReportInfo', true)
+      } catch (e) {
+        console.log(e)
+        this.loading = false
+      }
     },
     locateAnnotation(obj) {
       const { Id } = obj

From 88f2c34db93cc30997d1e772925ff441479cc72c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Wed, 24 Apr 2024 17:03:27 +0800
Subject: [PATCH 343/374] =?UTF-8?q?=E8=82=9D=E8=84=8F=E5=8F=8Apet5ps?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/components/Fusion/Questions.vue    | 11 +++++++--
 .../reading/dicoms/components/Questions.vue   | 24 ++++++++++++++-----
 2 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 3a8dbca5..9d55267f 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -664,9 +664,16 @@ export default {
           // this.calculatePet5PS = pet5PS
           // this.setPet5PSCommentDisplay()
           // this.setUptakeFormBaseline()
-          this.questionFormChangeState = true
         })
-
+        for (let i = 0; i < this.questions[0].Childrens[0].Childrens.length; i++) {
+          if (this.questions[0].Childrens[0].Childrens[i].QuestionType === 59) {
+            this.questions[0].Childrens[0].Childrens[i].ShowQuestion = 2
+            this.questions[0].Childrens[0].Childrens[i].IsRequired = 3
+            this.questionForm[this.pet5PSCommentsId] = ''
+            break
+          }
+        }
+        this.questionFormChangeState = true
         this.loading = false
       }).catch(() => { this.loading = false })
     },
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
index 0a7251fc..e8ba4bbc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Questions.vue
@@ -283,7 +283,6 @@ export default {
           currentSpleenStatus = isNaN(parseInt(currentSpleenStatus)) ? null : parseInt(currentSpleenStatus)
           var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
           var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
-          var chenckVaild = this.checkAnnotationValid(stIdx, slIdx)
 
           if (currentSpleenLength && currentSpleenStatus === 5) {
             // '脾脏状态为不可评估，不需要添加标记!'
@@ -299,11 +298,6 @@ export default {
             this.$alert(this.$t('trials:lugano:message:validSpleen2'), this.$t('trials:lugano:fusionDialog:warning'), {
               callback: _ => {}
             })
-          } else if (!chenckVaild) {
-            // 校验标记是否在同一序列的不同图像上
-            this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
-              callback: _ => {}
-            })
           } else {
             this.saveQuestionsList()
           }
@@ -533,6 +527,16 @@ export default {
       }
     },
     saveAnnotation(question) {
+      var stIdx = this.measurements.findIndex(i => i.QuestionType === 60)
+      var slIdx = this.measurements.findIndex(i => i.QuestionType === 61)
+      var chenckVaild = this.checkAnnotationValid(stIdx, slIdx)
+      if (!chenckVaild) {
+        // 校验标记是否在同一序列的不同图像上
+        this.$alert(this.$t('trials:lugano:message:validSpleen3'), this.$t('trials:lugano:fusionDialog:warning'), {
+          callback: _ => {}
+        })
+        return
+      }
       this.loading = true
       // 获取截图
       var annotationObj = this.measurements.find(i => i.QuestionType === question.QuestionType)
@@ -578,6 +582,14 @@ export default {
         await saveTaskQuestion(qsType, params)
         this.$message.success(this.$t('common:message:savedSuccessfully'))
         await this.setQuestions()
+        for (let i = 0; i < this.questions[0].Childrens.length; i++) {
+          if (this.questions[0].Childrens[i].QuestionType === 58) {
+            this.questions[0].Childrens[i].ShowQuestion = 2
+            this.questions[0].Childrens[i].IsRequired = 3
+            this.questionForm[this.spleenCommentsId] = ''
+            break
+          }
+        }
         this.loading = false
         this.$set(question, 'SaveEnum', 0)
         DicomEvent.$emit('getReportInfo', true)

From 0680bdf8059700bfd4c7fefc9c1e5f141af38c5d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 11:25:54 +0800
Subject: [PATCH 344/374] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AEbug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/GlobalReading.vue | 12 +++++--
 .../setting/reading-unit/index.vue            | 35 ++++++++++++-------
 2 files changed, 32 insertions(+), 15 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue b/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
index fa57595a..b5619713 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
@@ -215,7 +215,7 @@ export default {
           }
           this.isSign = res.Result.IsSign
         }
-        this.form.GlobalAssessTypeIdsStr = this.form.GlobalAssessTypeIds.map(v => this.$fd('GlobalAssessType', v, 'id')).toString()
+        // this.form.GlobalAssessTypeIdsStr = this.form.GlobalAssessTypeIds.map(v => this.$fd('GlobalAssessType', v, 'id')).toString()
         this.loading = false
       }).catch(() => {
         this.loading = false
@@ -223,11 +223,19 @@ export default {
     },
     handleSave(isPrompt) {
       return new Promise((resolve, reject) => {
-        this.$refs['globalReadingForm'].validate((valid) => {
+        this.$refs['globalReadingForm'].validate(async(valid) => {
           if (!valid) {
             resolve(false)
           } else {
             this.loading = true
+            if(this.form.GlobalAssessTypes.length === 0){
+              try{
+                let res = await getTrialConfigGlobalReadingInfo({ trialId: this.$route.query.trialId, TrialReadingCriterionId: this.trialReadingCriterionId })
+                this.form.GlobalAssessTypes = res.Result.GlobalAssessTypes
+              }catch(e){
+                console.log(e)
+              }
+            }
             // 保存配置信息
             this.form.TrialId = this.$route.query.trialId
             this.form.TrialReadingCriterionId = this.trialReadingCriterionId
diff --git a/src/views/trials/trials-panel/setting/reading-unit/index.vue b/src/views/trials/trials-panel/setting/reading-unit/index.vue
index f5272c33..a47453e9 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/index.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/index.vue
@@ -3,7 +3,7 @@
     <div v-if="isShow" class="content">
       <el-tabs v-model="TrialReadingCriterionId" type="border-card">
         <template v-for="item of trialCriterionList">
-          <el-tab-pane  v-if="isPaneShow" :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
+          <el-tab-pane :key="item.TrialReadingCriterionId" :label="item.TrialReadingCriterionName" :name="item.TrialReadingCriterionId">
             <div style="text-align: right;padding-bottom: 10px">
               <!-- 同步当前标准 -->
               <el-button
@@ -17,7 +17,7 @@
                 {{ $t('trials:readingUnit:button:sync') }}
               </el-button>
             </div>
-            <el-collapse v-model="activeCollapse" class="setting-config">
+            <el-collapse v-model="activeCollapse" class="setting-config"  v-if="item.isPaneShow && item.TrialReadingCriterionId === TrialReadingCriterionId" >
               <!-- 阅片规则 -->
               <el-collapse-item :title="$t('trials:readingUnit:readingRules')" name="1">
                 <ReadingRules
@@ -142,13 +142,14 @@ export default {
   },
   watch: {
     async TrialReadingCriterionId(v) {
-      await this.asyncTrialCriterionDictionary(v)
-      let o = this.trialCriterionList.find(i => i.TrialReadingCriterionId === v)
-      this.CriterionType = o.CriterionType
-      this.isPaneShow = false
-      this.$nextTick(() => {
-        this.isPaneShow = true
-      })
+      // await this.asyncTrialCriterionDictionary(v)
+      // let i = this.trialCriterionList.findIndex(i => i.TrialReadingCriterionId === v)
+      // if(i === -1) return
+      // this.CriterionType = this.trialCriterionList[i].CriterionType
+      // this.trialCriterionList[i].isPaneShow = false
+      // this.$nextTick(() => {
+      //   this.trialCriterionList[i].isPaneShow = true
+      // })
     }
   },
   mounted() {
@@ -177,11 +178,14 @@ export default {
         signInfo: signInfo
       }
       resetAndAsyncCriterion(params).then(res => {
-        this.isPaneShow = false
+        this.loading = false
+        let i = this.trialCriterionList.findIndex(i => i.TrialReadingCriterionId === this.TrialReadingCriterionId)
+        if(i === -1) return
+        this.trialCriterionList[i].isPaneShow = false
         this.$nextTick(() => {
           this.signVisible2 = false
-          this.isPaneShow = true
-          this.loading = false
+          this.trialCriterionList[i].isPaneShow = true
+          
         })
       }).catch(() => {
         this.$refs['signForm2'].btnLoading = false
@@ -197,7 +201,12 @@ export default {
     },
     getTrialCriterionList() {
       getTrialCriterionList(this.trialId, false).then(async res => {
-        this.trialCriterionList = res.Result
+        this.trialCriterionList = res.Result.map(item=>{
+          return {
+            ...item,
+            isPaneShow: true,
+          }
+        })
         this.TrialReadingCriterionId = this.trialCriterionList[0].TrialReadingCriterionId
         this.isShow = true
       }).catch(() => {

From 8d36fde03d19aa6019bfd7377e4e8bc1c7d7eb50 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 11:26:54 +0800
Subject: [PATCH 345/374] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE=E6=97=B6=E5=88=B7=E6=96=B0=E5=86=8D=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/reading-unit/components/GlobalReading.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue b/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
index b5619713..7515919d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/GlobalReading.vue
@@ -228,7 +228,7 @@ export default {
             resolve(false)
           } else {
             this.loading = true
-            if(this.form.GlobalAssessTypes.length === 0){
+            if(this.form.GlobalAssessTypes.length === 0 && !isPrompt){
               try{
                 let res = await getTrialConfigGlobalReadingInfo({ trialId: this.$route.query.trialId, TrialReadingCriterionId: this.trialReadingCriterionId })
                 this.form.GlobalAssessTypes = res.Result.GlobalAssessTypes

From 04b22f5b508c8c8dd35db69fe666ab1850e6b5bd Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 13:15:00 +0800
Subject: [PATCH 346/374] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E6=A0=87?=
 =?UTF-8?q?=E5=87=86=E9=98=85=E7=89=87=E5=8D=95=E5=85=83=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/QuestionsForm.vue | 19 +++++++------------
 1 file changed, 7 insertions(+), 12 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index 5ae6c821..f77b165b 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -76,10 +76,10 @@
       </el-form-item>
       <!-- 文件类型 -->
       <el-form-item 
-        v-if="form.Type === 'upload'" 
+        v-show="form.Type === 'upload'" 
         :label="$t('trials:readingUnit:qsList:title:FileType')"
         prop="FileType"
-        :rules="[{ type: 'array', required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change'] }]"
+        :rules="[{ type: 'array', required: form.Type === 'upload', message: this.$t('common:ruleMessage:specify'), trigger: [ 'change'] }]"
       >
         <el-checkbox-group
           v-model="form.FileType"
@@ -910,27 +910,22 @@ export default {
       await this.getGroupOptions()
       await this.getParentQuestions()
       await this.getLesionType()
-      console.log('data', this.data)
       if (Object.keys(this.data).length > 0) {
         for (const k in this.form) {
           if (k === 'CalculateQuestions' && this.data[k] !== undefined) {
-            console.log(this.data[k])
             this.form[k] = JSON.parse(this.data[k])
-            console.log('CalculateQuestions', this.form[k])
           } else if (k === 'ClassifyAlgorithms' && this.data[k] !== undefined && this.data[k] !== '') {
             this.ClassifyAlgorithmsList = JSON.parse(this.data[k])
-            console.log(11111, this.form)
+          } else if(k === 'FileType'){
+            if (this.data[k]){
+              this.form[k] = this.data[k].split(',')
+            }
           } else {
             if (this.data.hasOwnProperty(k)) {
               this.form[k] = this.data[k]
             }
           }
         }
-        if (this.form.FileType && this.form.FileType.length > 0) {
-          this.form.FileType = this.form.FileType.split(',')
-        } else {
-          this.form.FileType = []
-        }
         if (this.form.ParentId !== '' && this.form.ParentId !== null && this.form.GroupName !== '') {
           this.isParentExistGroup = true
         }
@@ -986,7 +981,7 @@ export default {
         if (this.form.Type !== 'upload') {
           this.form.ImageCount = 0
         }
-        params.FileType = this.form.FileType.toString()
+        params.FileType = this.form.FileType.join(',')
         addOrUpdateReadingQuestionTrial(params).then(res => {
           this.$emit('getList')
           this.loading = false

From 13ac2e283431ee47700c2e0be23cf42f6957683e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 14:45:45 +0800
Subject: [PATCH 347/374] =?UTF-8?q?=E6=9C=AA=E7=94=BB=E6=A0=87=E6=B3=A8?=
 =?UTF-8?q?=E6=98=AF=EF=BC=8C=E4=B8=8D=E4=B8=8A=E4=BC=A0=E6=88=AA=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/dicoms/components/DicomViewer.vue   | 5 ++++-
 .../reading/dicoms/components/IRecist/QuestionForm.vue       | 2 +-
 .../reading/dicoms/components/Lugano/QuestionForm.vue        | 2 +-
 .../reading/dicoms/components/PCWG/QuestionForm.vue          | 2 +-
 .../reading/dicoms/components/Recist/QuestionForm.vue        | 2 +-
 .../reading/dicoms/components/RecistBM/QuestionForm.vue      | 2 +-
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
index 0b3a2c09..0f619110 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/DicomViewer.vue
@@ -891,8 +891,11 @@ export default {
     })
     DicomEvent.$on('getScreenshots', async(measuredData, callback) => {
       if (this.currentDicomCanvasIndex > -1) {
-        if (!measuredData) return
         await this.imageLocation(measuredData)
+        if (!measuredData.isMarked) {
+          callback()
+          return
+        }
         setTimeout(async() => {
           // var base64Str = this.$refs[`dicomCanvas${this.currentDicomCanvasIndex}`][0].getScreenshots()
           const divForDownloadViewport = document.querySelector(
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
index 624016e5..851d3408 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/IRecist/QuestionForm.vue
@@ -1957,7 +1957,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index 2ed456cf..ee19cd9b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1669,7 +1669,7 @@ export default {
             }
           }
         }
-        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
index be980aff..d002ae92 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue
@@ -690,7 +690,7 @@ export default {
           }
         }
         const loading = this.$loading({ fullscreen: true })
-        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
           var picturePath = ''
           if (val && measureData) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
index dcc86e2b..ec14d2bc 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Recist/QuestionForm.vue
@@ -1319,7 +1319,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
           // 靶病灶状态为0（存在）时，一定存在长径或者长短径（长径、十字线 ）
           // 普通靶病灶：长径大于10mm且不小于2倍层厚（基线校验）
           // 淋巴结靶病灶：短径大于15mm且不小于2倍层厚（基线校验）
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
index 2e104760..eb74a357 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/RecistBM/QuestionForm.vue
@@ -970,7 +970,7 @@ export default {
           }
         }
 
-        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType }, async val => {
+        DicomEvent.$emit('getScreenshots', { questionId: this.parentQsId, rowIndex: this.questionForm.RowIndex, visitTaskId: this.visitTaskId, lesionName: this.lesionMark, lesionType: this.lesionType, isMarked: !!measureData }, async val => {
           var picturePath = ''
           if (val && measureData && this.questionForm.IsDicomReading) {
             var pictureObj = await this.uploadScreenshots(`${new Date().getTime()}`, val)

From 1e7237e7acacbf4ebb94355dab41f384bc50fcad Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 15:02:49 +0800
Subject: [PATCH 348/374] =?UTF-8?q?lugano=E9=9D=B6=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98=E5=A6=82=E6=9E=9C=E5=BF=85=E5=A1=AB=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=A1=AB=E5=86=99=E4=B8=8D=E5=85=A8=EF=BC=8C=E5=B0=86?=
 =?UTF-8?q?=E6=BB=9A=E5=8A=A8=E6=9D=A1=E6=BB=9A=E5=88=B0=E9=A1=B6=E9=83=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue    | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index ee19cd9b..da2c5aee 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -18,7 +18,7 @@
           <i class="el-icon-circle-close" style="font-size: 25px;cursor: pointer;" @click="handleClose" />
         </div>
       </div>
-      <div style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
+      <div ref="scrollPanel" style="height: 420px;overflow-y: auto;overflow-x: hidden;" @scroll.stop="scrollHandle">
         <el-form-item
           :label="$t('trials:reading:title:lesionType')"
           prop="LesionType"
@@ -1182,7 +1182,12 @@ export default {
     handleSave() {
       console.log('handleSave')
       this.$refs.measurementForm.validate(async valid => {
-        if (!valid) return
+        if (!valid) {
+          if(this.lesionType === 0){
+            this.$refs['scrollPanel'].scrollTo({ top: 0, behavior: 'smooth' })
+          }
+          return
+        }
         const loading = this.$loading({ fullscreen: true })
         var measureData = this.questionForm.MeasureData
         var lesionState = this.getQuestionVal(7)

From 830cd1e93ee9f8887600175b7451c60cb7415ffc Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 16:09:29 +0800
Subject: [PATCH 349/374] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=97=85=E7=81=B6?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=9B=B4=E6=96=B0FDG-PET=E8=AF=84=E4=BC=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Fusion/Questions.vue            | 3 ---
 .../reading/dicoms/components/Fusion/TableQuestions.vue       | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
index 9d55267f..c8b68038 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/Questions.vue
@@ -99,9 +99,6 @@ export default {
     this.readingTaskState = parseInt(this.$route.query.readingTaskState)
     this.isBaseLineTask = this.$route.query.isBaseLineTask === 'true'
     this.initPage()
-    FusionEvent.$on('refreshQuestions', () => {
-      this.initList(false)
-    })
     FusionEvent.$on('resetSuvQuestions', () => {
       console.log('resetSuvQuestions')
       this.resetSuvQuestions()
diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
index 1ab66d5a..194f3b6d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Fusion/TableQuestions.vue
@@ -805,8 +805,8 @@ export default {
     async close(questionsObj) {
       if (questionsObj) {
         this.getReadingQuestionAndAnswer(questionsObj.visitTaskId)
-        FusionEvent.$emit('getAnnotations')
-        FusionEvent.$emit('refreshQuestions')
+        // FusionEvent.$emit('getAnnotations')
+        FusionEvent.$emit('resetSuvQuestions')
       }
       this.activeItem.activeRowIndex = null
       this.activeItem.activeCollapseId = null

From 519e1519e2c96e5f9076776c4ca529ebb00886e7 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 25 Apr 2024 17:53:46 +0800
Subject: [PATCH 350/374] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=E6=97=B6=E7=99=BB=E5=87=BA=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-myinfo/index.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/views/trials/trials-myinfo/index.vue b/src/views/trials/trials-myinfo/index.vue
index 6605731b..0933ba69 100644
--- a/src/views/trials/trials-myinfo/index.vue
+++ b/src/views/trials/trials-myinfo/index.vue
@@ -275,9 +275,7 @@ export default {
           this.user.UserName = this.userForm.UserName
           this.userForm.UserName = ''
           this.$message.success(this.$t('trials:trials-myinfo:message:modifyPWSuccessfully'))
-          setTimeout(() => {
-            this.logout()
-          }, 1000)
+          this.logout()
         })
       })
     },

From 6c4f022764e20debee700f9e9fa1a351cbcb11ea Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 13:12:01 +0800
Subject: [PATCH 351/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BB=BB=E5=8A=A1=E5=8F=96=E6=B6=88=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E6=93=8D=E4=BD=9C=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/GlobalReview.vue        | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index c6d3bd62..687c2794 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -223,7 +223,6 @@
       <el-table-column
         :label="$t('common:action:action')"
         width="120"
-        fixed="right"
       >
         <template slot-scope="scope">
           <el-button

From 79a5e67b59f55fdfa0e48645466c4eafb667cb81 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 13:35:47 +0800
Subject: [PATCH 352/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E5=85=A8=E5=B1=80=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/GlobalReview.vue        | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index 687c2794..ea51cc33 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -223,6 +223,7 @@
       <el-table-column
         :label="$t('common:action:action')"
         width="120"
+        :fixed="adjustedQsList.length > 4 ? 'right' : false"
       >
         <template slot-scope="scope">
           <el-button

From 9feb906c3e78bb4a1893555dcd37020d91cc8e9a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 13:44:49 +0800
Subject: [PATCH 353/374] =?UTF-8?q?=E5=8C=BB=E5=AD=A6=E5=AE=A1=E6=A0=B8?=
 =?UTF-8?q?=E8=A3=81=E5=88=A4=E4=BB=BB=E5=8A=A1=E5=88=97=E8=A1=A8=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/AdReview.vue           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index b0774885..5291e814 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -66,7 +66,7 @@
       <el-table-column
         :label="$t('trials:adReview:table:view')"
         width="200"
-        fixed="right"
+        :fixed="judgeQuestion.length > 4 ? 'right' : false"
       >
         <template slot-scope="scope">
           <!-- 查看R1详情 -->

From 1e098c44c1541dc46322b05cb79ac70005e029c8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 14:16:45 +0800
Subject: [PATCH 354/374] =?UTF-8?q?=E8=A3=81=E5=88=A4=E4=BB=BB=E5=8A=A1?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B7=E5=BC=8F=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/ad-review/index.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/ad-review/index.vue b/src/views/trials/trials-panel/reading/ad-review/index.vue
index 68134e69..cb33fb79 100644
--- a/src/views/trials/trials-panel/reading/ad-review/index.vue
+++ b/src/views/trials/trials-panel/reading/ad-review/index.vue
@@ -82,6 +82,7 @@
         <el-table-column
           :label="criterionType === 10?$t('trials:adReview:table:visitInfoview'):$t('trials:adReview:table:view')"
           width="200"
+          :fixed="isFixed ? 'right' : false"
         >
           <template slot-scope="scope">
 
@@ -388,7 +389,8 @@ export default {
       priorLoading: false,
       judgeResultArmEnum: '',
       criterionType: null,
-      openWindow: null
+      openWindow: null,
+      isFixed:false
     }
   },
   // watch: {
@@ -443,7 +445,7 @@ export default {
           })
         }
         this.judgeQuestion = judgeQS
-
+        this.isFixed = this.judgeQuestion.length > 0 && this.judgeQuestion[0].judgeQuestionList.length > 4
         this.adInfo = res.Result
         this.adForm.judgeResultTaskId = res.Result.JudgeResultTaskId
 

From e744cbda51201855e3edc5ea8664b7a5bc46e192 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 14:21:15 +0800
Subject: [PATCH 355/374] =?UTF-8?q?=E5=85=A8=E5=B1=80=E3=80=81=E8=A3=81?=
 =?UTF-8?q?=E5=88=A4=E5=88=97=E8=A1=A8=E5=B1=95=E7=A4=BA=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/global-review/components/LuganoTable.vue            | 1 +
 .../reading/mim-medical-audit/components/AdReview.vue           | 2 +-
 .../reading/mim-medical-audit/components/GlobalReview.vue       | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
index e35ea11a..0022c210 100644
--- a/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
+++ b/src/views/trials/trials-panel/reading/global-review/components/LuganoTable.vue
@@ -285,6 +285,7 @@
       <el-table-column
         :label="$t('common:action:action')"
         min-width="150"
+        fixed="right"
       >
         <template slot-scope="scope">
           <el-button
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index 5291e814..300ec74e 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="ad_review_wrapper">
-    <div style="text-align:right">
+    <div style="text-align:left">
       <el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
         {{ $t('trials:adReview:title:clinicalData') }}
       </el-button>
diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
index ea51cc33..38cb03f7 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/GlobalReview.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <div style="text-align:right">
+    <div style="text-align:left">
 
       <el-button v-if="auditInfo.IsExistsClinicalData" type="text" @click="previewCD">
         {{ $t('trials:adReview:title:clinicalData') }}

From 806010c6d4c092748de8a702457bf4c5e096ca57 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 14:38:49 +0800
Subject: [PATCH 356/374] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E6=A0=B9=E6=8D=AE?=
 =?UTF-8?q?=E5=88=97=E7=9A=84=E6=95=B0=E9=87=8F=E5=8A=A8=E6=80=81=E5=9B=BA?=
 =?UTF-8?q?=E5=AE=9A=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/mim-medical-audit/components/AdReview.vue       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
index 300ec74e..c1aafe9d 100644
--- a/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
+++ b/src/views/trials/trials-panel/reading/mim-medical-audit/components/AdReview.vue
@@ -66,7 +66,7 @@
       <el-table-column
         :label="$t('trials:adReview:table:view')"
         width="200"
-        :fixed="judgeQuestion.length > 4 ? 'right' : false"
+        :fixed="isFixed ? 'right' : false"
       >
         <template slot-scope="scope">
           <!-- 查看R1详情 -->
@@ -196,7 +196,8 @@ export default {
       imageUrl: '',
       fileList: [],
       visitTaskArmList: [],
-      judgeQuestion: []
+      judgeQuestion: [],
+      isFixed: false
     }
   },
   mounted() {
@@ -220,6 +221,7 @@ export default {
         })
       }
       this.judgeQuestion = judgeQS
+      this.isFixed = this.judgeQuestion.length > 0 && this.judgeQuestion[0].judgeQuestionList.length > 4
 
       this.adInfo = JudgeInfo
       this.adForm.judgeResultTaskId = JudgeInfo.JudgeResultTaskId

From 8a6a7962ae5ae0cac4294126ffef5407be052436 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 14:40:56 +0800
Subject: [PATCH 357/374] =?UTF-8?q?mim=E9=A1=B9=E7=9B=AE=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-list/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue
index 83f35e19..0cdf8c08 100644
--- a/src/views/trials/trials-list/index.vue
+++ b/src/views/trials/trials-list/index.vue
@@ -484,14 +484,14 @@
           sortable="custom"
           min-width="160"
         />
-        <el-table-column
+        <!-- <el-table-column
           v-if="hasPermi(['role:mim'])"
           prop="MIM_UrgentCount"
           :label="$t('trials:trials-list:table:MIM_UrgentCount')"
           show-overflow-tooltip
           sortable="custom"
           min-width="160"
-        />
+        /> -->
         <el-table-column
           v-if="hasPermi(['role:mim'])"
           prop="MIM_PendingReviewCount"

From de545a0847a6e85c50cdf74c94d196e5e0cfaa08 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Fri, 26 Apr 2024 16:46:37 +0800
Subject: [PATCH 358/374] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?=
 =?UTF-8?q?=E6=9E=90=E6=93=8D=E4=BD=9C=E6=8C=89=E9=92=AEdisabled=E8=BF=98?=
 =?UTF-8?q?=E5=8E=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../trials-panel/reading/consistency-analysis/index.vue     | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
index 9bc78021..77c3fde2 100644
--- a/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
+++ b/src/views/trials/trials-panel/reading/consistency-analysis/index.vue
@@ -341,15 +341,17 @@
           width="110"
         >
           <template slot-scope="scope">
-            <!-- 查看阅片结果:disabled="scope.row.ReadingTaskState !== 2" -->
+            <!-- 查看阅片结果-->
             <el-button
               icon="el-icon-view"
+              :disabled="scope.row.ReadingTaskState !== 2" 
               circle
               :title="$t('trials:consistencyAnalysis:action:view')"
               @click="lookReadingResults(scope.row)"
             />
-            <!-- 设置为失效  !scope.row.IsReReadingOrBackInfluenceAnalysis|| scope.row.TaskState === 1-->
+            <!-- 设置为失效-->
             <el-button
+              :disabled="!scope.row.IsReReadingOrBackInfluenceAnalysis|| scope.row.TaskState === 1"
               v-if="hasPermi(['trials:trials-panel:reading:consistency-analysis:edit'])"
               icon="el-icon-close"
               circle

From cc0b201036035d69c704283c1167bc8104536f23 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Fri, 26 Apr 2024 17:39:10 +0800
Subject: [PATCH 359/374] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85?=
 =?UTF-8?q?=E7=89=87=E9=99=84=E4=BB=B6=E4=B8=8B=E8=BD=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/customize/CustomizeQuestionFormItem.vue    | 10 ++++++++--
 .../dicoms/customize/CustomizeQuestionItem.vue        | 10 ++++++++--
 .../customize/CustomizeQuestionTableFormItem.vue      | 11 +++++++++--
 .../dicoms/customize/CustomizeReportPageUpload.vue    | 10 ++++++++--
 4 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
index e1c7c3fb..c40d341a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionFormItem.vue
@@ -794,8 +794,14 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        this.imgVisible = true
+      }
     },
     // 删除图片
     handleRemove(file, fileList) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue
index 3afc5595..d6e7223a 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionItem.vue
@@ -302,8 +302,14 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        this.imgVisible = true
+      }
     },
     // 删除图片
     handleRemove(file, fileList) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
index 91316b09..54122c9b 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeQuestionTableFormItem.vue
@@ -486,8 +486,15 @@ export default {
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        this.imgVisible = true
+      }
+      
     },
     // 删除图片
     handleRemove(file, fileList) {
diff --git a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue
index 03ea842a..d53bf99d 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeReportPageUpload.vue
@@ -136,8 +136,14 @@ name: "CustomizeReportPageUpload",
     },
     // 预览图片
     handlePictureCardPreview(file) {
-      this.imageUrl = this.OSSclientConfig.basePath + file.url
-      this.imgVisible = true
+      var suffix = file.url.substring(file.url.lastIndexOf(".")+1)
+      suffix = suffix ? suffix.toLowerCase() : ''
+      if (suffix === 'doc' || suffix === 'docx' || suffix === 'pdf'){
+        window.open(this.OSSclientConfig.basePath + file.url,'_blank')
+      }else{
+        this.imageUrl = this.OSSclientConfig.basePath + file.url
+        this.imgVisible = true
+      }
     },
     // 删除图片
     handleRemove(file, fileList) {

From 3dfa1ae29679f1ba47bb3c9d47529f0ab0f41cd8 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 28 Apr 2024 10:44:37 +0800
Subject: [PATCH 360/374] =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-study.vue          | 31 ++++++++++---------
 .../enrollment/components/Approval.vue        |  3 +-
 .../enrollment/components/Confirmation.vue    |  3 +-
 .../enrollment/components/Selection.vue       |  3 +-
 .../enrollment/components/Submission.vue      |  3 +-
 .../enrolled-reviewers/list/index.vue         |  2 +-
 .../subject/reading-period/index.vue          |  2 +-
 .../trial-summary/login-log/index.vue         |  2 ++
 src/views/trials/trials-workbench/index.vue   | 30 +++++++++---------
 9 files changed, 44 insertions(+), 35 deletions(-)

diff --git a/src/views/dicom-show/dicom-study.vue b/src/views/dicom-show/dicom-study.vue
index 24e8e2ac..2aea62e2 100644
--- a/src/views/dicom-show/dicom-study.vue
+++ b/src/views/dicom-show/dicom-study.vue
@@ -64,21 +64,24 @@
 
                         </div>
                       </div>
-                      <div v-if="showDelete" @click.stop="">
+                      <div v-if="showDelete" @click.stop="" style="display: flex;flex-direction: row;justify-content: space-between;">
 
-                        <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
-                        <el-switch
-                          v-model="item.isReading"
-                          size="mini"
-                          @change="changeReadingStatus($event, item)"
-                        />
-
-                        <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
-                        <el-switch
-                          v-model="item.isDeleted"
-                          size="mini"
-                          @change="changeDeleteStatus($event, item)"
-                        />
+                        <div>
+                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isReading') }}</span>
+                          <el-switch
+                            v-model="item.isReading"
+                            size="mini"
+                            @change="changeReadingStatus($event, item)"
+                          />
+                        </div>
+                        <div>
+                          <span style="font-size: 12px;margin-right: 5px">{{ $t('trials:audit:table:isDelete') }}</span>
+                          <el-switch
+                            v-model="item.isDeleted"
+                            size="mini"
+                            @change="changeDeleteStatus($event, item)"
+                          />
+                        </div>
                       </div>
                       <div v-if="item.prefetchInstanceCount>0 && item.prefetchInstanceCount<item.instanceCount">
                         <el-progress :percentage="parseInt(((item.prefetchInstanceCount/item.instanceCount)*100).toFixed(2))" />
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
index eabfc1b0..8b36ac4b 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Approval.vue
@@ -26,7 +26,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
+             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
           </template>
         </el-table-column>
         <!-- Name CN -->
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
index 2884b453..79810767 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Confirmation.vue
@@ -37,7 +37,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
+             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
           </template>
         </el-table-column>
         <!-- Name CN -->
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
index 3e0369ca..9ea1fe6f 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -124,7 +124,8 @@
           sortable="custom"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+            <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
 <!--            <router-link-->
 <!--              style="color: #428bca;"-->
 <!--              tag="a"-->
diff --git a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
index c6d00f80..f496d756 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Submission.vue
@@ -47,7 +47,8 @@
           min-width="120"
         >
           <template slot-scope="scope">
-            <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button>
+             <span style="color: #428bca;cursor: pointer;" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</span>
+            <!-- <el-button type="text" @click="go(`/trialsResume?doctorId=${scope.row.Id}&token=${token}`)">{{ scope.row.LastName }} / {{ scope.row.FirstName }}</el-button> -->
           </template>
         </el-table-column>
         <!-- Name CN -->
diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 9571dac0..9db0b2a0 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -69,7 +69,7 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:status')"
-          width="140"
+          width="200"
           sortable="custom"
         >
           <template slot-scope="scope">
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 5cb27645..3456280b 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -162,7 +162,7 @@
                       </div>
                       <div style="display: flex;justify-content: space-between;border-bottom: 1px solid #d9d9d9;margin-bottom: 8px;padding-bottom: 8px">
                         <div>{{ $fd('ModuleTypeEnum',scope.row.Data[i-1].ModuleType) }}</div>
-                        <div>
+                        <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 110px;">
                           {{ $fd('ReadModuleEnum',scope.row.Data[i-1].ReadingStatus) }}
                         </div>
                       </div>
diff --git a/src/views/trials/trials-panel/trial-summary/login-log/index.vue b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
index e381dac5..52c5ac1a 100644
--- a/src/views/trials/trials-panel/trial-summary/login-log/index.vue
+++ b/src/views/trials/trials-panel/trial-summary/login-log/index.vue
@@ -9,6 +9,7 @@
           <el-select v-model="searchData.OptType" clearable style="width:120px;">
             <el-option
               v-for="item of $d.UserOptType"
+              v-show="item.value !== 3 && item.value !== 10"
               :key="'UserOptType' + item.label"
               :value="item.value"
               :label="item.label"
@@ -208,6 +209,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$d.UserOptType)
     this.getList()
   },
   methods: {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 1a4ef747..91049f22 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -248,48 +248,48 @@
         </div>
         <div style="width: auto;flex:1;padding: 0 20px">
           <!-- 加急影像提交 -->
-          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- PM/APM -->
           <!-- 阅片期 -->
           <!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
           <!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!--            </el-tab-pane>-->
-            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             重阅审批 -->
-            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             阅片人筛选 -->
-            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             中心调研 -->
-            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             SPM/CPM -->
           <!--             阅片人审批 -->
-            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             重阅审批 -->
-            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!--             CRC -->
           <!--             临床数据录入 -->
 <!--            <clinicalData v-if="selected === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!--             临床数据确认 -->
 <!--            <clinicalDataConfirm v-if="selected === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!-- 影像质疑 -->
-            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 核查质疑 -->
-            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 影像重传 -->
-            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- IQC -->
           <!-- 影像质控 -->
-            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- QC质疑 -->
-            <QcQuestion v-if="selected === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <QcQuestion v-if="selected === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- IR -->
           <!-- 影像待阅 -->
-            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 医学反馈 -->
-            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- MIM -->
           <!-- 医学审核 -->
-            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />
+            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- 项目签署文件 -->
             <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->

From 1cbe9ce2581cd6ca79e6c2176806e1403d098f3d Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 28 Apr 2024 13:40:30 +0800
Subject: [PATCH 361/374] =?UTF-8?q?=E5=8C=BB=E7=94=9F=E5=88=97=E8=A1=A8bug?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Agreements.vue                  | 1 +
 src/views/reviewers/components/Setting.vue                     | 1 +
 src/views/trials/trials-panel/subject/reading-period/index.vue | 2 +-
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index 70ddc037..2a3dead9 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -274,6 +274,7 @@ export default {
       this.model_cfg.title = title
     },
     initSowList() {
+      if (!this.doctorId) return
       getDoctorCriterionFile({
         fileType: 0,
         DoctorId: this.doctorId
diff --git a/src/views/reviewers/components/Setting.vue b/src/views/reviewers/components/Setting.vue
index 54ba4aed..a3b17759 100644
--- a/src/views/reviewers/components/Setting.vue
+++ b/src/views/reviewers/components/Setting.vue
@@ -184,6 +184,7 @@ export default {
   },
   methods: {
     initForm() {
+      if (!this.doctorId) return
       getAuditState(this.doctorId).then(res => {
         if (res.Result) {
           this.checkForm = res.Result
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index 3456280b..c08287c3 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -162,7 +162,7 @@
                       </div>
                       <div style="display: flex;justify-content: space-between;border-bottom: 1px solid #d9d9d9;margin-bottom: 8px;padding-bottom: 8px">
                         <div>{{ $fd('ModuleTypeEnum',scope.row.Data[i-1].ModuleType) }}</div>
-                        <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 110px;">
+                        <div style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;width: 110px;text-align: right;">
                           {{ $fd('ReadModuleEnum',scope.row.Data[i-1].ReadingStatus) }}
                         </div>
                       </div>

From ff87692f69230974cab1cc438c72feb970f0238f Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 28 Apr 2024 13:45:10 +0800
Subject: [PATCH 362/374] =?UTF-8?q?=E7=9C=8B=E6=A3=80=E6=9F=A5=E7=BA=A7?=
 =?UTF-8?q?=E5=88=AB=E7=9A=84=E5=BD=B1=E5=83=8F=E4=BF=A1=E6=81=AF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dicom-show/dicom-visit.vue | 31 +++++++++++++++-------------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/views/dicom-show/dicom-visit.vue b/src/views/dicom-show/dicom-visit.vue
index 68fd4e1f..feba26c4 100644
--- a/src/views/dicom-show/dicom-visit.vue
+++ b/src/views/dicom-show/dicom-visit.vue
@@ -83,21 +83,24 @@
 
                             </div>
                           </div>
-                          <div v-if="showDelete" @click.stop="">
+                          <div v-if="showDelete" @click.stop="" style="display: flex;flex-direction: row;justify-content: space-between;">
 
-                            <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
-                            <el-switch
-                              v-model="series.isReading"
-                              size="mini"
-                              @change="changeReadingStatus($event, series)"
-                            />
-
-                            <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
-                            <el-switch
-                              v-model="series.isDeleted"
-                              size="mini"
-                              @change="changeDeleteStatus($event, series)"
-                            />
+                            <div>
+                              <span style="font-size: 12px;">{{ $t('trials:audit:table:isReading') }}</span>
+                              <el-switch
+                                v-model="series.isReading"
+                                size="mini"
+                                @change="changeReadingStatus($event, series)"
+                              />
+                            </div>
+                            <div>
+                              <span style="font-size: 12px;">{{ $t('trials:audit:table:isDelete') }}</span>
+                              <el-switch
+                                v-model="series.isDeleted"
+                                size="mini"
+                                @change="changeDeleteStatus($event, series)"
+                              />
+                            </div>
                           </div>
                           <!-- <div style="position: absolute;bottom: -10px;left: 0;width: 100%;">
                           <el-progress v-if="series.prefetchInstanceCount>0 && series.prefetchInstanceCount<series.instanceCount" :percentage="Number(series.prefetchInstanceCount/series.instanceCount)*100" />

From 7c7573cdc423dad892cc864304f7806af4ff1a0b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 28 Apr 2024 17:09:17 +0800
Subject: [PATCH 363/374] =?UTF-8?q?=E7=8B=AC=E7=AB=8B=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BA=BA=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../enrolled-reviewers/list/index.vue         | 10 +++---
 src/views/trials/trials-workbench/index.vue   | 34 ++++++++++---------
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
index 9db0b2a0..d8f81a5b 100644
--- a/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
+++ b/src/views/trials/trials-panel/enrolled-reviewers/list/index.vue
@@ -56,14 +56,12 @@
         <el-table-column
           prop="EnrollTimeStr"
           :label="$t('trials:enrolledReviews:table:enrollmentTime')"
-          :width="hasPermi(['role:ea'])?320:200"
+          :width="hasPermi(['role:ea'])?320:130"
           sortable="custom"
           show-overflow-tooltip
         >
           <template slot-scope="scope">
-            <span v-if="scope.row.EnrollTime">
-              {{ `${scope.row.EnrollTime}` }}
-            </span>
+             {{ scope.row.EnrollTime?moment(scope.row.EnrollTime).format('YYYY-MM-DD'):'' }}
           </template>
         </el-table-column>
         <el-table-column
@@ -391,6 +389,7 @@ import { uploadFile } from '@/api/attachment'
 import { updateTrialReviewerState } from '@/api/trials/reading'
 import UploadAcksow from './components/UploadAcksow'
 import store from '@/store'
+import moment from 'moment'
 import BaseContainer from '@/components/BaseContainer'
 import BaseModel from '@/components/BaseModel'
 export default {
@@ -458,7 +457,8 @@ export default {
       IsOncologyReading: true,
       fileList: [],
       form: {},
-      rowData: {}
+      rowData: {},
+      moment
     }
   },
   computed: {
diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index 91049f22..a67169eb 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -248,48 +248,48 @@
         </div>
         <div style="width: auto;flex:1;padding: 0 20px">
           <!-- 加急影像提交 -->
-          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+          <ImageSubmission v-if="selected === 'ImageSubmission'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- PM/APM -->
           <!-- 阅片期 -->
           <!--            <el-tab-pane name="clinicalDataPM" v-if="hasPermi(['trials:trials-panel:subject:readingPeriod:edit'])" :label="`${$t('trials:crcUpload:label:clinicalData')} (${tabList.PM_ClinicalDataCount})`">-->
           <!--                <clinicalDataPM v-if="activeName === 'clinicalDataPM'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!--            </el-tab-pane>-->
-            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <consistencyCheck v-if="selected === 'consistencyCheck'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!--             重阅审批 -->
-            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <RereadApproval v-if="selected === 'RereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!--             阅片人筛选 -->
-            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ReviewerScreen v-if="selected === 'ReviewerScreen'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!--             中心调研 -->
-            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <SiteResearch v-if="selected === 'SiteResearch'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!--             SPM/CPM -->
           <!--             阅片人审批 -->
-            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ReviewerApproval v-if="selected === 'ReviewerApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!--             重阅审批 -->
-            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <SpmRereadApproval v-if="selected === 'SpmRereadApproval'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!--             CRC -->
           <!--             临床数据录入 -->
 <!--            <clinicalData v-if="selected === 'clinicalData'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!--             临床数据确认 -->
 <!--            <clinicalDataConfirm v-if="selected === 'clinicalDataConfirm'" :trial-id-list="trialIdList" :is-sign-system-doc="isSignSystemDoc" />-->
           <!-- 影像质疑 -->
-            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ImageQuestion v-if="selected === 'ImageQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- 核查质疑 -->
-            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ImageVerification v-if="selected === 'ImageVerification'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- 影像重传 -->
-            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ImageReupload v-if="selected === 'ImageReupload'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- IQC -->
           <!-- 影像质控 -->
-            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ImageQualityControl v-if="selected === 'ImageQualityControl'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- QC质疑 -->
             <QcQuestion v-if="selected === 'QcQuestion'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
           <!-- IR -->
           <!-- 影像待阅 -->
-            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <ImagesToRead v-if="selected === 'ImagesToRead'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- 医学反馈 -->
-            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <MedicalFeedback v-if="selected === 'MedicalFeedback'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- MIM -->
           <!-- 医学审核 -->
-            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0" />
+            <MedicalAudit v-if="selected === 'MedicalAudit'" :trial-id-list="trialIdList" :is-sign-system-doc="tabList.SysWaitSignDocCount > 0 && !isTestUser" />
           <!-- 项目签署文件 -->
             <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->
@@ -424,7 +424,7 @@ import './index.css'
 
 import {getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList,getWaitSignSysDocList, getTrialSignDocumentList} from '@/api/trials'
 import { getUser } from '@/api/admin'
-import {mapGetters} from "vuex";
+import {mapGetters, mapState} from "vuex";
 
 export default {
   name: 'WorkBench',
@@ -467,9 +467,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['userId', 'name'])
+    ...mapGetters(['userId', 'name']),
+    ...mapState('user', ['isTestUser'])
   },
   mounted() {
+    console.log('isTestUser: ',this.isTestUser)
     this.getUserTobeDoneRecord()
     this.getNeedSignTrialDocTrialIdList()
     this.getUserInfo()

From 782324b19c3ee0bfac9c1fcf65ba3af6acd0588c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Sun, 28 Apr 2024 17:26:14 +0800
Subject: [PATCH 364/374] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=AE=BE=E7=BD=AE=E9=BB=98=E8=AE=A4=E6=8E=92?=
 =?UTF-8?q?=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/login-log/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/system/login-log/index.vue b/src/views/system/login-log/index.vue
index bf3a21db..3d66804d 100644
--- a/src/views/system/login-log/index.vue
+++ b/src/views/system/login-log/index.vue
@@ -163,8 +163,8 @@ const searchDataDefault = () => {
     LoginFaildName: '',
     BeginDate: '',
     EndDate: '',
-    Asc: true,
-    SortField: '',
+    Asc: false,
+    SortField: 'CreateTime',
     PageIndex: 1,
     PageSize: 20
   }

From 5a98d503f84f42997931307e6c562766dc1acced Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 29 Apr 2024 09:37:38 +0800
Subject: [PATCH 365/374] =?UTF-8?q?=E7=BE=8E=E5=9B=BD=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E5=8F=91=E5=B8=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .env.usa | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.env.usa b/.env.usa
index 03bb19dd..b1d35930 100644
--- a/.env.usa
+++ b/.env.usa
@@ -2,7 +2,7 @@
 ENV = 'production'
 NODE_ENV = 'production'
 # base public path
-VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-03-29/'
+VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-04-29/'
 
 # 是否开启登陆限制 true:是 false:否
 VUE_APP_LOGIN_FOR_PERMISSION = false

From 384d7197a200405ff924fcffa5f0bca31e7c5c59 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 11:06:23 +0800
Subject: [PATCH 366/374] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E5=8F=B0=E7=B3=BB?=
 =?UTF-8?q?=E7=BB=9F=E6=96=87=E4=BB=B6=E7=AD=BE=E7=BD=B2=E5=88=B7=E6=96=B0?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-workbench/index.vue | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue
index a67169eb..3a92b8fb 100644
--- a/src/views/trials/trials-workbench/index.vue
+++ b/src/views/trials/trials-workbench/index.vue
@@ -293,7 +293,7 @@
           <!-- 项目签署文件 -->
             <NeedSignTrialDoc v-if="selected === 'NeedSignTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->
-            <NeedSignSysDoc v-if="selected === 'NeedSignSysDoc'" @refreshStats="--tabList.SysWaitSignDocCount" />
+            <NeedSignSysDoc v-if="selected === 'NeedSignSysDoc'" @refreshStats="refreshSysData" />
           <!-- 项目签署文件 -->
           <NeedSignedTrialDoc v-if="selected === 'NeedSignedTrialDoc'" :is-sign-system-doc="isSignSystemDoc" />
           <!-- 系统签署文件 -->
@@ -520,6 +520,10 @@ export default {
         })
       })
     },
+    refreshSysData(){
+      --this.tabList.SysWaitSignDocCount
+      store.dispatch('user/setTotalNeedSignSystemDocCount', this.tabList.SysWaitSignDocCount)
+    },
     getUserTobeDoneRecord() {
       getUserTobeDoneRecord().then(async res => {
         this.tabList = res.Result

From ec4141530505928c23b902dfdbb413dd94995ccf Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 11:24:29 +0800
Subject: [PATCH 367/374] =?UTF-8?q?=E9=9A=8F=E8=AE=BF=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E4=B8=BA=E5=AD=98=E5=9C=A8=E7=9A=84=E6=B7=8B=E5=B7=B4=E7=BB=93?=
 =?UTF-8?q?=E9=9D=B6=E7=97=85=E7=81=B6=E4=BF=9D=E5=AD=98=E9=AA=8C=E8=AF=81?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index da2c5aee..e356ffdf 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -1268,8 +1268,8 @@ export default {
                 return
               }
             } else {
-              // 非淋巴结靶病灶 直径测量工具
-              if (!(measureData && measureData.type === 'Bidirectional' && lesionLength > 10)) {
+              // 非淋巴结靶病灶 长短径测量工具
+              if (!(measureData && measureData.type === 'Bidirectional')) {
                 // 状态为“存在”的非淋巴结靶病灶，长径应大于10 mm，请使用长短径测量工具添加标记。
                 this.$confirm(this.$t('trials:lugano:message:validState4'), {
                   type: 'warning',

From 26009d0626c593726aaeac24c40588384f11e85c Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 13:09:29 +0800
Subject: [PATCH 368/374] =?UTF-8?q?=E5=85=A8=E5=B1=80=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=AD=97=E6=AE=B5=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-panel/reading/global-review/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/trials/trials-panel/reading/global-review/index.vue b/src/views/trials/trials-panel/reading/global-review/index.vue
index a8d509f2..979acdde 100644
--- a/src/views/trials/trials-panel/reading/global-review/index.vue
+++ b/src/views/trials/trials-panel/reading/global-review/index.vue
@@ -101,7 +101,7 @@
           width="200"
         />
         <el-table-column
-          prop="VisitName"
+          prop="VisitBlindName"
           :label="$t('trials:globalReview:table:cutOffVisitName')"
           show-overflow-tooltip
           width="200"

From f16f5adfd6b3af33c2241aa15acc84132ab04a68 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 14:33:00 +0800
Subject: [PATCH 369/374] =?UTF-8?q?=E4=B8=B4=E5=BA=8A=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../setting/trial-config/components/clinicalDataForm.vue         | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
index 5d38fc10..53c17d04 100644
--- a/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
+++ b/src/views/trials/trials-panel/setting/trial-config/components/clinicalDataForm.vue
@@ -58,6 +58,7 @@
         >
           <el-option
             v-for="(item,index) of $d.ClinicalLevel"
+            v-show="!(form.UploadRole === 1 && item.value === 4)"
             :key="index"
             :label="item.label"
             :value="item.value"

From cd95f0b018bc1da7fde4a294c823bc403f23c6ba Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 15:29:55 +0800
Subject: [PATCH 370/374] =?UTF-8?q?=E9=98=85=E7=89=87=E6=9C=9F=E4=B8=B4?=
 =?UTF-8?q?=E5=BA=8A=E6=95=B0=E6=8D=AE=E7=AD=BE=E5=90=8D=E6=88=90=E5=8A=9F?=
 =?UTF-8?q?=E5=88=B7=E6=96=B0=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../subject/reading-period/components/ClinicalData.vue        | 1 +
 .../trials/trials-panel/subject/reading-period/index.vue      | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
index f694767b..c375d060 100644
--- a/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/components/ClinicalData.vue
@@ -620,6 +620,7 @@ export default {
           this.signVisible = false
 
           this.getList()
+          this.$emit('getList')
           this.$nextTick(() => { this.verification.visible = false })
         }
       }).catch(_ => {
diff --git a/src/views/trials/trials-panel/subject/reading-period/index.vue b/src/views/trials/trials-panel/subject/reading-period/index.vue
index c08287c3..0de025ee 100644
--- a/src/views/trials/trials-panel/subject/reading-period/index.vue
+++ b/src/views/trials/trials-panel/subject/reading-period/index.vue
@@ -96,7 +96,7 @@
           <div slot="main-container">
             <el-table
               ref="myTable"
-              v-adaptive="{bottomOffset:75}"
+              v-adaptive="{bottomOffset:135}"
               v-loading="loading"
               :data="list"
               stripe
@@ -324,7 +324,7 @@
               :close-on-click-modal="false"
               append-to-body
             >
-              <ClinicalData :trial-reading-criterion-id="TrialReadingCriterionId" :trial-id="trialId" :data="currentData" />
+              <ClinicalData :trial-reading-criterion-id="TrialReadingCriterionId" :trial-id="trialId" :data="currentData" @getList="getList"/>
             </el-dialog>
             <!-- 添加受试者阅片期 -->
             <el-dialog

From 434fe551b3e348ef1214e341fb838359923bfb1b Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 15:53:28 +0800
Subject: [PATCH 371/374] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=A7=93=E5=90=8D=E5=90=8C=E6=AD=A5=E6=9B=B4=E6=96=B0=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=E4=B8=AD=E7=9A=84=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cb033368..c6b8a39a 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -161,7 +161,7 @@ const actions = {
     commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
     commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
     const user = JSON.parse(userString)
-    commit('SET_NAME', user.realName)
+    commit('SET_NAME', zzSessionStorage.getItem('realName'))
     commit('SET_USERID', user.id)
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))

From 264e0ee7c4afa98551cae75646ef50fcb0a78bc5 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 16:58:56 +0800
Subject: [PATCH 372/374] =?UTF-8?q?=E7=BE=8E=E5=9B=BD=E7=8E=AF=E5=A2=83?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E8=8F=9C=E5=8D=95=E6=A0=8F=E5=88=87=E6=8D=A2?=
 =?UTF-8?q?=E8=AF=AD=E8=A8=80=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/trials/trials-layout/components/trialsNavbar.vue | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue
index c91235da..082a8545 100644
--- a/src/views/trials/trials-layout/components/trialsNavbar.vue
+++ b/src/views/trials/trials-layout/components/trialsNavbar.vue
@@ -50,7 +50,8 @@
           <el-menu-item index="4-3">{{ $t('trials:trials-myinfo:button:loginout') }}</el-menu-item>
         </el-submenu>
       </el-menu>
-      <TopLang />
+      <TopLang v-if="VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1'"/>
+      
     </div>
   </div>
 </template>
@@ -66,7 +67,8 @@ export default {
       activeIndex: '2',
       isReviewer: false,
       userTypeShortName: zzSessionStorage.getItem('userTypeShortName'),
-      notice: ''
+      notice: '',
+      VUE_APP_OSS_CONFIG_REGION: process.env.VUE_APP_OSS_CONFIG_REGION
     }
   },
   computed: {

From e9188115fc35f657d2e4901395a811e01d3baa8e Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Mon, 29 Apr 2024 18:10:13 +0800
Subject: [PATCH 373/374] =?UTF-8?q?=E9=80=80=E5=9B=9E=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7real=20name?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/store/modules/user.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index c6b8a39a..cb033368 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -161,7 +161,7 @@ const actions = {
     commit('SET_PERMISSIONS', JSON.parse(zzSessionStorage.getItem('permissions')))
     commit('SET_ISTESTUSER', zzSessionStorage.getItem('isTestUser'))
     const user = JSON.parse(userString)
-    commit('SET_NAME', zzSessionStorage.getItem('realName'))
+    commit('SET_NAME', user.realName)
     commit('SET_USERID', user.id)
     commit('SET_USERNAME', zzSessionStorage.getItem('userName'))
     commit('SET_NEED_SIGN_SYSTEM_DOC_COUNT', parseInt(zzSessionStorage.getItem('TotalNeedSignSystemDocCount')))

From 49dcab2a0e6e2b5a2de22a4256ec383b3b9ddb28 Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Tue, 30 Apr 2024 12:59:52 +0800
Subject: [PATCH 374/374] =?UTF-8?q?=E9=9D=9E=E6=B7=8B=E5=B7=B4=E7=BB=93?=
 =?UTF-8?q?=E9=9D=B6=E7=97=85=E7=81=B6=E7=8A=B6=E6=80=81=E8=87=AA=E5=8A=A8?=
 =?UTF-8?q?=E8=B5=8B=E5=80=BC=E9=80=BB=E8=BE=91=E5=8F=8A=E8=82=BF=E7=98=A4?=
 =?UTF-8?q?=E5=AD=A6=E9=98=85=E7=89=87=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading/dicoms/components/Lugano/QuestionForm.vue       | 4 ++--
 .../trials/trials-panel/reading/oncology-review/index.vue   | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
index e356ffdf..c123bdff 100644
--- a/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/components/Lugano/QuestionForm.vue
@@ -856,8 +856,8 @@ export default {
                 }
               } else {
                 // 非淋巴结靶病灶
-                if (lesionLength > 10) {
-                  // 长径大于10mm,自动给“存在”状态
+                if (lesionLength > 0) {
+                  // 长径大于0,自动给“存在”状态
                   const stateId = this.getQuestionId(7)
                   this.$set(this.questionForm, stateId, 0)
                 }
diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue
index 89ec83da..8438938d 100644
--- a/src/views/trials/trials-panel/reading/oncology-review/index.vue
+++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue
@@ -213,6 +213,12 @@
           show-overflow-tooltip
           width="200"
         />
+        <el-table-column
+          prop="VisitName"
+          :label="$t('trials:globalReview:table:cutOffVisitName')"
+          show-overflow-tooltip
+          width="200"
+        />
         <el-table-column
           :label="$t('common:action:action')"
           width="200"