diff --git a/apis/creditManagementApi.js b/apis/creditManagementApi.js index 8b3a8f8..a2cbf7c 100644 --- a/apis/creditManagementApi.js +++ b/apis/creditManagementApi.js @@ -7,10 +7,3 @@ export function addPaper(data) { data }) } - -export function getPaperCategory(data) { - return http.get({ - url: '/base-paper-trading/get/product/category-list', - data - }) -} diff --git a/apis/orderApi.js b/apis/orderApi.js index b2f5b54..f757301 100644 --- a/apis/orderApi.js +++ b/apis/orderApi.js @@ -107,3 +107,36 @@ export function supplierConfirmRepay(data) { data }) } + +/** + * 账期订单融资列表 + * @param {object} data enterpriseId status + */ +export function getFinanceList(data) { + return http.get({ + url: '/base-paper-trading/get/supplier/order/financing/list/page', + data + }) +} + +/** + * 供应商获取合同列表 + * @param {object} data signDate enterpriseId type + */ +export function getContractList(data) { + return http.get({ + url: '/base-paper-trading/supplier/get/contract-list', + data + }) +} + +/** + * 获取已签署合同企业列表 + * @param {object} data enterpriseId + */ +export function getCooperationList(data) { + return http.get({ + url: '/base-paper-trading/supplier/get/contract-enterprise-list', + data + }) +} diff --git a/components/qn-datetime-picker/qn-datetime-picker.vue b/components/qn-datetime-picker/qn-datetime-picker.vue index 7c8d4f4..4ea79cf 100644 --- a/components/qn-datetime-picker/qn-datetime-picker.vue +++ b/components/qn-datetime-picker/qn-datetime-picker.vue @@ -5,7 +5,7 @@ - + diff --git a/enums/index.js b/enums/index.js index d9b0d94..99bbe53 100644 --- a/enums/index.js +++ b/enums/index.js @@ -1,6 +1,8 @@ import env from '@/env/index.js' const urlEnv = env === 'production' ? '' : `-${env}` +export const XAPPID = '503258978847966403' + /** * 账号类型 */ @@ -133,12 +135,12 @@ export const supplierOrderStatusMap = { [supplierOrderStatusEnum.WAIT_SUPPLIER_CONFIRM]: '待确认', [supplierOrderStatusEnum.WAIT_DELIVERY]: '待发货', [supplierOrderStatusEnum.RECEIVED]: '已发货', - [supplierOrderStatusEnum.WAIT_CLIENT_LOAN]: '待借款', + [supplierOrderStatusEnum.WAIT_CLIENT_LOAN]: '待客户借款', [supplierOrderStatusEnum.PAYING]: '支付中', [supplierOrderStatusEnum.WAIT_CLIENT_PAY]: '待支付', [supplierOrderStatusEnum.PAY_FAIL]: '付款失败', [supplierOrderStatusEnum.FINISHED]: '已完成', - [supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待还款', + [supplierOrderStatusEnum.WAIT_CLIENT_REPAY]: '待客户还款', [supplierOrderStatusEnum.REPAYING]: '还款中', [supplierOrderStatusEnum.CANCELED]: '已取消' } @@ -157,3 +159,36 @@ export const paymentMethodMap = { [paymentMethodEnum.MONTHLY_PAY]: '月结支付', [paymentMethodEnum.FLY_PAY]: '飞算支付' } + +/** + * 账期订单融资状态 30181 待客户借款,30182 待融资,30183 已融资,30184 融资失败 + */ +export const financeStatusEnum = { + WAIT_CLIENT_LOAN: 30181, + WAIT_FINANCE: 30182, + FINISHED: 30183, + FAILED: 30184 +} + +/** + * 账期订单融资状态 30181 待客户借款,30182 待融资,30183 已融资,30184 融资失败 + */ +export const financeStatusMap = { + [financeStatusEnum.WAIT_CLIENT_LOAN]: '待客户借款', + [financeStatusEnum.WAIT_FINANCE]: '待融资', + [financeStatusEnum.FINISHED]: '已融资', + [financeStatusEnum.FAILED]: '融资失败' +} + +/** + * 合同类型。1:订单合同,2:担保合同 + */ +export const contractTypeEnum = { + ORDER_CONTRACT: 1, + GUARANTEE_CONTRACT: 2 +} + +export const contractTypeMap = { + [contractTypeEnum.ORDER_CONTRACT]: '订单合同', + [contractTypeEnum.GUARANTEE_CONTRACT]: '担保合同' +} diff --git a/pages.json b/pages.json index 3e98ce4..25f5966 100644 --- a/pages.json +++ b/pages.json @@ -223,6 +223,20 @@ "navigationStyle": "custom" } }, + { + "path": "pages/credit-order-list/index", + "style": { + "navigationBarTitleText": "账期订单融资", + "navigationStyle": "custom" + } + }, + { + "path": "pages/contract-manage/index", + "style": { + "navigationBarTitleText": "合同管理", + "navigationStyle": "custom" + } + }, { "path": "pages/store-settings/index", "style": { diff --git a/pages/account-management/index.vue b/pages/account-management/index.vue index 5c417d9..b0f942e 100644 --- a/pages/account-management/index.vue +++ b/pages/account-management/index.vue @@ -44,7 +44,8 @@ export default { }, params: { asc: '', - desc: '' + desc: '', + enterpriseId: this.$store.state.supplierInfo.id, }, pagination: { pageNum: 0, // 初始会执行一次下拉加载 diff --git a/pages/client-credit-detail/index.vue b/pages/client-credit-detail/index.vue index 41ca8cd..ab2310a 100644 --- a/pages/client-credit-detail/index.vue +++ b/pages/client-credit-detail/index.vue @@ -3,7 +3,7 @@ 授信额度(元) - 5{{ info.creditLine }} + {{ info.creditLine }} diff --git a/pages/client-list/index.vue b/pages/client-list/index.vue index e5a3bf8..7ed3d71 100644 --- a/pages/client-list/index.vue +++ b/pages/client-list/index.vue @@ -103,8 +103,6 @@ export default { } else { this.list = this.list.concat(res.records) } - // this.list = [] - // this.list = [...this.list, ...[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]] resolve({ list: this.list, total: res.total }) } else { reject() diff --git a/pages/contract-manage/index.vue b/pages/contract-manage/index.vue new file mode 100644 index 0000000..292d5b9 --- /dev/null +++ b/pages/contract-manage/index.vue @@ -0,0 +1,257 @@ + + + + + diff --git a/pages/credit-management/index.vue b/pages/credit-management/index.vue index 22e5d69..e1b1068 100644 --- a/pages/credit-management/index.vue +++ b/pages/credit-management/index.vue @@ -1,52 +1,24 @@ - + diff --git a/pages/credit-order-list/index.vue b/pages/credit-order-list/index.vue new file mode 100644 index 0000000..2f6cd5d --- /dev/null +++ b/pages/credit-order-list/index.vue @@ -0,0 +1,208 @@ + + + + + diff --git a/pages/mine/index.vue b/pages/mine/index.vue index 8996265..f86e802 100644 --- a/pages/mine/index.vue +++ b/pages/mine/index.vue @@ -100,23 +100,23 @@ 其他工具 - + + 账期订单融资 - + 合同管理 - + 征信管理 - + 授信记录 @@ -133,7 +133,7 @@