1.完善案件领导上报路程
2.新增流程历史任务与变量查询方法
This commit is contained in:
parent
c6f9f7dca2
commit
3d33d02556
@ -19,6 +19,7 @@ import com.cm.inspection.pojo.vos.check.CheckCompleteVO;
|
||||
import com.cm.inspection.pojo.vos.check.StreetToLeaderVO;
|
||||
import com.cm.inspection.service.check.ICheck2Service;
|
||||
import io.swagger.annotations.*;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
import org.springframework.web.bind.annotation.*;
|
||||
@ -224,4 +225,9 @@ public class Check2Controller extends AbstractController {
|
||||
return check2Service.listPageCityOfMine(page);
|
||||
}
|
||||
|
||||
@GetMapping("list-historic-task/{checkId}")
|
||||
public List<HistoricTaskInstance> listHistoricTask(@PathVariable("checkId") String checkId) {
|
||||
return check2Service.listHistoricTask(checkId);
|
||||
}
|
||||
|
||||
}
|
||||
@ -16,7 +16,8 @@ public enum CheckProcessParamsEnum {
|
||||
IS_RE_REPORT("isReReport", "是否复查"),
|
||||
LAST_CHECK_ID("lastCheckId", "最后的检查ID"),
|
||||
HANDLE_TYPE("handleType", "处理类型"),
|
||||
LEADER("leader", "领导");
|
||||
LEADER("leader", "领导"),
|
||||
HANDLER("handler", "处理人");
|
||||
|
||||
private String value;
|
||||
private String summary;
|
||||
|
||||
@ -8,6 +8,7 @@ import com.cm.inspection.pojo.dtos.hiddendangerreport.HiddenDangerReportDTO;
|
||||
import com.cm.inspection.pojo.vos.check.Check2VO;
|
||||
import com.cm.inspection.pojo.vos.check.CheckCompleteVO;
|
||||
import com.cm.inspection.pojo.vos.check.StreetToLeaderVO;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
@ -171,4 +172,12 @@ public interface ICheck2Service {
|
||||
* @param streetToLeaderVO
|
||||
*/
|
||||
void updateStreetToLeader(String checkId, StreetToLeaderVO streetToLeaderVO);
|
||||
|
||||
/**
|
||||
* 检查任务历史
|
||||
*
|
||||
* @param checkId
|
||||
* @return
|
||||
*/
|
||||
List<HistoricTaskInstance> listHistoricTask(String checkId);
|
||||
}
|
||||
|
||||
@ -31,6 +31,7 @@ import com.cm.inspection.service.process.IProcessService;
|
||||
import com.cm.inspection.service.taskcheck.ITaskCheckService;
|
||||
import com.github.pagehelper.PageHelper;
|
||||
import com.github.pagehelper.PageInfo;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
import org.apache.commons.lang3.StringUtils;
|
||||
import org.springframework.beans.factory.annotation.Autowired;
|
||||
@ -180,44 +181,26 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
|
||||
@Override
|
||||
public SuccessResultList<List<Check2DTO>> listPageStreetOfMine(ListPage page) {
|
||||
String userId = securityComponent.getCurrentUser().getUserId();
|
||||
List<Task> tasks = processService.listTaskByAssigneeAndVariableKey(userId, GridPersonnelTypeEnum.STREET.getValue());
|
||||
List<String> checkIds = listLastCheckId(tasks);
|
||||
if (checkIds.isEmpty()) {
|
||||
return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
|
||||
}
|
||||
page.getParams().put("checkIds", checkIds);
|
||||
return listPage(page);
|
||||
return listPageOfMine(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SuccessResultList<List<Check2DTO>> listPageDistrictDepartmentOfMine(ListPage page) {
|
||||
String userId = securityComponent.getCurrentUser().getUserId();
|
||||
List<Task> tasks = processService.listTaskByAssigneeAndVariableKey(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), userId);
|
||||
List<String> checkIds = listLastCheckId(tasks);
|
||||
if (checkIds.isEmpty()) {
|
||||
return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
|
||||
}
|
||||
page.getParams().put("checkIds", checkIds);
|
||||
return listPage(page);
|
||||
return listPageOfMine(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SuccessResultList<List<Check2DTO>> listPageDistrictOfMine(ListPage page) {
|
||||
String userId = securityComponent.getCurrentUser().getUserId();
|
||||
List<Task> tasks = processService.listTaskByAssigneeAndVariableKey(GridPersonnelTypeEnum.DISTRICT.getValue(), userId);
|
||||
List<String> checkIds = listLastCheckId(tasks);
|
||||
if (checkIds.isEmpty()) {
|
||||
return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
|
||||
}
|
||||
page.getParams().put("checkIds", checkIds);
|
||||
return listPage(page);
|
||||
return listPageOfMine(page);
|
||||
}
|
||||
|
||||
@Override
|
||||
public SuccessResultList<List<Check2DTO>> listPageCityOfMine(ListPage page) {
|
||||
String userId = securityComponent.getCurrentUser().getUserId();
|
||||
List<Task> tasks = processService.listTaskByAssigneeAndVariableKey(GridPersonnelTypeEnum.CITY.getValue(), userId);
|
||||
return listPageOfMine(page);
|
||||
}
|
||||
|
||||
private SuccessResultList<List<Check2DTO>> listPageOfMine(ListPage page) {
|
||||
List<Task> tasks = processService.listTaskByAssignee(securityComponent.getCurrentUser().getUserId());
|
||||
List<String> checkIds = listLastCheckId(tasks);
|
||||
if (checkIds.isEmpty()) {
|
||||
return new SuccessResultList<>(new ArrayList<>(), 1, 0L);
|
||||
@ -239,7 +222,8 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
Map<String, Object> params = getHashMap(4);
|
||||
params.put("summary", checkCompleteVO.getSummary());
|
||||
params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.HANDLE.getValue());
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
LOG.debug("流程完成");
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -255,6 +239,11 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HistoricTaskInstance> listHistoricTask(String checkId) {
|
||||
return processService.listHistoricTaskInstanceByKeyAndValue(CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId);
|
||||
}
|
||||
|
||||
/**
|
||||
* 上报案件到委办局，逻辑：查找当前用户上级网格员，存在则将案件进行转发，否则抛出异常
|
||||
*
|
||||
@ -270,10 +259,10 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
Map<String, Object> params = getHashMap(4);
|
||||
params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.LEADER.getValue());
|
||||
params.put(CheckProcessParamsEnum.LEADER.getValue(), LeaderTypeEnum.DEPARTMENT.getValue());
|
||||
params.put(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), userId);
|
||||
params.put(CheckProcessParamsEnum.HANDLER.getValue(), gridPersonnelPO.getUserId());
|
||||
params.put("summary", summary);
|
||||
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -291,10 +280,10 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
Map<String, Object> params = getHashMap(4);
|
||||
params.put(CheckProcessParamsEnum.HANDLE_TYPE.getValue(), HandleTypeEnum.LEADER.getValue());
|
||||
params.put(CheckProcessParamsEnum.LEADER.getValue(), LeaderTypeEnum.DISTRICT.getValue());
|
||||
params.put(GridPersonnelTypeEnum.DISTRICT_DEPARTMENT.getValue(), gridPersonnelDTO.getUserId());
|
||||
params.put(CheckProcessParamsEnum.HANDLER.getValue(), gridPersonnelDTO.getUserId());
|
||||
params.put("summary", summary);
|
||||
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -306,8 +295,8 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
private void startCheckProcess(String token, String checkId, String grid, Check2VO check2VO) throws Exception {
|
||||
String businessKey = String.format("%s:%s", BUSINESS_KEY_PREFIX, checkId);
|
||||
Map<String, Object> params = getHashMap(16);
|
||||
LOG.debug("开启流程v2");
|
||||
params.put(GridPersonnelTypeEnum.GRID.getValue(), grid);
|
||||
LOG.debug("开启流程2");
|
||||
params.put(CheckProcessParamsEnum.HANDLER.getValue(), grid);
|
||||
processService.startProcessByName(IProcessService.BT_CHECK_REPORT_V2, businessKey, params);
|
||||
// 得到当前任务
|
||||
Task task = processService.getTaskByAssigneeAndBusinessKey(grid, businessKey);
|
||||
@ -317,12 +306,12 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
params.put(CheckProcessParamsEnum.IS_RE_REPORT.getValue(), 0);
|
||||
if (isAllPass == 0) {
|
||||
LOG.debug("没有全部通过，非复查");
|
||||
processService.setTaskVariableByTaskId(task.getId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId);
|
||||
params.put(CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), checkId);
|
||||
} else {
|
||||
LOG.debug("全部通过，状态标记为完成");
|
||||
updateCheckIsCompleteInfo(token, checkId, 1);
|
||||
}
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
}
|
||||
|
||||
/**
|
||||
@ -347,13 +336,13 @@ public class Check2ServiceImpl extends BaseService implements ICheck2Service {
|
||||
params.put(CheckProcessParamsEnum.IS_RE_REPORT.getValue(), 1);
|
||||
if (isAllPass == 0) {
|
||||
LOG.debug("没有全部通过，上报上级");
|
||||
processService.setTaskVariableByTaskId(task.getId(), CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), reCheckId);
|
||||
params.put(GridPersonnelTypeEnum.STREET.getValue(), leaderId);
|
||||
params.put(CheckProcessParamsEnum.LAST_CHECK_ID.getValue(), reCheckId);
|
||||
params.put(CheckProcessParamsEnum.HANDLER.getValue(), leaderId);
|
||||
} else {
|
||||
LOG.debug("全部通过，状态标记为完成");
|
||||
updateCheckIsCompleteInfo(token, reCheckId, 1);
|
||||
}
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -131,7 +131,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
|
||||
String leaderUserId = gridPersonnelService.getLeaderId(userId, 0);
|
||||
params.put("leader", leaderUserId);
|
||||
}
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
return new SuccessResult();
|
||||
}
|
||||
|
||||
@ -252,7 +252,7 @@ public class CheckServiceImpl extends BaseService implements ICheckService {
|
||||
LOG.debug("1.isCoordination：0, 不配合");
|
||||
setLeaderCheck(token, userId, checkId, oldCheckId, task, params);
|
||||
}
|
||||
processService.saveTaskCompleteByTaskId(task.getId(), params);
|
||||
processService.completeByTaskId(task.getId(), params);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@ -2,11 +2,13 @@ package com.cm.inspection.service.process;
|
||||
|
||||
import org.activiti.engine.history.HistoricProcessInstance;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.history.HistoricVariableInstance;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* When you feel like quitting. Think about why you started
|
||||
@ -282,7 +284,7 @@ public interface IProcessService {
|
||||
* @param taskId
|
||||
* @param params
|
||||
*/
|
||||
void saveTaskCompleteByTaskId(String taskId, Map<String, Object> params);
|
||||
void completeByTaskId(String taskId, Map<String, Object> params);
|
||||
|
||||
/**
|
||||
* 流程实例状态（通过流程ID）
|
||||
@ -306,6 +308,31 @@ public interface IProcessService {
|
||||
*/
|
||||
List<HistoricTaskInstance> listHistoricTaskInstance();
|
||||
|
||||
/**
|
||||
* 历史任务实例列表
|
||||
*
|
||||
* @param key 变量key
|
||||
* @param value 变量value
|
||||
* @return
|
||||
*/
|
||||
List<HistoricTaskInstance> listHistoricTaskInstanceByKeyAndValue(String key, Object value);
|
||||
|
||||
/**
|
||||
* 任务历史变量
|
||||
*
|
||||
* @param taskId 任务ID
|
||||
* @return
|
||||
*/
|
||||
List<HistoricVariableInstance> listHistoricVariableInstanceByKeyAndValue(String taskId);
|
||||
|
||||
/**
|
||||
* 任务历史变量
|
||||
*
|
||||
* @param taskIds 任务ID集合
|
||||
* @return
|
||||
*/
|
||||
List<HistoricVariableInstance> listHistoricVariableInstanceByKeyAndValue(Set<String> taskIds);
|
||||
|
||||
/**
|
||||
* 激活流程
|
||||
*
|
||||
|
||||
@ -5,6 +5,7 @@ import com.cm.inspection.service.process.IProcessService;
|
||||
import org.activiti.engine.*;
|
||||
import org.activiti.engine.history.HistoricProcessInstance;
|
||||
import org.activiti.engine.history.HistoricTaskInstance;
|
||||
import org.activiti.engine.history.HistoricVariableInstance;
|
||||
import org.activiti.engine.repository.ProcessDefinition;
|
||||
import org.activiti.engine.runtime.ProcessInstance;
|
||||
import org.activiti.engine.task.Task;
|
||||
@ -17,6 +18,7 @@ import org.springframework.stereotype.Service;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* When you feel like quitting. Think about why you started
|
||||
@ -242,7 +244,7 @@ public class ProcessServiceImpl implements IProcessService {
|
||||
|
||||
@Override
|
||||
public void removeRuntimeVariablesByExecutionId(String executionId, List<String> keys) {
|
||||
|
||||
runtimeService.removeVariables(executionId, keys);
|
||||
}
|
||||
|
||||
@Override
|
||||
@ -256,7 +258,7 @@ public class ProcessServiceImpl implements IProcessService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public void saveTaskCompleteByTaskId(String taskId, Map<String, Object> params) {
|
||||
public void completeByTaskId(String taskId, Map<String, Object> params) {
|
||||
taskService.complete(taskId, params, true);
|
||||
}
|
||||
|
||||
@ -275,6 +277,21 @@ public class ProcessServiceImpl implements IProcessService {
|
||||
return historyService.createHistoricTaskInstanceQuery().list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HistoricTaskInstance> listHistoricTaskInstanceByKeyAndValue(String key, Object value) {
|
||||
return historyService.createHistoricTaskInstanceQuery().taskVariableValueEquals(key, value).orderByHistoricTaskInstanceStartTime().asc().list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HistoricVariableInstance> listHistoricVariableInstanceByKeyAndValue(String taskId) {
|
||||
return historyService.createHistoricVariableInstanceQuery().taskId(taskId).list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public List<HistoricVariableInstance> listHistoricVariableInstanceByKeyAndValue(Set<String> taskIds) {
|
||||
return historyService.createHistoricVariableInstanceQuery().taskIds(taskIds).list();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void activeProcessByProcessId(String processId) {
|
||||
runtimeService.activateProcessInstanceById(processId);
|
||||
|
||||
@ -20,14 +20,14 @@ spring:
|
||||
max-request-size: 1GB
|
||||
datasource:
|
||||
druid:
|
||||
url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
|
||||
# url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
|
||||
# url: jdbc:mysql://49.233.36.36:6688/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
|
||||
url: jdbc:mysql://127.0.0.1:3306/db_cloud_inspection?useUnicode=true&characterEncoding=utf8&characterSetResults=utf8&autoReconnect=true&failOverReadOnly=false&useSSL=false
|
||||
db-type: mysql
|
||||
driver-class-name: com.mysql.jdbc.Driver
|
||||
username: wanggeng
|
||||
# username: root
|
||||
password: WenG>2132997
|
||||
# password: root
|
||||
# username: wanggeng
|
||||
username: root
|
||||
# password: WenG>2132997
|
||||
password: root
|
||||
initial-size: 2
|
||||
min-idle: 2
|
||||
max-active: 5
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
<process id="btCheckReportV2" name="btCheckReportV2" isExecutable="true">
|
||||
<documentation>包头检查上报版本2</documentation>
|
||||
<startEvent id="startTask" name="start"></startEvent>
|
||||
<userTask id="gridTask" name="网格员" activiti:assignee="${grid}">
|
||||
<userTask id="gridTask" name="网格员" activiti:assignee="${handler}">
|
||||
<documentation>网格员上报案件</documentation>
|
||||
<extensionElements>
|
||||
<modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
|
||||
@ -17,7 +17,7 @@
|
||||
<documentation>是否是复查</documentation>
|
||||
</exclusiveGateway>
|
||||
<sequenceFlow id="sid-D9D56F10-2C06-4992-99FD-AE3FA2EFFB60" sourceRef="startTask" targetRef="gridTask"></sequenceFlow>
|
||||
<userTask id="streetTask" name="乡镇街道管理员" activiti:assignee="${street}">
|
||||
<userTask id="streetTask" name="乡镇街道管理员" activiti:assignee="${handler}">
|
||||
<documentation>乡镇街道受理案件</documentation>
|
||||
<extensionElements>
|
||||
<modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
|
||||
@ -29,13 +29,13 @@
|
||||
<exclusiveGateway id="districtPersonType" name="选择上级领导">
|
||||
<documentation>旗县区处理人</documentation>
|
||||
</exclusiveGateway>
|
||||
<userTask id="districtTask" name="旗县区管理员" activiti:assignee="${district}">
|
||||
<userTask id="districtTask" name="旗县区管理员" activiti:assignee="${handler}">
|
||||
<documentation>旗县区管理员处理</documentation>
|
||||
<extensionElements>
|
||||
<modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
|
||||
</extensionElements>
|
||||
</userTask>
|
||||
<userTask id="districtDepartmentTask" name="旗县区委办局管理员" activiti:assignee="${districtDepartment}">
|
||||
<userTask id="districtDepartmentTask" name="旗县区委办局管理员" activiti:assignee="${handler}">
|
||||
<documentation>旗县区委办局管理员处理案件</documentation>
|
||||
<extensionElements>
|
||||
<modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
|
||||
@ -47,7 +47,7 @@
|
||||
<exclusiveGateway id="districtHandleType" name="处理类型">
|
||||
<documentation>旗县区管理员处理</documentation>
|
||||
</exclusiveGateway>
|
||||
<userTask id="cityTask" name="市管理员" activiti:assignee="${city}">
|
||||
<userTask id="cityTask" name="市管理员" activiti:assignee="${handler}">
|
||||
<documentation>市管理员案件</documentation>
|
||||
<extensionElements>
|
||||
<modeler:initiator-can-complete xmlns:modeler="http://activiti.com/modeler"><![CDATA[false]]></modeler:initiator-can-complete>
|
||||
@ -152,50 +152,50 @@
|
||||
<omgdc:Bounds height="40.0" width="40.0" x="159.51476323533734" y="600.0"></omgdc:Bounds>
|
||||
</bpmndi:BPMNShape>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-7AD93E5D-D680-496D-9AA4-36406B1ED45F" id="BPMNEdge_sid-7AD93E5D-D680-496D-9AA4-36406B1ED45F">
|
||||
<omgdi:waypoint x="410.5" y="228.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="410.5" y="167.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="410.0" y="228.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="410.0" y="167.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="175.0" y="167.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="175.0" y="208.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-1944CBDC-4EBC-4D64-BF88-0682CA3789DB" id="BPMNEdge_sid-1944CBDC-4EBC-4D64-BF88-0682CA3789DB">
|
||||
<omgdi:waypoint x="179.73521721682127" y="569.7781184291837"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="179.903925378424" y="600.3891621430867"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="179.51476323533734" y="569.7781184291837"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="179.51476323533734" y="600.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-782A49AE-03D6-4072-A7DD-B338471A094A" id="BPMNEdge_sid-782A49AE-03D6-4072-A7DD-B338471A094A">
|
||||
<omgdi:waypoint x="180.01476323533734" y="639.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="180.01476323533734" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="179.61231273724192" y="639.9024504980954"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="180.0" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="632.251622435528" y="719.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-C7F5003C-8991-48D0-80A1-BB2D41657385" id="BPMNEdge_sid-C7F5003C-8991-48D0-80A1-BB2D41657385">
|
||||
<omgdi:waypoint x="429.5733674373803" y="248.42663256261974"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="490.48523676466266" y="248.19232953389363"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="430.0" y="248.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="490.48523676466266" y="248.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-FB5CFE52-1729-4E92-AD18-40EE241F1C32" id="BPMNEdge_sid-FB5CFE52-1729-4E92-AD18-40EE241F1C32">
|
||||
<omgdi:waypoint x="435.0993152241083" y="620.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="338.0" y="620.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="338.0" y="529.7781184291837"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="229.51476323533734" y="529.7781184291837"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="434.5993152241083" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="338.0" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="338.0" y="529.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="229.51476323533734" y="529.5326323368926"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-F18556F5-37E9-4CA8-8EC9-109AD07F7EE7" id="BPMNEdge_sid-F18556F5-37E9-4CA8-8EC9-109AD07F7EE7">
|
||||
<omgdi:waypoint x="224.99999999999997" y="248.21676242049864"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="270.24656225323423" y="248.4129175075637"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="224.99999999999997" y="248.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="269.83364474567054" y="248.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-F03B7954-69F3-4487-92F1-ED308C30C9AB" id="BPMNEdge_sid-F03B7954-69F3-4487-92F1-ED308C30C9AB">
|
||||
<omgdi:waypoint x="646.6546836600178" y="639.5969387755101"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.3226875098071" y="705.0001803670468"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="640.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="705.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-7D2F70A6-E7C6-4CE4-9B3B-0AC6F8FCD32E" id="BPMNEdge_sid-7D2F70A6-E7C6-4CE4-9B3B-0AC6F8FCD32E">
|
||||
<omgdi:waypoint x="626.751622435528" y="365.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.5993152241083" y="365.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.5993152241083" y="405.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="626.251622435528" y="365.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.0" y="365.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.29965761205415" y="405.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-8A92357E-E72B-499D-9462-889FF79401C9" id="BPMNEdge_sid-8A92357E-E72B-499D-9462-889FF79401C9">
|
||||
<omgdi:waypoint x="454.7132753380684" y="485.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="455.0421723669654" y="600.4428571428572"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.5993152241083" y="485.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.5993152241083" y="600.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-EE18E98A-53FF-49A0-BF20-78E8C7FEE50E" id="BPMNEdge_sid-EE18E98A-53FF-49A0-BF20-78E8C7FEE50E">
|
||||
<omgdi:waypoint x="290.33364474567054" y="267.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="290.33364474567054" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="289.8407061689863" y="267.99293857668425"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="290.0" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="632.251622435528" y="719.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-D9D56F10-2C06-4992-99FD-AE3FA2EFFB60" id="BPMNEdge_sid-D9D56F10-2C06-4992-99FD-AE3FA2EFFB60">
|
||||
@ -203,51 +203,51 @@
|
||||
<omgdi:waypoint x="125.0" y="248.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-9CA7673F-82F6-4D35-BA5D-091D0E6A1C81" id="BPMNEdge_sid-9CA7673F-82F6-4D35-BA5D-091D0E6A1C81">
|
||||
<omgdi:waypoint x="665.751622435528" y="248.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="774.0" y="248.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="666.251622435528" y="248.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="774.0" y="248.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="774.0" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="660.251622435528" y="719.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-2FAC9D57-FC58-49F6-8FA3-F723ECF40F4E" id="BPMNEdge_sid-2FAC9D57-FC58-49F6-8FA3-F723ECF40F4E">
|
||||
<omgdi:waypoint x="455.09931522410835" y="639.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="455.09931522410835" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="454.6799353479626" y="639.9193798761457"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="455.0" y="719.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="632.251622435528" y="719.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-0FBD4F17-C683-4B85-B669-E8BF363D6F0E" id="BPMNEdge_sid-0FBD4F17-C683-4B85-B669-E8BF363D6F0E">
|
||||
<omgdi:waypoint x="160.01476323533734" y="620.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="84.3851751381628" y="620.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="84.3851751381628" y="445.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="159.51476323533734" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="84.0" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="84.0" y="445.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="404.5993152241083" y="445.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-701DE861-1F1E-4E97-9574-56DDB42D81C1" id="BPMNEdge_sid-701DE861-1F1E-4E97-9574-56DDB42D81C1">
|
||||
<omgdi:waypoint x="646.6936171287684" y="384.55800530675964"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.3733671949107" y="489.77811842918373"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="385.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="489.77811842918373"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-41C676FA-A45B-4340-844D-7DC14C6BD9DC" id="BPMNEdge_sid-41C676FA-A45B-4340-844D-7DC14C6BD9DC">
|
||||
<omgdi:waypoint x="626.7516224355281" y="620.5000000000001"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="564.0" y="620.5000000000001"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="564.0" y="288.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="626.251622435528" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="564.0" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="543.0137059297527" y="288.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-F5232F8C-1D37-4647-986C-A4C3C07854F1" id="BPMNEdge_sid-F5232F8C-1D37-4647-986C-A4C3C07854F1">
|
||||
<omgdi:waypoint x="590.4852367646627" y="248.23525783663547"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="626.6570744377254" y="248.40545200219736"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="590.4852367646627" y="248.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="626.251622435528" y="248.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-4141370E-81D1-4914-B3F5-261E3F9F4C9D" id="BPMNEdge_sid-4141370E-81D1-4914-B3F5-261E3F9F4C9D">
|
||||
<omgdi:waypoint x="309.33364474567054" y="248.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="390.5" y="248.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="309.83364474567054" y="248.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="390.0" y="248.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-D0C06CDD-DB84-49D8-8D15-56D8D9D74D98" id="BPMNEdge_sid-D0C06CDD-DB84-49D8-8D15-56D8D9D74D98">
|
||||
<omgdi:waypoint x="646.472076417012" y="569.7781184291837"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.6407845786147" y="600.3891621430867"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="569.7781184291837"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="600.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-DAAFBA9C-076B-4441-ACA5-AE953A646670" id="BPMNEdge_sid-DAAFBA9C-076B-4441-ACA5-AE953A646670">
|
||||
<omgdi:waypoint x="474.0993152241083" y="620.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="515.4852367646627" y="620.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="515.4852367646627" y="288.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="474.5993152241083" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="515.0" y="620.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="537.7448887254516" y="288.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
<bpmndi:BPMNEdge bpmnElement="sid-DF8C135C-6C07-4027-BA9E-3462D5D51129" id="BPMNEdge_sid-DF8C135C-6C07-4027-BA9E-3462D5D51129">
|
||||
<omgdi:waypoint x="646.751622435528" y="267.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.751622435528" y="345.5"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="268.0"></omgdi:waypoint>
|
||||
<omgdi:waypoint x="646.251622435528" y="345.0"></omgdi:waypoint>
|
||||
</bpmndi:BPMNEdge>
|
||||
</bpmndi:BPMNPlane>
|
||||
</bpmndi:BPMNDiagram>
|
||||
|
||||
@ -250,6 +250,10 @@
|
||||
AND
|
||||
t1.user_id = #{userId}
|
||||
</if>
|
||||
<if test="personType != null and personType != ''">
|
||||
AND
|
||||
t1.person_type = #{personType}
|
||||
</if>
|
||||
<if test="leaderUserId != null and leaderUserId != ''">
|
||||
AND
|
||||
t1.leader_user_id = #{leaderUserId}
|
||||
|
||||
@ -106,17 +106,6 @@
|
||||
</button>
|
||||
</div>
|
||||
<table class="layui-hide" id="dataTable" lay-filter="dataTable"></table>
|
||||
<!-- 表头按钮组 -->
|
||||
<script type="text/html" id="headerToolBar">
|
||||
<div class="layui-btn-group">
|
||||
<button type="button" class="layui-btn layui-btn-sm" lay-event="saveEvent">
|
||||
<i class="fa fa-lg fa-plus"></i> 新增
|
||||
</button>
|
||||
<button type="button" class="layui-btn layui-btn-danger layui-btn-sm" lay-event="removeEvent">
|
||||
<i class="fa fa-lg fa-trash"></i> 删除
|
||||
</button>
|
||||
</div>
|
||||
</script>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
@ -139,7 +128,7 @@
|
||||
var laytpl = layui.laytpl;
|
||||
var common = layui.common;
|
||||
var resizeTimeout = null;
|
||||
var tableUrl = 'api/check2/listpage-street-of-mine';
|
||||
var tableUrl = 'api/check2/listpage-district-department-of-mine';
|
||||
|
||||
// 初始化选择框、单选、复选模板
|
||||
function initSelectRadioCheckboxTemplate(templateId, templateBoxId, data, callback) {
|
||||
@ -253,7 +242,6 @@
|
||||
height: $win.height() - 130,
|
||||
limit: 20,
|
||||
limits: [20, 40, 60, 80, 100, 200],
|
||||
toolbar: '#headerToolBar',
|
||||
request: {
|
||||
pageName: 'page',
|
||||
limitName: 'rows'
|
||||
@ -341,17 +329,21 @@
|
||||
return infoDiv;
|
||||
}
|
||||
},
|
||||
{field:'col5', width: 120, title: '操作', align: 'center',
|
||||
{field:'col5', width: 100, title: '操作', align: 'center', fixed: 'right',
|
||||
templet: function(row) {
|
||||
var isCoordinationBtn = '<button type="button" class="layui-btn layui-btn-normal layui-btn-xs check-detail" data-checkid="'+ row.checkId +'" data-name="'+ row.enterpriseName +'"><i class="fa fa-lg fa-search"></i> 检查项</button>';
|
||||
if(row.isCoordination != 1) {
|
||||
isCoordinationBtn = '不配合';
|
||||
}
|
||||
var infoDiv = '<table>';
|
||||
infoDiv += '<tr><td class="col-content">'+ isCoordinationBtn +'</td></tr>';
|
||||
if(row.checkLng && row.checkLat) {
|
||||
infoDiv += '<tr><td class="col-content-opition"><div class="col-content-div check-location" data-lng="'+ row.checkLng +'" data-lat="'+ row.checkLat +'" data-enterprise-name="'+ row.enterpriseName +'" data-enterprise-id="'+ row.enterpriseId +'" data-enterprise-photos="'+ row.factoryGateByEnterpriseId +'"><i class="fa fa-map-marker"></i> 查看检查位置</div></td></tr>';
|
||||
}
|
||||
infoDiv += '<tr><td class="col-content-opition">' +
|
||||
'<button class="layui-btn layui-btn-xs handle-complete" data-check-id="'+ row.checkId +'">处理完成</button>' +
|
||||
'</td></tr>';
|
||||
infoDiv += '<tr><td class="col-content-opition">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-normal handler-to-leader" data-check-id="'+ row.checkId +'">上级处理</button>' +
|
||||
'</td></tr>';
|
||||
infoDiv += '<tr><td class="col-content-opition">' +
|
||||
'<div class="layui-btn-group">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-primary">流程</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-primary">详情</button>' +
|
||||
'</div>' +
|
||||
'</td></tr>';
|
||||
infoDiv += '</table>';
|
||||
return infoDiv;
|
||||
}
|
||||
@ -377,7 +369,6 @@
|
||||
type: $('#type').val(),
|
||||
industry: $('#industry').val(),
|
||||
checkType: $('#checkType').val(),
|
||||
isCoordination: $('#isCoordination').val(),
|
||||
isComplete: $('#isComplete').val(),
|
||||
area1: $('#area1').val(),
|
||||
area2: $('#area2').val(),
|
||||
@ -388,29 +379,7 @@
|
||||
page: {
|
||||
curr: currentPage
|
||||
},
|
||||
height: $win.height() - 90,
|
||||
});
|
||||
}
|
||||
// 删除
|
||||
function removeData(ids) {
|
||||
top.dialog.msg(top.dataMessage.delete, {
|
||||
time: 0,
|
||||
btn: [top.dataMessage.button.yes, top.dataMessage.button.no],
|
||||
shade: 0.3,
|
||||
yes: function (index) {
|
||||
top.dialog.close(index);
|
||||
var layIndex;
|
||||
top.restAjax.delete(top.restAjax.path('api/check2/remove/{ids}', [ids]), {}, null, function (code, data) {
|
||||
top.dialog.msg(top.dataMessage.deleteSuccess, {time: 1000});
|
||||
reloadTable();
|
||||
}, function (code, data) {
|
||||
top.dialog.msg(data.msg);
|
||||
}, function () {
|
||||
layIndex = top.dialog.msg(top.dataMessage.deleting, {icon: 16, time: 0, shade: 0.3});
|
||||
}, function () {
|
||||
top.dialog.close(layIndex);
|
||||
});
|
||||
}
|
||||
height: $win.height() - 130,
|
||||
});
|
||||
}
|
||||
initTable();
|
||||
@ -484,6 +453,32 @@
|
||||
}
|
||||
});
|
||||
|
||||
$(document).on('click', '.handle-complete', function() {
|
||||
var checkId = this.dataset.checkId;
|
||||
top.dialog.open({
|
||||
url: top.restAjax.path('route/check2/update-street-complete.html?checkId={checkId}', [checkId]),
|
||||
title: '处理完成',
|
||||
width: '400px',
|
||||
height: '280px',
|
||||
onClose: function() {
|
||||
reloadTable();
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
$(document).on('click', '.handler-to-leader', function() {
|
||||
var checkId = this.dataset.checkId;
|
||||
top.dialog.open({
|
||||
url: top.restAjax.path('route/check2/update-to-leader.html?checkId={checkId}', [checkId]),
|
||||
title: '上级处理',
|
||||
width: '400px',
|
||||
height: '280px',
|
||||
onClose: function() {
|
||||
reloadTable();
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// 联动事件
|
||||
// area1 选择事件
|
||||
// form.on('select(area1)', function(data) {
|
||||
|
||||
@ -242,7 +242,6 @@
|
||||
height: $win.height() - 130,
|
||||
limit: 20,
|
||||
limits: [20, 40, 60, 80, 100, 200],
|
||||
toolbar: '#headerToolBar',
|
||||
request: {
|
||||
pageName: 'page',
|
||||
limitName: 'rows'
|
||||
@ -334,10 +333,10 @@
|
||||
templet: function(row) {
|
||||
var infoDiv = '<table>';
|
||||
infoDiv += '<tr><td class="col-content-opition">' +
|
||||
'<button class="layui-btn layui-btn-xs" lay-event="handleCompleteEvent">处理完成</button>' +
|
||||
'<button class="layui-btn layui-btn-xs handle-complete" data-check-id="'+ row.checkId +'">处理完成</button>' +
|
||||
'</td></tr>';
|
||||
infoDiv += '<tr><td class="col-content-opition">' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-normal">上级处理</button>' +
|
||||
'<button class="layui-btn layui-btn-xs layui-btn-normal handler-to-leader" data-check-id="'+ row.checkId +'">上级处理</button>' +
|
||||
'</td></tr>';
|
||||
infoDiv += '<tr><td class="col-content-opition">' +
|
||||
'<div class="layui-btn-group">' +
|
||||
@ -454,21 +453,31 @@
|
||||
}
|
||||
});
|
||||
|
||||
table.on('tool(dataTable)', function(obj) {
|
||||
var data = obj.data;
|
||||
var event = obj.event;
|
||||
if(event === 'handleCompleteEvent') {
|
||||
top.dialog.open({
|
||||
url: top.restAjax.path('route/check2/update-street-complete.html?checkId={checkId}', [data.checkId]),
|
||||
title: '处理完成',
|
||||
width: '400px',
|
||||
height: '350px',
|
||||
onClose: function() {
|
||||
reloadTable();
|
||||
}
|
||||
});
|
||||
}
|
||||
});
|
||||
$(document).on('click', '.handle-complete', function() {
|
||||
var checkId = this.dataset.checkId;
|
||||
top.dialog.open({
|
||||
url: top.restAjax.path('route/check2/update-street-complete.html?checkId={checkId}', [checkId]),
|
||||
title: '处理完成',
|
||||
width: '400px',
|
||||
height: '280px',
|
||||
onClose: function() {
|
||||
reloadTable();
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
$(document).on('click', '.handler-to-leader', function() {
|
||||
var checkId = this.dataset.checkId;
|
||||
top.dialog.open({
|
||||
url: top.restAjax.path('route/check2/update-street-to-leader.html?checkId={checkId}', [checkId]),
|
||||
title: '上级处理',
|
||||
width: '400px',
|
||||
height: '380px',
|
||||
onClose: function() {
|
||||
reloadTable();
|
||||
}
|
||||
});
|
||||
})
|
||||
|
||||
// 联动事件
|
||||
// area1 选择事件
|
||||
|
||||
@ -11,17 +11,11 @@
|
||||
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
|
||||
</head>
|
||||
<body>
|
||||
<div class="layui-fluid layui-anim layui-anim-fadein">
|
||||
<div class="layui-anim layui-anim-fadein">
|
||||
<div class="layui-card">
|
||||
<div class="layui-card-header">
|
||||
<span class="layui-breadcrumb" lay-filter="breadcrumb" style="visibility: visible;">
|
||||
<a class="close" href="javascript:void(0);">上级列表</a><span lay-separator="">/</span>
|
||||
<a href="javascript:void(0);"><cite>提交</cite></a>
|
||||
</span>
|
||||
</div>
|
||||
<div class="layui-card-body" style="padding: 15px;">
|
||||
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
||||
<div class="layui-form-item">
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label">说明</label>
|
||||
<div class="layui-input-block">
|
||||
<textarea id="summary" name="summary" placeholder="请输入说明" class="layui-textarea"></textarea>
|
||||
@ -64,8 +58,7 @@
|
||||
top.dialog.confirm(top.dataMessage.commit, function(index) {
|
||||
top.dialog.close(index);
|
||||
var loadLayerIndex;
|
||||
formData.field['content'] = wangEditorObj['content'].txt.html();
|
||||
top.restAjax.post(top.restAjax.path('api/check2/update-street-complete/{checkId}', [checkId]), formData.field, null, function(code, data) {
|
||||
top.restAjax.put(top.restAjax.path('api/check2/update-street-complete/{checkId}', [checkId]), formData.field, null, function(code, data) {
|
||||
var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
|
||||
time: 0,
|
||||
btn: [top.dataMessage.button.yes],
|
||||
|
||||
@ -0,0 +1,139 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<base href="/inspection/">
|
||||
<meta charset="utf-8">
|
||||
<meta name="renderer" content="webkit">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
|
||||
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
|
||||
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
|
||||
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
|
||||
</head>
|
||||
<body>
|
||||
<div class="layui-anim layui-anim-fadein">
|
||||
<div class="layui-card">
|
||||
<div class="layui-card-body" style="padding: 15px;">
|
||||
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
||||
<div class="layui-form-item">
|
||||
<label class="layui-form-label">处理领导</label>
|
||||
<div class="layui-input-block">
|
||||
<select id="leaderType" name="leaderType" lay-verify="required" lay-filter="leaderType">
|
||||
<option value="districtDepartment" selected>直属领导（委办局）</option>
|
||||
<option value="district">旗县区管理员</option>
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
<div id="districtBox" class="layui-form-item" style="display: none;">
|
||||
<label class="layui-form-label">旗县区管理员</label>
|
||||
<div id="districtTemplateBox" class="layui-input-block" lay-filter="districtTemplateBox"></div>
|
||||
<script id="districtTemplate" type="text/html">
|
||||
<select id="leaderId" name="leaderId">
|
||||
{{# for(var i = 0, item; item = d[i++];) { }}
|
||||
<option value="{{item.userId}}">{{item.userName}}</option>
|
||||
{{# } }}
|
||||
</select>
|
||||
</script>
|
||||
</div>
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label">说明</label>
|
||||
<div class="layui-input-block">
|
||||
<textarea id="summary" name="summary" placeholder="请输入说明" class="layui-textarea"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-layout-admin">
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-footer" style="left: 0;">
|
||||
<button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="assets/layuiadmin/layui/layui.js"></script>
|
||||
<script>
|
||||
layui.config({
|
||||
base: 'assets/layuiadmin/' //静态资源所在路径
|
||||
}).extend({
|
||||
index: 'lib/index' //主入口模块
|
||||
}).use(['index', 'form', 'laydate', 'laytpl', 'tableSelect'], function(){
|
||||
var $ = layui.$;
|
||||
var form = layui.form;
|
||||
var laytpl = layui.laytpl;
|
||||
var laydate = layui.laydate;
|
||||
var checkId = top.restAjax.params(window.location.href).checkId;
|
||||
|
||||
function closeBox() {
|
||||
parent.layer.close(parent.layer.getFrameIndex(window.name));
|
||||
}
|
||||
|
||||
|
||||
// 初始化选择框、单选、复选模板
|
||||
function initSelectRadioCheckboxTemplate(templateId, templateBoxId, data, callback) {
|
||||
laytpl(document.getElementById(templateId).innerHTML).render(data, function(html) {
|
||||
document.getElementById(templateBoxId).innerHTML = html;
|
||||
});
|
||||
form.render('select');
|
||||
}
|
||||
|
||||
// 初始化旗县区管理员列表
|
||||
function initDistrictTemplate() {
|
||||
top.restAjax.get(top.restAjax.path('api/gridpersonnel/list?personType=district', []), {}, null, function(code, data, args) {
|
||||
initSelectRadioCheckboxTemplate('districtTemplate', 'districtTemplateBox', data);
|
||||
}, function(code, data) {
|
||||
top.dialog.msg(data.msg);
|
||||
});
|
||||
}
|
||||
|
||||
// 初始化内容
|
||||
function initData() {
|
||||
initDistrictTemplate();
|
||||
}
|
||||
initData();
|
||||
|
||||
// 提交表单
|
||||
form.on('submit(submitForm)', function(formData) {
|
||||
top.dialog.confirm(top.dataMessage.commit, function(index) {
|
||||
top.dialog.close(index);
|
||||
var loadLayerIndex;
|
||||
top.restAjax.put(top.restAjax.path('api/check2/update-street-to-leader/{checkId}', [checkId]), formData.field, null, function(code, data) {
|
||||
var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
|
||||
time: 0,
|
||||
btn: [top.dataMessage.button.yes],
|
||||
shade: 0.3,
|
||||
yes: function(index) {
|
||||
top.dialog.close(index);
|
||||
closeBox();
|
||||
},
|
||||
});
|
||||
}, function(code, data) {
|
||||
top.dialog.msg(data.msg);
|
||||
}, function() {
|
||||
loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
|
||||
}, function() {
|
||||
top.dialog.close(loadLayerIndex);
|
||||
});
|
||||
});
|
||||
return false;
|
||||
});
|
||||
|
||||
$('.close').on('click', function() {
|
||||
closeBox();
|
||||
});
|
||||
|
||||
|
||||
// area2 选择事件
|
||||
form.on('select(leaderType)', function(data) {
|
||||
var value = data.value;
|
||||
if(value === 'district') {
|
||||
$('#districtBox').show();
|
||||
} else {
|
||||
$('#districtBox').hide();
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
119
src/main/resources/static/route/check2/update-to-leader.html
Normal file
119
src/main/resources/static/route/check2/update-to-leader.html
Normal file
@ -0,0 +1,119 @@
|
||||
<!doctype html>
|
||||
<html lang="en">
|
||||
<head>
|
||||
<base href="/inspection/">
|
||||
<meta charset="utf-8">
|
||||
<meta name="renderer" content="webkit">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=0">
|
||||
<link rel="stylesheet" href="assets/fonts/font-awesome/css/font-awesome.css"/>
|
||||
<link rel="stylesheet" href="assets/layuiadmin/layui/css/layui.css" media="all">
|
||||
<link rel="stylesheet" href="assets/layuiadmin/style/admin.css" media="all">
|
||||
</head>
|
||||
<body>
|
||||
<div class="layui-anim layui-anim-fadein">
|
||||
<div class="layui-card">
|
||||
<div class="layui-card-body" style="padding: 15px;">
|
||||
<form class="layui-form layui-form-pane" lay-filter="dataForm">
|
||||
<div class="layui-form-item layui-form-text">
|
||||
<label class="layui-form-label">说明</label>
|
||||
<div class="layui-input-block">
|
||||
<textarea id="summary" name="summary" placeholder="请输入说明" class="layui-textarea"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="layui-form-item layui-layout-admin">
|
||||
<div class="layui-input-block">
|
||||
<div class="layui-footer" style="left: 0;">
|
||||
<button type="button" class="layui-btn" lay-submit lay-filter="submitForm">提交</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="assets/layuiadmin/layui/layui.js"></script>
|
||||
<script>
|
||||
layui.config({
|
||||
base: 'assets/layuiadmin/' //静态资源所在路径
|
||||
}).extend({
|
||||
index: 'lib/index' //主入口模块
|
||||
}).use(['index', 'form', 'laydate', 'laytpl', 'tableSelect'], function(){
|
||||
var $ = layui.$;
|
||||
var form = layui.form;
|
||||
var laytpl = layui.laytpl;
|
||||
var laydate = layui.laydate;
|
||||
var checkId = top.restAjax.params(window.location.href).checkId;
|
||||
|
||||
function closeBox() {
|
||||
parent.layer.close(parent.layer.getFrameIndex(window.name));
|
||||
}
|
||||
|
||||
|
||||
// 初始化选择框、单选、复选模板
|
||||
function initSelectRadioCheckboxTemplate(templateId, templateBoxId, data, callback) {
|
||||
laytpl(document.getElementById(templateId).innerHTML).render(data, function(html) {
|
||||
document.getElementById(templateBoxId).innerHTML = html;
|
||||
});
|
||||
form.render('select');
|
||||
}
|
||||
|
||||
// 初始化旗县区管理员列表
|
||||
function initDistrictTemplate() {
|
||||
top.restAjax.get(top.restAjax.path('api/gridpersonnel/list?personType=district', []), {}, null, function(code, data, args) {
|
||||
initSelectRadioCheckboxTemplate('districtTemplate', 'districtTemplateBox', data);
|
||||
}, function(code, data) {
|
||||
top.dialog.msg(data.msg);
|
||||
});
|
||||
}
|
||||
|
||||
// 初始化内容
|
||||
function initData() {
|
||||
initDistrictTemplate();
|
||||
}
|
||||
initData();
|
||||
|
||||
// 提交表单
|
||||
form.on('submit(submitForm)', function(formData) {
|
||||
top.dialog.confirm(top.dataMessage.commit, function(index) {
|
||||
top.dialog.close(index);
|
||||
var loadLayerIndex;
|
||||
top.restAjax.put(top.restAjax.path('api/check2/update-street-to-leader/{checkId}', [checkId]), formData.field, null, function(code, data) {
|
||||
var layerIndex = top.dialog.msg(top.dataMessage.commitSuccess, {
|
||||
time: 0,
|
||||
btn: [top.dataMessage.button.yes],
|
||||
shade: 0.3,
|
||||
yes: function(index) {
|
||||
top.dialog.close(index);
|
||||
closeBox();
|
||||
},
|
||||
});
|
||||
}, function(code, data) {
|
||||
top.dialog.msg(data.msg);
|
||||
}, function() {
|
||||
loadLayerIndex = top.dialog.msg(top.dataMessage.committing, {icon: 16, time: 0, shade: 0.3});
|
||||
}, function() {
|
||||
top.dialog.close(loadLayerIndex);
|
||||
});
|
||||
});
|
||||
return false;
|
||||
});
|
||||
|
||||
$('.close').on('click', function() {
|
||||
closeBox();
|
||||
});
|
||||
|
||||
|
||||
// area2 选择事件
|
||||
form.on('select(leaderType)', function(data) {
|
||||
var value = data.value;
|
||||
if(value === 'district') {
|
||||
$('#districtBox').show();
|
||||
} else {
|
||||
$('#districtBox').hide();
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
Loading…
Reference in New Issue
Block a user