From 16b6f5f8b175d2a3ba18e0fa65bc217890f08fd6 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Fri, 19 Jul 2024 10:14:20 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E7=9B=91=E6=8E=A7?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E3=80=81=E9=9D=9Edicom=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E5=92=8C=E6=8C=87=E6=8E=A7=E4=B8=8B=E8=BD=BD=E6=8E=92=E9=99=A4?= =?UTF-8?q?=E8=87=AA=E5=8A=A8=E7=99=BB=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main.js | 4 ++- src/utils/uploadZip.js | 6 +++- src/views/none-dicom-show/index.vue | 2 +- src/views/none-dicom-show/multiple.vue | 2 +- .../components/uploadNonDicomFiles.vue | 36 ++++++++++++------- 5 files changed, 34 insertions(+), 16 deletions(-) diff --git a/src/main.js b/src/main.js index 201e709b..65322394 100644 --- a/src/main.js +++ b/src/main.js @@ -367,7 +367,9 @@ async function VueInit() { } _vm.$store.dispatch('user/logout').then(res => { // window.location.href = `/login` - _vm.$msgbox.close(); + if(_vm.$msgbox){ + _vm.$msgbox.close(); + } isOpen = false isLock = null zzSessionStorage.removeItem('isLock') diff --git a/src/utils/uploadZip.js b/src/utils/uploadZip.js index c027eb85..45b6f563 100644 --- a/src/utils/uploadZip.js +++ b/src/utils/uploadZip.js @@ -2,12 +2,14 @@ import JSZip from "jszip"; import axios from "axios"; import { saveAs } from "file-saver"; import Vue from 'vue'; +import store from "@/store"; import { requestPackageAndAnonymizImage, } from "@/api/load.js"; let flag = {}; export const resetFlag = () => { - flag = {} + flag = {}; + store.dispatch("trials/setUnLock", false); } export const downloadImage = async (id, id2, IsDicom = true) => { if (flag[`${id2}_${IsDicom}`]) return Vue.prototype.$message.warning(Vue.prototype.$t('trials:upload:tip:uploading')); @@ -18,6 +20,7 @@ export const downloadImage = async (id, id2, IsDicom = true) => { SubjectVisitId: id2, IsDicom: IsDicom } + store.dispatch("trials/setUnLock", true); let res = await requestPackageAndAnonymizImage(params); if (res.IsSuccess) { if (!res.Result) { @@ -153,6 +156,7 @@ export const fileDownload = (content, filename) => { let download = async (downloadUrl, downloadFileName, res) => { const blob = await getBlob(downloadUrl); flag[`${res.id2}_${res.IsDicom}`] = false; + store.dispatch("trials/setUnLock", false); saveAsB(blob, downloadFileName); } diff --git a/src/views/none-dicom-show/index.vue b/src/views/none-dicom-show/index.vue index 84277cd8..7dae2175 100644 --- a/src/views/none-dicom-show/index.vue +++ b/src/views/none-dicom-show/index.vue @@ -121,7 +121,7 @@ export default { // 获取非Dicom检查信息 getNoneDicomList() { this.loading = true - getNoneDicomStudyList(this.subjectVisitId, this.studyId, true).then(res => { + getNoneDicomStudyList(this.subjectVisitId, this.studyId).then(res => { this.studyList = res.Result this.loading = false const studyIndex = this.studyList.findIndex(item => { diff --git a/src/views/none-dicom-show/multiple.vue b/src/views/none-dicom-show/multiple.vue index 9099021e..49e4d774 100644 --- a/src/views/none-dicom-show/multiple.vue +++ b/src/views/none-dicom-show/multiple.vue @@ -62,7 +62,7 @@ export default { // 获取非Dicom检查信息 getNoneDicomList() { this.loading = true - getNoneDicomStudyList(this.subjectVisitId, '', true).then(res => { + getNoneDicomStudyList(this.subjectVisitId, '').then(res => { this.noneDicomStudyList = res.Result this.loading = false const study = this.noneDicomStudyList.find((item, index) => { 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 29ed0a46..d577d26d 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 @@ -412,6 +412,7 @@ import { getToken } from '@/utils/auth' // import PreviewFiles from './previewFiles' import uploadVideos from '@/components/videos' import moment from 'moment' +import store from "@/store"; export default { name: 'UploadNonDicomFiles', components: { uploadVideos }, @@ -470,7 +471,8 @@ export default { uploadVideoVisible: false, trialId: this.$route.query.trialId, moment, - BodyPart:{} + BodyPart:{}, + studyMonitorId: null }; }, async mounted() { @@ -497,6 +499,12 @@ export default { }); } }, + btnLoading(){ + store.dispatch("trials/setUnLock", this.btnLoading); + } + }, + beforeDestroy(){ + store.dispatch("trials/setUnLock", false); }, methods: { // 初始化非Dicom列表数据 @@ -752,11 +760,20 @@ export default { this.selectArr.forEach(item=>item.status = 0); let num = this.selectArr.length > 6 ? 6 : this.selectArr.length; let funArr = []; - for (let i = 0; i < num; i++) { - funArr.push(this.handleUploadTask(this.selectArr, i)); - } - if (funArr.length > 0) { - let res = await Promise.all(funArr); + let res = await preArchiveStudy({ + subjectVisitId: this.subjectVisitId, + isDicom: false + }); + if(res.IsSuccess){ + this.studyMonitorId = res.Result; + for (let i = 0; i < num; i++) { + funArr.push(this.handleUploadTask(this.selectArr, i)); + } + if (funArr.length > 0) { + let res = await Promise.all(funArr); + } + }else{ + this.isFail = true; } } }, @@ -814,16 +831,12 @@ export default { // 非Dicom文件上传归档 submitFile(uploadedFileList){ if(!this.uploadVisible) return; - preArchiveStudy({ - subjectVisitId: this.subjectVisitId, - isDicom: false - }).then(res => { this.btnLoading = true var params = { trialId: this.trialId, subjectVisitId: this.subjectVisitId, noneDicomStudyId:this.currentRow.Id, - studyMonitorId: res.Result, + studyMonitorId: this.studyMonitorId, uploadedFileList: uploadedFileList } uploadNoneDicomFile(params).then(res => { @@ -833,7 +846,6 @@ export default { this.$emit('getList') this.$message.success(this.$t('trials:uploadNonDicoms:message:uploadedSuccessfully')) }).catch(() => { this.btnLoading = false }) - }) }, resetFileDiaolg(){ this.btnLoading = false From ca18abe26e5d898971bd4df9aa015c2c2034c3ca Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Jul 2024 13:44:38 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=8D=E9=98=85=E8=B7=9F=E8=B8=AA--?= =?UTF-8?q?=E5=AE=A1=E6=89=B9=E7=BB=93=E6=9E=9C=E6=96=B0=E5=A2=9E=E7=8A=B6?= =?UTF-8?q?=E6=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-panel/reading/reReading-tracking/index.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 88c96737..329edfb2 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -313,8 +313,9 @@ {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} - {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} - {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} + {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} + {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} + {{ $fd('RequestReReadingResult', scope.row.RequestReReadingResultEnum) }} From de638b14361f1c34f582eac58b7c45cb6f128055 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Jul 2024 14:08:50 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=90=8C=E6=84=8F=E9=87=8D=E9=98=85?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../reading/reReading-tracking/index.vue | 98 ++++++++++--------- 1 file changed, 53 insertions(+), 45 deletions(-) diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 329edfb2..74165789 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -785,7 +785,7 @@ export default { this.signVisible = false } }, - confirmReReading(row, type, open, signInfo) { + async confirmReReading(row, type, open, signInfo) { if (open) { this.rowData = { ...row } this.ConfirmReReadingVisible = true @@ -795,41 +795,41 @@ export default { return } if (type === 2) { - this.$refs.reasonForm.validate((valid) => { - if (!valid) return - var params = { - data: { - ConfirmReReadingList: [ - { - Id: row.Id, - OriginalReReadingTaskId: row.OriginalReReadingTaskId, - RootReReadingTaskId: row.RootReReadingTaskId, - NewReReadingTaskId: row.NewReReadingTaskId - } - ], - RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason, - TrialId: this.$route.query.trialId, - RequestReReadingResultEnum: type - }, - signInfo: signInfo - } - this.loading = true - this.btnLoading = true - confirmReReading(params).then(() => { - this.loading = false - this.btnLoading = false - // 同意申请成功/拒绝申请成功 - this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - this.$refs['signForm'].btnLoading = false - this.signVisible = false - this.getList() - this.ConfirmReReadingVisible = false - }).catch(() => { - this.loading = false - this.$refs['signForm'].btnLoading = false - this.btnLoading = false - }) - }) + let valid = await this.$refs.reasonForm.validate() + if (!valid) return + var params = { + data: { + ConfirmReReadingList: [ + { + Id: row.Id, + OriginalReReadingTaskId: row.OriginalReReadingTaskId, + RootReReadingTaskId: row.RootReReadingTaskId, + NewReReadingTaskId: row.NewReReadingTaskId + } + ], + RequestReReadingRejectReason: this.ConfirmReReadingForm.RequestReReadingRejectReason, + TrialId: this.$route.query.trialId, + RequestReReadingResultEnum: type + }, + signInfo: signInfo + } + this.loading = true + this.btnLoading = true + try { + await confirmReReading(params) + this.loading = false + this.btnLoading = false + // 同意申请成功/拒绝申请成功 + this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) + this.$refs['signForm'].btnLoading = false + this.signVisible = false + this.getList() + this.ConfirmReReadingVisible = false + } catch (e) { + this.loading = false + this.$refs['signForm'].btnLoading = false + this.btnLoading = false + } return } var params = { @@ -849,21 +849,29 @@ export default { } this.loading = true this.btnLoading = true - confirmReReading(params).then(() => { + try { + let res = await confirmReReading(params) this.loading = false this.btnLoading = false - // this.$message.success(`${type === 1 ? '同意' : '拒绝'}申请成功`) - // 同意申请成功/拒绝申请成功 - this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - this.ReReadingOrBackVisible = false this.$refs['signForm'].btnLoading = false - this.signVisible = false - this.getList() - }).catch(() => { + if (res.ErrorMessage) { + let alert = await this.$alert(res.ErrorMessage) + if (alert !== "confirm") return + this.ReReadingOrBackVisible = false + this.signVisible = false + this.getList() + } else { + // 同意申请成功/拒绝申请成功 + this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) + + this.signVisible = false + this.getList() + } + } catch (e) { this.loading = false this.$refs['signForm'].btnLoading = false this.btnLoading = false - }) + } }, assignSubjectTaskToDoctor(row, type) { this.rowData = { ...row } From fd70c3ee2c41d011a303f6c60083da98119480e5 Mon Sep 17 00:00:00 2001 From: caiyiling <1321909229@qq.com> Date: Thu, 25 Jul 2024 14:19:56 +0800 Subject: [PATCH 4/4] 1 --- .../trials/trials-panel/reading/reReading-tracking/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue index 74165789..17a67283 100644 --- a/src/views/trials/trials-panel/reading/reReading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reReading-tracking/index.vue @@ -863,7 +863,7 @@ export default { } else { // 同意申请成功/拒绝申请成功 this.$message.success(`${type === 1 ? this.$t('trials:rereadTrack:message:msg3') : this.$t('trials:rereadTrack:message:msg4')}`) - + this.ReReadingOrBackVisible = false this.signVisible = false this.getList() }