Merge remote-tracking branch 'origin/feature/bfi-api-rate' into feature/bfi-api-rate

# Conflicts:
#	src/api/payment/invoiceReceipt.js

src/api/payment/invoiceReceipt.js

@@ -5,8 +5,8 @@ const baseUrl = '/blade-transport/invoice-receipt';
 export const getList = (current, size, params) =>
   request({ url: `${baseUrl}/list`, method: 'get', params: { current, size, ...params } });
 export const getDetail = id => request({ url: `${baseUrl}/detail`, method: 'get', params: { id } });
-export const getInvoicePool = keyword =>
-  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params: { keyword } });
+export const queryInvoicePool = params =>
+  request({ url: `${baseUrl}/invoice-pool`, method: 'get', params });
 export const getSettlementCandidates = (keyword, receiptId) =>
   request({
     url: `${baseUrl}/settlement-candidates`,
@@ -25,8 +25,8 @@ export const submit = data => request({ url: `${baseUrl}/submit`, method: 'post'
 export const approve = data => request({ url: `${baseUrl}/approve`, method: 'post', data });
 export const returnBill = data => request({ url: `${baseUrl}/return`, method: 'post', data });
 export const voidBill = data => request({ url: `${baseUrl}/void`, method: 'post', data });
-export const syncKingdee = id =>
-  request({ url: `${baseUrl}/sync-kingdee`, method: 'post', params: { id }, timeout: 120000 });
+export const pushKingdee = ids =>
+  request({ url: `${baseUrl}/push-kingdee`, method: 'post', data: ids });
 
 export const approvalStatusOptions = [
   { label: '草稿', value: 'draft' },
@@ -36,8 +36,9 @@ export const approvalStatusOptions = [
   { label: '已作废', value: 'voided' },
 ];
 
-export const kingdeeStatusOptions = [
-  { label: '未同步', value: 'unsynced' },
-  { label: '已同步', value: 'synced' },
-  { label: '同步失败', value: 'failed' },
+export const kingdeePushStatusOptions = [
+  { label: '未推送', value: 'unsynced' },
+  { label: '已保存收票单', value: 'pushed' },
+  { label: '已指定应付', value: 'assigned' },
+  { label: '推送失败', value: 'failed' },
 ];