diff --git a/.env.prod b/.env.prod index d0c0cf3..8f2fb34 100644 --- a/.env.prod +++ b/.env.prod @@ -38,4 +38,4 @@ VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai' VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-prod' -VUE_APP_OSS_PATH = '/study_prod/dist' +VUE_APP_OSS_PATH = '/hir_prod/dist' diff --git a/.env.production b/.env.production index 716b971..5d6b600 100644 --- a/.env.production +++ b/.env.production @@ -45,4 +45,4 @@ VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai' VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs' -VUE_APP_OSS_PATH = '/study_test/dist' +VUE_APP_OSS_PATH = '/hir_test/dist' diff --git a/.env.uat b/.env.uat index 960cf15..fa9d6bb 100644 --- a/.env.uat +++ b/.env.uat @@ -38,4 +38,4 @@ VUE_APP_OSS_CONFIG_REGION = 'oss-cn-shanghai' VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-uat' -VUE_APP_OSS_PATH = '/study_uat/dist' +VUE_APP_OSS_PATH = '/hir_uat/dist' diff --git a/.eslintignore b/.eslintignore new file mode 100644 index 0000000..e0452c6 --- /dev/null +++ b/.eslintignore @@ -0,0 +1,21 @@ +build/*.js +src/assets +src/utils/* +public +dist +src/views/dictionary/checkConfig/* +src/views/trials/trials-panel/trial-summary/* +src/main.js +src/views/trials/trials-panel/reading/reading-tracking/* +src/views/trials/trials-panel/reading/pm-medical-feedback/* +src/views/trials/trials-panel/reading/consistency-analysis/* +src/views/trials/trials-panel/reading/referee-allocation/* +src/views/trials/trials-list/components/TrialForm +src/views/trials/trials-panel/reading/read-task-allocation/* +src/views/blindResumeInfo/* +src/views/trials/trials-panel/visit/crc-upload/* +src/views/trials/trials-panel/reading/dicoms/customize/* +src/views/trials/trials-panel/subject/brain-metastasis/* +src/views/trials/trials-panel/setting/reading-unit/components/* +src/cornerstonejs/* +src/* diff --git a/.gitignore b/.gitignore index 60883be..3df607e 100644 --- a/.gitignore +++ b/.gitignore @@ -14,5 +14,5 @@ tests/**/coverage/ *.ntvs* *.njsproj *.sln -.eslintignore -/.eslintignore \ No newline at end of file +# .eslintignore +# /.eslintignore \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 0cfc173..b260b3f 100644 --- a/src/App.vue +++ b/src/App.vue @@ -78,7 +78,7 @@ export default { } }, mounted() { - this.show = process.env.VUE_APP_OSS_PATH === '/study_test/dist' + this.show = process.env.VUE_APP_OSS_PATH === '/hir_test/dist' }, methods: { changeValue(target, attr, e) { diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue index e571d18..ea8931d 100644 --- a/src/views/trials/trials-inspection/components/confirm-visit-list.vue +++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue @@ -404,10 +404,10 @@ export default { if (!fd) return; let data = { TrialId: this.submitMessage.TrialId, - SubjectVisitList: [], + SubjectVisitIdList : [], }; this.tableSelectData.forEach((item) => { - data.SubjectVisitList.push(item.SubjectVisitId); + data.SubjectVisitIdList .push(item.SubjectVisitId); }); try { this.btnLoading2 = true; diff --git a/src/views/trials/trials-panel/hirVisit/index.vue b/src/views/trials/trials-panel/hirVisit/index.vue index 04846dc..bd1967c 100644 --- a/src/views/trials/trials-panel/hirVisit/index.vue +++ b/src/views/trials/trials-panel/hirVisit/index.vue @@ -406,7 +406,7 @@ export default { if (confirm !== "confirm") return; let data = { TrialId: this.$route.query.trialId, - SubjectVisitList: [item.SubjectVisitId], + SubjectVisitIdList: [item.SubjectVisitId], }; try { this.loading = true; @@ -418,7 +418,7 @@ export default { ); } } catch (err) { - this.btnLoading2 = false; + this.loading = false; console.log(err); } }, diff --git a/src/views/trials/trials-panel/reading/audit-records/index.vue b/src/views/trials/trials-panel/reading/audit-records/index.vue index 8550fd9..90710f5 100644 --- a/src/views/trials/trials-panel/reading/audit-records/index.vue +++ b/src/views/trials/trials-panel/reading/audit-records/index.vue @@ -1,287 +1,418 @@ diff --git a/src/views/trials/trials-panel/reading/pending-review/index.vue b/src/views/trials/trials-panel/reading/pending-review/index.vue index 1eb68a4..11967f3 100644 --- a/src/views/trials/trials-panel/reading/pending-review/index.vue +++ b/src/views/trials/trials-panel/reading/pending-review/index.vue @@ -1,87 +1,162 @@ @@ -120,14 +232,6 @@ sortable="custom" show-overflow-tooltip /> - - @@ -210,14 +324,6 @@ {{ scope.row.UserName }}({{ scope.row.FullName }}) - - @@ -256,9 +370,30 @@ show-overflow-tooltip > @@ -270,23 +405,47 @@ show-overflow-tooltip > @@ -299,9 +458,13 @@ > @@ -314,9 +477,13 @@ > @@ -347,7 +517,14 @@ circle icon="el-icon-s-claim" :title="$t('trials:pendingReview:button:enrollmentConfirm')" - :disabled="!(scope.row.TaskState === 0 && scope.row.PIAuditState === 2 && scope.row.IsEnrollmentConfirm && otherInfo.EnrollConfirmDefaultUserType === 8)" + :disabled=" + !( + scope.row.TaskState === 0 && + scope.row.PIAuditState === 2 && + scope.row.IsEnrollmentConfirm && + otherInfo.EnrollConfirmDefaultUserType === 8 + ) + " @click="handleEnrollConfirm(scope.row)" /> @@ -356,7 +533,14 @@ circle icon="el-icon-s-claim" :title="$t('trials:pendingReview:button:pdConfirm')" - :disabled="!(scope.row.TaskState === 0 && scope.row.PIAuditState === 2 && scope.row.PDState && otherInfo.PDProgressDefaultUserType === 8)" + :disabled=" + !( + scope.row.TaskState === 0 && + scope.row.PIAuditState === 2 && + scope.row.PDState && + otherInfo.PDProgressDefaultUserType === 8 + ) + " @click="handlePDConfirm(scope.row)" /> @@ -364,14 +548,24 @@ circle icon="el-icon-tickets" :title="$t('trials:pendingReview:button:auditRecords')" - :disabled="scope.row.TaskState !== 0 || scope.row.PIAuditState === 0 || scope.row.UserTypeShortName === 'PI'" + :disabled=" + scope.row.TaskState !== 0 || + scope.row.PIAuditState === 0 || + scope.row.UserTypeShortName === 'PI' + " @click="handleAuditRecords(scope.row)" /> - + @@ -382,14 +576,16 @@ :visible.sync="auditVisible" :close-on-click-modal="false" custom-class="base-dialog-wrapper" - :title="`${$t('trials:pendingReview:button:audit')}(${currentRow.SubjectCode} | ${currentRow.TaskName} | ${currentRow.UserName})`" + :title="`${$t('trials:pendingReview:button:audit')}(${ + currentRow.SubjectCode + } | ${currentRow.TaskName} | ${currentRow.UserName})`" width="600px" > @@ -398,14 +594,16 @@ :visible.sync="enrollVisible" :close-on-click-modal="false" custom-class="base-dialog-wrapper" - :title="`${$t('trials:pendingReview:button:enrollmentConfirm')}(${currentRow.SubjectCode} | ${currentRow.TaskName} | ${currentRow.UserName})`" + :title="`${$t('trials:pendingReview:button:enrollmentConfirm')}(${ + currentRow.SubjectCode + } | ${currentRow.TaskName} | ${currentRow.UserName})`" width="400px" > @@ -414,14 +612,16 @@ :visible.sync="pdVisible" :close-on-click-modal="false" custom-class="base-dialog-wrapper" - :title="`${$t('trials:pendingReview:button:pdConfirm')}(${currentRow.SubjectCode} | ${currentRow.TaskName} | ${currentRow.UserName})`" + :title="`${$t('trials:pendingReview:button:pdConfirm')}(${ + currentRow.SubjectCode + } | ${currentRow.TaskName} | ${currentRow.UserName})`" width="400px" > @@ -430,34 +630,39 @@ :visible.sync="auditRecordVisible" :close-on-click-modal="false" custom-class="base-dialog-wrapper" - :title="`${$t('trials:pendingReview:button:auditRecords')}(${currentRow.SubjectCode} | ${currentRow.TaskName} | ${currentRow.UserName})`" + :title="`${$t('trials:pendingReview:button:auditRecords')}(${ + currentRow.SubjectCode + } | ${currentRow.TaskName} | ${currentRow.UserName})`" width="600px" > diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue index 37f197f..9c1811a 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -224,10 +224,17 @@ :label="$t('common:action:action')" width="250" fixed="right" + v-if=" + hasPermi(['trials:readTask:view']) || + hasPermi(['trials:readTask:reread']) || + hasPermi(['trials:readTask:report']) || + hasPermi(['trials:readTask:auditRecord']) + " > diff --git a/src/views/trials/trials-panel/study/components/edit-visit.vue b/src/views/trials/trials-panel/study/components/edit-visit.vue index ebf3e0c..551b66d 100644 --- a/src/views/trials/trials-panel/study/components/edit-visit.vue +++ b/src/views/trials/trials-panel/study/components/edit-visit.vue @@ -8,6 +8,7 @@ width="500px" custom-class="base-dialog-wrapper" append-to-body + :before-close="handleCancel" >