diff --git a/src/views/modules/auth/authMachineProject.vue b/src/views/modules/auth/authMachineProject.vue index 62837e7..970e9cd 100644 --- a/src/views/modules/auth/authMachineProject.vue +++ b/src/views/modules/auth/authMachineProject.vue @@ -131,6 +131,13 @@ :auth-flag="true" :height="'33vh'"> + + + + + + @@ -181,6 +188,7 @@ import Chooselist from '@/views/modules/common/Chooselist_eam' import { getSiteAndBuByUserName } from '../../../api/qc/qc' import DictDataSelect from '../sys/dict-data-select.vue' +import OssComponents from '../oss/ossProjectComponents.vue' import quotationUpload from '../quote/quotation_upload.vue' import TpCost from '../quote/detail/tpCost.vue' @@ -225,6 +233,7 @@ export default { MachineProjectTask, MachineProjectCloseTable, MachineProjectAuthTable, + OssComponents, }, props: {}, data() { @@ -269,6 +278,80 @@ export default { pageSize: 50, totalPage: 0, selectedDataNum: 0, + ossColumns: [ + { + userId: this.$store.state.user.name, + functionId: 101506001001, + serialNumber: '101506001001Table2FileName', + tableId: '101506001001Table2', + 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: 101506001001, + serialNumber: '101506001001Table2FileRemark', + tableId: '101506001001Table2', + tableName: '文件信息表', + columnProp: 'cadditionalInfo', + 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: 101506001001, + serialNumber: '101506001001Table2CreateDate', + tableId: '101506001001Table2', + 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: 101506001001, + serialNumber: '101506001001Table2CreatedBy', + tableId: '101506001001Table2', + tableName: '文件信息表', + columnProp: 'createdBy', + headerAlign: 'center', + align: 'center', + columnLabel: '上传人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 140, + }, + ], // 条件查询 searchData: { userId: this.$store.state.user.id, @@ -807,6 +890,9 @@ export default { case 'projectAuth': this.getAuthList() break + case 'inquiryDocument': + this.$refs.inquiryDocument.handleQuery() + break default: this.getIncomeList() break diff --git a/src/views/modules/machine/machineProjectDetail.vue b/src/views/modules/machine/machineProjectDetail.vue index 44a3e44..6fb162e 100644 --- a/src/views/modules/machine/machineProjectDetail.vue +++ b/src/views/modules/machine/machineProjectDetail.vue @@ -61,7 +61,7 @@ + :disabled="false" :orderRef1="model.site" :orderRef2="model.id" :rfqNo="model.projectNo">