+
{{ $t('recompose:title:init') }}
-
+
@@ -18,6 +18,15 @@
+
+
+
+
+
+
+
+
+
@@ -185,7 +194,7 @@ input {
background-color:transparent;
caret-color: #fff;
}
->>>.is-error.my_new_pwd{
+::v-deep .is-error.my_new_pwd{
margin-bottom: 40px;
}
diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue
index 0f9e888..f4fc817 100644
--- a/src/views/forgetpassword/index.vue
+++ b/src/views/forgetpassword/index.vue
@@ -12,9 +12,14 @@
class="demo-ruleForm"
size="small"
>
+
+
+
+
-
+
+
+
-
+
@@ -67,10 +72,6 @@
-
-
-
-
@@ -268,7 +269,7 @@ export default {
/*>>>.is-error{*/
/* margin-bottom: 40px;*/
/*}*/
->>>.is-error.my_new_pwd{
+::v-deep .is-error.my_new_pwd{
margin-bottom: 40px;
}
diff --git a/src/views/login/index.vue b/src/views/login/index.vue
index dcf8655..f7cfacd 100644
--- a/src/views/login/index.vue
+++ b/src/views/login/index.vue
@@ -225,8 +225,10 @@ export default {
this.$router.replace({ path: res[0].path })
return
}
- if (this.hasPermi(['role:air', 'role:rpm', 'role:rcrc', 'role:rir'])) {
- this.$router.replace({ path: '/trials/trials-list' })
+ if (this.hasPermi(['role:pm', 'role:crc', 'role:crc'])) {
+ this.$router.replace({ path: '/trials/trials-inspection' })
+ }else if(this.hasPermi(['role:oa'])){
+ this.$router.replace({ path: '/system' })
} else {
this.$router.replace({ path: '/trials' })
}
diff --git a/src/views/system/dicomAE/index.vue b/src/views/system/dicomAE/index.vue
new file mode 100644
index 0000000..6e2ffa4
--- /dev/null
+++ b/src/views/system/dicomAE/index.vue
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 2414a4d..b6a5c4e 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -156,7 +156,7 @@
是否外链
- {{item.label}}
+ {{item.label}}
diff --git a/src/views/system/notice/index.vue b/src/views/system/notice/index.vue
index f427477..9dd3646 100644
--- a/src/views/system/notice/index.vue
+++ b/src/views/system/notice/index.vue
@@ -3,7 +3,12 @@
-
+
-
+
-
+
-
+
-
+
- 搜索
- 新增
+ 搜索
+ 新增
-
+
-
+
- {{ $fd('NoteLevel', scope.row.NoticeLevelEnum) }}
+ {{ $fd("NoteLevel", scope.row.NoticeLevelEnum) }}
-
+
- {{ $fd('NoteType', scope.row.NoticeTypeEnum) }}
+ {{ $fd("NoteType", scope.row.NoticeTypeEnum) }}
-
+
{{ scope.row.NoticeContent }}
-
+
-
- {{ $fd('NoticeState', scope.row.ActualNoticeStateEnum) }}
+
+ {{ $fd("NoticeState", scope.row.ActualNoticeStateEnum) }}
-
+
- {{ $fd('NoticeApplicableTrial', scope.row.ApplicableProjectEnum) }}
+ {{ $fd("NoticeApplicableTrial", scope.row.ApplicableProjectEnum) }}
-
+
- {{ $fd('NoticeUserTypeList', scope.row.UserTypeShortName) }}
+ {{ $fd("NoticeUserTypeList", scope.row.UserTypeShortName) }}
-
+
- {{ dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}) ? dict.type.NoticeMode.find(v => {return v.raw.Code * 1 === scope.row.NoticeModeEnum}).label : '' }}
+ {{
+ dict.type.NoticeMode.find((v) => {
+ return v.raw.Code * 1 === scope.row.NoticeModeEnum;
+ })
+ ? dict.type.NoticeMode.find((v) => {
+ return v.raw.Code * 1 === scope.row.NoticeModeEnum;
+ }).label
+ : ""
+ }}
-
+
{{ scope.row.StartDate }}-{{ scope.row.EndDate }}
-
-
-
+
+
+
- {{ scope.row.StartDate ? scope.row.StartDate: scope.row.CreateTime }}
+ {{
+ scope.row.StartDate ? scope.row.StartDate : scope.row.CreateTime
+ }}
-
+
- {{ scope.row.FileName }}
+ {{ scope.row.FileName }}
-
+
编辑
+ v-hasPermi="['system:notice:edit']"
+ >编辑
发布
+ v-hasPermi="['system:notice:publish']"
+ >发布
撤回
+ v-hasPermi="['system:notice:back']"
+ >撤回
-
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 @@
+
+
+ {{ $t("trials:inspection:button:addTrials") }}({{
+ $t("trials:uploadDicomList:table:patientInfo")
+ }}:T0001132,ZhangSan)
+
+
+
+
+
+
+
+
+
+
{{ $t("trials:inspection:message:checkAddTrials") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("common:button:search") }}
+
+
+
+ {{ $t("common:button:reset") }}
+
+
+
+
+ {{ $t("trials:addRP:button:confirmAddPR") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+ {{ $t("trials:inspection:message:confirmVisit") }}({{
+ $t("trials:trials-list:table:researchNumber")
+ }}:T0001132,ZhangSan)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("common:button:search") }}
+
+
+
+ {{ $t("common:button:reset") }}
+
+
+
+
+
+
+ {{ $t("trials:seletctedReviews:timeline:confirmation") }}
+
+
+
+ {{ $t("trials:inspection:button:confirmAndSubmit") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+ {{
+ $t("trials:uploadDicomList:table:patientInfo")
+ }}(T0001132,ZhangSan)|
+ {{
+ $t("trials:inspection:research-trials-list:table:joinTrialsNumber")
+ }}(2)
+
+
+ {{ $t("trials:inspection:button:addTrials") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+ {{ $t("trials:inspection:message:viewStudy") }}({{
+ $t("trials:uploadDicomList:table:patientInfo")
+ }}:T0001132,ZhangSan)
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("common:button:search") }}
+
+
+
+ {{ $t("common:button:reset") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{
+ $t("trials:inspection:button:image")
+ }}
+
+ {{
+ $t("trials:inspection:button:report")
+ }}
+
+
+
+
+
+
+
+
+
+
\ 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 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ item.VisitName }}
+
+
+
+
+
+
+
+
+
+
+
+ {{ $t("common:button:search") }}
+
+
+
+ {{ $t("common:button:reset") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ scope.row.VisitName }}
+
+
+
+
+
+
+
+
+ {{ scope.row.VisitName }}
+
+ {{ scope.row.VisitName }}
+
+
+
+
+
+
+
+
+
+ {{ $t("trials:inspection:button:addTrials") }}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ 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 }}
-
+
+
+
-