Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busbillapplication/BusBillApplicationService.java

@@ -87,6 +87,7 @@ import java.io.InputStream;
 import java.math.BigDecimal;
 import java.util.*;
 import java.util.concurrent.*;
+import java.util.stream.Collectors;
 
 @Service
 public class BusBillApplicationService extends MybatisBaseService<BusBillApplicationMapper, BusBillApplication> {
@@ -144,11 +145,9 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
             BeanUtil.copyProperties(dto, busBillApplication, "sid");
             busBillApplication.setNum(busBillVehicles.size());
             busBillApplication.setArrearsMoney("0");
-            String fileUrl = getFileUrl(dto);
-            if(StringUtils.isNotBlank(fileUrl)){
-                busBillApplication.setFileUrl(fileUrl);
-            }
+            dto.setSid(busBillApplication.getSid());
             save(busBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (BusBillVehicleDto busBillVehicleDto : busBillVehicles) {
                 BusBillVehicle busBillVehicle = new BusBillVehicle();
@@ -210,6 +209,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
         dto.setArrearsMoney("0");
         updateByDto(dto);
+        createContractNo(dto);
         busBillFileService.deleteByBusAppSid(dtoSid);
         //附件信息
         if (carBuyContractImages != null) {
@@ -283,10 +283,6 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
         BusBillApplication entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-        String fileUrl = getFileUrl(dto);
-        if(StringUtils.isNotBlank(fileUrl)){
-            entity.setFileUrl(fileUrl);
-        }
         baseMapper.updateById(entity);
     }
 
@@ -533,7 +529,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
     }
 
 
-    public String getFileUrl(BusBillApplicationDto dto) {
+    /*public String getFileUrl(BusBillApplicationDto dto) {
         Map<String, Object> map = new HashMap<>();
         Map<String, Object> carMap = new HashMap<>();
         Map<String, Object> filemap = new HashMap<>();
@@ -782,7 +778,7 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         }
 
         return fileUrl;
-    }
+    }*/
 
     public String blackFile(Map<String, Object> map) {
         String ftl = "dai_existingvehicles_black";
@@ -843,4 +839,257 @@ public class BusBillApplicationService extends MybatisBaseService<BusBillApplica
         WordConvertUtils.doc2pdf(wordPath, targetPath, pdfName);
         return pdfName;
     }
+
+    public String getFileUrl(BusBillApplicationDto dto) {
+        String fileUrl = "";
+        String contractNo = dto.getContractNo();
+        List<File> filesList = new ArrayList<>();
+        //根据合同号查询销售订单数据
+        BusSalesOrder busSalesOrder = baseMapper.selectByContract(contractNo);
+        SolutionsDetailsVo loanSolutions = loanSolutionsFeign.selectDetailss(busSalesOrder.getSid()).getData();
+        if ("1".equals(busSalesOrder.getPayTypeKey()) || ("2".equals(busSalesOrder.getPayTypeKey()) && StringUtils.isNotBlank(loanSolutions.getTypeKey()))) {
+            List<BusBillVehicleDto> finBillVehicles = dto.getFinBillVehicles();
+            BusSalesOrderModel busSalesOrderModel = baseMapper.selectByOrderSid(busSalesOrder.getSid());
+            BusSalesOrderPrice busSalesOrderPrice = baseMapper.selectByPrices(busSalesOrder.getSid());
+            //按开票名称sid分组
+            Map<String, List<BusBillVehicleDto>> groupedByOpenTickSid = finBillVehicles.stream()
+                    .collect(Collectors.groupingBy(BusBillVehicleDto::getOpenTickSid));
+            //遍历分组并组装每组的数据
+            groupedByOpenTickSid.forEach((openTickSid, sameOpenTickSidList) -> {
+                Map<String, Object> map = new HashMap<>();
+                Map<String, Object> carMap = new HashMap<>();
+                Map<String, Object> filemap = new HashMap<>();
+                Map<String, Object> checkMap = new HashMap<>();
+                FinCompanyInvoicingDetailsVo finCompanyInvoicingDetailsVo = finCompanyInvoicingFeign.fetchDetailsVoBySid(openTickSid).getData();
+                if (!openTickSid.equals(busSalesOrder.getAffiliatedCompanySid())) {
+                    BusBillVehicleDto finBillVehicleDto = sameOpenTickSidList.get(0);
+                    //生成开票申请书
+                    if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                        ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                        if (invoicingDetailsVoResultBean.getData() != null) {
+                            map.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                        }
+                    }
+                    map.put("contractNo", busSalesOrder.getContractNo());
+                    List<BillFileVo> list = new ArrayList<>();
+
+                    BillFileVo billFileVo = new BillFileVo();
+                    if (busSalesOrderModel != null) {
+                        billFileVo.setCarName(busSalesOrderModel.getModelName());
+                        billFileVo.setNum(String.valueOf(sameOpenTickSidList.size()));
+                        billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                    }
+                    if (loanSolutions != null) {
+                        if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) {
+                            billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount());
+                        }
+                    }
+                    billFileVo.setType(finBillVehicleDto.getBillTypeValue());//开票类型
+                    list.add(billFileVo);
+
+                    List<BusBillTrailerDto> lllList = new ArrayList<>();
+                    sameOpenTickSidList.forEach(v -> {
+                        List<BusBillTrailerDto> finBillTrailers = dto.getFinBillTrailers();
+                        finBillTrailers.removeAll(Collections.singleton(null));
+                        finBillTrailers = finBillTrailers.stream().filter(vv -> vv.getVinNo().contains(v.getVinNo())).collect(Collectors.toList());
+                        lllList.addAll(finBillTrailers);
+                    });
+                    Map<String, Object> carNameMap = new HashMap<>();
+                    if (!lllList.isEmpty()) {
+                        for (int i = 0; i < lllList.size(); i++) {
+                            BusBillTrailerDto finBillTrailerDto = lllList.get(i);
+                            billFileVo = new BillFileVo();
+                            BaseTrailer baseTrailer = baseMapper.selectByTrailerNo(finBillTrailerDto.getGcVinNo());
+                            if (baseTrailer != null) {
+                                BaseTrailerModel baseTrailerModel = baseMapper.selectByModelSid(baseTrailer.getTrailerModelSid());
+                                if (baseTrailerModel != null) {
+                                    String carName = "外廓-" + Integer.parseInt(baseTrailerModel.getAppearanceSizeLong()) / 1000 + "米" + "\t" + baseTrailerModel.getTrailerTypeValue();
+                                    if (carNameMap.containsKey(carName)) {
+                                        carNameMap.put(carName, Integer.parseInt(carNameMap.get(carName).toString()) + 1);
+                                        continue;
+                                    } else {
+                                        billFileVo.setType(busSalesOrder.getBillingType());
+                                        if (loanSolutions != null) {
+                                            if (StringUtils.isNotBlank(loanSolutions.getMainVehicleAmount())) {
+                                                billFileVo.setOpenPrice(loanSolutions.getMainVehicleAmount());
+                                            }
+                                        }
+                                        billFileVo.setCarName(carName);
+                                        if (busSalesOrderModel != null) {
+                                            billFileVo.setPrice(busSalesOrderPrice.getSingleFinalPrice().toString());
+                                        }
+                                        carNameMap.put(carName, 1);
+                                        list.add(billFileVo);
+                                    }
+                                }
+                            }
+                        }
+                    }
+                    if (!list.isEmpty()) {
+                        for (int i = 0; i < list.size(); i++) {
+                            BillFileVo billFileVo1 = list.get(i);
+                            String carName = billFileVo1.getCarName();
+                            if (carNameMap.containsKey(carName)) {
+                                billFileVo1.setNum(carNameMap.get(carName).toString());
+                            }
+                        }
+                    }
+                    map.put("list", list);
+                    map.put("name", finBillVehicleDto.getOpenTickName());
+                    String date = DateUtil.today();
+                    List<String> dateString = Arrays.asList(date.split("-"));
+                    String year = dateString.get(0);
+                    String month = dateString.get(1);
+                    String day = dateString.get(2);
+                    map.put("year", year);
+                    map.put("month", month);
+                    map.put("day", day);
+                    if (!"02".equals(finBillVehicleDto.getBillTypeKey())) {
+                        if (finCompanyInvoicingDetailsVo != null) {
+                            //生成车辆登记合同
+                            if (busSalesOrder != null) {
+                                carMap.put("Yf", busSalesOrder.getCustomerName());
+                                carMap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            }
+                            carMap.put("contractNo", "D" + map.get("contractNo"));
+                            if (StringUtils.isNotBlank(busSalesOrder.getPurchaseSystemSid())) {
+                                ResultBean<FinCompanyInvoicingDetailsVo> invoicingDetailsVoResultBean = finCompanyInvoicingFeign.getDetailsByUseOrgAndSystem(busSalesOrder.getUseOrgSid(), busSalesOrder.getPurchaseSystemSid());
+                                if (invoicingDetailsVoResultBean.getData() != null) {
+                                    carMap.put("createOrgName", invoicingDetailsVoResultBean.getData().getName());
+                                }
+                            }
+                            carMap.put("date", date);
+                            List<CarContractListVo> carContractListVos = new ArrayList<>();
+                            for (BusBillVehicleDto salesOrderVehicle : sameOpenTickSidList) {
+                                CarContractListVo carContractListVo = new CarContractListVo();
+                                BaseVehicle baseVehicle = baseMapper.selectByVinSid(salesOrderVehicle.getVehSid());
+                                carContractListVo.setBrand(baseVehicle.getModelName());
+                                carContractListVo.setVinNo(baseVehicle.getVinNo());
+                                carContractListVo.setEnginNo(baseVehicle.getEngineNo());
+                                carContractListVos.add(carContractListVo);
+                            }
+                            carMap.put("carLists", carContractListVos);
+                        }
+                    }
+                }
+                if (loanSolutions != null) {
+                    if (!dto.getOneBillMoney().equals(loanSolutions.getMainVehicleAmount())) {
+                        String remarks = "";
+                        String date = DateUtil.today();
+                        List<String> dateString = Arrays.asList(date.split("-"));
+                        String year = dateString.get(0);
+                        String month = dateString.get(1);
+                        String day = dateString.get(2);
+                        filemap.put("year", year);
+                        filemap.put("month", month);
+                        filemap.put("day", day);
+                        if (finCompanyInvoicingDetailsVo != null) {
+                            filemap.put("invoiceName", finCompanyInvoicingDetailsVo.getName());//开票名称
+                            filemap.put("customerName", finCompanyInvoicingDetailsVo.getName());//乙方
+                            filemap.put("invoiceNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//纳税人识别号
+                            filemap.put("idNo", finCompanyInvoicingDetailsVo.getTaxpayerNo());//乙方证件号码
+                            filemap.put("adds", finCompanyInvoicingDetailsVo.getAddress());//户籍地址
+                        } else {
+                            CrmCustomerTemp crmCustomerTemp = baseMapper.selectByCustomerSid(dto.getOpenTickSid());
+                            if (crmCustomerTemp != null) {
+                                filemap.put("invoiceName", crmCustomerTemp.getName());//开票名称
+                                filemap.put("customerName", crmCustomerTemp.getName());//乙方
+                                filemap.put("invoiceNo", crmCustomerTemp.getIDNumber());//纳税人识别号
+                                filemap.put("idNo", crmCustomerTemp.getIDNumber());//乙方证件号码
+                                filemap.put("adds", crmCustomerTemp.getCertificateAddress());//户籍地址
+                            }
+                        }
+                        filemap.put("invoiceType", dto.getOpenTickTypeValue());//开票类型
+                        remarks = "数量" + finBillVehicles.size() + "台，单台成交价：        元。";
+                        filemap.put("remarks", remarks);
+                        filemap.put("busSid", busSalesOrder.getSid());
+                        ResultBean<Map<String, Object>> mapResultBean = commonContractFeign.getModelMap(filemap);
+                        checkMap = mapResultBean.getData();
+                        //生成新车空白合同
+                        checkMap.put("totalPrice", "");
+                        checkMap.put("priceRemarks", "");
+                        checkMap.put("depositTotal", "");
+                        checkMap.put("createOrgName", "");
+                        checkMap.put("payTypeKey", busSalesOrder.getPayTypeKey());
+                    }
+                }
+                try {
+                    ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                            .setNameFormat("demo-pool-%d").build();
+                    ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                            1000, TimeUnit.MILLISECONDS,
+                            new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+
+                    if (!map.isEmpty()) {
+                        Future<String> future1 = pool.submit(() -> {
+                            return getInvoiceApplyFile(map);
+                        });
+                        if (StringUtils.isNotBlank(future1.get())) {
+                            File file = new File(docPdfComponent.getUploadTemplateUrl() + future1.get());
+                            filesList.add(file);
+                        }
+                    }
+                    if (!carMap.isEmpty()) {
+                        Future<String> future2 = pool.submit(() -> {
+                            return getCarFile(carMap);
+                        });
+                        if (StringUtils.isNotBlank(future2.get())) {
+                            File file = new File(docPdfComponent.getUploadTemplateUrl() + future2.get());
+                            filesList.add(file);
+                        }
+                    }
+                    if("1".equals(busSalesOrder.getPayTypeKey())){
+                        Map<String, Object> finalCheckMap = checkMap;
+                        if (!finalCheckMap.isEmpty()) {
+                            Future<String> future3 = pool.submit(() -> {
+                                return blackFile(finalCheckMap);
+                            });
+                            if (StringUtils.isNotBlank(future3.get())) {
+                                File file = new File(docPdfComponent.getUploadTemplateUrl() + future3.get());
+                                filesList.add(file);
+                            }
+                        }
+                    }
+
+
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("生成文件失败：==========================" + e.getMessage());
+                }
+
+            });
+            if (filesList.size() > 0) {
+                String typeName = contractNo + "开票附件.pdf";
+                try {
+                    File allFile = WordConvertUtils.mulFile2One(filesList, docPdfComponent.getUploadTemplateUrl() + typeName);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+                System.out.println("-========" + docPdfComponent.getUploadTemplateUrl() + typeName);
+                fileUrl = typeName;
+            }
+        }
+        if(StringUtils.isNotBlank(fileUrl)){
+            BusBillApplication finBillApplication = fetchBySid(dto.getSid());
+            finBillApplication.setFileUrl(fileUrl);
+            baseMapper.updateById(finBillApplication);
+        }
+        return fileUrl;
+    }
+
+    public void createContractNo(BusBillApplicationDto dto){
+       /* try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                    1000, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+            Future future1 = pool.submit(() -> {
+                String fileUrl = getFileUrl(dto);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("生成文件失败：==========================" + e.getMessage());
+        }*/
+    }
 }

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

@@ -502,11 +502,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             finBillApplication.setBillNo(billNo);
             finBillApplication.setNum(finBillVehicles.size());
             finBillApplication.setArrearsMoney("0");
-           /* String fileUrl = getFileUrl(dto);
-            if (StringUtils.isNotBlank(fileUrl)) {
-                finBillApplication.setFileUrl(fileUrl);
-            }*/
+            dto.setSid(finBillApplication.getSid());
             save(finBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -590,6 +588,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 finBillFileDto.setAttachType(FinAttachTypeEnum.ZJ.getAttachType());
                 finBillFileService.saveOrUpdateDto(finBillFileDto);
             }
+
             return rb.success().setMsg("保存成功").setData(finBillApplication.getSid());
         }
         FinBillApplication finBillApplication = fetchBySid(dtoSid);
@@ -598,6 +597,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         dto.setArrearsMoney("0");
         updateByDto(dto);
+        createContractNo(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
         if (carBuyContractImages != null) {
@@ -916,7 +916,11 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
                 fileUrl = typeName;
             }
         }
-
+        if(StringUtils.isNotBlank(fileUrl)){
+            FinBillApplication finBillApplication = fetchBySid(dto.getSid());
+            finBillApplication.setFileUrl(fileUrl);
+            baseMapper.updateById(finBillApplication);
+        }
         return fileUrl;
     }
 
@@ -1001,10 +1005,6 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         }
         FinBillApplication entity = fetchBySid(dtoSid);
         BeanUtil.copyProperties(dto, entity, "id", "sid");
-       /* String fileUrl = getFileUrl(dto);
-        if (StringUtils.isNotBlank(fileUrl)) {
-            entity.setFileUrl(fileUrl);
-        }*/
         baseMapper.updateById(entity);
     }
 
@@ -2338,11 +2338,9 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
             //计算开票金额合计
             BigDecimal totalBillMoney = oneBillMoney.multiply(new BigDecimal(finBillVehicles.size()));
             finBillApplication.setTotalBillMoney(totalBillMoney);
-            String fileUrl = getFileUrl(dto);
-            if (StringUtils.isNotBlank(fileUrl)) {
-                finBillApplication.setFileUrl(fileUrl);
-            }
+            dto.setSid(finBillApplication.getSid());
             save(finBillApplication);
+            createContractNo(dto);
             //主车开票信息
             for (FinBillVehicleDto finBillVehicleDto : finBillVehicles) {
                 FinBillVehicle finBillVehicle = new FinBillVehicle();
@@ -2473,6 +2471,7 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         dto.setBillStateKey("003");
         dto.setBillStateValue("欠款开票");
         updateByDto(dto);
+        createContractNo(dto);
         finBillFileService.deleteByFinAppSid(dtoSid);
         //附件信息
         if (khkpsqsApplicationAppendxs.size() > 0) {
@@ -5133,4 +5132,20 @@ public class FinBillApplicationService extends MybatisBaseService<FinBillApplica
         FinBillApplicationDetailsVo finBillApplicationDetailsVo = baseMapper.selectByCon(contractNo);
         return rb.success().setData(finBillApplicationDetailsVo);
     }
+
+    public void createContractNo(FinBillApplicationDto dto){
+        /*try {
+            ThreadFactory namedThreadFactory = new ThreadFactoryBuilder()
+                    .setNameFormat("demo-pool-%d").build();
+            ExecutorService pool = new ThreadPoolExecutor(1, 2,
+                    1000, TimeUnit.MILLISECONDS,
+                    new LinkedBlockingQueue<Runnable>(1024), namedThreadFactory, new ThreadPoolExecutor.AbortPolicy());
+            Future future1 = pool.submit(() -> {
+                String fileUrl = getFileUrl(dto);
+            });
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("生成文件失败：==========================" + e.getMessage());
+        }*/
+    }
 }

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusinessAdd.vue

@@ -20,7 +20,7 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <div class="span-sty">家访考察结果</div>
             <el-form-item>
               <el-select class="addinputInfo" v-model="formobj.homeVisitKey" @change="homeVisitChange" placeholder="请选择" clearable filterable>
@@ -28,24 +28,43 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <div v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
-              <div class="span-sty">挂车是否公司开票</div>
-              <el-form-item>
-                <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isCompInvoic">
-                  <el-radio label="0">是</el-radio>
-                  <el-radio label="1">否</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-          </el-col>
-          <el-col :span="8">
+          <el-col :span="12">
             <div class="span-sty">家访考察日期</div>
             <el-form-item>
               <el-date-picker class="addinputInfo" v-model="formobj.homeVisitDate" type="date" clearable format="yyyy-MM-dd" value-format="yyyy-MM-dd" placeholder="选择日期"/>
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row v-show="formobj.homeVisitKey == '001'">
+          <el-col :span="12">
+            <div class="span-sty">车辆登记在</div>
+            <el-form-item>
+              <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.type">
+                <el-radio label="1">客户名下</el-radio>
+                <el-radio label="2">挂靠公司名下</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div v-show="formobj.type == '2'" class="span-sty">选择挂靠运输公司</div>
+            <el-form-item v-show="formobj.type == '2'">
+              <el-select v-model="formobj.affiliatedCompany" class="addinputInfo" filterable clearable placeholder="" @change="changeBusiness">
+                <el-option v-for="item in business_list" :key="item.taxpayerNo" :label="item.businessName" :value="item.businessName"/>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
+          <el-col :span="24">
+            <div class="span-sty">挂车是否公司开票</div>
+            <el-form-item>
+              <el-radio-group class="addinputInfo" style="font-size: 1px" v-model="formobj.isCompInvoic">
+                <el-radio label="0">是</el-radio>
+                <el-radio label="1">否</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <div class="span-sty">资方信审终审结果</div>
@@ -127,7 +146,7 @@
 
 <script>
 import req from '@/api/unsecuredbusiness/unsecuredbusiness'
-import { typeValues } from '@/api/Common/dictcommons'
+import { selectInvoingByOrgPath, typeValues } from '@/api/Common/dictcommons'
 import uploadImg from '@/components/uploadFile/uploadImg'
 
 export default {
@@ -140,10 +159,13 @@ export default {
       viewTitle: '',
       submitdisabled: false,
       result_list: [],
+      business_list: [],
       image_list1: [],
       image_list2: [],
       image_list3: [],
       formobj: {
+        affiliatedCompany: '',
+        affiliatedCompanySid: '',
         salesOrderSid: '',
         salesman: '',
         borrowerName: '',
@@ -160,6 +182,7 @@ export default {
         isLoanDate: '',
         isCompInvoic: '',
         isHavTrailer: false,
+        type: '',
         homeVisitFiles: [],
         creditReviewFiles: [],
         loanReviewFiles: []
@@ -172,6 +195,11 @@ export default {
       this.$nextTick(() => {
         this.$refs['form_obj'].clearValidate()
       })
+      selectInvoingByOrgPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((res) => {
+        if (res.success) {
+          this.business_list = res.data
+        }
+      })
       req.fetchBySid({ salesOrderSid: sid }).then((resp) => {
         if (resp.success) {
           this.formobj = resp.data
@@ -231,7 +259,19 @@ export default {
         this.formobj.loanReview = ''
       }
     },
+    changeBusiness(value) {
+      const choose = this.business_list.filter((item) => item.businessName === value)
+      if (choose.length > 0) {
+        this.formobj.affiliatedCompanySid = choose[0].sid
+      } else {
+        this.formobj.affiliatedCompanySid = ''
+      }
+    },
     saveOrUpdate() {
+      if (this.formobj.homeVisitKey === '001' && this.formobj.type === '') {
+        this.$message({ showClose: true, type: 'error', message: '因家访结果为通过,车辆登记不能为空' })
+        return
+      }
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.getUrl()

anrui-riskcenter-ui/src/views/unsecuredbusiness/unsecuredbusinessInfo.vue

@@ -19,21 +19,34 @@
           </el-col>
         </el-row>
         <el-row>
-          <el-col :span="8">
+          <el-col :span="12">
             <div class="span-sty">家访考察结果</div>
             <el-form-item><span class="addinputInfo">{{ formobj.homeVisit }}</span></el-form-item>
           </el-col>
-          <el-col :span="8">
-            <div v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
-              <div class="span-sty">挂车是否公司开票</div>
-              <el-form-item><span class="addinputInfo">{{ formobj.isCompInvoic == '0' ? '是' : '否' }}</span></el-form-item>
-            </div>
-          </el-col>
-          <el-col :span="8">
+
+          <el-col :span="12">
             <div class="span-sty">家访考察日期</div>
             <el-form-item><span class="addinputInfo">{{ formobj.homeVisitDate }}</span></el-form-item>
           </el-col>
         </el-row>
+        <el-row v-show="formobj.homeVisitKey == '001'">
+          <el-col :span="12">
+            <div class="span-sty">车辆登记在</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.type == '1' ? '客户名下' : '挂靠公司名下' }}</span></el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <div v-show="formobj.type == '2'">
+              <div class="span-sty">挂靠运输公司</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.affiliatedCompany }}</span></el-form-item>
+            </div>
+          </el-col>
+        </el-row>
+        <el-row v-show="formobj.isHavTrailer && formobj.homeVisitKey == '001'">
+          <el-col :span="24">
+            <div class="span-sty">挂车是否公司开票</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.isCompInvoic == '0' ? '是' : '否' }}</span></el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="12">
             <div class="span-sty">资方信审终审结果</div>