Merge remote-tracking branch 'origin/master'

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousMapper.xml

@@ -25,7 +25,7 @@
     </select>
     <select id="getDepositRecords"
             resultType="com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo">
-        SELECT bso.billNo       as contractId,
+       <!-- SELECT bso.billNo       as contractId,
                bdf.price        as usePrice,
                bdf.createTime   as useDate,
                bso.sid          as salesOrderSid,
@@ -33,7 +33,44 @@
         FROM bus_deposit_fictitious bdf
                  LEFT JOIN bus_sales_order_deposit bsod ON bdf.depositSid = bsod.sid
                  LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid
-        WHERE bdf.depositBillNo = #{depositBillNo}
+        WHERE bdf.depositBillNo = #{depositBillNo}-->
+
+        SELECT
+        COALESCE (  f.`thisUseMoney` , 0 ) as usePrice,f.billNo as contractId,f.customerName as customer,concat('简易订单转',f.receivablesName) as purpose,f.sid as salesOrderSid
+        FROM
+        anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_collection_confirmation fc on fc.sid = d.collSid
+        LEFT JOIN (
+        SELECT
+        f.busSid,
+        ffd.subscriptionMoney as thisUseMoney,
+        fa.billNo,
+        ffd.customerName,
+        ffd.receivablesName,
+        fa.sid,
+        ffd.sid selectSid
+        FROM
+        anrui_fin.fin_selected_receivables_detailed ffd
+        left join anrui_fin.`fin_funds_carried_forward_apply` fa on ffd.collSid = fa.sid
+        left join anrui_fin.fin_funds_carried_forward_veh f ON f.mainSid = fa.sid
+        WHERE
+        fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE
+        (d.`auditState` = 3 or d.auditState = 1)
+        and fc.busSid = #{depositBillNo}
+        group by f.selectSid
+        having usePrice>0
+        union all
+        SELECT
+        COALESCE ( bf.price, 0 ) as usePrice,bso.billNo as contractId,bso.customerName as customer,'简易订单转订金' as purpose,bso.sid as salesOrderSid
+        FROM
+        bus_deposit_fictitious bf
+        LEFT JOIN bus_sales_order_deposit bsod ON bf.depositSid = bsod.sid
+        LEFT JOIN bus_sales_order bso ON bso.sid = bsod.salesOrderSid
+        where depositBillSid =#{depositBillNo}
+        group by bso.billNo
+        having usePrice>0
     </select>
 
     <select id="getList"

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/busdepositfictitious/BusDepositFictitiousRest.java

@@ -28,6 +28,8 @@ package com.yxt.anrui.buscenter.biz.busdepositfictitious;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousDetailsVo;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositFictitiousFeign;
 import com.yxt.anrui.buscenter.api.busdepositfictitious.BusDepositRecordsVo;
+import com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit;
+import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
 import com.yxt.common.core.result.ResultBean;
 import io.swagger.annotations.Api;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,14 +57,17 @@ import java.util.List;
 public class BusDepositFictitiousRest implements BusDepositFictitiousFeign {
     @Autowired
     BusDepositFictitiousService busDepositFictitiousService;
+    @Autowired
+    private BusMainDepositService busMainDepositService;
 
     @Override
     public ResultBean<List<BusDepositRecordsVo>> getDepositRecords(String depositBillNo) {
         ResultBean rb = ResultBean.fireFail();
-        List<BusDepositRecordsVo> list = busDepositFictitiousService.getDepositRecords(depositBillNo);
+        BusMainDeposit busMainDeposit = busMainDepositService.selectByBillNo(depositBillNo);
-        for (BusDepositRecordsVo busDepositRecordsVo : list) {
+        List<BusDepositRecordsVo> list = busDepositFictitiousService.getDepositRecords(busMainDeposit.getSid());
+       /* for (BusDepositRecordsVo busDepositRecordsVo : list) {
             busDepositRecordsVo.setPurpose("简易订单转订金");
-        }
+        }*/
         return rb.success().setData(list);
     }
 

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

@@ -141,4 +141,6 @@ public interface BusMainDepositMapper extends BaseMapper<BusMainDeposit> {
     int updateModify(@Param("date") Date date, @Param("sid") String businessSid);
 
     String selectUseMainMoney(String busMainSid);
+
+    BusMainDeposit selectByBillNo(String depositBillNo);
 }

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

@@ -383,27 +383,36 @@
     </update>
 
     <select id="selectUseMainMoney" resultType="java.lang.String">
+        select ifnull(sum(d.useDeposit),0) from
+        (SELECT
+        COALESCE ( SUM( f.`thisUseMoney` ), 0 ) as useDeposit
+        FROM
+        anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_collection_confirmation fc on fc.sid = d.collSid
+        LEFT JOIN (
         SELECT
-            COALESCE ( SUM( f.`thisUseMoney` ), 0 ) as useDeposit
+        f.busSid,
+        f.thisUseMoney
         FROM
-            anrui_fin.fin_selected_receivables_detailed d
+        anrui_fin.fin_funds_carried_forward_veh f
-                left join anrui_fin.fin_collection_confirmation fc on fc.sid = d.collSid
+        JOIN anrui_fin.`fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
-                LEFT JOIN (
+        WHERE
-                SELECT
+        fa.`nodeState` != '终止'
-                    f.busSid,
+        ) f ON f.`busSid` = d.`sid`
-                    f.thisUseMoney
-                FROM
-                    anrui_fin.fin_funds_carried_forward_veh f
-                        JOIN anrui_fin.`fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
-                WHERE
-                    fa.`nodeState` != '终止'
-            ) f ON f.`busSid` = d.`sid`
         WHERE
-            (d.`auditState` = 3 or d.auditState = 1)
+        (d.`auditState` = 3 or d.auditState = 1)
-          and fc.busSid = '3cb0600c-0a26-4278-9120-99565327c84d'
+        and fc.busSid = #{busMainSid}
         GROUP BY
-            d.`sid`
+        d.`sid`
+        union all
+        SELECT
+        COALESCE ( SUM(bf.price), 0 ) as useDeposit
+        FROM
+        bus_deposit_fictitious bf where depositBillSid = #{busMainSid}) d
 
+    </select>
 
+    <select id="selectByBillNo" resultType="com.yxt.anrui.buscenter.api.busmaindeposit.BusMainDeposit">
+        select * from bus_main_deposit where billNo = #{depositBillNo}
     </select>
 </mapper>

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

@@ -230,6 +230,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
         IPage<BusMainDepositListVo> pagging = baseMapper.selectPageVo(page, qw);
         List<BusMainDepositListVo> list = pagging.getRecords();
         for (BusMainDepositListVo vo : list) {
+            if (vo.getDepositBillTypeKey().equals("01")) {
+                String useDepositMoney = getUseFin(vo.getSid());
+                vo.setUsedDeposit(useDepositMoney);
+            }
             if (vo.getDepositBillTypeKey().equals("02")) {
                 BusDepositVehicleCustomer busDepositVehicleCustomer = baseMapper.selectVehicleCustomerByBillSid(vo.getSid());
                 if (busDepositVehicleCustomer != null) {
@@ -644,6 +648,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 AppBusDepositBusDetailsVo vo = baseMapper.selDepositByBillsid(virtualOrderSid);
                 record.setPayName(vo.getPayName());
                 record.setMobile(vo.getMobile());
+                String useDepositMoney =getUseFin(record.getVirtualOrderSid());
                 //判断财务是否已审核
                 if ("已办结".equals(record.getVirtualOrderState())) {
                     //查询款项确认的busSid是否存在该申请的sid
@@ -660,7 +665,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                             } else {
                                 record.setPaymentState("已确认");
                                 if (StringUtils.isNotBlank(record.getUsedDeposit())) {
-                                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + record.getUsedDeposit() + "元");
+                                    record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + useDepositMoney + "元");
                                 } else {
                                     record.setDescribe("订金: " + vo.getDeposit() + "元 已用:" + "0" + "元");
                                 }
@@ -690,7 +695,7 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
                 record.setShowDeleteBtn(false);
                 record.setShowUpdateBtn(false);
             }
-            List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderId());
+            List<BusDepositRecordsVo> depositRecords = busDepositFictitiousService.getDepositRecords(record.getVirtualOrderSid());
             if (depositRecords.size() > 0) {
                 record.setShowDepositBtn(true);
             } else {
@@ -1882,8 +1887,10 @@ public class BusMainDepositService extends MybatisBaseService<BusMainDepositMapp
     public String getUseFin(String busMainSid){
         //根据已审核通过的简易订单订金查询已款项结转通过的
         String useMainMoney = baseMapper.selectUseMainMoney(busMainSid);
-
+        return useMainMoney;
-        return null;
     }
 
+    public BusMainDeposit selectByBillNo(String depositBillNo) {
+        return baseMapper.selectByBillNo(depositBillNo);
+    }
 }

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

@@ -1565,10 +1565,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                 busDepositFictitious.setDepositBillNo(listVo.getVirtualOrderId());
                                 busDepositFictitious.setDepositBillSid(listVo.getVirtualOrderSid());
                                 busDepositFictitiousService.save(busDepositFictitious);
-                                //查询该虚拟订金单已使用的订金值
+                               /* //查询该虚拟订金单已使用的订金值
                                 String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
                                 //更新该虚拟订单的订金值
-                                busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
+                                busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());*/
                             }
                         }
                     }
@@ -1622,10 +1622,10 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                                     busDepositFictitious.setDepositBillNo(listVo.getVirtualOrderId());
                                     busDepositFictitious.setDepositBillSid(listVo.getVirtualOrderSid());
                                     busDepositFictitiousService.save(busDepositFictitious);
-                                    //查询该虚拟订金单已使用的订金值
+                                    /*//查询该虚拟订金单已使用的订金值
                                     String depositAll = busDepositFictitiousService.selectDeposit(listVo.getVirtualOrderId());
                                     //更新该虚拟订单的订金值
-                                    busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
+                                    busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());*/
                                 }
                             }
                         }
@@ -2764,7 +2764,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if (busSalesOrderDeposit != null) {
             if (BusSalesOrderConstantUtils.DepositType.DEPOSIT_CARRY_FORWARD.getCode().equals(busSalesOrderDeposit.getDepositTypeKey())) {
                 //根据订金sid查询虚拟订单和订金的关联
-                List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+               /* List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
                 listVos.removeAll(Collections.singleton(null));
                 if (!listVos.isEmpty()) {
                     for (AppBusSalesOrderDepositListVo listVo : listVos) {
@@ -2774,7 +2774,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
                         //更新该虚拟订单的订金值
                         busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
                     }
-                }
+                }*/
             }
             //删除订金信息
             busSalesOrderDepositService.deleteByOrderSid(sid);
@@ -5865,11 +5865,11 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             return rb.setMsg("该虚拟订金使用记录不存在");
         }
         //更新
-        //查询该虚拟订金单已使用的订金值
+       /* //查询该虚拟订金单已使用的订金值
         String depositAll = busDepositFictitiousService.selectDeposit(busDepositFictitious.getDepositBillNo());
         depositAll = new BigDecimal(depositAll).subtract(busDepositFictitious.getPrice()).toString();
         //更新该虚拟订单的订金值
-        busDepositService.updateDeposit(depositAll, busDepositFictitious.getDepositBillNo());
+        busDepositService.updateDeposit(depositAll, busDepositFictitious.getDepositBillNo());*/
         busDepositFictitiousService.deleteBySid(depositRecordSid);
         return rb.success();
     }

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositMapper.xml

@@ -43,19 +43,44 @@
 
     <select id="getDepositList" resultType="com.yxt.anrui.buscenter.api.bussalesorderdeposit.app.AppDepositListVo">
         select bmd.sid         as virtualSid,
-               bmd.depositBillType,
+        bmd.depositBillType,
-               bmd.billNo      as virtualId,
+        bmd.billNo      as virtualId,
-               bmd.createDate  as date,
+        bmd.createDate  as date,
-               bmd.staffName   as sellerName,
+        bmd.staffName   as sellerName,
-               bd.draweeName   as payName,
+        bd.draweeName   as payName,
-               bd.draweeMobile as mobile,
+        bd.draweeMobile as mobile,
-               bd.deposit,
+        bd.deposit,
-               bd.usedDeposit  as usePeposit
+        bfs.useDeposit as usePeposit,
+        cast((bd.deposit-bfs.useDeposit) AS DECIMAL ( 10, 2 )) as dblances
         from bus_main_deposit bmd
-                 left join bus_deposit bd on bd.billSid = bmd.sid
+        left join bus_deposit bd on bd.billSid = bmd.sid
+        left join (select ifnull(sum(d.useDeposit),0) as useDeposit,d.busSid  from (SELECT
+        COALESCE ( SUM( f.`thisUseMoney` ), 0 ) as useDeposit,fc.busSid
+        FROM
+        anrui_fin.fin_selected_receivables_detailed d
+        left join anrui_fin.fin_collection_confirmation fc on fc.sid = d.collSid
+        LEFT JOIN (
+        SELECT
+        f.busSid,
+        f.thisUseMoney
+        FROM
+        anrui_fin.fin_funds_carried_forward_veh f
+        JOIN anrui_fin.`fin_funds_carried_forward_apply` fa ON f.mainSid = fa.sid
+        WHERE
+        fa.`nodeState` != '终止'
+        ) f ON f.`busSid` = d.`sid`
+        WHERE
+        (d.`auditState` = 3 or d.auditState = 1) and LENGTH(fc.busSid)>0
+        GROUP BY
+        d.`sid`
+        union all
+        SELECT
+        COALESCE ( SUM(bf.price), 0 ) as useDeposit,bf.depositBillSid as busSid
+        FROM
+        bus_deposit_fictitious bf)d GROUP BY d.busSid) bfs on bfs.busSid = bmd.sid
         <where>
             ${ew.sqlSegment}
-              and IFNULL(bd.usedDeposit, 0) &lt;&gt; IFNULL(bd.deposit, 0)
+             <!-- and IFNULL(bd.usedDeposit, 0) &lt;&gt; IFNULL(bd.deposit, 0)-->
             <if test="name != null and name != ''">
                 and concat(bd.draweeName
                   , bmd.billNo) LIKE concat('%'
@@ -63,6 +88,8 @@
                   , '%')
             </if>
         </where>
+        group by bmd.sid
+        HAVING dblances>0
     </select>
 
     <update id="updateMakeUpDeposit">

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorderdeposit/BusSalesOrderDepositService.java

@@ -41,6 +41,7 @@ import com.yxt.anrui.buscenter.api.bussalesorderprice.BusSalesOrderPrice;
 import com.yxt.anrui.buscenter.api.common.BusSalesOrderConstantUtils;
 import com.yxt.anrui.buscenter.biz.busdeposit.BusDepositService;
 import com.yxt.anrui.buscenter.biz.busdepositfictitious.BusDepositFictitiousService;
+import com.yxt.anrui.buscenter.biz.busmaindeposit.BusMainDepositService;
 import com.yxt.anrui.buscenter.biz.bussalesorder.BusSalesOrderService;
 import com.yxt.anrui.buscenter.biz.bussalesorderprice.BusSalesOrderPriceService;
 import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationFeign;
@@ -93,6 +94,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
     private FileUploadComponent fileUploadComponent;
     @Autowired
     private FinCollectionConfirmationFeign finCollectionConfirmationFeign;
+    @Autowired
+    private BusMainDepositService busMainDepositService;
 
     public String saveOrderDepo(BusSalesOrderDepositDto busSalesOrderDepositDto, String sid) {
         BusSalesOrderDeposit busSalesOrderDeposit = new BusSalesOrderDeposit();
@@ -306,7 +309,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
             }
             //查询该订金信息的结转信息中已结转的，再加回至简易订金单的已使用订金中
             //根据订金sid查询虚拟订单和订金的关联
-            List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
+           /* List<AppBusSalesOrderDepositListVo> listVos = busDepositFictitiousService.getList(busSalesOrderDeposit.getSid());
             listVos.removeAll(Collections.singleton(null));
             if (!listVos.isEmpty()) {
                 for (AppBusSalesOrderDepositListVo listVo : listVos) {
@@ -316,7 +319,7 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     //更新该虚拟订单的订金值
                     busDepositService.updateDeposit(depositAll, listVo.getVirtualOrderId());
                 }
-            }
+            }*/
         }
         List<AppBusSalesOrderDepositListVo> list = busDepositFictitiousService.getList(depositSid);
         list.removeAll(Collections.singleton(null));
@@ -344,10 +347,10 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
                     busDepositFictitious.setPayPath(payPath);
                 }
                 busDepositFictitiousService.save(busDepositFictitious);
-                //查询该虚拟订金单已使用的订金值
+               /* //查询该虚拟订金单已使用的订金值
                 String depositAll = busDepositFictitiousService.selectDeposit(listDto.getDepositBillNo());
                 //更新该虚拟订单的订金值
-                busDepositService.updateDeposit(depositAll, listDto.getDepositBillNo());
+                busDepositService.updateDeposit(depositAll, listDto.getDepositBillNo());*/
                 bigDecimalAll = bigDecimalAll.add(new BigDecimal(listDto.getPrice()));
             }
             if (bigDecimalAll.compareTo(new BigDecimal(dto.getDepositAll())) > 0) {
@@ -367,7 +370,8 @@ public class BusSalesOrderDepositService extends MybatisBaseService<BusSalesOrde
         if (!list.isEmpty()) {
             for (AppDepositListVo vo : list) {
                 String deposit = vo.getDeposit();
-                String useDeposit = vo.getUsePeposit();
+//                String useDeposit = vo.getUsePeposit();
+                String useDeposit = busMainDepositService.getUseFin(vo.getVirtualSid());
                 if (StringUtils.isNotBlank(deposit)) {
                     if (StringUtils.isNotBlank(useDeposit)) {
                         vo.setRemainderMoney((new BigDecimal(deposit).subtract(new BigDecimal(useDeposit))).toString());

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/agencyfund/agencyfundAdd.vue

@@ -263,7 +263,7 @@
             </el-col>
             <el-col :span="14">
               <div>
-                <div class="tableTitle">已选应收款项明细</div>
+                <div class="tableTitle">已选款项明细</div>
                 <el-table border :key="selectedreceivableKey" width="100%" :data="formobj.finSelectedReceivablesDetaileds">
                   <el-table-column fixed label="操作" align="center" width="70">
                     <template slot-scope="scope">

anrui-buscenter/anrui-finmanage-ui/src/views/anruifinmanagement/paymentConfirmation/acknowledgementReceiptAdd.vue

@@ -242,7 +242,7 @@
             </el-col>
             <el-col :span="14">
               <div>
-                <div class="tableTitle">已选应收款项明细</div>
+                <div class="tableTitle">已选款项明细</div>
                 <el-table border :key="selectedreceivableKey" width="100%" :data="formobj.finSelectedReceivablesDetaileds">
                   <el-table-column fixed label="操作" align="center" width="70">
                     <template slot-scope="scope">

anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforward.vue

@@ -12,6 +12,9 @@
               <el-form-item label="部门">
                 <el-input v-model="listQuery.params.applyDeptName" placeholder="" clearable/>
               </el-form-item>
+              <el-form-item label="单据编号">
+                <el-input v-model="listQuery.params.billNo" placeholder="" clearable/>
+              </el-form-item>
               <el-form-item label="申请人">
                 <el-input v-model="listQuery.params.createByName" placeholder="" clearable/>
               </el-form-item>
@@ -49,7 +52,7 @@
                 <el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
               </template>
             </el-table-column>
-            <el-table-column label="状态" width="180px" header-align="center">
+            <el-table-column label="状态" width="130" header-align="center">
               <template slot-scope="scope">
                 <span v-if="scope.row.nodeState=='待提交'" type="primary" size="mini">待提交</span>
                 <span v-else @click="flowRecord(scope.row)" class="bluezi">{{ scope.row.nodeState }}</span>
@@ -192,6 +195,7 @@ export default {
         total: 0,
         params: {
           userSid: '',
+          billNo: '',
           createByName: '',
           applyDeptName: '',
           applyStartDate: '',
@@ -317,6 +321,7 @@ export default {
         total: 0,
         params: {
           userSid: '',
+          billNo: '',
           createByName: '',
           applyDeptName: '',
           applyStartDate: '',

anrui-buscenter/anrui-finmanage-ui/src/views/moneycarriedforward/moneycarriedforwardAdd.vue

@@ -204,7 +204,7 @@
             </el-col>
             <el-col :span="14">
               <div>
-                <div class="tableTitle">已选应收款项明细</div>
+                <div class="tableTitle">已选款项明细</div>
                 <el-table border :key="selectedreceivableKey" width="100%" :data="formobj.yxysFinFundsCarriedForwardYXYSKXVos">
                   <el-table-column fixed label="操作" align="center" width="70">
                     <template slot-scope="scope">

anrui-buscenter/anrui-finmanage-ui/src/views/workFlow/kuanxiangjiezhuanFlow/moneycarriedforwardEdit.vue

@@ -203,7 +203,7 @@
             </el-col>
             <el-col :span="14">
               <div>
-                <div class="tableTitle">已选应收款项明细</div>
+                <div class="tableTitle">已选款项明细</div>
                 <el-table border :key="selectedreceivableKey" width="100%" :data="formobj.yxysFinFundsCarriedForwardYXYSKXVos">
                   <el-table-column fixed label="操作" align="center" width="70">
                     <template slot-scope="scope">

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java

@@ -516,6 +516,9 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
         if(StringUtils.isNotBlank(params.getMobile())){
             qw.like("fd.customerPhone",params.getMobile());
         }
+        if(StringUtils.isNotBlank(params.getVinNo())){
+            qw.like("bv.linkNo",params.getVinNo());
+        }
         IPage<FinSelectReceivablesDetailedVo> pagging = baseMapper.selectPageLists(page, qw, params.getName());
         return pagging;
     }

anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangtaizhang/cheliangtaizhang.vue

@@ -173,6 +173,13 @@
                   <el-form-item label="配置编码">
                     <el-input v-model="listQuery.params.configCode" maxlength="125" placeholder="" class="addinputw" clearable/>
                   </el-form-item>
+                  <el-form-item label="更多配置">
+                    <div style="display: flex;flex-direction: row;align-items: flex-start;align-items: center">
+                      <el-input v-model="listQuery.params.otherConfigOne" maxlength="125" placeholder="" class="addinputw" clearable/>
+                      <el-input v-model="listQuery.params.otherConfigTwo" maxlength="125" placeholder="" class="addinputw" clearable/>
+                      <el-input v-model="listQuery.params.otherConfigThree" maxlength="125" placeholder="" class="addinputw" clearable/>
+                    </div>
+                  </el-form-item>
                 </el-collapse-item>
                 <el-collapse-item title="常用查询" name="3">
                   <el-form-item label="存放地点">
@@ -212,6 +219,21 @@
                   <el-form-item label="排产订单编号">
                     <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable class="addinputw"/>
                   </el-form-item>
+                  <el-form-item label="厂家库龄">
+                    <el-input v-model="listQuery.params.libraryAge" placeholder="" clearable class="addinputw"/>
+                  </el-form-item>
+                  <el-form-item label="公司库龄">
+                    <el-input v-model="listQuery.params.orgLibraryAge" placeholder="" clearable class="addinputw"/>
+                  </el-form-item>
+                  <el-form-item label="买断库龄">
+                    <el-input v-model="listQuery.params.settlementLibraryAge" placeholder="" clearable class="addinputw"/>
+                  </el-form-item>
+                  <el-form-item label="分公司">
+                    <el-input v-model="listQuery.params.orgName" placeholder="" clearable class="addinputw"/>
+                  </el-form-item>
+                  <el-form-item label="采购系统">
+                    <el-input v-model="listQuery.params.purchaseSystemName" placeholder="" clearable class="addinputw"/>
+                  </el-form-item>
                   <el-form-item label="厂家入库日期">
                     <el-date-picker value-format="yyyy-MM-dd" v-model="listQuery.params.applicationDateStart" clearable  type="date" placeholder="开始日期"/>
                     <span style="padding: 0 8px">至</span>
@@ -612,7 +634,18 @@ export default {
           salesEndDate: '',
           solidStartDate: '',
           solidEndDate: '',
-          manPurOrderTypeKey: ''
+          manPurOrderTypeKey: '',
+          libraryAge: '',
+          orgLibraryAge: '',
+          settlementLibraryAge: '',
+          menuUrl: '',
+          userSid: '',
+          orgName: '',
+          purchaseSystemName: '',
+          orgSidPath: '',
+          otherConfigOne: '',
+          otherConfigTwo: '',
+          otherConfigThree: ''
         },
         current: 1,
         size: 5,
@@ -1013,6 +1046,9 @@ export default {
     // 查询列表信息
     getList() {
       this.listLoading = true
+      this.listQuery.params.userSid = window.sessionStorage.getItem('userSid')
+      this.listQuery.params.orgSidPath = window.sessionStorage.getItem('defaultOrgPath')
+      this.listQuery.params.menuUrl = this.$route.path
       pagerList(this.listQuery).then((response) => {
         this.listLoading = false
         if (response.success) {
@@ -1081,7 +1117,18 @@ export default {
           salesEndDate: '',
           solidStartDate: '',
           solidEndDate: '',
-          manPurOrderTypeKey: ''
+          manPurOrderTypeKey: '',
+          libraryAge: '',
+          orgLibraryAge: '',
+          settlementLibraryAge: '',
+          menuUrl: '',
+          userSid: '',
+          orgName: '',
+          purchaseSystemName: '',
+          orgSidPath: '',
+          otherConfigOne: '',
+          otherConfigTwo: '',
+          otherConfigThree: ''
         },
         current: 1,
         size: 5,

anrui-scm/anrui-scm-ui/src/views/workFlow/weishoumaiduanFlow/weishoumaiduanguanli/weushoumaiduanEdit.vue

@@ -279,26 +279,6 @@ export default {
           this.payment_list = res.data
         }
       })
-      getOrgSidByPath({ orgPath: window.sessionStorage.getItem('defaultOrgPath') }).then((resp) => {
-        if (resp.success) {
-          this.formobj.useOrgSid = resp.data
-          fetchBySid(resp.data).then((res) => {
-            if (res.success) {
-              this.formobj.useOrgName = res.data.name
-            }
-          })
-          fetchDetailsByUseOrgSid(resp.data).then((res) => {
-            if (res.success) {
-              this.orgDept_list = res.data
-            }
-          })
-          brandDown({ useOrg: resp.data }).then((res) => {
-            if (res.success) {
-              this.carBrand_list = res.data
-            }
-          })
-        }
-      })
     },
     UpNumber(e, row) {
       e.target.value = e.target.value.replace(/[^\d]/g, '') // 清除“数字”和“.”"-"以外的字符
@@ -362,6 +342,26 @@ export default {
       req.fetchBySid(sid).then((resp) => {
         this.formobj = resp.data
         this.formobj.instanceId = resp.data.procInstId
+        getOrgSidByPath({ orgPath: this.formobj.orgPath }).then((respsone) => {
+          if (respsone.success) {
+            this.formobj.useOrgSid = respsone.data
+            fetchBySid(respsone.data).then((res) => {
+              if (res.success) {
+                this.formobj.useOrgName = res.data.name
+              }
+            })
+            fetchDetailsByUseOrgSid(respsone.data).then((res) => {
+              if (res.success) {
+                this.orgDept_list = res.data
+              }
+            })
+            brandDown({ useOrg: respsone.data }).then((res) => {
+              if (res.success) {
+                this.carBrand_list = res.data
+              }
+            })
+          }
+        })
       }).catch((e) => {
         this.formobj = {}
       })