fix：应付单、应收单列表查询调整
UNISINSIGHT\rdpnr_jiangpeng
parent
6a26d412c4
commit
2ebd64ab41
|
|
@ -124,7 +124,7 @@
|
|||
|
||||
<el-table v-loading="loading" :data="payableList" show-summary :summary-method="getSummaries" @selection-change="handleSelectionChange">
|
||||
<el-table-column type="selection" width="50" />
|
||||
<!-- <el-table-column label="项目编号" align="center" prop="projectCode" width="120" />-->
|
||||
<el-table-column label="项目编号" align="center" prop="projectCode" width="120" />
|
||||
<el-table-column label="项目名称" align="center" prop="projectName" width="260" />
|
||||
<el-table-column label="采购-应付单编号" align="center" prop="payableBillCode" width="150" />
|
||||
<!-- <el-table-column label="生成时间" align="center" prop="createTime" width="180"/>-->
|
||||
|
|
@ -307,15 +307,22 @@ export default {
|
|||
/** 查询采购应付单列表 */
|
||||
getList() {
|
||||
this.loading = true;
|
||||
const queryParams = { ...this.queryParams };
|
||||
const payableBillCodeList = (queryParams.payableBillCode || '')
|
||||
.split(/[，,]/)
|
||||
.map(item => item.trim())
|
||||
.filter(item => item);
|
||||
queryParams.payableBillCodeList = payableBillCodeList;
|
||||
queryParams.payableBillCode = payableBillCodeList.length === 1 ? payableBillCodeList[0] : null;
|
||||
if (null != this.dateRange && '' != this.dateRange) {
|
||||
this.queryParams.createTimeStart = this.dateRange[0];
|
||||
this.queryParams.createTimeEnd = this.dateRange[1];
|
||||
queryParams.createTimeStart = this.dateRange[0];
|
||||
queryParams.createTimeEnd = this.dateRange[1];
|
||||
}
|
||||
if (null != this.estimatedPaymentDateRange && '' != this.estimatedPaymentDateRange) {
|
||||
this.queryParams.estimatedPaymentTimeStart = this.estimatedPaymentDateRange[0];
|
||||
this.queryParams.estimatedPaymentTimeEnd = this.estimatedPaymentDateRange[1];
|
||||
queryParams.estimatedPaymentTimeStart = this.estimatedPaymentDateRange[0];
|
||||
queryParams.estimatedPaymentTimeEnd = this.estimatedPaymentDateRange[1];
|
||||
}
|
||||
listPayable(this.queryParams).then(response => {
|
||||
listPayable(queryParams).then(response => {
|
||||
this.payableList = response.rows;
|
||||
this.total = response.total;
|
||||
this.loading = false;
|
||||
|
|
|
|||
|
|
@ -20,7 +20,7 @@
|
|||
<el-form-item label="销售-应收单编号" prop="receivableBillCode">
|
||||
<el-input
|
||||
v-model="queryParams.receivableBillCode"
|
||||
placeholder="请输入应收单编号"
|
||||
placeholder="请输入应收单编号，多个用逗号分隔"
|
||||
clearable
|
||||
@keyup.enter.native="handleQuery"
|
||||
/>
|
||||
|
|
@ -229,6 +229,12 @@ export default {
|
|||
getList() {
|
||||
this.loading = true;
|
||||
let query = { ...this.queryParams };
|
||||
const receivableBillCodeList = (query.receivableBillCode || '')
|
||||
.split(/[，,]/)
|
||||
.map(item => item.trim())
|
||||
.filter(item => item);
|
||||
query.receivableBillCodeList = receivableBillCodeList;
|
||||
query.receivableBillCode = receivableBillCodeList.length === 1 ? receivableBillCodeList[0] : null;
|
||||
query = this.addDateRange(query, this.estimatedReceiptDateRange, 'PlanReceiptDate');
|
||||
|
||||
listReceivable(query).then(response => {
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ public class OmsPayableBill extends BaseEntity
|
|||
/** 应付单编号 */
|
||||
@Excel(name = "应付单编号")
|
||||
private String payableBillCode;
|
||||
private List<String> payableBillCodeList;
|
||||
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
|
||||
@Excel(name = "生成时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
|
||||
private Date createTime;
|
||||
|
|
|
|||
|
|
@ -29,6 +29,7 @@ public class OmsReceivableBill extends BaseEntity
|
|||
/** 应收单编号 */
|
||||
@Excel(name = "应收单编号")
|
||||
private String receivableBillCode;
|
||||
private List<String> receivableBillCodeList;
|
||||
|
||||
/** 最新收款计划ID */
|
||||
private Long lastReceiptPlanId;
|
||||
|
|
@ -98,4 +99,4 @@ public class OmsReceivableBill extends BaseEntity
|
|||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -101,7 +101,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectOmsPayableBillList" parameterType="OmsPayableBill" resultMap="OmsPayableBillResult">
|
||||
<include refid="selectOmsPayableBillRelationVo"/>
|
||||
<where>
|
||||
<if test="payableBillCode != null and payableBillCode != ''">and t1.payable_bill_code like concat(
|
||||
<if test="payableBillCodeList != null and payableBillCodeList.size>0">and t1.payable_bill_code in
|
||||
<foreach item="item" collection="payableBillCodeList" separator="," open="(" close=")" index="">#{item}</foreach>
|
||||
</if>
|
||||
<if test="(payableBillCodeList == null or payableBillCodeList.size == 0) and payableBillCode != null and payableBillCode != ''">and t1.payable_bill_code like concat(
|
||||
#{payableBillCode},'%')
|
||||
</if>
|
||||
<if test="idList != null and idList.size>0">and t1.id in
|
||||
|
|
@ -354,4 +357,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
group by t1.payable_bill_code
|
||||
</select>
|
||||
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
|
|
|||
|
|
@ -52,7 +52,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<select id="selectOmsReceivableBillList" parameterType="com.ruoyi.sip.domain.OmsReceivableBill" resultMap="OmsReceivableBillResult">
|
||||
<include refid="selectOmsReceivableBillVo"/>
|
||||
<where>
|
||||
<if test="receivableBillCode != null and receivableBillCode != ''"> and t1.receivable_bill_code like concat('%', #{receivableBillCode}, '%')</if>
|
||||
<if test="receivableBillCodeList != null and receivableBillCodeList.size>0"> and t1.receivable_bill_code in
|
||||
<foreach item="item" collection="receivableBillCodeList" separator="," open="(" close=")">
|
||||
#{item}
|
||||
</foreach>
|
||||
</if>
|
||||
<if test="(receivableBillCodeList == null or receivableBillCodeList.size == 0) and receivableBillCode != null and receivableBillCode != ''"> and t1.receivable_bill_code like concat('%', #{receivableBillCode}, '%')</if>
|
||||
<if test="idList != null and idList.size>0"> and t1.id in
|
||||
<foreach item="item" collection="idList" separator="," open="(" close=")">
|
||||
#{item}
|
||||
|
|
@ -231,4 +236,4 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
WHERE id = #{item.id}
|
||||
</foreach>
|
||||
</update>
|
||||
</mapper>
|
||||
</mapper>
|
||||
|
|
|
|||
Loading…
Reference in New Issue