m

youxiw2000
2 parents 3a62b23c b11ba85f
Showing 37 changed files with 1213 additions and 957 deletions
trash-admin/src/main/resources/application-dev.yml
trash-admin/src/main/resources/application-local.yml
trash-admin/src/main/resources/logback.xml
trash-admin/src/main/resources/static/car_1.png
trash-admin/src/main/resources/static/car_2.png
trash-admin/src/main/resources/static/goubiche.png
trash-admin/src/main/resources/static/zixieche.jpg
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageOrderController.java
trash-garbage/src/main/java/com/trash/garbage/mapper/GarOrderMatchHandlerMapper.java
trash-garbage/src/main/java/com/trash/garbage/pojo/domain/GarOrderCar.java
trash-garbage/src/main/java/com/trash/garbage/pojo/dto/OrderDto.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderCarService.java
trash-garbage/src/main/java/com/trash/garbage/service/GarOrderMatchHandlerService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderCarServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderMatchHandlerServiceImpl.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarOrderServiceImpl.java
trash-garbage/src/main/resources/mapper/GarOrderMatchHandlerMapper.xml
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/h5/leaveApplication/index.vue
trash-ui/src/views/h5/leaveApplication/leaveApplicationInfo.vue
@@ -9,7 +9,7 @@ trash:
     # 实例演示开关
     demoEnabled: true
     # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
-    profile: D:/trash/uploadPath
+    profile: /home/trash/uploadPath
 #    profile: E:/trash/uploadPath
 #    profile: F:/work/project/Documents/uploadPath/trash
 #     获取ip地址开关
@@ -86,7 +86,7 @@ spring:
         # redis 配置
     redis:
         # 地址
-        host: localhost
+        host: 127.0.0.1
         # 端口，默认为6379
         port: 6379
         # 密码
+# 项目相关配置
+trash:
+    # 名称
+    name: trash
+    # 版本
+    version: 3.2.0
+    # 版权年份
+    copyrightYear: 2020
+    # 实例演示开关
+    demoEnabled: true
+    # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
+    profile: D:/trash/uploadPath
+#    profile: E:/trash/uploadPath
+#    profile: F:/work/project/Documents/uploadPath/trash
+#     获取ip地址开关
+    addressEnabled: false
+    # 验证码类型 math 数组计算 char 字符验证
+    captchaType: math
+    # 远程服务器地址
+    #remotePath: http://175.6.47.84:8008
+    #token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJkdXJhYmxlIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg1NDE2NjEzMzU1fQ.58-J0KKfsK2pQhDQAzaBaUj-oFWMbYF1YzMAcshmcfidIkW16TZWIVhAVKPvCJvWfG54x7xB-ETxKCDLFnSctQ
+    #remotePath: http://cszhatu.natapp1.cc
+    remotePath: http://183.66.242.6:14601
+    token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0NDU5MjEzNzQ2fQ.85oIrOnU7cz7L_-IGt4Bt1LXDTkFtyrdqNt05K0v9-4nsrrzzpbjbemK-yMlbnUpe4Fx2FFES-Wbw8Yr8ML69w
+   
+    
+# 数据源配置
+spring:
+    datasource:
+        type: com.alibaba.druid.pool.DruidDataSource
+        driverClassName: com.mysql.cj.jdbc.Driver
+        druid:
+            # 主库数据源
+            master:
+#                url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
+                username: root
+                password: root
+            # 从库数据源
+            slave:
+                # 从数据源开关/默认关闭
+                enabled: false
+                url: 
+                username: 
+                password: 
+            # 初始连接数
+            initialSize: 5
+            # 最小连接池数量
+            minIdle: 10
+            # 最大连接池数量
+            maxActive: 20
+            # 配置获取连接等待超时的时间
+            maxWait: 60000
+            # 配置间隔多久才进行一次检测，检测需要关闭的空闲连接，单位是毫秒
+            timeBetweenEvictionRunsMillis: 60000
+            # 配置一个连接在池中最小生存的时间，单位是毫秒
+            minEvictableIdleTimeMillis: 300000
+            # 配置一个连接在池中最大生存的时间，单位是毫秒
+            maxEvictableIdleTimeMillis: 900000
+            # 配置检测连接是否有效
+            validationQuery: SELECT 1 FROM DUAL
+            testWhileIdle: true
+            testOnBorrow: false
+            testOnReturn: false
+            webStatFilter: 
+                enabled: false
+            statViewServlet:
+                enabled: false
+                # 设置白名单，不填则允许所有访问
+                allow:
+                url-pattern: /druid/*
+                # 控制台管理用户名和密码
+                login-username: youxiw2000
+                login-password: Noah5201
+            filter:
+                stat:
+                    enabled: true
+                    # 慢SQL记录
+                    log-slow-sql: true
+                    slow-sql-millis: 1000
+                    merge-sql: true
+                wall:
+                    config:
+                        multi-statement-allow: true
+        # redis 配置
+    redis:
+        # 地址
+        host: 127.0.0.1
+        # 端口，默认为6379
+        port: 6379
+        # 密码
+        password: 
+        # 连接超时时间
+        timeout: 10s
+        database: 11
+        lettuce:
+            pool:
+                # 连接池中的最小空闲连接
+                min-idle: 0
+                # 连接池中的最大空闲连接
+                max-idle: 8
+                # 连接池的最大数据库连接数
+                max-active: 8
+                #连接池最大阻塞等待时间（使用负值表示没有限制）
+                max-wait: -1ms
+# 开发环境配置
+server:
+    # 服务器的HTTP端口，默认为8080
+    port: 8080
+    servlet:
+        # 应用的访问路径
+        context-path: /workflow
+    tomcat:
+        # tomcat的URI编码
+        uri-encoding: UTF-8
+        # tomcat最大线程数，默认为200
+        max-threads: 800
+        # Tomcat启动初始化的线程数，默认值25
+        min-spare-threads: 30
+#华为OBS存储
+huawei:
+    enabled: false
+    endPoint:
+    ak:
+    sk:
+    url:
+    bucketName:
+#nginx静态文件
+nginx:
+    enabled: false
+    path:
+    url:
+
+# 生成二维码 前端地址
+front:
+    url: "http://61.169.120.202:5173/pages/order/guest/index?orderId="
 \ No newline at end of file
@@ -2,7 +2,7 @@
 <configuration>
     <!-- 日志存放路径 -->
 <!--	<property name="log.path" value="/home/trash/logs" />-->
-    <property name="log.path" value="C:/work/project/logs/trash" />
+    <property name="log.path" value="logs/trash" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
@@ -29,6 +29,7 @@ import com.trash.garbage.pojo.vo.OrderDetailVo;
 import com.trash.garbage.pojo.vo.ScanDriverDetailVo;
 import com.trash.garbage.service.GarOrderService;
 import com.trash.garbage.service.GarUserService;
+import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -49,6 +50,7 @@ import java.util.Objects;
  */
 @RestController
 @RequestMapping("/order")
+@Slf4j
 public class GarbageOrderController {
     @Autowired
@@ -92,6 +94,7 @@ public class GarbageOrderController {
             // 上传并返回新文件名称
             fileName = FileUploadUtils.upload(filePath, file);
         } catch (IOException e) {
+            log.error("上传图片异常",e);
             throw new BizException(ResultCode.CODE_400, ResultCode.CODE_400.getMsg());
         }
         String url = serverConfig.getUrl() + fileName;
@@ -7,6 +7,7 @@ import com.trash.garbage.pojo.vo.DispatchDriverVo;
 import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Set;
 /**
 * @author 20412
@@ -16,7 +17,7 @@ import java.util.List;
 */
 public interface GarOrderMatchHandlerMapper extends BaseMapper<GarOrderMatchHandler> {
-    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") Long id);
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(@Param("orderId") String orderId, @Param("companyId") Long id,@Param("containerVolumees") Set<String> containerVolumees);
 }
 package com.trash.garbage.pojo.domain;
-import com.baomidou.mybatisplus.annotation.*;
+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 lombok.Data;
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 /**
  * 订单车辆信息
@@ -57,6 +60,10 @@ public class GarOrderCar implements Serializable {
      */
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private String garUpdateBy;
+    /**车辆ID*/
+    private Integer carId;
+    /**车辆容积*/
+    private String containerVolume;
     /**
      * 
@@ -66,6 +73,8 @@ public class GarOrderCar implements Serializable {
     @TableField(exist = false)
     private static final long serialVersionUID = 1L;
+
+
     public String getGarId() {
         return garId;
     }
@@ -106,6 +106,8 @@ public class OrderDto {
         private Integer id;
         private String garOrderCarType;
+        private String containerVolume;
+
         public Integer getGarOrderCarNumber() {
             return garOrderCarNumber;
         }
@@ -141,8 +143,13 @@ public class OrderDto {
             this.id = id;
         }
+        public String getContainerVolume() {
+            return containerVolume;
+        }
-
+        public void setContainerVolume(String containerVolume) {
+            this.containerVolume = containerVolume;
+        }
     }
     public List<CarInfo> getGarCarInfoList() {
 package com.trash.garbage.service;
-import com.trash.garbage.pojo.domain.GarOrderCar;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarOrderCar;
+
+import java.util.List;
 /**
 * @author 20412
@@ -9,5 +11,5 @@ import com.baomidou.mybatisplus.extension.service.IService;
 * @createDate 2024-01-09 14:26:09
 */
 public interface GarOrderCarService extends IService<GarOrderCar> {
-
+    List<GarOrderCar> queryByOrderId(String orderId);
 }
 package com.trash.garbage.service;
-import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.trash.garbage.pojo.domain.GarOrderMatchHandler;
 import com.trash.garbage.pojo.vo.DispatchDriverVo;
-import org.apache.ibatis.annotations.Param;
 import java.util.List;
+import java.util.Set;
 /**
 * @author 20412
@@ -14,5 +14,5 @@ import java.util.List;
 */
 public interface GarOrderMatchHandlerService extends IService<GarOrderMatchHandler> {
-    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long companyId);
+    List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long companyId, Set<String> containerVolumees);
 }
 package com.trash.garbage.service.impl;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.trash.garbage.pojo.domain.GarOrderCar;
 import com.trash.garbage.service.GarOrderCarService;
 import com.trash.garbage.mapper.GarOrderCarMapper;
 import org.springframework.stereotype.Service;
+import java.util.List;
+
 /**
-* @author 20412
-* @description 针对表【gar_order_car(订单车辆信息)】的数据库操作Service实现
-* @createDate 2024-01-09 14:26:09
-*/
+ * @author 20412
+ * @description 针对表【gar_order_car(订单车辆信息)】的数据库操作Service实现
+ * @createDate 2024-01-09 14:26:09
+ */
 @Service
 public class GarOrderCarServiceImpl extends ServiceImpl<GarOrderCarMapper, GarOrderCar>
-    implements GarOrderCarService{
+        implements GarOrderCarService {
+    @Override
+    public List<GarOrderCar> queryByOrderId(String orderId) {
+        LambdaQueryWrapper<GarOrderCar> wrapper = new LambdaQueryWrapper<>();
+        wrapper.eq(GarOrderCar::getGarOrderId, orderId);
+        return list(wrapper);
+    }
 }
@@ -8,6 +8,7 @@ import com.trash.garbage.service.GarOrderMatchHandlerService;
 import org.springframework.stereotype.Service;
 import java.util.List;
+import java.util.Set;
 /**
  * @author 20412
@@ -19,8 +20,8 @@ public class GarOrderMatchHandlerServiceImpl extends ServiceImpl&lt;GarOrderMatchHa
         implements GarOrderMatchHandlerService {
     @Override
-    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long id) {
-        return baseMapper.queryDriverListWithDispatchStatus(orderId, id);
+    public List<DispatchDriverVo> queryDriverListWithDispatchStatus(String orderId, Long id, Set<String> containerVolumees) {
+        return baseMapper.queryDriverListWithDispatchStatus(orderId, id,containerVolumees);
     }
 }
@@ -106,6 +106,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                 GarOrderCar car = new GarOrderCar();
                 car.setGarOrderCarType(carInfo.getGarOrderCarType());
                 car.setGarOrderId(order.getGarOrderId());
+                car.setCarId(carInfo.getId());
+                car.setContainerVolume(carInfo.getContainerVolume());
                 car.setGarOrderCarUserType(GlobalStatus.GarOrderStatus.PLAN_CAR_TYPE.getValue());
                 garOrderCars.add(car);
             }
@@ -486,6 +488,8 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
                     GarOrderCar car = new GarOrderCar();
                     car.setGarOrderCarType(carInfo.getGarOrderCarType());
                     car.setGarOrderId(dto.getGarOrderId());
+                    car.setContainerVolume(carInfo.getContainerVolume());
+                    car.setCarId(carInfo.getId());
                     car.setGarOrderCarUserType(GlobalStatus.GarOrderStatus.REAL_CAR_TYPE.getValue());
                     garOrderCars.add(car);
                 }
@@ -817,8 +821,18 @@ public class GarOrderServiceImpl extends ServiceImpl&lt;GarOrderMapper, GarOrder&gt;
         TransportationEnterprise enterprise = new TransportationEnterprise();
         enterprise.setServicePhone(tel);
         List<TransportationEnterprise> enterprises = transportationEnterpriseService.selectTransportationEnterpriseList(enterprise);
+        if(CollectionUtils.isEmpty(enterprises)){
+            return Collections.emptyList();
+        }
+
+       List<GarOrderCar> garOrderCars = garOrderCarService.queryByOrderId(orderId);
+        if(CollectionUtils.isEmpty(garOrderCars)){
+            return Collections.emptyList();
+        }
+
+        Set<String> containerVolumees = garOrderCars.stream().map(GarOrderCar::getContainerVolume).collect(Collectors.toSet());
         // 选中的司机
-        List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId());
+        List<DispatchDriverVo> voList = handlerService.queryDriverListWithDispatchStatus(orderId, enterprises.get(0).getId(),containerVolumees);
         return voList;
     }
@@ -58,6 +58,9 @@
                 LEFT JOIN gar_order_match_handler gar ON gar.gar_order_handler_tel = driver.phoneNo
                 AND gar.gar_order_id = #{orderId} AND gar.gar_handler_car_code = car.car_code
         WHERE
-            driver.company_id = #{companyId}
+            driver.company_id = #{companyId} and container_volume in
+            <foreach collection="containerVolumees" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
     </select>
 </mapper>
-<template>
-  <div class="app-container">
-   <el-select v-model="queryParams.dept" filterable reserve-keyword >
-      <el-option v-for="item in depts" :label="item.name"
-                 :value="item.code" :key="item.code">
-      </el-option>
-    </el-select>
-    <el-select v-model="queryParams.role" filterable reserve-keyword >
-      <el-option v-for="item in roles" :label="item.name"
-                 :value="item.code" :key="item.code">
-      </el-option>
-    </el-select>
-
-    <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
-   <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
-      <el-option v-for="item in names" :label="item" :value="item">
-      </el-option>
-    </el-select> -->
-
-    <el-select v-model="queryParams.prev" filterable reserve-keyword  placeholder="上一节点">
-      <el-option v-for="item in prev" :label="item.name" :value="item.name">
-      </el-option>
-    </el-select>
-    <el-select v-model="queryParams.type" filterable reserve-keyword>
-      <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
-      <el-option label="消纳合同申报备案" value="workflow_conract"/>
-      <el-option label="处理场所备案" value="workflow_earthsites"/>
-      <el-option label="运输企业准入流程" value="workflow_company"/>
-      <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
-      <el-option label="驾驶员信息审批" value="workflow_driver"/>
-      <el-option label="报工审批" value="workflow_threestep"/>
-      <el-option label="交办案卷" value="workflow_caseoffline"/>
-      <el-option label="违规案卷处置流程" value="workflow_casefile"/>
-      <el-option label="平台预警信息" value="violation_warning"/>
-      <el-option label="办文办事" value="handleAffairs"/>
-      <el-option label="后勤管理" value="logistics"/>
-      <el-option label="会议事务" value="conference"/>
-      <el-option label="假勤管理" value="workflow_leave"/>
-      <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc,supervision_casefile,supervision_contract,workflow_supervision"/>
-    </el-select>
-
-    <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
-    <el-button size="mini" @click="resetQuery">重置</el-button>
-
-
-    <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
-
-    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
-                @pagination="getList"/>
-
-    <!-- 审批对话框 -->
-    <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
-      <threestepInfo :businessKey="businessKey" v-if="open2"/>
-      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
-        <el-row type="flex" justify="center">
-          <el-col>
-            <el-form-item label="补充说明" prop="subReason">
-              <el-input type="textarea" v-model="form.subReason" maxlength=100 show-word-limit='true'/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="12">
-            <el-form-item label="渣管负责人">
-              <el-input v-model="form.earthPipPerson"/>
-            </el-form-item>
-          </el-col>
-          <el-col :span="12">
-            <el-form-item label="执法负责人">
-              <el-input v-model="form.enforcePerson"/>
-            </el-form-item>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col>
-            上传补充材料:<a style="color:blue;font-size: 12px;" @click="picSample=true">示意图</a>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center" style="margin-top: 20px;">
+<template>
+  <div class="app-container">
+   <el-select v-model="queryParams.dept" filterable reserve-keyword >
+      <el-option v-for="item in depts" :label="item.name"
+                 :value="item.code" :key="item.code">
+      </el-option>
+    </el-select>
+    <el-select v-model="queryParams.role" filterable reserve-keyword >
+      <el-option v-for="item in roles" :label="item.name"
+                 :value="item.code" :key="item.code">
+      </el-option>
+    </el-select>
+
+    <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
+   <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName"  placeholder="名称">
+      <el-option v-for="item in names" :label="item" :value="item">
+      </el-option>
+    </el-select> -->
+
+    <el-select v-model="queryParams.prev" filterable reserve-keyword  placeholder="上一节点">
+      <el-option v-for="item in prev" :label="item.name" :value="item.name">
+      </el-option>
+    </el-select>
+    <el-select v-model="queryParams.type" filterable reserve-keyword>
+      <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
+      <el-option label="消纳合同申报备案" value="workflow_conract"/>
+      <el-option label="处理场所备案" value="workflow_earthsites"/>
+      <el-option label="运输企业准入流程" value="workflow_company"/>
+      <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
+      <el-option label="驾驶员信息审批" value="workflow_driver"/>
+      <el-option label="报工审批" value="workflow_threestep"/>
+      <el-option label="交办案卷" value="workflow_caseoffline"/>
+      <el-option label="违规案卷处置流程" value="workflow_casefile"/>
+      <el-option label="平台预警信息" value="violation_warning"/>
+      <el-option label="办文办事" value="handleAffairs"/>
+      <el-option label="后勤管理" value="logistics"/>
+      <el-option label="会议事务" value="conference"/>
+      <el-option label="假勤管理" value="workflow_leave"/>
+      <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc,supervision_casefile,supervision_contract,workflow_supervision"/>
+    </el-select>
+
+    <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
+    <el-button size="mini" @click="resetQuery">重置</el-button>
+
+
+    <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
+
+    <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 审批对话框 -->
+    <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
+      <threestepInfo :businessKey="businessKey" v-if="open2"/>
+      <el-form ref="form" :model="form" :rules="rules" label-width="120px">
+        <el-row type="flex" justify="center">
+          <el-col>
+            <el-form-item label="补充说明" prop="subReason">
+              <el-input type="textarea" v-model="form.subReason" maxlength=100 show-word-limit='true'/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col :span="12">
+            <el-form-item label="渣管负责人">
+              <el-input v-model="form.earthPipPerson"/>
+            </el-form-item>
+          </el-col>
+          <el-col :span="12">
+            <el-form-item label="执法负责人">
+              <el-input v-model="form.enforcePerson"/>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col>
+            上传补充材料:<a style="color:blue;font-size: 12px;" @click="picSample=true">示意图</a>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center" style="margin-top: 20px;">
           <el-col :span="6">
-            <span style="color: red;" >*</span>
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
-            <br/>
-            <el-image v-for="item in slides[0]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img0" type="hidden"></el-input>
-            <p v-for="img in form.sub_img0">{{ img.split(":")[0] }}<a @click="removeImage(0,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
+            <span style="color: red;" >*</span>
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
+            <br/>
+            <el-image v-for="item in slides[0]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img0" type="hidden"></el-input>
+            <p v-for="img in form.sub_img0">{{ img.split(":")[0] }}<a @click="removeImage(0,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
           <el-col :span="6">
-            <span style="color: red;" >*</span>
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
-            <br/>
-            <el-image v-for="item in slides[1]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img1" type="hidden"></el-input>
-            <p v-for="img in form.sub_img1">{{ img.split(":")[0] }}<a @click="removeImage(1,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-          <el-col :span="6">
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
-            <br/>
-            <el-image v-for="item in slides[2]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img2" type="hidden"></el-input>
-            <p v-for="img in form.sub_img2">{{ img.split(":")[0] }}<a @click="removeImage(2,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
+            <span style="color: red;" >*</span>
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
+            <br/>
+            <el-image v-for="item in slides[1]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img1" type="hidden"></el-input>
+            <p v-for="img in form.sub_img1">{{ img.split(":")[0] }}<a @click="removeImage(1,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
           <el-col :span="6">
-            <span style="color: red;" >*</span>
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
-            <br/>
-            <el-image v-for="item in slides[3]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img3" type="hidden"></el-input>
-            <p v-for="img in form.sub_img3">{{ img.split(":")[0] }}<a @click="removeImage(3,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
+            <br/>
+            <el-image v-for="item in slides[2]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img2" type="hidden"></el-input>
+            <p v-for="img in form.sub_img2">{{ img.split(":")[0] }}<a @click="removeImage(2,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
           <el-col :span="6">
-            <span style="color: red;" >*</span>
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
-            <br/>
-            <el-image v-for="item in slides[4]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img4" type="hidden"></el-input>
-            <p v-for="img in form.sub_img4">{{ img.split(":")[0] }}<a @click="removeImage(4,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
+            <span style="color: red;" >*</span>
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
+            <br/>
+            <el-image v-for="item in slides[3]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img3" type="hidden"></el-input>
+            <p v-for="img in form.sub_img3">{{ img.split(":")[0] }}<a @click="removeImage(3,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
           <el-col :span="6">
-            <span style="color: red;" >*</span>
-            <a style="color:blue;font-size: 12px;"
-               @click="showFileUpload(5)">{{ form.type == 0 ? "摄像头视频截图1" : "洗车设施照片" }}</a>
-            <br/>
-            <el-image v-for="item in slides[5]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img5" type="hidden"></el-input>
-            <p v-for="img in form.sub_img5">{{ img.split(":")[0] }}<a @click="removeImage(5,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
+            <span style="color: red;" >*</span>
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
+            <br/>
+            <el-image v-for="item in slides[4]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img4" type="hidden"></el-input>
+            <p v-for="img in form.sub_img4">{{ img.split(":")[0] }}<a @click="removeImage(4,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
           <el-col :span="6">
-            <span style="color: red;" v-if="form.type == 0">*</span>
-            <a style="color:blue;font-size: 12px;"
-               @click="showFileUpload(6)">{{ form.type == 0 ? "摄像头视频截图2" : "雾炮机" }}</a>
-            <br/>
-            <el-image v-for="item in slides[6]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img6" type="hidden"></el-input>
-            <p v-for="img in form.sub_img6">{{ img.split(":")[0] }}<a @click="removeImage(6,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
+            <span style="color: red;" >*</span>
+            <a style="color:blue;font-size: 12px;"
+               @click="showFileUpload(5)">{{ form.type == 0 ? "摄像头视频截图1" : "洗车设施照片" }}</a>
+            <br/>
+            <el-image v-for="item in slides[5]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img5" type="hidden"></el-input>
+            <p v-for="img in form.sub_img5">{{ img.split(":")[0] }}<a @click="removeImage(5,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
           <el-col :span="6">
-            <span style="color: red;" >*</span>
-            <a style="color:blue;font-size: 12px;"
-               @click="showFileUpload(7)">{{ form.type == 0 ? "摄像头视频截图3" : "裸露黄土覆盖照片" }}</a>
-            <br/>
-            <el-image v-for="item in slides[7]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img7" type="hidden"></el-input>
-            <p v-for="img in form.sub_img7">{{ img.split(":")[0] }}<a @click="removeImage(7,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-        </el-row>
-        <el-row type="flex" justify="center">
-          <el-col :span="5">
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
-            <br/>
-            <el-image v-for="item in slides[8]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img8" type="hidden"></el-input>
-            <p v-for="img in form.sub_img8">{{ img.split(":")[0] }}<a @click="removeImage(8,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-          <el-col :span="5">
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
-            <br/>
-            <el-image v-for="item in slides[9]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img9" type="hidden"></el-input>
-            <p v-for="img in form.sub_img9">{{ img.split(":")[0] }}<a @click="removeImage(9,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-          <el-col :span="5">
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
-            <br/>
-            <el-image v-for="item in slides[10]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img10" type="hidden"></el-input>
-            <p v-for="img in form.sub_img10">{{ img.split(":")[0] }}<a @click="removeImage(10,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-          <el-col :span="5">
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
-            <br/>
-            <el-image v-for="item in slides[11]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img11" type="hidden"></el-input>
-            <p v-for="img in form.sub_img11">{{ img.split(":")[0] }}<a @click="removeImage(11,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-          <el-col :span="4">
-            <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
-            <br/>
-            <el-image v-for="item in slides[12]"
-                      style="width: 100px; height: 100px; margin: 5px;"
-                      :src="item.url"
-                      :preview-src-list="[item.url]"
-                      :z-index="2000">
-            </el-image>
-            <el-input v-model="form.sub_img12" type="hidden"></el-input>
-            <p v-for="img in form.sub_img12">{{ img.split(":")[0] }}<a @click="removeImage(12,img)" style="color:red">
-              x</a>
-            </p>
-          </el-col>
-        </el-row>
-      </el-form>
-
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-
-    <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
-      <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
-                 :on-success="uploadSuccess" :before-upload="beforeUpload">
-        <el-button size="small" type="primary">选择附件</el-button>
-        <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word png文件</div>
-      </el-upload>
-      <div style="height: 40px;width:100%;">
-        <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">关闭</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog title="示意图" :visible.sync="picSample" append-to-body>
-      <img src="../../../assets/logo/logo.jpg" width="100%" height="800px"/>
-    </el-dialog>
-
-    <!--  会议管理  -->
-    <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
+            <span style="color: red;" v-if="form.type == 0">*</span>
+            <a style="color:blue;font-size: 12px;"
+               @click="showFileUpload(6)">{{ form.type == 0 ? "摄像头视频截图2" : "雾炮机" }}</a>
+            <br/>
+            <el-image v-for="item in slides[6]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img6" type="hidden"></el-input>
+            <p v-for="img in form.sub_img6">{{ img.split(":")[0] }}<a @click="removeImage(6,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+          <el-col :span="6">
+            <span style="color: red;" >*</span>
+            <a style="color:blue;font-size: 12px;"
+               @click="showFileUpload(7)">{{ form.type == 0 ? "摄像头视频截图3" : "裸露黄土覆盖照片" }}</a>
+            <br/>
+            <el-image v-for="item in slides[7]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img7" type="hidden"></el-input>
+            <p v-for="img in form.sub_img7">{{ img.split(":")[0] }}<a @click="removeImage(7,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+        </el-row>
+        <el-row type="flex" justify="center">
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
+            <br/>
+            <el-image v-for="item in slides[8]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img8" type="hidden"></el-input>
+            <p v-for="img in form.sub_img8">{{ img.split(":")[0] }}<a @click="removeImage(8,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
+            <br/>
+            <el-image v-for="item in slides[9]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img9" type="hidden"></el-input>
+            <p v-for="img in form.sub_img9">{{ img.split(":")[0] }}<a @click="removeImage(9,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
+            <br/>
+            <el-image v-for="item in slides[10]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img10" type="hidden"></el-input>
+            <p v-for="img in form.sub_img10">{{ img.split(":")[0] }}<a @click="removeImage(10,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+          <el-col :span="5">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
+            <br/>
+            <el-image v-for="item in slides[11]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img11" type="hidden"></el-input>
+            <p v-for="img in form.sub_img11">{{ img.split(":")[0] }}<a @click="removeImage(11,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+          <el-col :span="4">
+            <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
+            <br/>
+            <el-image v-for="item in slides[12]"
+                      style="width: 100px; height: 100px; margin: 5px;"
+                      :src="item.url"
+                      :preview-src-list="[item.url]"
+                      :z-index="2000">
+            </el-image>
+            <el-input v-model="form.sub_img12" type="hidden"></el-input>
+            <p v-for="img in form.sub_img12">{{ img.split(":")[0] }}<a @click="removeImage(12,img)" style="color:red">
+              x</a>
+            </p>
+          </el-col>
+        </el-row>
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+
+    <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
+      <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
+                 :on-success="uploadSuccess" :before-upload="beforeUpload">
+        <el-button size="small" type="primary">选择附件</el-button>
+        <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word png文件</div>
+      </el-upload>
+      <div style="height: 40px;width:100%;">
+        <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">关闭</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog title="示意图" :visible.sync="picSample" append-to-body>
+      <img src="../../../assets/logo/logo.jpg" width="100%" height="800px"/>
+    </el-dialog>
+
+    <!--  会议管理  -->
+    <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
       <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
-      
-      
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
-        <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <!--  请假申请  -->
-    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
-               :close-on-click-modal="false">
-      <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
-        <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-
-    <el-dialog :title="title" :visible.sync="construct" width="1500px" append-to-body>
-      <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
-       <div v-for="item in this.form.formData">
-         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-       </div>
-
-
-     <el-table :data="hisfromData" v-if="hisfromData != null">
-       <el-table-column label="处理意见" align="center" prop="controlValue"/>
-       <el-table-column label="处理人" align="center" prop="createName"/>
-       <el-table-column label="处理时间" align="center" prop="createTime"/>
-     </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="earthsites" width="1500px" append-to-body>
-      <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
-      <div v-for="item in this.form.formData">
-        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-      </div>
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="contract" width="1500px" append-to-body>
-      <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
-
-      <div v-for="item in this.form.formData">
-        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-      </div>
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <!--  后勤管理  -->
-    <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
-               :close-on-click-modal="false">
-      <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
-        <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <!--  办文办事  -->
-    <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body
-               :close-on-click-modal="false">
-      <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen"
-                  :businessKey="definitionKey"
-                  :controlId="controlId"/>
-      <el-form label-width="110px" v-if="definitionKey=='yuelan'">
-        <el-form-item label="阅览部门:">
-          <el-select ref="formDeptNameRef" v-model="deptName" placeholder="请选择部门" style="width: 100% "
-                     @change="changeDepts">
-            <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="阅览人:">
-          <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择" @select="handleSelect"/>
-        </el-form-item>
-      </el-form>
-      <div v-for="item in this.form.formData">
-          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                    placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-        </div>
-
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-
-      <div slot="footer" class="dialog-footer">
-        <div slot="footer" class="dialog-footer">
-          <el-button type="danger" @click="handleAffairsSubmitForm(1)"
-                     v-if="controlId!='FormProperty_11p96vq' && controlId!='FormProperty_0d6ngk1' && definitionKey!='yuelanxuexi' && definitionKey!='yuelan'">
-            驳回
-          </el-button>
-          <el-button type="primary" @click="handleAffairsSubmitForm(0)">通过</el-button>
-        </div>
-      </div>
-    </el-dialog>
-
-    <!--  线下案卷交办  -->
-    <el-dialog :title="title" :visible.sync="caseOffline" width="600px" append-to-body :close-on-click-modal="false">
-      <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
-      <el-form v-if="caseOffline" label-width="120px">
-        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
-        </el-input>
-        <el-upload multiple :headers="upload.headers" :action="upload.url"
-                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
-                   :show-file-list="false"
-                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
-          <el-button size="small" type="primary">选择附件</el-button>
-          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
-        </el-upload>
-        <el-image v-for="item in slides1"
-                  style="width: 150px; height: 100px; margin: 5px;"
-                  :src="item.url"
-                  :preview-src-list="[item.url]"
-                  :z-index="2000">
-        </el-image>
-        <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
-             v-for="item in videoSrc1">
-          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
-        </div>
-        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
-          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
-
-      </el-form>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
-                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
-        </el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <!--  平台违规信息  -->
-    <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body
-               :close-on-click-modal="false">
-      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile" :entryType="0"/>
-      <el-form v-if="violationCaseFile" label-width="120px">
-        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
-        </el-input>
-        <el-upload multiple :headers="upload.headers" :action="upload.url"
-                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
-                   :show-file-list="false"
-                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
-          <el-button size="small" type="primary">选择附件</el-button>
-          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
-        </el-upload>
-        <el-image v-for="item in slides1"
-                  style="width: 150px; height: 100px; margin: 5px;"
-                  :src="item.url"
-                  :preview-src-list="[item.url]"
-                  :z-index="2000">
-        </el-image>
-        <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
-             v-for="item in videoSrc1">
-          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
-        </div>
-        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
-          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
-
-      </el-form>
-
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
-                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
-        </el-button>
-        <el-button type="primary"
-
-        v-loading.fullscreen.lock="modalLoading"
-        @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <!--  违规预警信息  -->
-    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body
-               :close-on-click-modal="false">
-      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1" :entryType="0"/>
-      <el-form v-if="violationCaseFile1" label-width="120px">
-        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
-        </el-input>
-        <el-upload multiple :headers="upload.headers" :action="upload.url"
-                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
-                   :show-file-list="false"
-                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
-          <el-button size="small" type="primary">选择附件</el-button>
-          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
-        </el-upload>
-        <el-image v-for="item in slides1"
-                  style="width: 150px; height: 100px; margin: 5px;"
-                  :src="item.url"
-                  :preview-src-list="[item.url]"
-                  :z-index="2000">
-        </el-image>
-        <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
-             v-for="item in videoSrc1">
-          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
-        </div>
-        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
-          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
-      </el-form>
-
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
-                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
-        </el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body
-               :close-on-click-modal="false">
-      <supervisionInfo :infoData="supervisionData" v-if="supervisionOpen"/>
-
-      <div v-for="item in this.form.formData">
-        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-      </div>
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="company" width="1500px" append-to-body :close-on-click-modal="false">
-      <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
-      <div v-for="item in this.form.formData">
-        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-      </div>
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="vehicle" width="1500px" append-to-body :close-on-click-modal="false">
-      <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
-      <div v-for="item in this.form.formData">
-        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-      </div>
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-    <el-dialog :title="title" :visible.sync="driver" width="1500px" append-to-body :close-on-click-modal="false">
-      <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
-      <div v-for="item in this.form.formData">
-        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
-                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
-      </div>
-
-      <el-table :data="hisfromData" v-if="hisfromData != null">
-
-        <el-table-column label="处理意见" align="center" prop="controlValue"/>
-        <el-table-column label="处理人" align="center" prop="createName"/>
-        <el-table-column label="处理时间" align="center" prop="createTime"/>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
-        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
-      </div>
-    </el-dialog>
-
-  </div>
-</template>
-
-<style>
-@import '../../../assets/css/task.css';
-</style>
-
-<script>
-  import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
-  import {historyFromData} from '@/api/activiti/historyFormdata'
-  import {addSign, getSignByObjId} from "@/api/sign/sign";
-  import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
-  import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
-  import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
-  import {getDict, getSupervision, getUsers} from "@/api/dict";
-  import {activeThreestep} from "@/api/business/threestep";
-  import {getToken} from "@/utils/auth";
-  import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
-  import {updateHandleAffairs} from "@/api/office/handle";
-  import Treeselect from "@riophae/vue-treeselect";
-  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
-  import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
-  import threestepInfo from "@/views/business/threestep/threestepInfo";
-  import taskCard from "@/views/activiti/task/taskCard";
-  import conferenceInfo from "@/views/office/conference/conferenceInfo";
-  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
-  import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
-  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
-  import contractInfo from "@/views/activiti/task/contractInfo";
-  import logisticsInfo from "@/views/office/logistics/logisticsInfo";
-  import handleInfo from "@/views/office/handle/handleInfo";
-  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
-  import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
-  import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
-  import supervisionInfo from "@/views/activiti/task/SupervisionInfo";
-  import companyInfo from "@/views/activiti/task/companyInfo";
-  import driverInfo from "@/views/activiti/task/driverInfo";
-  import vehicleInfo from "@/views/activiti/task/vehicleInfo";
-
-  import taskmethod from '@/api/taskmethod'
-
-  export default {
-    name: "task",
-    mixins: [taskmethod],
-    components: {
-      taskCard,
-      leaveHistoryForm,
-      threestepInfo,
-      conferenceInfo,
-      leaveApplicationInfo,
-      logisticsInfo,
-      handleInfo,
-      constructsiteInfo,
-      Treeselect,
-      earthsitesInfo,
-      contractInfo,
-      caseOfflineInfo,
-      violationCaseFileInfo,
-      violationWarningInformationInfo,
-      supervisionInfo,
-      companyInfo,
-      driverInfo,
-      vehicleInfo
-    },
-    data() {
-      return {
-        modalLoading:false,
-        id: '',
-        definitionKey: '',
-        businessKey: '',
-        // 遮罩层
-        loading: true,
-        // 选中数组
-        ids: [],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        // 请假表格数据
-        taskList: [],
-        // 弹出层标题
-        title: "",
-        // 是否显示弹出层
-        picSample: false,
-        taskName: null,
-        // 查询参数
-        queryParams: {
-          name:null,
-          pageNum: 1,
-          pageSize: 10,
-          role: null,
-          dept: null,
-        },
-        // 表单参数
-        form: {
-          formData: []
-        },
-        needShow: false,
-        // 表单校验
-        rules: {
-          subReason: [{
-            required: true,
-            message: '请填写补充说明',
-            trigger: 'blur'
-          },],
-
-        },
-        picIndex: 0,
-        fileList: [],
-        upload: {
-          // 是否显示弹出层（用户导入）
-          open: false,
-          // 弹出层标题（用户导入）
-          title: "",
-          // 是否禁用上传
-          isUploading: false,
-          // 设置上传的请求头部
-          headers: {
-            Authorization: "Bearer " + getToken()
-          },
-          // 上传的地址
-          url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
-        },
-        controlId: null,
-        users: [],
-        options: [],
-        usersName: [],
-        deptName: null,
-        supervisionData: null,
-        uploadImageDialog: false,
-        idInfo: null,
-        signData: null,
-        areas: [],
-        roles: [],
-        depts: [],
-        signDataInfo: null,
-        earthsites: false,
-        contract: false,
-        logisticsInfoOpen: false,
-        handleAffairsInfoOpen: false,
-        caseOffline: false,
-        violationCaseFile: false,
-        violationCaseFile1: false,
-        supervisionOpen: false,
-        open: false,
-        open2: false,
-        conferenceOpen: false,
-        construct: false,
-        leaveApplicationOpen: false,
-        prev:[],
-        userNodes: [],
-        company: false,
-        driver: false,
-        vehicle: false,
-        names: null,
-        hisfromData: [],
-        slides: [],
-        slidesArys: [],
-        slides1: [],
-        videoSrc1: [],
-      };
-    },
-    created() {
-      let dep = {type: "CSUserDepartmentType"};
-
-      getDict(dep).then(res => {
-        this.depts = res.result;
-        for(let i in res.result){
-          if(res.result[i].name.indexOf("渣土办") < 1){
-            this.prev.push(res.result[i]);
-          }
-        }
-      });
-
-      let role = {type: "CSUserPostType"};
-
-      getDict(role).then(res => {
-        this.roles = res.result;
-      });
-
-      listTask(this.queryParams).then(response => {
-        this.taskList = response.rows;
-        this.names = response.names;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    methods: {
-
-    },
-  }
-
-</script>
+
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+<!--      <el-table :data="hisfromData" v-if="hisfromData != null">-->
+
+<!--        <el-table-column label="处理意见" align="center" prop="controlValue"/>-->
+<!--        <el-table-column label="处理人" align="center" prop="createName"/>-->
+<!--        <el-table-column label="处理时间" align="center" prop="createTime"/>-->
+<!--      </el-table>-->
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
+        <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!--  请假申请  -->
+    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
+               :close-on-click-modal="false">
+      <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
+        <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+
+    <el-dialog :title="title" :visible.sync="construct" width="1500px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
+       <div v-for="item in this.form.formData">
+         <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                   placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+       </div>
+
+
+     <el-table :data="hisfromData" v-if="hisfromData != null">
+       <el-table-column label="处理意见" align="center" prop="controlValue"/>
+       <el-table-column label="处理人" align="center" prop="createName"/>
+       <el-table-column label="处理时间" align="center" prop="createTime"/>
+     </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="earthsites" width="1500px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="contract" width="1500px" append-to-body>
+      <companyInfo :businessKey="businessKey" :businessType="4"   v-if="contract"/>
+
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!--  后勤管理  -->
+    <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
+               :close-on-click-modal="false">
+      <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <div v-for="item in this.form.formData">
+          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                    placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+        </div>
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
+        <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!--  办文办事  -->
+    <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body
+               :close-on-click-modal="false">
+      <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen"
+                  :businessKey="definitionKey"
+                  :controlId="controlId"/>
+      <el-form label-width="110px" v-if="definitionKey=='yuelan'">
+        <el-form-item label="阅览部门:">
+          <el-select ref="formDeptNameRef" v-model="deptName" placeholder="请选择部门" style="width: 100% "
+                     @change="changeDepts">
+            <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="阅览人:">
+          <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择" @select="handleSelect"/>
+        </el-form-item>
+      </el-form>
+      <div v-for="item in this.form.formData">
+          <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                    placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+        </div>
+
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <div slot="footer" class="dialog-footer">
+          <el-button type="danger" @click="handleAffairsSubmitForm(1)"
+                     v-if="controlId!='FormProperty_11p96vq' && controlId!='FormProperty_0d6ngk1' && definitionKey!='yuelanxuexi' && definitionKey!='yuelan'">
+            驳回
+          </el-button>
+          <el-button type="primary" @click="handleAffairsSubmitForm(0)">通过</el-button>
+        </div>
+      </div>
+    </el-dialog>
+
+    <!--  线下案卷交办  -->
+    <el-dialog :title="title" :visible.sync="caseOffline" width="600px" append-to-body :close-on-click-modal="false">
+      <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
+      <el-form v-if="caseOffline" label-width="120px">
+        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+        </el-input>
+        <el-upload multiple :headers="upload.headers" :action="upload.url"
+                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
+                   :show-file-list="false"
+                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
+          <el-button size="small" type="primary">选择附件</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
+        </el-upload>
+        <el-image v-for="item in slides1"
+                  style="width: 150px; height: 100px; margin: 5px;"
+                  :src="item.url"
+                  :preview-src-list="[item.url]"
+                  :z-index="2000">
+        </el-image>
+        <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+             v-for="item in videoSrc1">
+          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+        </div>
+        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
+          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
+
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
+                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
+        </el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!--  平台违规信息  -->
+    <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body
+               :close-on-click-modal="false">
+      <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile" :entryType="0"/>
+      <el-form v-if="violationCaseFile" label-width="120px">
+        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+        </el-input>
+        <el-upload multiple :headers="upload.headers" :action="upload.url"
+                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
+                   :show-file-list="false"
+                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
+          <el-button size="small" type="primary">选择附件</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
+        </el-upload>
+        <el-image v-for="item in slides1"
+                  style="width: 150px; height: 100px; margin: 5px;"
+                  :src="item.url"
+                  :preview-src-list="[item.url]"
+                  :z-index="2000">
+        </el-image>
+        <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+             v-for="item in videoSrc1">
+          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+        </div>
+        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
+          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
+
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
+                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
+        </el-button>
+        <el-button type="primary"
+
+        v-loading.fullscreen.lock="modalLoading"
+        @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <!--  违规预警信息  -->
+    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body
+               :close-on-click-modal="false">
+      <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1" :entryType="0"/>
+      <el-form v-if="violationCaseFile1" label-width="120px">
+        <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
+        </el-input>
+        <el-upload multiple :headers="upload.headers" :action="upload.url"
+                   accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
+                   :show-file-list="false"
+                   :on-success="uploadSuccess1" :before-upload="beforeUpload">
+          <el-button size="small" type="primary">选择附件</el-button>
+          <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
+        </el-upload>
+        <el-image v-for="item in slides1"
+                  style="width: 150px; height: 100px; margin: 5px;"
+                  :src="item.url"
+                  :preview-src-list="[item.url]"
+                  :z-index="2000">
+        </el-image>
+        <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
+             v-for="item in videoSrc1">
+          <video width="100%" controls="controls" height="100%" :src="item.url"></video>
+        </div>
+        <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
+          @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
+      </el-form>
+
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
+                   v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
+        </el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body
+               :close-on-click-modal="false">
+      <supervisionInfo :infoData="supervisionData" v-if="supervisionOpen"/>
+
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="company" width="1500px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="vehicle" width="1500px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+    <el-dialog :title="title" :visible.sync="driver" width="1500px" append-to-body :close-on-click-modal="false">
+      <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
+      <div v-for="item in this.form.formData">
+        <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
+                  placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
+      </div>
+
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
+        <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<style>
+@import '../../../assets/css/task.css';
+</style>
+
+<script>
+  import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
+  import {historyFromData} from '@/api/activiti/historyFormdata'
+  import {addSign, getSignByObjId} from "@/api/sign/sign";
+  import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
+  import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
+  import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
+  import {getDict, getSupervision, getUsers} from "@/api/dict";
+  import {activeThreestep} from "@/api/business/threestep";
+  import {getToken} from "@/utils/auth";
+  import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+  import {updateHandleAffairs} from "@/api/office/handle";
+  import Treeselect from "@riophae/vue-treeselect";
+  import '@riophae/vue-treeselect/dist/vue-treeselect.css'
+  import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
+  import threestepInfo from "@/views/business/threestep/threestepInfo";
+  import taskCard from "@/views/activiti/task/taskCard";
+  import conferenceInfo from "@/views/office/conference/conferenceInfo";
+  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
+  import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
+  import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
+  import contractInfo from "@/views/activiti/task/contractInfo";
+  import logisticsInfo from "@/views/office/logistics/logisticsInfo";
+  import handleInfo from "@/views/office/handle/handleInfo";
+  import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
+  import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
+  import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
+  import supervisionInfo from "@/views/activiti/task/SupervisionInfo";
+  import companyInfo from "@/views/activiti/task/companyInfo";
+  import driverInfo from "@/views/activiti/task/driverInfo";
+  import vehicleInfo from "@/views/activiti/task/vehicleInfo";
+
+  import taskmethod from '@/api/taskmethod'
+
+  export default {
+    name: "task",
+    mixins: [taskmethod],
+    components: {
+      taskCard,
+      leaveHistoryForm,
+      threestepInfo,
+      conferenceInfo,
+      leaveApplicationInfo,
+      logisticsInfo,
+      handleInfo,
+      constructsiteInfo,
+      Treeselect,
+      earthsitesInfo,
+      contractInfo,
+      caseOfflineInfo,
+      violationCaseFileInfo,
+      violationWarningInformationInfo,
+      supervisionInfo,
+      companyInfo,
+      driverInfo,
+      vehicleInfo
+    },
+    data() {
+      return {
+        modalLoading:false,
+        id: '',
+        definitionKey: '',
+        businessKey: '',
+        // 遮罩层
+        loading: true,
+        // 选中数组
+        ids: [],
+        // 非单个禁用
+        single: true,
+        // 非多个禁用
+        multiple: true,
+        // 显示搜索条件
+        showSearch: true,
+        // 总条数
+        total: 0,
+        // 请假表格数据
+        taskList: [],
+        // 弹出层标题
+        title: "",
+        // 是否显示弹出层
+        picSample: false,
+        taskName: null,
+        // 查询参数
+        queryParams: {
+          name:null,
+          pageNum: 1,
+          pageSize: 10,
+          role: null,
+          dept: null,
+        },
+        // 表单参数
+        form: {
+          formData: []
+        },
+        needShow: false,
+        // 表单校验
+        rules: {
+          subReason: [{
+            required: true,
+            message: '请填写补充说明',
+            trigger: 'blur'
+          },],
+
+        },
+        picIndex: 0,
+        fileList: [],
+        upload: {
+          // 是否显示弹出层（用户导入）
+          open: false,
+          // 弹出层标题（用户导入）
+          title: "",
+          // 是否禁用上传
+          isUploading: false,
+          // 设置上传的请求头部
+          headers: {
+            Authorization: "Bearer " + getToken()
+          },
+          // 上传的地址
+          url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
+        },
+        controlId: null,
+        users: [],
+        options: [],
+        usersName: [],
+        deptName: null,
+        supervisionData: null,
+        uploadImageDialog: false,
+        idInfo: null,
+        signData: null,
+        areas: [],
+        roles: [],
+        depts: [],
+        signDataInfo: null,
+        earthsites: false,
+        contract: false,
+        logisticsInfoOpen: false,
+        handleAffairsInfoOpen: false,
+        caseOffline: false,
+        violationCaseFile: false,
+        violationCaseFile1: false,
+        supervisionOpen: false,
+        open: false,
+        open2: false,
+        conferenceOpen: false,
+        construct: false,
+        leaveApplicationOpen: false,
+        prev:[],
+        userNodes: [],
+        company: false,
+        driver: false,
+        vehicle: false,
+        names: null,
+        hisfromData: [],
+        slides: [],
+        slidesArys: [],
+        slides1: [],
+        videoSrc1: [],
+      };
+    },
+    created() {
+      let dep = {type: "CSUserDepartmentType"};
+
+      getDict(dep).then(res => {
+        this.depts = res.result;
+        for(let i in res.result){
+          if(res.result[i].name.indexOf("渣土办") < 1){
+            this.prev.push(res.result[i]);
+          }
+        }
+      });
+
+      let role = {type: "CSUserPostType"};
+
+      getDict(role).then(res => {
+        this.roles = res.result;
+      });
+
+      listTask(this.queryParams).then(response => {
+        this.taskList = response.rows;
+        this.names = response.names;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    methods: {
+
+    },
+  }
+
+</script>
@@ -20,13 +20,15 @@
         <el-select v-model="queryParams.type" placeholder="请选择请假类型"  size="small">
           <el-option label="事假" value="事假"/>
           <el-option label="病假" value="病假"/>
-          <el-option label="年假" value="年假"/>
           <el-option label="婚假" value="婚假"/>
           <el-option label="产假" value="产假"/>
           <el-option label="丧假" value="丧假"/>
-          <el-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-form-item>
@@ -109,13 +111,15 @@
           <el-select v-model="form.type" 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-option label="公休假" value="公休假"/>
             <el-option label="护理假" value="护理假"/>
+            <el-option label="亲子假" value="亲子假"/>
+            <el-option label="育儿假" value="育儿假"/>
+            <el-option label="其他" value="其他"/>
           </el-select>
         </el-form-item>
@@ -201,7 +205,8 @@
   </div>
 </template>
-<script src="@/api/leave.js"/>
+<script src="@/api/leave.js">
+</script>
 <style scope>
   .el-select-dropdown__item{
     width:300px;
@@ -10,12 +10,15 @@
         <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true">
           <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-option label="护理假" value="护理假"/>
+          <el-option label="亲子假" value="亲子假"/>
+          <el-option label="育儿假" value="育儿假"/>
+          <el-option label="其他" value="其他"/>
         </el-select>
       </el-form-item>
@@ -45,11 +48,12 @@
         <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/>
       </el-form-item>
       <el-form-item label="附件图片预览" v-if="slide1.length!=0">
-        <el-image v-for="item in slide1"
+        <el-image v-for="(item, index) in slide1"
                   style="width: 150px; height: 100px; margin: 5px;"
                   :src="item"
                   :preview-src-list="slide1"
-                  :z-index="2000">
+                  :z-index="2000"
+                  :key="index">
         </el-image>
       </el-form-item>
       <el-table :data="fileEntityList">
@@ -67,6 +71,11 @@
           </template>
         </el-table-column>
       </el-table>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
     </el-form>
   </div>
 </template>
@@ -74,7 +83,7 @@
 <script>
 import {getLeaveApplication} from "@/api/office/leaveApplication";
 import Editor from '@/components/ZcEditor';
-import {getBase64} from "@/api/business/threestep";
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "leaveApplicationInfo",
@@ -93,7 +102,9 @@ export default {
       fileEntityList: [],
       showPic: null,
       picImage: null,
-      slide1: []
+      slide1: [],
+      taskNodeName:null,
+      hisfromData:[]
     }
   },
   created() {
@@ -103,13 +114,19 @@ export default {
     init() {
       getLeaveApplication(this.idInfo).then(response => {
         this.form = response.data.leaveApplication;
+        historyFromData("workflow_leave:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
         this.fileEntityList.map(item => {
-          if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
+          if (item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1) {
             this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
           }
-        })
+        });
+        //this.$set(this.form,"taskNodeName",this.form.taskNodeName)
       });
     },
     /** 文件下载 */
@@ -122,6 +139,12 @@ export default {
       a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
       a.click()
     },
+
+    getHistoryData(){
+      historyFromData("workflow_leave:" + this.idInfo).then(response => {
+        return response.data[response.data.length - 1].taskNodeName;
+      })
+    }
   }
 }
 </script>
@@ -64,12 +64,21 @@
         </el-table-column>
       </el-table>
     </el-row>
+    <el-row>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+    </el-row>
   </el-form>
 </template>
 <script>
 import {getConference} from "@/api/office/conference";
 import Editor from '@/components/ZcEditor';
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "conferenceInfo",
   components: {Editor},
@@ -85,7 +94,8 @@ export default {
     return {
       form: {},
       fileEntityList:[],
-      slide1:[]
+      slide1:[],
+      hisfromData:[]
     }
   },
   created() {
@@ -95,6 +105,11 @@ export default {
     init(){
       getConference(this.idInfo).then(response => {
         this.form = response.data.conference;
+        historyFromData("conference:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
         let files = JSON.stringify(response.data.uploadFiles);
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
         this.fileEntityList.map(item => {
@@ -114,12 +114,20 @@
         </el-table-column>
       </el-table>
     </el-row>
+    <el-row>
+      <el-table :data="hisfromData" v-if="hisfromData != null">
+        <el-table-column label="处理意见" align="center" prop="controlValue"/>
+        <el-table-column label="处理人" align="center" prop="createName"/>
+        <el-table-column label="处理时间" align="center" prop="createTime"/>
+      </el-table>
+    </el-row>
   </el-form>
 </template>
 <script>
 import {getHandle} from "@/api/office/handle";
 import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "handleInfo",
@@ -168,7 +176,8 @@ export default {
           "name": "治理部"
         },
       ],
-      slide1:[]
+      slide1:[],
+      hisfromData:[]
     }
   },
   created() {
@@ -179,6 +188,21 @@ export default {
       getHandle(this.idInfo).then(response => {
         this.form = response.data.handleAffairs;
         let files = JSON.stringify(response.data.uploadFiles);
+        historyFromData("handleAffairs:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
+        historyFromData("gongwenchuli:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
+        historyFromData("yuelan:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
         this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
         this.fileEntityList.map(item => {
           if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
@@ -20,13 +20,15 @@
         <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
           <el-option label="事假" value="事假"/>
           <el-option label="病假" value="病假"/>
-          <el-option label="年假" value="年假"/>
           <el-option label="婚假" value="婚假"/>
           <el-option label="产假" value="产假"/>
           <el-option label="丧假" value="丧假"/>
+          <el-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-form-item>
@@ -155,13 +157,15 @@
           <el-select v-model="form.type" 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-option label="护理假" value="护理假"/>
-            <el-option label="公休假" value="公休假"/>
+            <el-option label="亲子假" value="亲子假"/>
+            <el-option label="育儿假" value="育儿假"/>
+            <el-option label="其他" value="其他"/>
           </el-select>
         </el-form-item>
@@ -10,12 +10,15 @@
         <el-select v-model="form.type" placeholder="请选择请假类型" style="width: 100%" :disabled="true">
           <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-option label="护理假" value="护理假"/>
+          <el-option label="亲子假" value="亲子假"/>
+          <el-option label="育儿假" value="育儿假"/>
+          <el-option label="其他" value="其他"/>
         </el-select>
       </el-form-item>
@@ -45,11 +48,12 @@
         <el-input v-model="form.content" type="textarea" :rows="4" :disabled="true"/>
       </el-form-item>
       <el-form-item label="附件图片预览" v-if="slide1.length!=0">
-        <el-image v-for="item in slide1"
+        <el-image v-for="(item, index) in slide1"
                   style="width: 150px; height: 100px; margin: 5px;"
                   :src="item"
                   :preview-src-list="slide1"
-                  :z-index="2000">
+                  :z-index="2000"
+                  :key="index">
         </el-image>
       </el-form-item>
       <el-table :data="fileEntityList">
@@ -109,7 +113,7 @@ export default {
           if(item.url.indexOf(".jpg") > -1 || item.url.indexOf(".png") > -1 || item.url.indexOf(".jpeg") > -1 || item.url.indexOf(".jpg") > -1){
             this.slide1.push(process.env.VUE_APP_BASE_API + item.url);
           }
-        })
+        });
       });
     },
     /** 文件下载 */
@@ -54,12 +54,18 @@
                 :disabled="true"
                 @input="form.quantity=form.quantity.replace(/[^0-9]/g,'');"/>
     </el-form-item>
+    <el-table :data="hisfromData" v-if="hisfromData != null">
+      <el-table-column label="处理意见" align="center" prop="controlValue"/>
+      <el-table-column label="处理人" align="center" prop="createName"/>
+      <el-table-column label="处理时间" align="center" prop="createTime"/>
+    </el-table>
   </el-form>
 </template>
 <script>
 import {getLogistics} from "@/api/office/logistics";
 import {getDict} from "@/api/dict";
+import {historyFromData} from "@/api/activiti/historyFormdata";
 export default {
   name: "logisticsInfo",
   props: {
@@ -74,7 +80,8 @@ export default {
     return {
       form: {},
       type:null,
-      depts:[]
+      depts:[],
+      hisfromData:[]
     }
   },
   created() {
@@ -89,6 +96,11 @@ export default {
       getLogistics(this.idInfo).then(response => {
         this.form = response.data
         this.type = response.data.type;
+        historyFromData("logistics:" + this.idInfo).then(response => {
+          for(let i in response.data){
+            this.hisfromData.push(response.data[i]);
+          }
+        })
       });
     }
   }
@@ -12,9 +12,9 @@
       </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-option label="轻型货车" value="轻型货车" />
+          <el-option label="中型货车" value="中型货车" />
+          <el-option label="大中型货车" value="大中型货车" />
         </el-select>
       </el-form-item>
       <el-form-item label="车牌号" prop="carCode">
@@ -17,9 +17,9 @@
         <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-option label="轻型货车" value="轻型货车" />
+              <el-option label="中型货车" value="中型货车" />
+              <el-option label="大中型货车" value="大中型货车" />
             </el-select>
           </el-form-item>
         </el-col>
@@ -672,7 +672,7 @@ export default {
             form.lengthWidthHeight = form.length+";"+form.width+";"+form.height;
           }else{
             this.$message({
-              message: '请填写长宽高！',
+              message: '请在体积下拉框选择长宽高填写！',
               type: 'warning'
             });
             return;
 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;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
 /**
  * 运输车辆管理Mapper接口
@@ -30,6 +31,8 @@ public interface CarInfoMapper
      */
     List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo);
+    List<CarInfoVo> selectByCompanyId(@Param("companyId") Long companyId);
+
     /**
      * 新增运输车辆管理
      * 
 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;
+import java.io.IOException;
+import java.util.List;
+
 /**
  * 运输车辆管理Service接口
  * 
@@ -30,6 +31,8 @@ public interface ICarInfoService
      */
     List<CarInfoVo> selectCarInfoList(CarInfoVo carInfo);
+    List<CarInfoVo> selectByCompanyId(Long companyId);
+
     /**
      * 新增运输车辆管理
      *
 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.CarInfo;
 import com.trash.carInfo.domain.vo.CarInfoVo;
+import com.trash.carInfo.mapper.CarInfoMapper;
+import com.trash.carInfo.service.ICarInfoService;
 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 java.io.IOException;
+import java.util.List;
+
 import static com.trash.common.utils.file.FileUploadUtils.upload;
 /**
@@ -59,6 +58,11 @@ public class CarInfoServiceImpl implements ICarInfoService
         return carInfoMapper.selectCarInfoList(carInfo);
     }
+    @Override
+    public List<CarInfoVo> selectByCompanyId(Long companyId) {
+        return carInfoMapper.selectByCompanyId(companyId);
+    }
+
     /**
      * 新增运输车辆管理
      *
@@ -149,6 +149,13 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <include refid="selectCarInfoVo"/>
         where id = #{id}
     </select>
+    
+    
+    <select id="selectByCompanyId" parameterType="Long" resultMap="CarInfoVoResult">
+        <include refid="selectCarInfoForCompanyVo"/>
+        where car.company_id=#{companyId}
+    </select>
+    
     <insert id="insertCarInfo" parameterType="CarInfo" useGeneratedKeys="true" keyProperty="id">
         insert into car_info
@@ -31,28 +31,13 @@ public class ConferenceEndListener implements ExecutionListener {
         if("1".equals(status)){
             //设置为通过状态
             conference.setStatus(1);
-            //添加后勤管理（通过状态）
+            //修改后勤管理（通过状态）
             conferenceMapper.updateConference(conference);
         }else if("2".equals(status)){
             //设置为驳回状态
             conference.setStatus(2);
-            //删除当前后勤管理
-            conferenceMapper.deleteConferenceById(conference.getId());
-            //添加后勤管理（驳回状态）
-            conferenceMapper.insertConference(conference);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("conference");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(conference.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
+            //修改后勤管理（驳回状态）
+            conferenceMapper.updateConference(conference);
         }
         //流程历史存档
         WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
@@ -70,23 +70,8 @@ public class HandleAffairsEndListener implements ExecutionListener {
             //信访部门重置为null
             handleAffairs.setDeptId(null);
             handleAffairs.setDeptName(null);
-            //删除当前办文办事
-            handleAffairsMapper.deleteHandleAffairsById(id);
-            //添加办文办事（驳回状态）
-            handleAffairsMapper.insertHandleAffairs(handleAffairs);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("handle_affairs");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(handleAffairs.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
+            //修改办文办事（驳回状态）
+            handleAffairsMapper.updateHandleAffairs(handleAffairs);
         }else if ("3".equals(status)){
             //将部门id，部门名称，意见设置为null
             handleAffairs.setOpinion(null);
@@ -44,23 +44,7 @@ public class HandleAffairsTwoEndListener implements ExecutionListener {
             //信访部门重置为null
             handleAffairs.setDeptId(null);
             handleAffairs.setDeptName(null);
-            //删除当前办文办事
-            handleAffairsMapper.deleteHandleAffairsById(id);
-            //添加办文办事（驳回状态）
-            handleAffairsMapper.insertHandleAffairs(handleAffairs);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("handle_affairs");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(handleAffairs.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
+            handleAffairsMapper.updateHandleAffairs(handleAffairs);
         }
         workflowUtils.sendDataToHisTory(delegateExecution,state);
     }
@@ -36,10 +36,8 @@ public class LogisticsEndListener implements ExecutionListener {
         }else if("2".equals(status)){
             //设置为驳回状态
             logisticsManagement.setStatus(2);
-            //删除当前后勤管理
-            logisticsManagementMapper.deleteLogisticsManagementById(id);
-            //添加后勤管理（驳回状态）
-            logisticsManagementMapper.insertLogisticsManagement(logisticsManagement);
+            //修改当前后勤管理
+            logisticsManagementMapper.updateLogisticsManagement(logisticsManagement);
         }
         //流程历史存档
         WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
@@ -45,22 +45,8 @@ public class leaveEndListener implements ExecutionListener {
             //设置为驳回状态
             leaveApplication.setStatus(2);
             //删除当前请假申请
-            leaveApplicationMapper.deleteLeaveApplicationById(id);
+            leaveApplicationMapper.updateLeaveApplication(leaveApplication);
-            //获取上传文件
-            UploadFileMapper uploadFileMapper = SpringUtils.getBean(UploadFileMapper.class);
-            //查出旧的文件上传数据
-            UploadFile uploadFile = new UploadFile();
-            uploadFile.setTableName("leave_application");
-            uploadFile.setTableNumber(id.toString());
-            List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
-            //添加请假申请（驳回状态）
-            leaveApplicationMapper.insertLeaveApplication(leaveApplication);
-            for (UploadFile uploadFile1 : list) {
-                //将上传文件的表id 设置为新的请假申请id
-                uploadFile1.setTableNumber(leaveApplication.getId().toString());
-                uploadFileMapper.updateUploadFile(uploadFile1);
-            }
         }
         WorkflowMapper workflowMapper = SpringUtils.getBean(WorkflowMapper.class);
@@ -4,6 +4,7 @@ import java.io.IOException;
 import java.util.List;
 import java.util.stream.Collectors;
+import com.trash.common.core.domain.entity.SysUser;
 import com.trash.common.utils.DateUtils;
 import com.trash.common.utils.SecurityUtils;
 import com.trash.common.utils.file.FileUploadUtils;
@@ -204,7 +205,8 @@ public class LeaveApplicationServiceImpl implements ILeaveApplicationService
      * @param leaveApplication
      */
     public void initiatingProcess(LeaveApplication leaveApplication){
-        List<String> roleIds = SecurityUtils.getLoginUser().getUser().getRoleIds();
+        SysUser sysUser = SecurityUtils.getLoginUser().getUser();
+        List<String> roleIds = sysUser.getPostIds();
         Integer roleId = 0;
         for (String role : roleIds){
             //如果是角色id为3的则为部长或部长以上