diff --git a/.env.development b/.env.development index d48ca615..0819ca53 100644 --- a/.env.development +++ b/.env.development @@ -27,7 +27,7 @@ VUE_APP_LOGOUT_FOR_PERMISSION = false VUE_APP_LOGOUT_FOR_TIME = 1800 # 是否开启密码正则验证 true:是 false:否 -VUE_APP_PASSWORD_FOR_PERMISSION = true +VUE_APP_PASSWORD_FOR_PERMISSION = false # 密码校验规则 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ diff --git a/src/api/trials.js b/src/api/trials.js index c0d188d7..a2850c76 100644 --- a/src/api/trials.js +++ b/src/api/trials.js @@ -1747,6 +1747,22 @@ export function deleteTrialExternalUser(id) { method: 'delete' }) } + +export function getUserTobeDoneRecord() { + return request({ + url: `/PersonalWorkstation/getUserTobeDoneRecord`, + method: 'get' + }) +} + +export function getNeedSignTrialDocTrialIdList() { + return request({ + url: `/PersonalWorkstation/getNeedSignTrialDocTrialIdList`, + method: 'get' + }) +} + + export function getBasicStat() { return request({ url: `/PersonalWorkstation/getBasicStat`, @@ -3534,3 +3550,11 @@ export function mergeLesion(param) { data: param }) } + +export function resetAndAsyncCriterion(param) { + return request({ + url: `/Inspection/ReadingCriterion/ResetAndAsyncCriterion`, + method: 'post', + data: param + }) +} diff --git a/src/const/sign-code.vue b/src/const/sign-code.vue index 4c309847..102ae04e 100644 --- a/src/const/sign-code.vue +++ b/src/const/sign-code.vue @@ -27,6 +27,7 @@ export default ReadingUnitConfirmation: 108, // 医学审核问题确认 MedicalAudit: 215,// 医学审核 HeavyReadingApproval: 216,// 重阅审批 + ResetAndAsyncCriterion: 218, //同步签名 } } diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue index 977bf2f0..2de63881 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue @@ -167,7 +167,7 @@ { required: true, message: this.$t('common:ruleMessage:select')} ]" > - + @@ -183,7 +184,7 @@ > {{ $t('trials:readingUnit:button:sync') }} @@ -84,10 +84,24 @@ + + +
+ {{ $t('common:dialogTitle:sign') }} + {{ `(${$t('common:label:sign')}${ currentUser })` }} +
+ + - - + + + + diff --git a/src/views/trials/trials-workbench/components/spmRereadApproval.vue b/src/views/trials/trials-workbench/components/spmRereadApproval.vue index d369ead7..76c735b6 100644 --- a/src/views/trials/trials-workbench/components/spmRereadApproval.vue +++ b/src/views/trials/trials-workbench/components/spmRereadApproval.vue @@ -65,6 +65,7 @@ @@ -88,6 +89,12 @@ const searchDataDefault = () => { export default { name: 'RereadApproval', components: { Pagination }, + props: { + trialIdList: { + type: Array, + default() { return [] } + } + }, data() { return { listLoading: false, diff --git a/src/views/trials/trials-workbench/index.vue b/src/views/trials/trials-workbench/index.vue index 9b64e4a5..75533b21 100644 --- a/src/views/trials/trials-workbench/index.vue +++ b/src/views/trials/trials-workbench/index.vue @@ -3,139 +3,135 @@
-
-
- - -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- -
- - - -
- - - -
- - - -
- -
- - - -
- - - -
- - - -
- -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- - -
- - - -
- -
- - - -
- -
- - - +
+
+ + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ + + +
+ + + +
+ +
+ + + +
+ + +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ +
+ + + +
+ + +
+ + + +
+ +
+ + + +
+ + +
+ + + +
+ +
+ + + +
+ + +
+ + + +
+
+ + + +
+
+ + + +
-
@@ -161,20 +157,39 @@ import QcQuestion from './components/qcQuestion' import ImagesToRead from './components/imagesToRead' import MedicalFeedback from './components/medicalFeedback' import MedicalAudit from './components/medicalAudit' + +import { getUserTobeDoneRecord, getNeedSignTrialDocTrialIdList } from '@/api/trials' + export default { name: 'WorkBench', components: { clinicalDataConfirm, clinicalDataPM, PanelCount, NeedSignTrialDoc, SiteResearch, NeedSignSysDoc, consistencyCheck, clinicalData, RereadApproval, ReviewerScreen, ReviewerApproval, SpmRereadApproval, ImageQuestion, ImageVerification, ImageReupload, ImageSubmission, ImageQualityControl, QcQuestion, ImagesToRead, MedicalFeedback, MedicalAudit }, data() { return { - isSignSystemDoc: false + isSignSystemDoc: false, + trialIdList: [] } }, + mounted() { + this.getUserTobeDoneRecord() + this.getNeedSignTrialDocTrialIdList() + }, methods: { getSignSystemDocCount(count) { this.isSignSystemDoc = count > 0 }, refreshStats() { this.$refs['panelCount'].getData() + }, + getNeedSignTrialDocTrialIdList() { + getNeedSignTrialDocTrialIdList().then(res => { + console.log(res) + this.trialIdList = res.Result + }) + }, + getUserTobeDoneRecord() { + getUserTobeDoneRecord().then(res => { + console.log(res) + }) } } }