diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue index ae71aa9..a5ce7dc 100644 --- a/src/views/modules/oss/ossComponents.vue +++ b/src/views/modules/oss/ossComponents.vue @@ -142,8 +142,8 @@ export default { this.uploadLoading = false; }).catch((error)=>{ console.error('文件上传失败:', error); - const errorMsg = error.response && error.response.data && error.response.data.msg - ? error.response.data.msg + const errorMsg = error.response && error.response.data && error.response.data.msg + ? error.response.data.msg : (error.message || '文件上传失败'); this.$message.error(errorMsg); this.uploadLoading = false; @@ -265,6 +265,7 @@ export default { }, watch:{ params:{ + immediate: true, handler(){ this.ossForm.orderRef2 = this.orderRef2; this.ossForm.orderRef3 = this.orderRef3; @@ -280,7 +281,6 @@ export default { } }, mounted() { - this.ossForm.orderRef2 = this.orderRef2; } } diff --git a/src/views/modules/part/partInformation.vue b/src/views/modules/part/partInformation.vue index fb4729b..13ad2a3 100644 --- a/src/views/modules/part/partInformation.vue +++ b/src/views/modules/part/partInformation.vue @@ -154,7 +154,7 @@ - + @@ -637,6 +637,20 @@ + + + + + @@ -2966,6 +2980,68 @@ fixed: '', }, ], + columnProductFileList: [ + { + columnProp: 'fileName', + headerAlign: "center", + align: "left", + columnLabel: '文件名', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + columnWidth: '200', + status: true, + fixed: '', + }, + { + columnProp: 'fileType', + headerAlign: "center", + align: "center", + columnLabel: '文件类型', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + columnWidth: '80', + status: true, + fixed: '', + }, + { + columnProp: 'createBy', + headerAlign: "center", + align: "center", + columnLabel: '上传人', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + columnWidth: '100', + status: true, + fixed: '', + }, + { + columnProp: 'createDate', + headerAlign: "center", + align: "center", + columnLabel: '上传时间', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + columnWidth: '150', + status: true, + fixed: '', + }, + { + columnProp: 'fileRemark', + headerAlign: "center", + align: "left", + columnLabel: '备注', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + columnWidth: '150', + status: true, + fixed: '', + }, + ], columnUnitCostList: [ { columnProp: 'lotBatchNo', @@ -3495,6 +3571,13 @@ if (this.inventoryPartTable === 'Revisions') { this.queryPartRevisionList() } + if (this.inventoryPartTable === 'ProductFile') { + this.$nextTick(() => { + if (this.$refs.productFileOss) { + this.$refs.productFileOss.handleQuery() + } + }) + } }, // 获取维护的物料属性 diff --git a/src/views/modules/project/projectPart/searchProjectPart.vue b/src/views/modules/project/projectPart/searchProjectPart.vue index 47acdc9..560024b 100644 --- a/src/views/modules/project/projectPart/searchProjectPart.vue +++ b/src/views/modules/project/projectPart/searchProjectPart.vue @@ -205,6 +205,21 @@ + + + +
请在上方表格中选择一条物料记录
+
@@ -239,6 +254,7 @@ technicalSpecificationListSearchByAnyField } from "../../../../api/sampleManagement/technicalSpecificationList"; import {projectPartSearchByAnyField} from "../../../../api/project/project"; + import OssComponents from "../../oss/ossComponents.vue"; export default { components: { FilterSearch, @@ -251,6 +267,7 @@ projectQuotation, sample, test, + OssComponents, }, name: "searchProjectPart", data() { @@ -755,6 +772,68 @@ columnWidth: 100 }, ], + columnProductFileList: [ + { + columnProp: 'fileName', + headerAlign: 'center', + align: 'left', + columnLabel: '文件名', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + status: true, + fixed: '', + columnWidth: 200 + }, + { + columnProp: 'fileType', + headerAlign: 'center', + align: 'center', + columnLabel: '文件类型', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + status: true, + fixed: '', + columnWidth: 80 + }, + { + columnProp: 'createBy', + headerAlign: 'center', + align: 'center', + columnLabel: '上传人', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + status: true, + fixed: '', + columnWidth: 100 + }, + { + columnProp: 'createDate', + headerAlign: 'center', + align: 'center', + columnLabel: '上传时间', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + status: true, + fixed: '', + columnWidth: 150 + }, + { + columnProp: 'fileRemark', + headerAlign: 'center', + align: 'left', + columnLabel: '备注', + columnHidden: false, + columnImage: false, + showOverflowTooltip: true, + status: true, + fixed: '', + columnWidth: 150 + }, + ], } }, @@ -980,6 +1059,13 @@ if (this.activeName === 'changeRecord') { this.getChangeRecordList() } + if (this.activeName === 'productFile') { + this.$nextTick(() => { + if (this.$refs.productFileOss) { + this.$refs.productFileOss.handleQuery() + } + }) + } }, refreshTable (type) { let inData = {