diff --git a/src/components/BasicForm/src/BasicForm.vue b/src/components/BasicForm/src/BasicForm.vue index 0c54a52f8..d7d018198 100644 --- a/src/components/BasicForm/src/BasicForm.vue +++ b/src/components/BasicForm/src/BasicForm.vue @@ -452,9 +452,11 @@ const searchTableSuccess = (formField, searchField, val, type, row) => { } /** 打开弹窗 */ -const open = async (type: string, row?: any, masterParmas?: any, titleName?: any) => { +const open = async (type: string, row?: any, masterParmas?: any, titleName?: any, alltitleName?: any) => { dialogVisible.value = true - if (titleName) { + if(alltitleName){ + dialogTitle.value = alltitleName + }else if (titleName) { dialogTitle.value = t('action.' + titleName) } else { dialogTitle.value = t('action.' + type) diff --git a/src/components/UploadFile/src/UploadFile.vue b/src/components/UploadFile/src/UploadFile.vue index a05ff581f..33de112d5 100644 --- a/src/components/UploadFile/src/UploadFile.vue +++ b/src/components/UploadFile/src/UploadFile.vue @@ -106,12 +106,12 @@ const beforeUpload: UploadProps['beforeUpload'] = (file: UploadRawFile) => { // uploadRef.value.data.path = uploadFile.name // } // 文件上传成功 -const handleFileSuccess: UploadProps['onSuccess'] = (res: any): void => { +const handleFileSuccess: UploadProps['onSuccess'] = (res: any,uploadFile: any): void => { message.success('上传成功') const fileListNew = fileList.value fileListNew.pop() fileList.value = fileListNew - uploadList.value.push({ name: res.data, url: res.data }) + uploadList.value.push({ name: uploadFile.name, url: res.data }) if (uploadList.value.length == uploadNumber.value) { fileList.value = fileList.value.concat(uploadList.value) uploadList.value = [] diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index efde21c16..1065befd7 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -625,7 +625,7 @@ const handleUploadQualityReport = async (row) => { if(uploadFile){ uploadFile['componentProps']['upData']['tableId'] = row.masterId } - ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},'上传质检报告')//创建标签页面 createLabel 标题 + ploadQualityReportRef.value.open('create', null, {masterId:row.masterId},'上传质检报告','上传质检报告')//创建标签页面 createLabel 标题 const tableFormKeys = {} SupplierdeliverInspectionDetail.allSchemas.tableFormColumns.forEach((item) => { tableFormKeys[item.field] = item.default ? item.default : ''