diff --git a/src/api/trials/reading.js b/src/api/trials/reading.js index 1af8d6f6..9ee3654a 100644 --- a/src/api/trials/reading.js +++ b/src/api/trials/reading.js @@ -480,3 +480,11 @@ export function resetReadingRestTime() { method: 'post' }) } +// 设置随机排序 +export function setRandomTaskOrder(data) { + return request({ + url: `/VisitTask/setRandomTaskOrder`, + method: 'post', + data + }) +} diff --git a/src/views/trials/trials-panel/reading/oncology-review/index.vue b/src/views/trials/trials-panel/reading/oncology-review/index.vue index 68c7d7a9..6557034a 100644 --- a/src/views/trials/trials-panel/reading/oncology-review/index.vue +++ b/src/views/trials/trials-panel/reading/oncology-review/index.vue @@ -30,6 +30,7 @@ type="primary" size="small" @click="skipTask" + v-if="!isView" > {{ $t('trials:readingReport:button:skip') }} @@ -337,6 +338,11 @@ export default { // } // } // }, + computed:{ + isView(){ + return !this.hasPermi(['role:ir']) + } + }, mounted() { this.getList() if (this.isReadingShowPreviousResults) { diff --git a/src/views/trials/trials-panel/reading/read-order/index.vue b/src/views/trials/trials-panel/reading/read-order/index.vue index f9e1d4e5..b332fc73 100644 --- a/src/views/trials/trials-panel/reading/read-order/index.vue +++ b/src/views/trials/trials-panel/reading/read-order/index.vue @@ -70,7 +70,8 @@ {{ $t('common:button:export') }} - + {{ $t('trials:readingTracking:button:order') }} @@ -187,7 +188,7 @@ sortable="custom" show-overflow-tooltip> @@ -204,6 +205,7 @@ import { getTrialCriterionList, getReadingTaskList, getDoctorUserSelectList, + setRandomTaskOrder } from '@/api/trials/reading' import { getReadingTaskList_Export } from '@/api/export' import BaseContainer from '@/components/BaseContainer' @@ -273,10 +275,28 @@ export default { }, methods: { // 手动设置排序序号 - async handleChange(row, value) { + async handleChange(row, value, old) { try { - console.log(row, value) + if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false + let data = { + TrialId: this.$route.query.trialId, + TrialReadingCriterionId: this.searchData.TrialReadingCriterionId, + DoctorUserId: this.searchData.DoctorUserId, + IsAutoSet: false, + SetList: [ + { Id: row.Id, RandomOrder: value } + ] + } + this.loading = true; + let res = await setRandomTaskOrder(data) + this.loading = false + if (res.IsSuccess) { + this.getList() + } else { + row.RandomOrder = old + } } catch (err) { + row.RandomOrder = old console.log(err) this.loading = false } @@ -284,7 +304,20 @@ export default { // 随机排序 async randomOrder() { try { - + if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false + let data = { + TrialId: this.$route.query.trialId, + TrialReadingCriterionId: this.searchData.TrialReadingCriterionId, + DoctorUserId: this.searchData.DoctorUserId, + IsAutoSet: true, + SetList: [] + } + this.loading = true; + let res = await setRandomTaskOrder(data) + this.loading = false + if (res.IsSuccess) { + this.getList() + } } catch (err) { console.log(err) this.loading = false @@ -325,6 +358,7 @@ export default { }, getList() { + if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false this.searchData.TrialId = this.$route.query.trialId this.loading = true getReadingTaskList(this.searchData) 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 e9966a2e..93f47235 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,11 +844,10 @@ export default { return } if (v.DataType === 'ImageList') { - // if (obj[v.Code] && obj[v.Code].length > 0) { + // if (obj[v.Code] && obj[v.Code].length > 0) { if (obj[v.Code]) { obj[v.Code] = obj[v.Code].filter(s => s && s.trim()) - // obj[v.Code].forEach((o,i) => { // var uo = upObj && upObj.length > 0 ? upObj[v.Code][i] : 0 if (row.OptType === 'Add' || row.OptType === 'Init') {