youxiw2000 / trash · Commits

Commit 8019aac2cf121085c19047aee5e21be0cfc0f551

Authored by 2c2c2c
1 parent 56aae8e7
build: skipped

新增审批字段

Inline Side-by-side
Showing 5 changed files with 421 additions and 12 deletions
trash-ui/src/api/taskmethod.js
  View file @8019aac
1 -import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";  
2 -  
3 -import {historyFromData} from '@/api/activiti/historyFormdata'  
4 -import {addSign, getSignByObjId} from "@/api/sign/sign";  
5 -import {updateCaseOffline} from "@/api/caseOffline/caseOffline";  
6 -import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";  
7 -import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";  
8 -import {getDict, getSupervision, getUsers} from "@/api/dict";  
9 -import {activeThreestep} from "@/api/business/threestep";  
10 -import {getToken} from "@/utils/auth";  
11 -import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess"; 1 +import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
  2 +
  3 +import {historyFromData} from '@/api/activiti/historyFormdata'
  4 +import {addSign, getSignByObjId} from "@/api/sign/sign";
  5 +import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
  6 +import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
  7 +import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
  8 +import {getDict, getSupervision, getUsers} from "@/api/dict";
  9 +import {activeThreestep} from "@/api/business/threestep";
  10 +import {getToken} from "@/utils/auth";
  11 +import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
12 import {updateHandleAffairs} from "@/api/office/handle"; 12 import {updateHandleAffairs} from "@/api/office/handle";
13 import { listTrack, getTrack} from "@/api/business/track"; 13 import { listTrack, getTrack} from "@/api/business/track";
14 14
@@ -317,6 +317,10 @@ export default { @@ -317,6 +317,10 @@ export default {
317 this.driver = true; 317 this.driver = true;
318 return; 318 return;
319 } 319 }
  320 + if(this.definitionKey == "workflow_drop_point"){
  321 + this.dropPoint = true;
  322 + return;
  323 + }
320 this.open = true; 324 this.open = true;
321 this.title = "审批"; 325 this.title = "审批";
322 }); 326 });
@@ -561,6 +565,7 @@ export default { @@ -561,6 +565,7 @@ export default {
561 565
562 if ( 566 if (
563 this.definitionKey.indexOf("supervision") > -1 || 567 this.definitionKey.indexOf("supervision") > -1 ||
  568 + this.definitionKey == "workflow_drop_point" ||
564 this.definitionKey == "workflow_company" || 569 this.definitionKey == "workflow_company" ||
565 this.definitionKey == "workflow_driver" || 570 this.definitionKey == "workflow_driver" ||
566 this.definitionKey == "workflow_vehicle" || 571 this.definitionKey == "workflow_vehicle" ||
trash-ui/src/views/activiti/task/dropPointinfo.vue 0 → 100644
  View file @8019aac
  1 +<template>
  2 + <div>
  3 + <div v-loading="loading" style="border: 1px solid black;">
  4 + <el-row >
  5 + <el-col :span="12" class="bd">投放点编号</el-col>
  6 + <el-col :span="12" class="bd">{{infoData.dropPointNo}}</el-col>
  7 + </el-row>
  8 + <el-row >
  9 + <el-col :span="12" class="bd">投放点名称</el-col>
  10 + <el-col :span="12" class="bd">{{infoData.dropPointName}}</el-col>
  11 + </el-row>
  12 + <el-row >
  13 + <el-col :span="12" class="bd">所属区域</el-col>
  14 + <el-col :span="12" class="bd">{{dict(infoData.place)}}</el-col>
  15 + </el-row>
  16 + <el-row >
  17 + <el-col :span="12" class="bd">所属街道</el-col>
  18 + <el-col :span="12" class="bd">{{dictInfo(infoData.street)}}</el-col>
  19 + </el-row>
  20 + <el-row >
  21 + <el-col :span="12" class="bd">社区</el-col>
  22 + <el-col :span="12" class="bd">{{infoData.community}}</el-col>
  23 + </el-row>
  24 + <el-row >
  25 + <el-col :span="12" class="bd">详细地址</el-col>
  26 + <el-col :span="12" class="bd">{{infoData.address}}</el-col>
  27 + </el-row>
  28 + <el-row >
  29 + <el-col :span="12" class="bd">投放点形式</el-col>
  30 + <el-col :span="12" class="bd">{{infoData.type}}</el-col>
  31 + </el-row>
  32 + <el-row >
  33 + <el-col :span="12" class="bd">投放点面积(m²)</el-col>
  34 + <el-col :span="12" class="bd">{{infoData.area}}</el-col>
  35 + </el-row>
  36 + <el-row >
  37 + <el-col :span="12" class="bd">投放点容量(m³)</el-col>
  38 + <el-col :span="12" class="bd">{{infoData.capacity}}</el-col>
  39 + </el-row>
  40 + <el-row >
  41 + <el-col :span="12" class="bd">管理单位</el-col>
  42 + <el-col :span="12" class="bd">{{infoData.managementUnit}}</el-col>
  43 + </el-row>
  44 + <el-row >
  45 + <el-col :span="12" class="bd">管理人</el-col>
  46 + <el-col :span="12" class="bd">{{infoData.custodian}}</el-col>
  47 + </el-row>
  48 + <el-row >
  49 + <el-col :span="12" class="bd">管理员电话</el-col>
  50 + <el-col :span="12" class="bd">{{infoData.custodianPhone}}</el-col>
  51 + </el-row>
  52 + <el-row >
  53 + <el-col :span="12" class="bd">投放时间</el-col>
  54 + <el-col :span="12" class="bd">{{infoData.dropTime}}</el-col>
  55 + </el-row>
  56 + <el-row >
  57 + <el-col :span="12" class="bd">运营单位</el-col>
  58 + <el-col :span="12" class="bd">{{infoData.operatingUnit}}</el-col>
  59 + </el-row>
  60 + <el-row >
  61 + <el-col :span="12" class="bd">运输单位</el-col>
  62 + <el-col :span="12" class="bd">{{infoData.transportUnit}}</el-col>
  63 + </el-row>
  64 + <el-row >
  65 + <el-col :span="12" class="bd">坐标点</el-col>
  66 + <el-col :span="12" class="bd">{{infoData.coordinatePoint}}</el-col>
  67 + </el-row>
  68 + </div>
  69 + </div>
  70 +</template>
  71 +
  72 +<script>
  73 +
  74 +
  75 +import store from "@/store";
  76 +import {
  77 + getToken
  78 +} from "@/utils/auth";
  79 +import {
  80 + listDropPointInfo,
  81 + getDropPointInfo,
  82 + delDropPointInfo,
  83 + addDropPointInfo,
  84 + updateDropPointInfo,
  85 + exportDropPointInfo
  86 +} from "@/api/unit/dropPointInfo";
  87 +import {getAreaList} from "@/api/dict"
  88 +
  89 +
  90 +
  91 +
  92 +export default {
  93 + name: "dropPointinfo",
  94 + props: {
  95 + businessKey: {
  96 + type: String
  97 + },
  98 + },
  99 + data() {
  100 + return {
  101 + sign: store.getters.avatar, //裁剪图片的地址
  102 + areas: [],
  103 + loading: null,
  104 + infoData: {},
  105 + dicts:null,
  106 + showPic:false,
  107 + picImage:null,
  108 + }
  109 + },
  110 + created() {
  111 + getAreaList().then(response => {
  112 + if(response==null || response.length===0){
  113 + this.$message.error("获取区域列表失败");
  114 + return;
  115 + }
  116 + const data = response;
  117 + for (let dataKey in data) {
  118 + if(data[dataKey].level === '3'){
  119 + this.areas.push({name:data[dataKey].name,code:data[dataKey].id, streets:[]})
  120 + }
  121 + }
  122 + for(let dataKey in data){
  123 + for(let areas1Key in this.areas){
  124 + if(data[dataKey].pid === this.areas[areas1Key].code){
  125 + this.areas[areas1Key].streets.push({code:data[dataKey].id, name:data[dataKey].name})
  126 + }
  127 + }
  128 + }
  129 + });
  130 + this.loading = true;
  131 + this.getInfo();
  132 +
  133 + },
  134 + methods: {
  135 + dict(code) {
  136 + for (let key in this.areas) {
  137 + if (this.areas[key].code === code) {
  138 + return this.areas[key].name;
  139 + }
  140 + }
  141 + },
  142 + dictInfo(code) {
  143 + for (let key in this.areas) {
  144 + for (let keyInfo in this.areas[key].streets) {
  145 + if (this.areas[key].streets[keyInfo].code === code) {
  146 + return this.areas[key].streets[keyInfo].name;
  147 + }
  148 + }
  149 + }
  150 + },
  151 + getInfo() {
  152 + let id;
  153 + if (this.businessKey.split(":").length == 2) {
  154 + id = this.businessKey.split(":")[1];
  155 + } else {
  156 + id = this.businessKey;
  157 + }
  158 +
  159 + getDropPointInfo(id).then(response => {
  160 +
  161 + this.infoData = response.data;
  162 + // getArea().then(res => {
  163 + // this.areas = res.result;
  164 + // this.loading = false;
  165 + // for (let i = 0; i < this.areas.length; i++) {
  166 + // if (Number(this.infoData.place) == this.areas[i].code) {
  167 + // this.infoData.place = this.areas[i].name;
  168 + // }
  169 + // }
  170 + // });
  171 +
  172 + // for(let i in obj){
  173 + // if(this.objectDict[i]){
  174 + // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
  175 + // }
  176 + // }
  177 + this.loading = false;
  178 + });
  179 + },
  180 + }
  181 +
  182 +}
  183 +</script>
  184 +<style>
  185 +.bd{
  186 + padding:5px;
  187 +}
  188 +
  189 +
  190 +
  191 +</style>
trash-ui/src/views/activiti/task/index.vue
  View file @8019aac
@@ -658,6 +658,25 @@ @@ -658,6 +658,25 @@
658 </div> 658 </div>
659 </el-dialog> 659 </el-dialog>
660 660
  661 + <el-dialog :title="title" :visible.sync="dropPoint" width="1500px" append-to-body :close-on-click-modal="false">
  662 + <dropPointinfo :businessKey="businessKey" :businessType="5" v-if="dropPoint"/>
  663 + <div v-for="item in this.form.formData">
  664 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  665 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  666 + </div>
  667 +
  668 + <el-table :data="hisfromData" v-if="hisfromData != null">
  669 +
  670 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  671 + <el-table-column label="处理人" align="center" prop="createName"/>
  672 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  673 + </el-table>
  674 + <div slot="footer" class="dialog-footer">
  675 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  676 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  677 + </div>
  678 + </el-dialog>
  679 +
661 </div> 680 </div>
662 </template> 681 </template>
663 682
@@ -696,6 +715,7 @@ @@ -696,6 +715,7 @@
696 import companyInfo from "@/views/activiti/task/companyInfo"; 715 import companyInfo from "@/views/activiti/task/companyInfo";
697 import driverInfo from "@/views/activiti/task/driverInfo"; 716 import driverInfo from "@/views/activiti/task/driverInfo";
698 import vehicleInfo from "@/views/activiti/task/vehicleInfo"; 717 import vehicleInfo from "@/views/activiti/task/vehicleInfo";
  718 + import dropPointinfo from "@/views/activiti/task/dropPointinfo";
699 719
700 import taskmethod from '@/api/taskmethod' 720 import taskmethod from '@/api/taskmethod'
701 721
@@ -720,7 +740,8 @@ @@ -720,7 +740,8 @@
720 supervisionInfo, 740 supervisionInfo,
721 companyInfo, 741 companyInfo,
722 driverInfo, 742 driverInfo,
723 - vehicleInfo 743 + vehicleInfo,
  744 + dropPointinfo
724 }, 745 },
725 data() { 746 data() {
726 return { 747 return {
@@ -816,6 +837,7 @@ @@ -816,6 +837,7 @@
816 company: false, 837 company: false,
817 driver: false, 838 driver: false,
818 vehicle: false, 839 vehicle: false,
  840 + dropPoint: false,
819 names: null, 841 names: null,
820 hisfromData: [], 842 hisfromData: [],
821 slides: [], 843 slides: [],
trash-ui/src/views/h5/task/dropPointinfo.vue 0 → 100644
  View file @8019aac
  1 +<template>
  2 + <div>
  3 + <div v-loading="loading" style="border: 1px solid black;">
  4 + <el-row >
  5 + <el-col :span="12" class="bd">投放点编号</el-col>
  6 + <el-col :span="12" class="bd">{{infoData.dropPointNo}}</el-col>
  7 + </el-row>
  8 + <el-row >
  9 + <el-col :span="12" class="bd">投放点名称</el-col>
  10 + <el-col :span="12" class="bd">{{infoData.dropPointName}}</el-col>
  11 + </el-row>
  12 + <el-row >
  13 + <el-col :span="12" class="bd">所属区域</el-col>
  14 + <el-col :span="12" class="bd">{{dict(infoData.place)}}</el-col>
  15 + </el-row>
  16 + <el-row >
  17 + <el-col :span="12" class="bd">所属街道</el-col>
  18 + <el-col :span="12" class="bd">{{dictInfo(infoData.street)}}</el-col>
  19 + </el-row>
  20 + <el-row >
  21 + <el-col :span="12" class="bd">社区</el-col>
  22 + <el-col :span="12" class="bd">{{infoData.community}}</el-col>
  23 + </el-row>
  24 + <el-row >
  25 + <el-col :span="12" class="bd">详细地址</el-col>
  26 + <el-col :span="12" class="bd">{{infoData.address}}</el-col>
  27 + </el-row>
  28 + <el-row >
  29 + <el-col :span="12" class="bd">投放点形式</el-col>
  30 + <el-col :span="12" class="bd">{{infoData.type}}</el-col>
  31 + </el-row>
  32 + <el-row >
  33 + <el-col :span="12" class="bd">投放点面积(m²)</el-col>
  34 + <el-col :span="12" class="bd">{{infoData.area}}</el-col>
  35 + </el-row>
  36 + <el-row >
  37 + <el-col :span="12" class="bd">投放点容量(m³)</el-col>
  38 + <el-col :span="12" class="bd">{{infoData.capacity}}</el-col>
  39 + </el-row>
  40 + <el-row >
  41 + <el-col :span="12" class="bd">管理单位</el-col>
  42 + <el-col :span="12" class="bd">{{infoData.managementUnit}}</el-col>
  43 + </el-row>
  44 + <el-row >
  45 + <el-col :span="12" class="bd">管理人</el-col>
  46 + <el-col :span="12" class="bd">{{infoData.custodian}}</el-col>
  47 + </el-row>
  48 + <el-row >
  49 + <el-col :span="12" class="bd">管理员电话</el-col>
  50 + <el-col :span="12" class="bd">{{infoData.custodianPhone}}</el-col>
  51 + </el-row>
  52 + <el-row >
  53 + <el-col :span="12" class="bd">投放时间</el-col>
  54 + <el-col :span="12" class="bd">{{infoData.dropTime}}</el-col>
  55 + </el-row>
  56 + <el-row >
  57 + <el-col :span="12" class="bd">运营单位</el-col>
  58 + <el-col :span="12" class="bd">{{infoData.operatingUnit}}</el-col>
  59 + </el-row>
  60 + <el-row >
  61 + <el-col :span="12" class="bd">运输单位</el-col>
  62 + <el-col :span="12" class="bd">{{infoData.transportUnit}}</el-col>
  63 + </el-row>
  64 + <el-row >
  65 + <el-col :span="12" class="bd">坐标点</el-col>
  66 + <el-col :span="12" class="bd">{{infoData.coordinatePoint}}</el-col>
  67 + </el-row>
  68 + </div>
  69 + </div>
  70 +</template>
  71 +
  72 +<script>
  73 +
  74 +
  75 +import store from "@/store";
  76 +import {
  77 + getToken
  78 +} from "@/utils/auth";
  79 +import {
  80 + listDropPointInfo,
  81 + getDropPointInfo,
  82 + delDropPointInfo,
  83 + addDropPointInfo,
  84 + updateDropPointInfo,
  85 + exportDropPointInfo
  86 +} from "@/api/unit/dropPointInfo";
  87 +import {getAreaList} from "@/api/dict"
  88 +
  89 +
  90 +
  91 +
  92 +export default {
  93 + name: "dropPointinfo",
  94 + props: {
  95 + businessKey: {
  96 + type: String
  97 + },
  98 + },
  99 + data() {
  100 + return {
  101 + sign: store.getters.avatar, //裁剪图片的地址
  102 + areas: [],
  103 + loading: null,
  104 + infoData: {},
  105 + dicts:null,
  106 + showPic:false,
  107 + picImage:null,
  108 + }
  109 + },
  110 + created() {
  111 + getAreaList().then(response => {
  112 + if(response==null || response.length===0){
  113 + this.$message.error("获取区域列表失败");
  114 + return;
  115 + }
  116 + const data = response;
  117 + for (let dataKey in data) {
  118 + if(data[dataKey].level === '3'){
  119 + this.areas.push({name:data[dataKey].name,code:data[dataKey].id, streets:[]})
  120 + }
  121 + }
  122 + for(let dataKey in data){
  123 + for(let areas1Key in this.areas){
  124 + if(data[dataKey].pid === this.areas[areas1Key].code){
  125 + this.areas[areas1Key].streets.push({code:data[dataKey].id, name:data[dataKey].name})
  126 + }
  127 + }
  128 + }
  129 + });
  130 + this.loading = true;
  131 + this.getInfo();
  132 +
  133 + },
  134 + methods: {
  135 + dict(code) {
  136 + for (let key in this.areas) {
  137 + if (this.areas[key].code === code) {
  138 + return this.areas[key].name;
  139 + }
  140 + }
  141 + },
  142 + dictInfo(code) {
  143 + for (let key in this.areas) {
  144 + for (let keyInfo in this.areas[key].streets) {
  145 + if (this.areas[key].streets[keyInfo].code === code) {
  146 + return this.areas[key].streets[keyInfo].name;
  147 + }
  148 + }
  149 + }
  150 + },
  151 + getInfo() {
  152 + let id;
  153 + if (this.businessKey.split(":").length == 2) {
  154 + id = this.businessKey.split(":")[1];
  155 + } else {
  156 + id = this.businessKey;
  157 + }
  158 +
  159 + getDropPointInfo(id).then(response => {
  160 +
  161 + this.infoData = response.data;
  162 + // getArea().then(res => {
  163 + // this.areas = res.result;
  164 + // this.loading = false;
  165 + // for (let i = 0; i < this.areas.length; i++) {
  166 + // if (Number(this.infoData.place) == this.areas[i].code) {
  167 + // this.infoData.place = this.areas[i].name;
  168 + // }
  169 + // }
  170 + // });
  171 +
  172 + // for(let i in obj){
  173 + // if(this.objectDict[i]){
  174 + // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
  175 + // }
  176 + // }
  177 + this.loading = false;
  178 + });
  179 + },
  180 + }
  181 +
  182 +}
  183 +</script>
  184 +<style>
  185 +.bd{
  186 + padding:5px;
  187 +}
  188 +
  189 +
  190 +
  191 +</style>
trash-ui/src/views/unit/dropPointInfo/info.vue renamed to trash-ui/src/views/unit/dropPointInfo/dropPointinfo.vue
  View file @8019aac