From f5c4b49e6f8965d3900a613a7d5ff6dc9157c5a1 Mon Sep 17 00:00:00 2001 From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com> Date: Wed, 21 Aug 2024 13:46:46 +0800 Subject: [PATCH] =?UTF-8?q?=E6=84=8F=E8=A7=81=E5=8F=8D=E9=A6=88=E5=BD=B1?= =?UTF-8?q?=E5=83=8F=E4=B8=8A=E4=BC=A0=E3=80=81=E5=BD=B1=E5=83=8F=E8=B4=A8?= =?UTF-8?q?=E7=96=91=E3=80=81=E4=B8=80=E8=87=B4=E6=80=A7=E6=A0=B8=E6=9F=A5?= =?UTF-8?q?=E7=BB=91=E5=AE=9A=E8=AE=BF=E8=A7=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/feedBack/fun.js | 4 +- src/components/feedBack/index.vue | 14 +- src/store/modules/trials.js | 3 +- src/styles/index.scss | 3 + .../trials-layout/components/feedBack.vue | 1 + .../visit/consistency-check/index.vue | 809 ++++--- .../trials-panel/visit/crc-question/index.vue | 349 ++- .../trials-panel/visit/crc-upload/index.vue | 1883 +++++++++++------ 8 files changed, 1990 insertions(+), 1076 deletions(-) diff --git a/src/components/feedBack/fun.js b/src/components/feedBack/fun.js index a9dc546d..53ca553a 100644 --- a/src/components/feedBack/fun.js +++ b/src/components/feedBack/fun.js @@ -3,7 +3,7 @@ import FEEDBACKCOMP from "./index.vue"; const FBConstructor = Vue.extend(FEEDBACKCOMP); const FB = options => { - const { type, callBack, cancelBack, trialId = null, Id = null, visitTaskId = null } = options; + const { type, callBack, cancelBack, trialId = null, Id = null, visitTaskId = null, SubjectVisitId = null } = options; if (!type) throw `type is requred.but ${type}` const id = `FB${new Date().getTime()}`; const instance = new FBConstructor(); @@ -12,7 +12,7 @@ const FB = options => { if (instance.vm.visible) return; document.body.appendChild(instance.vm.$el); console.log(type); - instance.vm.open({ type, trialId, Id, visitTaskId }); + instance.vm.open({ type, trialId, Id, visitTaskId, SubjectVisitId }); instance.vm.$on("success", (Id) => { if (callBack) callBack(); diff --git a/src/components/feedBack/index.vue b/src/components/feedBack/index.vue index d123e5c8..2077ce06 100644 --- a/src/components/feedBack/index.vue +++ b/src/components/feedBack/index.vue @@ -14,7 +14,7 @@ {{ title }} -
+
{ config: {}, uploadTip: null, timer: null, - whiteList: [] + whiteList: [], + checkTaskId: null } } diff --git a/src/styles/index.scss b/src/styles/index.scss index 8d473c9f..9700fe12 100644 --- a/src/styles/index.scss +++ b/src/styles/index.scss @@ -346,4 +346,7 @@ body .el-table th.gutter { opacity: .5; background: #000; z-index: 3999; +} +.el-message-box__wrapper{ + z-index: 9999 !important; } \ No newline at end of file diff --git a/src/views/trials/trials-layout/components/feedBack.vue b/src/views/trials/trials-layout/components/feedBack.vue index 65a10d59..31a8bc5e 100644 --- a/src/views/trials/trials-layout/components/feedBack.vue +++ b/src/views/trials/trials-layout/components/feedBack.vue @@ -58,6 +58,7 @@ export default { this.$FB({ type: "feedback", trialId: this.$route.query.trialId, + SubjectVisitId: this.$store.state.trials.checkTaskId, }); }, // 打开反馈列表 diff --git a/src/views/trials/trials-panel/visit/consistency-check/index.vue b/src/views/trials/trials-panel/visit/consistency-check/index.vue index 6b571bb8..2b818826 100644 --- a/src/views/trials/trials-panel/visit/consistency-check/index.vue +++ b/src/views/trials/trials-panel/visit/consistency-check/index.vue @@ -5,9 +5,14 @@ - + - + - + @@ -34,34 +42,51 @@ > {{ item.VisitName }} - + - - + + - {{ $t('common:button:search') }} + {{ $t("common:button:search") }} - - {{ $t('common:button:reset') }} + + {{ $t("common:button:reset") }} - - {{ $t('trials:consistencyCheck:button:export1') }} + + {{ $t("trials:consistencyCheck:button:export1") }} - - {{ $t('trials:consistencyCheck:button:export2') }} + + {{ $t("trials:consistencyCheck:button:export2") }} - {{ $t('trials:consistencyCheck:button:download') }} + {{ $t("trials:consistencyCheck:button:download") }} - + - {{ $t('trials:consistencyCheck:button:upload') }} + {{ $t("trials:consistencyCheck:button:upload") }} - @@ -92,7 +116,7 @@ @@ -122,13 +150,29 @@ > @@ -157,7 +201,9 @@ > @@ -182,7 +228,7 @@ sortable="custom" > @@ -223,9 +269,15 @@ > @@ -259,14 +311,38 @@ min-width="120" > @@ -294,7 +374,11 @@ circle :title="$t('trials:consistencyCheck:action:pass')" icon="el-icon-circle-check" - :disabled="scope.row.CheckState === 11 || scope.row.CheckChallengeState === 1 || scope.row.CheckChallengeState === 2" + :disabled=" + scope.row.CheckState === 11 || + scope.row.CheckChallengeState === 1 || + scope.row.CheckChallengeState === 2 + " @click="handleOpenReason(scope.row, 'pass')" /> @@ -302,13 +386,19 @@ - +
- - {{$t('trials:consistencyCheck:table:back')}} - - : {{$t('trials:consistencyCheck:title:back')}} + + {{ $t("trials:consistencyCheck:table:back") }} + + : {{ $t("trials:consistencyCheck:title:back") }}
@@ -317,10 +407,24 @@ v-dialogDrag :visible.sync="chatVisible" :close-on-click-modal="false" + :close-on-press-escape="false" + :before-close="beforeClose" width="800px" - :title="$t('trials:consistencyCheck:dialogTitle:qsContent') + `(${currentRow.SubjectCode} ${currentRow.VisitName})`" + :title=" + $t('trials:consistencyCheck:dialogTitle:qsContent') + + `(${currentRow.SubjectCode} ${currentRow.VisitName})` + " > - + @@ -331,10 +435,17 @@ width="600px" >
- {{ $t('common:dialogTitle:sign') }} - {{ `(${$t('common:label:sign')}${ currentUser })` }} + {{ $t("common:dialogTitle:sign") }} + {{ + `(${$t("common:label:sign")}${currentUser})` + }}
- + @@ -347,7 +458,14 @@ :width="currentRow.type === 'pass' ? '750px' : '600px'" :title="ReasonTitle" > -
+
- {{ $t(`trials:check:radio:${currentRow.type}reason${1}`) }} + {{ + $t(`trials:check:radio:${currentRow.type}reason${1}`) + }} - {{ $t(`trials:check:radio:${currentRow.type}reason${2}`) }} + {{ + $t(`trials:check:radio:${currentRow.type}reason${2}`) + }} - {{ $t(`trials:check:radio:${currentRow.type}reason${3}`) }} + {{ + $t(`trials:check:radio:${currentRow.type}reason${3}`) + }} - {{ $t(`trials:check:radio:${currentRow.type}reason${4}`) }} + {{ + $t(`trials:check:radio:${currentRow.type}reason${4}`) + }} - + @@ -407,37 +565,54 @@