m

youxiw2000
1 parent c8bdb389
Showing 19 changed files with 228 additions and 659 deletions
sql/kafka_compensation.sql
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
trash-ui/src/layout/index.vue
trash-ui/src/layout/index5.vue
trash-ui/src/views/business/dayWorkReport/index.vue
trash-ui/src/views/business/threestep/index.vue
trash-ui/src/views/h5/task/conferenceInfo.vue
trash-ui/src/views/h5/task/handleInfo.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/h5/task/violationCaseFileInfo.vue
trash-ui/src/views/h5/task/violationWarningInformationInfo.vue
trash-ui/src/views/h5/taskhistory/end.vue
trash-ui/src/views/h5/taskhistory/index.vue
trash-ui/src/views/h5/violationCaseFile/index.vue
trash-ui/src/views/h5/violationCaseFile/violationCaseFileInfo.vue
trash-ui/src/views/h5/violationWarningInformation/index.vue
trash-ui/src/views/h5/violationWarningInformation/violationWarningInformationInfo.vue
trash-workFlow/src/main/java/com/trash/business/domain/dayWork.java
trash-workFlow/src/main/java/com/trash/workflow/listener/ConractListener.java
+/*
+ Navicat Premium Data Transfer
+
+ Source Server         : MySQL57
+ Source Server Type    : MySQL
+ Source Server Version : 50740
+ Source Host           : localhost:3306
+ Source Schema         : trash
+
+ Target Server Type    : MySQL
+ Target Server Version : 50740
+ File Encoding         : 65001
+
+ Date: 24/05/2023 09:01:57
+*/
+
+SET NAMES utf8mb4;
+SET FOREIGN_KEY_CHECKS = 0;
+
+-- ----------------------------
+-- Table structure for kafka_compensation
+-- ----------------------------
+DROP TABLE IF EXISTS `kafka_compensation`;
+CREATE TABLE `kafka_compensation`  (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `data` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'kafka数据',
+  `create_time` datetime(0) NULL DEFAULT NULL COMMENT '接收数据时间',
+  `status` int(2) NULL DEFAULT NULL COMMENT '消费状态，0:未消费，1:已消费',
+  PRIMARY KEY (`id`) USING BTREE
+) ENGINE = InnoDB AUTO_INCREMENT = 53 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
+
+SET FOREIGN_KEY_CHECKS = 1;
@@ -324,11 +324,24 @@ public class ActTaskServiceImpl implements IActTaskService {
 	@Override
 	public void endAllThreesteptask(String type) {
-		List<ProcessInstance> processes = runtimeService.createProcessInstanceQuery().list();
+		
+		
+		
+		List<ProcessInstance> processes = runtimeService.createProcessInstanceQuery().processDefinitionKey(type).list();
 		for(ProcessInstance proc:processes){
 			if(type.equals(proc.getProcessDefinitionKey())){
-				runtimeService.deleteProcessInstance(proc.getId(), "超时");
+				try {
+					
+					String executionId = proc.getSuperExecutionId();
+					Map<String, Object> map = proc.getProcessVariables();
+					
+//					runtimeService.removeVariable(executionId, variableName);
+					
+					runtimeService.deleteProcessInstance(proc.getId(), "超时");
+				} catch (Exception e) {
+					e.printStackTrace();
+				}
 			}
 		}
 <template>
-  <div :class="classObj" class="app-wrapper">
-    <sidebar class="sidebar-container" />
-    <div :class="{hasTagsView:needTagsView}" class="main-container">
-        <tags-view v-if="needTagsView" />
       <app-main />
-      
-      </div>
-  </div>
 </template>
 <script>
 <template>
+  <div :class="classObj" class="app-wrapper">
+    <sidebar class="sidebar-container" />
+    <div :class="{hasTagsView:needTagsView}" class="main-container">
+        <tags-view v-if="needTagsView" />
       <app-main />
+      
+      </div>
+  </div>
 </template>
 <script>
@@ -495,11 +495,9 @@
             name:this.threestepList[i].name,
             createTime:this.threestepList[i].createTime,
             selfCheckTime:this.threestepList[i].selfCheckTime,
-            type:this.threestepList[i].type,
             place:this.threestepList[i].place,
             status:this.threestepList[i].status,
             ename:this.threestepList[i].ename,
-            etype:this.threestepList[i].etype,
             eplace:this.threestepList[i].eplace,
             estatus:this.threestepList[i].estatus,
             eselfCheckTime:this.threestepList[i].eselfCheckTime,
@@ -122,8 +122,8 @@
         <el-row type="flex" justify="center" v-if="form.type != null">
           <el-col :span="12">
             <el-form-item :label="labelName" prop="name">
-              <el-select v-model="form.name" filterable  reserve-keyword>
-                <el-option @click.native="getObjId(item)" v-for="item in remoteData" :label="item.name"
+              <el-select v-model="form.name" filterable  reserve-keyword @change="getObjId">
+                <el-option v-for="item in remoteData" :label="item.name"
                   :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
                 </el-option>
               </el-select>
@@ -131,9 +131,8 @@
           </el-col>
           <el-col :span="12">
             <el-form-item :label="labelName2" prop="place">
-              <el-select v-model="bindname" filterable  reserve-keyword >
-                <el-option @click.native="getEarthsiteId(item)"
-                v-if="item.show"
+              <el-select v-model="bindname" filterable  reserve-keyword @change="getEarthsiteId">
+                <el-option  v-if="item.show"
                   v-for="item in bindData"
                   :label="item.name"
                   :value="item.name"
@@ -146,8 +145,8 @@
         <el-row type="flex" justify="center"  v-if="form.type != null">
           <el-col>
             <el-form-item label="消纳合同" prop="contract">
-              <el-select v-model="form.contract" filterable  reserve-keyword>
-                <el-option @click.native="conractCheck(item)" v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
+              <el-select v-model="form.contract" filterable  reserve-keyword  @change="conractCheck">
+                <el-option v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
                 </el-option>
               </el-select>
             </el-form-item>
@@ -526,34 +525,23 @@
         }
       });
-           // let query = {
-           //    'page':1,
-           //    'size':9999,
-           //  }
-
-           //  companyList(query).then(response => {
-
-           //    let companys = response.result.list;
-           //    this.companyList = companys;
-           //    let ids = [];
-
-           //    for(let i = 0 ;i<companys.length;i++){
-           //      ids.push(companys[i].id);
-           //    }
-           //    query.companyID = ids + "";
-           //    query.valid = 0;
-
-           //    truckList(query).then(res=>{
-           //      this.truckList = res.result.list;
-           //    });
-           //  });
-
-
       this.getList(0);
     },
     methods: {
-      conractCheck(item){
+      conractCheck(value){
+        
+        let item
+        for(let i in this.filterContract){
+          for(let i in this.filterContract){
+            if(this.filterContract[i].name == value){
+              item = this.filterContract[i];
+              break;
+            }
+          }
+        }
+        
+        
         if(new Date(item.endTime).getTime() < new Date().getTime()){
           this.form.contract = null;
           this.$message("合同已过期");
@@ -622,7 +610,17 @@
         this.areaCode = a;
         this.form.name = "";
       },
-      getObjId(item) {
+      getObjId(value) {
+        let item;
+        for(let i in this.remoteData){
+          if(this.remoteData[i].name == value){
+            item = this.remoteData[i];
+            break;
+          }
+        }
+
+
+
           this.form.objectId = item.id;
           this.form.place = Number(item.areaCode);
           this.filterConract();
@@ -643,34 +641,28 @@
               let query = {
                 'page':1,
                 'size':9999,
-                'creditStatus':0
+                'dishonestState':0,
+                'valid':0
               }
               let ids = [];
               ids.push(item.transportCompanyId);
-              query.companyID = ids;
+              query.companyID = ids +"";
               query.valid = 0;
               getConstructionTruck(item.id).then(res=>{
                 for(let i in res.result){
-
-                  this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
-
+                    this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
                     query.companyID += "," + res.result[i].companyId;
-
-                    query.companyID = query.companyID.substring(0,query.companyID.length -1);
-
-                    truckList(query).then(res=>{
-                      this.truckList = res.result.list;
-                    });
-
                 }
+
+                truckList(query).then(res=>{
+                  this.truckList = res.result.list;
+                });
               });
             });
-
-
           }
       },
@@ -725,7 +717,16 @@
           }
         }
       },
-      getEarthsiteId(item) {
+      getEarthsiteId(value) {
+          let item;
+          for(let i in this.bindData){
+            if(this.bindDate[i].name == value){
+              item = this.bindDate[i];
+              break;
+            }
+          }
+
+
            this.form.earthsitesName = item.name;
            this.form.earthsitesId = item.id;
            this.filterConract();
@@ -831,8 +832,6 @@
             this.remoteData = res.result.list;
           }
         });
-
-
       },
       getAreaName(code){
 <template>
   <el-form ref="form" :model="form" label-width="80px">
-    <el-row :gutter="2">
-      <el-col :span="11">
+
         <el-form-item label="会议时间" prop="conferenceTime">
           <el-date-picker  size="small" style="width: 100%"
                           v-model="form.conferenceTime"
@@ -11,29 +10,19 @@
                           placeholder="选择会议时间">
           </el-date-picker>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="会议地点" prop="conferenceSite">
           <el-input v-model="form.conferenceSite" placeholder="请输入会议地点" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="22">
+
         <el-form-item label="参会人员" prop="staff">
           <el-input type="textarea" v-model="form.staff" placeholder="请输入参会人员" :rows="4" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="22">
+
         <el-form-item label="会议议程" prop="content">
           <el-input type="textarea" v-model="form.content" placeholder="请输入会议议程" :rows="4" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="22">
+
         <el-form-item label="会议要求" prop="requirement">
           <el-input type="textarea" v-model="form.requirement" placeholder="请输入会议要求" :rows="4" :disabled="true"/>
         </el-form-item>
 <template>
-  <el-form ref="form" :model="form" label-width="110px">
+  <el-form ref="form" :model="form" label-width="80px">
     <el-form-item label="办文办事类型" prop="type">
       <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%" :disabled="true">
         <el-option label="传阅学习类" value="0"/>
@@ -156,7 +156,7 @@
-    <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
+    <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose" width="300px">
       <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>
@@ -369,8 +369,10 @@ import {addReplyApprovalProcess} from &quot;@/api/casefile/replyApprovalProcess&quot;;
 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 threestepInfo from "@/views/h5/task/threestepInfo";
 import taskCard from "@/views/h5/task/taskCard";
 import conferenceInfo from "@/views/h5/task/conferenceInfo";
 import leaveApplicationInfo from "@/views/h5/task/leaveApplicationInfo";
@@ -379,7 +381,7 @@ import earthsitesInfo from &quot;@/views/h5/task/earthsitesInfo&quot;;
 import contractInfo from "@/views/h5/task/contractInfo";
 import logisticsInfo from "@/views/h5/task/logisticsInfo";
 import handleInfo from "@/views/h5/task/handleInfo";
-import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";  
+import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
 import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
 import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
@@ -387,7 +389,6 @@ export default {
   name: "task",
   components: {
     taskCard,
-    leaveHistoryForm,
     threestepInfo,
     conferenceInfo,
     leaveApplicationInfo,
@@ -842,7 +843,6 @@ export default {
         return;
       }
       if (this.definitionKey == "workflow_casefile") {
-        debugger;
         if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
           console.log(this.businessKey);
@@ -894,7 +894,6 @@ export default {
         } else {
           if (value == 0) {
             let postData = {};
-
             postData.tableName = this.businessKey;
             postData.replyImg = this.form.replyImg;
             postData.reply = this.form.reply;
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="115px">
-    <el-row :gutter="2">
-      <el-col :span="11">
+  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+
         <el-form-item label="案卷编号" prop="number">
           <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="违规对象类型" prop="violationObjectType">
           <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
            <el-option label="工地" value="0" />
@@ -14,82 +12,64 @@
            <el-option label="企业" value="2" />
           </el-select>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="所属区域" prop="owningRegion">
           <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
             <el-option label="区域1" value="区域1" />
             <el-option label="区域2" value="区域2" />
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="违规类型" prop="violationType">
           <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
             <el-option label="违规1" value="违规1" />
             <el-option label="违规2" value="违规2" />
           </el-select>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="违规等级" prop="violationGrade">
           <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
             <el-option label="一般类" value="一般类"/>
             <el-option label="重点类" value="重点类" />
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="项目名称" prop="projectName">
           <el-select v-model="form.projectName"  :disabled="true" style="width: 100%;">
           </el-select>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="企业名称" prop="companyName">
           <el-select v-model="form.companyName"  :disabled="true" style="width: 100%;">
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="发送时间" prop="createTime">
           <el-input :value="form.createTime" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="发送人" prop="createBy">
           <el-input :value="form.createBy" :disabled="true"/>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="接收人" prop="receive">
           <el-input :value="form.readBy" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="阅读时间" prop="createBy">
           <el-input :value="form.readTime" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="22">
+
         <el-form-item label="违规描述" prop="describe">
           <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
+
     <el-form-item label="推送对象">
       <el-radio-group v-model="form.sendObject" :disabled="true">
         <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
@@ -116,7 +96,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="查看附件" :visible.sync="open" append-to-body>
+    <el-dialog title="查看附件" :visible.sync="open" append-to-body width="300px">
       <el-table :data="fileEntityList">
         <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
@@ -136,7 +116,7 @@
         <el-button @click="open = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
+    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
       <img :src="img" width="100%" height="750px" />
     </el-dialog>
   </el-form>
 <template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="115px">
-    <el-row :gutter="2">
-      <el-col :span="11">
+  <el-form ref="form" :model="form" :rules="rules" label-width="85px">
+
         <el-form-item label="案卷编号" prop="number">
           <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="违规对象类型" prop="violationObjectType">
           <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
             <el-option label="工地" value="0" />
@@ -14,79 +12,61 @@
             <el-option label="企业" value="2" />
           </el-select>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="所属区域" prop="owningRegion">
           <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="违规类型" prop="violationType">
           <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
           </el-select>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="违规等级" prop="violationGrade">
           <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
             <el-option label="一般类" value="一般类"/>
             <el-option label="重点类" value="重点类"/>
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="项目名称" prop="projectName">
           <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
           </el-select>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="企业名称" prop="companyName">
           <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
           </el-select>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="发送时间" prop="createTime">
           <el-input :value="form.createTime" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="发送人" prop="createBy">
           <el-input :value="form.createBy" :disabled="true"/>
         </el-form-item>
-      </el-col>
-      <el-col :span="11">
+
         <el-form-item label="接收人" prop="receive">
           <el-input :value="form.readBy!=null?form.readBy:''"
                     :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row :gutter="2">
-      <el-col :span="11">
+
+
         <el-form-item label="阅读时间" prop="createBy">
           <el-input :value="form.readTime" :disabled="true"/>
         </el-form-item>
-      </el-col>
-    </el-row>
-    <el-row>
-      <el-col :span="22">
+
         <el-form-item label="违规描述" prop="describe">
           <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"style="white-space: pre-line"/>
         </el-form-item>
-      </el-col>
-    </el-row>
+
     <el-form-item label="推送对象">
       <el-radio-group v-model="form.sendObject" :disabled="true">
         <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
@@ -94,11 +74,8 @@
         <el-radio label="运输企业">运输企业</el-radio>
       </el-radio-group>
     </el-form-item>
-    <el-row>
-      <el-col :offset="3">
         <el-button type="primary" @click="open = true">查看附件({{ fileEntityList.length }})</el-button>
-      </el-col>
-    </el-row>
+
     <el-table :data="replyApprovalProcessList" v-if="entryType==0">
       <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
       <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
@@ -115,7 +92,7 @@
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog title="查看附件" :visible.sync="open" append-to-body>
+    <el-dialog title="查看附件" :visible.sync="open" append-to-body width="300px">
       <el-table :data="fileEntityList">
         <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
         <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
@@ -135,7 +112,7 @@
         <el-button @click="open = false">取 消</el-button>
       </div>
     </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
+    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
       <img :src="img" width="100%" height="750px" />
     </el-dialog>
   </el-form>
@@ -5,15 +5,6 @@
     <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"/>
@@ -23,34 +14,34 @@
       <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
     </el-dialog>
     <!--  会议管理  -->
-    <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
+    <el-dialog :title="title" :visible.sync="conferenceOpen" width="300px" append-to-body>
       <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
     </el-dialog>
     <!--  请假申请  -->
-    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
+    <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="300px" append-to-body>
       <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
       <earthsitesInfo :businessKey="businessKey"  v-if="earthsites" />
     </el-dialog>
-    <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
+    <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
       <contractInfo :businessKey="businessKey"  v-if="contract" />
     </el-dialog>
     <!--  后勤管理  -->
-    <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
+    <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="300px" append-to-body
                :close-on-click-modal="false">
       <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
     </el-dialog>
     <!--  办文办事  -->
-    <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body
+    <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="300px" append-to-body
                :close-on-click-modal="false">
       <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen" :depts="depts"
                   :businessKey="definitionKey"
@@ -58,17 +49,17 @@
     </el-dialog>
     <!--  线下案卷交办  -->
-    <el-dialog :title="title" :visible.sync="caseOffline" width="600px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="caseOffline" width="300px" append-to-body :close-on-click-modal="false">
       <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
     </el-dialog>
     <!--  平台违规信息  -->
-    <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="violationCaseFile" width="300px" append-to-body :close-on-click-modal="false">
       <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
     </el-dialog>
     <!--  违规预警信息  -->
-    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body :close-on-click-modal="false">
+    <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
       <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
     </el-dialog>
@@ -87,19 +78,19 @@
   } from "@/api/activiti/taskhistory";
   import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
-  import taskCard from "@/views/activiti/task/taskCard";
-  import earthSitesForm from "@/views/workflow/earthSitesForm";
-  import threestepInfo from "@/views/business/threestep/threestepInfo";
-  import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
-  import conferenceInfo from "@/views/office/conference/conferenceInfo";
-  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
-  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/casefile/violationCaseFile/violationCaseFileInfo";
-  import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+
+  import threestepInfo from "@/views/h5/task/threestepInfo";
+  import taskCard from "@/views/h5/task/taskCard";
+  import conferenceInfo from "@/views/h5/task/conferenceInfo";
+  import leaveApplicationInfo from "@/views/h5/task/leaveApplicationInfo";
+  import constructsiteInfo from "@/views/h5/task/constructsiteInfo";
+  import earthsitesInfo from "@/views/h5/task/earthsitesInfo";
+  import contractInfo from "@/views/h5/task/contractInfo";
+  import logisticsInfo from "@/views/h5/task/logisticsInfo";
+  import handleInfo from "@/views/h5/task/handleInfo";
+  import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
+  import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
+  import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
   export default {
@@ -107,10 +98,17 @@
     components: {
       taskCard,
       threestepInfo,
-      earthSitesForm,
-      leaveApplicationInfo,
       conferenceInfo,
-      constructsiteInfo
+      leaveApplicationInfo,
+      logisticsInfo,
+      handleInfo,
+      constructsiteInfo,
+      Treeselect,
+      earthsitesInfo,
+      contractInfo,
+      caseOfflineInfo,
+      violationCaseFileInfo,
+      violationWarningInformationInfo
     },
     data() {
       return {
@@ -5,14 +5,7 @@
     <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-dialog>
@@ -72,30 +65,30 @@
   </div>
 </template>
-<style>
-  @import '../../../assets/css/task.css'
-</style>
 <script>
   import {
+
+    listEndTask,
     listTask,
     formDataShow
   } from "@/api/activiti/taskhistory";
   import {  getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
-  import taskCard from "@/views/activiti/task/taskCard";
-  import earthSitesForm from "@/views/workflow/earthSitesForm";
-  import threestepInfo from "@/views/business/threestep/threestepInfo";
-  import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
-  import conferenceInfo from "@/views/office/conference/conferenceInfo";
-  import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
-  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/casefile/violationCaseFile/violationCaseFileInfo";
-  import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
+
+
+  import threestepInfo from "@/views/h5/task/threestepInfo";
+  import taskCard from "@/views/h5/task/taskCard";
+  import conferenceInfo from "@/views/h5/task/conferenceInfo";
+  import leaveApplicationInfo from "@/views/h5/task/leaveApplicationInfo";
+  import constructsiteInfo from "@/views/h5/task/constructsiteInfo";
+  import earthsitesInfo from "@/views/h5/task/earthsitesInfo";
+  import contractInfo from "@/views/h5/task/contractInfo";
+  import logisticsInfo from "@/views/h5/task/logisticsInfo";
+  import handleInfo from "@/views/h5/task/handleInfo";
+  import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
+  import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
+  import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
@@ -103,11 +96,18 @@
     name: "taskHistory",
     components: {
       taskCard,
-      leaveHistoryForm,
       threestepInfo,
-      leaveApplicationInfo,
       conferenceInfo,
+      leaveApplicationInfo,
+      logisticsInfo,
+      handleInfo,
       constructsiteInfo,
+      Treeselect,
+      earthsitesInfo,
+      contractInfo,
+      caseOfflineInfo,
+      violationCaseFileInfo,
+      violationWarningInformationInfo
     },
     data() {
       return {
@@ -222,10 +222,10 @@
           }
-        if(this.definitionKey == "workflow_threestep"){
-          this.open2 = true;
-          return;
-        }
+          if(this.definitionKey == "workflow_threestep"){
+            this.open2 = true;
+            return;
+          }
           if (this.definitionKey == "logistics") {
             this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
@@ -255,14 +255,11 @@
       },
-      /** 提交按钮 */
-      submitForm() {
-        formDataSave(this.id, this.form.formData).then(response => {
-          this.msgSuccess("审批成功");
-          this.open = false;
-          this.getList();
-        });
-      },
+
     }
   };
 </script>
+
+<style>
+  @import '../../../assets/css/task.css'
+</style>
@@ -141,8 +141,7 @@
             <el-form-item label="违规对象" prop="projectName">
               <el-select v-model="form.projectName" :filterable="true"  placeholder="请输入项目名称" style="width: 100%;">
                 <el-option v-for="item in data" :key="item.name" :label="item.name" :value="item.name" @click.native="getObjId(item)"
-                  v-if="form.place == item.areaCode"
-                />
+                  v-if="form.place == item.areaCode" />
                 </el-select>
             </el-form-item>
           </el-col>
@@ -233,7 +232,7 @@
 import { listViolationCaseFile, getViolationCaseFile,
         delViolationCaseFile, addViolationCaseFile,
         updateViolationCaseFile, exportViolationCaseFile } from "@/api/casefile/violationCaseFile";
-import violationCaseFileInfo from "./violationCaseFileInfo";
+import violationCaseFileInfo from "../task/violationCaseFileInfo";
   import {
     earthsitesList,
-<template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
-        <el-form-item label="案卷编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="违规对象类型" prop="violationObjectType">
-          <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
-           <el-option label="工地" value="0" />
-           <el-option label="消纳场" value="1" />
-           <el-option label="企业" value="2" />
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="所属区域" prop="owningRegion">
-          <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
-            <el-option label="区域1" value="区域1" />
-            <el-option label="区域2" value="区域2" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="违规类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
-            <el-option label="违规1" value="违规1" />
-            <el-option label="违规2" value="违规2" />
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="违规等级" prop="violationGrade">
-          <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
-            <el-option label="一般类" value="一般类"/>
-            <el-option label="重点类" value="重点类" />
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="项目名称" prop="projectName">
-          <el-select v-model="form.projectName"  :disabled="true" style="width: 100%;">
-
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="企业名称" prop="companyName">
-          <el-select v-model="form.companyName"  :disabled="true" style="width: 100%;">
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="发送时间" prop="createTime">
-          <el-input :value="form.createTime" :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="发送人" prop="createBy">
-          <el-input :value="form.createBy" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="接收人" prop="receive">
-          <el-input :value="form.readBy" :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="阅读时间" prop="createBy">
-          <el-input :value="form.readTime" :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="违规描述" prop="describe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
-        </el-form-item>
-
-    <el-form-item label="推送对象">
-      <el-radio-group v-model="form.sendObject" :disabled="true">
-        <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
-        <el-radio label="区管理部门(消)">区管理部门(消)</el-radio>
-        <el-radio label="运输企业">运输企业</el-radio>
-      </el-radio-group>
-    </el-form-item>
-    <el-row>
-      <el-col :offset="3"><el-button type="primary" @click="open = true">查看附件({{fileEntityList.length}})</el-button></el-col>
-    </el-row>
-    <el-table :data="replyApprovalProcessList" v-if="entryType==0">
-      <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
-      <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
-      <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
-      <el-table-column property="replyImg" label="图片预览" header-align="center" align="center">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="openImage(scope.row.replyImg)"
-            v-hasPermi="['casefile:violationWarningInformation:view']"
-          >查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog title="查看附件" :visible.sync="open" append-to-body>
-      <el-table :data="fileEntityList">
-        <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-button
-              size="small" type="success"
-              icon="el-icon-download"
-              @click="downloadFA(scope.row)"
-              v-hasPermi="['office:management:edit']"
-              v-if="form.id!=null"
-              round>下载
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
-      <img :src="img" width="100%" height="750px" />
-    </el-dialog>
-  </el-form>
-</template>
-
-<script>
-import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
-import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
-export default {
-  name: "violationWarningInformationInfo",
-  props: {
-    businessKey: {
-      type: String
-    },
-    idInfo: {
-      type: String
-    },
-    entryType: {
-      type: Number
-    },
-  },
-  data() {
-    return {
-      form: {},
-      fileEntityList: [],
-      open: false,
-      replyApprovalProcessList:[],
-      openImg:false,
-      img:null,
-    }
-  },
-  created() {
-    let id = this.idInfo.split(":");
-
-    if(id.length == 2){
-      this.idInfo = id[1];
-    }else{
-      this.idInfo = id;
-    }
-
-
-
-
-    this.init();
-  },
-  methods:{
-    init(){
-      getViolationCaseFile(this.idInfo).then(response => {
-        this.form = response.data.violationCaseFile;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
-      });
-
-
-      listReplyApprovalProcess({tableName:"workflow_casefile" + ":" +  this.idInfo}).then(response => {
-        this.replyApprovalProcessList = response.rows;
-      });
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    openImage(base64){
-      this.openImg = true;
-      this.img = base64;
-    },
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
@@ -192,7 +192,7 @@
 <script>
 import { listViolationWarningInformation, getViolationWarningInformation, delViolationWarningInformation, addViolationWarningInformation, updateViolationWarningInformation, exportViolationWarningInformation } from "@/api/casefile/violationWarningInformation";
-import violationWarningInformationInfo from "./violationWarningInformationInfo";
+import violationWarningInformationInfo from "../task/violationWarningInformationInfo";
 import {
   earthsitesList,
   constructionsitesList,
-<template>
-  <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-
-        <el-form-item label="案卷编号" prop="number">
-          <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="违规对象类型" prop="violationObjectType">
-          <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
-            <el-option label="工地" value="0" />
-            <el-option label="消纳场" value="1" />
-            <el-option label="企业" value="2" />
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="所属区域" prop="owningRegion">
-          <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="违规类型" prop="violationType">
-          <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="违规等级" prop="violationGrade">
-          <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
-            <el-option label="一般类" value="一般类"/>
-            <el-option label="重点类" value="重点类"/>
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="项目名称" prop="projectName">
-          <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
-
-          </el-select>
-        </el-form-item>
-
-
-        <el-form-item label="企业名称" prop="companyName">
-          <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
-          </el-select>
-        </el-form-item>
-
-        <el-form-item label="发送时间" prop="createTime">
-          <el-input :value="form.createTime" :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="发送人" prop="createBy">
-          <el-input :value="form.createBy" :disabled="true"/>
-        </el-form-item>
-
-        <el-form-item label="接收人" prop="receive">
-          <el-input :value="form.readBy!=null?form.readBy:''"
-                    :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="阅读时间" prop="createBy">
-          <el-input :value="form.readTime" :disabled="true"/>
-        </el-form-item>
-
-
-        <el-form-item label="违规描述" prop="describe">
-          <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"/>
-        </el-form-item>
-
-    <el-form-item label="推送对象">
-      <el-radio-group v-model="form.sendObject" :disabled="true">
-        <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
-        <el-radio label="区管理部门(消)">区管理部门(消)</el-radio>
-        <el-radio label="运输企业">运输企业</el-radio>
-      </el-radio-group>
-    </el-form-item>
-
-        <el-button type="primary" @click="open = true">查看附件({{ fileEntityList.length }})</el-button>
-
-    <el-table :data="replyApprovalProcessList" v-if="entryType==0" width="300px">
-      <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
-      <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
-      <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
-      <el-table-column property="replyImg" label="图片预览" header-align="center" align="center">
-        <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-view"
-            @click="openImage(scope.row.replyImg)"
-            v-hasPermi="['casefile:violationWarningInformation:edit']"
-          >查看</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-    <el-dialog title="查看附件" :visible.sync="open" append-to-body>
-      <el-table :data="fileEntityList">
-        <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
-        <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
-          <template slot-scope="scope">
-            <el-button
-              size="small" type="success"
-              icon="el-icon-download"
-              @click="downloadFA(scope.row)"
-              v-hasPermi="['office:management:edit']"
-              v-if="form.id!=null"
-              round>下载
-            </el-button>
-          </template>
-        </el-table-column>
-      </el-table>
-      <div slot="footer" class="dialog-footer">
-        <el-button @click="open = false">取 消</el-button>
-      </div>
-    </el-dialog>
-    <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
-      <img :src="img" width="100%" height="750px" />
-    </el-dialog>
-  </el-form>
-</template>
-
-<script>
-import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation";
-import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
-export default {
-  name: "violationWarningInformationInfo",
-  props: {
-    businessKey: {
-      type: String
-    },
-    idInfo: {
-      type: String
-    },
-    entryType: {
-      type: Number
-    },
-  },
-  data() {
-    return {
-      form: {},
-      fileEntityList: [],
-      open:false,
-      replyApprovalProcessList:[],
-      openImg:false,
-      img:null,
-    }
-  },
-  created() {
-    let id = this.idInfo.split(":");
-
-    if(id.length == 2){
-      this.idInfo = id[1];
-    }else{
-      this.idInfo = id;
-    }
-    this.init();
-  },
-  methods: {
-    init() {
-      getViolationWarningInformation(this.idInfo).then(response => {
-        this.form = response.data.violationWarningInformation;
-        let files = JSON.stringify(response.data.uploadFiles);
-        this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
-      });
-      listReplyApprovalProcess({tableName:"violation_warning" + ":" +  this.idInfo}).then(response => {
-        this.replyApprovalProcessList = response.rows;
-      });
-    },
-    /** 文件下载 */
-    downloadFA(row) {
-      let name = row.name;
-      let url = row.url;
-      const a = document.createElement('a')
-      a.setAttribute('download', name)
-      a.setAttribute('target', '_blank')
-      a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
-      a.click()
-    },
-    openImage(base64){
-      this.openImg = true;
-      this.img = base64;
-    }
-  }
-}
-</script>
-
-<style scoped>
-
-</style>
@@ -25,10 +25,6 @@ public class dayWork extends BaseEntity
     /** 工地名称 */
     @Excel(name = "工地名称")
     private String name;
-    
-    /** 项目类型 消纳场/工地 */
-    @Excel(name = "项目类型")
-    private String type;
     /** 管辖区 */
     @Excel(name = "所属区域")
@@ -43,11 +39,7 @@ public class dayWork extends BaseEntity
     /** 消纳场名称 */
     @Excel(name = "消纳场名称")
     private String ename;
-    
-    /** 项目类型 消纳场/工地 */
-    @Excel(name = "消纳类型")
-    private String etype;
-
+   
     /** 管辖区 */
     @Excel(name = "所属区域")
     private String eplace;
@@ -71,14 +63,6 @@ public class dayWork extends BaseEntity
 		this.name = name;
 	}
-	public String getType() {
-		return type;
-	}
-
-	public void setType(String type) {
-		this.type = type;
-	}
-
 	public String getPlace() {
 		return place;
 	}
@@ -95,14 +79,6 @@ public class dayWork extends BaseEntity
 		this.ename = ename;
 	}
-	public String getEtype() {
-		return etype;
-	}
-
-	public void setEtype(String etype) {
-		this.etype = etype;
-	}
-
 	public String getEstatus() {
 		return estatus;
 	}
@@ -34,7 +34,7 @@ public class ConractListener implements ExecutionListener {
     	Map map = new HashMap();
-    	map.put("objectId", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
+    	map.put("id", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
     	map.put("auditStatus", state.getValue(delegateExecution).toString());
     	maps.add(map);