提交
This commit is contained in:
1 parent
ecde2ba07d
commit
06d021807b
61 files changed
+14874
-8772
No files matched your search
@@ -1184,8 +1184,15 @@
|
||||
fetchCollectionProtocolDetail,
|
||||
fetchCreateCollectionProtocol,
|
||||
fetchUpdateCollectionProtocol,
|
||||
fetchSubmitReceiptFinance,
|
||||
type CollectionProtocolRow
|
||||
} from '@/api/collection-protocol'
|
||||
import { fetchSubmitPaymentTransferFinance } from '@/api/protocol-sample-payment'
|
||||
import {
|
||||
flattenSamplePaymentTransfers,
|
||||
formatAutoSubmitFinanceFailureMessage,
|
||||
submitDfjTransfersOnSave
|
||||
} from '@/utils/presign-save-auto-submit'
|
||||
import { fetchUploadAttachment } from '@/api/business'
|
||||
import { downloadAttachmentFile } from '@/utils/download-attachment'
|
||||
import {
|
||||
@@ -2597,11 +2604,36 @@
|
||||
payload.paymentDetails = formData.paymentDetails.map(buildProtocolPaymentDetailPayload)
|
||||
}
|
||||
|
||||
let protocolId = ''
|
||||
if (isEdit.value && editingId.value) {
|
||||
await fetchUpdateCollectionProtocol(editingId.value, payload)
|
||||
protocolId = String(editingId.value)
|
||||
} else {
|
||||
await fetchCreateCollectionProtocol(payload)
|
||||
const created: any = await fetchCreateCollectionProtocol(payload)
|
||||
protocolId = String(created?.id || created?.protocol?.id || '')
|
||||
}
|
||||
|
||||
if (protocolId) {
|
||||
try {
|
||||
const bundle: any = await fetchCollectionProtocolDetail(protocolId)
|
||||
const rowsForSubmit = isV2
|
||||
? flattenSamplePaymentTransfers(bundle?.samplePayments || [])
|
||||
: Array.isArray(bundle?.paymentDetails)
|
||||
? bundle.paymentDetails
|
||||
: []
|
||||
const failures = await submitDfjTransfersOnSave(rowsForSubmit, (transferId) =>
|
||||
isV2
|
||||
? fetchSubmitPaymentTransferFinance(transferId, { showSuccessMessage: false })
|
||||
: fetchSubmitReceiptFinance(transferId, undefined, { showSuccessMessage: false })
|
||||
)
|
||||
if (failures.length) {
|
||||
ElMessage.warning(formatAutoSubmitFinanceFailureMessage(failures, '协议'))
|
||||
}
|
||||
} catch {
|
||||
ElMessage.warning('协议已保存,但自动提交财务确认失败,请在缴费信息中手动提交')
|
||||
}
|
||||
}
|
||||
|
||||
emit('update:modelValue', false)
|
||||
emit('saved')
|
||||
} finally {
|
||||
|
||||
Reference in new issue
Block a user