From d57c080916ff8282691cb7d973bccdff007f5178 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 2 Dec 2025 17:52:47 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E5=88=86=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/api/research.js | 7 +- .../research/components/ResearchForm.vue | 73 +++++++++---------- src/views/research/form.vue | 3 +- .../site-research/components/ImageManual.vue | 18 ++++- .../attachments/site-research/index.vue | 4 +- .../dicoms/components/PCWG/QuestionList.vue | 2 +- .../reading/dicoms/components/ReportPage.vue | 5 +- src/views/trials/trials-workbench/index.vue | 6 +- 8 files changed, 66 insertions(+), 52 deletions(-) diff --git a/src/api/research.js b/src/api/research.js index 086c0294..66f1b54c 100644 --- a/src/api/research.js +++ b/src/api/research.js @@ -26,8 +26,11 @@ export function getTrialSurveyInitInfo(trialId) { export function getSiteSurveyInfo(trialId, id) { return request({ - url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}/${id}`, - method: 'get' + url: `/TrialSiteSurvey/getSiteSurveyInfo/${trialId}`, + method: 'get', + params: { + TrialsiteSurveyId: id + } }) } diff --git a/src/views/research/components/ResearchForm.vue b/src/views/research/components/ResearchForm.vue index 1c8b0922..0c27b87d 100644 --- a/src/views/research/components/ResearchForm.vue +++ b/src/views/research/components/ResearchForm.vue @@ -21,14 +21,15 @@

{{ $t('trials:staffResearch:title:historicalStaff') }}

- +

{{ $t('trials:staffResearch:title:newStaff') }}

- + - +

{{ $t('trials:equiptResearch:title:equiptResearch') }}

 @@ -53,31 +54,17 @@ - +
- - + +
@@ -136,7 +123,7 @@ export default { props: { trialSiteSurveyId: { type: String, - required: true + default: '' } }, data() { @@ -152,7 +139,7 @@ export default { btnLoading: false, isFullscreen: false, historyVisible: false, - siteSurveyNoteInfo: null + siteSurveyNoteInfo: {} } }, mounted() { @@ -172,6 +159,7 @@ export default { if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) { this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote') } + this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey var historicalArr = [] var newArr = [] res.Result.TrialSiteUserSurveyList.map(i => { @@ -241,7 +229,7 @@ export default { this.$message.success(this.$t('common:message:savedSuccessfully')) } }).catch(() => { this.loading = false }) - }).catch(() => {}) + }).catch(() => { }) }, // 生成账号 generateAccount() { @@ -276,7 +264,7 @@ export default { }).catch(() => { this.loading = false }) - }).catch(() => {}) + }).catch(() => { }) }, // 驳回 handleReject() { @@ -324,37 +312,44 @@ export default { display: flex; flex-direction: column; height: 100%; - .mt10{ + + .mt10 { margin-top: 10px; } - .header-wrapper{ + + .header-wrapper { width: 70%; margin: 20px auto; } - .center-wrapper{ + + .center-wrapper { flex: 1; width: 70%; margin: 0px auto; padding-bottom: 20px; overflow-y: auto; } - ::v-deep .el-card__body{ + + ::v-deep .el-card__body { padding: 10px; } + // >>>.el-dialog__body{ // padding: 10px 20px 20px 20px; // } - ::v-deep .full-dialog-container{ - .el-dialog__body{ + ::v-deep .full-dialog-container { + .el-dialog__body { height: calc(100% - 80px); } } - ::v-deep .dialog-container{ + + ::v-deep .dialog-container { // margin-top: 50px !important; - width:75%; - height:80%; - .el-dialog__body{ + width: 75%; + height: 80%; + + .el-dialog__body { padding: 10px; height: calc(100% - 80px); } diff --git a/src/views/research/form.vue b/src/views/research/form.vue index afd5728e..7c4a1858 100644 --- a/src/views/research/form.vue +++ b/src/views/research/form.vue @@ -62,7 +62,7 @@ - +

{{ $t('trials:equiptResearch:title:equiptResearch') }}

 @@ -193,6 +193,7 @@ export default { if (res.Result.SiteSurveyFiledConfig && res.Result.SiteSurveyFiledConfig.ModifyFiledList.length > 0) { this.siteSurveyNoteInfo = res.Result.SiteSurveyFiledConfig.ModifyFiledList.find(i => i.NeedModifyFiled === 'SiteSurveyNote') } + this.siteSurveyNoteInfo.IsCloseEquipmentSurvey = res.Result.SiteSurveyFiledConfig.IsCloseEquipmentSurvey this.state = res.Result.TrialSiteSurvey.State this.siteId = res.Result.TrialSiteSurvey.TrialSiteId this.$refs['baseResearchInfo'].initForm(res.Result.TrialInfo, res.Result.TrialSiteSurvey, res.Result.SiteSurveyFiledConfig ? res.Result.SiteSurveyFiledConfig.NotShowFieldList : null) diff --git a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue index 14a84b6f..70f29157 100644 --- a/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue +++ b/src/views/trials/trials-panel/attachments/site-research/components/ImageManual.vue @@ -28,6 +28,17 @@ +
+ {{ $t("trials:researchRecord:ImageManual:TableConfiguration") }} +
+ + + + {{ item.label + }} + + +
{{ $t("trials:researchRecord:ImageManual:Precautions") }}
@@ -53,7 +64,7 @@ export default { props: { trialSiteSurveyId: { type: String, - required: true + default: '' } }, data() { @@ -68,7 +79,8 @@ export default { ReplaceContent: '', ReplaceContentCN: '', IsOpenLostVistRead: false, - IsSupportQCDownloadImage: false + IsSupportQCDownloadImage: false, + IsCloseEquipmentSurvey: true }, obj: { AverageEngravingCycle: false, @@ -105,6 +117,7 @@ export default { }) this.form.IsOpenLostVistRead = res.Result.IsOpenLostVistRead this.form.IsSupportQCDownloadImage = res.Result.IsSupportQCDownloadImage + this.form.IsCloseEquipmentSurvey = res.Result.IsCloseEquipmentSurvey if (Array.isArray(res.Result.NotShowFieldList) && res.Result.NotShowFieldList.length > 0) { res.Result.NotShowFieldList.forEach(key => { this.form[key] = false @@ -151,6 +164,7 @@ export default { let data = { IsOpenLostVistRead: this.form.IsOpenLostVistRead, IsSupportQCDownloadImage: this.form.IsSupportQCDownloadImage, + IsCloseEquipmentSurvey: this.form.IsCloseEquipmentSurvey, ModifyFiledList: [], NotShowFieldList: [] } 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 9507c564..07b03083 100644 --- a/src/views/trials/trials-panel/attachments/site-research/index.vue +++ b/src/views/trials/trials-panel/attachments/site-research/index.vue @@ -288,7 +288,7 @@ export default { }, methods: { openImageManual() { - if (!this.trialSiteSurveyId) return false + // if (!this.trialSiteSurveyId) return false this.ImageManualVisible = true }, // 获取系统文件数据 @@ -418,7 +418,7 @@ export default { const trialId = this.trialId this.shareLink = `${location.protocol}//${location.host}/researchLogin?trialId=${trialId}&lang=${this.$i18n.locale}` this.share_model.visible = true - this.trialSiteSurveyId = this.list[0].Id + // this.trialSiteSurveyId = this.list[0].Id this.$nextTick(() => { this.creatQrCode() }) diff --git a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue index b04fc35e..cc814660 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionList.vue @@ -36,7 +36,7 @@ class="svg-icon svg-readingChart-mini" @click.stop="(e) => handleReadingChart({ e, data: { - ReportChartTypeEnum: 0, + ReportChartTypeEnum: 1, QuestionName: item.QuestionName }, })" /> 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 9e1b542e..59277565 100644 --- a/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue +++ b/src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue @@ -49,7 +49,7 @@ QuestionId: scope.row.RowIndex ? null : scope.row.QuestionId, TableQuestionId: scope.row.RowIndex ? scope.row.TableQuestionId : null, RowIndex: scope.row.RowIndex ? scope.row.RowIndex : null, - ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) || (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 0 : null, + ReportChartTypeEnum: (scope.row.LesionType === 0 && scope.row.ReportLayType === 1) ? 0 : (scope.row.LesionType === 4 && scope.row.ReportLayType === 1) ? 1 : null, QuestionName: scope.row.QuestionName } })" /> @@ -169,7 +169,8 @@ {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }} diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue index 9ed37dc4..8e6e0593 100644 --- a/src/views/trials/trials-workbench/index.vue +++ b/src/views/trials/trials-workbench/index.vue @@ -88,11 +88,11 @@ {{ user.RealName }}
- -
{{ moment().format('DDMMMYYYY') }}，{{ +
+
{{ moment().format('DDMMMYYYY') }}，{{ dayOfWeek }}