diff --git a/src/lang/en.js b/src/lang/en.js index 54e7146..9236cec 100644 --- a/src/lang/en.js +++ b/src/lang/en.js @@ -1598,7 +1598,7 @@ Enroll: Enrolled Confirmation`, 'trials:tab:trials': `My Trials`, 'trials:trials:title:back': `Return`, 'trials:trials:title:backTrialList': `Return to trial list`, - 'trials:trials:title:eics': `SIR Imaging System`, + 'trials:trials:title:eics': `HIR Imaging System`, 'trials:tab:reading': `Reads`, 'trials:tab:pendingReadingTasks': `Pending`, 'trials:pendingReadingTasks:table:subjectCode': `Subject ID`, diff --git a/src/lang/zh.js b/src/lang/zh.js index 2906c69..b9e7cf6 100644 --- a/src/lang/zh.js +++ b/src/lang/zh.js @@ -1523,7 +1523,7 @@ export default { 'trials:notice:table:appendix': `附件`, 'trials:notice:table:isRead': `是否已读`, 'trials:notice:action:detail': `详情`, - 'login:title:system': `研究单位阅片系统`, + 'login:title:system': `院内影像评估系统`, 'login:form:userName': `用户名`, 'login:form:password': `密码`, 'login:button:login': `登录`, @@ -1587,7 +1587,7 @@ export default { 'trials:tab:trials': `我的项目`, 'trials:trials:title:back': `返回`, 'trials:trials:title:backTrialList': `返回项目列表`, - 'trials:trials:title:eics': `研究单位阅片系统`, + 'trials:trials:title:eics': `院内影像评估系统`, 'trials:tab:reading': `阅片`, 'trials:tab:pendingReadingTasks': `待阅`, 'trials:pendingReadingTasks:table:subjectCode': `受试者编号`, diff --git a/src/views/dictionary/institutions/components/Hospitals.vue b/src/views/dictionary/institutions/components/Hospitals.vue index 180b327..e6bb400 100644 --- a/src/views/dictionary/institutions/components/Hospitals.vue +++ b/src/views/dictionary/institutions/components/Hospitals.vue @@ -1,35 +1,44 @@ diff --git a/src/views/email-recompose/index.vue b/src/views/email-recompose/index.vue index 6de9175..cbc4a66 100644 --- a/src/views/email-recompose/index.vue +++ b/src/views/email-recompose/index.vue @@ -1,11 +1,11 @@ diff --git a/src/views/system/role/components/RoleForm.vue b/src/views/system/role/components/RoleForm.vue index ce44f7f..3ac044d 100644 --- a/src/views/system/role/components/RoleForm.vue +++ b/src/views/system/role/components/RoleForm.vue @@ -211,7 +211,6 @@ export default { this.btnLoading = true this.model_cfg.showClose = false this.form.MenuIds = this.getMenuAllCheckedKeys() - console.log(this.form.MenuIds) addOrUpdateUserType(this.form).then(res => { this.btnLoading = false this.$refs['roleForm'].resetFields() diff --git a/src/views/system/user/components/UserInfo.vue b/src/views/system/user/components/UserInfo.vue index fea53bb..8a99c61 100644 --- a/src/views/system/user/components/UserInfo.vue +++ b/src/views/system/user/components/UserInfo.vue @@ -40,20 +40,25 @@ - + - + + + + 请输入,校验码用于用户首次登录、重置密码时的校验 + @@ -121,7 +126,8 @@ export default { OrganizationName: '', DepartmentName: '', PositionName: '', - IsTestUser: false + IsTestUser: false, + verifyCode:'' }, userFormRules: { UserName: [ @@ -233,7 +239,7 @@ export default { } diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index e5d77f7..dc63561 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -10,10 +10,11 @@ @search="handleSearch" @reset="handleReset" /> + New diff --git a/src/views/system/user/list/list.js b/src/views/system/user/list/list.js index 5fffb38..385ae42 100644 --- a/src/views/system/user/list/list.js +++ b/src/views/system/user/list/list.js @@ -71,17 +71,17 @@ export const columns = [ label: 'Internal Or External:', hidden: true, slot: 'isZhiZhunSlot', - minWidth: 140, - sortable: 'custom', - showOverflowTooltip: true }, - { - prop: 'IsTestUser', - label: 'Is Test User', - hidden: true, - slot: 'isTestUserSlot', - minWidth: 120, + minWidth: 160, sortable: 'custom', showOverflowTooltip: true }, + // { + // prop: 'IsTestUser', + // label: 'Is Test User', + // hidden: true, + // slot: 'isTestUserSlot', + // minWidth: 120, + // sortable: 'custom', + // showOverflowTooltip: true }, { prop: 'Status', label: 'Status', @@ -92,10 +92,10 @@ export const columns = [ showOverflowTooltip: true }, { type: 'operate', label: 'Action', - minWidth: 200, + minWidth: 100, operates: [ { name: 'Edit', type: 'primary', emitKey: 'editCb' }, - { name: 'Delete', type: 'danger', emitKey: 'deleteCb' } + // { name: 'Delete', type: 'danger', emitKey: 'deleteCb' } ] } ] @@ -142,19 +142,19 @@ export const searchForm = [ change: scope => '', placeholder: '' }, - { - type: 'Select', - label: 'Is Test User:', - prop: 'IsTestUser', - width: '100px', - options: [ - { label: 'Yes', value: true }, - { label: 'No', value: false } - ], - props: { label: 'label', value: 'value' }, - change: scope => '', - placeholder: '' - }, + // { + // type: 'Select', + // label: 'Is Test User:', + // prop: 'IsTestUser', + // width: '100px', + // options: [ + // { label: 'Yes', value: true }, + // { label: 'No', value: false } + // ], + // props: { label: 'label', value: 'value' }, + // change: scope => '', + // placeholder: '' + // }, { type: 'Select', label: 'Status:', diff --git a/src/views/trials/trials-inspection/components/add-trials-list.vue b/src/views/trials/trials-inspection/components/add-trials-list.vue new file mode 100644 index 0000000..af83c8c --- /dev/null +++ b/src/views/trials/trials-inspection/components/add-trials-list.vue @@ -0,0 +1,243 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-inspection/components/confirm-visit-list.vue b/src/views/trials/trials-inspection/components/confirm-visit-list.vue new file mode 100644 index 0000000..d7da029 --- /dev/null +++ b/src/views/trials/trials-inspection/components/confirm-visit-list.vue @@ -0,0 +1,216 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-inspection/components/research-trials-list.vue b/src/views/trials/trials-inspection/components/research-trials-list.vue new file mode 100644 index 0000000..03cb44a --- /dev/null +++ b/src/views/trials/trials-inspection/components/research-trials-list.vue @@ -0,0 +1,151 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-inspection/components/view-study-list.vue b/src/views/trials/trials-inspection/components/view-study-list.vue new file mode 100644 index 0000000..f85b64d --- /dev/null +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -0,0 +1,159 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue new file mode 100644 index 0000000..3c3d5aa --- /dev/null +++ b/src/views/trials/trials-inspection/index.vue @@ -0,0 +1,255 @@ + + + \ No newline at end of file diff --git a/src/views/trials/trials-layout/components/trialsNavbar.vue b/src/views/trials/trials-layout/components/trialsNavbar.vue index d40af98..426315a 100644 --- a/src/views/trials/trials-layout/components/trialsNavbar.vue +++ b/src/views/trials/trials-layout/components/trialsNavbar.vue @@ -19,10 +19,15 @@ size="mini" @select="handleSelect" > - - + - {{ $t('trials:menuTitle:workbench') }} + + + + + {{ $t('trials:menuTitle:inspection') }} @@ -78,15 +83,13 @@ export default { } }, created() { - console.log(!this.hasPermi(['role:air'])) this.isReviewer = JSON.parse(zzSessionStorage.getItem('IsReviewer')) this.changeRoute(this.$route) - console.log(this.TotalNeedSignSystemDocCount) }, methods: { ...mapMutations({ setLanguage: 'lang/setLanguage' }), changeRoute(v) { - if (v.path === '/trials/trials-workbench') { + if (v.path === '/trials/trials-inspection') { this.activeIndex = '1' } if (v.path === '/trials/trials-list' || ~v.path.indexOf('/trials/trials-panel')) { @@ -108,7 +111,7 @@ export default { this.logout() break case '1': - this.go('/trials/trials-workbench') + this.go('/trials/trials-inspection') break case '2': if (~this.$route.path.indexOf('/trials/trials-panel')) { diff --git a/src/views/trials/trials-list/components/TrialForm.vue b/src/views/trials/trials-list/components/TrialForm.vue index cec81a1..62f6521 100644 --- a/src/views/trials/trials-list/components/TrialForm.vue +++ b/src/views/trials/trials-list/components/TrialForm.vue @@ -11,109 +11,81 @@ :inline="true" > - - + + - - - {{ item.label }} + + + {{ item.label }} - - - + + + - + - - - - - - + + - - - - - - - - - - - - - - - - - - - - {{ item.label }} - - - - - - - - + - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - + + + + + - - - - + + + + + + + + + + + + 年 + + + + + + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + - {{ $t('trials:trials-list:form:cancel') }} + {{ $t("trials:trials-list:form:cancel") }} - {{ $t('trials:trials-list:form:save') }} + {{ $t("trials:trials-list:form:save") }} diff --git a/src/views/trials/trials-panel/setting/personnel-manage/index.vue b/src/views/trials/trials-panel/setting/personnel-manage/index.vue index cf22ee4..7351769 100644 --- a/src/views/trials/trials-panel/setting/personnel-manage/index.vue +++ b/src/views/trials/trials-panel/setting/personnel-manage/index.vue @@ -1,51 +1,52 @@ diff --git a/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue b/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue index 938d11a..ccd5431 100644 --- a/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue +++ b/src/views/trials/trials-panel/subject/subject-list/components/SubjectsForm.vue @@ -5,75 +5,23 @@ :model="form" :rules="rules" size="small" - label-width="200px" + label-width="100px" >
- - - - - - - - {{ otherInfo.SubjectCodeRule }} + - - - + + + - - - -
- {{ otherInfo.VisitBaseDataDes }} -
-
- - - - - - - - F - M - O - - - - - - {{ item.label }} - + + +
-