diff --git a/anrui-base/anrui-base-ui/src/api/business/faRen.js b/anrui-base/anrui-base-ui/src/api/business/faRen.js index 6a32bfa6ea..02d17bd9f4 100644 --- a/anrui-base/anrui-base-ui/src/api/business/faRen.js +++ b/anrui-base/anrui-base-ui/src/api/business/faRen.js @@ -7,27 +7,47 @@ return request({ url: '/base/v1/basevehiclebrand/pagerList', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { 'Content-Type': 'application/json' } }) } // 添加法人 export function SaveListFaRen(data) { return request({ - url: '/base/v1/basedistributorlegal/save', data, + url: '/base/v1/basedistributorlegal/save', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { 'Content-Type': 'application/json' } }) } // 修改法人 export function UpdateFaRen(data) { return request({ - url: `/base/v1/basedistributorlegal/update/${data.sid}`, + url: '/base/v1/basedistributorlegal/update/' + data.sid, method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { 'Content-Type': 'application/json' } }) } + +// 添加个人 +export function SaveListGeRen(data) { + return request({ + url: '/base/v1/basedistributorperson/save', + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} +// 修改个人 +export function UpdateGeRen(data) { + return request({ + url: '/base/v1/basedistributorperson/update/' + data.sid, + method: 'post', + data: data, + headers: { 'Content-Type': 'application/json' } + }) +} + // 删除 export function deleteBySids(data) { return request({ @@ -48,8 +68,8 @@ export function brandLike(data) { // 回显/base/v1/basedistributor/details/{sid} export function detailsFaRen(data) { return request({ - url: '/base/v1/basedistributor/details/'+ data, - method: 'get', + url: '/base/v1/basedistributor/details/' + data, + method: 'get' }) } diff --git a/anrui-base/anrui-base-ui/src/api/business/geRen.js b/anrui-base/anrui-base-ui/src/api/business/geRen.js index 39733b91a1..6f61b15d81 100644 --- a/anrui-base/anrui-base-ui/src/api/business/geRen.js +++ b/anrui-base/anrui-base-ui/src/api/business/geRen.js @@ -1,14 +1,12 @@ import request from '@/utils/request' -import qs from 'qs' - // 添加个人 export function SaveListGeRen(data) { return request({ - url: '/base/v1/basedistributorperson/save', data, + url: '/base/v1/basedistributorperson/save', method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { 'Content-Type': 'application/json' } }) } // 修改个人 @@ -17,6 +15,6 @@ export function UpdateGeRen(data) { url: `/base/v1/basedistributorperson/update/${data.sid}`, method: 'post', data: data, - headers: { 'Content-Type': 'application/json' } + headers: { 'Content-Type': 'application/json' } }) } diff --git a/anrui-base/anrui-base-ui/src/main.js b/anrui-base/anrui-base-ui/src/main.js index 5629a0eb80..da2cbfcf3a 100644 --- a/anrui-base/anrui-base-ui/src/main.js +++ b/anrui-base/anrui-base-ui/src/main.js @@ -65,7 +65,9 @@ function getUserInfo() { userSid: data.sid, orgSid: data.organizationSid, // 单位sid Orgname: data.organizationName, - dwjb: data.dwjb + dwjb: data.dwjb, + orgNamePath: data.orgNamePath, // 使用组织全路径名称 + orgSidPath: data.orgSidPath // 使用组织全路径Sid }; // 结果存入缓存 window.sessionStorage.setItem('staffSid', user.staffSid) @@ -77,6 +79,8 @@ function getUserInfo() { window.sessionStorage.setItem('user', user) window.sessionStorage.setItem('departmentName', user.departmentName) window.sessionStorage.setItem('departmentSid', user.departmentSid) + window.sessionStorage.setItem('orgNamePath', user.orgNamePath) + window.sessionStorage.setItem('orgSidPath', user.orgSidPath) }) } getUserInfo() diff --git a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue index a725573362..eaf7dc9fff 100644 --- a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue +++ b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangAdd.vue @@ -1,119 +1,1364 @@ + diff --git a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangInfo.vue b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangInfo.vue index 6aca6b678c..2c583d17e0 100644 --- a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangInfo.vue +++ b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangInfo.vue @@ -1,113 +1,409 @@ diff --git a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue index 0e056022c0..5d63696849 100644 --- a/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue +++ b/anrui-base/anrui-base-ui/src/views/jingxiaoshang/jingxiaoshangguanli/jingxiaoshangguanli.vue @@ -1,247 +1,122 @@ diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java index ab431463c1..78ffce061c 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderAllDto.java @@ -14,8 +14,8 @@ import com.yxt.common.core.dto.Dto; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -31,25 +31,25 @@ public class BusSalesOrderAllDto implements Dto { private String sid; @ApiModelProperty(value = "用户sid", required = true) - @NotBlank(message = "用户sid不能为空") + @NotBlank(message = "参数错误：用户sid") private String userSid; @ApiModelProperty(value = "销售部门sid", required = true) - @NotBlank(message = "销售部门sid不能为空") + @NotBlank(message = "参数错误：销售部门sid") private String orgSid; @ApiModelProperty(value = "销售部门", required = true) - @NotBlank(message = "销售部门不能为空") + @NotBlank(message = "参数错误：销售部门") private String orgName; @ApiModelProperty(value = "客户名称", required = true) @NotBlank(message = "客户名称不能为空") private String customerName; @ApiModelProperty(value = "客户sid", required = true) - @NotBlank(message = "客户sid不能为空") + @NotBlank(message = "参数错误：客户sid") private String customerSid; @ApiModelProperty(value = "销售专员", required = true) @NotBlank(message = "销售专员不能为空") private String staffName; @ApiModelProperty(value = "销售专员sid", required = true) - @NotBlank(message = "销售专员sid不能为空") + @NotBlank(message = "参数错误：销售专员sid") private String staffSid; @ApiModelProperty(value = "客户联系电话", required = true) @NotBlank(message = "客户联系电话不能为空") @@ -83,7 +83,7 @@ public class BusSalesOrderAllDto implements Dto { @NotBlank(message = "销售订单车辆类型不能为空") private String type; @ApiModelProperty(value = "主车车型信息") - @NotNull(message = "车型信息不能为空") + @Valid private BusSalesOrderModelDto busSalesOrderModel; @ApiModelProperty(value = "现车车辆信息") private List busSalesOrderVehicleList; @@ -92,12 +92,14 @@ public class BusSalesOrderAllDto implements Dto { @ApiModelProperty(value = "上装配置信息") private BusSalesOrderMakeupDto busSalesOrderMakeup; @ApiModelProperty(value = "价格信息") + @Valid private BusSalesOrderPriceDto busSalesOrderPrice; @ApiModelProperty(value = "主车优惠明细") private List busSalesOrderDiscountList; @ApiModelProperty(value = "保险说明") private BusSalesOrderInsuranceDto busSalesOrderInsurance; @ApiModelProperty(value = "订金信息") + @Valid private BusSalesOrderDepositDto busSalesOrderDeposit; @ApiModelProperty(value = "虚拟订单和订金关联信息") private List busDepositFictitiousList; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java index 423d017399..e7c95c2ca9 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/BusSalesOrderFeign.java @@ -33,6 +33,8 @@ import io.swagger.annotations.ApiOperation; import org.springframework.cloud.openfeign.FeignClient; import org.springframework.web.bind.annotation.*; +import javax.validation.Valid; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderFeign.java
@@ -62,7 +64,7 @@ public interface BusSalesOrderFeign { @ApiOperation("新增或修改") @PostMapping("/saveOrUpdate") @ResponseBody - public ResultBean save(@RequestBody BusSalesOrderAllDto dto); + public ResultBean save(@Valid @RequestBody BusSalesOrderAllDto dto); @ApiOperation("删除/批量删除") @DeleteMapping("/delBySids") diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java index 374ff19d61..3d3164c578 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderdeposit/BusSalesOrderDepositDto.java @@ -31,6 +31,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; + /** * Project: anrui-buscenter(业务管理)
* File: BusSalesOrderDepositDto.java
@@ -49,13 +51,17 @@ import lombok.Data; public class BusSalesOrderDepositDto implements Dto { private static final long serialVersionUID = -5178085916707721474L; - @ApiModelProperty("单台订金") + @ApiModelProperty(value = "单台订金", required = true) + @NotBlank(message = "参数错误：订金信息单台订金不能为空") private String deposit; - @ApiModelProperty("订金合计") + @ApiModelProperty(value = "订金合计", required = true) + @NotBlank(message = "参数错误：订金信息订金合计不能为空") private String depositAll; - @ApiModelProperty("订金交纳方式") + @ApiModelProperty(value = "订金交纳方式", required = true) + @NotBlank(message = "参数错误：订金信息订金交纳方式不能为空") private String depositType; - @ApiModelProperty("订金交纳方式key") + @ApiModelProperty(value = "订金交纳方式key", required = true) + @NotBlank(message = "参数错误：订金交纳方式key") private String depositTypeKey; @ApiModelProperty("需补交订金") private String makeUpDeposit; diff --git a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java index d5d2cbf687..7fada7cfe2 100644 --- a/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java +++ b/anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorderprice/BusSalesOrderPriceDto.java @@ -32,6 +32,8 @@ import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import java.util.Date; /** @@ -52,18 +54,24 @@ import java.util.Date; public class BusSalesOrderPriceDto implements Dto { private static final long serialVersionUID = -1959772405551004198L; - @ApiModelProperty("单台指导价（主车加上装）") + @ApiModelProperty(value = "单台指导价（主车加上装）", required = true) + @NotBlank(message = "参数错误：价格信息单台指导价不能为空") private String singleGuildPrice; - @ApiModelProperty("单台成交价（主车加上装）") + @ApiModelProperty(value = "单台成交价（主车加上装）", required = true) + @NotBlank(message = "参数错误：价格信息单台成交价不能为空") private String singleFinalPrice; @ApiModelProperty("台数") + @NotNull(message = "参数错误：价格信息台数不能为空") private Integer quantity; @ApiModelProperty("车价合计") + @NotBlank(message = "参数错误：车价合计不能为空") private String priceSum; @ApiModelProperty("计划提车地点") + @NotBlank(message = "参数错误：计划提车地点不能为空") private String plannedPickUpLocation; @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") @ApiModelProperty("计划提车日期") + @NotNull(message = "参数错误：计划提车日期不能为空") private Date plannedPickUpDate; } \ No newline at end of file diff --git a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java index b6fce02ca8..0b17400086 100644 --- a/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java +++ b/anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java @@ -315,6 +315,8 @@ public class BusSalesOrderService extends MybatisBaseService - // import('@/views/xiaoshouguanli/xiaodaijinrongfangan/xiaodaijinrongfanganAdd.vue'), - // name: 'xiaodaijinrongfanganAdd', - // meta: { - // title: '消贷业务金融方案添加' - // } - // }, - // { - // path: '/xiaoshouguanli/xiaodaijinrongfanganInfo', - // component: () => - // import('@/views/xiaoshouguanli/xiaodaijinrongfangan/xiaodaijinrongfanganinfo.vue'), - // name: 'xiaodaijinrongfanganInfo', - // meta: { - // title: '消贷业务金融方案详情' - // } - // }, - // 挂车配置 + { + path: '/xiaoshouguanli/xiaoshouzhengce', + component: () => + import('@/views/xiaoshouguanli/xiaoshouzhengce/xiaoshouzhengce.vue'), + name: 'xiaoshouzhengce', + meta: { + title: '销售政策管理' + } + }, { path: '/xiaoshouguanli/guachepeizhixinxi', component: () => @@ -317,16 +306,6 @@ export const constantRoutes = [{ title: '挂车配置' } }, - // 上装配置 - // { - // path: '/xiaoshouguanli/shangzhuanpeizhi', - // component: () => - // import('@/views/xiaoshouguanli/jiaochedingdan/shangzhuanpeizhi.vue'), - // name: 'shangzhuanpeizhi', - // meta: { - // title: '上装配置' - // } - // }, // 车辆交付 { path: '/xiaoshouguanli/cheliangjiaofu', @@ -668,6 +647,7 @@ export const constantRoutes = [{ // import('@/views/workflow/hetongguanliFlow/hetongdanganguanli/hetongdangan.vue'), // name: 'hetongdangan', // }, + // 404 page must be placed at the end !!! // { path: '*', redirect: '/404', hidden: true } ] 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 @@ @@ -109,10 +109,13 @@ export default { size: 10, total: 0, params: { + staffSid: window.sessionStorage.getItem('staffSid'), sids: [], // 用于导出的时候保存已选择SID applicationCode: '', // 申请编号 createByName: '', // 申请人姓名 applicationDate: '', // 申请日期 + applicationStartDate:'', + applicationEndDate:'', externalMiningTypeKey: '', // 外采类型key externalMiningTypeValue: '', // 外采类型value purchasingUnitSid: '', // 采购单位sid @@ -168,19 +171,23 @@ export default { this.viewState = 2 this.$refs['divadd'].showAdd() }, - toEdit() { - if (this.multipleSelection.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' }) - return - } - if (this.multipleSelection.length > 1) { - this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' }) - return - } - this.viewState = 3 - const row = this.multipleSelection[0] - this.$refs['divadd'].showEdit(row) - }, + toEdit() { + if (this.multipleSelection.length === 0) { + this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' }) + return + } + if (this.multipleSelection.length > 1) { + this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' }) + return + } + this.viewState = 3 + const row = this.multipleSelection[0] + this.$refs['divadd'].showEdit(row) + }, + edit(row) { + this.viewState = 3 + this.$refs['divadd'].showEdit(row) + }, doSubmit(row) { // 提交的代码 this.btndisabled = true @@ -316,9 +323,9 @@ export default { return pageindex }, toInfo(row) { - this.$refs['divinfo'].showInfo(row) this.viewState = 4 - } + this.$refs['divinfo'].showInfo(row) + } } } diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue index 3a1a7efeee..3279eae8e1 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationAdd.vue @@ -8,6 +8,7 @@
保存 + 提交 返回
@@ -19,183 +20,210 @@
外采申请表


- + *申请编号 - + {{formobj.applicationCode}} *申请人 - 张三 + {{formobj.createByName}} *申请日期 - + {{formobj.applicationDate}} - + *外采类型 - + 直接外采 政策外采 - + *采购单位 - + - + *车型 - + {{formobj.modelName}} 选择 - + *常用配置名称 - + {{formobj.configName}} - + *采购价格 - + *销售指导价 - - 10000 + + {{formobj.guidedPrice}} - + *厂家合同价 - - 10000 + + {{formobj.manufactorSettlementPrice}} *台数 - - 2 + + {{formobj.num}} - - - *订金 - - - - - - + + + *订金 + + + + + + *费用名称 - + *费用金额合计 - +
- ‘ - - +
+ 车辆列表 选择车辆 +
+ ‘ + + - +
- - + + + + 确 定 + + + + + + + 确 定 + + + - + diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue index a52a2cb91b..1ffe9b6952 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationInfo.vue @@ -10,81 +10,68 @@
- -
外采申请表
+
外采申请表
- 申请编号 - {{ formobj.applicationCode }} + 申请编号 + + {{ formobj.applicationCode }} + 申请人姓名 + {{ formobj.createByName }} + 申请日期 + {{ formobj.applicationDate }} - - 申请人姓名 - {{ formobj.createByName }} - - - 申请日期 - {{ formobj.applicationDate }} - - - 外采类型key - {{ formobj.externalMiningTypeKey }} - - - 外采类型value - {{ formobj.externalMiningTypeValue }} - - - 采购单位sid - {{ formobj.purchasingUnitSid }} - - - 采购单位名称 - {{ formobj.purchasingUnitName }} - - - 车型sid - {{ formobj.modelSid }} - - - 车型名称 - {{ formobj.modelName }} + + 外采类型 + + + 政策外采 + 直接外采 + - 常用配置名称 - {{ formobj.configName }} + 采购单位名称 + {{ formobj.purchasingUnitName }} - 采购价格 - {{ formobj.purchasePrice }} + 车型名称 + {{ formobj.modelName }} + 常用配置名称 + {{ formobj.configName }} + + 采购价格 + {{ formobj.purchasePrice }} + 销售指导价 {{ formobj.guidedPrice }} - - - 厂家合同价 - {{ formobj.manufactorSettlementPrice }} - - + + 厂家合同价 + {{ formobj.manufactorSettlementPrice }} + 台数 {{ formobj.num }} - - - 订金 - {{ formobj.deposit }} - - + + 订金 + {{ formobj.deposit }} + 费用名称 {{ formobj.expenseName }} - - - 费用金额合计 - {{ formobj.totalExpenseAmount }} - - - 部门sid - {{ formobj.orgSid }} - + + 费用金额合计 + {{ formobj.totalExpenseAmount }} + +
+
+ 车辆列表 +
+ ‘ + + + +
+
@@ -95,22 +82,44 @@ export default { name: 'BaseOutsourcingApplicationInfo', data() { return { - formobj: {} + formobj: { + sid: '', + applicationCode: '123456', // 申请编号 + createByName: window.sessionStorage.getItem('name'), // 申请人姓名 + applicationDate: '', // 申请日期 + externalMiningTypeKey: '1', // 外采类型key + externalMiningTypeValue: '', // 外采类型value + purchasingUnitName: '', // 采购单位名称 + modelSid: '', // 车型sid + modelName: '', // 车型名称 + configName: '', // 常用配置名称 + configSid: '', // 常用配置sid + purchasePrice: '', // 采购价格 + guidedPrice: '', // 销售指导价 + manufactorSettlementPrice: '', // 厂家合同价 + num: '0', // 台数 + deposit: '', // 订金 + expenseName: '', // 费用名称 + totalExpenseAmount: '', // 费用金额合计 + orgSid: '', // 部门sid + baseOutsourcingApplicationVehicleDtos:[] + } } }, methods: { handleReturn() { - this.formobj = {} this.$emit('doback') }, showInfo(row) { + this.$nextTick(() => { + this.$refs['form_obj'].clearValidate() + }) + const _this = this req .fetchBySid(row.sid) .then(resp => { if (resp.success) { const vdata = resp.data - _this.formobj.id = vdata.id - _this.formobj.sid = vdata.sid // SID _this.formobj.applicationCode = vdata.applicationCode // 申请编号 _this.formobj.createByName = vdata.createByName // 申请人姓名 _this.formobj.applicationDate = vdata.applicationDate // 申请日期 @@ -122,13 +131,14 @@ export default { _this.formobj.modelName = vdata.modelName // 车型名称 _this.formobj.configName = vdata.configName // 常用配置名称 _this.formobj.purchasePrice = vdata.purchasePrice // 采购价格 - _this.formobj.guidedPrice = vdata.guidedPrice // 销售指导价 + _this.formobj.guidedPrice = vdata.guidedPrice // 销售指导价 _this.formobj.manufactorSettlementPrice = vdata.manufactorSettlementPrice // 厂家合同价 _this.formobj.num = vdata.num // 台数 _this.formobj.deposit = vdata.deposit // 订金 _this.formobj.expenseName = vdata.expenseName // 费用名称 _this.formobj.totalExpenseAmount = vdata.totalExpenseAmount // 费用金额合计 _this.formobj.orgSid = vdata.orgSid // 部门sid + _this.formobj.baseOutsourcingApplicationVehicleDtos = vdata.baseOutsourcingApplicationVehicleVos } }) .catch(e => { diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue index 84487dc6af..21d3db8f41 100644 --- a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/baseoutsourcingapplicationvehicle.vue @@ -1,12 +1,10 @@ @@ -66,31 +74,47 @@ import req from '@/api/baseoutsourcingapplication/baseoutsourcingapplicationvehi import ButtonBar from '@/components/ButtonBar' import Pagination from '@/components/pagination' import pageye from '@/components/pagination/pageye' -import divAdd from './baseoutsourcingapplicationvehicleAdd' -import divInfo from './baseoutsourcingapplicationvehicleInfo' export default { name: 'BaseOutsourcingApplicationVehicleIndex', components: { ButtonBar, Pagination, - pageye, - divAdd, - divInfo + pageye }, + props:{ + selectedSids:{ + type:String, + required:true + }, + modelSid:{ + type:String, + required:true + }, + configSid:{ + type:String, + required:true + } + }, data() { return { btndisabled: false, viewState: 1, // 1、列表 2、添加 3、修改 4、查看 - isSearchShow: true, + isSearchShow: false, tableLoading: false, dataList: [], + list: [], + tableKey:0, + listLoading: false, + sids: [], queryParams: { current: 1, size: 10, total: 0, params: { - sids: [], // 用于导出的时候保存已选择SID + modelSid:"", + configSid:"", + vehicleSid: "", // 用于导出的时候保存已选择SID outAppSid: '', // 外采申请单sid VIN: '' // 车架号 } @@ -102,159 +126,28 @@ export default { this.loadList() }, methods: { + getSids(){ + return this.multipleSelection; + }, resetState() { this.viewState = 1 }, - btnHandle(btnKey) { - switch (btnKey) { - case 'toAdd': - this.toAdd() - break - case 'toEdit': - this.toEdit() - break - case 'doSubmit': - this.doSubmit() - break - case 'doDel': - this.doDel() - break - case 'doImport': - this.doImport() - break - case 'doExport': - this.doExport() - break - default: - break - } - }, - toAdd(row) { - this.viewState = 2 - this.$refs['divadd'].showAdd() - }, - toEdit() { - if (this.multipleSelection.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' }) - return - } - if (this.multipleSelection.length > 1) { - this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' }) - return - } - this.viewState = 3 - const row = this.multipleSelection[0] - this.$refs['divadd'].showEdit(row) - }, - doSubmit(row) { - // 提交的代码 - this.btndisabled = true - req - .doSubmit(this.queryParams.params) - .then(resp => { - console.log(resp) - this.btndisabled = false - if (resp.success) { - // 加提交后的逻辑 - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(() => { - this.btndisabled = false - }) - }, - doDel(row) { - if (this.multipleSelection.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' }) - return - } - const _this = this - const sids = [] - this.multipleSelection.forEach(row => { - sids.push(row.sid) - }) - const tip = '请确认是否删除所选 ' + this.multipleSelection.length + ' 条记录?' - this.$confirm(tip, '提示', { - confirmButtonText: '确定', - cancelButtonText: '取消', - type: 'warning' - }) - .then(() => { - const loading = this.$loading({ - lock: true, - text: 'Loading', - spinner: 'el-icon-loading', - background: 'rgba(0, 0, 0, 0.7)' - }) - req - .delBySids(sids) - .then(resp => { - loading.close() - if (resp.success) { - _this.$message({ type: 'success', message: resp.msg, showClose: true }) - _this.loadList() - } else { - // 根据resp.code进行异常情况处理 - } - }) - .catch(e => { - loading.close() - }) - }) - .catch(() => {}) - }, - doImport(row) { - // 导入的代码 - req - .importExcel(this.queryParams.params) - .then(resp => { - if (resp.success) { - console.log(resp) - } - }) - .catch(() => {}) - }, - doExport(row) { - // 导出的代码 - const sids = [] - this.multipleSelection.forEach(row => { - sids.push(row.sid) - }) - this.queryParams.params.sids = sids - req - .exportExcel(this.queryParams.params) - .then(resp => { - if (resp.success) { - var map = resp.data - const fileName = map.filename // 导出文件名 - // // 对于标签，只有 Firefox 和 Chrome（内核） 支持 download 属性 - // // IE10以上支持blob但是依然不支持download - const link = document.createElement('a') // 创建a标签 - link.download = fileName // a标签添加属性 - link.style.display = 'none' - link.href = map.downurl - document.body.appendChild(link) - link.click() // 执行下载 - URL.revokeObjectURL(link.href) // 释放url - document.body.removeChild(link) // 释放标签 - } - }) - .catch(() => {}) - }, dosearch() { this.queryParams.current = 1 this.loadList() }, resetQuery() { - this.queryParams.params = {} - this.queryParams.params.sid = '' // sid - this.queryParams.params.name = '' // 登录名 + this.queryParams.params.vehicleSid = '' + this.queryParams.params.modelSid = '' + this.queryParams.params.configSid = '' this.dosearch() }, loadList() { const _this = this this.tableLoading = true + this.queryParams.params.vehicleSid = this.selectedSids + this.queryParams.params.modelSid = this.modelSid + this.queryParams.params.configSid = this.configSid req .listPage(this.queryParams) .then(resp => { diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue new file mode 100644 index 0000000000..93bf81ba1b --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplication.vue @@ -0,0 +1,207 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue new file mode 100644 index 0000000000..f8d27104e9 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationAdd.vue @@ -0,0 +1,453 @@ + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue new file mode 100644 index 0000000000..fedfe2c636 --- /dev/null +++ b/anrui-scm/anrui-scm-ui/src/views/baseoutsourcingapplication/workflow/baseoutsourcingapplicationInfo.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue index 934dbb8d98..0988045cff 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/chexing.vue @@ -544,7 +544,7 @@ }, handlePeizhi(row) { this.viewState = 5 - this.$refs['divGuanLianPeiZhi'].showGuanlian(row.sid, row.modelName) + this.$refs['divGuanLianPeiZhi'].showGuanlian(row ) }, handleSelectionChange(row) { const aa = [] diff --git a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue index c993e28dc5..ad5acd1b2a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue +++ b/anrui-scm/anrui-scm-ui/src/views/cheliang/chexing/relation/chexingguanlianchangyong.vue @@ -609,8 +609,6 @@ ]) }, created() { - - this.getList() // 加载列表 this.getType() }, methods: { @@ -623,12 +621,12 @@ this.searchxianshitit = '显示查询条件' } }, - showGuanlian(modelSid, modelName) { - console.log('sid:', modelSid, 'name:', modelName) - this.setRelList.modelSid = modelSid - this.checkRelieve_list.modelSid = modelSid - // this.listQuery.params.modelSid = modelSid - this.title = modelName + showGuanlian(row) { + this.setRelList.modelSid = row.sid + this.checkRelieve_list.modelSid = row.sid + this.title = row.modelName + this.listQuery.params.modelSid = row.sid + this.getList() // 加载列表 }, init() { var name = this.$store.state.modelName diff --git a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue index 8c36949c95..e3fb1202be 100644 --- a/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue +++ b/anrui-scm/anrui-scm-ui/src/views/supplychain/caigoutuiku/caigoutuiku.vue @@ -236,14 +236,6 @@ this.$refs['divadd'].showAdd() }, toEdit() { - if (this.sids.length === 0) { - this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行编辑' }) - return - } - if (this.sids.length > 1) { - this.$message({ showClose: true, type: 'error', message: '只能选择一条记录进行编辑' }) - return - } this.viewState = 3 const sid = this.sids[0] const row = this.row diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue index aa7fc89ddd..450c2ca32a 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuiku.vue @@ -218,7 +218,7 @@ type: 'success', duration: 2000 }) - this.refreshIt() + // this.refreshIt() } else { this.$notify({ title: '提示', @@ -257,7 +257,7 @@ type: 'success', duration: 2000 }) - this.refreshIt() + // this.refreshIt() } else { this.$notify({ title: '提示', @@ -296,7 +296,7 @@ type: 'success', duration: 2000 }) - this.refreshIt() + // this.refreshIt() } else { this.$notify({ title: '提示', diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue index 133de83489..fd0fa625d7 100644 --- a/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue +++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/caigoutuikuFlow/caigoutuikuEdit.vue @@ -259,7 +259,7 @@ type: 'success', duration: 2000 }) - this.refreshIt() + // this.refreshIt() } else { this.$notify({ title: '提示',