diff --git a/src/views/modules/project/projectInfo/projectInfo.vue b/src/views/modules/project/projectInfo/projectInfo.vue
index 17268d0..8854b4c 100644
--- a/src/views/modules/project/projectInfo/projectInfo.vue
+++ b/src/views/modules/project/projectInfo/projectInfo.vue
@@ -299,47 +299,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -1599,7 +1559,7 @@
// 刷新页签的table数据
refreshCurrentTabTable () {
if (this.activeName == 'down') {
- this.getFileContentData();
+ // this.getFileContentData();
}
if (this.activeName == 'customer_contact') {
this.getCustomerContactData();
diff --git a/src/views/modules/tooling/searchToolApply.vue b/src/views/modules/tooling/searchToolApply.vue
index e1177b2..de417d2 100644
--- a/src/views/modules/tooling/searchToolApply.vue
+++ b/src/views/modules/tooling/searchToolApply.vue
@@ -128,47 +128,49 @@
+
+
-
-
- 上传文件
-
-
-
-
-
- {{ scope.row[item.columnProp] }}
-
-
-
-
-
-
- 下载
- 删除
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -297,12 +299,13 @@
getApprovalList, // 查询审批信息
} from '@/api/changeManagement/changeManagement.js'
import ApprovalInformation from "../changeManagement/approvalInformation.vue";
+ import OssComponents from "../oss/ossComponents";
/*組件*/
export default {
components: {
ApprovalInformation,
-
+ OssComponents,
Chooselist,
projectUploadFile,
@@ -354,6 +357,98 @@
pageIndex: 1,
pageSize: 100,
totalPage: 0,
+ ossColumns:[
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2FileName',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'fileName',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '文件名称',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2FileRemark',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'fileRemark',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '备注',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 240
+ },
+ // {
+ // userId: this.$store.state.user.name,
+ // functionId: 103001,
+ // serialNumber: '103001Table2OrderRef3',
+ // tableId: '103001Table2',
+ // tableName: '文件信息表',
+ // columnProp: 'orderRef3',
+ // headerAlign: 'center',
+ // align: 'center',
+ // columnLabel: '文件描述',
+ // columnHidden: false,
+ // columnImage: false,
+ // columnSortable: false,
+ // sortLv: 0,
+ // status: true,
+ // fixed: '',
+ // columnWidth: 120
+ // },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2CreateDate',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'createDate',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '上传时间',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ },
+ {
+ userId: this.$store.state.user.name,
+ functionId: 103001,
+ serialNumber: '103001Table2CreatedBy',
+ tableId: '103001Table2',
+ tableName: '文件信息表',
+ columnProp: 'createBy',
+ headerAlign: 'center',
+ align: 'center',
+ columnLabel: '上传人',
+ columnHidden: false,
+ columnImage: false,
+ columnSortable: false,
+ sortLv: 0,
+ status: true,
+ fixed: '',
+ columnWidth: 140
+ }
+ ],
// 导出 end
columnList1: [
{
@@ -936,7 +1031,7 @@
this.searchToolApplyDetail();
}
if (this.activeName == 'down') {
- this.getFileContentData();
+ // this.getFileContentData();
}
if (this.activeName === 'approvalInformation') {
this.getApprovalList()