yxt_develop
/
anrui
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
fanzongzhe0036 2 months ago
parent
7076b44a7b 15a37e0c76
commit
640688fe8e
10 changed files with 568 additions and 102 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 23
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
  2. 38
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
  3. 16
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
  4. 3
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
  5. 156
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  6. 135
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
  7. 74
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
  8. 76
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
  9. 73
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
  10. 76
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue

23
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/baseinternalpurchase/BaseInternalPurchaseFeign.java
View File

@ -38,23 +38,9 @@ import io.swagger.annotations.ApiOperation;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.cloud.openfeign.SpringQueryMap;
import org.springframework.web.bind.annotation.*;
import javax.validation.Valid;
import java.util.List;
/**
* Project: anrui-base(内申请管理) <br/>
* File: BaseInternalPurchaseFeign.java <br/>
* Class: com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchaseFeign <br/>
* Description: 内购表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-06-16 13:46:25 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "内购表")
@FeignClient(
contextId = "anrui-base-BaseInternalPurchase",
@ -72,12 +58,12 @@ public interface BaseInternalPurchaseFeign {
@PostMapping("/save")
@ResponseBody
public ResultBean save(@RequestBody BaseInternalPurchaseDto dto);
@ApiOperation("根据sid删除记录")
@DeleteMapping("/delBySids")
@ResponseBody
public ResultBean delBySids(@RequestBody String[] sids);
@ApiOperation("根据SID获取一条记录")
@GetMapping("/fetchDetailsBySid/{sid}")
@ResponseBody
@ -91,6 +77,7 @@ public interface BaseInternalPurchaseFeign {
/**
* 申请方审批同意、应对方审批同意（除申请方最后一个环节）
*
* @param bvd
* @return
*/
@ -100,6 +87,7 @@ public interface BaseInternalPurchaseFeign {
/**
* 申请方跳应对方的同意
*
* @param bvd
* @return
*/
@ -109,6 +97,7 @@ public interface BaseInternalPurchaseFeign {
/**
* 分公司到事业部同意
*
* @param bvd
* @return
*/
@ -138,6 +127,6 @@ public interface BaseInternalPurchaseFeign {
@ApiOperation(value = "移动端调车详情")
@PostMapping(value = "/getCompanyShunting/{sid}")
ResultBean<AppCompanyShuntingVo> getCompanyShunting(@PathVariable("sid")String sid);
ResultBean<AppCompanyShuntingVo> getCompanyShunting(@PathVariable("sid") String sid);
}

38
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/baseaccadjapply/BaseAccadjApplyService.java
View File

@ -28,7 +28,6 @@ package com.yxt.anrui.base.biz.baseaccadjapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.TypeReference;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.base.api.baseaccadjapply.*;
@ -37,25 +36,13 @@ import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeQuery;
import com.yxt.anrui.base.api.baseaccadjapply.flow.GetNodeVo;
import com.yxt.anrui.base.api.baseaccadjapply.flow.SubmitBaseAccAdjApplyDto;
import com.yxt.anrui.base.api.baseaccadjapplyeveh.BaseAccadjApplyeVeh;
import com.yxt.anrui.base.api.baseinternalpurchase.BaseInternalPurchase;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicle;
import com.yxt.anrui.base.api.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleDetailsVo;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturer;
import com.yxt.anrui.base.api.basemanufacturer.BaseManufacturerDetailsVo;
import com.yxt.anrui.base.api.basemanufacturerbank.BaseManPayVo;
import com.yxt.anrui.base.api.baseoutsourcingapplication.BaseOutsourcingApplicationDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicle;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleFeign;
import com.yxt.anrui.base.api.basevehicle.BaseVehicleSelectVo;
import com.yxt.anrui.base.api.basevehiclebrand.BaseVehicleBrand;
import com.yxt.anrui.base.api.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.basevehinstall.BaseVehinstallDetailsVo;
import com.yxt.anrui.base.biz.baseaccadjapplyeveh.BaseAccadjApplyeVehService;
import com.yxt.anrui.base.biz.baseinternalpurchase.BaseInternalPurchaseService;
import com.yxt.anrui.base.biz.baseinternalpurchasevehicle.BaseInternalPurchaseVehicleService;
import com.yxt.anrui.base.biz.basemanufacturer.BaseManufacturerService;
import com.yxt.anrui.base.biz.basemanufacturerbank.BaseManufacturerBankService;
import com.yxt.anrui.base.biz.basepurchasesystem.BasePurchaseSystemService;
import com.yxt.anrui.base.biz.basevehicle.BaseVehicleService;
@ -80,7 +67,6 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
@ -88,43 +74,24 @@ import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.portal.api.sysuser.UserQuery;
import com.yxt.anrui.portal.api.sysuser.UserRoleQuery;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryDto;
import com.yxt.anrui.scm.api.scmapplyinboundquery.ScmApplyInboundQueryFeign;
import com.yxt.anrui.scm.api.scmapplyinboundvehicle.ScmApplyInboundVehicleDto;
import com.yxt.anrui.scm.api.scmapplyinboundvehquery.ScmApplyInboundVehQueryDto;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseFeign;
import com.yxt.anrui.scm.api.scmwarehouse.ScmWarehouseVo;
import com.yxt.common.base.utils.HanZiConverterPinYin;
import org.apache.commons.lang3.StringUtils;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;
/**
* Project: anrui-base(调账管理) <br/>
* File: BaseAccadjApplyService.java <br/>
* Class: com.yxt.anrui.base.biz.baseaccadjapply.BaseAccadjApplyService <br/>
* Description: 调账申请表 业务逻辑. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-07-07 16:57:24 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Service
public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMapper, BaseAccadjApply> {
@ -1083,6 +1050,7 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
return rb.setMsg("参数错误：userSid");
}
BaseAccadjApply baseAccadjApply = fetchBySid(query.getBusinessSid());
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
if (query.getUserSid().equals(baseAccadjApply.getCreateBySid())) {
FlowTaskVo flowTaskVo = new FlowTaskVo();
BeanUtil.copyProperties(query, flowTaskVo);
@ -1092,9 +1060,11 @@ public class BaseAccadjApplyService extends MybatisBaseService<BaseAccadjApplyMa
}
Map<String, Object> map = BeanUtil.beanToMap(resultBean.getData());
updateFlowFiled(map);
for (String purchaseSid : purchaseSids) {
baseInternalPurchaseVehicleService.updateIsAccadj(purchaseSid, "0");
}
return rb.success().setData(resultBean.getData());
}
List<String> purchaseSids = baseAccadjApplyeVehService.fetchByMainSid(baseAccadjApply.getSid());
String businessTaskId = baseAccadjApply.getTaskId();
if (StringUtils.isNotBlank(businessTaskId)) {
if (businessTaskId.equals(query.getTaskId())) {

16
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehrebate/ScmVehRebateFeign.java
View File

@ -25,8 +25,6 @@
*********************************************************/
package com.yxt.anrui.scm.api.scmvehrebate;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithQuery;
import com.yxt.anrui.scm.api.scmvehrebatewith.ScmVehRebateWithVo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery;
@ -35,25 +33,11 @@ import com.yxt.common.core.vo.PagerVo;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.text.ParseException;
import java.util.List;
/**
* Project: anrui-scm(单车返利) <br/>
* File: ScmVehRebateFeign.java <br/>
* Class: com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateFeign <br/>
* Description: 单车返利表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-08-24 09:01:54 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Api(tags = "单车返利表")
@FeignClient(
contextId = "anrui-scm-ScmVehRebate",

3
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateMapper.xml
View File

@ -156,8 +156,7 @@
SELECT
*,
expectItureCost + expectTreatCost + expectSuppCost AS expectCost,
onceItureCost + onceTreatCost + onceSuppCost AS money,
IF(uploadDate )
onceItureCost + onceTreatCost + onceSuppCost AS money
FROM
scm_special_rebate
<where>

156
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
View File

@ -151,6 +151,54 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (StringUtils.isNotBlank(query.getState())) {
qw.eq("state", query.getState());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.eq("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
String withholdingDate = query.getWithholdingDate().replace("-", "年") + "月";
qw.eq("withholdingDate", withholdingDate);
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
} else {
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.eq("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
} else {
qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
}
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")) {
qw.isNotNull("secondaryUploadMoney");
qw.ne("secondaryUploadMoney", "");
qw.ne("secondaryUploadMoney", 0);
qw.eq("isAdjustment", "是");
} else {
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
}
}
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
or().
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
@ -373,6 +421,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
return p;
}
}
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("createOrgName", query.getCreateOrgName());
}
@ -391,13 +441,59 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.eq("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
String withholdingDate = query.getWithholdingDate().replace("-", "年") + "月";
qw.eq("withholdingDate", withholdingDate);
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
} else {
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.eq("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
} else {
qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
}
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")) {
qw.isNotNull("secondaryUploadMoney");
qw.ne("secondaryUploadMoney", "");
qw.ne("secondaryUploadMoney", 0);
qw.eq("isAdjustment", "是");
} else {
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
}
}
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
or().
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
qw.orderByDesc("createTime");
IPage<ScmSpecialRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmSpecialRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@ -455,6 +551,8 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
return p;
}
}
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
if (StringUtils.isNotBlank(query.getCreateOrgName())) {
qw.like("createOrgName", query.getCreateOrgName());
}
@ -473,13 +571,59 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.eq("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
String withholdingDate = query.getWithholdingDate().replace("-", "年") + "月";
qw.eq("withholdingDate", withholdingDate);
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
} else {
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.eq("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
} else {
qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
}
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")) {
qw.isNotNull("secondaryUploadMoney");
qw.ne("secondaryUploadMoney", "");
qw.ne("secondaryUploadMoney", 0);
qw.eq("isAdjustment", "是");
} else {
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
}
}
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
or().
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
qw.orderByDesc("createTime");
List<ScmSpecialRebateVo> scmSpecialRebateVoList = baseMapper.checkApplyGetSpecialRebateAll(qw);
for (ScmSpecialRebateVo record : scmSpecialRebateVoList) {
@ -831,10 +975,6 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已存在");
break;
}
if (scmSpecialRebateVo.getOnceCheckState() == 1) {
checkWord.add("返利名称" + excelInfo.getRebateName() + "导入的返利信息已调整");
break;
}
if (StringUtils.isBlank(excelInfo.getPurchaseSystemName())) {
checkWord.add("采购系统不能为空");
break;

135
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehrebate/ScmVehRebateService.java
View File

@ -54,7 +54,6 @@ import org.apache.poi.xssf.usermodel.XSSFWorkbook;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.File;
@ -150,10 +149,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.like("purchaseSystemName", query.getPurchaseSystemName());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.like("palceGenDate", query.getPalceGenDate());
qw.eq("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
qw.like("withholdingDate", query.getWithholdingDate());
String withholdingDate = query.getWithholdingDate().replace("-", "年") + "月";
qw.eq("withholdingDate", withholdingDate);
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
@ -166,7 +166,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.like("isAdjustment", query.getIsAdjustment());
qw.eq("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
@ -179,15 +179,15 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")){
//qw.eq()
if (query.getSecondUploadState().equals("是")) {
qw.isNotNull("secondaryUploadMoney");
qw.ne("secondaryUploadMoney", "");
qw.ne("secondaryUploadMoney", 0);
qw.eq("isAdjustment", "是");
} else {
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
}
}
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
@ -196,6 +196,11 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.orderByDesc("createTime");
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@ -378,6 +383,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
}
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
@ -399,13 +406,59 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.eq("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
String withholdingDate = query.getWithholdingDate().replace("-", "年") + "月";
qw.eq("withholdingDate", withholdingDate);
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
} else {
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.eq("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
} else {
qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
}
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")) {
qw.isNotNull("secondaryUploadMoney");
qw.ne("secondaryUploadMoney", "");
qw.ne("secondaryUploadMoney", 0);
qw.eq("isAdjustment", "是");
} else {
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
}
}
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
or().
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
qw.orderByDesc("createTime");
IPage<ScmVehRebate> page = PagerUtil.queryToPage(pq);
IPage<ScmVehRebateVo> pagging = baseMapper.selectPageVo(page, qw);
@ -463,6 +516,8 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
return p;
}
}
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
if (StringUtils.isNotBlank(query.getBrandName())) {
qw.like("brandName", query.getBrandName());
}
@ -484,13 +539,59 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
if (StringUtils.isNotBlank(query.getUseOrgName())) {
qw.like("useOrgName", query.getUseOrgName());
}
if (StringUtils.isNotBlank(query.getPalceGenDate())) {
qw.eq("palceGenDate", query.getPalceGenDate());
}
if (StringUtils.isNotBlank(query.getWithholdingDate())) {
String withholdingDate = query.getWithholdingDate().replace("-", "年") + "月";
qw.eq("withholdingDate", withholdingDate);
}
if (StringUtils.isNotBlank(query.getUploadState())) {
if (query.getUploadState().equals("未上传")) {
qw.and(wrapper -> wrapper.eq("uploadDate", "")
.or().isNull("uploadDate")
);
} else {
qw.ne("uploadDate", "");
qw.isNotNull("uploadDate");
}
}
if (StringUtils.isNotBlank(query.getIsAdjustment())) {
qw.eq("isAdjustment", query.getIsAdjustment());
}
if (StringUtils.isNotBlank(query.getIsUploadFinish())) {
if (query.getIsUploadFinish().equals("是")) {
qw.eq("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
} else {
qw.ne("estimateRebate - uploadMoney - secondaryUploadMoney + adjustmentMoney", 0);
}
}
if (StringUtils.isNotBlank(query.getOnceCheckState())) {
qw.eq("onceCheckState", query.getOnceCheckState());
}
if (StringUtils.isNotBlank(query.getSecondUploadState())) {
if (query.getSecondUploadState().equals("是")) {
qw.isNotNull("secondaryUploadMoney");
qw.ne("secondaryUploadMoney", "");
qw.ne("secondaryUploadMoney", 0);
qw.eq("isAdjustment", "是");
} else {
qw.and(wrapper -> wrapper.eq("isAdjustment", '否').or().isNull("secondaryUploadMoney").or().eq("secondaryUploadMoney", ""));
}
}
String uploadStartDate = query.getUploadStartDate();
String uploadEndDate = query.getUploadEndDate();
qw.apply(StringUtils.isNotBlank(uploadStartDate), "date_format (uploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (uploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')").
or().
apply(StringUtils.isNotBlank(uploadStartDate), "date_format (secondaryUploadDate,'%Y-%m-%d') >= date_format('" + uploadStartDate + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(uploadEndDate), "date_format (secondaryUploadDate,'%Y-%m-%d') <= date_format('" + uploadEndDate + "','%Y-%m-%d')"
);
String createStartTime = query.getCreateStartTime();
String createEndTime = query.getCreateEndTime();
qw.apply(StringUtils.isNotBlank(createStartTime), "date_format (createTime,'%Y-%m-%d') >= date_format('" + createStartTime + "','%Y-%m-%d')").
apply(StringUtils.isNotBlank(createEndTime), "date_format (createTime,'%Y-%m-%d') <= date_format('" + createEndTime + "','%Y-%m-%d')"
);
qw.eq("state", 2);
qw.eq("adjustmentState", 0);
qw.orderByDesc("createTime");
List<ScmVehRebateVo> scmVehRebateVoList = baseMapper.checkApplyGetVehRebateAll(qw);
for (ScmVehRebateVo record : scmVehRebateVoList) {
@ -1606,7 +1707,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())){
if (StringUtils.isNotBlank(excelInfo.getUploadDate()) && StringUtils.isNotBlank(excelInfo.getUploadMoney())) {
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
//上传返利金额
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getOnceTreatCost())).subtract(new BigDecimal(excelInfo.getOnceSuppCost()));
@ -2099,7 +2200,7 @@ public class ScmVehRebateService extends MybatisBaseService<ScmVehRebateMapper,
break;
}
}
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())){
if (StringUtils.isNotBlank(excelInfo.getSecondaryUploadDate()) && StringUtils.isNotBlank(excelInfo.getSecondaryUploadMoney())) {
int i = new BigDecimal(excelInfo.getStayDetermineMoney()).compareTo(BigDecimal.ZERO);
//上传返利金额
BigDecimal scflje = new BigDecimal(excelInfo.getUploadMoney()).add(new BigDecimal(excelInfo.getSecondaryUploadMoney())).subtract(new BigDecimal(excelInfo.getStayDetermineMoney())).subtract(new BigDecimal(excelInfo.getQzMoney())).subtract(new BigDecimal(excelInfo.getSecondTreatCost())).subtract(new BigDecimal(excelInfo.getSecondSuppCost()));

74
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobechecked.vue
View File

@ -11,7 +11,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
</el-form-item>
@ -29,6 +29,17 @@
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="所属年月">
<el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-input v-model="listQuery.params.rebateTypeValue" placeholder="" clearable/>
</el-form-item>
@ -40,6 +51,31 @@
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@ -431,6 +467,26 @@ export default {
dictValue: '是'
}
],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
listLoading: false,
listQuery: {
params: {
@ -444,6 +500,14 @@ export default {
state: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -584,6 +648,14 @@ export default {
state: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

76
anrui-scm/anrui-scm-ui/src/views/bikerebate/bikerebatemanagement/bicyclerebatemanagement.vue
View File

@ -7,7 +7,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>
@ -28,6 +28,17 @@
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="所属年月">
<el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -36,11 +47,36 @@
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="流程状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@ -238,6 +274,26 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
state_list: [
{
dictKey: '0',
@ -272,6 +328,14 @@ export default {
vinNo: '',
vehModelName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -399,6 +463,14 @@ export default {
vinNo: '',
vehModelName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

73
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobechecked.vue
View File

@ -11,7 +11,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>
@ -34,9 +34,40 @@
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="所属年月">
<el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
@ -83,7 +114,7 @@
<el-table-column prop="money" label="上传" align="center" width="100" />
</el-table-column>
<el-table-column label="日期" align="center">
<el-table-column prop="createTime" label="创建日期" align="center" width="95" />
<el-table-column prop="createTime" label="创建" align="center" width="95" />
<el-table-column prop="withholdingDate" label="预提" align="center" width="95" />
<el-table-column prop="uploadDate" label="上传" align="center" width="95" />
<el-table-column prop="secondaryUploadDate" label="二次上传" align="center" width="95" />
@ -410,6 +441,26 @@ export default {
sids: [],
FormLoading: false,
rebateType_list: [],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
state_list: [
{
dictKey: '0',
@ -436,6 +487,14 @@ export default {
onceCheckState: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -583,6 +642,14 @@ export default {
onceCheckState: '',
createEndTime: '',
createStartTime: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

76
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatemanagement/specialrebatemanagement.vue
View File

@ -7,7 +7,7 @@
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="分公司">
<el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
</el-form-item>
@ -22,6 +22,17 @@
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.createEndTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="所属年月">
<el-date-picker v-model="listQuery.params.palceGenDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="预提年月">
<el-date-picker v-model="listQuery.params.withholdingDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="上传日期">
<el-date-picker v-model="listQuery.params.uploadStartDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
<span style="padding: 0 8px">至</span>
<el-date-picker v-model="listQuery.params.uploadEndDate" type="month" clearable format="yyyy-MM" value-format="yyyy-MM" placeholder="选择日期"/>
</el-form-item>
<el-form-item label="返利类型">
<el-select v-model="listQuery.params.rebateTypeKey" placeholder="请选择" filterable clearable>
<el-option v-for="item in rebateType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
@ -30,11 +41,36 @@
<el-form-item label="返利名称">
<el-input v-model="listQuery.params.rebateName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="状态">
<el-form-item label="流程状态">
<el-select v-model="listQuery.params.state" placeholder="请选择" filterable clearable>
<el-option v-for="item in state_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="上传状态">
<el-select v-model="listQuery.params.uploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in uploadState_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否调整">
<el-select v-model="listQuery.params.isAdjustment" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="是否上传完成">
<el-select v-model="listQuery.params.isUploadFinish" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="一次核对状态">
<el-select v-model="listQuery.params.onceCheckState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
<el-form-item label="二次上传状态">
<el-select v-model="listQuery.params.secondUploadState" placeholder="请选择" filterable clearable>
<el-option v-for="item in whether_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
</el-select>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" @click="handleFilter" size="small">查询</el-button>
@ -213,6 +249,26 @@ export default {
FormLoading: false,
listLoading: false,
rebateType_list: [],
uploadState_list: [
{
dictKey: '1',
dictValue: '已上传'
},
{
dictKey: '0',
dictValue: '未上传'
}
],
whether_list: [
{
dictKey: '1',
dictValue: '是'
},
{
dictKey: '0',
dictValue: '否'
}
],
state_list: [
{
dictKey: '0',
@ -254,6 +310,14 @@ export default {
createOrgName: '',
purchaseSystemName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''
@ -385,6 +449,14 @@ export default {
createOrgName: '',
purchaseSystemName: '',
brandName: '',
palceGenDate: '',
withholdingDate: '',
uploadStartDate: '',
uploadEndDate: '',
uploadState: '',
isAdjustment: '',
isUploadFinish: '',
secondUploadState: '',
orgPath: '',
userSid: '',
menuUrl: ''

Write Preview
Loading…
Cancel
Save