From a7ec726feca369ab8a9970d63939408e3ad04da3 Mon Sep 17 00:00:00 2001
From: cwchen <1048842385@qq.com>
Date: Wed, 17 Sep 2025 10:02:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=A1=A3=E6=A1=88=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fileManager/components/addTableData.vue           |  2 +-
 .../fileManager/components/addTreeData.vue            | 11 ++++++++---
 .../fileManager/components/config.js                  |  6 +++---
 .../fileManager/components/leftTree.vue               |  2 +-
 .../fileManager/components/rightTable.vue             |  9 ++++++++-
 .../archivesManagement/fileManager/file-data.vue      |  2 +-
 6 files changed, 22 insertions(+), 10 deletions(-)

diff --git a/src/views/archivesManagement/fileManager/components/addTableData.vue b/src/views/archivesManagement/fileManager/components/addTableData.vue
index 41f8b1d..fd33e27 100644
--- a/src/views/archivesManagement/fileManager/components/addTableData.vue
+++ b/src/views/archivesManagement/fileManager/components/addTableData.vue
@@ -53,7 +53,7 @@ import {
 import {getClassifyMarkSelApi} from '@/api/select.js'
 export default {
     name: "FileAddTableData",
-    props: ["width", "dataForm", "title", "disabled", "isAdd", "rowData"],
+    props: ["width", "dataForm", "title", "disabled", "isAdd", "rowData","projectId"],
     dicts: ['mark_code'],
     data() {
         return {
diff --git a/src/views/archivesManagement/fileManager/components/addTreeData.vue b/src/views/archivesManagement/fileManager/components/addTreeData.vue
index 5ad4395..dc6432e 100644
--- a/src/views/archivesManagement/fileManager/components/addTreeData.vue
+++ b/src/views/archivesManagement/fileManager/components/addTreeData.vue
@@ -34,10 +34,12 @@ import _ from 'lodash'
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import { getFileManageTreeByAddOrUpdateApi, addFileManageLeftApi, updateFileManageLeftApi,geMaxSortApi } from '@/api/archivesManagement/fileManager/fileManager.js'
+import { Alert } from 'element-ui';
 export default {
     name: "FileAddTreeData",
     props: ["width", "dataForm", "title", "disabled", "isAdd", "rowData"],
     components: { Treeselect },
+    props: ["projectId"],
     data() {
         return {
             lDialog: this.width > 500 ? "w700" : "w500",
@@ -158,6 +160,7 @@ export default {
         },
         /** 初始化表单数据 */
         async initFormData() {
+            
             let value = 0;
             let treeId = this.isAdd === 'edit' && this.rowData ? this.rowData.id : null;
             await this.getLeftTreeList(treeId);
@@ -168,7 +171,8 @@ export default {
                     parentId: this.rowData.parentId || 0,
                     contentName: this.rowData.label || null,
                     sort: this.rowData.sort || 0,
-                    level:this.rowData.level
+                    level:this.rowData.level,
+                    proId:this.projectId
                 };
                 value = this.rowData.parentId;
             } else {
@@ -177,7 +181,8 @@ export default {
                     parentId: this.rowData.id,
                     contentName: null,
                     sort: 0,
-                    level:this.rowData.level
+                    level:this.rowData.level,
+                    proId:this.projectId
                 };
                 value = this.rowData.id;
             }
@@ -225,7 +230,7 @@ export default {
         },
         // 获取左侧树列表
         async getLeftTreeList(value) {
-            const res = await getFileManageTreeByAddOrUpdateApi({id:value})
+            const res = await getFileManageTreeByAddOrUpdateApi({id:value,proId:this.projectId})
             const transformedData = this.convertToVueTree(res.data)
             this.treeDataList = transformedData;
         },
diff --git a/src/views/archivesManagement/fileManager/components/config.js b/src/views/archivesManagement/fileManager/components/config.js
index 58a7be0..b1cc1d8 100644
--- a/src/views/archivesManagement/fileManager/components/config.js
+++ b/src/views/archivesManagement/fileManager/components/config.js
@@ -17,9 +17,9 @@ export const formLabel = [
 export const columnsList = [
     { t_props: 'contentName', t_label: '档案名称',t_width:200 },
     { t_props: 'fileName', t_label: '档案文件' },
-    { t_props: 'markCode', t_label: '上传人' },
-    { t_props: 'unitName', t_label: '保管期限' },
+    { t_props: 'createUserName', t_label: '上传人' },
+    { t_props: 'term', t_label: '保管期限' },
     { t_slot: 'dataSource', t_label: '来源' },
     { t_props: 'unitName', t_label: '责任单位' },
-    { t_props: 'classifyMark', t_label: '上传时间' }
+    { t_props: 'createTime', t_label: '上传时间' }
 ]
\ No newline at end of file
diff --git a/src/views/archivesManagement/fileManager/components/leftTree.vue b/src/views/archivesManagement/fileManager/components/leftTree.vue
index 1091ea1..a8c46ce 100644
--- a/src/views/archivesManagement/fileManager/components/leftTree.vue
+++ b/src/views/archivesManagement/fileManager/components/leftTree.vue
@@ -48,7 +48,7 @@
         </el-card>
         <!-- 树的操作（新增、修改） -->
         <AddTreeData v-if="isflag" :isAdd="isAdd" :rowData="row" :title="title" @closeDialog="closeDialog"
-            @showColose="showColose" :dataForm="row" :width="600" />
+            @showColose="showColose" :dataForm="row" :width="600" :projectId="projectId" />
     </div>
 
 </template>
diff --git a/src/views/archivesManagement/fileManager/components/rightTable.vue b/src/views/archivesManagement/fileManager/components/rightTable.vue
index e84ab2e..b547cd5 100644
--- a/src/views/archivesManagement/fileManager/components/rightTable.vue
+++ b/src/views/archivesManagement/fileManager/components/rightTable.vue
@@ -4,6 +4,9 @@
         <el-card style="min-height: calc(100vh - 190px);">
         <TableModel :formLabel="formLabel" :showOperation="true" :showRightTools="true" ref="tableRef"
             :columnsList="columnsList" :request-api="getFileManageApi" :send-params="defaultParams">
+            <template slot="dataSource" slot-scope="{ data }">
+                <span>{{ data.dataSource === '1' ? '本系统上传' : '智慧现场' }}</span>
+            </template>
             <template slot="btn">
                 <el-button plain size="mini" type="primary" icon="el-icon-plus" v-hasPermi="['file:manage:add']"
                     @click="handleAdd" :disabled="addBtnIsShow">
@@ -28,7 +31,7 @@
         </TableModel>
         <!-- 新增/编辑 -->
         <AddTableData v-if="isflag" :isAdd="isAdd" :rowData="row" @handleQuery="handleQuery" :title="title"
-            @closeDialog="closeDialog" @showColose="showColose" :dataForm="row" :width="600" />
+            @closeDialog="closeDialog" @showColose="showColose" :dataForm="row" :width="600" :projectId="projectId" />
         </el-card>
     </div>
 </template>
@@ -46,6 +49,10 @@ import AddTableData from './addTableData'
 export default {
     name: 'FileRightTable',
     props:{
+        projectId:{
+            type:String,
+            default:''
+        },
         selectedNode:{
             type:Object,
             default:null
diff --git a/src/views/archivesManagement/fileManager/file-data.vue b/src/views/archivesManagement/fileManager/file-data.vue
index 2140ffc..f32f95d 100644
--- a/src/views/archivesManagement/fileManager/file-data.vue
+++ b/src/views/archivesManagement/fileManager/file-data.vue
@@ -15,7 +15,7 @@
                 <LeftTree @handleNodeClick="handleNodeClick" :projectId="projectId" />
             </el-col>
             <el-col :span="15" class="pane-right">
-                <RightTable :selectedNode = "selectedNode" />
+                <RightTable :selectedNode = "selectedNode" :projectId="projectId"/>
             </el-col>
         </el-row>
     </div>