详情

src/views/archivesManagement/proManager/config.js

@@ -2,14 +2,14 @@ export const formLabel = [
     {
         isShow: false, // 是否展示label
         f_type: 'ipt',
-        f_label: '项目名称',
+        f_label: '单项工程名称',
         f_model: 'proName',
         f_max: 32,
     },
     {
         isShow: false, // 是否展示label
         f_type: 'sel',
-        f_label: '项目类型',
+        f_label: '工程类型',
         f_model: 'proType',
         f_selList: [],
         f_dict: 'pro_type',

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

@@ -36,14 +36,10 @@
                         {{ scope.row.singleProName || '--' }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="createUserName" label="申请人" min-width="100">
+                
+                <el-table-column prop="transferTime" label="移交时间" min-width="120">
                     <template slot-scope="scope">
-                        {{ scope.row.createUserName || '--' }}
+                        {{ scope.row.transferTime || '--' }}
-                    </template>
-                </el-table-column>
-                <el-table-column prop="createTime" label="申请时间" min-width="120">
-                    <template slot-scope="scope">
-                        {{ scope.row.createTime || '--' }}
                     </template>
                 </el-table-column>
                 <el-table-column prop="archiveName" label="档案名称" min-width="300">
@@ -60,9 +56,9 @@
                         {{ scope.$index + 1 }}
                     </template>
                 </el-table-column>
-                <el-table-column prop="proName" label="移交时间" min-width="150">
+                <el-table-column prop="transferTime" label="移交时间" min-width="150">
                     <template slot-scope="scope">
-                        {{ scope.row.transferDate || '--' }}
+                        {{ scope.row.transferTime || '--' }}
                     </template>
                 </el-table-column>
 
@@ -73,10 +69,9 @@
                             scope.row.archiveName }}</div>
                     </template>
                 </el-table-column>
-                <el-table-column prop="createTime" label="接收状态" min-width="120">
+                <el-table-column label="接收状态" min-width="120">
                     <template slot-scope="scope">
-                        <el-tag v-if="scope.row.receiveStatus === '1'"
+                        <el-tag :type="scope.row.receiveStatus === '1' ? 'success' : 'danger'">
-                            :type="scope.row.receiveStatus === '1' ? 'success' : 'warning'">
                             {{ scope.row.receiveStatus === '1' ? '已接收' : '未接收' }}
                         </el-tag>
                     </template>
@@ -118,10 +113,9 @@
 
 <script>
 import { decryptWithSM4 } from '@/utils/sm'
-import { getTransferRecordDetailApi, getTransferRecordFilesApi } from '@/api/filesTransfer/record'
+import { getTransferRecordDetailApi } from '@/api/filesTransfer/record'
 import {
     getTransferReceiceDetailApi,
-    getTransferReceiceFilesApi,
     transferReceiveApi
 } from '@/api/filesTransfer/accept'
 import ViewFile from '@/views/viewFile/viewFile.vue'
@@ -178,29 +172,29 @@ export default {
         },
         async initData() {
             this.fileList = [];
-            const res = this.viewStatus === 'accept' ? await getTransferReceiceFilesApi({ transferApplyId: this.id }) : await getTransferRecordFilesApi({ transferApplyId: this.id });
 
-            const res2 = this.viewStatus === 'accept' ? await getTransferReceiceDetailApi({ id: this.id }) : await getTransferRecordDetailApi({ id: this.id });
+            const res = this.viewStatus === 'accept' ? await getTransferReceiceDetailApi({ id: this.id }) : await getTransferRecordDetailApi({ id: this.id });
-            this.projectName = res2?.data?.proName || '/';
+            this.projectName = res?.data?.proName || '/';
-            this.receivingOrg = res2?.data?.deptName || '/';
+            this.receivingOrg = res?.data?.deptName || '/';
 
-            if (Array.isArray(res.data) && res.data.length > 0) {
+            if (Array.isArray(res.data.transferFileDtos) && res.data.transferFileDtos.length > 0) {
-                res.data.map(item => {
+                res.data.transferFileDtos.map(item => {
                     const newFile = {
                         id: item.id,
                         proName: item.proName,
                         singleProName: item.singleProName,
-                        createUserName: item.createUserName,
+                        transferTime: item.transferTime,
-                        createTime: item.createTime,
                         archiveName: item?.parParentName + '/' + item?.parentName + '/' + item?.fileName,
                         receiveStatus: item.receiveStatus || '0',
                         transferDate: item.transferDate,
                         fileId: item?.fileId || '',
+                        proId: item?.proId ||'',
                     }
                     this.fileList.push(newFile);
                 })
             }
-
+            console.log(this.fileList);
+            
         },
         // 确认接收
         handleAccept(row) {
@@ -211,7 +205,11 @@ export default {
         // 确认完整性状态
         confirmTransferStatus() {
             this.closeConfirmDialog();
-            transferReceiveApi({ id: this.form.id }).then(res => {
+            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 || '确认接收成功');
                     this.refreshData();
@@ -227,15 +225,15 @@ export default {
         // 刷新数据
         async refreshData() {
             this.fileList = [];
-            const res = await getTransferReceiceFilesApi({ transferApplyId: this.id })
+            const res = await getTransferReceiceDetailApi({ id: this.id })
-            if (Array.isArray(res.data) && res.data.length > 0) {
+            if (Array.isArray(res.data.transferFileDtos) && res.data.transferFileDtos.length > 0) {
-                res.data.map(item => {
+                res.data.transferFileDtos.map(item => {
                     const newFile = {
                         id: item.id,
                         proName: item.proName,
                         singleProName: item.singleProName,
-                        createUserName: item.createUserName,
+                        transferTime: item.transferTime,
-                        createTime: item.createTime,
+                        proId: item.proId,
                         archiveName: item?.parParentName + '/' + item?.parentName + '/' + item?.fileName,
                         receiveStatus: item.receiveStatus || '0',
                         transferDate: item.transferDate,

src/views/filesTransfer/record/index.vue

@@ -18,7 +18,7 @@
             </template>
 
             <template slot="handle" slot-scope="{ data }">
-                <el-button plain size="mini" type="success" icon="el-icon-warning-outline" v-hasPermi="['transfer:apply:query']"
+                <el-button plain size="mini" type="success" icon="el-icon-warning-outline" v-hasPermi="['record:file:query']"
                     @click="handleDetail(data)">
                     详情
                 </el-button>

src/views/system/setting/index.vue

@@ -21,7 +21,7 @@
                     修改
                 </el-button>
                 <el-button plain size="mini" type="danger" icon="el-icon-delete" v-hasPermi="['sys:config:del']"
-                    @click="handleDelete(data)" v-if="data.id > 4">
+                    @click="handleDelete(data)" v-if="data.id > 5">
                     删除
                 </el-button>
             </template>