diff --git a/.env.development b/.env.development index ad322b0d..0819ca53 100644 --- a/.env.development +++ b/.env.development @@ -33,7 +33,7 @@ VUE_APP_PASSWORD_FOR_PERMISSION = false VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ # 是否开启文档签署验证 true:是 false:否 -VUE_APP_WORD_FOR_PERMISSION = true +VUE_APP_WORD_FOR_PERMISSION = false # dicom文件地址 diff --git a/src/views/trials/trials-list/index.vue b/src/views/trials/trials-list/index.vue index 77e4370c..319f9b29 100644 --- a/src/views/trials/trials-list/index.vue +++ b/src/views/trials/trials-list/index.vue @@ -353,6 +353,146 @@ sortable="custom" width="180" /> + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + diff --git a/src/views/trials/trials-workbench/components/clinicalData.vue b/src/views/trials/trials-workbench/components/clinicalData.vue index 3208cbad..00a4779d 100644 --- a/src/views/trials/trials-workbench/components/clinicalData.vue +++ b/src/views/trials/trials-workbench/components/clinicalData.vue @@ -17,7 +17,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -67,7 +68,7 @@ icon="el-icon-upload" v-if="scope.row.ToBeDealedCount !== 0 || scope.row.ReadModuleCount !== 0" circle - :disabled="!!~trialIdList.indexOf(scope.row.TrialId)" + :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc" :title="$t('trials:workbench:title:UploadClinicalData')" @click="handleUpload(scope.row)" /> @@ -75,7 +76,7 @@ v-if="scope.row.ToBeVisitCount !== 0" icon="el-icon-link" circle - :disabled="!!~trialIdList.indexOf(scope.row.TrialId)" + :disabled="!!~trialIdList.indexOf(scope.row.TrialId) || isSignSystemDoc" :title="$t('trials:workbench:button:UploadImage')" @click="goVisit(scope.row)" /> @@ -377,6 +378,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue b/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue index 6368506c..e66e0df6 100644 --- a/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue +++ b/src/views/trials/trials-workbench/components/clinicalDataConfirm.vue @@ -17,7 +17,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -66,7 +67,7 @@ @@ -58,14 +59,14 @@ @@ -395,6 +396,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, components: { Pagination, clinicalDataQuestions, SignForm }, diff --git a/src/views/trials/trials-workbench/components/consistencyCheck.vue b/src/views/trials/trials-workbench/components/consistencyCheck.vue index 669dbc9e..422b6608 100644 --- a/src/views/trials/trials-workbench/components/consistencyCheck.vue +++ b/src/views/trials/trials-workbench/components/consistencyCheck.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -75,7 +76,7 @@ @@ -103,6 +104,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/imageQualityControl.vue b/src/views/trials/trials-workbench/components/imageQualityControl.vue index 430f3ca4..c724058f 100644 --- a/src/views/trials/trials-workbench/components/imageQualityControl.vue +++ b/src/views/trials/trials-workbench/components/imageQualityControl.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -72,7 +73,7 @@ @@ -100,6 +101,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/imageQuestion.vue b/src/views/trials/trials-workbench/components/imageQuestion.vue index 09967abc..1e974265 100644 --- a/src/views/trials/trials-workbench/components/imageQuestion.vue +++ b/src/views/trials/trials-workbench/components/imageQuestion.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -93,6 +94,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/imageReupload.vue b/src/views/trials/trials-workbench/components/imageReupload.vue index bc92a942..34220a10 100644 --- a/src/views/trials/trials-workbench/components/imageReupload.vue +++ b/src/views/trials/trials-workbench/components/imageReupload.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -92,6 +93,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/imageSubmission.vue b/src/views/trials/trials-workbench/components/imageSubmission.vue index 042e861d..dac15fa1 100644 --- a/src/views/trials/trials-workbench/components/imageSubmission.vue +++ b/src/views/trials/trials-workbench/components/imageSubmission.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -93,6 +94,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/imageVerification.vue b/src/views/trials/trials-workbench/components/imageVerification.vue index c262eb70..6e900b1f 100644 --- a/src/views/trials/trials-workbench/components/imageVerification.vue +++ b/src/views/trials/trials-workbench/components/imageVerification.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -93,6 +94,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/imagesToRead.vue b/src/views/trials/trials-workbench/components/imagesToRead.vue index 1a2698aa..33259dba 100644 --- a/src/views/trials/trials-workbench/components/imagesToRead.vue +++ b/src/views/trials/trials-workbench/components/imagesToRead.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -79,7 +80,7 @@ @@ -107,6 +108,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/medicalAudit.vue b/src/views/trials/trials-workbench/components/medicalAudit.vue index a8471c4e..05451b03 100644 --- a/src/views/trials/trials-workbench/components/medicalAudit.vue +++ b/src/views/trials/trials-workbench/components/medicalAudit.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -79,7 +80,7 @@ @@ -107,6 +108,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/medicalFeedback.vue b/src/views/trials/trials-workbench/components/medicalFeedback.vue index 7079b40e..eca15b95 100644 --- a/src/views/trials/trials-workbench/components/medicalFeedback.vue +++ b/src/views/trials/trials-workbench/components/medicalFeedback.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -72,7 +73,7 @@ @@ -100,6 +101,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/needSignSysDoc.vue b/src/views/trials/trials-workbench/components/needSignSysDoc.vue index a6b7b118..ed0abda1 100644 --- a/src/views/trials/trials-workbench/components/needSignSysDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignSysDoc.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > diff --git a/src/views/trials/trials-workbench/components/needSignTrialDoc.vue b/src/views/trials/trials-workbench/components/needSignTrialDoc.vue index f99b7f08..ce52780e 100644 --- a/src/views/trials/trials-workbench/components/needSignTrialDoc.vue +++ b/src/views/trials/trials-workbench/components/needSignTrialDoc.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -60,6 +61,7 @@ icon="el-icon-edit-outline" circle :title="$t('trials:workbench:action:sign')" + :disabled="isSignSystemDoc" @click="handleSign(scope.row)" /> @@ -82,6 +84,12 @@ const searchDataDefault = () => { export default { name: 'NeedSignDoc', components: { Pagination }, + props: { + isSignSystemDoc: { + type: Boolean, + default() { return false } + } + }, data() { return { listLoading: false, diff --git a/src/views/trials/trials-workbench/components/qcQuestion.vue b/src/views/trials/trials-workbench/components/qcQuestion.vue index 14a836e8..711c1b1f 100644 --- a/src/views/trials/trials-workbench/components/qcQuestion.vue +++ b/src/views/trials/trials-workbench/components/qcQuestion.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -93,6 +94,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/rereadApproval.vue b/src/views/trials/trials-workbench/components/rereadApproval.vue index 6b730ab0..b64cd088 100644 --- a/src/views/trials/trials-workbench/components/rereadApproval.vue +++ b/src/views/trials/trials-workbench/components/rereadApproval.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -93,6 +94,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/reviewerApproval.vue b/src/views/trials/trials-workbench/components/reviewerApproval.vue index 9dc54ea4..98b536ae 100644 --- a/src/views/trials/trials-workbench/components/reviewerApproval.vue +++ b/src/views/trials/trials-workbench/components/reviewerApproval.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -70,7 +71,7 @@ @@ -98,6 +99,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/reviewerScreen.vue b/src/views/trials/trials-workbench/components/reviewerScreen.vue index a5e5d5ed..bf4fd3e7 100644 --- a/src/views/trials/trials-workbench/components/reviewerScreen.vue +++ b/src/views/trials/trials-workbench/components/reviewerScreen.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -70,7 +71,7 @@ @@ -98,6 +99,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/siteResearch.vue b/src/views/trials/trials-workbench/components/siteResearch.vue index 181661f5..9acf5f41 100644 --- a/src/views/trials/trials-workbench/components/siteResearch.vue +++ b/src/views/trials/trials-workbench/components/siteResearch.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -57,7 +58,7 @@ @@ -84,6 +85,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/components/spmRereadApproval.vue b/src/views/trials/trials-workbench/components/spmRereadApproval.vue index 76c735b6..101ff67c 100644 --- a/src/views/trials/trials-workbench/components/spmRereadApproval.vue +++ b/src/views/trials/trials-workbench/components/spmRereadApproval.vue @@ -18,7 +18,8 @@ v-loading="listLoading" :data="list" :show-header="true" - height="calc(100% - 100px)" + v-adaptive="{bottomOffset:45}" + height="100" @sort-change="handleSortByColumn" > @@ -65,7 +66,7 @@ @@ -93,6 +94,10 @@ export default { trialIdList: { type: Array, default() { return [] } + }, + isSignSystemDoc: { + type: Boolean, + default() { return false } } }, data() { diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue index 75533b21..e5441f39 100644 --- a/src/views/trials/trials-workbench/index.vue +++ b/src/views/trials/trials-workbench/index.vue @@ -3,134 +3,222 @@
-
-
- - -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- - - -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- - -
- - - -
-
- - - -
-
- - - -
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -166,7 +254,8 @@ export default { data() { return { isSignSystemDoc: false, - trialIdList: [] + trialIdList: [], + tabList: {} } }, mounted() { @@ -188,7 +277,7 @@ export default { }, getUserTobeDoneRecord() { getUserTobeDoneRecord().then(res => { - console.log(res) + this.tabList = res.Result }) } }