Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeign.java

@@ -1,10 +1,5 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
-import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleDto;
-import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleQuery;
-import com.yxt.anrui.buscenter.api.busordervehicle.ExpectInvoicevehicleVo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import com.yxt.common.core.query.PagerQuery;

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyFeignFallback.java

@@ -1,7 +1,5 @@
 package com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply;
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;
 import com.yxt.common.core.vo.PagerVo;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyRest.java

@@ -1,11 +1,7 @@
 package com.yxt.anrui.buscenter.biz.busarrearscarryvehicleapply;
 
-import cn.hutool.core.bean.BeanUtil;
 import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
-import com.yxt.anrui.buscenter.api.busmaindeposit.AppBusMainDepositVo;
 import com.yxt.common.base.utils.PagerUtil;
 import com.yxt.common.core.query.PagerQuery;
 import com.yxt.common.core.result.ResultBean;

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busarrearscarryvehicleapply/BusArrearsCarryVehicleApplyService.java

@@ -5,8 +5,6 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixDto;
 import com.yxt.anrui.base.api.commonappendix.CommonAppendixFeign;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.*;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsDto;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicledetails.BusArrearsCarryVehicleDetailsVo;

anrui-buscenter/anrui-buscenter-ui/src/api/jichuxinxi/crmcustomer.js

@@ -69,6 +69,18 @@ export function deleteBySids(data) {
   })
 }
 
+// 推送财务数据
+export function sendFinCustomer(data) {
+  return request({
+    url: '/crm/v1/crmcustomertemp/sendFinCustomer',
+    method: 'post',
+    data: data,
+    headers: {
+      'Content-Type': 'application/json'
+    }
+  })
+}
+
 // Pc端分页查询中介单位（经销商）
 export function getPcDistributorList(data) {
   return request({

anrui-buscenter/anrui-buscenter-ui/src/views/kehuguanli/kehuchaxun/kehuchaxun.vue

@@ -106,7 +106,7 @@
 </template>
 
 <script>
-import { listPageByOrgPathSid } from '@/api/jichuxinxi/crmcustomer'
+import { listPageByOrgPathSid, sendFinCustomer } from '@/api/jichuxinxi/crmcustomer'
 import { typeValues } from '@/api/dictcommons/shujuzidian'
 import Pagination from '@/components/pagination'
 import pageye from '@/components/pagination/pageye'
@@ -129,6 +129,13 @@ export default {
     return {
       btndisabled: false,
       btnList: [
+        {
+          type: 'primary',
+          size: 'small',
+          icon: '',
+          btnKey: 'toPush',
+          btnLabel: '推送财务数据'
+        },
         {
           type: 'info',
           size: 'small',
@@ -178,6 +185,9 @@ export default {
     btnHandle(btnKey) {
       console.log('XXXXXXXXXXXXXXX    ' + btnKey)
       switch (btnKey) {
+        case 'toPush':
+          this.toPush()
+          break
         case 'doClose':
           this.doClose()
           break
@@ -261,6 +271,7 @@ export default {
       row.forEach((element) => {
         aa.push(element.sid)
       })
+      this.sids = aa
     },
     // 查看詳情
     handleCheck(row) {
@@ -288,6 +299,17 @@ export default {
         }
       })
     },
+    toPush() {
+      if (this.sids.length === 0) {
+        this.$message({ showClose: true, type: 'error', message: '请选择一条记录进行推送财务数据的操作' })
+      } else {
+        sendFinCustomer(this.sids).then((res) => {
+          if (res.success) {
+            this.$message({ showClose: true, type: 'success', message: '推送成功' })
+          }
+        })
+      }
+    },
     doClose() {
       this.$store.dispatch('tagsView/delView', this.$route)
       this.$router.go(-1)

anrui-terminal/anrui-terminal-biz/src/main/java/com/yxt/anrui/terminal/biz/arrearsTakeCar/AppBusArrearsCarryVehicleApplyService.java

@@ -1,13 +1,9 @@
 package com.yxt.anrui.terminal.biz.arrearsTakeCar;
 
 
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoicePageVo;
-import com.yxt.anrui.buscenter.api.busadvanceginvoiceapply.AppAdvanceInvoiceQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehiclePageVo;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.AppArrearsCarryVehicleQuery;
 import com.yxt.anrui.buscenter.api.busarrearscarryvehicleapply.BusArrearsCarryVehicleApplyFeign;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AdvanceInvoicePageVo;
-import com.yxt.anrui.terminal.api.autoservice.advanceInvoice.AppBusAdvanceGinvoiceapplyFeign;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehiclePageVo;
 import com.yxt.anrui.terminal.api.autoservice.arrearsTakeCar.ArrearsCarryVehicleQuery;
 import com.yxt.anrui.terminal.config.CoverUtils;