zangbin 3 anni fa
parent
commit
1e5f13e02f

+ 9 - 0
lb-module/src/main/resources/mapper/module/orderMapper.xml

@@ -545,6 +545,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.paymentType != null">
             AND (o.payment_type = #{params.paymentType} and o.status != 0)
         </if>
+        <if test="params.shopName != null and params.shopName != ''">
+            AND o.shop_name like concat('%', #{params.shopName}, '%')
+        </if>
         ORDER BY o.create_time DESC
     </select>
 
@@ -997,6 +1000,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.paymentType != null">
             AND (o.payment_type = #{params.paymentType} and o.status != 0)
         </if>
+        <if test="params.shopName != null and params.shopName != ''">
+            AND o.shop_name like concat('%', #{params.shopName}, '%')
+        </if>
     </select>
 
     <select id="selectExportOrder" resultType="com.ydd.module.dto.OrderExportDto">
@@ -1180,6 +1186,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="params.paymentType != null">
             AND (o.payment_type = #{params.paymentType} and o.status != 0)
         </if>
+        <if test="params.shopName != null and params.shopName != ''">
+            AND o.shop_name like concat('%', #{params.shopName}, '%')
+        </if>
         ORDER BY o.create_time DESC
     </select>
 

+ 17 - 0
web-ui/src/views/module/order/index.vue

@@ -249,6 +249,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="门店名称" prop="shopName">
+            <el-input
+              v-model="queryParams.shopName"
+              placeholder="请输入门店名称"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
           <el-form-item label="下单人" prop="memberName">
             <el-input
               v-model="queryParams.memberName"
@@ -279,6 +287,14 @@
               @keyup.enter.native="handleQuery"
             />
           </el-form-item>
+          <el-form-item label="发件人联系电话" prop="sendPhone">
+            <el-input
+              v-model="queryParams.sendPhone"
+              placeholder="请输入发件人联系电话"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item>
         </div>
       </transition>
     </el-form>
@@ -1209,6 +1225,7 @@ export default {
         deliveryStatus: undefined,
         merchantId: undefined,
         merchantName: undefined,
+        shopName: undefined,
         aId: undefined,
         orderSn: undefined,
         memberName: undefined,