diff --git a/src/api/emis/emisSalesCommissionRatio.js b/src/api/emis/emisSalesCommissionRatio.js new file mode 100644 index 00000000..45d8d7a2 --- /dev/null +++ b/src/api/emis/emisSalesCommissionRatio.js @@ -0,0 +1,41 @@ +import request from '@/utils/request' + +// 查询 +export function listSalesCommissionRatio(query) { + return request({ + url: '/emis/salesCommissionRatio/list', + method: 'get', + params: query + }) +} +// 新增 +export function addSalesCommissionRatio(data) { + return request({ + url: '/emis/salesCommissionRatio', + method: 'post', + data: data + }) +} +// 删除 +export function delSalesCommissionRatio(ids) { + return request({ + url: '/emis/salesCommissionRatio/' + ids, + method: 'delete' + }) +} +//修改 +export function updateSalesCommissionRatio(data) { + return request({ + url: '/emis/salesCommissionRatio', + method: 'put', + data: data + }) +} + +//根据id查询 +export function getSalesCommissionRatio(id) { + return request({ + url: '/emis/salesCommissionRatio/' + id, + method: 'get' + }) +} diff --git a/src/views/emis/emisSettlePayRecord/index.vue b/src/views/emis/emisSettlePayRecord/index.vue index b90b903f..887378f7 100644 --- a/src/views/emis/emisSettlePayRecord/index.vue +++ b/src/views/emis/emisSettlePayRecord/index.vue @@ -62,8 +62,9 @@ - - + + + @@ -781,14 +782,16 @@ export default { return this.selectDictLabel(this.dict.type.emis_payment_status,paymentStatus); } - if(j == 'payStatus'){ - let payStatus = v['payStatus'] - if (payStatus == 0) { - return '待支付'; + if (j == 'payStatus') { + let payStatus = v['payStatus'] + if (payStatus == 0 || payStatus == null) { + return '未支付'; } else if (payStatus == 1) { - return '支付成功'; + return '支付中'; } else if (payStatus == 2) { + return '支付成功'; + } else if (payStatus == 3) { return '支付失败'; } } diff --git a/src/views/emis/salesCommissionRatio/editForm.vue b/src/views/emis/salesCommissionRatio/editForm.vue new file mode 100644 index 00000000..bb7cf25d --- /dev/null +++ b/src/views/emis/salesCommissionRatio/editForm.vue @@ -0,0 +1,169 @@ + + + + diff --git a/src/views/emis/salesCommissionRatio/index.vue b/src/views/emis/salesCommissionRatio/index.vue new file mode 100644 index 00000000..2395303f --- /dev/null +++ b/src/views/emis/salesCommissionRatio/index.vue @@ -0,0 +1,264 @@ + + + + +