diff --git a/package.json b/package.json index 0815b78..daf830e 100644 --- a/package.json +++ b/package.json @@ -97,7 +97,7 @@ "chalk": "4.1.0", "compression-webpack-plugin": "5.0.2", "connect": "3.6.6", - "eslint": "7.15.0", + "eslint": "^6.8.0", "eslint-config-airbnb-base": "^14.0.0", "eslint-plugin-import": "^2.26.0", "eslint-plugin-prettier": "^3.1.0", diff --git a/src/api/rescue/info.js b/src/api/rescue/info.js index 60624dc..e81f928 100644 --- a/src/api/rescue/info.js +++ b/src/api/rescue/info.js @@ -8,6 +8,23 @@ export function listInfo(query) { params: query }) } +// 根据ID修改发票信息 +export function updateBilled(data) { + return request({ + url: '/system/rescueInfo/updateBilled', + method: 'post', + data: data + }) +} + +// 根据ID查询救援信息详细 +export function getInfoById(id) { + return request({ + url: '/system/rescueInfo/getById', + method: 'get', + params: { id } + }) +} // 已撤销订单列表 export function listByRevoke(query) { @@ -150,3 +167,28 @@ export function confirmReceipt(data){ }) } +// 应收款、已收款、代收款统计 +export function getCountNum(query){ + return request({ + url: '/app/rescueInfo/getRescueStatisticsInfoNum', + method: 'get', + params: query + }) +} + +// 获取所有渠道 +export function channelList() { + return request({ + url: '/rescue-channel-source/channelList', + method: 'get' + }) +} + +// 获取所有来源 +export function sourceList() { + return request({ + url: '/rescue-channel-source/sourceList', + method: 'get' + }) +} + diff --git a/src/utils/dict.js b/src/utils/dict.js index d50f48e..f93fbb3 100644 --- a/src/utils/dict.js +++ b/src/utils/dict.js @@ -148,6 +148,8 @@ export const DICT_TYPE = { COMPANY_COST_TYPE: 'company_cost_type', // 救援车车型 JYC_TYPE: 'jyc_type', + // 救援车归属 + RESCUE_CAR_OWN: 'rescue_car_own', RESCUE_CAR_CATEGORY: 'rescue_car_category', Drive_Dialy: 'drive_dialy', Jx_report_state: 'jx_report_state', diff --git a/src/views/rescue/carInfo.vue b/src/views/rescue/carInfo.vue index 9fc3305..1380a06 100644 --- a/src/views/rescue/carInfo.vue +++ b/src/views/rescue/carInfo.vue @@ -79,31 +79,41 @@ - - + + - + + + + + + + - + - + - + @@ -165,6 +175,18 @@ > + + + + + + + @@ -195,14 +217,17 @@ placeholder="请选择购买时间"> - + + + + + + + + + + + + + + + + 应收款：{{ countNum.yingskNum }} + 已收款：{{ countNum.yiskNum }} + 待收款：{{ countNum.dskNum }} + + + + + + + +