diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java index 82345599a0..f64e258244 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDetailsVo.java @@ -54,6 +54,8 @@ public class ScmVehRebateDetailsVo implements Vo { private String sid; // sid + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("创建日期") @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8") private Date createTime; // 创建日期 diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java index 33010a6be5..8f0e06810b 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateDto.java @@ -51,30 +51,24 @@ import java.util.List; @ApiModel(value = "单车返利表 数据传输对象", description = "单车返利表 数据传输对象") public class ScmVehRebateDto implements Dto { + @ApiModelProperty("创建人sid") + private String createBySid; @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key + private String rebateTypeKey; @ApiModelProperty("返利类型value") - private String rebateTypeValue; // 返利类型value + private String rebateTypeValue; @ApiModelProperty("返利名称") - private String rebateName; // 返利名称 + private String rebateName; @ApiModelProperty("计算标准") - private String calculationStandard; // 计算标准 + private String calculationStandard; @ApiModelProperty("所属年月") - private String palceGenDate; // 所属年月 + private String palceGenDate; @ApiModelProperty("计算方式key") - private String calculationModeKey; // 计算方式key + private String calculationModeKey; @ApiModelProperty("计算方式Value") - private String calculationModeValue; // 计算方式Value - @ApiModelProperty("使用组织sid") - private String useOrgSid; // 使用组织sid - @ApiModelProperty("使用组织名称") - private String useOrgName; // 使用组织名称 - @ApiModelProperty("创建组织sid") - private String createOrgSid; // 创建组织sid - @ApiModelProperty("创建组织名称") - private String createOrgName; // 创建组织名称 + private String calculationModeValue; @ApiModelProperty("组织全路径") private String orgPath; @ApiModelProperty("单车返利车辆信息") - private List scmVehRebateVehs; // 单车返利车辆信息 + private List scmVehRebateVehs; } \ No newline at end of file diff --git a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java index 1e4a133d15..bf9805e3f8 100644 --- a/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java +++ b/anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateQuery.java @@ -52,25 +52,23 @@ import java.util.List; public class ScmVehRebateQuery implements Query { @ApiModelProperty("品牌sid") - private String brandSid; // 品牌sid + private String brandSid; @ApiModelProperty("车型名称") - private String vehModelName; // 车型名称 + private String vehModelName; @ApiModelProperty("车架号") - private String vinNo; // 车架号 + private String vinNo; @ApiModelProperty("创建开始日期") - private String createStartTime; // 创建开始日期 + private String createStartTime; @ApiModelProperty("创建结束日期") - private String createEndTime; // 创建结束日期 + private String createEndTime; @ApiModelProperty("返利类型key") - private String rebateTypeKey; // 返利类型key + private String rebateTypeKey; @ApiModelProperty("返利名称") - private String rebateName; // 返利名称 + private String rebateName; @ApiModelProperty("状态") - private String state; // 状态 - @ApiModelProperty("是否调整") - private String isAdjustment; // 是否调整 + private String state; @ApiModelProperty("单车返利sid") - private List sidList; // 单车返利sid + private List sidList; private String userSid; private String orgPath; diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java index 0f21795847..74cdb8ff4d 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateMapper.java @@ -54,9 +54,6 @@ import java.util.List; @Mapper public interface ScmVehRebateMapper extends BaseMapper { - //@Update("update scm_veh_rebate set name=#{msg} where id=#{id}") - //IPage voPage(IPage page, @Param(Constants.WRAPPER) QueryWrapper qw); - IPage selectPageVo(IPage page, @Param(Constants.WRAPPER) Wrapper qw); List selectListAllVo(@Param(Constants.WRAPPER) Wrapper qw); diff --git a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java index 35a56c5857..157a383893 100644 --- a/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java +++ b/anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java @@ -30,6 +30,9 @@ import cn.hutool.core.date.DateTime; import cn.hutool.core.date.DateUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign; +import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo; +import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign; import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery; import com.yxt.anrui.portal.api.sysuser.SysUserFeign; import com.yxt.anrui.scm.api.scmcollectionrebate.ScmCollectionRebateVo; @@ -65,13 +68,10 @@ public class ScmVehRebateService extends MybatisBaseService createQueryWrapper(ScmVehRebateQuery query) { - // todo: 这里根据具体业务调整查询条件 - // 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName())); - QueryWrapper qw = new QueryWrapper<>(); - return qw; - } + @Autowired + private SysStaffOrgFeign sysStaffOrgFeign; + @Autowired + private SysOrganizationFeign sysOrganizationFeign; public PagerVo listPageVo(PagerQuery pq) { ScmVehRebateQuery query = pq.getParams(); @@ -403,16 +403,16 @@ public class ScmVehRebateService extends MybatisBaseService { console.log('列表查询结果:', response) this.listLoading = false @@ -277,9 +282,12 @@ export default { handleReset() { this.listQuery = { params: { - createBySid: '', + brandSid: '', createEndTime: '', - createStartTime: '' + createStartTime: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue index 6b434311cb..553cc19b93 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue @@ -93,7 +93,7 @@ import danchefanliselect from './relation/danchefanliselect' import danchefanliAdd from './relation/danchefanliAdd' export default { - name: 'bicyclerebatewithholdingAdd', + name: 'BicycleRebateWithholdingAdd', components: { danchefanliselect, danchefanliAdd @@ -120,6 +120,7 @@ export default { createBySid: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmVehRebateWiths: [] }, rules: {}, @@ -159,6 +160,7 @@ export default { this.formobj.createOrgSid = createOrgSid this.formobj.useOrgSid = createOrgSid this.formobj.createByName = window.sessionStorage.getItem('name') + this.formobj.orgPath = window.sessionStorage.getItem('defaultOrgPath') this.viewTitle = '【新增】预提申请' }, showEdit(row) { @@ -392,6 +394,7 @@ export default { createBySid: '', instanceId: '', // 流程实例ID taskId: '', // 任务ID + orgPath: '', scmVehRebateWiths: [] } this.$refs['form_obj'].resetFields() diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue index af227002f4..9c0d279866 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingInfo.vue @@ -81,7 +81,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding' import danchefanliInfo from './relation/danchefanliInfo' export default { - name: 'bicyclerebatewithholdingInfo', + name: 'BicycleRebateWithholdingInfo', components: { danchefanliInfo }, diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue index 4c35b05ff0..44594b4611 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliAdd.vue @@ -85,7 +85,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding' export default { - name: 'danchefanliAdd', + name: 'DanCheFanLiAdd', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue index a763bfeb99..b1d0a15470 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliInfo.vue @@ -83,7 +83,7 @@ import req from '@/api/bikerebate/bicyclerebatewithholding' export default { - name: 'danchefanliInfo', + name: 'DanCheFanLiInfo', data() { return { viewTitle: '', diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue index cffcbe2c30..d27a736db4 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/relation/danchefanliselect.vue @@ -115,7 +115,7 @@ import ButtonBar from '@/components/ButtonBar' import { typeValues } from '@/api/cheliang/dictcommons' export default { - name: 'danchefanliSelect', + name: 'DanCheFanLiSelect', components: { Pagination, ButtonBar diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue index 7cc1a0a3be..627631bedd 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue @@ -195,7 +195,7 @@ import bicyclerebatemanagementEdit from './bicyclerebatemanagementEdit' import bicyclerebatemanagementInfo from './bicyclerebatemanagementInfo' export default { - name: 'bicyclerebatemanagement', + name: 'BicycleRebateManagement', components: { Pagination, pageye, @@ -264,7 +264,6 @@ export default { ], listQuery: { params: { - createOrgSid: '', createEndTime: '', createStartTime: '', rebateName: '', @@ -272,7 +271,10 @@ export default { state: '', vinNo: '', vehModelName: '', - brandSid: '' + brandSid: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -297,8 +299,7 @@ export default { }) getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => { if (resp.success) { - this.listQuery.params.createOrgSid = resp.data - brandDown({ useOrg: this.listQuery.params.createOrgSid }).then((res) => { + brandDown({ useOrg: resp.data }).then((res) => { if (res.success) { this.brand_list = res.data } @@ -352,6 +353,9 @@ export default { // 查询列表信息 getList() { this.listLoading = true + this.listQuery.params.userSid = window.sessionStorage.getItem('userSid') + this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath') + this.listQuery.params.menuUrl = this.$route.path req.listPage(this.listQuery).then((response) => { console.log('列表查询结果:', response) this.listLoading = false @@ -372,7 +376,6 @@ export default { handleReset() { this.listQuery = { params: { - createOrgSid: '', createEndTime: '', createStartTime: '', rebateName: '', @@ -380,7 +383,10 @@ export default { state: '', vinNo: '', vehModelName: '', - brandSid: '' + brandSid: '', + orgPath: '', + userSid: '', + menuUrl: '' }, current: 1, size: 5, @@ -390,7 +396,7 @@ export default { }, toAdd() { this.viewState = 2 - this.$refs['divAdd'].showAdd(this.listQuery.params.createOrgSid) + this.$refs['divAdd'].showAdd() }, toEdit(row) { this.viewState = 3 diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue index 8c7148cc26..b3005d3554 100644 --- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue +++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagementAdd.vue @@ -110,11 +110,11 @@