代码提交

src/views/filesTransfer/apply/index.vue

@@ -104,6 +104,7 @@ export default {
                 name: 'DetailData',
                 query: {
                     id: encryptWithSM4(row.id ?? '0'),
+                    proId: encryptWithSM4(row.proId ?? '0'),
                     viewStatus: encryptWithSM4('detail'),
                     auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
                 }

src/views/filesTransfer/apply/prop/applyForm.vue

@@ -132,7 +132,7 @@ export default {
             });
             await getProSelectApi().then(res => {
                 this.proList = res.data;
-                
+
             });
 
 
@@ -143,7 +143,7 @@ export default {
                     proId: this.rowData.proId || undefined,
                     deptId: this.rowData.deptId || undefined,
                 };
-                const res = await getTransferApplyFilesByApplyIdApi({ id: this.rowData.id });
+                const res = await getTransferApplyFilesByApplyIdApi({ id: this.rowData.id,proId:this.rowData.proId });
                 if (Array.isArray(res.data) && res.data.length > 0) {
                     res.data.map(item => {
                         const newFile = {
@@ -276,7 +276,7 @@ export default {
             }else{
                 return errorMessage;
             }
-            
+
         },
         // 树数据过滤 - 支持无限层级转换
         convertToVueTree(data, level = 1) {
@@ -331,7 +331,7 @@ export default {
                     }
                 })
             }
-            
+
             // 触发表单验证
             this.$nextTick(() => {
                 this.$refs.ruleForm.validateField('checkTreeData');
@@ -382,4 +382,4 @@ export default {
     display: flex;
     justify-content: space-between;
 }
-</style>
+</style>

src/views/filesTransfer/audit/index.vue

@@ -65,6 +65,7 @@ export default {
                 name: 'DetailData2',
                 query: {
                     id: encryptWithSM4(row.id ?? '0'),
+                    proId: encryptWithSM4(row.proId ?? '0'),
                     viewStatus: encryptWithSM4('audit'),
                     auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
                 }
@@ -74,7 +75,7 @@ export default {
         handleQuery() {
             this.$refs.auditTableRef.getTableList()
         },
-        
+
         // 获取状态
         getStatusText(status) {
             switch (status) {

src/views/filesTransfer/detail-data.vue

@@ -123,6 +123,7 @@ export default {
     data() {
         return {
             id: decryptWithSM4(this.$route.query.id),
+            proId: decryptWithSM4(this.$route.query.proId),
             viewStatus: decryptWithSM4(this.$route.query.viewStatus),
             status: decryptWithSM4(this.$route.query.auditStatus), // approving, approved, rejected
             projectName: '',
@@ -180,13 +181,13 @@ export default {
         // 预览文件
         viewFile(row) {
             console.error(row);
-            
+
             this.title = "预览";
             this.row = row;
             this.isViewflag = true;
         },
         closeDialog() {
-            this.isViewflag = false; 
+            this.isViewflag = false;
         },
         showColose() {
             this.isflag = false;
@@ -202,10 +203,9 @@ export default {
         },
         async initData() {
             this.fileList = [];
-            
+            const res = this.viewStatus === 'audit' ? await getTransferAudieFilesByApplyIdApi({ id: this.id,proId: this.proId }) : await getTransferApplyFilesByApplyIdApi({ id: this.id, proId: this.proId });
-            const res = this.viewStatus === 'audit' ? await getTransferAudieFilesByApplyIdApi({ id: this.id }) : await getTransferApplyFilesByApplyIdApi({ id: this.id });
 
-            const res2 = this.viewStatus === 'audit' ? await getTransferAuditApi({ id: this.id }) : await getTransferApplyApi({ id: this.id });
+            const res2 = this.viewStatus === 'audit' ? await getTransferAuditApi({ id: this.id,proId: this.proId }) : await getTransferApplyApi({ id: this.id, proId: this.proId });
             this.projectName = res2?.data?.proName || '/';
             this.receivingOrg = res2?.data?.deptName || '/';
             // 审批信息
@@ -291,7 +291,7 @@ export default {
             }else{
                 return errorMessage;
             }
-            
+
         }
     }
 }
@@ -523,4 +523,4 @@ export default {
 .file-name-link:hover {
     text-decoration: underline;
 }
-</style>
+</style>

src/views/filesTransfer/record/components/data-detail.vue

@@ -36,7 +36,7 @@
                         {{ scope.row.singleProName || '--' }}
                     </template>
                 </el-table-column>
-                
+
                 <el-table-column prop="transferTime" label="移交时间" min-width="120">
                     <template slot-scope="scope">
                         {{ scope.row.transferTime || '--' }}
@@ -125,6 +125,7 @@ export default {
     data() {
         return {
             id: decryptWithSM4(this.$route.query.id),
+            proId: decryptWithSM4(this.$route.query.proId),
             viewStatus: decryptWithSM4(this.$route.query.viewStatus),
             projectName: '',
             receivingOrg: '',
@@ -173,7 +174,7 @@ export default {
         async initData() {
             this.fileList = [];
 
-            const res = this.viewStatus === 'accept' ? await getTransferReceiceDetailApi({ id: this.id }) : await getTransferRecordDetailApi({ id: this.id });
+            const res = this.viewStatus === 'accept' ? await getTransferReceiceDetailApi({ id: this.id, proId: this.proId }) : await getTransferRecordDetailApi({ id: this.id, proId: this.proId });
             this.projectName = res?.data?.proName || '/';
             this.receivingOrg = res?.data?.deptName || '/';
 
@@ -194,21 +195,21 @@ export default {
                 })
             }
             // console.log(this.fileList);
-            
+
         },
         // 确认接收
         handleAccept(row) {
             this.form = row;
             this.confirmDialogVisible = true;
-            
+
         },
         // 确认完整性状态
         confirmTransferStatus() {
             this.closeConfirmDialog();
             console.error(this.form);
-            
+
             const id = this.form.id,transferApplyId = this.id,proId = this.form.proId;
-            
+
             transferReceiveApi({ id,transferApplyId,proId }).then(res => {
                 if (res.code === 200) {
                     this.$message.success(res.msg || '确认接收成功');
@@ -393,4 +394,4 @@ export default {
 .file-name-link:hover {
     text-decoration: underline;
 }
-</style>
+</style>

src/views/filesTransfer/record/index.vue

@@ -95,6 +95,7 @@ export default {
                 name: 'RecordDetail',
                 query: {
                     id: encryptWithSM4(row.id ?? '0'),
+                    proId: encryptWithSM4(row.proId ?? '0'),
                     viewStatus: encryptWithSM4('record'),
                     auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
                 }