mula
/
unis_sip
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix：订单管理查询条件调整

dev_1.0.2
UNISINSIGHT\rdpnr_jiangpeng 2026-04-07 23:30:06 +08:00
parent 81c561d28a
commit 504379f3e3
2 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oms_web/oms_vue/src/views/project/order/index.vue
View File

@ -38,7 +38,7 @@
<el-select v-model="queryParams.timeType" size="small" style="width: 140px">
<el-option label="到货时间" value="deliveryTime"></el-option>
<el-option label="下单时间" value="estimatedOrderTime"></el-option>
<el-option label="执行单截止时间" value="orderEndTime"></el-option>
<el-option label="订单生效时间" value="approveTime"></el-option>
</el-select>
<el-date-picker
v-model="dateRange"
@ -112,9 +112,9 @@
<span>{{ parseTime(scope.row.estimatedOrderTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="执行单截止时间" align="center" prop="orderEndTime" width="200" sortable="custom">
<el-table-column label="订单生效时间" align="center" prop="approveTime" width="200" sortable="custom">
<template slot-scope="scope">
<span>{{ parseTime(scope.row.orderEndTime, '{y}-{m}-{d}') }}</span>
<span>{{ parseTime(scope.row.approveTime, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" fixed="right" width="200">

15
ruoyi-sip/src/main/resources/mapper/sip/ProjectOrderInfoMapper.xml
View File

@ -167,7 +167,20 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<when test="params.endDeliveryTime != null">
and t1.delivery_time <![CDATA[ <= ]]> date_format(#{params.endDeliveryTime}, '%Y-%m-%d 23:59:59')
</when>
</choose>
</if>
<if test="params.beginApproveTime != null or params.endApproveTime != null">
<choose>
<when test="params.beginApproveTime != null and params.endApproveTime != null">
and t1.approve_time between date_format(#{params.beginApproveTime}, '%Y-%m-%d 00:00:00') and
date_format(#{params.endApproveTime}, '%Y-%m-%d 23:59:59')
</when>
<when test="params.beginApproveTime != null">
and t1.approve_time <![CDATA[ >= ]]> date_format(#{params.beginApproveTime}, '%Y-%m-%d 00:00:00')
</when>
<when test="params.endApproveTime != null">
and t1.approve_time <![CDATA[ <= ]]> date_format(#{params.endApproveTime}, '%Y-%m-%d 23:59:59')
</when>
</choose>
</if>
<if test="updateTimeStart != null or updateTimeEnd != null">