Merge branch 'dev' of http://61.169.120.202:8888/youxiw20000/trash into dev

youxiw2000
2 parents 31b2e956 20cd631f
Showing 5 changed files with 22 additions and 29 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchAskMapper.xml
trash-ui/src/views/ask/ask/index.vue
trash-ui/src/views/gar/order/index.vue
trash-ui/src/views/gar/user/index.vue
@@ -751,7 +751,7 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
     @Override
     public PageInfo queryOrderListByGarOrderPage(OrderWebDto dto) {
         LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
-        qw.eq(StringUtils.isNotEmpty(dto.getGarOrderCompanyName()), GarOrder::getGarOrderCompanyName, dto.getGarOrderCompanyName())
+        qw.likeRight(StringUtils.isNotEmpty(dto.getGarOrderCompanyName()), GarOrder::getGarOrderCompanyName, dto.getGarOrderCompanyName())
                 .eq(dto.getGarOrderHandlerStatus() != null, GarOrder::getGarOrderHandlerStatus, dto.getGarOrderHandlerStatus())
                 .eq(dto.getGarCancelFlag() != null, GarOrder::getGarCancelFlag, dto.getGarCancelFlag());
         List<GarOrder> list = list(qw);
@@ -73,7 +73,7 @@
             <if test="garOrderHandlerName != null  and garOrderHandlerName != ''"> and gar_order_handler_name like concat('%', #{garOrderHandlerName}, '%')</if>
             <if test="garOrderContainerVolume != null  and garOrderContainerVolume != ''"> and gar_order_container_volume = #{garOrderContainerVolume}</if>
             <if test="garOrderHandlerId != null  and garOrderHandlerId != ''"> and gar_order_handler_id = #{garOrderHandlerId}</if>
-            <if test="garHandlerCarCode != null  and garHandlerCarCode != ''"> and gar_handler_car_code = #{garHandlerCarCode}</if>
+            <if test="garHandlerCarCode != null  and garHandlerCarCode != ''"> and gar_handler_car_code = like concat('%', #{garHandlerCarCode}, '%')</if>
             <if test="garOrderHandlerCompanyId != null  and garOrderHandlerCompanyId != ''"> and gar_order_handler_company_id = #{garOrderHandlerCompanyId}</if>
             <if test="garOrderHandlerCompanyName != null  and garOrderHandlerCompanyName != ''"> and gar_order_handler_company_name like concat('%', #{garOrderHandlerCompanyName}, '%')</if>
             <if test="garCreateTime != null "> and gar_create_time = #{garCreateTime}</if>
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
-      <el-form-item label="订单 id" prop="garOrderId">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="订单编号" prop="garOrderId">
         <el-input
           v-model="queryParams.garOrderId"
-          placeholder="请输入订单 id"
+          placeholder="请输入订单编号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="联单编号" prop="garOrderNumber">
+        <el-input
+          v-model="queryParams.garOrderNumber"
+          placeholder="请输入订单编号"
           clearable
           size="small"
           @keyup.enter.native="handleQuery"
@@ -37,15 +46,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="投放点" prop="dropPointName">
-        <el-input
-          v-model="queryParams.dropPointName"
-          placeholder="请输入投放点"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="趟次类型" prop="garOrderType">
         <el-select v-model="queryParams.garOrderType" placeholder="请选择趟次类型" clearable size="small">
           <el-option label="全部" value="" />
@@ -62,15 +62,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-      <el-form-item label="订单编号" prop="garOrderNumber">
-        <el-input
-          v-model="queryParams.garOrderNumber"
-          placeholder="请输入订单编号"
-          clearable
-          size="small"
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
 <!--      <el-form-item label="下单手机号" prop="garOrderPhone">-->
 <!--        <el-input-->
 <!--          v-model="queryParams.garOrderPhone"-->
 <template>
   <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
       <el-form-item label="经营单位" prop="garOrderCompanyName">
         <el-input v-model="queryParams.garOrderCompanyName" placeholder="请输入经营单位" clearable size="small"
@@ -55,8 +55,8 @@
           {{ computedCancelFlagString(scope.row.garCancelFlag).toString() }}
         </template>
       </el-table-column>
-      <el-table-column label="车子数量" align="center" prop="garOrderCarNumber" />
-      <el-table-column label="车子类型" width="200px" align="center" prop="garOrderCarType" />
+      <el-table-column label="车子数量" align="center" prop="garRealCarCount" />
+<!--      <el-table-column label="车子类型" width="200px" align="center" prop="garOrderCarType" />-->
       <el-table-column fixed="right" label="操作" width="200px" align="center" class-name="small-padding fixed-width">
         <template slot-scope="scope">
           <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
@@ -11,8 +11,10 @@
       </el-form-item>
       <el-form-item label="用户类型" prop="garUserType">
         <el-select v-model="queryParams.garUserType" placeholder="请选择用户类型" clearable size="small">
-          <el-option label="居民用户" value="居民用户" />
-          <el-option label="管理负责人" value="管理负责人" />
+          <el-option label="用户" value="用户" />
+          <el-option label="运输企业负责人" value="运输企业负责人" />
+          <el-option label="清运车辆驾驶员" value="清运车辆驾驶员" />
+          <el-option label="处置场所负责人" value="处置场所负责人" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -28,7 +30,7 @@
     <el-table v-loading="loading" :data="GarUserList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="手机号" align="center" prop="garUserTel" />
-      <el-table-column label="用户名" align="center" prop="garUserName" />
+<!--      <el-table-column label="用户名" align="center" prop="garUserName" />-->
       <el-table-column label="用户类型" align="center" prop="garUserType" />
       <el-table-column label="创建时间" align="center" prop="garCreateTime" width="180">
         <template slot-scope="scope">