Browse Source

Merge remote-tracking branch 'origin/master'

master
dimengzhe 1 year ago
parent
commit
261af10907
  1. 74
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java
  2. 57
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java
  3. 42
      anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue
  4. 42
      anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue
  5. 42
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue
  6. 42
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue
  7. 42
      anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/financialschemeInfo.vue
  8. 42
      anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/financialschemeInfo.vue
  9. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java
  10. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java
  11. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java
  12. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java
  13. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java
  14. 5
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java
  15. 14
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java
  16. 3
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java
  17. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java
  18. 4
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java
  19. 20
      anrui-riskcenter-ui/src/api/provisionoffunds/provisionoffunds.js
  20. 8
      anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue
  21. 42
      anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue
  22. 42
      anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue
  23. 16
      anrui-riskcenter-ui/src/router/index.js
  24. 202
      anrui-riskcenter-ui/src/views/provisionoffunds/provisionoffunds.vue
  25. 8
      anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue
  26. 42
      anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue
  27. 42
      anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

74
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basetrailer/BaseTrailerService.java

@ -69,6 +69,7 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempFeign;
import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDetailsVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDetailsVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.fincompanyinvoicing.FinCompanyInvoicingDetailsVo;
@ -162,6 +163,8 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
private FinCompanyInvoicingFeign finCompanyInvoicingFeign;
@Autowired
private CrmCustomerTempFeign crmCustomerTempFeign;
@Autowired
private FinBillTrailerFeign finBillTrailerFeign;
private QueryWrapper<BaseTrailer> createQueryWrapper(BaseTrailerQuery query) {
// 多字段Like示例:qw.and(wrapper -> wrapper.like("name", query.getName()).or().like("remark", query.getName()));
@ -900,41 +903,44 @@ public class BaseTrailerService extends MybatisBaseService<BaseTrailerMapper, Ba
baseTrailer.setDealPrice(baseVehicleOut.getPrice());
baseTrailer.setIssueDate(DateUtil.formatDate(new Date()));
saveOrUpdate(baseTrailer);
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplicationDetailsVo.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplicationDetailsVo.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailer.getSid());
finVehicleInvoiceDto.setVIN(baseTrailer.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleDetailsVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(baseTrailer.getDealPrice());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplicationDetailsVo.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleDetailsVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplicationDetailsVo.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplicationDetailsVo.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
finVehicleInvoiceDto.setIsTakeTicket("是");
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
finVehicleInvoiceDto.setIsTakeTicket("是");
Integer count = finBillTrailerFeign.fetchByGcVinNo(baseTrailer.getVinNo(), finBillApplicationDetailsVo.getSid()).getData();
if (count == 0){
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(finBillApplicationDetailsVo.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(finBillApplicationDetailsVo.getContractNo());
finVehicleInvoiceDto.setCustomerName(finBillApplicationDetailsVo.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailer.getSid());
finVehicleInvoiceDto.setVIN(baseTrailer.getVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(finBillVehicleDetailsVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(finBillVehicleDetailsVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(baseTrailer.getDealPrice());
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(finBillApplicationDetailsVo.getSid());
finVehicleInvoiceDto.setInvoicingName(finBillVehicleDetailsVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(finBillApplicationDetailsVo.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(finBillApplicationDetailsVo.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(finBillApplicationDetailsVo.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(finBillApplicationDetailsVo.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsBySid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
if (StringUtils.isNotBlank(finCompanyInvoicingDetailsVo.getBankAccount())) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
finVehicleInvoiceDto.setIsTakeTicket("是");
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(finBillVehicleDetailsVo.getOpenTickSid()).getData();
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
finVehicleInvoiceDto.setIsTakeTicket("是");
}
finVehicleInvoiceFeign.saveOrUpdate(finVehicleInvoiceDto);
}
finVehicleInvoiceFeign.saveOrUpdate(finVehicleInvoiceDto);
return rb.success();
}

57
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdeliveredapply/BusDeliveredApplyService.java

@ -108,8 +108,10 @@ import com.yxt.anrui.crm.api.crmcustomertemp.CrmCustomerTempVo;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplication;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationDto;
import com.yxt.anrui.fin.api.finbillapplication.FinBillApplicationFeign;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerFeign;
import com.yxt.anrui.fin.api.finbilltrailer.FinBillTrailerVo;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleDto;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleFeign;
import com.yxt.anrui.fin.api.finbillvehicle.FinBillVehicleVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
@ -232,6 +234,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
@Autowired
private FinBillApplicationFeign finBillApplicationFeign;
@Autowired
private FinBillTrailerFeign finBillTrailerFeign;
@Autowired
private BusSalesOrderDiscountService busSalesOrderDiscountService;
@Autowired
private BusSalesOrderVehicleService busSalesOrderVehicleService;
@ -918,12 +922,12 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
log.error("获取销售订单详情出错啦!!!");
}
ResultBean<SysUserVo> userVoResultBean = sysUserFeign.fetchBySid(busDeliveredApply.getStaffUserSid());
BusBillApplication busBillApplication = busBillApplicationService.selectByCkSidAll(busDeliveredApply.getSid());
List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid());
if ("1".equals(busDeliveredApply.getHasInvoiceKey())) {
BusSalesOrderPrice data = busSalesOrderService.selectByContractNoOne(busDeliveredApply.getContractNo()).getData();
BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
BusBillApplication busBillApplication = busBillApplicationService.selectByCkSidAll(busDeliveredApply.getSid());
List<BusBillVehicleVo> busBillVehicleVos = busBillVehicleService.fetchVehBySid(busBillApplication.getSid());
List<BusBillTrailerVo> busBillTrailerVos = busBillTrailerService.fetchByMainSid(busBillApplication.getSid());
if (!data.getSingleFinalPrice().equals(busBillApplication.getOneBillMoney())) {//是高低开
BusValcustFilingDto busValcustFilingDto = new BusValcustFilingDto();
busValcustFilingDto.setCreateBySid(busBillApplication.getCreateBySid());
@ -1067,7 +1071,53 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
pushInvoice(busDeliveredApply, detailsList, orderDetailsVoResultBean.getData(), userVoResultBean.getData());
});
}
if (busBillTrailerVos != null){
String kpsqSid = finBillApplicationFeign.selectByCompContractNo(busDeliveredApply.getContractNo()).getData();
if (StringUtils.isNotBlank(kpsqSid)){
for (BusBillTrailerVo busBillTrailerVo : busBillTrailerVos) {
Integer count = finBillTrailerFeign.fetchByGcVinNo(busBillTrailerVo.getGcVinNo(),kpsqSid).getData();
if (count == 0){
BaseTrailerDetailsVo baseTrailerDetailsVo = baseTrailerFeign.fetchByGcVinNo(busBillTrailerVo.getGcVinNo()).getData();
FinVehicleInvoiceDto finVehicleInvoiceDto = new FinVehicleInvoiceDto();
finVehicleInvoiceDto.setInvoiceTitle(busBillApplication.getOpenTickUnitName());
finVehicleInvoiceDto.setContractNo(busBillApplication.getContractNo());
finVehicleInvoiceDto.setCustomerName(busBillApplication.getCustomerName());
finVehicleInvoiceDto.setVehicleSid(baseTrailerDetailsVo.getSid());
finVehicleInvoiceDto.setVIN(busBillTrailerVo.getGcVinNo());
finVehicleInvoiceDto.setInvoiceTypeKey(busBillTrailerVo.getBillTypeKey());
finVehicleInvoiceDto.setInvoiceType(busBillTrailerVo.getBillTypeValue());
finVehicleInvoiceDto.setInvoiceAmount(new BigDecimal(busBillTrailerVo.getOneBillMoney()));
finVehicleInvoiceDto.setBillingStateKey("001");
finVehicleInvoiceDto.setBillingState("未开票");
finVehicleInvoiceDto.setTransferStateKey("001");
finVehicleInvoiceDto.setTransferState("未移交");
finVehicleInvoiceDto.setVehicleType("挂车");
finVehicleInvoiceDto.setBillingSid(busBillApplication.getSid());
finVehicleInvoiceDto.setInvoicingName(busBillTrailerVo.getOpenTickName());
finVehicleInvoiceDto.setCreateBySid(busBillApplication.getCreateBySid());
finVehicleInvoiceDto.setBusinessStateKey(busBillApplication.getBillStateKey());
finVehicleInvoiceDto.setBusinessState(busBillApplication.getBillStateValue());
finVehicleInvoiceDto.setUseOrgSid(busBillApplication.getUseOrgSid());
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(busBillTrailerVo.getOpenTickSid()).getData();
if (finCompanyInvoicingDetailsVo != null) {
finVehicleInvoiceDto.setAddress(finCompanyInvoicingDetailsVo.getAddress());
finVehicleInvoiceDto.setTelPhone(finCompanyInvoicingDetailsVo.getPhone());
finVehicleInvoiceDto.setOpeningBank(finCompanyInvoicingDetailsVo.getBankName());
finVehicleInvoiceDto.setBankNum(finCompanyInvoicingDetailsVo.getBankAccount());
finVehicleInvoiceDto.setTaxpayerNo(finCompanyInvoicingDetailsVo.getTaxpayerNo());
} else {
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busBillTrailerVo.getOpenTickSid()).getData();
if (crmCustomerTempVo != null) {
finVehicleInvoiceDto.setTelPhone(crmCustomerTempVo.getMobile());
finVehicleInvoiceDto.setTaxpayerNo(crmCustomerTempVo.getIDNumber());
}
}
finVehicleInvoiceDto.setIsTakeTicket("是");
finVehicleInvoiceFeign.mySave(finVehicleInvoiceDto);
}
}
}
}
}
//推送优惠包交接数据
Future future2 = pool.submit(() -> {
@ -1449,7 +1499,6 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
}
}
}
}
}
}

42
anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeEdit.vue

@ -220,18 +220,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -240,24 +244,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-buscenter/anrui-buscenter-ui/src/components/publicPage/financialschemeInfo.vue

@ -219,18 +219,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -239,24 +243,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeEdit.vue

@ -220,18 +220,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -240,24 +244,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/publicPage/financialschemeInfo.vue

@ -219,18 +219,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -239,24 +243,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-buscenter/anrui-finmanage-ui/src/components/publicPage/financialschemeInfo.vue

@ -213,18 +213,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -233,24 +237,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

@ -213,18 +213,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -233,24 +237,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeign.java

@ -284,4 +284,9 @@ public interface FinBillApplicationFeign {
@PostMapping("/saveInvoicedApplyInfoPdfQk")
@ResponseBody
public ResultBean<DownloanVoUrl> saveInvoicedApplyInfoPdfQk(@RequestBody FinBillApplicationDto dto);
@ApiOperation("根据合同号查询已办结的开票申请sid")
@GetMapping("/selectByCompContractNo")
@ResponseBody
public ResultBean<String> selectByCompContractNo(@RequestParam("contractNo") String contractNo);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbillapplication/FinBillApplicationFeignFallback.java

@ -296,4 +296,9 @@ public class FinBillApplicationFeignFallback implements FinBillApplicationFeign
public ResultBean<DownloanVoUrl> saveInvoicedApplyInfoPdfQk(FinBillApplicationDto dto) {
return null;
}
@Override
public ResultBean<String> selectByCompContractNo(String contractNo) {
return null;
}
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeign.java

@ -80,4 +80,9 @@ public interface FinBillTrailerFeign {
@PostMapping("/fetchByMainSid")
@ResponseBody
ResultBean<List<FinBillTrailerVo>> fetchByMainSid(@RequestParam("busSid") String busSid);
@ApiOperation("根据挂车车架号及开票申请sid查询是否有挂车开票记录")
@PostMapping("/fetchByGcVinNo")
@ResponseBody
ResultBean<Integer> fetchByGcVinNo(@RequestParam("gcVinNo") String gcVinNo,@RequestParam("kpsqSid") String kpsqSid);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finbilltrailer/FinBillTrailerFeignFallback.java

@ -74,4 +74,9 @@ public class FinBillTrailerFeignFallback implements FinBillTrailerFeign {
public ResultBean<List<FinBillTrailerVo>> fetchByMainSid(String busSid) {
return null;
}
@Override
public ResultBean<Integer> fetchByGcVinNo(String gcVinNo,String kpsqSid) {
return null;
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationMapper.java

@ -122,4 +122,7 @@ public interface FinBillApplicationMapper extends BaseMapper<FinBillApplication>
BaseVehicle selectVinNoByVinSid(String vehSid);
BusSalesOrderVehicle selectByBorrowSid(@Param("contractNo") String contractNo, @Param("vehSid") String vehSid);
@Select("SELECT sid FROM fin_bill_application WHERE contractNo = #{contractNo} AND nodeState = '已办结'")
String selectByCompContractNo(String contractNo);
}

5
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationRest.java

@ -369,4 +369,9 @@ public class FinBillApplicationRest implements FinBillApplicationFeign {
public ResultBean<DownloanVoUrl> saveInvoicedApplyInfoPdfQk(FinBillApplicationDto dto) {
return finBillApplicationService.saveInvoicedApplyInfoPdfQk(dto);
}
@Override
public ResultBean<String> selectByCompContractNo(String contractNo) {
return finBillApplicationService.selectByCompContractNo(contractNo);
}
}

14
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbillapplication/FinBillApplicationService.java

@ -504,10 +504,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
}
} else if ("01".equals(solutionsDetailsVo.getTypeKey())) {//非担保
LoanNoGuaranteeCreditReviewDetailsVo loanNoGuaranteeCreditReviewDetailsVo = loanNoGuaranteeCreditReviewFeign.selByBorrSid(record.getBorrowerSid()).getData();
if (StringUtils.isBlank(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany())){
iterator.remove();
continue;
}
if ("1".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
BusSalesOrderBorrowerDetailsVo busSalesOrderBorrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(record.getBorrowerSid()).getData();
CrmCustomerTempVo crmCustomerTempVo = crmCustomerTempFeign.fetchSid(busSalesOrderBorrowerDetailsVo.getCustomSid()).getData();
@ -515,6 +511,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
record.setOpenTickSid(busSalesOrderBorrowerDetailsVo.getCustomSid());
record.setInvoiceInfo(crmCustomerTempVo.getIDNumber());
} else if ("2".equals(loanNoGuaranteeCreditReviewDetailsVo.getType())) {
if (StringUtils.isBlank(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany())){
iterator.remove();
continue;
}
FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingService.selectInvoingBySid(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompanySid()).getData();
record.setInvoiceName(loanNoGuaranteeCreditReviewDetailsVo.getAffiliatedCompany());
record.setOpenTickSid(finCompanyInvoicingDetailsVo.getSid());
@ -6086,4 +6086,10 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
downloanVoUrl.setSid(resultBean.getData().getSid());
return rb.success().setData(downloanVoUrl);
}
public ResultBean<String> selectByCompContractNo(String contractNo) {
ResultBean rb = ResultBean.fireFail();
String sid = baseMapper.selectByCompContractNo(contractNo);
return rb.success().setData(sid);
}
}

3
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerMapper.java

@ -69,4 +69,7 @@ public interface FinBillTrailerMapper extends BaseMapper<FinBillTrailer> {
@Delete("delete from fin_bill_trailer where billAppSid = #{dtoSid}")
void delByBillAppSid(String dtoSid);
@Select("SELECT COUNT(*) FROM fin_bill_trailer WHERE gcVinNo = #{gcVinNo} AND billAppSid = #{kpsqSid}")
int fetchByGcVinNo(@Param("gcVinNo") String gcVinNo,@Param("kpsqSid") String kpsqSid);
}

7
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerRest.java

@ -104,4 +104,11 @@ public class FinBillTrailerRest implements FinBillTrailerFeign {
List<FinBillTrailerVo> finBillTrailerVos = finBillTrailerService.fetchByMainSid(busSid);
return rb.success().setData(finBillTrailerVos);
}
@Override
public ResultBean<Integer> fetchByGcVinNo(String gcVinNo,String kpsqSid) {
ResultBean rb = ResultBean.fireFail();
int count = finBillTrailerService.fetchByGcVinNo(gcVinNo,kpsqSid);
return rb.success().setData(count);
}
}

4
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finbilltrailer/FinBillTrailerService.java

@ -115,4 +115,8 @@ public class FinBillTrailerService extends MybatisBaseService<FinBillTrailerMapp
public void delByBillAppSid(String dtoSid) {
baseMapper.delByBillAppSid(dtoSid);
}
public int fetchByGcVinNo(String gcVinNo,String kpsqSid) {
return baseMapper.fetchByGcVinNo(gcVinNo,kpsqSid);
}
}

20
anrui-riskcenter-ui/src/api/provisionoffunds/provisionoffunds.js

@ -0,0 +1,20 @@
import request from '@/utils/request'
export default {
// 查询分页列表
listPage: function(data) {
return request({
url: '/riskcenter/v1/loanpushfundhistory/listPage',
method: 'post',
data: data,
headers: { 'Content-Type': 'application/json' }
})
},
fundCreatePdf: function(data) {
return request({
url: '/riskcenter/v1/loanpushfundhistory/fundCreatePdf',
method: 'post',
params: data
})
}
}

8
anrui-riskcenter-ui/src/components/publicPage/financialscheme.vue

@ -240,7 +240,7 @@
</el-form-item>
</div>
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶首年保险费</div>
<div class="span-sty">首年保险费抵顶</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb || this.finance.premium == ''" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
</el-form-item>
@ -254,7 +254,7 @@
</el-form-item>
</div>
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶购置税</div>
<div class="span-sty">购置税抵顶</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb || this.finance.purchaseTax == ''" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
</el-form-item>
@ -740,11 +740,11 @@ export default {
}
if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') {
if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) {
this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' })
this.$message({ showClose: true, type: 'error', message: '首年保险费抵顶数额不能大于融资项目中的保险数额' })
return
}
if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) {
this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' })
this.$message({ showClose: true, type: 'error', message: '购置税抵顶数额不能大于融资项目中的购置税数额' })
return
}
}

42
anrui-riskcenter-ui/src/components/publicPage/financialschemeEdit.vue

@ -217,18 +217,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -237,24 +241,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">首年保险费抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">购置税抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-riskcenter-ui/src/components/publicPage/financialschemeInfo.vue

@ -219,18 +219,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -239,24 +243,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">首年保险费抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">购置税抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

16
anrui-riskcenter-ui/src/router/index.js

@ -839,6 +839,22 @@ export const constantRoutes = [
}
]
},
{
path: '/provisionoffunds',
component: Layout,
redirect: '/provisionoffunds',
meta: {
title: '资金占用费计提查询'
},
children: [
{
path: '/provisionoffunds/provisionoffunds',
component: () => import('@/views/provisionoffunds/provisionoffunds.vue'),
name: 'ProvisionOfFunds',
meta: { title: '资金占用费计提查询', noCache: true }
}
]
},
// 流程审批
// 金融产品政策报备--编辑

202
anrui-riskcenter-ui/src/views/provisionoffunds/provisionoffunds.vue

@ -0,0 +1,202 @@
<template>
<div class="app-container">
<!--列表页面-->
<div v-show="viewState == 1">
<button-bar view-title="资金占用费计提查询" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
<!--Start查询列表部分-->
<div class="main-content">
<div class="searchcon">
<el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
<div v-show="isSearchShow" class="search">
<el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
<el-form-item label="计提时间">
<el-date-picker v-model="listQuery.params.startTimes" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
<span style="padding: 0 8px"></span>
<el-date-picker v-model="listQuery.params.endTimes" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
</el-form-item>
</el-form>
<div class="btn" style="text-align: center;">
<el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
<el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
</div>
</div>
</div>
<!--End查询列表部分-->
<div class="listtop">
<div class="tit">资金占用费计提列表</div>
<pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--Start 主页面主要部分 -->
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;">
<el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center"/>
<el-table-column label="操作" width="100" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toDownload(scope.row)">下载</el-button>
</template>
</el-table-column>
<el-table-column prop="times" label="计提时间" align="center" />
<el-table-column prop="money" label="本次计提金额" align="center" />
</el-table>
</div>
<!--End 主页面主要部分-->
<div class="pages">
<div class="tit"/>
<!-- 翻页 -->
<pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
</div>
<!--End查询列表部分-->
</div>
</div>
</div>
</template>
<script>
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import ButtonBar from '@/components/ButtonBar'
import req from '@/api/provisionoffunds/provisionoffunds'
import { getStorage } from '@/utils/auth'
export default {
name: 'ProvisionOfFunds',
components: {
Pagination,
pageye,
ButtonBar
},
data() {
return {
btndisabled: false,
btnList: [
{
type: 'info',
size: 'small',
icon: 'cross',
btnKey: 'doClose',
btnLabel: '关闭'
}
],
isSearchShow: false,
searchxianshitit: '显示查询条件',
viewState: 1, // 1 2 3 4
tableKey: 0,
list: [],
sids: [], // SIDs
FormLoading: false,
listLoading: false,
//
listQuery: {
current: 1,
size: 5,
total: 0,
params: {
startTimes: '',
endTimes: '',
orgPath: ''
}
}
}
},
created() {
//
this.getList()
},
mounted() {
this.$refs['btnbar'].setButtonList(this.btnList)
},
methods: {
//
clicksearchShow() {
this.isSearchShow = !this.isSearchShow
if (this.isSearchShow) {
this.searchxianshitit = '隐藏查询条件'
} else {
this.searchxianshitit = '显示查询条件'
}
},
btnHandle(btnKey) {
console.log('XXXXXXXXXXXXXXX ' + btnKey)
switch (btnKey) {
case 'doClose':
this.doClose()
break
default:
break
}
},
//
indexMethod(index) {
var pagestart = (this.listQuery.current - 1) * this.listQuery.size
var pageindex = index + 1 + pagestart
return pageindex
},
//
getList() {
this.listLoading = true
this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
req.listPage(this.listQuery).then(response => {
this.listLoading = false
if (response.success) {
this.list = response.data.records
this.listQuery.total = response.data.total
} else {
this.list = []
this.listQuery.total = 0
}
})
},
//
handleFilter() {
this.listQuery.current = 1
this.getList()
},
//
handleReset() {
this.listQuery = {
current: 1,
size: 5,
total: 0,
params: {
startTimes: '',
endTimes: '',
orgPath: ''
}
}
this.getList()
},
toDownload(row) {
req.fundCreatePdf({ times: row.times, orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
if (res.success) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + res.data + '&outFileName=' + '资金占用费计提', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '资金占用费计提.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
}
})
},
doClose() {
this.$store.dispatch('tagsView/delView', this.$route)
this.$router.go(-1)
}
}
}
</script>
<style scoped>
</style>

8
anrui-riskcenter-ui/src/views/workFlow/publicPage/financialscheme.vue

@ -240,7 +240,7 @@
</el-form-item>
</div>
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶首年保险费</div>
<div class="span-sty">首年保险费抵顶</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPremium" :disabled="!finance.premiumCb || this.finance.premium == ''" placeholder="" clearable @keyup.native="finance.offsetPremium = oninput(finance.offsetPremium, 0)"/>
</el-form-item>
@ -254,7 +254,7 @@
</el-form-item>
</div>
<div v-if="finance.dealWayKey == '02' && finance.isPack == '1'">
<div class="span-sty">抵顶购置税</div>
<div class="span-sty">购置税抵顶</div>
<el-form-item>
<el-input class="addinputw" v-model="finance.offsetPurchasetax" :disabled="!finance.purchaseTaxCb || this.finance.purchaseTax == ''" placeholder="" clearable @keyup.native="finance.offsetPurchasetax = oninput(finance.offsetPurchasetax, 0)"/>
</el-form-item>
@ -741,11 +741,11 @@ export default {
}
if (this.finance.dealWayKey === '02' && this.finance.isPack === '1') {
if (parseInt(this.arguments(this.finance.premium)) < parseInt(this.arguments(this.finance.offsetPremium))) {
this.$message({ showClose: true, type: 'error', message: '抵顶首年保险费数额不能大于融资项目中的保险数额' })
this.$message({ showClose: true, type: 'error', message: '首年保险费抵顶数额不能大于融资项目中的保险数额' })
return
}
if (parseInt(this.arguments(this.finance.purchaseTax)) < parseInt(this.arguments(this.finance.offsetPurchasetax))) {
this.$message({ showClose: true, type: 'error', message: '抵顶购置税数额不能大于融资项目中的购置税数额' })
this.$message({ showClose: true, type: 'error', message: '购置税抵顶数额不能大于融资项目中的购置税数额' })
return
}
}

42
anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeEdit.vue

@ -217,18 +217,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -237,24 +241,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">首年保险费抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">购置税抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="addinputInfo">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

42
anrui-riskcenter-ui/src/views/workFlow/publicPage/financialschemeInfo.vue

@ -219,18 +219,22 @@
<el-form-item><span class="addinputInfo">{{ formobj.dealWay }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '01' && formobj.isPack == '0' ">
<el-row>
<el-col :span="6">
<div class="span-sty">代收费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
<div v-if="formobj.proxyTotal != '0'">
<div class="span-sty">代收购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.proxyPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>
@ -239,24 +243,28 @@
<el-form-item><span class="addinputInfo">{{ formobj.receivableTotal }}</span></el-form-item>
</el-col>
</el-row>
<el-row v-if="formobj.dealWayKey == '02' && formobj.isPack == '1'">
<el-row>
<el-col :span="6">
<div class="span-sty">抵顶费用合计</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetTotal }}</span></el-form-item>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶首年保险费</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">首年保险费抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPremium }}</span></el-form-item>
</div>
</el-col>
<el-col :span="9">
<div class="span-sty">抵顶购置税</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">购置税抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetPurchasetax }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row v-show="formobj.offsetAccessories != '0'">
<el-col :span="24">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
<el-col :span="6">
<div v-if="formobj.offsetTotal != '0'">
<div class="span-sty">配件抵顶</div>
<el-form-item><span class="addinputInfo">{{ formobj.offsetAccessories }}</span></el-form-item>
</div>
</el-col>
</el-row>
<el-row>

Loading…
Cancel
Save