From dee98e381c54b198da5f98a25fa76ac8488ff661 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Tue, 21 May 2024 08:47:41 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=85=AC=E5=85=B1=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/icons/svg/Import.svg | 2 ++
 yxt-as-ui/src/icons/svg/export.svg | 2 ++
 2 files changed, 4 insertions(+)
 create mode 100644 yxt-as-ui/src/icons/svg/Import.svg
 create mode 100644 yxt-as-ui/src/icons/svg/export.svg

diff --git a/yxt-as-ui/src/icons/svg/Import.svg b/yxt-as-ui/src/icons/svg/Import.svg
new file mode 100644
index 0000000000..184327c5d6
--- /dev/null
+++ b/yxt-as-ui/src/icons/svg/Import.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654478485023" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2834" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7zM902 476H588v-76c0-6.7-7.8-10.5-13-6.3l-141.9 112c-4.1 3.2-4.1 9.4 0 12.6l141.9 112c5.3 4.2 13 0.4 13-6.3v-76h314c4.4 0 8-3.6 8-8v-56c0-4.4-3.6-8-8-8z" p-id="2835" fill="#ffffff"></path></svg>
\ No newline at end of file
diff --git a/yxt-as-ui/src/icons/svg/export.svg b/yxt-as-ui/src/icons/svg/export.svg
new file mode 100644
index 0000000000..5354b7de19
--- /dev/null
+++ b/yxt-as-ui/src/icons/svg/export.svg
@@ -0,0 +1,2 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1654478800491" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5753" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css">@font-face { font-family: feedback-iconfont; src: url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff2?t=1630033759944") format("woff2"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.woff?t=1630033759944") format("woff"), url("//at.alicdn.com/t/font_1031158_u69w8yhxdu.ttf?t=1630033759944") format("truetype"); }
+</style></defs><path d="M888.3 757.4h-53.8c-4.2 0-7.7 3.5-7.7 7.7v61.8H197.1V197.1h629.8v61.8c0 4.2 3.5 7.7 7.7 7.7h53.8c4.2 0 7.7-3.4 7.7-7.7V158.7c0-17-13.7-30.7-30.7-30.7H158.7c-17 0-30.7 13.7-30.7 30.7v706.6c0 17 13.7 30.7 30.7 30.7h706.6c17 0 30.7-13.7 30.7-30.7V765.1c0-4.3-3.5-7.7-7.7-7.7z m18.6-251.7L765 393.7c-5.3-4.2-13-0.4-13 6.3v76H438c-4.4 0-8 3.6-8 8v56c0 4.4 3.6 8 8 8h314v76c0 6.7 7.8 10.5 13 6.3l141.9-112c4.1-3.2 4.1-9.4 0-12.6z" p-id="5754" fill="#ffffff"></path></svg>
\ No newline at end of file

From e43db6e8ac230a42d7ff664c1f3aeb0f99e3c0e3 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 22 May 2024 10:06:43 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E5=BC=80=E5=90=AF=E5=AE=9A=E6=9C=9F?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=BF=98=E6=AC=BE=E6=8F=90=E9=86=92=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanRepaymentHistoryMapper.xml               | 16 ++++++++--------
 .../ScheduledRepaymentService.java               |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
index 13be362bea..25636d4d3e 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryMapper.xml
@@ -253,7 +253,7 @@
     </select>
     <select id="repaymentStatistics"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsVo">
-        SELECT DISTINCT
+        SELECT
         a.*,
         (SELECT
         (fjj.reveivableMoney - fjj.m)
@@ -341,7 +341,7 @@
     </select>
     <select id="repaymentDetailsList"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentDetailsListVo">
-        SELECT DISTINCT
+        SELECT
         *
         FROM
         (
@@ -414,7 +414,7 @@
     </select>
     <select id="repaymentStatisticsExport"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.RepaymentStatisticsExportVo">
-        SELECT DISTINCT
+        SELECT
         a.*
         FROM
         (
@@ -542,7 +542,7 @@
     </select>
     <select id="selPlanDetailsByBank"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.NoImportVo">
-        SELECT DISTINCT *
+        SELECT  *
         FROM (
                  SELECT p.sid,
                         po.bankSid,
@@ -583,7 +583,7 @@
           AND a.useOrgSid = #{useOrgSid}
     </select>
     <select id="selNotRuleForBuckSids" resultType="java.lang.String">
-        SELECT DISTINCT b.sid
+        SELECT  b.sid
         FROM (
                  SELECT his.*,
                         a.*
@@ -618,7 +618,7 @@
             LIMIT 1
     </select>
     <select id="selSidsForBuckle" resultType="java.lang.String">
-        SELECT DISTINCT b.sid
+        SELECT  b.sid
         FROM (
                  SELECT his.*,
                         a.*
@@ -643,7 +643,7 @@
     </select>
     <select id="exportStatisticsExcel"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RecordCountVo">
-        SELECT DISTINCT
+        SELECT
         a.*,
         (SELECT
         (fjj.reveivableMoney - fjj.m)
@@ -727,7 +727,7 @@
     </select>
     <select id="exportDetailsExcel"
             resultType="com.yxt.anrui.riskcenter.api.loanrepaymenthistory.export.RepaymentDetailsExportVo">
-        SELECT DISTINCT
+        SELECT
         @row_number := @row_number + 1 AS rankNo,
         a.*
         FROM
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java
index 95a0db7e78..6061ee57b2 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentschedule/ScheduledRepaymentService.java
@@ -57,7 +57,7 @@ public class ScheduledRepaymentService {
     //@Scheduled(cron = "0 0 0 * * ?")
 //    @Scheduled(cron = "0 0/5 16 * * ?")
     //   @Scheduled(cron = "0/30 * * * * ?")   //每30秒执行一次
-//    @Scheduled(cron = "0 0/5 * * * ?")
+    @Scheduled(cron = "0 0 9 * * ?")
     public void scanRepayment() {
         List<ScanRepaymentVo> schedules = loanRepaymentScheduleService.scanRepaymentVos();
         schedules.removeAll(Collections.singleton(null));

From 0798eeeeea8f154801eff20f8a2ac06665216f37 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 22 May 2024 10:19:47 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E5=88=92=E6=89=A3=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E5=90=8E=EF=BC=8C=E8=BF=98=E6=AC=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92=E8=A1=A8=E4=B8=AD=E6=98=AF=E5=90=A6=E6=9B=BE=E9=80=BE?=
 =?UTF-8?q?=E6=9C=9F=E7=8A=B6=E6=80=81=E4=B8=BA=E6=98=AF=EF=BC=8C=E4=B8=94?=
 =?UTF-8?q?=E6=B2=A1=E6=9C=89=E6=8E=A8=E9=80=81=E8=BF=87=E7=9A=84=EF=BC=8C?=
 =?UTF-8?q?=E6=8E=A8=E9=80=81=E8=B4=A2=E5=8A=A1=E6=9C=AC=E9=87=91=E8=BD=AC?=
 =?UTF-8?q?=E7=B4=AF=E6=AC=A0=E5=87=AD=E8=AF=81=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LoanBuckleApplyService.java               | 118 +++++++++++++++---
 1 file changed, 100 insertions(+), 18 deletions(-)

diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
index b2d8ae6269..b3b0cf9441 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyService.java
@@ -682,20 +682,16 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
     }
 
     private void pushLaterBuckleVoucher(String businessSid) {
-        List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
-        if (!records.isEmpty()) {
+        LoanBuckleApply loanBuckleApply = fetchBySid(businessSid);
+        if (null != loanBuckleApply) {
+            List<LoanPlanDetailsVoForLateVoucher> records = loanRepaymentPlanDetailsService.selListForLateVoucher(loanBuckleApply.getUseOrgSid());
             List<String> planSids = new ArrayList<>();
-            List<String> finalPlanSids = new ArrayList<>();
-            records.stream().forEach(r -> {
-                planSids.add(r.getRepaymentHistorySid());
-            });
-            if (!planSids.isEmpty()) {
-                List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids);
-                if (!vouchers.isEmpty()) {
-                    GeneralVoucher generalVoucher = new GeneralVoucher();
-                    List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
-                    for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) {
-                        finalPlanSids.add(planDetails.getPlanSid());
+            if (!records.isEmpty()) {
+                GeneralVoucher generalVoucher = new GeneralVoucher();
+                List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
+                for (LoanPlanDetailsVoForLateVoucher planDetails : records) {
+                    if (null != planDetails) {
+                        planSids.add(planDetails.getPlanSid());
                         GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
                         if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
                             String useOrgSid = planDetails.getUseOrgSid();
@@ -758,16 +754,102 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                             voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney()));
                         }
                         voucherDetails.add(voucherDetail);
-
                     }
-                    generalVoucher.setVoucherDetails(voucherDetails);
-                    finKingDeeFeign.saveLateVoucher(generalVoucher);
                 }
+                generalVoucher.setVoucherDetails(voucherDetails);
+                finKingDeeFeign.saveLateVoucher(generalVoucher);
             }
-            if (!finalPlanSids.isEmpty()) {
-                int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids);
+            if (!planSids.isEmpty()) {
+                int i = loanRepaymentPlanDetailsService.updateOweState(planSids);
             }
         }
+
+//        List<LoanBuckleApplyRecord> records = loanBuckleApplyRecordService.selByMainSid(businessSid);
+//        if (!records.isEmpty()) {
+//            List<String> planSids = new ArrayList<>();
+//            List<String> finalPlanSids = new ArrayList<>();
+//            records.stream().forEach(r -> {
+//                planSids.add(r.getRepaymentHistorySid());
+//            });
+//            if (!planSids.isEmpty()) {
+//                List<LoanPlanDetailsVoForLateVoucher> vouchers = loanRepaymentPlanDetailsService.selPushLaterVoucherOnBuckle(planSids);
+//                if (!vouchers.isEmpty()) {
+//                    GeneralVoucher generalVoucher = new GeneralVoucher();
+//                    List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = new ArrayList<>();
+//                    for (LoanPlanDetailsVoForLateVoucher planDetails : vouchers) {
+//                        finalPlanSids.add(planDetails.getPlanSid());
+//                        GeneralVoucher.GeneralVoucherDetail voucherDetail = new GeneralVoucher.GeneralVoucherDetail();
+//                        if (StringUtils.isNotBlank(planDetails.getUseOrgSid())) {
+//                            String useOrgSid = planDetails.getUseOrgSid();
+//                            SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+//                            if (null != organizationVo) {
+//                                generalVoucher.setUseOrgCode(organizationVo.getOrgCode());
+//                            }
+//                        }
+//                        if (StringUtils.isNotBlank(planDetails.getScheduleSid())) {
+//                            LoanRepaymentSchedule repaymentSchedule = loanRepaymentScheduleService.fetchBySid(planDetails.getScheduleSid());
+//                            if (null != repaymentSchedule) {
+//                                if (StringUtils.isNotBlank(repaymentSchedule.getCwDeptNo())) {
+//                                    voucherDetail.setDeptCode(repaymentSchedule.getCwDeptNo());
+//                                }
+//                            }
+//                        }
+//                        BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+//                        BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
+//                        if (null != salesOrder) {
+//                            if (null != busSalesOrderVehicle) {
+//                                String customerNumber = "";
+//                                //判断财务系统是否有客户
+//                                Boolean aBoolean = finKingDeeFeign.customerExistState(busSalesOrderVehicle.getTemporaryNo()).getData();
+//                                String linkNo = "";
+//                                BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
+//                                if (!aBoolean) {
+//                                    //  List<BdCustomer> bdCustomers = new ArrayList<>();
+//                                    BdCustomer bdCustomer = new BdCustomer();
+//                                    bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
+//                                    bdCustomer.setFShortName(salesOrder.getContractNo());
+//                                    BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+//                                    bdCustomer.setTOrgIds(data.getOrgCode());
+//                                    if (org.apache.commons.lang3.StringUtils.isNotBlank(busSalesOrderVehicle.getLinkNo())) {
+//                                        String vinNo = busSalesOrderVehicle.getLinkNo();
+//                                        if (vinNo.length() > 8) {
+//                                            linkNo = vinNo.substring(vinNo.length() - 8);
+//                                        } else {
+//                                            linkNo = busSalesOrderVehicle.getLinkNo();
+//                                        }
+//                                        if (null != borrowerDetailsVo) {
+//                                            bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + linkNo);
+//                                        }
+//                                    } else {
+//                                        if (null != borrowerDetailsVo) {
+//                                            bdCustomer.setFName(borrowerDetailsVo.getBorrowerName() + busSalesOrderVehicle.getTemporaryNo());
+//                                        }
+//                                    }
+//                                    //  bdCustomers.add(bdCustomer);
+//                                    ResultBean<String> resultBean = finKingDeeFeign.draftBdCustomer(bdCustomer);
+//                                    if (resultBean.getSuccess()) {
+//                                        customerNumber = bdCustomer.getFNumber();
+//                                    }
+//                                } else {
+//                                    customerNumber = busSalesOrderVehicle.getTemporaryNo();
+//                                }
+//                                voucherDetail.setCustomerCode(customerNumber);
+//                            }
+//                        }
+//                        if (StringUtils.isNotBlank(planDetails.getOutstandingMoney())) {
+//                            voucherDetail.setAmount(new BigDecimal(planDetails.getOutstandingMoney()));
+//                        }
+//                        voucherDetails.add(voucherDetail);
+//
+//                    }
+//                    generalVoucher.setVoucherDetails(voucherDetails);
+//                    finKingDeeFeign.saveLateVoucher(generalVoucher);
+//                }
+//            }
+//            if (!finalPlanSids.isEmpty()) {
+//                int i = loanRepaymentPlanDetailsService.updateOweState(finalPlanSids);
+//            }
+//        }
     }
 
     private void pushBuckleVoucher(String businessSid) {

From e8cc533aa5175c6bee690186f512415029d0ff92 Mon Sep 17 00:00:00 2001
From: fanzongzhe <285169773@qq.com>
Date: Wed, 22 May 2024 13:36:44 +0800
Subject: [PATCH 4/9] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=BD=AC=E7=B4=AF?=
 =?UTF-8?q?=E6=AC=A0=E5=87=AD=E8=AF=81=E6=8E=A8=E9=80=81=E6=9C=AC=E9=87=91?=
 =?UTF-8?q?=E8=B4=9F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java    | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
index cd6b0dc962..54b714ce36 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java
@@ -352,7 +352,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     dto2.setDimensionDept(voucherDetail.getDeptCode());
                     dto2.setDimensionCustom(voucherDetail.getCustomerCode());
                     dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
-                    dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+                    dto2.setDebit("-" + voucherDetail.getAmount().toString());
                     resultDetails.add(dto1);
                     resultDetails.add(dto2);
                 }
@@ -552,7 +552,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
             }
         }
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
-       return voucherService.saveVoucher(newVoucher);
+        return voucherService.saveVoucher(newVoucher);
     }
 
     /**

From b8dc8fbb38b3e45c7119cc2d70fbbfac5f66a2b3 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 May 2024 13:41:46 +0800
Subject: [PATCH 5/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=BF=9D=E5=A4=96?=
 =?UTF-8?q?=E6=AC=A0=E6=AC=BE=E5=87=BA=E5=8E=82=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/api/operation/arrearsleavefactory.js  | 112 +++++
 .../arrearsleavefactory.vue                   | 364 +++++++++++++++
 .../arrearsleavefactoryAdd.vue                | 252 ++++++++++
 .../arrearsleavefactoryInfo.vue               | 197 ++++++++
 .../arrearsleavefactoryDaiBan.vue             | 441 ++++++++++++++++++
 .../arrearsleavefactoryEdit.vue               | 226 +++++++++
 .../arrearsleavefactoryYiBan.vue              | 233 +++++++++
 7 files changed, 1825 insertions(+)
 create mode 100644 yxt-as-ui/src/api/operation/arrearsleavefactory.js
 create mode 100644 yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactory.vue
 create mode 100644 yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryAdd.vue
 create mode 100644 yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryInfo.vue
 create mode 100644 yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue
 create mode 100644 yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue
 create mode 100644 yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue

diff --git a/yxt-as-ui/src/api/operation/arrearsleavefactory.js b/yxt-as-ui/src/api/operation/arrearsleavefactory.js
new file mode 100644
index 0000000000..f2fe0be291
--- /dev/null
+++ b/yxt-as-ui/src/api/operation/arrearsleavefactory.js
@@ -0,0 +1,112 @@
+import request from '@/utils/request'
+
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/listPage',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  init: function(data) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/init/' + data,
+      method: 'get'
+    })
+  },
+  // 初始化
+  fetchDetailsBySid: function(data) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/fetchDetailsBySid/' + data,
+      method: 'get'
+    })
+  },
+  saveOrUpdate: function(data) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/save',
+      method: 'post',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  deleteBySids: function(data) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 提交流程
+  submit: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/submit',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（同意）
+  complete: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/complete',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（加签）
+  delegate: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/delegate',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（驳回）
+  reject: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/reject',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（终止）
+  breakProcess: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/breakProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 流程审批（撤回）
+  revokeProcess: function(params) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/revokeProcess',
+      method: 'post',
+      data: params,
+      headers: { 'Content-Type': 'application/json' }
+    })
+  },
+  // 审批流程（同意）获取下一环节
+  getNextNodesForSubmit: function(data) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/getNextNodesForSubmit',
+      method: 'get',
+      params: data
+    })
+  },
+  // 审批流程（驳回）获取上一环节
+  getPreviousNodesForReject: function(data) {
+    return request({
+      url: '/as/v1/asarrearsoutapply/getPreviousNodesForReject',
+      method: 'get',
+      params: data
+    })
+  }
+}
diff --git a/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactory.vue b/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactory.vue
new file mode 100644
index 0000000000..6c98f37e20
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactory.vue
@@ -0,0 +1,364 @@
+<template>
+  <div class="app-container">
+    <!--列表页面-->
+    <div v-show="viewState == 1">
+      <button-bar view-title="保外欠款出厂管理" ref="btnbar" :btndisabled="btndisabled" @btnhandle="btnHandle"/>
+      <!--Start查询列表部分-->
+      <div class="main-content">
+        <div class="searchcon">
+          <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
+          <div v-show="isSearchShow" class="search">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.createOrgName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请部门">
+                <el-input v-model="listQuery.params.deptName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请人">
+                <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="申请日期">
+                <el-date-picker v-model="listQuery.params.createStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.createEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="办结日期">
+                <el-date-picker v-model="listQuery.params.finishStartTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+                <span style="padding: 0 8px">至</span>
+                <el-date-picker v-model="listQuery.params.finishEndTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+              <el-form-item label="维修工单编号">
+                <el-input v-model="listQuery.params.pairBillNo" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="工单类型">
+                <el-select v-model="listQuery.params.billTypeValue" placeholder="请选择" clearable filterable>
+                  <el-option v-for="item in billType_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
+                </el-select>
+              </el-form-item>
+              <el-form-item label="客户名称">
+                <el-input v-model="listQuery.params.customerName" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车牌号">
+                <el-input v-model="listQuery.params.vehMark" placeholder="" clearable/>
+              </el-form-item>
+              <el-form-item label="车架号">
+                <el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">保外欠款出厂列表</div>
+          <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
+            <el-table-column type="selection" align="center" width="50" />
+            <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
+            <el-table-column label="操作" width="180" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toEdit(scope.row)" :disabled="scope.row.nodeState =='发起申请' ? false : scope.row.nodeState == '待提交' ? false : true">办理</el-button>
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column label="流程状态" width="180" header-align="center">
+              <template slot-scope="scope">
+                <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
+                <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="170" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="120" />
+            <el-table-column prop="deptName" label="申请部门" align="center" width="120" />
+            <el-table-column prop="createTime" label="申请日期" align="center" width="120" />
+            <el-table-column prop="finishTime" label="办结日期" align="center" width="120" />
+            <el-table-column prop="pairBillNo" label="工单编号" align="center" width="170" />
+            <el-table-column prop="billTypeValue" label="工单类型" align="center" width="100" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="customerPhone" label="联系电话" align="center" width="110" />
+            <el-table-column prop="vinNo" label="车架号" align="center" min-width="150" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="pairReceivableMoney" label="工单应收金额" align="center" width="140" />
+            <el-table-column prop="pairReceivedMoney" label="已交金额" align="center" width="120" />
+            <el-table-column prop="pairArrearsMoney" label="欠款金额" align="center" width="120" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit"/>
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current" :limit.sync="listQuery.size" class="pagination" @pagination="getList"/>
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <arrearsleavefactoryAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList" />
+    <!-- 详情 -->
+    <arrearsleavefactoryInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 流程审批记录 -->
+    <el-dialog title="" :visible.sync="centerDialogVisible" width="78%" height="1%" :before-close="closeIt" center>
+      <iframe frameborder="0" id="iframe" style="width:100%;" scrolling="no" :src="this.centerDialogVisible === true ? url :''"></iframe>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import Pagination from '@/components/pagination'
+import pageye from '@/components/pagination/pageye'
+import ButtonBar from '@/components/ButtonBar'
+import req from '@/api/operation/arrearsleavefactory'
+import { typeValues } from '@/api/Common/dictcommons'
+import { getStorage } from '@/utils/auth'
+import arrearsleavefactoryAdd from './arrearsleavefactoryAdd'
+import arrearsleavefactoryInfo from './arrearsleavefactoryInfo'
+
+export default {
+  name: 'Procurement',
+  components: {
+    Pagination,
+    pageye,
+    ButtonBar,
+    arrearsleavefactoryAdd,
+    arrearsleavefactoryInfo
+  },
+  data() {
+    return {
+      url: '',
+      dialogHeight: '80%',
+      centerDialogVisible: false,
+      btndisabled: false,
+      btnList: [
+        {
+          type: 'danger',
+          size: 'small',
+          icon: 'del',
+          btnKey: 'doDel',
+          btnLabel: '删除'
+        },
+        {
+          type: 'info',
+          size: 'small',
+          icon: 'cross',
+          btnKey: 'doClose',
+          btnLabel: '关闭'
+        }
+      ],
+      isSearchShow: false,
+      searchxianshitit: '显示查询条件',
+      viewState: 1, // 1、列表 2、新增 3、编辑 4、查看
+      tableKey: 0,
+      list: [],
+      sids: [], // 用于导出的时候保存已选择的SIDs
+      billType_list: [],
+      FormLoading: false,
+      listLoading: false,
+      // 翻页
+      listQuery: {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          createOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          pairBillNo: '',
+          billTypeValue: '',
+          customerName: '',
+          vinNo: '',
+          vehMark: ''
+        }
+      }
+    }
+  },
+  created() {
+    // 初始化变量
+    this.init()
+    this.getList()
+  },
+  mounted() {
+    // 在外部vue的window上添加postMessage的监听，而且绑定处理函数handleMessage
+    window.addEventListener('message', this.handleMessage)
+    this.$refs['btnbar'].setButtonList(this.btnList)
+  },
+  methods: {
+    init() {
+      typeValues({ type: 'billType' }).then((res) => {
+        if (res.success) {
+          this.billType_list = res.data
+        }
+      })
+    },
+    async handleMessage(event) {
+      var code = ''
+      if (event.data.params !== null && event.data.params !== undefined) {
+        code = event.data.params.code
+      }
+      if (code === 1) {
+        this.centerDialogVisible = false
+      } else if (code === 2) {
+        this.dialogHeight = event.data.params.data
+        this.setIframeHeight(document.getElementById('iframe'))
+      }
+    },
+    closeIt() {
+      this.url = ''
+      this.centerDialogVisible = false
+    },
+    setIframeHeight(iframe) {
+      iframe.height = this.dialogHeight
+    },
+    flowRecord(row) {
+      this.centerDialogVisible = true
+      var params = {
+        deployId: row.procDefId,
+        procInsId: row.procInstId,
+        token: getStorage()
+      }
+      this.url = '/#/flow/flowRecordForBusiness?data=' + encodeURI((JSON.stringify(params)))
+    },
+    // 搜索条件效果
+    clicksearchShow() {
+      this.isSearchShow = !this.isSearchShow
+      if (this.isSearchShow) {
+        this.searchxianshitit = '隐藏查询条件'
+      } else {
+        this.searchxianshitit = '显示查询条件'
+      }
+    },
+    btnHandle(btnKey) {
+      console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+      switch (btnKey) {
+        case 'doDel':
+          this.doDel()
+          break
+        case 'doClose':
+          this.doClose()
+          break
+        default:
+          break
+      }
+    },
+    // 信息条数 获取点击时当前的sid
+    handleSelectionChange(row) {
+      const aa = []
+      row.forEach(element => {
+        aa.push(element.sid)
+      })
+      this.sids = aa
+    },
+    // 表中序号
+    indexMethod(index) {
+      var pagestart = (this.listQuery.current - 1) * this.listQuery.size
+      var pageindex = index + 1 + pagestart
+      return pageindex
+    },
+    // 查询列表信息
+    getList() {
+      this.listLoading = true
+      this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+      req.listPage(this.listQuery).then((response) => {
+        this.listLoading = false
+        if (response.success) {
+          this.list = response.data.records
+          this.listQuery.total = response.data.total
+        } else {
+          this.list = []
+          this.listQuery.total = 0
+        }
+      })
+    },
+    // 查询按钮
+    handleFilter() {
+      this.listQuery.current = 1
+      this.getList()
+    },
+    // 点击重置
+    handleReset() {
+      this.listQuery = {
+        current: 1,
+        size: 5,
+        total: 0,
+        params: {
+          createOrgName: '',
+          deptName: '',
+          createByName: '',
+          billNo: '',
+          createStartTime: '',
+          createEndTime: '',
+          finishStartTime: '',
+          finishEndTime: '',
+          pairBillNo: '',
+          billTypeValue: '',
+          customerName: '',
+          vinNo: '',
+          vehMark: ''
+        }
+      }
+      this.init()
+    },
+    toEdit(row) {
+      this.viewState = 3
+      this.$refs['divAdd'].showEdit(row)
+    },
+    toInfo(row) {
+      this.viewState = 4
+      this.$refs['divInfo'].showInfo(row)
+    },
+    doDel() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择至少一条记录进行删除操作' })
+        return
+      }
+      const tip = '请确认是否删除所选 ' + this.sids.length + ' 条记录?'
+      this.$confirm(tip, '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        const loading = this.$loading({
+          lock: true,
+          text: 'Loading',
+          spinner: 'el-icon-loading',
+          background: 'rgba(0, 0, 0, 0.7)'
+        })
+        req.deleteBySids(this.sids).then(resp => {
+          if (resp.success) {
+            this.$message({ type: 'success', message: resp.msg, showClose: true })
+          }
+          this.getList()
+          loading.close()
+        }).catch(e => {
+          loading.close()
+        })
+      }).catch(() => {
+      })
+    },
+    // 修改、编辑、详情返回列表页面
+    resetState() {
+      this.viewState = 1
+    },
+    doClose() {
+      this.$store.dispatch('tagsView/delView', this.$route)
+      this.$router.go(-1)
+    }
+  }
+}
+</script>
+<style scoped>
+</style>
diff --git a/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryAdd.vue b/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryAdd.vue
new file mode 100644
index 0000000000..6994eeea3a
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryAdd.vue
@@ -0,0 +1,252 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <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.deptName }}</span></el-form-item>
+            </el-col>
+            <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.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">结算日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.balanceDate }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</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.pairReceivableMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已交金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairReceivedMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairArrearsMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item><uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.filePaths" :limit="50" bucket="map" :upload-data="{ type: '0001' }" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/arrearsleavefactory'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'ArrearsLeaveFactoryAdd',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showAdd(value) {
+      this.viewTitle = '【新增】保外欠款出厂申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      this.formobj = JSON.parse(JSON.stringify(value))
+      this.formobj.createByName = window.sessionStorage.getItem('name')
+      this.formobj.createBySid = window.sessionStorage.getItem('userSid')
+      this.formobj.deptName = window.sessionStorage.getItem('defaultOrgPathName').substring(window.sessionStorage.getItem('defaultOrgPathName').lastIndexOf('/') + 1)
+      this.formobj.deptSid = window.sessionStorage.getItem('defaultOrgPath').substring(window.sessionStorage.getItem('defaultOrgPath').lastIndexOf('/') + 1)
+      var nowDate = new Date()
+      var date = {
+        year: nowDate.getFullYear(),
+        month: nowDate.getMonth() + 1,
+        day: nowDate.getDate()
+      }
+      this.formobj.createTime = date.year + '-' + (date.month >= 10 ? date.month : '0' + date.month) + '-' + (date.day >= 10 ? date.day : '0' + date.day)
+    },
+    showEdit(row) {
+      this.viewTitle = '【编辑】保外欠款出厂申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              this.handleReturn('true')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    handleReturn(isreload) {
+      if (isreload === 'true') this.$emit('reloadlist')
+      this.formobj = {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      }
+      this.submitdisabled = false
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryInfo.vue b/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryInfo.vue
new file mode 100644
index 0000000000..a999fab7c2
--- /dev/null
+++ b/yxt-as-ui/src/views/operation/arrearsleavefactory/arrearsleavefactoryInfo.vue
@@ -0,0 +1,197 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="info" size="small" @click="handleReturn()">关闭</el-button>
+        </div>
+      </div>
+      <div class="listconadd">
+        <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.deptName }}</span></el-form-item>
+            </el-col>
+            <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.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">结算日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.balanceDate }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</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.pairReceivableMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已交金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairReceivedMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairArrearsMoney }}</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.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="formobj.filePaths" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/arrearsleavefactory'
+
+export default {
+  name: 'ArrearsLeaveFactoryInfo',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      },
+      rules: {}
+    }
+  },
+  methods: {
+    showInfo(row) {
+      this.viewTitle = '保外欠款出厂详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(row.sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filePaths.length > 0) {
+            const aa = []
+            this.formobj.filePaths.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filePaths = aa
+          }
+        }
+      })
+    },
+    handleReturn() {
+      this.formobj = {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      }
+      this.$emit('doback')
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue
new file mode 100644
index 0000000000..c5eb6aba18
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue
@@ -0,0 +1,441 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" @click="openCountersign('加签')">加 签</el-button>
+          <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>
+      </div>
+      <div class="">
+        <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.deptName }}</span></el-form-item>
+            </el-col>
+            <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.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">结算日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.balanceDate }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</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.pairReceivableMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已交金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairReceivedMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairArrearsMoney }}</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.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="formobj.filePaths" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+    <!-- 选择待办人 的弹出框-->
+    <el-dialog title="填写审批意见" :visible.sync="nodeDialogVisible" width="80%">
+      <el-form class="formadd" >
+        <el-row v-show="countersignLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span class="icon">*</span>加签人员:
+          </el-col>
+          <el-col :span="20">
+            <el-form-item>
+              <el-select v-model="countersign.assignee" placeholder="请选择" filterable>
+                <el-option v-for="item in options" :key="item.userSid" :label="item.staffName" :value="item.userSid">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
+          <el-col :span="4" class="tleftb">
+            <span>当前环节:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><span>{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row :class="{rowClass:!currentLink}">
+          <el-col :span="4" class="tleftb">
+            <span>意见:</span>
+          </el-col>
+          <el-col :span="20">
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw" type="textarea" :autosize="{ minRows: 1, maxRows: 10}" clearable ></el-input></el-form-item>
+          </el-col>
+        </el-row>
+        <div style="text-align:center;margin-top: 20px;">
+          <el-button type="primary" size="mini" @click="reject">确 定</el-button>
+          <el-button type="info " size="mini" @click="nodeDialogVisible = false">取 消</el-button>
+        </div>
+      </el-form>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/arrearsleavefactory'
+
+export default {
+  name: 'ArrearsLeaveFactoryDaiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      },
+      rules: {},
+      options: [],
+      operation: '', // 点击操作按钮
+      dialogList: {
+        comment: ''
+      },
+      startTask: true,
+      current: {
+        taskDefKey: '',
+        taskName: '' // 当前环节名称
+      },
+      nextNode: {}, // 下一环节
+      nodeDialogVisible: false,
+      currentLink: true,
+      countersignLink: false,
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      },
+      // 加签按钮所需参数
+      countersign: {
+        taskId: '',
+        assignee: '',
+        userSid: '',
+        instanceId: '',
+        views: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    // this.linkByParameter.orgSidPath = window.sessionStorage.getItem('orgSidPath')
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    this.current.taskDefKey = obj.taskDefKey
+    this.current.taskName = obj.taskName
+    // 加签参数
+    this.countersign.taskId = obj.taskId
+    this.countersign.userSid = window.sessionStorage.getItem('userSid')
+    this.countersign.instanceId = obj.instanceId
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '保外欠款出厂详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filePaths.length > 0) {
+            const aa = []
+            this.formobj.filePaths.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filePaths = aa
+          }
+        }
+      })
+    },
+    // 加签
+    openCountersign(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = true
+      this.dialogList.comment = ''
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 同意
+    openAgree(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = '同意'
+      req.getNextNodesForSubmit({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 驳回
+    openReject(val) {
+      this.operation = val
+      this.currentLink = true
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      req.getPreviousNodesForReject({ taskDefKey: this.current.taskDefKey, businessSid: this.linkByParameter.businessSid }).then((resp) => {
+        if (resp.success) {
+          var arr = resp.data
+          this.nextNode = arr[0]
+          this.nodeDialogVisible = true
+        }
+        this.submitdisabled = false
+      })
+    },
+    // 终止
+    openStop(val) {
+      this.operation = val
+      this.currentLink = false
+      this.countersignLink = false
+      this.dialogList.comment = ''
+      this.nodeDialogVisible = true
+    },
+    reject() {
+      if (this.operation === '同意') {
+        this.handleAgree()
+      } else if (this.operation === '驳回') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleReject()
+        }
+      } else if (this.operation === '终止') {
+        if (this.dialogList.comment === '') {
+          this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        } else {
+          this.handleStop()
+        }
+      } else if (this.operation === '加签') {
+        this.handleCountersign()
+      }
+    },
+    /** 加签 */
+    handleCountersign() {
+      if (this.countersign.assignee === '') {
+        this.$message({ showClose: true, type: 'error', message: '请选择加签人员' })
+        return
+      }
+      if (this.dialogList.comment === '') {
+        this.$message({ showClose: true, type: 'error', message: '请填写审批意见' })
+        return
+      }
+      this.countersign.views = this.dialogList.comment
+      req.delegate(this.countersign).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 同意任务 */
+    handleAgree() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.complete(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 驳回任务 */
+    handleReject() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.reject(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    },
+    /** 终止任务 */
+    handleStop() {
+      this.linkByParameter.comment = this.dialogList.comment
+      req.breakProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+.rowClass{
+  border-top: 1px solid #E0E3EB;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue
new file mode 100644
index 0000000000..582025e47a
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue
@@ -0,0 +1,226 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</el-button>
+          <el-button type="primary" size="small" :disabled="submitdisabled" @click="submit()">提交</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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.deptName }}</span></el-form-item>
+            </el-col>
+            <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.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">结算日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.balanceDate }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</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.pairReceivableMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已交金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairReceivedMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairArrearsMoney }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">备注</div>
+              <el-form-item><el-input class="addinputInfo" style="width: 80%" v-model="formobj.remarks" clearable placeholder="" /></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item><uploadImg ref="uploadImg" class="addinputInfo" v-model="formobj.filePaths" :limit="50" bucket="map" :upload-data="{ type: '0001' }" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/arrearsleavefactory'
+import uploadImg from '@/components/uploadFile/uploadImg'
+
+export default {
+  name: 'ArrearsLeaveFactoryEdit',
+  components: {
+    uploadImg
+  },
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      submitdisabled: false,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      },
+      rules: {}
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 500 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '【编辑】保外欠款出厂申请'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          this.formobj.instanceId = res.data.procInstId
+        }
+      })
+    },
+    saveOrUpdate() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.saveOrUpdate(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '保存成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    },
+    submit() {
+      this.$refs['form_obj'].validate((valid) => {
+        if (valid) {
+          this.submitdisabled = true
+          req.submit(this.formobj).then((res) => {
+            if (res.success) {
+              this.$message({ showClose: true, type: 'success', message: '提交成功' })
+              // 子页面向父级页面传递值(关闭弹框)
+              window.parent.postMessage({
+                cmd: 'returnHeight',
+                params: {
+                  // 操作成功，告诉父级页面关闭弹框
+                  code: 1
+                }
+              }, '*')
+            } else {
+              this.submitdisabled = false
+            }
+          }).catch(() => {
+            this.submitdisabled = false
+          })
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>
diff --git a/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue
new file mode 100644
index 0000000000..4dd605f81d
--- /dev/null
+++ b/yxt-as-ui/src/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue
@@ -0,0 +1,233 @@
+<template>
+  <div class="app-container">
+    <div v-show="viewState == 1">
+      <div class="tab-header webtop">
+        <div>{{ viewTitle }}</div>
+        <div>
+          <el-button type="danger" size="small" @click="openRevoke()">撤回</el-button>
+        </div>
+      </div>
+      <div class="">
+        <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.deptName }}</span></el-form-item>
+            </el-col>
+            <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.createTime }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="8">
+              <div class="span-sty">维修工单编号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairBillNo }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">工单类型</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.billTypeValue }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">结算日期</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.balanceDate }}</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.customerName }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">联系电话</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.customerPhone }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">车牌号/车架号</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.vehMark }}/{{ formobj.vinNo }}</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.pairReceivableMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">已交金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairReceivedMoney }}</span></el-form-item>
+            </el-col>
+            <el-col :span="8">
+              <div class="span-sty">欠款金额</div>
+              <el-form-item><span class="addinputInfo">{{ formobj.pairArrearsMoney }}</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.remarks }}</span></el-form-item>
+            </el-col>
+          </el-row>
+          <el-row>
+            <el-col :span="24">
+              <div class="span-sty">附件</div>
+              <el-form-item><el-image class="addinputInfo" style="width: 150px;height: 150px" v-for="(item, index) in formobj.filePaths" :key="index" :src="item" :preview-src-list="formobj.filePaths" /></el-form-item>
+            </el-col>
+          </el-row>
+        </el-form>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import req from '@/api/operation/arrearsleavefactory'
+
+export default {
+  name: 'ArrearsLeaveFactoryYiBan',
+  data() {
+    return {
+      viewTitle: '',
+      viewState: 1,
+      formobj: {
+        sid: '',
+        remarks: '',
+        createBySid: '',
+        createByName: '',
+        billNo: '',
+        pairBillSid: '',
+        pairBillNo: '',
+        subjectSid: '',
+        subject: '',
+        customerSid: '',
+        customerName: '',
+        vinNo: '',
+        vehMark: '',
+        pairReceivableMoney: '',
+        pairReceivedMoney: '',
+        pairArrearsMoney: '',
+        filePaths: [],
+        useOrgSid: '',
+        useOrgName: '',
+        procDefId: '',
+        nodeId: '',
+        procInstId: '',
+        nodeState: '',
+        taskId: '',
+        finishTime: '',
+        deptSid: '',
+        deptName: '',
+        balanceDate: '',
+        billTypeKey: '',
+        billTypeValue: '',
+        customerPhone: ''
+      },
+      rules: {},
+      // 环节所需参数
+      linkByParameter: {
+        businessSid: '',
+        comment: '',
+        instanceId: '',
+        taskId: '',
+        orgSidPath: '',
+        taskDefKey: '',
+        userSid: ''
+      }
+    }
+  },
+  created() {
+    console.log('url:' + window.location.href)
+    var one = window.location.href.indexOf('&data') + 6
+    const data = window.location.href.substr(one) // url解码unescape()已从web中移除,尽量不使用
+    const obj = JSON.parse(decodeURIComponent(data))
+    console.log('iframe页面获取的obj:', obj)
+    // 点击（同意、终止、驳回、驳回）操作时所需的参数
+    this.linkByParameter.businessSid = obj.businessSid
+    this.linkByParameter.instanceId = obj.instanceId
+    this.linkByParameter.taskId = obj.taskId
+    this.linkByParameter.taskDefKey = obj.taskDefKey
+    this.linkByParameter.userSid = window.sessionStorage.getItem('userSid')
+    // 加载表单数据
+    this.showInfo(obj.businessSid)
+  },
+  mounted() {
+    window.parent.postMessage({
+      cmd: 'returnHeight',
+      params: {
+        // 告诉父级页面，子页面的弹框高度。
+        code: 2,
+        data: 400 + 'px'
+      }
+    }, '*')
+  },
+  methods: {
+    showInfo(sid) {
+      this.viewTitle = '保外欠款出厂详情'
+      this.$nextTick(() => {
+        this.$refs['form_obj'].clearValidate()
+      })
+      req.fetchDetailsBySid(sid).then((res) => {
+        if (res.success) {
+          this.formobj = res.data
+          if (this.formobj.filePaths.length > 0) {
+            const aa = []
+            this.formobj.filePaths.forEach((e) => {
+              aa.push(e.url)
+            })
+            this.formobj.filePaths = aa
+          }
+        }
+      })
+    },
+    /** 确认撤回任务 */
+    openRevoke() {
+      this.$confirm('是否确认执行撤回操作', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
+        this.handleRevoke()
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消撤回'
+        })
+      })
+    },
+    /** 撤回任务 */
+    handleRevoke() {
+      req.revokeProcess(this.linkByParameter).then((response) => {
+        if (response.success) {
+          this.$notify({
+            title: '提示',
+            message: '执行成功',
+            type: 'success',
+            duration: 2000
+          })
+          this.nodeDialogVisible = false
+          // 子页面向父级页面传递值
+          window.parent.postMessage({
+            cmd: 'returnHeight',
+            params: {
+              // 操作成功，告诉父级页面关闭弹框
+              code: 1
+            }
+          }, '*')
+        }
+      })
+    }
+  }
+}
+</script>
+
+<style scoped>
+.span-sty {
+  width: 130px !important;
+}
+.addinputInfo {
+  margin-left: 120px !important;
+}
+</style>

From 8f480c3225b5868b88f51035d2f105d0e7904005 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 May 2024 13:43:13 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95--=E7=BB=93=E7=AE=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repairbill/repairbillBySettleAccounts.vue | 37 ++++++++++++++++++-
 1 file changed, 35 insertions(+), 2 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
index 36e540bc71..5e58aff051 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillBySettleAccounts.vue
@@ -136,6 +136,8 @@
     <repairbillAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState" @reloadlist="getList"/>
     <!-- 详情 -->
     <repairbillInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+    <!-- 欠款出厂 -->
+    <arrearsleavefactoryAdd v-show="viewState == 5" ref="divQKCC" @doback="resetState" />
   </div>
 </template>
 
@@ -144,9 +146,11 @@ import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
 import ButtonBar from '@/components/ButtonBar'
 import req from '@/api/operation/repairbill'
+import arrearsleavefactory from '@/api/operation/arrearsleavefactory'
+import { typeValues } from '@/api/Common/dictcommons'
 import repairbillAdd from './repairbillAdd'
 import repairbillInfo from './repairbillInfo'
-import { typeValues } from '@/api/Common/dictcommons'
+import arrearsleavefactoryAdd from '../arrearsleavefactory/arrearsleavefactoryAdd'
 
 export default {
   name: 'RepairBillBySettleAccounts',
@@ -155,7 +159,8 @@ export default {
     pageye,
     ButtonBar,
     repairbillAdd,
-    repairbillInfo
+    repairbillInfo,
+    arrearsleavefactoryAdd
   },
   data() {
     return {
@@ -168,6 +173,13 @@ export default {
           btnKey: 'toEdit',
           btnLabel: '编辑'
         },
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'leaveFactory',
+          btnLabel: '欠款出厂'
+        },
         {
           type: 'danger',
           size: 'small',
@@ -189,6 +201,7 @@ export default {
       tableKey: 0,
       list: [],
       sids: [], // 用于导出的时候保存已选择的SIDs
+      multipleSelection: [],
       billType_list: [],
       state_list: [
         {
@@ -268,6 +281,9 @@ export default {
         case 'toEdit':
           this.toEdit()
           break
+        case 'leaveFactory':
+          this.leaveFactory()
+          break
         case 'doDel':
           this.doDel()
           break
@@ -281,6 +297,7 @@ export default {
     // 信息条数 获取点击时当前的sid
     handleSelectionChange(row) {
       const aa = []
+      this.multipleSelection = row
       row.forEach(element => {
         aa.push(element.sid)
       })
@@ -359,6 +376,22 @@ export default {
         this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
       }
     },
+    leaveFactory() {
+      if (this.sids.length === 1) {
+        if (this.multipleSelection[0].subject === '保外') {
+          arrearsleavefactory.init(this.sids[0]).then((res) => {
+            if (res.success) {
+              this.viewState = 5
+              this.$refs['divQKCC'].showAdd(res.data)
+            }
+          })
+        } else {
+          this.$message({ showClose: true, type: 'error', message: '请选择科目为保外的记录进行操作' })
+        }
+      } else {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行操作' })
+      }
+    },
     toInfo(row) {
       this.viewState = 4
       this.$refs['divInfo'].showInfo(row)

From 132870cbab84d889ad782d4bcd26b65807665c11 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 May 2024 13:43:49 +0800
Subject: [PATCH 7/9] =?UTF-8?q?=E5=85=AC=E5=85=B1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 yxt-as-ui/src/router/index.js | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/yxt-as-ui/src/router/index.js b/yxt-as-ui/src/router/index.js
index c52ec6616a..5c12c3a17f 100644
--- a/yxt-as-ui/src/router/index.js
+++ b/yxt-as-ui/src/router/index.js
@@ -92,6 +92,12 @@ export const constantRoutes = [{
         name: 'RepairBillBYLeaveFactory',
         meta: { title: '维修单管理(出厂)', noCache: true }
       },
+      {
+        path: '/arrearsleavefactory/arrearsleavefactory',
+        component: () => import('@/views/operation/arrearsleavefactory/arrearsleavefactory.vue'),
+        name: 'ArrearsLeaveFactory',
+        meta: { title: '保外欠款出厂管理', noCache: true }
+      },
       {
         path: '/workslrsettlement/workslrsettlement',
         component: () => import('@/views/operation/workslrsettlement/workslrsettlement.vue'),
@@ -490,6 +496,28 @@ export const constantRoutes = [{
       import('@/views/workFlow/fanjiesuanFlow/workslrsettlementYiBan.vue'),
     name: 'WorkSLRSettlementYiBan'
   },
+
+  // 保外欠款出厂管理--编辑
+  {
+    path: '/qikuanchuchangFlow/arrearsleavefactoryEdit',
+    component: () =>
+      import('@/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryEdit.vue'),
+    name: 'ArrearsLeaveFactoryEdit'
+  },
+  // 保外欠款出厂管理--待办
+  {
+    path: '/qikuanchuchangFlow/arrearsleavefactoryDaiBan',
+    component: () =>
+      import('@/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryDaiBan.vue'),
+    name: 'ArrearsLeaveFactoryDaiBan'
+  },
+  // 保外欠款出厂管理--已办
+  {
+    path: '/qikuanchuchangFlow/arrearsleavefactoryYiBan',
+    component: () =>
+      import('@/views/workFlow/qikuanchuchangFlow/arrearsleavefactoryYiBan.vue'),
+    name: 'ArrearsLeaveFactoryYiBan'
+  },
   // 404 page must be placed at the end !!!
   // { path: '*', redirect: '/404', hidden: true }
 ]

From 043fe9ee9b803ac25554aecd88c860c77f77b709 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 May 2024 13:52:13 +0800
Subject: [PATCH 8/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=BB=B4=E4=BF=AE?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E7=BC=96=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/repairbill/repairbillAdd.vue    | 31 +++++++++++++------
 1 file changed, 21 insertions(+), 10 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
index f03d3f5de9..c67de7dc05 100644
--- a/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
+++ b/yxt-as-ui/src/views/operation/repairbill/repairbillAdd.vue
@@ -434,11 +434,11 @@
     <customer v-show="viewState == 2" ref="divCus" @backData="backData" @doback="resetState"/>
     <!-- 结算 -->
     <el-dialog :visible.sync="settleVisible" width="70%">
-      <el-form :model="formobj" class="formaddcopy02">
+      <el-form ref="formobj" :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><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.payerName" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>付款人姓名</div>
+            <el-form-item prop="settleVo.payerName"><el-input class="addinputInfo addinputw" v-model="formobj.settleVo.payerName" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="8">
             <div class="span-sty">付款人编号</div>
@@ -455,16 +455,16 @@
             <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.settleVo.depositdeductAmount = getNumber(formobj.settleVo.depositdeductAmount, 2)" v-model="formobj.settleVo.depositdeductAmount" clearable placeholder="" /></el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">结算方式</div>
-            <el-form-item>
+            <div class="span-sty"><span class="icon">*</span>结算方式</div>
+            <el-form-item prop="settleVo.settleValue">
               <el-select class="addinputInfo" v-model="formobj.settleVo.settleValue" placeholder="请选择" @change="settleChange" clearable filterable>
                 <el-option v-for="item in settle_list" :key="item.dictKey" :label="item.dictValue" :value="item.dictValue"></el-option>
               </el-select>
             </el-form-item>
           </el-col>
           <el-col :span="8">
-            <div class="span-sty">结算金额</div>
-            <el-form-item><el-input class="addinputInfo addinputw" @keyup.native="formobj.settleVo.settleAmount = getNumber(formobj.settleVo.settleAmount, 2)" v-model="formobj.settleVo.settleAmount" clearable placeholder="" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>结算金额</div>
+            <el-form-item prop="settleVo.settleAmount"><el-input class="addinputInfo addinputw" @keyup.native="formobj.settleVo.settleAmount = getNumber(formobj.settleVo.settleAmount, 2)" v-model="formobj.settleVo.settleAmount" clearable placeholder="" /></el-form-item>
           </el-col>
         </el-row>
         <el-row>
@@ -487,8 +487,8 @@
         </el-row>
         <el-row>
           <el-col :span="24">
-            <div class="span-sty">结算时间</div>
-            <el-form-item><el-date-picker class="addinputInfo addinputw" v-model="formobj.settleVo.settleTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
+            <div class="span-sty"><span class="icon">*</span>结算时间</div>
+            <el-form-item prop="settleVo.settleTime"><el-date-picker class="addinputInfo addinputw" v-model="formobj.settleVo.settleTime" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -596,6 +596,7 @@ export default {
         mileage: '',
         oil: '',
         currentMileage: '',
+        receivableAmount: '',
         invoiceVo: {
           isInvoicing: '',
           invoiceType: '',
@@ -650,7 +651,12 @@ export default {
         },
         showReSettleBtn: true
       },
-      rules: {}
+      rules: {
+        'settleVo.payerName': [{ required: true, message: '付款人姓名不能为空', trigger: 'blur' }],
+        'settleVo.settleValue': [{ required: true, message: '结算方式不能为空', trigger: 'change' }],
+        'settleVo.settleAmount': [{ required: true, message: '结算金额不能为空', trigger: 'blur' }],
+        'settleVo.settleTime': [{ required: true, message: '结算时间不能为空', trigger: 'blur' }],
+      }
     }
   },
   computed: {
@@ -1054,6 +1060,7 @@ export default {
     submit() {
       this.formobj.operator = window.sessionStorage.getItem('name')
       this.formobj.operatorSid = window.sessionStorage.getItem('userSid')
+      this.formobj.receivableAmount = this.ysjeTotal
       this.$refs['form_obj'].validate((valid) => {
         if (valid) {
           this.submitdisabled = true
@@ -1165,6 +1172,7 @@ export default {
         vehModel: '',
         mileage: '',
         oil: '',
+        receivableAmount: '',
         currentMileage: '',
         invoiceVo: {
           isInvoicing: '',
@@ -1235,6 +1243,9 @@ export default {
 .addinputInfo {
   margin-left: 120px !important;
 }
+/deep/ .el-form-item__error {
+  margin-left: 120px !important;
+}
 .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
   margin-left: 120px !important;
   width: calc(100% - 115px);

From 8c1a1ac705cf4adf8c1f9eb870f31b575fbd27a9 Mon Sep 17 00:00:00 2001
From: yunuo970428 <405378304@qq.com>
Date: Wed, 22 May 2024 15:35:14 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E5=AE=8C=E5=96=84=E5=BE=85=E7=B4=A2?=
 =?UTF-8?q?=E8=B5=94=E7=BB=B4=E4=BF=AE=E5=B7=A5=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../operation/pendingclaim/pendingclaim.vue   | 60 +++++++++++--------
 1 file changed, 35 insertions(+), 25 deletions(-)

diff --git a/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue b/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue
index 01674953b7..30d00c197a 100644
--- a/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue
+++ b/yxt-as-ui/src/views/operation/pendingclaim/pendingclaim.vue
@@ -8,7 +8,7 @@
         <div class="searchcon">
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
-            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+            <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="110px" class="tab-header">
               <el-form-item label="分公司">
                 <el-input v-model="listQuery.params.useOrgName" placeholder="" clearable/>
               </el-form-item>
@@ -21,7 +21,7 @@
               <el-form-item label="单据编号">
                 <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
               </el-form-item>
-              <el-form-item label="申请日期">
+              <el-form-item label="制单日期">
                 <el-date-picker v-model="listQuery.params.createTimeStart" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
                 <span style="padding: 0 8px">至</span>
                 <el-date-picker v-model="listQuery.params.createTimeEnd" value-format="yyyy-MM-dd" format="yyyy-MM-dd" type="date" placeholder="选择日期"></el-date-picker>
@@ -91,25 +91,35 @@
           <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;" @selection-change="handleSelectionChange">
             <el-table-column type="selection" align="center" width="50" />
             <el-table-column label="序号" type="index" width="80" :index="indexMethod" align="center" />
-            <el-table-column prop="num" label="索赔单" align="center" />
-            <el-table-column prop="billNo" label="单据编号" align="center" />
-            <el-table-column prop="nodeName" label="环节" align="center" />
-            <el-table-column prop="useOrgName" label="分公司" align="center" />
-            <el-table-column prop="deptName" label="制单部门" align="center" />
-            <el-table-column prop="createByName" label="制单人" align="center" />
-            <el-table-column prop="billType" label="工单类型" align="center" />
-            <el-table-column prop="subject" label="科目" align="center" />
-            <el-table-column prop="entryTime" label="进厂日期" align="center" />
-            <el-table-column prop="estimatedFinishTime" label="预计完成日期" align="center" />
-            <el-table-column prop="customerName" label="客户名称" align="center" />
-            <el-table-column prop="mobile" label="联系电话" align="center" />
-            <el-table-column prop="customerOrg" label="客户单位" align="center" />
-            <el-table-column prop="vehMark" label="车牌号" align="center" />
-            <el-table-column prop="vinNo" label="车架号" align="center" />
-            <el-table-column prop="vehModel" label="车型" align="center" />
-            <el-table-column prop="waitorName" label="服务顾问" align="center" />
-            <el-table-column prop="groupName" label="班组" align="center" />
-            <el-table-column prop="mainRepairers" label="主修人" align="center" />
+            <el-table-column label="索赔单" align="center">
+              <template slot-scope="scope">
+                <el-popover trigger="hover" placement="top">
+                  <span>{{ scope.row.spdBillNo }}</span>
+                  <div slot="reference" class="name-wrapper">
+                    <span>{{ scope.row.num }}</span>
+                  </div>
+                </el-popover>
+              </template>
+            </el-table-column>
+            <el-table-column prop="billNo" label="单据编号" align="center" width="170" />
+            <el-table-column prop="nodeName" label="环节" align="center" width="100" />
+            <el-table-column prop="useOrgName" label="分公司" align="center" width="100" />
+            <el-table-column prop="deptName" label="制单部门" align="center" width="100" />
+            <el-table-column prop="createByName" label="制单人" align="center" width="100" />
+            <el-table-column prop="createTime" label="制单日期" align="center" width="120" />
+            <el-table-column prop="billType" label="工单类型" align="center" width="100" />
+            <el-table-column prop="subject" label="科目" align="center" width="100" />
+            <el-table-column prop="entryTime" label="进厂日期" align="center" width="120" />
+            <el-table-column prop="estimatedFinishTime" label="预计完成日期" align="center" width="130" />
+            <el-table-column prop="customerName" label="客户名称" align="center" width="100" />
+            <el-table-column prop="mobile" label="联系电话" align="center" width="110" />
+            <el-table-column prop="customerOrg" label="客户单位" align="center" width="120" />
+            <el-table-column prop="vehMark" label="车牌号" align="center" width="100" />
+            <el-table-column prop="vinNo" label="车架号" align="center" width="100" />
+            <el-table-column prop="vehModel" label="车型" align="center" width="150" />
+            <el-table-column prop="waitorName" label="服务顾问" align="center" width="100" />
+            <el-table-column prop="groupName" label="班组" align="center" width="100" />
+            <el-table-column prop="mainRepairers" label="主修人" align="center" width="100" />
           </el-table>
         </div>
         <!--End 主页面主要部分-->
@@ -121,7 +131,7 @@
         <!--End查询列表部分-->
       </div>
     </div>
-    <el-dialog :visible.sync="dialogVisible" width="70%">
+    <el-dialog :visible.sync="dialogVisible" width="40%">
       <el-form ref="form_obj" :model="formobj" class="formaddcopy02">
         <el-row style="border-top: 1px solid #E0E3EB">
           <el-col :span="24">
@@ -150,7 +160,7 @@
         <el-row>
           <el-col :span="24">
             <div class="span-sty">厂家索赔单号</div>
-            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billNo" clearable placeholder="" /></el-form-item>
+            <el-form-item><el-input class="addinputInfo addinputw" v-model="formobj.billNo" clearable placeholder="请每次录入一个索赔单号" /></el-form-item>
           </el-col>
         </el-row>
       </el-form>
@@ -403,9 +413,9 @@ export default {
 </script>
 <style scoped>
 .span-sty {
-  width: 80px !important;
+  width: 100px !important;
 }
 .addinputInfo {
-  margin-left: 75px !important;
+  margin-left: 90px !important;
 }
 </style>