diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js index 1a6f760e07..af8371c324 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/flow/jianyidingdan.js @@ -2,59 +2,80 @@ import request from '@/utils/request' export default { // 车辆预定流程审批(同意) 已改 - agreeCheliangTask: function(params) { + agreeCheliangTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/completeVehicle', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 订金收取流程审批(同意) 已改 - agreeDingjinTask: function(params) { + agreeDingjinTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/completeDeposit', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 流程审批(驳回) 已改 - rejectTask: function(params) { + rejectTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/reject', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 流程审批(终止) 已改 - breakTask: function(params) { + breakTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/breakProcess', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 流程审批(撤回) 已改 - revokeTask: function(params) { + revokeTask: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/revokeProcess', - method: 'post', - data: params + method: 'put', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 审批流程(同意)获取下一环节 已改 getNextNodesForSubmit: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/getNextNodesForSubmit', - method: 'get', - params: data + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 审批流程(驳回、终止)获取上一环节 已改 getPreviousNodesForReject: function(data) { return request({ url: 'buscenter/v1/busmaindeposit/getPreviousNodesForReject', - method: 'get', - params: data + method: 'post', + data: data, + headers: { + 'Content-Type': 'application/json' + } }) }, // 读取xml文件 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js index 141958d81a..49124f0d7b 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/busdeposit.js @@ -1,8 +1,7 @@ import request from '@/utils/request' -import qs from 'qs' // 简易订单页面接口 -//条件分页查询数据的列表 (8.12测试) +// 条件分页查询数据的列表 (8.12测试) export function listPage(data) { return request({ url: '/buscenter/v1/busmaindeposit/listPage', @@ -14,7 +13,7 @@ export function listPage(data) { }) } -//根据sid批量删除 (8.12测试) +// 根据sid批量删除 (8.12测试) export function deleteBySids(data) { return request({ url: '/buscenter/v1/busmaindeposit/deleteBySids', @@ -26,8 +25,7 @@ export function deleteBySids(data) { }) } - -//==========订金收取 +// ==========订金收取 // 保存虚拟订单(订金)(8.12已改) export function saveDing(data) { return request({ @@ -56,7 +54,7 @@ export function submitApprove(data) { export function depositDetail(data) { return request({ url: 'buscenter/v1/busdeposit/init/depositDetail/' + data.virtualOrderSid + '/' + data.userSid, - method: 'get', + method: 'get' }) } @@ -64,12 +62,11 @@ export function depositDetail(data) { export function fetchSid(data) { return request({ url: 'buscenter/v1/busdeposit/getDepositInfoDetails/' + data, - method: 'get', + method: 'get' }) } - -//==========预定车辆 +// ==========预定车辆 // 保存虚拟订单(预定车辆) (8.12已改) export function saveChe(data) { return request({ @@ -85,7 +82,7 @@ export function saveChe(data) { // 提交虚拟订单(车辆)审批流程 (8.12已改) export function submitVehicleApprove(data) { return request({ - url: 'buscenter/v1/busmaindeposit', + url: 'buscenter/v1/busmaindeposit/submitVirtualOrderVehicle', method: 'post', data: data, headers: { @@ -110,11 +107,10 @@ export function selectSid(data) { export function getReserveCarDetails(data) { return request({ url: 'buscenter/v1/busdepositvehicle/getReserveCarDetails/' + data, - method: 'get', + method: 'get' }) } - // 获取下拉框 export function typeValues(data) { return request({ @@ -133,7 +129,7 @@ export function kehu(data) { }) } -//订单批量删除主车优惠情况 +// 订单批量删除主车优惠情况 export function getDelDis(data) { return request({ url: '/buscenter/v1/busorder/delDis/' + data, diff --git a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue index 3bded014c6..97b711ed69 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/components/uploadFile/upload.vue @@ -238,6 +238,7 @@ } }, handlePictureCardPreview(file) { + this.dialogVisible = true this.dialogImageUrl = file.url }, // 上传失败 diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue index 9eb9f682c4..e1a071c142 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xunidingdanFlow/cheliangyuding.vue @@ -1,74 +1,79 @@