diff --git a/src/views/modules/ecss/codelnotifyConfirm.vue b/src/views/modules/ecss/codelnotifyConfirm.vue index 602a9d7..2bae72c 100644 --- a/src/views/modules/ecss/codelnotifyConfirm.vue +++ b/src/views/modules/ecss/codelnotifyConfirm.vue @@ -210,6 +210,12 @@ :show-actions="true"> + + + + @@ -608,6 +614,7 @@ import {} from "@/api/sysLanguage.js" import palletUploadExcel from "./pallet_upload_excel.vue"; import PackingDetailTab from "./components/PackingDetailTab.vue"; + import OssComponents from '../oss/ossComponents.vue' import { searchEcssCoDelNotifyHeaderForCK, searchEcssCoDelNotifyDetail, @@ -639,6 +646,7 @@ export default { name: "null", components:{ + OssComponents, palletUploadExcel, Chooselist, PackingDetailTab, @@ -1785,6 +1793,81 @@ columnWidth: 70 }, ], + + 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: '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: 'createdBy', + headerAlign: 'center', + align: 'center', + columnLabel: '上传人', + columnHidden: false, + columnImage: false, + columnSortable: false, + sortLv: 0, + status: true, + fixed: '', + columnWidth: 140 + } + ], currentRow:{}, } }, diff --git a/src/views/modules/oss/ossComponents.vue b/src/views/modules/oss/ossComponents.vue index 050dd3e..96e71ef 100644 --- a/src/views/modules/oss/ossComponents.vue +++ b/src/views/modules/oss/ossComponents.vue @@ -69,6 +69,7 @@ export default { } let params = { ...this.params, + orderRef6: this.codelnotifyFlag // 使用orderRef6字段区分文档类型 } this.queryLoading = true; queryOss(params).then(({data})=>{ @@ -112,6 +113,7 @@ export default { formData.append('orderRef2', this.ossForm.orderRef2); formData.append('createdBy', this.$store.state.user.name); formData.append('fileRemark', this.ossForm.remark); + formData.append('orderRef6', this.codelnotifyFlag || ''); // 使用orderRef6字段区分文档类型 this.uploadLoading = true; ossUpload(formData).then(({data})=>{ if (data && data.code === 0){