m

youxiw2000
2 parents 7ef57d20 a9073a0d
Showing 94 changed files with 11303 additions and 507 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>
+<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="companyId">
+            <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;" @change="listDriverByCompany">
+              <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="车辆类型" prop="carType">
+            <el-select v-model="form.carType" placeholder="请选择车辆类型" clearable style="width: 100%;">
+              <el-option label="燃油渣土车" value="燃油渣土车" />
+              <el-option label="电动渣土车" value="电动渣土车" />
+              <el-option label="其它" value="其它" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="车牌号" prop="carCode">
+            <el-input v-model="form.carCode" placeholder="请输入车牌号" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="车辆品牌" prop="carBrank">
+            <el-input v-model="form.carBrank" placeholder="请输入车辆品牌" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="排放标准" prop="emissionStandard">
+            <el-select v-model="form.emissionStandard" placeholder="请选择排放标准" clearable style="width: 100%;">
+              <el-option label="国四" value="国四" />
+              <el-option label="国五" value="国五" />
+              <el-option label="国六" value="国六" />
+              <el-option label="纯电动" value="纯电动" />
+            </el-select>
+        </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="驾驶员" prop="drivers">
+            <treeselect v-model="drivers" :multiple="true" :options="options" placeholder="请选择"/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="道路运输证有效期" prop="roadTransportDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.roadTransportDate"
+                            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="drivingLicenseDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.drivingLicenseDate"
+                            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-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="车架号" prop="farmeNumber">
+            <el-input v-model="form.farmeNumber" placeholder="请输入车架号" />
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="车辆标识牌" prop="carIdentification">
+            <el-input v-model="form.carIdentification" placeholder="请输入车辆标识牌" />
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="箱货体积" prop="containerVolume">
+            <el-row>
+              <el-col :span="5">
+                <el-select v-model="volumeOrLWH" placeholder="请选择排放标准" style="width: 100%;">
+                  <el-option label="体积" value="体积"/>
+                  <el-option label="长宽高" value="长宽高" />
+                </el-select>
+              </el-col>
+              <el-col :span="19" v-if="volumeOrLWH==='体积'">
+                <el-input v-model="form.containerVolume" placeholder="请输入车辆体积" />
+              </el-col>
+              <el-col :span="19" v-if="volumeOrLWH==='长宽高'">
+                <el-row>
+                  <el-col :span="8">
+                    <el-input v-model="form.length" placeholder="长" />
+                  </el-col>
+                  <el-col :span="8">
+                    <el-input v-model="form.width" placeholder="宽" />
+                  </el-col>
+                  <el-col :span="8">
+                    <el-input v-model="form.height" placeholder="高" />
+                  </el-col>
+                </el-row>
+              </el-col>
+            </el-row>
+
+          </el-form-item>
+
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="车辆颜色" prop="carColor">
+            <el-select v-model="form.carColor" placeholder="请选择车辆颜色" clearable style="width: 100%;">
+              <el-option label="黄色" value="黄色"/>
+              <el-option label="蓝色" value="蓝色" />
+              <el-option label="黄绿色" value="黄绿色" />
+              <el-option label="黑色" value="黑色" />
+              <el-option label="白色" value="白色" />
+              <el-option label="未上牌" value="未上牌" />
+              <el-option label="其它" value="其它" />
+            </el-select>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="车辆设备" prop="carEquipment">
+            <el-input v-model="form.carEquipment" placeholder="请输入车辆设备" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <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="roadTransport">
+
+              <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 roadTransport">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="roadTransport.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="roadTransport.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="drivingLicense">
+              <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 drivingLicense">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="drivingLicense.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="drivingLicense.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"
+              :on-change="fileChange2"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="carFront">
+              <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 carFront">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carFront.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="carFront.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"
+              :on-change="fileChange3"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="carLeft">
+              <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 carLeft">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carLeft.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="carLeft.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"
+              :on-change="fileChange4"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="carBehind">
+              <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 carBehind">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carBehind.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="carBehind.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"
+              :on-change="fileChange5"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="carRight">
+              <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 carRight">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carRight.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="carRight.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 {getCarInfo, addCarInfo, updateCarInfo } from "@/api/unit/carInfo";
+import { listEnterprise} from "@/api/unit/enterprise";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {getAreaList} from "@/api/casefile/remoteServer";
+import { listDriverByCompanyId } from "@/api/unit/driver";
+
+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: {
+        companyId: [
+          {required: true, message: "请选择所属公司", trigger: "blur"}
+        ],
+        carType: [
+          {required: true, message: "请选择车辆类型", trigger: "blur"}
+        ],
+        carCode: [
+          {required: true, message: "请输入车牌号", trigger: "blur"}
+        ],
+        carBrank: [
+          {required: true, message: "请输入车辆品牌", trigger: "blur"}
+        ],
+        emissionStandard: [
+          {required: true, message: "请选择排放标准", trigger: "blur"}
+        ],
+        roadTransportDate: [
+          {required: true, message: "请选择道路运输证有效期", trigger: "blur"}
+        ],
+        drivingLicenseDate: [
+          {required: true, message: "请选择行驶证有效期", trigger: "blur"}
+        ],
+        enterDate: [
+          {required: true, message: "请选择录入日期", trigger: "blur"}
+        ],
+        farmeNumber: [
+          {required: true, message: "请输入车架号", trigger: "blur"}
+        ],
+        carIdentification: [
+          {required: true, message: "请输入车辆标识牌", trigger: "blur"}
+        ],
+
+      },
+      areas:[],
+      // 附件
+      roadTransport: [],
+      drivingLicense: [],
+      carFront: [],
+      carLeft: [],
+      carBehind: [],
+      carRight: [],
+      enterpriseList:[],
+      driverList:[],
+      options:[],
+      volumeOrLWH:"体积",
+      drivers:[]
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.queryParams = {
+      companyType:"1"
+    }
+    listEnterprise(this.queryParams).then(response => {
+      this.enterpriseList = response.rows;
+    });
+    this.initData();
+  },
+  watch: {
+    '$route.query.carInfoId': 'initData'
+  },
+  methods: {
+    listDriverByCompany(value){
+      listDriverByCompanyId(value).then(response => {
+        this.drivers = [];
+        this.options = response;
+      });
+    },
+    reset(){
+      this.form = {
+        id: null,
+        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,
+        remark: null,
+        roadTransport: null,
+        drivingLicense: null,
+        carFront: null,
+        carLeft: null,
+        carBehind: null,
+        carRight: null,
+        drivers: null,
+        status: 0,
+        createTime: null,
+        createBy: null,
+        updateTime: null,
+        updateBy: null,
+        creditStatus: "0",
+        qrCode: null
+      };
+      this.roadTransport = [];
+      this.drivingLicense = [];
+      this.carFront = [];
+      this.carLeft = [];
+      this.carBehind = [];
+      this.carRight = [];
+      this.drivers = [];
+    },
+    initData(){
+      this.reset();
+      let id = this.$route.query.carInfoId;
+      if(id!=null){
+        getCarInfo(id).then(response => {
+          this.form = response.data;
+
+          listDriverByCompanyId(this.form.companyId).then(response => {
+            this.drivers = this.form.drivers.split(",").map(value => parseInt(value));
+            this.options = response;
+          });
+
+          //将附件转换为前端可视化数组
+          if(this.form.roadTransport!=null&&this.form.roadTransport!==""){
+            let roadTransport = this.form.roadTransport.split(";");
+            roadTransport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.roadTransport.push({name:name,url:item})
+            })
+          }
+          if(this.form.drivingLicense!=null&&this.form.drivingLicense!==""){
+            let drivingLicense = this.form.drivingLicense.split(";");
+            drivingLicense.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.drivingLicense.push({name:name,url:item})
+            })
+          }
+          if(this.form.carFront!=null&&this.form.carFront!==""){
+            let carFront = this.form.carFront.split(";");
+            carFront.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carFront.push({name:name,url:item})
+            })
+          }
+          if(this.form.carLeft!=null&&this.form.carLeft!==""){
+            let carLeft = this.form.carLeft.split(";");
+            carLeft.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carLeft.push({name:name,url:item})
+            })
+          }
+          if(this.form.carBehind!=null&&this.form.carBehind!==""){
+            let carBehind = this.form.carBehind.split(";");
+            carBehind.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carBehind.push({name:name,url:item})
+            })
+          }
+          if(this.form.carRight!=null&&this.form.carRight!==""){
+            let carRight = this.form.carRight.split(";");
+            carRight.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carRight.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:"/carInfo/info"}).then(() => {
+        this.$tab.openPage("车辆信息", "/tool/carInfo",{carInfoRefresh:1})
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+
+          //先清空原有的附件
+          form.roadTransport = null;
+          form.drivingLicense = null;
+          form.carFront = null;
+          form.carLeft = null;
+          form.carBehind = null;
+          form.carRight = null;
+
+          if(this.volumeOrLWH==="长宽高"){
+            form.lengthWidthHeight = form.length+";"+form.width+";"+form.height;
+          }
+          this.form.drivers = this.drivers.join(",");
+          this.roadTransport.forEach(item => {
+            if (item.raw != null) {
+              formData.append('roadTransportFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.roadTransport = form.roadTransport!==null?form.roadTransport+";"+item.url:item.url;
+            }
+          })
+          this.drivingLicense.forEach(item => {
+            if (item.raw != null) {
+              formData.append('drivingLicenseFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.drivingLicense = form.drivingLicense!==null?form.drivingLicense+";"+item.url:item.url;
+            }
+          })
+          this.carFront.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carFrontFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carFront = form.carFront!==null?form.carFront+";"+item.url:item.url;
+            }
+          })
+          this.carLeft.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carLeftFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carLeft = form.carLeft!==null?form.carLeft+";"+item.url:item.url;
+            }
+          })
+          this.carBehind.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carBehindFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carBehind = form.carBehind!==null?form.carBehind+";"+item.url:item.url;
+            }
+          })
+          this.carRight.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carRightFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carRight = form.carRight!==null?form.carRight+";"+item.url:item.url;
+            }
+          })
+          for (let key in form) {
+            formData.append(key, form[key] == null ? "" : form[key])
+          }
+          if (this.form.id != null) {
+            updateCarInfo(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.$tab.closePage({path:"/carInfo/infoEdit"}).then(() => {
+                this.$tab.openPage("车辆信息管理", "/tool/carInfo",{carInfoRefresh:1})
+              })
+            });
+          } else {
+            addCarInfo(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.$tab.closePage({path:"/carInfo/info"}).then(() => {
+                this.$tab.openPage("车辆信息管理", "/tool/carInfo",{carInfoRefresh: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.roadTransport = 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.drivingLicense = 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".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.carFront = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp格式!',
+          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".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.carLeft = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp格式!',
+          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".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.carBehind = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp格式!',
+          type: 'warning'
+        });
+        fileList = fileList.splice(fileList.length - 1, 1);
+      }
+    },
+    fileChange5(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".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.carRight = fileList
+        }
+      } else {
+        this.$message({
+          message: '上传文件只能是.jpg,.jpeg,.png,.gif,.jfif,.pjpeg,.pjp格式!',
+          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="158px">
+      <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="siteType">
+        <el-select v-model="queryParams.siteType" placeholder="请选择建筑垃圾处理场所类型" clearable size="small">
+          <el-option label="消纳（回填）场所" value="消纳（回填）场所" />
+          <el-option label="建筑垃圾资源化处置场" value="建筑垃圾资源化处置场" />
+          <el-option label="盾构土环保处置场" value="盾构土环保处置场" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="所在区域" prop="localArea">
+        <el-select v-model="queryParams.localArea" 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="auditStatus">
+        <el-select v-model="queryParams.auditStatus" placeholder="审核情况" clearable size="small">
+          <el-option label="新增审核中" value="新增审核中" />
+          <el-option label="审核通过" value="审核通过" />
+          <el-option label="新增审核驳回" value="新增审核驳回" />
+          <el-option label="变更审核中" value="变更审核中" />
+          <el-option label="变更审核驳回" value="变更审核驳回" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="信用状态" prop="creditStatus">
+        <el-select v-model="queryParams.creditStatus" placeholder="请选择信用状态" clearable size="small">
+          <el-option label="正常" value="正常" />
+          <el-option label="失信" value="失信" />
+        </el-select>
+      </el-form-item>
+      <el-form-item label="期限范围" prop="termRange">
+        <el-select v-model="queryParams.termRange" placeholder="请选择期限范围" clearable size="small">
+          <el-option label="已超期" value="已超期" />
+          <el-option label="未超期" value="未超期" />
+        </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:disposalSite: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:disposalSite: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:disposalSite: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:disposalSite:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="disposalSiteList" @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="siteType" />
+      <el-table-column label="所在区域" align="center" prop="localArea" />
+      <el-table-column label="审批方量(m³)" align="center" prop="squareMeasure" />
+      <el-table-column label="剩余方量(m³)" align="center" prop="surplusSquareMeasure" />
+      <el-table-column label="有限期开始时间" align="center" prop="validityBeginDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.validityBeginDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="有限期结束时间" align="center" prop="validityEndDate" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.validityEndDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="消纳来源" align="center" prop="absorbSource" />
+      <el-table-column label="审核情况" align="center" prop="auditStatus" />
+      <el-table-column label="信用状态" align="center" prop="creditStatus" />
+      <el-table-column label="期限范围" align="center" prop="termRange" />
+      <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:disposalSite:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['unit:disposalSite: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 { listDisposalSite, getDisposalSite, delDisposalSite, addDisposalSite, updateDisposalSite, exportDisposalSite } from "@/api/unit/disposalSite";
+import {getAreaList} from "@/api/casefile/remoteServer";
+
+export default {
+  name: "DisposalSite",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 处理场所管理表格数据
+      disposalSiteList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        certificateNumber: null,
+        address: null,
+        engineeringProperty: null,
+        siteType: null,
+        localArea: null,
+        operatingArea: null,
+        trashType: null,
+        constructionUnit: null,
+        constructionUnitPerson: null,
+        constructionUnitPersonPhone: null,
+        validityBeginDate: null,
+        validityEndDate: null,
+        squareMeasure: null,
+        surplusSquareMeasure: null,
+        carWashingFacilities: null,
+        exitRoadCondition: null,
+        lightingFacility: null,
+        videoSurveillanceFacility: null,
+        preparer: null,
+        handlingAdvice: null,
+        absorbSource: null,
+        electronicFence: null,
+        creditStatus: null,
+        approvalDocument: null,
+        approvalData: null,
+        scenePhoto: null,
+        carWashingFacilitiesImage: null,
+        termRange: null,
+        safetyAssessmentReport: null,
+        environmentalApproval: null,
+        authorization: null,
+        otherInformation: null,
+        companyIds: null,
+        status: null,
+        qrCode: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      },
+      areas: []
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+
+    this.getList();
+  },
+  watch:{
+    '$route.query.disposalSiteRefresh':'getList'
+  },
+  methods: {
+    /** 查询处理场所管理列表 */
+    getList() {
+      this.loading = true;
+      listDisposalSite(this.queryParams).then(response => {
+        this.disposalSiteList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.$tab.openPage("新增处理场所管理","/disposalSite/info",{disposalSiteRefresh:0});
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      this.$tab.openPage("修改处理场所","/disposalSite/infoEdit",{disposalSiteId: id,disposalSiteRefresh:0});
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除处理场所管理编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDisposalSite(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有处理场所管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDisposalSite(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="6">
+          <el-form-item label="建筑垃圾处理场所名称" prop="name">
+            <el-input v-model="form.name" placeholder="请输入建筑垃圾处理场所名称" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="证书编号" prop="certificateNumber">
+            <el-input v-model="form.certificateNumber" placeholder="请输入证书编号" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="所在地址" prop="address">
+            <el-input v-model="form.address" placeholder="请输入所在地址" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="所在区域" prop="localArea">
+            <el-select v-model="form.localArea" 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-col :span="6">
+          <el-form-item label="建筑垃圾处理场所类型" prop="siteType">
+            <el-select v-model="form.siteType" placeholder="请选择建筑垃圾处理场所类型" style="width: 100%">
+              <el-option label="消纳（回填）场所" value="消纳（回填）场所" />
+              <el-option label="建筑垃圾资源化处置场" value="建筑垃圾资源化处置场" />
+              <el-option label="盾构土环保处置场" value="盾构土环保处置场" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="消纳（回填）场所工程性质" prop="engineeringProperty">
+            <el-select v-model="form.engineeringProperty" placeholder="请选择消纳（回填）场所工程性质" style="width: 100%">
+              <el-option label="消纳（回填）场" value="消纳（回填）场" />
+              <el-option label="房建市政工程" value="房建市政工程" />
+              <el-option label="交通工程" value="交通工程" />
+              <el-option label="水利工程" value="水利工程" />
+              <el-option label="国有土地整理" value="国有土地整理" />
+              <el-option label="平场工程" value="平场工程" />
+              <el-option label="生态修复" value="生态修复" />
+              <el-option label="覆绿造景工程" value="覆绿造景工程" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="作业区域" prop="operatingArea">
+            <el-select v-model="form.operatingArea" placeholder="请选择作业区域" style="width: 100%">
+              <el-option label="核心区域" value="核心区域" />
+              <el-option label="中心区域" value="中心区域" />
+              <el-option label="外环区域" value="外环区域" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="可受纳建筑垃圾类型" prop="trashType">
+            <treeselect v-model="form.trashType" :multiple="true" :options="options" placeholder="请选择"/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="建设（施工）单位名称" prop="constructionUnit">
+            <el-input v-model="form.constructionUnit" placeholder="请输入建设（施工）单位名称" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="建设（施工）单位责任人" prop="constructionUnitPerson">
+            <el-input v-model="form.constructionUnitPerson" placeholder="请输入建设（施工）单位责任人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="责任人联系电话" prop="constructionUnitPersonPhone">
+            <el-input v-model="form.constructionUnitPersonPhone" placeholder="请输入责任人联系电话" :maxlength="11" show-word-limit/>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="有限期开始时间" prop="validityBeginDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.validityBeginDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择有限期开始时间">
+            </el-date-picker>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="有限期结束时间" prop="validityEndDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.validityEndDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择有限期结束时间">
+            </el-date-picker>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="审批方量(m³)" prop="squareMeasure">
+            <el-input v-model="form.squareMeasure" placeholder="请输入审批方量(m³)" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <!--        <el-form-item label="剩余方量" prop="surplusSquareMeasure">-->
+      <!--          <el-input v-model="form.surplusSquareMeasure" placeholder="请输入剩余方量" />-->
+      <!--        </el-form-item>-->
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="洗车作业设施" prop="carWashingFacilities">
+            <el-select v-model="form.carWashingFacilities" placeholder="请选择洗车作业设施" style="width: 100%">
+              <el-option label="钢架洗车平台" value="钢架洗车平台" />
+              <el-option label="钢架洗车平台、过水槽" value="钢架洗车平台、过水槽" />
+              <el-option label="全自动洗车平台、过水槽" value="全自动洗车平台、过水槽" />
+              <el-option label="特殊事项" value="特殊事项" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="出口道路状况" prop="exitRoadCondition">
+            <el-select v-model="form.exitRoadCondition" placeholder="请选择出口道路状况" style="width: 100%">
+              <el-option label="硬化" value="硬化" />
+              <el-option label="未硬化" value="未硬化" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="照明设施" prop="lightingFacility">
+            <el-select v-model="form.lightingFacility" placeholder="请选择照明设施" style="width: 100%">
+              <el-option label="有" value="有" />
+              <el-option label="无" value="无" />
+              <el-option label="不适用" value="不适用" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="视频监控设施" prop="videoSurveillanceFacility">
+            <el-select v-model="form.videoSurveillanceFacility" placeholder="请选择视频监控设施" style="width: 100%">
+              <el-option label="有" value="有" />
+              <el-option label="无" value="无" />
+              <el-option label="不适用" value="不适用" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="6">
+          <el-form-item label="填表人" prop="preparer">
+            <el-input v-model="form.preparer" placeholder="请输入填表人" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+          <el-form-item label="办理意见" prop="handlingAdvice">
+            <el-input v-model="form.handlingAdvice" placeholder="请输入内容" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+
+
+
+      <!--        <el-form-item label="消纳来源" prop="absorbSource">-->
+      <!--          <el-input v-model="form.absorbSource" placeholder="请输入消纳来源" />-->
+      <!--        </el-form-item>-->
+      <el-form-item label="电子围栏" prop="electronicFence">
+        <template v-slot:label>
+          <el-tooltip class="item" placement="right" style="float:left;">
+            <div slot="content">
+              请保证经度在前，维度在后，中间用,隔开。多个坐标点之间用“;”隔开，示例:118.121,110.112;118.111,110.112
+            </div>
+            <div class="tips">
+              <span class="tipsSpan">
+                电子围栏
+              </span>
+              <i class="el-icon-question"></i>
+            </div>
+          </el-tooltip>
+          <el-button @click="draw" type="text" style="float: left;margin-left: 10px">绘制围栏</el-button>
+        </template>
+
+        <el-input v-model="form.electronicFence" type="textarea" placeholder="请输入内容" style="width: 49%"/>
+      </el-form-item>
+      <!--        <el-form-item label="信用状态">-->
+      <!--          <el-radio-group v-model="form.creditStatus">-->
+      <!--            <el-radio label="1">请选择字典生成</el-radio>-->
+      <!--          </el-radio-group>-->
+      <!--        </el-form-item>-->
+      <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="approvalDocument">
+
+              <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 approvalDocument">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="approvalDocument.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="approvalDocument.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="approvalData">
+              <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 approvalData">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="approvalData.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="approvalData.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="scenePhoto">
+              <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 scenePhoto">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="scenePhoto.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="scenePhoto.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="carWashingFacilitiesImage">
+              <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 carWashingFacilitiesImage">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="carWashingFacilitiesImage.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="carWashingFacilitiesImage.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="safetyAssessmentReport">
+              <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 safetyAssessmentReport">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="safetyAssessmentReport.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="safetyAssessmentReport.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="fileChange5"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="environmentalApproval">
+              <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 environmentalApproval">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="environmentalApproval.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="environmentalApproval.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="fileChange6"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="authorization">
+              <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 authorization">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="authorization.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="authorization.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="fileChange7"
+              :auto-upload="false"
+              :show-file-list="false"
+              multiple
+              :file-list="otherInformation">
+              <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 otherInformation">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="otherInformation.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="otherInformation.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>
+    <el-dialog title="高德地图" :visible.sync="openMap" width="1600px" height="750px" append-to-body>
+      <div class="serach_map">
+        搜索：
+        <el-select
+          v-model="keywords"
+          filterable
+          remote
+          placeholder="请输入关键词"
+          :remote-method="remoteMethod"
+          :loading="loading"
+          :clearable="true"
+          size="mini"
+          @change="currentSelect"
+          style="width: 250px"
+        >
+          <el-option
+            v-for="item in mapOptions"
+            :key="item.id"
+            :label="item.name"
+            :value="item"
+            class="one-text"
+          >
+            <span style="float: left">{{ item.name }}</span>
+            <span style="float: right; color: #8492a6; font-size: 13px">{{
+                item.district
+              }}</span>
+          </el-option>
+        </el-select>
+      </div>
+      <div v-loading="loading" id="zcContainer" class="am-map" style="width:100%;height: 700px;"></div>
+      <div slot="footer" class="dialog-footer">
+        <el-button @click="clearPolyEditor">清 空</el-button>
+        <el-button @click="closeMap">取 消</el-button>
+        <el-button type="primary" @click="openMap = false">确 定</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { listDisposalSite, getDisposalSite, delDisposalSite, addDisposalSite, updateDisposalSite, exportDisposalSite } from "@/api/unit/disposalSite";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {getAreaList} from "@/api/casefile/remoteServer";
+import AMapLoader from '@amap/amap-jsapi-loader';
+
+// 设置安全密钥
+window._AMapSecurityConfig = {
+  securityJsCode: 'aa1db7d8f534f3da3f6d8a6a71382802',
+}
+export default {
+  name: "DisposalSite",
+  components: {Treeselect,AMapLoader},
+  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" },
+        ],
+        address: [
+          { required: true, message: "请输入处置场所地址", trigger: "blur" },
+        ],
+        localArea: [
+          { required: true, message: "请选择所属区域", trigger: "blur" },
+        ],
+        siteType: [
+          { required: true, message: "请选择处置场所类型", trigger: "blur" },
+        ],
+        operatingArea: [
+          { required: true, message: "请选择锁业区域", trigger: "blur" },
+        ],
+        trashType: [
+          { required: true, message: "请选择可受纳建筑垃圾类型", trigger: "blur" },
+        ],
+        constructionUnit: [
+          { required: true, message: "请输入建设（施工）单位", trigger: "blur" },
+        ],
+        constructionUnitPerson: [
+          { required: true, message: "请输入建设（施工）单位责任人", trigger: "blur" },
+        ],
+        constructionUnitPersonPhone: [
+          { required: true, message: "请输入责任人联系电话", trigger: "blur" },
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
+        validityBeginDate: [
+          { required: true, message: "请选择有限期开始时间", trigger: "blur" },
+        ],
+        validityEndDate: [
+          { required: true, message: "请选择有限期结束时间", trigger: "blur" },
+        ],
+        electronicFence: [
+          { required: true, message: "请输入电子围栏", trigger: "blur" },
+        ],
+        squareMeasure: [
+          { required: true, message: "请输入审批方量", trigger: "blur" },
+        ],
+        carWashingFacilities: [
+          { required: true, message: "请选择洗车作业设施", trigger: "blur" },
+        ],
+        exitRoadCondition: [
+          { required: true, message: "请选择出口道路状况", trigger: "blur" },
+        ],
+        lightingFacility: [
+          { required: true, message: "请选择照明设施", trigger: "blur" },
+        ],
+        videoSurveillanceFacility: [
+          { required: true, message: "请选择视频监控设施", trigger: "blur" },
+        ],
+        preparer: [
+          { required: true, message: "请输入填表人", trigger: "blur" },
+        ],
+        handlingAdvice: [
+          { required: true, message: "请输入办理意见", trigger: "blur" },
+        ],
+
+      },
+      areas:[],
+      options:[{id:1,label:"工程渣土"},{id:2,label:"工程淤泥"},{id:3,label:"盾构渣土"},{id:4,label:"拆除垃圾"},{id:5,label:"其他建筑垃圾"}],
+      approvalDocument:[],
+      approvalDocumentSlide:[],
+      approvalData:[],
+      approvalDataSlide:[],
+      scenePhoto:[],
+      scenePhotoSlide:[],
+      carWashingFacilitiesImage:[],
+      carWashingFacilitiesImageSlide:[],
+      safetyAssessmentReport:[],
+      safetyAssessmentReportSlide:[],
+      environmentalApproval:[],
+      environmentalApprovalSlide:[],
+      authorization:[],
+      authorizationSlide:[],
+      otherInformation:[],
+      otherInformationSlide:[],
+      openMap:false,
+      // 地图
+      map: null,
+      // 编辑工具
+      polyEditor: null,
+      // 电子围栏数据集
+      polygonArr: [],
+      // 当前电子围栏
+      nowPolygon: null,
+      keywords: "",
+      mapOptions: [],
+      AutoComplete: null,
+      searchMarker: null,
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.initData();
+  },
+  watch: {
+    '$route.query.disposalSiteId': 'initData'
+  },
+  methods: {
+    reset(){
+      this.form = {};
+      this.approvalDocument = [];
+      this.approvalData = [];
+      this.scenePhoto = [];
+      this.carWashingFacilitiesImage = [];
+      this.safetyAssessmentReport = [];
+      this.environmentalApproval = [];
+      this.authorization = [];
+      this.otherInformation = [];
+    },
+    initData(){
+      this.reset();
+      let id = this.$route.query.disposalSiteId;
+      if(id!=null){
+        getDisposalSite(id).then(response => {
+          this.form = response.data;
+          //将字符串转换为int数组
+          let trashTypeArr = this.form.trashType.split(",").map(str => parseInt(str, 10));
+          this.form.trashType = trashTypeArr;
+          //将附件转换为前端可视化数组
+          if(this.form.approvalDocument!=null&&this.form.approvalDocument!==""){
+            let approvalDocument = this.form.approvalDocument.split(";");
+            approvalDocument.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.approvalDocument.push({name:name,url:item})
+            })
+          }
+          if(this.form.approvalData!=null&&this.form.approvalData!==""){
+            let approvalData = this.form.approvalData.split(";");
+            approvalData.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.approvalData.push({name:name,url:item})
+            })
+          }
+          if(this.form.scenePhoto!=null&&this.form.scenePhoto!==""){
+            let scenePhoto = this.form.scenePhoto.split(";");
+            scenePhoto.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.scenePhoto.push({name:name,url:item})
+            })
+          }
+          if(this.form.carWashingFacilitiesImage!=null&&this.form.carWashingFacilitiesImage!==""){
+            let carWashingFacilitiesImage = this.form.carWashingFacilitiesImage.split(";");
+            carWashingFacilitiesImage.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.carWashingFacilitiesImage.push({name:name,url:item})
+            })
+          }
+          if(this.form.safetyAssessmentReport!=null&&this.form.safetyAssessmentReport!==""){
+            let safetyAssessmentReport = this.form.safetyAssessmentReport.split(";");
+            safetyAssessmentReport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.safetyAssessmentReport.push({name:name,url:item})
+            })
+          }
+          if(this.form.environmentalApproval!=null&&this.form.environmentalApproval!==""){
+            let environmentalApproval = this.form.environmentalApproval.split(";");
+            environmentalApproval.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.environmentalApproval.push({name:name,url:item})
+            })
+          }
+          if(this.form.authorization!=null&&this.form.authorization!==""){
+            let authorization = this.form.authorization.split(";");
+            authorization.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.authorization.push({name:name,url:item})
+            })
+          }
+          if(this.form.otherInformation!=null&&this.form.otherInformation!==""){
+            let otherInformation = this.form.otherInformation.split(";");
+            otherInformation.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.otherInformation.push({name:name,url:item})
+            })
+          }
+        });
+      }
+    },
+    closeMap(){
+      this.openMap = false;
+      this.form.electronicFence = null;
+      //清空地图图层
+      this.map.remove(this.nowPolygon);
+    },
+    // 选中提示
+    currentSelect(val) {
+      // 清空时不执行后面代码
+      if (!val) {
+        return ;
+      }
+      // 自动适应显示想显示的范围区域
+      this.map.setFitView();
+      //清除marker
+      if (this.searchMarker){
+        this.map.remove(this.searchMarker)
+      }
+      //设置marker
+      this.searchMarker = new AMap.Marker({
+        map: this.map,
+        position: [val.location.lng, val.location.lat],
+      });
+
+      this.keywords = val.name
+      //定位
+      this.map.setCenter([val.location.lng, val.location.lat])
+    },
+    // 搜索地址
+    remoteMethod(query) {
+      if (query !== "") {
+        this.loading = true;
+        setTimeout(() => {
+          this.loading = false;
+          this.AutoComplete.search(query, (status, result) => {
+            this.mapOptions = result.tips;
+          });
+        }, 200);
+      } else {
+        this.mapOptions = [];
+      }
+    },
+    initAMap() {
+      const _this = this
+      // 加载高德地图
+      AMapLoader.load({
+        key: _this.$aMapKey,  //设置高德地图申请的key
+        version: "2.0",  // 指定要加载的 JSAPI 的版本，缺省时默认为 1.4.15
+        plugins: ['AMap.ToolBar', 'AMap.PolygonEditor','AMap.AutoComplete', 'AMap.PlaceSearch', 'AMap.Marker'], // 需要使用的的插件列表，如比例尺'AMap.Scale'等
+        AMapUI: {
+          version: "1.1",
+          plugins: []
+        },
+        Loca: {
+          version: "2.0"
+        },
+      }).then(async (AMap) => {
+        _this.map = await new AMap.Map("zcContainer", { //设置地图容器id
+          viewMode: "2D",  // 默认使用 2D 模式
+          center: [113.01814545605467, 28.201039299894283], // 初始化地图中心点位置
+          zoom: 11, //初始化地图层级
+          resizeEnable: true,
+          willreadoften: true
+        });
+
+        _this.AutoComplete = await new AMap.AutoComplete({city:'全国'});
+
+        // 图层样式切换控件(卫星图)
+        AMapUI.loadUI(['control/BasicControl'], function(BasicControl) {
+
+          //图层切换控件
+          _this.map.addControl(new BasicControl.LayerSwitcher({
+            position: 'rb' // 右下角
+          }));
+
+        });
+        _this.polyEditor = new AMap.PolygonEditor(_this.map);
+        if(_this.form.electronicFence!=null){
+          // 电子围栏经纬度
+          let path = _this.form.electronicFence.split(";");
+          path.map(item=>{
+            let arr = item.split(",");
+            //将电子围栏经纬度转换为double类型数组
+            _this.polygonArr.push([parseFloat(arr[0]),parseFloat(arr[1])]);
+          });
+          _this.nowPolygon = new AMap.Polygon({
+            path: _this.polygonArr
+          })
+          _this.map.add([_this.nowPolygon]);
+          _this.map.setFitView();
+          _this.polyEditor.addAdsorbPolygons([_this.nowPolygon]);
+          _this.nowPolygon.on('dblclick', () => {
+            _this.polyEditor.setTarget(_this.nowPolygon);
+            _this.polyEditor.open();
+          })
+        }
+        _this.polyEditor.on('add', function (data) {
+          _this.nowPolygon = data.target;
+          _this.polyEditor.addAdsorbPolygons(_this.nowPolygon);
+          _this.nowPolygon.on('dblclick', () => {
+            _this.polyEditor.setTarget(_this.nowPolygon);
+            _this.polyEditor.open();
+          })
+
+          // 加个右击监听 双击图层进行编辑
+          _this.map.on("rightclick",function (e){
+            if (_this.polyEditor) {
+              const arr = _this.nowPolygon.getPath()
+              let pathArr = []
+              // 将获取的停车场坐标点转换格式后存入数组
+              for (let item of arr) {
+                const list = [item.lng, item.lat]
+                pathArr.push(list)
+              }
+
+              var maxDistance = 0; // 最大距离
+              var maxPointIndex = []; // 记录最大距离对应的点索引
+
+              // 计算所有点对之间的距离
+              for (var i = 0; i < pathArr.length; i++) {
+                for (var j = i + 1; j < pathArr.length; j++) {
+                  var distance = AMap.GeometryUtil.distance(pathArr[i], pathArr[j]);
+                  if (distance > maxDistance) {
+                    maxDistance = distance;
+                    maxPointIndex = [i, j];
+                  }
+                }
+              }
+
+              if(_this.nowPolygon!=null){
+                // 通过最大距离的点索引获取对应的点坐标
+                let mybounds  = new AMap.Bounds(pathArr[maxPointIndex[0]],pathArr[maxPointIndex[1]]);
+                // 设置地图显示范围
+                _this.map.setBounds(mybounds);
+              }
+              //将经纬度存到form中
+              _this.form.electronicFence = pathArr.join(";");
+              _this.polyEditor.close();
+            }
+          });
+        })
+
+        if(_this.nowPolygon===null){
+          _this.polyEditor.close();
+          _this.polyEditor.setTarget();
+          _this.polyEditor.open();
+        }
+
+
+      }).catch(e => {
+        console.log(e);
+      });
+      this.loading = false;
+      // this.openMap = false;
+    },
+    clearPolyEditor(){
+      this.form.electronicFence = null;
+      this.map.remove(this.nowPolygon);
+      // 关闭一下编辑器，防止出bug
+      this.polyEditor.close();
+      // 置空编辑区即为新增
+      this.polyEditor.setTarget();
+      // 打开编辑器即可开始绘制
+      this.polyEditor.open();
+    },
+    draw(){
+      if(this.polyEditor!=null){
+        if(this.form.electronicFence==null){
+          // 关闭一下编辑器，防止出bug
+          this.polyEditor.close();
+          // 置空编辑区即为新增
+          this.polyEditor.setTarget();
+          // 打开编辑器即可开始绘制
+          this.polyEditor.open();
+        }
+      }else{
+        this.initAMap();
+      }
+      this.openMap = true;
+      this.$alert('左键单击地图添加点，左键双击编辑，右键双击地图结束绘制', '温馨提示', {
+        confirmButtonText: '确定',
+        callback: action => {
+          let path = this.form.electronicFence.split(";");
+          path.map(item=>{
+            let arr = item.split(",");
+            this.polygonArr.push([arr[0],arr[1]]);
+          });
+        }
+      });
+    },
+    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;
+      }
+      console.log(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:"/disposalSite/info"}).then(() => {
+        this.$tab.openPage("处理场所管理", "/tool/disposalSite",{disposalSiteRefresh:1})
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+          // formData.append('approvalDocument', null);
+          // formData.append('approvalData', null);
+          // formData.append('scenePhoto', null);
+          // formData.append('carWashingFacilitiesImage', null);
+          // formData.append('authorization', null);
+          // formData.append('safetyAssessmentReport', null);
+          // formData.append('environmentalApproval', null);
+          // formData.append('otherInformation', null);
+          //将新增的文件放入formData
+
+          //先清空原有的附件
+          form.approvalDocument = null;
+          form.approvalData = null;
+          form.scenePhoto = null;
+          form.carWashingFacilitiesImage = null;
+          form.authorization = null;
+          form.safetyAssessmentReport = null;
+          form.environmentalApproval = null;
+          form.otherInformation = null;
+          form.trashType = this.form.trashType.join(",");
+
+          this.approvalDocument.forEach(item => {
+            if (item.raw != null) {
+              formData.append('approvalDocumentFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.approvalDocument = form.approvalDocument!==null?form.approvalDocument+";"+item.url:item.url;
+            }
+          })
+
+          this.approvalData.forEach(item => {
+            if (item.raw != null) {
+              formData.append('approvalDataFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.approvalData = form.approvalData!==null?form.approvalData+";"+item.url:item.url;
+            }
+          })
+          this.scenePhoto.forEach(item => {
+            if (item.raw != null) {
+              formData.append('scenePhotoFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.scenePhoto = form.scenePhoto!==null?form.scenePhoto+";"+item.url:item.url;
+            }
+          })
+          this.carWashingFacilitiesImage.forEach(item => {
+            if (item.raw != null) {
+              formData.append('carWashingFacilitiesImageFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.carWashingFacilitiesImage = form.carWashingFacilitiesImage!==null?form.carWashingFacilitiesImage+";"+item.url:item.url;
+            }
+          })
+          this.safetyAssessmentReport.forEach(item => {
+            if (item.raw != null) {
+              formData.append('safetyAssessmentReportFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.safetyAssessmentReport = form.safetyAssessmentReport!==null?form.safetyAssessmentReport+";"+item.url:item.url;
+            }
+          })
+          this.environmentalApproval.forEach(item => {
+            if (item.raw != null) {
+              formData.append('environmentalApprovalFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.environmentalApproval = form.environmentalApproval!==null?form.environmentalApproval+";"+item.url:item.url;
+            }
+          })
+          this.authorization.forEach(item => {
+            if (item.raw != null) {
+              formData.append('authorizationFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.authorization = form.authorization!==null?form.authorization+";"+item.url:item.url;
+            }
+          })
+          this.otherInformation.forEach(item => {
+            if (item.raw != null) {
+              formData.append('otherInformationFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.otherInformation = form.otherInformation!==null?form.otherInformation+";"+item.url:item.url;
+            }
+          })
+          for (let key in form) {
+            formData.append(key, form[key] == null ? "" : form[key])
+          }
+          if (this.form.id != null) {
+            updateDisposalSite(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.$tab.closePage({path:"/disposalSite/infoEdit"}).then(() => {
+                this.$tab.openPage("处理场所管理", "/tool/disposalSite",{disposalSiteRefresh:1})
+              })
+            });
+          } else {
+            addDisposalSite(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.$tab.closePage({path:"/disposalSite/info"}).then(() => {
+                this.$tab.openPage("处理场所管理", "/tool/disposalSite",{disposalSiteRefresh: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.approvalDocument = 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.approvalData = 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.scenePhoto = 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.carWashingFacilitiesImage = 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.safetyAssessmentReport = 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);
+      }
+    },
+    fileChange5(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.environmentalApproval = 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);
+      }
+    },
+    fileChange6(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.authorization = 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);
+      }
+    },
+    fileChange7(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.otherInformation = 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="108px">
+      <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="companyName">
+        <el-input
+          v-model="queryParams.companyName"
+          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:driver: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:driver: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:driver: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:driver:export']"
+        >导出</el-button>
+      </el-col>
+	  <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="driverList" @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="identityCard" />
+      <el-table-column label="所属公司" align="center" prop="companyName" />
+      <el-table-column label="从业资格证有效期" align="center" prop="professionalQualificationBeginDate" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.professionalQualificationBeginDate, '{y}-{m}-{d}') +' ~ '+ parseTime(scope.row.professionalQualificationEndDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="从业资格证有效期终" align="center" prop="professionalQualificationEndDate" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.professionalQualificationEndDate, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <el-table-column label="驾驶证有效期" align="center" prop="drivingLicenceBeginDate" width="200">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.drivingLicenceBeginDate, '{y}-{m}-{d}')+' ~ '+parseTime(scope.row.drivingLicenceEndDate, '{y}-{m}-{d}') }}</span>
+        </template>
+      </el-table-column>
+<!--      <el-table-column label="驾驶证有效期终" align="center" prop="drivingLicenceEndDate" width="180">-->
+<!--        <template slot-scope="scope">-->
+<!--          <span>{{ parseTime(scope.row.drivingLicenceEndDate, '{y}-{m}-{d}') }}</span>-->
+<!--        </template>-->
+<!--      </el-table-column>-->
+      <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" 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:driver:edit']"
+          >修改</el-button>
+          <el-button
+            size="mini"
+            type="text"
+            icon="el-icon-delete"
+            @click="handleDelete(scope.row)"
+            v-hasPermi="['unit:driver: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 { listDriver, getDriver, delDriver, addDriver, updateDriver, exportDriver } from "@/api/unit/driver";
+import Editor from '@/components/Editor';
+
+export default {
+  name: "Driver",
+  components: { Editor },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 驾驶员管理表格数据
+      driverList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        name: null,
+        identityCard: null,
+        companyId: null,
+        professionalQualificationBeginDate: null,
+        professionalQualificationEndDate: null,
+        drivingLicenceBeginDate: null,
+        drivingLicenceEndDate: null,
+        safetyTrainingDate: null,
+        safetyTrainingContent: null,
+        drivingLicence: null,
+        professionalQualification: null,
+        safetyTraining: null,
+        status: null,
+        photographOne: null,
+        photographTwo: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+      }
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询驾驶员管理列表 */
+    getList() {
+      this.loading = true;
+      listDriver(this.queryParams).then(response => {
+        this.driverList = 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("新增驾驶员","/driverInfo/info",{driverInfoRefresh:0});
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      this.$tab.openPage("修改驾驶员","/driverInfo/infoEdit",{driverInfoId: id,driverInfoRefresh:0});
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$confirm('是否确认删除驾驶员管理编号为"' + ids + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDriver(ids);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        })
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有驾驶员管理数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return exportDriver(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="identityCard">
+            <el-input v-model="form.identityCard" placeholder="请输入身份证" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <el-form-item label="手机号码" prop="phoneNo">
+            <el-input v-model="form.phoneNo" placeholder="请输入手机号码"  :maxlength="11" show-word-limit/>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+
+
+        <el-col :span="7">
+          <el-form-item label="从业资格证有效期起" prop="professionalQualificationBeginDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.professionalQualificationBeginDate"
+                            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="professionalQualificationEndDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.professionalQualificationEndDate"
+                            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="companyId">
+            <el-select v-model="form.companyId" placeholder="请选择所属公司" clearable style="width: 100%;">
+              <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row :gutter="30">
+        <el-col :span="7">
+          <el-form-item label="驾驶证有效期起" prop="drivingLicenceBeginDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.drivingLicenceBeginDate"
+                            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="drivingLicenceEndDate">
+            <el-date-picker clearable size="small" style="width: 100%"
+                            v-model="form.drivingLicenceEndDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择驾驶证有效期终">
+            </el-date-picker>
+          </el-form-item>
+
+        </el-col>
+        <el-col :span="7">
+            <el-row>
+              <el-col :span="8">
+                <el-form-item label="安全教育培训日期" prop="safetyTrainingDate">
+                  <el-date-picker clearable size="small" style="width: 100%"
+                                  v-model="form.safetyTrainingDate"
+                                  type="date"
+                                  value-format="yyyy-MM-dd"
+                                  placeholder="选择日期">
+                  </el-date-picker>
+                </el-form-item>
+              </el-col>
+              <el-col :span="16">
+                <el-form-item label="安全教育培训内容">
+                  <el-input  v-model="form.safetyTrainingContent"  placeholder="请输入内容"/>
+                </el-form-item>
+              </el-col>
+            </el-row>
+        </el-col>
+      </el-row>
+
+      <el-row :gutter="30">
+        <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">
+            <span style="color:red;">*</span>驾驶证
+            <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="drivingLicence">
+
+              <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 drivingLicence">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="drivingLicence.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="drivingLicence.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">
+            <span style="color:red;">*</span>从业资格证
+            <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="professionalQualification">
+              <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 professionalQualification">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="professionalQualification.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="professionalQualification.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">
+            <span style="color:red;">*</span>安全教育培训结业证明
+            <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="safetyTraining">
+              <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 safetyTraining">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="safetyTraining.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="safetyTraining.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">
+            <span style="color:red;">*</span>一寸免冠照片1
+            <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="photographOne">
+              <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 photographOne">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="photographOne.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="photographOne.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">
+            <span style="color:red;">*</span>一寸免冠照片2
+            <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="photographTwo">
+              <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 photographTwo">
+              <div v-if="!/\.(pjp|pdf|doc|docx|xls|xlsx)$/.test(item.name)" class="upload_div_image">
+                <div class="upload_close" @click="photographTwo.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="photographTwo.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>
+    <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 { listDriver, getDriver, delDriver, addDriver, updateDriver, exportDriver } from "@/api/unit/driver";
+import { listEnterprise} from "@/api/unit/enterprise";
+import Treeselect from "@riophae/vue-treeselect";
+import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+import {getAreaList} from "@/api/casefile/remoteServer";
+import Editor from "@/components/Editor/index.vue";
+
+export default {
+  name: "DisposalSite",
+  components: {Editor, 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"}
+        ],
+        identityCard: [
+          {required: true, message: "请输入身份证号码", trigger: "blur"}
+        ],
+        companyId: [
+          {required: true, message: "请选择所属公司", trigger: "blur"}
+        ],
+        drivingLicenceBeginDate: [
+          {required: true, message: "请选择驾驶证有效期起", trigger: "blur"}
+        ],
+        drivingLicenceEndDate: [
+          {required: true, message: "请选择驾驶证有效期终", trigger: "blur"}
+        ],
+        professionalQualificationBeginDate: [
+          {required: true, message: "请选择从业资格证有效期起", trigger: "blur"}
+        ],
+        professionalQualificationEndDate: [
+          {required: true, message: "请选择从业资格证有效期终", trigger: "blur"}
+        ],
+        safetyTrainingDate: [
+          {required: true, message: "请选择安全教育培训日期", trigger: "blur"}
+        ],
+        safetyTrainingContent: [
+          {required: true, message: "请输入安全教育培训内容", trigger: "blur"}
+        ],
+        phoneNo: [
+          {required: true, message: "请输入手机号码", trigger: "blur"},
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
+      },
+      areas:[],
+      drivingLicence:[],
+      professionalQualification:[],
+      safetyTraining:[],
+      photographOne:[],
+      photographTwo:[],
+      enterpriseList:[]
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.queryParams = {
+      companyType:"1"
+    }
+    listEnterprise(this.queryParams).then(response => {
+      this.enterpriseList = response.rows;
+    });
+    this.initData();
+  },
+  watch: {
+    '$route.query.driverInfoId': 'initData'
+  },
+  methods: {
+    reset(){
+      this.form = {};
+      this.drivingLicence = [];
+      this.professionalQualification = [];
+      this.safetyTraining = [];
+      this.photographOne = [];
+      this.photographTwo = [];
+    },
+    initData(){
+      this.reset();
+      let id = this.$route.query.driverInfoId;
+      console.log(id)
+      if(id!=null){
+        getDriver(id).then(response => {
+          this.form = response.data;
+          //将附件转换为前端可视化数组
+          if(this.form.drivingLicence!=null&&this.form.drivingLicence!==""){
+            let roadTransport = this.form.drivingLicence.split(";");
+            roadTransport.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.drivingLicence.push({name:name,url:item})
+            })
+          }
+          if(this.form.professionalQualification!=null&&this.form.professionalQualification!==""){
+            let drivingLicense = this.form.professionalQualification.split(";");
+            drivingLicense.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.professionalQualification.push({name:name,url:item})
+            })
+          }
+          if(this.form.safetyTraining!=null&&this.form.safetyTraining!==""){
+            let carFront = this.form.safetyTraining.split(";");
+            carFront.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.safetyTraining.push({name:name,url:item})
+            })
+          }
+          if(this.form.photographOne!=null&&this.form.photographOne!==""){
+            let carLeft = this.form.photographOne.split(";");
+            carLeft.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.photographOne.push({name:name,url:item})
+            })
+          }
+          if(this.form.photographTwo!=null&&this.form.photographTwo!==""){
+            let carBehind = this.form.photographTwo.split(";");
+            carBehind.map(item=>{
+              let name = item.substring(item.lastIndexOf("/")+1);
+              this.photographTwo.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:"/driverInfo/info"}).then(() => {
+        this.$tab.openPage("驾驶员管理", "/tool/driver",{driverInfoRefresh:1})
+      })
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if(this.drivingLicence.length===0){
+          this.$message({
+            message: '请上传驾驶证！',
+            type: 'warning'
+          });
+          return false;
+        }
+        if(this.professionalQualification.length===0){
+          this.$message({
+            message: '请上传从业资格证！',
+            type: 'warning'
+          });
+          return false;
+        }
+        if(this.safetyTraining.length===0){
+          this.$message({
+            message: '请上传安全教育培训结业证明！',
+            type: 'warning'
+          });
+          return false;
+        }
+        if(this.photographOne.length===0){
+          this.$message({
+            message: '请上传一寸免冠照片1！',
+            type: 'warning'
+          });
+          return false;
+        }
+        if(this.photographTwo.length===0){
+          this.$message({
+            message: '请上传一寸免冠照片2！',
+            type: 'warning'
+          });
+          return false;
+        }
+        if (valid) {
+          let formData = new FormData();
+          let form = this.form;
+          //去掉params属性
+          delete form.params;
+
+          //先清空原有的附件
+          form.drivingLicence = null;
+          form.professionalQualification = null;
+          form.safetyTraining = null;
+          form.photographOne = null;
+          form.photographTwo = null;
+          //将附件拼接到form中
+          this.drivingLicence.forEach(item => {
+            if (item.raw != null) {
+              formData.append('drivingLicenceFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.drivingLicence = form.drivingLicence!==null?form.drivingLicence+";"+item.url:item.url;
+            }
+          })
+          this.professionalQualification.forEach(item => {
+            if (item.raw != null) {
+              formData.append('professionalQualificationFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.professionalQualification = form.professionalQualification!==null?form.professionalQualification+";"+item.url:item.url;
+            }
+          })
+          this.safetyTraining.forEach(item => {
+            if (item.raw != null) {
+              formData.append('safetyTrainingFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.safetyTraining = form.safetyTraining!==null?form.safetyTraining+";"+item.url:item.url;
+            }
+          })
+          this.photographOne.forEach(item => {
+            if (item.raw != null) {
+              formData.append('photographOneFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.photographOne = form.photographOne!==null?form.photographOne+";"+item.url:item.url;
+            }
+          })
+          this.photographTwo.forEach(item => {
+            if (item.raw != null) {
+              formData.append('photographTwoFiles', item.raw)
+            }else{
+              //将原有的附件拼接到form中
+              form.photographTwo = form.photographTwo!==null?form.photographTwo+";"+item.url:item.url;
+            }
+          })
+
+          for (let key in form) {
+            formData.append(key, form[key] == null ? "" : form[key])
+          }
+          if (this.form.id != null) {
+            updateDriver(formData).then(response => {
+              this.msgSuccess("修改成功");
+              this.$tab.closePage({path:"/driverInfo/infoEdit"}).then(() => {
+                this.$tab.openPage("驾驶员管理", "/tool/driver",{driverInfoRefresh:1})
+              })
+            });
+          } else {
+            addDriver(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.$tab.closePage({path:"/driverInfo/info"}).then(() => {
+                this.$tab.openPage("驾驶员管理", "/tool/driver",{driverInfoRefresh: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.drivingLicence = 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.professionalQualification = 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.safetyTraining = 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.photographOne = 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.photographTwo = 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="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.enterpriseRefresh':'getList'
+  },
+  methods: {
+    /** 查询运输企业管理列表 */
+    getList() {
+      this.loading = true;
+      this.queryParams.companyType = "1";
+      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("新增运输企业","/enterprise/info",{enterpriseRefresh:0});
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      const id = row.id || this.ids
+      this.$tab.openPage("修改运输企业","/enterprise/infoEdit",{enterpriseId: id,enterpriseRefresh: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="7">
+          <el-form-item label="经营单位" prop="parentId">
+            <el-select v-model="form.parentId" placeholder="请选择经营单位" clearable style="width: 100%;">
+              <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="7">
+          <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:[],
+      enterpriseList:[]
+    };
+  },
+  created() {
+    getAreaList().then(res => {
+      this.areas = res.data;
+    });
+    this.queryParams = {
+      companyType:"0"
+    }
+    listEnterprise(this.queryParams).then(response => {
+      this.enterpriseList = response.rows;
+    });
+    this.initData();
+  },
+  watch: {
+    '$route.query.enterpriseId': 'initData'
+  },
+  methods: {
+    reset(){
+      this.form = {};
+      this.transportPermission = [];
+      this.enterpriseBusinessLicense = [];
+      this.safetyOfficerQualificationCertificate = [];
+      this.safetyCertificate = [];
+      this.carParkPanorama = [];
+    },
+    initData(){
+      this.reset();
+      let id = this.$route.query.enterpriseId;
+      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:"/enterprise/info"}).then(() => {
+        this.$tab.openPage("处理场所管理", "/tool/enterprise",{enterpriseRefresh: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 = "1";
+
+          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:"/enterprise/infoEdit"}).then(() => {
+                this.$tab.openPage("运输企业管理", "/tool/enterprise",{enterpriseRefresh:1})
+              })
+            });
+          } else {
+            addEnterprise(formData).then(response => {
+              this.msgSuccess("新增成功");
+              this.$tab.closePage({path:"/enterprise/info"}).then(() => {
+                this.$tab.openPage("运输企业管理", "/tool/enterprise",{enterpriseRefresh: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>
 package com.trash.carInfo.controller;
+import java.io.IOException;
 import java.util.List;
+
+import com.trash.carInfo.domain.vo.CarInfoVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
@@ -19,15 +15,16 @@ import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.service.ICarInfoService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 运输车辆管理Controller
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @RestController
-@RequestMapping("/carInfo")
+@RequestMapping("/unit/carInfo")
 public class CarInfoController extends BaseController
 {
     @Autowired
@@ -36,32 +33,32 @@ public class CarInfoController extends BaseController
     /**
      * 查询运输车辆管理列表
      */
-//    @PreAuthorize("@ss.hasPermi('carInfo:carInfo:list')")
+    @PreAuthorize("@ss.hasPermi('unit:carInfo:list')")
     @GetMapping("/list")
-    public TableDataInfo list(CarInfo carInfo)
+    public TableDataInfo list(CarInfoVo carInfo)
     {
         startPage();
-        List<CarInfo> list = carInfoService.selectCarInfoList(carInfo);
+        List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
         return getDataTable(list);
     }
     /**
      * 导出运输车辆管理列表
      */
-    @PreAuthorize("@ss.hasPermi('carInfo:carInfo:export')")
+    @PreAuthorize("@ss.hasPermi('unit:carInfo:export')")
     @Log(title = "运输车辆管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(CarInfo carInfo)
+    public AjaxResult export(CarInfoVo carInfo)
     {
-        List<CarInfo> list = carInfoService.selectCarInfoList(carInfo);
-        ExcelUtil<CarInfo> util = new ExcelUtil<CarInfo>(CarInfo.class);
+        List<CarInfoVo> list = carInfoService.selectCarInfoList(carInfo);
+        ExcelUtil<CarInfoVo> util = new ExcelUtil<CarInfoVo>(CarInfoVo.class);
         return util.exportExcel(list, "carInfo");
     }
     /**
      * 获取运输车辆管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('carInfo:carInfo:query')")
+    @PreAuthorize("@ss.hasPermi('unit:carInfo:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,29 +68,39 @@ public class CarInfoController extends BaseController
     /**
      * 新增运输车辆管理
      */
-    @PreAuthorize("@ss.hasPermi('carInfo:carInfo:add')")
+    @PreAuthorize("@ss.hasPermi('unit:carInfo:add')")
     @Log(title = "运输车辆管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody CarInfo carInfo)
-    {
-        return toAjax(carInfoService.insertCarInfo(carInfo));
+    public AjaxResult add(@RequestParam(value = "roadTransportFiles") MultipartFile[] roadTransportFiles,
+                          @RequestParam(value = "drivingLicenseFiles") MultipartFile[] drivingLicenseFiles,
+                          @RequestParam(value = "carFrontFiles") MultipartFile[] carFrontFiles,
+                          @RequestParam(value = "carLeftFiles") MultipartFile[] carLeftFiles,
+                          @RequestParam(value = "carBehindFiles") MultipartFile[] carBehindFiles,
+                          @RequestParam(value = "carRightFiles") MultipartFile[] carRightFiles,
+                          CarInfo carInfo) throws IOException {
+        return toAjax(carInfoService.insertCarInfo(roadTransportFiles, drivingLicenseFiles, carFrontFiles, carLeftFiles, carBehindFiles, carRightFiles, carInfo));
     }
     /**
      * 修改运输车辆管理
      */
-    @PreAuthorize("@ss.hasPermi('carInfo:carInfo:edit')")
+    @PreAuthorize("@ss.hasPermi('unit:carInfo:edit')")
     @Log(title = "运输车辆管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody CarInfo carInfo)
-    {
-        return toAjax(carInfoService.updateCarInfo(carInfo));
+    public AjaxResult edit(@RequestParam(value = "roadTransportFiles") MultipartFile[] roadTransportFiles,
+                           @RequestParam(value = "drivingLicenseFiles") MultipartFile[] drivingLicenseFiles,
+                           @RequestParam(value = "carFrontFiles") MultipartFile[] carFrontFiles,
+                           @RequestParam(value = "carLeftFiles") MultipartFile[] carLeftFiles,
+                           @RequestParam(value = "carBehindFiles") MultipartFile[] carBehindFiles,
+                           @RequestParam(value = "carRightFiles") MultipartFile[] carRightFiles,
+                           CarInfo carInfo) throws IOException {
+        return toAjax(carInfoService.updateCarInfo(roadTransportFiles, drivingLicenseFiles, carFrontFiles, carLeftFiles, carBehindFiles, carRightFiles, carInfo));
     }
     /**
      * 删除运输车辆管理
      */
-    @PreAuthorize("@ss.hasPermi('carInfo:carInfo:remove')")
+    @PreAuthorize("@ss.hasPermi('unit:carInfo:remove')")
     @Log(title = "运输车辆管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
+package com.trash.carInfo.domain;
+
+public class CarDriverRelation {
+
+    private Long id;
+
+    private Long carId;
+
+
+    private Long driverId;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getCarId() {
+        return carId;
+    }
+
+    public void setCarId(Long carId) {
+        this.carId = carId;
+    }
+
+    public Long getDriverId() {
+        return driverId;
+    }
+
+    public void setDriverId(Long driverId) {
+        this.driverId = driverId;
+    }
+}
@@ -11,7 +11,7 @@ import com.trash.common.core.domain.BaseEntity;
  * 运输车辆管理对象 car_info
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public class CarInfo extends BaseEntity
 {
@@ -63,10 +63,14 @@ public class CarInfo extends BaseEntity
     @Excel(name = "车辆标识牌")
     private String carIdentification;
-    /** 车辆体积 */
-    @Excel(name = "车辆体积")
+    /** 货箱体积 */
+    @Excel(name = "货箱体积")
     private String containerVolume;
+    /** 货箱长宽高 */
+    @Excel(name = "货箱长宽高")
+    private String lengthWidthHeight;
+
     /** 车辆颜色 */
     @Excel(name = "车辆颜色")
     private String carColor;
@@ -104,10 +108,26 @@ public class CarInfo extends BaseEntity
     private String drivers;
     /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
-    @Excel(name = "审批状态,0=审批中,1=审批通过,2=被驳回")
+    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
     private Integer status;
-    public void setId(Long id) 
+    /** 信用状态 */
+    @Excel(name = "信用状态")
+    private String creditStatus;
+
+    /** 二维码 */
+    @Excel(name = "二维码")
+    private String qrCode;
+
+    public String getLengthWidthHeight() {
+        return lengthWidthHeight;
+    }
+
+    public void setLengthWidthHeight(String lengthWidthHeight) {
+        this.lengthWidthHeight = lengthWidthHeight;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -305,6 +325,24 @@ public class CarInfo extends BaseEntity
     {
         return status;
     }
+    public void setCreditStatus(String creditStatus) 
+    {
+        this.creditStatus = creditStatus;
+    }
+
+    public String getCreditStatus() 
+    {
+        return creditStatus;
+    }
+    public void setQrCode(String qrCode) 
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
     @Override
     public String toString() {
@@ -336,6 +374,8 @@ public class CarInfo extends BaseEntity
             .append("createBy", getCreateBy())
             .append("updateTime", getUpdateTime())
             .append("updateBy", getUpdateBy())
+            .append("creditStatus", getCreditStatus())
+            .append("qrCode", getQrCode())
             .toString();
     }
 }
+package com.trash.carInfo.domain.vo;
+
+import com.trash.carInfo.domain.CarInfo;
+
+public class CarInfoVo extends CarInfo {
+    private String companyName;
+
+    private String driversName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+
+    public String getDriversName() {
+        return driversName;
+    }
+
+    public void setDriversName(String driversName) {
+        this.driversName = driversName;
+    }
+}
 package com.trash.carInfo.mapper;
 import java.util.List;
+
+import com.trash.carInfo.domain.CarDriverRelation;
 import com.trash.carInfo.domain.CarInfo;
+import com.trash.carInfo.domain.vo.CarInfoVo;
 /**
  * 运输车辆管理Mapper接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface CarInfoMapper 
 {
@@ -25,7 +28,7 @@ public interface CarInfoMapper
      * @param carInfo 运输车辆管理
      * @return 运输车辆管理集合
      */
-    List<CarInfo> selectCarInfoList(CarInfo carInfo);
+    List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo);
     /**
      * 新增运输车辆管理
@@ -58,4 +61,19 @@ public interface CarInfoMapper
      * @return 结果
      */
     int deleteCarInfoByIds(Long[] ids);
+
+    /**
+     * 新增车辆驾驶员关系
+     * @return 结果
+     */
+    int addCarDriverRelation(CarDriverRelation carDriverRelation);
+
+    /**
+     * 删除车辆驾驶员关系
+     * @param carId 车辆id
+     * @return 结果
+     */
+    int deleteCarDriverRelationByCarId(Long carId);
+
+
 }
 package com.trash.carInfo.service;
+import java.io.IOException;
 import java.util.List;
 import com.trash.carInfo.domain.CarInfo;
+import com.trash.carInfo.domain.vo.CarInfoVo;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 运输车辆管理Service接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface ICarInfoService 
 {
@@ -21,27 +24,51 @@ public interface ICarInfoService
     /**
      * 查询运输车辆管理列表
-     * 
+     *
      * @param carInfo 运输车辆管理
      * @return 运输车辆管理集合
      */
-    List<CarInfo> selectCarInfoList(CarInfo carInfo);
+    List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo);
     /**
      * 新增运输车辆管理
-     * 
-     * @param carInfo 运输车辆管理
+     *
+     * @param roadTransportFiles
+     * @param drivingLicenseFiles
+     * @param carFrontFiles
+     * @param carLeftFiles
+     * @param carBehindFiles
+     * @param carRightFiles
+     * @param carInfo             运输车辆管理
      * @return 结果
      */
-    int insertCarInfo(CarInfo carInfo);
+    int insertCarInfo(MultipartFile[] roadTransportFiles,
+                      MultipartFile[] drivingLicenseFiles,
+                      MultipartFile[] carFrontFiles,
+                      MultipartFile[] carLeftFiles,
+                      MultipartFile[] carBehindFiles,
+                      MultipartFile[] carRightFiles,
+                      CarInfo carInfo) throws IOException;
     /**
      * 修改运输车辆管理
-     * 
-     * @param carInfo 运输车辆管理
+     *
+     * @param roadTransportFiles
+     * @param drivingLicenseFiles
+     * @param carFrontFiles
+     * @param carLeftFiles
+     * @param carBehindFiles
+     * @param carRightFiles
+     * @param carInfo             运输车辆管理
      * @return 结果
      */
-    int updateCarInfo(CarInfo carInfo);
+    int updateCarInfo(MultipartFile[] roadTransportFiles,
+                      MultipartFile[] drivingLicenseFiles,
+                      MultipartFile[] carFrontFiles,
+                      MultipartFile[] carLeftFiles,
+                      MultipartFile[] carBehindFiles,
+                      MultipartFile[] carRightFiles,
+                      CarInfo carInfo) throws IOException;
     /**
      * 批量删除运输车辆管理
 package com.trash.carInfo.service.impl;
+import java.io.IOException;
 import java.util.List;
+
+import com.trash.carInfo.domain.CarDriverRelation;
+import com.trash.carInfo.domain.vo.CarInfoVo;
+import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.SecurityUtils;
+import com.trash.enterprise.domain.TransportationEnterprise;
+import com.trash.enterprise.mapper.TransportationEnterpriseMapper;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.carInfo.mapper.CarInfoMapper;
 import com.trash.carInfo.domain.CarInfo;
 import com.trash.carInfo.service.ICarInfoService;
+import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 运输车辆管理Service业务层处理
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @Service
 public class CarInfoServiceImpl implements ICarInfoService 
@@ -20,6 +32,9 @@ public class CarInfoServiceImpl implements ICarInfoService
     @Autowired
     private CarInfoMapper carInfoMapper;
+    @Autowired
+    private TransportationEnterpriseMapper transportationEnterpriseMapper;
+
     /**
      * 查询运输车辆管理
      * 
@@ -34,39 +49,124 @@ public class CarInfoServiceImpl implements ICarInfoService
     /**
      * 查询运输车辆管理列表
-     * 
+     *
      * @param carInfo 运输车辆管理
      * @return 运输车辆管理
      */
     @Override
-    public List<CarInfo> selectCarInfoList(CarInfo carInfo)
+    public List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo)
     {
         return carInfoMapper.selectCarInfoList(carInfo);
     }
     /**
      * 新增运输车辆管理
-     * 
-     * @param carInfo 运输车辆管理
+     *
+     * @param roadTransportFiles
+     * @param drivingLicenseFiles
+     * @param carFrontFiles
+     * @param carLeftFiles
+     * @param carBehindFiles
+     * @param carRightFiles
+     * @param carInfo             运输车辆管理
      * @return 结果
      */
     @Override
-    public int insertCarInfo(CarInfo carInfo)
-    {
+    @Transactional
+    public int insertCarInfo(MultipartFile[] roadTransportFiles, MultipartFile[] drivingLicenseFiles, MultipartFile[] carFrontFiles, MultipartFile[] carLeftFiles, MultipartFile[] carBehindFiles, MultipartFile[] carRightFiles, CarInfo carInfo) throws IOException {
         carInfo.setCreateTime(DateUtils.getNowDate());
-        return carInfoMapper.insertCarInfo(carInfo);
+        carInfo.setCreateBy(SecurityUtils.getUsername());
+        carInfo.setCreditStatus("正常");
+        carInfo.setStatus(0);
+        for (MultipartFile file : roadTransportFiles) {
+            carInfo.setRoadTransport(carInfo.getRoadTransport()!=null?carInfo.getRoadTransport()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : drivingLicenseFiles) {
+            carInfo.setDrivingLicense(carInfo.getDrivingLicense()!=null?carInfo.getDrivingLicense()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carFrontFiles) {
+            carInfo.setCarFront(carInfo.getCarFront()!=null?carInfo.getCarFront()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carLeftFiles) {
+            carInfo.setCarLeft(carInfo.getCarLeft()!=null?carInfo.getCarLeft()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carBehindFiles) {
+            carInfo.setCarBehind(carInfo.getCarBehind()!=null?carInfo.getCarBehind()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carRightFiles) {
+            carInfo.setCarRight(carInfo.getCarRight()!=null?carInfo.getCarRight()+";"+uploadFile(file):uploadFile(file));
+        }
+        carInfo.setRoadTransport(removeSemicolon(carInfo.getRoadTransport()));
+        carInfo.setDrivingLicense(removeSemicolon(carInfo.getDrivingLicense()));
+        carInfo.setCarFront(removeSemicolon(carInfo.getCarFront()));
+        carInfo.setCarLeft(removeSemicolon(carInfo.getCarLeft()));
+        carInfo.setCarBehind(removeSemicolon(carInfo.getCarBehind()));
+        carInfo.setCarRight(removeSemicolon(carInfo.getCarRight()));
+        int result =  carInfoMapper.insertCarInfo(carInfo);
+
+        String[] Drivers = carInfo.getDrivers().split(",");
+        int carCount = 0;
+        for (String driver : Drivers) {
+            CarDriverRelation carDriverRelation = new CarDriverRelation();
+            carDriverRelation.setCarId(carInfo.getId());
+            carDriverRelation.setDriverId(Long.parseLong(driver));
+            carCount = carCount+carInfoMapper.addCarDriverRelation(carDriverRelation);
+        }
+
+        return result;
     }
     /**
      * 修改运输车辆管理
-     * 
-     * @param carInfo 运输车辆管理
+     *
+     * @param roadTransportFiles
+     * @param drivingLicenseFiles
+     * @param carFrontFiles
+     * @param carLeftFiles
+     * @param carBehindFiles
+     * @param carRightFiles
+     * @param carInfo             运输车辆管理
      * @return 结果
      */
     @Override
-    public int updateCarInfo(CarInfo carInfo)
-    {
+    public int updateCarInfo(MultipartFile[] roadTransportFiles, MultipartFile[] drivingLicenseFiles, MultipartFile[] carFrontFiles, MultipartFile[] carLeftFiles, MultipartFile[] carBehindFiles, MultipartFile[] carRightFiles, CarInfo carInfo) throws IOException {
         carInfo.setUpdateTime(DateUtils.getNowDate());
+        carInfo.setUpdateBy(SecurityUtils.getUsername());
+        for (MultipartFile file : roadTransportFiles) {
+            carInfo.setRoadTransport(carInfo.getRoadTransport()!=null?carInfo.getRoadTransport()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : drivingLicenseFiles) {
+            carInfo.setDrivingLicense(carInfo.getDrivingLicense()!=null?carInfo.getDrivingLicense()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carFrontFiles) {
+            carInfo.setCarFront(carInfo.getCarFront()!=null?carInfo.getCarFront()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carLeftFiles) {
+            carInfo.setCarLeft(carInfo.getCarLeft()!=null?carInfo.getCarLeft()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carBehindFiles) {
+            carInfo.setCarBehind(carInfo.getCarBehind()!=null?carInfo.getCarBehind()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : carRightFiles) {
+            carInfo.setCarRight(carInfo.getCarRight()!=null?carInfo.getCarRight()+";"+uploadFile(file):uploadFile(file));
+        }
+        carInfo.setRoadTransport(removeSemicolon(carInfo.getRoadTransport()));
+        carInfo.setDrivingLicense(removeSemicolon(carInfo.getDrivingLicense()));
+        carInfo.setCarFront(removeSemicolon(carInfo.getCarFront()));
+        carInfo.setCarLeft(removeSemicolon(carInfo.getCarLeft()));
+        carInfo.setCarBehind(removeSemicolon(carInfo.getCarBehind()));
+        carInfo.setCarRight(removeSemicolon(carInfo.getCarRight()));
+
+        String[] Drivers = carInfo.getDrivers().split(",");
+        //删除原有关系
+        carInfoMapper.deleteCarDriverRelationByCarId(carInfo.getId());
+        //添加新关系
+        for (String driver : Drivers) {
+            CarDriverRelation carDriverRelation = new CarDriverRelation();
+            carDriverRelation.setCarId(carInfo.getId());
+            carDriverRelation.setDriverId(Long.parseLong(driver));
+            carInfoMapper.addCarDriverRelation(carDriverRelation);
+        }
         return carInfoMapper.updateCarInfo(carInfo);
     }
@@ -93,4 +193,25 @@ public class CarInfoServiceImpl implements ICarInfoService
     {
         return carInfoMapper.deleteCarInfoById(id);
     }
+
+    /**
+     * 文件上传
+     *
+     * @param file
+     * @author 2c
+     */
+    public static String uploadFile(MultipartFile file) throws IOException {
+        // 上传文件路径
+        String filePath = trashConfig.getUploadPath();
+        // 上传并返回新文件名称
+        String newFileName = upload(filePath, file);
+        return newFileName;
+    }
+
+    //去掉第一个分号,如果有的话
+    public String removeSemicolon(String str){
+        if (str.startsWith(";"))
+            str = str.substring(1);
+        return str;
+    }
 }
 package com.trash.disposalSite.controller;
+import java.io.IOException;
 import java.util.List;
+
+import com.trash.common.annotation.RepeatSubmit;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
@@ -19,15 +15,16 @@ import com.trash.disposalSite.domain.DisposalSite;
 import com.trash.disposalSite.service.IDisposalSiteService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 处理场所管理Controller
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @RestController
-@RequestMapping("/disposalSite")
+@RequestMapping("/unit/disposalSite")
 public class DisposalSiteController extends BaseController
 {
     @Autowired
@@ -36,7 +33,7 @@ public class DisposalSiteController extends BaseController
     /**
      * 查询处理场所管理列表
      */
-//    @PreAuthorize("@ss.hasPermi('disposalSite:disposalSite:list')")
+    @PreAuthorize("@ss.hasPermi('unit:disposalSite:list')")
     @GetMapping("/list")
     public TableDataInfo list(DisposalSite disposalSite)
     {
@@ -48,7 +45,7 @@ public class DisposalSiteController extends BaseController
     /**
      * 导出处理场所管理列表
      */
-    @PreAuthorize("@ss.hasPermi('disposalSite:disposalSite:export')")
+    @PreAuthorize("@ss.hasPermi('unit:disposalSite:export')")
     @Log(title = "处理场所管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(DisposalSite disposalSite)
@@ -61,7 +58,7 @@ public class DisposalSiteController extends BaseController
     /**
      * 获取处理场所管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('disposalSite:disposalSite:query')")
+    @PreAuthorize("@ss.hasPermi('unit:disposalSite:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,29 +68,42 @@ public class DisposalSiteController extends BaseController
     /**
      * 新增处理场所管理
      */
-    @PreAuthorize("@ss.hasPermi('disposalSite:disposalSite:add')")
+    @PreAuthorize("@ss.hasPermi('unit:disposalSite:add')")
     @Log(title = "处理场所管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody DisposalSite disposalSite)
-    {
-        return toAjax(disposalSiteService.insertDisposalSite(disposalSite));
+    @RepeatSubmit
+    public AjaxResult add(@RequestParam(value = "approvalDocumentFiles") MultipartFile[] approvalDocument,
+                          @RequestParam(value = "approvalDataFiles") MultipartFile[] approvalData,
+                          @RequestParam(value = "scenePhotoFiles") MultipartFile[] scenePhoto,
+                          @RequestParam(value = "carWashingFacilitiesImageFiles") MultipartFile[] carWashingFacilitiesImage,
+                          @RequestParam(value = "safetyAssessmentReportFiles") MultipartFile[] safetyAssessmentReport,
+                          @RequestParam(value = "environmentalApprovalFiles") MultipartFile[] environmentalApproval,
+                          @RequestParam(value = "authorizationFiles") MultipartFile[] authorization,
+                          @RequestParam(value = "otherInformationFiles") MultipartFile[] otherInformation, DisposalSite disposalSite) throws IOException {
+        return toAjax(disposalSiteService.insertDisposalSite(approvalDocument,approvalData,scenePhoto,carWashingFacilitiesImage,safetyAssessmentReport,environmentalApproval,authorization,otherInformation,disposalSite));
     }
     /**
      * 修改处理场所管理
      */
-    @PreAuthorize("@ss.hasPermi('disposalSite:disposalSite:edit')")
+    @PreAuthorize("@ss.hasPermi('unit:disposalSite:edit')")
     @Log(title = "处理场所管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody DisposalSite disposalSite)
-    {
-        return toAjax(disposalSiteService.updateDisposalSite(disposalSite));
+    public AjaxResult edit(@RequestParam(value = "approvalDocumentFiles") MultipartFile[] approvalDocument,
+    @RequestParam(value = "approvalDataFiles") MultipartFile[] approvalData,
+    @RequestParam(value = "scenePhotoFiles") MultipartFile[] scenePhoto,
+    @RequestParam(value = "carWashingFacilitiesImageFiles") MultipartFile[] carWashingFacilitiesImage,
+    @RequestParam(value = "safetyAssessmentReportFiles") MultipartFile[] safetyAssessmentReport,
+    @RequestParam(value = "environmentalApprovalFiles") MultipartFile[] environmentalApproval,
+    @RequestParam(value = "authorizationFiles") MultipartFile[] authorization,
+    @RequestParam(value = "otherInformationFiles") MultipartFile[] otherInformation, DisposalSite disposalSite) throws IOException {
+        return toAjax(disposalSiteService.updateDisposalSite(approvalDocument,approvalData,scenePhoto,carWashingFacilitiesImage,safetyAssessmentReport,environmentalApproval,authorization,otherInformation,disposalSite));
     }
     /**
      * 删除处理场所管理
      */
-    @PreAuthorize("@ss.hasPermi('disposalSite:disposalSite:remove')")
+    @PreAuthorize("@ss.hasPermi('unit:disposalSite:remove')")
     @Log(title = "处理场所管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -11,7 +11,7 @@ import com.trash.common.core.domain.BaseEntity;
  * 处理场所管理对象 disposal_site
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public class DisposalSite extends BaseEntity
 {
@@ -78,6 +78,10 @@ public class DisposalSite extends BaseEntity
     @Excel(name = "审批方量(m³)")
     private String squareMeasure;
+    /** 剩余方量 */
+    @Excel(name = "剩余方量")
+    private String surplusSquareMeasure;
+
     /** 洗车作业设施 */
     @Excel(name = "洗车作业设施")
     private String carWashingFacilities;
@@ -104,11 +108,19 @@ public class DisposalSite extends BaseEntity
     @Excel(name = "办理意见")
     private String handlingAdvice;
+    /** 消纳来源 */
+    @Excel(name = "消纳来源")
+    private String absorbSource;
+
     /** 电子围栏
  */
     @Excel(name = "电子围栏")
     private String electronicFence;
+    /** 信用状态 */
+    @Excel(name = "信用状态")
+    private String creditStatus;
+
     /** 批准文件 */
     @Excel(name = "批准文件")
     private String approvalDocument;
@@ -126,13 +138,17 @@ public class DisposalSite extends BaseEntity
     @Excel(name = "洗车设施照片")
     private String carWashingFacilitiesImage;
+    /** 期限范围 */
+    @Excel(name = "期限范围")
+    private String termRange;
+
     /** 安全评估报告 */
     @Excel(name = "安全评估报告")
     private String safetyAssessmentReport;
     /** 环评报告及环保部门批复
  */
-    @Excel(name = "环评报告及环保部门批复")
+    @Excel(name = "环评报告及环保部门批复 ")
     private String environmentalApproval;
     /** 签署消纳合同授权委托书 */
@@ -148,10 +164,25 @@ public class DisposalSite extends BaseEntity
     private String companyIds;
     /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
-    @Excel(name = "审批状态,0=审批中,1=审批通过,2=被驳回")
+    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
     private Integer status;
-    public void setId(Long id) 
+    /** 二维码 */
+    private String qrCode;
+
+    /** 审核情况 */
+    @Excel(name = "审核情况")
+    private String auditStatus;
+
+    public String getAuditStatus() {
+        return auditStatus;
+    }
+
+    public void setAuditStatus(String auditStatus) {
+        this.auditStatus = auditStatus;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -286,6 +317,15 @@ public class DisposalSite extends BaseEntity
     {
         return squareMeasure;
     }
+    public void setSurplusSquareMeasure(String surplusSquareMeasure) 
+    {
+        this.surplusSquareMeasure = surplusSquareMeasure;
+    }
+
+    public String getSurplusSquareMeasure() 
+    {
+        return surplusSquareMeasure;
+    }
     public void setCarWashingFacilities(String carWashingFacilities) 
     {
         this.carWashingFacilities = carWashingFacilities;
@@ -340,6 +380,15 @@ public class DisposalSite extends BaseEntity
     {
         return handlingAdvice;
     }
+    public void setAbsorbSource(String absorbSource) 
+    {
+        this.absorbSource = absorbSource;
+    }
+
+    public String getAbsorbSource() 
+    {
+        return absorbSource;
+    }
     public void setElectronicFence(String electronicFence) 
     {
         this.electronicFence = electronicFence;
@@ -349,6 +398,15 @@ public class DisposalSite extends BaseEntity
     {
         return electronicFence;
     }
+    public void setCreditStatus(String creditStatus) 
+    {
+        this.creditStatus = creditStatus;
+    }
+
+    public String getCreditStatus() 
+    {
+        return creditStatus;
+    }
     public void setApprovalDocument(String approvalDocument) 
     {
         this.approvalDocument = approvalDocument;
@@ -385,6 +443,15 @@ public class DisposalSite extends BaseEntity
     {
         return carWashingFacilitiesImage;
     }
+    public void setTermRange(String termRange) 
+    {
+        this.termRange = termRange;
+    }
+
+    public String getTermRange() 
+    {
+        return termRange;
+    }
     public void setSafetyAssessmentReport(String safetyAssessmentReport) 
     {
         this.safetyAssessmentReport = safetyAssessmentReport;
@@ -439,6 +506,15 @@ public class DisposalSite extends BaseEntity
     {
         return status;
     }
+    public void setQrCode(String qrCode) 
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
     @Override
     public String toString() {
@@ -458,17 +534,21 @@ public class DisposalSite extends BaseEntity
             .append("validityBeginDate", getValidityBeginDate())
             .append("validityEndDate", getValidityEndDate())
             .append("squareMeasure", getSquareMeasure())
+            .append("surplusSquareMeasure", getSurplusSquareMeasure())
             .append("carWashingFacilities", getCarWashingFacilities())
             .append("exitRoadCondition", getExitRoadCondition())
             .append("lightingFacility", getLightingFacility())
             .append("videoSurveillanceFacility", getVideoSurveillanceFacility())
             .append("preparer", getPreparer())
             .append("handlingAdvice", getHandlingAdvice())
+            .append("absorbSource", getAbsorbSource())
             .append("electronicFence", getElectronicFence())
+            .append("creditStatus", getCreditStatus())
             .append("approvalDocument", getApprovalDocument())
             .append("approvalData", getApprovalData())
             .append("scenePhoto", getScenePhoto())
             .append("carWashingFacilitiesImage", getCarWashingFacilitiesImage())
+            .append("termRange", getTermRange())
             .append("safetyAssessmentReport", getSafetyAssessmentReport())
             .append("environmentalApproval", getEnvironmentalApproval())
             .append("authorization", getAuthorization())
@@ -479,6 +559,7 @@ public class DisposalSite extends BaseEntity
             .append("createBy", getCreateBy())
             .append("updateTime", getUpdateTime())
             .append("updateBy", getUpdateBy())
+            .append("qrCode", getQrCode())
             .toString();
     }
 }
@@ -7,7 +7,7 @@ import com.trash.disposalSite.domain.DisposalSite;
  * 处理场所管理Mapper接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface DisposalSiteMapper 
 {
 package com.trash.disposalSite.service;
+import java.io.IOException;
 import java.util.List;
 import com.trash.disposalSite.domain.DisposalSite;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 处理场所管理Service接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface IDisposalSiteService 
 {
@@ -29,19 +31,35 @@ public interface IDisposalSiteService
     /**
      * 新增处理场所管理
-     * 
-     * @param disposalSite 处理场所管理
+     *
+     * @param approvalDocument
+     * @param approvalData
+     * @param scenePhoto
+     * @param carWashingFacilitiesImage
+     * @param safetyAssessmentReport
+     * @param environmentalApproval
+     * @param authorization
+     * @param otherInformation
+     * @param disposalSite              处理场所管理
      * @return 结果
      */
-    int insertDisposalSite(DisposalSite disposalSite);
+    int insertDisposalSite(MultipartFile[] approvalDocument,MultipartFile[] approvalData,MultipartFile[] scenePhoto,MultipartFile[] carWashingFacilitiesImage,MultipartFile[] safetyAssessmentReport,MultipartFile[] environmentalApproval,MultipartFile[] authorization,MultipartFile[] otherInformation, DisposalSite disposalSite) throws IOException;
     /**
      * 修改处理场所管理
-     * 
-     * @param disposalSite 处理场所管理
+     *
+     * @param approvalDocument
+     * @param approvalData
+     * @param scenePhoto
+     * @param carWashingFacilitiesImage
+     * @param safetyAssessmentReport
+     * @param environmentalApproval
+     * @param authorization
+     * @param otherInformation
+     * @param disposalSite              处理场所管理
      * @return 结果
      */
-    int updateDisposalSite(DisposalSite disposalSite);
+    int updateDisposalSite(MultipartFile[] approvalDocument,MultipartFile[] approvalData,MultipartFile[] scenePhoto,MultipartFile[] carWashingFacilitiesImage,MultipartFile[] safetyAssessmentReport,MultipartFile[] environmentalApproval,MultipartFile[] authorization,MultipartFile[] otherInformation, DisposalSite disposalSite) throws IOException;
     /**
      * 批量删除处理场所管理
 package com.trash.disposalSite.service.impl;
-import java.util.List;
+import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import com.trash.disposalSite.mapper.DisposalSiteMapper;
+import com.trash.common.utils.SecurityUtils;
 import com.trash.disposalSite.domain.DisposalSite;
+import com.trash.disposalSite.mapper.DisposalSiteMapper;
 import com.trash.disposalSite.service.IDisposalSiteService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 处理场所管理Service业务层处理
- * 
+ *
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @Service
-public class DisposalSiteServiceImpl implements IDisposalSiteService 
-{
+public class DisposalSiteServiceImpl implements IDisposalSiteService {
     @Autowired
     private DisposalSiteMapper disposalSiteMapper;
     /**
      * 查询处理场所管理
-     * 
+     *
      * @param id 处理场所管理ID
      * @return 处理场所管理
      */
     @Override
-    public DisposalSite selectDisposalSiteById(Long id)
-    {
+    public DisposalSite selectDisposalSiteById(Long id) {
         return disposalSiteMapper.selectDisposalSiteById(id);
     }
     /**
      * 查询处理场所管理列表
-     * 
+     *
      * @param disposalSite 处理场所管理
      * @return 处理场所管理
      */
     @Override
-    public List<DisposalSite> selectDisposalSiteList(DisposalSite disposalSite)
-    {
+    public List<DisposalSite> selectDisposalSiteList(DisposalSite disposalSite) {
         return disposalSiteMapper.selectDisposalSiteList(disposalSite);
     }
     /**
      * 新增处理场所管理
-     * 
-     * @param disposalSite 处理场所管理
+     *
+     * @param approvalDocument
+     * @param approvalData
+     * @param scenePhoto
+     * @param carWashingFacilitiesImage
+     * @param safetyAssessmentReport
+     * @param environmentalApproval
+     * @param authorization
+     * @param otherInformation
+     * @param disposalSite              处理场所管理
      * @return 结果
      */
     @Override
-    public int insertDisposalSite(DisposalSite disposalSite)
-    {
+    public int insertDisposalSite(MultipartFile[] approvalDocument, MultipartFile[] approvalData, MultipartFile[] scenePhoto, MultipartFile[] carWashingFacilitiesImage, MultipartFile[] safetyAssessmentReport, MultipartFile[] environmentalApproval, MultipartFile[] authorization, MultipartFile[] otherInformation, DisposalSite disposalSite) throws IOException {
         disposalSite.setCreateTime(DateUtils.getNowDate());
+        disposalSite.setCreateBy(SecurityUtils.getUsername());
+        disposalSite.setStatus(0);
+        disposalSite.setCreditStatus("正常");
+        disposalSite.setTermRange("未超期");
+        disposalSite.setAuditStatus("新增审核中");
+        for (MultipartFile multipartFile : approvalDocument) {
+            disposalSite.setApprovalDocument(disposalSite.getApprovalDocument() != null ? disposalSite.getApprovalDocument() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : approvalData) {
+            disposalSite.setApprovalData(disposalSite.getApprovalData() != null ? disposalSite.getApprovalData() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : scenePhoto) {
+            disposalSite.setScenePhoto(disposalSite.getScenePhoto() != null ? disposalSite.getScenePhoto() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : carWashingFacilitiesImage) {
+            disposalSite.setCarWashingFacilitiesImage(disposalSite.getCarWashingFacilitiesImage() != null ? disposalSite.getCarWashingFacilitiesImage() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : safetyAssessmentReport) {
+            disposalSite.setSafetyAssessmentReport(disposalSite.getSafetyAssessmentReport() != null ? disposalSite.getSafetyAssessmentReport() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : environmentalApproval) {
+            disposalSite.setEnvironmentalApproval(disposalSite.getEnvironmentalApproval() != null ? disposalSite.getEnvironmentalApproval() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : authorization) {
+            disposalSite.setAuthorization(disposalSite.getAuthorization() != null ? disposalSite.getAuthorization() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : otherInformation) {
+            disposalSite.setOtherInformation(disposalSite.getOtherInformation() != null ? disposalSite.getOtherInformation() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        //去掉第一个分号,如果有的话
+        disposalSite.setApprovalDocument(removeSemicolon(disposalSite.getApprovalDocument()));
+        disposalSite.setApprovalData(removeSemicolon(disposalSite.getApprovalData()));
+        disposalSite.setScenePhoto(removeSemicolon(disposalSite.getScenePhoto()));
+        disposalSite.setCarWashingFacilitiesImage(removeSemicolon(disposalSite.getCarWashingFacilitiesImage()));
+        disposalSite.setSafetyAssessmentReport(removeSemicolon(disposalSite.getSafetyAssessmentReport()));
+        disposalSite.setEnvironmentalApproval(removeSemicolon(disposalSite.getEnvironmentalApproval()));
+        disposalSite.setAuthorization(removeSemicolon(disposalSite.getAuthorization()));
+        disposalSite.setOtherInformation(removeSemicolon(disposalSite.getOtherInformation()));
         return disposalSiteMapper.insertDisposalSite(disposalSite);
     }
     /**
      * 修改处理场所管理
-     * 
-     * @param disposalSite 处理场所管理
+     *
+     * @param approvalDocument
+     * @param approvalData
+     * @param scenePhoto
+     * @param carWashingFacilitiesImage
+     * @param safetyAssessmentReport
+     * @param environmentalApproval
+     * @param authorization
+     * @param otherInformation
+     * @param disposalSite              处理场所管理
      * @return 结果
      */
     @Override
-    public int updateDisposalSite(DisposalSite disposalSite)
-    {
+    public int updateDisposalSite(MultipartFile[] approvalDocument, MultipartFile[] approvalData, MultipartFile[] scenePhoto, MultipartFile[] carWashingFacilitiesImage, MultipartFile[] safetyAssessmentReport, MultipartFile[] environmentalApproval, MultipartFile[] authorization, MultipartFile[] otherInformation, DisposalSite disposalSite) throws IOException {
         disposalSite.setUpdateTime(DateUtils.getNowDate());
+        disposalSite.setUpdateBy(SecurityUtils.getUsername());
+        for (MultipartFile multipartFile : approvalDocument) {
+            disposalSite.setApprovalDocument(disposalSite.getApprovalDocument() != null ? disposalSite.getApprovalDocument() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : approvalData) {
+            disposalSite.setApprovalData(disposalSite.getApprovalData() != null ? disposalSite.getApprovalData() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : scenePhoto) {
+            disposalSite.setScenePhoto(disposalSite.getScenePhoto() != null ? disposalSite.getScenePhoto() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : carWashingFacilitiesImage) {
+            disposalSite.setCarWashingFacilitiesImage(disposalSite.getCarWashingFacilitiesImage() != null ? disposalSite.getCarWashingFacilitiesImage() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : safetyAssessmentReport) {
+            disposalSite.setSafetyAssessmentReport(disposalSite.getSafetyAssessmentReport() != null ? disposalSite.getSafetyAssessmentReport() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : environmentalApproval) {
+            disposalSite.setEnvironmentalApproval(disposalSite.getEnvironmentalApproval() != null ? disposalSite.getEnvironmentalApproval() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : authorization) {
+            disposalSite.setAuthorization(disposalSite.getAuthorization() != null ? disposalSite.getAuthorization() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        for (MultipartFile multipartFile : otherInformation) {
+            disposalSite.setOtherInformation(disposalSite.getOtherInformation() != null ? disposalSite.getOtherInformation() + ";" + uploadFile(multipartFile) : uploadFile(multipartFile));
+        }
+        disposalSite.setApprovalDocument(removeSemicolon(disposalSite.getApprovalDocument()));
+        disposalSite.setApprovalData(removeSemicolon(disposalSite.getApprovalData()));
+        disposalSite.setScenePhoto(removeSemicolon(disposalSite.getScenePhoto()));
+        disposalSite.setCarWashingFacilitiesImage(removeSemicolon(disposalSite.getCarWashingFacilitiesImage()));
+        disposalSite.setSafetyAssessmentReport(removeSemicolon(disposalSite.getSafetyAssessmentReport()));
+        disposalSite.setEnvironmentalApproval(removeSemicolon(disposalSite.getEnvironmentalApproval()));
+        disposalSite.setAuthorization(removeSemicolon(disposalSite.getAuthorization()));
+        disposalSite.setOtherInformation(removeSemicolon(disposalSite.getOtherInformation()));
         return disposalSiteMapper.updateDisposalSite(disposalSite);
     }
     /**
      * 批量删除处理场所管理
-     * 
+     *
      * @param ids 需要删除的处理场所管理ID
      * @return 结果
      */
     @Override
-    public int deleteDisposalSiteByIds(Long[] ids)
-    {
+    public int deleteDisposalSiteByIds(Long[] ids) {
         return disposalSiteMapper.deleteDisposalSiteByIds(ids);
     }
     /**
      * 删除处理场所管理信息
-     * 
+     *
      * @param id 处理场所管理ID
      * @return 结果
      */
     @Override
-    public int deleteDisposalSiteById(Long id)
-    {
+    public int deleteDisposalSiteById(Long id) {
         return disposalSiteMapper.deleteDisposalSiteById(id);
     }
+
+    /**
+     * 文件上传
+     *
+     * @param file
+     * @author 2c
+     */
+    public static String uploadFile(MultipartFile file) throws IOException {
+        // 上传文件路径
+        String filePath = trashConfig.getUploadPath();
+        // 上传并返回新文件名称
+        String newFileName = upload(filePath, file);
+        return newFileName;
+    }
+
+    //去掉第一个分号,如果有的话
+    public String removeSemicolon(String str){
+        if (str.startsWith(";"))
+            str = str.substring(1);
+        return str;
+    }
 }
 package com.trash.driver.controller;
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+
+import com.trash.driver.domain.vo.DriverVo;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
@@ -19,15 +16,16 @@ import com.trash.driver.domain.Driver;
 import com.trash.driver.service.IDriverService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 驾驶员管理Controller
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @RestController
-@RequestMapping("/driver")
+@RequestMapping("/unit/driver")
 public class DriverController extends BaseController
 {
     @Autowired
@@ -36,32 +34,39 @@ public class DriverController extends BaseController
     /**
      * 查询驾驶员管理列表
      */
-//    @PreAuthorize("@ss.hasPermi('driver:driver:list')")
+    @PreAuthorize("@ss.hasPermi('unit:driver:list')")
     @GetMapping("/list")
-    public TableDataInfo list(Driver driver)
+    public TableDataInfo list(DriverVo driver)
     {
         startPage();
-        List<Driver> list = driverService.selectDriverList(driver);
+        List<DriverVo> list = driverService.selectDriverList(driver);
         return getDataTable(list);
     }
+    @PreAuthorize("@ss.hasPermi('unit:driver:list')")
+    @GetMapping("/listDriverByCompany/{companyId}")
+    public List<Map<Object,Object>> listDriverByCompany(@PathVariable("companyId") String companyId)
+    {
+        return driverService.selectDriverListByCompanyId(companyId);
+    }
+
     /**
      * 导出驾驶员管理列表
      */
-    @PreAuthorize("@ss.hasPermi('driver:driver:export')")
+    @PreAuthorize("@ss.hasPermi('unit:driver:export')")
     @Log(title = "驾驶员管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(Driver driver)
+    public AjaxResult export(DriverVo driver)
     {
-        List<Driver> list = driverService.selectDriverList(driver);
-        ExcelUtil<Driver> util = new ExcelUtil<Driver>(Driver.class);
+        List<DriverVo> list = driverService.selectDriverList(driver);
+        ExcelUtil<DriverVo> util = new ExcelUtil<DriverVo>(DriverVo.class);
         return util.exportExcel(list, "driver");
     }
     /**
      * 获取驾驶员管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('driver:driver:query')")
+    @PreAuthorize("@ss.hasPermi('unit:driver:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,33 +76,42 @@ public class DriverController extends BaseController
     /**
      * 新增驾驶员管理
      */
-    @PreAuthorize("@ss.hasPermi('driver:driver:add')")
+    @PreAuthorize("@ss.hasPermi('unit:driver:add')")
     @Log(title = "驾驶员管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody Driver driver)
-    {
-        return toAjax(driverService.insertDriver(driver));
+    public AjaxResult add(@RequestParam(value = "drivingLicenceFiles") MultipartFile[] drivingLicenceFiles,
+                          @RequestParam(value = "professionalQualificationFiles") MultipartFile[] professionalQualificationFiles,
+                          @RequestParam(value = "safetyTrainingFiles") MultipartFile[] safetyTrainingFiles,
+                          @RequestParam(value = "photographOneFiles") MultipartFile[] photographOneFiles,
+                          @RequestParam(value = "photographTwoFiles") MultipartFile[] photographTwoFiles,
+                          Driver driver) throws IOException {
+        return toAjax(driverService.insertDriver(drivingLicenceFiles,professionalQualificationFiles,safetyTrainingFiles,photographOneFiles,photographTwoFiles,driver));
     }
     /**
      * 修改驾驶员管理
      */
-    @PreAuthorize("@ss.hasPermi('driver:driver:edit')")
+    @PreAuthorize("@ss.hasPermi('unit:driver:edit')")
     @Log(title = "驾驶员管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody Driver driver)
-    {
-        return toAjax(driverService.updateDriver(driver));
+    public AjaxResult edit(@RequestParam(value = "drivingLicenceFiles") MultipartFile[] drivingLicenceFiles,
+                           @RequestParam(value = "professionalQualificationFiles") MultipartFile[] professionalQualificationFiles,
+                           @RequestParam(value = "safetyTrainingFiles") MultipartFile[] safetyTrainingFiles,
+                           @RequestParam(value = "photographOneFiles") MultipartFile[] photographOneFiles,
+                           @RequestParam(value = "photographTwoFiles") MultipartFile[] photographTwoFiles,
+                           Driver driver) throws IOException {
+        return toAjax(driverService.updateDriver(drivingLicenceFiles,professionalQualificationFiles,safetyTrainingFiles,photographOneFiles,photographTwoFiles,driver));
     }
     /**
      * 删除驾驶员管理
      */
-    @PreAuthorize("@ss.hasPermi('driver:driver:remove')")
+    @PreAuthorize("@ss.hasPermi('unit:driver:remove')")
     @Log(title = "驾驶员管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
     {
         return toAjax(driverService.deleteDriverByIds(ids));
     }
+
 }
@@ -9,9 +9,9 @@ import com.trash.common.core.domain.BaseEntity;
 /**
  * 驾驶员管理对象 driver
- * 
+ *
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-27
  */
 public class Driver extends BaseEntity
 {
@@ -77,155 +77,193 @@ public class Driver extends BaseEntity
     @Excel(name = "审批状态,0=审批中,1=审批通过,2=被驳回")
     private Integer status;
-    public void setId(Long id) 
+    /** 一寸免冠照片1 */
+    @Excel(name = "一寸免冠照片1")
+    private String photographOne;
+
+    /** 一寸免冠照片2 */
+    @Excel(name = "一寸免冠照片2")
+    private String photographTwo;
+
+    private String phoneNo;
+
+    public String getPhoneNo() {
+        return phoneNo;
+    }
+
+    public void setPhoneNo(String phoneNo) {
+        this.phoneNo = phoneNo;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
-    public Long getId() 
+    public Long getId()
     {
         return id;
     }
-    public void setName(String name) 
+    public void setName(String name)
     {
         this.name = name;
     }
-    public String getName() 
+    public String getName()
     {
         return name;
     }
-    public void setIdentityCard(String identityCard) 
+    public void setIdentityCard(String identityCard)
     {
         this.identityCard = identityCard;
     }
-    public String getIdentityCard() 
+    public String getIdentityCard()
     {
         return identityCard;
     }
-    public void setCompanyId(Long companyId) 
+    public void setCompanyId(Long companyId)
     {
         this.companyId = companyId;
     }
-    public Long getCompanyId() 
+    public Long getCompanyId()
     {
         return companyId;
     }
-    public void setProfessionalQualificationBeginDate(Date professionalQualificationBeginDate) 
+    public void setProfessionalQualificationBeginDate(Date professionalQualificationBeginDate)
     {
         this.professionalQualificationBeginDate = professionalQualificationBeginDate;
     }
-    public Date getProfessionalQualificationBeginDate() 
+    public Date getProfessionalQualificationBeginDate()
     {
         return professionalQualificationBeginDate;
     }
-    public void setProfessionalQualificationEndDate(Date professionalQualificationEndDate) 
+    public void setProfessionalQualificationEndDate(Date professionalQualificationEndDate)
     {
         this.professionalQualificationEndDate = professionalQualificationEndDate;
     }
-    public Date getProfessionalQualificationEndDate() 
+    public Date getProfessionalQualificationEndDate()
     {
         return professionalQualificationEndDate;
     }
-    public void setDrivingLicenceBeginDate(Date drivingLicenceBeginDate) 
+    public void setDrivingLicenceBeginDate(Date drivingLicenceBeginDate)
     {
         this.drivingLicenceBeginDate = drivingLicenceBeginDate;
     }
-    public Date getDrivingLicenceBeginDate() 
+    public Date getDrivingLicenceBeginDate()
     {
         return drivingLicenceBeginDate;
     }
-    public void setDrivingLicenceEndDate(Date drivingLicenceEndDate) 
+    public void setDrivingLicenceEndDate(Date drivingLicenceEndDate)
     {
         this.drivingLicenceEndDate = drivingLicenceEndDate;
     }
-    public Date getDrivingLicenceEndDate() 
+    public Date getDrivingLicenceEndDate()
     {
         return drivingLicenceEndDate;
     }
-    public void setSafetyTrainingDate(Date safetyTrainingDate) 
+    public void setSafetyTrainingDate(Date safetyTrainingDate)
     {
         this.safetyTrainingDate = safetyTrainingDate;
     }
-    public Date getSafetyTrainingDate() 
+    public Date getSafetyTrainingDate()
     {
         return safetyTrainingDate;
     }
-    public void setSafetyTrainingContent(String safetyTrainingContent) 
+    public void setSafetyTrainingContent(String safetyTrainingContent)
     {
         this.safetyTrainingContent = safetyTrainingContent;
     }
-    public String getSafetyTrainingContent() 
+    public String getSafetyTrainingContent()
     {
         return safetyTrainingContent;
     }
-    public void setDrivingLicence(String drivingLicence) 
+    public void setDrivingLicence(String drivingLicence)
     {
         this.drivingLicence = drivingLicence;
     }
-    public String getDrivingLicence() 
+    public String getDrivingLicence()
     {
         return drivingLicence;
     }
-    public void setProfessionalQualification(String professionalQualification) 
+    public void setProfessionalQualification(String professionalQualification)
     {
         this.professionalQualification = professionalQualification;
     }
-    public String getProfessionalQualification() 
+    public String getProfessionalQualification()
     {
         return professionalQualification;
     }
-    public void setSafetyTraining(String safetyTraining) 
+    public void setSafetyTraining(String safetyTraining)
     {
         this.safetyTraining = safetyTraining;
     }
-    public String getSafetyTraining() 
+    public String getSafetyTraining()
     {
         return safetyTraining;
     }
-    public void setStatus(Integer status) 
+    public void setStatus(Integer status)
     {
         this.status = status;
     }
-    public Integer getStatus() 
+    public Integer getStatus()
     {
         return status;
     }
+    public void setPhotographOne(String photographOne)
+    {
+        this.photographOne = photographOne;
+    }
+
+    public String getPhotographOne()
+    {
+        return photographOne;
+    }
+    public void setPhotographTwo(String photographTwo)
+    {
+        this.photographTwo = photographTwo;
+    }
+
+    public String getPhotographTwo()
+    {
+        return photographTwo;
+    }
     @Override
     public String toString() {
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("name", getName())
-            .append("identityCard", getIdentityCard())
-            .append("companyId", getCompanyId())
-            .append("professionalQualificationBeginDate", getProfessionalQualificationBeginDate())
-            .append("professionalQualificationEndDate", getProfessionalQualificationEndDate())
-            .append("drivingLicenceBeginDate", getDrivingLicenceBeginDate())
-            .append("drivingLicenceEndDate", getDrivingLicenceEndDate())
-            .append("safetyTrainingDate", getSafetyTrainingDate())
-            .append("safetyTrainingContent", getSafetyTrainingContent())
-            .append("remark", getRemark())
-            .append("drivingLicence", getDrivingLicence())
-            .append("professionalQualification", getProfessionalQualification())
-            .append("safetyTraining", getSafetyTraining())
-            .append("status", getStatus())
-            .append("createTime", getCreateTime())
-            .append("createBy", getCreateBy())
-            .append("updateTime", getUpdateTime())
-            .append("updateBy", getUpdateBy())
-            .toString();
+                .append("id", getId())
+                .append("name", getName())
+                .append("identityCard", getIdentityCard())
+                .append("companyId", getCompanyId())
+                .append("professionalQualificationBeginDate", getProfessionalQualificationBeginDate())
+                .append("professionalQualificationEndDate", getProfessionalQualificationEndDate())
+                .append("drivingLicenceBeginDate", getDrivingLicenceBeginDate())
+                .append("drivingLicenceEndDate", getDrivingLicenceEndDate())
+                .append("safetyTrainingDate", getSafetyTrainingDate())
+                .append("safetyTrainingContent", getSafetyTrainingContent())
+                .append("remark", getRemark())
+                .append("drivingLicence", getDrivingLicence())
+                .append("professionalQualification", getProfessionalQualification())
+                .append("safetyTraining", getSafetyTraining())
+                .append("status", getStatus())
+                .append("createTime", getCreateTime())
+                .append("createBy", getCreateBy())
+                .append("updateTime", getUpdateTime())
+                .append("updateBy", getUpdateBy())
+                .append("photographOne", getPhotographOne())
+                .append("photographTwo", getPhotographTwo())
+                .toString();
     }
 }
+package com.trash.driver.domain.vo;
+
+import com.trash.driver.domain.Driver;
+
+public class DriverVo extends Driver {
+
+    private String companyName;
+
+    public String getCompanyName() {
+        return companyName;
+    }
+
+    public void setCompanyName(String companyName) {
+        this.companyName = companyName;
+    }
+}
 package com.trash.driver.mapper;
 import java.util.List;
+import java.util.Map;
+
 import com.trash.driver.domain.Driver;
+import com.trash.driver.domain.vo.DriverVo;
 /**
  * 驾驶员管理Mapper接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface DriverMapper 
 {
@@ -25,7 +28,14 @@ public interface DriverMapper
      * @param driver 驾驶员管理
      * @return 驾驶员管理集合
      */
-    List<Driver> selectDriverList(Driver driver);
+    List<DriverVo> selectDriverList(DriverVo driver);
+
+    /**
+     * 根据公司id驾驶员管理列表
+     *
+     * @return 驾驶员管理集合
+     */
+    List<Map<Object,Object>> selectDriverListByCompanyId(String companyId);
     /**
      * 新增驾驶员管理
 package com.trash.driver.service;
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+
 import com.trash.driver.domain.Driver;
+import com.trash.driver.domain.vo.DriverVo;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 驾驶员管理Service接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface IDriverService 
 {
@@ -25,23 +30,50 @@ public interface IDriverService
      * @param driver 驾驶员管理
      * @return 驾驶员管理集合
      */
-    List<Driver> selectDriverList(Driver driver);
+    List<DriverVo> selectDriverList(DriverVo driver);
+
+    /**
+     * 根据公司id驾驶员管理列表
+     *
+     * @return 驾驶员管理集合
+     */
+    List<Map<Object,Object>> selectDriverListByCompanyId(String companyId);
     /**
      * 新增驾驶员管理
-     * 
-     * @param driver 驾驶员管理
+     *
+     * @param drivingLicenceFiles
+     * @param professionalQualificationFiles
+     * @param safetyTrainingFiles
+     * @param photographOneFiles
+     * @param photographTwoFiles
+     * @param driver                         驾驶员管理
      * @return 结果
      */
-    int insertDriver(Driver driver);
+    int insertDriver(MultipartFile[] drivingLicenceFiles,
+                     MultipartFile[] professionalQualificationFiles,
+                     MultipartFile[] safetyTrainingFiles,
+                     MultipartFile[] photographOneFiles,
+                     MultipartFile[] photographTwoFiles,
+                     Driver driver) throws IOException;
     /**
      * 修改驾驶员管理
-     * 
-     * @param driver 驾驶员管理
+     *
+     * @param drivingLicenceFiles
+     * @param professionalQualificationFiles
+     * @param safetyTrainingFiles
+     * @param photographOneFiles
+     * @param photographTwoFiles
+     * @param driver                         驾驶员管理
      * @return 结果
      */
-    int updateDriver(Driver driver);
+    int updateDriver(MultipartFile[] drivingLicenceFiles,
+                     MultipartFile[] professionalQualificationFiles,
+                     MultipartFile[] safetyTrainingFiles,
+                     MultipartFile[] photographOneFiles,
+                     MultipartFile[] photographTwoFiles,
+                     Driver driver) throws IOException;
     /**
      * 批量删除驾驶员管理
 package com.trash.driver.service.impl;
+import java.io.IOException;
 import java.util.List;
+import java.util.Map;
+
+import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.SecurityUtils;
+import com.trash.driver.domain.vo.DriverVo;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.driver.mapper.DriverMapper;
 import com.trash.driver.domain.Driver;
 import com.trash.driver.service.IDriverService;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 驾驶员管理Service业务层处理
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @Service
 public class DriverServiceImpl implements IDriverService 
@@ -39,34 +48,90 @@ public class DriverServiceImpl implements IDriverService
      * @return 驾驶员管理
      */
     @Override
-    public List<Driver> selectDriverList(Driver driver)
+    public List<DriverVo> selectDriverList(DriverVo driver)
     {
         return driverMapper.selectDriverList(driver);
     }
+    @Override
+    public List<Map<Object, Object>> selectDriverListByCompanyId(String companyId) {
+        return driverMapper.selectDriverListByCompanyId(companyId);
+    }
+
     /**
      * 新增驾驶员管理
-     * 
-     * @param driver 驾驶员管理
+     *
+     * @param drivingLicenceFiles
+     * @param professionalQualificationFiles
+     * @param safetyTrainingFiles
+     * @param photographOneFiles
+     * @param photographTwoFiles
+     * @param driver                         驾驶员管理
      * @return 结果
      */
     @Override
-    public int insertDriver(Driver driver)
-    {
+    public int insertDriver(MultipartFile[] drivingLicenceFiles, MultipartFile[] professionalQualificationFiles, MultipartFile[] safetyTrainingFiles, MultipartFile[] photographOneFiles, MultipartFile[] photographTwoFiles, Driver driver) throws IOException {
         driver.setCreateTime(DateUtils.getNowDate());
+        driver.setCreateBy(SecurityUtils.getUsername());
+        driver.setStatus(0);
+        for (MultipartFile file : drivingLicenceFiles) {
+            driver.setDrivingLicence(driver.getDrivingLicence()!=null?driver.getDrivingLicence()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : professionalQualificationFiles) {
+            driver.setProfessionalQualification(driver.getProfessionalQualification()!=null?driver.getProfessionalQualification()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : safetyTrainingFiles) {
+            driver.setSafetyTraining(driver.getSafetyTraining()!=null?driver.getSafetyTraining()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : photographOneFiles) {
+            driver.setPhotographOne(driver.getPhotographOne()!=null?driver.getPhotographOne()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : photographTwoFiles) {
+            driver.setPhotographTwo(driver.getPhotographTwo()!=null?driver.getPhotographTwo()+";"+uploadFile(file):uploadFile(file));
+        }
+        driver.setDrivingLicence(removeSemicolon(driver.getDrivingLicence()));
+        driver.setProfessionalQualification(removeSemicolon(driver.getProfessionalQualification()));
+        driver.setSafetyTraining(removeSemicolon(driver.getSafetyTraining()));
+        driver.setPhotographOne(removeSemicolon(driver.getPhotographOne()));
+        driver.setPhotographTwo(removeSemicolon(driver.getPhotographTwo()));
         return driverMapper.insertDriver(driver);
     }
     /**
      * 修改驾驶员管理
-     * 
-     * @param driver 驾驶员管理
+     *
+     * @param drivingLicenceFiles
+     * @param professionalQualificationFiles
+     * @param safetyTrainingFiles
+     * @param photographOneFiles
+     * @param photographTwoFiles
+     * @param driver                         驾驶员管理
      * @return 结果
      */
     @Override
-    public int updateDriver(Driver driver)
-    {
+    public int updateDriver(MultipartFile[] drivingLicenceFiles, MultipartFile[] professionalQualificationFiles, MultipartFile[] safetyTrainingFiles, MultipartFile[] photographOneFiles, MultipartFile[] photographTwoFiles, Driver driver) throws IOException {
         driver.setUpdateTime(DateUtils.getNowDate());
+        driver.setUpdateBy(SecurityUtils.getUsername());
+        for (MultipartFile file : drivingLicenceFiles) {
+            driver.setDrivingLicence(driver.getDrivingLicence()!=null?driver.getDrivingLicence()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : professionalQualificationFiles) {
+            driver.setProfessionalQualification(driver.getProfessionalQualification()!=null?driver.getProfessionalQualification()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : safetyTrainingFiles) {
+            driver.setSafetyTraining(driver.getSafetyTraining()!=null?driver.getSafetyTraining()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : photographOneFiles) {
+            driver.setPhotographOne(driver.getPhotographOne()!=null?driver.getPhotographOne()+";"+uploadFile(file):uploadFile(file));
+        }
+        for (MultipartFile file : photographTwoFiles) {
+            driver.setPhotographTwo(driver.getPhotographTwo()!=null?driver.getPhotographTwo()+";"+uploadFile(file):uploadFile(file));
+        }
+        driver.setDrivingLicence(removeSemicolon(driver.getDrivingLicence()));
+        driver.setProfessionalQualification(removeSemicolon(driver.getProfessionalQualification()));
+        driver.setSafetyTraining(removeSemicolon(driver.getSafetyTraining()));
+        driver.setPhotographOne(removeSemicolon(driver.getPhotographOne()));
+        driver.setPhotographTwo(removeSemicolon(driver.getPhotographTwo()));
         return driverMapper.updateDriver(driver);
     }
@@ -93,4 +158,25 @@ public class DriverServiceImpl implements IDriverService
     {
         return driverMapper.deleteDriverById(id);
     }
+
+    /**
+     * 文件上传
+     *
+     * @param file
+     * @author 2c
+     */
+    public static String uploadFile(MultipartFile file) throws IOException {
+        // 上传文件路径
+        String filePath = trashConfig.getUploadPath();
+        // 上传并返回新文件名称
+        String newFileName = upload(filePath, file);
+        return newFileName;
+    }
+
+    //去掉第一个分号,如果有的话
+    public String removeSemicolon(String str){
+        if (str.startsWith(";"))
+            str = str.substring(1);
+        return str;
+    }
 }
 package com.trash.enterprise.controller;
+import java.io.IOException;
 import java.util.List;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import com.trash.common.annotation.Log;
 import com.trash.common.core.controller.BaseController;
 import com.trash.common.core.domain.AjaxResult;
@@ -19,15 +13,16 @@ import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.service.ITransportationEnterpriseService;
 import com.trash.common.utils.poi.ExcelUtil;
 import com.trash.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 运输企业管理Controller
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @RestController
-@RequestMapping("/enterprise")
+@RequestMapping("/unit/enterprise")
 public class TransportationEnterpriseController extends BaseController
 {
     @Autowired
@@ -36,7 +31,7 @@ public class TransportationEnterpriseController extends BaseController
     /**
      * 查询运输企业管理列表
      */
-    //@PreAuthorize("@ss.hasPermi('enterprise:enterprise:list')")
+    @PreAuthorize("@ss.hasPermi('unit:enterprise:list')")
     @GetMapping("/list")
     public TableDataInfo list(TransportationEnterprise transportationEnterprise)
     {
@@ -48,7 +43,7 @@ public class TransportationEnterpriseController extends BaseController
     /**
      * 导出运输企业管理列表
      */
-    @PreAuthorize("@ss.hasPermi('enterprise:enterprise:export')")
+    @PreAuthorize("@ss.hasPermi('unit:enterprise:export')")
     @Log(title = "运输企业管理", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
     public AjaxResult export(TransportationEnterprise transportationEnterprise)
@@ -61,7 +56,7 @@ public class TransportationEnterpriseController extends BaseController
     /**
      * 获取运输企业管理详细信息
      */
-    @PreAuthorize("@ss.hasPermi('enterprise:enterprise:query')")
+    @PreAuthorize("@ss.hasPermi('unit:enterprise:query')")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") Long id)
     {
@@ -71,29 +66,37 @@ public class TransportationEnterpriseController extends BaseController
     /**
      * 新增运输企业管理
      */
-    @PreAuthorize("@ss.hasPermi('enterprise:enterprise:add')")
+    @PreAuthorize("@ss.hasPermi('unit:enterprise:add')")
     @Log(title = "运输企业管理", businessType = BusinessType.INSERT)
     @PostMapping
-    public AjaxResult add(@RequestBody TransportationEnterprise transportationEnterprise)
-    {
-        return toAjax(transportationEnterpriseService.insertTransportationEnterprise(transportationEnterprise));
+    public AjaxResult add(@RequestParam(value = "transportPermissionFiles") MultipartFile[] transportPermissionFiles,
+                          @RequestParam(value = "enterpriseBusinessLicenseFiles") MultipartFile[] enterpriseBusinessLicenseFiles,
+                          @RequestParam(value = "safetyOfficerQualificationCertificateFiles") MultipartFile[] safetyOfficerQualificationCertificateFiles,
+                          @RequestParam(value = "safetyCertificateFiles") MultipartFile[] safetyCertificateFiles,
+                          @RequestParam(value = "carParkPanoramaFiles") MultipartFile[] carParkPanoramaFiles,
+                          TransportationEnterprise transportationEnterprise) throws IOException {
+        return toAjax(transportationEnterpriseService.insertTransportationEnterprise(transportPermissionFiles, enterpriseBusinessLicenseFiles, safetyOfficerQualificationCertificateFiles, safetyCertificateFiles, carParkPanoramaFiles, transportationEnterprise));
     }
     /**
      * 修改运输企业管理
      */
-    @PreAuthorize("@ss.hasPermi('enterprise:enterprise:edit')")
+    @PreAuthorize("@ss.hasPermi('unit:enterprise:edit')")
     @Log(title = "运输企业管理", businessType = BusinessType.UPDATE)
     @PutMapping
-    public AjaxResult edit(@RequestBody TransportationEnterprise transportationEnterprise)
-    {
-        return toAjax(transportationEnterpriseService.updateTransportationEnterprise(transportationEnterprise));
+    public AjaxResult edit(@RequestParam(value = "transportPermissionFiles") MultipartFile[] transportPermissionFiles,
+                           @RequestParam(value = "enterpriseBusinessLicenseFiles") MultipartFile[] enterpriseBusinessLicenseFiles,
+                           @RequestParam(value = "safetyOfficerQualificationCertificateFiles") MultipartFile[] safetyOfficerQualificationCertificateFiles,
+                           @RequestParam(value = "safetyCertificateFiles") MultipartFile[] safetyCertificateFiles,
+                           @RequestParam(value = "carParkPanoramaFiles") MultipartFile[] carParkPanoramaFiles,
+                           TransportationEnterprise transportationEnterprise) throws IOException {
+        return toAjax(transportationEnterpriseService.updateTransportationEnterprise(transportPermissionFiles, enterpriseBusinessLicenseFiles, safetyOfficerQualificationCertificateFiles, safetyCertificateFiles, carParkPanoramaFiles, transportationEnterprise));
     }
     /**
      * 删除运输企业管理
      */
-    @PreAuthorize("@ss.hasPermi('enterprise:enterprise:remove')")
+    @PreAuthorize("@ss.hasPermi('unit:enterprise:remove')")
     @Log(title = "运输企业管理", businessType = BusinessType.DELETE)
 	@DeleteMapping("/{ids}")
     public AjaxResult remove(@PathVariable Long[] ids)
@@ -12,7 +12,7 @@ import com.trash.common.core.domain.BaseEntity;
  * 运输企业管理对象 transportation_enterprise
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public class TransportationEnterprise extends BaseEntity
 {
@@ -113,7 +113,7 @@ public class TransportationEnterprise extends BaseEntity
     private String businessUnit;
     /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
-    @Excel(name = "审批状态,0=审批中,1=审批通过,2=被驳回")
+    @Excel(name = "审批状态",readConverterExp = "0=审批中,1=审批通过,2=被驳回")
     private Integer status;
     /** 父公司id */
@@ -124,6 +124,14 @@ public class TransportationEnterprise extends BaseEntity
     @Excel(name = "公司类型", readConverterExp = "0=经营单位，1运输公司")
     private Integer companyType;
+    /** 信用状态 */
+    @Excel(name = "信用状态")
+    private String creditStatus;
+
+    /** 二维码 */
+    @Excel(name = "二维码")
+    private String qrCode;
+
     public void setId(Long id) 
     {
         this.id = id;
@@ -358,6 +366,24 @@ public class TransportationEnterprise extends BaseEntity
     {
         return companyType;
     }
+    public void setCreditStatus(String creditStatus) 
+    {
+        this.creditStatus = creditStatus;
+    }
+
+    public String getCreditStatus() 
+    {
+        return creditStatus;
+    }
+    public void setQrCode(String qrCode) 
+    {
+        this.qrCode = qrCode;
+    }
+
+    public String getQrCode() 
+    {
+        return qrCode;
+    }
     @Override
     public String toString() {
@@ -393,6 +419,8 @@ public class TransportationEnterprise extends BaseEntity
             .append("updateBy", getUpdateBy())
             .append("parentId", getParentId())
             .append("companyType", getCompanyType())
+            .append("creditStatus", getCreditStatus())
+            .append("qrCode", getQrCode())
             .toString();
     }
 }
@@ -7,7 +7,7 @@ import com.trash.enterprise.domain.TransportationEnterprise;
  * 运输企业管理Mapper接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface TransportationEnterpriseMapper 
 {
 package com.trash.enterprise.service;
+import java.io.IOException;
 import java.util.List;
 import com.trash.enterprise.domain.TransportationEnterprise;
+import org.springframework.web.multipart.MultipartFile;
 /**
  * 运输企业管理Service接口
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 public interface ITransportationEnterpriseService 
 {
@@ -29,19 +31,39 @@ public interface ITransportationEnterpriseService
     /**
      * 新增运输企业管理
-     * 
-     * @param transportationEnterprise 运输企业管理
+     *
+     * @param transportPermissionFiles
+     * @param enterpriseBusinessLicenseFiles
+     * @param safetyOfficerQualificationCertificateFiles
+     * @param safetyCertificateFiles
+     * @param carParkPanoramaFiles
+     * @param transportationEnterprise                   运输企业管理
      * @return 结果
      */
-    int insertTransportationEnterprise(TransportationEnterprise transportationEnterprise);
+    int insertTransportationEnterprise(MultipartFile[] transportPermissionFiles,
+                                       MultipartFile[] enterpriseBusinessLicenseFiles,
+                                       MultipartFile[] safetyOfficerQualificationCertificateFiles,
+                                       MultipartFile[] safetyCertificateFiles,
+                                       MultipartFile[] carParkPanoramaFiles,
+                                       TransportationEnterprise transportationEnterprise) throws IOException;
     /**
      * 修改运输企业管理
-     * 
-     * @param transportationEnterprise 运输企业管理
+     *
+     * @param transportPermissionFiles
+     * @param enterpriseBusinessLicenseFiles
+     * @param safetyOfficerQualificationCertificateFiles
+     * @param safetyCertificateFiles
+     * @param carParkPanoramaFiles
+     * @param transportationEnterprise                   运输企业管理
      * @return 结果
      */
-    int updateTransportationEnterprise(TransportationEnterprise transportationEnterprise);
+    int updateTransportationEnterprise(MultipartFile[] transportPermissionFiles,
+                                       MultipartFile[] enterpriseBusinessLicenseFiles,
+                                       MultipartFile[] safetyOfficerQualificationCertificateFiles,
+                                       MultipartFile[] safetyCertificateFiles,
+                                       MultipartFile[] carParkPanoramaFiles,
+                                       TransportationEnterprise transportationEnterprise) throws IOException;
     /**
      * 批量删除运输企业管理
 package com.trash.enterprise.service.impl;
+import java.io.IOException;
 import java.util.List;
+
+import com.trash.common.config.trashConfig;
 import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.trash.enterprise.mapper.TransportationEnterpriseMapper;
 import com.trash.enterprise.domain.TransportationEnterprise;
 import com.trash.enterprise.service.ITransportationEnterpriseService;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
  * 运输企业管理Service业务层处理
  * 
  * @author trash
- * @date 2023-11-15
+ * @date 2023-11-21
  */
 @Service
 public class TransportationEnterpriseServiceImpl implements ITransportationEnterpriseService 
@@ -46,27 +53,80 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
     /**
      * 新增运输企业管理
-     * 
-     * @param transportationEnterprise 运输企业管理
+     *
+     * @param transportPermissionFiles
+     * @param enterpriseBusinessLicenseFiles
+     * @param safetyOfficerQualificationCertificateFiles
+     * @param safetyCertificateFiles
+     * @param carParkPanoramaFiles
+     * @param transportationEnterprise                   运输企业管理
      * @return 结果
      */
     @Override
-    public int insertTransportationEnterprise(TransportationEnterprise transportationEnterprise)
-    {
+    public int insertTransportationEnterprise(MultipartFile[] transportPermissionFiles, MultipartFile[] enterpriseBusinessLicenseFiles, MultipartFile[] safetyOfficerQualificationCertificateFiles, MultipartFile[] safetyCertificateFiles, MultipartFile[] carParkPanoramaFiles, TransportationEnterprise transportationEnterprise) throws IOException {
         transportationEnterprise.setCreateTime(DateUtils.getNowDate());
+        transportationEnterprise.setCreateBy(SecurityUtils.getUsername());
+        transportationEnterprise.setStatus(0);
+        transportationEnterprise.setCreditStatus("正常");
+        for (MultipartFile file : transportPermissionFiles) {
+            transportationEnterprise.setTransportPermission(transportationEnterprise.getTransportPermission()!=null?transportationEnterprise.getTransportPermission()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : enterpriseBusinessLicenseFiles) {
+            transportationEnterprise.setEnterpriseBusinessLicense(transportationEnterprise.getEnterpriseBusinessLicense()!=null?transportationEnterprise.getEnterpriseBusinessLicense()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : safetyOfficerQualificationCertificateFiles) {
+            transportationEnterprise.setSafetyOfficerQualificationCertificate(transportationEnterprise.getSafetyOfficerQualificationCertificate()!=null?transportationEnterprise.getSafetyOfficerQualificationCertificate()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : safetyCertificateFiles) {
+            transportationEnterprise.setSafetyCertificate(transportationEnterprise.getSafetyCertificate()!=null?transportationEnterprise.getSafetyCertificate()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : carParkPanoramaFiles) {
+            transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama()!=null?transportationEnterprise.getCarParkPanorama()+";"+upload(file):upload(file));
+        }
+        //去掉第一个分号,如果有的话
+        transportationEnterprise.setTransportPermission(removeSemicolon(transportationEnterprise.getTransportPermission()));
+        transportationEnterprise.setEnterpriseBusinessLicense(removeSemicolon(transportationEnterprise.getEnterpriseBusinessLicense()));
+        transportationEnterprise.setSafetyOfficerQualificationCertificate(removeSemicolon(transportationEnterprise.getSafetyOfficerQualificationCertificate()));
+        transportationEnterprise.setSafetyCertificate(removeSemicolon(transportationEnterprise.getSafetyCertificate()));
+        transportationEnterprise.setCarParkPanorama(removeSemicolon(transportationEnterprise.getCarParkPanorama()));
         return transportationEnterpriseMapper.insertTransportationEnterprise(transportationEnterprise);
     }
     /**
      * 修改运输企业管理
-     * 
-     * @param transportationEnterprise 运输企业管理
+     *
+     * @param transportPermissionFiles
+     * @param enterpriseBusinessLicenseFiles
+     * @param safetyOfficerQualificationCertificateFiles
+     * @param safetyCertificateFiles
+     * @param carParkPanoramaFiles
+     * @param transportationEnterprise                   运输企业管理
      * @return 结果
      */
     @Override
-    public int updateTransportationEnterprise(TransportationEnterprise transportationEnterprise)
-    {
+    public int updateTransportationEnterprise(MultipartFile[] transportPermissionFiles, MultipartFile[] enterpriseBusinessLicenseFiles, MultipartFile[] safetyOfficerQualificationCertificateFiles, MultipartFile[] safetyCertificateFiles, MultipartFile[] carParkPanoramaFiles, TransportationEnterprise transportationEnterprise) throws IOException {
         transportationEnterprise.setUpdateTime(DateUtils.getNowDate());
+        transportationEnterprise.setUpdateBy(SecurityUtils.getUsername());
+        for (MultipartFile file : transportPermissionFiles) {
+            transportationEnterprise.setTransportPermission(transportationEnterprise.getTransportPermission()!=null?transportationEnterprise.getTransportPermission()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : enterpriseBusinessLicenseFiles) {
+            transportationEnterprise.setEnterpriseBusinessLicense(transportationEnterprise.getEnterpriseBusinessLicense()!=null?transportationEnterprise.getEnterpriseBusinessLicense()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : safetyOfficerQualificationCertificateFiles) {
+            transportationEnterprise.setSafetyOfficerQualificationCertificate(transportationEnterprise.getSafetyOfficerQualificationCertificate()!=null?transportationEnterprise.getSafetyOfficerQualificationCertificate()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : safetyCertificateFiles) {
+            transportationEnterprise.setSafetyCertificate(transportationEnterprise.getSafetyCertificate()!=null?transportationEnterprise.getSafetyCertificate()+";"+upload(file):upload(file));
+        }
+        for (MultipartFile file : carParkPanoramaFiles) {
+            transportationEnterprise.setCarParkPanorama(transportationEnterprise.getCarParkPanorama()!=null?transportationEnterprise.getCarParkPanorama()+";"+upload(file):upload(file));
+        }
+        transportationEnterprise.setTransportPermission(removeSemicolon(transportationEnterprise.getTransportPermission()));
+        transportationEnterprise.setEnterpriseBusinessLicense(removeSemicolon(transportationEnterprise.getEnterpriseBusinessLicense()));
+        transportationEnterprise.setSafetyOfficerQualificationCertificate(removeSemicolon(transportationEnterprise.getSafetyOfficerQualificationCertificate()));
+        transportationEnterprise.setSafetyCertificate(removeSemicolon(transportationEnterprise.getSafetyCertificate()));
+        transportationEnterprise.setCarParkPanorama(removeSemicolon(transportationEnterprise.getCarParkPanorama()));
         return transportationEnterpriseMapper.updateTransportationEnterprise(transportationEnterprise);
     }
@@ -93,4 +153,25 @@ public class TransportationEnterpriseServiceImpl implements ITransportationEnter
     {
         return transportationEnterpriseMapper.deleteTransportationEnterpriseById(id);
     }
+
+    /**
+     * 文件上传
+     *
+     * @param file
+     * @author 2c
+     */
+    public static String uploadFile(MultipartFile file) throws IOException {
+        // 上传文件路径
+        String filePath = trashConfig.getUploadPath();
+        // 上传并返回新文件名称
+        String newFileName = upload(filePath, file);
+        return newFileName;
+    }
+
+    //去掉第一个分号,如果有的话
+    public String removeSemicolon(String str){
+        if (str.startsWith(";"))
+            str = str.substring(1);
+        return str;
+    }
 }
-<?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.carInfo.mapper.CarInfoMapper">
-    
-    <resultMap type="CarInfo" id="CarInfoResult">
-        <result property="id"    column="id"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="carType"    column="car_type"    />
-        <result property="carCode"    column="car_code"    />
-        <result property="carBrank"    column="car_brank"    />
-        <result property="emissionStandard"    column="emission_standard"    />
-        <result property="roadTransportDate"    column="road_transport_date"    />
-        <result property="drivingLicenseDate"    column="driving_license_date"    />
-        <result property="enterDate"    column="enter_date"    />
-        <result property="farmeNumber"    column="farme_number"    />
-        <result property="carIdentification"    column="car_identification"    />
-        <result property="containerVolume"    column="container_volume"    />
-        <result property="carColor"    column="car_color"    />
-        <result property="carEquipment"    column="car_equipment"    />
-        <result property="remark"    column="remark"    />
-        <result property="roadTransport"    column="road_transport"    />
-        <result property="drivingLicense"    column="driving_license"    />
-        <result property="carFront"    column="car_front"    />
-        <result property="carLeft"    column="car_left"    />
-        <result property="carBehind"    column="car_behind"    />
-        <result property="carRight"    column="car_right"    />
-        <result property="drivers"    column="drivers"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
-    </resultMap>
-
-    <sql id="selectCarInfoVo">
-        select id, company_id, car_type, car_code, car_brank, emission_standard, road_transport_date, driving_license_date, enter_date, farme_number, car_identification, container_volume, car_color, car_equipment, remark, road_transport, driving_license, car_front, car_left, car_behind, car_right, drivers, status, create_time, create_by, update_time, update_by from car_info
-    </sql>
-
-    <select id="selectCarInfoList" parameterType="CarInfo" resultMap="CarInfoResult">
-        <include refid="selectCarInfoVo"/>
-        <where>  
-            <if test="companyId != null "> and company_id = #{companyId}</if>
-            <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
-            <if test="carCode != null  and carCode != ''"> and car_code = #{carCode}</if>
-            <if test="carBrank != null  and carBrank != ''"> and car_brank = #{carBrank}</if>
-            <if test="emissionStandard != null  and emissionStandard != ''"> and emission_standard = #{emissionStandard}</if>
-            <if test="roadTransportDate != null "> and road_transport_date = #{roadTransportDate}</if>
-            <if test="drivingLicenseDate != null "> and driving_license_date = #{drivingLicenseDate}</if>
-            <if test="enterDate != null "> and enter_date = #{enterDate}</if>
-            <if test="farmeNumber != null  and farmeNumber != ''"> and farme_number = #{farmeNumber}</if>
-            <if test="carIdentification != null  and carIdentification != ''"> and car_identification = #{carIdentification}</if>
-            <if test="containerVolume != null  and containerVolume != ''"> and container_volume = #{containerVolume}</if>
-            <if test="carColor != null  and carColor != ''"> and car_color = #{carColor}</if>
-            <if test="carEquipment != null  and carEquipment != ''"> and car_equipment = #{carEquipment}</if>
-            <if test="roadTransport != null  and roadTransport != ''"> and road_transport = #{roadTransport}</if>
-            <if test="drivingLicense != null  and drivingLicense != ''"> and driving_license = #{drivingLicense}</if>
-            <if test="carFront != null  and carFront != ''"> and car_front = #{carFront}</if>
-            <if test="carLeft != null  and carLeft != ''"> and car_left = #{carLeft}</if>
-            <if test="carBehind != null  and carBehind != ''"> and car_behind = #{carBehind}</if>
-            <if test="carRight != null  and carRight != ''"> and car_right = #{carRight}</if>
-            <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
-            <if test="status != null "> and status = #{status}</if>
-        </where>
-    </select>
-    
-    <select id="selectCarInfoById" parameterType="Long" resultMap="CarInfoResult">
-        <include refid="selectCarInfoVo"/>
-        where id = #{id}
-    </select>
-        
-    <insert id="insertCarInfo" parameterType="CarInfo" useGeneratedKeys="true" keyProperty="id">
-        insert into car_info
-        <trim prefix="(" suffix=")" suffixOverrides=",">
-            <if test="companyId != null">company_id,</if>
-            <if test="carType != null">car_type,</if>
-            <if test="carCode != null">car_code,</if>
-            <if test="carBrank != null">car_brank,</if>
-            <if test="emissionStandard != null">emission_standard,</if>
-            <if test="roadTransportDate != null">road_transport_date,</if>
-            <if test="drivingLicenseDate != null">driving_license_date,</if>
-            <if test="enterDate != null">enter_date,</if>
-            <if test="farmeNumber != null">farme_number,</if>
-            <if test="carIdentification != null">car_identification,</if>
-            <if test="containerVolume != null">container_volume,</if>
-            <if test="carColor != null">car_color,</if>
-            <if test="carEquipment != null">car_equipment,</if>
-            <if test="remark != null">remark,</if>
-            <if test="roadTransport != null">road_transport,</if>
-            <if test="drivingLicense != null">driving_license,</if>
-            <if test="carFront != null">car_front,</if>
-            <if test="carLeft != null">car_left,</if>
-            <if test="carBehind != null">car_behind,</if>
-            <if test="carRight != null">car_right,</if>
-            <if test="drivers != null">drivers,</if>
-            <if test="status != null">status,</if>
-            <if test="createTime != null">create_time,</if>
-            <if test="createBy != null">create_by,</if>
-            <if test="updateTime != null">update_time,</if>
-            <if test="updateBy != null">update_by,</if>
-         </trim>
-        <trim prefix="values (" suffix=")" suffixOverrides=",">
-            <if test="companyId != null">#{companyId},</if>
-            <if test="carType != null">#{carType},</if>
-            <if test="carCode != null">#{carCode},</if>
-            <if test="carBrank != null">#{carBrank},</if>
-            <if test="emissionStandard != null">#{emissionStandard},</if>
-            <if test="roadTransportDate != null">#{roadTransportDate},</if>
-            <if test="drivingLicenseDate != null">#{drivingLicenseDate},</if>
-            <if test="enterDate != null">#{enterDate},</if>
-            <if test="farmeNumber != null">#{farmeNumber},</if>
-            <if test="carIdentification != null">#{carIdentification},</if>
-            <if test="containerVolume != null">#{containerVolume},</if>
-            <if test="carColor != null">#{carColor},</if>
-            <if test="carEquipment != null">#{carEquipment},</if>
-            <if test="remark != null">#{remark},</if>
-            <if test="roadTransport != null">#{roadTransport},</if>
-            <if test="drivingLicense != null">#{drivingLicense},</if>
-            <if test="carFront != null">#{carFront},</if>
-            <if test="carLeft != null">#{carLeft},</if>
-            <if test="carBehind != null">#{carBehind},</if>
-            <if test="carRight != null">#{carRight},</if>
-            <if test="drivers != null">#{drivers},</if>
-            <if test="status != null">#{status},</if>
-            <if test="createTime != null">#{createTime},</if>
-            <if test="createBy != null">#{createBy},</if>
-            <if test="updateTime != null">#{updateTime},</if>
-            <if test="updateBy != null">#{updateBy},</if>
-         </trim>
-    </insert>
-
-    <update id="updateCarInfo" parameterType="CarInfo">
-        update car_info
-        <trim prefix="SET" suffixOverrides=",">
-            <if test="companyId != null">company_id = #{companyId},</if>
-            <if test="carType != null">car_type = #{carType},</if>
-            <if test="carCode != null">car_code = #{carCode},</if>
-            <if test="carBrank != null">car_brank = #{carBrank},</if>
-            <if test="emissionStandard != null">emission_standard = #{emissionStandard},</if>
-            <if test="roadTransportDate != null">road_transport_date = #{roadTransportDate},</if>
-            <if test="drivingLicenseDate != null">driving_license_date = #{drivingLicenseDate},</if>
-            <if test="enterDate != null">enter_date = #{enterDate},</if>
-            <if test="farmeNumber != null">farme_number = #{farmeNumber},</if>
-            <if test="carIdentification != null">car_identification = #{carIdentification},</if>
-            <if test="containerVolume != null">container_volume = #{containerVolume},</if>
-            <if test="carColor != null">car_color = #{carColor},</if>
-            <if test="carEquipment != null">car_equipment = #{carEquipment},</if>
-            <if test="remark != null">remark = #{remark},</if>
-            <if test="roadTransport != null">road_transport = #{roadTransport},</if>
-            <if test="drivingLicense != null">driving_license = #{drivingLicense},</if>
-            <if test="carFront != null">car_front = #{carFront},</if>
-            <if test="carLeft != null">car_left = #{carLeft},</if>
-            <if test="carBehind != null">car_behind = #{carBehind},</if>
-            <if test="carRight != null">car_right = #{carRight},</if>
-            <if test="drivers != null">drivers = #{drivers},</if>
-            <if test="status != null">status = #{status},</if>
-            <if test="createTime != null">create_time = #{createTime},</if>
-            <if test="createBy != null">create_by = #{createBy},</if>
-            <if test="updateTime != null">update_time = #{updateTime},</if>
-            <if test="updateBy != null">update_by = #{updateBy},</if>
-        </trim>
-        where id = #{id}
-    </update>
-
-    <delete id="deleteCarInfoById" parameterType="Long">
-        delete from car_info where id = #{id}
-    </delete>
-
-    <delete id="deleteCarInfoByIds" parameterType="String">
-        delete from car_info where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
-    </delete>
-    
-</mapper>
 \ No newline at end of file
+<?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.carInfo.mapper.CarInfoMapper">
+    
+    <resultMap type="CarInfo" id="CarInfoResult">
+        <result property="id"    column="id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="carType"    column="car_type"    />
+        <result property="carCode"    column="car_code"    />
+        <result property="carBrank"    column="car_brank"    />
+        <result property="emissionStandard"    column="emission_standard"    />
+        <result property="roadTransportDate"    column="road_transport_date"    />
+        <result property="drivingLicenseDate"    column="driving_license_date"    />
+        <result property="enterDate"    column="enter_date"    />
+        <result property="farmeNumber"    column="farme_number"    />
+        <result property="carIdentification"    column="car_identification"    />
+        <result property="containerVolume"    column="container_volume"    />
+        <result property="lengthWidthHeight"    column="length_width_height"    />
+        <result property="carColor"    column="car_color"    />
+        <result property="carEquipment"    column="car_equipment"    />
+        <result property="remark"    column="remark"    />
+        <result property="roadTransport"    column="road_transport"    />
+        <result property="drivingLicense"    column="driving_license"    />
+        <result property="carFront"    column="car_front"    />
+        <result property="carLeft"    column="car_left"    />
+        <result property="carBehind"    column="car_behind"    />
+        <result property="carRight"    column="car_right"    />
+        <result property="drivers"    column="drivers"    />
+        <result property="status"    column="status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="creditStatus"    column="credit_status"    />
+        <result property="qrCode"    column="qr_code"    />
+    </resultMap>
+
+    <resultMap type="CarInfoVo" id="CarInfoVoResult">
+        <result property="id"    column="id"    />
+        <result property="companyId"    column="company_id"    />
+        <result property="carType"    column="car_type"    />
+        <result property="carCode"    column="car_code"    />
+        <result property="carBrank"    column="car_brank"    />
+        <result property="emissionStandard"    column="emission_standard"    />
+        <result property="roadTransportDate"    column="road_transport_date"    />
+        <result property="drivingLicenseDate"    column="driving_license_date"    />
+        <result property="enterDate"    column="enter_date"    />
+        <result property="farmeNumber"    column="farme_number"    />
+        <result property="carIdentification"    column="car_identification"    />
+        <result property="containerVolume"    column="container_volume"    />
+        <result property="lengthWidthHeight"    column="length_width_height"    />
+        <result property="carColor"    column="car_color"    />
+        <result property="carEquipment"    column="car_equipment"    />
+        <result property="remark"    column="remark"    />
+        <result property="roadTransport"    column="road_transport"    />
+        <result property="drivingLicense"    column="driving_license"    />
+        <result property="carFront"    column="car_front"    />
+        <result property="carLeft"    column="car_left"    />
+        <result property="carBehind"    column="car_behind"    />
+        <result property="carRight"    column="car_right"    />
+        <result property="drivers"    column="drivers"    />
+        <result property="status"    column="status"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+        <result property="creditStatus"    column="credit_status"    />
+        <result property="qrCode"    column="qr_code"    />
+        <result property="companyName"    column="companyName"    />
+        <result property="driversName"    column="driversName"    />
+    </resultMap>
+
+    <sql id="selectCarInfoVo">
+        select id, company_id, car_type, car_code, car_brank, emission_standard, road_transport_date, driving_license_date, enter_date, farme_number, car_identification, container_volume, car_color, car_equipment, remark, road_transport, driving_license, car_front, car_left, car_behind, car_right, drivers, status, create_time, create_by, update_time, update_by, credit_status, qr_code from car_info
+    </sql>
+
+    <sql id="selectCarInfoForCompanyVo">
+        select car.id,
+               company_id,
+               car_type,
+               car_code,
+               car_brank,
+               emission_standard,
+               road_transport_date,
+               driving_license_date,
+               car.enter_date,
+               farme_number,
+               car_identification,
+               container_volume,
+               length_width_height,
+               car_color,
+               car_equipment,
+               car.remark,
+               road_transport,
+               driving_license,
+               car_front,
+               car_left,
+               car_behind,
+               car_right,
+               drivers,
+               car.status,
+               car.create_time,
+               car.create_by,
+               car.update_time,
+               car.update_by,
+               car.credit_status,
+               car.qr_code,
+               c.name companyName,
+               d.driversName
+        from car_info car
+                 left join transportation_enterprise c on car.company_id = c.id
+                 left join (select cdr.car_id, GROUP_CONCAT(name) driversName
+                            from car_driver_relation cdr
+                                     left join driver d on d.id = cdr.driver_id
+                            group by cdr.car_id) d on d.car_id = car.id
+    </sql>
+
+    <select id="selectCarInfoList" parameterType="CarInfoVo" resultMap="CarInfoVoResult">
+        <include refid="selectCarInfoForCompanyVo"/>
+        <where>  
+            <if test="companyName != null   and companyName != ''"> and c.name like concat('%',#{companyName},'%')</if>
+            <if test="carType != null  and carType != ''"> and car_type = #{carType}</if>
+            <if test="carCode != null  and carCode != ''"> and car_code like concat('%',#{carCode},'%')</if>
+            <if test="carBrank != null  and carBrank != ''"> and car_brank like concat('%',#{carBrank},'%')</if>
+            <if test="emissionStandard != null  and emissionStandard != ''"> and emission_standard = #{emissionStandard}</if>
+            <if test="roadTransportDate != null "> and road_transport_date = #{roadTransportDate}</if>
+            <if test="drivingLicenseDate != null "> and driving_license_date = #{drivingLicenseDate}</if>
+            <if test="enterDate != null "> and enter_date = #{enterDate}</if>
+            <if test="farmeNumber != null  and farmeNumber != ''"> and farme_number = #{farmeNumber}</if>
+            <if test="carIdentification != null  and carIdentification != ''"> and car_identification = #{carIdentification}</if>
+            <if test="containerVolume != null  and containerVolume != ''"> and container_volume = #{containerVolume}</if>
+            <if test="carColor != null  and carColor != ''"> and car_color = #{carColor}</if>
+            <if test="carEquipment != null  and carEquipment != ''"> and car_equipment = #{carEquipment}</if>
+            <if test="roadTransport != null  and roadTransport != ''"> and road_transport = #{roadTransport}</if>
+            <if test="drivingLicense != null  and drivingLicense != ''"> and driving_license = #{drivingLicense}</if>
+            <if test="carFront != null  and carFront != ''"> and car_front = #{carFront}</if>
+            <if test="carLeft != null  and carLeft != ''"> and car_left = #{carLeft}</if>
+            <if test="carBehind != null  and carBehind != ''"> and car_behind = #{carBehind}</if>
+            <if test="carRight != null  and carRight != ''"> and car_right = #{carRight}</if>
+            <if test="drivers != null  and drivers != ''"> and drivers = #{drivers}</if>
+            <if test="status != null "> and car.status = #{status}</if>
+            <if test="creditStatus != null  and creditStatus != ''"> and car.credit_status = #{creditStatus}</if>
+        </where>
+    </select>
+    
+    <select id="selectCarInfoById" parameterType="Long" resultMap="CarInfoResult">
+        <include refid="selectCarInfoVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertCarInfo" parameterType="CarInfo" useGeneratedKeys="true" keyProperty="id">
+        insert into car_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="companyId != null">company_id,</if>
+            <if test="carType != null">car_type,</if>
+            <if test="carCode != null">car_code,</if>
+            <if test="carBrank != null">car_brank,</if>
+            <if test="emissionStandard != null">emission_standard,</if>
+            <if test="roadTransportDate != null">road_transport_date,</if>
+            <if test="drivingLicenseDate != null">driving_license_date,</if>
+            <if test="enterDate != null">enter_date,</if>
+            <if test="farmeNumber != null">farme_number,</if>
+            <if test="carIdentification != null">car_identification,</if>
+            <if test="containerVolume != null">container_volume,</if>
+            <if test="carColor != null">car_color,</if>
+            <if test="carEquipment != null">car_equipment,</if>
+            <if test="remark != null">remark,</if>
+            <if test="roadTransport != null">road_transport,</if>
+            <if test="drivingLicense != null">driving_license,</if>
+            <if test="carFront != null">car_front,</if>
+            <if test="carLeft != null">car_left,</if>
+            <if test="carBehind != null">car_behind,</if>
+            <if test="carRight != null">car_right,</if>
+            <if test="drivers != null">drivers,</if>
+            <if test="status != null">status,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+            <if test="creditStatus != null">credit_status,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="lengthWidthHeight != null">length_width_height,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="companyId != null">#{companyId},</if>
+            <if test="carType != null">#{carType},</if>
+            <if test="carCode != null">#{carCode},</if>
+            <if test="carBrank != null">#{carBrank},</if>
+            <if test="emissionStandard != null">#{emissionStandard},</if>
+            <if test="roadTransportDate != null">#{roadTransportDate},</if>
+            <if test="drivingLicenseDate != null">#{drivingLicenseDate},</if>
+            <if test="enterDate != null">#{enterDate},</if>
+            <if test="farmeNumber != null">#{farmeNumber},</if>
+            <if test="carIdentification != null">#{carIdentification},</if>
+            <if test="containerVolume != null">#{containerVolume},</if>
+            <if test="carColor != null">#{carColor},</if>
+            <if test="carEquipment != null">#{carEquipment},</if>
+            <if test="remark != null">#{remark},</if>
+            <if test="roadTransport != null">#{roadTransport},</if>
+            <if test="drivingLicense != null">#{drivingLicense},</if>
+            <if test="carFront != null">#{carFront},</if>
+            <if test="carLeft != null">#{carLeft},</if>
+            <if test="carBehind != null">#{carBehind},</if>
+            <if test="carRight != null">#{carRight},</if>
+            <if test="drivers != null">#{drivers},</if>
+            <if test="status != null">#{status},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+            <if test="creditStatus != null">#{creditStatus},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="lengthWidthHeight != null">#{lengthWidthHeight},</if>
+         </trim>
+    </insert>
+
+    <update id="updateCarInfo" parameterType="CarInfo">
+        update car_info
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="companyId != null">company_id = #{companyId},</if>
+            <if test="carType != null">car_type = #{carType},</if>
+            <if test="carCode != null">car_code = #{carCode},</if>
+            <if test="carBrank != null">car_brank = #{carBrank},</if>
+            <if test="emissionStandard != null">emission_standard = #{emissionStandard},</if>
+            <if test="roadTransportDate != null">road_transport_date = #{roadTransportDate},</if>
+            <if test="drivingLicenseDate != null">driving_license_date = #{drivingLicenseDate},</if>
+            <if test="enterDate != null">enter_date = #{enterDate},</if>
+            <if test="farmeNumber != null">farme_number = #{farmeNumber},</if>
+            <if test="carIdentification != null">car_identification = #{carIdentification},</if>
+            <if test="containerVolume != null">container_volume = #{containerVolume},</if>
+            <if test="carColor != null">car_color = #{carColor},</if>
+            <if test="carEquipment != null">car_equipment = #{carEquipment},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="roadTransport != null">road_transport = #{roadTransport},</if>
+            <if test="drivingLicense != null">driving_license = #{drivingLicense},</if>
+            <if test="carFront != null">car_front = #{carFront},</if>
+            <if test="carLeft != null">car_left = #{carLeft},</if>
+            <if test="carBehind != null">car_behind = #{carBehind},</if>
+            <if test="carRight != null">car_right = #{carRight},</if>
+            <if test="drivers != null">drivers = #{drivers},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="creditStatus != null">credit_status = #{creditStatus},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="lengthWidthHeight != null">length_width_height = #{lengthWidthHeight},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteCarInfoById" parameterType="Long">
+        delete from car_info where id = #{id}
+    </delete>
+
+    <delete id="deleteCarInfoByIds" parameterType="String">
+        delete from car_info where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+
+
+    <insert id="addCarDriverRelation" parameterType="CarDriverRelation">
+        insert into car_driver_relation(car_id,driver_id)
+        values(#{carId},#{driverId})
+    </insert>
+
+    <delete id="deleteCarDriverRelationByCarId" parameterType="Long">
+        delete from car_driver_relation where car_id = #{carId}
+    </delete>
+</mapper>
 \ No newline at end of file
@@ -20,17 +20,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="validityBeginDate"    column="validity_begin_date"    />
         <result property="validityEndDate"    column="validity_end_date"    />
         <result property="squareMeasure"    column="square_measure"    />
+        <result property="surplusSquareMeasure"    column="surplus_square_measure"    />
         <result property="carWashingFacilities"    column="car_washing_facilities"    />
         <result property="exitRoadCondition"    column="exit_road_condition"    />
         <result property="lightingFacility"    column="lighting_facility"    />
         <result property="videoSurveillanceFacility"    column="video_surveillance_facility"    />
         <result property="preparer"    column="preparer"    />
         <result property="handlingAdvice"    column="handling_advice"    />
+        <result property="absorbSource"    column="absorb_source"    />
         <result property="electronicFence"    column="electronic_fence"    />
+        <result property="creditStatus"    column="credit_status"    />
         <result property="approvalDocument"    column="approval_document"    />
         <result property="approvalData"    column="approval_data"    />
         <result property="scenePhoto"    column="scene_photo"    />
         <result property="carWashingFacilitiesImage"    column="car_washing_facilities_image"    />
+        <result property="termRange"    column="term_range"    />
         <result property="safetyAssessmentReport"    column="safety_assessment_report"    />
         <result property="environmentalApproval"    column="environmental_approval"    />
         <result property="authorization"    column="authorization"    />
@@ -41,10 +45,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="createBy"    column="create_by"    />
         <result property="updateTime"    column="update_time"    />
         <result property="updateBy"    column="update_by"    />
+        <result property="qrCode"    column="qr_code"    />
+        <result property="auditStatus"    column="audit_status"    />
     </resultMap>
     <sql id="selectDisposalSiteVo">
-        select id, name, certificate_number, address, engineering_property, site_type, local_area, operating_area, trash_type, construction_unit, construction_unit_person, construction_unit_person_phone, validity_begin_date, validity_end_date, square_measure, car_washing_facilities, exit_road_condition, lighting_facility, video_surveillance_facility, preparer, handling_advice, electronic_fence, approval_document, approval_data, scene_photo, car_washing_facilities_image, safety_assessment_report, environmental_approval, authorization, other_information, company_ids, status, create_time, create_by, update_time, update_by from disposal_site
+        select id, name, certificate_number, address, engineering_property, site_type, local_area, operating_area, trash_type, construction_unit, construction_unit_person, construction_unit_person_phone, validity_begin_date, validity_end_date, square_measure, surplus_square_measure, car_washing_facilities, exit_road_condition, lighting_facility, video_surveillance_facility, preparer, handling_advice, absorb_source, electronic_fence, credit_status, approval_document, approval_data, scene_photo, car_washing_facilities_image, term_range, safety_assessment_report, environmental_approval, `authorization`, other_information, company_ids, status, create_time, create_by, update_time, update_by, qr_code,audit_status from disposal_site
     </sql>
     <select id="selectDisposalSiteList" parameterType="DisposalSite" resultMap="DisposalSiteResult">
@@ -64,23 +70,29 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="validityBeginDate != null "> and validity_begin_date = #{validityBeginDate}</if>
             <if test="validityEndDate != null "> and validity_end_date = #{validityEndDate}</if>
             <if test="squareMeasure != null  and squareMeasure != ''"> and square_measure = #{squareMeasure}</if>
+            <if test="surplusSquareMeasure != null  and surplusSquareMeasure != ''"> and surplus_square_measure = #{surplusSquareMeasure}</if>
             <if test="carWashingFacilities != null  and carWashingFacilities != ''"> and car_washing_facilities = #{carWashingFacilities}</if>
             <if test="exitRoadCondition != null  and exitRoadCondition != ''"> and exit_road_condition = #{exitRoadCondition}</if>
             <if test="lightingFacility != null  and lightingFacility != ''"> and lighting_facility = #{lightingFacility}</if>
             <if test="videoSurveillanceFacility != null  and videoSurveillanceFacility != ''"> and video_surveillance_facility = #{videoSurveillanceFacility}</if>
             <if test="preparer != null  and preparer != ''"> and preparer = #{preparer}</if>
             <if test="handlingAdvice != null  and handlingAdvice != ''"> and handling_advice = #{handlingAdvice}</if>
+            <if test="absorbSource != null  and absorbSource != ''"> and absorb_source = #{absorbSource}</if>
             <if test="electronicFence != null  and electronicFence != ''"> and electronic_fence = #{electronicFence}</if>
+            <if test="creditStatus != null  and creditStatus != ''"> and credit_status = #{creditStatus}</if>
             <if test="approvalDocument != null  and approvalDocument != ''"> and approval_document = #{approvalDocument}</if>
             <if test="approvalData != null  and approvalData != ''"> and approval_data = #{approvalData}</if>
             <if test="scenePhoto != null  and scenePhoto != ''"> and scene_photo = #{scenePhoto}</if>
             <if test="carWashingFacilitiesImage != null  and carWashingFacilitiesImage != ''"> and car_washing_facilities_image = #{carWashingFacilitiesImage}</if>
+            <if test="termRange != null  and termRange != ''"> and term_range = #{termRange}</if>
             <if test="safetyAssessmentReport != null  and safetyAssessmentReport != ''"> and safety_assessment_report = #{safetyAssessmentReport}</if>
             <if test="environmentalApproval != null  and environmentalApproval != ''"> and environmental_approval = #{environmentalApproval}</if>
             <if test="authorization != null  and authorization != ''"> and authorization = #{authorization}</if>
             <if test="otherInformation != null  and otherInformation != ''"> and other_information = #{otherInformation}</if>
             <if test="companyIds != null  and companyIds != ''"> and company_ids = #{companyIds}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="auditStatus != null "> and audit_status = #{auditStatus}</if>
         </where>
     </select>
@@ -106,17 +118,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="validityBeginDate != null">validity_begin_date,</if>
             <if test="validityEndDate != null">validity_end_date,</if>
             <if test="squareMeasure != null">square_measure,</if>
+            <if test="surplusSquareMeasure != null">surplus_square_measure,</if>
             <if test="carWashingFacilities != null">car_washing_facilities,</if>
             <if test="exitRoadCondition != null">exit_road_condition,</if>
             <if test="lightingFacility != null">lighting_facility,</if>
             <if test="videoSurveillanceFacility != null">video_surveillance_facility,</if>
             <if test="preparer != null">preparer,</if>
             <if test="handlingAdvice != null">handling_advice,</if>
+            <if test="absorbSource != null">absorb_source,</if>
             <if test="electronicFence != null">electronic_fence,</if>
+            <if test="creditStatus != null">credit_status,</if>
             <if test="approvalDocument != null">approval_document,</if>
             <if test="approvalData != null">approval_data,</if>
             <if test="scenePhoto != null">scene_photo,</if>
             <if test="carWashingFacilitiesImage != null">car_washing_facilities_image,</if>
+            <if test="termRange != null">term_range,</if>
             <if test="safetyAssessmentReport != null">safety_assessment_report,</if>
             <if test="environmentalApproval != null">environmental_approval,</if>
             <if test="authorization != null">authorization,</if>
@@ -127,6 +143,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
+            <if test="qrCode != null">qr_code,</if>
+            <if test="auditStatus != null">audit_status,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -143,17 +161,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="validityBeginDate != null">#{validityBeginDate},</if>
             <if test="validityEndDate != null">#{validityEndDate},</if>
             <if test="squareMeasure != null">#{squareMeasure},</if>
+            <if test="surplusSquareMeasure != null">#{surplusSquareMeasure},</if>
             <if test="carWashingFacilities != null">#{carWashingFacilities},</if>
             <if test="exitRoadCondition != null">#{exitRoadCondition},</if>
             <if test="lightingFacility != null">#{lightingFacility},</if>
             <if test="videoSurveillanceFacility != null">#{videoSurveillanceFacility},</if>
             <if test="preparer != null">#{preparer},</if>
             <if test="handlingAdvice != null">#{handlingAdvice},</if>
+            <if test="absorbSource != null">#{absorbSource},</if>
             <if test="electronicFence != null">#{electronicFence},</if>
+            <if test="creditStatus != null">#{creditStatus},</if>
             <if test="approvalDocument != null">#{approvalDocument},</if>
             <if test="approvalData != null">#{approvalData},</if>
             <if test="scenePhoto != null">#{scenePhoto},</if>
             <if test="carWashingFacilitiesImage != null">#{carWashingFacilitiesImage},</if>
+            <if test="termRange != null">#{termRange},</if>
             <if test="safetyAssessmentReport != null">#{safetyAssessmentReport},</if>
             <if test="environmentalApproval != null">#{environmentalApproval},</if>
             <if test="authorization != null">#{authorization},</if>
@@ -164,6 +186,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
+            <if test="qrCode != null">#{qrCode},</if>
+            <if test="auditStatus != null">#{auditStatus},</if>
          </trim>
     </insert>
@@ -184,17 +208,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="validityBeginDate != null">validity_begin_date = #{validityBeginDate},</if>
             <if test="validityEndDate != null">validity_end_date = #{validityEndDate},</if>
             <if test="squareMeasure != null">square_measure = #{squareMeasure},</if>
+            <if test="surplusSquareMeasure != null">surplus_square_measure = #{surplusSquareMeasure},</if>
             <if test="carWashingFacilities != null">car_washing_facilities = #{carWashingFacilities},</if>
             <if test="exitRoadCondition != null">exit_road_condition = #{exitRoadCondition},</if>
             <if test="lightingFacility != null">lighting_facility = #{lightingFacility},</if>
             <if test="videoSurveillanceFacility != null">video_surveillance_facility = #{videoSurveillanceFacility},</if>
             <if test="preparer != null">preparer = #{preparer},</if>
             <if test="handlingAdvice != null">handling_advice = #{handlingAdvice},</if>
+            <if test="absorbSource != null">absorb_source = #{absorbSource},</if>
             <if test="electronicFence != null">electronic_fence = #{electronicFence},</if>
+            <if test="creditStatus != null">credit_status = #{creditStatus},</if>
             <if test="approvalDocument != null">approval_document = #{approvalDocument},</if>
             <if test="approvalData != null">approval_data = #{approvalData},</if>
             <if test="scenePhoto != null">scene_photo = #{scenePhoto},</if>
             <if test="carWashingFacilitiesImage != null">car_washing_facilities_image = #{carWashingFacilitiesImage},</if>
+            <if test="termRange != null">term_range = #{termRange},</if>
             <if test="safetyAssessmentReport != null">safety_assessment_report = #{safetyAssessmentReport},</if>
             <if test="environmentalApproval != null">environmental_approval = #{environmentalApproval},</if>
             <if test="authorization != null">authorization = #{authorization},</if>
@@ -205,6 +233,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="auditStatus != null">audit_status = #{auditStatus},</if>
         </trim>
         where id = #{id}
     </update>
@@ -3,57 +3,76 @@
 PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.trash.driver.mapper.DriverMapper">
-    
+
     <resultMap type="Driver" id="DriverResult">
-        <result property="id"    column="id"    />
-        <result property="name"    column="name"    />
-        <result property="identityCard"    column="identity_card"    />
-        <result property="companyId"    column="company_id"    />
-        <result property="professionalQualificationBeginDate"    column="professional_qualification_begin_date"    />
-        <result property="professionalQualificationEndDate"    column="professional_qualification_end_date"    />
-        <result property="drivingLicenceBeginDate"    column="driving_licence_begin_date"    />
-        <result property="drivingLicenceEndDate"    column="driving_licence_end_date"    />
-        <result property="safetyTrainingDate"    column="safety_training_date"    />
-        <result property="safetyTrainingContent"    column="safety_training_content"    />
-        <result property="remark"    column="remark"    />
-        <result property="drivingLicence"    column="driving_licence"    />
-        <result property="professionalQualification"    column="professional_qualification"    />
-        <result property="safetyTraining"    column="safety_training"    />
-        <result property="status"    column="status"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="updateBy"    column="update_by"    />
+        <result property="id" column="id"/>
+        <result property="name" column="name"/>
+        <result property="identityCard" column="identity_card"/>
+        <result property="companyId" column="company_id"/>
+        <result property="professionalQualificationBeginDate" column="professional_qualification_begin_date"/>
+        <result property="professionalQualificationEndDate" column="professional_qualification_end_date"/>
+        <result property="drivingLicenceBeginDate" column="driving_licence_begin_date"/>
+        <result property="drivingLicenceEndDate" column="driving_licence_end_date"/>
+        <result property="safetyTrainingDate" column="safety_training_date"/>
+        <result property="safetyTrainingContent" column="safety_training_content"/>
+        <result property="remark" column="remark"/>
+        <result property="drivingLicence" column="driving_licence"/>
+        <result property="professionalQualification" column="professional_qualification"/>
+        <result property="safetyTraining" column="safety_training"/>
+        <result property="status" column="status"/>
+        <result property="createTime" column="create_time"/>
+        <result property="createBy" column="create_by"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="photographOne" column="photograph_one"/>
+        <result property="photographTwo" column="photograph_two"/>
+        <result property="phoneNo" column="phoneNo"/>
+    </resultMap>
+    <resultMap type="DriverVo" id="DriverVoResult" extends="DriverResult">
+        <result property="companyName" column="companyName"/>
     </resultMap>
     <sql id="selectDriverVo">
-        select id, name, identity_card, company_id, professional_qualification_begin_date, professional_qualification_end_date, driving_licence_begin_date, driving_licence_end_date, safety_training_date, safety_training_content, remark, driving_licence, professional_qualification, safety_training, status, create_time, create_by, update_time, update_by from driver
+    select id, name, identity_card, company_id, professional_qualification_begin_date, professional_qualification_end_date, driving_licence_begin_date, driving_licence_end_date, safety_training_date, safety_training_content, remark, driving_licence, professional_qualification, safety_training, status, create_time, create_by, update_time, update_by, photograph_one, photograph_two,phoneNo from driver
     </sql>
-    <select id="selectDriverList" parameterType="Driver" resultMap="DriverResult">
-        <include refid="selectDriverVo"/>
-        <where>  
-            <if test="name != null  and name != ''"> and name like concat('%', #{name}, '%')</if>
-            <if test="identityCard != null  and identityCard != ''"> and identity_card = #{identityCard}</if>
+    <sql id="selectDriverCompanyVo">
+        select d.id, d.name,c.name companyName, identity_card, company_id, professional_qualification_begin_date, professional_qualification_end_date, driving_licence_begin_date, driving_licence_end_date, safety_training_date, safety_training_content, d.remark, driving_licence, professional_qualification, safety_training, d.status, d.create_time, d.create_by, d.update_time, d.update_by, photograph_one, photograph_two,phoneNo from driver d
+        left join transportation_enterprise c on d.company_id = c.id
+    </sql>
+
+    <select id="selectDriverList" parameterType="DriverVo" resultMap="DriverVoResult">
+        <include refid="selectDriverCompanyVo"/>
+        <where>
+            <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
+            <if test="companyName != null and companyName != ''"> and c.name like concat('%', #{companyName}, '%')</if>
+            <if test="identityCard != null and identityCard != ''"> and identity_card = #{identityCard}</if>
             <if test="companyId != null "> and company_id = #{companyId}</if>
             <if test="professionalQualificationBeginDate != null "> and professional_qualification_begin_date = #{professionalQualificationBeginDate}</if>
             <if test="professionalQualificationEndDate != null "> and professional_qualification_end_date = #{professionalQualificationEndDate}</if>
             <if test="drivingLicenceBeginDate != null "> and driving_licence_begin_date = #{drivingLicenceBeginDate}</if>
             <if test="drivingLicenceEndDate != null "> and driving_licence_end_date = #{drivingLicenceEndDate}</if>
             <if test="safetyTrainingDate != null "> and safety_training_date = #{safetyTrainingDate}</if>
-            <if test="safetyTrainingContent != null  and safetyTrainingContent != ''"> and safety_training_content = #{safetyTrainingContent}</if>
-            <if test="drivingLicence != null  and drivingLicence != ''"> and driving_licence = #{drivingLicence}</if>
-            <if test="professionalQualification != null  and professionalQualification != ''"> and professional_qualification = #{professionalQualification}</if>
-            <if test="safetyTraining != null  and safetyTraining != ''"> and safety_training = #{safetyTraining}</if>
+            <if test="safetyTrainingContent != null and safetyTrainingContent != ''"> and safety_training_content = #{safetyTrainingContent}</if>
+            <if test="drivingLicence != null and drivingLicence != ''"> and driving_licence = #{drivingLicence}</if>
+            <if test="professionalQualification != null and professionalQualification != ''"> and professional_qualification = #{professionalQualification}</if>
+            <if test="safetyTraining != null and safetyTraining != ''"> and safety_training = #{safetyTraining}</if>
             <if test="status != null "> and status = #{status}</if>
+            <if test="photographOne != null and photographOne != ''"> and photograph_one = #{photographOne}</if>
+            <if test="photographTwo != null and photographTwo != ''"> and photograph_two = #{photographTwo}</if>
+            <if test="phoneNo != null and phoneNo != ''"> and phoneNo = #{phoneNo}</if>
         </where>
     </select>
-    
+
+    <select id="selectDriverListByCompanyId" parameterType="String" resultType="map">
+        select id,name as label from driver where company_id = #{companyId}
+    </select>
+
     <select id="selectDriverById" parameterType="Long" resultMap="DriverResult">
         <include refid="selectDriverVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertDriver" parameterType="Driver" useGeneratedKeys="true" keyProperty="id">
         insert into driver
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -75,7 +94,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">create_by,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="updateBy != null">update_by,</if>
-         </trim>
+            <if test="photographOne != null">photograph_one,</if>
+            <if test="photographTwo != null">photograph_two,</if>
+            <if test="phoneNo != null">phoneNo,</if>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
             <if test="identityCard != null">#{identityCard},</if>
@@ -95,7 +117,10 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">#{createBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
-         </trim>
+            <if test="photographOne != null">#{photographOne},</if>
+            <if test="photographTwo != null">#{photographTwo},</if>
+            <if test="phoneNo != null">#{phoneNo},</if>
+        </trim>
     </insert>
     <update id="updateDriver" parameterType="Driver">
@@ -119,19 +144,21 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="createBy != null">create_by = #{createBy},</if>
             <if test="updateTime != null">update_time = #{updateTime},</if>
             <if test="updateBy != null">update_by = #{updateBy},</if>
+            <if test="photographOne != null">photograph_one = #{photographOne},</if>
+            <if test="photographTwo != null">photograph_two = #{photographTwo},</if>
+            <if test="phoneNo != null">phoneNo = #{phoneNo},</if>
         </trim>
         where id = #{id}
     </update>
     <delete id="deleteDriverById" parameterType="Long">
-        delete from driver where id = #{id}
+        delete
+        from driver
+        where id = #{id}
     </delete>
     <delete id="deleteDriverByIds" parameterType="String">
-        delete from driver where id in 
-        <foreach item="id" collection="array" open="(" separator="," close=")">
-            #{id}
-        </foreach>
+        delete from driver where id in
+        <foreach item="id" collection="array" open="(" separator="," close=")"> #{id} </foreach>
     </delete>
-    
 </mapper>
 \ No newline at end of file
@@ -36,10 +36,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="updateBy"    column="update_by"    />
         <result property="parentId"    column="parent_id"    />
         <result property="companyType"    column="company_type"    />
+        <result property="creditStatus"    column="credit_status"    />
+        <result property="qrCode"    column="qr_code"    />
     </resultMap>
     <sql id="selectTransportationEnterpriseVo">
-        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type from transportation_enterprise
+        select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code from transportation_enterprise te
     </sql>
     <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
@@ -70,6 +72,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="status != null "> and status = #{status}</if>
             <if test="parentId != null "> and parent_id = #{parentId}</if>
             <if test="companyType != null "> and company_type = #{companyType}</if>
+            <if test="creditStatus != null  and creditStatus != ''"> and credit_status = #{creditStatus}</if>
+            <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
         </where>
     </select>
@@ -111,6 +115,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="updateBy != null">update_by,</if>
             <if test="parentId != null">parent_id,</if>
             <if test="companyType != null">company_type,</if>
+            <if test="creditStatus != null">credit_status,</if>
+            <if test="qrCode != null">qr_code,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -143,6 +149,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="updateBy != null">#{updateBy},</if>
             <if test="parentId != null">#{parentId},</if>
             <if test="companyType != null">#{companyType},</if>
+            <if test="creditStatus != null">#{creditStatus},</if>
+            <if test="qrCode != null">#{qrCode},</if>
          </trim>
     </insert>
@@ -179,6 +187,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="updateBy != null">update_by = #{updateBy},</if>
             <if test="parentId != null">parent_id = #{parentId},</if>
             <if test="companyType != null">company_type = #{companyType},</if>
+            <if test="creditStatus != null">credit_status = #{creditStatus},</if>
+            <if test="qrCode != null">qr_code = #{qrCode},</if>
         </trim>
         where id = #{id}
     </update>
@@ -40,7 +40,7 @@ public class Consumer {
     @Autowired
     private IViolationWarningInformationService violationWarningInformationService;
-    @KafkaListener(topics = "record_process_alarm")
+//    @KafkaListener(topics = "record_process_alarm")
     public void consume(ConsumerRecord<?, ?> record, Acknowledgment ack) throws InterruptedException, IOException {
         log.info("kafka消费数据成功,offset:"+ record.offset() +",data:" + record.value());
         String id = insertKafkaCompensation(record.value().toString());
@@ -58,4 +58,12 @@ public interface UploadFileMapper
      * @return 结果
      */
     int deleteUploadFileByIds(Long[] ids);
+
+    /**
+     * 根据表名删除文件上传
+     *
+     * @param tableName 表名
+     * @return 结果
+     */
+    int deleteUploadFileByTableName(String tableName);
 }
+package com.trash.other.controller;
+
+import java.io.IOException;
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+import com.trash.common.annotation.Log;
+import com.trash.common.core.controller.BaseController;
+import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.enums.BusinessType;
+import com.trash.other.domain.DocumentData;
+import com.trash.other.service.IDocumentDataService;
+import com.trash.common.utils.poi.ExcelUtil;
+import com.trash.common.core.page.TableDataInfo;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件资料Controller
+ * 
+ * @author trash
+ * @date 2023-11-28
+ */
+@RestController
+@RequestMapping("/other/documentData")
+public class DocumentDataController extends BaseController
+{
+    @Autowired
+    private IDocumentDataService documentDataService;
+
+    /**
+     * 查询文件资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('other:documentData:list')")
+    @GetMapping("/list")
+    public TableDataInfo list(DocumentData documentData)
+    {
+        startPage();
+        List<DocumentData> list = documentDataService.selectDocumentDataList(documentData);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出文件资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('other:documentData:export')")
+    @Log(title = "文件资料", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(DocumentData documentData)
+    {
+        List<DocumentData> list = documentDataService.selectDocumentDataList(documentData);
+        ExcelUtil<DocumentData> util = new ExcelUtil<DocumentData>(DocumentData.class);
+        return util.exportExcel(list, "documentData");
+    }
+
+    /**
+     * 获取文件资料详细信息
+     */
+    @PreAuthorize("@ss.hasPermi('other:documentData:query')")
+    @GetMapping(value = "/{id}")
+    public AjaxResult getInfo(@PathVariable("id") Long id)
+    {
+        return AjaxResult.success(documentDataService.selectDocumentDataById(id));
+    }
+
+    /**
+     * 新增文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('other:documentData:add')")
+    @Log(title = "文件资料", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, DocumentData documentData) throws IOException {
+        return toAjax(documentDataService.insertDocumentData(files, documentData));
+    }
+
+    /**
+     * 修改文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('other:documentData:edit')")
+    @Log(title = "文件资料", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,DocumentData documentData) throws IOException {
+        return toAjax(documentDataService.updateDocumentData(files, documentData));
+    }
+
+    /**
+     * 删除文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('other:documentData:remove')")
+    @Log(title = "文件资料", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids)
+    {
+        return toAjax(documentDataService.deleteDocumentDataByIds(ids));
+    }
+}
+package com.trash.other.controller;
+
+import com.trash.common.annotation.Log;
+import com.trash.common.core.controller.BaseController;
+import com.trash.common.core.domain.AjaxResult;
+import com.trash.common.enums.BusinessType;
+import com.trash.office.domain.UploadFile;
+import com.trash.other.service.IIncorruptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 文件资料Controller
+ * 
+ * @author trash
+ * @date 2023-11-28
+ */
+@RestController
+@RequestMapping("/other/incorrupt")
+public class IncorruptController extends BaseController
+{
+    @Autowired
+    private IIncorruptService incorruptService;
+
+    /**
+     * 查询文件资料列表
+     */
+    @PreAuthorize("@ss.hasPermi('other:incorrupt:list')")
+    @GetMapping("/list/{tableName}")
+    public List<UploadFile> list(@PathVariable("tableName") String tableName)
+    {
+        return incorruptService.selectOtherDataList(tableName);
+    }
+
+    /**
+     * 新增文件资料
+     */
+    @PreAuthorize("@ss.hasPermi('other:incorrupt:add')")
+    @Log(title = "廉政&廉洁教育", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestParam("files")MultipartFile[] files,String tableName) throws IOException {
+        return toAjax(incorruptService.insertIncorrupt(files,tableName));
+    }
+
+//    /**
+//     * 修改文件资料
+//     */
+//    @PreAuthorize("@ss.hasPermi('other:documentData:edit')")
+//    @Log(title = "文件资料", businessType = BusinessType.UPDATE)
+//    @PutMapping
+//    public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,DocumentData documentData) throws IOException {
+//        return toAjax(documentDataService.updateDocumentData(files, documentData));
+//    }
+
+}
+package com.trash.other.domain;
+
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.trash.common.annotation.Excel;
+import com.trash.common.core.domain.BaseEntity;
+
+/**
+ * 文件资料对象 document_data
+ * 
+ * @author trash
+ * @date 2023-11-28
+ */
+public class DocumentData extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** $column.columnComment */
+    private Long id;
+
+    /** 标题 */
+    @Excel(name = "标题")
+    private String title;
+
+    /** 内容 */
+    @Excel(name = "内容")
+    private String content;
+
+    /** 附件 */
+    @Excel(name = "附件")
+    private String files;
+
+    public void setId(Long id) 
+    {
+        this.id = id;
+    }
+
+    public Long getId() 
+    {
+        return id;
+    }
+    public void setTitle(String title) 
+    {
+        this.title = title;
+    }
+
+    public String getTitle() 
+    {
+        return title;
+    }
+    public void setContent(String content) 
+    {
+        this.content = content;
+    }
+
+    public String getContent() 
+    {
+        return content;
+    }
+    public void setFiles(String files) 
+    {
+        this.files = files;
+    }
+
+    public String getFiles() 
+    {
+        return files;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("id", getId())
+            .append("title", getTitle())
+            .append("content", getContent())
+            .append("files", getFiles())
+            .append("createTime", getCreateTime())
+            .append("createBy", getCreateBy())
+            .append("updateTime", getUpdateTime())
+            .append("updateBy", getUpdateBy())
+            .toString();
+    }
+}
+package com.trash.other.mapper;
+
+import java.util.List;
+import com.trash.other.domain.DocumentData;
+
+/**
+ * 文件资料Mapper接口
+ * 
+ * @author trash
+ * @date 2023-11-28
+ */
+public interface DocumentDataMapper 
+{
+    /**
+     * 查询文件资料
+     * 
+     * @param id 文件资料ID
+     * @return 文件资料
+     */
+        DocumentData selectDocumentDataById(Long id);
+
+    /**
+     * 查询文件资料列表
+     * 
+     * @param documentData 文件资料
+     * @return 文件资料集合
+     */
+    List<DocumentData> selectDocumentDataList(DocumentData documentData);
+
+    /**
+     * 新增文件资料
+     * 
+     * @param documentData 文件资料
+     * @return 结果
+     */
+    int insertDocumentData(DocumentData documentData);
+
+    /**
+     * 修改文件资料
+     * 
+     * @param documentData 文件资料
+     * @return 结果
+     */
+    int updateDocumentData(DocumentData documentData);
+
+    /**
+     * 删除文件资料
+     * 
+     * @param id 文件资料ID
+     * @return 结果
+     */
+    int deleteDocumentDataById(Long id);
+
+    /**
+     * 批量删除文件资料
+     * 
+     * @param ids 需要删除的数据ID
+     * @return 结果
+     */
+    int deleteDocumentDataByIds(Long[] ids);
+}
+package com.trash.other.service;
+
+import java.io.IOException;
+import java.util.List;
+import com.trash.other.domain.DocumentData;
+import org.springframework.web.multipart.MultipartFile;
+
+/**
+ * 文件资料Service接口
+ * 
+ * @author trash
+ * @date 2023-11-28
+ */
+public interface IDocumentDataService 
+{
+    /**
+     * 查询文件资料
+     * 
+     * @param id 文件资料ID
+     * @return 文件资料
+     */
+        DocumentData selectDocumentDataById(Long id);
+
+    /**
+     * 查询文件资料列表
+     * 
+     * @param documentData 文件资料
+     * @return 文件资料集合
+     */
+    List<DocumentData> selectDocumentDataList(DocumentData documentData);
+
+    /**
+     * 新增文件资料
+     *
+     * @param files
+     * @param documentData 文件资料
+     * @return 结果
+     */
+    int insertDocumentData(MultipartFile[] files, DocumentData documentData) throws IOException;
+
+    /**
+     * 修改文件资料
+     *
+     * @param files
+     * @param documentData 文件资料
+     * @return 结果
+     */
+    int updateDocumentData(MultipartFile[] files,DocumentData documentData) throws IOException;
+
+    /**
+     * 批量删除文件资料
+     * 
+     * @param ids 需要删除的文件资料ID
+     * @return 结果
+     */
+    int deleteDocumentDataByIds(Long[] ids);
+
+    /**
+     * 删除文件资料信息
+     * 
+     * @param id 文件资料ID
+     * @return 结果
+     */
+    int deleteDocumentDataById(Long id);
+}
+package com.trash.other.service;
+
+import com.trash.office.domain.UploadFile;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 其他专项资料Service接口
+ * 
+ * @author trash
+ * @date 2023-05-11
+ */
+public interface IIncorruptService
+{
+
+
+    List<UploadFile> selectOtherDataList(String tableName);
+
+
+    int insertIncorrupt(MultipartFile[] files, String tableName) throws IOException;
+
+
+}
+package com.trash.other.service.impl;
+
+import java.io.IOException;
+import java.util.List;
+
+import com.trash.common.config.trashConfig;
+import com.trash.common.utils.DateUtils;
+import com.trash.common.utils.SecurityUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.trash.other.mapper.DocumentDataMapper;
+import com.trash.other.domain.DocumentData;
+import com.trash.other.service.IDocumentDataService;
+import org.springframework.web.multipart.MultipartFile;
+
+import static com.trash.common.utils.file.FileUploadUtils.upload;
+
+/**
+ * 文件资料Service业务层处理
+ * 
+ * @author trash
+ * @date 2023-11-28
+ */
+@Service
+public class DocumentDataServiceImpl implements IDocumentDataService 
+{
+    @Autowired
+    private DocumentDataMapper documentDataMapper;
+
+    /**
+     * 查询文件资料
+     * 
+     * @param id 文件资料ID
+     * @return 文件资料
+     */
+    @Override
+    public DocumentData selectDocumentDataById(Long id)
+    {
+        return documentDataMapper.selectDocumentDataById(id);
+    }
+
+    /**
+     * 查询文件资料列表
+     * 
+     * @param documentData 文件资料
+     * @return 文件资料
+     */
+    @Override
+    public List<DocumentData> selectDocumentDataList(DocumentData documentData)
+    {
+        return documentDataMapper.selectDocumentDataList(documentData);
+    }
+
+    /**
+     * 新增文件资料
+     *
+     * @param files
+     * @param documentData 文件资料
+     * @return 结果
+     */
+    @Override
+    public int insertDocumentData(MultipartFile[] files, DocumentData documentData) throws IOException {
+        for (MultipartFile file:files){
+            documentData.setFiles(documentData.getFiles()!=null?documentData.getFiles()+";"+uploadFile(file):uploadFile(file));
+        }
+        documentData.setFiles(removeSemicolon(documentData.getFiles()));
+        return documentDataMapper.insertDocumentData(documentData);
+    }
+
+    /**
+     * 修改文件资料
+     *
+     * @param files
+     * @param documentData 文件资料
+     * @return 结果
+     */
+    @Override
+    public int updateDocumentData(MultipartFile[] files, DocumentData documentData) throws IOException {
+        documentData.setUpdateTime(DateUtils.getNowDate());
+        documentData.setUpdateBy(SecurityUtils.getUsername());
+        for (MultipartFile file:files){
+            documentData.setFiles(documentData.getFiles()!=null?documentData.getFiles()+";"+uploadFile(file):uploadFile(file));
+        }
+        documentData.setFiles(removeSemicolon(documentData.getFiles()));
+        return documentDataMapper.updateDocumentData(documentData);
+    }
+
+    /**
+     * 批量删除文件资料
+     * 
+     * @param ids 需要删除的文件资料ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDocumentDataByIds(Long[] ids)
+    {
+        return documentDataMapper.deleteDocumentDataByIds(ids);
+    }
+
+    /**
+     * 删除文件资料信息
+     * 
+     * @param id 文件资料ID
+     * @return 结果
+     */
+    @Override
+    public int deleteDocumentDataById(Long id)
+    {
+        return documentDataMapper.deleteDocumentDataById(id);
+    }
+
+    /**
+     * 文件上传
+     *
+     * @param file
+     * @author 2c
+     */
+    public static String uploadFile(MultipartFile file) throws IOException {
+        // 上传文件路径
+        String filePath = trashConfig.getUploadPath();
+        // 上传并返回新文件名称
+        String newFileName = upload(filePath, file);
+        return newFileName;
+    }
+
+    //去掉第一个分号,如果有的话
+    public String removeSemicolon(String str){
+        if (str.startsWith(";"))
+            str = str.substring(1);
+        return str;
+    }
+}
+package com.trash.other.service.impl;
+
+import com.trash.common.utils.file.FileUploadUtils;
+import com.trash.office.domain.UploadFile;
+import com.trash.office.mapper.UploadFileMapper;
+import com.trash.other.service.IIncorruptService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.util.List;
+
+/**
+ * 其他专项资料Service业务层处理
+ *
+ * @author trash
+ * @date 2023-05-11
+ */
+@Service
+public class IncorruptServiceImpl implements IIncorruptService {
+    @Autowired
+    private UploadFileMapper uploadFileMapper;
+
+
+    @Override
+    public List<UploadFile> selectOtherDataList(String tableName)  {
+        UploadFile uploadFile = new UploadFile();
+        uploadFile.setTableName(tableName);
+        return uploadFileMapper.selectUploadFileList(uploadFile);
+    }
+
+    @Override
+    public int insertIncorrupt(MultipartFile[] files, String tableName) throws IOException {
+        UploadFile uploadFile = new UploadFile();
+        for (MultipartFile file : files) {
+            uploadFile.setTableName(tableName);
+            uploadFile.setTableNumber("1");
+            uploadFile.setFileName(file.getOriginalFilename());
+            uploadFile.setFilePath(FileUploadUtils.uploadFile(file));
+        }
+        uploadFileMapper.deleteUploadFileByTableName(tableName);
+        return uploadFileMapper.insertUploadFile(uploadFile);
+    }
+
+}
@@ -71,5 +71,12 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             #{id}
         </foreach>
     </delete>
-    
+
+
+    <delete id="deleteUploadFileByTableName" parameterType="String">
+        delete from upload_file
+        <if test="tableName != null">
+            where table_name = #{tableName}
+        </if>
+    </delete>
 </mapper>
 \ No newline at end of file
+<?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.other.mapper.DocumentDataMapper">
+    
+    <resultMap type="DocumentData" id="DocumentDataResult">
+        <result property="id"    column="id"    />
+        <result property="title"    column="title"    />
+        <result property="content"    column="content"    />
+        <result property="files"    column="files"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="createBy"    column="create_by"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="updateBy"    column="update_by"    />
+    </resultMap>
+
+    <sql id="selectDocumentDataVo">
+        select id, title, content, files, create_time, create_by, update_time, update_by from document_data
+    </sql>
+
+    <select id="selectDocumentDataList" parameterType="DocumentData" resultMap="DocumentDataResult">
+        <include refid="selectDocumentDataVo"/>
+        <where>  
+            <if test="title != null  and title != ''"> and title like concat('%',#{title},'%')</if>
+            <if test="content != null  and content != ''"> and content = #{content}</if>
+            <if test="files != null  and files != ''"> and files = #{files}</if>
+        </where>
+    </select>
+    
+    <select id="selectDocumentDataById" parameterType="Long" resultMap="DocumentDataResult">
+        <include refid="selectDocumentDataVo"/>
+        where id = #{id}
+    </select>
+        
+    <insert id="insertDocumentData" parameterType="DocumentData" useGeneratedKeys="true" keyProperty="id">
+        insert into document_data
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="title != null">title,</if>
+            <if test="content != null">content,</if>
+            <if test="files != null">files,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="createBy != null">create_by,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="updateBy != null">update_by,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="title != null">#{title},</if>
+            <if test="content != null">#{content},</if>
+            <if test="files != null">#{files},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="createBy != null">#{createBy},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="updateBy != null">#{updateBy},</if>
+         </trim>
+    </insert>
+
+    <update id="updateDocumentData" parameterType="DocumentData">
+        update document_data
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="title != null">title = #{title},</if>
+            <if test="content != null">content = #{content},</if>
+            <if test="files != null">files = #{files},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="createBy != null">create_by = #{createBy},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="updateBy != null">update_by = #{updateBy},</if>
+        </trim>
+        where id = #{id}
+    </update>
+
+    <delete id="deleteDocumentDataById" parameterType="Long">
+        delete from document_data where id = #{id}
+    </delete>
+
+    <delete id="deleteDocumentDataByIds" parameterType="String">
+        delete from document_data where id in 
+        <foreach item="id" collection="array" open="(" separator="," close=")">
+            #{id}
+        </foreach>
+    </delete>
+    
+</mapper>
 \ No newline at end of file