diff --git a/.env.production b/.env.production index 68f45f4..e459511 100644 --- a/.env.production +++ b/.env.production @@ -22,7 +22,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 # 是否开启密码正则验证 true:是 false:否 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ diff --git a/.env.uat b/.env.uat index c2d8769..4e894be 100644 --- a/.env.uat +++ b/.env.uat @@ -1,6 +1,6 @@ # just a flag -ENV = 'production' -NODE_ENV = 'production' +ENV = 'uat' +NODE_ENV = 'uat' # base public path VUE_APP_BASE_PATH = '/' diff --git a/.env.usa b/.env.usa index 7df52bb..cd4f5b4 100644 --- a/.env.usa +++ b/.env.usa @@ -1,6 +1,6 @@ # just a flag -ENV = 'production' -NODE_ENV = 'production' +ENV = 'usa' +NODE_ENV = 'usa' # base public path VUE_APP_BASE_PATH = '/' diff --git a/src/api/inspection.js b/src/api/inspection.js index fdc484e..0e2f7a8 100644 --- a/src/api/inspection.js +++ b/src/api/inspection.js @@ -37,6 +37,24 @@ export function getPatientJoinedTrialList(data) { }) } +// 检查->scp影像推送记录 +export function getSCPImageUploadList(data) { + return request({ + url: '/Patient/getSCPImageUploadList', + method: 'post', + data + }) +} + +// 下载记录 +export function getTrialSubjectVisitDownloadList(data) { + return request({ + url: '/Patient/getTrialSubjectVisitDownloadList', + method: 'post', + data + }) +} + // 获取患者列表(下拉框) export function getTrialSubejctSelectList(data) { return request({ diff --git a/src/views/system/user/list/index.vue b/src/views/system/user/list/index.vue index 3b820ab..de74a08 100644 --- a/src/views/system/user/list/index.vue +++ b/src/views/system/user/list/index.vue @@ -68,14 +68,15 @@ const searchDataDefault = () => { return { UserName: null, Phone: null, + EMail:null, OrganizationName: null, UserState: null, UserType: null, PageIndex: 1, PageSize: 20, - Asc: true, + Asc: false, RealName: "", - SortField: "", + SortField: "CreateTime", CreateTimeArr: [], BeginCreateTime: null, EndCreateTime: null, @@ -212,6 +213,13 @@ export default { width: "120px", placeholder: "", }, + { + type: "Input", + label: this.$t("system:userlist:label:EMail"), + prop: "EMail", + width: "120px", + placeholder: "", + }, { type: "Input", label: this.$t("system:userlist:label:Organization"), diff --git a/src/views/trials/trials-inspection/components/push-record-list.vue b/src/views/trials/trials-inspection/components/push-record-list.vue new file mode 100644 index 0000000..c23f0b4 --- /dev/null +++ b/src/views/trials/trials-inspection/components/push-record-list.vue @@ -0,0 +1,310 @@ + + \ 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 index b4bcc39..f3edccc 100644 --- a/src/views/trials/trials-inspection/components/view-study-list.vue +++ b/src/views/trials/trials-inspection/components/view-study-list.vue @@ -273,6 +273,7 @@ export default { this.list = res.Result; } } catch (err) { + this.loading = false; console.log(err); } }, diff --git a/src/views/trials/trials-inspection/index.vue b/src/views/trials/trials-inspection/index.vue index fba4d66..ec06d34 100644 --- a/src/views/trials/trials-inspection/index.vue +++ b/src/views/trials/trials-inspection/index.vue @@ -92,6 +92,12 @@ {{ $t("common:button:reset") }} + + + + {{ $t("common:button:push") }} + + @@ -294,6 +300,13 @@ :Patient="selectPatient" @getList="getList" /> + + \ No newline at end of file + + \ No newline at end of file diff --git a/src/views/trials/trials-panel/reading/reread-task/index.vue b/src/views/trials/trials-panel/reading/reread-task/index.vue index f618534..d548065 100644 --- a/src/views/trials/trials-panel/reading/reread-task/index.vue +++ b/src/views/trials/trials-panel/reading/reread-task/index.vue @@ -35,7 +35,7 @@ /> - + diff --git a/src/views/trials/trials-panel/trial-summary/download-record/index.vue b/src/views/trials/trials-panel/trial-summary/download-record/index.vue new file mode 100644 index 0000000..e33769a --- /dev/null +++ b/src/views/trials/trials-panel/trial-summary/download-record/index.vue @@ -0,0 +1,259 @@ + +