youxiw2000 / trash · Commits

Commit 2c9117a69e3e912fe5a3890d7f84ec7eb81bbcaf

Authored by youxiw2000
1 parent 28f7c958

m

Inline Side-by-side
Showing 32 changed files with 1822 additions and 1718 deletions
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @2c9117a
... ... @@ -439,40 +439,37 @@ public class ActTaskServiceImpl implements IActTaskService {
439 439  
440 440 if (desc != null)
441 441 updateThreesetpTask(processInstance, desc);
442   -
443   - checkPostSMS(processInstance,task);
444 442  
445 443 // 写入数据库
446 444 return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
447 445 }
448   -
449   -
450   -
451   - private void checkPostSMS(ProcessInstance processInstance,Task task){
452   -
453   - String key = processInstance.getProcessDefinitionKey();
  446 +
  447 + private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
  448 +
  449 + org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId())
  450 + .singleResult();
454 451  
  452 + if (task == null)
  453 + return;
455 454  
456   - org.activiti.engine.task.Task tasks =taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
457   -
458   - if(tasks != null){
  455 + if(task != null){
459 456  
460 457 List<Mobile> mobileList=new ArrayList<Mobile>();
461 458  
462 459  
463   - String number = actMapper.getPhoneNumber(key,task.getName());
  460 + String number = actMapper.getPhoneNumber(processInstance.getProcessDefinitionKey(),task.getName());
464 461  
465 462  
466 463 if(number != null){
467   - String smsString = "【长沙渣管】工作提醒：您有新的工作流程，请及时处理。";
  464 + String smsString = "工作提醒：您有新的工作流程，请及时处理。";
468 465 Mobile mobile=new Mobile();
469 466 mobile.setMobile(number);
470 467 mobileList.add(mobile);
471 468  
472   - if(key.equals("workflow_caseoffline")){
  469 + if(processInstance.getProcessDefinitionKey().equals("workflow_caseoffline")){
473 470  
474 471 String dname = actMapper.getCaseTypeName("case_offline_type",processInstance.getBusinessKey().split(":")[1]);
475   - smsString = "【长沙渣管】案卷提醒：有一条"+ dname +"的案卷，请及时处理。";
  472 + smsString = "案卷提醒：有一条"+ dname +"的案卷，请及时处理。";
476 473 }
477 474  
478 475 JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
... ... @@ -488,23 +485,6 @@ public class ActTaskServiceImpl implements IActTaskService {
488 485 }
489 486  
490 487 }
491   -
492   -
493   -
494   -
495   -
496   -
497   - System.out.println("判断是否发短信!");
498   -
499   - }
500   -
501   - private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
502   -
503   - org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId())
504   - .singleResult();
505   -
506   - if (task == null)
507   - return;
508 488  
509 489 task.setDescription(placeCode);
510 490  
... ...
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
  View file @2c9117a
... ... @@ -181,6 +181,18 @@ public class RemoteServerUtils {
181 181  
182 182 return list;
183 183 }
  184 +
  185 + public static JSONArray getConstructionLedgerList(Map map, String token) {
  186 + JSONArray list = null;
  187 + Object object = post(ConstructionLedgerList, map,token);
  188 +
  189 + if (object != null) {
  190 + JSONObject jsonObject = JSON.parseObject(object.toString());
  191 + list = jsonObject.getJSONArray("list");
  192 + }
  193 +
  194 + return list;
  195 + }
184 196  
185 197 public static JSONArray getConstructionList(Map map, String token) {
186 198 JSONArray list = null;
... ...
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @2c9117a
... ... @@ -757,7 +757,9 @@ public class DriverTask {
757 757 JSONArray cList = redisCache.getCacheObject("constructionList");
758 758 if(cList == null){
759 759 cList = RemoteServerUtils.getConstructionList(map, trashConfig.getToken());
760   - redisCache.setCacheObject("constructionList", cList,60,TimeUnit.MINUTES);
  760 + if(cList != null){
  761 + redisCache.setCacheObject("constructionList", cList,1,TimeUnit.DAYS);
  762 + }
761 763 }
762 764  
763 765 JSONArray eList = redisCache.getCacheObject("earthSitesList");
... ... @@ -795,25 +797,21 @@ public class DriverTask {
795 797 List<Mobile> mobileList = new ArrayList<>();
796 798  
797 799  
798   -// String p = json.getString("constructionCompanyPhone");
799   -// if(p != null){
800   -// Mobile mobile=new Mobile();
801   -// mobile.setMobile(p);
802   -// mobileList.add(mobile);
803   -// }
804   -//
805   -// String p1 = json.getString("projectnCompanyPhone");
806   -// if(p1 != null){
807   -// Mobile mobile2=new Mobile();
808   -// mobile2.setMobile(p1);
809   -// mobileList.add(mobile2);
810   -// }
811   -
812   - Mobile mobile2=new Mobile();
813   - mobile2.setMobile("19520553054");
814   - mobileList.add(mobile2);
  800 + String p = json.getString("constructionCompanyPhone");
  801 + if(p != null){
  802 + Mobile mobile=new Mobile();
  803 + mobile.setMobile(p);
  804 + mobileList.add(mobile);
  805 + }
815 806  
816   - String smsString = "【长沙渣管】到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
  807 + String p1 = json.getString("projectnCompanyPhone");
  808 + if(p1 != null){
  809 + Mobile mobile2=new Mobile();
  810 + mobile2.setMobile(p1);
  811 + mobileList.add(mobile2);
  812 + }
  813 +
  814 + String smsString = "到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
817 815  
818 816 JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
819 817 if(jsonSmsSend!=null){
... ... @@ -853,15 +851,12 @@ public class DriverTask {
853 851 List<Mobile> mobileList = new ArrayList<>();
854 852 String p = json.getString("principalPhoneNo");
855 853 if(p != null){
856   -// Mobile mobile=new Mobile();
857   -// mobile.setMobile(p);
858   -// mobileList.add(mobile);
  854 + Mobile mobile=new Mobile();
  855 + mobile.setMobile(p);
  856 + mobileList.add(mobile);
859 857  
860   - Mobile mobile2=new Mobile();
861   - mobile2.setMobile("19520553054");
862   - mobileList.add(mobile2);
863 858  
864   - String smsString = "【长沙渣管】到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
  859 + String smsString = "到期提醒："+json.getString("name")+"将于"+json.getString("effectiveEnd")+"到期（截止日），请在到期日前及时办理相关手续。";
865 860  
866 861 JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
867 862 if(jsonSmsSend!=null){
... ... @@ -944,7 +939,7 @@ public class DriverTask {
944 939 map.put("page", 1);
945 940 JSONArray jsonArray = RemoteServerUtils.getCompanyList(map, trashConfig.getToken());
946 941 if (jsonArray != null) {
947   - redisCache.setCacheObject("companyList", jsonArray, 60, TimeUnit.MINUTES);
  942 + redisCache.setCacheObject("companyList", jsonArray, 1,TimeUnit.DAYS);
948 943 }
949 944 }
950 945  
... ... @@ -959,7 +954,7 @@ public class DriverTask {
959 954 map.put("auditStatus", 1);
960 955 JSONArray jsonArray = RemoteServerUtils.getContractList(map, trashConfig.getToken());
961 956 if (jsonArray != null) {
962   - redisCache.setCacheObject("contractList", jsonArray, 60, TimeUnit.MINUTES);
  957 + redisCache.setCacheObject("contractList", jsonArray, 1,TimeUnit.DAYS);
963 958 }
964 959 }
965 960  
... ... @@ -975,7 +970,12 @@ public class DriverTask {
975 970 map.put("page", 1);
976 971 JSONArray jsonArray = RemoteServerUtils.getConstructionList(map, trashConfig.getToken());
977 972 if (jsonArray != null) {
978   - redisCache.setCacheObject("constructionList", jsonArray, 60, TimeUnit.MINUTES);
  973 + redisCache.setCacheObject("constructionList", jsonArray, 1,TimeUnit.DAYS);
  974 + }
  975 +
  976 + jsonArray = RemoteServerUtils.getConstructionLedgerList(map, trashConfig.getToken());
  977 + if (jsonArray != null) {
  978 + redisCache.setCacheObject("constructionLedgerList", jsonArray, 1,TimeUnit.DAYS);
979 979 }
980 980 }
981 981  
... ... @@ -991,7 +991,7 @@ public class DriverTask {
991 991 map.put("page", 1);
992 992 JSONArray jsonArray = RemoteServerUtils.getEarthSitesList(map, trashConfig.getToken());
993 993 if (jsonArray != null) {
994   - redisCache.setCacheObject("earthSitesList", jsonArray, 60, TimeUnit.MINUTES);
  994 + redisCache.setCacheObject("earthSitesList", jsonArray, 1,TimeUnit.DAYS);
995 995 }
996 996 }
997 997  
... ... @@ -1009,7 +1009,7 @@ public class DriverTask {
1009 1009  
1010 1010 JSONArray jsonArray = RemoteServerUtils.getTruckList(map, trashConfig.getToken());
1011 1011 if (jsonArray != null) {
1012   - redisCache.setCacheObject("truckList", jsonArray, 60, TimeUnit.MINUTES);
  1012 + redisCache.setCacheObject("truckList", jsonArray, 1,TimeUnit.DAYS);
1013 1013 }
1014 1014 }
1015 1015  
... ... @@ -1025,7 +1025,7 @@ public class DriverTask {
1025 1025 map.put("page", 1);
1026 1026 JSONArray jsonArray = RemoteServerUtils.getAreas(trashConfig.getToken());
1027 1027 if (jsonArray != null) {
1028   - redisCache.setCacheObject("areaList", jsonArray, 60, TimeUnit.MINUTES);
  1028 + redisCache.setCacheObject("areaList", jsonArray, 1,TimeUnit.DAYS);
1029 1029 }
1030 1030 }
1031 1031 }
... ...
trash-ui/public/bpmnjs/index.js
  View file @2c9117a
... ... @@ -24,7 +24,7 @@ var _tools = _interopRequireDefault(require(&quot;../resources/tools&quot;));
24 24 var _newDiagram = _interopRequireDefault(require("../resources/newDiagram.bpmn"));
25 25  
26 26 _jquery.default.ajax({
27   - url: '/api/gpsservice/cs/dataDict',
  27 + url: '/api/gpsservice/cs/dataDict',
28 28 headers:{Authorization:"Bearer auth:token:" + sessionStorage.getItem('Admin-Token')},
29 29 type: 'GET',
30 30 data: {type:"CSUserPostType"},
... ... @@ -41,7 +41,7 @@ var _newDiagram = _interopRequireDefault(require(&quot;../resources/newDiagram.bpmn&quot;)
41 41 });
42 42  
43 43 _jquery.default.ajax({
44   - url: '/api/gpsservice/cs/dataDict',
  44 + url: '/api/gpsservice/cs/dataDict',
45 45 headers:{Authorization:"Bearer auth:token:" + sessionStorage.getItem('Admin-Token')},
46 46 // url: 'http://localhost:8080/processDefinition/getDefinitionXML',
47 47 type: 'GET',
... ... @@ -83437,8 +83437,8 @@ module.exports = function(group, element, bpmnFactory, translate) {
83437 83437 if (!ensureFormKeyAndDataSupported(element)) {
83438 83438 return;
83439 83439 }
83440   -
83441   -
  83440 +
  83441 +
83442 83442 var $ = require('jquery');
83443 83443  
83444 83444 /**
... ... @@ -83458,9 +83458,9 @@ module.exports = function(group, element, bpmnFactory, translate) {
83458 83458 }
83459 83459  
83460 83460 return formHelper.getFormField(element, selected.idx);
83461   - }
83462   -
83463   -
  83461 + }
  83462 +
  83463 +
83464 83464  
83465 83465 // [FormKey] form key text input field
83466 83466 group.entries.push(entryFactory.textField({
... ... @@ -83553,43 +83553,43 @@ module.exports = function(group, element, bpmnFactory, translate) {
83553 83553 return !!getSelectedFormField(element, node);
83554 83554 }
83555 83555 }));
83556   -
83557   - function updateParamInput(idvalue){
83558   - var value = $("#activiti-form-field-id").val();
83559   -
83560   - value = value.split("--__!!")[0];
83561   - debugger;
83562   - if($("#FormProperty_type").val() == "radio"){
83563   - $("#FormLabel").val("审批");
83564   - $("#FormValue").val("通过,驳回");
83565   -
83566   - $("#FormLabel").value = "审批";
83567   - $("#FormValue").value = "通过,驳回";
83568   - }
83569   - if($("#FormProperty_type").val() == "textarea"){
83570   - $("#FormLabel").val("批注");
83571   - $("#FormValue").val("NULL");
83572   -
83573   - $("#FormLabel").value = "批注";
83574   - $("#FormValue").value = "NULL";
83575   - }
83576   - var label = $("#FormLabel").val() == "" ? "NULL" : $("#FormLabel").val();
83577   - var labelValue = $("#FormValue").val() == "" ? "NULL" : $("#FormValue").val();
83578   -
83579   - var isCheck = "f";
83580   - if($("#isprime:checked").val()){
83581   - isCheck = "i";
83582   - }
83583   - var label = $("#FormLabel").val() == "" ? "NULL" : $("#FormLabel").val();
83584   -
83585   - value += "--__!!" + $("#FormProperty_type").val();
83586   - value += "--__!!" + label;
83587   - value += "--__!!" + isCheck;
83588   - value += "--__!!" + labelValue.replace(",","--__--");
83589   -
83590   - $("#activiti-form-field-id")[0].value = value;
83591   - }
83592   -
  83556 +
  83557 + function updateParamInput(idvalue){
  83558 + var value = $("#activiti-form-field-id").val();
  83559 +
  83560 + value = value.split("--__!!")[0];
  83561 + debugger;
  83562 + if($("#FormProperty_type").val() == "radio"){
  83563 + $("#FormLabel").val("审批");
  83564 + $("#FormValue").val("通过,驳回");
  83565 +
  83566 + $("#FormLabel").value = "审批";
  83567 + $("#FormValue").value = "通过,驳回";
  83568 + }
  83569 + if($("#FormProperty_type").val() == "textarea"){
  83570 + $("#FormLabel").val("批注");
  83571 + $("#FormValue").val("NULL");
  83572 +
  83573 + $("#FormLabel").value = "批注";
  83574 + $("#FormValue").value = "NULL";
  83575 + }
  83576 + var label = $("#FormLabel").val() == "" ? "NULL" : $("#FormLabel").val();
  83577 + var labelValue = $("#FormValue").val() == "" ? "NULL" : $("#FormValue").val();
  83578 +
  83579 + var isCheck = "f";
  83580 + if($("#isprime:checked").val()){
  83581 + isCheck = "i";
  83582 + }
  83583 + var label = $("#FormLabel").val() == "" ? "NULL" : $("#FormLabel").val();
  83584 +
  83585 + value += "--__!!" + $("#FormProperty_type").val();
  83586 + value += "--__!!" + label;
  83587 + value += "--__!!" + isCheck;
  83588 + value += "--__!!" + labelValue.replace(",","--__--");
  83589 +
  83590 + $("#activiti-form-field-id")[0].value = value;
  83591 + }
  83592 +
83593 83593  
83594 83594 // [FormData] form field id text input field
83595 83595 group.entries.push(entryFactory.validationAwareTextField({
... ... @@ -83612,72 +83612,72 @@ module.exports = function(group, element, bpmnFactory, translate) {
83612 83612 },
83613 83613 validate: function(element, values, node) {
83614 83614  
83615   - var formField = getSelectedFormField(element, node);
  83615 + var formField = getSelectedFormField(element, node);
83616 83616  
83617 83617 if (formField) {
83618 83618  
83619   - var idValue = values.id;
83620   -
83621   - // //"FormProperty_3qipis2--__!!radio--__!!审批意见--__!!i--__!!同意--__--不同意"
83622   - // var param = selectedFormField.id.split("--__!!");
83623   -
83624   - var param = idValue.split("--__!!");
83625   -
83626   -
83627   - // var combox = entryFactory.comboBox({"selectOptions": [{ name: 'textarea', value: 'textarea' },{ name: 'radio', value: 'radio' }]});
83628   -
83629   - $(".bpp-properties-entry[data-entry='form-field-id'] p").remove();
83630   - $("#FormProperty_type").remove();
83631   - $("#FormLabel").remove();
83632   - $("#FormValue").remove();
83633   - $("#isprime").remove();
83634   -
83635   - var tag = "<p>类型</p><select id=FormProperty_type><option value=radio ";
83636   - if(param[1] && param[1] == "radio"){
83637   - tag += "selected='selected'";
83638   - }
83639   - tag += ">单选</option><option value=textarea ";
83640   - if(param[1] && param[1] == "textarea"){
83641   - tag += "selected='selected'";
83642   - }
83643   - tag += ">文本</option><option value=file ";
83644   - if(param[1] && param[1] == "file"){
83645   - tag += "selected='selected'";
83646   - }
83647   - tag += ">文件</option><option value=image ";
83648   - if(param[1] && param[1] == "image"){
83649   - tag += "selected='selected'";
83650   - }
83651   - tag += ">图片</option></select>";
83652   - $(".bpp-properties-entry[data-entry='form-field-id']").append(tag);
83653   -
83654   - var p = "";
83655   -
83656   - if(param[2]){
83657   - p = param[2];
83658   - }
83659   - $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>标签</p><input id=FormLabel type=input value='审批'>");
83660   -
83661   - p = "";
83662   -
83663   - if(param[4]){
83664   - p = param[4].replace("--__--",",");
83665   - }
83666   - $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>参数</p><input id=FormValue type=input value='通过,驳回'>");
83667   -
83668   - p = '';
83669   -
83670   - if(param[3] != 'f'){
83671   - p = 'checked=checked';
83672   - }
83673   -
83674   - $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>是否关键</p><input id=isprime type=checkbox "+p+">");
83675   -
83676   - $("#FormProperty_type").change(updateParamInput);
83677   - $("#FormLabel").change(updateParamInput);
83678   - $("#FormValue").change(updateParamInput);
83679   - $("#isprime").change(updateParamInput);
83680   -
  83619 + var idValue = values.id;
  83620 +
  83621 + // //"FormProperty_3qipis2--__!!radio--__!!处理意见--__!!i--__!!同意--__--不同意"
  83622 + // var param = selectedFormField.id.split("--__!!");
  83623 +
  83624 + var param = idValue.split("--__!!");
  83625 +
  83626 +
  83627 + // var combox = entryFactory.comboBox({"selectOptions": [{ name: 'textarea', value: 'textarea' },{ name: 'radio', value: 'radio' }]});
  83628 +
  83629 + $(".bpp-properties-entry[data-entry='form-field-id'] p").remove();
  83630 + $("#FormProperty_type").remove();
  83631 + $("#FormLabel").remove();
  83632 + $("#FormValue").remove();
  83633 + $("#isprime").remove();
  83634 +
  83635 + var tag = "<p>类型</p><select id=FormProperty_type><option value=radio ";
  83636 + if(param[1] && param[1] == "radio"){
  83637 + tag += "selected='selected'";
  83638 + }
  83639 + tag += ">单选</option><option value=textarea ";
  83640 + if(param[1] && param[1] == "textarea"){
  83641 + tag += "selected='selected'";
  83642 + }
  83643 + tag += ">文本</option><option value=file ";
  83644 + if(param[1] && param[1] == "file"){
  83645 + tag += "selected='selected'";
  83646 + }
  83647 + tag += ">文件</option><option value=image ";
  83648 + if(param[1] && param[1] == "image"){
  83649 + tag += "selected='selected'";
  83650 + }
  83651 + tag += ">图片</option></select>";
  83652 + $(".bpp-properties-entry[data-entry='form-field-id']").append(tag);
  83653 +
  83654 + var p = "";
  83655 +
  83656 + if(param[2]){
  83657 + p = param[2];
  83658 + }
  83659 + $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>标签</p><input id=FormLabel type=input value='审批'>");
  83660 +
  83661 + p = "";
  83662 +
  83663 + if(param[4]){
  83664 + p = param[4].replace("--__--",",");
  83665 + }
  83666 + $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>参数</p><input id=FormValue type=input value='通过,驳回'>");
  83667 +
  83668 + p = '';
  83669 +
  83670 + if(param[3] != 'f'){
  83671 + p = 'checked=checked';
  83672 + }
  83673 +
  83674 + $(".bpp-properties-entry[data-entry='form-field-id']").append("<p>是否关键</p><input id=isprime type=checkbox "+p+">");
  83675 +
  83676 + $("#FormProperty_type").change(updateParamInput);
  83677 + $("#FormLabel").change(updateParamInput);
  83678 + $("#FormValue").change(updateParamInput);
  83679 + $("#isprime").change(updateParamInput);
  83680 +
83681 83681  
83682 83682 if (!idValue || idValue.trim() === '') {
83683 83683 return { id: 'Form field id must not be empty' };
... ... @@ -83707,28 +83707,28 @@ module.exports = function(group, element, bpmnFactory, translate) {
83707 83707 // // { name: 'enum', value: 'enum' }
83708 83708 // ],
83709 83709  
83710   - // get: function(element, node) {
  83710 + // get: function(element, node) {
83711 83711  
83712   - // var selectedFormField = getSelectedFormField(element, node);
83713   -
83714   - // if(!selectedFormField)
83715   - // return;
83716   -
83717   - // debugger;
83718   - // //"FormProperty_3qipis2--__!!radio--__!!审批意见--__!!i--__!!同意--__--不同意"
  83712 + // var selectedFormField = getSelectedFormField(element, node);
  83713 +
  83714 + // if(!selectedFormField)
  83715 + // return;
  83716 +
  83717 + // debugger;
  83718 + // //"FormProperty_3qipis2--__!!radio--__!!处理意见--__!!i--__!!同意--__--不同意"
83719 83719 // var param = selectedFormField.id.split("--__!!");
83720   -
83721   - // if(param[1] == 'radio'){
83722   - // this.selectOptions[1].select = true;
83723   - // }
83724   -
  83720 +
  83721 + // if(param[1] == 'radio'){
  83722 + // this.selectOptions[1].select = true;
  83723 + // }
  83724 +
83725 83725 // return ;
83726 83726 // },
83727   - // set: function(element, values, node) {
  83727 + // set: function(element, values, node) {
83728 83728 // debugger;
83729 83729 // var selectedFormField = getSelectedFormField(element, node),
83730 83730 // commands = [];
83731   - // console.log(selectedFormField);
  83731 + // console.log(selectedFormField);
83732 83732  
83733 83733 // // commands.push(cmdHelper.updateBusinessObject(element, selectedFormField, values));
83734 83734  
... ... @@ -86237,7 +86237,7 @@ module.exports = function(element, bpmnFactory, options, translate) {
86237 86237  
86238 86238 set: function(element, values, node) {
86239 86239 var action = this.__action;
86240   - delete this.__action;
  86240 + delete this.__action;
86241 86241  
86242 86242 businessObject = businessObject || getBusinessObject(element);
86243 86243  
... ... @@ -86257,16 +86257,16 @@ module.exports = function(element, bpmnFactory, options, translate) {
86257 86257 commands.push(createElement(element, extensionElements, action.value, node));
86258 86258 return commands;
86259 86259 }
86260   - else if (action.id === REMOVE_EXTENSION_ELEMENT_ACTION) {
86261   -
86262   - var result = removeElement(element, extensionElements, action.value, action.idx, node);
86263   -
86264   - if(extensionElements.values[action.idx].id == action.value){
86265   - extensionElements.values.splice(action.idx,1);
86266   - }
  86260 + else if (action.id === REMOVE_EXTENSION_ELEMENT_ACTION) {
  86261 +
  86262 + var result = removeElement(element, extensionElements, action.value, action.idx, node);
  86263 +
  86264 + if(extensionElements.values[action.idx].id == action.value){
  86265 + extensionElements.values.splice(action.idx,1);
  86266 + }
  86267 +
  86268 + return result;
86267 86269  
86268   - return result;
86269   -
86270 86270 }
86271 86271  
86272 86272 },
... ... @@ -86322,13 +86322,13 @@ module.exports = function(element, bpmnFactory, options, translate) {
86322 86322  
86323 86323 return true;
86324 86324 },
86325   - removeElement: function(element, node) {
  86325 + removeElement: function(element, node) {
86326 86326  
86327 86327 var selection = getSelected(node, id);
86328 86328  
86329   - var selectBox = getSelectBox(node, id);
  86329 + var selectBox = getSelectBox(node, id);
86330 86330  
86331   - selectBox.removeChild(selectBox.options[selection.idx]);
  86331 + selectBox.removeChild(selectBox.options[selection.idx]);
86332 86332  
86333 86333 initSelectionSize(selectBox, selectBox.options.length);
86334 86334  
... ... @@ -90190,4 +90190,4 @@ const tools = {
90190 90190 var _default = tools;
90191 90191 exports.default = _default;
90192 90192  
90193   -},{"jquery":348}]},{},[1])
  90193 +},{"jquery":348}]},{},[1])
... ...
trash-ui/src/api/taskmethod.js
  View file @2c9117a
... ... @@ -333,10 +333,28 @@ export default {
333 333 }
334 334  
335 335 if (this.definitionKey == "workflow_threestep") {
  336 + if(!this.form["sub_img0"] || this.form["sub_img0"].length == 0 ||
  337 + !this.form["sub_img1"] || this.form["sub_img1"].length == 0 ||
  338 + !this.form["sub_img3"] || this.form["sub_img3"].length == 0 ||
  339 + !this.form["sub_img4"] || this.form["sub_img4"].length == 0 ||
  340 + !this.form["sub_img5"] || this.form["sub_img5"].length == 0 ||
  341 + (this.form.type == 0 && (!this.form["sub_img6"] || this.form["sub_img6"].length == 0)) ||
  342 + !this.form["sub_img7"] || this.form["sub_img7"].length == 0
  343 + ){
  344 + this.$message("缺少必要的图片");
  345 + return;
  346 + }
  347 +
  348 +
  349 +
336 350 this.$refs["form"].validate(valid => {
337 351 if (!valid) {
338 352 return;
339 353 }
  354 +
  355 +
  356 +
  357 +
340 358 for (let i = 0; i < 13; i++) {
341 359 if (this.form["sub_img" + i]) {
342 360 let paths = "";
... ... @@ -495,9 +513,9 @@ export default {
495 513 updateViolationCaseFileReader({id: objId}).then(res => {
496 514 })
497 515 }
498   -
  516 +
499 517 this.modalLoading = true;
500   -
  518 +
501 519 addReplyApprovalProcess(postData).then(res => {
502 520 this.videoSrc1 = [];
503 521 this.slides1 = [];
... ...
trash-ui/src/api/three_step.js
  View file @2c9117a
... ... @@ -591,7 +591,8 @@ export default {
591 591 getList(tabIdx) {
592 592 if (tabIdx == 1) {
593 593 this.resetQuery();
594   - this.queryParams.pageStatus = tabIdx;
  594 + this.queryParams.pageStatus = tabIdx;
  595 + this.queryParams.his = tabIdx;
595 596 this.queryParams.status = tabIdx;
596 597  
597 598 getNames(this.queryParams).then(res => {
... ... @@ -602,7 +603,8 @@ export default {
602 603 } else if (tabIdx == 0) {
603 604 this.resetQuery();
604 605 this.queryParams.pageStatus = tabIdx;
605   - this.queryParams.status = null;
  606 + this.queryParams.status = null;
  607 + this.queryParams.his = null;
606 608  
607 609 getNames(this.queryParams).then(res => {
608 610  
... ... @@ -830,23 +832,22 @@ export default {
830 832 },
831 833 /** 提交按钮 */
832 834 submitForm() {
833   - if(this.form.trucks){
834   - this.form.companyTrucks = [];
835   - for(let i in this.form.trucks){
836   - for(let j in this.truckList){
837   - if(this.truckList[j].licenseplateNo == this.form.trucks[i]){
838   - this.form.companyTrucks.push(this.truckList[j].id);
839   - break;
840   - }
841   - }
842   - }
843   - }
844 835  
845   - let companyNames = "";
846   - for(let i in this.companyList){
847   - companyNames += this.companyList[i].name + ",";
  836 + if(!this.form["img0"] || this.form["img0"].length == 0 ||
  837 + !this.form["img1"] || this.form["img1"].length == 0 ||
  838 + !this.form["img2"] || this.form["img2"].length == 0 ||
  839 + !this.form["img3"] || this.form["img3"].length == 0 ||
  840 + !this.form["img4"] || this.form["img4"].length == 0 ||
  841 + !this.form["img5"] || this.form["img5"].length == 0 ||
  842 + (this.form.type == 0 && (!this.form["img6"] || this.form["img6"].length == 0)) ||
  843 + !this.form["img7"] || this.form["img7"].length == 0
  844 + ){
  845 + this.$message("缺少必要的图片");
  846 + return;
848 847 }
849 848  
  849 +
  850 +
850 851  
851 852 this.$refs["form"].validate(valid => {
852 853 if (valid) {
... ...
trash-ui/src/api/vio_casefile.js
  View file @2c9117a
... ... @@ -218,7 +218,7 @@ export default {
218 218 return "已回复";
219 219 }
220 220 if(item.status1 && Number(item.status1) > 1){
221   - return "待审核";
  221 + return "审核中";
222 222 }
223 223 },
224 224 getCaseType(type){
... ... @@ -599,15 +599,15 @@ export default {
599 599  
600 600 let companyName = formData.companyName ? formData.companyName : "";
601 601 let projectName = formData.projectName ? formData.projectName : "";
602   -
  602 +
603 603 for(let i in this.caseType){
604 604 if(this.caseType[i].dictValue == formData.violationType){
605 605 this.form.describe = code + companyName + "在" + projectName + "出现" + this.caseType[i].dictLabel;
606 606 break;
607 607 }
608 608 }
609   -
610   -
  609 +
  610 +
611 611 this.rules.companyName = null;
612 612 this.rules.projectName = null;
613 613 }
... ...
trash-ui/src/api/warningInfo.js
  View file @2c9117a
... ... @@ -222,7 +222,7 @@ export default {
222 222 return "已回复";
223 223 }
224 224 if(item.status1 && Number(item.status1) > 1){
225   - return "待审核";
  225 + return "审核中";
226 226 }
227 227 },
228 228 getAreaName(code){
... ... @@ -596,14 +596,14 @@ export default {
596 596  
597 597 let companyName = formData.companyName ? formData.companyName : "";
598 598 let projectName = formData.projectName ? formData.projectName : "";
599   -
  599 +
600 600 for(let i in this.caseType){
601 601 if(this.caseType[i].dictValue == formData.violationType){
602 602 this.form.describe = code + companyName + "在" + projectName + "出现" + this.caseType[i].dictLabel;
603 603 break;
604 604 }
605 605 }
606   -
  606 +
607 607 this.rules.companyName = null;
608 608 this.rules.projectName = null;
609 609 }
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @2c9117a
... ... @@ -10,7 +10,7 @@
10 10 :value="item.code" :key="item.code">
11 11 </el-option>
12 12 </el-select>
13   -
  13 +
14 14 <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
15 15 <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
16 16 <el-option v-for="item in names" :label="item" :value="item">
... ... @@ -36,10 +36,10 @@
36 36 <el-option label="后勤管理" value="logistics"/>
37 37 <el-option label="会议事务" value="conference"/>
38 38 <el-option label="假勤管理" value="workflow_leave"/>
39   - <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
40   - </el-select>
41   -
42   - <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
  39 + <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc,supervision_casefile,supervision_contract,workflow_supervision"/>
  40 + </el-select>
  41 +
  42 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
43 43 <el-button size="mini" @click="resetQuery">重置</el-button>
44 44  
45 45  
... ... @@ -85,7 +85,8 @@
85 85 </el-col>
86 86 </el-row>
87 87 <el-row type="flex" justify="center" style="margin-top: 20px;">
88   - <el-col :span="6">
  88 + <el-col :span="6">
  89 + <span style="color: red;" >*</span>
89 90 <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
90 91 <br/>
91 92 <el-image v-for="item in slides[0]"
... ... @@ -99,7 +100,8 @@
99 100 x</a>
100 101 </p>
101 102 </el-col>
102   - <el-col :span="6">
  103 + <el-col :span="6">
  104 + <span style="color: red;" >*</span>
103 105 <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
104 106 <br/>
105 107 <el-image v-for="item in slides[1]"
... ... @@ -127,7 +129,8 @@
127 129 x</a>
128 130 </p>
129 131 </el-col>
130   - <el-col :span="6">
  132 + <el-col :span="6">
  133 + <span style="color: red;" >*</span>
131 134 <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
132 135 <br/>
133 136 <el-image v-for="item in slides[3]"
... ... @@ -143,7 +146,8 @@
143 146 </el-col>
144 147 </el-row>
145 148 <el-row type="flex" justify="center">
146   - <el-col :span="6">
  149 + <el-col :span="6">
  150 + <span style="color: red;" >*</span>
147 151 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
148 152 <br/>
149 153 <el-image v-for="item in slides[4]"
... ... @@ -157,7 +161,8 @@
157 161 x</a>
158 162 </p>
159 163 </el-col>
160   - <el-col :span="6">
  164 + <el-col :span="6">
  165 + <span style="color: red;" >*</span>
161 166 <a style="color:blue;font-size: 12px;"
162 167 @click="showFileUpload(5)">{{ form.type == 0 ? "摄像头视频截图1" : "洗车设施照片" }}</a>
163 168 <br/>
... ... @@ -172,7 +177,8 @@
172 177 x</a>
173 178 </p>
174 179 </el-col>
175   - <el-col :span="6">
  180 + <el-col :span="6">
  181 + <span style="color: red;" v-if="form.type == 0">*</span>
176 182 <a style="color:blue;font-size: 12px;"
177 183 @click="showFileUpload(6)">{{ form.type == 0 ? "摄像头视频截图2" : "雾炮机" }}</a>
178 184 <br/>
... ... @@ -187,7 +193,8 @@
187 193 x</a>
188 194 </p>
189 195 </el-col>
190   - <el-col :span="6">
  196 + <el-col :span="6">
  197 + <span style="color: red;" >*</span>
191 198 <a style="color:blue;font-size: 12px;"
192 199 @click="showFileUpload(7)">{{ form.type == 0 ? "摄像头视频截图3" : "裸露黄土覆盖照片" }}</a>
193 200 <br/>
... ... @@ -329,9 +336,9 @@
329 336  
330 337  
331 338 <el-table :data="hisfromData" v-if="hisfromData != null">
332   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
333   - <el-table-column label="审批人" align="center" prop="createName"/>
334   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  339 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  340 + <el-table-column label="处理人" align="center" prop="createName"/>
  341 + <el-table-column label="处理时间" align="center" prop="createTime"/>
335 342 </el-table>
336 343 <div slot="footer" class="dialog-footer">
337 344 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
... ... @@ -348,9 +355,9 @@
348 355  
349 356 <el-table :data="hisfromData" v-if="hisfromData != null">
350 357  
351   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
352   - <el-table-column label="审批人" align="center" prop="createName"/>
353   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  358 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  359 + <el-table-column label="处理人" align="center" prop="createName"/>
  360 + <el-table-column label="处理时间" align="center" prop="createTime"/>
354 361 </el-table>
355 362  
356 363 <div slot="footer" class="dialog-footer">
... ... @@ -369,9 +376,9 @@
369 376  
370 377 <el-table :data="hisfromData" v-if="hisfromData != null">
371 378  
372   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
373   - <el-table-column label="审批人" align="center" prop="createName"/>
374   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  379 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  380 + <el-table-column label="处理人" align="center" prop="createName"/>
  381 + <el-table-column label="处理时间" align="center" prop="createTime"/>
375 382 </el-table>
376 383  
377 384 <div slot="footer" class="dialog-footer">
... ... @@ -406,18 +413,18 @@
406 413 <el-form-item label="阅览人:">
407 414 <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择" @select="handleSelect"/>
408 415 </el-form-item>
409   - </el-form>
410   - <div v-for="item in this.form.formData">
411   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
412   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
413   - </div>
414   -
415   -
416   - <el-table :data="hisfromData" v-if="hisfromData != null">
417   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
418   - <el-table-column label="审批人" align="center" prop="createName"/>
419   - <el-table-column label="审批时间" align="center" prop="createTime"/>
420   - </el-table>
  416 + </el-form>
  417 + <div v-for="item in this.form.formData">
  418 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  419 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  420 + </div>
  421 +
  422 +
  423 + <el-table :data="hisfromData" v-if="hisfromData != null">
  424 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  425 + <el-table-column label="处理人" align="center" prop="createName"/>
  426 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  427 + </el-table>
421 428  
422 429 <div slot="footer" class="dialog-footer">
423 430 <div slot="footer" class="dialog-footer">
... ... @@ -499,9 +506,9 @@
499 506 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)"
500 507 v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回
501 508 </el-button>
502   - <el-button type="primary"
503   -
504   - v-loading.fullscreen.lock="modalLoading"
  509 + <el-button type="primary"
  510 +
  511 + v-loading.fullscreen.lock="modalLoading"
505 512 @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
506 513 </div>
507 514 </el-dialog>
... ... @@ -554,9 +561,9 @@
554 561  
555 562 <el-table :data="hisfromData" v-if="hisfromData != null">
556 563  
557   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
558   - <el-table-column label="审批人" align="center" prop="createName"/>
559   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  564 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  565 + <el-table-column label="处理人" align="center" prop="createName"/>
  566 + <el-table-column label="处理时间" align="center" prop="createTime"/>
560 567 </el-table>
561 568  
562 569 <div slot="footer" class="dialog-footer">
... ... @@ -574,9 +581,9 @@
574 581  
575 582 <el-table :data="hisfromData" v-if="hisfromData != null">
576 583  
577   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
578   - <el-table-column label="审批人" align="center" prop="createName"/>
579   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  584 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  585 + <el-table-column label="处理人" align="center" prop="createName"/>
  586 + <el-table-column label="处理时间" align="center" prop="createTime"/>
580 587 </el-table>
581 588 <div slot="footer" class="dialog-footer">
582 589 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
... ... @@ -593,9 +600,9 @@
593 600  
594 601 <el-table :data="hisfromData" v-if="hisfromData != null">
595 602  
596   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
597   - <el-table-column label="审批人" align="center" prop="createName"/>
598   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  603 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  604 + <el-table-column label="处理人" align="center" prop="createName"/>
  605 + <el-table-column label="处理时间" align="center" prop="createTime"/>
599 606 </el-table>
600 607 <div slot="footer" class="dialog-footer">
601 608 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
... ... @@ -612,9 +619,9 @@
612 619  
613 620 <el-table :data="hisfromData" v-if="hisfromData != null">
614 621  
615   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
616   - <el-table-column label="审批人" align="center" prop="createName"/>
617   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  622 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  623 + <el-table-column label="处理人" align="center" prop="createName"/>
  624 + <el-table-column label="处理时间" align="center" prop="createTime"/>
618 625 </el-table>
619 626 <div slot="footer" class="dialog-footer">
620 627 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
... ... @@ -628,194 +635,194 @@
628 635 <style>
629 636 @import '../../../assets/css/task.css';
630 637 </style>
631   -
632   -<script>
633   - import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
634   - import {historyFromData} from '@/api/activiti/historyFormdata'
635   - import {addSign, getSignByObjId} from "@/api/sign/sign";
636   - import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
637   - import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
638   - import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
639   - import {getDict, getSupervision, getUsers} from "@/api/dict";
640   - import {activeThreestep} from "@/api/business/threestep";
641   - import {getToken} from "@/utils/auth";
642   - import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
643   - import {updateHandleAffairs} from "@/api/office/handle";
644   - import Treeselect from "@riophae/vue-treeselect";
645   - import '@riophae/vue-treeselect/dist/vue-treeselect.css'
646   - import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
647   - import threestepInfo from "@/views/business/threestep/threestepInfo";
648   - import taskCard from "@/views/activiti/task/taskCard";
649   - import conferenceInfo from "@/views/office/conference/conferenceInfo";
650   - import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
651   - import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
652   - import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
653   - import contractInfo from "@/views/activiti/task/contractInfo";
654   - import logisticsInfo from "@/views/office/logistics/logisticsInfo";
655   - import handleInfo from "@/views/office/handle/handleInfo";
656   - import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
657   - import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
658   - import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
659   - import supervisionInfo from "@/views/activiti/task/SupervisionInfo";
660   - import companyInfo from "@/views/activiti/task/companyInfo";
661   - import driverInfo from "@/views/activiti/task/driverInfo";
662   - import vehicleInfo from "@/views/activiti/task/vehicleInfo";
663   -
664   - import taskmethod from '@/api/taskmethod'
665   -
666   - export default {
667   - name: "task",
668   - mixins: [taskmethod],
669   - components: {
670   - taskCard,
671   - leaveHistoryForm,
672   - threestepInfo,
673   - conferenceInfo,
674   - leaveApplicationInfo,
675   - logisticsInfo,
676   - handleInfo,
677   - constructsiteInfo,
678   - Treeselect,
679   - earthsitesInfo,
680   - contractInfo,
681   - caseOfflineInfo,
682   - violationCaseFileInfo,
683   - violationWarningInformationInfo,
684   - supervisionInfo,
685   - companyInfo,
686   - driverInfo,
687   - vehicleInfo
688   - },
689   - data() {
690   - return {
691   - modalLoading:false,
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   - // 弹出层标题（用户导入）
742   - title: "",
743   - // 是否禁用上传
744   - isUploading: false,
745   - // 设置上传的请求头部
746   - headers: {
747   - Authorization: "Bearer " + getToken()
748   - },
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   - });
808   -
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   -
818   - },
819   - }
820   -
821   -</script>
  638 +
  639 +<script>
  640 + import {formDataSave, formDataShow, listTask,getNames} from "@/api/activiti/task";
  641 + import {historyFromData} from '@/api/activiti/historyFormdata'
  642 + import {addSign, getSignByObjId} from "@/api/sign/sign";
  643 + import {updateCaseOffline} from "@/api/caseOffline/caseOffline";
  644 + import {updateViolationCaseFileReader} from "@/api/casefile/violationCaseFile";
  645 + import {updateViolationCaseFileReader1} from "@/api/casefile/violationWarningInformation";
  646 + import {getDict, getSupervision, getUsers} from "@/api/dict";
  647 + import {activeThreestep} from "@/api/business/threestep";
  648 + import {getToken} from "@/utils/auth";
  649 + import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
  650 + import {updateHandleAffairs} from "@/api/office/handle";
  651 + import Treeselect from "@riophae/vue-treeselect";
  652 + import '@riophae/vue-treeselect/dist/vue-treeselect.css'
  653 + import leaveHistoryForm from "@/views/workflow/leaveHistoryForm";
  654 + import threestepInfo from "@/views/business/threestep/threestepInfo";
  655 + import taskCard from "@/views/activiti/task/taskCard";
  656 + import conferenceInfo from "@/views/office/conference/conferenceInfo";
  657 + import leaveApplicationInfo from "@/views/office/leaveApplication/leaveApplicationInfo";
  658 + import constructsiteInfo from "@/views/activiti/task/constructsiteInfo";
  659 + import earthsitesInfo from "@/views/activiti/task/earthsitesInfo";
  660 + import contractInfo from "@/views/activiti/task/contractInfo";
  661 + import logisticsInfo from "@/views/office/logistics/logisticsInfo";
  662 + import handleInfo from "@/views/office/handle/handleInfo";
  663 + import caseOfflineInfo from "@/views/caseOffline/caseOffline/caseOfflineInfo";
  664 + import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
  665 + import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
  666 + import supervisionInfo from "@/views/activiti/task/SupervisionInfo";
  667 + import companyInfo from "@/views/activiti/task/companyInfo";
  668 + import driverInfo from "@/views/activiti/task/driverInfo";
  669 + import vehicleInfo from "@/views/activiti/task/vehicleInfo";
  670 +
  671 + import taskmethod from '@/api/taskmethod'
  672 +
  673 + export default {
  674 + name: "task",
  675 + mixins: [taskmethod],
  676 + components: {
  677 + taskCard,
  678 + leaveHistoryForm,
  679 + threestepInfo,
  680 + conferenceInfo,
  681 + leaveApplicationInfo,
  682 + logisticsInfo,
  683 + handleInfo,
  684 + constructsiteInfo,
  685 + Treeselect,
  686 + earthsitesInfo,
  687 + contractInfo,
  688 + caseOfflineInfo,
  689 + violationCaseFileInfo,
  690 + violationWarningInformationInfo,
  691 + supervisionInfo,
  692 + companyInfo,
  693 + driverInfo,
  694 + vehicleInfo
  695 + },
  696 + data() {
  697 + return {
  698 + modalLoading:false,
  699 + id: '',
  700 + definitionKey: '',
  701 + businessKey: '',
  702 + // 遮罩层
  703 + loading: true,
  704 + // 选中数组
  705 + ids: [],
  706 + // 非单个禁用
  707 + single: true,
  708 + // 非多个禁用
  709 + multiple: true,
  710 + // 显示搜索条件
  711 + showSearch: true,
  712 + // 总条数
  713 + total: 0,
  714 + // 请假表格数据
  715 + taskList: [],
  716 + // 弹出层标题
  717 + title: "",
  718 + // 是否显示弹出层
  719 + picSample: false,
  720 + taskName: null,
  721 + // 查询参数
  722 + queryParams: {
  723 + name:null,
  724 + pageNum: 1,
  725 + pageSize: 10,
  726 + role: null,
  727 + dept: null,
  728 + },
  729 + // 表单参数
  730 + form: {
  731 + formData: []
  732 + },
  733 + needShow: false,
  734 + // 表单校验
  735 + rules: {
  736 + subReason: [{
  737 + required: true,
  738 + message: '请填写补充说明',
  739 + trigger: 'blur'
  740 + },],
  741 +
  742 + },
  743 + picIndex: 0,
  744 + fileList: [],
  745 + upload: {
  746 + // 是否显示弹出层（用户导入）
  747 + open: false,
  748 + // 弹出层标题（用户导入）
  749 + title: "",
  750 + // 是否禁用上传
  751 + isUploading: false,
  752 + // 设置上传的请求头部
  753 + headers: {
  754 + Authorization: "Bearer " + getToken()
  755 + },
  756 + // 上传的地址
  757 + url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
  758 + },
  759 + controlId: null,
  760 + users: [],
  761 + options: [],
  762 + usersName: [],
  763 + deptName: null,
  764 + supervisionData: null,
  765 + uploadImageDialog: false,
  766 + idInfo: null,
  767 + signData: null,
  768 + areas: [],
  769 + roles: [],
  770 + depts: [],
  771 + signDataInfo: null,
  772 + earthsites: false,
  773 + contract: false,
  774 + logisticsInfoOpen: false,
  775 + handleAffairsInfoOpen: false,
  776 + caseOffline: false,
  777 + violationCaseFile: false,
  778 + violationCaseFile1: false,
  779 + supervisionOpen: false,
  780 + open: false,
  781 + open2: false,
  782 + conferenceOpen: false,
  783 + construct: false,
  784 + leaveApplicationOpen: false,
  785 + prev:[],
  786 + userNodes: [],
  787 + company: false,
  788 + driver: false,
  789 + vehicle: false,
  790 + names: null,
  791 + hisfromData: [],
  792 + slides: [],
  793 + slidesArys: [],
  794 + slides1: [],
  795 + videoSrc1: [],
  796 + };
  797 + },
  798 + created() {
  799 + let dep = {type: "CSUserDepartmentType"};
  800 +
  801 + getDict(dep).then(res => {
  802 + this.depts = res.result;
  803 + for(let i in res.result){
  804 + if(res.result[i].name.indexOf("渣土办") < 1){
  805 + this.prev.push(res.result[i]);
  806 + }
  807 + }
  808 + });
  809 +
  810 + let role = {type: "CSUserPostType"};
  811 +
  812 + getDict(role).then(res => {
  813 + this.roles = res.result;
  814 + });
  815 +
  816 + listTask(this.queryParams).then(response => {
  817 + this.taskList = response.rows;
  818 + this.names = response.names;
  819 + this.total = response.total;
  820 + this.loading = false;
  821 + });
  822 + },
  823 + methods: {
  824 +
  825 + },
  826 + }
  827 +
  828 +</script>
... ...
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @2c9117a
1 1 <template>
2   - <div class="app-container">
3   -
4   - <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
5   - <el-option v-for="item in names" :label="item" :value="item">
6   - </el-option>
7   - </el-select> -->
8   -
9   - <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
  2 + <div class="app-container">
  3 +
  4 + <!-- <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
  5 + <el-option v-for="item in names" :label="item" :value="item">
  6 + </el-option>
  7 + </el-select> -->
  8 +
  9 + <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
10 10 <!--
11 11 <el-select v-model="queryParams.name" filterable reserve-keyword :filter-method="remoteName" placeholder="名称">
12 12 <el-option v-for="item in names" :label="item" :value="item">
... ... @@ -29,11 +29,11 @@
29 29 <el-option label="会议事务" value="conference"/>
30 30 <el-option label="假勤管理" value="workflow_leave"/>
31 31 <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
32   - </el-select>
33   -
34   - <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
  32 + </el-select>
  33 +
  34 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
35 35 <el-button size="mini" @click="resetQuery">重置</el-button>
36   -
  36 +
37 37  
38 38 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
39 39  
... ... @@ -49,21 +49,21 @@
49 49 </div>
50 50 </el-dialog>
51 51 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
52   - <threestepInfo :businessKey="businessKey" v-if="open2"/>
53   - <el-table :data="hisfromData" v-if="hisfromData != null">
54   -
55   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
56   - <el-table-column label="审批人" align="center" prop="createName"/>
57   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  52 + <threestepInfo :businessKey="businessKey" v-if="open2"/>
  53 + <el-table :data="hisfromData" v-if="hisfromData != null">
  54 +
  55 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  56 + <el-table-column label="处理人" align="center" prop="createName"/>
  57 + <el-table-column label="处理时间" align="center" prop="createTime"/>
58 58 </el-table>
59 59 </el-dialog>
60 60  
61   - <el-dialog :title="title" :visible.sync="construct" width="1500px" append-to-body>
62   - <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
63   - <el-table :data="hisfromData" v-if="hisfromData != null">
64   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
65   - <el-table-column label="审批人" align="center" prop="createName"/>
66   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  61 + <el-dialog :title="title" :visible.sync="construct" width="1500px" append-to-body>
  62 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
  63 + <el-table :data="hisfromData" v-if="hisfromData != null">
  64 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  65 + <el-table-column label="处理人" align="center" prop="createName"/>
  66 + <el-table-column label="处理时间" align="center" prop="createTime"/>
67 67 </el-table>
68 68 </el-dialog>
69 69 <!-- 会议管理 -->
... ... @@ -78,21 +78,21 @@
78 78  
79 79  
80 80 <el-dialog :title="title" :visible.sync="earthsites" width="1500px" append-to-body>
81   - <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
82   - <el-table :data="hisfromData" v-if="hisfromData != null">
83   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
84   - <el-table-column label="审批人" align="center" prop="createName"/>
85   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  81 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
  82 + <el-table :data="hisfromData" v-if="hisfromData != null">
  83 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  84 + <el-table-column label="处理人" align="center" prop="createName"/>
  85 + <el-table-column label="处理时间" align="center" prop="createTime"/>
86 86 </el-table>
87 87 </el-dialog>
88 88  
89 89 <el-dialog :title="title" :visible.sync="contract" width="1500px" append-to-body>
90   - <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
91   - <el-table :data="hisfromData" v-if="hisfromData != null">
92   -
93   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
94   - <el-table-column label="审批人" align="center" prop="createName"/>
95   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  90 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
  91 + <el-table :data="hisfromData" v-if="hisfromData != null">
  92 +
  93 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  94 + <el-table-column label="处理人" align="center" prop="createName"/>
  95 + <el-table-column label="处理时间" align="center" prop="createTime"/>
96 96 </el-table>
97 97 </el-dialog>
98 98  
... ... @@ -129,42 +129,42 @@
129 129  
130 130 <el-dialog :title="title" :visible.sync="supervisionOpen" width="700px" append-to-body
131 131 :close-on-click-modal="false">
132   - <supervisionInfo :infoData="supervisionData"/>
133   - <el-table :data="hisfromData" v-if="hisfromData != null">
134   -
135   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
136   - <el-table-column label="审批人" align="center" prop="createName"/>
137   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  132 + <supervisionInfo :infoData="supervisionData"/>
  133 + <el-table :data="hisfromData" v-if="hisfromData != null">
  134 +
  135 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  136 + <el-table-column label="处理人" align="center" prop="createName"/>
  137 + <el-table-column label="处理时间" align="center" prop="createTime"/>
138 138 </el-table>
139 139 </el-dialog>
140 140  
141 141 <el-dialog :title="title" :visible.sync="company" width="1500px" append-to-body :close-on-click-modal="false">
142   - <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
143   - <el-table :data="hisfromData" v-if="hisfromData != null">
144   -
145   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
146   - <el-table-column label="审批人" align="center" prop="createName"/>
147   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  142 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
  143 + <el-table :data="hisfromData" v-if="hisfromData != null">
  144 +
  145 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  146 + <el-table-column label="处理人" align="center" prop="createName"/>
  147 + <el-table-column label="处理时间" align="center" prop="createTime"/>
148 148 </el-table>
149 149 </el-dialog>
150 150  
151 151 <el-dialog :title="title" :visible.sync="vehicle" width="850px" append-to-body :close-on-click-modal="false">
152   - <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
153   - <el-table :data="hisfromData" v-if="hisfromData != null">
154   -
155   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
156   - <el-table-column label="审批人" align="center" prop="createName"/>
157   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  152 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
  153 + <el-table :data="hisfromData" v-if="hisfromData != null">
  154 +
  155 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  156 + <el-table-column label="处理人" align="center" prop="createName"/>
  157 + <el-table-column label="处理时间" align="center" prop="createTime"/>
158 158 </el-table>
159 159 </el-dialog>
160 160  
161 161 <el-dialog :title="title" :visible.sync="driver" width="850px" append-to-body :close-on-click-modal="false">
162   - <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
163   - <el-table :data="hisfromData" v-if="hisfromData != null">
164   -
165   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
166   - <el-table-column label="审批人" align="center" prop="createName"/>
167   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  162 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
  163 + <el-table :data="hisfromData" v-if="hisfromData != null">
  164 +
  165 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  166 + <el-table-column label="处理人" align="center" prop="createName"/>
  167 + <el-table-column label="处理时间" align="center" prop="createTime"/>
168 168 </el-table>
169 169 </el-dialog>
170 170 </div>
... ... @@ -176,7 +176,7 @@ import {
176 176 listEndTask,
177 177 listTask,
178 178 formDataShow
179   -} from "@/api/activiti/taskhistory";
  179 +} from "@/api/activiti/taskhistory";
180 180  
181 181 import {historyFromData} from '@/api/activiti/historyFormdata'
182 182  
... ... @@ -199,9 +199,9 @@ import supervisionInfo from &quot;../task/SupervisionInfo&quot;;
199 199 import companyInfo from "@/views/activiti/task/companyInfo";
200 200 import driverInfo from "@/views/activiti/task/driverInfo";
201 201 import vehicleInfo from "@/views/activiti/task/vehicleInfo";
202   -
203   -import taskhismethod from '@/api/taskhismethod'
204   -
  202 +
  203 +import taskhismethod from '@/api/taskhismethod'
  204 +
205 205  
206 206 import {
207 207 getArea,
... ... @@ -212,7 +212,7 @@ import {
212 212  
213 213  
214 214 export default {
215   - name: "taskHistory",
  215 + name: "taskHistory",
216 216 mixins: [taskhismethod],
217 217 props: {
218 218 type: {
... ... @@ -292,12 +292,12 @@ export default {
292 292 depts: [],
293 293 company:false,
294 294 driver:false,
295   - vehicle:false,
296   - names:null,
  295 + vehicle:false,
  296 + names:null,
297 297 hisfromData: [],
298 298 };
299 299 },
300   - created() {
  300 + created() {
301 301 debugger;
302 302 let dep = {type: "CSUserDepartmentType"};
303 303  
... ... @@ -312,7 +312,7 @@ export default {
312 312 });
313 313 this.getList();
314 314 },
315   - methods: {
  315 + methods: {
316 316  
317 317 }
318 318 };
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @2c9117a
... ... @@ -28,14 +28,22 @@
28 28 </el-select>
29 29 </el-form-item>
30 30  
31   - <el-form-item label="开始时间" prop="workStartTime" v-if="this.queryParams.status==1">
32   - <el-date-picker size="small" style="width: 200px" v-model="queryParams.workStartTime" type="datetime"
  31 + <el-form-item label="报工状态" prop="status" v-if="this.queryParams.his!=1">
  32 + <el-select v-model="queryParams.status" placeholder="请选择所属区域 " size="small">
  33 + <el-option label="审核中" value="0" />
  34 + <el-option label="已通过" value="1" />
  35 + <el-option label="已驳回" value="2" />
  36 + </el-select>
  37 + </el-form-item>
  38 +
  39 + <el-form-item label="开始时间" prop="workStartTime" v-if="this.queryParams.his==1">
  40 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.workStartTime" type="datetime"
33 41 format="yyyy-MM-dd HH:mm:ss"
34 42 value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间">
35 43 </el-date-picker>
36 44 </el-form-item>
37   - <el-form-item label="结束时间" prop="workEndTime" v-if="this.queryParams.status==1">
38   - <el-date-picker size="small" style="width: 200px" v-model="queryParams.workEndTime" type="datetime"
  45 + <el-form-item label="结束时间" prop="workEndTime" v-if="this.queryParams.his==1">
  46 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.workEndTime" type="datetime"
39 47 format="yyyy-MM-dd HH:mm:ss"
40 48 value-format="yyyy-MM-dd HH:mm:ss" placeholder="开始时间">
41 49 </el-date-picker>
... ... @@ -174,8 +182,27 @@
174 182 上传附件:<a style="color:blue;font-size: 12px;" @click="picSample=true">示意图</a>
175 183 </el-col>
176 184 </el-row>
177   - <el-row type="flex" justify="center" style="margin-top: 20px;" v-if="form.type != null">
178   - <el-col :span="6">
  185 + <el-row type="flex" justify="center" style="margin-top: 20px;" v-if="form.type != null">
  186 + <el-col :span="6">
  187 + <span style="color: red;">*</span>
  188 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">洗车平台照片</a>
  189 + <br/>
  190 + <el-image v-for="item in slides[1]"
  191 + style="width: 100px; height: 100px; margin: 5px;"
  192 + :src="item.url"
  193 + :preview-src-list="[item.url]"
  194 + :z-index="2000">
  195 + </el-image>
  196 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  197 + v-for="item in videos[1]" >
  198 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  199 + </div>
  200 +
  201 + <el-input v-model="form.img1" type="hidden"></el-input>
  202 + <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
  203 + </el-col>
  204 + <el-col :span="6">
  205 + <span style="color: red;">*</span>
179 206 <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">过水槽照片</a><br/>
180 207 <el-image v-for="item in slides[0]"
181 208 style="width: 100px; height: 100px; margin: 5px;"
... ... @@ -192,23 +219,6 @@
192 219 </el-col>
193 220 <el-col :span="6">
194 221 <span style="color: red;">*</span>
195   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">洗车平台照片</a>
196   - <br/>
197   - <el-image v-for="item in slides[1]"
198   - style="width: 100px; height: 100px; margin: 5px;"
199   - :src="item.url"
200   - :preview-src-list="[item.url]"
201   - :z-index="2000">
202   - </el-image>
203   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
204   - v-for="item in videos[1]" >
205   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
206   - </div>
207   -
208   - <el-input v-model="form.img1" type="hidden"></el-input>
209   - <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
210   - </el-col>
211   - <el-col :span="6">
212 222 <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">出入口照片</a>
213 223 <br/>
214 224 <el-image v-for="item in slides[2]"
... ... @@ -224,7 +234,8 @@
224 234 <el-input v-model="form.img2" type="hidden"></el-input>
225 235 <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
226 236 </el-col>
227   - <el-col :span="6">
  237 + <el-col :span="6">
  238 + <span style="color: red;">*</span>
228 239 <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">沉淀池照片</a>
229 240 <br/>
230 241 <el-image v-for="item in slides[3]"
... ... @@ -242,7 +253,8 @@
242 253 </el-col>
243 254 </el-row>
244 255 <el-row type="flex" justify="center" v-if="form.type != null">
245   - <el-col :span="6">
  256 + <el-col :span="6">
  257 + <span style="color: red;">*</span>
246 258 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">硬质路面照片</a>
247 259 <br/>
248 260 <el-image v-for="item in slides[4]"
... ... @@ -258,7 +270,8 @@
258 270 <el-input v-model="form.img4" type="hidden"></el-input>
259 271 <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
260 272 </el-col>
261   - <el-col :span="6">
  273 + <el-col :span="6">
  274 + <span style="color: red;">*</span>
262 275 <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}}</a>
263 276 <br/>
264 277 <el-image v-for="item in slides[5]"
... ... @@ -274,7 +287,8 @@
274 287 <el-input v-model="form.img5" type="hidden"></el-input>
275 288 <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
276 289 </el-col>
277   - <el-col :span="6">
  290 + <el-col :span="6">
  291 + <span style="color: red;" v-if="form.type == 0">*</span>
278 292 <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">{{form.type==0?"摄像头视频截图2":"雾炮机"}}</a>
279 293 <br/>
280 294 <el-image v-for="item in slides[6]"
... ... @@ -285,12 +299,14 @@
285 299 </el-image>
286 300 <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
287 301 v-for="item in videos[6]" >
  302 + <span style="color: red;">*</span>
288 303 <video width="100%" controls="controls" height="100%" :src="item.url"></video>
289 304 </div>
290 305 <el-input v-model="form.img6" type="hidden"></el-input>
291 306 <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
292 307 </el-col>
293   - <el-col :span="6">
  308 + <el-col :span="6">
  309 + <span style="color: red;" >*</span>
294 310 <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}}</a>
295 311 <br/>
296 312 <el-image v-for="item in slides[7]"
... ...
trash-ui/src/views/caseOffline/caseOffline/caseOfflineInfo.vue
  View file @2c9117a
... ... @@ -28,7 +28,7 @@
28 28 <el-form-item label="位置描述" prop="locationDec">
29 29 <el-input v-model="form.locationDec" type="textarea" maxlength="100" :rows="3" disabled/>
30 30 </el-form-item>
31   - <el-form-item label="审批意见" prop="advice1">
  31 + <el-form-item label="处理意见" prop="advice1">
32 32 <el-input v-model="form.advice1" type="textarea" :rows="3" disabled/>
33 33 </el-form-item>
34 34  
... ...
trash-ui/src/views/h5/caseOffline/caseOfflineInfo.vue
  View file @2c9117a
... ... @@ -27,7 +27,7 @@
27 27 <el-form-item label="位置描述" prop="locationDec">
28 28 <el-input v-model="form.locationDec" type="textarea" maxlength="100" :rows="3" disabled/>
29 29 </el-form-item>
30   - <el-form-item label="审批意见" prop="advice1">
  30 + <el-form-item label="处理意见" prop="advice1">
31 31 <el-input v-model="form.advice1" type="textarea" :rows="3" disabled/>
32 32 </el-form-item>
33 33  
... ...
trash-ui/src/views/h5/task/index.vue
  View file @2c9117a
1 1 <template>
2 2 <div class="app-container">
3   - <el-select v-model="queryParams.dept" filterable reserve-keyword >
4   - <el-option v-for="item in depts" :label="item.name"
5   - :value="item.code" :key="item.code">
6   - </el-option>
7   - </el-select>
8   - <el-select v-model="queryParams.role" filterable reserve-keyword >
9   - <el-option v-for="item in roles" :label="item.name"
10   - :value="item.code" :key="item.code">
11   - </el-option>
  3 + <el-select v-model="queryParams.dept" filterable reserve-keyword >
  4 + <el-option v-for="item in depts" :label="item.name"
  5 + :value="item.code" :key="item.code">
  6 + </el-option>
12 7 </el-select>
13   -
  8 + <el-select v-model="queryParams.role" filterable reserve-keyword >
  9 + <el-option v-for="item in roles" :label="item.name"
  10 + :value="item.code" :key="item.code">
  11 + </el-option>
  12 + </el-select>
  13 +
14 14 <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
15 15  
16 16 <el-select v-model="queryParams.prev" filterable reserve-keyword placeholder="上一节点">
... ... @@ -32,10 +32,10 @@
32 32 <el-option label="后勤管理" value="logistics"/>
33 33 <el-option label="会议事务" value="conference"/>
34 34 <el-option label="假勤管理" value="workflow_leave"/>
35   - <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
36   - </el-select>
37   -
38   - <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
  35 + <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc,supervision_casefile,supervision_contract,workflow_supervision"/>
  36 + </el-select>
  37 +
  38 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
39 39 <el-button size="mini" @click="resetQuery">重置</el-button>
40 40  
41 41 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
... ... @@ -76,33 +76,35 @@
76 76 </el-col>
77 77 </el-row>
78 78 <el-row el-row style="margin-top: 20px;">
79   - <el-col :span="12">
80   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
81   - <el-image v-for="item in slides[0]"
82   - style="width: 100px; height: 100px; margin: 5px;"
83   - :src="item.url"
84   - :preview-src-list="[item.url]"
85   - :z-index="2000">
86   - </el-image>
87   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
88   - v-for="item in videos[0]">
89   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  79 + <el-col :span="12">
  80 + <span style="color: red;" >*</span>
  81 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
  82 + <el-image v-for="item in slides[0]"
  83 + style="width: 100px; height: 100px; margin: 5px;"
  84 + :src="item.url"
  85 + :preview-src-list="[item.url]"
  86 + :z-index="2000">
  87 + </el-image>
  88 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  89 + v-for="item in videos[0]">
  90 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
90 91 </div>
91 92 <el-input v-model="form.sub_img0" type="hidden"></el-input>
92 93 <p v-for="img in form.sub_img0">{{img.split(":")[0]}}<a @click="removeImage(0,img)" style="color:red"> x</a>
93 94 </p>
94 95 </el-col>
95   - <el-col :span="12">
96   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
97   - <el-image v-for="item in slides[1]"
98   - style="width: 100px; height: 100px; margin: 5px;"
99   - :src="item.url"
100   - :preview-src-list="[item.url]"
101   - :z-index="2000">
102   - </el-image>
103   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
104   - v-for="item in videos[1]">
105   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  96 + <el-col :span="12">
  97 + <span style="color: red;" >*</span>
  98 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
  99 + <el-image v-for="item in slides[1]"
  100 + style="width: 100px; height: 100px; margin: 5px;"
  101 + :src="item.url"
  102 + :preview-src-list="[item.url]"
  103 + :z-index="2000">
  104 + </el-image>
  105 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  106 + v-for="item in videos[1]">
  107 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
106 108 </div>
107 109 <el-input v-model="form.sub_img1" type="hidden"></el-input>
108 110 <p v-for="img in form.sub_img1">{{img.split(":")[0]}}<a @click="removeImage(1,img)" style="color:red"> x</a>
... ... @@ -111,32 +113,33 @@
111 113 </el-row>
112 114 <el-row>
113 115 <el-col :span="12">
114   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
115   - <el-image v-for="item in slides[2]"
116   - style="width: 100px; height: 100px; margin: 5px;"
117   - :src="item.url"
118   - :preview-src-list="[item.url]"
119   - :z-index="2000">
120   - </el-image>
121   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
122   - v-for="item in videos[2]">
123   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  116 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
  117 + <el-image v-for="item in slides[2]"
  118 + style="width: 100px; height: 100px; margin: 5px;"
  119 + :src="item.url"
  120 + :preview-src-list="[item.url]"
  121 + :z-index="2000">
  122 + </el-image>
  123 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  124 + v-for="item in videos[2]">
  125 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
124 126 </div>
125 127 <el-input v-model="form.sub_img2" type="hidden"></el-input>
126 128 <p v-for="img in form.sub_img2">{{img.split(":")[0]}}<a @click="removeImage(2,img)" style="color:red"> x</a>
127 129 </p>
128 130 </el-col>
129   - <el-col :span="12">
130   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
131   - <el-image v-for="item in slides[3]"
132   - style="width: 100px; height: 100px; margin: 5px;"
133   - :src="item.url"
134   - :preview-src-list="[item.url]"
135   - :z-index="2000">
136   - </el-image>
137   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
138   - v-for="item in videos[3]">
139   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  131 + <el-col :span="12">
  132 + <span style="color: red;" >*</span>
  133 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
  134 + <el-image v-for="item in slides[3]"
  135 + style="width: 100px; height: 100px; margin: 5px;"
  136 + :src="item.url"
  137 + :preview-src-list="[item.url]"
  138 + :z-index="2000">
  139 + </el-image>
  140 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  141 + v-for="item in videos[3]">
  142 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
140 143 </div>
141 144 <el-input v-model="form.sub_img3" type="hidden"></el-input>
142 145 <p v-for="img in form.sub_img3">{{img.split(":")[0]}}<a @click="removeImage(3,img)" style="color:red"> x</a>
... ... @@ -144,69 +147,73 @@
144 147 </el-col>
145 148 </el-row>
146 149 <el-row>
147   - <el-col :span="12">
  150 + <el-col :span="12">
  151 + <span style="color: red;" >*</span>
148 152 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
149   - <el-input v-model="form.sub_img4" type="hidden"></el-input>
150   - <el-image v-for="item in slides[4]"
151   - style="width: 100px; height: 100px; margin: 5px;"
152   - :src="item.url"
153   - :preview-src-list="[item.url]"
154   - :z-index="2000">
155   - </el-image>
156   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
157   - v-for="item in videos[4]">
158   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  153 + <el-input v-model="form.sub_img4" type="hidden"></el-input>
  154 + <el-image v-for="item in slides[4]"
  155 + style="width: 100px; height: 100px; margin: 5px;"
  156 + :src="item.url"
  157 + :preview-src-list="[item.url]"
  158 + :z-index="2000">
  159 + </el-image>
  160 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  161 + v-for="item in videos[4]">
  162 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
159 163 </div>
160 164 <p v-for="img in form.sub_img4">{{img.split(":")[0]}}<a @click="removeImage(4,img)" style="color:red"> x</a>
161 165 </p>
162 166 </el-col>
163 167  
164   - <el-col :span="12">
165   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a>
166   - <el-input v-model="form.sub_img5" type="hidden"></el-input>
167   - <el-image v-for="item in slides[5]"
168   - style="width: 100px; height: 100px; margin: 5px;"
169   - :src="item.url"
170   - :preview-src-list="[item.url]"
171   - :z-index="2000">
172   - </el-image>
173   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
174   - v-for="item in videos[5]">
175   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  168 + <el-col :span="12">
  169 + <span style="color: red;" >*</span>
  170 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">{{ form.type == 0 ? "摄像头视频截图1" : "洗车设施照片" }}</a>
  171 + <el-input v-model="form.sub_img5" type="hidden"></el-input>
  172 + <el-image v-for="item in slides[5]"
  173 + style="width: 100px; height: 100px; margin: 5px;"
  174 + :src="item.url"
  175 + :preview-src-list="[item.url]"
  176 + :z-index="2000">
  177 + </el-image>
  178 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  179 + v-for="item in videos[5]">
  180 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
176 181 </div>
177 182 <p v-for="img in form.sub_img5">{{img.split(":")[0]}}<a @click="removeImage(5,img)" style="color:red"> x</a>
178 183 </p>
179 184 </el-col>
180 185 </el-row>
181 186 <el-row>
182   - <el-col :span="12">
183   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a>
184   - <el-input v-model="form.sub_img6" type="hidden"></el-input>
185   - <el-image v-for="item in slides[6]"
186   - style="width: 100px; height: 100px; margin: 5px;"
187   - :src="item.url"
188   - :preview-src-list="[item.url]"
189   - :z-index="2000">
190   - </el-image>
191   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
192   - v-for="item in videos[6]">
193   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  187 + <el-col :span="12">
  188 + <span style="color: red;" v-if="form.type == 0">*</span>
  189 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">{{ form.type == 0 ? "摄像头视频截图2" : "雾炮机" }}</a>
  190 + <el-input v-model="form.sub_img6" type="hidden"></el-input>
  191 + <el-image v-for="item in slides[6]"
  192 + style="width: 100px; height: 100px; margin: 5px;"
  193 + :src="item.url"
  194 + :preview-src-list="[item.url]"
  195 + :z-index="2000">
  196 + </el-image>
  197 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  198 + v-for="item in videos[6]">
  199 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
194 200 </div>
195 201 <p v-for="img in form.sub_img6">{{img.split(":")[0]}}<a @click="removeImage(6,img)" style="color:red"> x</a>
196 202 </p>
197 203 </el-col>
198   - <el-col :span="12">
199   - <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a>
200   - <el-input v-model="form.sub_img7" type="hidden"></el-input>
201   - <el-image v-for="item in slides[7]"
202   - style="width: 100px; height: 100px; margin: 5px;"
203   - :src="item.url"
204   - :preview-src-list="[item.url]"
205   - :z-index="2000">
206   - </el-image>
207   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
208   - v-for="item in videos[7]">
209   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  204 + <el-col :span="12">
  205 + <span style="color: red;" >*</span>
  206 + <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">{{ form.type == 0 ? "摄像头视频截图3" : "裸露黄土覆盖照片" }}</a>
  207 + <el-input v-model="form.sub_img7" type="hidden"></el-input>
  208 + <el-image v-for="item in slides[7]"
  209 + style="width: 100px; height: 100px; margin: 5px;"
  210 + :src="item.url"
  211 + :preview-src-list="[item.url]"
  212 + :z-index="2000">
  213 + </el-image>
  214 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  215 + v-for="item in videos[7]">
  216 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
210 217 </div>
211 218 <p v-for="img in form.sub_img7">{{img.split(":")[0]}}<a @click="removeImage(7,img)" style="color:red"> x</a>
212 219 </p>
... ... @@ -215,16 +222,16 @@
215 222 <el-row>
216 223 <el-col :span="12">
217 224 <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
218   - <el-input v-model="form.sub_img8" type="hidden"></el-input>
219   - <el-image v-for="item in slides[8]"
220   - style="width: 100px; height: 100px; margin: 5px;"
221   - :src="item.url"
222   - :preview-src-list="[item.url]"
223   - :z-index="2000">
224   - </el-image>
225   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
226   - v-for="item in videos[8]">
227   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  225 + <el-input v-model="form.sub_img8" type="hidden"></el-input>
  226 + <el-image v-for="item in slides[8]"
  227 + style="width: 100px; height: 100px; margin: 5px;"
  228 + :src="item.url"
  229 + :preview-src-list="[item.url]"
  230 + :z-index="2000">
  231 + </el-image>
  232 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  233 + v-for="item in videos[8]">
  234 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
228 235 </div>
229 236 <p v-for="img in form.sub_img8">{{img.split(":")[0]}}<a @click="removeImage(8,img)" style="color:red"> x</a>
230 237 </p>
... ... @@ -232,16 +239,16 @@
232 239  
233 240 <el-col :span="12">
234 241 <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
235   - <el-input v-model="form.sub_img9" type="hidden"></el-input>
236   - <el-image v-for="item in slides[9]"
237   - style="width: 100px; height: 100px; margin: 5px;"
238   - :src="item.url"
239   - :preview-src-list="[item.url]"
240   - :z-index="2000">
241   - </el-image>
242   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
243   - v-for="item in videos[9]">
244   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  242 + <el-input v-model="form.sub_img9" type="hidden"></el-input>
  243 + <el-image v-for="item in slides[9]"
  244 + style="width: 100px; height: 100px; margin: 5px;"
  245 + :src="item.url"
  246 + :preview-src-list="[item.url]"
  247 + :z-index="2000">
  248 + </el-image>
  249 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  250 + v-for="item in videos[9]">
  251 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
245 252 </div>
246 253 <p v-for="img in form.sub_img9">{{img.split(":")[0]}}<a @click="removeImage(9,img)" style="color:red"> x</a>
247 254 </p>
... ... @@ -250,16 +257,16 @@
250 257 <el-row>
251 258 <el-col :span="12">
252 259 <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
253   - <el-input v-model="form.sub_img10" type="hidden"></el-input>
254   - <el-image v-for="item in slides[10]"
255   - style="width: 100px; height: 100px; margin: 5px;"
256   - :src="item.url"
257   - :preview-src-list="[item.url]"
258   - :z-index="2000">
259   - </el-image>
260   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
261   - v-for="item in videos[10]">
262   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  260 + <el-input v-model="form.sub_img10" type="hidden"></el-input>
  261 + <el-image v-for="item in slides[10]"
  262 + style="width: 100px; height: 100px; margin: 5px;"
  263 + :src="item.url"
  264 + :preview-src-list="[item.url]"
  265 + :z-index="2000">
  266 + </el-image>
  267 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  268 + v-for="item in videos[10]">
  269 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
263 270 </div>
264 271 <p v-for="img in form.sub_img10">{{img.split(":")[0]}}<a @click="removeImage(10,img)" style="color:red">
265 272 x</a>
... ... @@ -267,16 +274,16 @@
267 274 </el-col>
268 275 <el-col :span="12">
269 276 <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
270   - <el-input v-model="form.sub_img11" type="hidden"></el-input>
271   - <el-image v-for="item in slides[11]"
272   - style="width: 100px; height: 100px; margin: 5px;"
273   - :src="item.url"
274   - :preview-src-list="[item.url]"
275   - :z-index="2000">
276   - </el-image>
277   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
278   - v-for="item in videos[11]">
279   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  277 + <el-input v-model="form.sub_img11" type="hidden"></el-input>
  278 + <el-image v-for="item in slides[11]"
  279 + style="width: 100px; height: 100px; margin: 5px;"
  280 + :src="item.url"
  281 + :preview-src-list="[item.url]"
  282 + :z-index="2000">
  283 + </el-image>
  284 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  285 + v-for="item in videos[11]">
  286 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
280 287 </div>
281 288 <p v-for="img in form.sub_img11">{{img.split(":")[0]}}<a @click="removeImage(11,img)" style="color:red">
282 289 x</a>
... ... @@ -285,16 +292,16 @@
285 292 </el-row>
286 293 <el-col :span="12">
287 294 <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
288   - <el-input v-model="form.sub_img12" type="hidden"></el-input>
289   - <el-image v-for="item in slides[12]"
290   - style="width: 100px; height: 100px; margin: 5px;"
291   - :src="item.url"
292   - :preview-src-list="[item.url]"
293   - :z-index="2000">
294   - </el-image>
295   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
296   - v-for="item in videos[12]">
297   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  295 + <el-input v-model="form.sub_img12" type="hidden"></el-input>
  296 + <el-image v-for="item in slides[12]"
  297 + style="width: 100px; height: 100px; margin: 5px;"
  298 + :src="item.url"
  299 + :preview-src-list="[item.url]"
  300 + :z-index="2000">
  301 + </el-image>
  302 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  303 + v-for="item in videos[12]">
  304 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
298 305 </div>
299 306 <p v-for="img in form.sub_img12">{{img.split(":")[0]}}<a @click="removeImage(12,img)" style="color:red">
300 307 x</a>
... ... @@ -349,16 +356,16 @@
349 356  
350 357  
351 358 <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
352   - <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
353   - <div v-for="item in this.form.formData">
354   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
355   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
356   - </div>
357   -
358   - <el-table :data="hisfromData" v-if="hisfromData != null">
359   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
360   - <el-table-column label="审批人" align="center" prop="createName"/>
361   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  359 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
  360 + <div v-for="item in this.form.formData">
  361 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  362 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  363 + </div>
  364 +
  365 + <el-table :data="hisfromData" v-if="hisfromData != null">
  366 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  367 + <el-table-column label="处理人" align="center" prop="createName"/>
  368 + <el-table-column label="处理时间" align="center" prop="createTime"/>
362 369 </el-table>
363 370 <div slot="footer" class="dialog-footer">
364 371 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
... ... @@ -368,17 +375,17 @@
368 375  
369 376  
370 377 <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
371   - <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
372   - <div v-for="item in this.form.formData">
373   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
374   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
375   - </div>
376   -
377   - <el-table :data="hisfromData" v-if="hisfromData != null">
378   -
379   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
380   - <el-table-column label="审批人" align="center" prop="createName"/>
381   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  378 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
  379 + <div v-for="item in this.form.formData">
  380 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  381 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  382 + </div>
  383 +
  384 + <el-table :data="hisfromData" v-if="hisfromData != null">
  385 +
  386 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  387 + <el-table-column label="处理人" align="center" prop="createName"/>
  388 + <el-table-column label="处理时间" align="center" prop="createTime"/>
382 389 </el-table>
383 390 <div slot="footer" class="dialog-footer">
384 391 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
... ... @@ -387,98 +394,98 @@
387 394 </el-dialog>
388 395  
389 396 <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
390   - <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
391   -
392   - <div v-for="item in this.form.formData">
393   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
394   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
395   - </div>
396   -
397   - <el-table :data="hisfromData" v-if="hisfromData != null">
398   -
399   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
400   - <el-table-column label="审批人" align="center" prop="createName"/>
401   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  397 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
  398 +
  399 + <div v-for="item in this.form.formData">
  400 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  401 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  402 + </div>
  403 +
  404 + <el-table :data="hisfromData" v-if="hisfromData != null">
  405 +
  406 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  407 + <el-table-column label="处理人" align="center" prop="createName"/>
  408 + <el-table-column label="处理时间" align="center" prop="createTime"/>
402 409 </el-table>
403 410 <div slot="footer" class="dialog-footer">
404 411 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
405 412 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
406 413 </div>
407 414 </el-dialog>
408   -
409   -
410   -
411   - <!-- 后勤管理 -->
412   - <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="300px" append-to-body
413   - :close-on-click-modal="false">
414   - <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
415   - <div slot="footer" class="dialog-footer">
416   - <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
417   - <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
418   - </div>
419   - </el-dialog>
420   -
421   - <!-- 办文办事 -->
422   - <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="300px" append-to-body
423   - :close-on-click-modal="false">
424   - <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen"
425   - :businessKey="definitionKey"
426   - :controlId="controlId"/>
427   - <el-form label-width="110px" v-if="definitionKey=='yuelan'">
428   - <el-form-item label="阅览部门:">
429   - <el-select ref="formDeptNameRef" v-model="deptName" placeholder="请选择部门" style="width: 100% "
430   - @change="changeDepts">
431   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
432   - </el-select>
433   - </el-form-item>
434   - <el-form-item label="阅览人:">
435   - <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择"/>
436   - </el-form-item>
437   - </el-form>
438   - <div slot="footer" class="dialog-footer">
439   - <div slot="footer" class="dialog-footer">
440   - <el-button type="danger" @click="handleAffairsSubmitForm(1)"
441   - v-if="controlId!='FormProperty_11p96vq' && controlId!='FormProperty_0d6ngk1' && definitionKey!='yuelanxuexi' && definitionKey!='yuelan'">驳回
442   - </el-button>
443   - <el-button type="primary" @click="handleAffairsSubmitForm(0)">通过</el-button>
444   - </div>
445   - </div>
446   - </el-dialog>
447   -
448   - <!-- 线下案卷交办 -->
449   - <el-dialog :title="title" :visible.sync="caseOffline" width="300px" append-to-body :close-on-click-modal="false">
450   - <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
451   - <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
452   - </el-input>
453   - <el-upload multiple :headers="upload.headers" :action="upload.url"
454   - accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
455   - :show-file-list="false"
456   - :on-success="uploadSuccess1" :before-upload="beforeUpload">
457   - <el-button size="small" type="primary">选择附件</el-button>
458   - <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
459   - </el-upload>
460   - <el-image v-for="item in slides1"
461   - style="width: 150px; height: 100px; margin: 5px;"
462   - :src="item.url"
463   - :preview-src-list="[item.url]"
464   - :z-index="2000">
465   - </el-image>
466   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
467   - v-for="item in videoSrc1">
468   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
469   - </div>
470   - <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
471   - @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
472   - <div slot="footer" class="dialog-footer">
473   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
474   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
475   - </div>
476   - </el-dialog>
477   -
478   - <!-- 平台违规信息 -->
479   - <el-dialog :title="title" :visible.sync="violationCaseFile" width="300px" append-to-body :close-on-click-modal="false">
480   - <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
481   - <el-form label-width="120px" >
  415 +
  416 +
  417 +
  418 + <!-- 后勤管理 -->
  419 + <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="300px" append-to-body
  420 + :close-on-click-modal="false">
  421 + <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
  422 + <div slot="footer" class="dialog-footer">
  423 + <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
  424 + <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
  425 + </div>
  426 + </el-dialog>
  427 +
  428 + <!-- 办文办事 -->
  429 + <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="300px" append-to-body
  430 + :close-on-click-modal="false">
  431 + <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen"
  432 + :businessKey="definitionKey"
  433 + :controlId="controlId"/>
  434 + <el-form label-width="110px" v-if="definitionKey=='yuelan'">
  435 + <el-form-item label="阅览部门:">
  436 + <el-select ref="formDeptNameRef" v-model="deptName" placeholder="请选择部门" style="width: 100% "
  437 + @change="changeDepts">
  438 + <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  439 + </el-select>
  440 + </el-form-item>
  441 + <el-form-item label="阅览人:">
  442 + <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择"/>
  443 + </el-form-item>
  444 + </el-form>
  445 + <div slot="footer" class="dialog-footer">
  446 + <div slot="footer" class="dialog-footer">
  447 + <el-button type="danger" @click="handleAffairsSubmitForm(1)"
  448 + v-if="controlId!='FormProperty_11p96vq' && controlId!='FormProperty_0d6ngk1' && definitionKey!='yuelanxuexi' && definitionKey!='yuelan'">驳回
  449 + </el-button>
  450 + <el-button type="primary" @click="handleAffairsSubmitForm(0)">通过</el-button>
  451 + </div>
  452 + </div>
  453 + </el-dialog>
  454 +
  455 + <!-- 线下案卷交办 -->
  456 + <el-dialog :title="title" :visible.sync="caseOffline" width="300px" append-to-body :close-on-click-modal="false">
  457 + <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
  458 + <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
  459 + </el-input>
  460 + <el-upload multiple :headers="upload.headers" :action="upload.url"
  461 + accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
  462 + :show-file-list="false"
  463 + :on-success="uploadSuccess1" :before-upload="beforeUpload">
  464 + <el-button size="small" type="primary">选择附件</el-button>
  465 + <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
  466 + </el-upload>
  467 + <el-image v-for="item in slides1"
  468 + style="width: 150px; height: 100px; margin: 5px;"
  469 + :src="item.url"
  470 + :preview-src-list="[item.url]"
  471 + :z-index="2000">
  472 + </el-image>
  473 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  474 + v-for="item in videoSrc1">
  475 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  476 + </div>
  477 + <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
  478 + @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
  479 + <div slot="footer" class="dialog-footer">
  480 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  481 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  482 + </div>
  483 + </el-dialog>
  484 +
  485 + <!-- 平台违规信息 -->
  486 + <el-dialog :title="title" :visible.sync="violationCaseFile" width="300px" append-to-body :close-on-click-modal="false">
  487 + <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
  488 + <el-form label-width="120px" >
482 489 <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
483 490 </el-input>
484 491 <el-upload multiple :headers="upload.headers" :action="upload.url"
... ... @@ -499,117 +506,117 @@
499 506 <video width="100%" controls="controls" height="100%" :src="item.url"></video>
500 507 </div>
501 508 <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
502   - @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
503   -
504   - </el-form>
505   -
506   -
507   - <div slot="footer" class="dialog-footer">
508   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
509   - <el-button type="primary"
510   - v-loading.fullscreen.lock="modalLoading"
511   - @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
512   - </div>
513   - </el-dialog>
514   -
515   - <!-- 违规预警信息 -->
516   - <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
517   - <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
518   - <el-form label-width="120px" >
519   - <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
520   - </el-input>
521   - <el-upload multiple :headers="upload.headers" :action="upload.url"
522   - accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
523   - :show-file-list="false"
524   - :on-success="uploadSuccess1" :before-upload="beforeUpload">
525   - <el-button size="small" type="primary">选择附件</el-button>
526   - <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
527   - </el-upload>
528   - <el-image v-for="item in slides1"
529   - style="width: 150px; height: 100px; margin: 5px;"
530   - :src="item.url"
531   - :preview-src-list="[item.url]"
532   - :z-index="2000">
533   - </el-image>
534   - <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
535   - v-for="item in videoSrc1">
536   - <video width="100%" controls="controls" height="100%" :src="item.url"></video>
537   - </div>
538   - <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
539   - @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
540   -
541   - </el-form>
542   -
543   -
544   - <div slot="footer" class="dialog-footer">
545   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
546   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
547   - </div>
548   - </el-dialog>
549   -
  509 + @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
  510 +
  511 + </el-form>
  512 +
  513 +
  514 + <div slot="footer" class="dialog-footer">
  515 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
  516 + <el-button type="primary"
  517 + v-loading.fullscreen.lock="modalLoading"
  518 + @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  519 + </div>
  520 + </el-dialog>
  521 +
  522 + <!-- 违规预警信息 -->
  523 + <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
  524 + <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1"/>
  525 + <el-form label-width="120px" >
  526 + <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
  527 + </el-input>
  528 + <el-upload multiple :headers="upload.headers" :action="upload.url"
  529 + accept=".docx,.doc,.pdf,.png,.jpeg,.png,.jpg,.mp4,.avi"
  530 + :show-file-list="false"
  531 + :on-success="uploadSuccess1" :before-upload="beforeUpload">
  532 + <el-button size="small" type="primary">选择附件</el-button>
  533 + <div slot="tip" class="el-upload__tip">只能上传不超过 100MB 的jpg、png、pdf、word、avi、mp4文件</div>
  534 + </el-upload>
  535 + <el-image v-for="item in slides1"
  536 + style="width: 150px; height: 100px; margin: 5px;"
  537 + :src="item.url"
  538 + :preview-src-list="[item.url]"
  539 + :z-index="2000">
  540 + </el-image>
  541 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  542 + v-for="item in videoSrc1">
  543 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  544 + </div>
  545 + <div style="color: blue;" v-for="(img,index) in form.replyImg">{{ img.split("/")[img.split("/").length - 1] }}<a
  546 + @click="removeAttchItem(index,img)" style="color:red;"> X</a></div>
  547 +
  548 + </el-form>
  549 +
  550 +
  551 + <div slot="footer" class="dialog-footer">
  552 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
  553 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  554 + </div>
  555 + </el-dialog>
  556 +
550 557 <el-dialog :title="title" :visible.sync="supervisionOpen" width="300px" append-to-body :close-on-click-modal="false">
551 558 <supervisionInfo :infoData="supervisionData"/>
552 559 <div slot="footer" class="dialog-footer">
553 560 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
554 561 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
555 562 </div>
556   - </el-dialog>
557   -
558   - <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
559   - <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
560   - <div v-for="item in this.form.formData">
561   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
562   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
563   - </div>
564   -
565   - <el-table :data="hisfromData" v-if="hisfromData != null">
566   -
567   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
568   - <el-table-column label="审批人" align="center" prop="createName"/>
569   - <el-table-column label="审批时间" align="center" prop="createTime"/>
570   - </el-table>
571   - <div slot="footer" class="dialog-footer">
572   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
573   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
574   - </div>
575   - </el-dialog>
576   -
577   - <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
578   - <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
579   - <div v-for="item in this.form.formData">
580   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
581   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
582   - </div>
583   -
584   - <el-table :data="hisfromData" v-if="hisfromData != null">
585   -
586   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
587   - <el-table-column label="审批人" align="center" prop="createName"/>
588   - <el-table-column label="审批时间" align="center" prop="createTime"/>
589   - </el-table>
590   - <div slot="footer" class="dialog-footer">
591   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
592   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
593   - </div>
594   - </el-dialog>
595   -
596   - <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
597   - <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
598   - <div v-for="item in this.form.formData">
599   - <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
600   - placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
601   - </div>
602   -
603   - <el-table :data="hisfromData" v-if="hisfromData != null">
604   -
605   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
606   - <el-table-column label="审批人" align="center" prop="createName"/>
607   - <el-table-column label="审批时间" align="center" prop="createTime"/>
608   - </el-table>
609   - <div slot="footer" class="dialog-footer">
610   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
611   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
612   - </div>
  563 + </el-dialog>
  564 +
  565 + <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
  566 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
  567 + <div v-for="item in this.form.formData">
  568 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  569 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  570 + </div>
  571 +
  572 + <el-table :data="hisfromData" v-if="hisfromData != null">
  573 +
  574 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  575 + <el-table-column label="处理人" align="center" prop="createName"/>
  576 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  577 + </el-table>
  578 + <div slot="footer" class="dialog-footer">
  579 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  580 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  581 + </div>
  582 + </el-dialog>
  583 +
  584 + <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
  585 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
  586 + <div v-for="item in this.form.formData">
  587 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  588 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  589 + </div>
  590 +
  591 + <el-table :data="hisfromData" v-if="hisfromData != null">
  592 +
  593 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  594 + <el-table-column label="处理人" align="center" prop="createName"/>
  595 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  596 + </el-table>
  597 + <div slot="footer" class="dialog-footer">
  598 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  599 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  600 + </div>
  601 + </el-dialog>
  602 +
  603 + <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
  604 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
  605 + <div v-for="item in this.form.formData">
  606 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  607 + placeholder="批注" type="textarea" :rows="3" style="margin-top:20px;"/>
  608 + </div>
  609 +
  610 + <el-table :data="hisfromData" v-if="hisfromData != null">
  611 +
  612 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  613 + <el-table-column label="处理人" align="center" prop="createName"/>
  614 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  615 + </el-table>
  616 + <div slot="footer" class="dialog-footer">
  617 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  618 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  619 + </div>
613 620 </el-dialog>
614 621 </div>
615 622 </template>
... ... @@ -621,7 +628,7 @@ import {
621 628 listTask,
622 629 formDataShow,
623 630 formDataSave,
624   -} from "@/api/activiti/task";
  631 +} from "@/api/activiti/task";
625 632  
626 633 import {historyFromData} from '@/api/activiti/historyFormdata'
627 634  
... ... @@ -649,7 +656,7 @@ import {
649 656 import {addReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
650 657 import {updateHandleAffairs} from "@/api/office/handle";
651 658 import Treeselect from "@riophae/vue-treeselect";
652   -import '@riophae/vue-treeselect/dist/vue-treeselect.css'
  659 +import '@riophae/vue-treeselect/dist/vue-treeselect.css'
653 660  
654 661 import h5Page from '@/views/h5/Pagination';
655 662  
... ... @@ -668,13 +675,13 @@ import violationWarningInformationInfo from &quot;@/views/h5/task/violationWarningInf
668 675 import supervisionInfo from "@/views/h5/task/SupervisionInfo";
669 676 import companyInfo from "@/views/h5/task/companyInfo";
670 677 import driverInfo from "@/views/activiti/task/driverInfo";
671   -import vehicleInfo from "@/views/activiti/task/vehicleInfo";
672   -
673   -import taskmethod from '@/api/taskmethod'
  678 +import vehicleInfo from "@/views/activiti/task/vehicleInfo";
  679 +
  680 +import taskmethod from '@/api/taskmethod'
674 681  
675 682  
676 683 export default {
677   - name: "task",
  684 + name: "task",
678 685 mixins: [taskmethod],
679 686 components: {
680 687 taskCard,
... ... @@ -689,15 +696,15 @@ export default {
689 696 contractInfo,
690 697 caseOfflineInfo,
691 698 violationCaseFileInfo,
692   - violationWarningInformationInfo,
693   - supervisionInfo,
694   - companyInfo,
695   - driverInfo,
696   - vehicleInfo,
  699 + violationWarningInformationInfo,
  700 + supervisionInfo,
  701 + companyInfo,
  702 + driverInfo,
  703 + vehicleInfo,
697 704 h5Page
698 705 },
699 706 data() {
700   - return {
  707 + return {
701 708 modalLoading:false,
702 709 id: '',
703 710 definitionKey: '',
... ... @@ -781,45 +788,45 @@ export default {
781 788 users: [],
782 789 options: [],
783 790 usersName: [],
784   - deptName:null,
  791 + deptName:null,
785 792 prev:[],
786 793 slides: [],
787   - slidesArys: [],
788   - videos:[],
789   - company:false,
790   - driver:false,
791   - vehicle:false,
792   - hisfromData:[],
793   -
794   - slides: [],
795   - slidesArys: [],
796   - slides1: [],
  794 + slidesArys: [],
  795 + videos:[],
  796 + company:false,
  797 + driver:false,
  798 + vehicle:false,
  799 + hisfromData:[],
  800 +
  801 + slides: [],
  802 + slidesArys: [],
  803 + slides1: [],
797 804 videoSrc1: [],
798 805 };
799 806 },
800 807 created() {
801   - let dep = {type: "CSUserDepartmentType"};
802   -
803   - getDict(dep).then(res => {
804   - this.depts = res.result;
805   - for(let i in res.result){
806   - if(res.result[i].name.indexOf("渣土办") < 1){
807   - this.prev.push(res.result[i]);
808   - }
809   - }
810   - });
811   -
812   - let role = {type: "CSUserPostType"};
813   -
814   - getDict(role).then(res => {
815   - this.roles = res.result;
816   - });
817   -
818   - listTask(this.queryParams).then(response => {
819   - this.taskList = response.rows;
820   - this.names = response.names;
821   - this.total = response.total;
822   - this.loading = false;
  808 + let dep = {type: "CSUserDepartmentType"};
  809 +
  810 + getDict(dep).then(res => {
  811 + this.depts = res.result;
  812 + for(let i in res.result){
  813 + if(res.result[i].name.indexOf("渣土办") < 1){
  814 + this.prev.push(res.result[i]);
  815 + }
  816 + }
  817 + });
  818 +
  819 + let role = {type: "CSUserPostType"};
  820 +
  821 + getDict(role).then(res => {
  822 + this.roles = res.result;
  823 + });
  824 +
  825 + listTask(this.queryParams).then(response => {
  826 + this.taskList = response.rows;
  827 + this.names = response.names;
  828 + this.total = response.total;
  829 + this.loading = false;
823 830 });
824 831 },
825 832 methods: {
... ... @@ -837,142 +844,142 @@ export default {
837 844  
838 845 <style>
839 846 @import '../../../assets/css/task.css'
840   -</style>
841   -<style scope>
842   - .el-select-dropdown__item{
843   - width:300px;
844   - }
845   -</style>
846   -
847   -
848   -
  847 +</style>
  848 +<style scope>
  849 + .el-select-dropdown__item{
  850 + width:300px;
  851 + }
  852 +</style>
  853 +
  854 +
  855 +
849 856 <!--
850   -remoteName(value){
851   - getNames(value).then(res=>{
852   -
853   - this.names = res.data;
854   -
855   - this.queryParams.name = value;
856   - });
857   - },
858   - resetQuery(){
859   - this.queryParams = {};
860   - this.queryParams.pageNum=1;
861   - this.queryParams.pageSize=10;
862   - this.getList();
  857 +remoteName(value){
  858 + getNames(value).then(res=>{
  859 +
  860 + this.names = res.data;
  861 +
  862 + this.queryParams.name = value;
  863 + });
  864 + },
  865 + resetQuery(){
  866 + this.queryParams = {};
  867 + this.queryParams.pageNum=1;
  868 + this.queryParams.pageSize=10;
  869 + this.getList();
863 870 },
864 871 handleClose() {
865 872 this.uploadImageDialog = false;
866 873 this.fileList = [];
867 874 },
868 875 removeImage(index, img) {
869   - if(this.slides[index]){
870   - for(let i=0;i<this.slides[index].length;i++){
871   - if(this.slides[index][i].alt == img){
872   - this.slides[index].splice(i,1);
873   - }
874   - }
875   - }
876   - if(this.videos[index]){
877   - for(let i=0;i<this.videos[index].length;i++){
878   - if(this.videos[index][i].alt == img){
879   - this.videos[index].splice(i,1);
880   - }
881   - }
882   - }
883   -
884   - let target = "sub_img" + index;
885   - this.form[target].splice(this.form[target].indexOf(img), 1);
  876 + if(this.slides[index]){
  877 + for(let i=0;i<this.slides[index].length;i++){
  878 + if(this.slides[index][i].alt == img){
  879 + this.slides[index].splice(i,1);
  880 + }
  881 + }
  882 + }
  883 + if(this.videos[index]){
  884 + for(let i=0;i<this.videos[index].length;i++){
  885 + if(this.videos[index][i].alt == img){
  886 + this.videos[index].splice(i,1);
  887 + }
  888 + }
  889 + }
  890 +
  891 + let target = "sub_img" + index;
  892 + this.form[target].splice(this.form[target].indexOf(img), 1);
886 893 this.$forceUpdate();
887 894 },
888   - uploadSuccess(res, file, fileList) {
  895 + uploadSuccess(res, file, fileList) {
889 896 debugger;
890   - if (res.code) {
891   - this.$message(res.message);
892   - return;
893   - }
894   -
895   - let target = "sub_img" + this.picIndex;
896   -
897   - if (!this.form[target]) {
898   - this.form[target] = [];
899   - }
900   -
901   - this.form[target].push(file.name + ':' + res);
902   -
903   - if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){
904   - let url = URL.createObjectURL(file.raw)
905   - if(!this.slides[this.picIndex]){
906   - this.slides[this.picIndex] = [];
907   - }
908   -
909   - this.slides[this.picIndex].push({
910   - url:url,
911   - alt:res
912   - })
913   - }
914   - if(file.name.indexOf('.avi') > -1 ||file.name.indexOf('.mp4') > -1){
915   -
916   - let url = URL.createObjectURL(file.raw)
917   - if(!this.videos[this.picIndex]){
918   - this.videos[this.picIndex] = [];
919   - }
920   - this.videos[this.picIndex].push({
921   - url:url,
922   - alt:res
923   - });
924   - }
925   -
  897 + if (res.code) {
  898 + this.$message(res.message);
  899 + return;
  900 + }
  901 +
  902 + let target = "sub_img" + this.picIndex;
  903 +
  904 + if (!this.form[target]) {
  905 + this.form[target] = [];
  906 + }
  907 +
  908 + this.form[target].push(file.name + ':' + res);
  909 +
  910 + if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){
  911 + let url = URL.createObjectURL(file.raw)
  912 + if(!this.slides[this.picIndex]){
  913 + this.slides[this.picIndex] = [];
  914 + }
  915 +
  916 + this.slides[this.picIndex].push({
  917 + url:url,
  918 + alt:res
  919 + })
  920 + }
  921 + if(file.name.indexOf('.avi') > -1 ||file.name.indexOf('.mp4') > -1){
  922 +
  923 + let url = URL.createObjectURL(file.raw)
  924 + if(!this.videos[this.picIndex]){
  925 + this.videos[this.picIndex] = [];
  926 + }
  927 + this.videos[this.picIndex].push({
  928 + url:url,
  929 + alt:res
  930 + });
  931 + }
  932 +
926 933 this.$forceUpdate();
927 934 },
928 935 showFileUpload(i) {
929 936 this.uploadImageDialog = true;
930 937 this.picIndex = i;
931   - },
932   - uploadSuccess1(res, file, fileList) {
933   - if (res.code) {
934   - this.$message(res.message);
935   - return;
936   - }
937   - if (!this.form.replyImg) {
938   - this.form.replyImg = [];
939   - }
940   - this.form.replyImg.push(res);
941   - if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.gif') > -1 || file.name.indexOf('.jpeg') > -1) {
942   - let url = URL.createObjectURL(file.raw)
943   - this.slides1.push({
944   - url: url,
945   - alt: res
946   - })
947   - }
948   - if (file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {
949   - let url = URL.createObjectURL(file.raw)
950   - this.videoSrc1.push({
951   - url: url,
952   - alt: res
953   - });
954   - }
955   - this.$forceUpdate();
  938 + },
  939 + uploadSuccess1(res, file, fileList) {
  940 + if (res.code) {
  941 + this.$message(res.message);
  942 + return;
  943 + }
  944 + if (!this.form.replyImg) {
  945 + this.form.replyImg = [];
  946 + }
  947 + this.form.replyImg.push(res);
  948 + if (file.name.indexOf('.jpg') > -1 || file.name.indexOf('.png') > -1 || file.name.indexOf('.gif') > -1 || file.name.indexOf('.jpeg') > -1) {
  949 + let url = URL.createObjectURL(file.raw)
  950 + this.slides1.push({
  951 + url: url,
  952 + alt: res
  953 + })
  954 + }
  955 + if (file.name.indexOf('.avi') > -1 || file.name.indexOf('.mp4') > -1) {
  956 + let url = URL.createObjectURL(file.raw)
  957 + this.videoSrc1.push({
  958 + url: url,
  959 + alt: res
  960 + });
  961 + }
  962 + this.$forceUpdate();
956 963 },
957 964 beforeUpload(file) {
958   - let isRightSize = file.size / 1024 / 1024 < 20
959   - if (!isRightSize) {
960   - this.$message.error('文件大小超过 20MB')
961   - return isRightSize;
962   - }
963   -
964   - let isAccept = false;
965   - let name = file.name + "";
966   - name = name.toLowerCase();
967   -
968   - if (name.indexOf('.docx') > -1 || name.indexOf(".jpg") > -1 || name.indexOf('.doc') > -1 || file
969   - .name.indexOf('.pdf') > -1||name.indexOf('.png') > -1 ||name.indexOf('.mp4') > -1 ||name.indexOf('.avi') > -1) {
970   - isAccept = true;
971   - }
972   - if (!isAccept) {
973   - this.$message.error('应该选择PDF、PNG、JPG、MP4,AVI,WORD类型的文件')
974   - return isAccept;
975   - }
  965 + let isRightSize = file.size / 1024 / 1024 < 20
  966 + if (!isRightSize) {
  967 + this.$message.error('文件大小超过 20MB')
  968 + return isRightSize;
  969 + }
  970 +
  971 + let isAccept = false;
  972 + let name = file.name + "";
  973 + name = name.toLowerCase();
  974 +
  975 + if (name.indexOf('.docx') > -1 || name.indexOf(".jpg") > -1 || name.indexOf('.doc') > -1 || file
  976 + .name.indexOf('.pdf') > -1||name.indexOf('.png') > -1 ||name.indexOf('.mp4') > -1 ||name.indexOf('.avi') > -1) {
  977 + isAccept = true;
  978 + }
  979 + if (!isAccept) {
  980 + this.$message.error('应该选择PDF、PNG、JPG、MP4,AVI,WORD类型的文件')
  981 + return isAccept;
  982 + }
976 983  
977 984 },
978 985 getList() {
... ... @@ -993,17 +1000,17 @@ remoteName(value){
993 1000 this.conferenceOpen = false;
994 1001 this.construct = false;
995 1002 this.logisticsInfoOpen = false;
996   - this.handleAffairsInfoOpen = false;
997   - this.earthsites=false;
998   - this.contract=false;
999   - this.caseOffline=false;
1000   - this.violationCaseFile=false;
1001   - this.violationCaseFile1=false;
1002   -
1003   - this.company=false;
1004   - this.driver=false;
1005   - this.vehicle=false;
1006   -
  1003 + this.handleAffairsInfoOpen = false;
  1004 + this.earthsites=false;
  1005 + this.contract=false;
  1006 + this.caseOffline=false;
  1007 + this.violationCaseFile=false;
  1008 + this.violationCaseFile1=false;
  1009 +
  1010 + this.company=false;
  1011 + this.driver=false;
  1012 + this.vehicle=false;
  1013 +
1007 1014  
1008 1015 this.reset();
1009 1016 },
... ... @@ -1013,9 +1020,9 @@ remoteName(value){
1013 1020 this.businessKey = '',
1014 1021 this.form = {
1015 1022 formData: [],
1016   - };
1017   - this.videoSrc1 = [];
1018   - this.slides1 = [];
  1023 + };
  1024 + this.videoSrc1 = [];
  1025 + this.slides1 = [];
1019 1026  
1020 1027 this.resetForm("form");
1021 1028 },
... ... @@ -1024,15 +1031,15 @@ remoteName(value){
1024 1031 this.definitionKey = row.definitionKey;
1025 1032 this.businessKey = row.businessKey;
1026 1033 this.id = row.id;
1027   - this.taskName = row.name;
1028   - historyFromData(this.businessKey).then(response => {
1029   - this.hisfromData = [];
1030   - this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
1031   - for(let i in response.data){
1032   -
1033   - this.hisfromData.push(response.data[i]);
1034   - }
1035   - })
  1034 + this.taskName = row.name;
  1035 + historyFromData(this.businessKey).then(response => {
  1036 + this.hisfromData = [];
  1037 + this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
  1038 + for(let i in response.data){
  1039 +
  1040 + this.hisfromData.push(response.data[i]);
  1041 + }
  1042 + })
1036 1043  
1037 1044 formDataShow(row.id).then(response => {
1038 1045 let datas = response.data;
... ... @@ -1111,33 +1118,33 @@ remoteName(value){
1111 1118 if(this.definitionKey == "violation_warning"){
1112 1119 this.violationCaseFile1 = true;
1113 1120 return;
1114   - }
1115   - if(this.definitionKey.indexOf("supervision")>-1){
1116   - const params = {
1117   - id: row.businessKey.split(":")[1],
1118   - }
1119   - getSupervision(params).then(res=>{
1120   - console.log(res)
1121   - if(res.result==null){
1122   - this.$message.error("获取纪检督察详情失败！请重试")
1123   - return;
1124   - }
1125   - this.supervisionData = res.result;
1126   - this.supervisionOpen = true;
1127   - })
1128   - return;
1129   - }
1130   - if(this.definitionKey == "workflow_company"){
1131   - this.company = true;
1132   - return;
1133   - }
1134   - if(this.definitionKey == "workflow_vehicle"){
1135   - this.vehicle = true;
1136   - return;
1137   - }
1138   - if(this.definitionKey == "workflow_driver"){
1139   - this.driver = true;
1140   - return;
  1121 + }
  1122 + if(this.definitionKey.indexOf("supervision")>-1){
  1123 + const params = {
  1124 + id: row.businessKey.split(":")[1],
  1125 + }
  1126 + getSupervision(params).then(res=>{
  1127 + console.log(res)
  1128 + if(res.result==null){
  1129 + this.$message.error("获取纪检督察详情失败！请重试")
  1130 + return;
  1131 + }
  1132 + this.supervisionData = res.result;
  1133 + this.supervisionOpen = true;
  1134 + })
  1135 + return;
  1136 + }
  1137 + if(this.definitionKey == "workflow_company"){
  1138 + this.company = true;
  1139 + return;
  1140 + }
  1141 + if(this.definitionKey == "workflow_vehicle"){
  1142 + this.vehicle = true;
  1143 + return;
  1144 + }
  1145 + if(this.definitionKey == "workflow_driver"){
  1146 + this.driver = true;
  1147 + return;
1141 1148 }
1142 1149 this.open = true;
1143 1150 this.title = "审批";
... ... @@ -1193,16 +1200,16 @@ this.form.formData[0].controlValue = value;
1193 1200 let objId = this.businessKey.split(":")[1];
1194 1201 let query = {
1195 1202 objectId: objId,
1196   - };
1197   - let text = "";
1198   - for (let i = 0; i < this.form.formData.length; i++) {
1199   - let strings = this.form.formData[i];
1200   - switch (strings.controlType) {
1201   - case 'textarea':
1202   - text = strings.controlValue;
1203   - break;
1204   - }
1205   - }
  1203 + };
  1204 + let text = "";
  1205 + for (let i = 0; i < this.form.formData.length; i++) {
  1206 + let strings = this.form.formData[i];
  1207 + switch (strings.controlType) {
  1208 + case 'textarea':
  1209 + text = strings.controlValue;
  1210 + break;
  1211 + }
  1212 + }
1206 1213  
1207 1214 if (this.taskName == "勘察科员") {
1208 1215 query.idx = 0;
... ... @@ -1374,7 +1381,7 @@ this.form.formData[0].controlValue = value;
1374 1381 }
1375 1382 if (this.definitionKey == "workflow_company" ||
1376 1383 this.definitionKey == "workflow_driver" ||
1377   - this.definitionKey == "workflow_vehicle" ||
  1384 + this.definitionKey == "workflow_vehicle" ||
1378 1385 this.definitionKey == "workflow_constructsite_edit") {
1379 1386 formDataSave(this.id, this.form.formData).then(response => {
1380 1387 this.msgSuccess("审批成功");
... ... @@ -1397,9 +1404,9 @@ this.form.formData[0].controlValue = value;
1397 1404 this.taskList = [];
1398 1405 this.getList();
1399 1406 });
1400   - },
1401   - downloadFile(path) {
1402   - window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
  1407 + },
  1408 + downloadFile(path) {
  1409 + window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
1403 1410 },
1404 1411 leaveApplicationSubmitForm(value) {
1405 1412 if (value == 0) {
... ... @@ -1608,4 +1615,4 @@ this.form.formData[0].controlValue = value;
1608 1615 },
1609 1616 handlePictureCardPreview(file) {
1610 1617 console.log(this.proofImage)
1611   - }, -->
  1618 + }, -->
... ...
trash-ui/src/views/h5/taskhistory/index.vue
  View file @2c9117a
1 1 <template>
2 2 <div class="app-container">
3   -
4   - <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
5   -
6   - <el-select v-model="queryParams.type" filterable reserve-keyword>
7   - <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
8   - <el-option label="消纳合同申报备案" value="workflow_conract"/>
9   - <el-option label="处理场所备案" value="workflow_earthsites"/>
10   - <el-option label="运输企业准入流程" value="workflow_company"/>
11   - <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
12   - <el-option label="驾驶员信息审批" value="workflow_driver"/>
13   - <el-option label="报工审批" value="workflow_threestep"/>
14   - <el-option label="交办案卷" value="workflow_caseoffline"/>
15   - <el-option label="违规案卷处置流程" value="workflow_casefile"/>
16   - <el-option label="平台预警信息" value="violation_warning"/>
17   - <el-option label="办文办事" value="handleAffairs"/>
18   - <el-option label="后勤管理" value="logistics"/>
19   - <el-option label="会议事务" value="conference"/>
20   - <el-option label="假勤管理" value="workflow_leave"/>
21   - <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
22   - </el-select>
23   -
24   - <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
25   - <el-button size="mini" @click="resetQuery">重置</el-button>
26   -
  3 +
  4 + <el-input v-model="queryParams.name" placeholder="名称" style="width:200px;"></el-input>
  5 +
  6 + <el-select v-model="queryParams.type" filterable reserve-keyword>
  7 + <el-option label="建筑垃圾许可证审批" value="workflow_constructsite"/>
  8 + <el-option label="消纳合同申报备案" value="workflow_conract"/>
  9 + <el-option label="处理场所备案" value="workflow_earthsites"/>
  10 + <el-option label="运输企业准入流程" value="workflow_company"/>
  11 + <el-option label="运输车辆准入流程" value="workflow_vehicle"/>
  12 + <el-option label="驾驶员信息审批" value="workflow_driver"/>
  13 + <el-option label="报工审批" value="workflow_threestep"/>
  14 + <el-option label="交办案卷" value="workflow_caseoffline"/>
  15 + <el-option label="违规案卷处置流程" value="workflow_casefile"/>
  16 + <el-option label="平台预警信息" value="violation_warning"/>
  17 + <el-option label="办文办事" value="handleAffairs"/>
  18 + <el-option label="后勤管理" value="logistics"/>
  19 + <el-option label="会议事务" value="conference"/>
  20 + <el-option label="假勤管理" value="workflow_leave"/>
  21 + <el-option label="纪检督察" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
  22 + </el-select>
  23 +
  24 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">搜索</el-button>
  25 + <el-button size="mini" @click="resetQuery">重置</el-button>
  26 +
27 27  
28 28 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
29 29  
... ... @@ -31,22 +31,22 @@
31 31  
32 32  
33 33 <el-dialog :title="title" :visible.sync="open2" width="300px" append-to-body>
34   - <threestepInfo :businessKey="businessKey" v-if="open2"/>
35   - <el-table :data="hisfromData" v-if="hisfromData != null">
36   -
37   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
38   - <el-table-column label="审批人" align="center" prop="createName"/>
39   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  34 + <threestepInfo :businessKey="businessKey" v-if="open2"/>
  35 + <el-table :data="hisfromData" v-if="hisfromData != null">
  36 +
  37 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  38 + <el-table-column label="处理人" align="center" prop="createName"/>
  39 + <el-table-column label="处理时间" align="center" prop="createTime"/>
40 40 </el-table>
41 41 </el-dialog>
42 42  
43 43 <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
44   - <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
45   -
46   - <el-table :data="hisfromData" v-if="hisfromData != null">
47   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
48   - <el-table-column label="审批人" align="center" prop="createName"/>
49   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  44 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
  45 +
  46 + <el-table :data="hisfromData" v-if="hisfromData != null">
  47 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  48 + <el-table-column label="处理人" align="center" prop="createName"/>
  49 + <el-table-column label="处理时间" align="center" prop="createTime"/>
50 50 </el-table>
51 51 </el-dialog>
52 52 <!-- 会议管理 -->
... ... @@ -61,26 +61,26 @@
61 61  
62 62  
63 63 <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
64   - <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
65   -
66   -
67   - <el-table :data="hisfromData" v-if="hisfromData != null">
68   -
69   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
70   - <el-table-column label="审批人" align="center" prop="createName"/>
71   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  64 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
  65 +
  66 +
  67 + <el-table :data="hisfromData" v-if="hisfromData != null">
  68 +
  69 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  70 + <el-table-column label="处理人" align="center" prop="createName"/>
  71 + <el-table-column label="处理时间" align="center" prop="createTime"/>
72 72 </el-table>
73 73 </el-dialog>
74 74  
75 75 <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
76   - <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
77   -
78   -
79   - <el-table :data="hisfromData" v-if="hisfromData != null">
80   -
81   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
82   - <el-table-column label="审批人" align="center" prop="createName"/>
83   - <el-table-column label="审批时间" align="center" prop="createTime"/>
  76 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
  77 +
  78 +
  79 + <el-table :data="hisfromData" v-if="hisfromData != null">
  80 +
  81 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  82 + <el-table-column label="处理人" align="center" prop="createName"/>
  83 + <el-table-column label="处理时间" align="center" prop="createTime"/>
84 84 </el-table>
85 85 </el-dialog>
86 86  
... ... @@ -113,43 +113,43 @@
113 113 <!-- 违规预警信息 -->
114 114 <el-dialog :title="title" :visible.sync="violationCaseFile1" width="300px" append-to-body :close-on-click-modal="false">
115 115 <violationWarningInformationInfo :idInfo="businessKey" v-if="violationCaseFile1" :entryType="0"/>
116   - </el-dialog>
117   -
  116 + </el-dialog>
  117 +
118 118 <el-dialog :title="title" :visible.sync="supervisionOpen" width="300px" append-to-body :close-on-click-modal="false">
119 119 <supervisionInfo :infoData="supervisionData"/>
120   - </el-dialog>
121   - <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
122   - <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
123   -
124   - <el-table :data="hisfromData" v-if="hisfromData != null">
125   -
126   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
127   - <el-table-column label="审批人" align="center" prop="createName"/>
128   - <el-table-column label="审批时间" align="center" prop="createTime"/>
129   - </el-table>
130   - </el-dialog>
131   -
132   - <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
133   - <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
134   -
135   - <el-table :data="hisfromData" v-if="hisfromData != null">
136   -
137   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
138   - <el-table-column label="审批人" align="center" prop="createName"/>
139   - <el-table-column label="审批时间" align="center" prop="createTime"/>
140   - </el-table>
141   - </el-dialog>
142   -
143   - <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
144   - <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
145   -
146   - <el-table :data="hisfromData" v-if="hisfromData != null">
147   -
148   - <el-table-column label="审批意见" align="center" prop="controlValue"/>
149   - <el-table-column label="审批人" align="center" prop="createName"/>
150   - <el-table-column label="审批时间" align="center" prop="createTime"/>
151   - </el-table>
152   - </el-dialog>
  120 + </el-dialog>
  121 + <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
  122 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
  123 +
  124 + <el-table :data="hisfromData" v-if="hisfromData != null">
  125 +
  126 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  127 + <el-table-column label="处理人" align="center" prop="createName"/>
  128 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  129 + </el-table>
  130 + </el-dialog>
  131 +
  132 + <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
  133 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
  134 +
  135 + <el-table :data="hisfromData" v-if="hisfromData != null">
  136 +
  137 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  138 + <el-table-column label="处理人" align="center" prop="createName"/>
  139 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  140 + </el-table>
  141 + </el-dialog>
  142 +
  143 + <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
  144 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
  145 +
  146 + <el-table :data="hisfromData" v-if="hisfromData != null">
  147 +
  148 + <el-table-column label="处理意见" align="center" prop="controlValue"/>
  149 + <el-table-column label="处理人" align="center" prop="createName"/>
  150 + <el-table-column label="处理时间" align="center" prop="createTime"/>
  151 + </el-table>
  152 + </el-dialog>
153 153  
154 154 </div>
155 155 </template>
... ... @@ -165,9 +165,9 @@
165 165 import Treeselect from "@riophae/vue-treeselect";
166 166 import '@riophae/vue-treeselect/dist/vue-treeselect.css'
167 167  
168   - import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
169   -
170   -
  168 + import { getSignByObjId, addSign, updateSign } from "@/api/sign/sign";
  169 +
  170 +
171 171 import h5Page from '@/views/h5/Pagination';
172 172  
173 173 import threestepInfo from "@/views/h5/task/threestepInfo";
... ... @@ -181,13 +181,13 @@
181 181 import handleInfo from "@/views/h5/task/handleInfo";
182 182 import caseOfflineInfo from "@/views/h5/caseOffline/caseOfflineInfo";
183 183 import violationCaseFileInfo from "@/views/h5/task/violationCaseFileInfo";
184   - import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
185   - import supervisionInfo from "@/views/h5/task/SupervisionInfo";
186   - import companyInfo from "@/views/h5/task/companyInfo";
187   - import driverInfo from "@/views/activiti/task/driverInfo";
188   - import vehicleInfo from "@/views/activiti/task/vehicleInfo";
189   -
190   -import taskhismethod from '@/api/taskhismethod'
  184 + import violationWarningInformationInfo from "@/views/h5/task/violationWarningInformationInfo";
  185 + import supervisionInfo from "@/views/h5/task/SupervisionInfo";
  186 + import companyInfo from "@/views/h5/task/companyInfo";
  187 + import driverInfo from "@/views/activiti/task/driverInfo";
  188 + import vehicleInfo from "@/views/activiti/task/vehicleInfo";
  189 +
  190 +import taskhismethod from '@/api/taskhismethod'
191 191 import {
192 192 getArea,
193 193 getDict,
... ... @@ -196,7 +196,7 @@ import taskhismethod from &#39;@/api/taskhismethod&#39;
196 196 } from "@/api/dict";
197 197  
198 198 export default {
199   - name: "taskHistory",
  199 + name: "taskHistory",
200 200 mixins: [taskhismethod],
201 201 props: {
202 202 type: {
... ... @@ -217,10 +217,10 @@ import taskhismethod from &#39;@/api/taskhismethod&#39;
217 217 caseOfflineInfo,
218 218 violationCaseFileInfo,
219 219 h5Page,
220   - violationWarningInformationInfo,
221   - supervisionInfo,
222   - companyInfo,
223   - driverInfo,
  220 + violationWarningInformationInfo,
  221 + supervisionInfo,
  222 + companyInfo,
  223 + driverInfo,
224 224 vehicleInfo
225 225 },
226 226 data() {
... ... @@ -274,11 +274,11 @@ import taskhismethod from &#39;@/api/taskhismethod&#39;
274 274 open2: false,
275 275 conferenceOpen: false,
276 276 construct: false,
277   - leaveApplicationOpen: false,
278   -
279   - company:false,
280   - driver:false,
281   - vehicle:false,
  277 + leaveApplicationOpen: false,
  278 +
  279 + company:false,
  280 + driver:false,
  281 + vehicle:false,
282 282 hisfromData:[],
283 283 };
284 284 },
... ...
trash-ui/src/views/h5/threestep/index.vue
  View file @2c9117a
... ... @@ -168,7 +168,8 @@
168 168 </el-col>
169 169 </el-row>
170 170 <el-row type="flex" justify="center" style="margin-top: 20px;" v-if="form.type != null">
171   - <el-col :span="12">
  171 + <el-col :span="12">
  172 + <span style="color: red;">*</span>
172 173 <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">出入口照片</a>
173 174 <el-image v-for="item in slides[2]"
174 175 style="width: 100px; height: 100px; margin: 5px;"
... ... @@ -183,7 +184,8 @@
183 184 <el-input v-model="form.img2" type="hidden"></el-input>
184 185 <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
185 186 </el-col>
186   - <el-col :span="12">
  187 + <el-col :span="12">
  188 + <span style="color: red;">*</span>
187 189 <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">沉淀池照片</a>
188 190 <el-image v-for="item in slides[3]"
189 191 style="width: 100px; height: 100px; margin: 5px;"
... ... @@ -200,7 +202,8 @@
200 202 </el-col>
201 203 </el-row>
202 204 <el-row type="flex" justify="center" v-if="form.type != null">
203   - <el-col :span="12">
  205 + <el-col :span="12">
  206 + <span style="color: red;">*</span>
204 207 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">硬质路面照片</a>
205 208 <el-image v-for="item in slides[4]"
206 209 style="width: 100px; height: 100px; margin: 5px;"
... ... @@ -215,7 +218,8 @@
215 218 <el-input v-model="form.img4" type="hidden"></el-input>
216 219 <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
217 220 </el-col>
218   - <el-col :span="12">
  221 + <el-col :span="12">
  222 + <span style="color: red;">*</span>
219 223 <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}}</a>
220 224 <el-image v-for="item in slides[5]"
221 225 style="width: 100px; height: 100px; margin: 5px;"
... ... @@ -232,7 +236,8 @@
232 236 </el-col>
233 237 </el-row>
234 238 <el-row type="flex" justify="center" style="margin-top: 20px;" v-if="form.type != null">
235   - <el-col :span="12">
  239 + <el-col :span="12">
  240 + <span style="color: red;" v-if="form.type == 0">*</span>
236 241 <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">{{form.type==0?"摄像头视频截图2":"雾炮机"}}</a>
237 242 <el-image v-for="item in slides[6]"
238 243 style="width: 100px; height: 100px; margin: 5px;"
... ... @@ -247,7 +252,8 @@
247 252 <el-input v-model="form.img6" type="hidden"></el-input>
248 253 <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
249 254 </el-col>
250   - <el-col :span="12">
  255 + <el-col :span="12">
  256 + <span style="color: red;">*</span>
251 257 <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}}</a>
252 258 <el-image v-for="item in slides[7]"
253 259 style="width: 100px; height: 100px; margin: 5px;"
... ...
trash-ui/src/views/workflow/earthSitesForm.vue
  View file @2c9117a
... ... @@ -23,8 +23,8 @@
23 23 <div v-for="(historyData, index) in fromData"
24 24 :key="index" >
25 25 <h2>{{historyData.taskNodeName}}</h2>
26   - <h3>审批人:{{historyData.createName}}</h3>
27   - <h3>审批时间:{{historyData.createdDate}}</h3>
  26 + <h3>处理人:{{historyData.createName}}</h3>
  27 + <h3>处理时间:{{historyData.createdDate}}</h3>
28 28 <el-form v-for="(fistoryFormData, indexH) in historyData.formHistoryDataDTO" :key="indexH" label-width="80px">
29 29 <el-form-item :label=fistoryFormData.title >
30 30 <el-input v-model="fistoryFormData.value"/>
... ...
trash-ui/src/views/workflow/leaveHistoryForm.vue
  View file @2c9117a
... ... @@ -23,8 +23,8 @@
23 23 <div v-for="(historyData, index) in fromData"
24 24 :key="index" >
25 25 <h2>{{historyData.taskNodeName}}</h2>
26   - <h3>审批人:{{historyData.createName}}</h3>
27   - <h3>审批时间:{{historyData.createdDate}}</h3>
  26 + <h3>处理人:{{historyData.createName}}</h3>
  27 + <h3>处理时间:{{historyData.createdDate}}</h3>
28 28 <el-form v-for="(fistoryFormData, indexH) in historyData.formHistoryDataDTO" :key="indexH" label-width="80px">
29 29 <el-form-item :label=fistoryFormData.title >
30 30 <el-input v-model="fistoryFormData.value"/>
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
  View file @2c9117a
... ... @@ -24,6 +24,7 @@ import com.trash.common.utils.SecurityUtils;
24 24 import com.trash.common.utils.util.PostSms;
25 25 import com.trash.common.utils.vo.mt.JsonSmsSend;
26 26 import com.trash.common.utils.vo.mt.Mobile;
  27 +import com.trash.common.utils.vo.mt.SendSms;
27 28  
28 29 /**
29 30 * 企业失信Service业务层处理
... ... @@ -89,7 +90,6 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
89 90  
90 91 /**
91 92 * 新增企业失信
92   - *
93 93 * @param companyCredit 企业失信
94 94 * @return 结果
95 95 */
... ... @@ -109,6 +109,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
109 109 i = 1;
110 110 } else {
111 111 i = companyCreditMapper.insertCompanyCredit(companyCredit);
  112 + SendSms(companyCredit);
112 113 }
113 114  
114 115 updateRemoteCompanyAndTruck(companyCredit, null);
... ... @@ -130,6 +131,7 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
130 131 i = 1;
131 132 } else {
132 133 i = companyCreditMapper.insertCompanyCredit(companyCredit);
  134 + SendSms(companyCredit);
133 135 }
134 136  
135 137 updateRemoteCompanyAndTruck(companyCredit, token);
... ... @@ -139,39 +141,31 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
139 141 return;
140 142 }
141 143  
142   - @Override
143   - public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit, String token) {
144   - long credit = companyCredit.getLostCredit();
145   - String companyId = companyCredit.getObjectId();
146   -
  144 + private void SendSms(CompanyCredit companyCredit) {
147 145 JSONArray array = redisCache.getCacheObject("companyList");
148 146  
149 147 String number = null;
150 148 for(Object obj:array){
151 149 JSONObject json = (JSONObject)obj;
152   - if(companyId.equals(json.getString("id"))){
  150 + if(companyCredit.getObjectId().equals(json.getString("id"))){
153 151 number = json.getString("principalPhoneNo"); //企业安全负责人
154 152 break;
155 153 }
156 154 }
157 155  
158   - List<Mobile> mobileList=new ArrayList<Mobile>();
159 156  
160   -
161   - //TODO...test
162   - number = "19520553054"; //LPF!
163   -
164 157  
165 158 if(number != null){
  159 + List<Mobile> mobileList=new ArrayList<Mobile>();
166 160 Mobile mobile=new Mobile();
167 161 mobile.setMobile(number);
168 162 mobileList.add(mobile);
169 163  
170 164 String smsString = "";
171 165 if(companyCredit.getLostCredit() == 1){
172   - smsString = "【长沙渣管】失信提醒："+companyCredit.getName()+"因"+companyCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
  166 + smsString = "失信提醒："+companyCredit.getName()+"因"+companyCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
173 167 }else{
174   - smsString = "【长沙渣管】失信解除提醒："+companyCredit.getName()+"现已解除失信，可以进行渣土业务办理，请知悉。";
  168 + smsString = "失信解除提醒："+companyCredit.getName()+"现已解除失信，可以进行渣土业务办理，请知悉。";
175 169 }
176 170  
177 171  
... ... @@ -188,6 +182,15 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService {
188 182 }
189 183 }
190 184  
  185 + }
  186 +
  187 + @Override
  188 + public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit, String token) {
  189 + long credit = companyCredit.getLostCredit();
  190 + String companyId = companyCredit.getObjectId();
  191 +
  192 +
  193 +
191 194 List<Map> cpcList = new ArrayList<>();
192 195 Map cpc = new HashedMap<>();
193 196 cpc.put("dishonestState", credit);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/ConstructionCreditServiceImpl.java
  View file @2c9117a
... ... @@ -157,20 +157,21 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
157 157 i = 1;
158 158 }else{
159 159 i = constructionCreditMapper.insertConstructionCredit(constructionCredit);
  160 + Map param = new HashMap();
  161 + param.put("objectId", constructionCredit.getObjectId());
  162 + param.put("creditStatus", constructionCredit.getLostCredit());
  163 + map.add(param);
  164 + RemoteServerUtils.updateConstationCreditAndStatus(map);
  165 +
  166 + JSONArray array = redis.getCacheObject("constructionList");
  167 +
  168 + sendCreditSMS(constructionCredit.getObjectId(),
  169 + constructionCredit.getName(),constructionCredit.getReason(),
  170 + constructionCredit.getLostCredit(),array,"credit",smsMapper,"constructionCompanyPhone","projectnCompanyPhone");
160 171 }
161 172  
162 173  
163   - Map param = new HashMap();
164   - param.put("objectId", constructionCredit.getObjectId());
165   - param.put("creditStatus", constructionCredit.getLostCredit());
166   - map.add(param);
167   - RemoteServerUtils.updateConstationCreditAndStatus(map);
168   -
169   - JSONArray array = redis.getCacheObject("constructionList");
170   -
171   - sendCreditSMS(constructionCredit.getObjectId(),
172   - constructionCredit.getName(),constructionCredit.getReason(),
173   - constructionCredit.getLostCredit(),array,"credit",smsMapper,"constructionCompanyPhone","projectnCompanyPhone");
  174 +
174 175  
175 176 return i;
176 177 }
... ... @@ -211,23 +212,13 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
211 212 }
212 213 }
213 214  
214   -
215   -
216   - mobileList.clear();
217   -
218   - //TODO...test
219   - number = "19520553054"; //LPF!
220   - Mobile mobile=new Mobile();
221   - mobile.setMobile(number);
222   - mobileList.add(mobile);
223   -
224   - if(number != null){
  215 + if(mobileList.size() > 0){
225 216  
226 217 String smsString = "";
227 218 if(lost == 1){
228   - smsString = "【长沙渣管】失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
  219 + smsString = "失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
229 220 }else{
230   - smsString = "【长沙渣管】失信解除提醒："+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
  221 + smsString = "失信解除提醒："+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
231 222 }
232 223  
233 224 JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
... ... @@ -248,29 +239,21 @@ public class ConstructionCreditServiceImpl implements IConstructionCreditService
248 239 String[] nums = number.split(",");
249 240  
250 241 for(String string:nums){
251   - mobile=new Mobile();
  242 + Mobile mobile=new Mobile();
252 243 mobile.setMobile(number);
253 244 mobileList.add(mobile);
254 245 }
255 246  
256 247 }
257 248  
258   -
259   - mobileList.clear();
260   -
261   - //TODO...test
262   - number = "19520553054"; //LPF!
263   - mobile=new Mobile();
264   - mobile.setMobile(number);
265   - mobileList.add(mobile);
266 249  
267 250 if(mobileList.size() > 0){
268 251  
269 252 String smsString = "";
270 253 if(lost == 1){
271   - smsString = "【长沙渣管】失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请加强监管。";
  254 + smsString = "失信提醒："+name+"因"+reason+"原因，被纳入失信名单，将影响渣土业务办理，请加强监管。";
272 255 }else{
273   - smsString = "【长沙渣管】失信解除提醒：你辖区内"+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
  256 + smsString = "失信解除提醒：你辖区内"+name+"现已解除失信，可以进行渣土业务办理，请知悉。";
274 257 }
275 258  
276 259 JsonSmsSend jsonSmsSend= PostSms.sendSms(mobileList,smsString);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
  View file @2c9117a
... ... @@ -137,7 +137,7 @@ public class DriverCreditServiceImpl implements IDriverCreditService
137 137 i = 1;
138 138 }else{
139 139 i = driverCreditMapper.insertDriverCredit(driverCredit);
140   - }
  140 +
141 141  
142 142 JSONArray array = redisCache.getCacheObject("companyList");
143 143  
... ... @@ -163,23 +163,20 @@ public class DriverCreditServiceImpl implements IDriverCreditService
163 163 }
164 164 }
165 165  
166   - List<Mobile> mobileList=new ArrayList<Mobile>();
167 166  
168   -
169   - //TODO...test
170   - number = "19520553054"; //LPF!
171 167  
172 168  
173 169 if(number != null){
  170 + List<Mobile> mobileList=new ArrayList<Mobile>();
174 171 Mobile mobile=new Mobile();
175 172 mobile.setMobile(number);
176 173 mobileList.add(mobile);
177 174  
178 175 String smsString = "";
179 176 if(driverCredit.getLostCredit() == 1){
180   - smsString = "【长沙渣管】失信提醒："+driverCredit.getName()+"因"+driverCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
  177 + smsString = "失信提醒："+driverCredit.getName()+"因"+driverCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
181 178 }else{
182   - smsString = "【长沙渣管】失信解除提醒："+driverCredit.getName()+"现已解除失信，可以进行渣土业务办理，请知悉。";
  179 + smsString = "失信解除提醒："+driverCredit.getName()+"现已解除失信，可以进行渣土业务办理，请知悉。";
183 180 }
184 181  
185 182  
... ... @@ -197,7 +194,7 @@ public class DriverCreditServiceImpl implements IDriverCreditService
197 194 }
198 195 }
199 196  
200   -
  197 + }
201 198  
202 199  
203 200  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/EarthsitesCreditServiceImpl.java
  View file @2c9117a
... ... @@ -124,7 +124,7 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
124 124 }else{
125 125  
126 126 i = earthsitesCreditMapper.insertEarthsitesCredit(earthsitesCredit);
127   - }
  127 +
128 128  
129 129 Map param = new HashMap();
130 130 param.put("objectId", earthsitesCredit.getObjectId());
... ... @@ -137,7 +137,7 @@ public class EarthsitesCreditServiceImpl implements IEarthsitesCreditService
137 137  
138 138 smsServer.sendCreditSMS(earthsitesCredit.getObjectId() , earthsitesCredit.getName(),earthsitesCredit.getReason(),
139 139 earthsitesCredit.getLostCredit(),array,"credit",smsMapper,"principalPhoneNo",null);;
140   -
  140 + }
141 141 return i;
142 142 }
143 143  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @2c9117a
... ... @@ -80,7 +80,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
80 80 @Override
81 81 public List<SupervisionThreestep> selectSupervisionThreestepList(SupervisionThreestep supervisionThreestep) {
82 82 List<SupervisionThreestep> list = new ArrayList<>();
83   - if (supervisionThreestep.getWorkStartTime() == null && supervisionThreestep.getStatus() == null) {
  83 + if (supervisionThreestep.getWorkStartTime() == null && supervisionThreestep.getHis() == null) {
84 84 String start, end;
85 85  
86 86 SimpleDateFormat yearFomat = new SimpleDateFormat("yyyy-MM-dd");
... ... @@ -138,7 +138,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
138 138 map.put("page", 1);
139 139 constructionList = RemoteServerUtils.getConstructionLedgerList(map);
140 140 if (constructionList != null) {
141   - redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
  141 + redisCache.setCacheObject("constructionLedgerList", constructionList, 1, TimeUnit.DAYS);
142 142 }
143 143 }
144 144  
... ... @@ -180,7 +180,17 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
180 180 if (eArea.size() > 0) {
181 181  
182 182 JSONArray jsonArray = redis.getCacheObject("earthSitesList");
183   -
  183 +
  184 + if(jsonArray == null){
  185 + Map<String, Object> map = new HashMap<>();
  186 + map.put("size", 99999);
  187 + map.put("page", 1);
  188 + jsonArray = RemoteServerUtils.getEarthSitesList(map);
  189 + if (jsonArray != null) {
  190 + redisCache.setCacheObject("earthSitesList", jsonArray, 1,TimeUnit.DAYS);
  191 + }
  192 + }
  193 +
184 194 for (Object obj : jsonArray) {
185 195 JSONObject json = (JSONObject) obj;
186 196 if (eArea.indexOf(json.getString("areaCode")) > -1) {
... ... @@ -328,7 +338,7 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
328 338 map.put("page", 1);
329 339 constructionList = RemoteServerUtils.getConstructionLedgerList(map);
330 340 if (constructionList != null) {
331   - redisCache.setCacheObject("constructionLedgerList", constructionList, 60, TimeUnit.MINUTES);
  341 + redisCache.setCacheObject("constructionLedgerList", constructionList, 1, TimeUnit.DAYS);
332 342 }
333 343 }
334 344  
... ... @@ -703,7 +713,17 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
703 713 if (companyName != null) {
704 714  
705 715 JSONArray array = redisCache.getCacheObject("constructionList");
706   -
  716 +
  717 + if(array == null){
  718 + Map<String, Object> map = new HashMap<>();
  719 + map.put("size", 99999);
  720 + map.put("page", 1);
  721 + array = RemoteServerUtils.getConstructionList(map);
  722 + if(array != null){
  723 + redisCache.setCacheObject("constructionList", array,1,TimeUnit.DAYS);
  724 + }
  725 + }
  726 +
707 727 for (SupervisionThreestep three : threesteps) {
708 728 for (Object obj : array) {
709 729 JSONObject con = (JSONObject) obj;
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @2c9117a
... ... @@ -301,6 +301,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
301 301 }
302 302  
303 303 active.setId(oldData.getId());// 更新已有车辆激活数据
  304 + active.setCreateBy(SecurityUtils.getUsername());
304 305 active.setCreateCount(oldData.getCreateCount() + 1);
305 306 successMessage += nos[i] + " ";
306 307 truckActivateMapper.updateTruckActivate(active);
... ... @@ -334,6 +335,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService {
334 335 threestepMapper.updateSupervisionThreestep(threestep);
335 336  
336 337 active.setCreateCount(1);
  338 + active.setCreateBy(SecurityUtils.getUsername());
337 339 successMessage += nos[i] + " ";
338 340  
339 341 truckActivateMapper.insertTruckActivate(active);
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
  View file @2c9117a
... ... @@ -135,7 +135,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
135 135 }else{
136 136 cc.setTime(new Date());
137 137 i = truckCreditMapper.insertTruckCredit(truckCredit);
138   - }
  138 +
139 139  
140 140 if(isCompany == 0){
141 141  
... ... @@ -151,23 +151,19 @@ public class TruckCreditServiceImpl implements ITruckCreditService
151 151 }
152 152 }
153 153  
154   - List<Mobile> mobileList=new ArrayList<Mobile>();
155   -
156   -
157   - //TODO...test
158   - number = "19520553054"; //LPF!
159 154  
160 155  
161 156 if(number != null){
  157 + List<Mobile> mobileList=new ArrayList<Mobile>();
162 158 Mobile mobile=new Mobile();
163 159 mobile.setMobile(number);
164 160 mobileList.add(mobile);
165 161  
166 162 String smsString = "";
167 163 if(truckCredit.getLostCredit() == 1){
168   - smsString = "【长沙渣管】失信提醒："+truckCredit.getLicensePlate()+"因"+truckCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
  164 + smsString = "失信提醒："+truckCredit.getLicensePlate()+"因"+truckCredit.getReason()+"原因，被纳入失信名单，将影响渣土业务办理，请及时处理。";
169 165 }else{
170   - smsString = "【长沙渣管】失信解除提醒："+truckCredit.getLicensePlate()+"现已解除失信，可以进行渣土业务办理，请知悉。";
  166 + smsString = "失信解除提醒："+truckCredit.getLicensePlate()+"现已解除失信，可以进行渣土业务办理，请知悉。";
171 167 }
172 168  
173 169  
... ... @@ -183,7 +179,7 @@ public class TruckCreditServiceImpl implements ITruckCreditService
183 179 System.out.println("发送返回空");
184 180 }
185 181 }
186   - }
  182 + }}
187 183 return i;
188 184 }
189 185  
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @2c9117a
... ... @@ -95,7 +95,7 @@ public class ViolationCaseFileController extends BaseController {
95 95 }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
96 96 list.get(i).status1 = "已回复";
97 97 }else if(list.get(i).status1 != null && Integer.parseInt(list.get(i).status1) > 1){
98   - list.get(i).status1 = "待审核";
  98 + list.get(i).status1 = "审核中";
99 99 }
100 100 }
101 101 ExcelUtil<ViolationCaseFile> util = new ExcelUtil<ViolationCaseFile>(ViolationCaseFile.class);
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @2c9117a
... ... @@ -88,7 +88,7 @@ public class ViolationWarningInformationController extends BaseController
88 88 }else if(list.get(i).status1!= null && Integer.parseInt(list.get(i).status1) == 1){
89 89 list.get(i).status1 = "已回复";
90 90 }else if(list.get(i).status1 != null && Integer.parseInt(list.get(i).status1) > 1){
91   - list.get(i).status1 = "待审核";
  91 + list.get(i).status1 = "审核中";
92 92 }
93 93 for(SysDictData d:caseType){
94 94 if(d.getDictValue().equals(list.get(i).getViolationType())){
... ...
trash-workFlow/src/main/java/com/trash/casefile/domain/ViolationCaseFile.java
  View file @2c9117a
... ... @@ -92,7 +92,7 @@ public class ViolationCaseFile extends BaseEntity
92 92  
93 93 private String endTime;
94 94  
95   - private List<String> names;
  95 + private String names;
96 96  
97 97 private String needUpload;
98 98  
... ... @@ -177,11 +177,11 @@ public class ViolationCaseFile extends BaseEntity
177 177 this.needUpload = needUpload;
178 178 }
179 179  
180   - public List<String> getNames() {
  180 + public String getNames() {
181 181 return names;
182 182 }
183 183  
184   - public void setNames(List<String> names) {
  184 + public void setNames(String names) {
185 185 this.names = names;
186 186 }
187 187  
... ...
trash-workFlow/src/main/java/com/trash/casefile/kafka/Consumer.java
  View file @2c9117a
... ... @@ -103,7 +103,7 @@ public class Consumer {
103 103 }
104 104 }else{//其他都是根据工地/消纳站累加
105 105 String project = jsonObject.getString("siteName");
106   - violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationType, nowDate, tomorrowDate);
  106 + violationWarningInformation1 = SpringUtils.getBean(ViolationWarningInformationMapper.class).selectViolationWarningInformation(null,project, violationTypeCode, nowDate, tomorrowDate);
107 107 }
108 108 String siteName = jsonObject.getString("siteName");
109 109 //判断该类型，该工地，该时间段是否已经存在报警信息，如果存在则不再新增，如果不存在则新增
... ...
trash-workFlow/src/main/java/com/trash/casefile/service/impl/ViolationCaseFileServiceImpl.java
  View file @2c9117a
... ... @@ -41,379 +41,436 @@ import com.trash.workflow.service.IWorkflowService;
41 41 * @date 2023-05-11
42 42 */
43 43 @Service
44   -public class ViolationCaseFileServiceImpl implements IViolationCaseFileService
45   -{
46   - @Autowired
47   - private ViolationCaseFileMapper violationCaseFileMapper;
48   - @Autowired
49   - private UploadFileMapper uploadFileMapper;
50   -
51   - @Autowired
52   - IWorkflowService WorkflowService;
53   -
54   - @Autowired
55   - RedisCache redisCache;
56   - /**
57   - * 查询平台违规案卷
58   - *
59   - * @param id 平台违规案卷ID
60   - * @return 平台违规案卷
61   - */
62   - @Override
63   - public ViolationCaseFileVo selectViolationCaseFileById(String id)
64   - {
65   - ViolationCaseFileVo violationCaseFileVo = new ViolationCaseFileVo();
66   - violationCaseFileVo.setViolationCaseFile(violationCaseFileMapper.selectViolationCaseFileById(id));
67   - if(violationCaseFileVo.getViolationCaseFile()!=null){
68   - UploadFile uploadFile = new UploadFile();
69   - uploadFile.setTableName("violation_case_file");
70   - uploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
71   - List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
72   - violationCaseFileVo.setUploadFiles(list);
73   - }
74   - return violationCaseFileVo;
75   - }
76   -
77   - /**
78   - * 查询平台违规案卷列表
79   - *
80   - * @param violationCaseFile 平台违规案卷
81   - * @return 平台违规案卷
82   - */
83   - @Override
84   - public List<ViolationCaseFile> selectViolationCaseFileList(ViolationCaseFile violationCaseFile)
85   - {
86   -
87   - if(violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")){
88   - return violationCaseFileMapper.selectViolationCaseFileList(violationCaseFile);
89   - }
90   -
91   - if(violationCaseFile.getStatus1() != null){
92   - if(violationCaseFile.getStatus1().equals("0")){
  44 +public class ViolationCaseFileServiceImpl implements IViolationCaseFileService {
  45 + @Autowired
  46 + private ViolationCaseFileMapper violationCaseFileMapper;
  47 + @Autowired
  48 + private UploadFileMapper uploadFileMapper;
  49 +
  50 + @Autowired
  51 + IWorkflowService WorkflowService;
  52 +
  53 + @Autowired
  54 + RedisCache redisCache;
  55 +
  56 + /**
  57 + * 查询平台违规案卷
  58 + *
  59 + * @param id
  60 + * 平台违规案卷ID
  61 + * @return 平台违规案卷
  62 + */
  63 + @Override
  64 + public ViolationCaseFileVo selectViolationCaseFileById(String id) {
  65 + ViolationCaseFileVo violationCaseFileVo = new ViolationCaseFileVo();
  66 + violationCaseFileVo.setViolationCaseFile(violationCaseFileMapper.selectViolationCaseFileById(id));
  67 + if (violationCaseFileVo.getViolationCaseFile() != null) {
  68 + UploadFile uploadFile = new UploadFile();
  69 + uploadFile.setTableName("violation_case_file");
  70 + uploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
  71 + List<UploadFile> list = uploadFileMapper.selectUploadFileList(uploadFile);
  72 + violationCaseFileVo.setUploadFiles(list);
  73 + }
  74 + return violationCaseFileVo;
  75 + }
  76 +
  77 + /**
  78 + * 查询平台违规案卷列表
  79 + *
  80 + * @param violationCaseFile
  81 + * 平台违规案卷
  82 + * @return 平台违规案卷
  83 + */
  84 + @Override
  85 + public List<ViolationCaseFile> selectViolationCaseFileList(ViolationCaseFile violationCaseFile) {
  86 +
  87 + if (violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")) {
  88 + return violationCaseFileMapper.selectViolationCaseFileList(violationCaseFile);
  89 + }
  90 +
  91 + if (violationCaseFile.getStatus1() != null) {
  92 + if (violationCaseFile.getStatus1().equals("0")) {
93 93 violationCaseFile.setStatus1(" and (read_by is null or read_by = '')");
94   - }else if(violationCaseFile.getStatus1().equals("1")){
  94 + } else if (violationCaseFile.getStatus1().equals("1")) {
95 95 violationCaseFile.setStatus1(" and status1 = 1 and status = 0");
96   - }else if(violationCaseFile.getStatus1().equals("2")){
  96 + } else if (violationCaseFile.getStatus1().equals("2")) {
97 97 violationCaseFile.setStatus1(" and status1 > 1 and status = 0");
98   - }else if(violationCaseFile.getStatus1().equals("3")){
  98 + } else if (violationCaseFile.getStatus1().equals("3")) {
99 99 violationCaseFile.setStatus1(" and status = 1");
100 100 }
101 101 }
102   -
103   - List<ViolationCaseFile> list = new ArrayList<>();
104   - JSONArray areas = redisCache.getCacheObject("areas");
105   -
106   - if (areas == null) {
107   - areas = RemoteServerUtils.getAreas();
108   - redisCache.setCacheObject("areas", areas);
109   - }
110   -
111   -
112   - List<String> names = new ArrayList<>();
113   -
114   -
115   -
116   -
117   - List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
118   - List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
119   - List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
120   - List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
121   -
122   - JSONArray earthList = redisCache.getCacheObject("earthSitesList");
123   - JSONArray construList = redisCache.getCacheObject("constructionList");
124   - JSONArray companyList = redisCache.getCacheObject("companyList");
125 102  
126   - List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
127   - List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
128   - for(Object obj:companyList) {
129   - JSONObject jsonObject = (JSONObject)obj;
130   - if(companyIds.indexOf(jsonObject.getString("id")) > -1 || companyAreas.indexOf(jsonObject.getString("areaCode"))> -1){
131   - names.add(jsonObject.getString("name"));
132   - }
133   - }
134   -
135   -
136   -
137   - for(Object obj:earthList){
138   - JSONObject jsonObject = (JSONObject) obj;
139   - if(eLish.indexOf(jsonObject.getString("id")) > -1 || eArea.indexOf(jsonObject.getString("areaCode"))> -1){
140   - names.add(jsonObject.getString("name"));
141   - }
142   - }
143   - for(Object obj:construList){
144   - JSONObject jsonObject = (JSONObject) obj;
145   - if(cLish.indexOf(jsonObject.getString("id")) > -1 || cArea.indexOf(jsonObject.getString("areaCode"))> -1){
146   - names.add(jsonObject.getString("name"));
147   - }
148   - }
149   -
150   - if(names.size() == 0){
151   - return list;
152   - }else{
153   - violationCaseFile.setNames(names);
154   - }
155   -
156   -
157   -
158   - return violationCaseFileMapper.selectViolationCaseFileList(violationCaseFile);
159   - }
160   -
161   -
162   -
163   - @Override
164   - public List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion,String startDate,String endDate,String violationObjectType)
165   - {
166   -
167   - List<SysDictData> dicts = SpringUtils.getBean(ISysDictTypeService.class).selectDictDataByType("vio_casefile");
168   -
169   - List<ViolationCaseFile> list = violationCaseFileMapper.selectViolationCaseFileListByTable(owningRegion,startDate,endDate,violationObjectType);
  103 + List<ViolationCaseFile> list = new ArrayList<>();
  104 + JSONArray areas = redisCache.getCacheObject("areas");
  105 +
  106 + if (areas == null) {
  107 + areas = RemoteServerUtils.getAreas();
  108 + redisCache.setCacheObject("areas", areas);
  109 + }
170 110  
171   -
172   - if(violationObjectType != null && !violationObjectType.isEmpty()){
  111 + Map<String,String> map = new HashMap<>();
  112 + for(Object obj:areas){
  113 +
  114 + JSONObject json = (JSONObject) obj;
  115 +
  116 + map.put(json.getString("code"), json.getString("name"));
  117 + }
  118 +
  119 + List<String> names = new ArrayList<>();
  120 +
  121 + List<String> cLish = SecurityUtils.getLoginUser().getUser().getConList();
  122 + List<String> cArea = SecurityUtils.getLoginUser().getUser().getConAreas();
  123 + List<String> eLish = SecurityUtils.getLoginUser().getUser().getEarthList();
  124 + List<String> eArea = SecurityUtils.getLoginUser().getUser().getEarthAreas();
  125 + List<String> companyAreas = SecurityUtils.getLoginUser().getUser().getCompanyAreas();
  126 + List<String> companyIds = SecurityUtils.getLoginUser().getUser().getCompanyIds();
  127 +
  128 + String sql = null;
  129 +
  130 + if (cArea.size() > 0) {
  131 + if (sql == null) {
  132 + sql = " and (";
  133 + }
  134 +
  135 + sql += "(violation_object_type = 0 and owning_region in (";
  136 + for (String str : cArea) {
  137 + sql += "'" +map.get(str) + "',";
  138 + }
  139 +
  140 + sql = sql.substring(0, sql.length() - 1);
  141 +
  142 + sql += "))";
  143 + }
  144 + if (eArea.size() > 0) {
  145 + if (sql == null) {
  146 + sql = " and (";
  147 + } else {
  148 + sql += " or ";
  149 + }
  150 +
  151 + sql += "(violation_object_type = 1 and owning_region in (";
  152 + for (String str : eArea) {
  153 + sql += "'" + map.get(str) + "',";
  154 + }
  155 +
  156 + sql = sql.substring(0, sql.length() - 1);
  157 + sql += "))";
  158 + }
  159 + if (companyAreas.size() > 0) {
  160 + if (sql == null) {
  161 + sql = " and (";
  162 + } else {
  163 + sql += " or ";
  164 + }
  165 +
  166 + sql += "(violation_object_type = 2 and owning_region in (";
  167 + for (String str : eArea) {
  168 + sql += "'"+ map.get(str) + "',";
  169 + }
  170 +
  171 + sql = sql.substring(0, sql.length() - 1);
  172 + sql += "))";
  173 + }
  174 +
  175 + JSONArray earthList = redisCache.getCacheObject("earthSitesList");
  176 + JSONArray construList = redisCache.getCacheObject("constructionList");
  177 + JSONArray companyList = redisCache.getCacheObject("companyList");
  178 +
  179 + for (Object obj : companyList) {
  180 + JSONObject jsonObject = (JSONObject) obj;
  181 + if (companyIds.indexOf(jsonObject.getString("id")) > -1) {
  182 + names.add(jsonObject.getString("name"));
  183 + }
  184 + }
  185 +
  186 + for (Object obj : earthList) {
  187 + JSONObject jsonObject = (JSONObject) obj;
  188 + if (eLish.indexOf(jsonObject.getString("id")) > -1) {
  189 + names.add(jsonObject.getString("name"));
  190 + }
  191 + }
  192 + for (Object obj : construList) {
  193 + JSONObject jsonObject = (JSONObject) obj;
  194 + if (cLish.indexOf(jsonObject.getString("id")) > -1) {
  195 + names.add(jsonObject.getString("name"));
  196 + }
  197 + }
  198 +
  199 + if(names.size() > 0){
  200 + if (sql == null) {
  201 + sql = " and (";
  202 + } else {
  203 + sql += " or ";
  204 + }
  205 +
  206 + sql += "(project_name in (";
  207 + for (String str : names) {
  208 + sql += "'"+str + "',";
  209 + }
  210 +
  211 + sql = sql.substring(0, sql.length() - 1);
  212 + sql += "))";
  213 + }
  214 +
  215 + if (sql != null) {
  216 + sql += ")";
  217 + }
  218 +
  219 + violationCaseFile.setNames(sql);
  220 + return violationCaseFileMapper.selectViolationCaseFileList(violationCaseFile);
  221 + }
  222 +
  223 + @Override
  224 + public List<ViolationCaseFile> selectViolationCaseFileListByTable(String owningRegion, String startDate,
  225 + String endDate, String violationObjectType) {
  226 +
  227 + List<SysDictData> dicts = SpringUtils.getBean(ISysDictTypeService.class).selectDictDataByType("vio_casefile");
  228 +
  229 + List<ViolationCaseFile> list = violationCaseFileMapper.selectViolationCaseFileListByTable(owningRegion,
  230 + startDate, endDate, violationObjectType);
  231 +
  232 + if (violationObjectType != null && !violationObjectType.isEmpty()) {
173 233 List<ViolationCaseFile> newList = new ArrayList<>();
174   - for(ViolationCaseFile v:list){
175   - for(SysDictData d:dicts){
176   - if(d.getDictValue().contains(v.getViolationType()) && violationObjectType.equals(d.getCssClass())){
  234 + for (ViolationCaseFile v : list) {
  235 + for (SysDictData d : dicts) {
  236 + if (d.getDictValue().contains(v.getViolationType())
  237 + && violationObjectType.equals(d.getCssClass())) {
177 238 newList.add(v);
178 239 break;
179 240 }
180 241 }
181 242 }
182 243 return newList;
183   - }else{
  244 + } else {
184 245 return list;
185 246 }
186   -
187   - }
188   -
189   - /**
190   - * 新增平台违规案卷
191   - *
192   - * @param violationCaseFile 平台违规案卷
193   - * @return 结果
194   - */
195   - @Override
196   - @Transactional
197   - public int insertViolationCaseFile(MultipartFile[] files, ViolationCaseFile violationCaseFile) throws IOException
198   - {
199   - violationCaseFile.setCreateBy(SecurityUtils.getUsername());
200   - violationCaseFile.setStatus(0);
201   -
202   - violationCaseFile.setCreateTime(DateUtils.getNowDate());
203   - //判断公司是否为空，如果不为空则查询公司简称
204   - if(StringUtils.isNotEmpty(violationCaseFile.getCompanyName())) {
205   - JSONArray companyList = redisCache.getCacheObject("companyList");
206   - for (Object o : companyList) {
207   - JSONObject jo = (JSONObject) o;
208   - if (violationCaseFile.getCompanyName().equals(jo.getString("name"))) {
209   - violationCaseFile.setAbbreviation(jo.getString("abbreviation"));
210   - break;
211   - }
212   - }
213   - }
214   -
215   - if(violationCaseFile.getViolationObjectType().equals("2")) {
216   - violationCaseFile.setProjectName(violationCaseFile.getCompanyName());
217   - }
218   -
219   - Integer result = violationCaseFileMapper.insertViolationCaseFile(violationCaseFile);
220   -
221   - List<Map<String,String>> upfiles = new ArrayList();
222   - //文件上传
223   - for (MultipartFile file : files) {
224   - UploadFile uploadFile = new UploadFile();
225   - uploadFile.setTableName("violation_case_file");
226   - uploadFile.setTableNumber(violationCaseFile.getId().toString());
227   - uploadFile.setFileName(file.getOriginalFilename());
228   - String path = FileUploadUtils.uploadFile(file);
229   - uploadFile.setFilePath(path);
230   - uploadFileMapper.insertUploadFile(uploadFile);
231   -
232   -
233   - if(violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")){
234   - Map map = new HashMap();
235   -
236   - if(file.getOriginalFilename().toUpperCase().endsWith("JPG")
237   - || file.getOriginalFilename().toUpperCase().endsWith("PNG")
238   - || file.getOriginalFilename().toUpperCase().endsWith("JPEG")){
239   - map.put("attchType", 0);
240   - }else if(file.getOriginalFilename().toUpperCase().endsWith("MP3")){
241   - map.put("attchType", 1);
242   - }else if(file.getOriginalFilename().toUpperCase().endsWith("MP4") || file.getOriginalFilename().toUpperCase().endsWith("AVI")){
243   - map.put("attchType", 2);
244   - }
245   -
246   - map.put("attchFileName", file.getOriginalFilename());
247   - map.put("attchFilePath", "http://172.26.157.12:10001/workflow" + path);
248   -
249   -
250   - upfiles.add(map);
251   -
252   - }
253   -
254   - }
255   -
256   - if(violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")){
257   -
258   - Map params = new HashMap<>();
259   -
260   - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
261   -
262   -
263   - JSONArray array = RemoteServerUtils.getUpArea();
264   -
265   - for(Object object:array){
266   - JSONObject json = (JSONObject) object;
267   -
268   - if(json.getString("areaName").equals(violationCaseFile.getOwningRegion())){
269   -
270   - params.put("areaCode",json.getString("areaCode"));
271   - break;
272   - }
273   -
274   - }
275   -
276   -
277   - JSONObject classObj = RemoteServerUtils.getUpClass();
278   -
279   -
280   - params.put("areaName",violationCaseFile.getOwningRegion());
281   - params.put("caseSource","01");
282   - params.put("caseClassId","1712034951982526466");
283   - params.put("position","未填写");
284   - params.put("questionDesc",violationCaseFile.getDescribe());
285   - params.put("reportTime",sdf.format(new java.util.Date()));
286   - params.put("reporter",SecurityUtils.getUsername());
287   - params.put("thirdCaseId",violationCaseFile.getId());
288   - params.put("geoX",0);
289   - params.put("geoY",0);
290   - params.put("attchList",upfiles);
291   - if(!RemoteServerUtils.insertUpCase(params)){
292   - violationCaseFileMapper.deleteViolationCaseFileById(violationCaseFile.getId());
293   - return 2;
294   - }
295   -
296   - return result;
297   - }
298   -
299   -
300   - int i = 0;
301   - //根据发送对象判断流程
302   - if(violationCaseFile.getSendObject().equals("区管理部门")){
303   -
304   - if(violationCaseFile.getViolationGrade().equals("一般类")){
305   - i = 1;
306   - }else{
307   - i = 2;
308   - }
309   - }
310   - if(violationCaseFile.getViolationType().equals("三无车辆进入工地")||violationCaseFile.getViolationType().equals("三无车辆进入处理场所")||violationCaseFile.getViolationType().equals("三无车辆运输")){
311   - i = 2;
312   - }
313   -
314   -
315   - WorkflowService.createCaseFile(violationCaseFile,i);
316   -
317   - return result;
318   - }
319   -
320   - /**
321   - * 修改平台违规案卷
322   - *
323   - * @param violationCaseFileVo 平台违规案卷
324   - * @return 结果
325   - */
326   - @Override
327   - @Transactional
328   - public int updateViolationCaseFile(MultipartFile[] files, ViolationCaseFileVo violationCaseFileVo) throws IOException
329   - {
330   - violationCaseFileVo.getViolationCaseFile().setUpdateBy(SecurityUtils.getUsername());
331   - //查询该合同下的文件上传数据然后删除数据库中的数据和文件
332   - UploadFile uploadFile = new UploadFile();
333   - uploadFile.setTableName("violation_case_file");
334   - uploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
335   - List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile);
336   - //判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件
337   - if (violationCaseFileVo.getUploadFiles().size() != 0) {
338   - //获取两个list的交集
339   - List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationCaseFileVo.getUploadFiles().stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList());
340   - //去掉交集得到需要删除的数据
341   - uploadFileList.removeAll(distinctList);
342   -
343   - for (UploadFile distinctFile : uploadFileList) {
344   - uploadFileMapper.deleteUploadFileById(distinctFile.getId());
345   - //删除文件
346   - FileUploadUtils.deleteFile(distinctFile.getFilePath());
347   - }
348   - } else {
349   - for (UploadFile uploadFile1 : uploadFileList) {
350   - //删除数据库数据
351   - uploadFileMapper.deleteUploadFileById(uploadFile1.getId());
352   - //删除文件
353   - FileUploadUtils.deleteFile(uploadFile1.getFilePath());
354   - }
355   - }
356   -
357   - //添加新的文件
358   - for (MultipartFile file : files) {
359   - UploadFile newUploadFile = new UploadFile();
360   - newUploadFile.setTableName("violation_case_file");
361   - newUploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
362   - newUploadFile.setFileName(file.getOriginalFilename());
363   - newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
364   - uploadFileMapper.insertUploadFile(newUploadFile);
365   - }
366   -
367   - int i = 0;
368   - //根据发送对象判断流程
369   - if(violationCaseFileVo.getViolationCaseFile().getSendObject().equals("区管理部门")){
370   -
371   - if(violationCaseFileVo.getViolationCaseFile().getViolationGrade().equals("一般类")){
372   - i = 1;
373   - }else{
374   - i = 2;
375   - }
376   - }
377   - if(violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆进入工地")||
378   - violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆进入处理场所")||
379   - violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆运输")){
380   - i = 2;
381   - }
382   -
383   -
384   - WorkflowService.createCaseFile(violationCaseFileVo.getViolationCaseFile(),i);
385   -
386   - violationCaseFileVo.getViolationCaseFile().setStatus(0);
387   -
388   - return violationCaseFileMapper.updateViolationCaseFile(violationCaseFileVo.getViolationCaseFile());
389   - }
390   -
391   - public void updateViolationCaseFile(ViolationCaseFile file){
392   - violationCaseFileMapper.updateViolationCaseFile(file);
393   - }
394   -
395   -
396   - /**
397   - * 批量删除平台违规案卷
398   - *
399   - * @param ids 需要删除的平台违规案卷ID
400   - * @return 结果
401   - */
402   - @Override
403   - public int deleteViolationCaseFileByIds(String[] ids) throws IOException
404   - {
405   - return violationCaseFileMapper.deleteViolationCaseFileByIds(ids);
406   - }
407   -
408   - /**
409   - * 删除平台违规案卷信息
410   - *
411   - * @param id 平台违规案卷ID
412   - * @return 结果
413   - */
414   - @Override
415   - public int deleteViolationCaseFileById(String id)
416   - {
417   - return violationCaseFileMapper.deleteViolationCaseFileById(id);
418   - }
  247 +
  248 + }
  249 +
  250 + /**
  251 + * 新增平台违规案卷
  252 + *
  253 + * @param violationCaseFile
  254 + * 平台违规案卷
  255 + * @return 结果
  256 + */
  257 + @Override
  258 + @Transactional
  259 + public int insertViolationCaseFile(MultipartFile[] files, ViolationCaseFile violationCaseFile) throws IOException {
  260 + violationCaseFile.setCreateBy(SecurityUtils.getUsername());
  261 + violationCaseFile.setStatus(0);
  262 +
  263 + violationCaseFile.setCreateTime(DateUtils.getNowDate());
  264 + // 判断公司是否为空，如果不为空则查询公司简称
  265 + if (StringUtils.isNotEmpty(violationCaseFile.getCompanyName())) {
  266 + JSONArray companyList = redisCache.getCacheObject("companyList");
  267 + for (Object o : companyList) {
  268 + JSONObject jo = (JSONObject) o;
  269 + if (violationCaseFile.getCompanyName().equals(jo.getString("name"))) {
  270 + violationCaseFile.setAbbreviation(jo.getString("abbreviation"));
  271 + break;
  272 + }
  273 + }
  274 + }
  275 +
  276 + if (violationCaseFile.getViolationObjectType().equals("2")) {
  277 + violationCaseFile.setProjectName(violationCaseFile.getCompanyName());
  278 + }
  279 +
  280 + Integer result = violationCaseFileMapper.insertViolationCaseFile(violationCaseFile);
  281 +
  282 + List<Map<String, String>> upfiles = new ArrayList();
  283 + // 文件上传
  284 + for (MultipartFile file : files) {
  285 + UploadFile uploadFile = new UploadFile();
  286 + uploadFile.setTableName("violation_case_file");
  287 + uploadFile.setTableNumber(violationCaseFile.getId().toString());
  288 + uploadFile.setFileName(file.getOriginalFilename());
  289 + String path = FileUploadUtils.uploadFile(file);
  290 + uploadFile.setFilePath(path);
  291 + uploadFileMapper.insertUploadFile(uploadFile);
  292 +
  293 + if (violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")) {
  294 + Map map = new HashMap();
  295 +
  296 + if (file.getOriginalFilename().toUpperCase().endsWith("JPG")
  297 + || file.getOriginalFilename().toUpperCase().endsWith("PNG")
  298 + || file.getOriginalFilename().toUpperCase().endsWith("JPEG")) {
  299 + map.put("attchType", 0);
  300 + } else if (file.getOriginalFilename().toUpperCase().endsWith("MP3")) {
  301 + map.put("attchType", 1);
  302 + } else if (file.getOriginalFilename().toUpperCase().endsWith("MP4")
  303 + || file.getOriginalFilename().toUpperCase().endsWith("AVI")) {
  304 + map.put("attchType", 2);
  305 + }
  306 +
  307 + map.put("attchFileName", file.getOriginalFilename());
  308 + map.put("attchFilePath", "http://172.26.157.12:10001/workflow" + path);
  309 +
  310 + upfiles.add(map);
  311 +
  312 + }
  313 +
  314 + }
  315 +
  316 + if (violationCaseFile.getNeedUpload() != null && violationCaseFile.getNeedUpload().equals("1")) {
  317 +
  318 + Map params = new HashMap<>();
  319 +
  320 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  321 +
  322 + JSONArray array = RemoteServerUtils.getUpArea();
  323 +
  324 + for (Object object : array) {
  325 + JSONObject json = (JSONObject) object;
  326 +
  327 + if (json.getString("areaName").equals(violationCaseFile.getOwningRegion())) {
  328 +
  329 + params.put("areaCode", json.getString("areaCode"));
  330 + break;
  331 + }
  332 +
  333 + }
  334 +
  335 + JSONObject classObj = RemoteServerUtils.getUpClass();
  336 +
  337 + params.put("areaName", violationCaseFile.getOwningRegion());
  338 + params.put("caseSource", "01");
  339 + params.put("caseClassId", "1712034951982526466");
  340 + params.put("position", "未填写");
  341 + params.put("questionDesc", violationCaseFile.getDescribe());
  342 + params.put("reportTime", sdf.format(new java.util.Date()));
  343 + params.put("reporter", SecurityUtils.getUsername());
  344 + params.put("thirdCaseId", violationCaseFile.getId());
  345 + params.put("geoX", 0);
  346 + params.put("geoY", 0);
  347 + params.put("attchList", upfiles);
  348 + if (!RemoteServerUtils.insertUpCase(params)) {
  349 + violationCaseFileMapper.deleteViolationCaseFileById(violationCaseFile.getId());
  350 + return 2;
  351 + }
  352 +
  353 + return result;
  354 + }
  355 +
  356 + int i = 0;
  357 + // 根据发送对象判断流程
  358 + if (violationCaseFile.getSendObject().equals("区管理部门")) {
  359 +
  360 + if (violationCaseFile.getViolationGrade().equals("一般类")) {
  361 + i = 1;
  362 + } else {
  363 + i = 2;
  364 + }
  365 + }
  366 + if (violationCaseFile.getViolationType().equals("三无车辆进入工地")
  367 + || violationCaseFile.getViolationType().equals("三无车辆进入处理场所")
  368 + || violationCaseFile.getViolationType().equals("三无车辆运输")) {
  369 + i = 2;
  370 + }
  371 +
  372 + WorkflowService.createCaseFile(violationCaseFile, i);
  373 +
  374 + return result;
  375 + }
  376 +
  377 + /**
  378 + * 修改平台违规案卷
  379 + *
  380 + * @param violationCaseFileVo
  381 + * 平台违规案卷
  382 + * @return 结果
  383 + */
  384 + @Override
  385 + @Transactional
  386 + public int updateViolationCaseFile(MultipartFile[] files, ViolationCaseFileVo violationCaseFileVo)
  387 + throws IOException {
  388 + violationCaseFileVo.getViolationCaseFile().setUpdateBy(SecurityUtils.getUsername());
  389 + // 查询该合同下的文件上传数据然后删除数据库中的数据和文件
  390 + UploadFile uploadFile = new UploadFile();
  391 + uploadFile.setTableName("violation_case_file");
  392 + uploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
  393 + List<UploadFile> uploadFileList = uploadFileMapper.selectUploadFileList(uploadFile);
  394 + // 判断getUploadFiles里是否有旧文件，如果有文件上传则先删除数据库中的数据，再添加新的数据，如果没有文件上传，则删除数据库中的数据和文件
  395 + if (violationCaseFileVo.getUploadFiles().size() != 0) {
  396 + // 获取两个list的交集
  397 + List<UploadFile> distinctList = uploadFileList.stream().filter(item -> violationCaseFileVo.getUploadFiles()
  398 + .stream().anyMatch(item2 -> item.getId().equals(item2.getId()))).collect(Collectors.toList());
  399 + // 去掉交集得到需要删除的数据
  400 + uploadFileList.removeAll(distinctList);
  401 +
  402 + for (UploadFile distinctFile : uploadFileList) {
  403 + uploadFileMapper.deleteUploadFileById(distinctFile.getId());
  404 + // 删除文件
  405 + FileUploadUtils.deleteFile(distinctFile.getFilePath());
  406 + }
  407 + } else {
  408 + for (UploadFile uploadFile1 : uploadFileList) {
  409 + // 删除数据库数据
  410 + uploadFileMapper.deleteUploadFileById(uploadFile1.getId());
  411 + // 删除文件
  412 + FileUploadUtils.deleteFile(uploadFile1.getFilePath());
  413 + }
  414 + }
  415 +
  416 + // 添加新的文件
  417 + for (MultipartFile file : files) {
  418 + UploadFile newUploadFile = new UploadFile();
  419 + newUploadFile.setTableName("violation_case_file");
  420 + newUploadFile.setTableNumber(violationCaseFileVo.getViolationCaseFile().getId().toString());
  421 + newUploadFile.setFileName(file.getOriginalFilename());
  422 + newUploadFile.setFilePath(FileUploadUtils.uploadFile(file));
  423 + uploadFileMapper.insertUploadFile(newUploadFile);
  424 + }
  425 +
  426 + int i = 0;
  427 + // 根据发送对象判断流程
  428 + if (violationCaseFileVo.getViolationCaseFile().getSendObject().equals("区管理部门")) {
  429 +
  430 + if (violationCaseFileVo.getViolationCaseFile().getViolationGrade().equals("一般类")) {
  431 + i = 1;
  432 + } else {
  433 + i = 2;
  434 + }
  435 + }
  436 + if (violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆进入工地")
  437 + || violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆进入处理场所")
  438 + || violationCaseFileVo.getViolationCaseFile().getViolationType().equals("三无车辆运输")) {
  439 + i = 2;
  440 + }
  441 +
  442 + WorkflowService.createCaseFile(violationCaseFileVo.getViolationCaseFile(), i);
  443 +
  444 + violationCaseFileVo.getViolationCaseFile().setStatus(0);
  445 +
  446 + return violationCaseFileMapper.updateViolationCaseFile(violationCaseFileVo.getViolationCaseFile());
  447 + }
  448 +
  449 + public void updateViolationCaseFile(ViolationCaseFile file) {
  450 + violationCaseFileMapper.updateViolationCaseFile(file);
  451 + }
  452 +
  453 + /**
  454 + * 批量删除平台违规案卷
  455 + *
  456 + * @param ids
  457 + * 需要删除的平台违规案卷ID
  458 + * @return 结果
  459 + */
  460 + @Override
  461 + public int deleteViolationCaseFileByIds(String[] ids) throws IOException {
  462 + return violationCaseFileMapper.deleteViolationCaseFileByIds(ids);
  463 + }
  464 +
  465 + /**
  466 + * 删除平台违规案卷信息
  467 + *
  468 + * @param id
  469 + * 平台违规案卷ID
  470 + * @return 结果
  471 + */
  472 + @Override
  473 + public int deleteViolationCaseFileById(String id) {
  474 + return violationCaseFileMapper.deleteViolationCaseFileById(id);
  475 + }
419 476 }
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationCaseFileMapper.xml
  View file @2c9117a
... ... @@ -39,7 +39,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
39 39 select a.*,c.status1 from casefile_violation a
40 40 left join (select a.table_name,count(*) status1 from
41 41 (select * from reply_approval_process b where table_name like "%workflow_casefile%" GROUP BY b.table_name,b.reply_people) a
42   - group by a.table_name order by a.table_name desc) c
  42 + group by a.table_name) c
43 43 on CONCAT("workflow_casefile:",a.id) = c.table_name
44 44 <where>
45 45 <if test="number != null and number != ''"> and number = #{number}</if>
... ... @@ -59,10 +59,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
59 59 <if test="createTime != null "> and create_time > #{createTime}</if>
60 60 <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
61 61 <if test="names != null ">
62   - and project_name in
63   - <foreach item="name" collection="names" open="(" separator="," close=")">
64   - #{name}
65   - </foreach>
  62 + ${names}
66 63 </if>
67 64 <if test="needUpload == null or needUpload == 0 ">
68 65 and need_upload != 1
... ...
trash-workFlow/src/main/resources/mapper/casefile/ViolationWarningInformationMapper.xml
  View file @2c9117a
... ... @@ -34,8 +34,9 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
34 34 <select id="selectViolationWarningInformationList" parameterType="ViolationWarningInformation" resultMap="ViolationWarningInformationResult">
35 35 select a.*,c.status1
36 36 from casefile_violation_warning_information a
37   - left join (select b.table_name,count(*) status1 from reply_approval_process b where table_name like "%violation_warning%"
38   - GROUP BY b.table_name,b.reply_people) c
  37 + left join (select a.table_name,count(*) status1 from
  38 + (select * from reply_approval_process b where table_name like "%violation_warning%" GROUP BY b.table_name,b.reply_people) a
  39 + group by a.table_name) c
39 40 on CONCAT("violation_warning:",a.id) = c.table_name
40 41 <where>
41 42 <if test="number != null and number != ''"> and `number` = #{number}</if>
... ... @@ -49,6 +50,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
49 50 <if test="startTime != null "> and create_time between #{startTime} and #{endTime}</if>
50 51 <if test="names != null ">
51 52 and project_name in
  53 +
52 54 <foreach item="name" collection="names" open="(" separator="," close=")">
53 55 #{name}
54 56 </foreach>
... ...