Merge remote-tracking branch 'origin/dev' into dev

lichao
2 parents 61af9557 4d2d9b4d
Showing 3 changed files with 12 additions and 27 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
trash-ui/src/views/gar/order/index.vue
@@ -437,13 +437,13 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         // 处置场所
         else if (user.getGarUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription())) {
             PageHelper.startPage(pageNo, pageSize);
-            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
-                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+//            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+//                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
                 List<GarOrderDisposalVo> orderList = baseMapper.queryDisposalOrderListByTelWithType(user.getGarUserTel(), type, GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
 //                orderList.forEach(GarOrderDisposalVo::adjustCarCount);
                 PageInfo<GarOrderDisposalVo> pageInfo = new PageInfo<GarOrderDisposalVo>(orderList, pageSize);
                 return pageInfo;
-            }
+//            }
         }
         return null;
     }
@@ -185,6 +185,8 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             nUser = new GarUser();
             nUser.setGarUserTel(loginDto.getTel());
             nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
+
+            this.save(nUser);
  
             if(loginDto.getSignin() == 1){
             	nUser.setGarUserName(loginDto.getNickname());
@@ -262,12 +264,12 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             vo.getRuleVos().add(ruleVo);
  
         }
-        for (LoginVo.RuleVo r : vo.getRuleVos()){
-            //排除驾驶员、企业负责人、处理场所
-            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
+//        for (LoginVo.RuleVo r : vo.getRuleVos()){
+//            //排除驾驶员、企业负责人、处理场所
+//            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
                 vo.setTestUser(true);
-            }
-        }
+//            }
+//        }
  
  
         this.saveOrUpdate(nUser);
@@ -191,7 +191,7 @@
           </el-col>
         </el-row>
  
-        <el-row :gutter="20" v-if="form.currentImages">
+        <el-row :gutter="20" v-if="form.currentImages && form.currentImages.length > 0">
           <el-col :span="24">
             <el-form-item label="现场图片" prop="currentImages">
               <el-image style="width: 100px; height: 100px" :src="form.currentImages[0]"
@@ -285,7 +285,7 @@
  
           <el-row :gutter="20" v-if="form.panoramas && form.panoramas.length > 0">
             <el-col :span="24">
-              <el-form-item label="现场图片" prop="putOnImages">
+              <el-form-item label="现场图片" prop="panoramas">
                 <el-image style="width: 100px; height: 100px" :src="form.panoramas[0]" :preview-src-list="form.panoramas">
                 </el-image>
               </el-form-item>
@@ -417,7 +417,6 @@ export default {
       this.loading = true;
       listOrder(this.queryParams).then(response => {
         this.orderList = response.data.list;
-        console.log(response.data.list)
         this.total = response.data.total;
  
         // 自动加载所有订单的未发车信息
@@ -572,22 +571,6 @@ export default {
         this.combnationImagePath(this.form.putOnImages);
         this.combnationImagePath(this.form.panoramas);
  
-        let param = {
-          auditStatus:1,
-          valid:0,
-          page:1,
-          size:1000,
-          tag:"1",
-          companyID : row.garOrderCompanyId,
-        };
-
-
-
-        truckList(param).then(tres=>{
-          this.tList = tres.result.list;
-        });
-
-
         this.open = true;
         this.title = "清运派单详情";
       });