m

youxiw2000
2 parents 7ef57d20 a9073a0d
Showing 47 changed files with 3936 additions and 31 deletions
trash-garbage/pom.xml
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/custom/BizException.java
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/interceptor/MyMetaObjectHandler.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderEvaluateMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderImageMapper.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarAddress.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrder.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderEvaluate.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderImage.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarUser.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/EvaluateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderUpdateDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/UploadDto.java
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/OrderDetailVo.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderEvaluateService.java
@@ -42,6 +42,10 @@
             <artifactId>hutool-all</artifactId>
             <version>5.3.8</version>
         </dependency>
+        <dependency>
+            <groupId>com.trash</groupId>
+            <artifactId>trash-unit</artifactId>
+        </dependency>
     </dependencies>
     <!-- 项目打包时会将java目录中的*.xml文件也进行打包 -->
     <build>
+package com.trash.garbage.controller;
+
+
+import com.trash.common.config.trashConfig;
+import com.trash.common.utils.file.FileUploadUtils;
+import com.trash.framework.config.ServerConfig;
+import com.trash.garbage.custom.BizException;
+import com.trash.garbage.global.Result;
+import com.trash.garbage.global.ResultCode;
+import com.trash.garbage.pojo.dto.EvaluateDto;
+import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.dto.OrderUpdateDto;
+import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.vo.OrderDetailVo;
+import com.trash.garbage.service.GarOrderService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 订单控制
+ *
+ * @author 20412
+ */
+@RestController
+@RequestMapping("/order")
+public class GarbageOrderController {
+
+    @Autowired
+    private GarOrderService garOrderService;
+    @Autowired
+    private ServerConfig serverConfig;
+
+    @PostMapping("/add")
+    public Result<?> saveOrder(@Validated @RequestBody OrderDto dto) {
+        return Result.OK(garOrderService.saveOrder(dto));
+    }
+
+    @RequestMapping("upload")
+    public Result<?> uploadFile(@RequestParam("file") MultipartFile file) {
+        String fileName = null;
+        try { // 上传文件路径
+            String filePath = trashConfig.getUploadPath();
+            // 上传并返回新文件名称
+            fileName = FileUploadUtils.upload(filePath, file);
+        } catch (IOException e) {
+            throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
+        }
+        String url = serverConfig.getUrl() + fileName;
+        Map<String, String> urlMap = new HashMap<>();
+        urlMap.put("url", url);
+        urlMap.put("fileName", fileName);
+        return Result.OK(urlMap, "图片上传成功");
+    }
+
+    @GetMapping("/detail/{id}")
+    public Result<OrderDetailVo> queryOrderDetail(@PathVariable("id") String id) {
+        return Result.OK(garOrderService.queryOrderDetail(id));
+    }
+
+    @PutMapping("/update")
+    public Result<String> uploadOrder(@RequestBody OrderUpdateDto dto) {
+        return Result.OK(garOrderService.uploadOrder(dto));
+    }
+
+    @PostMapping("/evaluate")
+    public Result<String> evaluateOrder(@Validated @RequestBody EvaluateDto dto) {
+        return Result.OK(garOrderService.evaluateOrder(dto));
+    }
+
+
+    @GetMapping("/query/list")
+    public Result<?> queryOrderList(@RequestParam("type") Integer type, @RequestParam("pageNo") Integer pageNo, @RequestParam("pageSize") Integer pageSize) {
+        return Result.OK(garOrderService.queryOrderList(type, pageNo, pageSize));
+    }
+
+    @PostMapping("/upload/imageUrl")
+    public Result<?> uploadImageUrlByType(@RequestBody UploadDto dto) {
+        return Result.OK(garOrderService.uploadImageUrlByType(dto));
+    }
+
+}
@@ -3,6 +3,7 @@ package com.trash.garbage.controller;
 import com.trash.garbage.global.Result;
 import com.trash.garbage.pojo.domain.GarAddress;
+import com.trash.garbage.pojo.domain.GarUser;
 import com.trash.garbage.pojo.dto.AddressDto;
 import com.trash.garbage.pojo.dto.LoginDto;
 import com.trash.garbage.service.GarUserService;
@@ -67,4 +68,11 @@ public class GarbageUserController {
     }
+    @PutMapping("/update")
+    public Result<?> updateUser(@RequestBody GarUser user){
+        garUserService.updateUserInfo(user);
+        return Result.OK();
+    }
+
+
 }
@@ -35,10 +35,8 @@ public class BizException extends RuntimeException{
 		this.code = code;
 	}
-
-
-	public BizException(ResultCode code, String msg){
-        this.msg = msg;
+    public BizException(ResultCode code, String msg){
         this.code = code;
+        this.msg = msg;
     }
 }
@@ -36,13 +36,13 @@ public class GlobalStatus {
          * 普通登录
          */
         NORMAL_LOGIN(0, "普通登录"),
-        NORMAL_USER(0, "普通用户"),
-        DRIVER_USER(1, "驾驶员用户");
+        NORMAL_USER(0, "居民用户"),
+        DRIVER_USER(1, "管理负责人");
         private Integer status;
         private String description;
-        public int getStatus() {
+        public Integer getStatus() {
             return this.status;
         }
@@ -57,7 +57,7 @@ public class GlobalStatus {
     }
     /**
-     * 字典
+     * 地址
      */
     public enum GarAddressStatus {
         NORMAL_ADDRESS(0, "地址"),
@@ -78,6 +78,38 @@ public class GlobalStatus {
         public String getDescription() {
             return this.description;
         }
+    }
+
+    /**
+     * 订单
+     */
+    public enum GarOrderStatus {
+        NEW_ORDER(0, "新订单"),
+        ACTIVE_ORDER(1, "处理中"),
+        ALL_ORDER(2, "全部订单"),
+        SUCCESS_ORDER(3, "待支付订单"),
+        FAIL_ORDER(9, "订单处理失败"),
+        CANCEL_FLAG_NO(0, "未取消订单"),
+        IMAGE_TYPE_CURRENT(0, "现场图片"),
+        IMAGE_TYPE_PUT_ON(1, "装车图片"),
+        IMAGE_TYPE_PUT_DOWN(2, "卸车图片"),
+        EVALUATE_ORDER_NO(0,"待评价"),
+        EVALUATE_ORDER_YES(1,"已评价");
+
+        GarOrderStatus(Integer status, String description) {
+            this.status = status;
+            this.description = description;
+        }
+
+        private String description;
+        private Integer status;
+        public Integer getValue() {
+            return this.status;
+        }
+
+        public String getDescription() {
+            return this.description;
+        }
     }
 }
@@ -23,17 +23,12 @@ public class MyMetaObjectHandler implements MetaObjectHandler {
         if (metaObject.hasGetter("garCreateTime")) {
             this.strictInsertFill(metaObject, "garCreateTime", Date.class, new Date());
         }
-
         if (metaObject.hasGetter("garCreateBy")) {
             this.strictInsertFill(metaObject, "garCreateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
         }
-
         if (metaObject.hasGetter("garUpdateTime")) {
             this.strictInsertFill(metaObject, "garUpdateTime", Date.class, new Date());
         }
-        if (metaObject.hasGetter("garUserId")) {
-            this.strictInsertFill(metaObject, "garUserId", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
-        }
         if (metaObject.hasGetter("garUpdateBy")) {
             this.strictInsertFill(metaObject, "garUpdateBy", String.class, SecurityUtils.getLoginUser().getUser().getUserId());
         }
+package com.trash.garbage.mapper;
+
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Mapper
+* @createDate 2023-11-29 14:19:18
+* @Entity com.trash.garbage.pojo.domain.GarOrderEvaluate
+*/
+public interface GarOrderEvaluateMapper extends BaseMapper<GarOrderEvaluate> {
+
+}
+
+
+
+
+package com.trash.garbage.mapper;
+
+import com.trash.garbage.pojo.domain.GarOrderImage;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_image(装修垃圾-订单图片表)】的数据库操作Mapper
+* @createDate 2023-11-24 16:26:19
+* @Entity com.trash.garbage.pojo.domain.GarOrderImage
+*/
+public interface GarOrderImageMapper extends BaseMapper<GarOrderImage> {
+
+}
+
+
+
+
+package com.trash.garbage.mapper;
+
+import com.trash.garbage.pojo.domain.GarOrder;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 20412
+* @description 针对表【gar_order(建筑垃圾—订单表)】的数据库操作Mapper
+* @createDate 2023-11-24 16:26:19
+* @Entity com.trash.garbage.pojo.domain.GarOrder
+*/
+public interface GarOrderMapper extends BaseMapper<GarOrder> {
+
+}
+
+
+
+
@@ -7,9 +7,11 @@ import com.baomidou.mybatisplus.annotation.TableName;
 import java.io.Serializable;
 import java.util.Date;
+import java.util.Objects;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 /**
@@ -48,6 +50,7 @@ public class GarAddress implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT, select = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
@@ -55,6 +58,7 @@ public class GarAddress implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE, select = false)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -72,6 +76,9 @@ public class GarAddress implements Serializable {
      */
     private String garRemark;
+
+
+
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
@@ -209,6 +216,5 @@ public class GarAddress implements Serializable {
 	public static long getSerialversionuid() {
 		return serialVersionUID;
 	}
-    
-    
+   
 }
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 建筑垃圾—订单表
+ * @TableName gar_order
+ */
+@TableName(value ="gar_order")
+@Data
+public class GarOrder implements Serializable {
+    /**
+     * 订单id
+     */
+    @TableId
+    private String garOrderId;
+
+    /**
+     * 用户id
+     */
+    @JsonIgnore
+    private String garOrderUserId;
+
+    /**
+     * 负责处理人id
+     */
+    private String garOrderHandlerId;
+
+    /**
+     * 订单地址
+     */
+    private String garOrderAddress;
+
+    /**
+     * 订单详细地址
+     */
+    private String garOrderAddressDetails;
+
+    /**
+     * 订单姓名
+     */
+    private String garOrderContactName;
+
+    /**
+     * 垃圾类型
+     */
+    private String garOrderTrashType;
+
+    /**
+     * 订单人电话
+     */
+    private String garOrderContactTel;
+
+    /**
+     * 承接经营单位
+     */
+    private String garOrderCompanyId;
+
+    /**
+     * 公司名称
+     */
+    private String garOrderCompanyName;
+
+    /**
+     * 公司负责人电话
+     */
+    private String garOrderCompanyTel;
+
+    /**
+     * 处理状态
+     */
+    private Integer garOrderHandlerStatus;
+
+    /**
+     * 约定时间
+     */
+    private String garOrderAgreementTime;
+
+    /**
+     * 订单创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    private Date garCreateTime;
+
+    /**
+     * 订单修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    private Date garUpdateTime;
+
+    /**
+     * 订单创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String garCreateBy;
+
+    /**
+     * 订单修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String garUpdateBy;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+    /**
+     * 取消标识
+     */
+    private Integer garCancelFlag;
+
+    /**
+     * 评分标识
+     */
+    private Integer garEvaluateFlag;
+    /**
+     * 原因
+     */
+    private String garReason;
+
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+}
 \ No newline at end of file
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 建筑垃圾-派单评分
+ * @author 20412
+ * @TableName gar_order_evaluate
+ */
+@TableName(value ="gar_order_evaluate")
+@Data
+public class GarOrderEvaluate implements Serializable {
+    /**
+     * id
+     */
+    @TableId
+    private String garEvaluateId;
+
+    /**
+     * 订单id
+     */
+    private String garOrderId;
+
+    /**
+     * 公司id
+     */
+    private String garCompanyId;
+
+    /**
+     * 评价内容
+     */
+    private String garEvaluateContent;
+
+    /**
+     * 评分
+     */
+    private Integer garEvaluateScore;
+
+    /**
+     * 修改人
+     */
+    private String garUpdateBy;
+
+    /**
+     * 创建人
+     */
+    private String garCreateBy;
+
+    /**
+     * 修改时间
+     */
+    private Date garUpdateTime;
+
+    /**
+     * 创建时间
+     */
+    private Date garCreateTime;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
 \ No newline at end of file
+package com.trash.garbage.pojo.domain;
+
+import com.baomidou.mybatisplus.annotation.FieldFill;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+/**
+ * 装修垃圾-订单图片表
+ * @TableName gar_order_image
+ */
+@TableName(value ="gar_order_image")
+@Data
+public class GarOrderImage implements Serializable {
+    /**
+     * 图片id
+     */
+    @TableId
+    private String garImageId;
+
+    /**
+     * 订单表id
+     */
+    private String garOrderId;
+
+    /**
+     * 图片类型
+     */
+    private Integer garOrderImageType;
+
+    /**
+     * 图片路径
+     */
+    private String garOrderImageUrl;
+
+    /**
+     * 创建时间
+     */
+    @TableField(fill = FieldFill.INSERT)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    private Date garCreateTime;
+
+    /**
+     * 修改时间
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    private Date garUpdateTime;
+
+    /**
+     * 创建人
+     */
+    @TableField(fill = FieldFill.INSERT)
+    private String garCreateBy;
+
+    /**
+     * 修改人
+     */
+    @TableField(fill = FieldFill.INSERT_UPDATE)
+    private String garUpdateBy;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+
+}
 \ No newline at end of file
@@ -9,6 +9,7 @@ import java.util.Date;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
 /**
  * 建筑垃圾-用户表
@@ -54,6 +55,7 @@ public class GarUser implements Serializable {
     @TableField(fill = FieldFill.INSERT)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garCreateTime;
     /**
@@ -61,6 +63,7 @@ public class GarUser implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:dd")
     private Date garUpdateTime;
     /**
@@ -206,6 +209,4 @@ public class GarUser implements Serializable {
 		return serialVersionUID;
 	}
-    
-
 }
 \ No newline at end of file
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class EvaluateDto {
+    @NotBlank(message = "订单id不能为空")
+    private String orderId;
+    private String content;
+    @NotNull
+    private Integer score;
+    private List<String> imageUrls;
+}
+package com.trash.garbage.pojo.dto;
+
+import com.baomidou.mybatisplus.annotation.TableId;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotEmpty;
+import java.util.List;
+
+/**
+ * 新增订单dto
+ * @author 20412
+ */
+@Data
+public class OrderDto {
+
+    /**
+     * 订单地址
+     */
+    @NotBlank(message = "地址不能为空")
+    private String garOrderAddress;
+    /**
+     * 图片列表
+     */
+    @NotEmpty(message = "必须要有现场图片")
+    private List<String> imageUrls;
+    /**
+     * 订单详细地址
+     */
+    private String garOrderAddressDetails;
+
+    /**
+     * 订单姓名
+     */
+    private String garOrderContactName;
+
+    /**
+     * 垃圾类型
+     */
+    private String garOrderTrashType;
+
+    /**
+     * 订单人电话
+     */
+    @NotBlank(message = "电话不能为空")
+    private String garOrderContactTel;
+
+    /**
+     * 承接经营单位
+     */
+    private String garOrderCompanyId;
+
+    /**
+     * 公司名称
+     */
+    @NotEmpty(message = "公司名称不能为空")
+    private String garOrderCompanyName;
+
+    /**
+     * 公司负责人电话
+     */
+    private String garOrderCompanyTel;
+
+    /**
+     * 约定时间
+     */
+    @NotBlank(message = "约定时间不能为空")
+    private String garOrderAgreementTime;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+
+}
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class OrderUpdateDto {
+
+    /**
+     * 订单id
+     */
+    private String garOrderId;
+
+    /**
+     * 处理类型
+     */
+    private Integer handleType;
+
+    /**
+     * 照片url
+      */
+    private List<String> imageUrls;
+}
+package com.trash.garbage.pojo.dto;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class UploadDto {
+    private String garOrderId;
+    private Integer type;
+    private List<String> imageUrls;
+}
+package com.trash.garbage.pojo.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import javax.validation.constraints.NotEmpty;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * @author 20412
+ */
+@Data
+public class OrderDetailVo {
+
+    private String garOrderHandlerId;
+
+    private Integer garEvaluateFlag;
+    /**
+     * 订单地址
+     */
+    private String garOrderAddress;
+    /**
+     * 现场图片图片列表
+     */
+    private List<String> currentImages;
+    /**
+     * 装车图片
+     */
+    private List<String> putOnImages;
+    /**
+     * 卸车图片
+     */
+    private List<String> putDownImages;
+    /**
+     * 订单详细地址
+     */
+    private String garOrderAddressDetails;
+
+    /**
+     * 订单姓名
+     */
+    private String garOrderContactName;
+
+    /**
+     * 垃圾类型
+     */
+    private String garOrderTrashType;
+
+    /**
+     * 订单状态
+     */
+    private Integer garOrderHandlerStatus;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:dd")
+    private Date garCreateTime;
+
+    /**
+     * 订单人电话
+     */
+    private String garOrderContactTel;
+
+    /**
+     * 承接经营单位
+     */
+    private String garOrderCompanyId;
+
+    /**
+     * 公司名称
+     */
+    private String garOrderCompanyName;
+
+    /**
+     * 公司负责人电话
+     */
+    private String garOrderCompanyTel;
+
+    /**
+     * 约定时间
+     */
+    private String garOrderAgreementTime;
+
+    /**
+     * 备注
+     */
+    private String garRemark;
+
+    /**
+     * 允许处理标识
+     */
+    private Boolean handleFlag;
+
+    public OrderDetailVo(){
+        this.currentImages = new ArrayList<>();
+        this.putDownImages = new ArrayList<>();
+        this.putOnImages = new ArrayList<>();
+        this.handleFlag = false;
+    }
+
+}
+package com.trash.garbage.service;
+
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Service
+* @createDate 2023-11-29 14:19:18
+*/
+public interface GarOrderEvaluateService extends IService<GarOrderEvaluate> {
+
+}
+package com.trash.garbage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarOrderImage;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_image(装修垃圾-订单图片表)】的数据库操作Service
+* @createDate 2023-11-24 16:26:19
+*/
+public interface GarOrderImageService extends IService<GarOrderImage> {
+
+}
+package com.trash.garbage.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.github.pagehelper.PageInfo;
+import com.trash.garbage.pojo.domain.GarOrder;
+import com.trash.garbage.pojo.dto.EvaluateDto;
+import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.dto.OrderUpdateDto;
+import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.vo.OrderDetailVo;
+
+import java.util.List;
+
+/**
+* @author 20412
+* @description 针对表【gar_order(建筑垃圾—订单表)】的数据库操作Service
+* @createDate 2023-11-24 16:26:19
+*/
+public interface GarOrderService extends IService<GarOrder> {
+
+    /**
+     * 新增订单
+     * @param dto
+     * @return
+     */
+    String saveOrder(OrderDto dto);
+
+    /**
+     * 根据id查询订单详情
+     * @param id
+     * @return
+     */
+    OrderDetailVo queryOrderDetail(String id);
+
+    /**
+     * 根据类型查询订单
+     *
+     * @param type
+     * @param pageNo
+     * @param pageSize
+     * @return
+     */
+    PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize);
+
+    /**
+     * 修改订单状态
+     * @param dto
+     * @return
+     */
+    String uploadOrder(OrderUpdateDto dto);
+
+    /**
+     * 上传图片url执行图片type
+     * @param dto
+     * @return
+     */
+    String uploadImageUrlByType(UploadDto dto);
+
+    String evaluateOrder(EvaluateDto dto);
+}
@@ -27,4 +27,6 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     String updateAddress(AddressDto dto);
     String deleteAddress(String addressId);
+
+    void updateUserInfo(GarUser user);
 }
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.trash.garbage.service.GarOrderEvaluateService;
+import com.trash.garbage.mapper.GarOrderEvaluateMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_evaluate(建筑垃圾-派单评分)】的数据库操作Service实现
+* @createDate 2023-11-29 14:19:18
+*/
+@Service
+public class GarOrderEvaluateServiceImpl extends ServiceImpl<GarOrderEvaluateMapper, GarOrderEvaluate>
+    implements GarOrderEvaluateService{
+
+}
+
+
+
+
+package com.trash.garbage.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.trash.garbage.pojo.domain.GarOrderImage;
+import com.trash.garbage.service.GarOrderImageService;
+import com.trash.garbage.mapper.GarOrderImageMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 20412
+* @description 针对表【gar_order_image(装修垃圾-订单图片表)】的数据库操作Service实现
+* @createDate 2023-11-24 16:26:19
+*/
+@Service
+public class GarOrderImageServiceImpl extends ServiceImpl<GarOrderImageMapper, GarOrderImage>
+    implements GarOrderImageService{
+
+}
+
+
+
+
+package com.trash.garbage.service.impl;
+
+import cn.hutool.core.collection.CollectionUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.trash.common.utils.SecurityUtils;
+import com.trash.common.utils.bean.BeanUtils;
+import com.trash.driver.domain.vo.DriverVo;
+import com.trash.driver.service.IDriverService;
+import com.trash.garbage.global.GlobalStatus;
+import com.trash.garbage.pojo.domain.GarOrder;
+import com.trash.garbage.pojo.domain.GarOrderEvaluate;
+import com.trash.garbage.pojo.domain.GarOrderImage;
+import com.trash.garbage.pojo.domain.GarUser;
+import com.trash.garbage.pojo.dto.EvaluateDto;
+import com.trash.garbage.pojo.dto.OrderDto;
+import com.trash.garbage.pojo.dto.OrderUpdateDto;
+import com.trash.garbage.pojo.dto.UploadDto;
+import com.trash.garbage.pojo.vo.OrderDetailVo;
+import com.trash.garbage.service.GarOrderEvaluateService;
+import com.trash.garbage.service.GarOrderImageService;
+import com.trash.garbage.service.GarOrderService;
+import com.trash.garbage.mapper.GarOrderMapper;
+import com.trash.garbage.service.GarUserService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @author 20412
+ * @description 针对表【gar_order(建筑垃圾—订单表)】的数据库操作Service实现
+ * @createDate 2023-11-24 16:26:19
+ */
+@Service
+public class GarOrderServiceImpl extends ServiceImpl<GarOrderMapper, GarOrder>
+        implements GarOrderService {
+
+
+    @Autowired
+    private GarOrderImageService garOrderImageService;
+
+    @Autowired
+    private GarOrderEvaluateService garOrderEvaluateService;
+
+    @Autowired
+    private GarUserService garUserService;
+
+    @Autowired
+    private IDriverService driverService;
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public String saveOrder(OrderDto dto) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarOrder order = new GarOrder();
+        BeanUtils.copyBeanProp(order, dto);
+        order.setGarOrderUserId(userId);
+        order.setGarOrderHandlerStatus(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
+        order.setGarCancelFlag(GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue());
+        save(order);
+        // 保存图片url
+        List<String> imageUrls = dto.getImageUrls();
+        List<GarOrderImage> images = new ArrayList<>(imageUrls.size());
+        for (String imageUrl : imageUrls) {
+            GarOrderImage image = new GarOrderImage();
+            image.setGarOrderId(order.getGarOrderId());
+            image.setGarOrderImageUrl(imageUrl);
+            image.setGarOrderImageType(GlobalStatus.GarOrderStatus.IMAGE_TYPE_CURRENT.getValue());
+            images.add(image);
+        }
+        garOrderImageService.saveBatch(images);
+        return order.getGarOrderId();
+    }
+
+    @Override
+    public OrderDetailVo queryOrderDetail(String id) {
+        GarOrder order = this.getById(id);
+        String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        LambdaQueryWrapper<GarOrderImage> qwi = new LambdaQueryWrapper<>();
+        qwi.eq(GarOrderImage::getGarOrderId, id);
+        OrderDetailVo vo = new OrderDetailVo();
+        BeanUtils.copyBeanProp(vo, order);
+        DriverVo driverVo = new DriverVo();
+        driverVo.setPhoneNo(tel);
+        driverVo.setCompanyId(Long.valueOf(order.getGarOrderCompanyId()));
+        List<DriverVo> driverVos = driverService.selectDriverList(driverVo);
+        if (CollectionUtil.isNotEmpty(driverVos)) {
+            vo.setHandleFlag(true);
+        }
+        List<GarOrderImage> imageList = garOrderImageService.list(qwi);
+        for (GarOrderImage image : imageList) {
+            if (GlobalStatus.GarOrderStatus.CANCEL_FLAG_NO.getValue().equals(image.getGarOrderImageType())) {
+                vo.getCurrentImages().add(image.getGarOrderImageUrl());
+            }
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_ON.getValue().equals(image.getGarOrderImageType())) {
+                vo.getPutOnImages().add(image.getGarOrderImageUrl());
+            }
+            if (GlobalStatus.GarOrderStatus.IMAGE_TYPE_PUT_DOWN.getValue().equals(image.getGarOrderImageType())) {
+                vo.getPutDownImages().add(image.getGarOrderImageUrl());
+            }
+        }
+        return vo;
+    }
+
+    @Override
+    public PageInfo queryOrderList(Integer type, Integer pageNo, Integer pageSize) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarUser user = garUserService.getById(userId);
+        LambdaQueryWrapper<GarOrder> qw = new LambdaQueryWrapper<>();
+        qw.orderByAsc(GarOrder::getGarEvaluateFlag, GarOrder::getGarOrderHandlerStatus);
+       // 居民用户
+        if (user.getGarUserType().equals(GlobalStatus.UserStatusEnum.DRIVER_USER.getDescription())) {
+            PageHelper.startPage(pageNo, pageSize);
+            // 待清运 || 清运中 || 已完成 || 待支付
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderUserId, userId)
+                        .eq(GarOrder::getGarOrderHandlerStatus, type);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+            // 全部
+            if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderUserId, userId);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+        } else {
+            DriverVo driver = new DriverVo();
+            driver.setPhoneNo(user.getGarUserTel());
+            List<DriverVo> driverList = driverService.selectDriverList(driver);
+            DriverVo driverVo = driverList.get(0);
+            String companyId = String.valueOf(driverVo.getCompanyId());
+            PageHelper.startPage(pageNo, pageSize);
+            if (GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderCompanyId, companyId)
+                        .eq(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.NEW_ORDER.getValue());
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+
+            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(type)
+                    || GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderCompanyId, companyId)
+                        .eq(GarOrder::getGarOrderHandlerId, user.getGarUserId())
+                        .eq(GarOrder::getGarOrderHandlerStatus, type);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+
+            // 全部
+            if (GlobalStatus.GarOrderStatus.ALL_ORDER.getValue().equals(type)) {
+                qw.eq(GarOrder::getGarOrderHandlerId, userId);
+                List<GarOrder> orderList = list(qw);
+                PageInfo<GarOrder> pageInfo = new PageInfo<GarOrder>(orderList, pageSize);
+                return pageInfo;
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String uploadOrder(OrderUpdateDto dto) {
+        GarOrder order = getById(dto.getGarOrderId());
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarUser user = garUserService.getById(userId);
+        // 运输员操作 TODO 公司所属 待清运- 》 清运中
+        if (GlobalStatus.UserStatusEnum.NORMAL_USER.getDescription().equals(user.getGarUserType())){
+            if (order.getGarOrderHandlerStatus().equals(GlobalStatus.GarOrderStatus.NEW_ORDER.getValue())
+                    || GlobalStatus.GarOrderStatus.NEW_ORDER.getValue().equals(dto.getHandleType())) {
+                LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+                uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue())
+                        .set(GarOrder::getGarOrderHandlerId, userId);
+                update(uw);
+                return "准备清运";
+            }
+            // 运输员操作 清运中 ==》已完成
+            if (GlobalStatus.GarOrderStatus.ACTIVE_ORDER.getValue().equals(order.getGarOrderHandlerStatus())
+                    && GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(dto.getHandleType())) {
+                LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+                uw.eq(GarOrder::getGarOrderId, dto.getGarOrderId())
+                        .set(GarOrder::getGarOrderHandlerStatus, GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue())
+                        .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_NO.getValue());
+                update(uw);
+            }
+            return "派单已完成";
+        }
+        return "什么都没发生";
+    }
+
+    @Override
+    public String uploadImageUrlByType(UploadDto dto) {
+        List<GarOrderImage> garOrderImages = new ArrayList<>(dto.getImageUrls().size());
+        for (String imageUrl : dto.getImageUrls()) {
+            GarOrderImage orderImage = new GarOrderImage();
+            orderImage.setGarOrderId(dto.getGarOrderId());
+            orderImage.setGarOrderImageUrl(imageUrl);
+            orderImage.setGarOrderImageType(dto.getType());
+            garOrderImages.add(orderImage);
+        }
+        garOrderImageService.saveBatch(garOrderImages);
+        return "上传成功！";
+    }
+
+    @Override
+    public String evaluateOrder(EvaluateDto dto) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        GarUser user = garUserService.getById(userId);
+        GarOrder order = getById(dto.getOrderId());
+        // TODO 用户评价
+        if (GlobalStatus.GarOrderStatus.SUCCESS_ORDER.getValue().equals(order.getGarOrderHandlerStatus())) {
+            evaluate(dto, order);
+        }
+        return "已评价";
+    }
+
+    private void evaluate(EvaluateDto dto, GarOrder order) {
+        GarOrderEvaluate evaluate = new GarOrderEvaluate();
+        evaluate.setGarOrderId(order.getGarOrderId());
+        evaluate.setGarEvaluateContent(dto.getContent());
+        evaluate.setGarEvaluateScore(dto.getScore());
+        garOrderEvaluateService.save(evaluate);
+        // 修改订单评价状态
+        LambdaUpdateWrapper<GarOrder> uw = new LambdaUpdateWrapper<>();
+        uw.eq(GarOrder::getGarOrderId, order.getGarOrderId())
+                .set(GarOrder::getGarEvaluateFlag, GlobalStatus.GarOrderStatus.EVALUATE_ORDER_YES.getValue());
+        update(uw);
+    }
+}
+
+
+
+
@@ -116,9 +116,6 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         user.setRoles(roles);
         loginUser.setPermissions(set);
         String token = JwtUtils.createToken(nUser.getGarUserId(), nUser.getGarUserTel());
-        if (!token.contains("Bearer ")) {
-            token = "Bearer " + token;
-        }
         loginUser.setToken(token);
         tokenService.refreshToken(loginUser);
         return token;
@@ -209,6 +206,17 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         return "删除成功！";
     }
+    @Override
+    public void updateUserInfo(GarUser user) {
+        String userId = SecurityUtils.getLoginUser().getUser().getUserId();
+        LambdaUpdateWrapper<GarUser> uw = new LambdaUpdateWrapper<>();
+        uw.eq(GarUser::getGarUserId, userId)
+                .set(GarUser::getGarUserType, user.getGarUserType())
+                .set(GarUser::getGarUserName, user.getGarUserName())
+                .set(GarUser::getGarUserCarNum, user.getGarUserCarNum());
+        update(uw);
+    }
+
     /**
      * 微信小程序解密
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.garbage.mapper.GarOrderEvaluateMapper">
+
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderEvaluate">
+            <id property="garEvaluateId" column="gar_evaluate_id" jdbcType="VARCHAR"/>
+            <result property="garEvaluateContent" column="gar_evaluate_content" jdbcType="VARCHAR"/>
+            <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+            <result property="garEvaluateScore" column="gar_evaluate_score" jdbcType="TINYINT"/>
+            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+            <result property="garCompanyId" column="gar_company_id" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        gar_evaluate_id,gar_evaluate_content,gar_evaluate_score,
+        gar_update_by,gar_create_by,gar_update_time,
+        gar_create_time,gar_remark,gar_order_id,gar_company_id
+    </sql>
+</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.garbage.mapper.GarOrderImageMapper">
+
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrderImage">
+            <id property="garImageId" column="gar_image_id" jdbcType="VARCHAR"/>
+            <result property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+            <result property="garOrderImageType" column="gar_order_image_type" jdbcType="TINYINT"/>
+            <result property="garOrderImageUrl" column="gar_order_image_url" jdbcType="VARCHAR"/>
+            <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+            <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+            <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+            <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+            <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        gar_image_id,gar_order_id,gar_order_image_type,
+        gar_order_image_url,gar_create_time,gar_update_time,
+        gar_create_by,gar_update_by,gar_remark
+    </sql>
+</mapper>
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.trash.garbage.mapper.GarOrderMapper">
+
+    <resultMap id="BaseResultMap" type="com.trash.garbage.pojo.domain.GarOrder">
+        <id property="garOrderId" column="gar_order_id" jdbcType="VARCHAR"/>
+        <result property="garOrderUserId" column="gar_order_user_id" jdbcType="VARCHAR"/>
+        <result property="garOrderHandlerId" column="gar_order_handler_id" jdbcType="VARCHAR"/>
+        <result property="garOrderAddress" column="gar_order_address" jdbcType="VARCHAR"/>
+        <result property="garOrderAddressDetails" column="gar_order_address_details" jdbcType="VARCHAR"/>
+        <result property="garOrderContactName" column="gar_order_contact_name" jdbcType="VARCHAR"/>
+        <result property="garOrderTrashType" column="gar_order_trash_type" jdbcType="VARCHAR"/>
+        <result property="garOrderContactTel" column="gar_order_contact_tel" jdbcType="VARCHAR"/>
+        <result property="garOrderCompanyId" column="gar_order_company_id" jdbcType="VARCHAR"/>
+        <result property="garOrderCompanyName" column="gar_order_company_name" jdbcType="VARCHAR"/>
+        <result property="garOrderCompanyTel" column="gar_order_company_tel" jdbcType="VARCHAR"/>
+        <result property="garOrderHandlerStatus" column="gar_order_handler_status" jdbcType="INTEGER"/>
+        <result property="garOrderAgreementTime" column="gar_order_agreement_time" jdbcType="VARCHAR"/>
+        <result property="garCreateTime" column="gar_create_time" jdbcType="TIMESTAMP"/>
+        <result property="garUpdateTime" column="gar_update_time" jdbcType="TIMESTAMP"/>
+        <result property="garCreateBy" column="gar_create_by" jdbcType="VARCHAR"/>
+        <result property="garUpdateBy" column="gar_update_by" jdbcType="VARCHAR"/>
+        <result property="garRemark" column="gar_remark" jdbcType="VARCHAR"/>
+        <result property="garReason" column="gar_reason" jdbcType="VARCHAR"/>
+        <result property="garCancelFlag" column="gar_cancel_flag" jdbcType="TINYINT"/>
+        <result property="garEvaluateFlag" column="gar_evaluate_flag" jdbcType="TINYINT"/>
+    </resultMap>
+
+    <sql id="Base_Column_List">
+        gar_order_id
+        ,gar_order_user_id,gar_order_handle_id,
+        gar_order_address,gar_order_address_details,gar_order_contact_name,
+        gar_order_trash_type,gar_order_contact_tel,gar_order_company_id,
+        gar_order_company_name,gar_order_company_tel,gar_order_hander_status,
+        gar_order_agreement_time,gar_create_time,gar_update_time,
+        gar_create_by,gar_update_by,gar_remark,gar_reason,gar_cancel_flag,gar_evaluate_flag
+    </sql>
+</mapper>
+import request from '@/utils/request'
+
+// 查询文件资料列表
+export function listDocumentData(query) {
+  return request({
+    url: '/other/documentData/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询文件资料详细
+export function getDocumentData(id) {
+  return request({
+    url: '/other/documentData/' + id,
+    method: 'get'
+  })
+}
+
+// 新增文件资料
+export function addDocumentData(data) {
+  return request({
+    url: '/other/documentData',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改文件资料
+export function updateDocumentData(data) {
+  return request({
+    url: '/other/documentData',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除文件资料
+export function delDocumentData(id) {
+  return request({
+    url: '/other/documentData/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出文件资料
+export function exportDocumentData(query) {
+  return request({
+    url: '/other/documentData/export',
+    method: 'get',
+    params: query
+  })
+}
 \ No newline at end of file
+import request from '@/utils/request'
+
+// 查询文件资料列表
+export function listIncorruptData(tableName) {
+  return request({
+    url: '/other/incorrupt/list/'+tableName,
+    method: 'get'
+  })
+}
+
+// 新增文件资料
+export function addIncorruptData(data) {
+  return request({
+    url: '/other/incorrupt',
+    method: 'post',
+    data: data
+  })
+}
+import request from '@/utils/request'
+
+// 查询运输企业管理列表
+export function listEnterprise(query) {
+  return request({
+    url: '/unit/enterprise/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运输企业管理详细
+export function getEnterprise(id) {
+  return request({
+    url: '/unit/enterprise/' + id,
+    method: 'get'
+  })
+}
+
+// 新增运输企业管理
+export function addEnterprise(data) {
+  return request({
+    url: '/unit/enterprise',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改运输企业管理
+export function updateEnterprise(data) {
+  return request({
+    url: '/unit/enterprise',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除运输企业管理
+export function delEnterprise(id) {
+  return request({
+    url: '/unit/enterprise/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出运输企业管理
+export function exportEnterprise(query) {
+  return request({
+    url: '/unit/enterprise/export',
+    method: 'get',
+    params: query
+  })
+}
+import request from '@/utils/request'
+
+// 查询运输车辆管理列表
+export function listCarInfo(query) {
+  return request({
+    url: '/unit/carInfo/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运输车辆管理详细
+export function getCarInfo(id) {
+  return request({
+    url: '/unit/carInfo/' + id,
+    method: 'get'
+  })
+}
+
+// 新增运输车辆管理
+export function addCarInfo(data) {
+  return request({
+    url: '/unit/carInfo',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改运输车辆管理
+export function updateCarInfo(data) {
+  return request({
+    url: '/unit/carInfo',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除运输车辆管理
+export function delCarInfo(id) {
+  return request({
+    url: '/unit/carInfo/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出运输车辆管理
+export function exportCarInfo(query) {
+  return request({
+    url: '/unit/carInfo/export',
+    method: 'get',
+    params: query
+  })
+}
+import request from '@/utils/request'
+
+// 查询处理场所管理列表
+export function listDisposalSite(query) {
+  return request({
+    url: '/unit/disposalSite/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询处理场所管理详细
+export function getDisposalSite(id) {
+  return request({
+    url: '/unit/disposalSite/' + id,
+    method: 'get'
+  })
+}
+
+// 新增处理场所管理
+export function addDisposalSite(data) {
+  return request({
+    url: '/unit/disposalSite',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改处理场所管理
+export function updateDisposalSite(data) {
+  return request({
+    url: '/unit/disposalSite',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除处理场所管理
+export function delDisposalSite(id) {
+  return request({
+    url: '/unit/disposalSite/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出处理场所管理
+export function exportDisposalSite(query) {
+  return request({
+    url: '/unit/disposalSite/export',
+    method: 'get',
+    params: query
+  })
+}
+import request from '@/utils/request'
+
+// 查询驾驶员管理列表
+export function listDriver(query) {
+  return request({
+    url: '/unit/driver/list',
+    method: 'get',
+    params: query
+  })
+}
+
+
+// 查询驾驶员管理详细
+export function listDriverByCompanyId(companyId) {
+  return request({
+    url: '/unit/driver/listDriverByCompany/' + companyId,
+    method: 'get'
+  })
+}
+
+// 查询驾驶员管理详细
+export function getDriver(id) {
+  return request({
+    url: '/unit/driver/' + id,
+    method: 'get'
+  })
+}
+
+// 新增驾驶员管理
+export function addDriver(data) {
+  return request({
+    url: '/unit/driver',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改驾驶员管理
+export function updateDriver(data) {
+  return request({
+    url: '/unit/driver',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除驾驶员管理
+export function delDriver(id) {
+  return request({
+    url: '/unit/driver/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出驾驶员管理
+export function exportDriver(query) {
+  return request({
+    url: '/unit/driver/export',
+    method: 'get',
+    params: query
+  })
+}
+import request from '@/utils/request'
+
+// 查询运输企业管理列表
+export function listEnterprise(query) {
+  return request({
+    url: '/unit/enterprise/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询运输企业管理详细
+export function getEnterprise(id) {
+  return request({
+    url: '/unit/enterprise/' + id,
+    method: 'get'
+  })
+}
+
+// 新增运输企业管理
+export function addEnterprise(data) {
+  return request({
+    url: '/unit/enterprise',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改运输企业管理
+export function updateEnterprise(data) {
+  return request({
+    url: '/unit/enterprise',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除运输企业管理
+export function delEnterprise(id) {
+  return request({
+    url: '/unit/enterprise/' + id,
+    method: 'delete'
+  })
+}
+
+// 导出运输企业管理
+export function exportEnterprise(query) {
+  return request({
+    url: '/unit/enterprise/export',
+    method: 'get',
+    params: query
+  })
+}
@@ -12,6 +12,7 @@ import &#39;@/assets/styles/trash.scss&#39; // trash css
 import App from './App'
 import store from './store'
 import router from './router'
+import plugins from './plugins' // plugins
 import permission from './directive/permission'
 import './assets/icons' // icon
@@ -35,7 +36,11 @@ Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
 Vue.prototype.parseStatus = parseStatus
-Vue.prototype.checkPer = checkPermi
+Vue.prototype.checkPer = checkPermi
+
+Vue.use(plugins)
+Vue.prototype.$aMapKey = "902732b0ff4758e4b39f0f34f0cb1cb0";// 高德地图key
+
 Vue.prototype.remoteFrame = "http://183.66.242.6:14601"
 // Vue.prototype.remoteFrame = "http://175.6.47.84:8008"
@@ -67,8 +72,8 @@ Vue.use(permission)
  *
  * Currently MockJs will be used in the production environment,
  * please remove it before going online! ! !
- */
-Element.Dialog.props.closeOnClickModal.default = false;
+ */
+Element.Dialog.props.closeOnClickModal.default = false;
 Vue.use(Element, {
   size: Cookies.get('size') || 'medium' // set element-ui default size
+import tab from './tab'
+
+export default {
+  install(Vue) {
+    // 页签操作
+    Vue.prototype.$tab = tab
+  }
+}
+import store from '@/store'
+import router from '@/router';
+
+export default {
+  // 刷新当前tab页签
+  refreshPage(obj) {
+    const { path, query, matched } = router.currentRoute;
+    if (obj === undefined) {
+      matched.forEach((m) => {
+        if (m.components && m.components.default && m.components.default.name) {
+          if (!['Layout', 'ParentView'].includes(m.components.default.name)) {
+            obj = { name: m.components.default.name, path: path, query: query };
+          }
+        }
+      });
+    }
+    return store.dispatch('tagsView/delCachedView', obj).then(() => {
+      const { path, query } = obj
+      router.replace({
+        path: '/redirect' + path,
+        query: query
+      })
+    })
+  },
+  // 关闭当前tab页签，打开新页签
+  closeOpenPage(obj) {
+    store.dispatch("tagsView/delView", router.currentRoute);
+    if (obj !== undefined) {
+      return router.push(obj);
+    }
+  },
+  // 关闭指定tab页签
+  closePage(obj) {
+    if (obj === undefined) {
+      return store.dispatch('tagsView/delView', router.currentRoute).then(({ visitedViews }) => {
+        const latestView = visitedViews.slice(-1)[0]
+        if (latestView) {
+            return router.push(latestView.fullPath)
+        }
+        return router.push('/');
+      });
+    }
+    return store.dispatch('tagsView/delView', obj);
+  },
+  // 关闭所有tab页签
+  closeAllPage() {
+    return store.dispatch('tagsView/delAllViews');
+  },
+  // 关闭左侧tab页签
+  closeLeftPage(obj) {
+    return store.dispatch('tagsView/delLeftTags', obj || router.currentRoute);
+  },
+  // 关闭右侧tab页签
+  closeRightPage(obj) {
+    return store.dispatch('tagsView/delRightTags', obj || router.currentRoute);
+  },
+  // 关闭其他tab页签
+  closeOtherPage(obj) {
+    return store.dispatch('tagsView/delOthersViews', obj || router.currentRoute);
+  },
+  // 添加tab页签
+  openPage(title, url, params) {
+    var obj = { path: url, meta: { title: title } }
+    store.dispatch('tagsView/addView', obj);
+    return router.push({ path: url, query: params });
+  },
+  // 修改tab页签
+  updatePage(obj) {
+    return store.dispatch('tagsView/updateVisitedView', obj);
+  }
+}
@@ -65,6 +65,7 @@ export const constantRoutes = [
       }
     ]
   },
+
   {
     path: '/user',
     component: Layout,
@@ -115,9 +116,79 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/tool/gen/editTable'], resolve),
         name: 'GenEdit',
         meta: { title: '修改生成配置' }
-      }
+      },
+      {
+        path: '/disposalSite/info',
+        component: (resolve) => require(['@/views/unit/disposalSite/info'], resolve),
+        name: '新增处理场所',
+        hidden: true,
+        meta: { title: '新增处理场所' }
+      },
+      {
+        path: '/disposalSite/infoEdit',
+        component: (resolve) => require(['@/views/unit/disposalSite/info'], resolve),
+        name: '修改处理场所',
+        hidden: true,
+        meta: { title: '修改处理场所' }
+      },
+      {
+        path: '/enterprise/info',
+        component: (resolve) => require(['@/views/unit/enterprise/info'], resolve),
+        name: '新增运输企业',
+        hidden: true,
+        meta: { title: '新增运输企业' }
+      },
+      {
+        path: '/enterprise/infoEdit',
+        component: (resolve) => require(['@/views/unit/enterprise/info'], resolve),
+        name: '修改运输企业',
+        hidden: true,
+        meta: { title: '修改运输企业' }
+      },
+      {
+        path: '/unit/info',
+        component: (resolve) => require(['@/views/unit/businessUnit/info'], resolve),
+        name: '新增经营单位',
+        hidden: true,
+        meta: { title: '新增经营单位' }
+      },
+      {
+        path: '/unit/infoEdit',
+        component: (resolve) => require(['@/views/unit/businessUnit/info'], resolve),
+        name: '修改经营单位',
+        hidden: true,
+        meta: { title: '修改经营单位' }
+      },
+      {
+        path: '/carInfo/info',
+        component: (resolve) => require(['@/views/unit/carInfo/info'], resolve),
+        name: '新增车辆信息',
+        hidden: true,
+        meta: { title: '新增车辆信息' }
+      },
+      {
+        path: '/carInfo/infoEdit',
+        component: (resolve) => require(['@/views/unit/carInfo/info'], resolve),
+        name: '修改车辆信息',
+        hidden: true,
+        meta: { title: '修改车辆信息' }
+      },
+      {
+        path: '/driverInfo/info',
+        component: (resolve) => require(['@/views/unit/driver/info'], resolve),
+        name: '新增驾驶员',
+        hidden: true,
+        meta: { title: '新增驾驶员' }
+      },
+      {
+        path: '/driverInfo/infoEdit',
+        component: (resolve) => require(['@/views/unit/driver/info'], resolve),
+        name: '修改驾驶员',
+        hidden: true,
+        meta: { title: '修改驾驶员' }
+      },
     ]
-  },
+  },
   {
     path: '/business',
     component: Layout,
@@ -128,12 +199,12 @@ export const constantRoutes = [
         component: (resolve) => require(['@/views/business/ConstructionCredit'], resolve),
         name: '工地失信管理',
         meta: { title: '工地失信管理' }
-      },
-      {
-          path: 'track',
-          component: (resolve) => require(['@/views/business/track'], resolve),
-          name: '跟踪监督',
-          meta: { title: '跟踪监督' }
+      },
+      {
+          path: 'track',
+          component: (resolve) => require(['@/views/business/track'], resolve),
+          name: '跟踪监督',
+          meta: { title: '跟踪监督' }
         },
       {
         path: 'supervision/threestep',
@@ -371,6 +442,7 @@ export const constantRoutes = [
       },
     ]
   },
+
   // {
   //   path: '/task/handle',
   //   component: Layout,
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="标题" prop="title">
+        <el-input
+          v-model="queryParams.title"
+          placeholder="请输入标题"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['other:documentData:add']"
+        >新增
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['other:documentData:edit']"
+        >修改
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['other:documentData:remove']"
+        >删除
+        </el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['other:documentData:export']"
+        >导出
+        </el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="documentDataList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center"/>
+      <el-table-column label="附件" align="center" prop="id"/>
+      <el-table-column label="标题" align="center" prop="title"/>
+      <el-table-column label="时间" align="center" prop="createTime">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime, "{y}-{m}-{d} {h}:{i}:{s}") }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" 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)"
+            v-hasPermi="['other:documentData:edit']"
+          >修改
+          </el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['other:documentData:remove']"
+          >删除
+          </el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+    <!-- 添加或修改文件资料对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题"/>
+        </el-form-item>
+        <el-form-item label="内容" prop="content">
+          <editor v-model="form.content" :min-height="368"/>
+        </el-form-item>
+        <el-row>
+          <el-col :span="12">
+            <el-form-item label="录入时间">
+              <el-input v-model="form.createTime" disabled="disabled"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="录入人">
+              <el-input v-model="form.createBy" disabled="disabled"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-form-item label="附件预览">
+          <el-image v-for="item in fileEntityList"
+                    v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)"
+                    style="width: 150px; height: 100px; margin: 5px;"
+                    :src="createUrl(item)"
+                    :preview-src-list="[createUrl(item)]"
+                    :z-index="999">
+          </el-image>
+        </el-form-item>
+        <el-form-item prop="fileEntityList" label="附件">
+          <el-upload
+            ref="upload"
+            action=""
+            accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+            :on-change="fileChange"
+            :auto-upload="false"
+            :show-file-list="false"
+            multiple
+            :file-list="fileEntityList">
+            <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+          </el-upload>
+        </el-form-item>
+        <el-table :data="fileEntityList">
+          <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
+          <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
+            <template slot-scope="scope">
+              <el-button
+                size="small" type="success"
+                icon="el-icon-download"
+                @click="tempDownload(scope.row)"
+                v-hasPermi="['other:documentData:edit']"
+                round>下载
+              </el-button>
+              <el-button
+                size="small" type="danger"
+                icon="el-icon-delete"
+                @click="handleDeleteFile(scope.$index)"
+                v-hasPermi="['other:documentData:remove']"
+                round>删除
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+import {
+  addDocumentData,
+  delDocumentData,
+  exportDocumentData,
+  getDocumentData,
+  listDocumentData,
+  updateDocumentData
+} from "@/api/other/documentData";
+import Editor from '@/components/ZcEditor';
+import {parseTime} from "../../../utils/trash";
+
+export default {
+  name: "DocumentData",
+  components: {Editor},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 文件资料表格数据
+      documentDataList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        title: null,
+        content: null,
+        files: null,
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        title: [
+          {required: true, message: "请输入标题", trigger: "blur"},
+          {min: 1, max: 100, message: "长度在 1 到 100 个字符", trigger: "blur"}
+        ],
+        content: [
+          {required: true, message: "请输入内容", trigger: "blur"},
+          {min: 1, max: 10000, message: "长度在 1 到 10000 个字符", trigger: "blur"}
+        ],
+        files: [
+          {required: true, message: "请上传附件", trigger: "blur"}
+        ]
+      },
+      fileEntityList: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询文件资料列表 */
+    getList() {
+      this.loading = true;
+      listDocumentData(this.queryParams).then(response => {
+        this.documentDataList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        id: null,
+        title: null,
+        content: null,
+        files: null,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null
+      };
+      this.fileEntityList = [];
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length !== 1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      //yyyy-MM-dd HH:mm:ss
+      this.form.createTime = parseTime(new Date(), "{y}-{m}-{d} {h}:{i}:{s}");
+      this.form.createBy = this.$store.getters.name;
+      this.open = true;
+      this.title = "添加文件资料";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id || this.ids
+      getDocumentData(id).then(response => {
+        this.form = response.data;
+        //将附件转换为前端可视化数组
+        if (this.form.files != null && this.form.files !== "") {
+          let fileList = this.form.files.split(";");
+          fileList.map(item => {
+            let name = item.substring(item.lastIndexOf("/") + 1);
+            this.fileEntityList.push({name: name, url: item})
+          })
+        }
+        this.open = true;
+        this.title = "修改文件资料";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+          //先清空原有的附件
+          form.files = null;
+
+
+          this.fileEntityList.forEach(item => {
+            if (item.raw != null) {
+              formData.append('fileList', item.raw)
+            } else {
+              //将原有的附件拼接到form中
+              form.files = form.files !== null ? form.files + ";" + item.url : item.url;
+            }
+          })
+
+          for (let key in form) {
+            formData.append(key, form[key] == null ? "" : form[key])
+          }
+
+          if (this.form.id != null) {
+            updateDocumentData(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDocumentData(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除文件资料编号为"' + ids + '"的数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return delDocumentData(ids);
+      }).then(() => {
+        this.getList();
+        this.msgSuccess("删除成功");
+      })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有文件资料数据项?', "警告", {
+        confirmButtonText: "确定",
+        cancelButtonText: "取消",
+        type: "warning"
+      }).then(function () {
+        return exportDocumentData(queryParams);
+      }).then(response => {
+        this.download(response.msg);
+      })
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.fileEntityList = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是 jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    // 删除文件
+    handleDeleteFile(index) {
+      this.fileEntityList.splice(index, 1);
+    },
+    /** 文件下载 */
+    tempDownload(row) {
+      let name = row.name;
+      let url = "";
+      if (row.raw != null) {
+        url = URL.createObjectURL(row.raw);
+      } else {
+        url = process.env.VUE_APP_BASE_API + row.url;
+      }
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', url);
+      a.click()
+    },
+    createUrl(file) {
+      if (file.raw != null) {
+        return URL.createObjectURL(file.raw);
+      } else {
+        return process.env.VUE_APP_BASE_API + file.url;
+      }
+
+    },
+  }
+};
+</script>
+<template>
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-upload
+          ref="upload"
+          action=""
+          accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp"
+          :on-change="fileChange"
+          :auto-upload="false"
+          :show-file-list="false"
+          multiple
+          :file-list="file">
+          <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+        </el-upload>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="small" type="primary" @click="file=[]">删除附件</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="small" type="primary" @click="submitForm">提交</el-button>
+      </el-col>
+    </el-row>
+    <el-image v-if="file.length!=0" style=""
+              :src="createUrl(file[0])"
+              :preview-src-list="[createUrl(file[0])]"
+              :z-index="999">
+    </el-image>
+  </div>
+</template>
+
+<script>
+import {addIncorruptData, listIncorruptData} from "@/api/other/incorruptData";
+
+export default {
+  name: "incorruptEducation",
+  data() {
+    return {
+      file: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询文件资料列表 */
+    getList() {
+      this.loading = true;
+      listIncorruptData("education").then(response => {
+        this.file = [{
+          url:response[0].filePath,
+          name:response[0].fileName,
+        }];
+      });
+    },
+    delFile(){
+      this.file=[];
+    },
+    /** 提交按钮 */
+    submitForm() {
+
+      let formData = new FormData();
+      let form = {
+        files: null,
+        tableName: "education",
+      };
+
+      this.file.forEach(item => {
+        if (item.raw != null) {
+          formData.append('files', item.raw)
+        } else {
+          //将原有的附件拼接到form中
+          form.files = form.files !== null ? form.files + ";" + item.url : item.url;
+        }
+      })
+
+      for (let key in form) {
+        formData.append(key, form[key] == null ? "" : form[key])
+      }
+
+      addIncorruptData(formData).then(response => {
+        this.msgSuccess("新增成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      if(fileList.length>1){
+        this.$message({
+          message: '只能上传一张图片！',
+          type: 'warning'
+        });
+        return false;
+      }
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.file = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是 jpg,jpeg,png,gif,jfif,pjpeg,pjp格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    createUrl(file) {
+      if (file.raw != null) {
+        return URL.createObjectURL(file.raw);
+      } else {
+        return process.env.VUE_APP_BASE_API + file.url;
+      }
+
+    },
+  }
+};
+</script>
+<template>
+  <div class="app-container">
+
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-upload
+          ref="upload"
+          action=""
+          accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp"
+          :on-change="fileChange"
+          :auto-upload="false"
+          :show-file-list="false"
+          multiple
+          :file-list="file">
+          <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+        </el-upload>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="small" type="primary" @click="file=[]">删除附件</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button size="small" type="primary" @click="submitForm">提交</el-button>
+      </el-col>
+    </el-row>
+    <el-image v-if="file.length!=0" style=""
+              :src="createUrl(file[0])"
+              :preview-src-list="[createUrl(file[0])]"
+              :z-index="999">
+    </el-image>
+  </div>
+</template>
+
+<script>
+import {addIncorruptData, listIncorruptData} from "@/api/other/incorruptData";
+
+export default {
+  name: "incorruptGovernment",
+  data() {
+    return {
+      file: [],
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询文件资料列表 */
+    getList() {
+      this.loading = true;
+      listIncorruptData("government").then(response => {
+        this.file = [{
+          url:response[0].filePath,
+          name:response[0].fileName,
+        }];
+      });
+    },
+    delFile(){
+      this.file=[];
+    },
+    /** 提交按钮 */
+    submitForm() {
+
+      let formData = new FormData();
+      let form = {
+        files: null,
+        tableName: "government",
+      };
+
+      this.file.forEach(item => {
+        if (item.raw != null) {
+          formData.append('files', item.raw)
+        } else {
+          //将原有的附件拼接到form中
+          form.files = form.files !== null ? form.files + ";" + item.url : item.url;
+        }
+      })
+
+      for (let key in form) {
+        formData.append(key, form[key] == null ? "" : form[key])
+      }
+
+      addIncorruptData(formData).then(response => {
+        this.msgSuccess("新增成功");
+        this.open = false;
+        this.getList();
+      });
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      if(fileList.length>1){
+        this.$message({
+          message: '只能上传一张图片！',
+          type: 'warning'
+        });
+        return false;
+      }
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.file = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是 jpg,jpeg,png,gif,jfif,pjpeg,pjp格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    createUrl(file) {
+      if (file.raw != null) {
+        return URL.createObjectURL(file.raw);
+      } else {
+        return process.env.VUE_APP_BASE_API + file.url;
+      }
+
+    },
+  }
+};
+</script>
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
+      <el-form-item label="企业名称" prop="name">
+        <el-input
+          v-model="queryParams.name"
+          placeholder="请输入企业名称"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="所属区域" prop="registrationArea">
+        <el-select v-model="queryParams.registrationArea" placeholder="请输入注册地所在区域" style="width: 100%" clearable>
+          <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
+        </el-select>
+      </el-form-item>
+
+      <el-form-item label="法人代表" prop="legalRepresentative">
+        <el-input
+          v-model="queryParams.legalRepresentative"
+          placeholder="请输入法人代表"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="审批状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
+          <el-option label="审批中" value="0" />
+          <el-option label="审批通过" value="1" />
+          <el-option label="被驳回" value="2" />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['unit:enterprise:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['unit:enterprise:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['unit:enterprise:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['unit:enterprise:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="enterpriseList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" width="55" align="center" label="序号"/>
+      <el-table-column label="企业名称" align="center" prop="name" />
+      <el-table-column label="简称" align="center" prop="abbreviation" />
+      <el-table-column label="所属区域" align="center" prop="registrationArea" />
+      <el-table-column label="车辆数" align="center" prop="carNumber" />
+      <el-table-column label="法人代表" align="center" prop="legalRepresentative" />
+      <el-table-column label="联系方式" align="center" prop="legalRepresentativePhone" />
+      <el-table-column label="审批状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <span>{{ parseStatus(scope.row.status) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+      <el-table-column label="操作" 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)"
+            v-hasPermi="['unit:enterprise:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['unit:enterprise:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise, exportEnterprise } from "@/api/unit/enterprise";
+import {getAreaList} from "@/api/casefile/remoteServer";
+
+export default {
+  name: "Enterprise",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 运输企业管理表格数据
+      enterpriseList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        abbreviation: null,
+        registrationArea: null,
+        transportPermissionDate: null,
+        enterDate: null,
+        businessLicenseDate: null,
+        officeAddress: null,
+        parkingLotLocation: null,
+        parkingArea: null,
+        carNumber: null,
+        safetyManagerName: null,
+        safetyManagerPhone: null,
+        socialUniformCreditCodeNumber: null,
+        legalRepresentative: null,
+        legalRepresentativePhone: null,
+        safetyPeopleName: null,
+        transportPermission: null,
+        enterpriseBusinessLicense: null,
+        safetyOfficerQualificationCertificate: null,
+        safetyCertificate: null,
+        carParkPanorama: null,
+        businessUnit: null,
+        status: null,
+        parentId: null,
+        companyType: null,
+        creditStatus: null,
+        qrCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      areas: []
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.getList();
+  },
+  watch:{
+    '$route.query.unitRefresh':'getList'
+  },
+  methods: {
+    /** 查询运输企业管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.companyType = "0";
+      listEnterprise(this.queryParams).then(response => {
+        this.enterpriseList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$tab.openPage("新增经营单位","/unit/info",{unitRefresh:0});
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      this.$tab.openPage("修改经营单位","/unit/infoEdit",{unitId: id,unitRefresh:0});
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除运输企业管理编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delEnterprise(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有运输企业管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportEnterprise(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>
+<template>
+  <div class="app-container">
+
+    <!-- 添加或修改处理场所管理对话框 -->
+    <h3>
+      基础信息
+    </h3>
+    <el-form ref="form" :model="form" :rules="rules" label-width="80px"  label-position="top">
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="企业名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入企业名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="简称" prop="abbreviation">
+            <el-input v-model="form.abbreviation" placeholder="请输入简称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="注册地所在区域" prop="registrationArea">
+            <el-select v-model="form.registrationArea" placeholder="请输入注册地所在区域" style="width: 100%">
+              <el-option v-for="(area,index) in areas" :label="area.name" :value="area.name" :key="index"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="企业道路运输经营许可证有效期" prop="transportPermissionDate">
+            <el-date-picker clearable size="small" style="width: 100%;"
+                            v-model="form.transportPermissionDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择企业道路运输经营许可证有效期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="企业入市时间" prop="enterDate">
+            <el-date-picker clearable size="small" style="width: 100%;"
+                            v-model="form.enterDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择企业入市时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="企业营业执照有效期" prop="businessLicenseDate">
+            <el-date-picker clearable size="small" style="width: 100%;"
+                            v-model="form.businessLicenseDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择企业营业执照有效期">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="办公地址" prop="officeAddress">
+            <el-input v-model="form.officeAddress" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="停车场位置" prop="parkingLotLocation">
+            <el-input v-model="form.parkingLotLocation" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="停车场面积(m²)" prop="parkingArea">
+            <el-input v-model="form.parkingArea" placeholder="请输入停车场面积" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="企业安全负责人姓名及联系方式" prop="safetyManagerName">
+            <el-row>
+              <el-col :span="6">
+                <el-input v-model="form.safetyManagerName" placeholder="姓名" />
+              </el-col>
+              <el-col :span="18">
+                <el-input v-model="form.safetyManagerPhone" placeholder="联系方式"  :maxlength="11" show-word-limit/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="社会统一信用代码编号" prop="socialUniformCreditCodeNumber">
+            <el-input v-model="form.socialUniformCreditCodeNumber" placeholder="请输入社会统一信用代码编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="法人代表及联系方式" prop="legalRepresentative">
+            <el-row>
+              <el-col :span="6">
+                <el-input v-model="form.legalRepresentative" placeholder="姓名" />
+              </el-col>
+              <el-col :span="18">
+                <el-input v-model="form.legalRepresentativePhone" placeholder="联系方式"  :maxlength="11" show-word-limit/>
+              </el-col>
+            </el-row>
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="安全管理人员" prop="safetyPeopleName">
+            <el-input v-model="form.safetyPeopleName" placeholder="请输入安全管理人员" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="14">
+          <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            企业道路运输经营许可证
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="transportPermission">
+
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in transportPermission">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="transportPermission.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="transportPermission.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            企业营业执照
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange1"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="enterpriseBusinessLicense">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in enterpriseBusinessLicense">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="enterpriseBusinessLicense.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="enterpriseBusinessLicense.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            安全员考核合格证明
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange2"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="safetyOfficerQualificationCertificate">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in safetyOfficerQualificationCertificate">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="safetyOfficerQualificationCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="safetyOfficerQualificationCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            企业负责人安全考核证
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange3"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="safetyCertificate">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in safetyCertificate">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="safetyCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="safetyCertificate.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
+        <el-col :span="3">
+          <div class="upload_lable">
+            停车场全景图
+            <el-upload
+              ref="upload"
+              action=""
+              accept=".jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx"
+              :on-change="fileChange4"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="carParkPanorama">
+              <el-button size="small" type="primary" icon="el-icon-upload">上传附件</el-button>
+            </el-upload>
+          </div>
+        </el-col>
+        <el-col :span="21">
+          <div class="upload_btn">
+            <div v-for="(item,index) in carParkPanorama">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carParkPanorama.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <el-image
+                  style="width: 110px; height: 95px; margin: 5px;float:left;"
+                  :src="createUrl(item)"
+                  :preview-src-list="[createUrl(item)]"
+                  :z-index="999">
+                </el-image>
+              </div>
+              <div  v-if="/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_file">
+                <div class="upload_close_file" @click="carParkPanorama.splice(index,1);"><el-icon class="el-icon-error"></el-icon></div>
+                <span @click="tempDownload(item)"><el-icon class="el-icon-document-add" style="font-size:70px;"></el-icon></span>
+                <div style="overflow: hidden;text-overflow: ellipsis;white-space: nowrap;" @click="tempDownload(item)">{{ item.name }}</div>
+              </div>
+            </div>
+          </div>
+        </el-col>
+      </el-row>
+      <!--        <el-form-item label="" prop="environmentalApproval">-->
+      <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="" prop="authorization">-->
+      <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="" prop="otherInformation">-->
+      <!--          <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="运输企业" prop="companyIds">-->
+      <!--          <el-input v-model="form.companyIds" placeholder="请输入运输企业" />-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="审批状态,0=审批中,1=审批通过,2=被驳回">-->
+      <!--          <el-radio-group v-model="form.status">-->
+      <!--            <el-radio label="1">请选择字典生成</el-radio>-->
+      <!--          </el-radio-group>-->
+      <!--        </el-form-item>-->
+      <!--        <el-form-item label="二维码" prop="qrCode">-->
+      <!--          <el-input v-model="form.qrCode" placeholder="请输入二维码" />-->
+      <!--        </el-form-item>-->
+    </el-form>
+    <div slot="footer" class="dialog-footer" style="margin-top: 20px">
+      <el-button type="primary" @click="submitForm">确 定</el-button>
+      <el-button @click="cancel">取 消</el-button>
+    </div>
+  </div>
+</template>
+
+<script>
+import { listEnterprise, getEnterprise, delEnterprise, addEnterprise, updateEnterprise, exportEnterprise } from "@/api/unit/enterprise";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {getAreaList} from "@/api/casefile/remoteServer";
+
+export default {
+  name: "DisposalSite",
+  components: {Treeselect},
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 处理场所管理表格数据
+      disposalSiteList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        name: [
+          {required: true, message: "请输入企业名称", trigger: "blur"}
+        ],
+        abbreviation: [
+          {required: true, message: "请输入简称", trigger: "blur"}
+        ],
+        registrationArea: [
+          {required: true, message: "请输入注册地所在区域", trigger: "blur"}
+        ],
+        transportPermissionDate: [
+          {required: true, message: "请选择企业道路运输经营许可证有效期", trigger: "blur"}
+        ],
+        enterDate: [
+          {required: true, message: "请选择企业入市时间", trigger: "blur"}
+        ],
+        businessLicenseDate: [
+          {required: true, message: "请选择企业营业执照有效期", trigger: "blur"}
+        ],
+        officeAddress: [
+          {required: true, message: "请输入办公地址", trigger: "blur"}
+        ],
+        parkingLotLocation: [
+          {required: true, message: "请输入停车场位置", trigger: "blur"}
+        ],
+        parkingArea: [
+          {required: true, message: "请输入停车场面积", trigger: "blur"},
+          {pattern: /^\d+(\.\d+)?$/, message: "只能输入正数和小数", trigger: "blur"}
+        ],
+        safetyManagerName: [
+          {required: true, message: "请输入企业安全负责人姓名", trigger: "blur"}
+        ],
+        socialUniformCreditCodeNumber: [
+          {required: true, message: "请输入社会统一信用代码编号", trigger: "blur"}
+        ],
+        legalRepresentative: [
+          {required: true, message: "请输入法人代表", trigger: "blur"}
+        ],
+        safetyPeopleName: [
+          {required: true, message: "请输入安全管理人员", trigger: "blur"}
+        ],
+      },
+      areas:[],
+      // 企业道路运输经营许可证
+      transportPermission:[],
+      // 企业营业执照
+      enterpriseBusinessLicense:[],
+      // 安全员考核合格证明
+      safetyOfficerQualificationCertificate:[],
+      // 企业负责人安全考核证
+      safetyCertificate:[],
+      // 停车场全景图
+      carParkPanorama:[],
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.initData();
+  },
+  watch: {
+    '$route.query.unitId': 'initData'
+  },
+  methods: {
+    reset(){
+      this.form = {};
+      this.transportPermission = [];
+      this.enterpriseBusinessLicense = [];
+      this.safetyOfficerQualificationCertificate = [];
+      this.safetyCertificate = [];
+      this.carParkPanorama = [];
+    },
+    initData(){
+      this.reset();
+      let id = this.$route.query.unitId;
+      if(id!=null){
+        getEnterprise(id).then(response => {
+          this.form = response.data;
+          //将附件转换为前端可视化数组
+          if(this.form.transportPermission!=null&&this.form.transportPermission!==""){
+            let approvalDocument = this.form.transportPermission.split(";");
+            approvalDocument.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.transportPermission.push({name:name,url:item})
+            })
+          }
+          if(this.form.enterpriseBusinessLicense!=null&&this.form.enterpriseBusinessLicense!==""){
+            let approvalData = this.form.enterpriseBusinessLicense.split(";");
+            approvalData.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.enterpriseBusinessLicense.push({name:name,url:item})
+            })
+          }
+          if(this.form.safetyOfficerQualificationCertificate!=null&&this.form.safetyOfficerQualificationCertificate!==""){
+            let scenePhoto = this.form.safetyOfficerQualificationCertificate.split(";");
+            scenePhoto.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.safetyOfficerQualificationCertificate.push({name:name,url:item})
+            })
+          }
+          if(this.form.safetyCertificate!=null&&this.form.safetyCertificate!==""){
+            let carWashingFacilitiesImage = this.form.safetyCertificate.split(";");
+            carWashingFacilitiesImage.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.safetyCertificate.push({name:name,url:item})
+            })
+          }
+          if(this.form.carParkPanorama!=null&&this.form.carParkPanorama!==""){
+            let safetyAssessmentReport = this.form.carParkPanorama.split(";");
+            safetyAssessmentReport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carParkPanorama.push({name:name,url:item})
+            })
+          }
+        });
+      }
+    },
+    createUrl(file){
+      if(file.raw!=null){
+        return URL.createObjectURL(file.raw);
+      }else{
+        return process.env.VUE_APP_BASE_API + file.url;
+      }
+
+    },
+    tempDownload(row){
+      let name = row.name;
+      let url = "";
+      if(row.raw!=null){
+        url = URL.createObjectURL(row.raw);
+      }else{
+        url = process.env.VUE_APP_BASE_API + row.url;
+      }
+      const a = document.createElement('a')
+      a.setAttribute('download', name)
+      a.setAttribute('target', '_blank')
+      a.setAttribute('href', url);
+      a.click()
+    },
+    // 取消按钮
+    cancel() {
+      this.$tab.closePage({path:"/unit/info"}).then(() => {
+        this.$tab.openPage("经营单位管理", "/tool/unit",{unitRefresh:1})
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let phoneTest = /^1[3456789]\d{9}$/;
+          if(phoneTest.test(this.form.safetyManagerPhone)===false){
+            this.msgError("请输入正确的企业安全负责人联系方式");
+            return false;
+          }
+          if(phoneTest.test(this.form.legalRepresentativePhone)===false){
+            this.msgError("请输入正确的法人代表联系方式");
+            return false;
+          }
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+
+          //先清空原有的附件
+          form.transportPermission = null;
+          form.enterpriseBusinessLicense = null;
+          form.safetyOfficerQualificationCertificate = null;
+          form.safetyCertificate = null;
+          form.carParkPanorama = null;
+          form.companyType = "0";
+
+          this.transportPermission.forEach(item => {
+            if (item.raw != null) {
+              formData.append('transportPermissionFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.transportPermission = form.transportPermission!==null?form.transportPermission+";"+item.url:item.url;
+            }
+          })
+
+          this.enterpriseBusinessLicense.forEach(item => {
+            if (item.raw != null) {
+              formData.append('enterpriseBusinessLicenseFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.enterpriseBusinessLicense = form.enterpriseBusinessLicense!==null?form.enterpriseBusinessLicense+";"+item.url:item.url;
+            }
+          })
+          this.safetyOfficerQualificationCertificate.forEach(item => {
+            if (item.raw != null) {
+              formData.append('safetyOfficerQualificationCertificateFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.safetyOfficerQualificationCertificate = form.safetyOfficerQualificationCertificate!==null?form.safetyOfficerQualificationCertificate+";"+item.url:item.url;
+            }
+          })
+          this.safetyCertificate.forEach(item => {
+            if (item.raw != null) {
+              formData.append('safetyCertificateFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.safetyCertificate = form.safetyCertificate!==null?form.safetyCertificate+";"+item.url:item.url;
+            }
+          })
+          this.carParkPanorama.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carParkPanoramaFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carParkPanorama = form.carParkPanorama!==null?form.carParkPanorama+";"+item.url:item.url;
+            }
+          })
+          for (let key in form) {
+            formData.append(key, form[key] == null ? "" : form[key])
+          }
+          if (this.form.id != null) {
+            updateEnterprise(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.$tab.closePage({path:"/unit/infoEdit"}).then(() => {
+                this.$tab.openPage("经营单位管理", "/tool/unit",{unitRefresh:1})
+              })
+            });
+          } else {
+            addEnterprise(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.$tab.closePage({path:"/unit/info"}).then(() => {
+                this.$tab.openPage("经营单位管理", "/tool/unit",{unitRefresh:1})
+              })
+            });
+          }
+        }
+      });
+    },
+    /**
+     * 文件改变时,限制文件上传格式和大小
+     * 文件格式只能为docx/doc/pdf/png/jpeg/png/jpg
+     * 大小不超过20M
+     * */
+    fileChange(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.transportPermission = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange1(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.enterpriseBusinessLicense = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange2(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.safetyOfficerQualificationCertificate = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange3(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.safetyCertificate = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange4(file, fileList) {
+      let count = 0;
+      for (let i = 0; i < fileList.length; i++) {
+        // console.log(fileList.length)
+        // console.log(this.fileEntityList[i].name+"111"+file.name)
+        if (fileList[i].name == file.name) {
+          count++;
+          if (count == 2) {
+            this.$message({
+              message: '已存在此文件！',
+              type: 'warning'
+            });
+            for (let j = fileList.length; j > 0; j--) {
+              //如果存在此文件，去除新选择的重复文件
+              if (fileList[j - 1].name == file.name) {
+                fileList.splice(j - 1, 1);
+                i--;
+                return false;
+              }
+            }
+          }
+        }
+      }
+      let fileType = file.name.substring(file.name.lastIndexOf('.') + 1).toLowerCase();
+      //格式符合后判断大小
+      if ("jpg,jpeg,png,gif,jfif,pjpeg,pjp,pdf,doc,docx,xls,xlsx".indexOf(fileType) != -1) {
+        let max5M = file.size / 1024 / 1024 < 100;
+        if (!max5M) {
+          this.$message({
+            message: '上传文件大小不得超过100M！',
+            type: 'warning'
+          });
+          fileList = fileList.splice(fileList.length - 1, 1);
+        } else {
+          //符合条件后进行添加
+          this.carParkPanorama = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp,.pdf,.doc,.docx,.xls,.xlsx格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+  }
+};
+</script>
+<style  lang="scss"  scoped>
+.upload_lable{
+  border-right: 1px solid #dcdfe6;
+  padding: 27px 30px;
+  background: #fafafa;
+  text-align: center;
+}
+.upload_btn{
+  max-height: 106px;
+}
+.upload_close{
+  position: absolute;
+  left: 105px;
+  z-index:99;
+  top:-1px;
+  font-size:18px;
+  color:red;
+}
+.upload_close_file{
+  position: absolute;
+  left: 80px;
+  z-index:99;
+  top:-1px;
+  font-size:18px;
+  color:red;
+}
+.upload_div_image{
+  display: inline-block;
+  width: 110px;
+  height: 95px;
+  position: relative;
+  float: left;
+  margin-left: 5px;
+}
+.upload_div_file{
+  display: inline-block;
+  width: 110px;
+  height: 95px;
+  text-align: center;
+  float:left;
+  margin: 5px;
+  position: relative;
+}
+.serach_map{
+  position: absolute;
+  top: 100px;
+  left: 25px;
+  z-index: 999;
+  background: #fff;
+  padding: 10px;
+  border-radius: 5px;
+  box-shadow: 0 0 10px rgba(0,0,0,.2);
+}
+</style>
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+      <el-form-item label="所属公司" prop="companyName">
+        <el-input
+          v-model="queryParams.companyName"
+          placeholder="请输入所属公司"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆类型" prop="carType">
+        <el-select v-model="queryParams.carType" placeholder="请选择车辆类型" clearable style="width: 100%;"  size="small">
+          <el-option label="燃油渣土车" value="燃油渣土车" />
+          <el-option label="电动渣土车" value="电动渣土车" />
+          <el-option label="其它" value="其它" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="车牌号" prop="carCode">
+        <el-input
+          v-model="queryParams.carCode"
+          placeholder="请输入车牌号"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="车辆品牌" prop="carBrank">
+        <el-input
+          v-model="queryParams.carBrank"
+          placeholder="请输入车辆品牌"
+          clearable
+          size="small"
+          @keyup.enter.native="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+          type="primary"
+          icon="el-icon-plus"
+          size="mini"
+          @click="handleAdd"
+          v-hasPermi="['unit:carInfo:add']"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="success"
+          icon="el-icon-edit"
+          size="mini"
+          :disabled="single"
+          @click="handleUpdate"
+          v-hasPermi="['unit:carInfo:edit']"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="danger"
+          icon="el-icon-delete"
+          size="mini"
+          :disabled="multiple"
+          @click="handleDelete"
+          v-hasPermi="['unit:carInfo:remove']"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+          type="warning"
+          icon="el-icon-download"
+          size="mini"
+          @click="handleExport"
+          v-hasPermi="['unit:carInfo:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="carInfoList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column type="index" width="55" align="center" label="序号"/>
+      <el-table-column label="车牌号" align="center" prop="carCode" />
+      <el-table-column label="车辆标识牌" align="center" prop="carIdentification" />
+      <el-table-column label="所属公司" align="center" prop="companyName" />
+      <el-table-column label="驾驶员" align="center" prop="driversName" />
+      <el-table-column label="车辆品牌" align="center" prop="carBrank" />
+      <el-table-column label="所属区域" align="center" prop="emissionStandard" />
+      <el-table-column label="车辆类型" align="center" prop="carType" />
+      <el-table-column label="SIM卡号" align="center" prop="farmeNumber" />
+      <el-table-column label="审批状态" align="center" prop="status" >
+        <template slot-scope="scope">
+          {{ parseStatus(scope.row.status)}}
+        </template>
+      </el-table-column>
+      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+      <el-table-column label="操作" 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)"
+            v-hasPermi="['unit:carInfo:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['unit:carInfo:remove']"
+          >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+      v-show="total>0"
+      :total="total"
+      :page.sync="queryParams.pageNum"
+      :limit.sync="queryParams.pageSize"
+      @pagination="getList"
+    />
+
+  </div>
+</template>
+
+<script>
+import { listCarInfo, getCarInfo, delCarInfo, addCarInfo, updateCarInfo, exportCarInfo } from "@/api/unit/carInfo";
+import {parseStatus} from "../../../utils/trash";
+
+export default {
+  name: "CarInfo",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 运输车辆管理表格数据
+      carInfoList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        companyId: null,
+        carType: null,
+        carCode: null,
+        carBrank: null,
+        emissionStandard: null,
+        roadTransportDate: null,
+        drivingLicenseDate: null,
+        enterDate: null,
+        farmeNumber: null,
+        carIdentification: null,
+        containerVolume: null,
+        carColor: null,
+        carEquipment: null,
+        roadTransport: null,
+        drivingLicense: null,
+        carFront: null,
+        carLeft: null,
+        carBehind: null,
+        carRight: null,
+        drivers: null,
+        status: null,
+        creditStatus: null,
+        qrCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  watch:{
+    '$route.query.carInfoRefresh':'getList'
+  },
+  methods: {
+    /** 查询运输车辆管理列表 */
+    getList() {
+      this.loading = true;
+      listCarInfo(this.queryParams).then(response => {
+        this.carInfoList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$tab.openPage("新增车辆信息","/carInfo/info",{carInfoRefresh:0});
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      this.$tab.openPage("修改运输企业","/carInfo/infoEdit",{carInfoId: id,carInfoRefresh:0});
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.id != null) {
+            updateCarInfo(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addCarInfo(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除运输车辆管理编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delCarInfo(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有运输车辆管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportCarInfo(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+        })
+    }
+  }
+};
+</script>