diff --git a/src/views/fileTransfer/accept.vue b/src/views/fileTransfer/accept.vue index d5f76622..090601da 100644 --- a/src/views/fileTransfer/accept.vue +++ b/src/views/fileTransfer/accept.vue @@ -39,6 +39,18 @@ + + + @@ -84,11 +96,11 @@ export default { searchMenuSpan: 6, border: true, index: true, - viewBtn: true, + addBtn:false, + viewBtn: false, editBtn: false, delBtn: false, selection: false, - addBtn:true, dialogClickModal: false, column: [ @@ -268,7 +280,30 @@ export default { this.recordListRow = row; this.recordListJumpType = 'progress'; this.recordListVisible = true; - } + }, + handleDetail (rowData) { + this.$router.push({ + name: 'DetailData2', + query: { + id: rowData.id ?? '0', + proId: rowData.proId ?? '0', + viewStatus: 'accept', + auditStatus: this.getStatusText2(rowData.auditStatus), + } + }) + }, + getStatusText2(status) { + switch (status) { + case '0': + return 'approving' + case '1': + return 'approved' + case '2': + return 'rejected' + default: + return 'approving' + } + }, }, }; diff --git a/src/views/fileTransfer/apply.vue b/src/views/fileTransfer/apply.vue index 7e7b0263..437d659d 100644 --- a/src/views/fileTransfer/apply.vue +++ b/src/views/fileTransfer/apply.vue @@ -55,7 +55,6 @@ plain size="small" type="success" - v-hasPermi="['transfer:apply:query']" @click="handleDetail(row)" > 详情 diff --git a/src/views/fileTransfer/components/data-detail.vue b/src/views/fileTransfer/components/data-detail.vue index 7a37b9b2..5268e14a 100644 --- a/src/views/fileTransfer/components/data-detail.vue +++ b/src/views/fileTransfer/components/data-detail.vue @@ -235,11 +235,11 @@ const confirmTransferStatus = async () => { confirmDialogVisible.value = false; - if (res.code === 200) { - ElMessage.success(res.msg || '确认接收成功'); + if (res.data.code === 200) { + ElMessage.success(res.data.msg || '确认接收成功'); await refreshData(); } else { - ElMessage.error(res.msg || '确认接收失败'); + ElMessage.error(res.data.msg || '确认接收失败'); } } catch (error) { ElMessage.error('操作失败'); @@ -251,8 +251,8 @@ const refreshData = async () => { fileList.value = []; try { const res = await getTransferReceiceDetailApi({ id, proId }); - if (Array.isArray(res.data.transferFileDtos)) { - fileList.value = res.data.transferFileDtos.map((item) => ({ + if (Array.isArray(res.data.data.transferFileDtos)) { + fileList.value = res.data.data.transferFileDtos.map((item) => ({ id: item.id, proName: item.proName, singleProName: item.singleProName, diff --git a/src/views/fileTransfer/components/recordAcceptList.vue b/src/views/fileTransfer/components/recordAcceptList.vue index 22c52798..8d51c775 100644 --- a/src/views/fileTransfer/components/recordAcceptList.vue +++ b/src/views/fileTransfer/components/recordAcceptList.vue @@ -99,7 +99,7 @@ const tableColumns = computed(() => { { prop: 'parParentName', label: '所属分类' }, { prop: 'parentName', label: '所属案卷' }, { prop: 'fileName', label: '文件名称' }, - { prop: 'transferStatus', label: '进度' } + { prop: 'receiveStatus', label: '进度' } ]; } }); @@ -111,7 +111,7 @@ const initFormData = async () => { if (Array.isArray(res.data.data)) { tableData.value = res.data.data.map(item => ({ ...item, - transferStatus: (item.transferStatus ?? '0') === '0' ? '进行中' : '已完成' + receiveStatus: (item.receiveStatus ?? '0') === '0' ? '进行中' : '已完成' })); } }; @@ -137,7 +137,7 @@ const transfer = (row) => { const res = await updateTransferRecordFilesStatusApi({ transferApplyId: props.rowData.id, id: row.fileId, - transferStatus: '1' + receiveStatus: '1' }); loading.close(); if (res.data.code === 200) { diff --git a/src/views/fileTransfer/record.vue b/src/views/fileTransfer/record.vue index 1f488f5b..5515a06c 100644 --- a/src/views/fileTransfer/record.vue +++ b/src/views/fileTransfer/record.vue @@ -48,7 +48,6 @@ plain size="small" type="success" - v-hasPermi="['transfer:apply:query']" @click="handleDetail(row)" > 详情