From a5f16c866ddb9ba391f2801aade38005131e75f2 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 13 Mar 2025 16:37:08 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E5=90=8D=E7=A7=B0?= =?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 --- src/api/trials/setting.js | 8 ++ .../trial-config/components/logicalConfig.vue | 83 +++++++++++++++++-- 2 files changed, 86 insertions(+), 5 deletions(-) diff --git a/src/api/trials/setting.js b/src/api/trials/setting.js index ad9bf3b9..063b0e36 100644 --- a/src/api/trials/setting.js +++ b/src/api/trials/setting.js @@ -110,4 +110,12 @@ export function addOrUpdateTrialBodyPart(data) { data }) } +// 修改检查名称列表 +export function updateTrialStudyNameList(data) { + return request({ + url: `/TrialConfig/updateTrialStudyNameList`, + method: 'post', + data + }) +} 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 df629d11..b0e38cdc 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 @@ -912,10 +912,19 @@ @@ -933,6 +942,7 @@ import { ConfigTrialBasicInfoConfirm, getTrialBodyPartList, addOrUpdateTrialBodyPart, + updateTrialStudyNameList, } from '@/api/trials/setting' import SignForm from '@/views/trials/components/newSignForm' import ClinicalDataForm from './clinicalDataForm' @@ -1094,6 +1104,7 @@ export default { width: '500px', appendToBody: true, }, + studyNameLoading: false, addBodyPartForm: { bodyPartStr: null, Id: null, @@ -1328,13 +1339,51 @@ export default { if (!validate) return this.addStudyNameForm.EnName = this.addStudyNameForm.Name let data = { ...this.addStudyNameForm } - this.trialStudyNameList.push(data) + let arr = [] + this.trialStudyNameList.forEach((item) => { + let obj = { + EnName: item.EnName, + Name: item.EnName, + IsChoose: false, + } + arr.push(obj) + }) + arr.push(data) + + this.studyNameLoading = true + let res = await this.updateStudyNameList(arr) + this.studyNameLoading = false + if (!res) + return this.$message.warning( + this.$t('trials:seeting:message:addStudyNameFail') + ) + this.$message.success( + this.$t('trials:seeting:message:addStudyNameSucccess') + ) this.addStudyNameForm = { EnName: null, Name: null, IsChoose: false, } this.addStudyName_model.visible = false + // this.getStudyNameList() + this.trialStudyNameList.push(data) + }, + async updateStudyNameList(StudyNameList) { + try { + let data = { + TrialId: this.$route.query.trialId, + StudyNameList, + } + let res = await updateTrialStudyNameList(data) + if (res.IsSuccess) { + return true + } + return false + } catch (err) { + console.log(err) + return false + } }, // 编辑检查部位 handleEditBodyPart(item) { @@ -1344,11 +1393,33 @@ export default { this.addBodyPart_model.title = this.$t('trials:setting:button:edit') this.addBodyPart_model.visible = true }, - handleDelStudyName(item) { + async handleDelStudyName(item) { let index = this.trialStudyNameList.findIndex( (data) => item.Name === data.Name ) + let arr = [] + this.trialStudyNameList.forEach((item, i) => { + if (index !== i) { + let obj = { + EnName: item.EnName, + Name: item.EnName, + IsChoose: false, + } + arr.push(obj) + } + }) + this.listLoading = true + let res = await this.updateStudyNameList(arr) + this.listLoading = false + if (!res) + return this.$message.warning( + this.$t('trials:seeting:message:delStudyNameFail') + ) + this.$message.success( + this.$t('trials:seeting:message:delStudyNameSucccess') + ) this.trialStudyNameList.splice(index, 1) + // this.getStudyNameList() }, handleSetBodyPart() { this.bodyPartListVisible = true @@ -1835,7 +1906,9 @@ export default { this.form.ClinicalDataSetNames.join(', ') } this.getClinicalDataList(true) - this.$message.success('删除成功!') + this.$message.success( + this.$t('common:message:deletedSuccessfully') + ) } }) .catch(() => { From 08cdcffd825e726ba9b62e10ecd014795fd27f9c Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 13 Mar 2025 17:10:42 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E6=96=B9=E5=90=8C=E6=84=8F=E5=85=A5=E9=A1=B9?= =?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/api/dictionary.js | 16 + .../attachment-management/index.vue | 2 + .../components/fileRecord/index.vue | 1 - .../components/trainRecord/form.vue | 32 +- .../components/viewer/certificate/form.vue | 0 .../components/viewer/certificate/index.vue | 801 ++++++++++++++++++ .../viewer/curriculumVitae/index.vue | 8 +- .../components/viewer/entryRecord/index.vue | 470 ++++++++++ .../trial-summary/trial-document/index.vue | 12 +- 9 files changed, 1303 insertions(+), 39 deletions(-) create mode 100644 src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/form.vue create mode 100644 src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/entryRecord/index.vue diff --git a/src/api/dictionary.js b/src/api/dictionary.js index d17c02f5..9ee4273f 100644 --- a/src/api/dictionary.js +++ b/src/api/dictionary.js @@ -1249,3 +1249,19 @@ export function getTrialDoctorList(data) { data }) } +// 项目文档-上传同意入项记录 +export function uploadTrialFileTypeFile(data) { + return request({ + url: `/TrialFileType/uploadTrialFileTypeFile`, + method: 'post', + data + }) +} +// 项目文档-获取上传同意入项记录 +export function getTrialFileTypeFile(data) { + return request({ + url: `/TrialFileType/getTrialFileTypeFile`, + method: 'post', + data + }) +} diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue index 7fbd75a6..7c24363e 100644 --- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue +++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue @@ -425,6 +425,8 @@ export default { this.loading = true if (this.viewStatus) { this.searchData.IsConfirmed = true + } + if (this.isDoc) { let IR = this.userTypeOptions.find((item) => item.UserTypeEnum == 13) if (IR) { this.searchData.UserTypeId = IR.Id diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/fileRecord/index.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/fileRecord/index.vue index cf4df76a..ff7e756b 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/components/fileRecord/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/fileRecord/index.vue @@ -780,7 +780,6 @@ export default { let typeArr = ['', 'Report', 'Doc', 'Record', 'Reviewer', 'Template'] let types = typeArr[this.ArchiveTypeEnum] this.uploadPath = `/${this.$route.query.trialId}/Document/${types}` - console.log(this.uploadPath, this.ArchiveTypeEnum) }, computed: { isEN() { diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/trainRecord/form.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/trainRecord/form.vue index 47a48a3a..0533bca0 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/components/trainRecord/form.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/trainRecord/form.vue @@ -29,7 +29,7 @@ :label="$t('trials:trialDocument:trainRecord:form:TrianingCount')" prop="TrianingCount" > - + { - if ( - value && - (String(value).includes('.') || - new RegExp(/\D/g).test(String(value))) - ) { - callback( - new Error( - this.$t( - 'trials:trialDocument:trainRecord:ruleMessage:TrianingCountPatternS' - ) - ) - ) - } else { - callback() - } - }, - trigger: 'blur', - }, - ], }, loading: false, TrialFile: [], diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/form.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/form.vue new file mode 100644 index 00000000..e69de29b diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/index.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/index.vue index e69de29b..32400e25 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/certificate/index.vue @@ -0,0 +1,801 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/curriculumVitae/index.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/curriculumVitae/index.vue index 488010e9..0f9d7df5 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/curriculumVitae/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/curriculumVitae/index.vue @@ -101,6 +101,12 @@ {{ isEN ? scope.row.BlindName : scope.row.BlindNameCN }} + + +
+ {{ TITLE }} +
+ + + + + + + + + + + + + + + + + + + + + + + + + + +
+ +
+
+ +
+ + + \ No newline at end of file diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/index.vue b/src/views/trials/trials-panel/trial-summary/trial-document/index.vue index 88fe8be0..2f6006a1 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/index.vue @@ -96,13 +96,13 @@ :viewStatus="viewStatus" /> - + /> Date: Fri, 14 Mar 2025 10:25:35 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=96=87=E6=A1=A3?= =?UTF-8?q?=E7=94=B3=E6=8A=A5=E6=96=B9=E5=90=8C=E6=84=8F=E5=85=A5=E9=A1=B9?= =?UTF-8?q?=E8=AE=B0=E5=BD=95=E5=AE=A1=E6=A0=B8=E4=BA=BA=E8=A7=92=E8=89=B2?= =?UTF-8?q?=E5=AD=97=E6=AE=B5=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/viewer/entryRecord/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/entryRecord/index.vue b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/entryRecord/index.vue index 082fef7d..c2a612b1 100644 --- a/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/entryRecord/index.vue +++ b/src/views/trials/trials-panel/trial-summary/trial-document/components/viewer/entryRecord/index.vue @@ -33,7 +33,7 @@ :label="$t('trials:trialDocument:entryRecord:search:auditorRole')" > { return { Code: null, - OptUserType: null, + UserTypeEnum: null, OptUserName: null, OptStartTime: null, OptEndTime: null,