Browse Source

Merge remote-tracking branch 'origin/master'

zhanglei
dimengzhe 2 years ago
parent
commit
6ca4240909
  1. 6
      anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java
  2. 9
      anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue
  3. 6
      anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue
  4. 5
      anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue
  5. 10
      anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue
  6. 27
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/dingdanchaxun/xiaoshoudingdanchaxun.vue
  7. 10
      anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue
  8. 44
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java
  9. 4
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java
  10. 5
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java
  11. 42
      anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java
  12. 7
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.java
  13. 33
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml
  14. 8
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedRest.java
  15. 104
      anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedService.java
  16. 2
      anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

6
anrui-base/anrui-base-api/src/main/java/com/yxt/anrui/base/api/basevehicleout/BaseVehicleOutDto.java

@ -75,7 +75,7 @@ public class BaseVehicleOutDto implements Dto {
@ApiModelProperty("中介人2编码")
private String middleCodeTwo;
@ApiModelProperty("创建组织sid")
private String createOrgSid; // 创建组织sid
private String createOrgSid;
@ApiModelProperty("上装/挂车物料分组code")
private String trailerOrInstallMGroupCode;
@ -95,10 +95,10 @@ public class BaseVehicleOutDto implements Dto {
private String totalDealPrice;
@ApiModelProperty("单据编号")
private String billNo; // 单据编号
private String billNo;
@ApiModelProperty("是否要修改客户")
private String isUpdateOrInsertCrm; // 是否要修改客户
private String isUpdateOrInsertCrm;
@ApiModelProperty("财务中客户编码")
private String cwCustomerNo;

9
anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicereceive.vue

@ -62,11 +62,6 @@
<div class="">
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;">
<el-table-column fixed label="序号" width="60" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" width="180" 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 label="创建日期" align="center" width="120">
<template slot-scope="scope">
<span>{{ scope.row.createTime }}</span>
@ -259,6 +254,7 @@ export default {
this.payType_list = res.data
}
})
this.getList()
},
//
indexMethod(index) {
@ -315,9 +311,6 @@ export default {
}
this.getList()
},
toInfo(row) {
this.viewState = 3
},
handleLook(row) {
this.dialogVisible = true
this.image_list = row.receiveFilesList

6
anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/InternalinvoicereceiveAdd.vue

@ -75,7 +75,7 @@
</el-row>
<el-row>
<el-col :span="24">
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center"><span class="icon">*</span>接收附件</div>
<div class="span-sty" style="display: flex;flex-direction: row;justify-content: flex-end;align-items: center">接收附件</div>
<el-form-item><upload ref="uploadImg" class="addinputInfo" v-model="formobj.receiveFilesList" :accept="accept" :limit="50" bucket="map" :upload-data="{ type: '0001' }"/></el-form-item>
</el-col>
</el-row>
@ -140,10 +140,6 @@ export default {
})
},
handleSave() {
if (this.formobj.receiveFilesList.length === 0) {
this.$message({ showClose: true, type: 'error', message: '请上传接收附件' })
return
}
this.$refs['form_obj'].validate((valid) => {
if (valid) {
this.submitdisabled = true

5
anrui-buscenter/anrui-buscenter-ui/src/views/fapiaoneibujieshou/Internalinvoicetobereceived.vue

@ -61,7 +61,6 @@
<el-table-column fixed label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" size="mini" @click="toEdit(scope.row)">确认</el-button>
<el-button type="primary" size="mini" @click="toInfo(scope.row)">查看</el-button>
</template>
</el-table-column>
<el-table-column label="创建日期" align="center" width="120">
@ -346,10 +345,6 @@ export default {
this.viewState = 3
this.$refs['divAdd'].showEdit(row)
},
toInfo(row) {
this.viewState = 4
this.$refs['divInfo'].showInfo(row)
},
resetState() {
this.viewState = 1
},

10
anrui-buscenter/anrui-buscenter-ui/src/views/workflow/xiaoshouguanliFlow/xiaoshouzhengceFlow/relation/vehicleSelect.vue

@ -61,9 +61,9 @@
<el-form-item label="车型:">
<el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable/>
</el-form-item>
<!-- <el-form-item label="采购订单编号:">-->
<!-- <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable/>-->
<!-- </el-form-item>-->
<el-form-item label="车架号:">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="快捷检索:">
<el-input v-model="listQuery.params.modelName" placeholder="" clearable/>
</el-form-item>
@ -162,7 +162,7 @@ export default {
vehicleType: '',
vehicleVersion: '',
userSid: '',
orderingNo: '',
vinNo: '',
orgSid: '',
vehSids: []
},
@ -267,7 +267,7 @@ export default {
this.listQuery.params.vehicleType = ''
this.listQuery.params.vehicleVersion = ''
this.listQuery.params.userSid = ''
this.listQuery.params.orderingNo = ''
this.listQuery.params.vinNo = ''
this.getList()
},
handleSelectionChange(row) {

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

@ -61,9 +61,10 @@
<el-table :key="tableKey" v-loading="listLoading" :data="list" border style="width: 100%;" @selection-change="handleSelectionChange">
<el-table-column width="50" type="selection" align="center"/>
<el-table-column fixed label="序号" width="60" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" width="100" align="center">
<el-table-column fixed label="操作" width="180" align="center">
<template slot-scope="scope">
<el-button type="primary" v-show="scope.row.printOrderBtn" size="mini" @click="handlePrint(scope.row)">下载打印</el-button>
<el-button type="primary" v-show="scope.row.printOrderBtn" size="mini" @click="handlePrint(scope.row)">下载订单</el-button>
<el-button type="primary" v-show="scope.row.showContractBtn2" size="mini" @click="handleDown(scope.row)">下载合同</el-button>
</template>
</el-table-column>
<el-table-column label="分公司" align="center" width="120">
@ -412,6 +413,28 @@ export default {
}
})
},
handleDown(row) {
var xhr = new XMLHttpRequest()
xhr.open('GET', process.env.VUE_APP_BASE_API + '/base/file/download?filePath=' + row.contractFilePath + '&outFileName=' + '合同', true)
xhr.setRequestHeader('token', getStorage())
xhr.responseType = 'blob'
xhr.onload = function(e) {
//
var blob = this.response
var filename = '合同.pdf'
var a = document.createElement('a')
// blob.type="application/octet-stream";
// url
var url = URL.createObjectURL(blob)
a.href = url
a.download = filename
a.click()
// URL
window.URL.revokeObjectURL(url)
}
//
xhr.send()
},
handleLook(row) {
this.viewState = 2
let aa = null

10
anrui-buscenter/anrui-buscenter-ui/src/views/xiaoshouguanli/xiaoshouzhengce/relation/vehicleselect.vue

@ -61,9 +61,9 @@
<el-form-item label="车型:">
<el-input v-model="listQuery.params.vehicleAlias" placeholder="" clearable/>
</el-form-item>
<!-- <el-form-item label="采购订单编号:">-->
<!-- <el-input v-model="listQuery.params.orderingNo" placeholder="" clearable/>-->
<!-- </el-form-item>-->
<el-form-item label="车架号:">
<el-input v-model="listQuery.params.vinNo" placeholder="" clearable/>
</el-form-item>
<el-form-item label="厂家入库日期">
<el-date-picker v-model="listQuery.params.priceStartDate" type="date" placeholder="选择日期" value-format="yyyy-MM-dd" format="yyyy-MM-dd"></el-date-picker>
<span style="padding: 0 8px"></span>
@ -177,7 +177,7 @@ export default {
vehicleType: '',
vehicleVersion: '',
userSid: '',
orderingNo: '',
vinNo: '',
orgSid: '',
priceStartDate: '',
priceEndDate: '',
@ -288,7 +288,7 @@ export default {
this.listQuery.params.vehicleType = ''
this.listQuery.params.vehicleVersion = ''
this.listQuery.params.userSid = ''
this.listQuery.params.orderingNo = ''
this.listQuery.params.vinNo = ''
this.listQuery.params.priceStartDate = ''
this.listQuery.params.priceEndDate = ''
this.listQuery.params.orgPriceStartDate = ''

44
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectReceivablesDetailedWCKCLRKVo.java

@ -0,0 +1,44 @@
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.yxt.common.core.vo.Vo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 已认款项列表
* @author: dimengzhe
* @date: 2023/6/29
**/
@Data
public class FinSelectReceivablesDetailedWCKCLRKVo implements Vo {
@ApiModelProperty("当前行sid")
private String sid;
@ApiModelProperty("分公司sid")
private String useOrgSid;
@ApiModelProperty("分公司名称")
private String useOrgName;
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("全款贷款")
private String payType;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("联系电话")
private String customerPhone;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("应收项目名称")
private String receivablesName;
@ApiModelProperty("认款日期")
private String auditDate;
@ApiModelProperty("认款金额")
private String subscriptionMoney;
@ApiModelProperty("剩余金额")
private String reveivableMoney;
}

4
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeign.java

@ -83,4 +83,8 @@ public interface FinSelectedReceivablesDetailedFeign {
@ApiOperation("选择已认款项")
@PostMapping("/selectPageList")
ResultBean<PagerVo<FinSelectReceivablesDetailedVo>> selectPageList(@RequestBody PagerQuery<FinSelectedReceivablesPaymentDetailsQuery> pagerQuery);
@ApiOperation("未出库车辆已认款项列表")
@PostMapping("/noOutVehRecPageList")
ResultBean<PagerVo<FinSelectReceivablesDetailedWCKCLRKVo>> noOutVehRecPageList(@RequestBody PagerQuery<FinSelectedReceivablesPaymentDetailsWCKCLRKQuery> pagerQuery);
}

5
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedFeignFallback.java

@ -83,4 +83,9 @@ public class FinSelectedReceivablesDetailedFeignFallback implements FinSelectedR
return null;
}
@Override
public ResultBean<PagerVo<FinSelectReceivablesDetailedWCKCLRKVo>> noOutVehRecPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsWCKCLRKQuery> pagerQuery) {
return null;
}
}

42
anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/finselectedreceivablesdetailed/FinSelectedReceivablesPaymentDetailsWCKCLRKQuery.java

@ -0,0 +1,42 @@
package com.yxt.anrui.fin.api.finselectedreceivablesdetailed;
import com.yxt.common.core.query.Query;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
/**
* @description: 已认款查询
* @author: dimengzhe
* @date: 2023/6/29
**/
@Data
public class FinSelectedReceivablesPaymentDetailsWCKCLRKQuery implements Query {
@ApiModelProperty("销售专员部门名称")
private String staffDeptName;
@ApiModelProperty("销售专员名称")
private String staffName;
@ApiModelProperty("合同编号")
private String contractNo;
@ApiModelProperty("客户名称")
private String customerName;
@ApiModelProperty("联系电话")
private String mobile;
@ApiModelProperty("车架号")
private String vinNo;
@ApiModelProperty("可用最小金额")
private String balanceSmallMoney;
@ApiModelProperty("可用最大金额")
private String balanceBigMoney;
@ApiModelProperty("用户sid")
private String userSid;
@ApiModelProperty("机构sid")
private String orgPath;
private String menuUrl;
private String menuSid;
@ApiModelProperty("移动端查询条件")
private String name;
}

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

@ -33,10 +33,7 @@ import com.baomidou.mybatisplus.core.toolkit.Constants;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailed;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectedReceivablesDetailedVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.SelectCustomerVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import org.apache.ibatis.annotations.*;
@ -153,4 +150,6 @@ public interface FinSelectedReceivablesDetailedMapper extends BaseMapper<FinSele
List<String> selectUnSelectList(@Param("purchaseSystemSid") String purchaseSystemSid, @Param("userSid") String userSid, @Param("useOrgSid") String useOrgSid);
List<FinSelectReceivablesDetailedVo> selectPageList(@Param(Constants.WRAPPER) QueryWrapper<AppFinUncollectedReceivablesDetailedVo> qw, @Param("name") String name);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> noOutVehRecPageList(IPage<FinSelectedReceivablesDetailed> page, @Param(Constants.WRAPPER)QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw);
}

33
anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/finselectedreceivablesdetailed/FinSelectedReceivablesDetailedMapper.xml

@ -282,8 +282,12 @@
</select>
<select id="selectUnSelectList" resultType="java.lang.String">
select sid from fin_uncollected_receivables_detailed where currentReceivableMoney>0
and useOrgSid = #{useOrgSid} and createBySid = #{userSid} AND purchaseSystemSid = #{purchaseSystemSid}
select sid
from fin_uncollected_receivables_detailed
where currentReceivableMoney > 0
and useOrgSid = #{useOrgSid}
and createBySid = #{userSid}
AND purchaseSystemSid = #{purchaseSystemSid}
</select>
<select id="selectPageList"
@ -315,4 +319,29 @@
</if>
</where>
</select>
<select id="noOutVehRecPageList"
resultType="com.yxt.anrui.fin.api.finselectedreceivablesdetailed.FinSelectReceivablesDetailedWCKCLRKVo">
SELECT
fcc.`useOrgSid`,
fcc.`staffDeptName`,
fcc.`staffName`,
ferd.`contractNo`,
ferd.`payType`,
ferd.`customerName`,
ferd.`customerPhone`,
ferd.`VIN` AS vinNo,
ferd.`receivablesName`,
ferd.`auditDate`,
ferd.`subscriptionMoney`
FROM
fin_selected_receivables_detailed ferd
LEFT JOIN fin_collection_confirmation fcc
ON ferd.`collSid` = fcc.`sid`
LEFT JOIN anrui_base.`base_vehicle` bv
ON ferd.`VIN` = bv.`vinNo` AND fcc.`useOrgSid` = bv.`createOrgSid`
<where>
${ew.sqlSegment}
</where>
</select>
</mapper>

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

@ -26,6 +26,7 @@
package com.yxt.anrui.fin.biz.finselectedreceivablesdetailed;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -105,4 +106,11 @@ public class FinSelectedReceivablesDetailedRest implements FinSelectedReceivable
return new ResultBean<PagerVo<FinSelectReceivablesDetailedVo>>().success().setData(pagerVo);
}
@Override
public ResultBean<PagerVo<FinSelectReceivablesDetailedWCKCLRKVo>> noOutVehRecPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsWCKCLRKQuery> pagerQuery) {
ResultBean rb = ResultBean.fireFail();
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> pv = finSelectedReceivablesDetailedService.noOutVehRecPageList(pagerQuery);
return rb.success().setData(pv);
}
}

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

@ -29,14 +29,20 @@ import cn.hutool.core.bean.BeanUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.yxt.anrui.base.common.enums.VehicleState;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicle;
import com.yxt.anrui.buscenter.api.bussalesordervehicle.BusSalesOrderVehicleFeign;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsQuery;
import com.yxt.anrui.fin.api.fincollectionconfirmation.AppFinSelectedReceivablesPaymentDetailsVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmation;
import com.yxt.anrui.fin.api.fincollectionconfirmation.FinCollectionConfirmationJYDDKYDJVo;
import com.yxt.anrui.fin.api.fincollectionconfirmation.app.AppBusArrearsCarryMoneyVo;
import com.yxt.anrui.fin.api.finselectedreceivablesdetailed.*;
import com.yxt.anrui.fin.api.finuncollectedreceivablesdetailed.AppFinUncollectedReceivablesDetailedVo;
import com.yxt.anrui.portal.api.sysorganization.SysOrganizationFeign;
import com.yxt.anrui.portal.api.sysstafforg.SysStaffOrgFeign;
import com.yxt.anrui.portal.api.sysuser.PrivilegeQuery;
import com.yxt.anrui.portal.api.sysuser.SysUserFeign;
import com.yxt.common.base.service.MybatisBaseService;
import com.yxt.common.base.utils.PagerUtil;
import com.yxt.common.core.query.PagerQuery;
@ -71,6 +77,10 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
private SysStaffOrgFeign sysStaffOrgFeign;
@Autowired
private BusSalesOrderVehicleFeign busSalesOrderVehicleFeign;
@Autowired
private SysUserFeign sysUserFeign;
@Autowired
private SysOrganizationFeign sysOrganizationFeign;
public PagerVo<FinSelectedReceivablesDetailed> listPage(PagerQuery<FinSelectedReceivablesDetailedQuery> pq) {
FinSelectedReceivablesDetailedQuery query = pq.getParams();
@ -362,13 +372,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
for (FinSelectReceivablesDetailedVo record : collList) {
BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney());
BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney());
if(currentMoney.compareTo(BigDecimal.ZERO)<=0){
if (currentMoney.compareTo(BigDecimal.ZERO) <= 0) {
record.setReveivableMoney("0");
}else{
} else {
BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney);
if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){
if (bigDecimal1.compareTo(BigDecimal.ZERO) <= 0) {
record.setReveivableMoney("0");
}else{
} else {
record.setReveivableMoney(bigDecimal1.toString());
}
}
@ -398,13 +408,13 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
for (FinSelectReceivablesDetailedVo record : collList) {
BigDecimal currentMoney = new BigDecimal(record.getCurrentReceivableMoney());
BigDecimal subscriptionMoney = new BigDecimal(record.getSubscriptionMoney());
if(currentMoney.compareTo(BigDecimal.ZERO)<=0){
if (currentMoney.compareTo(BigDecimal.ZERO) <= 0) {
record.setReveivableMoney("0");
}else{
} else {
BigDecimal bigDecimal1 = currentMoney.subtract(subscriptionMoney);
if(bigDecimal1.compareTo(BigDecimal.ZERO)<=0){
if (bigDecimal1.compareTo(BigDecimal.ZERO) <= 0) {
record.setReveivableMoney("0");
}else{
} else {
record.setReveivableMoney(bigDecimal1.toString());
}
}
@ -446,4 +456,82 @@ public class FinSelectedReceivablesDetailedService extends MybatisBaseService<Fi
page1.setSize(pagerQuery.getSize());
return page1;
}
public PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> noOutVehRecPageList(PagerQuery<FinSelectedReceivablesPaymentDetailsWCKCLRKQuery> pagerQuery) {
FinSelectedReceivablesPaymentDetailsWCKCLRKQuery query = pagerQuery.getParams();
QueryWrapper<FinSelectReceivablesDetailedWCKCLRKVo> qw = new QueryWrapper<>();
//========================================数据授权开始
if (StringUtils.isNotBlank(query.getMenuUrl()) || StringUtils.isNotBlank(query.getMenuSid())) {
//=======================
PrivilegeQuery privilegeQuery = new PrivilegeQuery();
privilegeQuery.setOrgPath(query.getOrgPath());
privilegeQuery.setMenuUrl(query.getMenuUrl());
privilegeQuery.setMenuSid(query.getMenuSid());
privilegeQuery.setUserSid(query.getUserSid());
ResultBean<String> defaultIdReltBean = sysUserFeign.selectPrivilegeLevel(privilegeQuery);
if (StringUtils.isNotBlank(defaultIdReltBean.getData())) {
//数据权限ID(1集团、2事业部、3分公司、4部门、5个人)
String orgSidPath = query.getOrgPath();
orgSidPath = orgSidPath + "/";
int i1 = orgSidPath.indexOf("/");
int i2 = orgSidPath.indexOf("/", i1 + 1);
int i3 = orgSidPath.indexOf("/", i2 + 1);
int i4 = orgSidPath.indexOf("/", i3 + 1);
String orgLevelKey = defaultIdReltBean.getData();
if ("1".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i1);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("2".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i2);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("3".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i3);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("4".equals(orgLevelKey)) {
orgSidPath = orgSidPath.substring(0, i4);
qw.like("fcc.orgSidPath", orgSidPath);
} else if ("5".equals(orgLevelKey)) {
qw.eq("fcc.createBySid", query.getUserSid());
} else {
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
return p;
}
} else {
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = new PagerVo<>();
return p;
}
}
qw.eq("ferd.auditState", 3);
qw.ne("bv.vehicleState", VehicleState.StockEnum.OUT_STOCK.getCode());
if (StringUtils.isNotBlank(query.getStaffDeptName())){
qw.like("fcc.staffDeptName",query.getStaffDeptName());
}
if (StringUtils.isNotBlank(query.getStaffName())){
qw.like("fcc.staffName",query.getStaffName());
}
if (StringUtils.isNotBlank(query.getContractNo())){
qw.like("ferd.contractNo",query.getContractNo());
}
if (StringUtils.isNotBlank(query.getCustomerName())){
qw.like("ferd.customerName",query.getCustomerName());
}
if (StringUtils.isNotBlank(query.getMobile())){
qw.like("ferd.customerPhone",query.getMobile());
}
if (StringUtils.isNotBlank(query.getVinNo())){
qw.like("ferd.VIN",query.getVinNo());
}
String balanceSmallMoney = query.getBalanceSmallMoney();
String balanceBigMoney = query.getBalanceBigMoney();
//TODO 缺少可用余额查询条件
IPage<FinSelectedReceivablesDetailed> page = PagerUtil.queryToPage(pagerQuery);
IPage<FinSelectReceivablesDetailedWCKCLRKVo> pagging = baseMapper.noOutVehRecPageList(page, qw);
for (FinSelectReceivablesDetailedWCKCLRKVo record : pagging.getRecords()) {
String useOrgSid = record.getUseOrgSid();
String useOrgName = sysOrganizationFeign.fetchBySid(useOrgSid).getData().getName();
record.setUseOrgName(useOrgName);
}
PagerVo<FinSelectReceivablesDetailedWCKCLRKVo> p = PagerUtil.pageToVo(pagging, null);
return p;
}
}

2
anrui-scm/anrui-scm-ui/src/views/cheliang/cheliangcaigou/cheliangcaigou.vue

@ -50,7 +50,7 @@
<el-table-column fixed width="60px" label="序号" type="index" :index="indexMethod" align="center"/>
<el-table-column fixed label="操作" align="center" width="220">
<template slot-scope="scope">
<el-button type="primary" size="small" :disabled="scope.row.offlineDate !==''" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="primary" size="small" :disabled="scope.row.offlineDate !=='' || scope.row.orderStatus == '已作废'" @click="handleUpdate(scope.row)">编辑</el-button>
<el-button type="danger" size="small" :disabled="scope.row.offlineDate !=='' || scope.row.orderStatus == '已作废'" @click="handleCancellation(scope.row)">作废</el-button>
<el-button type="primary" size="small" @click="handleLooK(scope.row)">查看</el-button>
</template>

Loading…
Cancel
Save