diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js index cb57cbb2fa..26bce924f8 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/basevehicle.js @@ -139,22 +139,13 @@ export function fetchByUseOrgSid(data) { // 出库 export function vehicleOutLibrary(data) { return request({ - url: '/base/v1/basevehicle/vehicleOutLibrary', + url: '/base/v1/basevehicleout/vehicleOut', method: 'post', data: data, headers: { 'Content-Type': 'application/json' } }) } -// 销售专员 -export function getUserByOrgSid(data) { - return request({ - url: '/portal/v1/sysuser/getUserByOrgSid', - method: 'get', - params: data - }) -} - // 买断 export function vehicleBuyBreak(data) { return request({ diff --git a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js index a907309d51..cbbdc48b41 100644 --- a/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js +++ b/anrui-scm/anrui-scm-ui/src/api/cheliang/dictcommons.js @@ -92,3 +92,32 @@ export function fetchVinNoAndVehSid(data) { method: 'get' }) } + +// 根据当前登录用户sid获取本分公司下的销售部门和销售专员 +export function selectOrgList(data) { + return request({ + url: '/portal/v1/sysorganization/selectOrgList', + method: 'get', + params: data + }) +} + +// 根据选择的销售专员获取客户 +export function selectCustomerList(data) { + return request({ + url: '/crm/v1/crmcustomertemp/selectCustomerList', + method: 'get', + params: data + }) +} + +// 获取本分公司下的二级经销商 +export function selectDisList(data) { + return request({ + url: '/base/v1/basedistributor/selectDisList', + method: 'get', + params: data + }) +} + + diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue index 8422211405..32af66be6d 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue @@ -152,7 +152,7 @@ - + @@ -562,24 +562,19 @@ export default { }, // 出库 doChuku() { - if (this.sids.length === 1) { - this.viewState = 6 - const sid = this.sids[0] - this.$refs['divChu'].showChu(sid) - } else if (this.sids.length > 1) { - this.$message({ - showClose: true, - message: '请选择一台车辆进行出库！', - type: 'error' - }) - } else { - this.$message({ - showClose: true, - message: '仅可选择一台车辆进行出库！', - type: 'error' - }) + if (this.sids.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行出库操作' }) return } + for (var i = 0; i < this.multipleSelection.length; i++) { + if (this.multipleSelection[i].vehicleStateValue !== '库存' && this.multipleSelection[i].vehicleStateValue !== '调入' && this.multipleSelection[i].isProblemVeh !== '无问题') { + const tip = '因车架号' + this.multipleSelection[i].vinNo + '的车辆不满足出库条件,出库操作失败' + this.$message({ showClose: true, type: 'error', message: tip }) + return + } + } + this.viewState = 6 + this.$refs['divChu'].showChu(this.multipleSelection) }, // 买断 doMaiduan() { // salesDate settlementStatus diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue index 4d4250cffc..eb551c3faa 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue @@ -11,115 +11,141 @@
车辆出库
- - - 出库类型 - + + 车架号 + + + {{ temp.vinNo }} + + + 出库类型 - - - + + + - - - 销售专员 + + + + 销售部门 + + + + + + + + 销售专员 + - - - + + + - - - 合同编号 - + + 合同编号 - - - 成交价(元) - + + 成交价(元) - + - - - 客户类型 - - - - - - - - + + 是否为终端客户 - + - 客户姓名 + 是 + 否 + + + + 客户名称 + - + + + - - - - - 手机号码 - + + 手机号码 - - - 身份证号码 + + + + 实际购车人名称 + + + + + + + + 手机号码 + - - + + - + + 赠品说明 + + - 联系地址 + - - - + + + + 二级经销商 + + + + + + + + + + 返利金额(元) + + + + @@ -129,7 +155,8 @@