diff --git a/src/api/trials/reading.js b/src/api/trials/reading.js index 2d65d3c4..1af8d6f6 100644 --- a/src/api/trials/reading.js +++ b/src/api/trials/reading.js @@ -459,9 +459,9 @@ export function setMedicalReviewInvalid(params) { }) } -export function getTrialCriterionList(trialId) { +export function getTrialCriterionList(trialId, isRandom = false) { return request({ - url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}`, + url: `/VisitTask/getTrialCriterionList?TrialId=${trialId}&isRandom=${isRandom}`, method: 'get' }) } diff --git a/src/router/index.js b/src/router/index.js index 4a978c6d..a660e860 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -61,6 +61,12 @@ export const constantRoutes = [ name: 'Resetpassword', hidden: true }, + { + path: '/trials/trials-panel/reading/readingTracking/ReadOrder', + component: () => import('@/views/trials/trials-panel/reading/read-order/index'), + name: 'ReadOrder', + hidden: true + }, { path: '/recompose', component: () => import('@/views/recompose/index'), diff --git a/src/views/trials/trials-panel/reading/read-order/index.vue b/src/views/trials/trials-panel/reading/read-order/index.vue new file mode 100644 index 00000000..f9e1d4e5 --- /dev/null +++ b/src/views/trials/trials-panel/reading/read-order/index.vue @@ -0,0 +1,387 @@ + + + diff --git a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue index a8178e53..e9966a2e 100644 --- a/src/views/trials/trials-panel/trial-summary/audit-record/index.vue +++ b/src/views/trials/trials-panel/trial-summary/audit-record/index.vue @@ -844,31 +844,35 @@ export default { return } if (v.DataType === 'ImageList') { - if(obj[v.Code]){ + // if (obj[v.Code] && obj[v.Code].length > 0) { + + if (obj[v.Code]) { obj[v.Code] = obj[v.Code].filter(s => s && s.trim()) - } - if (obj[v.Code] && obj[v.Code].length > 0) { + // obj[v.Code].forEach((o,i) => { // var uo = upObj && upObj.length > 0 ? upObj[v.Code][i] : 0 if (row.OptType === 'Add' || row.OptType === 'Init') { item = { key: v.Code, Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value, - newValue: obj[v.Code] ? obj[v.Code] : '--', + // newValue: obj[v.Code] ? obj[v.Code] : '--', + newValue: obj[v.Code] && obj[v.Code].length > 0 ? obj[v.Code] : '--', oldValue: '' } } else if (row.OptType === 'Delete') { item = { key: v.Code, Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value, - oldValue: obj[v.Code] ? obj[v.Code] : '--', + // oldValue: obj[v.Code] ? obj[v.Code] : '--', + oldValue: obj[v.Code] && obj[v.Code].length > 0 ? obj[v.Code] : '--', newValue: '--' } } else { item = { key: v.Code, Enum: this.$i18n.locale === 'zh' ? v.ValueCN : v.Value, - newValue: obj[v.Code] ? obj[v.Code] : '--', + // newValue: obj[v.Code] ? obj[v.Code] : '--', + newValue: obj[v.Code] && obj[v.Code].length > 0 ? obj[v.Code] : '--', oldValue: upObj[v.Code].length > 0 ? upObj[v.Code] : '--' } }