diff --git a/src/views/trials/trials-inspection/components/pull-image-list.vue b/src/views/trials/trials-inspection/components/pull-image-list.vue
index 18cdef4..dc0aeb9 100644
--- a/src/views/trials/trials-inspection/components/pull-image-list.vue
+++ b/src/views/trials/trials-inspection/components/pull-image-list.vue
@@ -225,7 +225,31 @@
@selection-change="handleSelectionChange"
>
-
+
+
+
+
+
+
+ {{ scope.$index + 1 }}
+
+
+
@@ -302,13 +326,13 @@
sortable="custom"
/>
-
+ /> -->
@@ -456,8 +481,10 @@ export default {
onClick: (picker) => {
const end = new Date()
const start = new Date()
- if (!this.timeFrame || this.timeFrame > 30) {
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 29)
+ let month = this.$moment().subtract(1, 'months')
+ let day = this.$moment().diff(month, 'day')
+ if (!this.timeFrame || this.timeFrame > day) {
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
} else {
start.setTime(
start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
@@ -472,8 +499,10 @@ export default {
onClick: (picker) => {
const end = new Date()
const start = new Date()
- if (!this.timeFrame || this.timeFrame > 90) {
- start.setTime(start.getTime() - 3600 * 1000 * 24 * 89)
+ let month = this.$moment().subtract(3, 'months')
+ let day = this.$moment().diff(month, 'day')
+ if (!this.timeFrame || this.timeFrame > day) {
+ start.setTime(start.getTime() - 3600 * 1000 * 24 * (day - 1))
} else {
start.setTime(
start.getTime() - 3600 * 1000 * 24 * (this.timeFrame - 1)
@@ -563,7 +592,10 @@ export default {
let message = this.$t(
'trials:inspection:pullImage:confirm:limit50'
).replace('xx', MaxStudyCount)
- this.$confirm(message)
+ this.$confirm(message, 'hahaha', {
+ type: 'warning',
+ showCancelButton: false,
+ })
}
}
} catch (err) {
@@ -577,7 +609,7 @@ export default {
CalledAE: null,
IP: null,
Port: null,
- // PacsTypeEnum: 2,
+ PacsTypeEnum: 2,
PageIndex: 1,
PageSize: 1000,
SortField: 'CreateTime',
@@ -635,10 +667,10 @@ export default {
// 表格排序
handleSortByColumn(sort) {
if (sort.order === 'ascending') {
- this.list.sort((a, b) => a[sort.prop] - b[sort.prop])
+ this.list.sort((a, b) => (a[sort.prop] > b[sort.prop] ? 1 : -1))
}
if (sort.order === 'descending') {
- this.list.sort((a, b) => b[sort.prop] - a[sort.prop])
+ this.list.sort((a, b) => (b[sort.prop] > a[sort.prop] ? 1 : -1))
}
this.paging()
},
@@ -669,13 +701,19 @@ export default {
}
})
let message = this.$t('trials:inspection:pullImage:confirm:pull')
+ let patientMessage = ''
if (isPullList.length > 0) {
- message =
- isPullList.join('
') +
- '
' +
- this.$t('trials:inspection:pullImage:message:isHasPull') +
- ',' +
- message
+ isPullList.forEach((key) => {
+ patientMessage += `患者:${r[key].PatientName},检查申请号:${r[key].AccessionNumber}
`
+ })
+ if (patientMessage) {
+ message =
+ patientMessage +
+ '
' +
+ this.$t('trials:inspection:pullImage:message:isHasPull') +
+ ',' +
+ message
+ }
}
let confirm = await this.$confirm(message, '', {
dangerouslyUseHTMLString: true,
@@ -700,4 +738,18 @@ export default {
},
},
}
-
\ No newline at end of file
+
+
\ 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 6df908e..a9d444f 100644
--- a/src/views/trials/trials-inspection/components/view-study-list.vue
+++ b/src/views/trials/trials-inspection/components/view-study-list.vue
@@ -69,6 +69,15 @@
:default-sort="{ prop: 'StudyTime', order: 'descending' }"
>
+
+