Merge branch 'master' of http://git.lionquexpress.com/wuweihua/BMS

bms-front/src/api/ar/receipt.js

@@ -1,25 +0,0 @@
-import request from '@/utils/request'
-
-export function listArReceipt(query) {
-  return request({ url: '/ar/receipt/list', method: 'get', params: query })
-}
-
-export function addArReceipt(data) {
-  return request({ url: '/ar/receipt', method: 'post', data })
-}
-
-export function cancelArReceipt(receiptId, data = {}) {
-  return request({ url: '/ar/receipt/' + receiptId + '/cancel', method: 'put', data })
-}
-
-export function listArWriteoffs(receiptId) {
-  return request({ url: '/ar/receipt/' + receiptId + '/writeoffs', method: 'get' })
-}
-
-export function writeoffArReceipt(data) {
-  return request({ url: '/ar/receipt/writeoff', method: 'post', data })
-}
-
-export function cancelArWriteoff(writeoffId, data = {}) {
-  return request({ url: '/ar/receipt/writeoff/' + writeoffId + '/cancel', method: 'put', data })
-}

bms-front/src/api/customersuppliermanagement/customermoney/customerbill.js

@@ -35,19 +35,3 @@ export function cancelBalanceWriteoff(writeoffId, cancelRemark) {
   })
 }
 
-/** 账单查看：账单列表（只读） */
-export function listCustomerBill(query) {
-  return request({
-    url: '/customersupplier/customerbill/list',
-    method: 'get',
-    params: query
-  })
-}
-
-/** 账单查看：账单详情（含明细） */
-export function getCustomerBill(arBillId) {
-  return request({
-    url: '/customersupplier/customerbill/' + arBillId,
-    method: 'get'
-  })
-}

bms-front/src/api/customersuppliermanagement/customermoney/customermoney.js

@@ -68,11 +68,47 @@ export function listCreditFlow(query) {
   })
 }
 
-/** 调整客户额度（信用额度/临时额度），调整过程留额度流水 */
-export function adjustCredit(data) {
+/** 提交额度调整申请（信用额度/临时额度），审批通过后才调整额度 */
+export function applyCreditAdjust(data) {
   return request({
-    url: '/customersupplier/customermoney/credit/adjust',
+    url: '/customersupplier/customermoney/credit/apply',
     method: 'post',
     data: data
   })
 }
+
+/** 查询额度调整申请列表 */
+export function listCreditApply(query) {
+  return request({
+    url: '/customersupplier/customermoney/credit/apply/list',
+    method: 'get',
+    params: query
+  })
+}
+
+/** 审批通过额度调整申请 */
+export function approveCreditApply(applyId, approveRemark) {
+  return request({
+    url: '/customersupplier/customermoney/credit/apply/approve/' + applyId,
+    method: 'put',
+    data: { approveRemark }
+  })
+}
+
+/** 驳回额度调整申请 */
+export function rejectCreditApply(applyId, approveRemark) {
+  return request({
+    url: '/customersupplier/customermoney/credit/apply/reject/' + applyId,
+    method: 'put',
+    data: { approveRemark }
+  })
+}
+
+/** 撤销待审批的额度调整申请 */
+export function cancelCreditApply(applyId) {
+  return request({
+    url: '/customersupplier/customermoney/credit/apply/cancel/' + applyId,
+    method: 'put'
+  })
+}
+