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

Merge remote-tracking branch 'origin/master'

master
God 2 years ago
parent
66ec491f17 85934975b1
commit
691d1d598c
23 changed files with 3481 additions and 738 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java
  2. 4
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java
  3. 249
      anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
  4. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl
  5. 8
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
  6. 1573
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl
  7. 8
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
  8. 1575
      anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl
  9. 582
      anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl
  10. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl
  11. 2
      anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
  12. 2
      anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
  13. 1
      anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
  14. 43
      anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
  15. 41
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
  16. 8
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
  17. 24
      anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue
  18. 17
      anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingguanli.vue
  19. 20
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
  20. 2
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangInfo.vue
  21. 17
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangguanli.vue
  22. 17
      anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/relation/guachechexingselect.vue

2
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/ContractTemplateEnum.java
View File

@ -15,7 +15,7 @@ public enum ContractTemplateEnum {
CUSTOMERINVOICINGAPPLICATION("customer_invoicing_application", "客户开票申请书"),
VEHICLEREGISTRATION("vehicle_registration", "车辆登记合同"),
ENTRUSTPICKUPAUTHORIZATION("entrust_pickup_authorization", "委托提车授权书"),
CONTRACTALL("contract_all", "合同其他附件"),
CONTRACTALL("contract_all", "合同整体"),
;
/**

4
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/commoncontract/InvoicMessageContractVo.java
View File

@ -17,7 +17,7 @@ public class InvoicMessageContractVo implements Vo {
@ApiModelProperty("开票类型")
private String type;
@ApiModelProperty("开票金额")
private String invoicMoney;
private String money;
@ApiModelProperty("开票名称")
private String invoicName;
private String name;
}

249
anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/commoncontract/CommonContractService.java
View File

@ -6,6 +6,7 @@ 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.basevehiclemodel.BaseVehicleModel;
import com.yxt.anrui.base.api.commonappendix.CommonAppendix;
import com.yxt.anrui.base.api.commonappendix.CommonAttachTypeEnum;
import com.yxt.anrui.base.api.commoncontract.*;
@ -765,6 +766,21 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//获取模板
ftl = "orderacar";
}
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = "";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
} else {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
}
map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
@ -783,6 +799,48 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return pdfName;
}
private String genCarSaleContract2(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String ftl = "";
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles2";
} else {
//获取模板
ftl = "orderacar";
}
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = "";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。车架号：" + String.join("、", stringList);
} else {
remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
}
map.put("remarks", remarks);
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
File file = new File(targetPath + ftl + seconds + ".ftl");
File dir = new File(targetPath);
WordConvertUtils.inputStreamToFile(inputStream, file);
WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
//新生成的word路径
String wordPath = targetPath + typeName;
//生成文件名
String pdfName = "新车买卖合同2_" + dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
return pdfName;
}
/**
* 生成 新车买卖合同(现车) （空）pdf
*
@ -818,6 +876,22 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("totalPrice", "");
map.put("priceRemarks", "");
map.put("depositTotal", "");
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = "";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
if ("1".equals(dto.getDiscountKey())) {
if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else {
remarks = "主车" + num + "台，单台成交价： 元。";
}
map.put("remarks", remarks);
}
String ftl = "";
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) {
@ -849,6 +923,58 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
return url;
}
private String genCarSaleContractBlank2(PrintConfirmDto dto, Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
map.put("totalPrice", "");
map.put("priceRemarks", "");
map.put("depositTotal", "");
AppOrderPriceInfoVo priceInfo = appOrderDetailsVo.getPriceInfo();
//查询台数
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = "";
AppOrderModelInfoVo orderModelInfoVo = appOrderDetailsVo.getModelInfo();
List<String> stringList = orderModelInfoVo.getVinList();
if ("1".equals(dto.getDiscountKey())) {
if (stringList.size() > 0) {
remarks = "主车" + num + "台，单台成交价： 元。车架号：" + String.join("、", stringList);
} else {
remarks = "主车" + num + "台，单台成交价： 元。";
}
map.put("remarks", remarks);
}
String ftl = "";
// 涉及高低开票的，需要打印两套合同，一套按照成交价打印（记账用），一套为价格空白的合同（开票用）
if ("1".equals(dto.getDiscountKey())) {
// 现车
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
//获取模板
ftl = "existingvehicles_black2";
} else {
// 订车获取模板
ftl = "orderacar_black";
}
InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("ftl/" + ftl + ".ftl");
//生成word文件名
String targetPath = docPdfComponent.getUploadTemplateUrl();
String dateStr = DateUtil.format(new Date(), "yyyyMMdd");
long seconds = System.currentTimeMillis();
String typeName = dateStr + seconds + ".doc";
File file = new File(targetPath + ftl + seconds + ".ftl");
File dir = new File(targetPath);
WordConvertUtils.inputStreamToFile(inputStream, file);
WordConvertUtils.creatWord1(map, file, targetPath, typeName, dir);
//新生成的word路径
String wordPath = targetPath + typeName;
//生成合同文件名
String pdfName = "新车买卖空白合同2_" + dateStr + seconds + ".pdf";
WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
url = pdfName;
}
return url;
}
private String getReceiveCar(Map<String, Object> map, AppOrderDetailsVo appOrderDetailsVo) {
String url = "";
//查询销售订单的现车
@ -890,7 +1016,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String invoicName = "";
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getUseOrgName());
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
invoicName = invoicingDetailsVoResultBean.getData().getName();
}
//查询销售订单的现车
@ -901,10 +1027,12 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
if (stringList.size() > 0) {
for (int i = 0; i < stringList.size(); i++) {
InvoicMessageContractVo vo = new InvoicMessageContractVo();
if (stringList.get(i).length() > 8) {
vo.setVinNo(stringList.get(i).substring(stringList.get(i).length() - 8));
} else {
vo.setVinNo(stringList.get(i));
}
vo.setType(appOrderDetailsVo.getInvoiceType());
vo.setInvoicMoney(priceInfo.getSingleFinalPrice());
vo.setInvoicName(invoicName);
invoicMessageContractVos.add(vo);
}
}
@ -1538,10 +1666,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
CrmCustomerTempVo crmCustomerTempVo = crmResultBean.getData();
//身份证号
String idNo = crmCustomerTempVo.getIDNumber();
if (StringUtils.isBlank(idNo)) {
return rb.setMsg("请先在客户洽谈的基础信息中补全客户的身份证号");
}
//查询销售订单的车型信息
AppOrderModelInfoVo appOrderModelInfoVo = appOrderDetailsVo.getModelInfo();
//根据车型sid查询车型的全称
BaseVehicleModel baseVehicleModel = baseVehicleModelService.fetchBySid(appOrderModelInfoVo.getModelSid());
//车型
String modelName = "车型：" + appOrderModelInfoVo.getModelName() + "。";
String modelName = "车型：" + baseVehicleModel.getModelName() + "。";
//配置
String modelConfig = "配置：" + appOrderModelInfoVo.getConfig() + "。";
//上装
@ -1556,9 +1689,25 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
String num = priceInfo.getNumber();
//单台成交价
String transactionPrice = priceInfo.getSingleFinalPrice();
String remarks = "主车" + num + "台，单台成交价：" + transactionPrice + "元。";
//优惠说明
//ToDo:
//ToDo:discountDetail
String discountDetail = "";
if (StringUtils.isNotBlank(appOrderDetailsVo.getTotaldiscount())) {
List<AppOrderDiscountListVo> discountList = appOrderDetailsVo.getDiscountList();
discountDetail = "优惠说明：赠送价值" + appOrderDetailsVo.getTotaldiscount() + "元优惠包。包括";
for (int iii = 0; iii < discountList.size(); iii++) {
AppOrderDiscountListVo vv = discountList.get(iii);
String discountName = vv.getDiscountName();
if (iii == discountList.size() - 1) {
discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName +vv.getNumber()+ "份（每份包含" + vv.getDiscountExplain()+"）。";
} else {
discountDetail = discountDetail + "价值" + vv.getPrice() + "元" + discountName +vv.getNumber()+ "份（每份包含" + vv.getDiscountExplain()+"），";
}
}
map.put("discountDetail", discountDetail);
}
//保险说明
String insuranceInfo = "保险说明：" + appOrderDetailsVo.getInsuranceInfo() + "。";
@ -1578,10 +1727,17 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
listResultBeanData.removeAll(Collections.singleton(null));
if (!listResultBeanData.isEmpty()) {
String depositRemarks = "（其中乙方在";
for (BusDepositFictitiousDetailsVo v : listResultBeanData) {
for (int ii = 0; ii < listResultBeanData.size(); ii++) {
BusDepositFictitiousDetailsVo v = listResultBeanData.get(ii);
if(ii == listResultBeanData.size()-1){
String b = v.getPaymentDate() + "转入甲方的" + v.getDeposit() + "元中的" + v.getPrice() + "元用于本次订金。";
depositRemarks = depositRemarks + b;
}else{
String b = v.getPaymentDate() + "转入甲方的" + v.getDeposit() + "元中的" + v.getPrice() + "元用于本次订金，";
depositRemarks = depositRemarks + b;
}
}
depositRemarks = depositRemarks + "）";
map.put("depositRemarks", depositRemarks);
}
@ -1589,10 +1745,10 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//车辆交付地点
String address = priceInfo.getAddress();
//组装到文档相对应的字段中
/* ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.fetchDetailsByUseOrgSid(appOrderDetailsVo.getUseOrgSid());
if (invoicingDetailsVoResultBean.getData() != null) {
map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
}else{
} else {
return rb.setMsg("请先完善公司开票信息");
}
map.put("customerName", customerName);
@ -1600,14 +1756,13 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
map.put("idNo", idNo);
map.put("modelName", modelName);
map.put("modelConfig", modelConfig);
map.put("remarks", remarks);
if(appOrderDetailsVo.getInsuranceState()){
if ("1".equals(appOrderDetailsVo.getIsInsurance())) {
map.put("insuranceInfo", insuranceInfo);
}
map.put("totalPrice", totalPrice);
map.put("priceRemarks", priceRemarks);
map.put("depositTotal", depositTotal);
map.put("address", address);*/
map.put("address", address);
//生成合同编号
String contractNo = getApplyCode(dto.getUserSid(), appOrderModelInfoVo.getModelSid());
map.put("contractNo", contractNo);
@ -1618,36 +1773,20 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
ExecutorService pool = new ThreadPoolExecutor(2, 100,
0L, TimeUnit.MILLISECONDS,
new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
Future<String> future1 = pool.submit(() -> {
/* Future<String> future1 = pool.submit(() -> {
return genCarSaleContract(dto, map, appOrderDetailsVo);
});
Future<String> future1_2 = pool.submit(() -> {
return genCarSaleContract2(dto, map, appOrderDetailsVo);
});*/
PrintConfirmVo printConfirmVo = null;
String urlAll = "";
/*if (StringUtils.isNotBlank(future1.get())) {
printConfirmVo = new PrintConfirmVo();
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEW.getName()));
} else {
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOK.getName()));
}
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future1.get());
list.add(printConfirmVo);
url = future1.get();
}
Future<String> future2 = pool.submit(() -> {
/*Future<String> future2 = pool.submit(() -> {
return genCarSaleContractBlank(dto, map, appOrderDetailsVo);
});
if (StringUtils.isNotBlank(future2.get())) {
printConfirmVo = new PrintConfirmVo();
if ("现车".equals(appOrderDetailsVo.getOrderType())) {
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTNEWBLANK.getName()));
} else {
printConfirmVo.setName(MessageFormat.format("《{0}》", ContractTemplateEnum.CARSALECONTRACTBOOKBLANK.getName()));
}
printConfirmVo.setDownloadUrl(docPdfComponent.getPrefixTemplateUrl() + future2.get());
list.add(printConfirmVo);
url = url + "," + future2.get();
}
Future<String> future2_2 = pool.submit(() -> {
return genCarSaleContractBlank2(dto, map, appOrderDetailsVo);
});
//接收车辆委托书
Future<String> future4 = pool.submit(() -> {
return getReceiveCar(map, appOrderDetailsVo);
@ -1674,6 +1813,30 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
});
}
List<File> filesList = new ArrayList<>();
if (future1 != null) {
if (StringUtils.isNotBlank(future1.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
filesList.add(file);
}
}
if (future1_2 != null) {
if (StringUtils.isNotBlank(future1_2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future1_2.get());
filesList.add(file);
}
}
if (future2 != null) {
if (StringUtils.isNotBlank(future2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
filesList.add(file);
}
}
if (future2_2 != null) {
if (StringUtils.isNotBlank(future2_2.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future2_2.get());
filesList.add(file);
}
}
//合并pdf文件
if (future8 != null) {
if (StringUtils.isNotBlank(future8.get())) {
@ -1689,7 +1852,7 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
File file = new File(docPdfComponent.getUploadTemplateUrl() + future5.get());
filesList.add(file);
}
if(future6 != null){
if (future6 != null) {
if (StringUtils.isNotBlank(future6.get())) {
File file = new File(docPdfComponent.getUploadTemplateUrl() + future6.get());
filesList.add(file);
@ -1867,15 +2030,15 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
//查询是否是结转金额，如果是，则订金金额为补交金额/台数。若为现金则为单台订金
String key = depositInfo.getDepositTypeKey();
BigDecimal bigDecimalKeyAll = new BigDecimal("0");
if("02".equals(key)){
if ("02".equals(key)) {
String makeUpAll = depositInfo.getMakeUpDeposit();
if(makeUpAll != null){
if (makeUpAll != null) {
bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(makeUpAll).divide(new BigDecimal(num)));
}
}else{
} else {
bigDecimalKeyAll = bigDecimalKeyAll.add(new BigDecimal(depositInfo.getDeposit()));
}
if(bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0){
if (bigDecimalKeyAll.compareTo(BigDecimal.ZERO) != 0) {
for (int i = 0; i < vinList.size(); i++) {
UnCollectionDto unCollectionDto = new UnCollectionDto();
//合同sid
@ -2187,8 +2350,8 @@ public class CommonContractService extends MybatisBaseService<CommonContractMapp
QueryWrapper<CommonContract> qw = new QueryWrapper<>();
SysUserVo sysUserVo = sysUserFeign.fetchBySid(params.getUserSid()).getData();
String staffSid = sysUserVo.getStaffSid();
qw.eq("staffSid",staffSid);
if (StringUtils.isNotBlank(params.getNames())){
qw.eq("staffSid", staffSid);
if (StringUtils.isNotBlank(params.getNames())) {
qw.and(wrapper -> wrapper.like("contractNo", params.getNames()).or().like("partyB", params.getNames()));
}
IPage<CommonContract> page = PagerUtil.queryToPage(query);

2
anrui-base/anrui-base-biz/src/main/resources/ftl/carFin.ftl
View File

@ -579,7 +579,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t> ${createOrgName!} </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!} </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:cs="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:i-cs/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
</w:r>
<w:r>
<w:rPr>

8
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles.ftl
View File

@ -1409,7 +1409,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t> 甲方： 乙方：</w:t>
<w:t>甲方： 乙方： </w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1504,7 +1504,7 @@
</w:rPr>
<w:tab/>
</w:r>
<w:r>
<#--<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
@ -1530,7 +1530,7 @@
<w:sz-cs w:val="20"/>
</w:rPr>
<w:tab/>
</w:r>
</w:r>-->
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@ -1539,7 +1539,7 @@
<w:sz-cs w:val="20"/>
</w:rPr>
<w:tab/>
<w:t> 地址：</w:t>
<w:t>地址：</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">

1573
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles2.ftl
View File

File diff suppressed because it is too large

8
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black.ftl
View File

@ -1411,7 +1411,7 @@
<w:sz w:val="20"/>
<w:sz-cs w:val="20"/>
</w:rPr>
<w:t> 甲方： 乙方：</w:t>
<w:t>甲方： 乙方： </w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00000000" wsp:rsidRDefault="00000000">
@ -1506,7 +1506,7 @@
</w:rPr>
<w:tab/>
</w:r>
<w:r>
<#-- <w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
@ -1532,7 +1532,7 @@
<w:sz-cs w:val="20"/>
</w:rPr>
<w:tab/>
</w:r>
</w:r>-->
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@ -1541,7 +1541,7 @@
<w:sz-cs w:val="20"/>
</w:rPr>
<w:tab/>
<w:t> 地址：</w:t>
<w:t>地址：</w:t>
</w:r>
</w:p>
<w:p wsp:rsidR="00CE5AB6" wsp:rsidRDefault="00000000">

1575
anrui-base/anrui-base-biz/src/main/resources/ftl/existingvehicles_black2.ftl
View File

File diff suppressed because it is too large

582
anrui-base/anrui-base-biz/src/main/resources/ftl/invoicApply.ftl
View File

@ -582,7 +582,7 @@
</w:pPr>
</w:p>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<#--<w:pPr>
<w:adjustRightInd w:val="off"/>
<w:snapToGrid w:val="off"/>
<w:spacing w:line="360" w:line-rule="auto"/>
@ -593,7 +593,7 @@
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
</w:pPr>-->
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
@ -602,7 +602,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t> ${createOrgName!} </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t>${createOrgName!} </w:t></w:r><w:proofErr w:type="spellEnd"/><w:proofErr w:type="gramStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:sz w:val="28"/><w:sz-cs w:val="28"/><w:u w:val="single"/></w:rPr><w:t></w:t>
</w:r>
<w:proofErr w:type="gramEnd"/>
<w:r>
@ -669,7 +669,7 @@
</w:p>
<w:tbl>
<w:tblPr>
<w:tblW w:w="0" w:type="auto"/>
<w:tblW w:w="8540" w:type="dxa"/>
<w:tblBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
@ -682,19 +682,19 @@
<w:tblLook w:val="04A0"/>
</w:tblPr>
<w:tblGrid>
<w:gridCol w:w="861"/>
<w:gridCol w:w="1577"/>
<w:gridCol w:w="2773"/>
<w:gridCol w:w="1539"/>
<w:gridCol w:w="1772"/>
<w:gridCol w:w="863"/>
<w:gridCol w:w="1580"/>
<w:gridCol w:w="2779"/>
<w:gridCol w:w="1542"/>
<w:gridCol w:w="1776"/>
</w:tblGrid>
<w:tr wsp:rsidR="0081402C" wsp:rsidTr="007A320A">
<w:tr wsp:rsidR="0081402C" wsp:rsidTr="00160E50">
<w:trPr>
<w:trHeight w:val="382"/>
<w:trHeight w:val="18"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="861" w:type="dxa"/>
<w:tcW w:w="863" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -722,7 +722,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1577" w:type="dxa"/>
<w:tcW w:w="1580" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -751,7 +751,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2773" w:type="dxa"/>
<w:tcW w:w="2779" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000" wsp:rsidP="005817AE">
@ -779,7 +779,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1539" w:type="dxa"/>
<w:tcW w:w="1542" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
@ -807,7 +807,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1772" w:type="dxa"/>
<w:tcW w:w="1776" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -836,13 +836,13 @@
</w:tc>
</w:tr>
<#list invoicList as invoic>
<w:tr wsp:rsidR="0081402C" wsp:rsidTr="007A320A">
<w:tr wsp:rsidR="0081402C" wsp:rsidTr="00160E50">
<w:trPr>
<w:trHeight w:val="1144"/>
<w:trHeight w:val="323"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="861" w:type="dxa"/>
<w:tcW w:w="863" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -871,7 +871,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1577" w:type="dxa"/>
<w:tcW w:w="1580" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -900,20 +900,9 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2773" w:type="dxa"/>
<w:tcW w:w="2779" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="0081402C">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz-cs w:val="21"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="0081402C" wsp:rsidRPr="00051004" wsp:rsidRDefault="00BF3E36"
wsp:rsidP="00051004">
<w:pPr>
@ -952,7 +941,7 @@
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1539" w:type="dxa"/>
<w:tcW w:w="1542" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -975,13 +964,13 @@
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.invoicMoney!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
<w:t></w:t></w:r><w:r wsp:rsidR="0073129A"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.money!}</w:t></w:r><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1772" w:type="dxa"/>
<w:tcW w:w="1776" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
@ -1004,534 +993,13 @@
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.invoicName!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
<w:t></w:t></w:r><w:r wsp:rsidR="004558CF"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t></w:r><w:r wsp:rsidR="0073129A"><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.name!}</w:t></w:r><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
</#list>
</w:tbl>
<#-- <w:tbl>
<w:tblPr>
<w:tblW w:w="0" w:type="auto"/>
<w:tblBorders>
<w:top w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:left w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:bottom w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:right w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:insideH w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
<w:insideV w:val="single" w:sz="4" wx:bdrwidth="10" w:space="0" w:color="auto"/>
</w:tblBorders>
<w:tblLayout w:type="Fixed"/>
<w:tblLook w:val="04A0"/>
</w:tblPr>
<w:tblGrid>
<w:gridCol w:w="861"/>
<w:gridCol w:w="1577"/>
<w:gridCol w:w="1592"/>
<w:gridCol w:w="2316"/>
<w:gridCol w:w="2176"/>
</w:tblGrid>
<w:tr wsp:rsidR="00E41CA7">
<w:trPr>
<w:trHeight w:val="382"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="861" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>序号</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1577" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>车架号</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1592" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>开票类型</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2316" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>开票金额</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2176" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>开票名称</w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
<#list invoicList as invoic>
<w:tr wsp:rsidR="0081402C">
<w:trPr>
<w:trHeight w:val="1144"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="861" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign
w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern
w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>${invoic_index+1}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1577" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign
w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern
w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r>
<w:proofErr w:type="spellStart"/>
<w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern
w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr>
<w:t>${invoic.vinNo!}</w:t></w:r>
<w:proofErr w:type="spellEnd"/>
<w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern
w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr>
<w:t></w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2600" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="0081402C">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz-cs w:val="21"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz-cs w:val="21"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern
w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>${invoic.type!}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1712" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign
w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern
w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r>
<w:proofErr w:type="spellStart"/>
<w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern
w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr>
<w:t>${invoic.invoicMoney!}</w:t></w:r>
<w:proofErr w:type="spellEnd"/>
<w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern
w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr>
<w:t></w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1772" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign
w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="0081402C" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern
w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r>
<w:proofErr w:type="spellStart"/>
<w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern
w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr>
<w:t>${invoic.invoicName!}</w:t></w:r>
<w:proofErr w:type="spellEnd"/>
<w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern
w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr>
<w:t></w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
</#list>
&lt;#&ndash;<#list invoicList as invoic>
<w:tr wsp:rsidR="00E41CA7">
<w:trPr>
<w:trHeight w:val="1144"/>
</w:trPr>
<w:tc>
<w:tcPr>
<w:tcW w:w="861" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>${invoic_index+1}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1577" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.vinNo!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="1592" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00E41CA7">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz-cs w:val="21"/>
</w:rPr>
</w:pPr>
</w:p>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz-cs w:val="21"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t>${invoic.type!}</w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2316" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="center"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.invoicMoney!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
</w:r>
</w:p>
</w:tc>
<w:tc>
<w:tcPr>
<w:tcW w:w="2176" w:type="dxa"/>
<w:shd w:val="clear" w:color="auto" w:fill="auto"/>
<w:vAlign w:val="center"/>
</w:tcPr>
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00000000">
<w:pPr>
<w:jc w:val="left"/>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
</w:pPr>
<w:r>
<w:rPr>
<w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/>
<wx:font wx:val="宋体"/>
<w:kern w:val="0"/>
<w:sz w:val="28"/>
<w:sz-cs w:val="28"/>
</w:rPr>
<w:t></w:t></w:r><w:proofErr w:type="spellStart"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t>${invoic.invoicName!}</w:t></w:r><w:proofErr w:type="spellEnd"/><w:r><w:rPr><w:rFonts w:ascii="宋体" w:h-ansi="宋体" w:hint="fareast"/><wx:font wx:val="宋体"/><w:kern w:val="0"/><w:sz w:val="28"/><w:sz-cs w:val="28"/></w:rPr><w:t></w:t>
</w:r>
</w:p>
</w:tc>
</w:tr>
</#list>&ndash;&gt;
</w:tbl>-->
<w:p wsp:rsidR="00E41CA7" wsp:rsidRDefault="00E41CA7">
<w:pPr>
<w:rPr>

2
anrui-base/anrui-base-biz/src/main/resources/ftl/moneyFin.ftl
View File

@ -640,7 +640,7 @@
<w:u w:val="single"/>
<w:lang w:val="EN-US"/>
</w:rPr>
<w:t> ${createOrgName!} </w:t>
<w:t>${createOrgName!} </w:t>
</w:r>
<w:proofErr w:type="spellEnd"/>
<w:proofErr w:type="gramStart"/>

2
anrui-base/anrui-base-biz/src/main/resources/ftl/receiveCar.ftl
View File

@ -622,7 +622,7 @@
<w:sz-cs w:val="28"/>
<w:u w:val="single"/>
</w:rPr>
<w:t> ${createOrgName!} </w:t>
<w:t>${createOrgName!} </w:t>
</w:r>
<w:proofErr w:type="spellEnd"/>
<w:proofErr w:type="gramStart"/>

2
anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppOrderDetailsVo.java
View File

@ -102,5 +102,7 @@ public class AppOrderDetailsVo implements Vo {
//中介人2
private SubmitVo intermediary2;
private String isInsurance;
}

1
anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java
View File

@ -2726,6 +2726,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
vo.setUserSid(busSalesOrder.getCreateBySid());
vo.setProcInsId(busSalesOrder.getProcInstId());
vo.setTaskId(busSalesOrder.getTaskId());
vo.setIsInsurance(busSalesOrder.getIsInsurance());
vo.setInsuranceState(StringUtils.isNotBlank(busSalesOrder.getIsInsurance()));
vo.setRemarksState(StringUtils.isNotBlank(busSalesOrder.getNotes()));
//根据销售部门sid查询分公司名称

43
anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue
View File

@ -107,7 +107,7 @@
</el-col>
<el-col :span="4" class="trightb">
<el-form-item prop="payAccount">
<el-input v-model="formobj.payAccount" :disabled="forbidden" placeholder="" clearable/>
<el-input v-model="formobj.payAccount" :disabled="forbidden" maxlength="4" placeholder="" clearable/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
@ -152,18 +152,18 @@
</el-col>
</el-row>
<el-row>
<el-col :span="12">
<el-col :span="10">
<div>
<div>
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
<el-form-item label="合同编号:">
<el-input v-model="listQuery.contractNo" placeholder="" style="width: 110px" clearable/>
<el-input v-model="listQuery.contractNo" size="mini" placeholder="" style="width: 110px" clearable/>
</el-form-item>
<el-form-item label="客户名称:">
<el-input v-model="listQuery.customerName" placeholder="" style="width: 100px" clearable/>
<el-input v-model="listQuery.customerName" size="mini" placeholder="" style="width: 100px" clearable/>
</el-form-item>
<el-form-item label="联系电话:">
<el-input v-model="listQuery.customerPhone" placeholder="" style="width: 140px" clearable/>
<el-input v-model="listQuery.customerPhone" size="mini" placeholder="" style="width: 140px" clearable/>
</el-form-item>
</el-form>
<div style="text-align: center;padding: 5px 0;border: 1px solid #e0e3eb">
@ -216,7 +216,7 @@
</el-table>
</div>
</el-col>
<el-col :span="12">
<el-col :span="14">
<div>
<div>
<el-form ref="listQueryform" :inline="true" :model="listQuery" class="tab-header">
@ -264,12 +264,12 @@
{{ scope.row.currentReceivableMoney }}
</template>
</el-table-column>
<el-table-column label="认款金额" align="center" width="95">
<el-table-column label="认款金额" align="center" width="150">
<template slot-scope="scope">
<el-input v-model="scope.row.subscriptionMoney" @change="changeSubscriptionMoney" placeholder="" clearable/>
</template>
</el-table-column>
<el-table-column label="认款申请日期" align="center" width="120">
<el-table-column label="认款申请日期" align="center" width="200">
<template slot-scope="scope">
<el-date-picker value-format="yyyy-MM-dd" v-model="scope.row.subscriptionDate" clearable style="width: 140px" type="date" placeholder="请选择"/>
</template>
@ -296,6 +296,7 @@ export default {
data() {
return {
viewTitle: '',
dialogStatus: '',
overduereceivableKey: 0,
selectedreceivableKey: 1,
receiptBank_list: [],
@ -350,7 +351,8 @@ export default {
payAccount: [{ required: true, message: '付款账号不能为空', trigger: 'blur' }]
},
submitdisabled: false,
balance: '' // 余额
balance: '', // 余额
balanceCopy: '' // 计算余额时使用(针对已选应收款项明细表中认款金额多次输入导致余额计算错误)
}
},
methods: {
@ -426,7 +428,10 @@ export default {
this.formobj.collectionTypeKey = aa.value
},
changeCollectionMoney() {
if (this.dialogStatus === '') {
this.balance = this.formobj.collectionMoney
this.balanceCopy = this.formobj.collectionMoney
}
},
changeSubscriptionMoney() {
let subscriptionMoney = '0'
@ -469,7 +474,7 @@ export default {
return u
})
})
this.balance = parseInt(this.balance) - parseInt(resNum)
this.balance = parseInt(this.balanceCopy) - parseInt(resNum)
},
getlist() {
this.listQuery.createBySid = window.sessionStorage.getItem('userSid')
@ -508,10 +513,12 @@ export default {
showEdit(row) {
this.DataDictionary()
this.viewTitle = '【编辑】收款确认申请'
this.dialogStatus = 'edit'
fetchDetailBySid(row.sid).then(resp => {
if (resp.code === '200') {
if (resp.success) {
this.formobj = resp.data
this.balance = this.formobj.balance
this.balanceCopy = this.formobj.balance
this.getlist()
this.forbidden = true
if (this.formobj.paymentVoucherAppendixs.length > 0) {
@ -622,6 +629,9 @@ export default {
paymentVoucherUrl_list.push(this.formobj.paymentVoucherAppendixs[i].filePath)
}
this.formobj.paymentVoucherUrl = paymentVoucherUrl_list.join(',')
} else {
this.$message({ showClose: true, type: 'error', message: '请上传打款凭证' })
return
}
if (this.formobj.remittanceConfirmationAppendixs.length > 0) {
var remittanceConfirmationUrl_list = []
@ -629,6 +639,13 @@ export default {
remittanceConfirmationUrl_list.push(this.formobj.remittanceConfirmationAppendixs[b].filePath)
}
this.formobj.remittanceConfirmationUrl = remittanceConfirmationUrl_list.join(',')
} else {
for (var k = 0; k < this.formobj.finSelectedReceivablesDetaileds.length; k++) {
if (this.formobj.finSelectedReceivablesDetaileds[k].customerName !== this.formobj.payerName) {
this.$message({ showClose: true, type: 'error', message: '请上传汇款确认书' })
return
}
}
}
this.formobj.userSid = window.sessionStorage.getItem('userSid')
this.$refs['form_obj'].validate((valid) => {
@ -638,6 +655,8 @@ export default {
if (resp.success) {
this.$message({ showClose: true, type: 'success', message: resp.msg })
this.handleReturn('true')
} else {
this.submitdisabled = false
}
}).catch(() => {
this.submitdisabled = false
@ -691,6 +710,8 @@ export default {
this.$refs['remittance'].show(this.list2)
})
this.balance = ''
this.balanceCopy = ''
this.dialogStatus = ''
this.$refs['form_obj'].resetFields()
this.$emit('doback')
}

41
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
View File

@ -1290,6 +1290,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
List<ARReceivebill.FRECEIVEBILLENTRY> fEntityList = new ArrayList<>();
ARReceivebill.FRECEIVEBILLENTRY freceivebillentry = new ARReceivebill.FRECEIVEBILLENTRY();
//推送车款
List<FinSelectedReceivablesDetailedVo> finSelectedReceivablesDetailedVos1 = finSelectedReceivablesDetailedService.fetchByAuditState1(sid, 1, "车款");
finSelectedReceivablesDetailedVos1.removeAll(Collections.singleton(null));
if (!finSelectedReceivablesDetailedVos1.isEmpty()) {
@ -1457,38 +1458,6 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
}
}
}
/*ResultBean<BusSalesOrderPrice> resultBean = busSalesOrderFeign.selectByContractNo(v.getContractNo());
if(resultBean.getSuccess()){
BusSalesOrderPrice busSalesOrderPrice = resultBean.getData();
BigDecimal singleFinalPrice = busSalesOrderPrice.getSingleFinalPrice();
if(singleFinalPrice.compareTo(bigDecimalVinAll) == 0){//推送待出库
BusDeliveredDto busDeliveredDto = new BusDeliveredDto();
busDeliveredDto.setSubscriptionKey(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getCode());
busDeliveredDto.setSubscription(VehicleStateTempOrLast.PaymentEnum.PAY_MODELS.getRemarks());
ResultBean<BusSalesOrder> busSalesOrderResultBean = busSalesOrderFeign.selectOrderByContractNo(v.getContractNo());
if(busSalesOrderResultBean.getSuccess()){
BusSalesOrder busSalesOrder = busSalesOrderResultBean.getData();
if(busSalesOrder != null){
busDeliveredDto.setPaymentMethodKey(busSalesOrder.getPayTypeKey());
busDeliveredDto.setPaymentMethod(busSalesOrder.getPayType());
}
}
busDeliveredDto.setContractNo(v.getContractNo());
busDeliveredDto.setName(v.getCustomerName());
busDeliveredDto.setVinNo(v.getVIN());
busDeliveredDto.setMobile(v.getCustomerPhone());
busDeliveredDto.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
//根据客户sid查询客户的身份证号和
ResultBean<AppOrderDetailsVo> orderDetails = busSalesOrderFeign.getSaleOrderDetails(busSalesOrderPrice.getSalesOrderSid());
AppOrderDetailsVo vo = orderDetails.getData();
if(vo != null){
AppOrderModelInfoVo appOrderModelInfoVo = vo.getModelInfo();
busDeliveredDto.setModelName(appOrderModelInfoVo.getModelName());
}
ResultBean resultBean1 = busDeliveredFeign.save(busDeliveredDto);
}
}*/
});
//查询该申请已认款金额总数
subscriptionMoneyAll = finSelectedReceivablesDetailedVos.stream().map(FinSelectedReceivablesDetailedVo::getSubscriptionMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
@ -1505,7 +1474,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
baseMapper.updateById(confirmation);
//删除临时表的数据
ResultBean deleteResult = baseVehicleTempstateFeign.delByBusSid(sid);
//已作废以下代码
/* baseMapper.cashierConfirm(sid);
int auditState = 1;
//总共认款金额
@ -1567,9 +1536,11 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
bdCustomer.setTOrgIds(vo.getOrgCode());
}
}
String fname = name + mobile.substring(mobile.length() - 4);
// String fname = name + mobile.substring(mobile.length() - 4);
String fname = name + mobile;
bdCustomer.setFName(fname);
String code = HanZiConverterPinYin.getPinYinFirst(name) + mobile.substring(mobile.length() - 4);
// String code = HanZiConverterPinYin.getPinYinFirst(name) + mobile.substring(mobile.length() - 4);
String code = HanZiConverterPinYin.getPinYinFirst(name) + mobile;
bdCustomer.setFNumber(code);
return bdCustomer;
}

8
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/relation/cheliangtaizhangChu.vue
View File

@ -56,7 +56,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="saleDate">
<el-date-picker v-model="temp.saleDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
<el-date-picker v-model="temp.saleDate" :picker-options="pickerOptions" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
@ -236,6 +236,12 @@ export default {
// }
// }
return {
pickerOptions: {
disabledDate(time) {
let oneDay = 3600 * 1000 * 24 * 5
return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
}
},
dialogVisible: false,
disabledBtn: false,
temp: {

24
anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingAdd.vue
View File

@ -16,10 +16,7 @@
</el-col>
<el-col :span="8">
<el-form-item prop="brandName">
<el-select v-model="formobj.brandName" @change="changeBrandName" filterable placeholder="请选择">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.brandName">
</el-option>
</el-select>
<el-input v-model="formobj.brandName" placeholder="" clearable class="addinputw"/>
</el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
@ -190,10 +187,10 @@
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>销售指导价(元)</span>
<span><span class="icon">*</span>销售指导价(元)</span>
</el-col>
<el-col :span="20">
<el-form-item>
<el-form-item prop="saleGuidancePrice">
<el-input v-model="formobj.saleGuidancePrice" placeholder="" clearable style="width: 20%" @keyup.native="UpNumber"/>
</el-form-item>
</el-col>
@ -206,14 +203,13 @@
<script>
import req from '@/api/guache/guachechexing'
import { typeValues, fetchBySid, brandDown, getGysTypeByOrgSid } from '@/api/cheliang/dictcommons'
import { typeValues, fetchBySid, getGysTypeByOrgSid } from '@/api/cheliang/dictcommons'
export default {
name: 'GuaCheCheXingAdd',
data() {
return {
viewTitle: '',
brand_list: [],
manufacturer_list: [],
trailerType_list: [],
towPin_list: [],
@ -228,7 +224,6 @@ export default {
axle: '',
boxColor: '',
brandName: '',
brandSid: '',
carModelName: '',
doorFanRequirement: '',
floorSize: '',
@ -262,6 +257,7 @@ export default {
plateSpring: [{ required: true, message: '板簧不能为空', trigger: 'change' }],
axle: [{ required: true, message: '车桥不能为空', trigger: 'blur' }],
tyreAndSteelCircle: [{ required: true, message: '轮胎及钢圈不能为空', trigger: 'change' }],
saleGuidancePrice: [{ required: true, message: '销售指导价不能为空', trigger: 'blur' }]
},
submitdisabled: false
}
@ -288,11 +284,6 @@ export default {
this.tyreAndSteelCircle_list = res.data
}
})
brandDown({ useOrg: this.formobj.useOrgSid }).then((res) => {
if (res.success) {
this.brand_list = res.data
}
})
getGysTypeByOrgSid({ orgSid: this.formobj.useOrgSid, supplierType: '0002' }).then((resp) => {
if (resp.success) {
this.manufacturer_list = resp.data
@ -336,10 +327,6 @@ export default {
this.formobj = {}
})
},
changeBrandName(value) {
const choose = this.brand_list.filter((item) => item.brandName === value)
this.formobj.brandSid = choose[0].sid
},
changeManufacturer(value) {
const choose = this.manufacturer_list.filter((item) => item.manufacturerName === value)
this.formobj.manufacturerSid = choose[0].sid
@ -393,7 +380,6 @@ export default {
axle: '',
boxColor: '',
brandName: '',
brandSid: '',
carModelName: '',
doorFanRequirement: '',
floorSize: '',

17
anrui-scm/anrui-scm-ui/src/views/guache/guachechexing/guachechexingguanli.vue
View File

@ -11,10 +11,7 @@
<el-form :inline="true" class="tab-header" label-width="100px">
<el-row>
<el-form-item label="车辆品牌">
<el-select v-model="queryParams.params.brandSid" filterable placeholder="请选择">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid">
</el-option>
</el-select>
<el-input v-model="queryParams.params.brandName" clearable placeholder=""/>
</el-form-item>
<el-form-item label="车辆型号">
<el-input v-model="queryParams.params.carModelName" clearable placeholder=""/>
@ -85,7 +82,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import guachechexingAdd from './guachechexingAdd'
import guachechexingInfo from './guachechexingInfo'
import { getGysTypeByOrgSid, getPathSidByUserSid, typeValues, brandDown } from '@/api/cheliang/dictcommons'
import { getGysTypeByOrgSid, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'guachechexingguanli',
@ -135,13 +132,12 @@ export default {
dataList: [],
manufacturer_list: [],
trailerType_list: [],
brand_list: [],
queryParams: {
current: 1,
size: 5,
total: 0,
params: {
brandSid: '',
brandName: '',
carModelName: '',
manufacturerSid: '',
trailerTypeKey: '',
@ -167,11 +163,6 @@ export default {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.queryParams.params.useOrgSid = res.data
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
this.brand_list = resp.data
}
})
getGysTypeByOrgSid({ orgSid: res.data, supplierType: '0002' }).then((resp) => {
if (resp.success) {
this.manufacturer_list = resp.data
@ -236,7 +227,7 @@ export default {
size: 5,
total: 0,
params: {
brandSid: '',
brandName: '',
carModelName: '',
manufacturerSid: '',
trailerTypeKey: '',

20
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangAdd.vue
View File

@ -249,15 +249,15 @@
<span>入库日期</span>
</el-col>
<el-col :span="8">
<el-form-item><el-date-picker v-model="formobj.warehousingDate" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
<el-form-item><el-date-picker v-model="formobj.warehousingDate" :picker-options="pickerOptions" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/></el-form-item>
</el-col>
</el-row>
<el-row>
<el-col :span="4" class="tleftb">
<span>厂家结算价</span>
<span><span class="icon">*</span>厂家结算价(元)</span>
</el-col>
<el-col :span="20">
<el-form-item><el-input v-model="formobj.settlementPrice" clearable placeholder="" @keyup.native="UpNumber" style="width: 20%"></el-input></el-form-item>
<el-form-item prop="settlementPrice"><el-input v-model="formobj.settlementPrice" clearable placeholder="" @keyup.native="UpNumber" style="width: 20%"></el-input></el-form-item>
</el-col>
</el-row>
<el-row>
@ -302,6 +302,13 @@ export default {
},
data() {
return {
// 限制日期不可选择当天之前的
pickerOptions: {
disabledDate(time) {
let oneDay = 3600 * 1000 * 24 * 5
return Date.now() < time.getTime() || time.getTime() < Date.now() - oneDay
}
},
viewTitle: '',
dialogStatus: '',
viewState: 1,
@ -318,7 +325,6 @@ export default {
axle: '',
boxColor: '',
brandName: '',
brandSid: '',
carModelName: '',
doorFanRequirement: '',
floorSize: '',
@ -367,7 +373,8 @@ export default {
},
rules: {
zcvinNo: [{ required: true, message: '主车车架号不能为空', trigger: 'change' }],
vinNo: [{ required: true, message: '挂车车架号不能为空', trigger: 'blur' }]
vinNo: [{ required: true, message: '挂车车架号不能为空', trigger: 'blur' }],
settlementPrice: [{ required: true, message: '厂家结算价不能为空', trigger: 'blur' }]
},
submitdisabled: false
}
@ -418,7 +425,6 @@ export default {
this.formobj.sid = row.sid
this.formobj.trailerModelSid = res.data.baseTrailerModelDetailsVo.trailerModelSid
this.formobj.brandName = res.data.baseTrailerModelDetailsVo.brandName
this.formobj.brandSid = res.data.baseTrailerModelDetailsVo.brandSid
this.formobj.carModelName = res.data.baseTrailerModelDetailsVo.carModelName
this.formobj.manufacturerName = res.data.baseTrailerModelDetailsVo.manufacturerName
this.formobj.manufacturerSid = res.data.baseTrailerModelDetailsVo.manufacturerSid
@ -521,7 +527,6 @@ export default {
this.viewState = 1
this.formobj.trailerModelSid = value.sid
this.formobj.brandName = value.brandName
this.formobj.brandSid = value.brandSid
this.formobj.carModelName = value.carModelName
this.formobj.manufacturerName = value.manufacturerName
this.formobj.manufacturerSid = value.manufacturerSid
@ -658,7 +663,6 @@ export default {
axle: '',
boxColor: '',
brandName: '',
brandSid: '',
carModelName: '',
doorFanRequirement: '',
floorSize: '',

2
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangInfo.vue
View File

@ -267,7 +267,7 @@
<el-form-item><span>{{ formobj.stockStateValue }}</span></el-form-item>
</el-col>
<el-col :span="4" class="tleftb">
<span>厂家结算价</span>
<span>厂家结算价(元)</span>
</el-col>
<el-col :span="8">
<el-form-item><span>{{ formobj.settlementPrice }}</span></el-form-item>

17
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/guachetaizhangguanli.vue
View File

@ -13,10 +13,7 @@
<el-input v-model="queryParams.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车辆品牌">
<el-select v-model="queryParams.params.carBrand" filterable placeholder="请选择">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid">
</el-option>
</el-select>
<el-input v-model="queryParams.params.carBrandName" placeholder="" clearable/>
</el-form-item>
<el-form-item label="车辆型号">
<el-input v-model="queryParams.params.carModelName" placeholder="" clearable/>
@ -92,7 +89,7 @@ import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import guachetaizhangAdd from './guachetaizhangAdd'
import guachetaizhangInfo from './guachetaizhangInfo'
import { brandDown, getGysTypeByOrgSid, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
import { getGysTypeByOrgSid, getPathSidByUserSid } from '@/api/cheliang/dictcommons'
export default {
name: 'GuaCheTaiZhangGuanLi',
@ -133,14 +130,13 @@ export default {
isSearchShow: false,
tableLoading: false,
dataList: [],
brand_list: [],
manufacturer_list: [],
queryParams: {
current: 1,
size: 5,
total: 0,
params: {
carBrand: '',
carBrandName: '',
carModelName: '',
settlementSid: '',
useOrgSid: '',
@ -168,11 +164,6 @@ export default {
this.manufacturer_list = res.data
}
})
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
this.brand_list = resp.data
}
})
this.loadList()
}
})
@ -238,7 +229,7 @@ export default {
size: 5,
total: 0,
params: {
carBrand: '',
carBrandName: '',
carModelName: '',
settlementSid: '',
useOrgSid: '',

17
anrui-scm/anrui-scm-ui/src/views/guache/guachetaizhang/relation/guachechexingselect.vue
View File

@ -11,10 +11,7 @@
<el-form :inline="true" class="tab-header" label-width="100px">
<el-row>
<el-form-item label="车辆品牌">
<el-select v-model="queryParams.params.brandSid" filterable placeholder="请选择">
<el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid">
</el-option>
</el-select>
<el-input v-model="queryParams.params.brandName" clearable placeholder=""/>
</el-form-item>
<el-form-item label="车辆型号">
<el-input v-model="queryParams.params.carModelName" clearable placeholder=""/>
@ -78,7 +75,7 @@ import req from '@/api/guache/guachechexing'
import ButtonBar from '@/components/ButtonBar'
import Pagination from '@/components/pagination'
import pageye from '@/components/pagination/pageye'
import { getGysTypeByOrgSid, getPathSidByUserSid, typeValues, brandDown } from '@/api/cheliang/dictcommons'
import { getGysTypeByOrgSid, getPathSidByUserSid, typeValues } from '@/api/cheliang/dictcommons'
export default {
name: 'guachechexingselect',
@ -105,13 +102,12 @@ export default {
dataList: [],
manufacturer_list: [],
trailerType_list: [],
brand_list: [],
queryParams: {
current: 1,
size: 5,
total: 0,
params: {
brandSid: '',
brandName: '',
carModelName: '',
manufacturerSid: '',
trailerTypeKey: '',
@ -133,11 +129,6 @@ export default {
getPathSidByUserSid({ userSid: window.sessionStorage.getItem('userSid') }).then((res) => {
if (res.success) {
this.queryParams.params.useOrgSid = res.data
brandDown({ useOrg: res.data }).then((resp) => {
if (resp.success) {
this.brand_list = resp.data
}
})
getGysTypeByOrgSid({ orgSid: res.data, supplierType: '0002' }).then((resp) => {
if (resp.success) {
this.manufacturer_list = resp.data
@ -189,7 +180,7 @@ export default {
size: 5,
total: 0,
params: {
brandSid: '',
brandName: '',
carModelName: '',
manufacturerSid: '',
trailerTypeKey: '',

Write Preview
Loading…
Cancel
Save