diff --git a/src/views/filesTransfer/detail-data.vue b/src/views/filesTransfer/detail-data.vue
index 61af318..2d39eee 100644
--- a/src/views/filesTransfer/detail-data.vue
+++ b/src/views/filesTransfer/detail-data.vue
@@ -55,7 +55,7 @@
- {{ scope.row.archiveName }}
+ {{ scope.row.archiveName }}
@@ -103,6 +103,8 @@
+
+
@@ -113,8 +115,11 @@ import {
getTransferApplyApi,
} from '@/api/filesTransfer/apply'
import {auditTransferApplyApi} from '@/api/filesTransfer/audit'
+import ViewFile from '@/views/viewFile/viewFile.vue'
+
export default {
name: 'DetailData',
+ components:{ViewFile},
data() {
return {
id: decryptWithSM4(this.$route.query.id),
@@ -127,7 +132,10 @@ export default {
// 审批信息展示
auditUserName: '',
auditDate: '',
- auditOpinion: ''
+ auditOpinion: '',
+ isViewflag: false,
+ row: {},
+ title: "",
}
},
computed: {
@@ -166,6 +174,20 @@ export default {
this.initData();
},
methods: {
+ // 预览文件
+ viewFile(row) {
+ console.error(row);
+
+ this.title = "预览";
+ this.row = row;
+ this.isViewflag = true;
+ },
+ closeDialog() {
+ this.isViewflag = false;
+ },
+ showColose() {
+ this.isflag = false;
+ },
handleClose() {
if (this.viewStatus === 'audit') {
const obj = { path: "/archivesManagement/filesTransfer/audit" }
@@ -184,8 +206,8 @@ export default {
this.projectName = res2?.data?.proName || '/';
this.receivingOrg = res2?.data?.deptName || '/';
// 审批信息
- this.auditUserName = res2?.data?.auditUserName || '--';
- this.auditDate = res2?.data?.transfertTime || '--';
+ this.auditUserName = res2?.data?.auditUser || '--';
+ this.auditDate = res2?.data?.auditTime || '--';
this.auditOpinion = res2?.data?.auditOpinion || '--';
if (Array.isArray(res.data) && res.data.length > 0) {
res.data.map(item => {
@@ -195,6 +217,7 @@ export default {
createUserName: item.createUserName,
createTime: item.createTime,
archiveName: item?.parParentName + '/' + item?.parentName + '/' + item?.fileName,
+ fileId: item?.fileId || '',
}
this.fileList.push(newFile);
})
@@ -470,4 +493,11 @@ export default {
}
}
}
+.file-name-link {
+ color: #409EFF;
+ cursor: pointer;
+}
+.file-name-link:hover {
+ text-decoration: underline;
+}
\ No newline at end of file
diff --git a/src/views/filesTransfer/record/index.vue b/src/views/filesTransfer/record/index.vue
index 68f9900..068fa19 100644
--- a/src/views/filesTransfer/record/index.vue
+++ b/src/views/filesTransfer/record/index.vue
@@ -2,7 +2,7 @@
+ :columnsList="columnsList" :request-api="getTransferRecordListApi">