diff --git a/src/components/kingdee-invoice-pool-dialog/main.vue b/src/components/kingdee-invoice-pool-dialog/main.vue index 7b0449c..4c2b1ab 100644 --- a/src/components/kingdee-invoice-pool-dialog/main.vue +++ b/src/components/kingdee-invoice-pool-dialog/main.vue @@ -1,8 +1,8 @@ + @@ -172,8 +177,8 @@ -
- 按名称检索范围为已同步票,未找到请改用发票号码或税号精确查找 +
+ 按名称检索范围为已同步票,未找到请改用发票号码或税号精确查找 diff --git a/src/option/payment/invoiceReceipt.js b/src/option/payment/invoiceReceipt.js index add059a..ddc030d 100644 --- a/src/option/payment/invoiceReceipt.js +++ b/src/option/payment/invoiceReceipt.js @@ -12,7 +12,7 @@ export const invoiceReceiptTableColumns = [ { prop: 'createUserName', label: '创建人', minWidth: 110 }, { prop: 'createTime', label: '创建时间', minWidth: 170 }, { prop: 'kingdeeReceivedInvoiceNo', label: '金蝶单据号', minWidth: 150 }, - { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130 }, + { prop: 'kingdeePushStatusName', label: '金蝶状态', minWidth: 130, kingdeeStatus: true }, { prop: 'kingdeePushMsg', label: '失败原因', minWidth: 160 }, { prop: 'attachmentSyncStatusName', label: '附件同步', minWidth: 100 }, ]; diff --git a/src/utils/kingdee.js b/src/utils/kingdee.js index 4a4f6ab..3f82010 100644 --- a/src/utils/kingdee.js +++ b/src/utils/kingdee.js @@ -14,6 +14,17 @@ export const KINGDEE_STATUS_TAG_TYPES = { /** 金蝶单据状态 → el-tag 颜色类型,未映射状态返回 info */ export const kingdeeStatusType = status => KINGDEE_STATUS_TAG_TYPES[status] || 'info'; +/** 收票登记推送状态 → el-tag 颜色类型(已指定应付=绿、已保存收票单=黄、推送失败=红、未推送=灰) */ +export const KINGDEE_PUSH_STATUS_TAG_TYPES = { + unsynced: 'info', + pushed: 'warning', + assigned: 'success', + failed: 'danger', +}; + +/** 收票登记推送状态 → el-tag 颜色类型,未映射状态返回 info */ +export const kingdeePushStatusType = status => KINGDEE_PUSH_STATUS_TAG_TYPES[status] || 'info'; + /** 金蝶冲销状态 → el-tag 颜色类型(已冲销=绿、未冲销=黄) */ export const KINGDEE_WRITEOFF_TAG_TYPES = { writtenoff: 'success', diff --git a/src/views/payment/invoice-receipt.vue b/src/views/payment/invoice-receipt.vue index 0a15cd8..7f17ab3 100644 --- a/src/views/payment/invoice-receipt.vue +++ b/src/views/payment/invoice-receipt.vue @@ -119,6 +119,9 @@ {{ displayValue(row[column.prop]) }} + + {{ displayValue(row[column.prop]) }} + {{ formatMoney(row[column.prop]) }} {{ displayValue(row[column.prop]) }} @@ -222,6 +225,7 @@ import TableHeaderTools from '@/components/table-header-tools/main.vue'; import organizationSearch from '@/mixins/organization-search'; import { getMKApprovalUrl } from '@/api/system/business-process'; import { loadMkEnabled, submitMkApprovalFlow } from '@/utils/mk-approval'; +import { kingdeePushStatusType } from '@/utils/kingdee'; // 表单提交成功后带标记返回,keep-alive 缓存的列表页据此重新拉取 const invoiceReceiptListRefreshKey = 'invoice-receipt-list-refresh'; @@ -480,6 +484,7 @@ export default { '' ); }, + kingdeePushStatusType, displayValue(value) { return value === null || value === undefined || value === '' ? '-' : value; }, diff --git a/src/views/settlement/components/invoice-receipt-candidates-dialog.vue b/src/views/settlement/components/invoice-receipt-candidates-dialog.vue index f8d325e..51469f5 100644 --- a/src/views/settlement/components/invoice-receipt-candidates-dialog.vue +++ b/src/views/settlement/components/invoice-receipt-candidates-dialog.vue @@ -74,6 +74,7 @@