移交申请

src/api/filesTransfer/apply.js

@@ -28,9 +28,9 @@ export function editTransferApplyApi(data) {
 }
 
 // 档案移交申请详情
-export function getTransferApplyApi(params) {
+export function getTransferApplyFilesByApplyIdApi(params) {
     return request({
-        url: '/smartArchives/transferApply/getTransferApply',
+        url: '/smartArchives/transferApply/getTransferApplyFilesByApplyId',
         method: 'GET',
         params: params
     })

src/views/filesTransfer/apply/detail-data.vue

@@ -33,24 +33,24 @@
                         {{ scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="projectName" label="项目名称" min-width="150">
+                <el-table-column prop="proName" label="项目名称" min-width="150">
                     <template slot-scope="scope">
-                        {{ scope.row.projectName }}
+                        {{ scope.row.proName }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="singleProjectName" label="单项工程名称" min-width="150">
+                <el-table-column prop="singleProName" label="单项工程名称" min-width="150">
                     <template slot-scope="scope">
-                        {{ scope.row.singleProjectName || '--' }}
+                        {{ scope.row.singleProName || '--' }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="applicant" label="申请人" min-width="100">
+                <el-table-column prop="createUserName" label="申请人" min-width="100">
                     <template slot-scope="scope">
-                        {{ scope.row.applicant || '' }}
+                        {{ scope.row.createUserName || '' }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="applicationTime" label="申请时间" min-width="120">
+                <el-table-column prop="createTime" label="申请时间" min-width="120">
                     <template slot-scope="scope">
-                        {{ scope.row.applicationTime || '' }}
+                        {{ scope.row.createTime || '' }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="archiveName" label="档案名称" min-width="300">
@@ -85,16 +85,18 @@
 
 <script>
 import { decryptWithSM4 } from '@/utils/sm'
-
+import {
+    getTransferApplyFilesByApplyIdApi
+} from '@/api/filesTransfer/apply'
 export default {
     name: 'DetailData',
     data() {
         return {
             id: decryptWithSM4(this.$route.query.id),
             viewStatus: decryptWithSM4(this.$route.query.viewStatus),
-            status: 'approving', // approving, approved, rejected
+            status: decryptWithSM4(this.$route.query.auditStatus), // approving, approved, rejected
-            projectName: 'XXXXXXXXXXXXX工程',
+            projectName: '',
-            receivingOrg: '省公司办公室',
+            receivingOrg: '',
             approvalComment: '', // 审批意见
             fileList: [
                 {
@@ -176,6 +178,25 @@ export default {
             const obj = { path: "/archivesManagement/filesTransfer/apply" }
             this.$tab.closeOpenPage(obj)
         },
+        async getTransferApplyData() {
+            this.fileList = [];
+            const res = await getTransferApplyFilesByApplyIdApi({ id: this.id });
+            // this.projectName = res?.data?.proName || '/';
+            // this.receivingOrg = res?.data?.deptName || '/';
+            if (Array.isArray(res.data.transferFileDtos) && res.data.transferFileDtos.length > 0) {
+                res.data.transferFileDtos.map(item => {
+                    const newFile = {
+                        proName: item.projectName,
+                        singleProName: item.singleProjectName,
+                        createUserName: item.createUserName,
+                        createTime: item.createTime,
+                        archiveName: item?.parParentName + '/' + item?.parentName + '/' + item?.fileName,
+                    }
+                    this.fileList.push(newFile);
+                })
+            }
+            
+        },
         handleApprove() {
             if (!this.approvalComment.trim()) {
                 this.$message.warning('请填写审批意见')

src/views/filesTransfer/apply/index.vue

@@ -8,10 +8,6 @@
                     @click="handleAdd">
                     新增
                 </el-button>
-                <el-button plain size="mini" type="success" icon="el-icon-warning-outline" v-hasPermi="['transfer:apply:query']"
-                    @click="handleDetail()">
-                    详情
-                </el-button>
             </template>
             <template slot="auditStatus" slot-scope="{ data }">
                 <el-tag size="mini" :type="getStatusType(data.auditStatus)">
@@ -107,8 +103,9 @@ export default {
             this.$router.push({
                 name: 'DetailData',
                 query: {
-                    id: encryptWithSM4('1'),
+                    id: encryptWithSM4(row.id ?? '0'),
                     viewStatus: encryptWithSM4('detail'),
+                    auditStatus: encryptWithSM4(this.getStatusText2(row.auditStatus)),
                 }
             })
         },
@@ -164,7 +161,19 @@ export default {
                 default:
                     return 'info'
             }
-        }
+        },
+        getStatusText2(status) {
+            switch (status) {
+                case '0':
+                    return 'approving'
+                case '1':
+                    return 'approved'
+                case '2':
+                    return 'rejected'
+                default:
+                    return 'approving'
+            }
+        },
     },
 }
 </script>

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

@@ -72,7 +72,7 @@ import {
     editTransferApplyApi,
     getProSelectApi,
     getTransferApplyFilesApi,
-    getTransferApplyApi
+    getTransferApplyFilesByApplyIdApi
 } from '@/api/filesTransfer/apply'
 import { getDeptSelectApi } from '@/api/select'
 import Treeselect from "@riophae/vue-treeselect";
@@ -133,9 +133,9 @@ export default {
             await getProSelectApi().then(res => {
                 this.proList = res.data;
             });
-            const res = await getTransferApplyApi({ id: this.rowData.id });
+            const res = await getTransferApplyFilesByApplyIdApi({ id: this.rowData.id });
-            if (Array.isArray(res.data.transferFileDtos) && res.data.transferFileDtos.length > 0) {
+            if (Array.isArray(res.data) && res.data.length > 0) {
-                res.data.transferFileDtos.map(item => {
+                res.data.map(item => {
                     const newFile = {
                         proFilesContentsId: item.id,
                         parParentName: item.parParentName,