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 @@
+ @showColose="showColose" :dataForm="row" :width="600" :projectId="projectId" />
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 @@
+
+ {{ data.dataSource === '1' ? '本系统上传' : '智慧现场' }}
+
@@ -28,7 +31,7 @@
+ @closeDialog="closeDialog" @showColose="showColose" :dataForm="row" :width="600" :projectId="projectId" />
@@ -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 @@
-
+