From 7b7da6851904c5572b1c1838999c08578fa6cc5c Mon Sep 17 00:00:00 2001 From: chenhao <852066789@qq.com> Date: Mon, 7 Jul 2025 16:16:28 +0800 Subject: [PATCH] =?UTF-8?q?feat(order):=20=E5=A2=9E=E5=8A=A0=E8=AE=A2?= =?UTF-8?q?=E5=8D=95=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E5=B9=B6=E4=BC=98?= =?UTF-8?q?=E5=8C=96=E4=BA=A7=E5=93=81=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 在订单列表页面添加代表处和代理商搜索条件 - 更新订单信息映射文件，支持按代表处和代理商名称搜索 - 修正产品列表中价格和折扣的显示格式 - 更新产品信息中编码字段的名称 --- .../main/resources/templates/layout/product-list.html | 4 ++-- .../main/resources/templates/manage/order/order.html | 10 ++++++++++ .../main/resources/templates/project/order/edit.html | 4 ++-- .../resources/templates/system/product/product.html | 2 +- .../main/java/com/ruoyi/sip/domain/ProductInfo.java | 2 +- .../main/resources/mapper/manage/OrderInfoMapper.xml | 2 ++ .../main/resources/mapper/sip/ProjectInfoMapper.xml | 2 +- 7 files changed, 19 insertions(+), 7 deletions(-) diff --git a/ruoyi-admin/src/main/resources/templates/layout/product-list.html b/ruoyi-admin/src/main/resources/templates/layout/product-list.html index 8e13f427..70d8db36 100644 --- a/ruoyi-admin/src/main/resources/templates/layout/product-list.html +++ b/ruoyi-admin/src/main/resources/templates/layout/product-list.html @@ -387,7 +387,7 @@ $('.productTable .price-formmat').change('input', function () { let val = $(this).val() let num = $(this).parent().parent().find('.quantity').val() - $(this).parent().parent().find('.price').val(val) + $(this).parent().parent().find('.price').val(val.toFixed(2)) let allPriceNumber = val * num // if (getFlag()) { // allPriceNumber *= FOLD_ON_FOLD @@ -398,7 +398,7 @@ let cataloguePrice = $(this).parent().parent().find('.cataloguePrice').val() let discount = (val*1.0000/cataloguePrice).toFixed(4); $(this).parent().parent().find('.discount').val(discount) - $(this).parent().parent().find('.discount-format').val(discount * 100) + $(this).parent().parent().find('.discount-format').val((discount * 100).toFixed(2)) setOrderPriceData() // $(this).val(formatAmountNumber(val)) }) diff --git a/ruoyi-admin/src/main/resources/templates/manage/order/order.html b/ruoyi-admin/src/main/resources/templates/manage/order/order.html index edad408e..3816940c 100644 --- a/ruoyi-admin/src/main/resources/templates/manage/order/order.html +++ b/ruoyi-admin/src/main/resources/templates/manage/order/order.html @@ -41,6 +41,16 @@ +
  • + + +
    • +
  • + + +
    • + +
  •  搜索  重置 diff --git a/ruoyi-admin/src/main/resources/templates/project/order/edit.html b/ruoyi-admin/src/main/resources/templates/project/order/edit.html index 133ad44c..53727a4d 100644 --- a/ruoyi-admin/src/main/resources/templates/project/order/edit.html +++ b/ruoyi-admin/src/main/resources/templates/project/order/edit.html @@ -204,7 +204,7 @@ 执行单有效截止时间* - @@ -217,7 +217,7 @@ 要求到货时间* - diff --git a/ruoyi-admin/src/main/resources/templates/system/product/product.html b/ruoyi-admin/src/main/resources/templates/system/product/product.html index 3934c9b1..688289b4 100644 --- a/ruoyi-admin/src/main/resources/templates/system/product/product.html +++ b/ruoyi-admin/src/main/resources/templates/system/product/product.html @@ -85,7 +85,7 @@ }, {width:100, field: 'hzCode', - title: '上架编码' + title: '华智编码' }, { width:100, diff --git a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java index f60cb93b..8a15fd36 100644 --- a/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java +++ b/ruoyi-sip/src/main/java/com/ruoyi/sip/domain/ProductInfo.java @@ -28,7 +28,7 @@ public class ProductInfo extends BaseEntity /** 产品编码 */ @Excel(name = "产品编码") private String productCode; - @Excel(name = "上架编码") + @Excel(name = "华智编码") private String hzCode; private String type; private String value; diff --git a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml index 6f4bf278..2c2d33f5 100644 --- a/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/manage/OrderInfoMapper.xml @@ -142,6 +142,8 @@ and t1.order_code like concat('%', #{orderCode}, '%') + and t1.order_agent_code in (select agent_code from agent_info where agent_name like concat('%', #{orderAgentName}, '%')) + and t1.order_partner_code in (select partner_code from partner_info where partner_name like concat('%', #{orderPartnerName}, '%')) and t1.order_name like concat('%', #{orderName}, '%') and t1.project_code like concat('%', #{projectCode}, '%') diff --git a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml index 6d89ce22..edf6a972 100644 --- a/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml +++ b/ruoyi-sip/src/main/resources/mapper/sip/ProjectInfoMapper.xml @@ -178,7 +178,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where t1.id = #{id}