Commit dcc43cab335e84e5c25853701f3a9a70207cfb63

Authored by 2c
1 parent 51f76235

修复驾驶员查询bug

trash-ui/src/views/unit/businessUnit/index.vue
... ... @@ -214,11 +214,14 @@ export default {
214 214 },
215 215 /** 搜索按钮操作 */
216 216 handleQuery() {
217   - this.queryParams.pageNum = 1;
218 217 this.getList();
219 218 },
220 219 /** 重置按钮操作 */
221 220 resetQuery() {
  221 + this.queryParams.pageNum = 1;
  222 + this.queryParams.registrationArea = null;
  223 + this.queryParams.name = null;
  224 + this.queryParams.legalRepresentative = null;
222 225 this.resetForm("queryForm");
223 226 this.handleQuery();
224 227 },
... ...
trash-ui/src/views/unit/carInfo/index.vue
... ... @@ -210,11 +210,15 @@ export default {
210 210 },
211 211 /** 搜索按钮操作 */
212 212 handleQuery() {
213   - this.queryParams.pageNum = 1;
214 213 this.getList();
215 214 },
216 215 /** 重置按钮操作 */
217 216 resetQuery() {
  217 + this.queryParams.pageNum = 1;
  218 + this.queryParams.companyName = null;
  219 + this.queryParams.carType = null;
  220 + this.queryParams.carCode = null;
  221 + this.queryParams.carBrank = null;
218 222 this.resetForm("queryForm");
219 223 this.handleQuery();
220 224 },
... ...
trash-ui/src/views/unit/disposalSite/index.vue
... ... @@ -240,11 +240,15 @@ export default {
240 240 },
241 241 /** 搜索按钮操作 */
242 242 handleQuery() {
243   - this.queryParams.pageNum = 1;
244 243 this.getList();
245 244 },
246 245 /** 重置按钮操作 */
247 246 resetQuery() {
  247 + this.queryParams.pageNum = 1;
  248 + this.queryParams.name = null;
  249 + this.queryParams.siteType = null;
  250 + this.queryParams.localArea = null;
  251 + this.queryParams.termRange = null;
248 252 this.handleQuery();
249 253 },
250 254 // 多选框选中数据
... ...
trash-ui/src/views/unit/driver/index.vue
... ... @@ -209,11 +209,13 @@ export default {
209 209  
210 210 /** 搜索按钮操作 */
211 211 handleQuery() {
212   - this.queryParams.pageNum = 1;
213 212 this.getList();
214 213 },
215 214 /** 重置按钮操作 */
216 215 resetQuery() {
  216 + this.queryParams.pageNum = 1;
  217 + this.queryParams.name = null;
  218 + this.queryParams.companyName = null;
217 219 this.resetForm("queryForm");
218 220 this.handleQuery();
219 221 },
... ...
trash-ui/src/views/unit/enterprise/index.vue
... ... @@ -214,11 +214,14 @@ export default {
214 214 },
215 215 /** 搜索按钮操作 */
216 216 handleQuery() {
217   - this.queryParams.pageNum = 1;
218 217 this.getList();
219 218 },
220 219 /** 重置按钮操作 */
221 220 resetQuery() {
  221 + this.queryParams.pageNum = 1;
  222 + this.queryParams.name = null;
  223 + this.queryParams.registrationArea = null;
  224 + this.queryParams.legalRepresentative = null;
222 225 this.resetForm("queryForm");
223 226 this.handleQuery();
224 227 },
... ...
trash-unit/src/main/resources/mapper/unit/DriverMapper.xml
... ... @@ -44,7 +44,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
44 44 <select id="selectDriverList" parameterType="DriverVo" resultMap="DriverVoResult">
45 45 <include refid="selectDriverCompanyVo"/>
46 46 <where>
47   - <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  47 + <if test="name != null and name != ''"> and d.name like concat('%', #{name}, '%')</if>
48 48 <if test="companyName != null and companyName != ''"> and c.name like concat('%', #{companyName}, '%')</if>
49 49 <if test="identityCard != null and identityCard != ''"> and identity_card = #{identityCard}</if>
50 50 <if test="companyId != null "> and company_id = #{companyId}</if>
... ...