youxiw2000 / trash · Commits

Commit bad7842277c8707c95be9782150ccf8aaf83b09e

Authored by youxiw2000
1 parent c8bdb389
build: skipped

m

Inline Side-by-side
Showing 19 changed files with 228 additions and 659 deletions
sql/kafka_compensation.sql 0 → 100644
  View file @bad7842
  1 +/*
  2 + Navicat Premium Data Transfer
  3 +
  4 + Source Server : MySQL57
  5 + Source Server Type : MySQL
  6 + Source Server Version : 50740
  7 + Source Host : localhost:3306
  8 + Source Schema : trash
  9 +
  10 + Target Server Type : MySQL
  11 + Target Server Version : 50740
  12 + File Encoding : 65001
  13 +
  14 + Date: 24/05/2023 09:01:57
  15 +*/
  16 +
  17 +SET NAMES utf8mb4;
  18 +SET FOREIGN_KEY_CHECKS = 0;
  19 +
  20 +-- ----------------------------
  21 +-- Table structure for kafka_compensation
  22 +-- ----------------------------
  23 +DROP TABLE IF EXISTS `kafka_compensation`;
  24 +CREATE TABLE `kafka_compensation` (
  25 + `id` int(11) NOT NULL AUTO_INCREMENT,
  26 + `data` varchar(2048) CHARACTER SET utf8 COLLATE utf8_general_ci NULL DEFAULT NULL COMMENT 'kafka数据',
  27 + `create_time` datetime(0) NULL DEFAULT NULL COMMENT '接收数据时间',
  28 + `status` int(2) NULL DEFAULT NULL COMMENT '消费状态，0:未消费，1:已消费',
  29 + PRIMARY KEY (`id`) USING BTREE
  30 +) ENGINE = InnoDB AUTO_INCREMENT = 53 CHARACTER SET = utf8 COLLATE = utf8_general_ci ROW_FORMAT = Dynamic;
  31 +
  32 +SET FOREIGN_KEY_CHECKS = 1;
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @bad7842
... ... @@ -324,11 +324,24 @@ public class ActTaskServiceImpl implements IActTaskService {
324 324  
325 325 @Override
326 326 public void endAllThreesteptask(String type) {
327   - List<ProcessInstance> processes = runtimeService.createProcessInstanceQuery().list();
  327 +
  328 +
  329 +
  330 + List<ProcessInstance> processes = runtimeService.createProcessInstanceQuery().processDefinitionKey(type).list();
328 331  
329 332 for(ProcessInstance proc:processes){
330 333 if(type.equals(proc.getProcessDefinitionKey())){
331   - runtimeService.deleteProcessInstance(proc.getId(), "超时");
  334 + try {
  335 +
  336 + String executionId = proc.getSuperExecutionId();
  337 + Map<String, Object> map = proc.getProcessVariables();
  338 +
  339 +// runtimeService.removeVariable(executionId, variableName);
  340 +
  341 + runtimeService.deleteProcessInstance(proc.getId(), "超时");
  342 + } catch (Exception e) {
  343 + e.printStackTrace();
  344 + }
332 345 }
333 346 }
334 347  
... ...
trash-ui/src/layout/index.vue
  View file @bad7842
1 1 <template>
2   - <div :class="classObj" class="app-wrapper">
3   - <sidebar class="sidebar-container" />
4   - <div :class="{hasTagsView:needTagsView}" class="main-container">
5   - <tags-view v-if="needTagsView" />
6 2 <app-main />
7   -
8   - </div>
9   - </div>
10 3 </template>
11 4  
12 5 <script>
... ...
trash-ui/src/layout/index5.vue
  View file @bad7842
1 1 <template>
  2 + <div :class="classObj" class="app-wrapper">
  3 + <sidebar class="sidebar-container" />
  4 + <div :class="{hasTagsView:needTagsView}" class="main-container">
  5 + <tags-view v-if="needTagsView" />
2 6 <app-main />
  7 +
  8 + </div>
  9 + </div>
3 10 </template>
4 11  
5 12 <script>
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @bad7842
... ... @@ -495,11 +495,9 @@
495 495 name:this.threestepList[i].name,
496 496 createTime:this.threestepList[i].createTime,
497 497 selfCheckTime:this.threestepList[i].selfCheckTime,
498   - type:this.threestepList[i].type,
499 498 place:this.threestepList[i].place,
500 499 status:this.threestepList[i].status,
501 500 ename:this.threestepList[i].ename,
502   - etype:this.threestepList[i].etype,
503 501 eplace:this.threestepList[i].eplace,
504 502 estatus:this.threestepList[i].estatus,
505 503 eselfCheckTime:this.threestepList[i].eselfCheckTime,
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @bad7842
... ... @@ -122,8 +122,8 @@
122 122 <el-row type="flex" justify="center" v-if="form.type != null">
123 123 <el-col :span="12">
124 124 <el-form-item :label="labelName" prop="name">
125   - <el-select v-model="form.name" filterable reserve-keyword>
126   - <el-option @click.native="getObjId(item)" v-for="item in remoteData" :label="item.name"
  125 + <el-select v-model="form.name" filterable reserve-keyword @change="getObjId">
  126 + <el-option v-for="item in remoteData" :label="item.name"
127 127 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
128 128 </el-option>
129 129 </el-select>
... ... @@ -131,9 +131,8 @@
131 131 </el-col>
132 132 <el-col :span="12">
133 133 <el-form-item :label="labelName2" prop="place">
134   - <el-select v-model="bindname" filterable reserve-keyword >
135   - <el-option @click.native="getEarthsiteId(item)"
136   - v-if="item.show"
  134 + <el-select v-model="bindname" filterable reserve-keyword @change="getEarthsiteId">
  135 + <el-option v-if="item.show"
137 136 v-for="item in bindData"
138 137 :label="item.name"
139 138 :value="item.name"
... ... @@ -146,8 +145,8 @@
146 145 <el-row type="flex" justify="center" v-if="form.type != null">
147 146 <el-col>
148 147 <el-form-item label="消纳合同" prop="contract">
149   - <el-select v-model="form.contract" filterable reserve-keyword>
150   - <el-option @click.native="conractCheck(item)" v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
  148 + <el-select v-model="form.contract" filterable reserve-keyword @change="conractCheck">
  149 + <el-option v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
151 150 </el-option>
152 151 </el-select>
153 152 </el-form-item>
... ... @@ -526,34 +525,23 @@
526 525 }
527 526 });
528 527  
529   - // let query = {
530   - // 'page':1,
531   - // 'size':9999,
532   - // }
533   -
534   - // companyList(query).then(response => {
535   -
536   - // let companys = response.result.list;
537   - // this.companyList = companys;
538   - // let ids = [];
539   -
540   - // for(let i = 0 ;i<companys.length;i++){
541   - // ids.push(companys[i].id);
542   - // }
543   - // query.companyID = ids + "";
544   - // query.valid = 0;
545   -
546   - // truckList(query).then(res=>{
547   - // this.truckList = res.result.list;
548   - // });
549   - // });
550   -
551   -
552 528 this.getList(0);
553 529  
554 530 },
555 531 methods: {
556   - conractCheck(item){
  532 + conractCheck(value){
  533 +
  534 + let item
  535 + for(let i in this.filterContract){
  536 + for(let i in this.filterContract){
  537 + if(this.filterContract[i].name == value){
  538 + item = this.filterContract[i];
  539 + break;
  540 + }
  541 + }
  542 + }
  543 +
  544 +
557 545 if(new Date(item.endTime).getTime() < new Date().getTime()){
558 546 this.form.contract = null;
559 547 this.$message("合同已过期");
... ... @@ -622,7 +610,17 @@
622 610 this.areaCode = a;
623 611 this.form.name = "";
624 612 },
625   - getObjId(item) {
  613 + getObjId(value) {
  614 + let item;
  615 + for(let i in this.remoteData){
  616 + if(this.remoteData[i].name == value){
  617 + item = this.remoteData[i];
  618 + break;
  619 + }
  620 + }
  621 +
  622 +
  623 +
626 624 this.form.objectId = item.id;
627 625 this.form.place = Number(item.areaCode);
628 626 this.filterConract();
... ... @@ -643,34 +641,28 @@
643 641 let query = {
644 642 'page':1,
645 643 'size':9999,
646   - 'creditStatus':0
  644 + 'dishonestState':0,
  645 + 'valid':0
647 646 }
648 647  
649 648 let ids = [];
650 649  
651 650 ids.push(item.transportCompanyId);
652 651  
653   - query.companyID = ids;
  652 + query.companyID = ids +"";
654 653 query.valid = 0;
655 654  
656 655 getConstructionTruck(item.id).then(res=>{
657 656 for(let i in res.result){
658   -
659   - this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
660   -
  657 + this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
661 658 query.companyID += "," + res.result[i].companyId;
662   -
663   - query.companyID = query.companyID.substring(0,query.companyID.length -1);
664   -
665   - truckList(query).then(res=>{
666   - this.truckList = res.result.list;
667   - });
668   -
669 659 }
  660 +
  661 + truckList(query).then(res=>{
  662 + this.truckList = res.result.list;
  663 + });
670 664 });
671 665 });
672   -
673   -
674 666 }
675 667  
676 668 },
... ... @@ -725,7 +717,16 @@
725 717 }
726 718 }
727 719 },
728   - getEarthsiteId(item) {
  720 + getEarthsiteId(value) {
  721 + let item;
  722 + for(let i in this.bindData){
  723 + if(this.bindDate[i].name == value){
  724 + item = this.bindDate[i];
  725 + break;
  726 + }
  727 + }
  728 +
  729 +
729 730 this.form.earthsitesName = item.name;
730 731 this.form.earthsitesId = item.id;
731 732 this.filterConract();
... ... @@ -831,8 +832,6 @@
831 832 this.remoteData = res.result.list;
832 833 }
833 834 });
834   -
835   -
836 835 },
837 836  
838 837 getAreaName(code){
... ...
trash-ui/src/views/h5/task/conferenceInfo.vue
  View file @bad7842
1 1 <template>
2 2 <el-form ref="form" :model="form" label-width="80px">
3   - <el-row :gutter="2">
4   - <el-col :span="11">
  3 +
5 4 <el-form-item label="会议时间" prop="conferenceTime">
6 5 <el-date-picker size="small" style="width: 100%"
7 6 v-model="form.conferenceTime"
... ... @@ -11,29 +10,19 @@
11 10 placeholder="选择会议时间">
12 11 </el-date-picker>
13 12 </el-form-item>
14   - </el-col>
15   - <el-col :span="11">
  13 +
16 14 <el-form-item label="会议地点" prop="conferenceSite">
17 15 <el-input v-model="form.conferenceSite" placeholder="请输入会议地点" :disabled="true"/>
18 16 </el-form-item>
19   - </el-col>
20   - </el-row>
21   - <el-row :gutter="2">
22   - <el-col :span="22">
  17 +
23 18 <el-form-item label="参会人员" prop="staff">
24 19 <el-input type="textarea" v-model="form.staff" placeholder="请输入参会人员" :rows="4" :disabled="true"/>
25 20 </el-form-item>
26   - </el-col>
27   - </el-row>
28   - <el-row :gutter="2">
29   - <el-col :span="22">
  21 +
30 22 <el-form-item label="会议议程" prop="content">
31 23 <el-input type="textarea" v-model="form.content" placeholder="请输入会议议程" :rows="4" :disabled="true"/>
32 24 </el-form-item>
33   - </el-col>
34   - </el-row>
35   - <el-row :gutter="2">
36   - <el-col :span="22">
  25 +
37 26 <el-form-item label="会议要求" prop="requirement">
38 27 <el-input type="textarea" v-model="form.requirement" placeholder="请输入会议要求" :rows="4" :disabled="true"/>
39 28 </el-form-item>
... ...
trash-ui/src/views/h5/task/handleInfo.vue
  View file @bad7842
1 1 <template>
2   - <el-form ref="form" :model="form" label-width="110px">
  2 + <el-form ref="form" :model="form" label-width="80px">
3 3 <el-form-item label="办文办事类型" prop="type">
4 4 <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%" :disabled="true">
5 5 <el-option label="传阅学习类" value="0"/>
... ...
trash-ui/src/views/h5/task/index.vue
  View file @bad7842
... ... @@ -156,7 +156,7 @@
156 156  
157 157  
158 158  
159   - <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
  159 + <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose" width="300px">
160 160 <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
161 161 :on-success="uploadSuccess" :before-upload="beforeUpload">
162 162 <el-button size="small" type="primary">选择附件</el-button>
... ... @@ -369,8 +369,10 @@ import {addReplyApprovalProcess} from &quot;@/api/casefile/replyApprovalProcess&quot;;
369 369 import {updateHandleAffairs} from "@/api/office/handle";
370 370 import Treeselect from "@riophae/vue-treeselect";
371 371 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
372   -import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
373   -import threestepInfo from "@/views/business/threestep/threestepInfo";
  372 +
  373 +
  374 +
  375 +import threestepInfo from "@/views/h5/task/threestepInfo";
374 376 import taskCard from "@/views/h5/task/taskCard";
375 377 import conferenceInfo from "@/views/h5/task/conferenceInfo";
376 378 import leaveApplicationInfo from "@/views/h5/task/leaveApplicationInfo";
... ... @@ -379,7 +381,7 @@ import earthsitesInfo from &quot;@/views/h5/task/earthsitesInfo&quot;;
379 381 import contractInfo from "@/views/h5/task/contractInfo";
380 382 import logisticsInfo from "@/views/h5/task/logisticsInfo";
381 383 import handleInfo from "@/views/h5/task/handleInfo";
382   -import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
  384 +import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
383 385 import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
384 386 import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
385 387  
... ... @@ -387,7 +389,6 @@ export default {
387 389 name: "task",
388 390 components: {
389 391 taskCard,
390   - leaveHistoryForm,
391 392 threestepInfo,
392 393 conferenceInfo,
393 394 leaveApplicationInfo,
... ... @@ -842,7 +843,6 @@ export default {
842 843 return;
843 844 }
844 845 if (this.definitionKey == "workflow_casefile") {
845   - debugger;
846 846  
847 847 if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
848 848 console.log(this.businessKey);
... ... @@ -894,7 +894,6 @@ export default {
894 894 } else {
895 895 if (value == 0) {
896 896 let postData = {};
897   -
898 897 postData.tableName = this.businessKey;
899 898 postData.replyImg = this.form.replyImg;
900 899 postData.reply = this.form.reply;
... ...
trash-ui/src/views/h5/task/violationCaseFileInfo.vue
  View file @bad7842
1 1 <template>
2   - <el-form ref="form" :model="form" :rules="rules" label-width="115px">
3   - <el-row :gutter="2">
4   - <el-col :span="11">
  2 + <el-form ref="form" :model="form" :rules="rules" label-width="80px">
  3 +
5 4 <el-form-item label="案卷编号" prop="number">
6 5 <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
7 6 </el-form-item>
8   - </el-col>
9   - <el-col :span="11">
  7 +
10 8 <el-form-item label="违规对象类型" prop="violationObjectType">
11 9 <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
12 10 <el-option label="工地" value="0" />
... ... @@ -14,82 +12,64 @@
14 12 <el-option label="企业" value="2" />
15 13 </el-select>
16 14 </el-form-item>
17   - </el-col>
18   - </el-row>
19   - <el-row :gutter="2">
20   - <el-col :span="11">
  15 +
  16 +
21 17 <el-form-item label="所属区域" prop="owningRegion">
22 18 <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
23 19 <el-option label="区域1" value="区域1" />
24 20 <el-option label="区域2" value="区域2" />
25 21 </el-select>
26 22 </el-form-item>
27   - </el-col>
28   - <el-col :span="11">
  23 +
29 24 <el-form-item label="违规类型" prop="violationType">
30 25 <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
31 26 <el-option label="违规1" value="违规1" />
32 27 <el-option label="违规2" value="违规2" />
33 28 </el-select>
34 29 </el-form-item>
35   - </el-col>
36   - </el-row>
37   - <el-row :gutter="2">
38   - <el-col :span="11">
  30 +
  31 +
39 32 <el-form-item label="违规等级" prop="violationGrade">
40 33 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
41 34 <el-option label="一般类" value="一般类"/>
42 35 <el-option label="重点类" value="重点类" />
43 36 </el-select>
44 37 </el-form-item>
45   - </el-col>
46   - <el-col :span="11">
  38 +
47 39 <el-form-item label="项目名称" prop="projectName">
48 40 <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
49 41  
50 42 </el-select>
51 43 </el-form-item>
52   - </el-col>
53   - </el-row>
54   - <el-row :gutter="2">
55   - <el-col :span="11">
  44 +
  45 +
56 46 <el-form-item label="企业名称" prop="companyName">
57 47 <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
58 48 </el-select>
59 49 </el-form-item>
60   - </el-col>
61   - <el-col :span="11">
  50 +
62 51 <el-form-item label="发送时间" prop="createTime">
63 52 <el-input :value="form.createTime" :disabled="true"/>
64 53 </el-form-item>
65   - </el-col>
66   - </el-row>
67   - <el-row :gutter="2">
68   - <el-col :span="11">
  54 +
  55 +
69 56 <el-form-item label="发送人" prop="createBy">
70 57 <el-input :value="form.createBy" :disabled="true"/>
71 58 </el-form-item>
72   - </el-col>
73   - <el-col :span="11">
  59 +
74 60 <el-form-item label="接收人" prop="receive">
75 61 <el-input :value="form.readBy" :disabled="true"/>
76 62 </el-form-item>
77   - </el-col>
78   - </el-row>
79   - <el-row :gutter="2">
80   - <el-col :span="11">
  63 +
  64 +
81 65 <el-form-item label="阅读时间" prop="createBy">
82 66 <el-input :value="form.readTime" :disabled="true"/>
83 67 </el-form-item>
84   - </el-col>
85   - </el-row>
86   - <el-row>
87   - <el-col :span="22">
  68 +
88 69 <el-form-item label="违规描述" prop="describe">
89 70 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
90 71 </el-form-item>
91   - </el-col>
92   - </el-row>
  72 +
93 73 <el-form-item label="推送对象">
94 74 <el-radio-group v-model="form.sendObject" :disabled="true">
95 75 <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
... ... @@ -116,7 +96,7 @@
116 96 </template>
117 97 </el-table-column>
118 98 </el-table>
119   - <el-dialog title="查看附件" :visible.sync="open" append-to-body>
  99 + <el-dialog title="查看附件" :visible.sync="open" append-to-body width="300px">
120 100 <el-table :data="fileEntityList">
121 101 <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
122 102 <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
... ... @@ -136,7 +116,7 @@
136 116 <el-button @click="open = false">取 消</el-button>
137 117 </div>
138 118 </el-dialog>
139   - <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
  119 + <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
140 120 <img :src="img" width="100%" height="750px" />
141 121 </el-dialog>
142 122 </el-form>
... ...
trash-ui/src/views/h5/task/violationWarningInformationInfo.vue
  View file @bad7842
1 1 <template>
2   - <el-form ref="form" :model="form" :rules="rules" label-width="115px">
3   - <el-row :gutter="2">
4   - <el-col :span="11">
  2 + <el-form ref="form" :model="form" :rules="rules" label-width="85px">
  3 +
5 4 <el-form-item label="案卷编号" prop="number">
6 5 <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
7 6 </el-form-item>
8   - </el-col>
9   - <el-col :span="11">
  7 +
10 8 <el-form-item label="违规对象类型" prop="violationObjectType">
11 9 <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
12 10 <el-option label="工地" value="0" />
... ... @@ -14,79 +12,61 @@
14 12 <el-option label="企业" value="2" />
15 13 </el-select>
16 14 </el-form-item>
17   - </el-col>
18   - </el-row>
19   - <el-row :gutter="2">
20   - <el-col :span="11">
  15 +
  16 +
21 17 <el-form-item label="所属区域" prop="owningRegion">
22 18 <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
23 19 </el-select>
24 20 </el-form-item>
25   - </el-col>
26   - <el-col :span="11">
  21 +
27 22 <el-form-item label="违规类型" prop="violationType">
28 23 <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
29 24 </el-select>
30 25 </el-form-item>
31   - </el-col>
32   - </el-row>
33   - <el-row :gutter="2">
34   - <el-col :span="11">
  26 +
  27 +
35 28 <el-form-item label="违规等级" prop="violationGrade">
36 29 <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
37 30 <el-option label="一般类" value="一般类"/>
38 31 <el-option label="重点类" value="重点类"/>
39 32 </el-select>
40 33 </el-form-item>
41   - </el-col>
42   - <el-col :span="11">
  34 +
43 35 <el-form-item label="项目名称" prop="projectName">
44 36 <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
45 37  
46 38 </el-select>
47 39 </el-form-item>
48   - </el-col>
49   - </el-row>
50   - <el-row :gutter="2">
51   - <el-col :span="11">
  40 +
  41 +
52 42 <el-form-item label="企业名称" prop="companyName">
53 43 <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
54 44 </el-select>
55 45 </el-form-item>
56   - </el-col>
57   - <el-col :span="11">
  46 +
58 47 <el-form-item label="发送时间" prop="createTime">
59 48 <el-input :value="form.createTime" :disabled="true"/>
60 49 </el-form-item>
61   - </el-col>
62   - </el-row>
63   - <el-row :gutter="2">
64   - <el-col :span="11">
  50 +
  51 +
65 52 <el-form-item label="发送人" prop="createBy">
66 53 <el-input :value="form.createBy" :disabled="true"/>
67 54 </el-form-item>
68   - </el-col>
69   - <el-col :span="11">
  55 +
70 56 <el-form-item label="接收人" prop="receive">
71 57 <el-input :value="form.readBy!=null?form.readBy:''"
72 58 :disabled="true"/>
73 59 </el-form-item>
74   - </el-col>
75   - </el-row>
76   - <el-row :gutter="2">
77   - <el-col :span="11">
  60 +
  61 +
78 62 <el-form-item label="阅读时间" prop="createBy">
79 63 <el-input :value="form.readTime" :disabled="true"/>
80 64 </el-form-item>
81   - </el-col>
82   - </el-row>
83   - <el-row>
84   - <el-col :span="22">
  65 +
85 66 <el-form-item label="违规描述" prop="describe">
86 67 <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"style="white-space: pre-line"/>
87 68 </el-form-item>
88   - </el-col>
89   - </el-row>
  69 +
90 70 <el-form-item label="推送对象">
91 71 <el-radio-group v-model="form.sendObject" :disabled="true">
92 72 <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
... ... @@ -94,11 +74,8 @@
94 74 <el-radio label="运输企业">运输企业</el-radio>
95 75 </el-radio-group>
96 76 </el-form-item>
97   - <el-row>
98   - <el-col :offset="3">
99 77 <el-button type="primary" @click="open = true">查看附件({{ fileEntityList.length }})</el-button>
100   - </el-col>
101   - </el-row>
  78 +
102 79 <el-table :data="replyApprovalProcessList" v-if="entryType==0">
103 80 <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
104 81 <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
... ... @@ -115,7 +92,7 @@
115 92 </template>
116 93 </el-table-column>
117 94 </el-table>
118   - <el-dialog title="查看附件" :visible.sync="open" append-to-body>
  95 + <el-dialog title="查看附件" :visible.sync="open" append-to-body width="300px">
119 96 <el-table :data="fileEntityList">
120 97 <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
121 98 <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
... ... @@ -135,7 +112,7 @@
135 112 <el-button @click="open = false">取 消</el-button>
136 113 </div>
137 114 </el-dialog>
138   - <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
  115 + <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0" width="300px">
139 116 <img :src="img" width="100%" height="750px" />
140 117 </el-dialog>
141 118 </el-form>
... ...
trash-ui/src/views/h5/taskhistory/end.vue
  View file @bad7842
... ... @@ -5,15 +5,6 @@
5 5  
6 6 <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
7 7  
8   - <!-- 审批对话框 -->
9   - <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
10   -
11   - <div slot="footer" class="dialog-footer">
12   - <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
13   - <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
14   - </div>
15   - </el-dialog>
16   -
17 8  
18 9 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
19 10 <threestepInfo :businessKey="businessKey" v-if="open2"/>
... ... @@ -23,34 +14,34 @@
23 14 <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
24 15 </el-dialog>
25 16 <!-- 会议管理 -->
26   - <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body>
  17 + <el-dialog :title="title" :visible.sync="conferenceOpen" width="300px" append-to-body>
27 18 <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
28 19 </el-dialog>
29 20  
30 21 <!-- 请假申请 -->
31   - <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body>
  22 + <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="300px" append-to-body>
32 23 <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
33 24 </el-dialog>
34 25  
35 26  
36   - <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
  27 + <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
37 28 <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
38 29 </el-dialog>
39 30  
40   - <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
  31 + <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
41 32 <contractInfo :businessKey="businessKey" v-if="contract" />
42 33 </el-dialog>
43 34  
44 35  
45 36  
46 37 <!-- 后勤管理 -->
47   - <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
  38 + <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="300px" append-to-body
48 39 :close-on-click-modal="false">
49 40 <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
50 41 </el-dialog>
51 42  
52 43 <!-- 办文办事 -->
53   - <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body
  44 + <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="300px" append-to-body
54 45 :close-on-click-modal="false">
55 46 <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen" :depts="depts"
56 47 :businessKey="definitionKey"
... ... @@ -58,17 +49,17 @@
58 49 </el-dialog>
59 50  
60 51 <!-- 线下案卷交办 -->
61   - <el-dialog :title="title" :visible.sync="caseOffline" width="600px" append-to-body :close-on-click-modal="false">
  52 + <el-dialog :title="title" :visible.sync="caseOffline" width="300px" append-to-body :close-on-click-modal="false">
62 53 <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
63 54 </el-dialog>
64 55  
65 56 <!-- 平台违规信息 -->
66   - <el-dialog :title="title" :visible.sync="violationCaseFile" width="850px" append-to-body :close-on-click-modal="false">
  57 + <el-dialog :title="title" :visible.sync="violationCaseFile" width="300px" append-to-body :close-on-click-modal="false">
67 58 <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
68 59 </el-dialog>
69 60  
70 61 <!-- 违规预警信息 -->
71   - <el-dialog :title="title" :visible.sync="violationCaseFile1" width="850px" append-to-body :close-on-click-modal="false">
  62 + <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
72 63 <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
73 64 </el-dialog>
74 65  
... ... @@ -87,19 +78,19 @@
87 78 } from "@/api/activiti/taskhistory";
88 79  
89 80 import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
90   - import taskCard from "@/views/activiti/task/taskCard";
91   - import earthSitesForm from "@/views/workflow/earthSitesForm";
92   - import threestepInfo from "@/views/business/threestep/threestepInfo";
93   - import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
94   - import conferenceInfo from "@/views/office/conference/conferenceInfo";
95   - import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
96   - import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
97   - import contractInfo from "@/views/activiti/task/contractInfo";
98   - import logisticsInfo from "@/views/office/logistics/logisticsInfo";
99   - import handleInfo from "@/views/office/handle/handleInfo";
100   - import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
101   - import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
102   - import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
  81 +
  82 + import threestepInfo from "@/views/h5/task/threestepInfo";
  83 + import taskCard from "@/views/h5/task/taskCard";
  84 + import conferenceInfo from "@/views/h5/task/conferenceInfo";
  85 + import leaveApplicationInfo from "@/views/h5/task/leaveApplicationInfo";
  86 + import constructsiteInfo from "@/views/h5/task/constructsiteInfo";
  87 + import earthsitesInfo from "@/views/h5/task/earthsitesInfo";
  88 + import contractInfo from "@/views/h5/task/contractInfo";
  89 + import logisticsInfo from "@/views/h5/task/logisticsInfo";
  90 + import handleInfo from "@/views/h5/task/handleInfo";
  91 + import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
  92 + import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
  93 + import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
103 94  
104 95  
105 96 export default {
... ... @@ -107,10 +98,17 @@
107 98 components: {
108 99 taskCard,
109 100 threestepInfo,
110   - earthSitesForm,
111   - leaveApplicationInfo,
112 101 conferenceInfo,
113   - constructsiteInfo
  102 + leaveApplicationInfo,
  103 + logisticsInfo,
  104 + handleInfo,
  105 + constructsiteInfo,
  106 + Treeselect,
  107 + earthsitesInfo,
  108 + contractInfo,
  109 + caseOfflineInfo,
  110 + violationCaseFileInfo,
  111 + violationWarningInformationInfo
114 112 },
115 113 data() {
116 114 return {
... ...
trash-ui/src/views/h5/taskhistory/index.vue
  View file @bad7842
... ... @@ -5,14 +5,7 @@
5 5  
6 6 <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
7 7  
8   - <!-- 审批对话框 -->
9   - <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
10 8  
11   - <div slot="footer" class="dialog-footer">
12   - <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
13   - <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
14   - </div>
15   - </el-dialog>
16 9 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
17 10 <threestepInfo :businessKey="businessKey" v-if="open2"/>
18 11 </el-dialog>
... ... @@ -72,30 +65,30 @@
72 65 </div>
73 66 </template>
74 67  
75   -<style>
76   - @import '../../../assets/css/task.css'
77   -</style>
78 68  
79 69 <script>
80 70 import {
  71 +
  72 + listEndTask,
81 73 listTask,
82 74 formDataShow
83 75 } from "@/api/activiti/taskhistory";
84 76  
85 77 import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
86   - import taskCard from "@/views/activiti/task/taskCard";
87   - import earthSitesForm from "@/views/workflow/earthSitesForm";
88   - import threestepInfo from "@/views/business/threestep/threestepInfo";
89   - import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
90   - import conferenceInfo from "@/views/office/conference/conferenceInfo";
91   - import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
92   - import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
93   - import contractInfo from "@/views/activiti/task/contractInfo";
94   - import logisticsInfo from "@/views/office/logistics/logisticsInfo";
95   - import handleInfo from "@/views/office/handle/handleInfo";
96   - import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
97   - import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
98   - import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
  78 +
  79 +
  80 + import threestepInfo from "@/views/h5/task/threestepInfo";
  81 + import taskCard from "@/views/h5/task/taskCard";
  82 + import conferenceInfo from "@/views/h5/task/conferenceInfo";
  83 + import leaveApplicationInfo from "@/views/h5/task/leaveApplicationInfo";
  84 + import constructsiteInfo from "@/views/h5/task/constructsiteInfo";
  85 + import earthsitesInfo from "@/views/h5/task/earthsitesInfo";
  86 + import contractInfo from "@/views/h5/task/contractInfo";
  87 + import logisticsInfo from "@/views/h5/task/logisticsInfo";
  88 + import handleInfo from "@/views/h5/task/handleInfo";
  89 + import caseOfflineInfo from "@/views/h5/task/caseOfflineInfo";
  90 + import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
  91 + import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
99 92  
100 93  
101 94  
... ... @@ -103,11 +96,18 @@
103 96 name: "taskHistory",
104 97 components: {
105 98 taskCard,
106   - leaveHistoryForm,
107 99 threestepInfo,
108   - leaveApplicationInfo,
109 100 conferenceInfo,
  101 + leaveApplicationInfo,
  102 + logisticsInfo,
  103 + handleInfo,
110 104 constructsiteInfo,
  105 + Treeselect,
  106 + earthsitesInfo,
  107 + contractInfo,
  108 + caseOfflineInfo,
  109 + violationCaseFileInfo,
  110 + violationWarningInformationInfo
111 111 },
112 112 data() {
113 113 return {
... ... @@ -222,10 +222,10 @@
222 222 }
223 223  
224 224  
225   - if(this.definitionKey == "workflow_threestep"){
226   - this.open2 = true;
227   - return;
228   - }
  225 + if(this.definitionKey == "workflow_threestep"){
  226 + this.open2 = true;
  227 + return;
  228 + }
229 229  
230 230 if (this.definitionKey == "logistics") {
231 231 this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
... ... @@ -255,14 +255,11 @@
255 255  
256 256  
257 257 },
258   - /** 提交按钮 */
259   - submitForm() {
260   - formDataSave(this.id, this.form.formData).then(response => {
261   - this.msgSuccess("审批成功");
262   - this.open = false;
263   - this.getList();
264   - });
265   - },
  258 +
266 259 }
267 260 };
268 261 </script>
  262 +
  263 +<style>
  264 + @import '../../../assets/css/task.css'
  265 +</style>
... ...
trash-ui/src/views/h5/violationCaseFile/index.vue
  View file @bad7842
... ... @@ -141,8 +141,7 @@
141 141 <el-form-item label="违规对象" prop="projectName">
142 142 <el-select v-model="form.projectName" :filterable="true" placeholder="请输入项目名称" style="width: 100%;">
143 143 <el-option v-for="item in data" :key="item.name" :label="item.name" :value="item.name" @click.native="getObjId(item)"
144   - v-if="form.place == item.areaCode"
145   - />
  144 + v-if="form.place == item.areaCode" />
146 145 </el-select>
147 146 </el-form-item>
148 147 </el-col>
... ... @@ -233,7 +232,7 @@
233 232 import { listViolationCaseFile, getViolationCaseFile,
234 233 delViolationCaseFile, addViolationCaseFile,
235 234 updateViolationCaseFile, exportViolationCaseFile } from "@/api/casefile/violationCaseFile";
236   -import violationCaseFileInfo from "./violationCaseFileInfo";
  235 +import violationCaseFileInfo from "../task/violationCaseFileInfo";
237 236  
238 237 import {
239 238 earthsitesList,
... ...
trash-ui/src/views/h5/violationCaseFile/violationCaseFileInfo.vue deleted 100644 → 0
  View file @c8bdb38
1   -<template>
2   - <el-form ref="form" :model="form" :rules="rules" label-width="80px">
3   -
4   - <el-form-item label="案卷编号" prop="number">
5   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
6   - </el-form-item>
7   -
8   - <el-form-item label="违规对象类型" prop="violationObjectType">
9   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
10   - <el-option label="工地" value="0" />
11   - <el-option label="消纳场" value="1" />
12   - <el-option label="企业" value="2" />
13   - </el-select>
14   - </el-form-item>
15   -
16   -
17   - <el-form-item label="所属区域" prop="owningRegion">
18   - <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
19   - <el-option label="区域1" value="区域1" />
20   - <el-option label="区域2" value="区域2" />
21   - </el-select>
22   - </el-form-item>
23   -
24   - <el-form-item label="违规类型" prop="violationType">
25   - <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
26   - <el-option label="违规1" value="违规1" />
27   - <el-option label="违规2" value="违规2" />
28   - </el-select>
29   - </el-form-item>
30   -
31   -
32   - <el-form-item label="违规等级" prop="violationGrade">
33   - <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
34   - <el-option label="一般类" value="一般类"/>
35   - <el-option label="重点类" value="重点类" />
36   - </el-select>
37   - </el-form-item>
38   -
39   - <el-form-item label="项目名称" prop="projectName">
40   - <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
41   -
42   - </el-select>
43   - </el-form-item>
44   -
45   -
46   - <el-form-item label="企业名称" prop="companyName">
47   - <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
48   - </el-select>
49   - </el-form-item>
50   -
51   - <el-form-item label="发送时间" prop="createTime">
52   - <el-input :value="form.createTime" :disabled="true"/>
53   - </el-form-item>
54   -
55   -
56   - <el-form-item label="发送人" prop="createBy">
57   - <el-input :value="form.createBy" :disabled="true"/>
58   - </el-form-item>
59   -
60   - <el-form-item label="接收人" prop="receive">
61   - <el-input :value="form.readBy" :disabled="true"/>
62   - </el-form-item>
63   -
64   -
65   - <el-form-item label="阅读时间" prop="createBy">
66   - <el-input :value="form.readTime" :disabled="true"/>
67   - </el-form-item>
68   -
69   -
70   - <el-form-item label="违规描述" prop="describe">
71   - <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :row="4" :disabled="true"/>
72   - </el-form-item>
73   -
74   - <el-form-item label="推送对象">
75   - <el-radio-group v-model="form.sendObject" :disabled="true">
76   - <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
77   - <el-radio label="区管理部门(消)">区管理部门(消)</el-radio>
78   - <el-radio label="运输企业">运输企业</el-radio>
79   - </el-radio-group>
80   - </el-form-item>
81   - <el-row>
82   - <el-col :offset="3"><el-button type="primary" @click="open = true">查看附件({{fileEntityList.length}})</el-button></el-col>
83   - </el-row>
84   - <el-table :data="replyApprovalProcessList" v-if="entryType==0">
85   - <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
86   - <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
87   - <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
88   - <el-table-column property="replyImg" label="图片预览" header-align="center" align="center">
89   - <template slot-scope="scope">
90   - <el-button
91   - size="mini"
92   - type="text"
93   - icon="el-icon-view"
94   - @click="openImage(scope.row.replyImg)"
95   - v-hasPermi="['casefile:violationWarningInformation:view']"
96   - >查看</el-button>
97   - </template>
98   - </el-table-column>
99   - </el-table>
100   - <el-dialog title="查看附件" :visible.sync="open" append-to-body>
101   - <el-table :data="fileEntityList">
102   - <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
103   - <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
104   - <template slot-scope="scope">
105   - <el-button
106   - size="small" type="success"
107   - icon="el-icon-download"
108   - @click="downloadFA(scope.row)"
109   - v-hasPermi="['office:management:edit']"
110   - v-if="form.id!=null"
111   - round>下载
112   - </el-button>
113   - </template>
114   - </el-table-column>
115   - </el-table>
116   - <div slot="footer" class="dialog-footer">
117   - <el-button @click="open = false">取 消</el-button>
118   - </div>
119   - </el-dialog>
120   - <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
121   - <img :src="img" width="100%" height="750px" />
122   - </el-dialog>
123   - </el-form>
124   -</template>
125   -
126   -<script>
127   -import {getViolationCaseFile} from "@/api/casefile/violationCaseFile";
128   -import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
129   -export default {
130   - name: "violationWarningInformationInfo",
131   - props: {
132   - businessKey: {
133   - type: String
134   - },
135   - idInfo: {
136   - type: String
137   - },
138   - entryType: {
139   - type: Number
140   - },
141   - },
142   - data() {
143   - return {
144   - form: {},
145   - fileEntityList: [],
146   - open: false,
147   - replyApprovalProcessList:[],
148   - openImg:false,
149   - img:null,
150   - }
151   - },
152   - created() {
153   - let id = this.idInfo.split(":");
154   -
155   - if(id.length == 2){
156   - this.idInfo = id[1];
157   - }else{
158   - this.idInfo = id;
159   - }
160   -
161   -
162   -
163   -
164   - this.init();
165   - },
166   - methods:{
167   - init(){
168   - getViolationCaseFile(this.idInfo).then(response => {
169   - this.form = response.data.violationCaseFile;
170   - let files = JSON.stringify(response.data.uploadFiles);
171   - this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
172   - });
173   -
174   -
175   - listReplyApprovalProcess({tableName:"workflow_casefile" + ":" + this.idInfo}).then(response => {
176   - this.replyApprovalProcessList = response.rows;
177   - });
178   - },
179   - /** 文件下载 */
180   - downloadFA(row) {
181   - let name = row.name;
182   - let url = row.url;
183   - const a = document.createElement('a')
184   - a.setAttribute('download', name)
185   - a.setAttribute('target', '_blank')
186   - a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
187   - a.click()
188   - },
189   - openImage(base64){
190   - this.openImg = true;
191   - this.img = base64;
192   - },
193   - }
194   -}
195   -</script>
196   -
197   -<style scoped>
198   -
199   -</style>
trash-ui/src/views/h5/violationWarningInformation/index.vue
  View file @bad7842
... ... @@ -192,7 +192,7 @@
192 192  
193 193 <script>
194 194 import { listViolationWarningInformation, getViolationWarningInformation, delViolationWarningInformation, addViolationWarningInformation, updateViolationWarningInformation, exportViolationWarningInformation } from "@/api/casefile/violationWarningInformation";
195   -import violationWarningInformationInfo from "./violationWarningInformationInfo";
  195 +import violationWarningInformationInfo from "../task/violationWarningInformationInfo";
196 196 import {
197 197 earthsitesList,
198 198 constructionsitesList,
... ...
trash-ui/src/views/h5/violationWarningInformation/violationWarningInformationInfo.vue deleted 100644 → 0
  View file @c8bdb38
1   -<template>
2   - <el-form ref="form" :model="form" :rules="rules" label-width="80px">
3   -
4   - <el-form-item label="案卷编号" prop="number">
5   - <el-input v-model="form.number" placeholder="请输入案卷编号" :disabled="true"/>
6   - </el-form-item>
7   -
8   - <el-form-item label="违规对象类型" prop="violationObjectType">
9   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" style="width: 100%;" :disabled="true">
10   - <el-option label="工地" value="0" />
11   - <el-option label="消纳场" value="1" />
12   - <el-option label="企业" value="2" />
13   - </el-select>
14   - </el-form-item>
15   -
16   -
17   - <el-form-item label="所属区域" prop="owningRegion">
18   - <el-select v-model="form.owningRegion" placeholder="请输入所属区域" style="width: 100%;" :disabled="true">
19   - </el-select>
20   - </el-form-item>
21   -
22   - <el-form-item label="违规类型" prop="violationType">
23   - <el-select v-model="form.violationType" placeholder="请选择违规类型" style="width: 100%;" :disabled="true">
24   - </el-select>
25   - </el-form-item>
26   -
27   - <el-form-item label="违规等级" prop="violationGrade">
28   - <el-select v-model="form.violationGrade" placeholder="请选择企业名称" style="width: 100%;" :disabled="true">
29   - <el-option label="一般类" value="一般类"/>
30   - <el-option label="重点类" value="重点类"/>
31   - </el-select>
32   - </el-form-item>
33   -
34   - <el-form-item label="项目名称" prop="projectName">
35   - <el-select v-model="form.projectName" :disabled="true" style="width: 100%;">
36   -
37   - </el-select>
38   - </el-form-item>
39   -
40   -
41   - <el-form-item label="企业名称" prop="companyName">
42   - <el-select v-model="form.companyName" :disabled="true" style="width: 100%;">
43   - </el-select>
44   - </el-form-item>
45   -
46   - <el-form-item label="发送时间" prop="createTime">
47   - <el-input :value="form.createTime" :disabled="true"/>
48   - </el-form-item>
49   -
50   -
51   - <el-form-item label="发送人" prop="createBy">
52   - <el-input :value="form.createBy" :disabled="true"/>
53   - </el-form-item>
54   -
55   - <el-form-item label="接收人" prop="receive">
56   - <el-input :value="form.readBy!=null?form.readBy:''"
57   - :disabled="true"/>
58   - </el-form-item>
59   -
60   -
61   - <el-form-item label="阅读时间" prop="createBy">
62   - <el-input :value="form.readTime" :disabled="true"/>
63   - </el-form-item>
64   -
65   -
66   - <el-form-item label="违规描述" prop="describe">
67   - <el-input v-model="form.describe" type="textarea" placeholder="请输入内容" :rows="5" :disabled="true"/>
68   - </el-form-item>
69   -
70   - <el-form-item label="推送对象">
71   - <el-radio-group v-model="form.sendObject" :disabled="true">
72   - <el-radio label="区管理部门(治)">区管理部门(治)</el-radio>
73   - <el-radio label="区管理部门(消)">区管理部门(消)</el-radio>
74   - <el-radio label="运输企业">运输企业</el-radio>
75   - </el-radio-group>
76   - </el-form-item>
77   -
78   - <el-button type="primary" @click="open = true">查看附件({{ fileEntityList.length }})</el-button>
79   -
80   - <el-table :data="replyApprovalProcessList" v-if="entryType==0" width="300px">
81   - <el-table-column property="replyPeople" label="操作人" header-align="center" align="center"></el-table-column>
82   - <el-table-column property="reply" label="意见" header-align="center" align="center"></el-table-column>
83   - <el-table-column property="replyTime" label="操作时间" header-align="center" align="center"></el-table-column>
84   - <el-table-column property="replyImg" label="图片预览" header-align="center" align="center">
85   - <template slot-scope="scope">
86   - <el-button
87   - size="mini"
88   - type="text"
89   - icon="el-icon-view"
90   - @click="openImage(scope.row.replyImg)"
91   - v-hasPermi="['casefile:violationWarningInformation:edit']"
92   - >查看</el-button>
93   - </template>
94   - </el-table-column>
95   - </el-table>
96   - <el-dialog title="查看附件" :visible.sync="open" append-to-body>
97   - <el-table :data="fileEntityList">
98   - <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
99   - <el-table-column label="操作" class-name="small-padding fixed-width" header-align="center" align="center">
100   - <template slot-scope="scope">
101   - <el-button
102   - size="small" type="success"
103   - icon="el-icon-download"
104   - @click="downloadFA(scope.row)"
105   - v-hasPermi="['office:management:edit']"
106   - v-if="form.id!=null"
107   - round>下载
108   - </el-button>
109   - </template>
110   - </el-table-column>
111   - </el-table>
112   - <div slot="footer" class="dialog-footer">
113   - <el-button @click="open = false">取 消</el-button>
114   - </div>
115   - </el-dialog>
116   - <el-dialog title="预览" :visible.sync="openImg" append-to-body v-if="entryType==0">
117   - <img :src="img" width="100%" height="750px" />
118   - </el-dialog>
119   - </el-form>
120   -</template>
121   -
122   -<script>
123   -import {getViolationWarningInformation} from "@/api/casefile/violationWarningInformation";
124   -import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
125   -export default {
126   - name: "violationWarningInformationInfo",
127   - props: {
128   - businessKey: {
129   - type: String
130   - },
131   - idInfo: {
132   - type: String
133   - },
134   - entryType: {
135   - type: Number
136   - },
137   - },
138   - data() {
139   - return {
140   - form: {},
141   - fileEntityList: [],
142   - open:false,
143   - replyApprovalProcessList:[],
144   - openImg:false,
145   - img:null,
146   - }
147   - },
148   - created() {
149   - let id = this.idInfo.split(":");
150   -
151   - if(id.length == 2){
152   - this.idInfo = id[1];
153   - }else{
154   - this.idInfo = id;
155   - }
156   - this.init();
157   - },
158   - methods: {
159   - init() {
160   - getViolationWarningInformation(this.idInfo).then(response => {
161   - this.form = response.data.violationWarningInformation;
162   - let files = JSON.stringify(response.data.uploadFiles);
163   - this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
164   - });
165   - listReplyApprovalProcess({tableName:"violation_warning" + ":" + this.idInfo}).then(response => {
166   - this.replyApprovalProcessList = response.rows;
167   - });
168   - },
169   - /** 文件下载 */
170   - downloadFA(row) {
171   - let name = row.name;
172   - let url = row.url;
173   - const a = document.createElement('a')
174   - a.setAttribute('download', name)
175   - a.setAttribute('target', '_blank')
176   - a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
177   - a.click()
178   - },
179   - openImage(base64){
180   - this.openImg = true;
181   - this.img = base64;
182   - }
183   - }
184   -}
185   -</script>
186   -
187   -<style scoped>
188   -
189   -</style>
trash-workFlow/src/main/java/com/trash/business/domain/dayWork.java
  View file @bad7842
... ... @@ -25,10 +25,6 @@ public class dayWork extends BaseEntity
25 25 /** 工地名称 */
26 26 @Excel(name = "工地名称")
27 27 private String name;
28   -
29   - /** 项目类型 消纳场/工地 */
30   - @Excel(name = "项目类型")
31   - private String type;
32 28  
33 29 /** 管辖区 */
34 30 @Excel(name = "所属区域")
... ... @@ -43,11 +39,7 @@ public class dayWork extends BaseEntity
43 39 /** 消纳场名称 */
44 40 @Excel(name = "消纳场名称")
45 41 private String ename;
46   -
47   - /** 项目类型 消纳场/工地 */
48   - @Excel(name = "消纳类型")
49   - private String etype;
50   -
  42 +
51 43 /** 管辖区 */
52 44 @Excel(name = "所属区域")
53 45 private String eplace;
... ... @@ -71,14 +63,6 @@ public class dayWork extends BaseEntity
71 63 this.name = name;
72 64 }
73 65  
74   - public String getType() {
75   - return type;
76   - }
77   -
78   - public void setType(String type) {
79   - this.type = type;
80   - }
81   -
82 66 public String getPlace() {
83 67 return place;
84 68 }
... ... @@ -95,14 +79,6 @@ public class dayWork extends BaseEntity
95 79 this.ename = ename;
96 80 }
97 81  
98   - public String getEtype() {
99   - return etype;
100   - }
101   -
102   - public void setEtype(String etype) {
103   - this.etype = etype;
104   - }
105   -
106 82 public String getEstatus() {
107 83 return estatus;
108 84 }
... ...
trash-workFlow/src/main/java/com/trash/workflow/listener/ConractListener.java
  View file @bad7842
... ... @@ -34,7 +34,7 @@ public class ConractListener implements ExecutionListener {
34 34  
35 35 Map map = new HashMap();
36 36  
37   - map.put("objectId", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
  37 + map.put("id", delegateExecution.getProcessInstanceBusinessKey().split(":")[1]);
38 38 map.put("auditStatus", state.getValue(delegateExecution).toString());
39 39 maps.add(map);
40 40  
... ...