Merge remote-tracking branch 'origin/master'

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyQuery.java

@@ -41,4 +41,6 @@ public class BusVehicleApplyQuery implements Query {
     private String applicationCode;
     @ApiModelProperty("当前组织机构的全路径sid")
     private String orgPath;
+
+    private String menuUrl;
 }

anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/busvehicleapply/BusVehicleApplyVo.java

@@ -58,4 +58,7 @@ public class BusVehicleApplyVo implements Vo {
     private String purchaseSystemName;
     @ApiModelProperty("分公司sid")
     private String useOrgSid;
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
 }

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/basevehicleactualsales/BaseVehicleActualSalesService.java

@@ -15,6 +15,7 @@ import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsD
 import com.yxt.anrui.base.api.basevehicleactualdetails.BaseVehicleActualDetailsVo;
 import com.yxt.anrui.base.api.basevehicleactualpay.AppBaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPay;
+import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayDto;
 import com.yxt.anrui.base.api.basevehicleactualpay.BaseVehicleActualPayVo;
 import com.yxt.anrui.base.api.basevehicleactualsales.*;
 import com.yxt.anrui.base.api.basevehicleactualsales.flow.ActualGetNodeQuery;
@@ -168,6 +169,19 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
         ResultBean<String> rb = ResultBean.fireFail();
         String sid = scmVehicleActualSalesDto.getSid();
         if (StringUtils.isBlank(sid)) {
+            BigDecimal salesMoney = BigDecimal.ZERO;
+            BigDecimal payMoney = BigDecimal.ZERO;
+            if(scmVehicleActualSalesDto.getDetailsList().size()>0){
+                salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            }
+            if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
+                if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) {
+                    payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+                }
+            }
+            if(payMoney.compareTo(salesMoney)>0){
+                return rb.setMsg("付款合计不允许大于买断金额合计");
+            }
             //新增
             //=======================================
             String orgSidPath = "";
@@ -216,7 +230,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
                 if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
                     if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) {
                         baseVehicleActualPayService.saveDetails(scmVehicleActualSalesDto.getDetailsPayList(), sid);
-
                     }
                 }
 
@@ -227,8 +240,23 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (baseVehicleActualSales == null) {
                 return rb.setMsg("该申请不存在");
             }
+            BigDecimal salesMoney = BigDecimal.ZERO;
+            BigDecimal payMoney = BigDecimal.ZERO;
+            if(scmVehicleActualSalesDto.getDetailsList().size()>0){
+                salesMoney = scmVehicleActualSalesDto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            }
+            if ("1".equals(scmVehicleActualSalesDto.getIsPay())) {
+                if (scmVehicleActualSalesDto.getDetailsPayList().size() > 0) {
+                    payMoney = scmVehicleActualSalesDto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+                }
+            }
+            if(payMoney.compareTo(salesMoney)>0){
+                return rb.setMsg("付款合计不允许大于买断金额合计");
+            }
+
             BeanUtil.copyProperties(scmVehicleActualSalesDto, baseVehicleActualSales, "orgSidPath");
             int i = baseMapper.updateById(baseVehicleActualSales);
+
             //查询details中是否有关于sales的该条sid数据
             List<BaseVehicleActualDetails> scmVehicleActualDetailsList = baseVehicleActualDetailsService.selectBySaleSid(sid);
             if (scmVehicleActualDetailsList.size() > 0) {
@@ -237,7 +265,6 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
             if (scmVehicleActualSalesDto.getDetailsList().size() > 0) {
                 baseVehicleActualDetailsService.updateListByReturnSid(sid, scmVehicleActualSalesDto.getDetailsList());
             }
-
             //查询pay中是否有关于sales的该条sid数据
             List<BaseVehicleActualPay> scmVehicleActualPayList = baseVehicleActualPayService.selectBySaleSid(sid);
             if (scmVehicleActualPayList.size() > 0) {
@@ -347,6 +374,19 @@ public class BaseVehicleActualSalesService extends MybatisBaseService<BaseVehicl
      */
     public ResultBean submitVehicleSales(SubmitActualSalesDto dto) {
         ResultBean rb = ResultBean.fireFail();
+        BigDecimal salesMoney = BigDecimal.ZERO;
+        BigDecimal payMoney = BigDecimal.ZERO;
+        if(dto.getDetailsList().size()>0){
+            salesMoney = dto.getDetailsList().stream().map(BaseVehicleActualDetailsDto::getActualMoney).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+        }
+        if ("1".equals(dto.getIsPay())) {
+            if (dto.getDetailsPayList().size() > 0) {
+                payMoney = dto.getDetailsPayList().stream().map(BaseVehicleActualPayDto::getPayAccount).map(BigDecimal::new).reduce(BigDecimal.ZERO, BigDecimal::add);
+            }
+        }
+        if(payMoney.compareTo(salesMoney)>0){
+            return rb.setMsg("付款合计不允许大于买断金额合计");
+        }
         String useOrgSid = "";
         String orgSidPath = "";
         if(StringUtils.isNotBlank(dto.getOrgPath())){

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyMapper.xml

@@ -19,7 +19,8 @@
                         bva.applyTypeKey,
                         bva.id,
                         bva.orgDeptSid,
-                        bva.createOrgSid useOrgSid
+                        bva.createOrgSid useOrgSid,
+                        bva.createBySid
         FROM bus_vehicle_apply bva
                  LEFT JOIN bus_vehicle_apply_detail bvad
                            ON bva.sid = bvad.`applySid`

anrui-base/anrui-base-biz/src/main/java/com/yxt/anrui/base/biz/busvehicleapply/BusVehicleApplyService.java

@@ -53,6 +53,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.common.base.config.component.FileUploadComponent;
@@ -148,8 +149,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
     public PagerVo<BusVehicleApplyVo> listPageVo(PagerQuery<BusVehicleApplyQuery> pq) {
         BusVehicleApplyQuery query = pq.getParams();
         QueryWrapper<BusVehicleApply> qw = new QueryWrapper<>();
-        BusVehicleApplyQuery params = pq.getParams();
-        if (params != null) {
+        if (query != null) {
             String applicationDateStart = query.getApplicationDateStart();
             String applicationDateEnd = query.getApplicationDateEnd();
             qw.apply(StringUtils.isNotBlank(applicationDateStart), "date_format (bva.applicationDate,'%Y-%m-%d') >= date_format('" + applicationDateStart + "','%Y-%m-%d')").
@@ -158,9 +158,7 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if (StringUtils.isNotBlank(query.getModelName())) {
                 qw.like("bvad.vehicleName", query.getModelName());
             }
-            if (StringUtils.isNotBlank(query.getUserSid())) {
-                qw.eq("bva.createBySid", query.getUserSid());
-            }
+
             if (StringUtils.isNotBlank(query.getApplyTypeKey())) {
                 qw.eq("bva.applyTypeKey", query.getApplyTypeKey());
             }
@@ -170,9 +168,53 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
             if(StringUtils.isNotBlank(query.getApplicationCode())){
                 qw.like("bva.applicationCode", query.getApplicationCode());
             }
-            if(StringUtils.isNotBlank(query.getOrgPath())){
-                String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
-                qw.eq("bva.createOrgSid",orgPath);
+            //========================================数据授权开始
+            if(StringUtils.isNotBlank(query.getMenuUrl())){
+                //=======================
+                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+                privilegeQuery.setOrgPath(query.getOrgPath());
+                privilegeQuery.setMenuUrl(query.getMenuUrl());
+                privilegeQuery.setUserSid(query.getUserSid());
+                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+                if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                    String orgSidPath = query.getOrgPath();
+                    orgSidPath = orgSidPath + "/";
+                    int i1 = orgSidPath.indexOf("/");
+                    int i2 = orgSidPath.indexOf("/", i1 + 1);
+                    int i3 = orgSidPath.indexOf("/", i2 + 1);
+                    int i4 = orgSidPath.indexOf("/", i3 + 1);
+                    String orgLevelKey = defaultIdReltBean.getData();
+                    if ("1".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i1);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if("5".equals(orgLevelKey)){
+                        qw.eq("bo.createBySid",query.getUserSid());
+                    }else{
+                        PagerVo<BusVehicleApplyVo> p = new PagerVo<>();
+                        return p;
+                    }
+                }else{
+                    PagerVo<BusVehicleApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                if (StringUtils.isNotBlank(query.getUserSid())) {
+                    qw.eq("bva.createBySid", query.getUserSid());
+                }
+                if (StringUtils.isNotBlank(query.getOrgPath())) {
+                    String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                    qw.eq("bva.createOrgSid", orgPath);
+                }
             }
         }
         qw.orderByDesc("bva.id");
@@ -189,6 +231,11 @@ public class BusVehicleApplyService extends MybatisBaseService<BusVehicleApplyMa
                         record.setPurchaseSystemName(basePurchaseSystemDetailsVo.getPurchaseSystemName());
                     }
                 }
+                if(query.getUserSid().equals(record.getCreateBySid())){
+                    record.setAllowModify(true);
+                }else{
+                    record.setAllowModify(false);
+                }
             }
         }
         PagerVo<BusVehicleApplyVo> p = PagerUtil.pageToVo(pagging, null);

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/AppDeliveredApplyPageQuery.java

@@ -18,4 +18,6 @@ public class AppDeliveredApplyPageQuery implements Query {
     @ApiModelProperty("用户名称")
     private String name;
 
+    private String menuSid;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyQuery.java

@@ -63,4 +63,9 @@ public class BusDeliveredApplyQuery implements Query {
     @ApiModelProperty("销售类型")
     private String paymentMethodKey;
 
+    @ApiModelProperty("菜单url")
+    private String menuUrl;
+    @ApiModelProperty("组织全路径sid")
+    private String orgPath;
+
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busdeliveredapply/BusDeliveredApplyVo.java

@@ -75,5 +75,9 @@ public class BusDeliveredApplyVo implements Vo {
     @ApiModelProperty("流程定义id")
     private String procDefId;
 
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
+
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busmaindeposit/BusMainDeposit.java

@@ -90,4 +90,5 @@ public class BusMainDeposit extends BaseEntity {
     @ApiModelProperty(value = "环节定义的ID")
     private String taskDefKey;
 
+    private String orgSidPath;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/AppBusSalesOrderVo.java

@@ -164,4 +164,6 @@ public class AppBusSalesOrderVo implements Vo {
 
     @ApiModelProperty("审批结束时间")
     private String endTime;
+    @ApiModelProperty("车架号显示")
+    private String vinNo;
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesorder/app/order/OrderQuery.java

@@ -3,7 +3,6 @@ package com.yxt.anrui.buscenter.api.bussalesorder.app.order;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import org.springframework.beans.factory.annotation.Autowired;
 
 /**
  * @Author dimengzhe
@@ -23,4 +22,17 @@ public class OrderQuery implements Query {
     private String menuUrl;
     @ApiModelProperty("用户sid")
     private String userSid;
+
+    @ApiModelProperty("订单状态")
+    private String nodeState;
+    @ApiModelProperty("车型")
+    private String modelName;
+    @ApiModelProperty("合同编号")
+    private String contractNo;
+    @ApiModelProperty("发起人")
+    private String createByName;
+    @ApiModelProperty("发起部门")
+    private String createByDept;
+    @ApiModelProperty("销售类型")
+    private String saleTypeKey;
 }

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

@@ -26,7 +26,6 @@
 package com.yxt.anrui.buscenter.biz.busdeliveredapply;
 
 import cn.hutool.core.bean.BeanUtil;
-import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.buscenter.api.busdelivered.AppDeliveredDetailsVo;
 import com.yxt.anrui.buscenter.api.busdeliveredapply.*;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
@@ -215,8 +214,8 @@ public class BusDeliveredApplyRest implements BusDeliveredApplyFeign {
     @Override
     public ResultBean<PagerVo<AppDeliveredApplyPageVo>> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
         ResultBean rb = ResultBean.fireFail();
-        IPage<AppDeliveredApplyPageVo> iPage = busDeliveredApplyService.getRetrievalApplyList(pagerQuery);
-        return rb.success().setData(iPage);
+        PagerVo<AppDeliveredApplyPageVo> pv = busDeliveredApplyService.getRetrievalApplyList(pagerQuery);
+        return rb.success().setData(pv);
     }
 
     @Override

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

@@ -61,6 +61,7 @@ import com.yxt.anrui.buscenter.api.busdiscountpackagehandover.BusDiscountpackage
 import com.yxt.anrui.buscenter.api.busdiscountpackagehandoverlist.BusDiscountpackageHandoverListDto;
 import com.yxt.anrui.buscenter.api.bushandoverprepare.BusHandoverPrepareAddDto;
 import com.yxt.anrui.buscenter.api.bushandoverpreparevehicle.AppBusHandoverPrepareVehicleDto;
+import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrder;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorderdiscount.BusSalesOrderDiscount;
 import com.yxt.anrui.buscenter.api.bussalesordersubmit.SubmitVo;
@@ -100,8 +101,14 @@ import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
+import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutionsFeign;
+import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
+import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
+import com.yxt.anrui.scm.api.scmfile.ScmFile;
+import com.yxt.anrui.scm.api.scmvehiclegression.ScmVehicleGressionPageVo;
 import com.yxt.common.base.service.MybatisBaseService;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
@@ -194,6 +201,8 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
     private BusVehicleInformationHandoverService busVehicleInformationHandoverService;
     @Autowired
     private BusHandoverPrepareService busHandoverPrepareService;
+    @Autowired
+    private LoanSolutionsFeign loanSolutionsFeign;
 
     /**
      * 构造出库申请的查询条件
@@ -228,9 +237,77 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
 
     public PagerVo<BusDeliveredApplyVo> listPageVo(PagerQuery<BusDeliveredApplyQuery> pq) {
         BusDeliveredApplyQuery query = pq.getParams();
-        QueryWrapper<BusDeliveredApply> qw = createQueryWrapper(query);
+        QueryWrapper<BusDeliveredApply> qw = new QueryWrapper<>();
+        if (query != null) {
+            //合同编号
+            if (StringUtils.isNotBlank(query.getContractNo())) {
+                qw.like("bd.contractNo", query.getContractNo());
+            }
+            //客户名称
+            if (StringUtils.isNotBlank(query.getName())) {
+                qw.like("bd.name", query.getName());
+            }
+            if (StringUtils.isNotBlank(query.getApplyDateStart()) && StringUtils.isNotBlank(query.getApplyDateEnd())) {
+                qw.between("bd.createTime", query.getApplyDateStart(), query.getApplyDateEnd());
+            }
+            if (StringUtils.isNotBlank(query.getApplyName())) {
+                qw.like("bd.applyName", query.getApplyName());
+            }
+            if (StringUtils.isNotBlank(query.getPaymentMethodKey())) {
+                qw.eq("bd.paymentMethodKey", query.getPaymentMethodKey());
+            }
+            //========================================数据授权开始
+            if(StringUtils.isNotBlank(query.getMenuUrl())){
+                PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+                privilegeQuery.setOrgPath(query.getOrgPath());
+                privilegeQuery.setMenuUrl(query.getMenuUrl());
+                privilegeQuery.setUserSid(query.getApplySid());
+                ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+                if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                    //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                    String orgSidPath = query.getOrgPath();
+                    orgSidPath = orgSidPath + "/";
+                    int i1 = orgSidPath.indexOf("/");
+                    int i2 = orgSidPath.indexOf("/", i1 + 1);
+                    int i3 = orgSidPath.indexOf("/", i2 + 1);
+                    int i4 = orgSidPath.indexOf("/", i3 + 1);
+                    String orgLevelKey = defaultIdReltBean.getData();
+                    if ("1".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i1);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("2".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i2);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("3".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i3);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if ("4".equals(orgLevelKey)) {
+                        orgSidPath = orgSidPath.substring(0, i4);
+                        qw.like("bo.orgSidPath", orgSidPath);
+                    } else if("5".equals(orgLevelKey)){
+                        qw.eq("bo.createBySid",query.getApplySid());
+                    }else{
+                        PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
+                        return p;
+                    }
+                }else{
+                    PagerVo<BusDeliveredApplyVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                qw.eq("bd.applySid", query.getApplySid());
+            }
+        }
         IPage<BusDeliveredApply> page = PagerUtil.queryToPage(pq);
         IPage<BusDeliveredApplyVo> pagging = baseMapper.selectPageVo(page, qw);
+        List<BusDeliveredApplyVo> records = pagging.getRecords();
+        for (BusDeliveredApplyVo record : records) {
+            if(query.getApplySid().equals(record.getCreateBySid())){
+                record.setAllowModify(true);
+            }else{
+                record.setAllowModify(false);
+            }
+        }
         PagerVo<BusDeliveredApplyVo> p = PagerUtil.pageToVo(pagging, null);
         return p;
     }
@@ -656,7 +733,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appMap.put("contractId", busDeliveredApply.getContractNo());
         appMap.put("contract_id", busDeliveredApply.getContractNo());
         variables.put("app", appMap);
-        variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+//        variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+        //根据合同号查询销售订单
+        if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
+            BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+            if("2".equals(busSalesOrder.getFinancePlan())){
+                //查询是否是自营非担保
+                ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                if(detailsVoResultBean.getData() != null){
+                    if("01".equals(detailsVoResultBean.getData().getTypeKey())){
+                        //自营非担保
+                        variables.put("isDanBao",true);
+                    }else{
+                        variables.put("isDanBao",false);
+                    }
+                }
+            }else{
+                variables.put("isDanBao",false);
+            }
+        }else{
+            variables.put("isDanBao",true);
+        }
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
         flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
         flowProcessMapQuery.setVariables(variables);
@@ -1091,7 +1188,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             appMap.put("contractId", busDeliveredApply.getContractNo());
             appMap.put("contract_id", busDeliveredApply.getContractNo());
             variables.put("app", appMap);
-            variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+//            variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+                        //根据合同号查询销售订单
+            if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
+                BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+                if("2".equals(busSalesOrder.getFinancePlan())){
+                    //查询是否是自营非担保
+                    ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                    if(detailsVoResultBean.getData() != null){
+                        if("01".equals(detailsVoResultBean.getData().getTypeKey())){
+                            //自营非担保
+                            variables.put("isDanBao",true);
+                        }else{
+                            variables.put("isDanBao",false);
+                        }
+                    }
+                }else{
+                    variables.put("isDanBao",false);
+                }
+            }else{
+                variables.put("isDanBao",true);
+            }
             FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
             flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
             flowProcessMapQuery.setVariables(variables);
@@ -1129,7 +1246,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
             appMap.put("contractId", busDeliveredApply.getContractNo());
             appMap.put("contract_id", busDeliveredApply.getContractNo());
             variables.put("app", appMap);
-            variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+//            variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+                        //根据合同号查询销售订单
+            if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
+                BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+                if("2".equals(busSalesOrder.getFinancePlan())){
+                    //查询是否是自营非担保
+                    ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                    if(detailsVoResultBean.getData() != null){
+                        if("01".equals(detailsVoResultBean.getData().getTypeKey())){
+                            //自营非担保
+                            variables.put("isDanBao",true);
+                        }else{
+                            variables.put("isDanBao",false);
+                        }
+                    }
+                }else{
+                    variables.put("isDanBao",false);
+                }
+            }else{
+                variables.put("isDanBao",true);
+            }
             FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
             flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
             flowProcessMapQuery.setVariables(variables);
@@ -1170,7 +1307,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 appMap.put("contractId", busDeliveredApply.getContractNo());
                 appMap.put("contract_id", busDeliveredApply.getContractNo());
                 variables.put("app", appMap);
-                variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+//                variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+                                //根据合同号查询销售订单
+                if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
+                    BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+                    if("2".equals(busSalesOrder.getFinancePlan())){
+                        //查询是否是自营非担保
+                        ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                        if(detailsVoResultBean.getData() != null){
+                            if("01".equals(detailsVoResultBean.getData().getTypeKey())){
+                                //自营非担保
+                                variables.put("isDanBao",true);
+                            }else{
+                                variables.put("isDanBao",false);
+                            }
+                        }
+                    }else{
+                        variables.put("isDanBao",false);
+                    }
+                }else{
+                    variables.put("isDanBao",true);
+                }
                 FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
                 flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
                 flowProcessMapQuery.setVariables(variables);
@@ -1251,7 +1408,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
                 appMap.put("contractId", busDeliveredApply.getContractNo());
                 appMap.put("contract_id", busDeliveredApply.getContractNo());
                 variables.put("app", appMap);
-                variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+//                variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+                                //根据合同号查询销售订单
+                if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
+                    BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+                    if("2".equals(busSalesOrder.getFinancePlan())){
+                        //查询是否是自营非担保
+                        ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                        if(detailsVoResultBean.getData() != null){
+                            if("01".equals(detailsVoResultBean.getData().getTypeKey())){
+                                //自营非担保
+                                variables.put("isDanBao",true);
+                            }else{
+                                variables.put("isDanBao",false);
+                            }
+                        }
+                    }else{
+                        variables.put("isDanBao",false);
+                    }
+                }else{
+                    variables.put("isDanBao",true);
+                }
                 FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
                 flowProcessMapQuery.setProDefKey(busDeliveredApply.getProcDefId());
                 flowProcessMapQuery.setVariables(variables);
@@ -1339,21 +1516,61 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
      * @param pagerQuery
      * @return
      */
-    public IPage<AppDeliveredApplyPageVo> getRetrievalApplyList
-    (PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
+    public PagerVo<AppDeliveredApplyPageVo> getRetrievalApplyList(PagerQuery<AppDeliveredApplyPageQuery> pagerQuery) {
+        AppDeliveredApplyPageQuery query = pagerQuery.getParams();
         QueryWrapper<AppDeliveredApplyPageQuery> qw = new QueryWrapper<>();
         String orgPath = pagerQuery.getParams().getOrgPath();
-        String orgSid = "";
-        if (StringUtils.isNotBlank(orgPath)) {
-            orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
-        } else {
-            orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+        //========================================数据授权开始
+        if(StringUtils.isNotBlank(query.getMenuSid())){
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if("5".equals(orgLevelKey)){
+                    qw.eq("bo.createBySid",query.getUserSid());
+                }else{
+                    PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                PagerVo<AppDeliveredApplyPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            String orgSid = "";
+            if (StringUtils.isNotBlank(orgPath)) {
+                orgSid = sysStaffOrgFeign.getOrgSidByPath(orgPath).getData();
+            } else {
+                orgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
+            }
         }
-        qw.eq("useOrgSid", orgSid);
-        qw.eq("applySid", pagerQuery.getParams().getUserSid());
         IPage<AppDeliveredApplyPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         IPage<AppDeliveredApplyPageVo> iPage = baseMapper.getRetrievalApplyList(page, qw, pagerQuery.getParams().getName());
-        return iPage;
+        PagerVo<AppDeliveredApplyPageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
 
@@ -1886,7 +2103,27 @@ public class BusDeliveredApplyService extends MybatisBaseService<BusDeliveredApp
         appMap.put("contractId", busDeliveredApply.getContractNo());
         appMap.put("contract_id", busDeliveredApply.getContractNo());
         variables.put("app", appMap);
-        variables.put("isDanBao","2".equals(busDeliveredApply.getPaymentMethodKey()));
+        //根据合同号查询销售订单
+        if(!"2".equals(busDeliveredApply.getPaymentMethodKey())){
+            BusSalesOrder busSalesOrder = busSalesOrderService.selectByContractNos(busDeliveredApply.getContractNo());
+            if("2".equals(busSalesOrder.getFinancePlan())){
+                //查询是否是自营非担保
+                ResultBean<SolutionsDetailsVo> detailsVoResultBean = loanSolutionsFeign.selectDetailsss(busSalesOrder.getSid());
+                if(detailsVoResultBean.getData() != null){
+                    if("01".equals(detailsVoResultBean.getData().getTypeKey())){
+                        //自营非担保
+                        variables.put("isDanBao",true);
+                    }else{
+                        variables.put("isDanBao",false);
+                    }
+                }
+            }else{
+                variables.put("isDanBao",false);
+            }
+        }else{
+            variables.put("isDanBao",true);
+        }
+
         FlowProcessMapQuery flowProcessMapQuery = new FlowProcessMapQuery();
         flowProcessMapQuery.setProDefKey(bv.getModelId());
         flowProcessMapQuery.setVariables(variables);

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bushandoverprepare/BusHandoverPrepareService.java

@@ -234,9 +234,9 @@ public class BusHandoverPrepareService extends MybatisBaseService<BusHandoverPre
                 return p;
             }
         } else {
-           /* PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
-            return p;*/
-            qw.eq("createBySid", params.getUserSid());
+            PagerVo<AppHandoverPreparePageVo> p = new PagerVo<>();
+            return p;
+//            qw.eq("createBySid", params.getUserSid());
         }
         if (StringUtils.isNotBlank(params.getType())) {//1待准备，2已准备
             qw.eq("handoverPrepareStateKey", params.getType());

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busmaindeposit/BusMainDepositService.java

@@ -775,6 +775,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
             busMainDeposit.setCreateBySid(dto.getUserSid());
             busMainDeposit.setDepositBillType("订金收取");
             busMainDeposit.setDepositBillTypeKey("01");
+            busMainDeposit.setOrgSidPath(dto.getOrgPath());
             busMainDeposit.setCreateDate(dateFormat.format(new Date()));
             baseMapper.insert(busMainDeposit);
             BusDeposit busDeposit = new BusDeposit();
@@ -2116,16 +2117,12 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public ResultBean complete(BusinessVariables bv) {
         ResultBean rb = ResultBean.fireFail();
         BusMainDeposit busMainDeposit = fetchBySid(bv.getBusinessSid());
-        /*
-        String userSid = bv.getUserSid();
-        SysOrganizationVo data = sysOrganizationFeign.getUseOrgByUserSid(userSid).getData();
-        bv.setOrgSidPath(data.getOrgSidPath());
-        */
         Map<String, Object> variables = new HashMap<>();
         Map<String, Object> appMap = new HashMap<>();
         appMap.put("virtualOrderSid", bv.getBusinessSid());
         variables.put("app", appMap);
         bv.setFormVariables(variables);
+        bv.setOrgSidPath(busMainDeposit.getOrgSidPath());
         if (bv.getTaskId().equals(busMainDeposit.getTaskId())) {
             ResultBean<UpdateFlowFieldVo> resultBean = flowableFeign.handleProsess(bv);
             log.info("流程返回：{}", JSONObject.toJSONString(resultBean));

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderMapper.xml

@@ -68,6 +68,7 @@
         FROM bus_sales_order bo
         left join bus_sales_order_price bp on bp.salesOrderSid = bo.sid
         left join bus_sales_order_deposit bd on bd.salesOrderSid = bo.sid
+        left join bus_sales_order_model bm on bm.salesOrderSid = bo.sid
         <where>
             ${ew.sqlSegment}
             <if test="name != null and name != ''">

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

@@ -4620,6 +4620,28 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             }
             UpdateFlowFieldVo ufVo = voResultBean.getData();
             updateFlowFiled(BeanUtil.beanToMap(ufVo));
+            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
+            AppOrderDetailsVo vo = resultBean.getData();
+            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
+                //更新已选择的车架号的状态为审批中
+                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
+                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
+                busMainDepositUpdateQuery.setVinSidList(list);
+                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
+                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
+                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
+            }
+            if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(busSalesOrderOne.getType())) {
+                List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
+                for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
+                    String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
+                    //查询该采购订单的已使用台数
+                    int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
+                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
+                    //更新该采购订单的锁定台数
+                    ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
+                }
+            }
             //如果创建人与部门主管一样，则自动到下一环节。
             if(busSalesOrder.get().getCreateBySid().equals(nextNodeUserSids_)){
                 busSalesOrderOne = fetchBySid(businessSid);
@@ -4635,7 +4657,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                 bv.setOrgSidPath(busSalesOrderOne.getOrgSidPath());
                 bv.setComment("因与申请人相同，系统自动处理，需以下一级审批人审批意见为准！");
                 return complete(bv);
-
             }
             //极光推送
             busSalesOrder.set(fetchBySid(businessSid));
@@ -4649,28 +4670,6 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             messageFlowableQuery.setMsgContent(busSalesOrder.get().getStaffName() + "提交的" + messageFlowableQuery.getModuleName() + ",请审批");
             messageFlowableQuery.setMsgTitle("销售订单");
             ResultBean<String> stringResultBean = messageFeign.pushMessage(messageFlowableQuery);
-            ResultBean<AppOrderDetailsVo> resultBean = getSaleOrderDetails(businessSid);
-            AppOrderDetailsVo vo = resultBean.getData();
-            if (BusSalesOrderConstantUtils.TypeEnum.EXISTING_CAR.getRemarks().equals(vo.getOrderType())) {
-                //更新已选择的车架号的状态为审批中
-                List<String> list = busSalesOrderVehicleService.selectVehicleSid(businessSid);
-                BusMainDepositUpdateQuery busMainDepositUpdateQuery = new BusMainDepositUpdateQuery();
-                busMainDepositUpdateQuery.setVinSidList(list);
-                busMainDepositUpdateQuery.setLockedState(VehicleState.LockEnum.CONDUCT_LOCK.getCode());
-                busMainDepositUpdateQuery.setLockedStateValue(VehicleState.LockEnum.CONDUCT_LOCK.getRemarks());
-                baseVehicleFeign.updateMainDepositByVinNo(busMainDepositUpdateQuery);
-            }
-            if (BusSalesOrderConstantUtils.TypeEnum.PURCHASE_ORDER.getCode().equals(busSalesOrderOne.getType())) {
-                List<BusSalesVehicleOrderDetailsVo> list = busSalesVehicleOrderService.detailsList(busSalesOrderOne.getSid());
-                for (BusSalesVehicleOrderDetailsVo busSalesVehicleOrderDetailsVo : list) {
-                    String linkSid = busSalesVehicleOrderDetailsVo.getLinkSid();
-                    //查询该采购订单的已使用台数
-                    int count = busSalesVehicleOrderService.selectByLinkSid1(linkSid);
-                    count = count + busSalesVehicleOrderDetailsVo.getUsingNum();
-                    //更新该采购订单的锁定台数
-                    ResultBean resultBeanOrder = busVehicleOrderFeign.updateLockNum(linkSid, String.valueOf(count));
-                }
-            }
             return voResultBean;
         }
         if (r == 2) {
@@ -5724,12 +5723,36 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             return p;
         }
         //=======================
-       /* String orgSidPath = pagerQuery.getOrgPath();
-        orgSidPath = sysOrganizationFeign.selectByCJOrgPath(orgSidPath).getData();
-        qw.like("bo.orgSidPath", orgSidPath);*/
+        //节点状态
+        if(StringUtils.isNotBlank(pagerQuery.getNodeState())){
+            qw.like("bo.nodeState",pagerQuery.getNodeState());
+        }
+        //车型
+        if(StringUtils.isNotBlank(pagerQuery.getModelName())){
+            qw.like("bm.modelName",pagerQuery.getModelName());
+        }
+        //合同编号
+        if(StringUtils.isNotBlank(pagerQuery.getContractNo())){
+            qw.like("bo.contractNo",pagerQuery.getContractNo());
+        }
+        //发起人
+        if(StringUtils.isNotBlank(pagerQuery.getCreateByName())){
+            qw.like("bo.staffName",pagerQuery.getCreateByName());
+        }
+        //发起部门
+        if(StringUtils.isNotBlank(pagerQuery.getCreateByDept())){
+            qw.like("bo.orgName",pagerQuery.getCreateByDept());
+        }
+        //销售类型
+        if(StringUtils.isNotBlank(pagerQuery.getSaleTypeKey())){
+            qw.eq("bo.payTypeKey",pagerQuery.getSaleTypeKey());
+        }
+
         String typeState = "getSaleOrdersByOrgPath";//查询接口的标识
         IPage<AppBusSalesOrderVo> pagging = baseMapper.getSaleOrders(page, qw, pq.getParams().getName(), typeState);
         for (AppBusSalesOrderVo record : pagging.getRecords()) {
+            List<String> vinList = busSalesOrderVehicleService.selectList(record.getSaleOrderSid());
+            record.setVinNo(String.join(",",vinList));
             record.setShowStopBtn(false);
             record.setShowContractBtn(false);
             if (StringUtils.isNotBlank(record.getCustomerImage())) {

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheByDivisionDaiBanInfo.vue

@@ -97,6 +97,11 @@
                 <span>{{ scope.row.subscribedAll }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
             <div class="title">挂车信息</div>
@@ -210,17 +215,20 @@
       </el-form>
     </el-dialog>
     <dingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchSid, getNextNodesForSubmit, getPreviousNodesForReject, initiatorToAnswerInfo, breakProcess, reject } from '@/api/tesheshenpi/qiankuantiche'
 import dingdanInfo from '../../chukuguanliFlow/chukuguanli/relation/dingdanInfo'
+import paymentticket from '../../chukuguanliFlow/chukuguanli/relation/paymentticket'
 
 export default {
   name: 'qiankuanticheByDivisionDaiBanInfo',
   components: {
-    dingdanInfo
+    dingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -375,6 +383,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo({ sid: this.formobj.busSalesOrderSid })
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.carSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractId, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileAndQiTaInfo.vue

@@ -97,6 +97,11 @@
                 <span>{{ scope.row.subscribedAll }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
             <div class="title">挂车信息</div>
@@ -212,19 +217,22 @@
       </el-form>
     </el-dialog>
     <dingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchSid, getNextNodesForSubmit, getPreviousNodesForReject, completeBy, breakProcess, reject } from '@/api/tesheshenpi/qiankuantiche'
 import dingdanInfo from '../../chukuguanliFlow/chukuguanli/relation/dingdanInfo'
+import paymentticket from '../../chukuguanliFlow/chukuguanli/relation/paymentticket'
 import upload from '@/components/uploadFile/upload'
 
 export default {
   name: 'qiankuanticheDaiBanByFileAndQiTaInfo',
   components: {
     upload,
-    dingdanInfo
+    dingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -388,6 +396,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo({ sid: this.formobj.busSalesOrderSid })
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.carSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractId, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanByFileInfo.vue

@@ -97,6 +97,11 @@
                 <span>{{ scope.row.subscribedAll }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
             <div class="title">挂车信息</div>
@@ -229,19 +234,22 @@
       </el-form>
     </el-dialog>
     <dingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchSid, getNextNodesForSubmit, getPreviousNodesForReject, completeBy, breakProcess, reject } from '@/api/tesheshenpi/qiankuantiche'
 import upload from '@/components/uploadFile/upload'
+import paymentticket from '../../chukuguanliFlow/chukuguanli/relation/paymentticket'
 import dingdanInfo from '../../chukuguanliFlow/chukuguanli/relation/dingdanInfo'
 
 export default {
   name: 'qiankuanticheDaiBanByFileInfo',
   components: {
     upload,
-    dingdanInfo
+    dingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -418,6 +426,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo({ sid: this.formobj.busSalesOrderSid })
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.carSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractId, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheDaiBanInfo.vue

@@ -97,6 +97,11 @@
                 <span>{{ scope.row.subscribedAll }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
             <div class="title">挂车信息</div>
@@ -210,17 +215,20 @@
       </el-form>
     </el-dialog>
     <dingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchSid, getNextNodesForSubmit, getPreviousNodesForReject, complete, breakProcess, reject } from '@/api/tesheshenpi/qiankuantiche'
 import dingdanInfo from '../../chukuguanliFlow/chukuguanli/relation/dingdanInfo'
+import paymentticket from '../../chukuguanliFlow/chukuguanli/relation/paymentticket'
 
 export default {
   name: 'qiankuanticheDaiBanInfo',
   components: {
-    dingdanInfo
+    dingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -374,6 +382,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo({ sid: this.formobj.busSalesOrderSid })
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.carSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractId, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-buscenter-ui/src/views/workflow/teshushenpiFlow/qiankuanticheguanli/qiankuanticheYiBanInfo.vue

@@ -96,6 +96,11 @@
                 <span>{{ scope.row.subscribedAll }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <div v-show="formobj.trailersList !== null && formobj.trailersList.length > 0">
             <div class="title">挂车信息</div>
@@ -184,18 +189,21 @@
       </div>
     </div>
     <dingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState" />
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchSid, revokeProcess, createPdf } from '@/api/tesheshenpi/qiankuantiche'
 import dingdanInfo from '../../chukuguanliFlow/chukuguanli/relation/dingdanInfo'
+import paymentticket from '../../chukuguanliFlow/chukuguanli/relation/paymentticket'
 import { getStorage } from '@/utils/auth'
 
 export default {
   name: 'qiankuanticheYiBanInfo',
   components: {
-    dingdanInfo
+    dingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -335,6 +343,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo({ sid: this.formobj.busSalesOrderSid })
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.carSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractId, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue

@@ -8,8 +8,25 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
-              <el-form-item label="快捷检索">
-                <el-input v-model="listQuery.params.name" clearable placeholder="请输入订单编号" />
+              <el-form-item label="订单状态">
+                <el-input v-model="listQuery.params.nodeState" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="车型">
+                <el-input v-model="listQuery.params.modelName" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="合同编号">
+                <el-input v-model="listQuery.params.contractNo" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="发起人">
+                <el-input v-model="listQuery.params.createByName" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="发起部门">
+                <el-input v-model="listQuery.params.createByDept" clearable placeholder="" />
+              </el-form-item>
+              <el-form-item label="销售类型">
+                <el-select v-model="listQuery.params.saleTypeKey" class="filter-item" clearable placeholder="请选择">
+                  <el-option v-for="item in purchaseType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictKey"/>
+                </el-select>
               </el-form-item>
             </el-form>
             <div class="btn" style="text-align: center;">
@@ -41,6 +58,11 @@
                 <span>{{ scope.row.contractId }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="车架号" align="center" width="120">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
             <el-table-column label="客户名称" align="center" width="120">
               <template slot-scope="scope">
                 <span>{{ scope.row.customerName }}</span>
@@ -119,6 +141,7 @@ import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/jichuxinxi/dingdanchaxun'
 import { getStorage } from '@/utils/auth'
+import { typeValues } from '@/api/dictcommons/dictcommons'
 import xiaoshoudingdanInfo from '../../xiaoshouguanli/xiaoshoudingdan/xiaoshoudingdanInfo'
 
 export default {
@@ -149,6 +172,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [],
+      purchaseType_list: [],
       FormLoading: false,
       listLoading: false,
       listQuery: {
@@ -156,7 +180,13 @@ export default {
           orgPath: '',
           name: '',
           userSid: '',
-          menuUrl: ''
+          menuUrl: '',
+          nodeState: '',
+          modelName: '',
+          contractNo: '',
+          createByName: '',
+          createByDept: '',
+          saleTypeKey: ''
         },
         current: 1,
         size: 10,
@@ -223,6 +253,11 @@ export default {
       }
     },
     init() {
+      typeValues({ type: 'purchaseType' }).then((res) => {
+        if (res.success) {
+          this.purchaseType_list = res.data
+        }
+      })
       this.getList()
     },
     // 序号
@@ -267,7 +302,13 @@ export default {
           orgPath: '',
           name: '',
           userSid: '',
-          menuUrl: ''
+          menuUrl: '',
+          nodeState: '',
+          modelName: '',
+          contractNo: '',
+          createByName: '',
+          createByDept: '',
+          saleTypeKey: ''
         },
         current: 1,
         size: 10,

anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/jiaochezhunbei/relation/affirm.vue

@@ -388,6 +388,10 @@ export default {
           }
         })
       } else if (this.fold == '03') {
+        if (this.image_list1.length === 0) {
+          this.$message({ showClose: true, type: 'error', message: '请上传保单照片' })
+          return
+        }
         if (this.image_list1.length > 0) {
           for (var i = 0; i < this.image_list1.length; i++) {
             this.warrant.policyList.push(this.image_list1[i].url)

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/billinginformation/kaipiaoxinxiguanli/kaixiaoxinxiguanli.vue

@@ -142,7 +142,9 @@ export default {
         params: {
           useOrgSid: '',
           orgSidPath: '',
-          purchaseSystemSid: ''
+          purchaseSystemSid: '',
+          menuUrl: '',
+          userSid: ''
         },
         current: 1,
         size: 5,
@@ -209,6 +211,8 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.menuUrl = this.$route.path
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
       this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
       req.listPage(this.listQuery).then((response) => {
         this.listLoading = false
@@ -231,7 +235,9 @@ export default {
         params: {
           useOrgSid: '',
           orgSidPath: '',
-          purchaseSystemSid: ''
+          purchaseSystemSid: '',
+          menuUrl: '',
+          userSid: ''
         },
         current: 1,
         size: 5,

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyByFileDaiBanInfo.vue

@@ -109,6 +109,11 @@
                 <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <el-row>
             <el-col :span="24">
@@ -225,6 +230,7 @@
     </el-dialog>
     <!-- 查看销售订单详情 -->
     <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
@@ -232,12 +238,14 @@
 import { fetchDetailsBySid, completeByKP, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import upload from '@/components/uploadFile/upload'
 import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
+import paymentticket from './relation/paymentticket'
 
 export default {
   name: 'finginvoiceapplyByFileDaiBanInfo',
   components: {
     upload,
-    xiaoshoudingdanInfo
+    xiaoshoudingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -409,6 +417,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyDaiBanInfo.vue

@@ -109,6 +109,11 @@
                 <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <el-row>
             <el-col :span="24">
@@ -227,17 +232,20 @@
     </el-dialog>
     <!-- 查看销售订单详情 -->
     <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, complete, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
+import paymentticket from './relation/paymentticket'
 
 export default {
   name: 'finginvoiceapplyDaiBanInfo',
   components: {
-    xiaoshoudingdanInfo
+    xiaoshoudingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -393,6 +401,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/finginvoiceapplyYiBanInfo.vue

@@ -107,6 +107,11 @@
                 <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
           </el-table>
           <el-row>
             <el-col :span="24">
@@ -198,17 +203,20 @@
     </el-dialog>
     <!-- 查看销售订单详情 -->
     <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, revokeProcess } from '@/api/anruifinmanagement/finwaitinvoiceapply'
 import xiaoshoudingdanInfo from './relation/xiaoshoudingdanInfo'
+import paymentticket from './relation/paymentticket'
 
 export default {
   name: 'finginvoiceapplyYiBanInfo',
   components: {
-    xiaoshoudingdanInfo
+    xiaoshoudingdanInfo,
+    paymentticket
   },
   data() {
     return {
@@ -350,6 +358,14 @@ export default {
       this.viewState = 2
       this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
     },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
     resetState() {
       this.viewState = 1
     },

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kaipiaoguanliFlow/relation/paymentticket.vue

@@ -0,0 +1,249 @@
+<template>
+  <div class="app-container">
+    <div>
+      <div class="tab-header webtop">
+        <div>款票详情</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="">
+        <el-form ref="dataForm" :model="formobj" class="formaddcopy02" :rules="rules">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="12">
+              <div class="span-sty">车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.paymentMethod }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">车型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.modelName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <!--Start 预订车辆信息-->
+          <div class="title">
+            <div>款项情况(平台收款)</div>
+          </div>
+          <el-table :key="tableKey" v-loading="listLoading" ref="multipleTable" :data="formobj.finSelectVoList" border style="width: 100%" :index="index">
+            <el-table-column fixed align="center" label="序号" type="index" :index="index + 1" width="60"/>
+            <el-table-column label="款项名称" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.receivablesName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="应收金额" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.reveivableMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="已收款" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.subscriptionMoneyAll }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="未收款" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.notSubscriptionMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="备注" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.remark }}</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <div class="title">发票情况</div>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">开票名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.invoicingName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">税号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.invoiceNo }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">地址</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.address }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.telPhone }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">开户行</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.openingBank }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">银行账号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.bankNum }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="16">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.invoiceTitle }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.invoiceType }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">开票状态</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.billingState }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.invoiceAmount }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.invoiceDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">移交状态</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.transferState }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">接收人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.recipient }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">移交日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vinInvoiceVo.transferTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import { deliveredFinSelect } from '@/api/chukuguanli/chukubanli'
+
+export default {
+  name: 'PaymentTicket',
+  data() {
+    return {
+      tableKey: 0,
+      index: 0,
+      // --按钮菜单-------
+      listLoading: false,
+      formobj: {
+        vinNo: '',
+        paymentMethod: '',
+        contractNo: '',
+        customerName: '',
+        modelName: '',
+        finSelectVoList: [],
+        vinInvoiceVo: {
+          invoicingName: '',
+          invoiceNo: '',
+          invoiceTitle: '',
+          invoiceType: '',
+          billingState: '',
+          invoiceAmount: '',
+          invoiceDate: '',
+          transferState: '',
+          address: '',
+          telPhone: '',
+          openingBank: '',
+          bankNum: '',
+          recipient: '',
+          transferTime: ''
+        }
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    // ------------ 页面初始化 ------------
+    showInfo(contractId, row) {
+      this.$nextTick(() => {
+        this.$refs['dataForm'].clearValidate()
+      })
+      deliveredFinSelect({ contractNo: contractId, vinSid: row.vinSid }).then((response) => {
+        if (response.success) {
+          console.log(response.data)
+          this.formobj = response.data
+        }
+      })
+    },
+    // ------------ 功能实现 ------------
+    // 返回
+    handleReturn() {
+      this.$refs['dataForm'].resetFields()
+      this.formobj = {
+        vinNo: '',
+        paymentMethod: '',
+        contractNo: '',
+        customerName: '',
+        modelName: '',
+        finSelectVoList: [],
+        vinInvoiceVo: {
+          invoicingName: '',
+          invoiceNo: '',
+          invoiceTitle: '',
+          invoiceType: '',
+          billingState: '',
+          invoiceAmount: '',
+          invoiceDate: '',
+          transferState: '',
+          address: '',
+          telPhone: '',
+          openingBank: '',
+          bankNum: '',
+          recipient: '',
+          transferTime: ''
+        }
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+<style scoped>
+.titwu {
+  font-size: 28px;
+  text-align: center;
+  padding: 30px 0 20px 0;
+}
+.span-sty {
+  width: 120px !important;
+}
+.addinputInfo {
+  margin-left: 110px !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed {
+  height: 100% !important;
+}
+/*表格列设置fixed后固定列出现下边框的设置*/
+/deep/ .el-table__fixed-right {
+  height: 100% !important;
+}
+</style>

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByDivisionDaiBanInfo.vue

@@ -1,142 +1,97 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
-        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款开票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">单台开票金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">是否领取发票原件</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票名称默认</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center" width="110">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center" min-width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="formobj.finBillTrailers !== null">
-          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款开票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">单台开票金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否领取发票原件</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票名称默认</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
+            <el-table-column label="车架号" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="主车车架号" align="center">
+            <el-table-column label="合格证状态" align="center" width="110">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票名称" align="center" width="160">
@@ -144,60 +99,115 @@
                 <span>{{ scope.row.openTickName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票信息" align="center">
+            <el-table-column label="开票信息" align="center" min-width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
+                <span>{{ scope.row.openTickRemarks }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合格证" align="center" width="100">
+            <el-table-column label="款、票情况" align="center" width="200">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <div class="title">证件(营业执照或身份证)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
-          </el-col>
-        </el-row>
-        <div class="title">客户开票申请书</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
-          </el-col>
-        </el-row>
-        <div class="title">款项确认书(贷款业务上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">欠款领票相关附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list5" :key="index" :src="item" :preview-src-list="image_list5"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center" width="160">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center" width="100">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="title">证件(营业执照或身份证)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+            </el-col>
+          </el-row>
+          <div class="title">客户开票申请书</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
+            </el-col>
+          </el-row>
+          <div class="title">款项确认书(贷款业务上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">欠款领票相关附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list5" :key="index" :src="item" :preview-src-list="image_list5"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </div>
 
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -229,16 +239,28 @@
         </div>
       </el-form>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, completeByDivision, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearsbilling'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+
 export default {
   name: 'arrearsbillingByDivisionDaiBanInfo',
+  components: {
+    xiaoshoudingdanInfo,
+    paymentticket
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       billingKey: 1,
       index: 0,
@@ -392,6 +414,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     // 同意
     openAgree(val) {
       this.operation = val
@@ -545,6 +582,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 100px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingByFileDaiBanInfo.vue

@@ -1,142 +1,97 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
-        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款开票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">单台开票金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">是否领取发票原件</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票名称默认</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center" width="110">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center" min-width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="formobj.finBillTrailers !== null">
-          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款开票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">单台开票金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否领取发票原件</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票名称默认</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
+            <el-table-column label="车架号" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="主车车架号" align="center">
+            <el-table-column label="合格证状态" align="center" width="110">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票名称" align="center" width="160">
@@ -144,58 +99,113 @@
                 <span>{{ scope.row.openTickName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票信息" align="center">
+            <el-table-column label="开票信息" align="center" min-width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
+                <span>{{ scope.row.openTickRemarks }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合格证" align="center" width="100">
+            <el-table-column label="款、票情况" align="center" width="200">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
-        <el-row>
-          <el-col :span="24">
-            <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
-          </el-col>
-        </el-row>
-        <div class="title"><span class="icon">*</span>客户开票申请书</div>
-        <el-row>
-          <el-col :span="24">
-            <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
-          </el-col>
-        </el-row>
-        <div class="title">款项确认书(贷款业务上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
-          </el-col>
-        </el-row>
-        <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <upload ref="uploadImg" v-model="image_list4" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">欠款领票相关附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <upload ref="uploadImg" v-model="image_list5" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center" width="160">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center" width="100">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="title"><span class="icon">*</span>证件(营业执照或身份证)</div>
+          <el-row>
+            <el-col :span="24">
+              <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+            </el-col>
+          </el-row>
+          <div class="title"><span class="icon">*</span>客户开票申请书</div>
+          <el-row>
+            <el-col :span="24">
+              <upload ref="uploadImg" v-model="image_list2" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+            </el-col>
+          </el-row>
+          <div class="title">款项确认书(贷款业务上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <upload ref="uploadImg" v-model="image_list3" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+            </el-col>
+          </el-row>
+          <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <upload ref="uploadImg" v-model="image_list4" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">欠款领票相关附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <upload ref="uploadImg" v-model="image_list5" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </div>
 
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -227,21 +237,30 @@
         </div>
       </el-form>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, completeBy, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearsbilling'
 import upload from '@/components/uploadFile/upload'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
 
 export default {
   name: 'arrearsbillingByFileDaiBanInfo',
   components: {
-    upload
+    upload,
+    xiaoshoudingdanInfo,
+    paymentticket
   },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       billingKey: 1,
       index: 0,
@@ -416,6 +435,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     getUrl() {
       if (this.image_list1.length > 0) {
         const aa = []
@@ -648,6 +682,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 100px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingDaiBanInfo.vue

@@ -1,142 +1,97 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
-        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款开票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">单台开票金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">是否领取发票原件</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票名称默认</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center" width="110">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center" min-width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="formobj.finBillTrailers !== null">
-          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款开票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">单台开票金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否领取发票原件</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票名称默认</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
+            <el-table-column label="车架号" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="主车车架号" align="center">
+            <el-table-column label="合格证状态" align="center" width="110">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票名称" align="center" width="160">
@@ -144,60 +99,115 @@
                 <span>{{ scope.row.openTickName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票信息" align="center">
+            <el-table-column label="开票信息" align="center" min-width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
+                <span>{{ scope.row.openTickRemarks }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合格证" align="center" width="100">
+            <el-table-column label="款、票情况" align="center" width="200">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <div class="title">证件(营业执照或身份证)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
-          </el-col>
-        </el-row>
-        <div class="title">客户开票申请书</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
-          </el-col>
-        </el-row>
-        <div class="title">款项确认书(贷款业务上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">欠款领票相关附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list5" :key="index" :src="item" :preview-src-list="image_list5"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center" width="160">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center" width="100">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="title">证件(营业执照或身份证)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+            </el-col>
+          </el-row>
+          <div class="title">客户开票申请书</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
+            </el-col>
+          </el-row>
+          <div class="title">款项确认书(贷款业务上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">欠款领票相关附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list5" :key="index" :src="item" :preview-src-list="image_list5"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </div>
 
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
@@ -228,16 +238,29 @@
         </div>
       </el-form>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearsbilling'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+import upload from "@/components/uploadFile/upload";
+
 export default {
   name: 'arrearsbillingDaiBanInfo',
+  components: {
+    xiaoshoudingdanInfo,
+    paymentticket
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       billingKey: 1,
       index: 0,
@@ -391,6 +414,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     // 同意
     openAgree(val) {
       this.operation = val
@@ -522,6 +560,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 100px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuankaipiaoFlow/arrearsbillingYiBanInfo.vue

@@ -1,141 +1,96 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="handlePrint()">打印</el-button>
-        <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="handlePrint()">打印</el-button>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+        <!--end 添加修改按钮-->
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款开票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">单台开票金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">是否领取发票原件</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票名称默认</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center" width="110">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center" width="150">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center" width="160">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center" min-width="200">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center" width="120">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div v-if="formobj.finBillTrailers !== null">
-          <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
-          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款开票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">单台开票金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.oneBillMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">是否领取发票原件</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.isLQOrigInvoice }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票名称默认</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
             <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-            <el-table-column label="挂车车架号" align="center">
+            <el-table-column label="车架号" align="center">
               <template slot-scope="scope">
-                <span>{{ scope.row.gcVinNo }}</span>
+                <span>{{ scope.row.vinNo }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="主车车架号" align="center">
+            <el-table-column label="合格证状态" align="center" width="110">
               <template slot-scope="scope">
-                <span>{{ scope.row.vinNo }}</span>
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center" width="150">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票名称" align="center" width="160">
@@ -143,77 +98,143 @@
                 <span>{{ scope.row.openTickName }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="开票信息" align="center">
+            <el-table-column label="开票信息" align="center" min-width="200">
               <template slot-scope="scope">
-                <span>{{ scope.row.invoiceInfo }}</span>
+                <span>{{ scope.row.openTickRemarks }}</span>
               </template>
             </el-table-column>
             <el-table-column label="开票金额" align="center" width="120">
-              <template slot-scope="scope">
-                <span>{{ scope.row.oneBillMoney }}</span>
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
               </template>
             </el-table-column>
-            <el-table-column label="合格证" align="center" width="100">
+            <el-table-column label="款、票情况" align="center" width="200">
               <template slot-scope="scope">
-                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
               </template>
             </el-table-column>
           </el-table>
-        </div>
-        <div class="title">证件(营业执照或身份证)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
-          </el-col>
-        </el-row>
-        <div class="title">客户开票申请书</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
-          </el-col>
-        </el-row>
-        <div class="title">款项确认书(贷款业务上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">欠款领票相关附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list5" :key="index" :src="item" :preview-src-list="image_list5"></el-image>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div v-if="formobj.finBillTrailers !== null">
+            <div class="title">挂车开票信息(挂车的开票类型、开票名称与主车相同)</div>
+            <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+              <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+              <el-table-column label="挂车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.gcVinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="主车车架号" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.vinNo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票名称" align="center" width="160">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.openTickName }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票信息" align="center">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.invoiceInfo }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="开票金额" align="center" width="120">
+                <template slot-scope="scope">
+                  <span>{{ scope.row.oneBillMoney }}</span>
+                </template>
+              </el-table-column>
+              <el-table-column label="合格证" align="center" width="100">
+                <template slot-scope="scope">
+                  <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+                </template>
+              </el-table-column>
+            </el-table>
+          </div>
+          <div class="title">证件(营业执照或身份证)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+            </el-col>
+          </el-row>
+          <div class="title">客户开票申请书</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list2" :key="index" :src="item" :preview-src-list="image_list2"></el-image>
+            </el-col>
+          </el-row>
+          <div class="title">款项确认书(贷款业务上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list3" :key="index" :src="item" :preview-src-list="image_list3"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">车辆登记合同(开票名称与客户名称不一致时上传)</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list4" :key="index" :src="item" :preview-src-list="image_list4"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">欠款领票相关附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list5" :key="index" :src="item" :preview-src-list="image_list5"></el-image>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
     </div>
 
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, revokeProcess, createPdf } from '@/api/anruifinmanagement/arrearsbilling'
 import { getStorage } from '@/utils/auth'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
 
 export default {
   name: 'arrearsbillingYiBanInfo',
+  components: {
+    xiaoshoudingdanInfo,
+    paymentticket
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       tableKey: 0,
       billingKey: 1,
       index: 0,
@@ -379,6 +400,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     /** 确认撤回任务 */
     openRevoke() {
       this.$confirm('是否确认执行撤回操作', '提示', {
@@ -426,6 +462,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 100px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByDivisionDaiBanInfo.vue

@@ -1,175 +1,186 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
-        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
+      </div>
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款领票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickRemarks }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证状态" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">开票金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">提前领取发票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款领票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">开票金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">提前领取发票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
-          </el-col>
-        </el-row>
-      </el-form>
     </div>
+
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
@@ -199,17 +210,28 @@
         </div>
       </el-form>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, completeByDivision, reject, breakProcess, getPreviousNodesForReject, getNextNodesForSubmit } from '@/api/anruifinmanagement/arrearscollection'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
 
 export default {
   name: 'ArrearsScollectionByDivisionDaiBanInfo',
+  components: {
+    xiaoshoudingdanInfo,
+    paymentticket
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       dialogVisible: false,
       srcList: [],
       tableKey: 0,
@@ -339,6 +361,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     totalBillMoney() {
       var aa = 0
       if (this.formobj.finBillVehicles.length > 0) {
@@ -477,6 +514,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 130px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionByFileDaiBanInfo.vue

@@ -1,177 +1,188 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
-        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
+      </div>
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款领票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickRemarks }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证状态" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">开票金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">提前领取发票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-form-item>
+                <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
+              </el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款领票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">开票金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">提前领取发票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-form-item>
-              <upload ref="uploadImg" v-model="image_list1" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
     </div>
+
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
@@ -201,21 +212,30 @@
         </div>
       </el-form>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, breakProcess, completeBy, getNextNodesForSubmit, getPreviousNodesForReject, reject } from '@/api/anruifinmanagement/arrearscollection'
 import upload from '@/components/uploadFile/upload'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
 
 export default {
   name: 'ArrearsScollectionByFileDaiBanInfo',
   components: {
-    upload
+    upload,
+    xiaoshoudingdanInfo,
+    paymentticket
   },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       dialogVisible: false,
       srcList: [],
       tableKey: 0,
@@ -360,6 +380,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     getUrl() {
       if (this.image_list1.length > 0) {
         const aa = []
@@ -512,6 +547,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 130px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionDaiBanInfo.vue

@@ -1,175 +1,186 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
-        <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
-        <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="primary" size="small" @click="openAgree('同意')">同 意</el-button>
+          <el-button type="danger" size="small" @click="openReject('驳回')">驳 回</el-button>
+          <el-button type="danger" size="small" @click="openStop('终止')">终 止</el-button>
+        </div>
+        <!--end 添加修改按钮-->
+      </div>
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款领票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickRemarks }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证状态" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">开票金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">提前领取发票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款领票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">开票金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">提前领取发票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
-          </el-col>
-        </el-row>
-      </el-form>
     </div>
+
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
@@ -199,17 +210,28 @@
         </div>
       </el-form>
     </el-dialog>
+
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, complete, breakProcess, reject, getNextNodesForSubmit, getPreviousNodesForReject } from '@/api/anruifinmanagement/arrearscollection'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
 
 export default {
   name: 'ArrearsScollectionDaiBanInfo',
+  components: {
+    xiaoshoudingdanInfo,
+    paymentticket
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       dialogVisible: false,
       srcList: [],
       tableKey: 0,
@@ -346,6 +368,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     // 同意
     openAgree(val) {
       this.operation = val
@@ -477,6 +514,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 130px !important;
 }

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/qiankuanlingpiaoFlow/arrearscollectionYiBanInfo.vue

@@ -1,186 +1,208 @@
 <template>
   <div class="app-container">
     <!--标题按钮部分开始-->
-    <div class="tab-header webtop">
-      <!--标题-->
-      <div>{{ viewTitle }}</div>
-      <!--start 新增修改按钮-->
-      <div>
-        <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <!--标题-->
+        <div>{{ viewTitle }}</div>
+        <!--start 新增修改按钮-->
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+        <!--end 添加修改按钮-->
+      </div>
+      <!--按钮部分结束-->
+      <div class="">
+        <div class="titwu">欠款领票申请单</div>
+        <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
+          <el-row style="border-top: 1px solid #E0E3EB">
+            <el-col :span="8">
+              <div class="span-sty">发起人</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">发起日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">销售专员</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售部门</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">销售类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">合同编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">开票单位</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">客户名称</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title titleOne">
+            <div>主车开票信息</div>
+            <div><el-button type="primary" size="mini" class="btntopblueline" @click="handleLookByDingDan()">查看销售订单</el-button></div>
+          </div>
+          <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickRemarks }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template>
+                <span>{{ formobj.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证状态" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="款、票情况" align="center" width="200">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="lookPayment(scope.row)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">开票金额合计</div>
+              <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="12">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="12">
+              <div class="span-sty">承诺回款日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">欠款开票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="16">
+              <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">挂车开票信息</div>
+          <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
+            <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
+            <el-table-column label="挂车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.gcVinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="主车车架号" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.vinNo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票类型" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.billTypeValue }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票名称" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.openTickName }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票信息" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.invoiceInfo }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="开票金额" align="center">
+              <template slot-scope="scope">
+                <span>{{ scope.row.oneBillMoney }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="合格证" align="center">
+              <template slot-scope="scope">
+                <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
+              </template>
+            </el-table-column>
+          </el-table>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">提前领取发票原因</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <div class="title">附件</div>
+          <el-row>
+            <el-col :span="24">
+              <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
+            </el-col>
+          </el-row>
+        </el-form>
       </div>
-      <!--end 添加修改按钮-->
-    </div>
-    <!--按钮部分结束-->
-    <div class="">
-      <div class="titwu">欠款领票申请单</div>
-      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02">
-        <el-row style="border-top: 1px solid #E0E3EB">
-          <el-col :span="8">
-            <div class="span-sty">发起人</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.createByName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.deptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">发起日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.applyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">销售专员</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.staffName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售部门</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleDeptName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">销售类型</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.saleTypeValue }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">合同编号</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.contractNo }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">开票单位</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.openTickUnitName }}</span></el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <div class="span-sty">客户名称</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.customerName }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">主车开票信息</div>
-        <el-table :key="tableKey" :data="formobj.finBillVehicles" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickRemarks }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template>
-              <span>{{ formobj.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证状态" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.certificatePhoto)">{{ scope.row.certificateStateValue }}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">开票金额合计</div>
-            <el-form-item><span class="addinputInfo">{{ totalBillMoney() }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="12">
-            <div class="span-sty">欠款金额</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsMoney }}</span></el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <div class="span-sty">承诺回款日期</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.returnedMoneyDate }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <el-row>
-          <el-col :span="8">
-            <div class="span-sty">欠款开票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.arrearsOpenYYValue }}</span></el-form-item>
-          </el-col>
-          <el-col :span="16">
-            <el-form-item><span class="addinputInfo" style="margin-left: 0px !important;">{{ formobj.remarks }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">挂车开票信息</div>
-        <el-table :key="billingKey" :data="formobj.finBillTrailers" :index="index" border style="width: 100%">
-          <el-table-column fixed width="80px" label="序号" type="index" :index="index + 1" align="center"/>
-          <el-table-column label="挂车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.gcVinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="主车车架号" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.vinNo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票类型" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.billTypeValue }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票名称" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.openTickName }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票信息" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.invoiceInfo }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="开票金额" align="center">
-            <template slot-scope="scope">
-              <span>{{ scope.row.oneBillMoney }}</span>
-            </template>
-          </el-table-column>
-          <el-table-column label="合格证" align="center">
-            <template slot-scope="scope">
-              <span class="bluezi" @click="handleLook(scope.row.hgzImageUrl)">查看</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <el-row>
-          <el-col :span="24">
-            <div class="span-sty">提前领取发票原因</div>
-            <el-form-item><span class="addinputInfo">{{ formobj.reason }}</span></el-form-item>
-          </el-col>
-        </el-row>
-        <div class="title">附件</div>
-        <el-row>
-          <el-col :span="24">
-            <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in image_list1" :key="index" :src="item" :preview-src-list="image_list1"></el-image>
-          </el-col>
-        </el-row>
-      </el-form>
     </div>
+
     <el-dialog :visible.sync="dialogVisible" :append-to-body="true">
       <el-image style="width: 178px;height: 178px;padding-left: 5px" v-for="(item,index) in srcList" :key="index" :src="item" :preview-src-list="srcList"></el-image>
     </el-dialog>
+    <!-- 查看销售订单详情 -->
+    <xiaoshoudingdanInfo v-show="viewState == 2" ref="divInfo" @doback="resetState"/>
+    <paymentticket v-show="viewState == 3" ref="divPay" @doback="resetState"/>
   </div>
 </template>
 
 <script>
 import { fetchDetailsBySid, revokeProcess } from '@/api/anruifinmanagement/arrearscollection'
+import xiaoshoudingdanInfo from '../../workFlow/kaipiaoguanliFlow/relation/xiaoshoudingdanInfo'
+import paymentticket from '../../workFlow/kaipiaoguanliFlow/relation/paymentticket'
+
 export default {
   name: 'ArrearsScollectionYiBanInfo',
+  components: {
+    xiaoshoudingdanInfo,
+    paymentticket
+  },
   data() {
     return {
       viewTitle: '',
+      viewState: 1,
       dialogVisible: false,
       srcList: [],
       tableKey: 0,
@@ -303,6 +325,21 @@ export default {
       this.dialogVisible = true
       this.srcList = row
     },
+    handleLookByDingDan() {
+      this.viewState = 2
+      this.$refs['divInfo'].showInfo(this.formobj.busSalesOrderSid)
+    },
+    // 查看款、票情况
+    lookPayment(row) {
+      this.viewState = 3
+      const params = {
+        vinSid: row.vehSid
+      }
+      this.$refs['divPay'].showInfo(this.formobj.contractNo, params)
+    },
+    resetState() {
+      this.viewState = 1
+    },
     /** 确认撤回任务 */
     openRevoke() {
       this.$confirm('是否确认执行撤回操作', '提示', {
@@ -350,6 +387,13 @@ export default {
   text-align: center;
   padding: 30px 0 20px 0;
 }
+.titleOne {
+  padding: 7px;
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  align-items: center;
+}
 .span-sty {
   width: 130px !important;
 }

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

@@ -47,6 +47,7 @@ import com.yxt.anrui.buscenter.api.busdelivered.BusDeliveredFeign;
 import com.yxt.anrui.buscenter.api.busdeposit.AppBusDepositBuscenterDetailVo;
 import com.yxt.anrui.buscenter.api.busdeposit.BusDepositFeign;
 import com.yxt.anrui.buscenter.api.bussalesorder.BusSalesOrderFeign;
+import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDepositInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderDetailsVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderModelInfoVo;
 import com.yxt.anrui.buscenter.api.bussalesorder.app.order.AppOrderPriceInfoVo;
@@ -2207,6 +2208,20 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                         AppOrderDetailsVo vo = orderDetails.getData();
                         if (vo != null) {
                             AppOrderPriceInfoVo priceInfoVo = vo.getPriceInfo();
+                            AppOrderDepositInfoVo depositInfo = vo.getDepositInfo();
+                            if(depositInfo != null){
+                                if("02".equals(depositInfo.getDepositTypeKey())){//订金结转
+                                    BigDecimal decimalDeposit = BigDecimal.ZERO;
+                                    if(StringUtils.isNotBlank(depositInfo.getDepositTotal())){
+                                        decimalDeposit = new BigDecimal(depositInfo.getDepositTotal());
+                                    }
+                                    if(StringUtils.isNotBlank(depositInfo.getMakeUpDeposit())){
+                                        decimalDeposit = decimalDeposit.subtract(new BigDecimal(depositInfo.getMakeUpDeposit()));
+                                    }
+                                    decimalDeposit = decimalDeposit.divide(new BigDecimal(priceInfoVo.getNumber()), BigDecimal.ROUND_CEILING);
+                                    bigDecimalVinAll = bigDecimalVinAll.add(decimalDeposit);
+                                }
+                            }
                             //单台整体成交价
                             BigDecimal singleFinalPrice = new BigDecimal(priceInfoVo.getSingleFinalPrice());
                             BigDecimal leftAll = BigDecimal.ZERO;

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/flowtask/FlowableQuery.java

@@ -1,5 +1,6 @@
 package com.yxt.anrui.flowable.api.flowtask;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.util.HashMap;
@@ -12,10 +13,10 @@ import java.util.Map;
  **/
 @Data
 public class FlowableQuery {
-
+    @ApiModelProperty("列表中的procDefId")
     private String modelId;
-
+    @ApiModelProperty("列表中的processVariables")
     private Map<String,Object> map = new HashMap<>();
-
+    @ApiModelProperty("列表中的taskDefKey")
     private String taskDefKey;
 }

anrui-flowable/anrui-flowable-api/src/main/java/com/yxt/anrui/flowable/api/utils/ProcDefEnum.java

@@ -33,7 +33,7 @@ public enum ProcDefEnum {
     BASEMODELMODPRICE("车型调价申请", "process_kydcif7k:7:722512"),
     BASEINTERNALPURCHASE("调车申请", "process_i6luw5xq:3:722516"),
     BASEACCADJAPPLY("调账申请", "process_r6pyzqoz:4:1362508"),
-    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:9:1632516"),
+    BUSDELIVEREDAPPLY("出库申请", "process_wgt1n66l:10:1700004"),
     BASESHUNINVOICAPPLY("调车开票申请", "process_u4xrvaso:1:400008"),
     BASEVEHINSTALLMODPRICE("上装调价申请", "process_s0a0svth:1:492508"),
     SCMVEHREBATEWITHAPPLY("单车返利预提申请", "process_qegarc7r:1:535004"),

anrui-flowable/anrui-flowable-biz/src/main/java/com/yxt/anrui/flowable/biz/flowtask/FlowTaskService.java

@@ -304,8 +304,9 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
             List<HistoricActivityInstance> list = historyService
                     .createHistoricActivityInstanceQuery()
                     .processInstanceId(procInsId)
-                    .orderByHistoricActivityInstanceStartTime()
-                    .desc().list();
+//                    .orderByHistoricActivityInstanceStartTime()
+//                    .desc().list();
+                    .list();
            Map<String,String>  processInstance=processService.getProcessInstanceById(procInsId);
             List<FlowTask> hisFlowList = new ArrayList<>();
             for (HistoricActivityInstance histIns : list) {
@@ -314,6 +315,11 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     flowTask.setTaskId(histIns.getTaskId());
                     flowTask.setTaskName(histIns.getActivityName());
                     flowTask.setTaskDefKey(histIns.getActivityId());
+                    flowTask.setProcDefId(histIns.getProcessDefinitionId());
+                    HistoricTaskInstance historicTaskInstance = historyService.createHistoricTaskInstanceQuery()
+                            .includeProcessVariables().taskId(histIns.getTaskId()).singleResult();
+                    Map<String, Object> processVariables = historicTaskInstance.getProcessVariables();
+                    flowTask.setProcVars(processVariables);
                     Date startTime = histIns.getStartTime();
                     flowTask.setCreateTime(startTime);
                     Date endTime = histIns.getEndTime();
@@ -323,9 +329,6 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                     //processInstance.get("END_TIME_") timestap类型不能转string
                     String end_time_ = processInstance.get("END_TIME_") == null ? "" : "end";
                     flowTask.setProcessEndTime(end_time_);
-/*
-                    flowTask.setCreateTime(histIns.getStartTime());
-                    flowTask.setFinishTime(histIns.getEndTime());*/
                     if (StringUtils.isNotBlank(histIns.getAssignee())) {
                         ResultBean<List<SysUserVo>> sysUserVoResultBean = sysUserFeign.fetchBySids(histIns.getAssignee());// sysUserService.selectUserById(Long.parseLong(histIns.getAssignee()));
                         List<SysUserVo> data1 = sysUserVoResultBean.getData();
@@ -2108,6 +2111,7 @@ public class FlowTaskService extends MybatisBaseService<FlowTaskMapper, FlowTask
                 }else{
                     if(flowableQuery.getTaskDefKey().equals(item.getId())){
                         taskKeyTrue = true;
+                        continue;
                     }
                     if(taskKeyTrue){
                         log.info("flowElement:{}", item);

anrui-portal/anrui-portal-biz/src/main/java/com/yxt/anrui/portal/biz/flow/FlowableRest.java

@@ -29,6 +29,8 @@ import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowableQuery;
 import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign;
 import com.yxt.anrui.portal.api.flow.*;
 import com.yxt.anrui.portal.api.flow.app.FlowTaskDoQuery;
@@ -46,6 +48,7 @@ import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;
 import io.swagger.annotations.Api;
+import org.apache.commons.collections4.comparators.NullComparator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -84,6 +87,10 @@ public class FlowableRest implements FlowableFeign {
     private SysUrlConfigService sysUrlConfigService;
     @Value("${config.url.prefix}")
     private String urlPrefix;
+
+    private static final NullComparator<Date> nullComparator = new NullComparator<>();
+    @Autowired
+    private FlowTaskFeign flowTaskFeign;
 /*
 
     @Override
@@ -159,7 +166,6 @@ public class FlowableRest implements FlowableFeign {
     public ResultBean<List<PCHistTaskListAndCommentList>> flowRecordAndComment(String procInsId, String deployId) {
         ResultBean<com.yxt.anrui.flowable.api.flowtask.FlowRecordVo> flowRecordVoResultBean = flowableService.flowRecord(procInsId, deployId);
         com.yxt.anrui.flowable.api.flowtask.FlowRecordVo flowRecordVo = flowRecordVoResultBean.getData();
-       // private List<com.yxt.anrui.flowable.api.flowtask.FlowTask> flowList = new ArrayList<>();
         List<PCHistTaskListAndCommentList> flowList = new ArrayList<>();
        //流转记录
         List<com.yxt.anrui.flowable.api.flowtask.FlowTask> flowList1 = flowRecordVo.getFlowList();
@@ -184,8 +190,34 @@ public class FlowableRest implements FlowableFeign {
             a.setState(1+"");
             flowList.add(a);
         });
-        flowList.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime()));
-        //flowRecordVo.setFlowList(flowList);
+        if(flowList1.size()>0){
+            com.yxt.anrui.flowable.api.flowtask.FlowTask appFlowableRecordVo = flowList1.get(flowList1.size()-1);
+            if(!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())){
+                String proDefId = appFlowableRecordVo.getProcDefId();
+                Map<String,Object> map = (Map<String, Object>) appFlowableRecordVo.getProcVars();
+                FlowableQuery flowableQuery = new FlowableQuery();
+                flowableQuery.setModelId(proDefId);
+                flowableQuery.setTaskDefKey(appFlowableRecordVo.getTaskDefKey());
+                flowableQuery.setMap(map);
+                ResultBean<List<Map<String,Object>>> resultBean = flowTaskFeign.yuyanTest(flowableQuery);
+                if(!resultBean.getData().isEmpty()){
+                    List<Map<String,Object>> mapList = resultBean.getData();
+                    mapList.forEach(f->{
+                        PCHistTaskListAndCommentList a = new PCHistTaskListAndCommentList();
+                        Map<String, Object> stringObjectMap = BeanUtil.beanToMap(f);
+                        stringObjectMap.put("taskName",f.get("nodeName").toString());
+                        stringObjectMap.put("finishTime",null);
+                        stringObjectMap.put("createTime","");
+                        stringObjectMap.put("taskUserInfos",new ArrayList<>());
+                        a.setFlowableRecordVo(stringObjectMap);
+                        a.setState(3 + "");
+                        flowList.add(a);
+                    });
+                }
+            }
+        }
+        flowList.sort(Comparator.nullsLast(Comparator.comparing(PCHistTaskListAndCommentList::getTime,nullComparator)));
+//        flowList.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime()));
         ResultBean<List<PCHistTaskListAndCommentList>> resultBean = new ResultBean<List<PCHistTaskListAndCommentList>>().success();
         resultBean.setData(flowList);
         return resultBean;

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/AppScmVehicleGressionPageQuery.java

@@ -64,4 +64,6 @@ public class AppScmVehicleGressionPageQuery implements Query {
     @ApiModelProperty("分公司sid")
     private String orgPath;
 
+    private String menuSid;
+
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageQuery.java

@@ -33,4 +33,5 @@ public class ScmVehicleGressionPageQuery implements Query {
     private String operator;
 
     private String orgPath;
+    private String menuUrl;
 }

anrui-scm/anrui-scm-api/src/main/java/com/yxt/anrui/scm/api/scmvehiclegression/ScmVehicleGressionPageVo.java

@@ -54,4 +54,8 @@ public class ScmVehicleGressionPageVo implements Vo {
     @ApiModelProperty("流程实例id")
     private String procInstId;
 
+    @ApiModelProperty("是否允许点击办理，true允许，false不允许")
+    private boolean allowModify;
+    private String createBySid;
+
 }

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionMapper.xml

@@ -34,7 +34,8 @@
                svg.operator,
                svg.procDefId,
                svg.procInstId,
-               svg.temporaryCard
+               svg.temporaryCard,
+               svg.createBySid
         FROM scm_vehicle_gression svg
         <where>
             ${ew.sqlSegment}

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionRest.java

@@ -37,7 +37,6 @@ import com.yxt.anrui.scm.biz.scmfile.ScmFileService;
 import com.yxt.anrui.scm.biz.scmvehiclegressionveh.ScmVehicleGressionVehService;
 import com.yxt.common.base.config.component.FileUploadComponent;
 import com.yxt.common.base.utils.PagerUtil;
-import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.FileUploadResult;
 import com.yxt.common.core.result.ResultBean;
@@ -123,13 +122,13 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @Override
     @ApiOperation("PC端-获取车辆移位列表")
     public ResultBean<PagerVo<ScmVehicleGressionPageVo>> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
-        if (StringUtils.isBlank(pagerQuery.getParams().getUserSid())) {
-            new ResultBean<>().success().setMsg("用户sid不能为空");
-        }
-        PagerVo<ScmVehicleGressionPageVo> page = new PagerVo<>();
+       /* PagerVo<ScmVehicleGressionPageVo> page = new PagerVo<>();
         IPage<ScmVehicleGressionPageVo> iPage = scmVehicleGressionService.selectCarTransferList(pagerQuery);
         PagerVo<ScmVehicleGressionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return new ResultBean<PagerVo<ScmVehicleGressionPageVo>>().success().setData(pagerVo);
+        return new ResultBean<PagerVo<ScmVehicleGressionPageVo>>().success().setData(pagerVo);*/
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<ScmVehicleGressionPageVo> pv = scmVehicleGressionService.selectCarTransferList(pagerQuery);
+        return rb.success().setData(pv);
     }
 
     @Override
@@ -154,11 +153,14 @@ public class ScmVehicleGressionRest implements ScmVehicleGressionFeign {
     @ApiOperation("手机端-获取车辆移位列表")
     @PostMapping("/getCarTransferList")
     public ResultBean<PagerVo<AppScmVehicleGressionPageVo>> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
-        ResultBean<PagerVo<AppScmVehicleGressionPageVo>> rb = ResultBean.fireFail();
+      /*  ResultBean<PagerVo<AppScmVehicleGressionPageVo>> rb = ResultBean.fireFail();
         PagerVo<AppScmVehicleGressionPageVo> page = new PagerVo<>();
         IPage<AppScmVehicleGressionPageVo> iPage = scmVehicleGressionService.getCarTransferList(pagerQuery);
         PagerVo<AppScmVehicleGressionPageVo> pagerVo = PagerUtil.pageToVo(iPage, page);
-        return rb.success().setData(pagerVo);
+        return rb.success().setData(pagerVo);*/
+        ResultBean rb = ResultBean.fireFail();
+        PagerVo<AppScmVehicleGressionPageVo> pv = scmVehicleGressionService.getCarTransferList(pagerQuery);
+        return rb.success().setData(pv);
     }
 
     @Override

anrui-scm/anrui-scm-biz/src/main/java/com/yxt/anrui/scm/biz/scmvehiclegression/ScmVehicleGressionService.java

@@ -58,6 +58,7 @@ import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationVo;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrg;
 import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
+import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
 import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.scm.api.scmexitpermit.ScmExitPermit;
@@ -215,14 +216,94 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @param pagerQuery
      * @return
      */
-    public IPage<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
+    public PagerVo<ScmVehicleGressionPageVo> selectCarTransferList(PagerQuery<ScmVehicleGressionPageQuery> pagerQuery) {
         IPage<ScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
         String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(pagerQuery.getParams().getUserSid()).getData();
         pagerQuery.getParams().setUseOrgSid(useOrgSid);
-        QueryWrapper<ScmVehicleGressionPageVo> qw = pcQueryWrapper(pagerQuery.getParams());
+//        QueryWrapper<ScmVehicleGressionPageVo> qw = pcQueryWrapper(pagerQuery.getParams());
+        ScmVehicleGressionPageQuery query = pagerQuery.getParams();
+        QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>();
+
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("svg.handleState", query.getType());
+        }
+        if (StringUtils.isNotBlank(query.getApplyId())) {
+            qw.like("svg.applicantNo", query.getApplyId());
+        }
+        if (StringUtils.isNotBlank(query.getVin())) {
+            qw.like("svg.vinNo", query.getVin());
+        }
+        if (StringUtils.isNotBlank(query.getLocationSid())) {
+            qw.eq("svg.locationSid", query.getLocationSid());
+        }
+        if (StringUtils.isNotBlank(query.getTargetLocationSid())) {
+            qw.eq("svg.targetLocationSid", query.getTargetLocationSid());
+        }
+        if (StringUtils.isNotBlank(query.getOperator())) {
+            qw.like("svg.operator", query.getOperator());
+        }
+        String inventStartDate = query.getApplyDateStart();
+        String inventEndDate = query.getApplyDateEnd();
+        qw.apply(StringUtils.isNotEmpty(inventStartDate), "date_format (applicantDate,'%Y-%m-%d') >= date_format('" + inventStartDate + "','%Y-%m-%d')").
+                apply(StringUtils.isNotEmpty(inventEndDate), "date_format (applicantDate,'%Y-%m-%d') <= date_format('" + inventEndDate + "','%Y-%m-%d')"
+                );
+        //========================================数据授权开始
+        if(StringUtils.isNotBlank(query.getMenuUrl())){
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuUrl(query.getMenuUrl());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if("5".equals(orgLevelKey)){
+                    qw.eq("bo.createBySid",query.getUserSid());
+                }else{
+                    PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                PagerVo<ScmVehicleGressionPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("svg.createBySid", query.getUserSid());
+            }
+            if(StringUtils.isNotBlank(query.getOrgPath())){
+                String orgpath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("svg.useorgSid",orgpath);
+            }
+
+        }
         IPage<ScmVehicleGressionPageVo> iPage = baseMapper.selectCarTransferList(page, qw);
         List<ScmVehicleGressionPageVo> records = iPage.getRecords();
         for (ScmVehicleGressionPageVo record : records) {
+            if(query.getUserSid().equals(record.getCreateBySid())){
+                record.setAllowModify(true);
+            }else{
+                record.setAllowModify(false);
+            }
             String sid = record.getSid();
             String type1 = "04"; //保单照片
             String type2 = "05"; //现场照片
@@ -244,7 +325,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
             }
             record.setImages(image);
         }
-        return iPage;
+        PagerVo<ScmVehicleGressionPageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
     /**
@@ -255,9 +337,6 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      */
     private QueryWrapper<ScmVehicleGressionPageVo> pcQueryWrapper(ScmVehicleGressionPageQuery query) {
         QueryWrapper<ScmVehicleGressionPageVo> qw = new QueryWrapper<>();
-//        if (StringUtils.isNotBlank(query.getUseOrgSid())) {
-//            qw.eq("svg.useOrgSid", query.getUseOrgSid());
-//        }
         if (StringUtils.isNotBlank(query.getUserSid())) {
             qw.eq("svg.createBySid", query.getUserSid());
         }
@@ -335,12 +414,69 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
      * @param pagerQuery
      * @return
      */
-    public IPage<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
+    public PagerVo<AppScmVehicleGressionPageVo> getCarTransferList(PagerQuery<AppScmVehicleGressionPageQuery> pagerQuery) {
         String type = "05";
         IPage<AppScmVehicleGressionPageQuery> page = PagerUtil.queryToPage(pagerQuery);
-        QueryWrapper<AppScmVehicleGressionPageVo> qw = appQueryWrapper(pagerQuery.getParams());
-        AppScmVehicleGressionPageQuery params = pagerQuery.getParams();
-        IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, params.getNames());
+        AppScmVehicleGressionPageQuery query = pagerQuery.getParams();
+        QueryWrapper<AppScmVehicleGressionPageVo> qw = new QueryWrapper<>();
+        if (StringUtils.isNotBlank(query.getType())) {
+            qw.eq("svg.handleState", query.getType());
+        }
+        //========================================数据授权开始
+        if(StringUtils.isNotBlank(query.getMenuSid())){
+            //=======================
+            PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+            privilegeQuery.setOrgPath(query.getOrgPath());
+            privilegeQuery.setMenuSid(query.getMenuSid());
+            privilegeQuery.setUserSid(query.getUserSid());
+            ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+            if(StringUtils.isNotBlank(defaultIdReltBean.getData())){
+                //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+                String orgSidPath = query.getOrgPath();
+                orgSidPath = orgSidPath + "/";
+                int i1 = orgSidPath.indexOf("/");
+                int i2 = orgSidPath.indexOf("/", i1 + 1);
+                int i3 = orgSidPath.indexOf("/", i2 + 1);
+                int i4 = orgSidPath.indexOf("/", i3 + 1);
+                String orgLevelKey = defaultIdReltBean.getData();
+                if ("1".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i1);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("2".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i2);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("3".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i3);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if ("4".equals(orgLevelKey)) {
+                    orgSidPath = orgSidPath.substring(0, i4);
+                    qw.like("bo.orgSidPath", orgSidPath);
+                } else if("5".equals(orgLevelKey)){
+                    qw.eq("bo.createBySid",query.getUserSid());
+                }else{
+                    PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
+                    return p;
+                }
+            }else{
+                PagerVo<AppScmVehicleGressionPageVo> p = new PagerVo<>();
+                return p;
+            }
+        }else{
+            if (StringUtils.isNotBlank(query.getOrgPath())) {
+                //切换机构
+                //根据用户所在组织全路径获取分公司sid
+                String orgPath = sysStaffOrgFeign.getOrgSidByPath(query.getOrgPath()).getData();
+                qw.eq("svg.useOrgSid", orgPath);
+            } else {
+                String useOrgSid = sysStaffOrgFeign.getPathSidByUserSid(query.getUserSid()).getData();
+                qw.eq("svg.useOrgSid", useOrgSid);
+            }
+            if (StringUtils.isNotBlank(query.getUserSid())) {
+                qw.eq("svg.createBySid", query.getUserSid());
+            }
+        }
+
+        IPage<AppScmVehicleGressionPageVo> iPage = baseMapper.getCarTransferList(page, qw, query.getNames());
         List<AppScmVehicleGressionPageVo> records = iPage.getRecords();
         for (AppScmVehicleGressionPageVo record : records) {
             List<ScmVehicleGressionVehVo> scmVehicleGressionVehVos = scmVehicleGressionVehService.selectInfoVoByMainSid(record.getSid());
@@ -361,7 +497,8 @@ public class ScmVehicleGressionService extends MybatisBaseService<ScmVehicleGres
                 record.setShowUploadBtn(false);
             }
         }
-        return iPage;
+        PagerVo<AppScmVehicleGressionPageVo> p = PagerUtil.pageToVo(iPage, null);
+        return p;
     }
 
     /**

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

@@ -89,7 +89,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import guachetaizhangAdd from './guachetaizhangAdd'
 import guachetaizhangInfo from './guachetaizhangInfo'
-import { getGysTypeByOrgSid, getOrgSidByPath } from '@/api/cheliang/dictcommons'
+import { getButtonPermissions, getGysTypeByOrgSid, getOrgSidByPath } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'GuaCheTaiZhangGuanLi',
@@ -156,7 +156,18 @@ export default {
     }
   },
   mounted() {
-    this.$refs['btnbar'].setButtonList(this.btnList)
+    getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
+      if (res.success) {
+        for (var i = 0; i < res.data.length; i++) {
+          for (var k = 0; k < this.btnList.length; k++) {
+            if (res.data[i].buttonId === this.btnList[k].btnKey) {
+              this.btnList.splice(k, 1)
+            }
+          }
+        }
+        this.$refs['btnbar'].setButtonList(this.btnList)
+      }
+    })
   },
   created() {
     this.init()

anrui-scm/anrui-scm-ui/src/views/shangzhuang/shangzhuangtaizhangguanli/shangzhuangtaizhangguanli.vue

@@ -115,7 +115,7 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import shangzhuangtaizhangAdd from './shangzhuangtaizhangAdd'
 import shangzhangtaizhangInfo from './shangzhangtaizhangInfo'
-import { getGysByOrgSid, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
+import { getButtonPermissions, getGysByOrgSid, getOrgSidByPath, typeValues } from '@/api/cheliang/dictcommons'
 
 export default {
   name: 'shangzhuangtaizhangguanli',
@@ -189,7 +189,18 @@ export default {
     }
   },
   mounted() {
-    this.$refs['btnbar'].setButtonList(this.btnList)
+    getButtonPermissions({ userSid: window.sessionStorage.getItem('userSid'), url: this.$route.path, type: 0 }).then((res) => {
+      if (res.success) {
+        for (var i = 0; i < res.data.length; i++) {
+          for (var k = 0; k < this.btnList.length; k++) {
+            if (res.data[i].buttonId === this.btnList[k].btnKey) {
+              this.btnList.splice(k, 1)
+            }
+          }
+        }
+        this.$refs['btnbar'].setButtonList(this.btnList)
+      }
+    })
   },
   created() {
     this.init()

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/app/flowable/AppFlowableRecordVo.java

@@ -9,6 +9,7 @@ import lombok.Data;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 /**
  * @Author dimengzhe
@@ -53,4 +54,14 @@ public class AppFlowableRecordVo implements Vo {
     @JsonIgnore
     private AppFlowCommentVo comment;
 
+
+    @ApiModelProperty("任务编号")
+    private String taskId;
+    @ApiModelProperty("任务Key")
+    private String taskDefKey;
+    @ApiModelProperty("流程ID")
+    private String procDefId;
+
+    private Map<String,Object> procVars;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/retrieval/DeliveredPageQuery.java

@@ -17,4 +17,6 @@ public class DeliveredPageQuery implements Query {
     @ApiModelProperty("客户名称")
     private String name;
 
+    private String menuSid;
+
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/autoservice/saleOrders/order/BusOrderSalesVo.java

@@ -114,4 +114,6 @@ public class BusOrderSalesVo implements Vo {
     private String contractId;
     @ApiModelProperty("销售专员")
     private String saler;
+    @ApiModelProperty("车架号的展示")
+    private String vinNo;
 }

anrui-terminal/anrui-terminal-api/src/main/java/com/yxt/anrui/terminal/api/supplychain/scmvehiclegression/AppGressionPageQuery.java

@@ -1,6 +1,5 @@
 package com.yxt.anrui.terminal.api.supplychain.scmvehiclegression;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.yxt.common.core.query.Query;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -21,4 +20,7 @@ public class AppGressionPageQuery implements Query {
 
     @ApiModelProperty("机构sid")
     private String orgPath;
+
+    @ApiModelProperty("菜单sid")
+    private String menuSid;
 }

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/app/AppService.java

@@ -7,12 +7,14 @@ import com.yxt.anrui.flowable.api.flow.FlowableShareQuery;
 import com.yxt.anrui.flowable.api.flowcomment.FlowComment;
 import com.yxt.anrui.flowable.api.flowtask.FlowRecordVo;
 import com.yxt.anrui.flowable.api.flowtask.FlowTaskFeign;
+import com.yxt.anrui.flowable.api.flowtask.FlowableQuery;
 import com.yxt.anrui.flowable.api.processcomment.ProcessCommentDto;
 import com.yxt.anrui.flowable.api.processcomment.ProcessCommentFeign;
 import com.yxt.anrui.terminal.api.app.ShareMessageQuery;
 import com.yxt.anrui.terminal.api.app.flowable.*;
 import com.yxt.common.base.utils.StringUtils;
 import com.yxt.common.core.result.ResultBean;
+import org.apache.commons.collections4.comparators.NullComparator;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -34,12 +36,12 @@ public class AppService {
     private ProcessCommentFeign processCommentFeign;
     @Autowired
     private FlowableFeign flowableFeign;
+    private static final NullComparator<Date> nullComparator = new NullComparator<>();
 
     public ResultBean<List<AppFlowableRecordVo>> getProgressList(AppFlowableRecordQuery appFlowableRecordQuery) {
         ResultBean<List<AppFlowableRecordVo>> rb = ResultBean.fireFail();
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
         String procInsId = appFlowableRecordQuery.getProgressId();
-//        String deployId = appFlowableRecordQuery.getDeployId();
         ResultBean<FlowRecordVo> resultBean = flowTaskFeign.businessFlowRecord(procInsId);
         List<AppFlowableRecordVo> voList = Optional.ofNullable(resultBean.getData().getFlowList()).orElse(new ArrayList<>()).stream().map(m -> JSON.parseObject(JSON.toJSONString(m), AppFlowableRecordVo.class)).collect(Collectors.toList());
         voList.removeAll(Collections.singleton(null));
@@ -82,8 +84,6 @@ public class AppService {
         progressList.forEach(f -> {
             AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo();
             a.setTime(f.getFinishTime() == null ? new Date() : f.getFinishTime());
-            // a.setTime(f.getCreateTime());
-
             a.setFlowableRecordVo(f);
             a.setState(0 + "");
             list.add(a);
@@ -98,7 +98,31 @@ public class AppService {
             a.setState(1 + "");
             list.add(a);
         });
-        list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime()));
+//        list.sort((t1, t2) -> t2.getTime().compareTo(t1.getTime()));
+        if(progressList.size()>0){
+            AppFlowableRecordVo appFlowableRecordVo = progressList.get(progressList.size()-1);
+            if(!"Event_end".equals(appFlowableRecordVo.getTaskDefKey())){
+                String proDefId = appFlowableRecordVo.getProcDefId();
+                Map<String,Object> map = appFlowableRecordVo.getProcVars();
+                FlowableQuery flowableQuery = new FlowableQuery();
+                flowableQuery.setModelId(proDefId);
+                flowableQuery.setTaskDefKey(appFlowableRecordVo.getTaskDefKey());
+                flowableQuery.setMap(map);
+                ResultBean<List<Map<String,Object>>> resultBean = flowTaskFeign.yuyanTest(flowableQuery);
+                if(!resultBean.getData().isEmpty()){
+                    List<Map<String,Object>> mapList = resultBean.getData();
+                    mapList.forEach(f->{
+                        AppFlowableRecordAndCommentVo a = new AppFlowableRecordAndCommentVo();
+                        AppFlowableRecordVo app = new AppFlowableRecordVo();
+                        app.setTaskName(f.get("nodeName").toString());
+                        a.setFlowableRecordVo(app);
+                        a.setState(3 + "");
+                        list.add(a);
+                    });
+                }
+            }
+        }
+        list.sort(Comparator.nullsLast(Comparator.comparing(AppFlowableRecordAndCommentVo::getTime,nullComparator)));
         return rb.success().setData(list);
     }