youxiw2000 / trash · Commits

Commit a9012930410c71a7b9098f68d00324a17820e205

Authored by youxiw2000
1 parent 47b8f1f2
build: skipped

m

Inline Side-by-side
Showing 14 changed files with 1442 additions and 1388 deletions
trash-ui/dist.rar
View file @a901293
No preview for this file type
trash-ui/src/api/caseOfflineInfo.js
  View file @a901293
@@ -144,6 +144,14 @@ export default { @@ -144,6 +144,14 @@ export default {
144 }, 144 },
145 /** 修改按钮操作 */ 145 /** 修改按钮操作 */
146 handleUpdate() { 146 handleUpdate() {
  147 +
  148 + let id = this.businessKey.split(":");
  149 +
  150 + if (id.length == 2) {
  151 + this.businessKey = id[1];
  152 + } else {
  153 + this.businessKey = id;
  154 + }
147 getCaseOffline(this.businessKey).then(response => { 155 getCaseOffline(this.businessKey).then(response => {
148 this.form = response.data; 156 this.form = response.data;
149 if (this.form.attach && this.form.attach != "") 157 if (this.form.attach && this.form.attach != "")
trash-ui/src/api/dayWorkReport.js
  View file @a901293
@@ -329,7 +329,6 @@ export default { @@ -329,7 +329,6 @@ export default {
329 } 329 }
330 330
331 getNames(this.queryParams).then(res => { 331 getNames(this.queryParams).then(res => {
332 -  
333 this.names = res; 332 this.names = res;
334 }) 333 })
335 334
trash-ui/src/api/taskhismethod.js 0 → 100644
  View file @a901293
  1 +import {
  2 + listEndTask,
  3 + listTask,
  4 + formDataShow
  5 +} from "@/api/activiti/taskhistory";
  6 +
  7 +
  8 +
  9 +import {historyFromData} from '@/api/activiti/historyFormdata'
  10 +import {addSign, getSignByObjId} from "@/api/sign/sign";
  11 +import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
  12 +import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
  13 +import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
  14 +import {getDict, getSupervision, getUsers} from "@/api/dict";
  15 +import {activeThreestep} from "@/api/business/threestep";
  16 +import {getToken} from "@/utils/auth";
  17 +import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
  18 +import {updateHandleAffairs} from "@/api/office/handle";
  19 +
  20 +export default {
  21 + methods: {
  22 + remoteName(value){
  23 + getNames(value).then(res=>{
  24 +
  25 + this.names = res.data;
  26 +
  27 + this.queryParams.name = value;
  28 + });
  29 + },
  30 + resetQuery(){
  31 + this.queryParams = {};
  32 + this.queryParams.pageNum=1;
  33 + this.queryParams.pageSize=10;
  34 + this.getList();
  35 + },
  36 + /** 查询请假列表 */
  37 + getList() {
  38 + debugger;
  39 + this.loading = true;
  40 + if (this.type == 1) {
  41 + listEndTask(this.queryParams).then(response => {
  42 + this.taskList = response.rows;
  43 + this.total = response.total;
  44 + this.loading = false;
  45 + if(!this.names)
  46 + this.names = response.names;
  47 + });
  48 + } else {
  49 + listTask(this.queryParams).then(response => {
  50 + this.taskList = response.rows;
  51 + this.total = response.total;
  52 + this.loading = false;
  53 +
  54 + if(!this.names)
  55 + this.names = response.names;
  56 + });
  57 + }
  58 + },
  59 +
  60 + // 取消按钮
  61 + cancel() {
  62 + this.earthsites = false;
  63 + this.contract = false;
  64 + this.logisticsInfoOpen = false;
  65 + this.handleAffairsInfoOpen = false;
  66 + this.caseOffline = false;
  67 + this.violationCaseFile = false;
  68 + this.violationCaseFile1 = false;
  69 + this.supervisionOpen = false;
  70 + this.open = false;
  71 + this.open2 = false;
  72 + this.conferenceOpen = false;
  73 + this.construct = false;
  74 + this.leaveApplicationOpen = false;
  75 + this.reset();
  76 + },
  77 + // 表单重置
  78 + reset() {
  79 + this.definitionKey = '';
  80 + this.businessKey = '';
  81 + this.form = {
  82 + formData: [],
  83 + };
  84 + this.resetForm("form");
  85 + },
  86 + showTask(row, idx) {
  87 + this.needShow = false;
  88 + this.reset();
  89 + this.definitionKey = row.definitionKey;
  90 + this.businessKey = row.businessKey;
  91 + this.id = row.id;
  92 +
  93 + historyFromData(this.businessKey).then(response => {
  94 +
  95 + this.hisfromData = [];
  96 +
  97 + this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time});
  98 + for(let i in response.data){
  99 +
  100 + this.hisfromData.push(response.data[i]);
  101 + }
  102 + })
  103 +
  104 +
  105 + this.title = "详情";
  106 + formDataShow(row.id).then(response => {
  107 + let datas = response.data;
  108 + let formData = []
  109 + for (let i = 0; i < datas.length; i++) {
  110 + let strings = datas[i].split('--__!!')
  111 + let controlValue = null
  112 + let controlDefault = null
  113 + switch (strings[1]) {
  114 + case 'radio':
  115 + controlValue = idx;
  116 + controlDefault = strings[4]
  117 + break;
  118 + // default:
  119 + }
  120 + formData.push({
  121 + controlId: strings[0],
  122 + controlType: strings[1],
  123 + controlLable: strings[2],
  124 + controlIsParam: strings[3],
  125 + controlValue: controlValue,
  126 + controlDefault: controlDefault
  127 + })
  128 + }
  129 + if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {
  130 + if(this.definitionKey == "yuelanxuexi"||this.definitionKey == "yuelan"){
  131 + this.businessKey = 'yuelanxuexi1';
  132 + }else if(this.definitionKey == "gongwenchuli"){
  133 + this.businessKey = 'gongwenchuli';
  134 + }
  135 + this.idInfo = row.businessKey.split(":")[1];
  136 + this.handleAffairsInfoOpen = true;
  137 + return;
  138 + }
  139 + });
  140 +
  141 + if (this.definitionKey == "conference") {
  142 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":") + 1);
  143 + this.conferenceOpen = true;
  144 + return;
  145 + }
  146 + if (this.definitionKey == "workflow_leave") {
  147 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
  148 + this.leaveApplicationOpen = true;
  149 + return;
  150 + }
  151 + if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
  152 +
  153 +
  154 + this.construct = true;
  155 + return;
  156 + }
  157 + if (this.definitionKey == "workflow_earthsites") {
  158 + this.earthsites = true;
  159 + return;
  160 + }
  161 + if (this.definitionKey == "workflow_conract") {
  162 + this.contract = true;
  163 + return;
  164 + }
  165 +
  166 +
  167 + if (this.definitionKey == "workflow_threestep") {
  168 + this.open2 = true;
  169 + return;
  170 + }
  171 +
  172 + if (this.definitionKey == "logistics") {
  173 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
  174 + this.logisticsInfoOpen = true;
  175 + return;
  176 + }
  177 +
  178 + if (this.definitionKey == "workflow_caseoffline") {
  179 + this.caseOffline = true;
  180 + return;
  181 + }
  182 +
  183 + if (this.definitionKey == "workflow_casefile") {
  184 + this.violationCaseFile = true;
  185 + return;
  186 + }
  187 +
  188 + if (this.definitionKey == "violation_warning") {
  189 + this.violationCaseFile1 = true;
  190 + return;
  191 + }
  192 +
  193 + if (this.definitionKey.indexOf("supervision") > -1) {
  194 + const params = {
  195 + id: row.businessKey.split(":")[1],
  196 + }
  197 + getSupervision(params).then(res => {
  198 + if (res.result == null) {
  199 + this.$message.error("获取纪检督察详情失败！请重试")
  200 + return;
  201 + }
  202 + this.supervisionData = res.result;
  203 + this.supervisionOpen = true;
  204 + })
  205 + return;
  206 + }
  207 +
  208 + if(this.definitionKey == "workflow_company"){
  209 + this.company = true;
  210 + return;
  211 + }
  212 + if(this.definitionKey == "workflow_vehicle"){
  213 + this.vehicle = true;
  214 + return;
  215 + }
  216 + if(this.definitionKey == "workflow_driver"){
  217 + this.driver = true;
  218 + return;
  219 + }
  220 +
  221 + },
  222 + },
  223 + }
trash-ui/src/api/taskmethod.js 0 → 100644
  View file @a901293
  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";
  13 +
  14 +export default {
  15 + methods: {
  16 + remoteName(value){
  17 + getNames(value).then(res=>{
  18 +
  19 + this.names = res.data;
  20 +
  21 + this.queryParams.name = value;
  22 + });
  23 + },
  24 + resetQuery(){
  25 + this.queryParams = {};
  26 + this.queryParams.pageNum=1;
  27 + this.queryParams.pageSize=10;
  28 + this.getList();
  29 + },
  30 +
  31 + removeAttchItem(index, img) {
  32 + this.form.replyImg.splice(this.form.replyImg.indexOf(img), 1);
  33 + for (let i = 0; i < this.slides1.length; i++) {
  34 + if (this.slides1[i].alt == img) {
  35 + this.slides1.splice(i, 1);
  36 + }
  37 + }
  38 + for (let i = 0; i < this.videoSrc1.length; i++) {
  39 + if (this.videoSrc1[i].alt == img) {
  40 + this.videoSrc1.splice(i, 1);
  41 + }
  42 + }
  43 +
  44 + this.$forceUpdate();
  45 + },
  46 + handleClose() {
  47 + this.uploadImageDialog = false;
  48 + this.fileList = [];
  49 + this.slidesArys = [];
  50 + this.slides1 = [];
  51 + this.videoSrc1 = [];
  52 + },
  53 + removeImage(index, img) {
  54 + let target = "sub_img" + this.picIndex;
  55 + for (let i = 0; i < this.slides[index].length; i++) {
  56 + if (this.slides[index][i].alt == img) {
  57 + this.slides[index].splice(i, 1);
  58 + }
  59 + }
  60 + this.form[target].splice(this.form[target].indexOf(img), 1);
  61 + },
  62 + uploadSuccess(res, file, fileList) {
  63 + if (res.code) {
  64 + this.$message(res.message);
  65 + return;
  66 + }
  67 + let target = "sub_img" + this.picIndex;
  68 + if (!this.form[target]) {
  69 + this.form[target] = [];
  70 + }
  71 + this.form[target].push(file.name + ':' + res);
  72 + if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1) {
  73 + let url = URL.createObjectURL(file.raw)
  74 + this.slidesArys.push({
  75 + url: url,
  76 + alt: res
  77 + })
  78 + this.slides[this.picIndex] = this.slidesArys;
  79 + }
  80 + this.$forceUpdate();
  81 + },
  82 + uploadSuccess1(res, file, fileList) {
  83 + if (res.code) {
  84 + this.$message(res.message);
  85 + return;
  86 + }
  87 + if (!this.form.replyImg) {
  88 + this.form.replyImg = [];
  89 + }
  90 + this.form.replyImg.push(res);
  91 + if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.gif') > -1 || file.name.indexOf('.jpeg') > -1) {
  92 + let url = URL.createObjectURL(file.raw)
  93 + this.slides1.push({
  94 + url: url,
  95 + alt: res
  96 + })
  97 + }
  98 + if (file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {
  99 + let url = URL.createObjectURL(file.raw)
  100 + this.videoSrc1.push({
  101 + url: url,
  102 + alt: res
  103 + });
  104 + }
  105 + this.$forceUpdate();
  106 + },
  107 + showFileUpload(i) {
  108 + this.uploadImageDialog = true;
  109 + this.picIndex = i;
  110 + },
  111 + beforeUpload(file) {
  112 + let isRightSize = file.size / 1024 / 1024 < 100
  113 + if (!isRightSize) {
  114 + this.$message.error('文件大小超过 100MB')
  115 + return isRightSize;
  116 + }
  117 + let isAccept = false;
  118 + if (file.name.indexOf('.png') > -1 || file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
  119 + .name.indexOf('.pdf') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.jpeg') > -1 || file.name.indexOf('.gif') > -1
  120 + || file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {
  121 + isAccept = true;
  122 + }
  123 + if (!isAccept) {
  124 + this.$message.error('应该选择PDF、AVI、MP4、WORD、图片类型的文件')
  125 + return isAccept;
  126 + }
  127 + },
  128 + getList() {
  129 + this.reset();
  130 + this.loading = true;
  131 + listTask(this.queryParams).then(response => {
  132 + this.taskList = response.rows;
  133 + this.total = response.total;
  134 + this.loading = false;
  135 + });
  136 + },
  137 +
  138 + // 取消按钮
  139 + cancel() {
  140 + this.earthsites = false;
  141 + this.contract = false;
  142 + this.logisticsInfoOpen = false;
  143 + this.handleAffairsInfoOpen = false;
  144 + this.caseOffline = false;
  145 + this.violationCaseFile = false;
  146 + this.violationCaseFile1 = false;
  147 + this.supervisionOpen = false;
  148 + this.open = false;
  149 + this.open2 = false;
  150 + this.conferenceOpen = false;
  151 + this.construct = false;
  152 + this.leaveApplicationOpen = false;
  153 + this.company = false;
  154 + this.driver = false;
  155 + this.vehicle = false;
  156 + this.videoSrc1 = [];
  157 + this.slides1 = [];
  158 + this.reset();
  159 + },
  160 + // 表单重置
  161 + reset() {
  162 + this.definitionKey = '',
  163 + this.businessKey = '',
  164 + this.form = {
  165 + formData: [],
  166 + };
  167 + this.resetForm("form");
  168 + },
  169 + showTask(row, idx) {
  170 + this.reset();
  171 + this.definitionKey = row.definitionKey;
  172 + this.businessKey = row.businessKey;
  173 + this.id = row.id;
  174 + this.taskName = row.name;
  175 + historyFromData(this.businessKey).then(response => {
  176 + this.hisfromData = [];
  177 + this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
  178 + for(let i in response.data){
  179 +
  180 + this.hisfromData.push(response.data[i]);
  181 + }
  182 + })
  183 +
  184 + formDataShow(row.id).then(response => {
  185 + let datas = response.data;
  186 + let formData = []
  187 + let text = "";
  188 + for (let i = 0; i < datas.length; i++) {
  189 + let strings = datas[i].split('--__!!')
  190 + let controlValue = null
  191 + let controlDefault = null
  192 + switch (strings[1]) {
  193 + case 'radio':
  194 + controlValue = idx;
  195 + controlDefault = strings[4]
  196 + break;
  197 + case 'textarea':
  198 + text = controlValue;
  199 + break;
  200 + // default:
  201 + }
  202 + formData.push({
  203 + controlId: strings[0],
  204 + controlType: strings[1],
  205 + controlLable: strings[2],
  206 + controlIsParam: strings[3],
  207 + controlValue: controlValue,
  208 + controlDefault: controlDefault
  209 + })
  210 + }
  211 + this.form.formData = formData;
  212 +
  213 + if (this.definitionKey == "workflow_threestep") {
  214 + this.open2 = true;
  215 + return;
  216 + }
  217 + if (this.definitionKey == "conference") {
  218 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":") + 1);
  219 + this.conferenceOpen = true;
  220 + return;
  221 + }
  222 + if (this.definitionKey == "workflow_leave") {
  223 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
  224 + this.leaveApplicationOpen = true;
  225 + return;
  226 + }
  227 +
  228 + if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
  229 + this.construct = true;
  230 + return;
  231 + }
  232 + if (this.definitionKey == "workflow_earthsites") {
  233 + this.earthsites = true;
  234 + return;
  235 + }
  236 + if (this.definitionKey == "workflow_conract") {
  237 + this.contract = true;
  238 + return;
  239 + }
  240 +
  241 + if (this.definitionKey == "logistics") {
  242 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
  243 + this.logisticsInfoOpen = true;
  244 + return;
  245 + }
  246 + if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {
  247 + this.controlId = this.form.formData[0].controlId;
  248 + this.idInfo = row.businessKey.split(":")[1];
  249 + this.handleAffairsInfoOpen = true;
  250 + return;
  251 + }
  252 + if (this.definitionKey == "workflow_caseoffline") {
  253 + this.caseOffline = true;
  254 + return;
  255 + }
  256 +
  257 + if (this.definitionKey == "workflow_casefile") {
  258 + this.violationCaseFile = true;
  259 + this.videoSrc1 = [];
  260 + this.slides1 = [];
  261 + return;
  262 + }
  263 +
  264 + if (this.definitionKey == "violation_warning") {
  265 + this.violationCaseFile1 = true;
  266 + this.videoSrc1 = [];
  267 + this.slides1 = [];
  268 + return;
  269 + }
  270 + if (this.definitionKey.indexOf("supervision") > -1) {
  271 + console.log(row)
  272 + const params = {
  273 + id: row.businessKey.split(":")[1],
  274 + }
  275 + getSupervision(params).then(res => {
  276 + if (res.result == null) {
  277 + this.$message.error("获取纪检督察详情失败！请重试")
  278 + return;
  279 + }
  280 + this.supervisionData = res.result;
  281 + this.supervisionOpen = true;
  282 + })
  283 + return;
  284 + }
  285 + if (this.definitionKey == "workflow_company") {
  286 + this.company = true;
  287 + return;
  288 + }
  289 + if (this.definitionKey == "workflow_vehicle") {
  290 + this.vehicle = true;
  291 + return;
  292 + }
  293 + if (this.definitionKey == "workflow_driver") {
  294 + this.driver = true;
  295 + return;
  296 + }
  297 + this.open = true;
  298 + this.title = "审批";
  299 + });
  300 + },
  301 +
  302 + /** 提交按钮 */
  303 + submitForm(formid, value) {
  304 + this.form.formData[0].controlValue = value;
  305 + this.form.formData[0].controlId = formid;
  306 + this.form.id = this.businessKey.split(":")[1];
  307 + if (this.form.formData[0].controlValue == 0) {
  308 + this.form.status = 1;
  309 + } else {
  310 + this.form.status = 2;
  311 + }
  312 +
  313 + if (this.definitionKey == "workflow_threestep") {
  314 +
  315 +
  316 + for (let i = 0; i < 13; i++) {
  317 + if (this.form["sub_img" + i]) {
  318 + let paths = "";
  319 + for (var j = 0; j < this.form["sub_img" + i].length; j++) {
  320 + paths += this.form["sub_img" + i][j].split(":")[1] + ",";
  321 + }
  322 + this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
  323 + }
  324 + }
  325 +
  326 + if (this.form.status == 1) {
  327 + activeThreestep(this.form).then(res => {
  328 + formDataSave(this.id, this.form.formData).then(response => {
  329 + this.msgSuccess("审批成功");
  330 + this.open2 = false;
  331 + this.taskList = [];
  332 + this.getList();
  333 + });
  334 + });
  335 + } else {
  336 + formDataSave(this.id, this.form.formData).then(response => {
  337 + this.msgSuccess("审批成功");
  338 + this.open2 = false;
  339 + this.taskList = [];
  340 + this.getList();
  341 + });
  342 + }
  343 + return;
  344 + }
  345 +
  346 + if (this.definitionKey == "workflow_constructsite") {
  347 + if (this.form.status == 1) {
  348 + let objId = this.businessKey.split(":")[1];
  349 + let query = {
  350 + objectId: objId,
  351 + };
  352 + let text = "";
  353 + for (let i = 0; i < this.form.formData.length; i++) {
  354 + let strings = this.form.formData[i];
  355 + switch (strings.controlType) {
  356 + case 'textarea':
  357 + text = strings.controlValue;
  358 + break;
  359 + }
  360 + }
  361 +
  362 + if (this.taskName == "勘察科员") {
  363 + query.idx = 0;
  364 + query.sign1Text = text;
  365 + } else if (this.taskName == "堪察部长") {
  366 + query.idx = 1;
  367 + query.sign2Text = text;
  368 + } else if (this.taskName == "堪察分管领导") {
  369 + query.idx = 2;
  370 + query.sign3Text = text
  371 + } else if (this.taskName == "中心负责人") {
  372 + query.idx = 3;
  373 + query.sign4Text = text;
  374 + }
  375 +
  376 + addSign(query).then(res => {
  377 + formDataSave(this.id, this.form.formData).then(response => {
  378 + this.msgSuccess("审批成功");
  379 + this.open = false;
  380 + this.construct = false;
  381 + this.getList();
  382 + });
  383 + })
  384 +
  385 + } else {
  386 +
  387 + formDataSave(this.id, this.form.formData).then(response => {
  388 + this.msgSuccess("审批成功");
  389 + this.construct = false;
  390 + this.getList();
  391 + });
  392 + }
  393 + return;
  394 + }
  395 +
  396 +
  397 + if (this.definitionKey == "workflow_caseoffline") {
  398 +
  399 + let postData = {};
  400 +
  401 + postData.tableName = this.businessKey;
  402 + postData.replyImg = this.form.replyImg + "";
  403 + postData.reply = this.form.reply;
  404 + if(postData.reply==null || postData.reply==""){
  405 + if(value==0){
  406 + postData.reply = "通过";
  407 + }else{
  408 + postData.reply = "驳回";
  409 + }
  410 + }
  411 +
  412 + addReplyApprovalProcess(postData).then(res => {
  413 + this.videoSrc1 = [];
  414 + this.slides1 = [];
  415 + });
  416 + let id = this.businessKey.split(":")[1];
  417 + let query = {
  418 + id: id,
  419 + };
  420 +
  421 + let adv = this.form.advice;
  422 +
  423 + if (!adv) {
  424 + if (value == 0) {
  425 + adv = "审批通过";
  426 + } else {
  427 + adv = "审批驳回";
  428 + }
  429 + }
  430 +
  431 + if (this.taskName == "渣土办科员") {
  432 + query.advice1 = adv;
  433 + } else if (this.taskName == "渣土办分管领导") {
  434 + query.advice2 = adv;
  435 + } else if (this.taskName == "治理部部长") {
  436 + query.advice3 = adv;
  437 + } else if (this.taskName == "治理部分管领导") {
  438 + query.advice4 = adv;
  439 + }
  440 +
  441 + updateCaseOffline(query).then(res => {
  442 + formDataSave(this.id, this.form.formData).then(response => {
  443 + this.msgSuccess("审批成功");
  444 + this.caseOffline = false;
  445 + this.getList();
  446 + });
  447 + })
  448 + return;
  449 + }
  450 +
  451 + if (this.definitionKey == "workflow_casefile") {
  452 + let postData = {};
  453 +
  454 + postData.tableName = this.businessKey;
  455 + postData.replyImg = this.form.replyImg + "";
  456 + postData.reply = this.form.reply;
  457 + if(postData.reply==null || postData.reply==""){
  458 + if(value==0){
  459 + postData.reply = "通过";
  460 + }else{
  461 + postData.reply = "驳回";
  462 + }
  463 + }
  464 + if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
  465 + console.log(this.businessKey);
  466 + let objId = this.businessKey.split(":")[1];
  467 + updateViolationCaseFileReader({id: objId}).then(res => {
  468 + })
  469 + }
  470 + addReplyApprovalProcess(postData).then(res => {
  471 + this.videoSrc1 = [];
  472 + this.slides1 = [];
  473 + formDataSave(this.id, this.form.formData).then(response => {
  474 + this.msgSuccess("审批成功");
  475 + this.violationCaseFile = false;
  476 + this.getList();
  477 + });
  478 + });
  479 + }
  480 + if (this.definitionKey == "violation_warning") {
  481 + let postData = {};
  482 + postData.tableName = this.businessKey;
  483 + postData.replyImg = this.form.replyImg + "";
  484 + postData.reply = this.form.reply;
  485 + if(postData.reply==null || postData.reply==""){
  486 + if(value==0){
  487 + postData.reply = "通过";
  488 + }else{
  489 + postData.reply = "驳回";
  490 + }
  491 + }
  492 +
  493 +
  494 + if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
  495 + let objId = this.businessKey.split(":")[1];
  496 + updateViolationCaseFileReader1({id: objId}).then(res => {
  497 + })
  498 + }
  499 + addReplyApprovalProcess(postData).then(res => {
  500 + this.videoSrc1 = [];
  501 + this.slides1 = [];
  502 + formDataSave(this.id, this.form.formData).then(response => {
  503 + this.msgSuccess("审批成功");
  504 + this.violationCaseFile1 = false;
  505 + this.getList();
  506 + });
  507 + });
  508 + }
  509 +
  510 + if (
  511 + this.definitionKey.indexOf("supervision") > -1 ||
  512 + this.definitionKey == "workflow_company" ||
  513 + this.definitionKey == "workflow_driver" ||
  514 + this.definitionKey == "workflow_vehicle" ||
  515 + this.definitionKey == "workflow_earthsites" ||
  516 + this.definitionKey == "workflow_conract" ||
  517 + this.definitionKey == "workflow_constructsite_edit") {
  518 + formDataSave(this.id, this.form.formData).then(response => {
  519 + this.msgSuccess("审批成功");
  520 + this.cancel();
  521 + this.getList();
  522 + });
  523 + }
  524 + },
  525 + conferenceSubmitForm(value) {
  526 + this.form.formData[0].controlValue = value;
  527 + if (value == 0) {
  528 + this.form.status = 1;
  529 + } else {
  530 + this.form.status = 2;
  531 + }
  532 + //审批or驳回
  533 + formDataSave(this.id, this.form.formData).then(response => {
  534 + this.msgSuccess("审批成功");
  535 + this.conferenceOpen = false;
  536 + this.taskList = [];
  537 + this.getList();
  538 + });
  539 + },
  540 + leaveApplicationSubmitForm(value) {
  541 + if (value == 0) {
  542 + this.form.status = 1;
  543 + } else {
  544 + this.form.status = 2;
  545 + }
  546 + this.form.formData[0].controlValue = value;
  547 + //审批or驳回
  548 + formDataSave(this.id, this.form.formData).then(response => {
  549 + this.msgSuccess("审批成功");
  550 + this.leaveApplicationOpen = false;
  551 + this.taskList = [];
  552 + this.getList();
  553 + });
  554 + },
  555 + logisticsInfoSubmitForm(value) {
  556 + if (value == 0) {
  557 + this.form.status = 1;
  558 + } else {
  559 + this.form.status = 2;
  560 + }
  561 + this.form.formData[0].controlValue = value;
  562 + //this.form.formData[0].route = value;
  563 + //审批or驳回
  564 + formDataSave(this.id, this.form.formData).then(response => {
  565 + this.msgSuccess("审批成功");
  566 + this.logisticsInfoOpen = false;
  567 + this.taskList = [];
  568 + this.getList();
  569 + });
  570 + },
  571 + handleAffairsSubmitForm(value) {
  572 + console.log(this.controlId)
  573 + if (value == 0) {
  574 + this.form.status = 1;
  575 + } else {
  576 + this.form.status = 2;
  577 + }
  578 + this.form.formData[0].controlValue = value;
  579 + if (this.definitionKey == "yuelan") {
  580 + if (this.deptName == null) {
  581 + this.$message.error("请选择阅览部门！");
  582 + return;
  583 + }
  584 + if (this.users.length == 0) {
  585 + this.$message.error("请选择阅览人！");
  586 + return;
  587 + }
  588 + const userNames = [];
  589 + const newArr = this.ArrSet(this.userNodes, "id");
  590 + for (let i = 0; i < newArr.length; i++) {
  591 + for (let j = 0; j < this.users.length; j++) {
  592 + if (newArr[i].id == this.users[j]) {
  593 + userNames.push(newArr[i].label);
  594 + }
  595 + }
  596 + }
  597 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  598 + this.form.formData[0].userNames = userNames;
  599 + //表里存中文
  600 + handleAffairsForm.userNames = userNames.join(",");
  601 + updateHandleAffairs(handleAffairsForm).then(res => {
  602 + formDataSave(this.id, this.form.formData).then(response => {
  603 + this.msgSuccess("审批成功");
  604 + this.handleAffairsInfoOpen = false;
  605 + this.taskList = [];
  606 + this.getList();
  607 + });
  608 + })
  609 + return;
  610 + }
  611 + //分管领导审批流程时，需要指定部门审批，所以判断当前流程类型和当前控件（表单）id
  612 + if ((this.controlId == "FormProperty_214hj4h" || this.controlId == "FormProperty_2vu2250") && value == 0) {
  613 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  614 + if (handleAffairsForm.deptId == null) {
  615 + this.$message.error("请选择信访部门！");
  616 + return;
  617 + }
  618 + const deptCode = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.value;
  619 + this.form.formData[0].deptCode = deptCode;
  620 + //表里存中文
  621 + handleAffairsForm.deptName = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.selectedLabel;
  622 + const haType = handleAffairsForm.type;
  623 + if (haType == 4 || haType == 2 || haType == 3) {
  624 + updateHandleAffairs(handleAffairsForm).then(res => {
  625 + formDataSave(this.id, this.form.formData).then(response => {
  626 + this.msgSuccess("审批成功");
  627 + this.handleAffairsInfoOpen = false;
  628 + this.taskList = [];
  629 + this.getList();
  630 + });
  631 + })
  632 + }
  633 + //回复意见
  634 + } else if (this.controlId == "FormProperty_0orjdou" || this.controlId == "FormProperty_05v7lct") {
  635 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  636 + updateHandleAffairs(handleAffairsForm).then(res => {
  637 + formDataSave(this.id, this.form.formData).then(response => {
  638 + this.msgSuccess("审批成功");
  639 + this.handleAffairsInfoOpen = false;
  640 + this.taskList = [];
  641 + this.getList();
  642 + });
  643 + })
  644 + } else if (this.controlId == "FormProperty_0aq22i0" && value == 0) {
  645 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  646 + if (handleAffairsForm.sendObject == null) {
  647 + this.$message.error("请选择推送对象!");
  648 + return;
  649 + }
  650 + this.form.formData[0].index = handleAffairsForm.sendObject;
  651 + updateHandleAffairs(handleAffairsForm).then(res => {
  652 + formDataSave(this.id, this.form.formData).then(response => {
  653 + this.msgSuccess("审批成功");
  654 + this.handleAffairsInfoOpen = false;
  655 + this.taskList = [];
  656 + this.getList();
  657 + });
  658 + })
  659 + } else if ((this.controlId == 'FormProperty_11p96vq' || this.controlId == 'FormProperty_2jvcgq8') && value == 0) {
  660 + const reply = {
  661 + reply: this.$refs.handleAffairsInfoRef.$data.opinion,
  662 + tableName: "handle_affairs",
  663 + tableId: this.idInfo
  664 + }
  665 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  666 + if (handleAffairsForm.deptId == null) {
  667 + this.$message.error("请选择处理部门！");
  668 + return;
  669 + }
  670 + const deptCode = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.value;
  671 + this.form.formData[0].deptCode = deptCode;
  672 + //表里存中文
  673 + handleAffairsForm.deptName = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.selectedLabel;
  674 + updateHandleAffairs(handleAffairsForm).then(res => {
  675 + addReplyApprovalProcess(reply).then(res => {
  676 + formDataSave(this.id, this.form.formData).then(response => {
  677 + this.msgSuccess("审批成功");
  678 + this.handleAffairsInfoOpen = false;
  679 + this.taskList = [];
  680 + this.getList();
  681 + });
  682 + })
  683 + })
  684 +
  685 + } else {
  686 + formDataSave(this.id, this.form.formData).then(response => {
  687 + this.msgSuccess("审批成功");
  688 + this.handleAffairsInfoOpen = false;
  689 + this.taskList = [];
  690 + this.getList();
  691 + });
  692 + }
  693 +
  694 + },
  695 + changeDepts(e) {
  696 + this.options = [];
  697 + this.roles.forEach((role, index) => {
  698 + let area = {
  699 + bizAuthCodes: [2],
  700 + authPostType: role.code,
  701 + authDepartmentType: e
  702 + };
  703 + getUsers(area).then(res => {
  704 + if (res.result.length != 0) {
  705 + if (res.result[0].userAuthList.length > 0) {
  706 + res.result[0].userAuthList.forEach((user, index) => {
  707 + this.options.push({id: user.userId, label: user.username})
  708 + });
  709 + }
  710 + }
  711 + });
  712 + });
  713 + },
  714 + handleSelect(node) {
  715 + this.userNodes.push(node);
  716 + },
  717 + ArrSet(Arr, id) {
  718 + var obj = {};
  719 + const arrays = Arr.reduce((setArr, item) => {
  720 + obj[item[id]] ? '' : obj[item[id]] = true && setArr.push(item);
  721 + return setArr;
  722 + }, []);
  723 + return arrays;
  724 + },
  725 + getFile(file, fileList) {
  726 + this.getBase64(file.raw).then(res => {
  727 + const params = res
  728 + this.proofImage = params
  729 + this.form.replyImg = params;
  730 + this.$forceUpdate();
  731 + })
  732 + },
  733 + getBase64(file) {
  734 + return new Promise(function (resolve, reject) {
  735 + const reader = new FileReader()
  736 + let imgResult = ''
  737 + reader.readAsDataURL(file)
  738 + reader.onload = function () {
  739 + imgResult = reader.result
  740 + }
  741 + reader.onerror = function (error) {
  742 + reject(error)
  743 + }
  744 + reader.onloadend = function () {
  745 + resolve(imgResult)
  746 + }
  747 + })
  748 + },
  749 + handleUploadRemove(file, fileList) {
  750 + this.proofImage = ''
  751 + this.form.replyImg = null;
  752 + this.$forceUpdate();
  753 + },
  754 + handlePictureCardPreview(file) {
  755 + console.log(this.proofImage)
  756 + },
  757 + },
  758 + }
trash-ui/src/api/truck_active.js
  View file @a901293
@@ -92,13 +92,14 @@ export default { @@ -92,13 +92,14 @@ export default {
92 }, 92 },
93 constList: [], 93 constList: [],
94 truckList: [], 94 truckList: [],
95 -  
96 construction: null, 95 construction: null,
97 truck: null, 96 truck: null,
98 company: null, 97 company: null,
99 openActivateTime: false, 98 openActivateTime: false,
100 isLoading: false, 99 isLoading: false,
101 simpleName:null, 100 simpleName:null,
  101 + remoteCompanys:[],
  102 + truckName:null,
102 }; 103 };
103 }, 104 },
104 created() { 105 created() {
@@ -119,34 +120,62 @@ export default { @@ -119,34 +120,62 @@ export default {
119 break; 120 break;
120 } 121 }
121 } 122 }
122 - if(need){ 123 +
  124 +
  125 +
  126 + let name = this.$store.getters.name.replace("公司", "")
  127 +
123 let query = { 128 let query = {
124 - name:this.$store.getters.name.replace("公司", "") 129 + page:1,
  130 + size:99999
125 } 131 }
126 132
127 -  
128 companyList(query).then(res=>{ 133 companyList(query).then(res=>{
129 -  
130 - for(let i in res.result.list){  
131 - if(res.result.list[i].abbreviation == this.$store.getters.name.replace("公司", "")){  
132 - this.simpleName = res.result.list[i].name;  
133 - break; 134 + this.remoteCompanys = res.result.list;
  135 + if(need){
  136 + for(let i in res.result.list){
  137 + if(res.result.list[i].abbreviation == name){
  138 + this.simpleName = res.result.list[i].name;
  139 + break;
  140 + }
  141 + }
134 } 142 }
135 - }  
136 -  
137 - this.getList(0);  
138 }); 143 });
139 144
140 - }else{  
141 -  
142 this.getList(0); 145 this.getList(0);
143 - }  
144 }); 146 });
145 147
146 148
147 149
148 }, 150 },
149 methods: { 151 methods: {
  152 + selectAll(value){
  153 +
  154 + if(value){
  155 + for(let i in this.truckList){
  156 + let item = this.truckList[i];
  157 + if(item.creditStatus != 0)
  158 + continue;
  159 + if((!this.truckName || item.licenseplateNo.indexOf(this.truckName) > -1) && (this.form.company && this.form.company == item.companyName)){
  160 + if(this.form.licensePlate.indexOf(item.licenseplateNo) == -1){
  161 + this.form.licensePlate.push(item.licenseplateNo);
  162 + }
  163 + }
  164 + }
  165 + }else{
  166 + for(let i in this.truckList){
  167 + let item = this.truckList[i];
  168 + if((!this.truckName || item.licenseplateNo.indexOf(this.truckName) > -1) && (this.form.company && this.form.company == item.companyName)){
  169 + this.form.licensePlate.splice(this.form.licensePlate.indexOf(item.licenseplateNo),1);
  170 +
  171 + }
  172 + }
  173 + }
  174 +
  175 +
  176 +
  177 +
  178 + },
150 /** 查询车辆激活列表 */ 179 /** 查询车辆激活列表 */
151 getList(index) { 180 getList(index) {
152 if (index == 0) { 181 if (index == 0) {
@@ -189,35 +218,69 @@ export default { @@ -189,35 +218,69 @@ export default {
189 218
190 219
191 constructionById(item.objectId).then(res => { 220 constructionById(item.objectId).then(res => {
192 - this.companyList.push({  
193 - id: res.result.transportCompanyId,  
194 - name: res.result.transportCompany  
195 - }); 221 +
  222 + for(let i in this.remoteCompanys){
  223 + if(this.remoteCompanys[i].id == res.result.transportCompanyId){
  224 + if(this.remoteCompanys[i].auditStatus != 1){
  225 + break;
  226 + }
  227 + let credit = "";
  228 + if(this.remoteCompanys[i].dishonestState != 0){
  229 + credit ="(失信)";
  230 + }
  231 +
  232 + this.companyList.push({
  233 + id: res.result.transportCompanyId,
  234 + name: res.result.transportCompany + credit,
  235 + creditStatus: this.remoteCompanys[i].dishonestState
  236 + });
  237 + break;
  238 + }
  239 +
  240 + }
  241 +
  242 +
196 243
197 244
198 let param = { 245 let param = {
199 - companyId:res.result.transportCompanyId, 246 + companyID:res.result.transportCompanyId,
200 auditStatus:1, 247 auditStatus:1,
201 - valid:0 248 + valid:0,
  249 + page:1,
  250 + size:1000
202 } 251 }
203 252
204 253
205 for(let i in res.result.unitCompanyList){ 254 for(let i in res.result.unitCompanyList){
206 let unit = res.result.unitCompanyList[i]; 255 let unit = res.result.unitCompanyList[i];
  256 + if(!unit.companyName)
  257 + continue;
207 258
208 let today = new Date().getTime(); 259 let today = new Date().getTime();
209 if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){ 260 if(new Date(unit.startTime).getTime() > today || new Date(unit.endTime).getTime() < today){
210 continue; 261 continue;
211 } 262 }
212 - if(unit.companyName){  
213 - param.companyId += "," + unit.companyId;  
214 263
215 - this.companyList.push({  
216 - id: unit.companyId,  
217 - name: unit.companyName  
218 - }); 264 + for(let i in this.remoteCompanys){
  265 + if(this.remoteCompanys[i].id == unit.companyId){
  266 + if(this.remoteCompanys[i].auditStatus != 1){
  267 + break;
  268 + }
  269 + let credit = "";
  270 + if(this.remoteCompanys[i].dishonestState != 0){
  271 + credit ="(失信)";
  272 + }
  273 +
  274 + param.companyID += "," + unit.companyId;
  275 +
  276 + this.companyList.push({
  277 + id: unit.companyId,
  278 + name: unit.companyName + credit,
  279 + creditStatus: this.remoteCompanys[i].dishonestState
  280 + });
  281 + break;
  282 + }
219 } 283 }
220 -  
221 } 284 }
222 285
223 truckList(param).then(tres=>{ 286 truckList(param).then(tres=>{
@@ -297,25 +360,36 @@ export default { @@ -297,25 +360,36 @@ export default {
297 }, 360 },
298 /** 提交按钮 */ 361 /** 提交按钮 */
299 submitForm() { 362 submitForm() {
  363 + let objs = "";
  364 + let licensePlates = "";
  365 + for (var i in this.form.licensePlate) {
  366 + if(!this.form.licensePlate[i] || this.form.licensePlate[i]==""){
  367 + continue;
  368 + }
  369 + for (let j in this.truckList) {
  370 + if (this.form.licensePlate[i] == this.truckList[j].licenseplateNo) {
  371 + objs += this.form.licensePlate[i] + ",";
  372 + licensePlates += this.truckList[j].licenseplateNo + ",";
  373 + }
  374 + }
  375 + }
  376 +
  377 + if(objs == ""){
  378 + this.form.licensePlate = null;
  379 + }
  380 +
300 this.$refs["form"].validate(valid => { 381 this.$refs["form"].validate(valid => {
301 if (valid) { 382 if (valid) {
302 let data = { 383 let data = {
303 - objectId: "",  
304 - licensePlate: "", 384 + objectId: objs,
  385 + licensePlate:licensePlates,
305 constructionId:this.construction.objectId, 386 constructionId:this.construction.objectId,
306 construction: this.construction.name, 387 construction: this.construction.name,
307 earthsite: this.construction.earthsitesName, 388 earthsite: this.construction.earthsitesName,
308 status: 0, 389 status: 0,
309 company: this.form.company, 390 company: this.form.company,
310 } 391 }
311 - for (var i in this.form.licensePlate) {  
312 - for (let j in this.truckList) {  
313 - if (this.form.licensePlate[i] == this.truckList[j].id) {  
314 - data.objectId += this.form.licensePlate[i] + ",";  
315 - data.licensePlate += this.truckList[j].licenseplateNo + ",";  
316 - }  
317 - }  
318 - } 392 +
319 addTruckActivate(data).then(response => { 393 addTruckActivate(data).then(response => {
320 this.msgSuccess("新增成功"); 394 this.msgSuccess("新增成功");
321 this.open = false; 395 this.open = false;
trash-ui/src/views/activiti/task/index.vue
  View file @a901293
@@ -27,6 +27,7 @@ @@ -27,6 +27,7 @@
27 <el-option label="运输企业准入流程" value="workflow_company"/> 27 <el-option label="运输企业准入流程" value="workflow_company"/>
28 <el-option label="运输车辆准入流程" value="workflow_vehicle"/> 28 <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
29 <el-option label="驾驶员信息审批" value="workflow_driver"/> 29 <el-option label="驾驶员信息审批" value="workflow_driver"/>
  30 + <el-option label="报工审批" value="workflow_threestep"/>
30 <el-option label="交办案卷" value="workflow_caseoffline"/> 31 <el-option label="交办案卷" value="workflow_caseoffline"/>
31 <el-option label="违规案卷处置流程" value="workflow_casefile"/> 32 <el-option label="违规案卷处置流程" value="workflow_casefile"/>
32 <el-option label="平台预警信息" value="violation_warning"/> 33 <el-option label="平台预警信息" value="violation_warning"/>
@@ -409,14 +410,14 @@ @@ -409,14 +410,14 @@
409 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" 410 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
410 placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/> 411 placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
411 </div> 412 </div>
412 -  
413 - 413 +
  414 +
414 <el-table :data="hisfromData" v-if="hisfromData != null"> 415 <el-table :data="hisfromData" v-if="hisfromData != null">
415 <el-table-column label="审批意见" align="center" prop="controlValue"/> 416 <el-table-column label="审批意见" align="center" prop="controlValue"/>
416 <el-table-column label="审批人" align="center" prop="createName"/> 417 <el-table-column label="审批人" align="center" prop="createName"/>
417 <el-table-column label="审批时间" align="center" prop="createTime"/> 418 <el-table-column label="审批时间" align="center" prop="createTime"/>
418 </el-table> 419 </el-table>
419 - 420 +
420 <div slot="footer" class="dialog-footer"> 421 <div slot="footer" class="dialog-footer">
421 <div slot="footer" class="dialog-footer"> 422 <div slot="footer" class="dialog-footer">
422 <el-button type="danger" @click="handleAffairsSubmitForm(1)" 423 <el-button type="danger" @click="handleAffairsSubmitForm(1)"
@@ -625,936 +626,192 @@ @@ -625,936 +626,192 @@
625 </style> 626 </style>
626 627
627 <script> 628 <script>
628 -import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";  
629 -  
630 -import {historyFromData} from '@/api/activiti/historyFormdata'  
631 -  
632 -  
633 -import {addSign, getSignByObjId} from "@/api/sign/sign";  
634 -  
635 -import {updateCaseOffline} from "@/api/caseOffline/caseOffline";  
636 -  
637 -import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";  
638 -import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";  
639 -  
640 -import {getDict, getSupervision, getUsers} from "@/api/dict";  
641 -  
642 -import {activeThreestep} from "@/api/business/threestep";  
643 -import {getToken} from "@/utils/auth";  
644 -import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";  
645 -import {updateHandleAffairs} from "@/api/office/handle";  
646 -import Treeselect from "@riophae/vue-treeselect";  
647 -import '@riophae/vue-treeselect/dist/vue-treeselect.css'  
648 -import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";  
649 -import threestepInfo from "@/views/business/threestep/threestepInfo";  
650 -import taskCard from "@/views/activiti/task/taskCard";  
651 -import conferenceInfo from "@/views/office/conference/conferenceInfo";  
652 -import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";  
653 -import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";  
654 -import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";  
655 -import contractInfo from "@/views/activiti/task/contractInfo";  
656 -import logisticsInfo from "@/views/office/logistics/logisticsInfo";  
657 -import handleInfo from "@/views/office/handle/handleInfo";  
658 -import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";  
659 -import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";  
660 -import violationWarningInformationInfo  
661 - from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";  
662 -import supervisionInfo from "./SupervisionInfo";  
663 -  
664 -import companyInfo from "@/views/activiti/task/companyInfo";  
665 -import driverInfo from "@/views/activiti/task/driverInfo";  
666 -import vehicleInfo from "@/views/activiti/task/vehicleInfo";  
667 -  
668 -export default {  
669 - name: "task",  
670 - components: {  
671 - taskCard,  
672 - leaveHistoryForm,  
673 - threestepInfo,  
674 - conferenceInfo,  
675 - leaveApplicationInfo,  
676 - logisticsInfo,  
677 - handleInfo,  
678 - constructsiteInfo,  
679 - Treeselect,  
680 - earthsitesInfo,  
681 - contractInfo,  
682 - caseOfflineInfo,  
683 - violationCaseFileInfo,  
684 - violationWarningInformationInfo,  
685 - supervisionInfo,  
686 - companyInfo,  
687 - driverInfo,  
688 - vehicleInfo  
689 - },  
690 - data() {  
691 - return {  
692 - id: '',  
693 - definitionKey: '',  
694 - businessKey: '',  
695 - // 遮罩层  
696 - loading: true,  
697 - // 选中数组  
698 - ids: [],  
699 - // 非单个禁用  
700 - single: true,  
701 - // 非多个禁用  
702 - multiple: true,  
703 - // 显示搜索条件  
704 - showSearch: true,  
705 - // 总条数  
706 - total: 0,  
707 - // 请假表格数据  
708 - taskList: [],  
709 - // 弹出层标题  
710 - title: "",  
711 - // 是否显示弹出层  
712 - picSample: false,  
713 - taskName: null,  
714 - // 查询参数  
715 - queryParams: {  
716 - name:null,  
717 - pageNum: 1,  
718 - pageSize: 10,  
719 - role: null,  
720 - dept: null,  
721 - },  
722 - // 表单参数  
723 - form: {  
724 - formData: []  
725 - },  
726 - needShow: false,  
727 - // 表单校验  
728 - rules: {  
729 - subReason: [{  
730 - required: true,  
731 - message: '请填写补充说明',  
732 - trigger: 'blur'  
733 - },],  
734 -  
735 - },  
736 - picIndex: 0,  
737 - fileList: [],  
738 - upload: {  
739 - // 是否显示弹出层（用户导入）  
740 - open: false,  
741 - // 弹出层标题（用户导入） 629 + import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
  630 + import {historyFromData} from '@/api/activiti/historyFormdata'
  631 + import {addSign, getSignByObjId} from "@/api/sign/sign";
  632 + import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
  633 + import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
  634 + import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
  635 + import {getDict, getSupervision, getUsers} from "@/api/dict";
  636 + import {activeThreestep} from "@/api/business/threestep";
  637 + import {getToken} from "@/utils/auth";
  638 + import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
  639 + import {updateHandleAffairs} from "@/api/office/handle";
  640 + import Treeselect from "@riophae/vue-treeselect";
  641 + import '@riophae/vue-treeselect/dist/vue-treeselect.css'
  642 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
  643 + import threestepInfo from "@/views/business/threestep/threestepInfo";
  644 + import taskCard from "@/views/activiti/task/taskCard";
  645 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  646 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  647 + import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  648 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  649 + import contractInfo from "@/views/activiti/task/contractInfo";
  650 + import logisticsInfo from "@/views/office/logistics/logisticsInfo";
  651 + import handleInfo from "@/views/office/handle/handleInfo";
  652 + import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
  653 + import violationCaseFileInfo from "@/views/casefile/violationCaseFile/violationCaseFileInfo";
  654 + import violationWarningInformationInfo from "@/views/casefile/violationWarningInformation/violationWarningInformationInfo";
  655 + import supervisionInfo from "@/views/activiti/task/SupervisionInfo";
  656 + import companyInfo from "@/views/activiti/task/companyInfo";
  657 + import driverInfo from "@/views/activiti/task/driverInfo";
  658 + import vehicleInfo from "@/views/activiti/task/vehicleInfo";
  659 +
  660 + import taskmethod from '@/api/taskmethod'
  661 +
  662 + export default {
  663 + name: "task",
  664 + mixins: [taskmethod],
  665 + components: {
  666 + taskCard,
  667 + leaveHistoryForm,
  668 + threestepInfo,
  669 + conferenceInfo,
  670 + leaveApplicationInfo,
  671 + logisticsInfo,
  672 + handleInfo,
  673 + constructsiteInfo,
  674 + Treeselect,
  675 + earthsitesInfo,
  676 + contractInfo,
  677 + caseOfflineInfo,
  678 + violationCaseFileInfo,
  679 + violationWarningInformationInfo,
  680 + supervisionInfo,
  681 + companyInfo,
  682 + driverInfo,
  683 + vehicleInfo
  684 + },
  685 + data() {
  686 + return {
  687 + id: '',
  688 + definitionKey: '',
  689 + businessKey: '',
  690 + // 遮罩层
  691 + loading: true,
  692 + // 选中数组
  693 + ids: [],
  694 + // 非单个禁用
  695 + single: true,
  696 + // 非多个禁用
  697 + multiple: true,
  698 + // 显示搜索条件
  699 + showSearch: true,
  700 + // 总条数
  701 + total: 0,
  702 + // 请假表格数据
  703 + taskList: [],
  704 + // 弹出层标题
742 title: "", 705 title: "",
743 - // 是否禁用上传  
744 - isUploading: false,  
745 - // 设置上传的请求头部  
746 - headers: {  
747 - Authorization: "Bearer " + getToken() 706 + // 是否显示弹出层
  707 + picSample: false,
  708 + taskName: null,
  709 + // 查询参数
  710 + queryParams: {
  711 + name:null,
  712 + pageNum: 1,
  713 + pageSize: 10,
  714 + role: null,
  715 + dept: null,
748 }, 716 },
749 - // 上传的地址  
750 - url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",  
751 - },  
752 - controlId: null,  
753 - users: [],  
754 - options: [],  
755 - usersName: [],  
756 - deptName: null,  
757 - supervisionData: null,  
758 - uploadImageDialog: false,  
759 - idInfo: null,  
760 - signData: null,  
761 - areas: [],  
762 - roles: [],  
763 - depts: [],  
764 - signDataInfo: null,  
765 - earthsites: false,  
766 - contract: false,  
767 - logisticsInfoOpen: false,  
768 - handleAffairsInfoOpen: false,  
769 - caseOffline: false,  
770 - violationCaseFile: false,  
771 - violationCaseFile1: false,  
772 - supervisionOpen: false,  
773 - open: false,  
774 - open2: false,  
775 - conferenceOpen: false,  
776 - construct: false,  
777 - leaveApplicationOpen: false,  
778 - prev:[],  
779 - userNodes: [],  
780 - company: false,  
781 - driver: false,  
782 - vehicle: false,  
783 - names: null,  
784 - hisfromData: [],  
785 - slides: [],  
786 - slidesArys: [],  
787 - slides1: [],  
788 - videoSrc1: [],  
789 - };  
790 - },  
791 - created() {  
792 - let dep = {type: "CSUserDepartmentType"};  
793 -  
794 - getDict(dep).then(res => {  
795 - this.depts = res.result;  
796 - for(let i in res.result){  
797 - if(res.result[i].name.indexOf("渣土办") < 1){  
798 - this.prev.push(res.result[i]);  
799 - }  
800 - }  
801 - });  
802 -  
803 - let role = {type: "CSUserPostType"};  
804 -  
805 - getDict(role).then(res => {  
806 - this.roles = res.result;  
807 - }); 717 + // 表单参数
  718 + form: {
  719 + formData: []
  720 + },
  721 + needShow: false,
  722 + // 表单校验
  723 + rules: {
  724 + subReason: [{
  725 + required: true,
  726 + message: '请填写补充说明',
  727 + trigger: 'blur'
  728 + },],
808 729
809 - listTask(this.queryParams).then(response => {  
810 - this.taskList = response.rows;  
811 - this.names = response.names;  
812 - this.total = response.total;  
813 - this.loading = false;  
814 - });  
815 - },  
816 - methods: {  
817 - remoteName(value){  
818 - getNames(value).then(res=>{ 730 + },
  731 + picIndex: 0,
  732 + fileList: [],
  733 + upload: {
  734 + // 是否显示弹出层（用户导入）
  735 + open: false,
  736 + // 弹出层标题（用户导入）
  737 + title: "",
  738 + // 是否禁用上传
  739 + isUploading: false,
  740 + // 设置上传的请求头部
  741 + headers: {
  742 + Authorization: "Bearer " + getToken()
  743 + },
  744 + // 上传的地址
  745 + url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
  746 + },
  747 + controlId: null,
  748 + users: [],
  749 + options: [],
  750 + usersName: [],
  751 + deptName: null,
  752 + supervisionData: null,
  753 + uploadImageDialog: false,
  754 + idInfo: null,
  755 + signData: null,
  756 + areas: [],
  757 + roles: [],
  758 + depts: [],
  759 + signDataInfo: null,
  760 + earthsites: false,
  761 + contract: false,
  762 + logisticsInfoOpen: false,
  763 + handleAffairsInfoOpen: false,
  764 + caseOffline: false,
  765 + violationCaseFile: false,
  766 + violationCaseFile1: false,
  767 + supervisionOpen: false,
  768 + open: false,
  769 + open2: false,
  770 + conferenceOpen: false,
  771 + construct: false,
  772 + leaveApplicationOpen: false,
  773 + prev:[],
  774 + userNodes: [],
  775 + company: false,
  776 + driver: false,
  777 + vehicle: false,
  778 + names: null,
  779 + hisfromData: [],
  780 + slides: [],
  781 + slidesArys: [],
  782 + slides1: [],
  783 + videoSrc1: [],
  784 + };
  785 + },
  786 + created() {
  787 + let dep = {type: "CSUserDepartmentType"};
  788 +
  789 + getDict(dep).then(res => {
  790 + this.depts = res.result;
  791 + for(let i in res.result){
  792 + if(res.result[i].name.indexOf("渣土办") < 1){
  793 + this.prev.push(res.result[i]);
  794 + }
  795 + }
  796 + });
819 797
820 - this.names = res.data; 798 + let role = {type: "CSUserPostType"};
821 799
822 - this.queryParams.name = value; 800 + getDict(role).then(res => {
  801 + this.roles = res.result;
823 }); 802 });
824 - },  
825 - resetQuery(){  
826 - this.queryParams = {};  
827 - this.queryParams.pageNum=1;  
828 - this.queryParams.pageSize=10;  
829 - this.getList();  
830 - },  
831 803
832 - removeAttchItem(index, img) {  
833 - this.form.replyImg.splice(this.form.replyImg.indexOf(img), 1);  
834 - for (let i = 0; i < this.slides1.length; i++) {  
835 - if (this.slides1[i].alt == img) {  
836 - this.slides1.splice(i, 1);  
837 - }  
838 - }  
839 - for (let i = 0; i < this.videoSrc1.length; i++) {  
840 - if (this.videoSrc1[i].alt == img) {  
841 - this.videoSrc1.splice(i, 1);  
842 - }  
843 - }  
844 -  
845 - this.$forceUpdate();  
846 - },  
847 - handleClose() {  
848 - this.uploadImageDialog = false;  
849 - this.fileList = [];  
850 - this.slidesArys = [];  
851 - this.slides1 = [];  
852 - this.videoSrc1 = [];  
853 - },  
854 - removeImage(index, img) {  
855 - let target = "sub_img" + this.picIndex;  
856 - for (let i = 0; i < this.slides[index].length; i++) {  
857 - if (this.slides[index][i].alt == img) {  
858 - this.slides[index].splice(i, 1);  
859 - }  
860 - }  
861 - this.form[target].splice(this.form[target].indexOf(img), 1);  
862 - },  
863 - uploadSuccess(res, file, fileList) {  
864 - if (res.code) {  
865 - this.$message(res.message);  
866 - return;  
867 - }  
868 - let target = "sub_img" + this.picIndex;  
869 - if (!this.form[target]) {  
870 - this.form[target] = [];  
871 - }  
872 - this.form[target].push(file.name + ':' + res);  
873 - if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1) {  
874 - let url = URL.createObjectURL(file.raw)  
875 - this.slidesArys.push({  
876 - url: url,  
877 - alt: res  
878 - })  
879 - this.slides[this.picIndex] = this.slidesArys;  
880 - }  
881 - this.$forceUpdate();  
882 - },  
883 - uploadSuccess1(res, file, fileList) {  
884 - if (res.code) {  
885 - this.$message(res.message);  
886 - return;  
887 - }  
888 - if (!this.form.replyImg) {  
889 - this.form.replyImg = [];  
890 - }  
891 - this.form.replyImg.push(res);  
892 - if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.gif') > -1 || file.name.indexOf('.jpeg') > -1) {  
893 - let url = URL.createObjectURL(file.raw)  
894 - this.slides1.push({  
895 - url: url,  
896 - alt: res  
897 - })  
898 - }  
899 - if (file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {  
900 - let url = URL.createObjectURL(file.raw)  
901 - this.videoSrc1.push({  
902 - url: url,  
903 - alt: res  
904 - });  
905 - }  
906 - this.$forceUpdate();  
907 - },  
908 - showFileUpload(i) {  
909 - this.uploadImageDialog = true;  
910 - this.picIndex = i;  
911 - },  
912 - beforeUpload(file) {  
913 - let isRightSize = file.size / 1024 / 1024 < 100  
914 - if (!isRightSize) {  
915 - this.$message.error('文件大小超过 100MB')  
916 - return isRightSize;  
917 - }  
918 - let isAccept = false;  
919 - if (file.name.indexOf('.png') > -1 || file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file  
920 - .name.indexOf('.pdf') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.jpeg') > -1 || file.name.indexOf('.gif') > -1  
921 - || file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {  
922 - isAccept = true;  
923 - }  
924 - if (!isAccept) {  
925 - this.$message.error('应该选择PDF、AVI、MP4、WORD、图片类型的文件')  
926 - return isAccept;  
927 - }  
928 - },  
929 - getList() {  
930 - this.reset();  
931 - this.loading = true;  
932 listTask(this.queryParams).then(response => { 804 listTask(this.queryParams).then(response => {
933 this.taskList = response.rows; 805 this.taskList = response.rows;
  806 + this.names = response.names;
934 this.total = response.total; 807 this.total = response.total;
935 this.loading = false; 808 this.loading = false;
936 }); 809 });
937 }, 810 },
  811 + methods: {
938 812
939 - // 取消按钮  
940 - cancel() {  
941 - this.earthsites = false;  
942 - this.contract = false;  
943 - this.logisticsInfoOpen = false;  
944 - this.handleAffairsInfoOpen = false;  
945 - this.caseOffline = false;  
946 - this.violationCaseFile = false;  
947 - this.violationCaseFile1 = false;  
948 - this.supervisionOpen = false;  
949 - this.open = false;  
950 - this.open2 = false;  
951 - this.conferenceOpen = false;  
952 - this.construct = false;  
953 - this.leaveApplicationOpen = false;  
954 - this.company = false;  
955 - this.driver = false;  
956 - this.vehicle = false;  
957 - this.videoSrc1 = [];  
958 - this.slides1 = [];  
959 - this.reset();  
960 - },  
961 - // 表单重置  
962 - reset() {  
963 - this.definitionKey = '',  
964 - this.businessKey = '',  
965 - this.form = {  
966 - formData: [],  
967 - };  
968 - this.resetForm("form");  
969 - },  
970 - showTask(row, idx) {  
971 - this.reset();  
972 - this.definitionKey = row.definitionKey;  
973 - this.businessKey = row.businessKey;  
974 - this.id = row.id;  
975 - this.taskName = row.name;  
976 - historyFromData(this.businessKey).then(response => {  
977 - this.hisfromData = [];  
978 - this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})  
979 - for(let i in response.data){  
980 -  
981 - this.hisfromData.push(response.data[i]);  
982 - }  
983 - })  
984 -  
985 - formDataShow(row.id).then(response => {  
986 - let datas = response.data;  
987 - let formData = []  
988 - let text = "";  
989 - for (let i = 0; i < datas.length; i++) {  
990 - let strings = datas[i].split('--__!!')  
991 - let controlValue = null  
992 - let controlDefault = null  
993 - switch (strings[1]) {  
994 - case 'radio':  
995 - controlValue = idx;  
996 - controlDefault = strings[4]  
997 - break;  
998 - case 'textarea':  
999 - text = controlValue;  
1000 - break;  
1001 - // default:  
1002 - }  
1003 - formData.push({  
1004 - controlId: strings[0],  
1005 - controlType: strings[1],  
1006 - controlLable: strings[2],  
1007 - controlIsParam: strings[3],  
1008 - controlValue: controlValue,  
1009 - controlDefault: controlDefault  
1010 - })  
1011 - }  
1012 - this.form.formData = formData;  
1013 -  
1014 - if (this.definitionKey == "workflow_threestep") {  
1015 - this.open2 = true;  
1016 - return;  
1017 - }  
1018 - if (this.definitionKey == "conference") {  
1019 - this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":") + 1);  
1020 - this.conferenceOpen = true;  
1021 - return;  
1022 - }  
1023 - if (this.definitionKey == "workflow_leave") {  
1024 - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);  
1025 - this.leaveApplicationOpen = true;  
1026 - return;  
1027 - }  
1028 -  
1029 - if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {  
1030 - this.construct = true;  
1031 - return;  
1032 - }  
1033 - if (this.definitionKey == "workflow_earthsites") {  
1034 - this.earthsites = true;  
1035 - return;  
1036 - }  
1037 - if (this.definitionKey == "workflow_conract") {  
1038 - this.contract = true;  
1039 - return;  
1040 - }  
1041 -  
1042 - if (this.definitionKey == "logistics") {  
1043 - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);  
1044 - this.logisticsInfoOpen = true;  
1045 - return;  
1046 - }  
1047 - if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {  
1048 - this.controlId = this.form.formData[0].controlId;  
1049 - this.idInfo = row.businessKey.split(":")[1];  
1050 - this.handleAffairsInfoOpen = true;  
1051 - return;  
1052 - }  
1053 - if (this.definitionKey == "workflow_caseoffline") {  
1054 - this.caseOffline = true;  
1055 - return;  
1056 - }  
1057 -  
1058 - if (this.definitionKey == "workflow_casefile") {  
1059 - this.violationCaseFile = true;  
1060 - this.videoSrc1 = [];  
1061 - this.slides1 = [];  
1062 - return;  
1063 - }  
1064 -  
1065 - if (this.definitionKey == "violation_warning") {  
1066 - this.violationCaseFile1 = true;  
1067 - this.videoSrc1 = [];  
1068 - this.slides1 = [];  
1069 - return;  
1070 - }  
1071 - if (this.definitionKey.indexOf("supervision") > -1) {  
1072 - console.log(row)  
1073 - const params = {  
1074 - id: row.businessKey.split(":")[1],  
1075 - }  
1076 - getSupervision(params).then(res => {  
1077 - if (res.result == null) {  
1078 - this.$message.error("获取纪检督察详情失败！请重试")  
1079 - return;  
1080 - }  
1081 - this.supervisionData = res.result;  
1082 - this.supervisionOpen = true;  
1083 - })  
1084 - return;  
1085 - }  
1086 - if (this.definitionKey == "workflow_company") {  
1087 - this.company = true;  
1088 - return;  
1089 - }  
1090 - if (this.definitionKey == "workflow_vehicle") {  
1091 - this.vehicle = true;  
1092 - return;  
1093 - }  
1094 - if (this.definitionKey == "workflow_driver") {  
1095 - this.driver = true;  
1096 - return;  
1097 - }  
1098 - this.open = true;  
1099 - this.title = "审批";  
1100 - });  
1101 - },  
1102 -  
1103 - /** 提交按钮 */  
1104 - submitForm(formid, value) {  
1105 - this.form.formData[0].controlValue = value;  
1106 - this.form.formData[0].controlId = formid;  
1107 - this.form.id = this.businessKey.split(":")[1];  
1108 - if (this.form.formData[0].controlValue == 0) {  
1109 - this.form.status = 1;  
1110 - } else {  
1111 - this.form.status = 2;  
1112 - }  
1113 -  
1114 - if (this.definitionKey == "workflow_threestep") {  
1115 -  
1116 -  
1117 - for (let i = 0; i < 13; i++) {  
1118 - if (this.form["sub_img" + i]) {  
1119 - let paths = "";  
1120 - for (var j = 0; j < this.form["sub_img" + i].length; j++) {  
1121 - paths += this.form["sub_img" + i][j].split(":")[1] + ",";  
1122 - }  
1123 - this.form["sub_img" + i] = paths.substring(0, paths.length - 1);  
1124 - }  
1125 - }  
1126 -  
1127 - if (this.form.status == 1) {  
1128 - activeThreestep(this.form).then(res => {  
1129 - formDataSave(this.id, this.form.formData).then(response => {  
1130 - this.msgSuccess("审批成功");  
1131 - this.open2 = false;  
1132 - this.taskList = [];  
1133 - this.getList();  
1134 - });  
1135 - });  
1136 - } else {  
1137 - formDataSave(this.id, this.form.formData).then(response => {  
1138 - this.msgSuccess("审批成功");  
1139 - this.open2 = false;  
1140 - this.taskList = [];  
1141 - this.getList();  
1142 - });  
1143 - }  
1144 - return;  
1145 - }  
1146 -  
1147 - if (this.definitionKey == "workflow_constructsite") {  
1148 - if (this.form.status == 1) {  
1149 - let objId = this.businessKey.split(":")[1];  
1150 - let query = {  
1151 - objectId: objId,  
1152 - };  
1153 - let text = "";  
1154 - for (let i = 0; i < this.form.formData.length; i++) {  
1155 - let strings = this.form.formData[i];  
1156 - switch (strings.controlType) {  
1157 - case 'textarea':  
1158 - text = strings.controlValue;  
1159 - break;  
1160 - }  
1161 - }  
1162 -  
1163 - if (this.taskName == "勘察科员") {  
1164 - query.idx = 0;  
1165 - query.sign1Text = text;  
1166 - } else if (this.taskName == "堪察部长") {  
1167 - query.idx = 1;  
1168 - query.sign2Text = text;  
1169 - } else if (this.taskName == "堪察分管领导") {  
1170 - query.idx = 2;  
1171 - query.sign3Text = text  
1172 - } else if (this.taskName == "中心负责人") {  
1173 - query.idx = 3;  
1174 - query.sign4Text = text;  
1175 - }  
1176 -  
1177 - addSign(query).then(res => {  
1178 - formDataSave(this.id, this.form.formData).then(response => {  
1179 - this.msgSuccess("审批成功");  
1180 - this.open = false;  
1181 - this.construct = false;  
1182 - this.getList();  
1183 - });  
1184 - })  
1185 -  
1186 - } else {  
1187 -  
1188 - formDataSave(this.id, this.form.formData).then(response => {  
1189 - this.msgSuccess("审批成功");  
1190 - this.construct = false;  
1191 - this.getList();  
1192 - });  
1193 - }  
1194 - return;  
1195 - }  
1196 -  
1197 -  
1198 - if (this.definitionKey == "workflow_caseoffline") {  
1199 -  
1200 - let postData = {};  
1201 -  
1202 - postData.tableName = this.businessKey;  
1203 - postData.replyImg = this.form.replyImg + "";  
1204 - postData.reply = this.form.reply;  
1205 - if(postData.reply==null || postData.reply==""){  
1206 - if(value==0){  
1207 - postData.reply = "通过";  
1208 - }else{  
1209 - postData.reply = "驳回";  
1210 - }  
1211 - }  
1212 -  
1213 - addReplyApprovalProcess(postData).then(res => {  
1214 - this.videoSrc1 = [];  
1215 - this.slides1 = [];  
1216 - });  
1217 - let id = this.businessKey.split(":")[1];  
1218 - let query = {  
1219 - id: id,  
1220 - };  
1221 -  
1222 - let adv = this.form.advice;  
1223 -  
1224 - if (!adv) {  
1225 - if (value == 0) {  
1226 - adv = "审批通过";  
1227 - } else {  
1228 - adv = "审批驳回";  
1229 - }  
1230 - }  
1231 -  
1232 - if (this.taskName == "渣土办科员") {  
1233 - query.advice1 = adv;  
1234 - } else if (this.taskName == "渣土办分管领导") {  
1235 - query.advice2 = adv;  
1236 - } else if (this.taskName == "治理部部长") {  
1237 - query.advice3 = adv;  
1238 - } else if (this.taskName == "治理部分管领导") {  
1239 - query.advice4 = adv;  
1240 - }  
1241 -  
1242 - updateCaseOffline(query).then(res => {  
1243 - formDataSave(this.id, this.form.formData).then(response => {  
1244 - this.msgSuccess("审批成功");  
1245 - this.caseOffline = false;  
1246 - this.getList();  
1247 - });  
1248 - })  
1249 - return;  
1250 - }  
1251 -  
1252 - if (this.definitionKey == "workflow_casefile") {  
1253 - let postData = {};  
1254 -  
1255 - postData.tableName = this.businessKey;  
1256 - postData.replyImg = this.form.replyImg + "";  
1257 - postData.reply = this.form.reply;  
1258 - if(postData.reply==null || postData.reply==""){  
1259 - if(value==0){  
1260 - postData.reply = "通过";  
1261 - }else{  
1262 - postData.reply = "驳回";  
1263 - }  
1264 - }  
1265 - if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {  
1266 - console.log(this.businessKey);  
1267 - let objId = this.businessKey.split(":")[1];  
1268 - updateViolationCaseFileReader({id: objId}).then(res => {  
1269 - })  
1270 - }  
1271 - addReplyApprovalProcess(postData).then(res => {  
1272 - this.videoSrc1 = [];  
1273 - this.slides1 = [];  
1274 - formDataSave(this.id, this.form.formData).then(response => {  
1275 - this.msgSuccess("审批成功");  
1276 - this.violationCaseFile = false;  
1277 - this.getList();  
1278 - });  
1279 - });  
1280 - }  
1281 - if (this.definitionKey == "violation_warning") {  
1282 - let postData = {};  
1283 - postData.tableName = this.businessKey;  
1284 - postData.replyImg = this.form.replyImg + "";  
1285 - postData.reply = this.form.reply;  
1286 - if(postData.reply==null || postData.reply==""){  
1287 - if(value==0){  
1288 - postData.reply = "通过";  
1289 - }else{  
1290 - postData.reply = "驳回";  
1291 - }  
1292 - }  
1293 -  
1294 -  
1295 - if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {  
1296 - let objId = this.businessKey.split(":")[1];  
1297 - updateViolationCaseFileReader1({id: objId}).then(res => {  
1298 - })  
1299 - }  
1300 - addReplyApprovalProcess(postData).then(res => {  
1301 - this.videoSrc1 = [];  
1302 - this.slides1 = [];  
1303 - formDataSave(this.id, this.form.formData).then(response => {  
1304 - this.msgSuccess("审批成功");  
1305 - this.violationCaseFile1 = false;  
1306 - this.getList();  
1307 - });  
1308 - });  
1309 - }  
1310 -  
1311 - if (  
1312 - this.definitionKey.indexOf("supervision") > -1 ||  
1313 - this.definitionKey == "workflow_company" ||  
1314 - this.definitionKey == "workflow_driver" ||  
1315 - this.definitionKey == "workflow_vehicle" ||  
1316 - this.definitionKey == "workflow_earthsites" ||  
1317 - this.definitionKey == "workflow_conract" ||  
1318 - this.definitionKey == "workflow_constructsite_edit") {  
1319 - formDataSave(this.id, this.form.formData).then(response => {  
1320 - this.msgSuccess("审批成功");  
1321 - this.cancel();  
1322 - this.getList();  
1323 - });  
1324 - }  
1325 }, 813 },
1326 - conferenceSubmitForm(value) {  
1327 - this.form.formData[0].controlValue = value;  
1328 - if (value == 0) {  
1329 - this.form.status = 1;  
1330 - } else {  
1331 - this.form.status = 2;  
1332 - }  
1333 - //审批or驳回  
1334 - formDataSave(this.id, this.form.formData).then(response => {  
1335 - this.msgSuccess("审批成功");  
1336 - this.conferenceOpen = false;  
1337 - this.taskList = [];  
1338 - this.getList();  
1339 - });  
1340 - },  
1341 - leaveApplicationSubmitForm(value) {  
1342 - if (value == 0) {  
1343 - this.form.status = 1;  
1344 - } else {  
1345 - this.form.status = 2;  
1346 - }  
1347 - this.form.formData[0].controlValue = value;  
1348 - //审批or驳回  
1349 - formDataSave(this.id, this.form.formData).then(response => {  
1350 - this.msgSuccess("审批成功");  
1351 - this.leaveApplicationOpen = false;  
1352 - this.taskList = [];  
1353 - this.getList();  
1354 - });  
1355 - },  
1356 - logisticsInfoSubmitForm(value) {  
1357 - if (value == 0) {  
1358 - this.form.status = 1;  
1359 - } else {  
1360 - this.form.status = 2;  
1361 - }  
1362 - this.form.formData[0].controlValue = value;  
1363 - //this.form.formData[0].route = value;  
1364 - //审批or驳回  
1365 - formDataSave(this.id, this.form.formData).then(response => {  
1366 - this.msgSuccess("审批成功");  
1367 - this.logisticsInfoOpen = false;  
1368 - this.taskList = [];  
1369 - this.getList();  
1370 - });  
1371 - },  
1372 - handleAffairsSubmitForm(value) {  
1373 - console.log(this.controlId)  
1374 - if (value == 0) {  
1375 - this.form.status = 1;  
1376 - } else {  
1377 - this.form.status = 2;  
1378 - }  
1379 - this.form.formData[0].controlValue = value;  
1380 - if (this.definitionKey == "yuelan") {  
1381 - if (this.deptName == null) {  
1382 - this.$message.error("请选择阅览部门！");  
1383 - return;  
1384 - }  
1385 - if (this.users.length == 0) {  
1386 - this.$message.error("请选择阅览人！");  
1387 - return;  
1388 - }  
1389 - const userNames = [];  
1390 - const newArr = this.ArrSet(this.userNodes, "id");  
1391 - for (let i = 0; i < newArr.length; i++) {  
1392 - for (let j = 0; j < this.users.length; j++) {  
1393 - if (newArr[i].id == this.users[j]) {  
1394 - userNames.push(newArr[i].label);  
1395 - }  
1396 - }  
1397 - }  
1398 - const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;  
1399 - this.form.formData[0].userNames = userNames;  
1400 - //表里存中文  
1401 - handleAffairsForm.userNames = userNames.join(",");  
1402 - updateHandleAffairs(handleAffairsForm).then(res => {  
1403 - formDataSave(this.id, this.form.formData).then(response => {  
1404 - this.msgSuccess("审批成功");  
1405 - this.handleAffairsInfoOpen = false;  
1406 - this.taskList = [];  
1407 - this.getList();  
1408 - });  
1409 - })  
1410 - return;  
1411 - }  
1412 - //分管领导审批流程时，需要指定部门审批，所以判断当前流程类型和当前控件（表单）id  
1413 - if ((this.controlId == "FormProperty_214hj4h" || this.controlId == "FormProperty_2vu2250") && value == 0) {  
1414 - const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;  
1415 - if (handleAffairsForm.deptId == null) {  
1416 - this.$message.error("请选择信访部门！");  
1417 - return;  
1418 - }  
1419 - const deptCode = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.value;  
1420 - this.form.formData[0].deptCode = deptCode;  
1421 - //表里存中文  
1422 - handleAffairsForm.deptName = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.selectedLabel;  
1423 - const haType = handleAffairsForm.type;  
1424 - if (haType == 4 || haType == 2 || haType == 3) {  
1425 - updateHandleAffairs(handleAffairsForm).then(res => {  
1426 - formDataSave(this.id, this.form.formData).then(response => {  
1427 - this.msgSuccess("审批成功");  
1428 - this.handleAffairsInfoOpen = false;  
1429 - this.taskList = [];  
1430 - this.getList();  
1431 - });  
1432 - })  
1433 - }  
1434 - //回复意见  
1435 - } else if (this.controlId == "FormProperty_0orjdou" || this.controlId == "FormProperty_05v7lct") {  
1436 - const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;  
1437 - updateHandleAffairs(handleAffairsForm).then(res => {  
1438 - formDataSave(this.id, this.form.formData).then(response => {  
1439 - this.msgSuccess("审批成功");  
1440 - this.handleAffairsInfoOpen = false;  
1441 - this.taskList = [];  
1442 - this.getList();  
1443 - });  
1444 - })  
1445 - } else if (this.controlId == "FormProperty_0aq22i0" && value == 0) {  
1446 - const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;  
1447 - if (handleAffairsForm.sendObject == null) {  
1448 - this.$message.error("请选择推送对象!");  
1449 - return;  
1450 - }  
1451 - this.form.formData[0].index = handleAffairsForm.sendObject;  
1452 - updateHandleAffairs(handleAffairsForm).then(res => {  
1453 - formDataSave(this.id, this.form.formData).then(response => {  
1454 - this.msgSuccess("审批成功");  
1455 - this.handleAffairsInfoOpen = false;  
1456 - this.taskList = [];  
1457 - this.getList();  
1458 - });  
1459 - })  
1460 - } else if ((this.controlId == 'FormProperty_11p96vq' || this.controlId == 'FormProperty_2jvcgq8') && value == 0) {  
1461 - const reply = {  
1462 - reply: this.$refs.handleAffairsInfoRef.$data.opinion,  
1463 - tableName: "handle_affairs",  
1464 - tableId: this.idInfo  
1465 - }  
1466 - const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;  
1467 - if (handleAffairsForm.deptId == null) {  
1468 - this.$message.error("请选择处理部门！");  
1469 - return;  
1470 - }  
1471 - const deptCode = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.value;  
1472 - this.form.formData[0].deptCode = deptCode;  
1473 - //表里存中文  
1474 - handleAffairsForm.deptName = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.selectedLabel;  
1475 - updateHandleAffairs(handleAffairsForm).then(res => {  
1476 - addReplyApprovalProcess(reply).then(res => {  
1477 - formDataSave(this.id, this.form.formData).then(response => {  
1478 - this.msgSuccess("审批成功");  
1479 - this.handleAffairsInfoOpen = false;  
1480 - this.taskList = [];  
1481 - this.getList();  
1482 - });  
1483 - })  
1484 - })  
1485 -  
1486 - } else {  
1487 - formDataSave(this.id, this.form.formData).then(response => {  
1488 - this.msgSuccess("审批成功");  
1489 - this.handleAffairsInfoOpen = false;  
1490 - this.taskList = [];  
1491 - this.getList();  
1492 - });  
1493 - } 814 + }
1494 815
1495 - },  
1496 - changeDepts(e) {  
1497 - this.options = [];  
1498 - this.roles.forEach((role, index) => {  
1499 - let area = {  
1500 - bizAuthCodes: [2],  
1501 - authPostType: role.code,  
1502 - authDepartmentType: e  
1503 - };  
1504 - getUsers(area).then(res => {  
1505 - if (res.result.length != 0) {  
1506 - if (res.result[0].userAuthList.length > 0) {  
1507 - res.result[0].userAuthList.forEach((user, index) => {  
1508 - this.options.push({id: user.userId, label: user.username})  
1509 - });  
1510 - }  
1511 - }  
1512 - });  
1513 - });  
1514 - },  
1515 - handleSelect(node) {  
1516 - this.userNodes.push(node);  
1517 - },  
1518 - ArrSet(Arr, id) {  
1519 - var obj = {};  
1520 - const arrays = Arr.reduce((setArr, item) => {  
1521 - obj[item[id]] ? '' : obj[item[id]] = true && setArr.push(item);  
1522 - return setArr;  
1523 - }, []);  
1524 - return arrays;  
1525 - },  
1526 - getFile(file, fileList) {  
1527 - this.getBase64(file.raw).then(res => {  
1528 - const params = res  
1529 - this.proofImage = params  
1530 - this.form.replyImg = params;  
1531 - this.$forceUpdate();  
1532 - })  
1533 - },  
1534 - getBase64(file) {  
1535 - return new Promise(function (resolve, reject) {  
1536 - const reader = new FileReader()  
1537 - let imgResult = ''  
1538 - reader.readAsDataURL(file)  
1539 - reader.onload = function () {  
1540 - imgResult = reader.result  
1541 - }  
1542 - reader.onerror = function (error) {  
1543 - reject(error)  
1544 - }  
1545 - reader.onloadend = function () {  
1546 - resolve(imgResult)  
1547 - }  
1548 - })  
1549 - },  
1550 - handleUploadRemove(file, fileList) {  
1551 - this.proofImage = ''  
1552 - this.form.replyImg = null;  
1553 - this.$forceUpdate();  
1554 - },  
1555 - handlePictureCardPreview(file) {  
1556 - console.log(this.proofImage)  
1557 - },  
1558 - },  
1559 -}  
1560 </script> 816 </script>
  817 +
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @a901293
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 - <el-select v-model="queryParams.name" filterable reserve-keyword placeholder="名称">  
4 - <el-option label="全部" value="" />  
5 - <el-option v-for="item in names" :label="item" :value="item" >  
6 - </el-option>  
7 - </el-select>  
8 -  
9 - <el-select v-model="queryParams.type" filterable reserve-keyword >  
10 - <el-option label="全部" value="" />  
11 - <el-option label="建筑垃圾许可证审批" value="workflow_constructsite" />  
12 - <el-option label="消纳合同申报备案" value="workflow_conract" />  
13 - <el-option label="处理场所备案" value="workflow_earthsites" />  
14 - <el-option label="运输企业准入流程" value="workflow_company" />  
15 - <el-option label="运输车辆准入流程" value="workflow_vehicle" />  
16 - <el-option label="驾驶员信息审批" value="workflow_driver" />  
17 - <el-option label="交办案卷" value="workflow_caseoffline" />  
18 - <el-option label="违规案卷处置流程" value="workflow_casefile" />  
19 - <el-option label="平台预警信息" value="violation_warning" />  
20 - <el-option label="办文办事" value="handleAffairs" />  
21 - <el-option label="后勤管理" value="logistics" />  
22 - <el-option label="会议事务" value="conference" />  
23 - <el-option label="假勤管理" value="workflow_leave" />  
24 - <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc" />  
25 - </el-select>  
26 -  
27 - <el-button type="primary" size="mini" @click="getList">搜索</el-button> 3 + <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
  4 + <el-option v-for="item in names" :label="item" :value="item">
  5 + </el-option>
  6 + </el-select>
  7 +
  8 + <el-select v-model="queryParams.type" filterable reserve-keyword>
  9 + <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
  10 + <el-option label="消纳合同申报备案" value="workflow_conract"/>
  11 + <el-option label="处理场所备案" value="workflow_earthsites"/>
  12 + <el-option label="运输企业准入流程" value="workflow_company"/>
  13 + <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
  14 + <el-option label="驾驶员信息审批" value="workflow_driver"/>
  15 + <el-option label="报工审批" value="workflow_threestep"/>
  16 + <el-option label="交办案卷" value="workflow_caseoffline"/>
  17 + <el-option label="违规案卷处置流程" value="workflow_casefile"/>
  18 + <el-option label="平台预警信息" value="violation_warning"/>
  19 + <el-option label="办文办事" value="handleAffairs"/>
  20 + <el-option label="后勤管理" value="logistics"/>
  21 + <el-option label="会议事务" value="conference"/>
  22 + <el-option label="假勤管理" value="workflow_leave"/>
  23 + <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
  24 + </el-select>
  25 +
  26 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
28 <el-button size="mini" @click="resetQuery">重置</el-button> 27 <el-button size="mini" @click="resetQuery">重置</el-button>
29 28
30 29
@@ -193,6 +192,9 @@ import companyInfo from &quot;@/views/activiti/task/companyInfo&quot;; @@ -193,6 +192,9 @@ import companyInfo from &quot;@/views/activiti/task/companyInfo&quot;;
193 import driverInfo from "@/views/activiti/task/driverInfo"; 192 import driverInfo from "@/views/activiti/task/driverInfo";
194 import vehicleInfo from "@/views/activiti/task/vehicleInfo"; 193 import vehicleInfo from "@/views/activiti/task/vehicleInfo";
195 194
  195 +import taskhismethod from '@/api/taskhismethod'
  196 +
  197 +
196 import { 198 import {
197 getArea, 199 getArea,
198 getDict, 200 getDict,
@@ -203,6 +205,7 @@ import { @@ -203,6 +205,7 @@ import {
203 205
204 export default { 206 export default {
205 name: "taskHistory", 207 name: "taskHistory",
  208 + mixins: [taskhismethod],
206 props: { 209 props: {
207 type: { 210 type: {
208 type: Number 211 type: Number
@@ -287,6 +290,7 @@ export default { @@ -287,6 +290,7 @@ export default {
287 }; 290 };
288 }, 291 },
289 created() { 292 created() {
  293 + debugger;
290 let dep = {type: "CSUserDepartmentType"}; 294 let dep = {type: "CSUserDepartmentType"};
291 295
292 getDict(dep).then(res => { 296 getDict(dep).then(res => {
@@ -301,205 +305,7 @@ export default { @@ -301,205 +305,7 @@ export default {
301 this.getList(); 305 this.getList();
302 }, 306 },
303 methods: { 307 methods: {
304 - resetQuery(){  
305 - this.queryParams = {};  
306 - this.queryParams.pageNum=1;  
307 - this.queryParams.pageSize=10;  
308 - this.getList();  
309 - },  
310 - /** 查询请假列表 */  
311 - getList() {  
312 - this.loading = true;  
313 - if (this.type == 1) {  
314 - listEndTask(this.queryParams).then(response => {  
315 - this.taskList = response.rows;  
316 - this.total = response.total;  
317 - this.loading = false;  
318 - if(!this.names)  
319 - this.names = response.names;  
320 - });  
321 - } else {  
322 - listTask(this.queryParams).then(response => {  
323 - this.taskList = response.rows;  
324 - this.total = response.total;  
325 - this.loading = false;  
326 -  
327 - if(!this.names)  
328 - this.names = response.names;  
329 - });  
330 - }  
331 - },  
332 -  
333 - // 取消按钮  
334 - cancel() {  
335 - this.earthsites = false;  
336 - this.contract = false;  
337 - this.logisticsInfoOpen = false;  
338 - this.handleAffairsInfoOpen = false;  
339 - this.caseOffline = false;  
340 - this.violationCaseFile = false;  
341 - this.violationCaseFile1 = false;  
342 - this.supervisionOpen = false;  
343 - this.open = false;  
344 - this.open2 = false;  
345 - this.conferenceOpen = false;  
346 - this.construct = false;  
347 - this.leaveApplicationOpen = false;  
348 - this.reset();  
349 - },  
350 - // 表单重置  
351 - reset() {  
352 - this.definitionKey = '';  
353 - this.businessKey = '';  
354 - this.form = {  
355 - formData: [],  
356 - };  
357 - this.resetForm("form");  
358 - },  
359 - showTask(row, idx) {  
360 - this.needShow = false;  
361 - this.reset();  
362 - this.definitionKey = row.definitionKey;  
363 - this.businessKey = row.businessKey;  
364 - this.id = row.id;  
365 -  
366 - historyFromData(this.businessKey).then(response => {  
367 -  
368 - this.hisfromData = [];  
369 -  
370 - this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time});  
371 - for(let i in response.data){  
372 -  
373 - this.hisfromData.push(response.data[i]);  
374 - }  
375 - })  
376 -  
377 -  
378 - this.title = "详情";  
379 - formDataShow(row.id).then(response => {  
380 - let datas = response.data;  
381 - let formData = []  
382 - for (let i = 0; i < datas.length; i++) {  
383 - let strings = datas[i].split('--__!!')  
384 - let controlValue = null  
385 - let controlDefault = null  
386 - switch (strings[1]) {  
387 - case 'radio':  
388 - controlValue = idx;  
389 - controlDefault = strings[4]  
390 - break;  
391 - // default:  
392 - }  
393 - formData.push({  
394 - controlId: strings[0],  
395 - controlType: strings[1],  
396 - controlLable: strings[2],  
397 - controlIsParam: strings[3],  
398 - controlValue: controlValue,  
399 - controlDefault: controlDefault  
400 - })  
401 - }  
402 - if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {  
403 - if(this.definitionKey == "yuelanxuexi"||this.definitionKey == "yuelan"){  
404 - this.businessKey = 'yuelanxuexi1';  
405 - }else if(this.definitionKey == "gongwenchuli"){  
406 - this.businessKey = 'gongwenchuli';  
407 - }  
408 - this.idInfo = row.businessKey.split(":")[1];  
409 - this.handleAffairsInfoOpen = true;  
410 - return;  
411 - }  
412 - });  
413 -  
414 - if (this.definitionKey == "conference") {  
415 - this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":") + 1);  
416 - this.conferenceOpen = true;  
417 - return;  
418 - }  
419 - if (this.definitionKey == "workflow_leave") {  
420 - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);  
421 - this.leaveApplicationOpen = true;  
422 - return;  
423 - }  
424 - if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {  
425 -  
426 -  
427 - this.construct = true;  
428 - return;  
429 - }  
430 - if (this.definitionKey == "workflow_earthsites") {  
431 - this.earthsites = true;  
432 - return;  
433 - }  
434 - if (this.definitionKey == "workflow_conract") {  
435 - this.contract = true;  
436 - return;  
437 - }  
438 -  
439 -  
440 - if (this.definitionKey == "workflow_threestep") {  
441 - this.open2 = true;  
442 - return;  
443 - }  
444 -  
445 - if (this.definitionKey == "logistics") {  
446 - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);  
447 - this.logisticsInfoOpen = true;  
448 - return;  
449 - }  
450 -  
451 - if (this.definitionKey == "workflow_caseoffline") {  
452 - this.caseOffline = true;  
453 - return;  
454 - }  
455 -  
456 - if (this.definitionKey == "workflow_casefile") {  
457 - this.violationCaseFile = true;  
458 - return;  
459 - }  
460 -  
461 - if (this.definitionKey == "violation_warning") {  
462 - this.violationCaseFile1 = true;  
463 - return;  
464 - }  
465 -  
466 - if (this.definitionKey.indexOf("supervision") > -1) {  
467 - const params = {  
468 - id: row.businessKey.split(":")[1],  
469 - }  
470 - getSupervision(params).then(res => {  
471 - if (res.result == null) {  
472 - this.$message.error("获取纪检督察详情失败！请重试")  
473 - return;  
474 - }  
475 - this.supervisionData = res.result;  
476 - this.supervisionOpen = true;  
477 - })  
478 - return;  
479 - }  
480 -  
481 - if(this.definitionKey == "workflow_company"){  
482 - this.company = true;  
483 - return;  
484 - }  
485 - if(this.definitionKey == "workflow_vehicle"){  
486 - this.vehicle = true;  
487 - return;  
488 - }  
489 - if(this.definitionKey == "workflow_driver"){  
490 - this.driver = true;  
491 - return;  
492 - }  
493 -  
494 - },  
495 - /** 提交按钮 */  
496 - submitForm() {  
497 - formDataSave(this.id, this.form.formData).then(response => {  
498 - this.msgSuccess("审批成功");  
499 - this.open = false;  
500 - this.getList();  
501 - });  
502 - }, 308 +
503 } 309 }
504 }; 310 };
505 </script> 311 </script>
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @a901293
@@ -100,9 +100,15 @@ @@ -100,9 +100,15 @@
100 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList(queryParams.his)"></right-toolbar> 100 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList(queryParams.his)"></right-toolbar>
101 </el-row> 101 </el-row>
102 102
103 - <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="!queryParams.his || queryParams.his == 1"> 103 + <el-table :data="threestepList" v-show="!queryParams.his || queryParams.his == 1">
104 <el-table-column label="序号" align="center" type="index" /> 104 <el-table-column label="序号" align="center" type="index" />
105 - <el-table-column label="日期" align="center" prop="createTime" /> 105 + <el-table-column label="日期" align="center" prop="createTime" >
  106 + <template slot-scope="scope">
  107 + <span>{{ scope.row.createTime}}</span>
  108 + </template>
  109 +
  110 +
  111 + </el-table-column>
106 <el-table-column label="工地名称" align="center" prop="name" > 112 <el-table-column label="工地名称" align="center" prop="name" >
107 <template slot-scope="scope"> 113 <template slot-scope="scope">
108 <a @click="getInfo(scope.row,0);">{{ scope.row.name}}</a> 114 <a @click="getInfo(scope.row,0);">{{ scope.row.name}}</a>
@@ -124,7 +130,7 @@ @@ -124,7 +130,7 @@
124 <el-table-column label="备注" align="center" prop="descript"/> 130 <el-table-column label="备注" align="center" prop="descript"/>
125 </el-table> 131 </el-table>
126 132
127 - <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="queryParams.his > 1"> 133 + <el-table :data="threestepList" v-show="queryParams.his > 1">
128 <el-table-column label="序号" align="center" type='index'/> 134 <el-table-column label="序号" align="center" type='index'/>
129 135
130 <el-table-column label="项目类型" align="center" prop="type"> 136 <el-table-column label="项目类型" align="center" prop="type">
trash-ui/src/views/business/threestep/index.vue
  View file @a901293
@@ -80,9 +80,15 @@ @@ -80,9 +80,15 @@
80 <span>{{ scope.row.checkTime}}</span> 80 <span>{{ scope.row.checkTime}}</span>
81 </template> 81 </template>
82 </el-table-column> 82 </el-table-column>
83 - <el-table-column label="抽查时间" align="center" prop="checkEndTime" width="180" v-if="queryParams.pageStatus==1"> 83 +
  84 + <el-table-column label="巡查时间" align="center" prop="checkTime" width="180">
  85 + <template slot-scope="scope">
  86 + <span>{{ scope.row.checkTime}}</span>
  87 + </template>
  88 + </el-table-column>
  89 + <el-table-column label="报工状态" align="center" prop="status" width="180">
84 <template slot-scope="scope"> 90 <template slot-scope="scope">
85 - <span>{{ scope.row.checkEndTime }}</span> 91 + <span>{{ scope.row.status==0 ? "待巡查" : scope.row.status==1 ? "巡查通过" : "巡查驳回"}}</span>
86 </template> 92 </template>
87 </el-table-column> 93 </el-table-column>
88 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 94 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
trash-ui/src/views/business/truckActivate/index.vue
  View file @a901293
@@ -100,19 +100,24 @@ @@ -100,19 +100,24 @@
100 </el-form-item> 100 </el-form-item>
101 <el-form-item label="所属企业" prop="company"> 101 <el-form-item label="所属企业" prop="company">
102 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck"> 102 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
103 - <el-option v-for="item in companyList" :label="item.name" :value="item.name" 103 + <el-option v-for="item in companyList"
  104 + :disabled="item.creditStatus != 0"
  105 + :label="item.name" :value="item.name"
104 v-if="!simpleName || simpleName == item.name" 106 v-if="!simpleName || simpleName == item.name"
105 /> 107 />
106 </el-select> 108 </el-select>
107 </el-form-item> 109 </el-form-item>
108 <el-form-item label="车牌号" prop="licensePlate"> 110 <el-form-item label="车牌号" prop="licensePlate">
109 - <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>  
110 - <el-option v-if="(form.company && form.company == item.companyName)"  
111 - :disabled="item.creditStatus != 0"  
112 - v-for="item in truckList"  
113 - :label="item.licenseplateNo"  
114 - :value="item.id"/>  
115 - </el-select> 111 + <el-input v-model="truckName" />
  112 + <el-checkbox-group v-model="form.licensePlate">
  113 + <el-checkbox @change="selectAll">全选</el-checkbox>
  114 +
  115 + <el-checkbox v-if="(!truckName || item.licenseplateNo.indexOf(truckName) > -1) && (form.company && form.company == item.companyName)"
  116 + :disabled="item.creditStatus != 0"
  117 + v-for="item in truckList"
  118 + :label="item.licenseplateNo"
  119 + :value="item.id"></el-checkbox>
  120 + </el-checkbox-group>
116 </el-form-item> 121 </el-form-item>
117 </el-form> 122 </el-form>
118 <div slot="footer" class="dialog-footer"> 123 <div slot="footer" class="dialog-footer">
trash-ui/src/views/h5/task/index.vue
  View file @a901293
@@ -10,7 +10,35 @@ @@ -10,7 +10,35 @@
10 :value="item.code" :key="item.code" > 10 :value="item.code" :key="item.code" >
11 </el-option> 11 </el-option>
12 </el-select> --> 12 </el-select> -->
  13 +<el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
  14 + <el-option v-for="item in names" :label="item" :value="item">
  15 + </el-option>
  16 + </el-select>
13 17
  18 + <el-select v-model="queryParams.prev" filterable reserve-keyword placeholder="上一节点">
  19 + <el-option v-for="item in prev" :label="item.name" :value="item.name">
  20 + </el-option>
  21 + </el-select>
  22 + <el-select v-model="queryParams.type" filterable reserve-keyword>
  23 + <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
  24 + <el-option label="消纳合同申报备案" value="workflow_conract"/>
  25 + <el-option label="处理场所备案" value="workflow_earthsites"/>
  26 + <el-option label="运输企业准入流程" value="workflow_company"/>
  27 + <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
  28 + <el-option label="驾驶员信息审批" value="workflow_driver"/>
  29 + <el-option label="报工审批" value="workflow_threestep"/>
  30 + <el-option label="交办案卷" value="workflow_caseoffline"/>
  31 + <el-option label="违规案卷处置流程" value="workflow_casefile"/>
  32 + <el-option label="平台预警信息" value="violation_warning"/>
  33 + <el-option label="办文办事" value="handleAffairs"/>
  34 + <el-option label="后勤管理" value="logistics"/>
  35 + <el-option label="会议事务" value="conference"/>
  36 + <el-option label="假勤管理" value="workflow_leave"/>
  37 + <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
  38 + </el-select>
  39 +
  40 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
  41 + <el-button size="mini" @click="resetQuery">重置</el-button>
14 42
15 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" /> 43 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
16 44
@@ -642,8 +670,12 @@ import companyInfo from &quot;@/views/h5/task/companyInfo&quot;; @@ -642,8 +670,12 @@ import companyInfo from &quot;@/views/h5/task/companyInfo&quot;;
642 import driverInfo from "@/views/activiti/task/driverInfo"; 670 import driverInfo from "@/views/activiti/task/driverInfo";
643 import vehicleInfo from "@/views/activiti/task/vehicleInfo"; 671 import vehicleInfo from "@/views/activiti/task/vehicleInfo";
644 672
  673 +import taskmethod from '@/api/taskmethod'
  674 +
  675 +
645 export default { 676 export default {
646 name: "task", 677 name: "task",
  678 + mixins: [taskmethod],
647 components: { 679 components: {
648 taskCard, 680 taskCard,
649 threestepInfo, 681 threestepInfo,
@@ -779,7 +811,44 @@ export default { @@ -779,7 +811,44 @@ export default {
779 this.getList(); 811 this.getList();
780 }, 812 },
781 methods: { 813 methods: {
  814 + },
  815 +}
  816 +</script>
  817 +
  818 +
  819 +<style scoped>
  820 + div{
  821 + font-size:12px;
  822 + }
  823 +
  824 +</style>
  825 +
  826 +<style>
  827 + @import '../../../assets/css/task.css'
  828 +</style>
  829 +<style scope>
  830 + .el-select-dropdown__item{
  831 + width:300px;
  832 + }
  833 +</style>
782 834
  835 +
  836 +
  837 +<!--
  838 +remoteName(value){
  839 + getNames(value).then(res=>{
  840 +
  841 + this.names = res.data;
  842 +
  843 + this.queryParams.name = value;
  844 + });
  845 + },
  846 + resetQuery(){
  847 + this.queryParams = {};
  848 + this.queryParams.pageNum=1;
  849 + this.queryParams.pageSize=10;
  850 + this.getList();
  851 + },
783 handleClose() { 852 handleClose() {
784 this.uploadImageDialog = false; 853 this.uploadImageDialog = false;
785 this.fileList = []; 854 this.fileList = [];
@@ -1527,24 +1596,4 @@ this.form.formData[0].controlValue = value; @@ -1527,24 +1596,4 @@ this.form.formData[0].controlValue = value;
1527 }, 1596 },
1528 handlePictureCardPreview(file) { 1597 handlePictureCardPreview(file) {
1529 console.log(this.proofImage) 1598 console.log(this.proofImage)
1530 - },  
1531 - },  
1532 -}  
1533 -</script>  
1534 -  
1535 -  
1536 -<style scoped>  
1537 - div{  
1538 - font-size:12px;  
1539 - }  
1540 -  
1541 -</style>  
1542 -  
1543 -<style>  
1544 - @import '../../../assets/css/task.css'  
1545 -</style>  
1546 -<style scope>  
1547 - .el-select-dropdown__item{  
1548 - width:300px;  
1549 - }  
1550 -</style> 1599 + }, -->
1551 \ No newline at end of file 1600 \ No newline at end of file
trash-ui/src/views/h5/taskhistory/index.vue
  View file @a901293
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
  3 + <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
  4 + <el-option v-for="item in names" :label="item" :value="item">
  5 + </el-option>
  6 + </el-select>
  7 +
  8 + <el-select v-model="queryParams.type" filterable reserve-keyword>
  9 + <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
  10 + <el-option label="消纳合同申报备案" value="workflow_conract"/>
  11 + <el-option label="处理场所备案" value="workflow_earthsites"/>
  12 + <el-option label="运输企业准入流程" value="workflow_company"/>
  13 + <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
  14 + <el-option label="驾驶员信息审批" value="workflow_driver"/>
  15 + <el-option label="报工审批" value="workflow_threestep"/>
  16 + <el-option label="交办案卷" value="workflow_caseoffline"/>
  17 + <el-option label="违规案卷处置流程" value="workflow_casefile"/>
  18 + <el-option label="平台预警信息" value="violation_warning"/>
  19 + <el-option label="办文办事" value="handleAffairs"/>
  20 + <el-option label="后勤管理" value="logistics"/>
  21 + <el-option label="会议事务" value="conference"/>
  22 + <el-option label="假勤管理" value="workflow_leave"/>
  23 + <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
  24 + </el-select>
  25 +
  26 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
  27 + <el-button size="mini" @click="resetQuery">重置</el-button>
  28 +
3 29
4 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/> 30 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
5 31
@@ -157,6 +183,7 @@ @@ -157,6 +183,7 @@
157 import driverInfo from "@/views/activiti/task/driverInfo"; 183 import driverInfo from "@/views/activiti/task/driverInfo";
158 import vehicleInfo from "@/views/activiti/task/vehicleInfo"; 184 import vehicleInfo from "@/views/activiti/task/vehicleInfo";
159 185
  186 +import taskhismethod from '@/api/taskhismethod'
160 import { 187 import {
161 getArea, 188 getArea,
162 getDict, 189 getDict,
@@ -166,6 +193,7 @@ @@ -166,6 +193,7 @@
166 193
167 export default { 194 export default {
168 name: "taskHistory", 195 name: "taskHistory",
  196 + mixins: [taskhismethod],
169 props: { 197 props: {
170 type: { 198 type: {
171 type: Number 199 type: Number
@@ -264,174 +292,6 @@ @@ -264,174 +292,6 @@
264 this.getList(); 292 this.getList();
265 }, 293 },
266 methods: { 294 methods: {
267 - /** 查询请假列表 */  
268 - getList() {  
269 - this.loading = true;  
270 -  
271 - if(this.type == 1){  
272 - listEndTask(this.queryParams).then(response => {  
273 - this.taskList = response.rows;  
274 - this.total = response.total;  
275 - this.loading = false;  
276 - });  
277 - }else{  
278 - listTask(this.queryParams).then(response => {  
279 - this.taskList = response.rows;  
280 - this.total = response.total;  
281 - this.loading = false;  
282 - });  
283 - }  
284 -  
285 -  
286 - },  
287 -  
288 - // 取消按钮  
289 - cancel() {  
290 - this.earthsites=false;  
291 - this.contract=false;  
292 - this.logisticsInfoOpen=false;  
293 - this.handleAffairsInfoOpen=false;  
294 - this.caseOffline=false;  
295 - this.violationCaseFile=false;  
296 - this.violationCaseFile1=false;  
297 - this.supervisionOpen=false;  
298 - this.open=false;  
299 - this.open2=false;  
300 - this.conferenceOpen=false;  
301 - this.construct=false;  
302 - this.leaveApplicationOpen=false;  
303 -  
304 - this.company=false;  
305 - this.driver=false;  
306 - this.vehicle=false;  
307 - this.reset();  
308 - },  
309 - // 表单重置  
310 - reset() {  
311 - this.definitionKey = '',  
312 - this.businessKey = '',  
313 - this.form = {  
314 - formData: [],  
315 - };  
316 - this.resetForm("form");  
317 - },  
318 - showTask(row,idx) {  
319 -  
320 - this.needShow = false;  
321 - this.reset();  
322 - this.definitionKey = row.definitionKey;  
323 - this.businessKey = row.businessKey;  
324 - this.id = row.id;  
325 -  
326 - this.title = "详情";  
327 - formDataShow(row.id).then(response => {  
328 - let datas = response.data;  
329 - let formData = []  
330 - for (let i = 0; i < datas.length; i++) {  
331 - let strings = datas[i].split('--__!!')  
332 - let controlValue = null  
333 - let controlDefault = null  
334 - switch (strings[1]) {  
335 - case 'radio':  
336 - controlValue = idx;  
337 - controlDefault = strings[4]  
338 - break;  
339 - // default:  
340 - }  
341 - formData.push({  
342 - controlId: strings[0],  
343 - controlType: strings[1],  
344 - controlLable: strings[2],  
345 - controlIsParam: strings[3],  
346 - controlValue: controlValue,  
347 - controlDefault: controlDefault  
348 - })  
349 - }  
350 - if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey == "yuelanxuexi") {  
351 - this.controlId = formData[0].controlId;  
352 - this.idInfo = row.businessKey.split(":")[1];  
353 - this.handleAffairsInfoOpen = true;  
354 - return;  
355 - }  
356 - });  
357 - if(this.definitionKey == "conference"){  
358 - this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);  
359 - this.conferenceOpen = true;  
360 - return;  
361 - }  
362 - if(this.definitionKey == "workflow_leave"){  
363 - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);  
364 - this.leaveApplicationOpen = true;  
365 - return;  
366 - }  
367 - if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {  
368 -  
369 - this.construct = true;  
370 - return;  
371 - }  
372 - if(this.definitionKey == "workflow_earthsites"){  
373 - this.earthsites = true;  
374 - return;  
375 - }  
376 - if(this.definitionKey == "workflow_conract"){  
377 - this.contract = true;  
378 - return;  
379 - }  
380 -  
381 -  
382 - if(this.definitionKey == "workflow_threestep"){  
383 - this.open2 = true;  
384 - return;  
385 - }  
386 -  
387 - if (this.definitionKey == "logistics") {  
388 - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);  
389 - this.logisticsInfoOpen = true;  
390 - return;  
391 - }  
392 - if(this.definitionKey == "workflow_caseoffline"){  
393 - this.caseOffline = true;  
394 - return;  
395 - }  
396 -  
397 - if(this.definitionKey == "workflow_casefile"){  
398 - this.violationCaseFile = true;  
399 - return;  
400 - }  
401 -  
402 - if(this.definitionKey == "violation_warning"){  
403 - this.violationCaseFile1 = true;  
404 - return;  
405 - }  
406 - if(this.definitionKey.indexOf("supervision")>-1){  
407 - const params = {  
408 - id: row.businessKey.split(":")[1],  
409 - }  
410 - getSupervision(params).then(res=>{  
411 - if(res.result==null){  
412 - this.$message.error("获取纪检督察详情失败！请重试")  
413 - return;  
414 - }  
415 - this.supervisionData = res.result;  
416 - this.supervisionOpen = true;  
417 - })  
418 - return;  
419 - }  
420 -  
421 - if(this.definitionKey == "workflow_company"){  
422 - this.company = true;  
423 - return;  
424 - }  
425 - if(this.definitionKey == "workflow_vehicle"){  
426 - this.vehicle = true;  
427 - return;  
428 - }  
429 - if(this.definitionKey == "workflow_driver"){  
430 - this.driver = true;  
431 - return;  
432 - }  
433 -  
434 - },  
435 295
436 } 296 }
437 }; 297 };
trash-ui/src/views/h5/truckActivate/index.vue
  View file @a901293
@@ -102,18 +102,21 @@ @@ -102,18 +102,21 @@
102 <el-form-item label="所属企业" prop="company"> 102 <el-form-item label="所属企业" prop="company">
103 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck"> 103 <el-select v-model="form.company" filterable reserve-keyword @change="clearTruck">
104 <el-option v-for="item in companyList" :label="item.name" :value="item.name" 104 <el-option v-for="item in companyList" :label="item.name" :value="item.name"
  105 + :disabled="item.creditStatus != 0"
105 v-if="!simpleName || simpleName == item.name" 106 v-if="!simpleName || simpleName == item.name"
106 /> 107 />
107 </el-select> 108 </el-select>
108 </el-form-item> 109 </el-form-item>
109 <el-form-item label="车牌号" prop="licensePlate"> 110 <el-form-item label="车牌号" prop="licensePlate">
110 - <el-select v-model="form.licensePlate" placeholder="请选择车辆" multiple filterable>  
111 - <el-option v-if="(form.company && form.company == item.companyName)" 111 + <el-input v-model="truckName" />
  112 + <el-checkbox-group v-model="form.licensePlate">
  113 + <el-checkbox @change="selectAll">全选</el-checkbox>
  114 + <el-checkbox v-if="(!truckName || item.licenseplateNo.indexOf(truckName) > -1) && (form.company && form.company == item.companyName)"
112 :disabled="item.creditStatus != 0" 115 :disabled="item.creditStatus != 0"
113 v-for="item in truckList" 116 v-for="item in truckList"
114 :label="item.licenseplateNo" 117 :label="item.licenseplateNo"
115 - :value="item.id"/>  
116 - </el-select> 118 + :value="item.id"></el-checkbox>
  119 + </el-checkbox-group>
117 </el-form-item> 120 </el-form-item>
118 </el-form> 121 </el-form>
119 <div slot="footer" class="dialog-footer"> 122 <div slot="footer" class="dialog-footer">