From 7e2ff6de1b631dc3e2b977b5cf4481a49f0e75f8 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Thu, 12 Jun 2025 16:23:44 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E7=A8=BD=E6=9F=A5=E5=9B=BE=E7=89=87?= =?UTF-8?q?=E4=B8=8D=E5=AD=98=E5=9C=A8=E5=B1=95=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trial-summary/audit-record/index.vue | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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 85063181..bf9d26f9 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 @@ -1018,28 +1018,34 @@ 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') { 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] : '--' } } From ccdfe9d83eb02f4353f7d057ae33c3e552070296 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 13 Jun 2025 11:17:28 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=98=85=E7=89=87=E6=8E=92=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trials/reading.js | 8 ++++ .../trials-panel/reading/read-order/index.vue | 39 +++++++++++++++++-- 2 files changed, 43 insertions(+), 4 deletions(-) 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/read-order/index.vue b/src/views/trials/trials-panel/reading/read-order/index.vue index f9e1d4e5..d4227ee4 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' @@ -275,7 +277,22 @@ export default { // 手动设置排序序号 async handleChange(row, value) { 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() + } } catch (err) { console.log(err) this.loading = false @@ -284,7 +301,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 +355,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) From 19896b85e00569c2e3bfb8e693c7e613ea78893f Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 13 Jun 2025 11:43:07 +0800 Subject: [PATCH 3/5] 1 --- src/views/trials/trials-panel/reading/read-order/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) 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 d4227ee4..b332fc73 100644 --- a/src/views/trials/trials-panel/reading/read-order/index.vue +++ b/src/views/trials/trials-panel/reading/read-order/index.vue @@ -188,7 +188,7 @@ sortable="custom" show-overflow-tooltip> @@ -275,7 +275,7 @@ export default { }, methods: { // 手动设置排序序号 - async handleChange(row, value) { + async handleChange(row, value, old) { try { if (!this.searchData.DoctorUserId || !this.searchData.TrialReadingCriterionId) return false let data = { @@ -292,8 +292,11 @@ export default { this.loading = false if (res.IsSuccess) { this.getList() + } else { + row.RandomOrder = old } } catch (err) { + row.RandomOrder = old console.log(err) this.loading = false } From a7251ce65ca38c73f6a86bf3d5c0cc0830d6f32a Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 13 Jun 2025 14:17:58 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E9=98=85=E7=89=87=E9=A1=BA=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/trials/reading.js | 8 + src/router/index.js | 6 + .../trials-panel/reading/read-order/index.vue | 421 ++++++++++++++++++ 3 files changed, 435 insertions(+) create mode 100644 src/views/trials/trials-panel/reading/read-order/index.vue diff --git a/src/api/trials/reading.js b/src/api/trials/reading.js index 2d65d3c4..06b4b9e2 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 + }) +} \ No newline at end of file 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..b332fc73 --- /dev/null +++ b/src/views/trials/trials-panel/reading/read-order/index.vue @@ -0,0 +1,421 @@ + + + From b512112d962492dbbfa845f66bb9d0b458343cd6 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Fri, 13 Jun 2025 14:33:55 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=82=BF=E7=98=A4=E5=AD=A6=E9=98=85?= =?UTF-8?q?=E7=89=87=E6=9F=A5=E7=9C=8B=E5=B1=8F=E8=94=BD=E8=B7=B3=E8=BF=87?= =?UTF-8?q?=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../trials/trials-panel/reading/oncology-review/index.vue | 6 ++++++ 1 file changed, 6 insertions(+) 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) {