diff --git a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
index e3c16b1d21..3746916b26 100644
--- a/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
+++ b/anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/fincollectionconfirmation/FinCollectionConfirmationService.java
@@ -3919,7 +3919,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                     loanRepaymentHistoryFeign.saveHistoryByEntity(historyEntity);
                 }
                 //认资方退还垫款或者结清时资方逾期利息
-                if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("结清时资方逾期利息")) {
+                if (v.getReceivablesName().equals("资方退还垫款") || v.getReceivablesName().equals("结清时资方逾期利息") || v.getReceivablesName().equals("贷款保证金扣罚")) {
                     CollectionVoucher.CollectionVoucherDetail d = getReturnBackMoneyVoucher(v, collectionDate);
                     voucherDetails.add(d);
                 }
@@ -4440,7 +4440,7 @@ public class FinCollectionConfirmationService extends MybatisBaseService<FinColl
                             String linkNo = "";
                             BusSalesOrderBorrowerDetailsVo borrowerDetailsVo = busSalesOrderBorrowerFeign.fetchDetailsBySid(busSalesOrderVehicle.getBorrowerSid()).getData();
                             if (!aBoolean) {
-                                //  List<BdCustomer> bdCustomers = new ArrayList<>();
+                                //  List<BdCustomer> bdCustomers = new ArrayList<>()666;
                                 BdCustomer bdCustomer = new BdCustomer();
                                 bdCustomer.setFNumber(busSalesOrderVehicle.getTemporaryNo());
                                 bdCustomer.setFShortName(salesOrder.getContractNo());
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 c0a9399e93..99c9f0b705 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
@@ -520,7 +520,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy.MM.dd");
         Voucher newVoucher = new Voucher();
         String payType = "";
-        BigDecimal amountAll = new BigDecimal(0);
         BigDecimal decimal = BigDecimal.ZERO;
         String payerName = voucher.getPayerName();
         int check = 0;
@@ -553,7 +552,6 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                     }
                     String payCostTitleValue = voucherDetail.getPayCostTitleValue();
                     date = voucherDetail.getDataTime();
-                    amountAll = amountAll.add(voucherDetail.getAmount());
                     if (payCostTitleValue.equals("月还") || payCostTitleValue.equals("资方逾期利息")) {
                         Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
                         if (voucherDetail.getSceneCode().equals(SceneCodeEnum.INDIRECT_VOUCHER1.getCode())) {
@@ -654,6 +652,14 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                             resultDetails.add(dto3);
                             decimal = decimal.add(voucherDetail.getBalance());
                         }
+                    } else if (payCostTitleValue.equals("贷款保证金扣罚")) {
+                        Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+                        dto2.setSummary("收贷款保证金扣罚金额");
+                        dto2.setSubjectNo("6002.01.21");
+                        dto2.setDimensionDept(voucherDetail.getDeptCode());
+                        dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+                        resultDetails.add(dto2);
+                        decimal = decimal.add(voucherDetail.getAmount());
                     } else if (payCostTitleValue.equals("资方退还垫款")) {
                         check = 1;
                         Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
@@ -682,7 +688,7 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
                 }
                 dto1.setSubjectNo(payType);
                 dto1.setSummary("收款-" + payerName + "（" + sdf.format(date) + "）");
-                dto1.setDebit(String.valueOf(amountAll));
+                dto1.setDebit(String.valueOf(decimal));
                 resultDetails.add(0, dto1);
             }
             newVoucher.setResultDetails(resultDetails);
diff --git a/anrui-riskcenter-ui/src/api/Common/dictcommons.js b/anrui-riskcenter-ui/src/api/Common/dictcommons.js
index 602fa59952..0b372f8758 100644
--- a/anrui-riskcenter-ui/src/api/Common/dictcommons.js
+++ b/anrui-riskcenter-ui/src/api/Common/dictcommons.js
@@ -8,6 +8,15 @@ export function typeValues(data) {
   })
 }
 
+// 获取所有分公司
+export function selectOrgSidList(data) {
+  return request({
+    url: '/portal/v1/sysorganization/selectOrgSidList',
+    method: 'get',
+    params: data
+  })
+}
+
 // 根据当前登录人orgSidPath(全路径sid)查询分公司
 export function getOrgSidByPath(data) {
   return request({
@@ -76,7 +85,9 @@ export function selectHaveMessage(data) {
     url: '/portal/v1/sysuser/selectHaveMessage ',
     method: 'post',
     data: data,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 
@@ -86,7 +97,9 @@ export function getButtonPermissions(data) {
     url: '/portal/v1/sysfunction/getButtonPermissions',
     method: 'post',
     data: data,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 
@@ -224,7 +237,9 @@ export function getLegalStaffS(data) {
     url: '/riskcenter/v1/LoanCaseProgress/getLegalStaffS',
     method: 'post',
     data: data,
-    headers: { 'Content-Type': 'application/json' }
+    headers: {
+      'Content-Type': 'application/json'
+    }
   })
 }
 
@@ -236,4 +251,3 @@ export function fetchListByBankSid(data) {
     params: data
   })
 }
-
diff --git a/anrui-riskcenter-ui/src/api/auditSupervision/auditSupervision.js b/anrui-riskcenter-ui/src/api/auditSupervision/auditSupervision.js
new file mode 100644
index 0000000000..3165d0eaa5
--- /dev/null
+++ b/anrui-riskcenter-ui/src/api/auditSupervision/auditSupervision.js
@@ -0,0 +1,62 @@
+import request from '@/utils/request'
+//  审计监管
+export default {
+  // 查询分页列表
+  listPage: function(params) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/riskcenter/v1/auditSupervision/listPage',
+      method: 'post',
+      data: params,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  saveOrUpdate: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/riskcenter/v1/auditSupervision/saveOrUpdate',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  saveResult: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/riskcenter/v1/auditSupervision/saveResult',
+      method: 'post',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+  init: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/riskcenter/v1/auditSupervision/gteInitBySid/' + data,
+      method: 'get',
+
+    })
+  },
+
+  deleteBySids: function(data) {
+    return request({
+      // baseURL: "http://127.0.0.1:4523/m1/613533-0-default",
+      url: '/riskcenter/v1/auditSupervision/delBySids',
+      method: 'DELETE',
+      data: data,
+      headers: {
+        'Content-Type': 'application/json'
+      }
+    })
+  },
+
+}
diff --git a/anrui-riskcenter-ui/src/router/index.js b/anrui-riskcenter-ui/src/router/index.js
index 40d6e72d61..d0755d60f2 100644
--- a/anrui-riskcenter-ui/src/router/index.js
+++ b/anrui-riskcenter-ui/src/router/index.js
@@ -7,8 +7,7 @@ Vue.use(Router)
 import Layout from '@/layout'
 /* 所有角色可以访问/没有权限要求的基页 */
 
-export const constantRoutes = [
-  {
+export const constantRoutes = [{
     path: '/redirect',
     component: Layout,
     hidden: true,
@@ -17,26 +16,26 @@ export const constantRoutes = [
       component: () => import('@/views/redirect/index.vue')
     }]
   },
-	{
-		path: '/',
-		redirect: 'index'
-	},
-	{
-		path: '/index',
-		component: Layout,
-		redirect: '/index',
-		children: [{
-			path: '/index',
-			component: () =>
-				import('@/views/index.vue'),
-			name: 'index',
-			meta: {
-				title: '主页',
-				noCache: true,
-				affix: true
-			}
-		}]
-	},
+  {
+    path: '/',
+    redirect: 'index'
+  },
+  {
+    path: '/index',
+    component: Layout,
+    redirect: '/index',
+    children: [{
+      path: '/index',
+      component: () =>
+        import('@/views/index.vue'),
+      name: 'index',
+      meta: {
+        title: '主页',
+        noCache: true,
+        affix: true
+      }
+    }]
+  },
   {
     path: '/404',
     component: () =>
@@ -50,14 +49,15 @@ export const constantRoutes = [
     meta: {
       title: '资方管理'
     },
-    children: [
-      {
-        path: '/capital/capital',
-        component: () => import('@/views/capital/capital.vue'),
-        name: 'Capital',
-        meta: { title: '资方管理', noCache: true }
+    children: [{
+      path: '/capital/capital',
+      component: () => import('@/views/capital/capital.vue'),
+      name: 'Capital',
+      meta: {
+        title: '资方管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/financialpolicymanagement',
@@ -66,14 +66,15 @@ export const constantRoutes = [
     meta: {
       title: '金融产品政策管理'
     },
-    children: [
-      {
-        path: '/financialpolicymanagement/financialpolicymanagement',
-        component: () => import('@/views/financialpolicymanagement/financialpolicymanagement.vue'),
-        name: 'FinancialPolicyManagement',
-        meta: { title: '金融产品政策管理', noCache: true }
+    children: [{
+      path: '/financialpolicymanagement/financialpolicymanagement',
+      component: () => import('@/views/financialpolicymanagement/financialpolicymanagement.vue'),
+      name: 'FinancialPolicyManagement',
+      meta: {
+        title: '金融产品政策管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/financialpolicyreporting',
@@ -82,14 +83,15 @@ export const constantRoutes = [
     meta: {
       title: '金融产品政策报备'
     },
-    children: [
-      {
-        path: '/financialpolicyreporting/financialpolicyreporting',
-        component: () => import('@/views/financialpolicyreporting/financialpolicyreporting.vue'),
-        name: 'FinancialPolicyrReporting',
-        meta: { title: '金融产品政策报备', noCache: true }
+    children: [{
+      path: '/financialpolicyreporting/financialpolicyreporting',
+      component: () => import('@/views/financialpolicyreporting/financialpolicyreporting.vue'),
+      name: 'FinancialPolicyrReporting',
+      meta: {
+        title: '金融产品政策报备',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/otherfinancialpolicymanagement',
@@ -98,14 +100,15 @@ export const constantRoutes = [
     meta: {
       title: '其它融产品管理'
     },
-    children: [
-      {
-        path: '/otherfinancialpolicymanagement/otherfinancialpolicymanagement',
-        component: () => import('@/views/otherfinancialpolicymanagement/otherfinancialpolicymanagement.vue'),
-        name: 'OtherFinancialPolicyManagement',
-        meta: { title: '其它融产品管理', noCache: true }
+    children: [{
+      path: '/otherfinancialpolicymanagement/otherfinancialpolicymanagement',
+      component: () => import('@/views/otherfinancialpolicymanagement/otherfinancialpolicymanagement.vue'),
+      name: 'OtherFinancialPolicyManagement',
+      meta: {
+        title: '其它融产品管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/otherfinancialproductsreport',
@@ -114,14 +117,15 @@ export const constantRoutes = [
     meta: {
       title: '其它融产品报备'
     },
-    children: [
-      {
-        path: '/otherfinancialproductsreport/otherfinancialproductsreport',
-        component: () => import('@/views/otherfinancialproductsreport/otherfinancialproductsreport.vue'),
-        name: 'OtherFinancialProductsReport',
-        meta: { title: '其它融产品报备', noCache: true }
+    children: [{
+      path: '/otherfinancialproductsreport/otherfinancialproductsreport',
+      component: () => import('@/views/otherfinancialproductsreport/otherfinancialproductsreport.vue'),
+      name: 'OtherFinancialProductsReport',
+      meta: {
+        title: '其它融产品报备',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/customizedfinancialsolutions',
@@ -130,14 +134,15 @@ export const constantRoutes = [
     meta: {
       title: '公司定制金融方案'
     },
-    children: [
-      {
-        path: '/customizedfinancialsolutions/customizedfinancialsolutions',
-        component: () => import('@/views/customizedfinancialsolutions/customizedfinancialsolutions.vue'),
-        name: 'CustomizedFinancialSolutions',
-        meta: { title: '公司定制金融方案', noCache: true }
+    children: [{
+      path: '/customizedfinancialsolutions/customizedfinancialsolutions',
+      component: () => import('@/views/customizedfinancialsolutions/customizedfinancialsolutions.vue'),
+      name: 'CustomizedFinancialSolutions',
+      meta: {
+        title: '公司定制金融方案',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/creditauditmanagement',
@@ -146,14 +151,15 @@ export const constantRoutes = [
     meta: {
       title: '贷前信用审核管理'
     },
-    children: [
-      {
-        path: '/creditauditmanagement/creditauditmanagement',
-        component: () => import('@/views/creditauditmanagement/creditauditmanagement.vue'),
-        name: 'CreditAuditManagement',
-        meta: { title: '贷前信用审核管理', noCache: true }
+    children: [{
+      path: '/creditauditmanagement/creditauditmanagement',
+      component: () => import('@/views/creditauditmanagement/creditauditmanagement.vue'),
+      name: 'CreditAuditManagement',
+      meta: {
+        title: '贷前信用审核管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/financialclerkbycreditvetting',
@@ -162,14 +168,15 @@ export const constantRoutes = [
     meta: {
       title: '金融内勤信用审核管理'
     },
-    children: [
-      {
-        path: '/financialclerkbycreditvetting/financialclerkbycreditvetting',
-        component: () => import('@/views/financialclerkbycreditvetting/financialclerkbycreditvetting.vue'),
-        name: 'FinancialClerkByCreditVetting',
-        meta: { title: '金融内勤信用审核管理', noCache: true }
+    children: [{
+      path: '/financialclerkbycreditvetting/financialclerkbycreditvetting',
+      component: () => import('@/views/financialclerkbycreditvetting/financialclerkbycreditvetting.vue'),
+      name: 'FinancialClerkByCreditVetting',
+      meta: {
+        title: '金融内勤信用审核管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/creditauditappeal',
@@ -178,14 +185,15 @@ export const constantRoutes = [
     meta: {
       title: '贷前信用审核申诉'
     },
-    children: [
-      {
-        path: '/creditauditappeal/creditauditappeal',
-        component: () => import('@/views/creditauditappeal/creditauditappeal.vue'),
-        name: 'CreditAuditAppeal',
-        meta: { title: '贷前信用审核申诉', noCache: true }
+    children: [{
+      path: '/creditauditappeal/creditauditappeal',
+      component: () => import('@/views/creditauditappeal/creditauditappeal.vue'),
+      name: 'CreditAuditAppeal',
+      meta: {
+        title: '贷前信用审核申诉',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/homevisitpreparation',
@@ -194,14 +202,15 @@ export const constantRoutes = [
     meta: {
       title: '家访准备管理'
     },
-    children: [
-      {
-        path: '/homevisitpreparation/homevisittobeprepared',
-        component: () => import('@/views/homevisitpreparation/homevisittobeprepared.vue'),
-        name: 'HomeVisitToBePrepared',
-        meta: { title: '家访准备管理', noCache: true }
+    children: [{
+      path: '/homevisitpreparation/homevisittobeprepared',
+      component: () => import('@/views/homevisitpreparation/homevisittobeprepared.vue'),
+      name: 'HomeVisitToBePrepared',
+      meta: {
+        title: '家访准备管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/riskcontrolparameter',
@@ -210,14 +219,15 @@ export const constantRoutes = [
     meta: {
       title: '风控参数设置'
     },
-    children: [
-      {
-        path: '/riskcontrolparameter/riskcontrolparameter',
-        component: () => import('@/views/riskcontrolparameter/riskcontrolparameter.vue'),
-        name: 'RiskControlParameter',
-        meta: { title: '风控参数设置', noCache: true }
+    children: [{
+      path: '/riskcontrolparameter/riskcontrolparameter',
+      component: () => import('@/views/riskcontrolparameter/riskcontrolparameter.vue'),
+      name: 'RiskControlParameter',
+      meta: {
+        title: '风控参数设置',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/homevisitdatareview',
@@ -226,14 +236,15 @@ export const constantRoutes = [
     meta: {
       title: '家访资料审核'
     },
-    children: [
-      {
-        path: '/homevisitdatareview/homevisitdatatobereviewed',
-        component: () => import('@/views/homevisitdatareview/homevisitdatatobereviewed.vue'),
-        name: 'HomeVisitDataReview',
-        meta: { title: '家访资料审核', noCache: true }
+    children: [{
+      path: '/homevisitdatareview/homevisitdatatobereviewed',
+      component: () => import('@/views/homevisitdatareview/homevisitdatatobereviewed.vue'),
+      name: 'HomeVisitDataReview',
+      meta: {
+        title: '家访资料审核',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/managementcreditaudit',
@@ -242,14 +253,15 @@ export const constantRoutes = [
     meta: {
       title: '资方信审终审结果'
     },
-    children: [
-      {
-        path: '/managementcreditaudit/managementcreditaudit',
-        component: () => import('@/views/managementcreditaudit/managementcreditaudit.vue'),
-        name: 'ManagementCreditAudit',
-        meta: { title: '资方信审终审结果', noCache: true }
+    children: [{
+      path: '/managementcreditaudit/managementcreditaudit',
+      component: () => import('@/views/managementcreditaudit/managementcreditaudit.vue'),
+      name: 'ManagementCreditAudit',
+      meta: {
+        title: '资方信审终审结果',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/warrantinformation',
@@ -258,14 +270,15 @@ export const constantRoutes = [
     meta: {
       title: '权证资料管理'
     },
-    children: [
-      {
-        path: '/warrantinformation/warrantinformation',
-        component: () => import('@/views/warrantinformation/warrantinformation.vue'),
-        name: 'WarrantInformation',
-        meta: { title: '权证资料管理', noCache: true }
+    children: [{
+      path: '/warrantinformation/warrantinformation',
+      component: () => import('@/views/warrantinformation/warrantinformation.vue'),
+      name: 'WarrantInformation',
+      meta: {
+        title: '权证资料管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/repaymentschedule',
@@ -274,14 +287,15 @@ export const constantRoutes = [
     meta: {
       title: '还款计划表'
     },
-    children: [
-      {
-        path: '/repaymentschedule/repaymentschedule',
-        component: () => import('@/views/repaymentschedule/repaymentschedule.vue'),
-        name: 'RepaymentSchedule',
-        meta: { title: '还款计划表', noCache: true }
+    children: [{
+      path: '/repaymentschedule/repaymentschedule',
+      component: () => import('@/views/repaymentschedule/repaymentschedule.vue'),
+      name: 'RepaymentSchedule',
+      meta: {
+        title: '还款计划表',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/unsecuredbusiness',
@@ -290,14 +304,15 @@ export const constantRoutes = [
     meta: {
       title: '非担保信审'
     },
-    children: [
-      {
-        path: '/unsecuredbusiness/unsecuredbusiness',
-        component: () => import('@/views/unsecuredbusiness/unsecuredbusiness.vue'),
-        name: 'UnsecuredBusiness',
-        meta: { title: '非担保信审', noCache: true }
+    children: [{
+      path: '/unsecuredbusiness/unsecuredbusiness',
+      component: () => import('@/views/unsecuredbusiness/unsecuredbusiness.vue'),
+      name: 'UnsecuredBusiness',
+      meta: {
+        title: '非担保信审',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/loandatareview',
@@ -306,14 +321,15 @@ export const constantRoutes = [
     meta: {
       title: '放款资料审核'
     },
-    children: [
-      {
-        path: '/loandatareview/loandatareview',
-        component: () => import('@/views/loandatareview/loandatareview.vue'),
-        name: 'LoanDataReview',
-        meta: { title: '放款资料审核', noCache: true }
+    children: [{
+      path: '/loandatareview/loandatareview',
+      component: () => import('@/views/loandatareview/loandatareview.vue'),
+      name: 'LoanDataReview',
+      meta: {
+        title: '放款资料审核',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/delinquentcustomerfiling',
@@ -322,14 +338,15 @@ export const constantRoutes = [
     meta: {
       title: '欠款客户备案'
     },
-    children: [
-      {
-        path: '/delinquentcustomerfiling/delinquentcustomerfiling',
-        component: () => import('@/views/delinquentcustomerfiling/delinquentcustomerfiling.vue'),
-        name: 'DelinquentCustomerFiling',
-        meta: { title: '欠款客户备案', noCache: true }
+    children: [{
+      path: '/delinquentcustomerfiling/delinquentcustomerfiling',
+      component: () => import('@/views/delinquentcustomerfiling/delinquentcustomerfiling.vue'),
+      name: 'DelinquentCustomerFiling',
+      meta: {
+        title: '欠款客户备案',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/loanbalancerecognition',
@@ -338,14 +355,15 @@ export const constantRoutes = [
     meta: {
       title: '放款差额确认'
     },
-    children: [
-      {
-        path: '/loanbalancerecognition/loanbalancerecognition',
-        component: () => import('@/views/loanbalancerecognition/loanbalancerecognition.vue'),
-        name: 'LoanBalanceRecognition',
-        meta: { title: '放款差额确认', noCache: true }
+    children: [{
+      path: '/loanbalancerecognition/loanbalancerecognition',
+      component: () => import('@/views/loanbalancerecognition/loanbalancerecognition.vue'),
+      name: 'LoanBalanceRecognition',
+      meta: {
+        title: '放款差额确认',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/monthlypayment',
@@ -354,14 +372,15 @@ export const constantRoutes = [
     meta: {
       title: '资方划扣还款'
     },
-    children: [
-      {
-        path: '/monthlypayment/monthlypayment',
-        component: () => import('@/views/monthlypayment/monthlypayment.vue'),
-        name: 'MonthlyPayment',
-        meta: { title: '资方划扣还款', noCache: true }
+    children: [{
+      path: '/monthlypayment/monthlypayment',
+      component: () => import('@/views/monthlypayment/monthlypayment.vue'),
+      name: 'MonthlyPayment',
+      meta: {
+        title: '资方划扣还款',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/deduct',
@@ -370,14 +389,15 @@ export const constantRoutes = [
     meta: {
       title: '划扣申请管理'
     },
-    children: [
-      {
-        path: '/deduct/deduct',
-        component: () => import('@/views/deduct/deduct.vue'),
-        name: 'Deduct',
-        meta: { title: '划扣申请管理', noCache: true }
+    children: [{
+      path: '/deduct/deduct',
+      component: () => import('@/views/deduct/deduct.vue'),
+      name: 'Deduct',
+      meta: {
+        title: '划扣申请管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/advancerequest',
@@ -386,18 +406,23 @@ export const constantRoutes = [
     meta: {
       title: '垫款申请管理'
     },
-    children: [
-      {
+    children: [{
         path: '/advancerequest/advancerequest',
         component: () => import('@/views/advancerequest/advancerequest.vue'),
         name: 'AdvanceRequest',
-        meta: { title: '垫款申请管理', noCache: true }
+        meta: {
+          title: '垫款申请管理',
+          noCache: true
+        }
       },
       {
         path: '/advancerequest/advancedetails',
         component: () => import('@/views/advancerequest/advancedetails.vue'),
         name: 'AdvanceDetails',
-        meta: { title: '垫款明细查询', noCache: true }
+        meta: {
+          title: '垫款明细查询',
+          noCache: true
+        }
       }
     ]
   },
@@ -408,14 +433,15 @@ export const constantRoutes = [
     meta: {
       title: '间还转付记录'
     },
-    children: [
-      {
-        path: '/alsotransfer/pendingtransfer',
-        component: () => import('@/views/alsotransfer/pendingtransfer.vue'),
-        name: 'AlsoTransfer',
-        meta: { title: '间还转付记录', noCache: true }
+    children: [{
+      path: '/alsotransfer/pendingtransfer',
+      component: () => import('@/views/alsotransfer/pendingtransfer.vue'),
+      name: 'AlsoTransfer',
+      meta: {
+        title: '间还转付记录',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/agentbusiness',
@@ -424,14 +450,15 @@ export const constantRoutes = [
     meta: {
       title: '代收代付申请'
     },
-    children: [
-      {
-        path: '/agentbusiness/agentbusiness',
-        component: () => import('@/views/agentbusiness/agentbusiness.vue'),
-        name: 'AgentBusiness',
-        meta: { title: '代收代付申请', noCache: true }
+    children: [{
+      path: '/agentbusiness/agentbusiness',
+      component: () => import('@/views/agentbusiness/agentbusiness.vue'),
+      name: 'AgentBusiness',
+      meta: {
+        title: '代收代付申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/monthlyallowance',
@@ -440,14 +467,15 @@ export const constantRoutes = [
     meta: {
       title: '月还计提申请'
     },
-    children: [
-      {
-        path: '/monthlyallowance/monthlyallowance',
-        component: () => import('@/views/monthlyallowance/monthlyallowance.vue'),
-        name: 'MonthlyAllowance',
-        meta: { title: '月还计提申请', noCache: true }
+    children: [{
+      path: '/monthlyallowance/monthlyallowance',
+      component: () => import('@/views/monthlyallowance/monthlyallowance.vue'),
+      name: 'MonthlyAllowance',
+      meta: {
+        title: '月还计提申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/customerrepayment',
@@ -456,18 +484,23 @@ export const constantRoutes = [
     meta: {
       title: '客户还款'
     },
-    children: [
-      {
+    children: [{
         path: '/customerrepayment/customerrepayment',
         component: () => import('@/views/customerrepayment/customerrepayment.vue'),
         name: 'CustomerRepayment',
-        meta: { title: '客户还款情况统计', noCache: false }
+        meta: {
+          title: '客户还款情况统计',
+          noCache: false
+        }
       },
       {
         path: '/customerrepayment/customerrepaymentdetails',
         component: () => import('@/views/customerrepayment/customerrepaymentdetails.vue'),
         name: 'CustomerRepaymentDetails',
-        meta: { title: '客户还款明细查询', noCache: false }
+        meta: {
+          title: '客户还款明细查询',
+          noCache: false
+        }
       }
     ]
   },
@@ -478,14 +511,15 @@ export const constantRoutes = [
     meta: {
       title: '逾期车辆列表'
     },
-    children: [
-      {
-        path: '/overduevehicle/overduevehicle',
-        component: () => import('@/views/overduevehicle/overduevehicle.vue'),
-        name: 'OverdueVehicle',
-        meta: { title: '逾期车辆列表', noCache: true }
+    children: [{
+      path: '/overduevehicle/overduevehicle',
+      component: () => import('@/views/overduevehicle/overduevehicle.vue'),
+      name: 'OverdueVehicle',
+      meta: {
+        title: '逾期车辆列表',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/overduevehicleByRisk',
@@ -494,14 +528,15 @@ export const constantRoutes = [
     meta: {
       title: '逾期客户列表'
     },
-    children: [
-      {
-        path: '/overduevehicle/overduevehicleByRisk',
-        component: () => import('@/views/overduevehicle/overduevehicleByRisk.vue'),
-        name: 'OverdueVehicleByRisk',
-        meta: { title: '逾期客户列表', noCache: true }
+    children: [{
+      path: '/overduevehicle/overduevehicleByRisk',
+      component: () => import('@/views/overduevehicle/overduevehicleByRisk.vue'),
+      name: 'OverdueVehicleByRisk',
+      meta: {
+        title: '逾期客户列表',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/collectionmeasures',
@@ -510,14 +545,15 @@ export const constantRoutes = [
     meta: {
       title: '催收措施申请'
     },
-    children: [
-      {
-        path: '/collectionmeasures/collectionmeasures',
-        component: () => import('@/views/collectionmeasures/collectionmeasures.vue'),
-        name: 'CollectionMeasures',
-        meta: { title: '催收措施申请', noCache: true }
+    children: [{
+      path: '/collectionmeasures/collectionmeasures',
+      component: () => import('@/views/collectionmeasures/collectionmeasures.vue'),
+      name: 'CollectionMeasures',
+      meta: {
+        title: '催收措施申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/remotedecontrol',
@@ -526,14 +562,15 @@ export const constantRoutes = [
     meta: {
       title: '车辆远程解控申请'
     },
-    children: [
-      {
-        path: '/remotedecontrol/remotedecontrol',
-        component: () => import('@/views/remotedecontrol/remotedecontrol.vue'),
-        name: 'RemotedeControl',
-        meta: { title: '车辆远程解控申请', noCache: true }
+    children: [{
+      path: '/remotedecontrol/remotedecontrol',
+      component: () => import('@/views/remotedecontrol/remotedecontrol.vue'),
+      name: 'RemotedeControl',
+      meta: {
+        title: '车辆远程解控申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/returnreserve',
@@ -542,14 +579,15 @@ export const constantRoutes = [
     meta: {
       title: '车辆交回事前报备'
     },
-    children: [
-      {
-        path: '/returnreserve/returnreserve',
-        component: () => import('@/views/returnreserve/returnreserve.vue'),
-        name: 'ReturnReserve',
-        meta: { title: '车辆交回事前报备', noCache: true }
+    children: [{
+      path: '/returnreserve/returnreserve',
+      component: () => import('@/views/returnreserve/returnreserve.vue'),
+      name: 'ReturnReserve',
+      meta: {
+        title: '车辆交回事前报备',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/overduereconciliationfinancing',
@@ -558,14 +596,15 @@ export const constantRoutes = [
     meta: {
       title: '财务逾期对账'
     },
-    children: [
-      {
-        path: '/overduereconciliationfinancing/overduereconciliationfinancing',
-        component: () => import('@/views/overduereconciliationfinancing/overduereconciliationfinancing.vue'),
-        name: 'OverdueReconciliationFinancing',
-        meta: { title: '财务逾期对账', noCache: true }
+    children: [{
+      path: '/overduereconciliationfinancing/overduereconciliationfinancing',
+      component: () => import('@/views/overduereconciliationfinancing/overduereconciliationfinancing.vue'),
+      name: 'OverdueReconciliationFinancing',
+      meta: {
+        title: '财务逾期对账',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/overduereconciliationcapital',
@@ -574,14 +613,15 @@ export const constantRoutes = [
     meta: {
       title: '资方逾期对账'
     },
-    children: [
-      {
-        path: '/overduereconciliationcapital/overduereconciliationcapital',
-        component: () => import('@/views/overduereconciliationcapital/overduereconciliationcapital.vue'),
-        name: 'OverdueReconciliationCapital',
-        meta: { title: '资方逾期对账', noCache: true }
+    children: [{
+      path: '/overduereconciliationcapital/overduereconciliationcapital',
+      component: () => import('@/views/overduereconciliationcapital/overduereconciliationcapital.vue'),
+      name: 'OverdueReconciliationCapital',
+      meta: {
+        title: '资方逾期对账',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/returntostorage',
@@ -590,14 +630,15 @@ export const constantRoutes = [
     meta: {
       title: '交回车辆入库申请'
     },
-    children: [
-      {
-        path: '/returntostorage/returntostorage',
-        component: () => import('@/views/returntostorage/returntostorage.vue'),
-        name: 'ReturnToStorage',
-        meta: { title: '交回车辆入库申请', noCache: true }
+    children: [{
+      path: '/returntostorage/returntostorage',
+      component: () => import('@/views/returntostorage/returntostorage.vue'),
+      name: 'ReturnToStorage',
+      meta: {
+        title: '交回车辆入库申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/returntheaccount',
@@ -606,14 +647,15 @@ export const constantRoutes = [
     meta: {
       title: '交回车辆台账'
     },
-    children: [
-      {
-        path: '/returntheaccount/returntheaccount',
-        component: () => import('@/views/returntheaccount/returntheaccount.vue'),
-        name: 'ReturnTheAccount',
-        meta: { title: '交回车辆台账', noCache: true }
+    children: [{
+      path: '/returntheaccount/returntheaccount',
+      component: () => import('@/views/returntheaccount/returntheaccount.vue'),
+      name: 'ReturnTheAccount',
+      meta: {
+        title: '交回车辆台账',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/surrenderforredemption',
@@ -622,14 +664,15 @@ export const constantRoutes = [
     meta: {
       title: '交回车辆赎回申请'
     },
-    children: [
-      {
-        path: '/surrenderforredemption/surrenderforredemption',
-        component: () => import('@/views/surrenderforredemption/surrenderforredemption.vue'),
-        name: 'SurrenderForRedemption',
-        meta: { title: '交回车辆赎回申请', noCache: true }
+    children: [{
+      path: '/surrenderforredemption/surrenderforredemption',
+      component: () => import('@/views/surrenderforredemption/surrenderforredemption.vue'),
+      name: 'SurrenderForRedemption',
+      meta: {
+        title: '交回车辆赎回申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/secondarysales',
@@ -638,14 +681,15 @@ export const constantRoutes = [
     meta: {
       title: '交回车辆二次销售'
     },
-    children: [
-      {
-        path: '/secondarysales/secondarysales',
-        component: () => import('@/views/secondarysales/secondarysales.vue'),
-        name: 'SecondarySales',
-        meta: { title: '交回车辆二次销售', noCache: true }
+    children: [{
+      path: '/secondarysales/secondarysales',
+      component: () => import('@/views/secondarysales/secondarysales.vue'),
+      name: 'SecondarySales',
+      meta: {
+        title: '交回车辆二次销售',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/secondarysublet',
@@ -654,14 +698,15 @@ export const constantRoutes = [
     meta: {
       title: '交回车辆二次转租'
     },
-    children: [
-      {
-        path: '/secondarysublet/secondarysublet',
-        component: () => import('@/views/secondarysublet/secondarysublet.vue'),
-        name: 'SecondarySublet',
-        meta: { title: '交回车辆二次转租', noCache: true }
+    children: [{
+      path: '/secondarysublet/secondarysublet',
+      component: () => import('@/views/secondarysublet/secondarysublet.vue'),
+      name: 'SecondarySublet',
+      meta: {
+        title: '交回车辆二次转租',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/returntothewarehouse',
@@ -670,14 +715,15 @@ export const constantRoutes = [
     meta: {
       title: '交回车辆出库申请'
     },
-    children: [
-      {
-        path: '/returntothewarehouse/returntothewarehouse',
-        component: () => import('@/views/returntothewarehouse/returntothewarehouse.vue'),
-        name: 'ReturnToTheWarehouse',
-        meta: { title: '交回车辆出库申请', noCache: true }
+    children: [{
+      path: '/returntothewarehouse/returntothewarehouse',
+      component: () => import('@/views/returntothewarehouse/returntothewarehouse.vue'),
+      name: 'ReturnToTheWarehouse',
+      meta: {
+        title: '交回车辆出库申请',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/settle',
@@ -686,14 +732,15 @@ export const constantRoutes = [
     meta: {
       title: '车辆结清管理'
     },
-    children: [
-      {
-        path: '/settle/settle',
-        component: () => import('@/views/settle/settle.vue'),
-        name: 'Settle',
-        meta: { title: '车辆结清管理', noCache: true }
+    children: [{
+      path: '/settle/settle',
+      component: () => import('@/views/settle/settle.vue'),
+      name: 'Settle',
+      meta: {
+        title: '车辆结清管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/settlethevehicleaccount',
@@ -702,14 +749,15 @@ export const constantRoutes = [
     meta: {
       title: '结清车辆台账'
     },
-    children: [
-      {
-        path: '/settlethevehicleaccount/settlethevehicleaccount',
-        component: () => import('@/views/settlethevehicleaccount/settlethevehicleaccount.vue'),
-        name: 'SettleTheVehicleAccount',
-        meta: { title: '结清车辆台账', noCache: true }
+    children: [{
+      path: '/settlethevehicleaccount/settlethevehicleaccount',
+      component: () => import('@/views/settlethevehicleaccount/settlethevehicleaccount.vue'),
+      name: 'SettleTheVehicleAccount',
+      meta: {
+        title: '结清车辆台账',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/offset',
@@ -718,14 +766,15 @@ export const constantRoutes = [
     meta: {
       title: '车辆解抵管理'
     },
-    children: [
-      {
-        path: '/offset/offset',
-        component: () => import('@/views/offset/offset.vue'),
-        name: 'Offset',
-        meta: { title: '车辆解抵管理', noCache: true }
+    children: [{
+      path: '/offset/offset',
+      component: () => import('@/views/offset/offset.vue'),
+      name: 'Offset',
+      meta: {
+        title: '车辆解抵管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/buyback',
@@ -734,14 +783,15 @@ export const constantRoutes = [
     meta: {
       title: '车辆回购管理'
     },
-    children: [
-      {
-        path: '/buyback/buyback',
-        component: () => import('@/views/buyback/buyback.vue'),
-        name: 'BuyBack',
-        meta: { title: '车辆回购管理', noCache: true }
+    children: [{
+      path: '/buyback/buyback',
+      component: () => import('@/views/buyback/buyback.vue'),
+      name: 'BuyBack',
+      meta: {
+        title: '车辆回购管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/caseaction',
@@ -750,14 +800,15 @@ export const constantRoutes = [
     meta: {
       title: '案件诉讼管理'
     },
-    children: [
-      {
-        path: '/caseaction/caseaction',
-        component: () => import('@/views/caseaction/caseaction.vue'),
-        name: 'CaseAction',
-        meta: { title: '案件诉讼管理', noCache: true }
+    children: [{
+      path: '/caseaction/caseaction',
+      component: () => import('@/views/caseaction/caseaction.vue'),
+      name: 'CaseAction',
+      meta: {
+        title: '案件诉讼管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/courseofthecase',
@@ -766,14 +817,15 @@ export const constantRoutes = [
     meta: {
       title: '案件进程管理'
     },
-    children: [
-      {
-        path: '/courseofthecase/courseofthecase',
-        component: () => import('@/views/courseofthecase/courseofthecase.vue'),
-        name: 'CourseOfTheCase',
-        meta: { title: '案件进程管理', noCache: true }
+    children: [{
+      path: '/courseofthecase/courseofthecase',
+      component: () => import('@/views/courseofthecase/courseofthecase.vue'),
+      name: 'CourseOfTheCase',
+      meta: {
+        title: '案件进程管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/casedelegation',
@@ -782,14 +834,15 @@ export const constantRoutes = [
     meta: {
       title: '案件委托律师管理'
     },
-    children: [
-      {
-        path: '/casedelegation/casedelegation',
-        component: () => import('@/views/casedelegation/casedelegation.vue'),
-        name: 'CaseDelegation',
-        meta: { title: '案件委托律师管理', noCache: true }
+    children: [{
+      path: '/casedelegation/casedelegation',
+      component: () => import('@/views/casedelegation/casedelegation.vue'),
+      name: 'CaseDelegation',
+      meta: {
+        title: '案件委托律师管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/caseappeal',
@@ -798,14 +851,15 @@ export const constantRoutes = [
     meta: {
       title: '案件上诉管理'
     },
-    children: [
-      {
-        path: '/caseappeal/caseappeal',
-        component: () => import('@/views/caseappeal/caseappeal.vue'),
-        name: 'CaseAppeal',
-        meta: { title: '案件上诉管理', noCache: true }
+    children: [{
+      path: '/caseappeal/caseappeal',
+      component: () => import('@/views/caseappeal/caseappeal.vue'),
+      name: 'CaseAppeal',
+      meta: {
+        title: '案件上诉管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/caseexecution',
@@ -814,14 +868,15 @@ export const constantRoutes = [
     meta: {
       title: '案件执行管理'
     },
-    children: [
-      {
-        path: '/caseexecution/caseexecution',
-        component: () => import('@/views/caseexecution/caseexecution.vue'),
-        name: 'CaseExecution',
-        meta: { title: '案件执行管理', noCache: true }
+    children: [{
+      path: '/caseexecution/caseexecution',
+      component: () => import('@/views/caseexecution/caseexecution.vue'),
+      name: 'CaseExecution',
+      meta: {
+        title: '案件执行管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/caseclosed',
@@ -830,14 +885,15 @@ export const constantRoutes = [
     meta: {
       title: '案件结案管理'
     },
-    children: [
-      {
-        path: '/caseclosed/caseclosed',
-        component: () => import('@/views/caseclosed/caseclosed.vue'),
-        name: 'CaseClosed',
-        meta: { title: '案件结案管理', noCache: true }
+    children: [{
+      path: '/caseclosed/caseclosed',
+      component: () => import('@/views/caseclosed/caseclosed.vue'),
+      name: 'CaseClosed',
+      meta: {
+        title: '案件结案管理',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/provisionoffunds',
@@ -846,14 +902,15 @@ export const constantRoutes = [
     meta: {
       title: '资金占用费计提查询'
     },
-    children: [
-      {
-        path: '/provisionoffunds/provisionoffunds',
-        component: () => import('@/views/provisionoffunds/provisionoffunds.vue'),
-        name: 'ProvisionOfFunds',
-        meta: { title: '资金占用费计提查询', noCache: true }
+    children: [{
+      path: '/provisionoffunds/provisionoffunds',
+      component: () => import('@/views/provisionoffunds/provisionoffunds.vue'),
+      name: 'ProvisionOfFunds',
+      meta: {
+        title: '资金占用费计提查询',
+        noCache: true
       }
-    ]
+    }]
   },
   {
     path: '/financialdetails',
@@ -862,16 +919,36 @@ export const constantRoutes = [
     meta: {
       title: '资金占用费明细查询'
     },
-    children: [
-      {
-        path: '/financialdetails/financialdetails',
-        component: () => import('@/views/financialdetails/financialdetails.vue'),
-        name: 'FinancialDetails',
-        meta: { title: '资金占用费明细查询', noCache: true }
+    children: [{
+      path: '/financialdetails/financialdetails',
+      component: () => import('@/views/financialdetails/financialdetails.vue'),
+      name: 'FinancialDetails',
+      meta: {
+        title: '资金占用费明细查询',
+        noCache: true
       }
-    ]
+    }]
   },
 
+  {
+    path: '/auditSupervision',
+    component: Layout,
+    redirect: '/auditSupervision',
+    meta: {
+      title: '审计监管'
+    },
+    children: [{
+      path: '/auditSupervision/auditSupervision',
+      component: () => import('@/views/auditSupervision/auditSupervision.vue'),
+      name: 'AuditSupervision',
+      meta: {
+        title: '审计监管',
+        noCache: true
+      }
+    }]
+  },
+
+
   // 流程审批
   // 金融产品政策报备--编辑
   {
@@ -1485,22 +1562,24 @@ export const constantRoutes = [
       import('@/views/workFlow/jieanFlow/caseclosedYiBan.vue'),
     name: 'CaseClosedYiBan'
   },
-	// 404 page must be placed at the end !!!
-	// { path: '*', redirect: '/404', hidden: true }
+  // 404 page must be placed at the end !!!
+  // { path: '*', redirect: '/404', hidden: true }
 ]
 
 const createRouter = () => new Router({
-	// mode: 'history', // require service support
-	scrollBehavior: () => ({ y: 0 }),
-	routes: constantRoutes
+  // mode: 'history', // require service support
+  scrollBehavior: () => ({
+    y: 0
+  }),
+  routes: constantRoutes
 })
 
 const router = createRouter()
 
 // Detail see: https://github.com/vuejs/vue-router/issues/1234#issuecomment-357941465
 export function resetRouter() {
-	const newRouter = createRouter()
-	router.matcher = newRouter.matcher // reset router
+  const newRouter = createRouter()
+  router.matcher = newRouter.matcher // reset router
 }
 
 export default router
diff --git a/anrui-riskcenter-ui/src/utils/index.js b/anrui-riskcenter-ui/src/utils/index.js
index 4830c04890..86a2979c94 100644
--- a/anrui-riskcenter-ui/src/utils/index.js
+++ b/anrui-riskcenter-ui/src/utils/index.js
@@ -45,7 +45,9 @@ export function parseTime(time, cFormat) {
   const time_str = format.replace(/{([ymdhisa])+}/g, (result, key) => {
     const value = formatObj[key]
     // Note: getDay() returns 0 on Sunday
-    if (key === 'a') { return ['日', '一', '二', '三', '四', '五', '六'][value ] }
+    if (key === 'a') {
+      return ['日', '一', '二', '三', '四', '五', '六'][value]
+    }
     return value.toString().padStart(2, '0')
   })
   return time_str
@@ -115,3 +117,13 @@ export function param2Obj(url) {
   })
   return obj
 }
+/**
+ * 获取当前日期
+ */
+export function getCurrentDate() {
+  let now = new Date();
+  let year = now.getFullYear();
+  let month = now.getMonth() + 1;
+  let day = now.getDate();
+  return year + "-" + month + "-" + day;
+}
diff --git a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue
new file mode 100644
index 0000000000..4da70d2be0
--- /dev/null
+++ b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervision.vue
@@ -0,0 +1,419 @@
+<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" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.orgName" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="审计事项">
+                <el-input v-model="listQuery.params.auditMatters" placeholder="" clearable />
+              </el-form-item>
+              <el-form-item label="审计日期">
+                <el-date-picker v-model="listQuery.params.createStartDate" 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.createEndDate" value-format="yyyy-MM-dd" format="yyyy-MM-dd"
+                  type="date" placeholder="选择日期"></el-date-picker>
+              </el-form-item>
+            </el-form>
+            <div class="btn" style="text-align: center;">
+              <el-button type="primary" icon="el-icon-search" size="small" @click="handleFilter">查询</el-button>
+              <el-button type="primary" icon="el-icon-refresh" size="small" @click="handleReset">重置</el-button>
+            </div>
+          </div>
+        </div>
+        <!--End查询列表部分-->
+        <div class="listtop">
+          <div class="tit">审计列表</div>
+          <!--   <pageye v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" /> -->
+        </div>
+        <!--Start 主页面主要部分 -->
+        <div class="">
+          <el-table :key="tableKey" v-loading="listLoading" :data="list" :border="true" style="width: 100%;"
+            @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="80" align="center">
+              <template slot-scope="scope">
+                <el-button type="primary" size="mini" @click="toInfo(scope.row)">详情</el-button>
+              </template>
+            </el-table-column>
+            <el-table-column prop="useOrgName" label="分公司" align="center" />
+            <el-table-column prop="auditMatters" label="审计事项" align="center" />
+            <el-table-column prop="createStartDate" label="审计开始日期" align="center" />
+            <el-table-column prop="createEndDate" label="审计结束日期" align="center" />
+            <el-table-column prop="auditor" label="审计人" align="center" />
+            <el-table-column prop="auditResults" label="审计结果" align="center" />
+          </el-table>
+        </div>
+        <!--End 主页面主要部分-->
+        <div class="pages">
+          <div class="tit" />
+          <!-- 翻页 -->
+          <pagination v-show="list.length > 0" :total="listQuery.total" :page.sync="listQuery.current"
+            :limit.sync="listQuery.size" class="pagination" @pagination="getList" />
+        </div>
+        <!--End查询列表部分-->
+      </div>
+    </div>
+    <!--新增及修改 -->
+    <auditSupervisionAdd v-show="viewState == 2 || viewState == 3" ref="divAdd" @doback="resetState"
+      @reloadlist="getList" />
+    <!--详情-->
+    <auditSupervisionInfo v-show="viewState == 4" ref="divInfo" @doback="resetState" />
+
+    <el-dialog title="审计结果" :visible.sync="dialogVisible" :before-close="handleClose">
+      <el-form ref="form_obj" :model="formobj" :rules="rules" class="formaddcopy02" style="margin-top: -30px">
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="24">
+            <div class="span-sty"><span class="must">*</span> 审计结果</div>
+            <el-form-item prop="result"><el-input v-model="formobj.result" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+
+      <div style="display: flex;flex-direction: row;width: 100%;justify-content: center;align-items: center;">
+        <el-button type="primary" style="margin-top: 20px;" @click="saveResults">确 定</el-button>
+      </div>
+
+    </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/auditSupervision/auditSupervision'
+  import auditSupervisionAdd from './auditSupervisionAdd'
+  import auditSupervisionInfo from './auditSupervisionInfo'
+
+  export default {
+    name: 'AdvanceDetails',
+    components: {
+      Pagination,
+      pageye,
+      ButtonBar,
+      auditSupervisionAdd,
+      auditSupervisionInfo
+    },
+    data() {
+      return {
+        btndisabled: false,
+        dialogVisible: false,
+        btnList: [{
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toAdd',
+            btnLabel: '新增'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toEdit',
+            btnLabel: '编辑'
+          },
+          {
+            type: 'primary',
+            size: 'small',
+            icon: 'plus',
+            btnKey: 'toResult',
+            btnLabel: '审计结果'
+          },
+          {
+            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
+        FormLoading: false,
+        listLoading: false,
+        // 翻页
+        listQuery: {
+          current: 1,
+          size: 10,
+          total: 0,
+          params: {
+            "userSid": "",
+            "menuUrl": "",
+            "orgPath": "",
+            "orgName": "",
+            "auditMatters": "",
+            "createStartDate": "",
+            "createEndDate": ""
+          }
+        },
+        sids: [],
+        formobj: {
+          sids: [],
+          result: '',
+          userSid: window.sessionStorage.getItem('userSid'),
+        },
+        rules: {
+          result: [{
+            required: true,
+            message: '审计结果不能为空',
+            trigger: 'blur'
+          }],
+        }
+      }
+    },
+    created() {
+      // 初始化变量
+      this.getList()
+    },
+    mounted() {
+      this.$refs['btnbar'].setButtonList(this.btnList)
+    },
+    methods: {
+      // 搜索条件效果
+      clicksearchShow() {
+        this.isSearchShow = !this.isSearchShow
+        if (this.isSearchShow) {
+          this.searchxianshitit = '隐藏查询条件'
+        } else {
+          this.searchxianshitit = '显示查询条件'
+        }
+      },
+      btnHandle(btnKey) {
+        console.log('XXXXXXXXXXXXXXX    ' + btnKey)
+        switch (btnKey) {
+          case 'toAdd':
+            this.toAdd()
+            break
+          case 'toEdit':
+            this.toEdit()
+            break
+          case 'toResult':
+            this.toResult()
+            break
+          case 'doDel':
+            this.doDel()
+            break
+          case 'doClose':
+            this.doClose()
+            break
+          default:
+            break
+        }
+      },
+      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.userSid = window.sessionStorage.getItem('userSid')
+        this.listQuery.params.orgPath = window.sessionStorage.getItem('defaultOrgPath')
+        this.listQuery.params.menuUrl = this.$route.path
+        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: 10,
+          total: 0,
+          params: {
+            "userSid": "",
+            "menuUrl": "",
+            "orgPath": "",
+            "orgName": "",
+            "auditMatters": "",
+            "createStartDate": "",
+            "createEndDate": ""
+          }
+        }
+        this.getList()
+      },
+      toAdd() {
+        this.viewState = 2
+        this.$refs['divAdd'].showAdd()
+      },
+      toEdit() {
+
+        if (this.sids.length != 1) {
+          this.$message({
+            showClose: true,
+            type: 'error',
+            message: '请选择一条记录进行操作'
+          })
+          return
+        }
+
+        this.viewState = 3
+        this.$refs['divAdd'].showEdit(this.sids[0])
+      },
+      toResult() {
+
+        this.dialogVisible = true
+
+      },
+      handleClose() {
+        this.dialogVisible = false
+        this.formobj = {
+          sids: [],
+          result: '',
+          userSid: window.sessionStorage.getItem('userSid'),
+        }
+      },
+      saveResults() {
+
+        this.formobj.sids = this.sids
+        this.$refs['form_obj'].validate((valid) => {
+          if (valid) {
+            req.saveResult(this.formobj).then((res) => {
+              if (res.success) {
+                this.handleClose()
+              }
+            })
+
+          }
+        })
+
+
+      },
+      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(() => {})
+      },
+      doClose() {
+        this.$store.dispatch('tagsView/delView', this.$route)
+        this.$router.go(-1)
+      },
+      toInfo(row) {
+
+        this.viewState = 4
+        this.$refs['divInfo'].showDetail(row.sid)
+      },
+      resetState() {
+        this.viewState = 1
+      },
+    }
+  }
+</script>
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+    align-items: center;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>
diff --git a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue
new file mode 100644
index 0000000000..3218bbefea
--- /dev/null
+++ b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionAdd.vue
@@ -0,0 +1,269 @@
+<template>
+  <div class="app-container">
+    <div class="tab-header webtop">
+      <div>{{ viewTitle }}</div>
+      <div>
+        <el-button type="primary" size="small" :disabled="submitdisabled" @click="saveOrUpdate()">保存</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.createStartDate }}</span></el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 分公司</div>
+            <el-form-item prop="useOrgName">
+              <el-select class="addinputInfo addinputw" v-model="formobj.useOrgName" placeholder="请选择"
+                @change="seleOrgName">
+                <el-option v-for="item in orgList" :key="item.sid" :label="item.name" :value="item.sid"></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 审计人</div>
+            <el-form-item prop="auditor"><el-input v-model="formobj.auditor" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty"><span class="must">*</span> 审计事项</div>
+            <el-form-item prop="auditMatters"><el-input v-model="formobj.auditMatters" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">备注</div>
+            <el-form-item><el-input v-model="formobj.remarks" clearable placeholder=""
+                class="addinputInfo addinputw" /></el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <div class="span-sty">附件</div>
+            <el-form-item>
+              <upload-img ref="uploadImg" class="addinputw addinputInfo" v-model="formobj.urls" :limit="1" bucket="map"
+                :upload-data="{ type: '0001' }" @change="backData" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/auditSupervision/auditSupervision'
+  import uploadImg from '@/components/uploadFile/uploadImg'
+  import {
+    selectOrgSidList,
+    getOrgSidByPath,
+    fetchBySid
+  } from '@/api/Common/dictcommons'
+  import {
+    getCurrentDate,
+  } from '@/utils/index'
+
+  export default {
+    name: 'AuditSupervisionAdd',
+    components: {
+      uploadImg
+    },
+    data() {
+      return {
+        viewTitle: '',
+        submitdisabled: false,
+        formobj: {
+          "sid": "",
+          "useOrgName": "",
+          "useOrgSid": "",
+          "auditMatters": "",
+          "createStartDate": getCurrentDate(),
+          "createEndDate": "",
+          "auditor": "",
+          "auditResults": "",
+          "remarks": "",
+          "urls": [],
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createOrgSid": "",
+          "createOrgName": '',
+        },
+        rules: {
+          orgName: [{
+            required: true,
+            message: '请选择分公司',
+            trigger: 'change'
+          }],
+          auditor: [{
+            required: true,
+            message: '审计人不能为空',
+            trigger: 'blur'
+          }],
+          auditMatters: [{
+            required: true,
+            message: '审计项目不能为空',
+            trigger: 'blur'
+          }],
+        },
+        orgList: [],
+      }
+    },
+    methods: {
+
+      init() {
+        selectOrgSidList().then((res) => {
+          if (res.success) {
+            console.log("selectOrgSidList", res);
+            this.orgList = res.data
+          }
+        })
+
+        getOrgSidByPath({
+          orgPath: window.sessionStorage.getItem('defaultOrgPath')
+        }).then((resp) => {
+          if (resp.success) {
+            this.formobj.createOrgSid = resp.data
+            fetchBySid(resp.data).then((respsone) => {
+              if (respsone.success) {
+                this.formobj.createOrgName = respsone.data.name
+              }
+            })
+          }
+        })
+      },
+      backData(value) {
+
+        console.log('backData》》》》', value)
+
+        this.formobj.urls = value
+
+      },
+      showAdd() {
+        this.viewTitle = '【新增】审计监管'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.init()
+      },
+      showEdit(sid) {
+        this.viewTitle = '【编辑】审计监管'
+        this.$nextTick(() => {
+          this.$refs['form_obj'].clearValidate()
+        })
+        this.init()
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      },
+
+      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
+            })
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+          "sid": "",
+          "useOrgName": "",
+          "useOrgSid": "",
+          "auditMatters": "",
+          "createStartDate": getCurrentDate(),
+          "createEndDate": "",
+          "auditor": "",
+          "auditResults": "",
+          "remarks": "",
+          "urls": [],
+          "createBySid": window.sessionStorage.getItem('userSid'),
+          "createByName": window.sessionStorage.getItem('name'),
+          "createOrgSid": "",
+          "createOrgName": '',
+        }
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+      seleOrgName(val) {
+        console.log("seleOrgName", val);
+        const choose = this.orgList.filter((item) => item.sid == val)
+        console.log('>>>>>>>>>seleOrgName', choose)
+        this.formobj.useOrgSid = choose[0].sid
+        this.formobj.useOrgName = choose[0].name
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  /deep/ .el-form-item__error {
+    margin-left: 120px !important;
+  }
+
+  .must {
+    color: #f00;
+  }
+
+  .span-sty {
+    width: 130px !important;
+    align-items: center;
+  }
+
+  .addinputInfo {
+    margin-left: 120px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 120px !important;
+    width: calc(100% - 115px);
+  }
+
+  .first_row {
+    border-top: 1px solid #E0E3EB;
+  }
+
+  .titleOne {
+    padding: 7px;
+    display: flex;
+    flex-direction: row;
+    justify-content: space-between;
+    align-items: center;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .el-radio-group {
+    display: inline;
+    line-height: 1px;
+    vertical-align: middle;
+  }
+</style>
diff --git a/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue
new file mode 100644
index 0000000000..9df407d424
--- /dev/null
+++ b/anrui-riskcenter-ui/src/views/auditSupervision/auditSupervisionInfo.vue
@@ -0,0 +1,114 @@
+<template>
+  <div class="app-container">
+    <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" 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.createStartDate }}</span></el-form-item>
+          </el-col>
+        </el-row> -->
+        <el-row style="border-top: 1px solid #e0e3eb">
+          <el-col :span="8">
+            <div class="span-sty">分公司</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.useOrgName }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">审计人</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.auditor }}</span></el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <div class="span-sty">审计事项</div>
+            <el-form-item><span class="addinputInfo">{{ formobj.auditMatters }}</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>
+              <template slot-scope="scope">
+                <span v-for="(item,index) in formobj.urls" :key="index" class="addinputInfo">
+                  <el-popover placement="left" trigger="click" width="300">
+                    <img :src="item.url" width="100%" />
+                    <img slot="reference" :src="item.url" :alt="item.url"
+                      style="max-height: 70px;max-width: 70px; padding: 5px" />
+                  </el-popover>
+                </span>
+              </template>
+            </el-form-item>
+          </el-col>
+        </el-row>
+      </el-form>
+    </div>
+  </div>
+</template>
+
+<script>
+  import req from '@/api/auditSupervision/auditSupervision'
+
+  export default {
+    name: 'AuditSupervisionAdd',
+    components: {},
+    data() {
+      return {
+        viewTitle: '',
+        submitdisabled: false,
+        formobj: {},
+      }
+    },
+    methods: {
+      showDetail(sid) {
+        this.viewTitle = '审计监管详情'
+        req.init(sid).then((res) => {
+          if (res.success) {
+            this.formobj = res.data
+          }
+        })
+      },
+
+      handleReturn(isreload) {
+        if (isreload === 'true') this.$emit('reloadlist')
+        this.formobj = {
+
+        }
+        this.submitdisabled = false
+        this.$emit('doback')
+      },
+    }
+  }
+</script>
+
+<style scoped>
+  .span-sty {
+    width: 160px !important;
+  }
+
+  .addinputInfo {
+    margin-left: 150px !important;
+  }
+
+  .formaddcopy02 .el-row .el-col /deep/ .el-form-item .addinputw {
+    margin-left: 150px !important;
+    width: calc(100% - 145px);
+  }
+</style>
diff --git a/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleVoucherVo.java b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleVoucherVo.java
new file mode 100644
index 0000000000..9da493dacf
--- /dev/null
+++ b/anrui-riskcenter/anrui-riskcenter-api/src/main/java/com/yxt/anrui/riskcenter/api/loansettleapply/LoanSettleVoucherVo.java
@@ -0,0 +1,18 @@
+package com.yxt.anrui.riskcenter.api.loansettleapply;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/27 14:44
+ */
+@Data
+public class LoanSettleVoucherVo {
+
+    private String receivablesName; //结转款项名称
+    private BigDecimal subscriptionMoney; //结转金额
+//    private String oweState;//还款状态 未到期01当月未逾期02 已逾期/资方逾期利息/资方逾期利息03
+}
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.java
index 026a4a45d4..135280b9bc 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.java
@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Constants;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApply;
 import com.yxt.anrui.riskcenter.api.loanbuckleapply.LoanBuckleApplyVo;
 import com.yxt.anrui.riskcenter.api.loancustomerrecord.LoanCustomerRecord;
@@ -14,6 +15,7 @@ import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Update;
 
+import java.util.List;
 import java.util.Map;
 
 
@@ -25,4 +27,6 @@ public interface LoanBuckleApplyMapper extends BaseMapper<LoanBuckleApply> {
     int updateFlowFiled(Map<String, Object> map);
 
     int selectNum(String bill);
+
+    List<FinUncollectedReceivablesDetailedJR> selFinJrList(String sid);
 }
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml
index f637253ee3..e250327948 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanbuckleapply/LoanBuckleApplyMapper.xml
@@ -40,4 +40,15 @@
         from loan_buckle_apply
         where billNo LIKE concat(#{bill}, '%')
     </select>
-</mapper>
\ No newline at end of file
+    <select id="selFinJrList"
+            resultType="com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR">
+        SELECT
+            *
+        FROM
+            anrui_fin.fin_uncollected_receivables_detailed_jr
+        WHERE
+            busSid = #{sid}
+          AND payCostTitleValue = '资方退还垫款'
+          AND reveivableMoney > 0
+    </select>
+</mapper>
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 0e390adc48..ef1d5fbd4b 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
@@ -18,6 +18,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerDe
 import com.yxt.anrui.buscenter.api.bussalesorderborrower.BusSalesOrderBorrowerFeign;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
 import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
+import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailedjr.FinUncollectedReceivablesDetailedJR;
 import com.yxt.anrui.fin.api.kingdee.FinKingDeeFeign;
 import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
@@ -800,9 +801,9 @@ public class LoanBuckleApplyService extends MybatisBaseService<LoanBuckleApplyMa
                             voucherDetail.setSceneCode("01");
                         }
                     } else if (oweState == 0) {
-                        BigDecimal paymentMoney = planDetails.getPaymentMoney();
-                        if (null != paymentMoney) {
-                            if (paymentMoney.compareTo(BigDecimal.ZERO) > 0) {
+                        List<FinUncollectedReceivablesDetailedJR> jrList = baseMapper.selFinJrList(planDetails.getSid());
+                        if (null != jrList) {
+                            if (jrList.size() > 0) {
                                 voucherDetail.setSceneCode("03");
                             } else {
                                 voucherDetail.setSceneCode("02");
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
index f3c145987a..d648358926 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymenthistory/LoanRepaymentHistoryService.java
@@ -1576,7 +1576,16 @@ public class LoanRepaymentHistoryService extends MybatisBaseService<LoanRepaymen
             qw.like("a.dept", pagerQuery.getDept());
         }
         if (StringUtils.isNotBlank(pagerQuery.getReturnWayKey())) {
-            qw.like("a.returnWayKey", pagerQuery.getReturnWayKey());
+            String value = "";
+            String key = pagerQuery.getReturnWayKey();
+            if (key.equals("01")) {
+                value = "直还";
+            } else if (key.equals("02")) {
+                value = "间还";
+            } else if (key.equals("03")) {
+                value = "转付";
+            }
+            qw.like("a.returnWay", value);
         }
         if (StringUtils.isNotBlank(pagerQuery.getStaffName())) {
             qw.like("a.staffName", pagerQuery.getStaffName());
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
index 1b1794ab4b..58c97cd02c 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loanrepaymentplandetails/LoanRepaymentPlanDetailsMapper.xml
@@ -749,7 +749,7 @@
                                    SELECT IFNULL(SUM(jr.reveivableMoney), 0) AS reveivableMoney
                                    FROM anrui_fin.fin_uncollected_receivables_detailed_jr AS jr
                                             LEFT JOIN loan_repayment_plan_details AS p ON p.sid = jr.busSid
-                                   WHERE jr.payCostTitleKey = '006' AND jr.isEnable != 3
+                                   WHERE jr.payCostTitleKey = '006'
                                      AND p.busVinSid = #{busVinSid}
                                ) AS a
                       ) AS b
diff --git a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
index 417f6ca9cf..b3da93b887 100644
--- a/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
+++ b/anrui-riskcenter/anrui-riskcenter-biz/src/main/java/com/yxt/anrui/riskcenter/biz/loansettleapply/LoanSettleApplyService.java
@@ -41,6 +41,7 @@ import com.yxt.anrui.fin.api.kingdee.bdcustomer.BdCustomer;
 import com.yxt.anrui.fin.api.kingdee.voucher.GeneralVoucher;
 import com.yxt.anrui.fin.api.kingdee.voucher.PaymentVoucher;
 import com.yxt.anrui.fin.api.kingdee.voucher.SceneCodeEnum;
+import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.anrui.flowable.api.flow.FlowableFeign;
 import com.yxt.anrui.flowable.api.flow.UpdateFlowFieldVo;
 import com.yxt.anrui.flowable.api.flow2.FlowDelegateQuery;
@@ -50,6 +51,8 @@ import com.yxt.anrui.flowable.api.flowtask.FlowTaskVo;
 import com.yxt.anrui.flowable.api.flowtask.LatestTaskVo;
 import com.yxt.anrui.flowable.api.utils.ProcDefEnum;
 import com.yxt.anrui.flowable.sqloperationsymbol.BusinessVariables;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonFeign;
+import com.yxt.anrui.portal.api.dictcommon.DictCommonVo;
 import com.yxt.anrui.portal.api.flow.PCHistTaskListAndCommentList;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganization;
 import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
@@ -62,7 +65,9 @@ import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
 import com.yxt.anrui.portal.api.sysuser.SysUserVo;
 import com.yxt.anrui.riskcenter.api.loanmonthlyaccrualrecord.LoanMonthlyAccrualRecord;
 import com.yxt.anrui.riskcenter.api.loanoverduefin.UrlQuery;
+import com.yxt.anrui.riskcenter.api.loanpushfundhistory.LoanPushFundHistory;
 import com.yxt.anrui.riskcenter.api.loanrepaymenthistory.LoanRepaymentHistory;
+import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanPlanDetailsVoForFundVoucher;
 import com.yxt.anrui.riskcenter.api.loanrepaymentplandetails.LoanRepaymentPlanDetails;
 import com.yxt.anrui.riskcenter.api.loanrepaymentschedule.LoanRepaymentSchedule;
 import com.yxt.anrui.riskcenter.api.loansettleapply.*;
@@ -78,6 +83,7 @@ import com.yxt.anrui.riskcenter.api.loansolutions.LoanSolutions;
 import com.yxt.anrui.riskcenter.api.loansolutions.app.SolutionsDetailsVo;
 import com.yxt.anrui.riskcenter.api.loansolutionsdetail.LoanSolutionsDetail;
 import com.yxt.anrui.riskcenter.api.loantransferpaymentrecord.LoanTransferPaymentRecord;
+import com.yxt.anrui.riskcenter.biz.loanpushfundhistory.LoanPushFundHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymenthistory.LoanRepaymentHistoryService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentplandetails.LoanRepaymentPlanDetailsService;
 import com.yxt.anrui.riskcenter.biz.loanrepaymentschedule.LoanRepaymentScheduleService;
@@ -119,6 +125,9 @@ import java.net.URL;
 import java.net.URLEncoder;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
 import java.util.*;
 import java.util.concurrent.*;
 import java.util.stream.Collectors;
@@ -199,6 +208,11 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
     private BasePurchaseSystemFeign basePurchaseSystemFeign;
     @Autowired
     private LoanSolutionsService loanSolutionsService;
+    @Autowired
+    private DictCommonFeign dictCommonFeign;
+    @Autowired
+    private LoanPushFundHistoryService loanPushFundHistoryService;
+
 
     public PagerVo<LoanSettleApplyVo> listPageVo(PagerQuery<LoanSettleApplyQuery> pq) {
         LoanSettleApplyQuery query = pq.getParams();
@@ -956,13 +970,15 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     int check = 0;// 0不推抵顶保证金凭证 1推送
                     //结清合计 + 贷款保证金结转金额
                     BigDecimal add = amountTo.add(depositJZ);
-                    BigDecimal actualDeposit = BigDecimal.ZERO;
+//                    BigDecimal actualDeposit = BigDecimal.ZERO;
+                    List<LoanSettleVoucherVo> settleVoucherVos = new ArrayList<>();
                     if (add.compareTo(BigDecimal.ZERO) > 0) {
                         //结转剩余保证金
-                        BigDecimal decimal = carryForward(loanSettleApply);
-                        if (null != decimal) {
-                            actualDeposit = decimal;
-                        }
+//                        BigDecimal decimal = carryForward(loanSettleApply);
+//                        if (null != decimal) {
+//                            actualDeposit = decimal;
+//                        }
+                        settleVoucherVos = carryForward2(loanSettleApply);
                         check = 1;
                     }
                     //设置结清申请的“客户结清确认”状态为是
@@ -974,7 +990,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     //设置认款月还为已转付
                     updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
                     //推送财务凭证
-                    pushSettleVoucher(loanSettleApply, check, actualDeposit);
+//                    pushSettleVoucher(loanSettleApply, check, actualDeposit);
+                    pushSettleVoucher2(loanSettleApply, check, settleVoucherVos);
                 }
                 baseMapper.updateById(loanSettleApply);
             } else {
@@ -1460,6 +1477,377 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         return returnDecimal;
     }
 
+    private List<LoanSettleVoucherVo> carryForward2(LoanSettleApply loanSettleApply) {
+        List<LoanSettleVoucherVo> list = new ArrayList<>();
+        String userSid = loanSettleApply.getCreateBySid();
+        BigDecimal cwWDQ = BigDecimal.ZERO;//未到期
+        BigDecimal cwWYQ = BigDecimal.ZERO;//未逾期
+        BigDecimal cwYYQ = BigDecimal.ZERO;//已逾期
+        BigDecimal fund = BigDecimal.ZERO;//资金占用费
+        BigDecimal deposit = BigDecimal.ZERO; // 贷款保证金 - （扣罚金额-贷款保证金减免）
+        String busVinSid = loanSettleApply.getBusVinSid();
+        List<LoanRepaymentHistory> histories = new ArrayList<>();//还款记录
+        List<LoanRepaymentPlanDetails> updatePsList = new ArrayList<>();//还款计划明细集合
+        List<FinSelectedReceivablesDetailed> selectList = new ArrayList<>();
+        LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
+        String scheduleSid = planDetails.getScheduleSid();
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+        if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+            planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        }
+        String planDetailsSid = planDetails.getSid();
+        LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(loanSettleApply.getSid());
+        if (null != companyCost) {
+            if (null != companyCost.getLoanDeposit()) {
+                deposit = companyCost.getLoanDeposit();
+            }
+        }
+        //按照顺序结转
+        //月还
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            List<PlanNoReturnMoney> p = baseMapper.selPlansNoReturnMoneyByBusVinSidDesc(busVinSid);
+            p.removeAll(Collections.singleton(null));
+            if (!p.isEmpty() && p.size() > 0) {
+                for (PlanNoReturnMoney m : p) {
+                    if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal money = new BigDecimal(m.getMoney());
+                        BigDecimal mm = BigDecimal.ZERO;
+                        String sid = m.getSid();
+                        String mSid = m.getMSid();
+                        LoanRepaymentHistory history = new LoanRepaymentHistory();
+                        history.setCreateBySid(userSid);
+                        history.setDataTime(new Date());
+                        history.setUpdateState("1");
+                        history.setUpdateTime(new Date());
+                        history.setActualDate(new Date());
+                        history.setBuckleKey("003");
+                        history.setBuckle("审核通过");
+                        history.setReturnWayKey("04");
+                        history.setReturnWay("贷款保证金抵顶");
+                        history.setPayState(0);
+                        history.setPlanDetailSid(sid);
+                        history.setScheduleSid(mSid);
+                        if (deposit.compareTo(money) >= 0) {
+                            mm = money;
+                            history.setActualMoney(money);
+                            histories.add(history);
+                            deposit = deposit.subtract(money);
+                        } else {
+                            mm = deposit;
+                            history.setActualMoney(deposit);
+                            histories.add(history);
+                            deposit = BigDecimal.ZERO;
+                        }
+                        LoanRepaymentPlanDetails details = loanRepaymentPlanDetailsService.fetchBySid(sid);
+                        if (null != details) {
+                            if (null != details.getPaymentMoney()) {
+                                BigDecimal paymentMoney = details.getPaymentMoney();
+                                if (paymentMoney.compareTo(BigDecimal.ZERO) > 0) {
+                                    details.setPaymentMoney(paymentMoney.subtract(mm));
+                                    updatePsList.add(details);
+                                }
+                            }
+                        }
+                        if (null != details.getOweState()) {
+                            if (details.getOweState() == 0) {
+                                cwYYQ = cwYYQ.add(mm);
+                            } else if (details.getOweState() == 1) {
+                                //获取收款日期的当月最后一天
+                                DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+                                LocalDate localDate = LocalDate.parse(DateUtil.formatDate(new Date()), formatter);
+                                LocalDate date = localDate.withDayOfMonth(localDate.lengthOfMonth());
+                                Date dueDate = details.getDueDate(); //应还日期
+                                // Date -> LocalDate
+                                LocalDate localDueDate = dueDate.toInstant().atZone(ZoneId.systemDefault()).toLocalDate();
+                                boolean after = localDueDate.isAfter(date);
+                                if (after) {
+                                    cwWDQ = cwWDQ.add(mm);
+                                } else {
+                                    cwWYQ = cwWYQ.add(mm);
+                                }
+                            }
+                        }
+
+                    }
+                }
+            }
+        }
+        //结转垫资方逾期利息
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            List<PlanNoReturnMoney> p = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "005");
+            p.removeAll(Collections.singleton(null));
+            if (!p.isEmpty() && p.size() > 0) {
+                for (PlanNoReturnMoney m : p) {
+                    if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal money = new BigDecimal(m.getMoney());
+                        BigDecimal mm = BigDecimal.ZERO;
+                        String sid = m.getSid();
+                        FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                        fin.setCreateBySid(userSid);
+                        fin.setRemarks("贷款保证金抵顶");
+                        fin.setVIN(planDetails.getVinNo());
+                        fin.setUseOrgSid(planDetails.getUseOrgSid());
+                        fin.setReceivablesName("资方逾期利息");
+                        if (deposit.compareTo(money) >= 0) {
+                            mm = money;
+                            fin.setSubscriptionMoney(money);
+                            deposit = deposit.subtract(money);
+                        } else {
+                            mm = deposit;
+                            fin.setSubscriptionMoney(deposit);
+                            deposit = BigDecimal.ZERO;
+                        }
+                        fin.setSubscriptionDate(DateUtil.today());
+                        fin.setAuditState(3);
+                        fin.setAuditDate(DateUtil.today());
+                        fin.setReceivablesSid(m.getJrSid());
+                        fin.setKxState("01");
+                        fin.setUseOrgName(planDetails.getUseOrgName());
+                        fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                        selectList.add(fin);
+                        LoanRepaymentPlanDetails details = loanRepaymentPlanDetailsService.fetchBySid(sid);
+                        if (null != details) {
+                            if (null != details.getPaymentInterest()) {
+                                BigDecimal paymentInterest = details.getPaymentInterest();
+                                BigDecimal paymentMoney = details.getPaymentMoney();
+                                if (paymentInterest.compareTo(BigDecimal.ZERO) > 0) {
+                                    details.setPaymentMoney(paymentMoney.subtract(mm));
+                                    details.setPaymentInterest(paymentInterest.subtract(mm));
+                                    updatePsList.add(details);
+                                }
+                            }
+                        }
+                        cwYYQ = cwYYQ.add(mm);
+                    }
+                }
+            }
+        }
+        //结转资方逾期利息
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "结清时资方逾期利息");
+            if (null != p) {
+                BigDecimal money = new BigDecimal(p.getMoney());
+                BigDecimal mm = BigDecimal.ZERO;
+                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                fin.setCreateBySid(planDetails.getSalesUserSid());
+                fin.setRemarks("贷款保证金抵顶");
+                fin.setVIN(planDetails.getVinNo());
+                fin.setUseOrgSid(planDetails.getUseOrgSid());
+                fin.setReceivablesName("结清时资方逾期利息");
+                if (deposit.compareTo(money) >= 0) {
+                    mm = money;
+                    fin.setSubscriptionMoney(money);
+                    deposit = deposit.subtract(money);
+                } else {
+                    mm = deposit;
+                    fin.setSubscriptionMoney(deposit);
+                    deposit = BigDecimal.ZERO;
+                }
+                fin.setSubscriptionDate(DateUtil.today());
+                fin.setAuditState(3);
+                fin.setAuditDate(DateUtil.today());
+                fin.setReceivablesSid(p.getJrSid());
+                fin.setKxState("01");
+                fin.setPurchaseSystemSid("");
+                fin.setPurchaseSystemName("");
+                fin.setStaffUserSid("");
+                fin.setUseOrgName(planDetails.getUseOrgName());
+                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                selectList.add(fin);
+                cwYYQ = cwYYQ.add(mm);
+            }
+
+        }
+        //名义价
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "名义价");
+            if (null != p) {
+                BigDecimal mm = BigDecimal.ZERO;
+                BigDecimal money = new BigDecimal(p.getMoney());
+                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                fin.setCreateBySid(planDetails.getSalesUserSid());
+                fin.setRemarks("贷款保证金抵顶");
+                fin.setVIN(planDetails.getVinNo());
+                fin.setUseOrgSid(planDetails.getUseOrgSid());
+                fin.setReceivablesName("名义价");
+                if (deposit.compareTo(money) >= 0) {
+                    mm = money;
+                    fin.setSubscriptionMoney(money);
+                    deposit = deposit.subtract(money);
+                } else {
+                    mm = deposit;
+                    fin.setSubscriptionMoney(deposit);
+                    deposit = BigDecimal.ZERO;
+                }
+                fin.setSubscriptionDate(DateUtil.today());
+                fin.setAuditState(3);
+                fin.setAuditDate(DateUtil.today());
+                fin.setReceivablesSid(p.getJrSid());
+                fin.setKxState("01");
+                fin.setPurchaseSystemSid("");
+                fin.setPurchaseSystemName("");
+                fin.setStaffUserSid("");
+                fin.setUseOrgName(planDetails.getUseOrgName());
+                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                selectList.add(fin);
+                LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+                v.setReceivablesName("名义价");
+                v.setSubscriptionMoney(mm);
+                list.add(v);
+            }
+
+        }
+        //合同违约金
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "合同违约金");
+            if (null != p) {
+                BigDecimal mm = BigDecimal.ZERO;
+                BigDecimal money = new BigDecimal(p.getMoney());
+                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                fin.setCreateBySid(planDetails.getSalesUserSid());
+                fin.setRemarks("贷款保证金抵顶");
+                fin.setVIN(planDetails.getVinNo());
+                fin.setUseOrgSid(planDetails.getUseOrgSid());
+                fin.setReceivablesName("合同违约金");
+                if (deposit.compareTo(money) >= 0) {
+                    mm = money;
+                    fin.setSubscriptionMoney(money);
+                    deposit = deposit.subtract(money);
+                } else {
+                    mm = deposit;
+                    fin.setSubscriptionMoney(deposit);
+                    deposit = BigDecimal.ZERO;
+                }
+                fin.setSubscriptionDate(DateUtil.today());
+                fin.setAuditState(3);
+                fin.setAuditDate(DateUtil.today());
+                fin.setReceivablesSid(p.getJrSid());
+                fin.setKxState("01");
+                fin.setPurchaseSystemSid("");
+                fin.setPurchaseSystemName("");
+                fin.setStaffUserSid("");
+                fin.setUseOrgName(planDetails.getUseOrgName());
+                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                selectList.add(fin);
+                LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+                v.setReceivablesName("合同违约金");
+                v.setSubscriptionMoney(mm);
+                list.add(v);
+            }
+        }
+        //其他费用
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, "其他费用");
+            if (null != p) {
+                BigDecimal mm = BigDecimal.ZERO;
+                BigDecimal money = new BigDecimal(p.getMoney());
+                FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                fin.setCreateBySid(planDetails.getSalesUserSid());
+                fin.setRemarks("贷款保证金抵顶");
+                fin.setVIN(planDetails.getVinNo());
+                fin.setUseOrgSid(planDetails.getUseOrgSid());
+                fin.setReceivablesName("其他费用");
+                if (deposit.compareTo(money) >= 0) {
+                    mm = money;
+                    fin.setSubscriptionMoney(money);
+                    deposit = deposit.subtract(money);
+                } else {
+                    mm = deposit;
+                    fin.setSubscriptionMoney(deposit);
+                    deposit = BigDecimal.ZERO;
+                }
+                fin.setSubscriptionDate(DateUtil.today());
+                fin.setAuditState(3);
+                fin.setAuditDate(DateUtil.today());
+                fin.setReceivablesSid(p.getJrSid());
+                fin.setKxState("01");
+                fin.setPurchaseSystemSid("");
+                fin.setPurchaseSystemName("");
+                fin.setStaffUserSid("");
+                fin.setUseOrgName(planDetails.getUseOrgName());
+                fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                selectList.add(fin);
+                LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+                v.setReceivablesName("其他费用");
+                v.setSubscriptionMoney(mm);
+                list.add(v);
+            }
+        }
+        //资金占用费
+        if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+            List<PlanNoReturnMoney> p = baseMapper.selNoReturnJrMoneyByBusVinSidAndKeyDesc(busVinSid, "006");
+            p.removeAll(Collections.singleton(null));
+            if (!p.isEmpty() && p.size() > 0) {
+                for (PlanNoReturnMoney m : p) {
+                    if (deposit.compareTo(BigDecimal.ZERO) > 0) {
+                        BigDecimal mm = BigDecimal.ZERO;
+                        BigDecimal money = new BigDecimal(m.getMoney());
+                        FinSelectedReceivablesDetailed fin = new FinSelectedReceivablesDetailed();
+                        fin.setCreateBySid(userSid);
+                        fin.setRemarks("贷款保证金抵顶");
+                        fin.setVIN(planDetails.getVinNo());
+                        fin.setUseOrgSid(planDetails.getUseOrgSid());
+                        fin.setReceivablesName("资金占用费");
+                        if (deposit.compareTo(money) >= 0) {
+                            mm = money;
+                            fin.setSubscriptionMoney(money);
+                            deposit = deposit.subtract(money);
+                        } else {
+                            mm = deposit;
+                            fin.setSubscriptionMoney(deposit);
+                            deposit = BigDecimal.ZERO;
+                        }
+                        fin.setSubscriptionDate(DateUtil.today());
+                        fin.setAuditState(3);
+                        fin.setAuditDate(DateUtil.today());
+                        fin.setReceivablesSid(m.getJrSid());
+                        fin.setKxState("01");
+                        fin.setUseOrgName(planDetails.getUseOrgName());
+                        fin.setOrgSidPath(loanSettleApply.getOrgSidPath());
+                        selectList.add(fin);
+                        fund = fund.add(mm);
+                    }
+                }
+            }
+        }
+        if (histories.size() > 0 && !histories.isEmpty()) {
+            loanRepaymentHistoryService.saveList(histories);
+        }
+        selectList.removeAll(Collections.singleton(null));
+        if (selectList.size() > 0 && !selectList.isEmpty()) {
+            ResultBean resultBean = finSelectedReceivablesDetailedFeign.saveAll(selectList);
+        }
+        updatePsList.removeAll(Collections.singleton(null));
+        if (!updatePsList.isEmpty() && updatePsList.size() > 0) {
+            loanRepaymentPlanDetailsService.updateList(updatePsList);
+        }
+        if (cwWDQ.compareTo(BigDecimal.ZERO) > 0) {
+            LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+            v.setReceivablesName("未到期");
+            v.setSubscriptionMoney(cwWDQ);
+            list.add(v);
+        }
+        if (cwWYQ.compareTo(BigDecimal.ZERO) > 0) {
+            LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+            v.setReceivablesName("未逾期");
+            v.setSubscriptionMoney(cwWYQ);
+            list.add(v);
+        }
+        if (cwYYQ.compareTo(BigDecimal.ZERO) > 0) {
+            LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+            v.setReceivablesName("已逾期");
+            v.setSubscriptionMoney(cwYYQ);
+            list.add(v);
+        }
+        if (fund.compareTo(BigDecimal.ZERO) > 0) {
+            LoanSettleVoucherVo v = new LoanSettleVoucherVo();
+            v.setReceivablesName("资金占用费");
+            v.setSubscriptionMoney(fund);
+            list.add(v);
+        }
+        return list;
+    }
+
     //--------------------------------- 减免 ----------------------------
     private void reliefMoney(LoanSettleApply loanSettleApply) {
         String userSid = loanSettleApply.getCreateBySid();
@@ -1792,6 +2180,328 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
     }
 
+    private void pushSettleVoucher2(LoanSettleApply loanSettleApply, int check, List<LoanSettleVoucherVo> vos) {
+        String sid = loanSettleApply.getSid();
+        BigDecimal amountAll = BigDecimal.ZERO; //贷款保证金抵结清款 预收贷款车费用_贷款保证金_贷款保证金
+        LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(sid);
+        LoanSettleCompanyReduction reduction = loanSettleCompanyReductionService.selectByMainSid(sid);
+        LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(sid);
+        Voucher newVoucher = new Voucher();
+        List<Voucher.VoucherResultDetailDto> resultDetails = new ArrayList<>();
+        SimpleDateFormat sdfTimes = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        //--------------推送资金占用费计提记录表--------------------
+        List<LoanPushFundHistory> fundHistoryList = new ArrayList<>();
+        LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(loanSettleApply.getBusVinSid());
+        String scheduleSid = planDetails.getScheduleSid();
+        LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+        if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+            planDetails = baseMapper.selectMainPeriodByBusVinSid(loanSettleApply.getBusVinSid());
+        }
+        if (null != planDetails) {
+            String useOrgSid = planDetails.getUseOrgSid();
+            SysOrganizationVo organizationVo = sysOrganizationFeign.fetchBySid(useOrgSid).getData();
+            if (null != organizationVo) {
+                newVoucher.setAccountBook(organizationVo.getOrgCode());
+                newVoucher.setVoucherNo(organizationVo.getOrgCode());
+            }
+            String deptCode = "";
+            String customerNumber = "";
+            String bankCode = ""; //资方编码
+            if (StringUtils.isNotBlank(schedule.getCwDeptNo())) {
+                deptCode = schedule.getCwDeptNo();
+            }
+            DictCommonVo dictCommonVo = dictCommonFeign.selectBykey(planDetails.getBankName(), "investorsCode").getData();
+            if (null != dictCommonVo) {
+                bankCode = dictCommonVo.getDictValue();
+            }
+            BusSalesOrderVehicle busSalesOrderVehicle = busSalesOrderVehicleFeign.details(planDetails.getBusVinSid()).getData();
+            BusSalesOrder salesOrder = busSalesOrderFeign.fetchBySid(planDetails.getSalesOrderSid()).getData();
+            if (null != salesOrder) {
+                if (null != busSalesOrderVehicle) {
+                    //判断财务系统是否有客户
+                    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());
+                        if (StringUtils.isNotBlank(salesOrder.getPurchaseSystemSid())) {
+                            BasePurchaseSystemDetailsVo data = basePurchaseSystemFeign.fetchDetailsByDeptSid(salesOrder.getPurchaseSystemSid()).getData();
+                            bdCustomer.setTOrgIds(data.getOrgCode());
+                        }
+                        bdCustomer.setTOrgIds(deptCode);
+                        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();
+                    }
+                }
+            }
+            BigDecimal fund = BigDecimal.ZERO;//资金占用费减免
+            BigDecimal bzjMoney = BigDecimal.ZERO;//剩余贷款保证金结转
+            BigDecimal bzjJM = BigDecimal.ZERO;//贷款保证金减免
+            BigDecimal bzjKF = BigDecimal.ZERO;//贷款保证金扣罚
+            BigDecimal bzjKFCw = BigDecimal.ZERO;//贷款保证金扣罚
+            BigDecimal sybzj = BigDecimal.ZERO;//贷款保证金扣罚
+            BigDecimal zfJQK = BigDecimal.ZERO;//资方结清款
+            int topping = 0;
+            BigDecimal bbjDDMoney = BigDecimal.ZERO; //资方保证金抵顶
+            if (null != reduction) {
+                if (null != reduction.getFundPenalty()) {
+                    fund = reduction.getFundPenalty();
+                }
+                if (null != reduction.getDepositPenalty()) {
+                    bzjJM = reduction.getDepositPenalty();
+                }
+            }
+            if (null != companyCost) {
+                if (null != companyCost.getLoanDeposit()) {
+                    bzjMoney = companyCost.getLoanDeposit();
+                }
+                if (null != companyCost.getDeductionAmount()) {
+                    bzjKF = companyCost.getDeductionAmount();
+                }
+            }
+            if (null != bankCost) {
+                if (null != bankCost.getBankSettlePrice()) {
+                    zfJQK = bankCost.getBankSettlePrice();
+                }
+                topping = bankCost.getTopping();
+                if (null != bankCost.getLoanDeposit()) {
+                    bbjDDMoney = bankCost.getLoanDeposit();
+                }
+            }
+            sybzj = bzjMoney.subtract(bzjKF).add(bzjJM);
+            bzjKFCw = bzjKF.subtract(bzjJM);
+            //资金占用费减免凭证
+            if (fund.compareTo(BigDecimal.ZERO) > 0) {
+                Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
+                voucherDetail1.setSummary("公司逾期利息减免");
+                voucherDetail1.setSubjectNo("1201.02.02");
+                voucherDetail1.setDimensionDept(deptCode);
+                voucherDetail1.setDimensionCustom(customerNumber);
+                voucherDetail1.setDebit("-" + bbjDDMoney.toString());
+                resultDetails.add(voucherDetail1);
+                Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
+                voucherDetail2.setSummary("公司逾期利息减免");
+                voucherDetail2.setSubjectNo("2191.05.00");
+                voucherDetail2.setDimensionDept(deptCode);
+                voucherDetail2.setDebit(bbjDDMoney.toString());
+                resultDetails.add(voucherDetail2);
+            }
+            //剩余贷款保证金结转
+            if (check == 1) {
+                if (vos.size() > 0 && !vos.isEmpty()) {
+                    for (LoanSettleVoucherVo v : vos) {
+                        BigDecimal subscriptionMoney = v.getSubscriptionMoney();
+                        String receivablesName = v.getReceivablesName();
+                        amountAll = amountAll.add(subscriptionMoney);
+                        if (receivablesName.equals("未到期")) {
+                            Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                            voucherDetail.setSummary("贷款保证金抵结清款");
+                            voucherDetail.setSubjectNo("1201.01.00");
+                            voucherDetail.setDimensionDept(deptCode);
+                            voucherDetail.setDimensionCustom(customerNumber);
+                            voucherDetail.setCredit(subscriptionMoney.toString());
+                            resultDetails.add(voucherDetail);
+                        }
+                        if (receivablesName.equals("未逾期")) {
+                            Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                            voucherDetail.setSummary("贷款保证金抵结清款");
+                            voucherDetail.setSubjectNo("1201.02.01");
+                            voucherDetail.setDimensionDept(deptCode);
+                            voucherDetail.setDimensionCustom(customerNumber);
+                            voucherDetail.setCredit(subscriptionMoney.toString());
+                            resultDetails.add(voucherDetail);
+                        }
+                        if (receivablesName.equals("已逾期")) {
+                            Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                            voucherDetail.setSummary("贷款保证金抵结清款");
+                            voucherDetail.setSubjectNo("1201.02.03");
+                            voucherDetail.setDimensionDept(deptCode);
+                            voucherDetail.setDimensionCustom(customerNumber);
+                            voucherDetail.setCredit(subscriptionMoney.toString());
+                            resultDetails.add(voucherDetail);
+                        }
+                        if (receivablesName.equals("名义价") || receivablesName.equals("合同违约金") || receivablesName.equals("其他费用")) {
+                            SettleFinVo finVo = getFinSettleVo(planDetails.getBusVinSid(), receivablesName, subscriptionMoney.toString()).getData();
+                            if (null != finVo) {
+                                if (null != finVo.getSubtrahend()) {
+                                    if (finVo.getSubtrahend().compareTo(BigDecimal.ZERO) > 0) {
+                                        Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                                        voucherDetail.setSummary("贷款保证金抵结清款");
+                                        voucherDetail.setSubjectNo(bankCode);
+                                        voucherDetail.setDimensionDept(deptCode);
+                                        voucherDetail.setDimensionCustom(customerNumber);
+                                        voucherDetail.setCredit(finVo.getSubtrahend().toString());
+                                        resultDetails.add(voucherDetail);
+                                    }
+                                }
+                                if (null != finVo.getBalance()) {
+                                    if (finVo.getBalance().compareTo(BigDecimal.ZERO) > 0) {
+                                        if (receivablesName.equals("其他费用")) {
+                                            Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                                            voucherDetail.setSummary("收其他费用");
+                                            voucherDetail.setSubjectNo("1133.10.00");
+                                            voucherDetail.setDimensionDept(deptCode);
+                                            voucherDetail.setDimensionCustom(customerNumber);
+                                            voucherDetail.setCredit(finVo.getBalance().toString());
+                                            resultDetails.add(voucherDetail);
+                                        } else {
+                                            Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                                            voucherDetail.setSummary("其他费用差额转收入");
+                                            voucherDetail.setSubjectNo("6002.01.17");
+                                            voucherDetail.setDimensionDept(deptCode);
+                                            voucherDetail.setCredit(finVo.getBalance().toString());
+                                            resultDetails.add(voucherDetail);
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                        if (receivablesName.equals("资金占用费")) {
+                            Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                            voucherDetail.setSummary("贷款保证金抵结清款");
+                            voucherDetail.setSubjectNo("1201.02.02");
+                            voucherDetail.setDimensionDept(deptCode);
+                            voucherDetail.setDimensionCustom(customerNumber);
+                            voucherDetail.setCredit(subscriptionMoney.toString());
+                            resultDetails.add(voucherDetail);
+                            SimpleDateFormat sdfnew = new SimpleDateFormat("yyyy-MM-dd");
+                            String date = sdfnew.format(new Date());
+                            String[] split = date.split("-");
+                            String month = split[1];
+                            Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
+                            voucherDetail1.setSummary(month + "月逾期利息确认收入");
+                            voucherDetail1.setSubjectNo("2191.05.00");
+                            voucherDetail1.setDimensionDept(deptCode);
+                            voucherDetail1.setDebit(subscriptionMoney.toString());
+                            resultDetails.add(voucherDetail1);
+                            Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
+                            voucherDetail2.setSummary(month + "月逾期利息确认收入");
+                            voucherDetail2.setSubjectNo("6002.01.19");
+                            voucherDetail2.setDimensionDept(deptCode);
+                            voucherDetail2.setCredit(subscriptionMoney.toString());
+                            resultDetails.add(voucherDetail2);
+                            //资金占用费未计提的部分
+                            LoanPlanDetailsVoForFundVoucher f = loanRepaymentPlanDetailsService.getLoanPlanDetailsVoForFundVoucher(planDetails.getBusVinSid());
+                            if (null != f) {
+                                if (null != f.getDuePushMoney()) {
+                                    BigDecimal duePushMoney = f.getDuePushMoney();
+                                    if (duePushMoney.compareTo(BigDecimal.ZERO) > 0) {
+                                        Voucher.VoucherResultDetailDto voucherDetail3 = new Voucher.VoucherResultDetailDto();
+                                        voucherDetail3.setSummary("计提" + month + "月逾期利息");
+                                        voucherDetail3.setSubjectNo("1201.02.02");
+                                        voucherDetail3.setDimensionDept(deptCode);
+                                        voucherDetail3.setDimensionCustom(customerNumber);
+                                        voucherDetail3.setDebit(duePushMoney.toString());
+                                        resultDetails.add(voucherDetail3);
+                                        Voucher.VoucherResultDetailDto voucherDetail4 = new Voucher.VoucherResultDetailDto();
+                                        voucherDetail4.setSummary("计提" + month + "月逾期利息");
+                                        voucherDetail4.setSubjectNo("2191.05.00");
+                                        List<SysOrganizationVo> deptVo = sysOrganizationFeign.selectChildrenListBySid(planDetails.getUseOrgSid()).getData();
+                                        if (!deptVo.isEmpty()) {
+                                            for (SysOrganizationVo d : deptVo) {
+                                                if (d.getName().equals("金融服务部")) {
+                                                    voucherDetail4.setDimensionDept(d.getOrgCode());
+                                                }
+                                            }
+                                        }
+                                        voucherDetail4.setCredit(duePushMoney.toString());
+                                        resultDetails.add(voucherDetail4);
+                                        LoanPushFundHistory loanPushFundHistory = new LoanPushFundHistory();
+                                        loanPushFundHistory.setFund(f.getDuePushMoney());
+                                        loanPushFundHistory.setBusVinSid(planDetails.getBusVinSid());
+                                        loanPushFundHistory.setUseOrgName(planDetails.getUseOrgName());
+                                        loanPushFundHistory.setUseOrgSid(planDetails.getUseOrgSid());
+                                        String lastTimes = loanPushFundHistoryService.getLastDateByBusVinSid(planDetails.getBusVinSid()).getData();
+                                        if (StringUtils.isNotBlank(lastTimes)) {
+                                            try {
+                                                loanPushFundHistory.setLastAccrualDate(sdfTimes.parse(lastTimes));
+                                            } catch (ParseException e) {
+                                                e.printStackTrace();
+                                            }
+                                        }
+                                        fundHistoryList.add(loanPushFundHistory);
+                                    }
+                                }
+
+                            }
+
+                        }
+                    }
+                }
+            }
+            //贷款保证金扣罚
+            if (bzjKFCw.compareTo(BigDecimal.ZERO) > 0) {
+                Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                voucherDetail.setSubjectNo("6002.01.21");
+                voucherDetail.setSummary("贷款保证金抵结清款");
+                voucherDetail.setDimensionDept(deptCode);
+                voucherDetail.setDimensionCustom(customerNumber);
+                voucherDetail.setCredit(bzjKFCw.toString());
+                resultDetails.add(voucherDetail);
+                amountAll = amountAll.add(bzjKFCw);
+            }
+            //资方结清款付款
+            if (zfJQK.compareTo(BigDecimal.ZERO) <= 0) {
+                if (topping == 1) {
+                    if (bbjDDMoney.compareTo(BigDecimal.ZERO) > 0) {
+                        Voucher.VoucherResultDetailDto voucherDetail1 = new Voucher.VoucherResultDetailDto();
+                        voucherDetail1.setSummary(planDetails.getBankName() + "结清");
+                        voucherDetail1.setSubjectNo(bankCode);
+                        voucherDetail1.setDimensionDept(deptCode);
+                        voucherDetail1.setDimensionCustom(customerNumber);
+                        voucherDetail1.setDebit(bbjDDMoney.toString());
+                        resultDetails.add(voucherDetail1);
+                        Voucher.VoucherResultDetailDto voucherDetail2 = new Voucher.VoucherResultDetailDto();
+                        voucherDetail2.setSummary(planDetails.getBankName() + "个贷保证金抵结清款");
+                        voucherDetail2.setSubjectNo("1009.01.00");
+                        voucherDetail2.setDimensionDept(deptCode);
+                        voucherDetail2.setDimensionCustom(customerNumber);
+                        voucherDetail2.setCredit(bbjDDMoney.toString());
+                        resultDetails.add(voucherDetail2);
+                    }
+                }
+            }
+            //贷款保证金扣罚
+            if (amountAll.compareTo(BigDecimal.ZERO) > 0) {
+                Voucher.VoucherResultDetailDto voucherDetail = new Voucher.VoucherResultDetailDto();
+                voucherDetail.setSubjectNo("2182.01.01");
+                voucherDetail.setSummary("贷款保证金抵结清款");
+                voucherDetail.setDimensionDept(deptCode);
+                voucherDetail.setDimensionCustom(customerNumber);
+                voucherDetail.setDebit(amountAll.toString());
+                resultDetails.add(voucherDetail);
+            }
+            newVoucher.setResultDetails(resultDetails);
+            if (!fundHistoryList.isEmpty()) {
+                loanPushFundHistoryService.saveLists(fundHistoryList);
+            }
+            finKingDeeFeign.saveVoucher(newVoucher);
+        }
+    }
+
     //--------------------资方结清款到出纳代付款列表------------------
     private void pushBankSettlePrice(LoanSettleApply loanSettleApply) {
         if (StringUtils.isBlank(loanSettleApply.getBusSid())) {
@@ -2883,12 +3593,13 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         }
         loanSettleApply.setState(1);
         baseMapper.updateById(loanSettleApply);
-        BigDecimal actualDeposit = BigDecimal.ZERO;
+//        BigDecimal actualDeposit = BigDecimal.ZERO;
         //结转剩余保证金
-        BigDecimal decimal = carryForward(loanSettleApply);
-        if (null != decimal) {
-            actualDeposit = decimal;
-        }
+        List<LoanSettleVoucherVo> settleVoucherVos = carryForward2(loanSettleApply);
+//        BigDecimal decimal = carryForward(loanSettleApply);
+//        if (null != decimal) {
+//            actualDeposit = decimal;
+//        }
         //更新车辆表结清状态
         baseMapper.updateBus(loanSettleApply.getBusVinSid(), "1");
         //推送资方结清款到出纳代付款列表
@@ -2896,7 +3607,8 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         //设置认款月还为已转付
         updatePaymentStateByBusVinSid(loanSettleApply.getBusVinSid());
         //推送财务凭证
-        pushSettleVoucher(loanSettleApply, 1, actualDeposit);
+//        pushSettleVoucher(loanSettleApply, 1, actualDeposit);
+        pushSettleVoucher2(loanSettleApply, 1, settleVoucherVos);
         return rb.success();
     }
 
@@ -3276,10 +3988,19 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
         SettleFinVo vo = new SettleFinVo();
         LoanSettleApply apply = baseMapper.getFinSettleVo(busVinSid);
         if (null != apply) {
+            LoanRepaymentPlanDetails planDetails = baseMapper.selectByBusVinSidAndDesc(busVinSid);
+            String scheduleSid = planDetails.getScheduleSid();
+            LoanRepaymentSchedule schedule = loanRepaymentScheduleService.fetchBySid(scheduleSid);
+            if (schedule.getIsOtherPolicy().equals("1") && schedule.getSameBank().equals("0")) {
+                planDetails = baseMapper.selectMainPeriodByBusVinSid(busVinSid);
+            }
+            String planDetailsSid = planDetails.getSid();
             String sid = apply.getSid();
             BigDecimal amount = new BigDecimal(subscriptionMoney);
-            BigDecimal balance = BigDecimal.ZERO;
-            BigDecimal subtrahend = BigDecimal.ZERO;
+            BigDecimal balance = BigDecimal.ZERO; //差额
+            BigDecimal kuanxiang = BigDecimal.ZERO; //差额
+            BigDecimal companyAmount = BigDecimal.ZERO; //公司收
+            BigDecimal subtrahend = BigDecimal.ZERO; //资方收
             LoanSettleCompanyCost companyCost = loanSettleCompanyCostService.selectByMainSid(sid);
             LoanSettleBankCost bankCost = loanSettleBankCostService.selectByMainSid(sid);
             if (null != bankCost) {
@@ -3299,11 +4020,37 @@ public class LoanSettleApplyService extends MybatisBaseService<LoanSettleApplyMa
                     }
                 }
             }
-            balance = amount.subtract(subtrahend);
+            if (null != companyCost) {
+                if (receivablesName.equals("名义价")) {
+                    if (null != companyCost.getCompanyNominalPrice()) {
+                        companyAmount = companyCost.getCompanyNominalPrice();
+                    }
+                }
+                if (receivablesName.equals("合同违约金")) {
+                    if (null != companyCost.getContractLiquidated()) {
+                        companyAmount = companyCost.getContractLiquidated();
+                    }
+                }
+                if (receivablesName.equals("其他费用")) {
+                    if (null != companyCost.getCompanyOtherPrice()) {
+                        companyAmount = companyCost.getCompanyOtherPrice();
+                    }
+                }
+            }
+            PlanNoReturnMoney p = baseMapper.selectNoReturnMoneyByType(planDetailsSid, receivablesName);
+            if (null != p) {
+                BigDecimal money = new BigDecimal(p.getMoney());
+                if (money.compareTo(BigDecimal.ZERO) == 0) {
+                    balance = companyAmount.subtract(subtrahend);
+                }
+            } else {
+                balance = companyAmount.subtract(subtrahend);
+            }
+            kuanxiang = amount.subtract(balance);
             vo.setBusSid(sid);
             vo.setAmount(amount);
             vo.setBalance(balance);
-            vo.setSubtrahend(subtrahend);
+            vo.setSubtrahend(kuanxiang);
             return rb.success().setData(vo);
         }
         return rb;
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
index 32c60211ed..537a465c37 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholding.vue
@@ -8,11 +8,20 @@
           <el-button size="small" class="searchbtn" @click="clicksearchShow">{{ searchxianshitit }}</el-button>
           <div v-show="isSearchShow" class="search">
             <el-form ref="listQueryform" :inline="true" :model="listQuery" label-width="100px" class="tab-header">
+              <el-form-item label="分公司">
+                <el-input v-model="listQuery.params.useOrgName" 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-select v-model="listQuery.params.brandSid" placeholder="请选择" filterable clearable>
                   <el-option v-for="item in brand_list" :key="item.sid" :label="item.brandName" :value="item.sid"/>
                 </el-select>
               </el-form-item>
+              <el-form-item label="申请名称">
+                <el-input v-model="listQuery.params.withApply" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="创建日期">
                 <el-date-picker v-model="listQuery.params.createStartTime" type="date" clearable value-format="yyyy-MM-dd" placeholder="选择日期"/>
                 <span style="padding: 0 8px">至</span>
@@ -53,7 +62,7 @@
               </template>
             </el-table-column>
             <el-table-column prop="withRebateTotal" label="预提返利" align="center" />
-            <el-table-column prop="expectCost" label="其中预提费用" align="center" />
+            <el-table-column prop="withholdCost" label="其中预提费用" align="center" />
             <el-table-column prop="createTime" label="创建日期" align="center" width="120" />
             <el-table-column prop="createByName" label="创建人" align="center" width="120" />
           </el-table>
@@ -132,9 +141,12 @@ export default {
       brand_list: [],
       listQuery: {
         params: {
+          useOrgName: '',
+          createByName: '',
           brandSid: '',
           createEndTime: '',
           createStartTime: '',
+          withApply: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
@@ -246,7 +258,7 @@ export default {
       req.listPage(this.listQuery).then((response) => {
         console.log('列表查询结果：', response)
         this.listLoading = false
-        if (response.success && response.data && response.data.total > 0) {
+        if (response.success) {
           this.list = response.data.records
           this.listQuery.total = response.data.total
         } else {
@@ -263,9 +275,12 @@ export default {
     handleReset() {
       this.listQuery = {
         params: {
+          useOrgName: '',
+          createByName: '',
           brandSid: '',
           createEndTime: '',
           createStartTime: '',
+          withApply: '',
           orgPath: '',
           userSid: '',
           menuUrl: ''
diff --git a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
index 964a0cb1b4..cac4c052ee 100644
--- a/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/bikerebate/bicyclerebatewithholding/bicyclerebatewithholdingAdd.vue
@@ -189,9 +189,9 @@ export default {
         for (var j in this.formobj.scmVehRebateWiths) {
           if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
             this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
-            this.formobj.scmVehRebateWiths[j].withRebate = parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
-            this.formobj.scmVehRebateWiths[j].expectTreatCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
-            this.formobj.scmVehRebateWiths[j].expectSuppCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
+            this.formobj.scmVehRebateWiths[j].withRebate = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
+            this.formobj.scmVehRebateWiths[j].expectTreatCost = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
+            this.formobj.scmVehRebateWiths[j].expectSuppCost = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
             this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
             v = 1
             break
@@ -231,9 +231,9 @@ export default {
           for (var j in aa) {
             if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
               aa[j].num = parseInt(aa[j].num) + parseInt(1)
-              aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
-              aa[j].expectTreatCost = parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
-              aa[j].expectSuppCost = parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
+              aa[j].withRebate = Math.round((parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
+              aa[j].expectTreatCost = Math.round((parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
+              aa[j].expectSuppCost = Math.round((parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
               aa[j].vehRebateSids.push(cval.sid)
               v = 1
               break
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
index bd11d4d595..c42a5a8226 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiDaiBanInfo.vue
@@ -58,14 +58,14 @@
       <el-form class="formaddcopy02" >
         <el-row v-show="currentLink" style="border-top: 1px solid #e0e3eb">
           <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>当前环节:</span></div>
-            <el-form-item><span class="addinputInfo addinputOne">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
+            <div class="span-sty"><span>当前环节:</span></div>
+            <el-form-item><span class="addinputInfo">{{ current.taskName }}->{{ nextNode.name }}</span></el-form-item>
           </el-col>
         </el-row>
         <el-row :class="{ rowClass:!currentLink }">
           <el-col :span="24">
-            <div class="span-sty spanTwoWidth"><span>意见:</span></div>
-            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputw addinputOne" clearable ></el-input></el-form-item>
+            <div class="span-sty"><span>意见:</span></div>
+            <el-form-item><el-input size="small" v-model="dialogList.comment" placeholder="审批意见" class="addinputInfo addinputw" clearable ></el-input></el-form-item>
           </el-col>
         </el-row>
         <div style="text-align:center;margin-top: 20px;">
diff --git a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
index 26ebb4caa2..7003613960 100644
--- a/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
+++ b/anrui-scm/anrui-scm-ui/src/views/workFlow/danchefanliyutiFlow/danchefanliyutiEdit.vue
@@ -177,9 +177,9 @@ export default {
         for (var j in this.formobj.scmVehRebateWiths) {
           if (this.formobj.scmVehRebateWiths[j].rebateTypeValue === cval.rebateTypeValue) {
             this.formobj.scmVehRebateWiths[j].num = parseInt(this.formobj.scmVehRebateWiths[j].num) + parseInt(1)
-            this.formobj.scmVehRebateWiths[j].withRebate = parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
-            this.formobj.scmVehRebateWiths[j].expectTreatCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
-            this.formobj.scmVehRebateWiths[j].expectSuppCost = parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
+            this.formobj.scmVehRebateWiths[j].withRebate = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].withRebate !== '' ? this.formobj.scmVehRebateWiths[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
+            this.formobj.scmVehRebateWiths[j].expectTreatCost = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].expectTreatCost !== '' ? this.formobj.scmVehRebateWiths[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
+            this.formobj.scmVehRebateWiths[j].expectSuppCost = Math.round((parseFloat(this.formobj.scmVehRebateWiths[j].expectSuppCost !== '' ? this.formobj.scmVehRebateWiths[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
             this.formobj.scmVehRebateWiths[j].vehRebateSids.push(cval.sid)
             v = 1
             break
@@ -219,9 +219,9 @@ export default {
           for (var j in aa) {
             if (aa[j].rebateTypeValue === cval.rebateTypeValue) {
               aa[j].num = parseInt(aa[j].num) + parseInt(1)
-              aa[j].withRebate = parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)
-              aa[j].expectTreatCost = parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)
-              aa[j].expectSuppCost = parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)
+              aa[j].withRebate = Math.round((parseFloat(aa[j].withRebate !== '' ? aa[j].withRebate : 0) + parseFloat(cval.withRebate !== '' ? cval.withRebate : 0)) * 100) / 100
+              aa[j].expectTreatCost = Math.round((parseFloat(aa[j].expectTreatCost !== '' ? aa[j].expectTreatCost : 0) + parseFloat(cval.expectTreatCost !== '' ? cval.expectTreatCost : 0)) * 100) / 100
+              aa[j].expectSuppCost = Math.round((parseFloat(aa[j].expectSuppCost !== '' ? aa[j].expectSuppCost : 0) + parseFloat(cval.expectSuppCost !== '' ? cval.expectSuppCost : 0)) * 100) / 100
               aa[j].vehRebateSids.push(cval.sid)
               v = 1
               break
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/SummaryQuery.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/SummaryQuery.java
new file mode 100644
index 0000000000..59e736b070
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/SummaryQuery.java
@@ -0,0 +1,37 @@
+package com.yxt.anrui.as.api.asbusrepairbill.report;
+
+import com.yxt.common.core.query.Query;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/26 9:35
+ */
+@Data
+public class SummaryQuery implements Query {
+
+    /**
+     * 开始日期结束
+     */
+    private String createEndTime;
+    /**
+     * 开始日期开始
+     */
+    private String createStartTime;
+    /**
+     * 1本日2本月3本年
+     */
+    private String dateType;
+    private String menuUrl;
+    private String orgPath;
+    /**
+     * 结算结束
+     */
+    private String settleEndTime;
+    /**
+     * 结算开始
+     */
+    private String settleStartTime;
+    private String userSid;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/SummaryVo.java b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/SummaryVo.java
new file mode 100644
index 0000000000..758440fc23
--- /dev/null
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/api/asbusrepairbill/report/SummaryVo.java
@@ -0,0 +1,70 @@
+package com.yxt.anrui.as.api.asbusrepairbill.report;
+
+import com.yxt.common.core.vo.Vo;
+import lombok.Data;
+
+/**
+ * @author Fan
+ * @description
+ * @date 2024/9/26 9:36
+ */
+@Data
+public class SummaryVo implements Vo {
+
+    /**
+     * 单据状态
+     */
+    private String billState;
+    /**
+     * 维修类型
+     */
+    private String billType;
+    /**
+     * 业务类型
+     */
+    private String busType;
+    /**
+     * 成本合计
+     */
+    private String costTotal;
+    /**
+     * 门店
+     */
+    private String deptName;
+    /**
+     * 折后金额
+     */
+    private String discountAmount;
+    /**
+     * 图号
+     */
+    private String goodsSkuCode;
+    /**
+     * 厂家名称
+     */
+    private String manufacturerName;
+    /**
+     * 名称
+     */
+    private String name;
+    /**
+     * 数量
+     */
+    private String num;
+    /**
+     * 利润
+     */
+    private String profit;
+    /**
+     * 工种
+     */
+    private String serviceType;
+    /**
+     * 供应商
+     */
+    private String supplierName;
+    /**
+     * 分公司
+     */
+    private String useOrgName;
+}
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
index c1822fecb4..929a12d3f9 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillRest.java
@@ -2,6 +2,8 @@ package com.yxt.anrui.as.biz.asbusrepairbill;
 
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbill.app.*;
+import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryVo;
 import com.yxt.anrui.as.api.asbusrepairbillinvoice.AsBusrepairBillInvoice;
 import com.yxt.anrui.as.api.asbusrepairbillsitem.AsBusrepairBillSitem;
 import com.yxt.anrui.as.api.asbusrepairbillsitemrepairer.AsBusrepairBillSitemRepairer;
@@ -297,4 +299,14 @@ public class AsBusrepairBillRest {
         return asBusrepairBillService.goodsConfrimInfoList(sid);
     }
 
+    //-------------------------------- 售后报表----------------------------------------
+    @PostMapping("/Summary")
+    @ApiOperation("业务汇总")
+    ResultBean<PagerVo<SummaryVo>> Summary(@RequestBody PagerQuery<SummaryQuery> pagerQuery) {
+        ResultBean<PagerVo<SummaryVo>> rb = ResultBean.fireFail();
+        PagerVo<SummaryVo> pv = asBusrepairBillService.Summary(pagerQuery);
+        return rb.success().setData(pv);
+    }
+
+
 }
diff --git a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
index f7e388dd45..6b8e48996e 100644
--- a/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
+++ b/yxt-as/src/main/java/com/yxt/anrui/as/biz/asbusrepairbill/AsBusrepairBillService.java
@@ -10,6 +10,8 @@ import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApply;
 import com.yxt.anrui.as.api.asbillsettelapply.AsBillSettelApplyDto;
 import com.yxt.anrui.as.api.asbusrepairbill.*;
 import com.yxt.anrui.as.api.asbusrepairbill.app.*;
+import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryQuery;
+import com.yxt.anrui.as.api.asbusrepairbill.report.SummaryVo;
 import com.yxt.anrui.as.api.asbusrepairbillaitem.AsBusrepairBillAitem;
 import com.yxt.anrui.as.api.asbusrepairbillaitemspec.AsBusrepairBillAitemspec;
 import com.yxt.anrui.as.api.asbusrepairbillinsurance.AsBusrepairBillInsurance;
@@ -1251,6 +1253,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             if (asBusrepairBill.getNodeCode() == 1) {
                 nodeCode = 2;
                 nodeName = "派工";
+                asBusrepairBill.setDispatchTime(new Date());
             } else if (asBusrepairBill.getNodeCode() == 2) {
                 nodeCode = 3;
                 nodeName = "维修";
@@ -1258,6 +1261,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
             } else if (asBusrepairBill.getNodeCode() == 3) {
                 nodeCode = 4;
                 nodeName = "竣工";
+                asBusrepairBill.setFinishTime(new Date());
             } else if (asBusrepairBill.getNodeCode() == 4) {
                 nodeCode = 5;
                 nodeName = "结算";
@@ -1430,6 +1434,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 asBusrepairBill.setNodeCode(6);
                 asBusrepairBill.setNodeName("已结算");
                 asBusrepairBill.setNodeTime(new DateTime());
+                asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date()));
                 if (asBusrepairBill.getMaterialConfirm().intValue() == 0) {
                     asBusrepairBill.setMaterialConfirm(1);
                     asBusrepairBill.setOutDoorState("2");
@@ -1507,6 +1512,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                         }
                     }
                 }
+                asBusrepairBill.setSettleTime(DateUtil.formatDate(new Date()));
                 asBusrepairBill.setNodeCode(6);
                 asBusrepairBill.setNodeName("已结算");
                 asBusrepairBill.setNodeTime(new DateTime());
@@ -1526,7 +1532,7 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
                 settelApplyDto.setSourceBillNo(dto.getBillNo());
                 settelApplyDto.setCustomerSid(dto.getCustomerSid());
                 settelApplyDto.setCustomerName(dto.getCustomerName());
-                 BigDecimal receivableAmount = BigDecimal.ZERO; // 应收金额
+                BigDecimal receivableAmount = BigDecimal.ZERO; // 应收金额
                 BigDecimal discountAmount = BigDecimal.ZERO; // 优惠金额
                 BigDecimal settleAmount = BigDecimal.ZERO; // 结算金额
                 if (StringUtils.isNotBlank(dto.getReceivableAmount())) {
@@ -2475,4 +2481,49 @@ public class AsBusrepairBillService extends MybatisBaseService<AsBusrepairBillMa
     public ResultBean updateOldIsReclaim(String billNo) {
         return baseMapper.updateOldIsReclaim(billNo);
     }
+
+    public PagerVo<SummaryVo> Summary(PagerQuery<SummaryQuery> pq) {
+        SummaryQuery query = pq.getParams();
+        QueryWrapper<AsBusrepairBill> qw = new QueryWrapper<>();
+        PrivilegeQuery privilegeQuery = new PrivilegeQuery();
+        privilegeQuery.setOrgPath(query.getOrgPath());
+        privilegeQuery.setUserSid(query.getUserSid());
+        ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
+        if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
+            //数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
+            String orgSidPath = query.getOrgPath();
+            orgSidPath = orgSidPath + "/";
+            int i1 = orgSidPath.indexOf("/");
+            int i2 = orgSidPath.indexOf("/", i1 + 1);
+            int i3 = orgSidPath.indexOf("/", i2 + 1);
+            int i4 = orgSidPath.indexOf("/", i3 + 1);
+            String orgLevelKey = defaultIdReltBean.getData();
+            if ("1".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i1);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("2".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i2);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("3".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i3);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("4".equals(orgLevelKey)) {
+                orgSidPath = orgSidPath.substring(0, i4);
+                qw.like("s.orgSidPath", orgSidPath);
+            } else if ("5".equals(orgLevelKey)) {
+                qw.eq("a.createBySid", query.getUserSid());
+            } else {
+                PagerVo<SummaryVo> p = new PagerVo<>();
+                return p;
+            }
+        } else {
+            PagerVo<SummaryVo> p = new PagerVo<>();
+            return p;
+        }
+//        IPage<AsBusrepairBill> page = PagerUtil.queryToPage(pq);
+//        IPage<SummaryVo> pagging = baseMapper.Summary(page, qw);
+//        PagerVo<SummaryVo> p = PagerUtil.pageToVo(pagging, null);
+//        return p;
+        return null;
+    }
 }