From 90202d9a0d2786c8f5b230f8dfd3505cef046ab6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMacBook-Pro.local>
Date: Mon, 29 Jan 2024 16:39:01 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B4=A8=E6=8E=A7=E6=8D=A2=E8=A1=8Cbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dicoms/customize/CustomizeDicomCanvas.vue |   1 -
 .../personnel-manage/components/siteForm.vue  | 491 +++++++++---------
 .../qc-check/components/qualityAssurance.vue  |   2 +-
 3 files changed, 250 insertions(+), 244 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 8d83e111..6b08c699 100644
--- a/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
+++ b/src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue
@@ -559,7 +559,6 @@ export default {
             showCancelButton: false,
             type: 'warning'
           }).then(() => {
-
           }).catch(() => {})
           e.stopImmediatePropagation()
           e.stopPropagation()
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 ed755f11..c207f4a1 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
@@ -1,242 +1,249 @@
-<template>
-  <el-container class="siteform-container">
-    <el-header style="height:50px">
-      <div class="filter-container">
-        <!-- 中心名称 -->
-        <span>{{ $t('trials:customSite:form:siteName') }}:</span>
-        <el-input v-model="listQuery.SiteName" size="mini" class="mr" clearable />
-        <!-- 查询 -->
-        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
-          {{ $t('common:button:search') }}
-        </el-button>
-        <!-- 重置 -->
-        <el-button size="mini" type="primary" icon="el-icon-refresh-left" @click="handleReset">
-          {{ $t('common:button:reset') }}
-        </el-button>
-        <span style="margin-left:auto">
-          <el-button
-            type="primary"
-            size="mini"
-            icon="el-icon-plus"
-            @click="handleCustomSite"
-          >
-            {{ $t('trials:sitesList:dialogButton:customSite') }}
-          </el-button>
-          <el-button
-            type="primary"
-            size="mini"
-            :disabled="selectArr.length === 0"
-            :loading="assignLoadStatus"
-            icon="el-icon-plus"
-            @click="handleAssign"
-          >
-            {{ $t('trials:sitesList:dialogButton:addSite') }}
-          </el-button>
-        </span>
-
-      </div>
-    </el-header>
-    <el-main>
-      <div class="data-table">
-        <el-table
-          :data="list"
-          stripe
-          height="400px"
-          class="site-table-list"
-          @selection-change="handleSelectChange"
-          @sort-change="handleSortByColumn"
-        >
-          <el-table-column
-            type="selection"
-            width="50"
-            :selectable="handleSelectable"
-          />
-          <el-table-column type="index" width="50" />
-          <el-table-column
-            prop="SiteName"
-            :label="$t('trials:customSite:form:siteName')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          />
-          <el-table-column
-            prop="Country"
-            :label="$t('trials:customSite:form:country')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="80"
-          />
-          <el-table-column
-            prop="City"
-            :label="$t('trials:customSite:form:city')"
-            show-overflow-tooltip
-            min-width="80"
-            sortable="custom"
-          />
-          <el-table-column
-            prop="Address"
-            :label="$t('trials:customSite:form:address')"
-            show-overflow-tooltip
-            sortable="custom"
-            min-width="120"
-          />
-        </el-table>
-      </div>
-    </el-main>
-    <el-footer style="text-align: right;">
-      <div class="pagination">
-        <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
-      </div>
-    </el-footer>
-    <el-dialog
-      v-if="customVisible"
-      :visible.sync="customVisible"
-      :close-on-click-modal="false"
-      :title="$t('trials:customSite:title:custom')"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-      append-to-body
-    >
-      <CustomSiteForm v-if="customVisible" @close="closeDialog" @getList="handleReset" />
-    </el-dialog>
-  </el-container>
-</template>
-<script>
-import { getTrialSiteScreeningList, addTrialSites } from '@/api/trials'
-import CustomSiteForm from './customSiteForm'
-import Pagination from '@/components/Pagination'
-const getListQueryDefault = () => {
-  return {
-    SiteName: '',
-    PageIndex: 1,
-    PageSize: 20
-  }
-}
-export default {
-  components: { Pagination, CustomSiteForm },
-  data() {
-    return {
-      list: [],
-      total: 0,
-      listQuery: getListQueryDefault(),
-      selectArr: [],
-      assignLoadStatus: false,
-      customVisible: false,
-      trialId: ''
-    }
-  },
-  mounted() {
-    this.trialId = this.$route.query.trialId
-    this.getList()
-  },
-  methods: {
-    getList() {
-      const loading = this.$loading({
-        target: document.querySelector('.site-table-list'),
-        fullscreen: false,
-        lock: true
-      })
-      this.listQuery.TrialId = this.trialId
-      getTrialSiteScreeningList(this.listQuery).then(res => {
-        loading.close()
-        this.list = res.Result.CurrentPageData
-        this.total = res.Result.TotalCount
-      }).catch(() => { loading.close() })
-    },
-    handleCustomSite() {
-      this.customVisible = true
-    },
-    closeDialog() {
-      this.customVisible = false
-    },
-    handleAssign() {
-      this.$confirm(this.$t('trials:customSite:message:add'), {
-        type: 'warning',
-        distinguishCancelAndClose: true
-      })
-        .then(() => {
-          const loading = this.$loading({
-            target: document.querySelector('.site-table-list'),
-            fullscreen: false,
-            lock: true
-          })
-          this.assignLoadStatus = true
-          addTrialSites(this.selectArr)
-            .then(res => {
-              this.assignLoadStatus = false
-              loading.close()
-              if (res.IsSuccess) {
-                this.$emit('closeDialog')
-                this.$message.success(this.$t('common:message:addedSuccessfully'))
-              }
-            }).catch(() => {
-              loading.close()
-              this.assignLoadStatus = false
-            })
-        })
-    },
-    handleSearch() {
-      this.listQuery.PageIndex = 1
-      this.getList()
-    },
-    handleReset() {
-      this.listQuery = getListQueryDefault()
-      this.getList()
-    },
-    handleSelectChange(val) {
-      const arr = []
-      for (let index = 0; index < val.length; index++) {
-        const param = {
-          TrialId: this.trialId,
-          SiteId: val[index].Id,
-          SiteName: val[index].SiteName
-        }
-        arr.push(param)
-      }
-      this.selectArr = arr
-    },
-    handleSortByColumn(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()
-    },
-    handleSelectable(row) {
-      if (!row.IsSelect) {
-        return true
-      } else {
-        return false
-      }
-    }
-  }
-}
-</script>
-<style lang="scss" scoped>
-.siteform-container{
-  height: 100%;
-  .el-header{
-    .filter-container{
-      display: flex;
-      align-items: center;
-      span{
-        font-size:13px;
-        margin-right:5px;
-      }
-      .mr{
-        margin-right: 5px;
-        width: 120px;
-      }
-    }
-  }
-  .el-main{
-    padding: 0px;
-  }
-  .el-footer{
-    padding: 0 20px;
-  }
-}
-</style>
+<template>
+  <el-container class="siteform-container">
+    <el-header style="height:50px">
+      <div class="filter-container">
+        <!-- 中心名称 -->
+        <span>{{ $t('trials:customSite:form:siteName') }}:</span>
+        <el-input v-model="listQuery.SiteName" size="mini" class="mr" clearable />
+        <!-- 查询 -->
+        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
+          {{ $t('common:button:search') }}
+        </el-button>
+        <!-- 重置 -->
+        <el-button size="mini" type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          {{ $t('common:button:reset') }}
+        </el-button>
+        <span style="margin-left:auto">
+          <el-button
+            type="primary"
+            size="mini"
+            icon="el-icon-plus"
+            @click="handleCustomSite"
+          >
+            {{ $t('trials:sitesList:dialogButton:customSite') }}
+          </el-button>
+          <el-button
+            type="primary"
+            size="mini"
+            :disabled="selectArr.length === 0"
+            :loading="assignLoadStatus"
+            icon="el-icon-plus"
+            @click="handleAssign"
+          >
+            {{ $t('trials:sitesList:dialogButton:addSite') }}
+          </el-button>
+        </span>
+
+      </div>
+    </el-header>
+    <el-main>
+      <div class="data-table">
+        <el-table
+          :data="list"
+          stripe
+          height="400px"
+          class="site-table-list"
+          @selection-change="handleSelectChange"
+          @sort-change="handleSortByColumn"
+        >
+          <el-table-column
+            type="selection"
+            width="50"
+            :selectable="handleSelectable"
+          />
+          <el-table-column type="index" width="50" />
+          <el-table-column
+            prop="SiteName"
+            :label="$t('trials:customSite:form:siteName')"
+            show-overflow-tooltip
+            sortable="custom"
+            min-width="120"
+          />
+          <el-table-column
+            prop="AliasName"
+            :label="$t('trials:customSite:form:AliasName')"
+            show-overflow-tooltip
+            sortable="custom"
+            min-width="120"
+          />
+          <el-table-column
+            prop="Country"
+            :label="$t('trials:customSite:form:country')"
+            show-overflow-tooltip
+            sortable="custom"
+            min-width="80"
+          />
+          <el-table-column
+            prop="City"
+            :label="$t('trials:customSite:form:city')"
+            show-overflow-tooltip
+            min-width="80"
+            sortable="custom"
+          />
+          <el-table-column
+            prop="Address"
+            :label="$t('trials:customSite:form:address')"
+            show-overflow-tooltip
+            sortable="custom"
+            min-width="120"
+          />
+        </el-table>
+      </div>
+    </el-main>
+    <el-footer style="text-align: right;">
+      <div class="pagination">
+        <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize" @pagination="getList" />
+      </div>
+    </el-footer>
+    <el-dialog
+      v-if="customVisible"
+      :visible.sync="customVisible"
+      :close-on-click-modal="false"
+      :title="$t('trials:customSite:title:custom')"
+      width="600px"
+      custom-class="base-dialog-wrapper"
+      append-to-body
+    >
+      <CustomSiteForm v-if="customVisible" @close="closeDialog" @getList="handleReset" />
+    </el-dialog>
+  </el-container>
+</template>
+<script>
+import { getTrialSiteScreeningList, addTrialSites } from '@/api/trials'
+import CustomSiteForm from './customSiteForm'
+import Pagination from '@/components/Pagination'
+const getListQueryDefault = () => {
+  return {
+    SiteName: '',
+    PageIndex: 1,
+    PageSize: 20
+  }
+}
+export default {
+  components: { Pagination, CustomSiteForm },
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listQuery: getListQueryDefault(),
+      selectArr: [],
+      assignLoadStatus: false,
+      customVisible: false,
+      trialId: ''
+    }
+  },
+  mounted() {
+    this.trialId = this.$route.query.trialId
+    this.getList()
+  },
+  methods: {
+    getList() {
+      const loading = this.$loading({
+        target: document.querySelector('.site-table-list'),
+        fullscreen: false,
+        lock: true
+      })
+      this.listQuery.TrialId = this.trialId
+      getTrialSiteScreeningList(this.listQuery).then(res => {
+        loading.close()
+        this.list = res.Result.CurrentPageData
+        this.total = res.Result.TotalCount
+      }).catch(() => { loading.close() })
+    },
+    handleCustomSite() {
+      this.customVisible = true
+    },
+    closeDialog() {
+      this.customVisible = false
+    },
+    handleAssign() {
+      this.$confirm(this.$t('trials:customSite:message:add'), {
+        type: 'warning',
+        distinguishCancelAndClose: true
+      })
+        .then(() => {
+          const loading = this.$loading({
+            target: document.querySelector('.site-table-list'),
+            fullscreen: false,
+            lock: true
+          })
+          this.assignLoadStatus = true
+          addTrialSites(this.selectArr)
+            .then(res => {
+              this.assignLoadStatus = false
+              loading.close()
+              if (res.IsSuccess) {
+                this.$emit('closeDialog')
+                this.$message.success(this.$t('common:message:addedSuccessfully'))
+              }
+            }).catch(() => {
+              loading.close()
+              this.assignLoadStatus = false
+            })
+        })
+    },
+    handleSearch() {
+      this.listQuery.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = getListQueryDefault()
+      this.getList()
+    },
+    handleSelectChange(val) {
+      const arr = []
+      for (let index = 0; index < val.length; index++) {
+        const param = {
+          TrialId: this.trialId,
+          SiteId: val[index].Id,
+          SiteName: val[index].SiteName
+        }
+        arr.push(param)
+      }
+      this.selectArr = arr
+    },
+    handleSortByColumn(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()
+    },
+    handleSelectable(row) {
+      if (!row.IsSelect) {
+        return true
+      } else {
+        return false
+      }
+    }
+  }
+}
+</script>
+<style lang="scss" scoped>
+.siteform-container{
+  height: 100%;
+  .el-header{
+    .filter-container{
+      display: flex;
+      align-items: center;
+      span{
+        font-size:13px;
+        margin-right:5px;
+      }
+      .mr{
+        margin-right: 5px;
+        width: 120px;
+      }
+    }
+  }
+  .el-main{
+    padding: 0px;
+  }
+  .el-footer{
+    padding: 0 20px;
+  }
+}
+</style>
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 e2ccd666..49ca0b3c 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
@@ -1331,7 +1331,7 @@ export default {
         })
         if (!isgo) {
           // `请补充检查${isgoList.toString()}的检查部位！`
-          this.$confirm(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.toString()), '',{
+          this.$confirm(this.$t('trials:qcQuality:title:title1').replace('xxx', isgoList.join('、 ')), '',{
             showCancelButton: false
           })
           return

From d745ad7318aae32a977e97385de36bef0b9e141a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=86=8A=E9=A3=9E?= <xiongfei@xiongfeideMacBook-Pro.local>
Date: Mon, 29 Jan 2024 17:01:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E7=AE=80?=
 =?UTF-8?q?=E5=8E=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/UploadFile/index.vue                | 2 +-
 src/views/reviewers/components/GcpCertificate.vue  | 2 +-
 src/views/reviewers/components/TrialExperience.vue | 8 --------
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/src/components/UploadFile/index.vue b/src/components/UploadFile/index.vue
index 331b0033..cf3c72c7 100644
--- a/src/components/UploadFile/index.vue
+++ b/src/components/UploadFile/index.vue
@@ -141,7 +141,7 @@ export default {
     },
     handlePreview(file) {
       if (file.fullPath) {
-        window.open(file.fullPath, '_blank')
+        window.open(this.OSSclientConfig.basePath + file.fullPath, '_blank')
       }
     },
     handleExceed(files, fileList) {
diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue
index 933046c8..2c7957b5 100644
--- a/src/views/reviewers/components/GcpCertificate.vue
+++ b/src/views/reviewers/components/GcpCertificate.vue
@@ -192,7 +192,7 @@ export default {
     },
     handlePreview(file) {
       if (file.fullPath) {
-        window.open(file.fullPath, '_blank')
+        window.open(this.OSSclientConfig.basePath + file.fullPath, '_blank')
       }
     },
     handleExceed(files, fileList) {
diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index d6dfa7fc..22c4e172 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -39,22 +39,14 @@
       <p>GCP Certificate</p>
     </div>
     <div style="margin-left:40px;width:40%">
-      <!-- <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-group>
-      <upload-file v-if="GCP" :doctor-id="doctorId" type="GCP" @getFileList="getFileList" />
-      <div><el-button type="primary" size="small" style="margin-top:20px" @click="handleSaveGCP">Save</el-button></div> -->
       <gcp-certificate :doctor-id="doctorId" :gcp="GCP" :gcp-id="GCPID" />
     </div>
     <div class="title-wrapper" style="margin-top:10px;">
       <p>Other Relevant Experience</p>
     </div>
     <div style="padding:0 40px;">
-
       <el-row type="flex" justify="space-between">
         <el-col :span="11">
-
           <el-input
             v-model="OtherClinicalExperience"
             type="textarea"