From 296a455f0d7deb5a6540d5f17491fec4a68a9f42 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 11:39:42 +0800
Subject: [PATCH 1/9] 1

---
 src/api/export.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/src/api/export.js b/src/api/export.js
index 17606cfe..71b1208d 100644
--- a/src/api/export.js
+++ b/src/api/export.js
@@ -248,3 +248,12 @@ export function GetAnalysisTaskList_Export(data) {
     data
   })
 }
+// 导出邮件配置
+export function GetEmailNoticeConfigList_Export(data) {
+  return requestDownload({
+    url: `/ExcelExport/GetEmailNoticeConfigList_Export`,
+    responseType: 'blob',
+    method: 'post',
+    data
+  })
+}

From f672ac350091ee2c0ae5b7f4ae47262653cf0c15 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 13:14:15 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E4=BA=BA=E6=96=B0=E5=A2=9E=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

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

diff --git a/src/views/reviewers/new.vue b/src/views/reviewers/new.vue
index 67882132..f74c3147 100644
--- a/src/views/reviewers/new.vue
+++ b/src/views/reviewers/new.vue
@@ -160,7 +160,7 @@ export default {
     },
     checkLeave() {
       const id = getQueryString('Id')
-      if (!id) {
+      if (!id && !this.reviewerId) {
         this.$message({
           message: 'Please fill in the basic information first',
           type: 'warning',

From e947c99f711dd1212efc224062b76cb725acf81b Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 13:18:21 +0800
Subject: [PATCH 3/9] 1

---
 src/views/dictionary/template/email/components/EmailList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/dictionary/template/email/components/EmailList.vue b/src/views/dictionary/template/email/components/EmailList.vue
index db3d2dcb..f03a4a25 100644
--- a/src/views/dictionary/template/email/components/EmailList.vue
+++ b/src/views/dictionary/template/email/components/EmailList.vue
@@ -513,7 +513,7 @@ export default {
       // this.searchData.IsDistinguishCriteria = this.isDistinguishCriteria
       // this.searchData.systemLevel = this.systemLevel
       // return GetEmailNoticeConfigList_Export(this.searchData)
-      return GetEmailNoticeConfigList_Export()
+      return GetEmailNoticeConfigList_Export(this.searchData)
     },
   },
 }

From 25a3a0e371a72f7c6a3956745f8742682a93e479 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 13:43:49 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E6=A6=82=E8=BF=B0=E4=B8=8E=E6=94=AF?=
 =?UTF-8?q?=E4=BB=98=E4=BF=A1=E6=81=AF=E4=BF=9D=E5=AD=98=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Pay.vue       | 1 +
 src/views/reviewers/components/Summarize.vue | 1 +
 2 files changed, 2 insertions(+)

diff --git a/src/views/reviewers/components/Pay.vue b/src/views/reviewers/components/Pay.vue
index f535f7f2..2ae2aaa3 100644
--- a/src/views/reviewers/components/Pay.vue
+++ b/src/views/reviewers/components/Pay.vue
@@ -107,6 +107,7 @@ export default {
         let res = await updatePaymentMode(this.form)
         this.loading = false
         if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
       } catch (err) {
         this.loading = false
diff --git a/src/views/reviewers/components/Summarize.vue b/src/views/reviewers/components/Summarize.vue
index 2074b49f..559cb658 100644
--- a/src/views/reviewers/components/Summarize.vue
+++ b/src/views/reviewers/components/Summarize.vue
@@ -96,6 +96,7 @@ export default {
         let res = await updateGneralSituation(this.form)
         this.loading = false
         if (res.IsSuccess) {
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
         }
       } catch (err) {
         this.loading = false

From fe18b885f114b8f5aeea6089dfcd6fc82b52aa1e Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 13:45:55 +0800
Subject: [PATCH 5/9] =?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/components/EducationTraining.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/views/reviewers/components/EducationTraining.vue b/src/views/reviewers/components/EducationTraining.vue
index cbdaac83..c88adcfb 100644
--- a/src/views/reviewers/components/EducationTraining.vue
+++ b/src/views/reviewers/components/EducationTraining.vue
@@ -291,14 +291,14 @@
             size="small"
             :disabled="$route.query.ReviewStatus === '1'"
             @click="handlePostgraduateEdit(scope.row)"
-            >Edit</el-button
+            >{{ $t('common:button:edit') }}</el-button
           >
           <el-button
             type="text"
             size="small"
             :disabled="$route.query.ReviewStatus === '1'"
             @click="handlePostgraduateDelete(scope.row)"
-            >Delete</el-button
+            >{{ $t('common:button:delete') }}</el-button
           >
         </template>
       </el-table-column>

From 9671722e1a03ae5941bb04c912f9aa18927f9541 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 14:28:02 +0800
Subject: [PATCH 6/9] =?UTF-8?q?GCP=E8=AF=81=E4=B9=A6=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reviewers/components/GcpCertificate.vue   | 206 +++++++++++++-----
 .../reviewers/components/TrialExperience.vue  |  12 +-
 2 files changed, 162 insertions(+), 56 deletions(-)

diff --git a/src/views/reviewers/components/GcpCertificate.vue b/src/views/reviewers/components/GcpCertificate.vue
index 4867b0a2..886e875a 100644
--- a/src/views/reviewers/components/GcpCertificate.vue
+++ b/src/views/reviewers/components/GcpCertificate.vue
@@ -1,11 +1,43 @@
 <template>
   <div class="gcp-container">
-    <el-radio-group v-model="GCP" style="margin-bottom:20px">
-      <el-radio :label="1">{{ $t('system:GcpCertificate:radio:Yes') }}</el-radio>
+    <el-radio-group v-model="GCP" style="margin-bottom: 20px">
+      <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>
+    <el-form
+      ref="certificateFrom"
+      v-loading="saveBtnLoading"
+      :model="certificateForm"
+      :rules="certificateRules"
+      label-width="80px"
+      size="small"
+    >
+      <el-form-item
+        :label="$t('curriculumVitae:clinicalTrials:form:CertificateTime')"
+        prop="GCPTime"
+        v-if="GCP"
+      >
+        <el-date-picker
+          v-model="certificateForm.GCPTime"
+          type="date"
+          placeholder=""
+          value-format="yyyy-MM-dd"
+          format="yyyy-MM-dd"
+        >
+        </el-date-picker>
+      </el-form-item>
+      <el-form-item
+        :label="$t('curriculumVitae:clinicalTrials:form:certificateHospital')"
+        prop="GCPAgencies"
+        v-if="GCP"
+      >
+        <el-input v-model="certificateForm.GCPAgencies" clearable></el-input>
+      </el-form-item>
+    </el-form>
     <div v-if="GCP" class="upload-container">
-<!--      <upload-file :doctor-id="doctorId" type="GCP" />-->
+      <!--      <upload-file :doctor-id="doctorId" type="GCP" />-->
       <el-upload
         class="upload-demo"
         action
@@ -19,12 +51,23 @@
         :on-exceed="handleExceed"
         accept=".pdf"
       >
-        <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:tip:file:pdf') }}</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:tip:file:pdf')
+        }}</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">
+      <el-button
+        :loading="saveBtnLoading"
+        :disabled="fileList.length === 0 && GCP === 1"
+        type="primary"
+        size="small"
+        style="margin-top: 20px"
+        @click="handleSaveGCP"
+      >
         {{ $t('common:button:save') }}
       </el-button>
     </div>
@@ -32,26 +75,43 @@
 </template>
 <script>
 import UploadFile from '@/components/UploadFile'
-import { uploadFile, deleteAttachment, getAttachmentByType, saveAttachments } from '@/api/attachment'
+import {
+  uploadFile,
+  deleteAttachment,
+  getAttachmentByType,
+  saveAttachments,
+} from '@/api/attachment'
 import { updateGcpExperience } from '@/api/reviewers'
+const defaultCertificateForm = () => {
+  return {
+    GCPTime: '',
+    GCPAgencies: '',
+  }
+}
 export default {
   name: 'GcpCertificate',
   components: {
-    UploadFile
+    UploadFile,
   },
   props: {
     doctorId: {
       type: String,
-      required: true
+      required: true,
     },
     gcp: {
       type: Number,
-      default: 0
+      default: 0,
     },
     gcpId: {
       type: String,
-      default: ''
-    }
+      default: '',
+    },
+    DATA: {
+      type: Object,
+      default: () => {
+        return {}
+      },
+    },
   },
   data() {
     return {
@@ -59,7 +119,9 @@ export default {
       btnDisabled: false,
       saveBtnLoading: false,
       GCP: 0,
-      GCPID: ''
+      GCPID: '',
+      certificateForm: defaultCertificateForm(),
+      certificateRules: {},
     }
   },
   watch: {
@@ -68,7 +130,16 @@ export default {
     },
     gcpId(val) {
       this.GCPID = val
-    }
+    },
+    DATA: {
+      handler() {
+        Object.keys(this.certificateForm).forEach((key) => {
+          this.certificateForm[key] = this.DATA[key]
+        })
+      },
+      immediate: true,
+      deep: true,
+    },
   },
   mounted() {
     this.initFileList()
@@ -76,48 +147,53 @@ export default {
   methods: {
     handleSaveGCP() {
       if (this.GCP && this.GCPID === '') {
-        this.$message.info(this.$t('reviewers:GCPCertificate:message:uploadValid'))
+        this.$message.info(
+          this.$t('reviewers:GCPCertificate:message:uploadValid')
+        )
         return
       }
 
       const param = {
         Id: this.doctorId,
         GCP: this.GCP,
-        GCPId: this.GCP ? this.GCPID : ''
+        GCPId: this.GCP ? this.GCPID : '',
+        GCPTime: this.GCP ? this.certificateForm.GCPTime : '',
+        GCPAgencies: this.GCP ? this.certificateForm.GCPAgencies : '',
       }
       this.saveBtnLoading = true
-      updateGcpExperience(param).then(res => {
-        if (this.GCP === 0) {
-          this.fileList = []
-        }
-        this.saveBtnLoading = false
-        this.$message.success(this.$t('common:message:savedSuccessfully'))
-      }).catch(() => {
-        this.saveBtnLoading = false
-      })
+      updateGcpExperience(param)
+        .then((res) => {
+          if (this.GCP === 0) {
+            this.fileList = []
+          }
+          this.saveBtnLoading = false
+          this.$message.success(this.$t('common:message:savedSuccessfully'))
+        })
+        .catch(() => {
+          this.saveBtnLoading = false
+        })
     },
     initFileList() {
-      if(!this.doctorId) return
-      getAttachmentByType(this.doctorId, 'GCP')
-        .then(res => {
-          if (res.IsSuccess) {
-            if (res.Result.length > 0) {
-              this.fileList = this.formatterFileList(res.Result)
-            } else {
-              this.fileList = []
-            }
+      if (!this.doctorId) return
+      getAttachmentByType(this.doctorId, 'GCP').then((res) => {
+        if (res.IsSuccess) {
+          if (res.Result.length > 0) {
+            this.fileList = this.formatterFileList(res.Result)
+          } else {
+            this.fileList = []
           }
-        })
+        }
+      })
     },
     formatterFileList(list) {
       var arr = []
-      list.forEach(item => {
+      list.forEach((item) => {
         var data = {
           name: item.FileName,
           path: item.Path,
           fullPath: item.FullPath,
           id: item.Id,
-          type: item.Type
+          type: item.Type,
         }
         arr.push(data)
       })
@@ -127,8 +203,17 @@ export default {
       var fileName = param.file.name
       this.btnDisabled = true
       const file = await this.fileToBlob(param.file)
-      const res = await this.OSSclient.put(`/SystemData/reviewer/GCP/${this.doctorId}/${fileName}`, file)
-      this.fileList.push({ name: fileName, path: this.$getObjectName(res.url), fullPath: this.$getObjectName(res.url),url: this.$getObjectName(res.url), type: 'GCP' })
+      const res = await this.OSSclient.put(
+        `/SystemData/reviewer/GCP/${this.doctorId}/${fileName}`,
+        file
+      )
+      this.fileList.push({
+        name: fileName,
+        path: this.$getObjectName(res.url),
+        fullPath: this.$getObjectName(res.url),
+        url: this.$getObjectName(res.url),
+        type: 'GCP',
+      })
       this.saveFile()
     },
     // uploadFile(param) {
@@ -147,15 +232,24 @@ export default {
     // },
     saveFile() {
       const { name, path, fullPath, type } = this.fileList[0]
-      const param = [{ DoctorId: this.doctorId, Type: type, Path: path, FullPath: fullPath, FileName: name }]
-      saveAttachments(param).then(res => {
-        this.btnDisabled = false
-        if (res.IsSuccess) {
-          this.fileList[0].id = res.Result[0].Id
-          this.GCPID = res.Result[0].Id
-          this.$message.success(this.$t('common:message:savedSuccessfully'))
-        }
-      })
+      const param = [
+        {
+          DoctorId: this.doctorId,
+          Type: type,
+          Path: path,
+          FullPath: fullPath,
+          FileName: name,
+        },
+      ]
+      saveAttachments(param)
+        .then((res) => {
+          this.btnDisabled = false
+          if (res.IsSuccess) {
+            this.fileList[0].id = res.Result[0].Id
+            this.GCPID = res.Result[0].Id
+            this.$message.success(this.$t('common:message:savedSuccessfully'))
+          }
+        })
         .catch(() => {
           this.btnDisabled = false
         })
@@ -177,19 +271,19 @@ export default {
     handleRemoveFile(file, fileList) {
       if (file && file.status === 'success') {
         if (file.id) {
-          deleteAttachment(file.id, file.path).then(res => {
+          deleteAttachment(file.id, file.path).then((res) => {
             if (res.IsSuccess) {
               this.fileList = []
               this.GCPID = ''
               this.$message({
                 message: this.$t('common:message:deletedSuccessfully'),
-                type: 'success'
+                type: 'success',
               })
             }
           })
         } else {
           this.fileList = []
-           this.GCPID = ''
+          this.GCPID = ''
         }
       }
     },
@@ -202,18 +296,20 @@ export default {
       this.$message.warning(`Upload is currently limited to 1 file`)
     },
     fileValid(fileName, typeArr) {
-      var extendName = fileName.substring(fileName.lastIndexOf('.') + 1).toLocaleLowerCase()
+      var extendName = fileName
+        .substring(fileName.lastIndexOf('.') + 1)
+        .toLocaleLowerCase()
       if (typeArr.indexOf(extendName) > -1) {
         return true
       } else {
         return false
       }
-    }
-  }
+    },
+  },
 }
 </script>
 <style lang="scss">
-.gcp-container{
+.gcp-container {
   .upload-container .el-upload--text {
     border: none;
     width: 80px;
diff --git a/src/views/reviewers/components/TrialExperience.vue b/src/views/reviewers/components/TrialExperience.vue
index 5f761976..d681165f 100644
--- a/src/views/reviewers/components/TrialExperience.vue
+++ b/src/views/reviewers/components/TrialExperience.vue
@@ -112,7 +112,12 @@
       <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" />
+      <gcp-certificate
+        :doctor-id="doctorId"
+        :gcp="GCP"
+        :gcp-id="GCPID"
+        :DATA="GCPData"
+      />
     </div>
     <div class="title-wrapper" style="margin-top: 10px">
       <p>{{ $t('system:TrialExperience:title:Other Relevant Experience') }}</p>
@@ -396,6 +401,7 @@ export default {
       selectId: '00000000-0000-0000-0000-000000000000',
       dictionaryList: {},
       otherId: 'ef84e9cb-f1a6-49d7-b6da-34be2c12abd5',
+      GCPData: {},
     }
   },
   computed: {
@@ -488,6 +494,10 @@ export default {
             this.clinicalTrialList = res.Result.ClinicalTrialExperienceList
             this.GCP = res.Result.GCP
             this.GCPID = res.Result.GCPId
+            this.GCPData = {
+              GCPAgencies: res.Result.GCPAgencies,
+              GCPTime: res.Result.GCPTime,
+            }
             this.OtherClinicalExperience = res.Result.OtherClinicalExperience
             this.OtherClinicalExperienceCN =
               res.Result.OtherClinicalExperienceCN

From 7952c83b524434466c2a826f2ed8cbcd30ba999f Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 14:29:48 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=8D=8F=E8=AE=AE=E5=9B=BD=E9=99=85?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Agreements.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/reviewers/components/Agreements.vue b/src/views/reviewers/components/Agreements.vue
index 82704dc4..34501ae9 100644
--- a/src/views/reviewers/components/Agreements.vue
+++ b/src/views/reviewers/components/Agreements.vue
@@ -190,7 +190,7 @@
         :label="$t('system:Agreements:table:Upload Time')"
         width="150"
       />
-      <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"

From 79473f6638965e4bd97e36f3b09ce714ade40bf0 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 15:24:37 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E9=98=85=E7=89=87=E4=BA=BA=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=93=8D=E4=BD=9C=E6=A0=8F=E5=9B=BA=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

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 282b4fdf..561999f6 100644
--- a/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
+++ b/src/views/trials/trials-panel/attachments/enrollment/components/Selection.vue
@@ -316,6 +316,7 @@
           width="150"
         />
         <el-table-column
+          fixed="right"
           prop="OptTimeStr"
           :label="$t('common:action:action')"
           width="150"

From 39b5333f9cf3c1ef6db725ae28bfc44f7fedf6b6 Mon Sep 17 00:00:00 2001
From: wangxiaoshuang <825034831@qq.com>
Date: Mon, 4 Nov 2024 15:46:10 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E6=94=AF=E4=BB=98=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/reviewers/components/Pay.vue | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/views/reviewers/components/Pay.vue b/src/views/reviewers/components/Pay.vue
index 2ae2aaa3..0168ae98 100644
--- a/src/views/reviewers/components/Pay.vue
+++ b/src/views/reviewers/components/Pay.vue
@@ -81,6 +81,11 @@
 <script>
 import { getDetail, updatePaymentMode } from '@/api/reviewers'
 export default {
+  props: {
+    reviewerId: {
+      type: String,
+    },
+  },
   data() {
     return {
       loading: false,