diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js index b4e5c35d1c..4059b8805d 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/chukuguanli/chukubanli.js @@ -1,5 +1,4 @@ import request from '@/utils/request' -import qs from 'qs' // 待出库分页列表 已改 export function listPage(params) { @@ -13,7 +12,19 @@ export function listPage(params) { }); } -// 出库申请初始化/详情 已改 +// 验证是否可出库 +export function checkingApply(params) { + return request({ + url: '/buscenter/v1/busdeliveredapply/checkingApply', + method: 'post', + data: params, + headers: { + 'Content-Type': 'application/json' + } + }) +} + +// 出库申请详情、编辑回显 已改 export function fetchDetailsBySid(params) { return request({ url: '/buscenter/v1/busdeliveredapply/fetchDetailsBySid', diff --git a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js index 97e980ef9f..e97072fced 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js +++ b/anrui-buscenter/anrui-buscenter-ui/src/api/salesManagement/orderManagement.js @@ -1,8 +1,9 @@ import request from "@/utils/request"; // ----------------------------------- 订单管理 -export function getPageList(data) { +// 销售订单管理列表 已改 +export function getListPage(data) { return request({ - url: "/buscenter/v1/busorder/busOrderPagerList", + url: "/buscenter/v1/bussalesorder/listPage", method: "post", data: data, headers: { @@ -10,10 +11,23 @@ export function getPageList(data) { } }); } -// 添加 + +// 销售订单批量删除销售订单 已改 +export function delBySids(data) { + return request({ + url: "/buscenter/v1/bussalesorder/delBySids", + method: "delete", + data: data, + headers: { + "Content-Type": "application/json" + } + }); +} + +// 销售订单新增保存 已改 export function saveOrderForm(data) { return request({ - url: "/buscenter/v1/busorder/saveAll", + url: "/buscenter/v1/bussalesorder/saveOrUpdate", method: "post", data: data, headers: { @@ -21,10 +35,11 @@ export function saveOrderForm(data) { } }); } -// 修改 -export function updateOrderForm(data) { + +// 编辑、详情初始化 已改 +export function fetchDetailsBySid(data) { return request({ - url: "/buscenter/v1/busorder/updateAll/" + data.busOrderDto.sid, + url: "/buscenter/v1/bussalesorder/fetchDetailsBySid/" + data.sid, method: "post", data: data, headers: { @@ -32,16 +47,76 @@ export function updateOrderForm(data) { } }); } -// 根据编号查看详情 -export function getOneDetailsByBillNo(data) { + +// 外联表接口 +// 获取意向车型列表 已改 +export function getYixiangList(data) { return request({ - url: "/buscenter/v1/busorder/getAllByBillNo", + url: "/crm/v1/crmvehicledemand/selectPagePc", method: "post", - params: { billNo: data } + data: data, + headers: { + "Content-Type": "application/json" + } }); } -// 根据订单id 获取详情 /buscenter/v1/busorder/fetchSid/{sid} +// 获取虚拟订单列表 已改 +export function getXuniList(data) { + return request({ + url: "/buscenter/v1/pcbusmaindeposit/pageList", + method: "post", + data: data, + headers: { + "Content-Type": "application/json" + } + }); +} + +// 车辆信息获取现车列表 已改 +export function getXianList(data) { + return request({ + url: "/base/v1/basevehicle/selectVo", + method: "post", + data: data, + headers: { + "Content-Type": "application/json" + } + }); +} + +// 采购订单查询分页列表 已改 +export function getCaigouList(params) { + return request({ + url: '/base/v1/busvehicleapplydetail/applyPage', + method: 'post', + data: params, + headers: {'Content-Type': 'application/json'} + }) +} + +// 销售政策分页列表 已改 +export function selectSalesOrderList(params) { + return request({ + url: '/base/v1/basediscountpackage/selectSalesOrderList', + method: 'post', + data: params, + headers: {'Content-Type': 'application/json'} + }) +} + +// 虚拟订单订金列表 已改 +export function depositPageList(params) { + return request({ + url: '/buscenter/v1/pcbusmaindeposit/depositPageList', + method: 'post', + data: params, + headers: {'Content-Type': 'application/json'} + }) +} + + +// ==================== 分割 ======================== // 部门下拉 export function getListOrg(data) { return request({ @@ -49,6 +124,7 @@ export function getListOrg(data) { method: "get" }); } + // 支付方式下拉 export function getPaymentType(data) { return request({ diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue index 40768212fe..e239b02ecc 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingAdd.vue @@ -243,7 +243,8 @@ useMessage = this.detailsList[i].useMessage this.isShow = false this.isShowLook = true - this.$refs['divUserInfo'].showInfo(useMessage, vinNo) + const createBtn = false + this.$refs['divUserInfo'].showInfo(useMessage, vinNo,createBtn) } } }, @@ -328,7 +329,8 @@ this.temp.sid = sid this.detailsList = response.data.listVo for (var i = 0; i < this.detailsList.length; i++) { - if (JSON.stringify(this.detailsList[i].useMessage) !== '{}') { + //JSON.stringify() + if (this.detailsList[i].useMessage.vinNo !== '') { this.detailsList[i].isExist = '1' } } diff --git a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue index 478a30b1b0..0d0b6ca3cc 100644 --- a/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue +++ b/anrui-buscenter/anrui-buscenter-ui/src/views/chukuguanli/chukubanli/chukushenqingInfo.vue @@ -46,8 +46,8 @@ - - + + @@ -99,7 +99,7 @@