Browse Source

Merge remote-tracking branch 'origin/master'

master
ligaode 1 month ago
parent
commit
0c2cdc1cb4
  1. 9
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java
  2. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java
  3. 8
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java
  4. 3
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordQuery.java
  5. 2
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java
  6. 68
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
  7. 2
      anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java
  8. 1
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java
  9. 160
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
  10. 48
      anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java
  11. 727
      yxt-as-ui/src/views/storage/deliveryNotice/index.vue
  12. 868
      yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue
  13. 143
      yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue

9
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecord.java

@ -119,4 +119,13 @@ public class FinPaymentrecord extends BaseEntity {
private BigDecimal paymentCharges;
@ApiModelProperty("是否推送回款返利,0不推送,1推送")
private Integer isPushHkfl;
@ApiModelProperty("推送财务数据类型(0付款单,1凭证)")
private Integer finDataType;
@ApiModelProperty("应付类别分类(dictTypeCode)")
private String payCostType;
@ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)")
private String payChannel;
@ApiModelProperty("批量处理编码")
private String batchNumber;
}

8
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDetailsVo.java

@ -85,4 +85,12 @@ public class FinPaymentrecordDetailsVo implements Vo {
private String purchaseSystemSid; // 采购系统sid
@ApiModelProperty("采购系统名称")
private String purchaseSystemName; // 采购系统名称
@ApiModelProperty("推送财务数据类型(0付款单,1凭证)")
private Integer finDataType;
@ApiModelProperty("应付类别分类(dictTypeCode)")
private String payCostType;
@ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)")
private String payChannel;
@ApiModelProperty("批量处理编码")
private String batchNumber;
}

8
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordDto.java

@ -105,4 +105,12 @@ public class FinPaymentrecordDto implements Dto {
private String busRemarks;
@ApiModelProperty("是否推送回款返利,0不推送,1推送")
private Integer isPushHkfl;
@ApiModelProperty("推送财务数据类型(0付款单,1凭证)")
private Integer finDataType;
@ApiModelProperty("应付类别分类(dictTypeCode)")
private String payCostType;
@ApiModelProperty("款项类别key(dictKey对应财务应付类别编码)")
private String payChannel;
@ApiModelProperty("批量处理编码")
private String batchNumber;
}

3
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordQuery.java

@ -78,5 +78,6 @@ public class FinPaymentrecordQuery implements Query {
private String payBank;
@ApiModelProperty("付款账号")
private String payBankAccount;
@ApiModelProperty("批量处理编码")
private String batchNumber;
}

2
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finpaymentrecord/FinPaymentrecordVo.java

@ -95,4 +95,6 @@ public class FinPaymentrecordVo implements Vo {
private String payWayKey;
@ApiModelProperty("付款方式Value")
private String payWayValue;
@ApiModelProperty("批量处理编码")
private String batchNumber;
}

68
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@ -1670,23 +1670,23 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto0.setDebit(String.valueOf(voucherDetail.getPaymentCharges()));
resultDetails.add(dto0);
}
if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方
dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免");
dto2.setSubjectNo("6002.01.17");
dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setCredit(String.valueOf(voucherDetail.getNoRelief()));
resultDetails.add(dto2);
}
if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方
dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免");
dto3.setSubjectNo("1201.01.00");
dto3.setDimensionDept(voucherDetail.getDeptCode());
dto3.setDimensionCustom(voucherDetail.getCustomerCode());
dto3.setCredit(String.valueOf(voucherDetail.getRelief()));
resultDetails.add(dto3);
}
// if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) {
// Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方
// dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免");
// dto2.setSubjectNo("6002.01.17");
// dto2.setDimensionDept(voucherDetail.getDeptCode());
// dto2.setCredit(String.valueOf(voucherDetail.getNoRelief()));
// resultDetails.add(dto2);
// }
// if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) {
// Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方
// dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免");
// dto3.setSubjectNo("1201.01.00");
// dto3.setDimensionDept(voucherDetail.getDeptCode());
// dto3.setDimensionCustom(voucherDetail.getCustomerCode());
// dto3.setCredit(String.valueOf(voucherDetail.getRelief()));
// resultDetails.add(dto3);
// }
if (voucherDetail.getSubtrahend().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方
dto4.setSummary(voucherDetail.getBankName() + "个贷保证金抵结清款");
@ -1729,23 +1729,23 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
dto0.setDebit(String.valueOf(voucherDetail.getPaymentCharges()));
resultDetails.add(dto0);
}
if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方
dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免");
dto2.setSubjectNo("6002.01.17");
dto2.setDimensionDept(voucherDetail.getDeptCode());
dto2.setCredit(String.valueOf(voucherDetail.getNoRelief()));
resultDetails.add(dto2);
}
if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方
dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免");
dto3.setSubjectNo("1201.01.00");
dto3.setDimensionDept(voucherDetail.getDeptCode());
dto3.setDimensionCustom(voucherDetail.getCustomerCode());
dto3.setCredit(String.valueOf(voucherDetail.getRelief()));
resultDetails.add(dto3);
}
// if (voucherDetail.getNoRelief().compareTo(BigDecimal.ZERO) != 0) {
// Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //借方
// dto2.setSummary(voucherDetail.getBankName() + "结清未到期利息不减免");
// dto2.setSubjectNo("6002.01.17");
// dto2.setDimensionDept(voucherDetail.getDeptCode());
// dto2.setCredit(String.valueOf(voucherDetail.getNoRelief()));
// resultDetails.add(dto2);
// }
// if (voucherDetail.getRelief().compareTo(BigDecimal.ZERO) != 0) {
// Voucher.VoucherResultDetailDto dto3 = new Voucher.VoucherResultDetailDto(); //借方
// dto3.setSummary(voucherDetail.getBankName() + "结清未到期利息减免");
// dto3.setSubjectNo("1201.01.00");
// dto3.setDimensionDept(voucherDetail.getDeptCode());
// dto3.setDimensionCustom(voucherDetail.getCustomerCode());
// dto3.setCredit(String.valueOf(voucherDetail.getRelief()));
// resultDetails.add(dto3);
// }
if (voucherDetail.getBalance().compareTo(BigDecimal.ZERO) != 0) {
Voucher.VoucherResultDetailDto dto4 = new Voucher.VoucherResultDetailDto(); //贷方
dto4.setSummary(voucherDetail.getBankName() + "结清");

2
anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettlecompanyreduction/LoanSettleCompanyReduction.java

@ -28,7 +28,7 @@ public class LoanSettleCompanyReduction extends BaseEntity {
private BigDecimal profit;
@ApiModelProperty("公司未到期利息减免")
private BigDecimal notDuePriceRelief;
@ApiModelProperty("减免依据")
@ApiModelProperty("减免依据(资方未到期利息减免)")
private BigDecimal reliefBasis;
}

1
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbepadsincereapply/LoanBePadsincereApplyService.java

@ -987,6 +987,7 @@ public class LoanBePadsincereApplyService extends MybatisBaseService<LoanBePadsi
finPaymentrecordDto.setPurchaseSystemSid("");
finPaymentrecordDto.setPurchaseSystemName("");
finPaymentrecordDto.setBusRemarks(loanBePadsincereApply.getPaymentRemarks());
finPaymentrecordDto.setFinDataType(1);
String sid = finPaymentrecordFeign.save(finPaymentrecordDto).getData();
loanBePadsincereVehService.updatePaySid(sid,loanBePadsincereVehDetailsVo.getSid());
}

160
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java

@ -6,34 +6,22 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.google.common.util.concurrent.ThreadFactoryBuilder;
import com.yxt.anrui.base.api.basemiddleman.BaseMiddlemanDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemDetailsVo;
import com.yxt.anrui.base.api.basepurchasesystem.BasePurchaseSystemFeign;
import com.yxt.anrui.base.api.commoncontract.CommonContract;
import com.yxt.anrui.base.common.enums.BillTypeEnum;
import com.yxt.anrui.base.common.utils.Rule;
import com.yxt.anrui.base.common.utils.domain.BillNo;
import com.yxt.anrui.buscenter.api.busdeposit.BusDeposit;
import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitious;
import com.yxt.anrui.buscenter.api.bussalesorder.*;
import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDiscountListVo;
import com.yxt.anrui.buscenter.api.bussalesorder.flowable.BusSalesOrderDelegateQuery;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderSourceLCVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
import com.yxt.anrui.buscenter.api.bussalesorderdeposit.BusSalesOrderDeposit;
import com.yxt.anrui.buscenter.api.bussalesorderinsurance.BusSalesOrderInsuranceDetailsVo;
import com.yxt.anrui.buscenter.api.bussalesordermodel.BusSalesOrderModel;
import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.finmanufacturerbank.FinManufacturerBank;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecord;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordDto;
import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.FinUncollectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJRFeign;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
@ -54,16 +42,13 @@ import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
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;
import com.yxt.anrui.portal.api.sysparameter.SysParameterFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgVo;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.anrui.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
@ -79,10 +64,7 @@ import com.yxt.anrui.riskcenter.api.loansettlecompanycost.LoanSettleCompanyCostV
import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReduction;
import com.yxt.anrui.riskcenter.api.loansettlecompanyreduction.LoanSettleCompanyReductionVo;
import com.yxt.anrui.riskcenter.api.loansettlevehicle.LoanSettleVehicleDto;
import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
@ -100,8 +82,10 @@ import com.yxt.anrui.riskcenter.biz.loansolutionsdetail.LoanSolutionsDetailServi
import com.yxt.common.base.config.component.DocPdfComponent;
import com.yxt.common.base.config.component.FileUploadComponent;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.*;
import com.yxt.common.base.utils.Base64;
import com.yxt.common.base.utils.ConstantUtils;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.base.utils.WordConvertUtils;
import com.yxt.common.core.query.PagerQuery;
import com.yxt.common.core.result.ResultBean;
import com.yxt.common.core.vo.PagerVo;
@ -111,7 +95,6 @@ import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;
import org.springframework.beans.factory.annotation.Autowired;
@ -119,7 +102,6 @@ import org.springframework.stereotype.Service;
import java.io.*;
import java.math.BigDecimal;
import java.math.RoundingMode;
import java.net.HttpURLConnection;
import java.net.URL;
import java.net.URLEncoder;
@ -970,14 +952,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
int check = 0;// 0不推抵顶保证金凭证 1推送
//结清合计 + 贷款保证金结转金额
BigDecimal add = amountTo.add(depositJZ);
// BigDecimal actualDeposit = BigDecimal.ZERO;
List<LoanSettleVoucherVo> settleVoucherVos = new ArrayList<>();
if (add.compareTo(BigDecimal.ZERO) > 0) {
//结转剩余保证金
// BigDecimal decimal = carryForward(loanSettleApply);
// if (null != decimal) {
// actualDeposit = decimal;
// }
settleVoucherVos = carryForward2(loanSettleApply);
check = 1;
}
@ -990,7 +967,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
//设置认款月还为已转付
updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
//推送财务凭证
// pushSettleVoucher(loanSettleApply, check, actualDeposit);
pushSettleVoucher2(loanSettleApply, check, settleVoucherVos);
}
baseMapper.updateById(loanSettleApply);
@ -2269,6 +2245,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
BigDecimal zfJQK = BigDecimal.ZERO;//资方结清款
int topping = 0;
BigDecimal bbjDDMoney = BigDecimal.ZERO; //资方保证金抵顶
BigDecimal wdqlxjm = BigDecimal.ZERO; //未到期利息减免
BigDecimal gsdqwdqyh = BigDecimal.ZERO; //公司当期未到期月还
BigDecimal gswdqje = BigDecimal.ZERO; //公司未到期金额
BigDecimal gswdqlxjm = BigDecimal.ZERO; //公司未到期利息减免
BigDecimal zfdqwdqyh = BigDecimal.ZERO; //资方当期未到期月还
BigDecimal zfwdqje = BigDecimal.ZERO; //资方未到期金额
BigDecimal zfwdqlxjm = BigDecimal.ZERO; //资方未到期利息减免
if (null != reduction) {
if (null != reduction.getFundPenalty()) {
fund = reduction.getFundPenalty();
@ -2276,6 +2261,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (null != reduction.getDepositPenalty()) {
bzjJM = reduction.getDepositPenalty();
}
if (null != reduction.getNotDuePriceRelief()) {
gswdqlxjm = reduction.getNotDuePriceRelief();
}
if (null != reduction.getReliefBasis()) {
zfwdqlxjm = reduction.getReliefBasis();
}
}
if (null != companyCost) {
if (null != companyCost.getLoanDeposit()) {
@ -2284,6 +2275,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (null != companyCost.getDeductionAmount()) {
bzjKF = companyCost.getDeductionAmount();
}
if (null != companyCost.getCompanyCurrentNotPrice()) {
gsdqwdqyh = companyCost.getCompanyCurrentNotPrice();
}
if (null != companyCost.getBankNotPrice()) {
gswdqje = companyCost.getBankNotPrice();
}
}
if (null != bankCost) {
if (null != bankCost.getBankSettlePrice()) {
@ -2293,6 +2291,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (null != bankCost.getLoanDeposit()) {
bbjDDMoney = bankCost.getLoanDeposit();
}
if (null != bankCost.getCurrentNotDuePrice()) {
zfdqwdqyh = bankCost.getCurrentNotDuePrice();
}
if (null != bankCost.getNotDuePrice()) {
zfwdqje = bankCost.getNotDuePrice();
}
}
sybzj = bzjMoney.subtract(bzjKF).add(bzjJM);
bzjKFCw = bzjKF.subtract(bzjJM);
@ -2497,6 +2501,37 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
voucherDetail.setDebit(amountAll.toString());
resultDetails.add(voucherDetail);
}
BigDecimal yhcesrCompany = gsdqwdqyh.add(gswdqje).subtract(gswdqlxjm); //月还差额计收入 公司部分
BigDecimal yhcesrBank = zfdqwdqyh.add(zfwdqje).subtract(zfwdqlxjm); //月还差额计收入 资方部分
BigDecimal yhcejsr = yhcesrCompany.subtract(yhcesrBank);//月还差额记收入
BigDecimal yhjmjf = yhcejsr.add(gswdqlxjm);
if (yhjmjf.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
voucherDetail.setSummary(planDetails.getBankName() + "结清");
voucherDetail.setSubjectNo(bankCode);
voucherDetail.setDimensionDept(deptCode);
voucherDetail.setDimensionCustom(customerNumber);
voucherDetail.setDebit(yhjmjf.toString());
resultDetails.add(voucherDetail);
}
if (gswdqlxjm.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
voucherDetail.setSummary(planDetails.getBankName() + "结清未到期利息减免");
voucherDetail.setSubjectNo("1201.01.00");
voucherDetail.setDimensionDept(deptCode);
voucherDetail.setDimensionCustom(customerNumber);
voucherDetail.setCredit(gswdqlxjm.toString());
resultDetails.add(voucherDetail);
}
if (yhcejsr.compareTo(BigDecimal.ZERO) > 0) {
Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
voucherDetail.setSummary(planDetails.getBorrowerName() + "结清收入");
voucherDetail.setSubjectNo("6002.01.17");
voucherDetail.setDimensionDept(deptCode);
voucherDetail.setCredit(yhcejsr.toString());
resultDetails.add(voucherDetail);
}
newVoucher.setResultDetails(resultDetails);
if (!fundHistoryList.isEmpty()) {
loanPushFundHistoryService.saveLists(fundHistoryList);
@ -2514,6 +2549,7 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
BigDecimal bankSettlePrice = bankCost.getBankSettlePrice();
if (bankSettlePrice.compareTo(BigDecimal.ZERO) > 0) {
FinPaymentrecordDto finPaymentrecordDto = new FinPaymentrecordDto();
finPaymentrecordDto.setFinDataType(1);
finPaymentrecordDto.setApplySid("");
finPaymentrecordDto.setPayCompanySid("");
finPaymentrecordDto.setPayType(1);
@ -3596,13 +3632,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
}
loanSettleApply.setState(1);
baseMapper.updateById(loanSettleApply);
// BigDecimal actualDeposit = BigDecimal.ZERO;
//结转剩余保证金
List<LoanSettleVoucherVo> settleVoucherVos = carryForward2(loanSettleApply);
// BigDecimal decimal = carryForward(loanSettleApply);
// if (null != decimal) {
// actualDeposit = decimal;
// }
//更新车辆表结清状态
baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
//推送资方结清款到出纳代付款列表
@ -3610,7 +3641,6 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
//设置认款月还为已转付
updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
//推送财务凭证
// pushSettleVoucher(loanSettleApply, 1, actualDeposit);
pushSettleVoucher2(loanSettleApply, 1, settleVoucherVos);
return rb.success();
}
@ -4004,8 +4034,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
BigDecimal kuanxiang = BigDecimal.ZERO; //差额
BigDecimal companyAmount = BigDecimal.ZERO; //公司收
BigDecimal subtrahend = BigDecimal.ZERO; //资方收
BigDecimal qtfyjm = BigDecimal.ZERO; //其他费用减免
LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(sid);
LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(sid);
LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(sid);
if (null != bankCost) {
if (receivablesName.equals("名义价")) {
if (null != bankCost.getBankNominalPrice()) {
@ -4050,6 +4082,12 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
}
}
}
if (null != reduction) {
if (null != reduction.getOtherCost()) {
qtfyjm = reduction.getOtherCost();
}
}
PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, receivablesName);
if (null != p) {
BigDecimal money = new BigDecimal(p.getMoney());
@ -4059,6 +4097,9 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
} else {
balance = companyAmount.subtract(subtrahend);
}
if (receivablesName.equals("其他费用")) {
balance = balance.subtract(qtfyjm);
}
kuanxiang = amount.subtract(balance);
vo.setBusSid(sid);
vo.setAmount(amount);
@ -4073,31 +4114,26 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
ResultBean rb = ResultBean.fireFail();
LoanSettleApply apply = fetchBySid(sid);
LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(sid);
// LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(sid);
LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(sid);
if (null != apply) {
BigDecimal amountAll = BigDecimal.ZERO;//推送资方结清款总数
BigDecimal zfJQK = BigDecimal.ZERO;//资方结清款
BigDecimal bankRelief = BigDecimal.ZERO;//资方结清未到期利息减免
BigDecimal companyRelief = BigDecimal.ZERO;//公司结清未到期利息减免
BigDecimal noRelief = BigDecimal.ZERO;//结清未到期利息不减免
// BigDecimal bankRelief = BigDecimal.ZERO;//资方结清未到期利息减免
// BigDecimal companyRelief = BigDecimal.ZERO;//公司结清未到期利息减免
// BigDecimal noRelief = BigDecimal.ZERO;//结清未到期利息不减免
int topping = 0;
BigDecimal bbjDDMoney = BigDecimal.ZERO; //资方保证金抵顶
BigDecimal sub = BigDecimal.ZERO; //资方保证金差额
BigDecimal shouxufeiCW = new BigDecimal(shouxufei);
// // 资方未到期金额
// BigDecimal zfwdq = BigDecimal.ZERO;
// // 公司未到期金额
// BigDecimal gswdq = BigDecimal.ZERO;
if (null != reduction) {
if (null != reduction.getNotDuePriceRelief()) {
companyRelief = reduction.getNotDuePriceRelief();
}
if (null != reduction.getReliefBasis()) {
bankRelief = reduction.getReliefBasis();
}
noRelief = bankRelief.subtract(companyRelief);
}
// if (null != reduction) {
// if (null != reduction.getNotDuePriceRelief()) {
// companyRelief = reduction.getNotDuePriceRelief();
// }
// if (null != reduction.getReliefBasis()) {
// bankRelief = reduction.getReliefBasis();
// }
// noRelief = bankRelief.subtract(companyRelief);
// }
if (null != bankCost) {
if (null != bankCost.getBankSettlePrice()) {
zfJQK = bankCost.getBankSettlePrice();
@ -4106,20 +4142,10 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
if (null != bankCost.getLoanDeposit()) {
bbjDDMoney = bankCost.getLoanDeposit();
}
// if (null != bankCost.getNotDuePrice()) {
// zfwdq = bankCost.getNotDuePrice();
// }
}
// if (null != companyCost) {
// if (null != companyCost.getBankNotPrice()) {
// gswdq = companyCost.getBankNotPrice();
// }
// }
// if (companyRelief.compareTo(BigDecimal.ZERO) == 0 && bankRelief.compareTo(BigDecimal.ZERO) == 0) {
// noRelief = gswdq.subtract(zfwdq);
// }
sub = zfJQK.subtract(bbjDDMoney);
amountAll = noRelief.add(companyRelief).add(bbjDDMoney).add(sub);
// amountAll = noRelief.add(companyRelief).add(bbjDDMoney).add(sub);
amountAll = bbjDDMoney.add(sub);
if (zfJQK.compareTo(BigDecimal.ZERO) > 0) {
PaymentVoucher paymentVoucher = new PaymentVoucher();
paymentVoucher.setBankAccount(accountNumber);
@ -4198,8 +4224,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
voucherDetail.setAmount(amountAll);
voucherDetail.setSubtrahend(bbjDDMoney);
voucherDetail.setBalance(sub.add(shouxufeiCW));
voucherDetail.setRelief(companyRelief);
voucherDetail.setNoRelief(noRelief);
// voucherDetail.setRelief(companyRelief);
// voucherDetail.setNoRelief(noRelief);
voucherDetail.setPaymentCharges(shouxufeiCW);
voucherDetails.add(voucherDetail);
}

48
anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loantransferpaymentapply/LoanTransferPaymentApplyService.java

@ -3,7 +3,6 @@ package com.yxt.anrui.riskcenter.biz.loantransferpaymentapply;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.date.DateTime;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.math.Money;
import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
@ -27,7 +26,6 @@ import com.yxt.anrui.fin.api.finpaymentrecord.FinPaymentrecordFeign;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.PaymentVoucher;
import com.yxt.anrui.fin.api.kingdee.voucher.SceneCodeEnum;
import com.yxt.anrui.flowable.api.flow.FlowableFeign;
@ -47,15 +45,9 @@ 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.portal.api.sysuser.SysUserVo;
import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
import com.yxt.anrui.riskcenter.api.loanbuckleapplyrecord.LoanBuckleApplyRecord;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFile;
import com.yxt.anrui.riskcenter.api.loanfile.LoanFileEnum;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.AppAccrualRecordVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.AppMonthAccrualDetailsVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.LoanMonthlyAccrualApply;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualapply.MonthlyAccrualSourceLCVo;
import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
@ -82,7 +74,6 @@ import com.yxt.messagecenter.api.message.MessageFlowVo;
import com.yxt.messagecenter.api.message.MessageFlowableQuery;
import com.yxt.messagecenter.api.messagelist.MessageList;
import com.yxt.messagecenter.api.messagelist.MessageListFeign;
import io.swagger.annotations.ApiModelProperty;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@ -664,28 +655,6 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
repaymentHistory.setPaymentState("已转付");
repaymentHistory.setTransferDate(new DateTime());
loanRepaymentHistoryService.updateById(repaymentHistory);
// //推送转付还款记录
// LoanRepaymentHistory transfer = new LoanRepaymentHistory();
// transfer.setScheduleSid(repaymentHistory.getScheduleSid());
// transfer.setPlanDetailSid(repaymentHistory.getPlanDetailSid());
// transfer.setReturnWay("转付");
// transfer.setReturnWayKey("03");
// transfer.setActualDate(new Date());
// transfer.setDataTime(new DateTime());
// transfer.setBuckleKey("001");
// transfer.setBuckle("未申请");
// transfer.setUpdateState("1");
// transfer.setUpdateTime(new DateTime());
// BigDecimal money = new BigDecimal(0);
// if (null != applyRecord.getTransferPrincipal()) {
// money = applyRecord.getTransferPrincipal();
// }
// if (null != applyRecord.getDefaultInterest()) {
// money = applyRecord.getDefaultInterest().add(money);
// }
// String amount = String.valueOf(money);
// transfer.setActualMoney(new BigDecimal("-" + amount));
// loanRepaymentHistoryService.insert(transfer);
}
if (payFormKey.equals("01")) {
if (StringUtils.isNotBlank(applyRecord.getBankContractNo())) {
@ -735,6 +704,7 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
if (!map.isEmpty()) {
for (Map.Entry<String, BigDecimal> entry : map.entrySet()) {
FinPaymentrecordDto payDto = new FinPaymentrecordDto();
payDto.setFinDataType(1);
payDto.setBusSid(apply.getSid());
payDto.setCreateBySid(apply.getCreateBySid());
payDto.setCost(entry.getValue().toString());
@ -795,22 +765,6 @@ public class LoanTransferPaymentApplyService extends MybatisBaseService<LoanTran
}
}
}
// try {
// ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
// .setNameFormat("demo-pool-%d").build();
// ExecutorService pool = new org.apache.tomcat.util.threads.ThreadPoolExecutor(1, 10,
// 1000, TimeUnit.MILLISECONDS,
// new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new org.apache.tomcat.util.threads.ThreadPoolExecutor.AbortPolicy());
// //推送转付凭证
// Future future = pool.submit(() -> {
// pushPaymentVoucher(businessSid);
// });
// } catch (Exception e) {
// e.printStackTrace();
// log.error("推送数据失败=========================" + e.getMessage());
// return rb.setMsg("推送数据失败");
// }
}
return rb.success().setData(resultBean.getData());
} else {

727
yxt-as-ui/src/views/storage/deliveryNotice/index.vue

@ -1,7 +1,7 @@
<template>
<div class="app-container">
<div v-show="viewState == 1">
<button-bar ref="btnbar" view-title="预期到货通知单管理" :btndisabled="btndisabled" @btnhandle="btnHandle" />
<button-bar ref="btnbar" view-title="预期到货通知单管理" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">
@ -10,41 +10,33 @@
<div v-show="isSearchShow" class="search">
<el-form :inline="true" class="tab-header">
<el-form-item label="单据编号">
<el-input v-model="queryParams.params.billNo" placeholder="" clearable />
<el-input v-model="queryParams.params.billNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="单据日期">
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.createTimeStart" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.createTimeEnd" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<el-form-item label="来源单号">
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable />
<el-input v-model="queryParams.params.sourceBillNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="业务类型">
<el-select v-model="queryParams.params.busTypeKey" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in busTypeList" :key="item.dictKey" :label="item.dictValue"
:value="item.dictValue">
<el-option v-for="item in busTypeList" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue">
</el-option>
</el-select>
</el-form-item>
<el-form-item label="供应商">
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable />
<el-input v-model="queryParams.params.supplierName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="预计到货日期">
<el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期"
format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;">
</el-date-picker>
<el-date-picker v-model="queryParams.params.deliveryDateStart" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
<span style="padding: 0 8px"></span>
<el-date-picker v-model="queryParams.params.deliveryDateEnd" type="date" placeholder="选择日期" format="yyyy-MM-dd" value-format="yyyy-MM-dd" style="width: 200px;" />
</el-form-item>
<el-form-item label="单据状态">
<el-select v-model="queryParams.params.billState" placeholder="请选择" style="width: 200px;">
<el-option v-for="(item,i) in billStateList" :key="item.sid" :label="item.name" :value="item.name">
<el-option v-for="item in billStateList" :key="item.sid" :label="item.name" :value="item.name">
</el-option>
</el-select>
</el-form-item>
@ -61,61 +53,51 @@
</div>
</div>
</div>
<!-- Start 项目列表头部 -->
<div class="listtop">
<div class="tit">预期到货通知单列表</div>
</div>
<!-- End 项目列表头部 -->
<!-- Start 项目列表 -->
<div class="">
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%"
@selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table v-loading="tableLoading" :data="dataList" border style="width: 100%" @selection-change="selectionLineChangeHandle">
<el-table-column fixed width="50" type="selection" align="center"/>
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toRelevancy(scope.row)">查看</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column prop="billNo" label="单据编号" align="center" width="220" />
<el-table-column prop="createTime" label="单据日期" align="center" width="150" />
<el-table-column prop="createByName" label="制单人" align="center" width="150" />
<el-table-column prop="billNo" label="单据编号" align="center" width="220"/>
<el-table-column prop="createTime" label="单据日期" align="center" width="150"/>
<el-table-column prop="createByName" label="制单人" align="center" width="150"/>
<el-table-column label="来源单号" align="center" width="180">
<template slot-scope="scope">
<div style="color: #1890FF; text-decoration: underline ;cursor:pointer;"
@click="showSourceBillDetail(scope.row)">
{{ scope.row.sourceBillNo }}
</div>
<span class="bluezi" @click="showSourceBillDetail(scope.row)">{{ scope.row.sourceBillNo }}</span>
</template>
</el-table-column>
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="150" />
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="180" />
<el-table-column prop="manufactorBillTypeValue" label="厂家订单类型" align="center" width="150" />
<el-table-column prop="supplierName" label="供应商" align="center" width="150" />
<el-table-column prop="contact" label="联系人" align="center" width="150" />
<el-table-column prop="mobile" label="联系人电话" align="center" width="150" />
<el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150" />
<el-table-column prop="billState" label="单据状态" align="center" width="150" />
<el-table-column prop="busTypeValue" label="业务类型" align="center" width="150"/>
<el-table-column prop="manufactorBillNo" label="厂家订单号" align="center" width="180"/>
<el-table-column prop="manufactorBillTypeValue" label="厂家订单类型" align="center" width="150"/>
<el-table-column prop="supplierName" label="供应商" align="center" width="150"/>
<el-table-column prop="contact" label="联系人" align="center" width="150"/>
<el-table-column prop="mobile" label="联系人电话" align="center" width="150"/>
<el-table-column prop="deliveryDate" label="预计到货日期" align="center" width="150"/>
<el-table-column prop="billState" label="单据状态" align="center" width="150"/>
<!-- <el-table-column prop="reviewStatus" label="审核状态" align="center" width="150" /> -->
<!-- <el-table-column prop="refuseReason" label="拒绝原因" align="center" width="150" /> -->
</el-table>
</div>
<!-- End 项目列表 -->
<div class="pages">
<div class="tit" />
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current"
:limit.sync="queryParams.size" class="pagination" @pagination="loadList" />
<pagination v-show="dataList.length > 0" :total="queryParams.total" :page.sync="queryParams.current" :limit.sync="queryParams.size" class="pagination" @pagination="loadList"/>
</div>
</div>
</div>
<!-- End 查询和其列表部分 -->
<!-- 新增修改部分组件 -->
<divAdd v-show="viewState == 2 || viewState == 3" ref="divadd" @doback="resetState" @reloadlist="loadList" />
<divInfo v-show="viewState == 4" ref="divinfo" @doback="resetState" @reloadlist="loadList" />
<sourceBillInfo v-show="viewState == 5" ref="sourceinfo" @doback="resetState" @reloadlist="loadList" />
<receiptAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="loadList"/>
<receiptInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" @reloadlist="loadList"/>
<sourceBillInfo v-show="viewState == 5" ref="sourceinfo" @doback="resetState" @reloadlist="loadList"/>
<el-dialog title="审核单据" :visible.sync="dialogVisible" :before-close="handleClose">
<el-form ref="dataForm" class="formadd" style="margin-top: -40px;" :model="formobj">
@ -127,7 +109,7 @@
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-radio-group v-model="formobj.reviewStatus" size="small" @change="changeTheme">
<el-radio-group v-model="formobj.reviewStatus" size="small">
<el-radio :label="1">合格</el-radio>
<el-radio :label="2">不合格</el-radio>
</el-radio-group>
@ -142,381 +124,261 @@
</el-col>
<el-col :span="16">
<el-form-item class="trightb_item">
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw" style="width:100%"
clearable />
<el-input v-model="formobj.remarks" placeholder="请填写审核意见" class="addinputw" style="width:100%" clearable/>
</el-form-item>
</el-col>
</el-row>
</el-form>
<div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
<el-button type="primary" style="margin-top: 20px;" @click="saveExamine"> </el-button>
</div>
</el-dialog>
</div>
</template>
<script>
import req from '@/api/storage/deliveryNotice.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import divAdd from './receiptAdd.vue'
import divInfo from './receiptInfo.vue'
import sourceBillInfo from './procurementInfo.vue'
import {
typeValues,
} from '@/api/Common/dictcommons'
import req from '@/api/storage/deliveryNotice.js'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import receiptAdd from './receiptAdd.vue'
import receiptInfo from './receiptInfo.vue'
import sourceBillInfo from './procurementInfo.vue'
import { typeValues } from '@/api/Common/dictcommons'
export default {
components: {
ButtonBar,
Pagination,
pageye,
divAdd,
divInfo,
sourceBillInfo
},
data() {
return {
dialogVisible: false,
formobj: {
sid: "",
reviewStatus: "",
remarks: ''
export default {
components: {
ButtonBar,
Pagination,
receiptAdd,
receiptInfo,
sourceBillInfo
},
data() {
return {
dialogVisible: false,
formobj: {
sid: '',
reviewStatus: '',
remarks: ''
},
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [
// {
// type: 'primary',
// size: 'small',
// icon: 'plus',
// btnKey: 'toAudit',
// btnLabel: ''
// },
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增收货单'
},
btndisabled: false,
viewState: 1, // 1 2 3 4
isSearchShow: false,
searchxianshitit: '显示查询条件',
tableLoading: false,
dataList: [],
btnList: [
// {
// type: 'primary',
// size: 'small',
// icon: 'plus',
// btnKey: 'toAudit',
// btnLabel: ''
// },
{
type: 'primary',
size: 'small',
icon: 'plus',
btnKey: 'toAdd',
btnLabel: '新增收货单'
},
{
type: 'danger',
size: 'small',
icon: 'plus',
btnKey: 'toEnd',
btnLabel: '终止'
},
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
{
type: 'danger',
size: 'small',
icon: 'plus',
btnKey: 'toEnd',
btnLabel: '终止'
},
sids: [],
selectionList: [],
busTypeList: [{
name: "采购预约",
sid: "0"
},
{
name: "调拨预约",
sid: "1"
},
{
name: "其他预约",
sid: "2"
}
],
billStateList: [{
name: "在途",
sid: "0"
},
{
name: "部分收货",
sid: "1"
},
{
name: "已收货",
sid: "2"
},
{
name: "已取消",
sid: "3"
}
],
reviewStatusList: [{
name: "待审核",
sid: "1"
},
{
name: "审核通过",
sid: "2"
},
{
name: "审核拒绝",
sid: "3"
}
]
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
this.loadList()
},
methods: {
init() {
typeValues({
type: 'wms_busType'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
showSourceBillDetail(row) {
console.log("showSourceBillDetail》》》》", row)
this.viewState = 5
this.$refs['sourceinfo'].showInfo(row.sourceBillSid)
// this.$refs['sourceinfo'].showInfo('1b20ee30-d7d5-4cd0-8ee3-3802ddd12ff2')
},
saveExamine() {
},
changeTheme() {
},
toAudit() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
this.dialogVisible = true
},
handleClose() {
this.dialogVisible = false
},
selectTime1() {
},
selectTime2() {
},
selectionLineChangeHandle(val) {
console.log("val", val);
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
],
queryParams: {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAudit':
this.toAudit()
break
case 'toAdd':
this.toAdd()
break
case 'toEnd':
this.toEnd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
})
},
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
sids: [],
selectionList: [],
busTypeList: [
{
name: '采购预约',
sid: '0'
},
{
name: '调拨预约',
sid: '1'
},
{
name: '其他预约',
sid: '2'
}
this.loadList()
},
toEnd() {
for (var i = 0; i < this.selectionList.length; i++) {
if (this.selectionList[i].billState == '已收货' || this.selectionList[i].billState == '已收货(部分终止)') {
this.$message({
type: 'warning',
message: "不可选择已收货或已终止的记录。",
showClose: true
})
return
}
],
billStateList: [
{
name: '在途',
sid: '0'
},
{
name: '部分收货',
sid: '1'
},
{
name: '已收货',
sid: '2'
},
{
name: '已收货(部分终止)',
sid: '3'
}
if (this.sids.length > 0) {
const tip = '请确认是否终止所选 ' + this.sids.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.billToEnd(this.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(() => {})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行终止操作'
})
],
reviewStatusList: [
{
name: '待审核',
sid: '1'
},
{
name: '审核通过',
sid: '2'
},
{
name: '审核拒绝',
sid: '3'
}
},
toAdd() {
if (this.selectionList.length != 1) {
this.$message({
type: 'warning',
message: "请选择一条数据。",
showClose: true
})
return
]
}
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
created() {
this.init()
this.loadList()
},
methods: {
init() {
typeValues({
type: 'wms_busType'
}).then((res) => {
if (res.success) {
this.busTypeList = res.data
}
})
},
showSourceBillDetail(row) {
this.viewState = 5
this.$refs['sourceinfo'].showInfo(row.sourceBillSid)
},
saveExamine() {
if (this.selectionList[0].billState == '已收货') {
this.$message({
type: 'warning',
message: "此记录已完成,不可重复操作。",
showClose: true
})
return
},
toAudit() {
if (this.selectionList.length === 1) {
this.dialogVisible = true
} else {
this.$message({ type: 'warning', message: '请选择一条记录进行操作', showClose: true })
}
},
handleClose() {
this.dialogVisible = false
},
selectionLineChangeHandle(val) {
this.selectionList = val
const aa = []
val.forEach(element => {
aa.push(element.sid)
})
this.sids = aa
},
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
switch (btnKey) {
case 'toAudit':
this.toAudit()
break
case 'toAdd':
this.toAdd()
break
case 'toEnd':
this.toEnd()
break
case 'doClose':
this.doClose()
break
default:
break
}
},
loadList() {
this.tableLoading = true
this.queryParams.params.userSid = window.sessionStorage.getItem('userSid')
this.queryParams.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
this.queryParams.params.menuUrl = this.$route.path
req.listPage(this.queryParams).then((resp) => {
this.tableLoading = false
if (resp.success) {
const data = resp.data
this.queryParams.total = data.total
this.dataList = data.records
} else {
// resp.code
this.dataList = []
this.queryParams.total = 0
}
}).catch(() => {
this.tableLoading = false
})
},
if (this.selectionList[0].busTypeValue == '采购入库' &&
this.selectionList[0].manufactorBillNo == '') {
this.$message({
type: 'warning',
message: "厂家订单号不能为空",
showClose: true
})
return
//
indexMethod(index) {
var pagestart = (this.queryParams.current - 1) * this.queryParams.size
var pageindex = index + 1 + pagestart
return pageindex
},
dosearch() {
this.queryParams.current = 1
this.loadList()
},
resetQuery() {
this.queryParams = {
current: 1,
size: 10,
total: 0,
params: {
name: ''
}
if (this.selectionList[0].billState == '已收货(部分终止)') {
}
this.loadList()
},
toEnd() {
for (var i = 0; i < this.selectionList.length; i++) {
if (this.selectionList[i].billState === '已收货' || this.selectionList[i].billState === '已收货(部分终止)') {
this.$message({
type: 'warning',
message: "此记录已终止,不可重复操作。",
message: '不可选择已收货或已终止的记录。',
showClose: true
})
return
}
this.viewState = 2
this.$refs['divadd'].showEdit(this.selectionList[0])
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
},
toRelevancy(row) {
this.viewState = 4
this.$refs['divinfo'].showEdit(row)
},
toRelevancyInfo(row) {
const tip = '请确认是否删除所选品牌?'
}
if (this.sids.length > 0) {
const tip = '请确认是否终止所选 ' + this.sids.length + ' 条记录?'
this.$confirm(tip, '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
@ -528,7 +390,7 @@
spinner: 'el-icon-loading',
background: 'rgba(0, 0, 0, 0.7)'
})
req.deleteGoods(row.sid).then((resp) => {
req.billToEnd(this.sids).then((resp) => {
loading.close()
if (resp.success) {
this.$message({
@ -543,29 +405,64 @@
}).catch(e => {
loading.close()
})
}).catch(() => {})
},
resetState() {
this.viewState = 1
},
enableChange(sid, state) {
console.log('sid', sid)
console.log('state', state)
req.updateIsEnable(sid, state).then((resp) => {
if (resp.success) {
this.$message({
type: 'success',
message: '状态已更新',
showClose: true
})
} else { // resp.code
}
}).catch(e => {
console.log(e)
}).catch(() => {
})
} else {
this.$message({
showClose: true,
message: '请至少选择一条记录进行终止操作'
})
}
},
toAdd() {
if (this.selectionList.length !== 1) {
this.$message({
type: 'warning',
message: '请选择一条数据。',
showClose: true
})
return
}
if (this.selectionList[0].billState === '已收货') {
this.$message({
type: 'warning',
message: '此记录已完成,不可重复操作。',
showClose: true
})
return
}
if (this.selectionList[0].busTypeValue === '采购入库' && this.selectionList[0].manufactorBillNo === '') {
this.$message({
type: 'warning',
message: '厂家订单号不能为空',
showClose: true
})
return
}
if (this.selectionList[0].billState === '已收货(部分终止)') {
this.$message({
type: 'warning',
message: '此记录已终止,不可在收货。',
showClose: true
})
return
}
this.viewState = 2
this.$refs['divAdd'].showEdit(this.selectionList[0])
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showEdit(row)
},
resetState() {
this.viewState = 1
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

868
yxt-as-ui/src/views/storage/deliveryNotice/receiptAdd.vue

@ -1,27 +1,16 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>新增收货单</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate">保存</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submintdate">确认</el-button>
<el-button type="primary" size="small" :disabled="submitdisabled" @click="submit">确认</el-button>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">制单人</div>
<el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
@ -35,7 +24,6 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">来源单号</div>
@ -46,24 +34,20 @@
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item> <el-select v-model="formobj.supplierName" placeholder="请选择" clearable
@change="selectSupplierName" class="addinputInfo addinputw">
<el-option v-for="(item,i) in supplierNameList" :key="item.sid" :label="item.supplierName"
:value="item.sid">
<div class="span-sty"><span class="must">*</span>供应商</div>
<el-form-item prop="supplierName">
<el-select v-model="formobj.supplierName" placeholder="请选择" clearable @change="selectSupplierName" class="addinputInfo addinputw">
<el-option v-for="item in supplierNameList" :key="item.sid" :label="item.supplierName" :value="item.sid">
</el-option>
</el-select>
</el-form-item>
<!-- <el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item> -->
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 到货日期</div>
<div class="span-sty"><span class="must">*</span>到货日期</div>
<el-form-item prop="deliveryDate">
<el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputInfo" value-format="yyyy-MM-dd"
placeholder="选择日期">
<el-date-picker v-model="formobj.deliveryDate" type="date" class="addinputInfo" value-format="yyyy-MM-dd" placeholder="选择日期">
</el-date-picker>
</el-form-item>
</el-col>
@ -72,84 +56,60 @@
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty"><span class="must">*</span> 收货人是否与上架人一致</div>
<!-- <el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item> -->
<div class="span-sty"><span class="must">*</span>收货人是否与上架人一致</div>
<el-form-item prop="isUpShelf">
<el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo" @change="changeTheme">
<el-radio-group v-model="formobj.isUpShelf" size="small" class="addinputInfo">
<el-radio :label="1"></el-radio>
<el-radio :label="2"></el-radio>
</el-radio-group>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">备注</div>
<el-form-item> <el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo"
type="textarea" :rows="4" clearable /></el-form-item>
<el-form-item>
<el-input v-model="formobj.remarks" placeholder="" class="addinputw addinputInfo" type="textarea" :rows="4" clearable/>
</el-form-item>
</el-col>
</el-row>
<div class="title titleOne">
<div>商品列表</div>
<!-- <el-button type="primary" size="mini" class="btntopblueline" @click="batchAddAll()">批次收货</el-button> -->
</div>
<div class="title">商品列表</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed width="50" type="selection" align="center" />
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" wid align="center" width="100">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoods(scope.row)">删除</el-button>
<!-- <el-button type="primary" size="mini" @click="doAddBatch(scope.row)">批次+</el-button> -->
</template>
</el-table-column>
<el-table-column label="商品名称" prop="goodsSpuName" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<!-- <el-table-column label="仓库" align="center" width="180">
<el-table-column label="入库单价" prop="cost" align="center" width="100">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseName" placeholder="请选择" clearable
@change="selectWarehouseName(scope.row,$event)">
<el-option v-for="(item,i) in warehouseList" :key="i" :label="item.warehouseName" :value="item.sid">
</el-option>
</el-select>
<el-input @input="commodityComputeYHAndXSJE(scope.row)" @keyup.native="scope.row.cost = getNumber(scope.row.cost, 0)" v-model="scope.row.cost" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="库位" align="center" width="180">
<template slot-scope="scope">
<el-select v-model="scope.row.warehouseRackName" :disabled="scope.row.warehouseName==''" clearable
@focus="getWarehouseAreaList(scope.row.warehouseSid)" placeholder="请选择"
@change="selectWarehouseAreaCode">
<el-option v-for="(item,i) in warehouseRackList" :key="i" :label="item.areaCode" :value="item.sid">
</el-option>
</el-select>
</template>
</el-table-column> -->
<el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
<el-table-column label="实收数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" @input="commodityComputeYHAndXSJE(scope.row,$event)"
v-model="scope.row.actualInCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<el-input @input="commodityComputeYHAndXSJE(scope.row)" @keyup.native="scope.row.actualInCount = getNumber(scope.row.actualInCount, 0)" v-model="scope.row.actualInCount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="拒收数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rejectCount" clearable placeholder=""
@input="commodityComputeYHAndXSJE2(scope.row,$event)"
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
<el-input @keyup.native="scope.row.rejectCount = getNumber(scope.row.rejectCount, 0)" v-model="scope.row.rejectCount" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="拒收原因" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.rejectReason" clearable placeholder="" />
<el-input v-model="scope.row.rejectReason" clearable placeholder=""/>
</template>
</el-table-column>
<el-table-column label="是否质检" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.isQuality" size="small" @change="changeTheme">
<el-radio-group v-model="scope.row.isQuality" size="small">
<el-radio :label="0"></el-radio>
<el-radio :label="1"></el-radio>
</el-radio-group>
@ -157,7 +117,7 @@
</el-table-column>
<el-table-column label="质检状态" align="center" width="180">
<template slot-scope="scope">
<el-radio-group v-model="scope.row.qualityState" size="small" @change="changeTheme2">
<el-radio-group v-model="scope.row.qualityState" size="small">
<el-radio :label="0">合格</el-radio>
<el-radio :label="1">不合格</el-radio>
</el-radio-group>
@ -165,593 +125,261 @@
</el-table-column>
<el-table-column label="载具说明" align="center" width="180">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.packageRemark" clearable placeholder="" />
<el-input v-model="scope.row.packageRemark" clearable placeholder="" />
</template>
</el-table-column>
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="入库金额" prop="amount" align="center" width="100" />
</el-table>
<!-- <div class="title">
<div>商品-批次</div>
</div>
<el-table v-loading="listLoading" :data="formobj.pcList" border style="width: 100%;">
<el-table-column fixed width="60" label="序号" type="index" :index="indexMethod" align="center" />
<el-table-column fixed label="操作" wid align="center" width="120">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="doGoodsBatch(scope.row)">删除</el-button>
</template>
</el-table-column>
<el-table-column label="商品列表序号" prop="xh" align="center" width="120" />
<el-table-column label="商品名称" prop="goodsSkuTitle" align="center" width="200" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" width="150" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<el-table-column label="仓库" prop="unit" align="center" width="150" />
<el-table-column label="库位" prop="unit" align="center" width="150" />
<el-table-column label="批次号" prop="batchNumber" align="center" width="300" />
<el-table-column label="生产日期" align="center" width="180">
<template slot-scope="scope">
<el-date-picker v-model="scope.row.manufactureDate" type="date" value-format="yyyy-MM-dd"
placeholder="选择日期" @change="manufactureDateChange(scope.row,$event)" />
</template>
</el-table-column>
<el-table-column label="有效期" prop="expirationDate" align="center" width="180" />
<el-table-column label="数量" align="center" width="120">
<template slot-scope="scope">
<el-input ref="focusAssumptionInput" v-model="scope.row.batchCount" clearable placeholder=""
oninput="value=value.replace(/^(0+)|[^\d]+/g,'')" />
</template>
</el-table-column>
</el-table> -->
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/deliveryNotice.js'
import req2 from '@/api/storage/allocation.js'
import {
getCurrentDate
} from '@/utils/index.js'
import {
choiceSupplierInfo,
getOrgSidByPath
} from '@/api/Common/dictcommons'
export default {
components: {},
data() {
return {
listLoading: false,
activeNames: ['1'],
submitdisabled: false,
formobj: {
sourceBillNo: "",
busTypeKey: "",
busTypeValue: "",
createTime: '',
createByName: window.sessionStorage.getItem('name'),
deptName: '',
deptSid: '',
createBySid: window.sessionStorage.getItem('userSid'),
useOrgSid: '',
createOrgSid: '',
billState: '新建',
billStateKey: 0,
reviewStatus: "",
refuseReason: "",
contact: "",
mobile: "",
supplierSid: "",
supplierName: "",
goodsOwnerSid: "",
goodsOwner: "",
deliveryDate: getCurrentDate(),
list: [],
pcList: []
},
hideUploadBtn: false,
warehouseList: [],
warehouseRackList: [],
supplierNameList: [],
rules: {
deliveryDate: [{
required: true,
message: '到货日期不能为空',
trigger: 'change'
}],
isUpShelf: [{
required: true,
message: '请选择是或否',
trigger: 'change'
}],
}
import req from '@/api/storage/deliveryNotice.js'
import { getCurrentDate } from '@/utils/index.js'
import { choiceSupplierInfo, getOrgSidByPath } from '@/api/Common/dictcommons'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {
sourceBillNo: '',
busTypeKey: '',
busTypeValue: '',
createTime: '',
createByName: window.sessionStorage.getItem('name'),
deptName: '',
deptSid: '',
createBySid: window.sessionStorage.getItem('userSid'),
useOrgSid: '',
createOrgSid: '',
billState: '新建',
billStateKey: 0,
reviewStatus: '',
refuseReason: '',
contact: '',
mobile: '',
supplierSid: '',
supplierName: '',
goodsOwnerSid: '',
goodsOwner: '',
deliveryDate: getCurrentDate(),
list: [],
pcList: []
},
supplierNameList: [],
rules: {
deliveryDate: [{ required: true, message: '到货日期不能为空', trigger: 'change' }],
isUpShelf: [{ required: true, message: '请选择是或否', trigger: 'change' }],
supplierName: [{ required: true, message: '供应商不能为空', trigger: 'change' }]
}
}
},
methods: {
getNumber(val, limit) {
val = val.replace(/[^0-9.]/g, '') //
val = val.replace(/^00/, '0.') // 0
val = val.replace(/^\./g, '0.') // 0.
val = val.replace(/\.{2,}/g, '.') //
val = val.replace('.', '$#$').replace(/\./g, '').replace('$#$', '.'); //
/^0\d+/.test(val) ? val = val.slice(1) : '' // 0
const str = '^(\\d+)\\.(\\d{' + limit + '}).*$'
const reg = new RegExp(str)
if (limit === 0) {
//
val = val.replace(reg, '$1')
} else {
//
val = val.replace(reg, '$1.$2')
}
return val
},
created() {
},
methods: {
init() {
getOrgSidByPath({
orgPath: window.sessionStorage.getItem('defaultOrgPath')
}).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
})
},
// getOrgPathSid() {
// getOrgSidByPath({
// orgPath: window.sessionStorage.getItem('defaultOrgPath')
// }).then((res) => {
// if (res.success) {
// this.formobj.createOrgSid = res.data
// this.formobj.useOrgSid = res.data
// }
// })
// },
selectSupplierName(val) {
console.log("supplierNameSelect", val);
const choose = this.supplierNameList.filter((item) => item.sid == val)
console.log('>>>>>>>>>supplierNameSelect', choose)
this.formobj.supplierName = choose[0].supplierName
this.formobj.supplierSid = choose[0].sid
},
getsupplierLust() {
// getOrgSidByPath({
// orgPath: window.sessionStorage.getItem('defaultOrgPath')
// }).then((res) => {
// if (res.success) {
// this.formobj.createOrgSid = res.data
// this.formobj.useOrgSid = res.data
// req.choiceSupplierInfo(res.data).then((resp) => {
// if (resp.success) {
// this.supplierNameList = resp.data
// console.log("aaaaaa", this.supplierNameList);
// }
// })
// }
// })
choiceSupplierInfo({
deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}).then((resp) => {
if (resp.success) {
this.supplierNameList = resp.data
console.log("aaaaaa", this.supplierNameList);
}
})
},
getWarehouseList() {
var parpams = {
orgPath: window.sessionStorage.getItem('defaultOrgPath'),
init() {
getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
this.formobj.createOrgSid = res.data
this.formobj.useOrgSid = res.data
}
req2.getWarehouses(parpams).then((res) => {
if (res.success) {
this.warehouseList = res.data
console.log("aaaaaa", this.warehouseList);
}
})
},
getWarehouseAreaList(sid) {
var query = {
ckSid: sid
})
choiceSupplierInfo({ deptSid: window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1) }).then((resp) => {
if (resp.success) {
this.supplierNameList = resp.data
}
req2.getWarehouseareas(query).then((res) => {
if (res.success) {
this.warehouseRackList = res.data
console.log("aaaaaa", this.warehouseRackList);
}
})
},
selectWarehouseName(row, val) {
console.log("selectWarehouseName", row);
console.log("selectWarehouseName", val);
const choose = this.warehouseList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseName', choose)
row.warehouseName = choose[0].warehouseName
row.warehouseSid = choose[0].sid
},
selectWarehouseAreaCode(val) {
console.log("selectWarehouseAreaCode", val);
const choose = this.warehouseRackList.filter((item) => item.sid == val)
console.log('>>>>>>>>>selectWarehouseAreaCode', choose)
row.warehouseRackName = choose[0].areaCode
row.warehouseRackSid = choose[0].sid
},
batchAddAll() {
for (var i = 0; i < this.formobj.list.length; i++) {
var item = this.formobj.list[i]
var info = {
xh: i + 1,
goodsSkuSid: item.goodsSkuSid,
goodsSkuTitle: item.goodsSkuTitle,
goodsSkuCode: item.goodsSkuCode,
goodsSkuOwnSpec: item.goodsSkuOwnSpec,
unit: item.unit,
warehouseSid: item.warehouseSid,
warehouseName: item.warehouseName,
warehouseRackSid: item.warehouseRackSid,
warehouseRackName: item.warehouseRackName,
shelfLife: item.shelfLife,
orderCount: item.orderCount,
batchNumber: '',
manufactureDate: '',
batchCount: 0,
})
},
selectSupplierName(val) {
const choose = this.supplierNameList.filter((item) => item.sid === val)
this.formobj.supplierName = choose[0].supplierName
this.formobj.supplierSid = choose[0].sid
},
doGoods(row) {
this.$confirm('是否确定删除此商品?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.list.findIndex((item) => item === row)
this.formobj.list.splice(index, 1)
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
if (this.formobj.pcList[i].xh === (index + 1)) {
this.formobj.pcList.splice(i, 1)
}
this.formobj.pcList.push(info)
}
},
doGoods(row) {
console.log("doGoodsDel》》》》", row)
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.list.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.list.splice(index, 1)
for (var i = this.formobj.pcList.length - 1; i >= 0; i--) {
if (this.formobj.pcList[i].xh === (index + 1)) {
this.formobj.pcList.splice(i, 1);
}
}
})
},
doGoodsBatch(row) {
console.log("doGoodsDel》》》》", row)
this.$confirm("是否确定删除此商品?", '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}).then(() => {
const index = this.formobj.pcList.findIndex((item) => item === row)
console.log("index》》》》", index)
this.formobj.pcList.splice(index, 1)
})
},
manufactureDateChange(row, val) {
console.log("manufactureDateChange》》》》", val)
row.manufactureDate = val
row.expirationDate = this.addDate(val, row.shelfLife)
let reg = new RegExp('-', 'g') //g
row.batchNumber = this.formobj.deliveryDate.replace(reg, '') + " - " + row.expirationDate.replace(reg, '')
this.$forceUpdate(); //
console.log("manufactureDateChange》》》》", row)
},
addDate(date, days) {
var dates = new Date(date)
dates.setDate(dates.getDate() + days)
var year = dates.getFullYear()
var month = dates.getMonth() + 1
var day = dates.getDate()
if (month < 9) {
month = "0" + month
}
if (day < 9) {
day = "0" + day
}
var time = year + '-' + month + '-' + day
return time
},
doAddBatch(row) {
const index = (this.formobj.list.findIndex((item) => item === row)) + 1
console.log("doAddBatch》》》》", index)
console.log("doAddBatch》》》》", row)
var info = {
xh: index,
goodsSkuSid: row.goodsSkuSid,
goodsSkuTitle: row.goodsSkuTitle,
goodsSkuCode: row.goodsSkuCode,
goodsSkuOwnSpec: row.goodsSkuOwnSpec,
unit: row.unit,
warehouseSid: row.warehouseSid,
warehouseName: row.warehouseName,
warehouseRackSid: row.warehouseRackSid,
warehouseRackName: row.warehouseRackName,
shelfLife: row.shelfLife,
orderCount: row.orderCount,
batchNumber: '',
manufactureDate: '',
batchCount: 0,
}
console.log("aaaaaaaaaaa", info);
this.formobj.pcList.push(info)
},
commodityComputeYHAndXSJE(row, val) {
console.log("aaa", row);
console.log("aaa", val);
// if (Number(row.actualInCount) > Number(row.orderCount)) {
row.actualInCount = val
// }
row.amount = (Number(row.actualInCount) * Number(row.cost)).toFixed(2)
},
commodityComputeYHAndXSJE2(row, val) {
console.log("aaa", row);
console.log("aaa", val);
row.rejectCount = val
// if ((Number(row.rejectCount) + Number(row.actualInCount)) > Number(row.orderCount)) {
// row.rejectCount = Number(row.orderCount) - Number(row.actualInCount)
// }
},
changeTheme() {
},
changeTheme2() {
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
// if (this.formobj.deliveryDate == '') {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
// return
// }
this.$refs['form_obj'].validate((valid) => {
if (valid) {
for (var i = 0; i < this.formobj.list.length; i++) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
})
},
commodityComputeYHAndXSJE(row) {
row.amount = Math.round((parseFloat(row.actualInCount !== '' ? row.actualInCount : 0) * parseFloat(row.cost !== '' ? row.cost : 0)) * 100) / 100
},
indexMethod(index) {
return index + 1
},
saveOrUpdate() {
this.$refs['form_obj'].validate((valid) => {
if (valid) {
for (var i = 0; i < this.formobj.list.length; i++) {
if (parseFloat(this.formobj.list[i].actualInCount) === 0) {
this.$message({ showClose: true, type: 'error', message: '商品实收数量不能为空' })
return
}
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
}
})
},
submintdate() {
console.log('>>>>>>>>>saveOrUpdate', this.formobj)
// if (this.formobj.deliveryDate == '') {
// this.$message({
// showClose: true,
// type: 'error',
// message: ''
// })
// return
// }
for (var i = 0; i < this.formobj.list.length; i++) {
if (Number(this.formobj.list[i].actualInCount) == 0) {
this.$message({
showClose: true,
type: 'error',
message: '商品实收数量不能为空'
})
return
}
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({
showClose: true,
type: 'success',
message: '保存成功'
})
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = true
req.save(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '保存成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.submitdisabled = false
this.formobj = {
sourceBillNo: "",
busTypeKey: "",
busTypeValue: "",
createByName: "",
billState: 0,
reviewStatus: "",
refuseReason: "",
contact: "",
mobile: "",
supplierSid: "",
supplierName: "",
goodsOwnerSid: "",
goodsOwner: "",
deliveryDate: "",
list: [],
pcList: []
}
}).catch(() => {
this.submitdisabled = false
})
}
this.$emit('doback')
},
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
// this.getWarehouseList()
this.getsupplierLust()
// this.getOrgPathSid()
var params = {
sourceSid: row.sid
})
},
submit() {
for (var i = 0; i < this.formobj.list.length; i++) {
if (parseFloat(this.formobj.list[i].actualInCount) === 0) {
this.$message({ showClose: true, type: 'error', message: '商品实收数量不能为空' })
return
}
req.getInitDetails(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
this.formobj.deliveryDate = getCurrentDate()
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window
.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage
.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true
req.submit(this.formobj).then((res) => {
if (res.success) {
this.$message({ showClose: true, type: 'success', message: '提交成功' })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
})
.catch(e => {
this.formobj = {}
})
}
})
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.submitdisabled = false
this.formobj = {
sourceBillNo: '',
busTypeKey: '',
busTypeValue: '',
createTime: '',
createByName: window.sessionStorage.getItem('name'),
deptName: '',
deptSid: '',
createBySid: window.sessionStorage.getItem('userSid'),
useOrgSid: '',
createOrgSid: '',
billState: '新建',
billStateKey: 0,
reviewStatus: '',
refuseReason: '',
contact: '',
mobile: '',
supplierSid: '',
supplierName: '',
goodsOwnerSid: '',
goodsOwner: '',
deliveryDate: getCurrentDate(),
list: [],
pcList: []
}
this.$emit('doback')
},
showAdd() {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
},
showEdit(row) {
this.$nextTick(() => {
this.$refs['form_obj'].clearValidate()
})
this.init()
req.getInitDetails(row.sid).then((resp) => {
if (resp.success) {
this.formobj = resp.data
this.formobj.deliveryDate = getCurrentDate()
this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
}
}).catch(e => {
this.formobj = {}
})
}
}
}
</script>
<style scoped>
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 190px !important;
}
.addinputInfo {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 180px !important;
width: calc(100% - 175px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
/deep/ .el-form-item__error {
margin-left: 120px !important;
}
.must {
color: #f00;
}
.span-sty {
width: 190px !important;
}
.addinputInfo {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 180px !important;
width: calc(100% - 175px);
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
/deep/ .el-form-item__error {
margin-left: 180px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
display: inline;
line-height: 1px;
vertical-align: middle;
}
</style>

143
yxt-as-ui/src/views/storage/deliveryNotice/receiptInfo.vue

@ -1,25 +1,14 @@
<template>
<div>
<div class="tab-header webtop">
<!-- 标题 -->
<div>预期到货通知单详情</div>
<!-- start 添加修改按钮 -->
<div>
<el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
</div>
<!-- end 添加修改按钮 -->
<!-- end 详情按钮 -->
</div>
<div class="listconadd">
<el-form ref="form_obj" :model="formobj" class="formaddcopy02">
<!-- <div class="title">
<div>基础信息</div>
</div> -->
<el-row class="first_row">
<el-col :span="8">
<div class="span-sty">单据编号</div>
<el-form-item><span class="addinputInfo">{{ formobj.billNo }}</span></el-form-item>
@ -33,9 +22,7 @@
<el-form-item><span class="addinputInfo">{{ formobj.createTime }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">来源单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.sourceBillNo }}</span></el-form-item>
@ -45,14 +32,15 @@
<el-form-item><span class="addinputInfo">{{ formobj.busTypeValue }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
<div class="span-sty">厂家订单号</div>
<el-form-item><span class="addinputInfo">{{ formobj.manufactorBillNo }}</span></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="8">
<div class="span-sty">供应商</div>
<el-form-item><span class="addinputInfo">{{ formobj.supplierName }}</span></el-form-item>
</el-col>
<el-col :span="8">
<div class="span-sty">预期到货日期</div>
<el-form-item><span class="addinputInfo">{{ formobj.deliveryDate }}</span></el-form-item>
@ -61,115 +49,72 @@
<div class="span-sty">单据状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.billState }}</span></el-form-item>
</el-col>
<!-- <el-col :span="8">
<div class="span-sty">审核状态</div>
<el-form-item><span class="addinputInfo">{{ formobj.reviewStatus }}</span></el-form-item>
</el-col> -->
</el-row>
<!-- <el-row>
<el-row>
<el-col :span="24">
<div class="span-sty">拒绝原因</div>
<el-form-item><span class="addinputInfo">{{ formobj.refuseReason }}</span></el-form-item>
<div class="span-sty">备注</div>
<el-form-item><span class="addinputInfo">{{ formobj.remarks }}</span></el-form-item>
</el-col>
</el-row> -->
<div class="title titleOne">
<div>商品列表</div>
</div>
</el-row>
<div class="title">商品列表</div>
<el-table v-loading="listLoading" :data="formobj.list" border style="width: 100%;">
<el-table-column fixed label="序号" type="index" :index="indexMethod" align="center" width="80" />
<el-table-column fixed label="商品名称" prop="goodsSpuName" align="center" />
<el-table-column label="商品编码" prop="goodsSkuCode" align="center" />
<el-table-column label="规格" prop="goodsSkuOwnSpec" align="center" width="150" />
<el-table-column label="单位" prop="unit" align="center" width="120" />
<!-- <el-table-column label="仓库" prop="warehouseName" align="center" width="120" />
<el-table-column label="库位" prop="warehouseRack" align="center" width="120" /> -->
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="预期到货数量" prop="orderCount" align="center" width="120" />
<el-table-column label="待收货数量" prop="waitInCount" align="center" />
<el-table-column label="已收货数量" prop="actualInCount" align="center" />
<el-table-column label="入库单价" prop="cost" align="center" width="100" />
<el-table-column label="税率" prop="taxAmount" align="center" width="100" />
<!-- <el-table-column label="含税单价" prop="taxPrice" align="center" width="100" /> -->
<el-table-column label="采购金额" prop="amount" align="center" />
</el-table>
</el-form>
</div>
</div>
</template>
<script>
import req from '@/api/storage/deliveryNotice.js'
import req from '@/api/storage/deliveryNotice.js'
export default {
components: {},
data() {
return {
listLoading: false,
submitdisabled: false,
formobj: {},
}
export default {
data() {
return {
listLoading: false,
formobj: {}
}
},
methods: {
indexMethod(index) {
return index + 1
},
methods: {
indexMethod(index) {
return index + 1
},
handleReturn(isreload) {
if (isreload === 'true') this.$emit('reloadlist')
this.$emit('doback')
},
showAdd() {
},
showEdit(row) {
var params = {
sid: row.sid
handleReturn() {
this.formobj = {}
this.$emit('doback')
},
showEdit(row) {
req.init(row.sid).then(resp => {
if (resp.success) {
this.formobj = resp.data
}
req.init(row.sid)
.then(resp => {
if (resp.success) {
this.formobj = resp.data
}
})
.catch(e => {
this.formobj = {}
})
}
}).catch(e => {
this.formobj = {}
})
}
}
}
</script>
<style scoped>
.span-sty {
width: 130px !important;
}
.addinputInfo {
margin-left: 120px !important;
}
.span-sty {
width: 130px !important;
}
.formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
margin-left: 120px !important;
width: calc(100% - 115px);
}
.addinputInfo {
margin-left: 120px !important;
}
.first_row {
border-top: 1px solid #E0E3EB;
}
.titleOne {
padding: 7px;
display: flex;
flex-direction: row;
justify-content: space-between;
align-items: center;
}
.first_row {
border-top: 1px solid #E0E3EB;
}
</style>

Loading…
Cancel
Save