diff --git a/.env.development b/.env.development index 64c3f85a..6b4ca792 100644 --- a/.env.development +++ b/.env.development @@ -15,7 +15,7 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = false VUE_APP_LOGIN_FOR_PERMISSION = false # 是否开启长时间无操作锁定弹框 true:是 false:否 -VUE_APP_LOCK_FOR_PERMISSION = true +VUE_APP_LOCK_FOR_PERMISSION = false # 无操作锁定弹框判断时间 单位:秒 VUE_APP_LOCK_FOR_TIME = 360 diff --git a/.env.production b/.env.production index 920e7135..0329ed2e 100644 --- a/.env.production +++ b/.env.production @@ -10,10 +10,10 @@ VUE_APP_IS_TEST = true VUE_APP_LOGIN_FOR_PERMISSION = false # 是否开启长时间无操作锁定弹框 true:是 false:否 -VUE_APP_LOCK_FOR_PERMISSION = false +VUE_APP_LOCK_FOR_PERMISSION = true # 无操作锁定弹框判断时间 单位:秒 -VUE_APP_LOCK_FOR_TIME = 900 +VUE_APP_LOCK_FOR_TIME = 360 # 是否开启长时间无操作登出 true:是 false:否 VUE_APP_LOGOUT_FOR_PERMISSION = false diff --git a/src/App.vue b/src/App.vue index 283a4316..ff9943b5 100644 --- a/src/App.vue +++ b/src/App.vue @@ -90,6 +90,7 @@ export default { openI18n() { this.tableData = [] this.drawer = true + let arr = [] let tableData = this.$tl.map(v => { let a = {...v} // if (!a.Description) { @@ -101,7 +102,22 @@ export default { // return ~this.$path.indexOf(v.Description + '_' + v.Code) return ~this.$path.indexOf(v.Code) }) - this.tableData = Object.assign([], tableData) + this.$path.forEach(v => { + let o = tableData.find(a => { + return a.Code === v + }) + if (o) { + arr.push(o) + } else { + arr.push({ + Code: v, + Description: null, + Value: null, + ValueCN: null + }) + } + }) + this.tableData = Object.assign([], arr) console.log(JSON.stringify(this.$path)) console.log(JSON.stringify(this.tableData)) } diff --git a/src/main.js b/src/main.js index 7714f937..06d74021 100644 --- a/src/main.js +++ b/src/main.js @@ -242,7 +242,7 @@ async function VueInit () { Vue.prototype.$path = [] var t = function (key) { // if (![Vue.prototype.toPath + '_' + key].includes(Vue.prototype.$path)) { - if (![key].includes(Vue.prototype.$path)) { + if (!~Vue.prototype.$path.indexOf(key)) { // Vue.prototype.$path.push(Vue.prototype.toPath + '_' + key) Vue.prototype.$path.push(key) } diff --git a/src/views/trials/trials-panel/attachments/attachment-management/index.vue b/src/views/trials/trials-panel/attachments/attachment-management/index.vue index ca48b829..75272c38 100644 --- a/src/views/trials/trials-panel/attachments/attachment-management/index.vue +++ b/src/views/trials/trials-panel/attachments/attachment-management/index.vue @@ -55,6 +55,16 @@ + + + + + + + + + + @@ -213,7 +223,9 @@ const searchDataDefault = () => { UserId: '', UserTypeId: '', PageIndex: 1, - PageSize: 20 + PageSize: 20, + IsConfirmed: null, + IsDeleted: null } } export default { diff --git a/src/views/trials/trials-panel/attachments/site-research/index.vue b/src/views/trials/trials-panel/attachments/site-research/index.vue index 687a9d2c..80baa9cd 100644 --- a/src/views/trials/trials-panel/attachments/site-research/index.vue +++ b/src/views/trials/trials-panel/attachments/site-research/index.vue @@ -24,6 +24,24 @@ style="width:140px;" /> + + + + + + + + @@ -287,7 +305,9 @@ const searchDataDefault = () => { UserKeyInfo: '', State: null, IsDeleted: '', - DateRange: [] + DateRange: [], + PreliminaryUserName: null, + ReviewerUserName: null } } export default { diff --git a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue index 14bce33e..65de5ae9 100644 --- a/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue +++ b/src/views/trials/trials-panel/reading/mim-medical-audit/index.vue @@ -132,6 +132,11 @@ + + + + + { ReadingCategory: null, ReadingTaskState: null, AuditState: null, - TaskState: null + TaskState: null, + DoctorUserIdeaEnum: null } } export default { diff --git a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue index ec86df70..308463fc 100644 --- a/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue +++ b/src/views/trials/trials-panel/reading/pm-medical-feedback/index.vue @@ -68,6 +68,31 @@ + + + + + + + + + + + + + + + + + + + {{ $t('common:button:search') }} @@ -427,7 +452,11 @@ const searchDataDefault = () => { BeginAllocateDate: null, EndAllocateDate: null, AuditState: null, - TrialReadingCriterionId: null + TrialReadingCriterionId: null, + BeginSignTime: null, + EndSignTime: null, + AuditAdviceEnum: null, + DoctorUserIdeaEnum: null } } export default { @@ -459,7 +488,8 @@ export default { SelectMedicalList: [], distributionInfo: {}, currentRow: {}, - trialCriterionList:[] + trialCriterionList:[], + timeList:[] } }, mounted() { @@ -470,6 +500,15 @@ export default { this.getTrialCriterionList() }, methods: { + changeTimeList() { + if (this.timeList) { + this.searchData.BeginSignTime = this.timeList[0] + this.searchData.EndSignTime = this.timeList[1] + } else { + this.searchData.BeginSignTime = null + this.searchData.EndSignTime = null + } + }, handleExport() { getMedicalReviewTaskList_Export(this.searchData).then(res => { }).catch(() => { this.loading = false }) diff --git a/src/views/trials/trials-panel/reading/read-task/index.vue b/src/views/trials/trials-panel/reading/read-task/index.vue index 325f5dcb..4ee24afb 100644 --- a/src/views/trials/trials-panel/reading/read-task/index.vue +++ b/src/views/trials/trials-panel/reading/read-task/index.vue @@ -25,7 +25,12 @@ - + + + + + + @@ -425,7 +430,8 @@ const searchDataDefault = () => { PageIndex: 1, PageSize: 20, TaskState: null, - ReadingCategory: null + ReadingCategory: null, + IsUrgent: null } } export default { diff --git a/src/views/trials/trials-panel/reading/reading-tracking/index.vue b/src/views/trials/trials-panel/reading/reading-tracking/index.vue index efc6bccc..e053539e 100644 --- a/src/views/trials/trials-panel/reading/reading-tracking/index.vue +++ b/src/views/trials/trials-panel/reading/reading-tracking/index.vue @@ -83,6 +83,16 @@ @change="changeTimeList" /> + + + + {{ $t('common:button:search') }} @@ -904,7 +914,8 @@ const searchDataDefault = () => { EndAllocateDate: null, ReadingTaskState: null, CompleteClinicalDataEnum: null, - + BeginSignTime: null, + EndSignTime: null } } export default { @@ -964,6 +975,7 @@ export default { title: '', rowData: {}, timeList: [], + timeList2: [], SubjectAssignList: [], SubjectAssignSelectList: [], TaskAllocationRuleSelectList: [], @@ -1178,6 +1190,15 @@ export default { this.searchData.EndAllocateDate = null } }, + changeTimeList2() { + if (this.timeList2) { + this.searchData.BeginSignTime = this.timeList2[0] + this.searchData.EndSignTime = this.timeList2[1] + } else { + this.searchData.BeginSignTime = null + this.searchData.EndSignTime = null + } + }, changeUrgentStatus(row){ this.rowData = {...row} this.urgentForm.VisitTaskId = row.Id 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 440fe119..637007b9 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,21 @@ clearable /> - + + + + + + + + + + + + + + + @@ -272,7 +286,10 @@ const searchDataDefault = () => { SubjectCode: '', TaskCode: '', PageIndex: 1, - PageSize: 20 + PageSize: 20, + TaskState: null, + ReadingCategory: null, + RequestReReadingResultEnum: null, } } export default { diff --git a/src/views/trials/trials-panel/setting/attachment/index.vue b/src/views/trials/trials-panel/setting/attachment/index.vue index 97ef2336..205f01ef 100644 --- a/src/views/trials/trials-panel/setting/attachment/index.vue +++ b/src/views/trials/trials-panel/setting/attachment/index.vue @@ -21,6 +21,20 @@ + + + + + @@ -200,7 +214,8 @@ const searchDataDefault = () => { PageIndex: 1, PageSize: 20, SortField: '', - Asc: false + Asc: false, + IsDeleted: null } } export default { diff --git a/src/views/trials/trials-panel/site/index.vue b/src/views/trials/trials-panel/site/index.vue index d2afc00a..58abb819 100644 --- a/src/views/trials/trials-panel/site/index.vue +++ b/src/views/trials/trials-panel/site/index.vue @@ -2,6 +2,13 @@