Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 6 days ago
parent
commit
7f59fa0eb1
  1. 3
      anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue
  2. 3
      anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue
  3. 7
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java
  4. 9
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java
  5. 141
      anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java
  6. 16
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java
  7. 24
      anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java
  8. 167
      anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js
  9. 7
      anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js
  10. 27
      anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue
  11. 27
      anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

3
anrui-riskcenter-ui/src/views/buyback/buybackAdd.vue

@ -300,7 +300,8 @@ export default {
// -- // --
calculateSettleAll() { calculateSettleAll() {
let money = 0 let money = 0
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 // = + + + + + + + + -
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100
return money return money
}, },
// //

3
anrui-riskcenter-ui/src/views/workFlow/huigouFlow/buybackEdit.vue

@ -299,7 +299,8 @@ export default {
// -- // --
calculateSettleAll() { calculateSettleAll() {
let money = 0 let money = 0
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100 // = + + + + + + + + -
money = Math.round((parseFloat(money) + parseFloat(this.formobj.companyCostVo.overduePrice === '' ? 0 : this.formobj.companyCostVo.overduePrice) + parseFloat(this.formobj.companyCostVo.funfCost === '' ? 0 : this.formobj.companyCostVo.funfCost) + parseFloat(this.formobj.companyCostVo.bankOverInterest === '' ? 0 : this.formobj.companyCostVo.bankOverInterest) + parseFloat(this.formobj.companyCostVo.companyCurrentNotPrice === '' ? 0 : this.formobj.companyCostVo.companyCurrentNotPrice) + parseFloat(this.formobj.companyCostVo.bankNotPrice === '' ? 0 : this.formobj.companyCostVo.bankNotPrice) + parseFloat(this.formobj.companyCostVo.deductionAmount === '' ? 0 : this.formobj.companyCostVo.deductionAmount) + parseFloat(this.formobj.companyCostVo.companyNominalPrice === '' ? 0 : this.formobj.companyCostVo.companyNominalPrice) + parseFloat(this.formobj.companyCostVo.contractLiquidated === '' ? 0 : this.formobj.companyCostVo.contractLiquidated) + parseFloat(this.formobj.companyCostVo.companyOtherPrice === '' ? 0 : this.formobj.companyCostVo.companyOtherPrice) - parseFloat(this.formobj.companyCostVo.loanDeposit === '' ? 0 : this.formobj.companyCostVo.loanDeposit)) * 100) / 100
return money return money
}, },
// //

7
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansecondarysalesnotapply/LoanSecondarySalesNotApplyService.java

@ -38,15 +38,10 @@ import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign; import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign; import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderreturnveh.BusSalesOrderReturnVehDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehApplyDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderreturnvehapply.BusSalesOrderReturnVehPdfVo;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign; import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.finpaymentapplydetailsbelow.FinPaymentapplyDetailsBelowDetailsVo;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo; import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordSourceLCVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedDto;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign; import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign; import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
@ -72,7 +67,6 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo; import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile; import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum; import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanoutboundapply.LoanOutboundApply;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails; import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply; import com.yxt.anrui.riskcenter.api.loanrepurchaseapply.LoanRepurchaseApply;
import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost; import com.yxt.anrui.riskcenter.api.loanrepurchasecost.LoanRepurchaseCost;
@ -157,7 +151,6 @@ public class LoanSecondarySalesNotApplyService extends MybatisBaseService<LoanSe
private MessageListFeign messageListFeign; private MessageListFeign messageListFeign;
@Autowired @Autowired
private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp; private com.yxt.anrui.portal.api.flow.FlowableFeign flowableFeignSp;
@Autowired @Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign; private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired @Autowired

9
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeign.java

@ -25,6 +25,7 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebate; package com.yxt.anrui.scm.api.scmspecialrebate;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
@ -43,8 +44,7 @@ import java.util.List;
@FeignClient( @FeignClient(
contextId = "anrui-scm-ScmSpecialRebate", contextId = "anrui-scm-ScmSpecialRebate",
name = "anrui-scm", name = "anrui-scm",
path = "v1/scmspecialrebate", path = "v1/scmspecialrebate")
fallback = ScmSpecialRebateFeignFallback.class)
public interface ScmSpecialRebateFeign { public interface ScmSpecialRebateFeign {
@ApiOperation("根据条件分页查询数据的列表") @ApiOperation("根据条件分页查询数据的列表")
@ -77,6 +77,11 @@ public interface ScmSpecialRebateFeign {
@ResponseBody @ResponseBody
public ResultBean<ScmSpecialRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid); public ResultBean<ScmSpecialRebateDetailsVo> fetchDetailsBySid(@PathVariable("sid") String sid);
@ApiOperation("清空")
@GetMapping("/clear/{sid}")
@ResponseBody
public ResultBean<ScmVehRebateDetailsVo> clear(@PathVariable("sid") String sid);
@ApiOperation("专项返利未预提申请选择专项返利信息") @ApiOperation("专项返利未预提申请选择专项返利信息")
@PostMapping("/withApplyGetSpecialRebate") @PostMapping("/withApplyGetSpecialRebate")
@ResponseBody @ResponseBody

141
anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmspecialrebate/ScmSpecialRebateFeignFallback.java

@ -1,141 +0,0 @@
/*********************************************************
*********************************************************
******************** *******************
************* ************
******* _oo0oo_ *******
*** o8888888o ***
* 88" . "88 *
* (| -_- |) *
* 0\ = /0 *
* ___/`---'\___ *
* .' \\| |// '. *
* / \\||| : |||// \ *
* / _||||| -:- |||||- \ *
* | | \\\ - /// | | *
* | \_| ''\---/'' |_/ | *
* \ .-\__ '-' ___/-. / *
* ___'. .' /--.--\ `. .'___ *
* ."" '< `.___\_<|>_/___.' >' "". *
* | | : `- \`.;`\ _ /`;.`/ - ` : | | *
* \ \ `_. \_ __\ /__ _/ .-` / / *
* =====`-.____`.___ \_____/___.-`___.-'===== *
* `=---=' *
* ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ *
*********__佛祖保佑__永无BUG__验收通过__钞票多多__*********
*********************************************************/
package com.yxt.anrui.scm.api.scmspecialrebate;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
import org.springframework.stereotype.Component;
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: ScmSpecialRebateFeignFallback.java <br/>
* Class: com.yxt.anrui.scm.api.scmspecialrebate.ScmSpecialRebateFeignFallback <br/>
* Description: 专项返利表. <br/>
* Copyright: Copyright (c) 2011 <br/>
* Company: https://gitee.com/liuzp315 <br/>
* Makedate: 2022-09-08 16:11:43 <br/>
*
* @author liupopo
* @version 1.0
* @since 1.0
*/
@Component
public class ScmSpecialRebateFeignFallback implements ScmSpecialRebateFeign {
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> listPage(PagerQuery<ScmSpecialRebateQuery> pq){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmspecialrebate/listPage无法访问");
}
@Override
public ResultBean<List<ScmSpecialRebateVo>> listAll(ScmSpecialRebateQuery query) {
return null;
}
@Override
public ResultBean save(ScmSpecialRebateDto dto){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/save无法访问");
}
@Override
public ResultBean adjustment(ScmSpecialRebateSpecialAdjDto dto) {
return null;
}
@Override
public ResultBean delBySids( String[] sids){
return ResultBean.fireFail().setMsg("接口anrui-scm/scmspecialrebate/delBySids无法访问");
}
@Override
public ResultBean<ScmSpecialRebateDetailsVo> fetchDetailsBySid(String sid){
ResultBean rb = ResultBean.fireFail();
return rb.setMsg("接口anrui-scm/scmspecialrebate/fetchDetailsBySid无法访问");
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
@Override
public ResultBean<List<ScmSpecialRebateVo>> checkApplyGetSpecialRebateAll(ScmSpecialRebateQuery query) {
return null;
}
@Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> checkApplyGetAlreadyUploadSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
@Override
public ResultBean<PagerVo<ScmStayDisRebateVo>> stayDisRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
return null;
}
@Override
public void downloadExcel() {
}
@Override
public ResultBean getExcelInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException {
return null;
}
@Override
public void excelListOne(ScmSpecialRebateQuery scmSpecialRebateQuery) {
}
@Override
public ResultBean getExcelOneInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException {
return null;
}
@Override
public void excelListTwo(ScmSpecialRebateQuery scmSpecialRebateQuery) {
}
@Override
public ResultBean getExcelTwoInfo(MultipartFile file, HttpServletRequest request, String userSid, String orgPath) throws IOException, ParseException {
return null;
}
}

16
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateRest.java

@ -25,14 +25,8 @@
*********************************************************/ *********************************************************/
package com.yxt.anrui.scm.biz.scmspecialrebate; package com.yxt.anrui.scm.biz.scmspecialrebate;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateUtil;
import com.yxt.anrui.scm.api.scmspecialrebate.*; import com.yxt.anrui.scm.api.scmspecialrebate.*;
import com.yxt.anrui.scm.api.scmspecialrebatecheckapply.SpecialRebateCheckExcelVo; import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateDetailsVo;
import com.yxt.anrui.scm.api.scmspecialrebatewithapply.ScmSpecialRebateWithApply;
import com.yxt.anrui.scm.api.scmvehrebate.ScmVehRebateExcelVo;
import com.yxt.anrui.scm.biz.scmspecialrebatewith.ScmSpecialRebateWithService;
import com.yxt.anrui.scm.biz.scmspecialrebatewithapply.ScmSpecialRebateWithApplyService;
import com.yxt.common.base.utils.ExportExcelUtils; import com.yxt.common.base.utils.ExportExcelUtils;
import com.yxt.common.core.query.PagerQuery; import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean; import com.yxt.common.core.result.ResultBean;
@ -55,7 +49,6 @@ import java.io.OutputStream;
import java.io.UnsupportedEncodingException; import java.io.UnsupportedEncodingException;
import java.net.URLEncoder; import java.net.URLEncoder;
import java.text.ParseException; import java.text.ParseException;
import java.util.ArrayList;
import java.util.List; import java.util.List;
@Api(tags = "专项返利表") @Api(tags = "专项返利表")
@ -256,6 +249,13 @@ public class ScmSpecialRebateRest implements ScmSpecialRebateFeign {
return rb.success().setData(vo); return rb.success().setData(vo);
} }
@Override
public ResultBean<ScmVehRebateDetailsVo> clear(String sid) {
ResultBean rb = ResultBean.fireFail();
ScmSpecialRebateDetailsVo vo = scmSpecialRebateService.clear(sid);
return rb.success().setData(vo);
}
@Override @Override
public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) { public ResultBean<PagerVo<ScmSpecialRebateVo>> withApplyGetSpecialRebate(PagerQuery<ScmSpecialRebateQuery> pq) {
ResultBean rb = ResultBean.fireFail(); ResultBean rb = ResultBean.fireFail();

24
anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmspecialrebate/ScmSpecialRebateService.java

@ -2496,4 +2496,28 @@ public class ScmSpecialRebateService extends MybatisBaseService<ScmSpecialRebate
public List<ScmVehRebateTypeStatMxVo> getTypeDetail(List<String> sids) { public List<ScmVehRebateTypeStatMxVo> getTypeDetail(List<String> sids) {
return baseMapper.getTypeDetail(sids); return baseMapper.getTypeDetail(sids);
} }
public ScmSpecialRebateDetailsVo clear(String sid) {
ScmSpecialRebate scmSpecialRebate = fetchBySid(sid);
scmSpecialRebate.setUploadDate("");
scmSpecialRebate.setUploadMoney("0");
scmSpecialRebate.setStayDetermineMoney("0");
scmSpecialRebate.setStayDetermineMoneyNew("0");
scmSpecialRebate.setOnceItureCost(BigDecimal.ZERO);
scmSpecialRebate.setOnceTreatCost(BigDecimal.ZERO);
scmSpecialRebate.setOnceSuppCost(BigDecimal.ZERO);
scmSpecialRebate.setOnceSuppRemark("");
scmSpecialRebate.setSecondaryUploadDate("");
scmSpecialRebate.setSecondaryUploadMoney("0");
scmSpecialRebate.setSecondItureCost(BigDecimal.ZERO);
scmSpecialRebate.setSecondTreatCost(BigDecimal.ZERO);
scmSpecialRebate.setSecondSuppCost(BigDecimal.ZERO);
scmSpecialRebate.setSecondSuppRemark("");
scmSpecialRebate.setIsAdjustment("");
scmSpecialRebate.setAdjustmentMoney("0");
scmSpecialRebate.setAdjustmentRemarks("");
updateById(scmSpecialRebate);
ScmSpecialRebateDetailsVo scmSpecialRebateDetailsVo = fetchDetailsVoBySid(sid);
return scmSpecialRebateDetailsVo;
}
} }

167
anrui-scm/anrui-scm-ui/src/api/bikerebate/bicyclerebatemanagement.js

@ -1,84 +1,91 @@
import request from '@/utils/request' import request from '@/utils/request'
export default { export default {
// 查询分页列表 // 查询分页列表
listPage: function(data) { listPage: function(data) {
return request({ return request({
url: '/scm/v1/scmvehrebate/listPage', url: '/scm/v1/scmvehrebate/listPage',
method: 'post', method: 'post',
data: data, data: data,
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
}, },
// 查询不分页 // 查询不分页
listAll: function(data) { listAll: function(data) {
return request({ return request({
url: '/scm/v1/scmvehrebate/listAll', url: '/scm/v1/scmvehrebate/listAll',
method: 'post', method: 'post',
data: data, data: data,
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
}, },
// 选择车辆信息--查询分页列表 // 选择车辆信息--查询分页列表
pageList: function(data) { pageList: function(data) {
return request({ return request({
url: '/base/v1/basevehicle/vehicleRebateList', url: '/base/v1/basevehicle/vehicleRebateList',
method: 'post', method: 'post',
data: data, data: data,
headers: { 'Content-Type': 'application/json' } headers: { 'Content-Type': 'application/json' }
}) })
}, },
// 删除 // 清空
delete: function(params) { clear: function(data) {
return request({ return request({
url: '/scm/v1/scmvehrebate/delBySids', url: '/scm/v1/scmvehrebate/clear/' + data,
method: 'DELETE', method: 'get'
data: params, })
headers: { 'Content-Type': 'application/json' } },
}) // 删除
}, delete: function(params) {
// 新增保存修改记录 return request({
save: function(data) { url: '/scm/v1/scmvehrebate/delBySids',
return request({ method: 'DELETE',
url: '/scm/v1/scmvehrebate/save', data: params,
method: 'post', headers: { 'Content-Type': 'application/json' }
data: data, })
headers: { 'Content-Type': 'application/json' } },
}) // 新增保存修改记录
}, save: function(data) {
// 编辑保存修改记录 return request({
update: function(data) { url: '/scm/v1/scmvehrebate/save',
return request({ method: 'post',
url: '/scm/v1/scmvehrebate/update', data: data,
method: 'post', headers: { 'Content-Type': 'application/json' }
data: data, })
headers: { 'Content-Type': 'application/json' } },
}) // 编辑保存修改记录
}, update: function(data) {
// 通过sid查询一条记录 return request({
fetchBySid: function(data) { url: '/scm/v1/scmvehrebate/update',
return request({ method: 'post',
url: '/scm/v1/scmvehrebate/fetchDetailsBySid/' + data, data: data,
method: 'get' headers: { 'Content-Type': 'application/json' }
}) })
}, },
// 导出 // 通过sid查询一条记录
exportExcel: function(data) { fetchBySid: function(data) {
return request({ return request({
url: '/scm/v1/scmvehrebate/excelList', url: '/scm/v1/scmvehrebate/fetchDetailsBySid/' + data,
method: 'post', method: 'get'
data: data, })
responseType: 'blob', // 表明返回服务器返回的数据类型 },
headers: { 'Content-Type': 'application/json' } // 导出
}) exportExcel: function(data) {
}, return request({
// 下载模板 url: '/scm/v1/scmvehrebate/excelList',
downloadExcel: function() { method: 'post',
return request({ data: data,
url: '/scm/v1/scmvehrebate/download', responseType: 'blob', // 表明返回服务器返回的数据类型
method: 'post', headers: { 'Content-Type': 'application/json' }
responseType: 'blob', // 表明返回服务器返回的数据类型 })
headers: { 'Content-Type': 'application/json' } },
}) // 下载模板
} downloadExcel: function() {
return request({
url: '/scm/v1/scmvehrebate/download',
method: 'post',
responseType: 'blob', // 表明返回服务器返回的数据类型
headers: { 'Content-Type': 'application/json' }
})
}
} }

7
anrui-scm/anrui-scm-ui/src/api/specialrebate/specialrebatemanagement.js

@ -44,6 +44,13 @@ export default {
method: 'get' method: 'get'
}) })
}, },
// 清空
clear: function(data) {
return request({
url: '/scm/v1/scmspecialrebate/clear/' + data,
method: 'get'
})
},
// 导出 // 导出
exportExcel: function(data) { exportExcel: function(data) {
return request({ return request({

27
anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatecheck/bicyclerebatetobecheckedByUpdate.vue

@ -7,6 +7,7 @@
<div>{{ viewTitle }}</div> <div>{{ viewTitle }}</div>
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleClear()">清空</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
@ -335,6 +336,32 @@ export default {
this.formobj.adjustmentRemarks = '' this.formobj.adjustmentRemarks = ''
} }
}, },
handleClear() {
const tip = '请确认是否清空上传数据!'
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)'
})
this.submitdisabled = true
req.clear(this.formobj.sid).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.handleReturn('true')
}
loading.close()
}).catch(e => {
this.submitdisabled = false
loading.close()
})
})
},
handleSave() { handleSave() {
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {

27
anrui-scm/anrui-scm-ui/src/views/specialrebate/specialrebatecheck/specialrebatetobecheckedByUpdate.vue

@ -7,6 +7,7 @@
<div>{{ viewTitle }}</div> <div>{{ viewTitle }}</div>
<!--start 添加修改按钮--> <!--start 添加修改按钮-->
<div> <div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleClear()">清空</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button> <el-button type="primary" size="small" :disabled="submitdisabled" @click="handleSave()">保存</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button> <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div> </div>
@ -323,6 +324,32 @@ export default {
this.formobj.adjustmentRemarks = '' this.formobj.adjustmentRemarks = ''
} }
}, },
handleClear() {
const tip = '请确认是否清空上传数据!'
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)'
})
this.submitdisabled = true
req.clear(this.formobj.sid).then((resp) => {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: '操作成功' })
this.handleReturn('true')
}
loading.close()
}).catch(e => {
this.submitdisabled = false
loading.close()
})
})
},
handleSave() { handleSave() {
this.$refs['form_obj'].validate((valid) => { this.$refs['form_obj'].validate((valid) => {
if (valid) { if (valid) {

Loading…
Cancel
Save