youxiw2000 / trash · Commits

Commit 32edd86363bceeabb56ce4e1382848040b5b180d

Authored by youxiw2000
2 parents a398f9f6 8b55410f
build: skipped

m

Inline Side-by-side
Showing 29 changed files with 2294 additions and 1408 deletions

Too many changes to show.
Reload with full diff Plain diff Email patch

To preserve performance only 29 of 42 files are displayed.

trash-activiti/src/main/java/com/trash/activiti/domain/ActWorkflowFormData.java
  View file @32edd86
... ... @@ -6,6 +6,8 @@ import org.apache.commons.lang3.builder.ToStringStyle;
6 6 import com.trash.common.core.domain.BaseEntity;
7 7 import com.trash.activiti.domain.dto.ActWorkflowFormDataDTO;
8 8  
  9 +import java.util.List;
  10 +
9 11 /**
10 12 * 动态单对象 act_workflow_formdata
11 13 *
... ...
trash-activiti/src/main/java/com/trash/activiti/domain/dto/ActWorkflowFormDataDTO.java
  View file @32edd86
... ... @@ -3,6 +3,8 @@ package com.trash.activiti.domain.dto;
3 3  
4 4 import com.trash.common.core.domain.BaseEntity;
5 5  
  6 +import java.util.List;
  7 +
6 8  
7 9 /**
8 10 * 动态单对象 act_workflow_formdata
... ... @@ -30,9 +32,26 @@ public class ActWorkflowFormDataDTO extends BaseEntity
30 32 private String controlValue;
31 33 private String controlDefault;
32 34  
  35 + private String deptCode;
  36 +
  37 + private String index;
  38 + public String getIndex() {
  39 + return index;
  40 + }
  41 +
  42 + public void setIndex(String index) {
  43 + this.index = index;
  44 + }
  45 +
  46 + public String getDeptCode() {
  47 + return deptCode;
  48 + }
33 49  
  50 + public void setDeptCode(String deptCode) {
  51 + this.deptCode = deptCode;
  52 + }
34 53  
35   - public void setControlId(String controlId)
  54 + public void setControlId(String controlId)
36 55 {
37 56 this.controlId = controlId;
38 57 }
... ...
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @32edd86
... ... @@ -12,6 +12,7 @@ import java.util.stream.Collectors;
12 12  
13 13 import javax.validation.constraints.Null;
14 14  
  15 +import com.trash.common.utils.StringUtils;
15 16 import org.activiti.api.runtime.shared.identity.UserGroupManager;
16 17 import org.activiti.api.runtime.shared.query.Pageable;
17 18 import org.activiti.api.runtime.shared.security.SecurityManager;
... ... @@ -52,251 +53,258 @@ import com.trash.common.utils.spring.SpringUtils;
52 53 @Service
53 54 public class ActTaskServiceImpl implements IActTaskService {
54 55  
55   - @Autowired
56   - private RepositoryService repositoryService;
  56 + @Autowired
  57 + private RepositoryService repositoryService;
57 58  
58   - @Autowired
59   - private myTaskService taskRuntime;
  59 + @Autowired
  60 + private myTaskService taskRuntime;
60 61  
61   - @Autowired
62   - private TaskService taskService;
  62 + @Autowired
  63 + private TaskService taskService;
63 64  
64   - @Autowired
65   - private RuntimeService runtimeService;
66   -
67   - @Autowired
68   - private IActWorkflowFormDataService actWorkflowFormDataService;
  65 + @Autowired
  66 + private RuntimeService runtimeService;
69 67  
  68 + @Autowired
  69 + private IActWorkflowFormDataService actWorkflowFormDataService;
70 70  
71   - @Autowired
72   - private ActReDeploymentMapper actMapper;
73 71  
74   - @Autowired
75   - SecurityManager securityManager;
  72 + @Autowired
  73 + private ActReDeploymentMapper actMapper;
76 74  
77   - @Autowired
78   - UserGroupManager userGroupManager;
79   -
80   - HistoricProcessInstanceQuery processInstanceQuery;
  75 + @Autowired
  76 + SecurityManager securityManager;
81 77  
  78 + @Autowired
  79 + UserGroupManager userGroupManager;
82 80  
83   - @Override
84   - public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
85   - Page<ActTaskDTO> list = new Page<ActTaskDTO>();
86   -
87   -
88   - if(ServletUtils.getParameter("role") != null){
89   - List<String> posts = new ArrayList<>();
90   - posts.add(ServletUtils.getParameter("role"));
91   - SecurityUtils.getLoginUser().getUser().setPostIds(posts);
92   - }
93   - if(ServletUtils.getParameter("dept") != null){
94   - List<String> roles = new ArrayList<>();
95   - roles.add(ServletUtils.getParameter("dept"));
96   - SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
97   - }
98   -
99   - if(SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0){
100   - return list;
101   - }
102   -
103   -
104   - org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
105   -
106   - List<Task> tasks = pageTasks.getContent();
107   - int totalItems = pageTasks.getTotalItems();
108   - list.setTotal(totalItems);
109   - if (totalItems != 0) {
110   - Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
111   -
112   - List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();
113   -
114   - List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t,processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
115   - getData(processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get()))).collect(Collectors.toList());
116   -
117   - list.addAll(actTaskDTOS);
118   - }
119   - return list;
120   - }
  81 + HistoricProcessInstanceQuery processInstanceQuery;
121 82  
122   - @Override
123   - public Page<ActTaskDTO> selectTaskEndHistoryDefinitionList(PageDomain pageDomain) {
124   - Page<ActTaskDTO> list = new Page<ActTaskDTO>();
125   -
126   - ProcessEngine pes = ProcessEngines.getDefaultProcessEngine();
127   - HistoryService historyService = pes.getHistoryService();
128   -
129   - String username = securityManager.getAuthenticatedUserId();
130   -
131   - List<String> collect = actMapper.selectCompleteWorkByUsername(username);
132   -
133   - if(collect.size() > 0){
134   - Set<String> set = new HashSet(collect);
135   -
136   - List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery().involvedUser(username).processInstanceIds(set).list();
137   -
138   - list.setTotal(processInstanceList.size());
139   -
140   - if(processInstanceList.size() > 0){
141   - for(HistoricProcessInstance p : processInstanceList){
142   - ActTaskDTO actTaskDTOS = new ActTaskDTO(p,getHistoryData(p));
143   -
144   - getCheckData(actTaskDTOS);
145   -
146   - list.add(actTaskDTOS);
147   - }
148   -
149   - }
150   - }
151 83  
152   - return list;
153   - }
154   -
  84 + @Override
  85 + public Page<ActTaskDTO> selectProcessDefinitionList(PageDomain pageDomain) {
  86 + Page<ActTaskDTO> list = new Page<ActTaskDTO>();
155 87  
156 88  
157   - @Override
158   - public Page<ActTaskDTO> selectRuntimeTaskHistoryDefinitionList(PageDomain pageDomain) {
159   - Page<ActTaskDTO> list = new Page<ActTaskDTO>();
160   -
161   - Set<String> collect = actMapper.selectUnCompleteWorkByUsername(securityManager.getAuthenticatedUserId());
162   -
163   - if(collect.size() > 0){
164   -
165   - List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(collect).list();
166   -
167   - list.setTotal(processInstanceList.size());
168   -
169   - if(processInstanceList.size() > 0){
170   - for(ProcessInstance p: processInstanceList){
171   - ActTaskDTO actTaskDTOS = new ActTaskDTO(p,getData(p));
172   -
173   - getCheckData(actTaskDTOS);
174   -
175   - list.add(actTaskDTOS);
176   - }
177   -
178   - }
179   - }
180   - return list;
181   - }
182   -
183   -
184   - public void getCheckData(ActTaskDTO actTaskDTOS){
185   - ActWorkflowFormData ActWorkflowFormData = new ActWorkflowFormData();
186   - ActWorkflowFormData.setBusinessKey(actTaskDTOS.getBusinessKey());
187   - ActWorkflowFormData.setCreateBy(securityManager.getAuthenticatedUserId());
188   - ActWorkflowFormData.setControlName("审批");
189   -
190   - actTaskDTOS.setCheckStatus(actWorkflowFormDataService.selectActWorkflowFormDataList(ActWorkflowFormData).get(0).getControlValue().equals("通过") ? "0" : "1");
191   - }
192   -
193   - SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
194   -
195   - public Map<String, String> getData(HistoricProcessInstance processInstance) {
196   - Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
197   - return map;
198   - }
199   -
200   - public Map<String, String> getHistoryData(HistoricProcessInstance processInstance) {
201   - Map<String, String> map = actMapper.selectHistoryWorkByPId(processInstance.getId());
202   - return map;
203   -
204   - }
205   -
206   - public Map<String, String> getData(ProcessInstance processInstance) {
207   - Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
208   - return map;
209   - }
  89 + if (ServletUtils.getParameter("role") != null) {
  90 + List<String> posts = new ArrayList<>();
  91 + posts.add(ServletUtils.getParameter("role"));
  92 + SecurityUtils.getLoginUser().getUser().setPostIds(posts);
  93 + }
  94 + if (ServletUtils.getParameter("dept") != null) {
  95 + List<String> roles = new ArrayList<>();
  96 + roles.add(ServletUtils.getParameter("dept"));
  97 + SecurityUtils.getLoginUser().getUser().setRoleIds(roles);
  98 + }
210 99  
211   - @Override
212   - public List<String> formDataShow(String taskID) {
213   - Task task = taskRuntime.task(taskID);
214   - /*
215   - * ---------------------------------------------------------------------
216   - * --------- FormProperty_0ueitp2--__!!类型--__!!名称--__!!是否参数--__!!默认值 例子：
217   - * FormProperty_0lovri0--__!!string--__!!姓名--__!!f--__!!同意!!__--驳回
218   - * FormProperty_1iu6onu--__!!int--__!!年龄--__!!s
219   - *
220   - * 默认值：无、字符常量、FormProperty_开头定义过的控件ID
221   - * 是否参数：f为不是参数，s是字符，t是时间(不需要int，因为这里int等价于string)
222   - * 注：类型是可以获取到的，但是为了统一配置原则，都配置到
223   - */
224   -
225   - // 注意!!!!!!!!:表单Key必须要任务编号一模一样，因为参数需要任务key，但是无法获取，只能获取表单key“task.getFormKey()”当做任务key
226   - UserTask userTask = (UserTask) repositoryService.getBpmnModel(task.getProcessDefinitionId())
227   - .getFlowElement(task.getFormKey());
228   -
229   - if (userTask == null) {
230   - return null;
231   - }
232   - List<FormProperty> formProperties = userTask.getFormProperties();
233   - List<String> collect = formProperties.stream().map(fp -> fp.getId()).collect(Collectors.toList());
  100 + if (SecurityUtils.getLoginUser().getUser().getPostIds().size() == 0 || SecurityUtils.getLoginUser().getUser().getRoleIds().size() == 0) {
  101 + return list;
  102 + }
234 103  
235   - return collect;
236   - }
237 104  
238   - @Override
239   - public int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException {
240   - Task task = taskRuntime.task(taskID);
241   -
242   -
243   - ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
244   - .processInstanceId(task.getProcessInstanceId()).singleResult();
245   -
246   - Map<String,Object> str = processInstance.getProcessVariables();
247   -
248   - String desc = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult().getDescription();
249   -
250   -
251   - Boolean hasVariables = false;// 没有任何参数
252   - HashMap<String, Object> variables = new HashMap<String, Object>();
253   - // 前端传来的字符串，拆分成每个控件
254   - List<ActWorkflowFormData> acwfds = new ArrayList<>();
255   - for (ActWorkflowFormDataDTO awf : awfs) {
256   - ActWorkflowFormData actWorkflowFormData = new ActWorkflowFormData(processInstance.getBusinessKey(), awf,
257   - task);
258   - acwfds.add(actWorkflowFormData);
259   - // 构建参数集合
260   - if (!"f".equals(awf.getControlIsParam())) {
261   - variables.put(awf.getControlId(), awf.getControlValue());
262   - hasVariables = true;
263   - }
264   - } // for结束
265   - if (task.getAssignee() == null) {
266   - taskRuntime.claim(TaskPayloadBuilder.claim().withTaskId(task.getId()).build());
267   - }
268   - if (hasVariables) {
269   - // 带参数完成任务
270   - taskRuntime.complete(TaskPayloadBuilder.complete().withTaskId(taskID).withVariables(variables).build());
271   - } else {
272   - taskRuntime.complete(TaskPayloadBuilder.complete().withTaskId(taskID).build());
273   - }
274   -
275   -
276   - updateThreesetpTask(processInstance,desc);
277   -
278   -
279   -
280   - // 写入数据库
281   - return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
282   - }
283   -
  105 + org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of((pageDomain.getPageNum() - 1) * pageDomain.getPageSize(), pageDomain.getPageSize()));
  106 +
  107 + List<Task> tasks = pageTasks.getContent();
  108 + int totalItems = pageTasks.getTotalItems();
  109 + list.setTotal(totalItems);
  110 + if (totalItems != 0) {
  111 + Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
  112 +
  113 + List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();
  114 +
  115 + List<ActTaskDTO> actTaskDTOS = tasks.stream().map(t -> new ActTaskDTO(t, processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get(),
  116 + getData(processInstanceList.parallelStream().filter(pi -> t.getProcessInstanceId().equals(pi.getId())).findAny().get()))).collect(Collectors.toList());
  117 +
  118 + list.addAll(actTaskDTOS);
  119 + }
  120 + return list;
  121 + }
  122 +
  123 + @Override
  124 + public Page<ActTaskDTO> selectTaskEndHistoryDefinitionList(PageDomain pageDomain) {
  125 + Page<ActTaskDTO> list = new Page<ActTaskDTO>();
  126 +
  127 + ProcessEngine pes = ProcessEngines.getDefaultProcessEngine();
  128 + HistoryService historyService = pes.getHistoryService();
  129 +
  130 + String username = securityManager.getAuthenticatedUserId();
  131 +
  132 + List<String> collect = actMapper.selectCompleteWorkByUsername(username);
  133 +
  134 + if (collect.size() > 0) {
  135 + Set<String> set = new HashSet(collect);
  136 +
  137 + List<HistoricProcessInstance> processInstanceList = historyService.createHistoricProcessInstanceQuery().involvedUser(username).processInstanceIds(set).list();
  138 +
  139 + list.setTotal(processInstanceList.size());
  140 +
  141 + if (processInstanceList.size() > 0) {
  142 + for (HistoricProcessInstance p : processInstanceList) {
  143 + ActTaskDTO actTaskDTOS = new ActTaskDTO(p, getHistoryData(p));
  144 +
  145 + getCheckData(actTaskDTOS);
  146 +
  147 + list.add(actTaskDTOS);
  148 + }
  149 +
  150 + }
  151 + }
  152 +
  153 + return list;
  154 + }
  155 +
  156 +
  157 + @Override
  158 + public Page<ActTaskDTO> selectRuntimeTaskHistoryDefinitionList(PageDomain pageDomain) {
  159 + Page<ActTaskDTO> list = new Page<ActTaskDTO>();
  160 +
  161 + Set<String> collect = actMapper.selectUnCompleteWorkByUsername(securityManager.getAuthenticatedUserId());
  162 +
  163 + if (collect.size() > 0) {
  164 +
  165 + List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(collect).list();
  166 +
  167 + list.setTotal(processInstanceList.size());
  168 +
  169 + if (processInstanceList.size() > 0) {
  170 + for (ProcessInstance p : processInstanceList) {
  171 + ActTaskDTO actTaskDTOS = new ActTaskDTO(p, getData(p));
  172 +
  173 + getCheckData(actTaskDTOS);
  174 +
  175 + list.add(actTaskDTOS);
  176 + }
  177 +
  178 + }
  179 + }
  180 + return list;
  181 + }
  182 +
  183 +
  184 + public void getCheckData(ActTaskDTO actTaskDTOS) {
  185 + ActWorkflowFormData ActWorkflowFormData = new ActWorkflowFormData();
  186 + ActWorkflowFormData.setBusinessKey(actTaskDTOS.getBusinessKey());
  187 + ActWorkflowFormData.setCreateBy(securityManager.getAuthenticatedUserId());
  188 + ActWorkflowFormData.setControlName("审批");
  189 +
  190 + actTaskDTOS.setCheckStatus(actWorkflowFormDataService.selectActWorkflowFormDataList(ActWorkflowFormData).get(0).getControlValue().equals("通过") ? "0" : "1");
  191 + }
  192 +
  193 + SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:SS");
  194 +
  195 + public Map<String, String> getData(HistoricProcessInstance processInstance) {
  196 + Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
  197 + return map;
  198 + }
  199 +
  200 + public Map<String, String> getHistoryData(HistoricProcessInstance processInstance) {
  201 + Map<String, String> map = actMapper.selectHistoryWorkByPId(processInstance.getId());
  202 + return map;
  203 +
  204 + }
  205 +
  206 + public Map<String, String> getData(ProcessInstance processInstance) {
  207 + Map<String, String> map = actMapper.selectWorkById(processInstance.getBusinessKey());
  208 + return map;
  209 + }
  210 +
  211 + @Override
  212 + public List<String> formDataShow(String taskID) {
  213 + Task task = taskRuntime.task(taskID);
  214 + /*
  215 + * ---------------------------------------------------------------------
  216 + * --------- FormProperty_0ueitp2--__!!类型--__!!名称--__!!是否参数--__!!默认值 例子：
  217 + * FormProperty_0lovri0--__!!string--__!!姓名--__!!f--__!!同意!!__--驳回
  218 + * FormProperty_1iu6onu--__!!int--__!!年龄--__!!s
  219 + *
  220 + * 默认值：无、字符常量、FormProperty_开头定义过的控件ID
  221 + * 是否参数：f为不是参数，s是字符，t是时间(不需要int，因为这里int等价于string)
  222 + * 注：类型是可以获取到的，但是为了统一配置原则，都配置到
  223 + */
  224 +
  225 + // 注意!!!!!!!!:表单Key必须要任务编号一模一样，因为参数需要任务key，但是无法获取，只能获取表单key“task.getFormKey()”当做任务key
  226 + UserTask userTask = (UserTask) repositoryService.getBpmnModel(task.getProcessDefinitionId())
  227 + .getFlowElement(task.getFormKey());
  228 +
  229 + if (userTask == null) {
  230 + return null;
  231 + }
  232 + List<FormProperty> formProperties = userTask.getFormProperties();
  233 + List<String> collect = formProperties.stream().map(fp -> fp.getId()).collect(Collectors.toList());
  234 +
  235 + return collect;
  236 + }
  237 +
  238 + @Override
  239 + public int formDataSave(String taskID, List<ActWorkflowFormDataDTO> awfs) throws ParseException {
  240 + Task task = taskRuntime.task(taskID);
  241 +
  242 +
  243 + ProcessInstance processInstance = runtimeService.createProcessInstanceQuery()
  244 + .processInstanceId(task.getProcessInstanceId()).singleResult();
  245 +
  246 + Map<String, Object> str = processInstance.getProcessVariables();
  247 +
  248 + String desc = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult().getDescription();
  249 + //办文办事功能：分管领导指定部门时，将部门code存入desc
  250 + if (!StringUtils.isEmpty(awfs.get(0).getDeptCode())) {
  251 + desc = awfs.get(0).getDeptCode();
  252 + }
  253 +
  254 +
  255 + Boolean hasVariables = false;// 没有任何参数
  256 + HashMap<String, Object> variables = new HashMap<String, Object>();
  257 + // 前端传来的字符串，拆分成每个控件
  258 + List<ActWorkflowFormData> acwfds = new ArrayList<>();
  259 + for (ActWorkflowFormDataDTO awf : awfs) {
  260 + ActWorkflowFormData actWorkflowFormData = new ActWorkflowFormData(processInstance.getBusinessKey(), awf,
  261 + task);
  262 + acwfds.add(actWorkflowFormData);
  263 + // 构建参数集合
  264 + if (!"f".equals(awf.getControlIsParam())) {
  265 + variables.put(awf.getControlId(), awf.getControlValue());
  266 + hasVariables = true;
  267 + }
  268 +
  269 + if (processInstance.getProcessDefinitionKey().equals("handleAffairs") && awf.getControlId().equals("FormProperty_0aq22i0")) {
  270 + variables.put("index", awf.getIndex());
  271 + }
  272 + } // for结束
  273 + if (task.getAssignee() == null)
  274 + {
  275 + taskRuntime.claim(TaskPayloadBuilder.claim().withTaskId(task.getId()).build());
  276 + }
  277 + if (hasVariables) {
  278 + // 带参数完成任务
  279 + taskRuntime.complete(TaskPayloadBuilder.complete().withTaskId(taskID).withVariables(variables).build());
  280 + } else {
  281 + taskRuntime.complete(TaskPayloadBuilder.complete().withTaskId(taskID).build());
  282 + }
  283 +
  284 +
  285 + updateThreesetpTask(processInstance, desc);
  286 +
  287 +
  288 + // 写入数据库
  289 + return actWorkflowFormDataService.insertActWorkflowFormDatas(acwfds);
  290 + }
284 291  
285 292  
286 293 private void updateThreesetpTask(ProcessInstance processInstance, String placeCode) {
287   -
  294 +
288 295 org.activiti.engine.task.Task task = taskService.createTaskQuery().processInstanceId(processInstance.getId()).singleResult();
289   -
  296 +
290 297 if(task == null)
291 298 return;
292   -
  299 +
293 300 task.setDescription(placeCode);
294   -
  301 +
295 302 if(processInstance.getProcessDefinitionKey().equals("workflow_leave") || processInstance.getProcessDefinitionKey().equals("workflow_caseoffline") ||
296 303 processInstance.getProcessDefinitionKey().equals("logistics") || processInstance.getProcessDefinitionKey().equals("conference")
297   - || processInstance.getProcessDefinitionKey().equals("workflow_threestep") || processInstance.getProcessDefinitionKey().equals("workflow_casefile")){
  304 + || processInstance.getProcessDefinitionKey().equals("workflow_threestep") || processInstance.getProcessDefinitionKey().equals("workflow_casefile")
  305 + || processInstance.getProcessDefinitionKey().equals("handleAffairs") || processInstance.getProcessDefinitionKey().equals("gongwenchuli")){
298 306 List<IdentityLink> list = taskService.getIdentityLinksForTask(task.getId());
299   -
  307 +
300 308 if(list.size() == 1){
301 309 taskService.addCandidateUser(task.getId(), placeCode);
302 310 }
... ... @@ -305,9 +313,9 @@ public class ActTaskServiceImpl implements IActTaskService {
305 313 }
306 314  
307 315 taskService.saveTask(task);
308   -
  316 +
309 317 }
310   -
  318 +
311 319  
312 320 @Override
313 321 public void deleteProcessById(String type) {
... ... @@ -317,12 +325,12 @@ public class ActTaskServiceImpl implements IActTaskService {
317 325 @Override
318 326 public void endAllThreesteptask(String type) {
319 327 List<ProcessInstance> processes = runtimeService.createProcessInstanceQuery().list();
320   -
  328 +
321 329 for(ProcessInstance proc:processes){
322 330 if(type.equals(proc.getProcessDefinitionKey())){
323 331 runtimeService.deleteProcessInstance(proc.getId(), "超时");
324 332 }
325 333 }
326   -
  334 +
327 335 }
328 336 -}
  337 +}
329 338 \ No newline at end of file
... ...
trash-admin/src/main/resources/application-dev.yml
  View file @32edd86
... ... @@ -9,7 +9,7 @@ trash:
9 9 # 实例演示开关
10 10 demoEnabled: true
11 11 # 文件路径 示例（ Windows配置D:/trash/uploadPath，Linux配置 /home/trash/uploadPath，存储桶 trash/uploadPath,nginx配置 /trash/upload）
12   - #profile: /home/thrid-system/upload
  12 +# profile: E:/trash/uploadPath
13 13 profile: c:/work/uploadPath/trash
14 14 # 获取ip地址开关
15 15 addressEnabled: false
... ... @@ -27,12 +27,9 @@ spring:
27 27 druid:
28 28 # 主库数据源
29 29 master:
30   - #url: jdbc:mysql://127.0.0.1:9123/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
31   - #username: sofia
32   - #password: Gpsdata_.123456
33 30 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
34 31 username: root
35   - password: root
  32 + password: asd0731.
36 33 # 从库数据源
37 34 slave:
38 35 # 从数据源开关/默认关闭
... ... @@ -85,10 +82,8 @@ spring:
85 82 host: localhost
86 83 # 端口，默认为6379
87 84 port: 6379
88   - #port: 9102
89 85 # 密码
90   - password:
91   - #password: gpsredis
  86 + password: bsth123
92 87 # 连接超时时间
93 88 timeout: 10s
94 89 database: 10
... ...
trash-daily/src/main/java/com/trash/situation/domain/DailySituation.java
  View file @32edd86
... ... @@ -28,6 +28,10 @@ public class DailySituation extends BaseEntity
28 28 /** 操作人 */
29 29 @Excel(name = "操作人")
30 30 private String operator;
  31 +
  32 +
  33 + @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
  34 + private Date updateTime;
31 35  
32 36 /** 日期 */
33 37 @JsonFormat(pattern = "yyyy-MM-dd")
... ... @@ -41,8 +45,40 @@ public class DailySituation extends BaseEntity
41 45  
42 46 /** 车辆数 */
43 47 private String numberOfVehicles;
44   -
45   - public void setId(String id)
  48 +
  49 + private String caseFileInfo;
  50 +
  51 +
  52 + private String warningCaseFileInfo;
  53 +
  54 +
  55 +
  56 +
  57 + public Date getUpdateTime() {
  58 + return updateTime;
  59 + }
  60 +
  61 + public void setUpdateTime(Date updateTime) {
  62 + this.updateTime = updateTime;
  63 + }
  64 +
  65 + public String getCaseFileInfo() {
  66 + return caseFileInfo;
  67 + }
  68 +
  69 + public void setCaseFileInfo(String caseFileInfo) {
  70 + this.caseFileInfo = caseFileInfo;
  71 + }
  72 +
  73 + public String getWarningCaseFileInfo() {
  74 + return warningCaseFileInfo;
  75 + }
  76 +
  77 + public void setWarningCaseFileInfo(String warningCaseFileInfo) {
  78 + this.warningCaseFileInfo = warningCaseFileInfo;
  79 + }
  80 +
  81 + public void setId(String id)
46 82 {
47 83 this.id = id;
48 84 }
... ...
trash-daily/src/main/resources/mapper/situation/DailySituationMapper.xml
  View file @32edd86
... ... @@ -12,6 +12,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
12 12 <result property="weather" column="weather" />
13 13 <result property="consumptionSiteSituation" column="Consumption_site_situation" />
14 14 <result property="numberOfVehicles" column="Number_of_vehicles" />
  15 + <result property="caseFileInfo" column="case_file_info" />
  16 + <result property="warningCaseFileInfo" column="warning_case_file_info" />
15 17 <result property="createBy" column="create_by" />
16 18 <result property="createTime" column="create_time" />
17 19 <result property="updateTime" column="update_time" />
... ... @@ -19,7 +21,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
19 21 </resultMap>
20 22  
21 23 <sql id="selectDailySituationVo">
22   - select id, title, operator, date, weather, Consumption_site_situation, Number_of_vehicles, create_time, update_time,create_by from daily_situation
  24 + select id, title, operator, date, weather, Consumption_site_situation, Number_of_vehicles,case_file_info,warning_case_file_info, create_time, update_time,create_by from daily_situation
23 25 </sql>
24 26  
25 27 <select id="selectDailySituationList" parameterType="DailySituation" resultMap="DailySituationResult">
... ... @@ -46,6 +48,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
46 48 <if test="weather != null">weather,</if>
47 49 <if test="consumptionSiteSituation != null">Consumption_site_situation,</if>
48 50 <if test="numberOfVehicles != null">Number_of_vehicles,</if>
  51 + <if test="warningCaseFileInfo != null">warning_case_file_info,</if>
  52 + <if test="caseFileInfo != null">case_file_info,</if>
49 53 <if test="createTime != null">create_time,</if>
50 54 <if test="updateTime != null">update_time,</if>
51 55 <if test="createBy != null">create_by,</if>
... ... @@ -58,6 +62,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
58 62 <if test="weather != null">#{weather},</if>
59 63 <if test="consumptionSiteSituation != null">#{consumptionSiteSituation},</if>
60 64 <if test="numberOfVehicles != null">#{numberOfVehicles},</if>
  65 + <if test="warningCaseFileInfo != null">#{warningCaseFileInfo},</if>
  66 + <if test="caseFileInfo != null">#{caseFileInfo},</if>
61 67 <if test="createTime != null">#{createTime},</if>
62 68 <if test="updateTime != null">#{updateTime},</if>
63 69 <if test="createBy != null">#{createBy}</if>
... ... @@ -73,6 +79,8 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
73 79 <if test="weather != null">weather = #{weather},</if>
74 80 <if test="consumptionSiteSituation != null">Consumption_site_situation = #{consumptionSiteSituation},</if>
75 81 <if test="numberOfVehicles != null">Number_of_vehicles = #{numberOfVehicles},</if>
  82 + <if test="warningCaseFileInfo != null">warning_case_file_info = #{warningCaseFileInfo},</if>
  83 + <if test="caseFileInfo != null">case_file_info = #{caseFileInfo},</if>
76 84 <if test="createTime != null">create_time = #{createTime},</if>
77 85 <if test="updateTime != null">update_time = #{updateTime},</if>
78 86 </trim>
... ...
trash-ui/src/api/dict.js
  View file @32edd86
... ... @@ -115,6 +115,14 @@ export function getArea(params) {
115 115 });
116 116 }
117 117  
  118 +export function getUsers(data){
  119 + return requestRemote({
  120 + url: '/api/authservice/cs/user/authority',
  121 + method: 'post',
  122 + data:data
  123 + })
  124 +}
  125 +
118 126  
119 127 export function getDict(params) {
120 128 return requestRemote({
... ...
trash-ui/src/api/office/handle.js
  View file @32edd86
... ... @@ -51,3 +51,12 @@ export function exportHandle(query) {
51 51 params: query
52 52 })
53 53 }
  54 +
  55 +// 审批修改办文办事
  56 +export function updateHandleAffairs(data) {
  57 + return request({
  58 + url: '/office/handle/updateHandleAffairs',
  59 + method: 'post',
  60 + data: data
  61 + })
  62 +}
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @32edd86
... ... @@ -2,20 +2,20 @@
2 2 <div class="app-container">
3 3 <el-select v-model="queryParams.dept" filterable clearable reserve-keyword @change="getList">
4 4 <el-option v-for="item in depts" :label="item.name"
5   - :value="item.code" :key="item.code" >
  5 + :value="item.code" :key="item.code">
6 6 </el-option>
7 7 </el-select>
8 8 <el-select v-model="queryParams.role" filterable clearable reserve-keyword @change="getList">
9 9 <el-option v-for="item in roles" :label="item.name"
10   - :value="item.code" :key="item.code" >
  10 + :value="item.code" :key="item.code">
11 11 </el-option>
12 12 </el-select>
13 13  
14 14  
15   - <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask" />
  15 + <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
16 16  
17 17 <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
18   - @pagination="getList" />
  18 + @pagination="getList"/>
19 19  
20 20 <!-- 审批对话框 -->
21 21 <el-dialog :title="title" :visible.sync="open" v-if="open" width="500px" append-to-body>
... ... @@ -27,24 +27,24 @@
27 27 </el-dialog>
28 28  
29 29 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
30   - <threestepInfo :businessKey="businessKey" v-if="open2" />
  30 + <threestepInfo :businessKey="businessKey" v-if="open2"/>
31 31 <el-form v-if="taskName == '巡查'" :rules="rules" label-width="120px">
32 32 <el-row type="flex" justify="center">
33 33 <el-col>
34 34 <el-form-item label="补充说明">
35   - <el-input type="textarea" v-model="form.subReason" />
  35 + <el-input type="textarea" v-model="form.subReason"/>
36 36 </el-form-item>
37 37 </el-col>
38 38 </el-row>
39 39 <el-row type="flex" justify="center">
40 40 <el-col :span="12">
41 41 <el-form-item label="渣管负责人">
42   - <el-input v-model="form.earthPipPerson" />
  42 + <el-input v-model="form.earthPipPerson"/>
43 43 </el-form-item>
44 44 </el-col>
45 45 <el-col :span="12">
46 46 <el-form-item label="执法负责人">
47   - <el-input v-model="form.enforcePerson" />
  47 + <el-input v-model="form.enforcePerson"/>
48 48 </el-form-item>
49 49 </el-col>
50 50 </el-row>
... ... @@ -57,25 +57,29 @@
57 57 <el-col :span="6">
58 58 <a style="color:blue;font-size: 12px;" @click="showFileUpload(0)">履职情况照片</a>
59 59 <el-input v-model="form.sub_img0" type="hidden"></el-input>
60   - <p v-for="img in form.sub_img0">{{img.split(":")[0]}}<a @click="removeImage(0,img)" style="color:red"> x</a>
  60 + <p v-for="img in form.sub_img0">{{ img.split(":")[0] }}<a @click="removeImage(0,img)" style="color:red">
  61 + x</a>
61 62 </p>
62 63 </el-col>
63 64 <el-col :span="6">
64 65 <a style="color:blue;font-size: 12px;" @click="showFileUpload(1)">水枪水嘴照片</a>
65 66 <el-input v-model="form.sub_img1" type="hidden"></el-input>
66   - <p v-for="img in form.sub_img1">{{img.split(":")[0]}}<a @click="removeImage(1,img)" style="color:red"> x</a>
  67 + <p v-for="img in form.sub_img1">{{ img.split(":")[0] }}<a @click="removeImage(1,img)" style="color:red">
  68 + x</a>
67 69 </p>
68 70 </el-col>
69 71 <el-col :span="6">
70 72 <a style="color:blue;font-size: 12px;" @click="showFileUpload(2)">照明照片</a>
71 73 <el-input v-model="form.sub_img2" type="hidden"></el-input>
72   - <p v-for="img in form.sub_img2">{{img.split(":")[0]}}<a @click="removeImage(2,img)" style="color:red"> x</a>
  74 + <p v-for="img in form.sub_img2">{{ img.split(":")[0] }}<a @click="removeImage(2,img)" style="color:red">
  75 + x</a>
73 76 </p>
74 77 </el-col>
75 78 <el-col :span="6">
76 79 <a style="color:blue;font-size: 12px;" @click="showFileUpload(3)">视频监控照片</a>
77 80 <el-input v-model="form.sub_img3" type="hidden"></el-input>
78   - <p v-for="img in form.sub_img3">{{img.split(":")[0]}}<a @click="removeImage(3,img)" style="color:red"> x</a>
  81 + <p v-for="img in form.sub_img3">{{ img.split(":")[0] }}<a @click="removeImage(3,img)" style="color:red">
  82 + x</a>
79 83 </p>
80 84 </el-col>
81 85 </el-row>
... ... @@ -83,25 +87,29 @@
83 87 <el-col :span="6">
84 88 <a style="color:blue;font-size: 12px;" @click="showFileUpload(4)">洗车机照片</a>
85 89 <el-input v-model="form.sub_img4" type="hidden"></el-input>
86   - <p v-for="img in form.sub_img4">{{img.split(":")[0]}}<a @click="removeImage(4,img)" style="color:red"> x</a>
  90 + <p v-for="img in form.sub_img4">{{ img.split(":")[0] }}<a @click="removeImage(4,img)" style="color:red">
  91 + x</a>
87 92 </p>
88 93 </el-col>
89 94 <el-col :span="6">
90 95 <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a>
91 96 <el-input v-model="form.sub_img5" type="hidden"></el-input>
92   - <p v-for="img in form.sub_img5">{{img.split(":")[0]}}<a @click="removeImage(5,img)" style="color:red"> x</a>
  97 + <p v-for="img in form.sub_img5">{{ img.split(":")[0] }}<a @click="removeImage(5,img)" style="color:red">
  98 + x</a>
93 99 </p>
94 100 </el-col>
95 101 <el-col :span="6">
96 102 <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a>
97 103 <el-input v-model="form.sub_img6" type="hidden"></el-input>
98   - <p v-for="img in form.sub_img6">{{img.split(":")[0]}}<a @click="removeImage(6,img)" style="color:red"> x</a>
  104 + <p v-for="img in form.sub_img6">{{ img.split(":")[0] }}<a @click="removeImage(6,img)" style="color:red">
  105 + x</a>
99 106 </p>
100 107 </el-col>
101 108 <el-col :span="6">
102 109 <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a>
103 110 <el-input v-model="form.sub_img7" type="hidden"></el-input>
104   - <p v-for="img in form.sub_img7">{{img.split(":")[0]}}<a @click="removeImage(7,img)" style="color:red"> x</a>
  111 + <p v-for="img in form.sub_img7">{{ img.split(":")[0] }}<a @click="removeImage(7,img)" style="color:red">
  112 + x</a>
105 113 </p>
106 114 </el-col>
107 115 </el-row>
... ... @@ -109,34 +117,36 @@
109 117 <el-col :span="5">
110 118 <a style="color:blue;font-size: 12px;" @click="showFileUpload(8)">其他1</a>
111 119 <el-input v-model="form.sub_img8" type="hidden"></el-input>
112   - <p v-for="img in form.sub_img8">{{img.split(":")[0]}}<a @click="removeImage(8,img)" style="color:red"> x</a>
  120 + <p v-for="img in form.sub_img8">{{ img.split(":")[0] }}<a @click="removeImage(8,img)" style="color:red">
  121 + x</a>
113 122 </p>
114 123 </el-col>
115 124 <el-col :span="5">
116 125 <a style="color:blue;font-size: 12px;" @click="showFileUpload(9)">其他2</a>
117 126 <el-input v-model="form.sub_img9" type="hidden"></el-input>
118   - <p v-for="img in form.sub_img9">{{img.split(":")[0]}}<a @click="removeImage(9,img)" style="color:red"> x</a>
  127 + <p v-for="img in form.sub_img9">{{ img.split(":")[0] }}<a @click="removeImage(9,img)" style="color:red">
  128 + x</a>
119 129 </p>
120 130 </el-col>
121 131 <el-col :span="5">
122 132 <a style="color:blue;font-size: 12px;" @click="showFileUpload(10)">其他3</a>
123 133 <el-input v-model="form.sub_img10" type="hidden"></el-input>
124   - <p v-for="img in form.sub_img10">{{img.split(":")[0]}}<a @click="removeImage(10,img)" style="color:red">
125   - x</a>
  134 + <p v-for="img in form.sub_img10">{{ img.split(":")[0] }}<a @click="removeImage(10,img)" style="color:red">
  135 + x</a>
126 136 </p>
127 137 </el-col>
128 138 <el-col :span="5">
129 139 <a style="color:blue;font-size: 12px;" @click="showFileUpload(11)">其他4</a>
130 140 <el-input v-model="form.sub_img11" type="hidden"></el-input>
131   - <p v-for="img in form.sub_img11">{{img.split(":")[0]}}<a @click="removeImage(11,img)" style="color:red">
132   - x</a>
  141 + <p v-for="img in form.sub_img11">{{ img.split(":")[0] }}<a @click="removeImage(11,img)" style="color:red">
  142 + x</a>
133 143 </p>
134 144 </el-col>
135 145 <el-col :span="4">
136 146 <a style="color:blue;font-size: 12px;" @click="showFileUpload(12)">其他5</a>
137 147 <el-input v-model="form.sub_img12" type="hidden"></el-input>
138   - <p v-for="img in form.sub_img12">{{img.split(":")[0]}}<a @click="removeImage(12,img)" style="color:red">
139   - x</a>
  148 + <p v-for="img in form.sub_img12">{{ img.split(":")[0] }}<a @click="removeImage(12,img)" style="color:red">
  149 + x</a>
140 150 </p>
141 151 </el-col>
142 152 </el-row>
... ... @@ -150,10 +160,9 @@
150 160 </el-dialog>
151 161  
152 162  
153   -
154 163 <el-dialog title="附件" :visible.sync="uploadImageDialog" append-to-body :beforeClose="handleClose">
155 164 <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
156   - :on-success="uploadSuccess" :before-upload="beforeUpload">
  165 + :on-success="uploadSuccess" :before-upload="beforeUpload">
157 166 <el-button size="small" type="primary">选择附件</el-button>
158 167 <div slot="tip" class="el-upload__tip">只能上传不超过 20MB 的jpg pdf word文件</div>
159 168 </el-upload>
... ... @@ -163,117 +172,108 @@
163 172 </el-dialog>
164 173  
165 174 <el-dialog title="示意图" :visible.sync="picSample" append-to-body>
166   - <img src="../../../assets/logo/logo.jpg" width="100%" height="800px" />
  175 + <img src="../../../assets/logo/logo.jpg" width="100%" height="800px"/>
167 176 </el-dialog>
168 177  
169 178 <!-- 会议管理 -->
170 179 <el-dialog :title="title" :visible.sync="conferenceOpen" width="850px" append-to-body :close-on-click-modal="false">
171 180 <conferenceInfo :idInfo="idInfo" v-if="conferenceOpen"/>
172 181 <div slot="footer" class="dialog-footer">
173   - <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
174   - <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
175   - </div>
  182 + <el-button type="danger" @click="conferenceSubmitForm(1)">驳回</el-button>
  183 + <el-button type="primary" @click="conferenceSubmitForm(0)">通过</el-button>
  184 + </div>
176 185 </el-dialog>
177 186  
178 187 <!-- 请假申请 -->
179   - <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body :close-on-click-modal="false">
  188 + <el-dialog :title="title" :visible.sync="leaveApplicationOpen" width="500px" append-to-body
  189 + :close-on-click-modal="false">
180 190 <leaveApplicationInfo :idInfo="idInfo" v-if="leaveApplicationOpen"/>
181 191 <div slot="footer" class="dialog-footer">
182   - <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
183   - <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
184   - </div>
  192 + <el-button type="danger" @click="leaveApplicationSubmitForm(1)">驳回</el-button>
  193 + <el-button type="primary" @click="leaveApplicationSubmitForm(0)">通过</el-button>
  194 + </div>
185 195 </el-dialog>
186 196  
187 197  
188 198 <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>
189   - <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />
  199 + <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>
190 200 <el-row>
191 201  
192   - <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
  202 + <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>
193 203 </el-row>
194 204 <div slot="footer" class="dialog-footer">
195   - <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
196   - <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
197   - </div>
  205 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  206 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  207 + </div>
198 208 </el-dialog>
199 209  
200 210 <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>
201   - <earthsitesInfo :businessKey="businessKey" v-if="earthsites" />
  211 + <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/>
202 212 <div slot="footer" class="dialog-footer">
203   - <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
204   - <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
205   - </div>
  213 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  214 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  215 + </div>
206 216 </el-dialog>
207 217  
208 218 <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>
209   - <contractInfo :businessKey="businessKey" v-if="contract" />
  219 + <contractInfo :businessKey="businessKey" v-if="contract"/>
210 220 <div slot="footer" class="dialog-footer">
211   - <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
212   - <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
213   - </div>
  221 + <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">驳回</el-button>
  222 + <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">通过</el-button>
  223 + </div>
214 224 </el-dialog>
215 225  
216 226 <!-- 后勤管理 -->
217   - <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body :close-on-click-modal="false">
  227 + <el-dialog :title="title" :visible.sync="logisticsInfoOpen" width="500px" append-to-body
  228 + :close-on-click-modal="false">
218 229 <logisticsInfo :idInfo="idInfo" v-if="logisticsInfoOpen"/>
219 230 <div slot="footer" class="dialog-footer">
220   - <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
221   - <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
222   - </div>
  231 + <el-button type="danger" @click="logisticsInfoSubmitForm(1)">驳回</el-button>
  232 + <el-button type="primary" @click="logisticsInfoSubmitForm(0)">通过</el-button>
  233 + </div>
223 234 </el-dialog>
224 235  
225 236 <!-- 办文办事 -->
226   - <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body :close-on-click-modal="false">
227   - <handleInfo :idInfo="idInfo" v-if="handleAffairsInfoOpen"/>
  237 + <el-dialog :title="title" :visible.sync="handleAffairsInfoOpen" width="600px" append-to-body
  238 + :close-on-click-modal="false">
  239 + <handleInfo ref="handleAffairsInfoRef" :idInfo="idInfo" v-if="handleAffairsInfoOpen" :depts="depts"
  240 + :businessKey="definitionKey"
  241 + :controlId="controlId"/>
  242 + <el-form label-width="110px" v-if="definitionKey=='yuelan'">
  243 + <el-form-item label="阅览部门:">
  244 + <el-select ref="formDeptNameRef" v-model="deptName" placeholder="请选择部门" style="width: 100% "
  245 + @change="changeDepts">
  246 + <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  247 + </el-select>
  248 + </el-form-item>
  249 + <el-form-item label="阅览人:">
  250 + <treeselect v-model="users" :multiple="true" :options="options" placeholder="请选择"/>
  251 + </el-form-item>
  252 + </el-form>
228 253 <div slot="footer" class="dialog-footer">
229   - <el-button type="danger" @click="handleAffairsSubmitForm(1)">驳回</el-button>
  254 + <div slot="footer" class="dialog-footer">
  255 + <el-button type="danger" @click="handleAffairsSubmitForm(1)"
  256 + v-if="controlId!='FormProperty_11p96vq' && controlId!='FormProperty_0d6ngk1' && definitionKey!='yuelanxuexi' && definitionKey!='yuelan'">驳回
  257 + </el-button>
230 258 <el-button type="primary" @click="handleAffairsSubmitForm(0)">通过</el-button>
231 259 </div>
  260 + </div>
232 261 </el-dialog>
233 262  
234 263 <!-- 线下案卷交办 -->
235 264 <el-dialog :title="title" :visible.sync="caseOffline" width="600px" append-to-body :close-on-click-modal="false">
236 265 <caseOfflineInfo :businessKey="businessKey" v-if="caseOffline"/>
237   - <el-input v-model="form.advice" placeholder="请填写审批意见" type="textarea" :rows="3" />
238   - <div slot="footer" class="dialog-footer">
239   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
240   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
241   - </div>
242   - </el-dialog>
243   - <!-- 办文办事 -->
244   - <el-dialog :title="title" :visible.sync="violationCaseFile" width="600px" append-to-body :close-on-click-modal="false">
245   - <violationCaseFileInfo :idInfo="businessKey" v-if="violationCaseFile"/>
246   - <el-form v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员' && violationCaseFile" :rules="rules" label-width="120px" >
247   - <el-input v-model="form.reply" type="textarea" :rows="3" placeholder="回复意见">
248   - </el-input>
249   - <el-upload
250   - list-type="picture"
251   - action=''
252   - accept=".jpg, .png , .bmp"
253   - :limit="1"
254   - :auto-upload="false"
255   - :file-list="form.replyImg"
256   - :on-change="getFile"
257   - :on-preview="handlePictureCardPreview"
258   - :on-remove="handleUploadRemove"
259   - >
260   - <el-button size="small" type="primary" @click="uploadimg" v-if="form.replyImg == null">选择图片上传</el-button>
261   - <div slot="tip" class="el-upload__tip" v-if="form.replyImg== null">只能上传一张图片文件</div>
262   - </el-upload>
263   -
264   - </el-form>
265   -
266   -
  266 + <el-input v-model="form.advice" placeholder="请填写审批意见" type="textarea" :rows="3"/>
267 267 <div slot="footer" class="dialog-footer">
268   - <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)" v-if="this.taskName != '车辆所属企业' && this.taskName != '渣土办科员'">驳回</el-button>
269   - <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
270   - </div>
  268 + <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">驳回</el-button>
  269 + <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">通过</el-button>
  270 + </div>
271 271 </el-dialog>
272 272 </div>
273 273 </template>
274 274  
275 275 <style>
276   - @import '../../../assets/css/task.css'
  276 +@import '../../../assets/css/task.css';
277 277 </style>
278 278  
279 279 <script>
... ... @@ -384,495 +384,621 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
384 384 message: '请填写补充说明',
385 385 trigger: 'change'
386 386 }, ],
387   -
388   - },
389   - picIndex: 0,
390   - fileList: [],
391   - upload: {
392   - // 是否显示弹出层（用户导入）
393   - open: false,
394   - // 弹出层标题（用户导入）
395   - title: "",
396   - // 是否禁用上传
397   - isUploading: false,
398   - // 设置上传的请求头部
399   - headers: {
400   - Authorization: "Bearer " + getToken()
401   - },
402   - // 上传的地址
403   - url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
  387 + },
  388 + picIndex: 0,
  389 + fileList: [],
  390 + upload: {
  391 + // 是否显示弹出层（用户导入）
  392 + open: false,
  393 + // 弹出层标题（用户导入）
  394 + title: "",
  395 + // 是否禁用上传
  396 + isUploading: false,
  397 + // 设置上传的请求头部
  398 + headers: {
  399 + Authorization: "Bearer " + getToken()
404 400 },
405   - uploadImageDialog: false,
406   - conferenceOpen: false,
407   - construct:false,
408   - idInfo:null,
409   - leaveApplicationOpen:false,
410   - signData:null,
411   - areas:[],
412   - roles:[],
413   - depts:[],
414   - signDataInfo:null,
415   - earthsites:false,
416   - contract:false,
417   - logisticsInfoOpen:false,
418   - handleAffairsInfoOpen:false,
419   - caseOffline:false,
420   - violationCaseFile:false,
421   - };
  401 + // 上传的地址
  402 + url: process.env.VUE_APP_BASE_API + "/business/threestep/upload",
  403 + },
  404 + uploadImageDialog: false,
  405 + conferenceOpen: false,
  406 + construct: false,
  407 + idInfo: null,
  408 + leaveApplicationOpen: false,
  409 + signData: null,
  410 + areas: [],
  411 + roles: [],
  412 + depts: [],
  413 + signDataInfo: null,
  414 + earthsites: false,
  415 + contract: false,
  416 + logisticsInfoOpen: false,
  417 + handleAffairsInfoOpen: false,
  418 + caseOffline: false,
  419 + violationCaseFile: false,
  420 + controlId: null,
  421 + users: [],
  422 + options: [],
  423 + usersName: [],
  424 + deptName:null,
  425 + };
  426 + },
  427 + created() {
  428 + let dep = {type: "CSUserDepartmentType"};
  429 +
  430 + getDict(dep).then(res => {
  431 + this.depts = res.result;
  432 + });
  433 +
  434 + let role = {type: "CSUserPostType"};
  435 +
  436 + getDict(role).then(res => {
  437 + this.roles = res.result;
  438 + });
  439 + this.getList();
  440 + },
  441 + methods: {
  442 +
  443 + handleClose() {
  444 + this.uploadImageDialog = false;
  445 + this.fileList = [];
422 446 },
423   - created() {
424   - let dep = {type:"CSUserDepartmentType"};
425   -
426   - getDict(dep).then(res=>{
427   - this.depts = res.result;
428   - });
429   -
430   - let role = {type:"CSUserPostType"};
  447 + removeImage(index, img) {
  448 + let target = "sub_img" + this.picIndex;
  449 + this.form[target].splice(this.form[target].indexOf(img), 1);
  450 + },
  451 + uploadSuccess(res, file, fileList) {
  452 + let target = "sub_img" + this.picIndex;
  453 + if (!this.form[target]) {
  454 + this.form[target] = [];
  455 + }
  456 + this.form[target].push(file.name + ':' + res);
431 457  
432   - getDict(role).then(res=>{
433   - this.roles = res.result;
  458 + },
  459 + showFileUpload(i) {
  460 + this.uploadImageDialog = true;
  461 + this.picIndex = i;
  462 + },
  463 + beforeUpload(file) {
  464 + let isRightSize = file.size / 1024 / 1024 < 20
  465 + if (!isRightSize) {
  466 + this.$message.error('文件大小超过 20MB')
  467 + return isRightSize;
  468 + }
  469 + let isAccept = false;
  470 + if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
  471 + .name.indexOf('.pdf') > -1) {
  472 + isAccept = true;
  473 + }
  474 + if (!isAccept) {
  475 + this.$message.error('应该选择PDF、JPG、WORD类型的文件')
  476 + return isAccept;
  477 + }
  478 + },
  479 + getList() {
  480 + this.reset();
  481 + this.loading = true;
  482 + listTask(this.queryParams).then(response => {
  483 + this.taskList = response.rows;
  484 + this.total = response.total;
  485 + this.loading = false;
434 486 });
435   -
436   - this.getList();
437 487 },
438   - methods: {
439 488  
440   - handleClose() {
441   - this.uploadImageDialog = false;
442   - this.fileList = [];
443   - },
444   - removeImage(index, img) {
445   - let target = "sub_img" + this.picIndex;
446   - this.form[target].splice(this.form[target].indexOf(img), 1);
447   - },
448   - uploadSuccess(res, file, fileList) {
449   - let target = "sub_img" + this.picIndex;
450   - if (!this.form[target]) {
451   - this.form[target] = [];
  489 + // 取消按钮
  490 + cancel() {
  491 + this.open = false;
  492 + this.open2 = false;
  493 + this.leaveApplicationOpen = false;
  494 + this.conferenceOpen = false;
  495 + this.construct = false;
  496 + this.logisticsInfoOpen = false;
  497 + this.handleAffairsInfoOpen = false;
  498 + this.reset();
  499 + },
  500 + // 表单重置
  501 + reset() {
  502 + this.definitionKey = '',
  503 + this.businessKey = '',
  504 + this.form = {
  505 + formData: [],
  506 + };
  507 + this.resetForm("form");
  508 + },
  509 + showTask(row, idx) {
  510 + this.reset();
  511 + this.definitionKey = row.definitionKey;
  512 + this.businessKey = row.businessKey;
  513 + this.id = row.id;
  514 + this.taskName = row.name;
  515 + formDataShow(row.id).then(response => {
  516 + let datas = response.data;
  517 + let formData = []
  518 + for (let i = 0; i < datas.length; i++) {
  519 + let strings = datas[i].split('--__!!')
  520 + let controlValue = null
  521 + let controlDefault = null
  522 + switch (strings[1]) {
  523 + case 'radio':
  524 + controlValue = idx;
  525 + controlDefault = strings[4]
  526 + break;
  527 + // default:
  528 + }
  529 + formData.push({
  530 + controlId: strings[0],
  531 + controlType: strings[1],
  532 + controlLable: strings[2],
  533 + controlIsParam: strings[3],
  534 + controlValue: controlValue,
  535 + controlDefault: controlDefault
  536 + })
452 537 }
453   - this.form[target].push(file.name + ':' + res);
  538 + this.form.formData = formData;
454 539  
455   - },
456   - showFileUpload(i) {
457   - this.uploadImageDialog = true;
458   - this.picIndex = i;
459   - },
460   - beforeUpload(file) {
461   - let isRightSize = file.size / 1024 / 1024 < 20
462   - if (!isRightSize) {
463   - this.$message.error('文件大小超过 20MB')
464   - return isRightSize;
  540 + if (this.definitionKey == "workflow_threestep") {
  541 + this.open2 = true;
  542 + return;
465 543 }
466   - let isAccept = false;
467   - if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file
468   - .name.indexOf('.pdf') > -1) {
469   - isAccept = true;
  544 + if (this.definitionKey == "conference") {
  545 + this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":") + 1);
  546 + this.conferenceOpen = true;
  547 + return;
470 548 }
471   - if (!isAccept) {
472   - this.$message.error('应该选择PDF、JPG、WORD类型的文件')
473   - return isAccept;
  549 + if (this.definitionKey == "workflow_leave") {
  550 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
  551 + this.leaveApplicationOpen = true;
  552 + return;
474 553 }
475   - },
476   - getList() {
477   - this.reset();
478   - this.loading = true;
479   - listTask(this.queryParams).then(response => {
480   - this.taskList = response.rows;
481   - this.total = response.total;
482   - this.loading = false;
483   - });
484   - },
485   -
486   - // 取消按钮
487   - cancel() {
488   - this.open = false;
489   - this.open2 = false;
490   - this.leaveApplicationOpen= false;
491   - this.conferenceOpen = false;
492   - this.construct = false;
493   - this.logisticsInfoOpen = false;
494   - this.handleAffairsInfoOpen = false;
495   - this.reset();
496   - },
497   - // 表单重置
498   - reset() {
499   - this.definitionKey = '',
500   - this.businessKey = '',
501   - this.form = {
502   - formData: [],
503   - };
504   - this.resetForm("form");
505   - },
506   - showTask(row, idx) {
507   - this.reset();
508   - this.definitionKey = row.definitionKey;
509   - this.businessKey = row.businessKey;
510   - this.id = row.id;
511   - this.taskName = row.name;
512   - formDataShow(row.id).then(response => {
513   - let datas = response.data;
514   - let formData = []
515   - for (let i = 0; i < datas.length; i++) {
516   - let strings = datas[i].split('--__!!')
517   - let controlValue = null
518   - let controlDefault = null
519   - switch (strings[1]) {
520   - case 'radio':
521   - controlValue = idx;
522   - controlDefault = strings[4]
523   - break;
524   - // default:
525   - }
526   - formData.push({
527   - controlId: strings[0],
528   - controlType: strings[1],
529   - controlLable: strings[2],
530   - controlIsParam: strings[3],
531   - controlValue: controlValue,
532   - controlDefault: controlDefault
533   - })
534   - }
535   - this.form.formData = formData;
536 554  
537   - if (this.definitionKey == "workflow_threestep") {
538   - this.open2 = true;
539   - return;
540   - }
541   - if(this.definitionKey == "conference"){
542   - this.idInfo = row.businessKey.substring(row.businessKey.indexOf(":")+1);
543   - this.conferenceOpen = true;
544   - return;
545   - }
546   - if(this.definitionKey == "workflow_leave"){
547   - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
548   - this.leaveApplicationOpen = true;
549   - return;
550   - }
551   -
552   - if(this.definitionKey == "workflow_constructsite"){
  555 + if (this.definitionKey == "workflow_constructsite") {
  556 + getSignByObjId(this.businessKey.split(":")[1]).then(res => {
  557 + if (this.definitionKey == "workflow_constructsite") {
553 558  
554 559 this.signDataInfo = "经现场查勘及核对资料，现场设施基本达到净车出场标准，建议按程序办理相关手续，妥否，请批示。";
555   - this.construct = true;
556   - return;
557   - }
558   - if(this.definitionKey == "workflow_earthsites"){
559   - this.earthsites = true;
560   - return;
561   - }
562   - if(this.definitionKey == "workflow_conract"){
563   - this.contract = true;
564   - return;
565   - }
566   -
567 560  
  561 + this.signData = res.data;
  562 + this.construct = true;
  563 + }
  564 + })
  565 + }
  566 + if (this.definitionKey == "workflow_earthsites") {
  567 + this.earthsites = true;
  568 + return;
  569 + }
  570 + if (this.definitionKey == "workflow_conract") {
  571 + this.contract = true;
  572 + return;
  573 + }
568 574  
569   - if(this.definitionKey == "logistics"){
570   - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
571   - this.logisticsInfoOpen = true;
572   - return;
573   - }
574   - if(this.definitionKey == "handleAffairs"){
575   - this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":")+1);
576   - this.handleAffairsInfoOpen = true;
577   - return;
578   - }
579   - if(this.definitionKey == "workflow_caseoffline"){
580   - this.caseOffline = true;
581   - return;
582   - }
  575 + if (this.definitionKey == "logistics") {
  576 + this.idInfo = row.businessKey.substring(row.businessKey.lastIndexOf(":") + 1);
  577 + this.logisticsInfoOpen = true;
  578 + return;
  579 + }
  580 + if (this.definitionKey == "handleAffairs" || this.definitionKey == "gongwenchuli" || this.definitionKey == "yuelan" || this.definitionKey=="yuelanxuexi") {
  581 + this.controlId = this.form.formData[0].controlId;
  582 + this.idInfo = row.businessKey.split(":")[1];
  583 + this.handleAffairsInfoOpen = true;
  584 + return;
  585 + }
  586 + this.open = true;
  587 + this.title = "审批";
  588 + });
  589 + },
583 590  
584   - if(this.definitionKey == "workflow_casefile"){
585   - this.violationCaseFile = true;
586   - return;
  591 + /** 提交按钮 */
  592 + submitForm(formid, value) {
  593 + this.form.formData[0].controlValue = value;
  594 + this.form.formData[0].controlId = formid;
  595 + this.form.id = this.businessKey.split(":")[1];
  596 + if (this.form.formData[0].controlValue == 0) {
  597 + this.form.status = 1;
  598 + } else {
  599 + this.form.status = 2;
  600 + }
  601 +
  602 + if (this.definitionKey == "workflow_threestep") {
  603 +
  604 +
  605 + for (let i = 0; i < 13; i++) {
  606 + if (this.form["sub_img" + i]) {
  607 + let paths = "";
  608 + for (var j = 0; j < this.form["sub_img" + i].length; j++) {
  609 + paths += this.form["sub_img" + i][j].split(":")[1] + ",";
  610 + }
  611 + this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
587 612 }
  613 + }
588 614  
589   -
590   -
591   -
592   - this.open = true;
593   - this.title = "审批";
594   - });
595   - },
596   - /** 提交按钮 */
597   - submitForm(formid, value) {
598   - this.form.formData[0].controlValue = value;
599   - this.form.formData[0].controlId = formid;
600   - this.form.id = this.businessKey.split(":")[1];
601   - if (this.form.formData[0].controlValue == 0) {
602   - this.form.status = 1;
  615 + this.form.checkTime = new Date();
  616 + if (this.form.status == 1) {
  617 + activeThreestep(this.form).then(res => {
  618 + formDataSave(this.id, this.form.formData).then(response => {
  619 + this.msgSuccess("审批成功");
  620 + this.open2 = false;
  621 + this.taskList = [];
  622 + this.getList();
  623 + });
  624 + });
603 625 } else {
604   - this.form.status = 2;
  626 + updateThreestep(this.form).then(res => {
  627 + formDataSave(this.id, this.form.formData).then(response => {
  628 + this.msgSuccess("审批成功");
  629 + this.open2 = false;
  630 + this.taskList = [];
  631 + this.getList();
  632 + });
  633 + });
605 634 }
  635 + return;
  636 + }
606 637  
607   - if (this.definitionKey == "workflow_threestep") {
608   -
609   -
610   - for (let i = 0; i < 13; i++) {
611   - if (this.form["sub_img" + i]) {
612   - let paths = "";
613   - for (var j = 0; j < this.form["sub_img" + i].length; j++) {
614   - paths += this.form["sub_img" + i][j].split(":")[1] + ",";
615   - }
616   - this.form["sub_img" + i] = paths.substring(0, paths.length - 1);
617   - }
  638 + if (this.definitionKey == "workflow_constructsite") {
  639 + if (this.form.status == 1) {
  640 + let objId = this.businessKey.split(":")[1];
  641 + let query = {
  642 + objectId: objId,
  643 + };
  644 + if (this.taskName == "勘察科员") {
  645 + query.idx = 0;
  646 + query.sign1Text = this.signDataInfo;
  647 + } else if (this.taskName == "堪察部长") {
  648 + query.idx = 1;
  649 + query.sign2Text = this.signDataInfo;
  650 + } else if (this.taskName == "堪察分管领导") {
  651 + query.idx = 2;
  652 + query.sign3Text = this.signDataInfo;
  653 + } else if (this.taskName == "中心负责人") {
  654 + query.idx = 3;
  655 + query.sign4Text = this.signDataInfo;
618 656 }
619 657  
620   - this.form.checkTime = new Date();
621   - if (this.form.status == 1) {
622   - activeThreestep(this.form).then(res => {
623   - formDataSave(this.id, this.form.formData).then(response => {
624   - this.msgSuccess("审批成功");
625   - this.open2 = false;
626   - this.taskList = [];
627   - this.getList();
628   - });
629   - });
630   - } else {
631   - updateThreestep(this.form).then(res => {
632   - formDataSave(this.id, this.form.formData).then(response => {
633   - this.msgSuccess("审批成功");
634   - this.open2 = false;
635   - this.taskList = [];
636   - this.getList();
637   - });
  658 + addSign(query).then(res => {
  659 + formDataSave(this.id, this.form.formData).then(response => {
  660 + this.msgSuccess("审批成功");
  661 + this.open = false;
  662 + this.construct = false;
  663 + this.getList();
638 664 });
639   - }
640   - return;
641   - }
  665 + })
  666 +
  667 + } else {
642 668  
643   - if(this.definitionKey == "workflow_constructsite"){
644   - if(this.form.status == 1){
645   - let objId = this.businessKey.split(":")[1];
646   - let query = {
647   - objectId : objId,
648   - };
649   - if(this.taskName == "勘察科员"){
650   - query.idx = 0;
651   - query.sign1Text = this.signDataInfo;
652   - }else if(this.taskName == "堪察部长"){
653   - query.idx = 1;
654   - query.sign2Text = this.signDataInfo;
655   - }else if(this.taskName == "堪察分管领导"){
656   - query.idx = 2;
657   - query.sign3Text = this.signDataInfo;
658   - }else if(this.taskName == "中心负责人"){
659   - query.idx = 3;
660   - query.sign4Text = this.signDataInfo;
661   - }
662   -
663   - addSign(query).then(res=>{
664   - formDataSave(this.id, this.form.formData).then(response => {
665   - this.msgSuccess("审批成功");
666   - this.open = false;
667   - this.construct = false;
668   - this.getList();
669   - });
670   - })
671   -
672   - }else{
673   -
674   - formDataSave(this.id, this.form.formData).then(response => {
675   - this.msgSuccess("审批成功");
676   - this.construct = false;
677   - this.getList();
678   - });
679   - }
680   - return;
681   - }
682   - if(this.definitionKey == "workflow_conract"){
683 669 formDataSave(this.id, this.form.formData).then(response => {
684 670 this.msgSuccess("审批成功");
685   - this.contract = false;
  671 + this.construct = false;
686 672 this.getList();
687 673 });
688 674 }
689   - if(this.definitionKey == "workflow_earthsites"){
  675 + return;
  676 + formDataSave(this.id, this.form.formData).then(response => {
  677 + this.msgSuccess("审批成功");
  678 + this.construct = false;
  679 + this.getList();
  680 + });
  681 + }
  682 +
  683 + if (this.definitionKey == "workflow_conract") {
  684 + formDataSave(this.id, this.form.formData).then(response => {
  685 + this.msgSuccess("审批成功");
  686 + this.contract = false;
  687 + this.getList();
  688 + });
  689 + }
  690 + if (this.definitionKey == "workflow_earthsites") {
  691 + formDataSave(this.id, this.form.formData).then(response => {
  692 + this.msgSuccess("审批成功");
  693 + this.earthsites = false;
  694 + this.getList();
  695 + });
  696 + }
  697 + if (this.definitionKey == "workflow_caseoffline") {
  698 + let id = this.businessKey.split(":")[1];
  699 + let query = {
  700 + id: id,
  701 + };
  702 +
  703 + let adv = this.form.advice;
  704 +
  705 + if (!adv) {
  706 + if (value == 0) {
  707 + adv = "审批通过";
  708 + } else {
  709 + adv = "审批驳回";
  710 + }
  711 + }
  712 +
  713 + if (this.taskName == "渣土办科员") {
  714 + query.advice1 = adv;
  715 + } else if (this.taskName == "渣土办分管领导") {
  716 + query.advice2 = adv;
  717 + } else if (this.taskName == "治理部部长") {
  718 + query.advice3 = adv;
  719 + } else if (this.taskName == "治理部分管领导") {
  720 + query.advice4 = adv;
  721 + }
  722 +
  723 + updateCaseOffline(query).then(res => {
690 724 formDataSave(this.id, this.form.formData).then(response => {
691 725 this.msgSuccess("审批成功");
692   - this.earthsites = false;
  726 + this.caseOffline = false;
693 727 this.getList();
694 728 });
695   - }
696   - if(this.definitionKey == "workflow_caseoffline"){
697   - let id = this.businessKey.split(":")[1];
698   - let query = {
699   - id : id,
700   - };
  729 + })
701 730  
702   - let adv = this.form.advice;
703 731  
704   - if(!adv){
705   - if(value == 0){
706   - adv = "审批通过";
707   - }else{
708   - adv = "审批驳回";
709   - }
710   - }
  732 + return;
  733 + }
711 734  
712   - if(this.taskName == "渣土办科员"){
713   - query.advice1 = adv;
714   - }else if(this.taskName == "渣土办分管领导"){
715   - query.advice2 = adv;
716   - }else if(this.taskName == "治理部部长"){
717   - query.advice3 = adv;
718   - }else if(this.taskName == "治理部分管领导"){
719   - query.advice4 = adv;
720   - }
  735 + if (this.definitionKey == "workflow_casefile") {
  736 + debugger;
721 737  
722   - updateCaseOffline(query).then(res=>{
  738 + if (this.taskName == "车辆所属企业" || this.taskName == "渣土办科员") {
  739 + console.log(this.businessKey);
  740 + let objId = this.businessKey.split(":")[1];
  741 + updateViolationCaseFileReader({id: objId}).then(res => {
723 742 formDataSave(this.id, this.form.formData).then(response => {
724 743 this.msgSuccess("审批成功");
725   - this.caseOffline = false;
  744 + this.violationCaseFile = false;
726 745 this.getList();
727 746 });
728 747 })
729   -
730   -
731 748 return;
  749 + } else {
  750 +
732 751 }
733 752  
734   - if(this.definitionKey == "workflow_casefile"){
735   - debugger;
736   -
737   - if(this.taskName == "车辆所属企业" || this.taskName == "渣土办科员"){
738   - console.log(this.businessKey);
739   - let objId = this.businessKey.split(":")[1];
740   - updateViolationCaseFileReader({id:objId}).then(res=>{
741   - formDataSave(this.id, this.form.formData).then(response => {
742   - this.msgSuccess("审批成功");
743   - this.violationCaseFile = false;
744   - this.getList();
745   - });
746   - })
747   - return;
748   - }else{
749   -
750   -
751   -
752   - if(value == 0){
753   - let postData ={};
754   -
755   - postData.tableName = this.businessKey;
756   - postData.replyImg = this.form.replyImg;
757   - postData.reply = this.form.reply;
758   - addReplyApprovalProcess(postData).then(res=>{
759   - formDataSave(this.id, this.form.formData).then(response => {
760   - this.msgSuccess("审批成功");
761   - this.violationCaseFile = false;
762   - this.getList();
763   - });
764   - });
765   -
766   - }else{
767   - formDataSave(this.id, this.form.formData).then(response => {
768   - this.msgSuccess("审批成功");
769   - this.violationCaseFile = false;
770   - this.getList();
771   - });
772   - }
773 753  
774   -
  754 + if (value == 0) {
  755 + let postData = {};
775 756  
  757 + postData.tableName = this.businessKey;
  758 + postData.replyImg = this.form.replyImg;
  759 + postData.reply = this.form.reply;
  760 + addReplyApprovalProcess(postData).then(res => {
  761 + formDataSave(this.id, this.form.formData).then(response => {
  762 + this.msgSuccess("审批成功");
  763 + this.violationCaseFile = false;
  764 + this.getList();
  765 + });
  766 + });
776 767  
777   - }
  768 + } else {
  769 + formDataSave(this.id, this.form.formData).then(response => {
  770 + this.msgSuccess("审批成功");
  771 + this.violationCaseFile = false;
  772 + this.getList();
  773 + });
  774 + }
778 775  
779   - }
780 776  
781   - },
782   - conferenceSubmitForm(value){
783   - this.form.formData[0].controlValue = value;
784   - if(value==0){
785   - this.form.status = 1;
786   - }else{
787   - this.form.status = 2;
  777 + }
  778 + },
  779 + conferenceSubmitForm(value) {
  780 + this.form.formData[0].controlValue = value;
  781 + if (value == 0) {
  782 + this.form.status = 1;
  783 + } else {
  784 + this.form.status = 2;
  785 + }
  786 + //审批or驳回
  787 + formDataSave(this.id, this.form.formData).then(response => {
  788 + this.msgSuccess("审批成功");
  789 + this.conferenceOpen = false;
  790 + this.taskList = [];
  791 + this.getList();
  792 + });
  793 + },
  794 + leaveApplicationSubmitForm(value) {
  795 + if (value == 0) {
  796 + this.form.status = 1;
  797 + } else {
  798 + this.form.status = 2;
  799 + }
  800 + this.form.formData[0].controlValue = value;
  801 + //审批or驳回
  802 + formDataSave(this.id, this.form.formData).then(response => {
  803 + this.msgSuccess("审批成功");
  804 + this.leaveApplicationOpen = false;
  805 + this.taskList = [];
  806 + this.getList();
  807 + });
  808 + },
  809 + logisticsInfoSubmitForm(value) {
  810 + if (value == 0) {
  811 + this.form.status = 1;
  812 + } else {
  813 + this.form.status = 2;
  814 + }
  815 + this.form.formData[0].controlValue = value;
  816 + //this.form.formData[0].route = value;
  817 + //审批or驳回
  818 + formDataSave(this.id, this.form.formData).then(response => {
  819 + this.msgSuccess("审批成功");
  820 + this.logisticsInfoOpen = false;
  821 + this.taskList = [];
  822 + this.getList();
  823 + });
  824 + },
  825 + handleAffairsSubmitForm(value) {
  826 + console.log(this.controlId)
  827 + if (value == 0) {
  828 + this.form.status = 1;
  829 + } else {
  830 + this.form.status = 2;
  831 + }
  832 + this.form.formData[0].controlValue = value;
  833 + if (this.definitionKey == "yuelan") {
  834 + if(this.deptName==null){
  835 + this.$message.error("请选择阅览部门！");
  836 + return;
788 837 }
789   - //审批or驳回
790   - formDataSave(this.id, this.form.formData).then(response => {
  838 + if(this.users.length==0){
  839 + this.$message.error("请选择阅览人！");
  840 + return;
  841 + }
  842 + let userNames = [];
  843 + for (let i in this.users) {
  844 + for (let j in this.options) {
  845 + if (this.users[i] == this.options[j].id) {
  846 + userNames.push(this.options[j].label);
  847 + }
  848 + }
  849 + }
  850 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  851 + this.form.formData[0].userNames = userNames;
  852 + //表里存中文
  853 + handleAffairsForm.userNames = userNames.join(",");
  854 + console.log(this.form)
  855 + console.log(handleAffairsForm)
  856 +
  857 + updateHandleAffairs(handleAffairsForm).then(res => {
  858 + formDataSave(this.id, this.form.formData).then(response => {
791 859 this.msgSuccess("审批成功");
792   - this.conferenceOpen = false;
  860 + this.handleAffairsInfoOpen = false;
793 861 this.taskList = [];
794 862 this.getList();
795   - });
796   - },
797   - leaveApplicationSubmitForm(value){
798   - if(value==0){
799   - this.form.status = 1;
800   - }else{
801   - this.form.status = 2;
  863 + });
  864 + })
  865 + return;
  866 + }
  867 + //分管领导审批流程时，需要指定部门审批，所以判断当前流程类型和当前控件（表单）id
  868 + if ((this.controlId == "FormProperty_214hj4h" || this.controlId == "FormProperty_2vu2250") && value == 0) {
  869 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  870 + if (handleAffairsForm.deptId == null) {
  871 + this.$message.error("请选择信访部门！");
  872 + return;
802 873 }
803   - this.form.formData[0].controlValue = value;
804   - //审批or驳回
805   - formDataSave(this.id, this.form.formData).then(response => {
806   - this.msgSuccess("审批成功");
807   - this.leaveApplicationOpen = false;
808   - this.taskList = [];
809   - this.getList();
810   - });
811   - },
812   - logisticsInfoSubmitForm(value){
813   - if(value==0){
814   - this.form.status = 1;
815   - }else{
816   - this.form.status = 2;
  874 + const deptCode = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.value;
  875 + this.form.formData[0].deptCode = deptCode;
  876 + //表里存中文
  877 + handleAffairsForm.deptName = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.selectedLabel;
  878 + const haType = handleAffairsForm.type;
  879 + if (haType == 4 || haType == 2 || haType == 3) {
  880 + updateHandleAffairs(handleAffairsForm).then(res => {
  881 + formDataSave(this.id, this.form.formData).then(response => {
  882 + this.msgSuccess("审批成功");
  883 + this.handleAffairsInfoOpen = false;
  884 + this.taskList = [];
  885 + this.getList();
  886 + });
  887 + })
817 888 }
818   - this.form.formData[0].controlValue = value;
819   - //this.form.formData[0].route = value;
820   - //审批or驳回
821   - formDataSave(this.id, this.form.formData).then(response => {
822   - this.msgSuccess("审批成功");
823   - this.logisticsInfoOpen = false;
824   - this.taskList = [];
825   - this.getList();
826   - });
827   - },
828   - handleAffairsSubmitForm(value){
829   - if(value==0){
830   - this.form.status = 1;
831   - }else{
832   - this.form.status = 2;
  889 + //回复意见
  890 + } else if (this.controlId == "FormProperty_0orjdou" || this.controlId == "FormProperty_05v7lct") {
  891 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  892 + updateHandleAffairs(handleAffairsForm).then(res => {
  893 + formDataSave(this.id, this.form.formData).then(response => {
  894 + this.msgSuccess("审批成功");
  895 + this.handleAffairsInfoOpen = false;
  896 + this.taskList = [];
  897 + this.getList();
  898 + });
  899 + })
  900 + } else if (this.controlId == "FormProperty_0aq22i0" && value == 0) {
  901 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  902 + if (handleAffairsForm.sendObject == null) {
  903 + this.$message.error("请选择推送对象!");
  904 + return;
833 905 }
834   - this.form.formData[0].controlValue = value;
835   - //this.form.formData[0].route = value;
836   - //审批or驳回
  906 + this.form.formData[0].index = handleAffairsForm.sendObject;
  907 + updateHandleAffairs(handleAffairsForm).then(res => {
  908 + formDataSave(this.id, this.form.formData).then(response => {
  909 + this.msgSuccess("审批成功");
  910 + this.handleAffairsInfoOpen = false;
  911 + this.taskList = [];
  912 + this.getList();
  913 + });
  914 + })
  915 + } else if ((this.controlId == 'FormProperty_11p96vq' || this.controlId == 'FormProperty_2jvcgq8') && value == 0) {
  916 + const reply = {
  917 + reply: this.$refs.handleAffairsInfoRef.$data.opinion,
  918 + tableName: "handle_affairs",
  919 + tableId: this.idInfo
  920 + }
  921 + const handleAffairsForm = this.$refs.handleAffairsInfoRef.$data.form;
  922 + if (handleAffairsForm.deptId == null) {
  923 + this.$message.error("请选择处理部门！");
  924 + return;
  925 + }
  926 + const deptCode = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.value;
  927 + this.form.formData[0].deptCode = deptCode;
  928 + //表里存中文
  929 + handleAffairsForm.deptName = this.$refs.handleAffairsInfoRef.$refs.formDeptNameRef.selectedLabel;
  930 + updateHandleAffairs(handleAffairsForm).then(res => {
  931 + addReplyApprovalProcess(reply).then(res => {
  932 + formDataSave(this.id, this.form.formData).then(response => {
  933 + this.msgSuccess("审批成功");
  934 + this.handleAffairsInfoOpen = false;
  935 + this.taskList = [];
  936 + this.getList();
  937 + });
  938 + })
  939 + })
  940 +
  941 + } else {
837 942 formDataSave(this.id, this.form.formData).then(response => {
838 943 this.msgSuccess("审批成功");
839 944 this.handleAffairsInfoOpen = false;
840 945 this.taskList = [];
841 946 this.getList();
842 947 });
843   - },
844   - getFile(file, fileList) {
845   - this.getBase64(file.raw).then(res => {
846   - const params = res
847   - this.proofImage = params
848   - this.form.replyImg = params;
849   - this.$forceUpdate();
850   - })
851   - },
852   - getBase64(file) {
853   - return new Promise(function (resolve, reject) {
854   - const reader = new FileReader()
855   - let imgResult = ''
856   - reader.readAsDataURL(file)
857   - reader.onload = function () {
858   - imgResult = reader.result
859   - }
860   - reader.onerror = function (error) {
861   - reject(error)
862   - }
863   - reader.onloadend = function () {
864   - resolve(imgResult)
  948 + }
  949 +
  950 + },
  951 + changeDepts(e) {
  952 + this.options = [];
  953 + this.roles.forEach((role, index) => {
  954 + let area = {
  955 + bizAuthCodes: [2],
  956 + authPostType: role.code,
  957 + authDepartmentType: e
  958 + };
  959 + getUsers(area).then(res => {
  960 + if (res.result.length != 0) {
  961 + if (res.result[0].userAuthList.length > 0) {
  962 + res.result[0].userAuthList.forEach((user, index) => {
  963 + this.options.push({id: user.userId, label: user.username})
  964 + });
  965 + }
865 966 }
866   - })
867   - },
868   - handleUploadRemove(file, fileList) {
869   - this.proofImage = ''
870   - this.form.replyImg = null;
  967 + });
  968 + });
  969 + },
  970 + getFile(file, fileList) {
  971 + this.getBase64(file.raw).then(res => {
  972 + const params = res
  973 + this.proofImage = params
  974 + this.form.replyImg = params;
871 975 this.$forceUpdate();
872   - },
873   - handlePictureCardPreview(file) {
874   - console.log(this.proofImage)
875   - },
  976 + })
  977 + },
  978 + getBase64(file) {
  979 + return new Promise(function (resolve, reject) {
  980 + const reader = new FileReader()
  981 + let imgResult = ''
  982 + reader.readAsDataURL(file)
  983 + reader.onload = function () {
  984 + imgResult = reader.result
  985 + }
  986 + reader.onerror = function (error) {
  987 + reject(error)
  988 + }
  989 + reader.onloadend = function () {
  990 + resolve(imgResult)
  991 + }
  992 + })
  993 + },
  994 + handleUploadRemove(file, fileList) {
  995 + this.proofImage = ''
  996 + this.form.replyImg = null;
  997 + this.$forceUpdate();
  998 + },
  999 + handlePictureCardPreview(file) {
  1000 + console.log(this.proofImage)
876 1001 },
877   - };
  1002 + },
  1003 +}
878 1004 </script>
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @32edd86
... ... @@ -41,15 +41,38 @@
41 41  
42 42 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
43 43 <el-table-column label="序号" align="center" prop="id" />
  44 + <el-table-column label="日期" align="center" prop="createTime" width="180">
  45 + <template slot-scope="scope">
  46 + <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
  47 + </template>
  48 + </el-table-column>
44 49 <el-table-column label="工地名称" align="center" prop="name" />
45 50 <el-table-column label="项目类型" align="center" prop="type" />
46   - <el-table-column label="管辖区" align="center" prop="place" />
47   - <el-table-column label="审查意见" align="center" prop="sub_reason" width="180" />
  51 + <el-table-column label="所属区域" align="center" prop="place" />
  52 + <el-table-column label="开工状态" align="center" prop="status" >
  53 + <template slot-scope="scope">
  54 + <span>{{ scope.row.estatus == 1 ?"开工":"未开工" }}</span>
  55 + </template>
  56 + </el-table-column>
  57 + <el-table-column label="申请开工时间" align="center" prop="self_check_time" />
48 58 <el-table-column label="消纳场名称" align="center" prop="ename" width="180" />
49 59 <el-table-column label="消纳场类型" align="center" prop="etype" width="180"/>
50   - <el-table-column label="管辖区" align="center" prop="eplace" />
51   - <el-table-column label="审查意见" align="center" prop="esub_reason" width="180" />
52   - <el-table-column label="开工状态" align="center" prop="estatus" class-name="small-padding fixed-width"/>
  60 + <el-table-column label="所属区域" align="center" prop="eplace" />
  61 + <el-table-column label="开工状态" align="center" prop="estatus" class-name="small-padding fixed-width">
  62 + <template slot-scope="scope">
  63 + <span>{{ scope.row.estatus == 1 ?"开工":"未开工" }}</span>
  64 + </template>
  65 +
  66 + </el-table-column>
  67 + <el-table-column label="申请开工时间" align="center" prop="eself_check_time" >
  68 + <template slot-scope="scope">
  69 + <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
  70 + </template>
  71 + </el-table-column>
  72 + <el-table-column label="备注" align="center" prop="desc">
  73 + </el-table-column>
  74 +
  75 +
53 76 </el-table>
54 77  
55 78 <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @32edd86
... ... @@ -60,7 +60,7 @@
60 60  
61 61 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
62 62 <el-table-column label="序号" align="center" prop="id" />
63   -
  63 +
64 64 <el-table-column label="项目类型" align="center" prop="type">
65 65 <template slot-scope="scope">
66 66 <span>{{ scope.row.type==0?"工地":"消纳场"}}</span>
... ...
trash-ui/src/views/daily/situation/index.vue
  View file @32edd86
1   -<template>
2   - <div class="app-container">
3   - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4   - <el-form-item label="标题" prop="title">
5   - <el-input
6   - v-model="queryParams.title"
7   - placeholder="请输入标题"
8   - clearable
9   - size="small"
10   -
11   - />
12   - </el-form-item>
13   - <el-form-item label="操作人" prop="operator">
14   - <el-input
15   - v-model="queryParams.operator"
16   - placeholder="请输入操作人"
17   - clearable
18   - size="small"
19   -
20   - />
21   - </el-form-item>
22   - <el-form-item>
23   - <el-button type="cyan" size="mini" @click="handleQuery">搜索</el-button>
24   - </el-form-item>
25   - </el-form>
26   -
27   - <el-row :gutter="10" class="mb8">
28   - <el-col :span="1.5">
29   - <el-button
30   - type="primary"
31   - size="mini"
32   - @click="handleAdd"
33   - v-hasPermi="['daily:situation:add']"
34   - >新增</el-button>
35   - </el-col>
36   - <el-col :span="1.5">
37   - <el-button
38   - type="success"
39   - size="mini"
40   - :disabled="single"
41   - @click="handleUpdate"
42   - v-hasPermi="['daily:situation:edit']"
43   - >修改</el-button>
44   - </el-col>
45   - <el-col :span="1.5">
46   - <el-button
47   - type="danger"
48   - size="mini"
49   - :disabled="multiple"
50   - @click="handleDelete"
51   - v-hasPermi="['daily:situation:remove']"
52   - >删除</el-button>
53   - </el-col>
54   - <el-col :span="1.5">
55   - <el-button
56   - type="warning"
57   - size="mini"
58   - @click="handleExport"
59   - v-hasPermi="['daily:situation:export']"
60   - >导出</el-button>
61   - </el-col>
62   - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
63   - </el-row>
64   -
65   - <el-table v-loading="loading" :data="situationList" border @selection-change="handleSelectionChange">
66   - <el-table-column type="selection" width="55" align="center" />
67   - <el-table-column label="标题" align="center" prop="title" />
68   - <el-table-column label="操作人" align="center" prop="operator" />
69   - <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
70   - <template slot-scope="scope">
71   - <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
72   - </template>
73   - </el-table-column>
74   - <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
75   - <template slot-scope="scope">
76   - <el-button
77   - size="mini"
78   - type="text"
79   - @click="handleById(scope.row)"
80   - v-hasPermi="['daily:situation:query']">
81   - 查看
82   - </el-button>
83   - </template>
84   - </el-table-column>
85   - </el-table>
86   -
87   - <pagination
88   - v-show="total>0"
89   - :total="total"
90   - :page.sync="queryParams.pageNum"
91   - :limit.sync="queryParams.pageSize"
92   - @pagination="getList"
93   - />
  1 +<template>
  2 + <div class="app-container">
  3 + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
  4 + <el-form-item label="标题" prop="title">
  5 + <el-input
  6 + v-model="queryParams.title"
  7 + placeholder="请输入标题"
  8 + clearable
  9 + size="small"
  10 +
  11 + />
  12 + </el-form-item>
  13 + <el-form-item label="操作人" prop="operator">
  14 + <el-input
  15 + v-model="queryParams.operator"
  16 + placeholder="请输入操作人"
  17 + clearable
  18 + size="small"
  19 +
  20 + />
  21 + </el-form-item>
  22 + <el-form-item>
  23 + <el-button type="cyan" size="mini" @click="handleQuery">搜索</el-button>
  24 + </el-form-item>
  25 + </el-form>
  26 +
  27 + <el-row :gutter="10" class="mb8">
  28 + <el-col :span="1.5">
  29 + <el-button
  30 + type="primary"
  31 + size="mini"
  32 + @click="handleAdd"
  33 + v-hasPermi="['daily:situation:add']"
  34 + >新增</el-button>
  35 + </el-col>
  36 + <el-col :span="1.5">
  37 + <el-button
  38 + type="success"
  39 + size="mini"
  40 + :disabled="single"
  41 + @click="handleUpdate"
  42 + v-hasPermi="['daily:situation:edit']"
  43 + >修改</el-button>
  44 + </el-col>
  45 + <el-col :span="1.5">
  46 + <el-button
  47 + type="danger"
  48 + size="mini"
  49 + :disabled="multiple"
  50 + @click="handleDelete"
  51 + v-hasPermi="['daily:situation:remove']"
  52 + >删除</el-button>
  53 + </el-col>
  54 + <el-col :span="1.5">
  55 + <el-button
  56 + type="warning"
  57 + size="mini"
  58 + @click="handleExport"
  59 + v-hasPermi="['daily:situation:export']"
  60 + >导出</el-button>
  61 + </el-col>
  62 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  63 + </el-row>
  64 +
  65 + <el-table v-loading="loading" :data="situationList" border @selection-change="handleSelectionChange">
  66 + <el-table-column type="selection" width="55" align="center" />
  67 + <el-table-column label="标题" align="center" prop="title" />
  68 + <el-table-column label="操作人" align="center" prop="operator" />
  69 + <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
  70 + <template slot-scope="scope">
  71 + <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
  72 + </template>
  73 + </el-table-column>
  74 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  75 + <template slot-scope="scope">
  76 + <el-button
  77 + size="mini"
  78 + type="text"
  79 + @click="handleById(scope.row)"
  80 + v-hasPermi="['daily:situation:query']">
  81 + 查看
  82 + </el-button>
  83 + </template>
  84 + </el-table-column>
  85 + </el-table>
  86 +
  87 + <pagination
  88 + v-show="total>0"
  89 + :total="total"
  90 + :page.sync="queryParams.pageNum"
  91 + :limit.sync="queryParams.pageSize"
  92 + @pagination="getList"
  93 + />
  94 +
  95 + <!-- 添加或修改每日普查情况对话框 -->
  96 + <el-dialog :title="title" :visible.sync="open" append-to-body>
  97 + <el-form ref="form" :model="form" :rules="rules" label-width="120px">
  98 + <el-row type="flex" justify="center">
  99 + <el-col>
  100 + <el-form-item label="日期" prop="date">
  101 + <el-date-picker clearable size="small" style="width: 200px"
  102 + v-model="form.date"
  103 + type="date"
  104 + value-format="yyyy-MM-dd"
  105 + placeholder="选择日期"
  106 + @change="selectDate">
  107 + </el-date-picker>
  108 + </el-form-item>
  109 + </el-col>
  110 + <el-col>
  111 + <el-form-item label="星期" >
  112 + <el-input v-model="dayOfWeek" placeholder="" style="width: 200px" disabled/>
  113 + </el-form-item>
  114 + </el-col>
  115 + </el-row>
  116 + <el-row type="flex" justify="center">
  117 + <el-col>
  118 + <el-form-item label="天气" prop="weather">
  119 + <el-input v-model="form.weather" placeholder="请输入天气" style="width: 200px"/>
  120 + </el-form-item>
  121 + </el-col>
  122 + <el-col>
  123 + <el-form-item label="操作人" prop="operator">
  124 + <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px"/>
  125 + </el-form-item>
  126 + </el-col>
  127 + </el-row>
  128 +
  129 + <el-form-item label="全市工地,消纳场开停情况" prop="consumptionSiteSituation">
  130 + <editor v-model="form.consumptionSiteSituation" :min-height="192"/>
  131 + </el-form-item>
94 132  
95   - <!-- 添加或修改每日普查情况对话框 -->
96   - <el-dialog :title="title" :visible.sync="open" append-to-body>
97   - <el-form ref="form" :model="form" :rules="rules" label-width="120px">
98   - <el-row type="flex" justify="center">
99   - <el-col>
100   - <el-form-item label="日期" prop="date">
101   - <el-date-picker clearable size="small" style="width: 200px"
102   - v-model="form.date"
103   - type="date"
104   - value-format="yyyy-MM-dd"
105   - placeholder="选择日期"
106   - @change="selectDate">
107   - </el-date-picker>
108   - </el-form-item>
109   - </el-col>
110   - <el-col>
111   - <el-form-item label="星期" >
112   - <el-input v-model="dayOfWeek" placeholder="" style="width: 200px" disabled/>
113   - </el-form-item>
114   - </el-col>
115   - </el-row>
116   - <el-row type="flex" justify="center">
117   - <el-col>
118   - <el-form-item label="天气" prop="weather">
119   - <el-input v-model="form.weather" placeholder="请输入天气" style="width: 200px"/>
120   - </el-form-item>
121   - </el-col>
122   - <el-col>
123   - <el-form-item label="操作人" prop="operator">
124   - <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px"/>
125   - </el-form-item>
126   - </el-col>
127   - </el-row>
128 133  
129   - <el-form-item label="全市工地,消纳场开停情况" prop="consumptionSiteSituation">
130   - <editor v-model="form.consumptionSiteSituation" :min-height="192"/>
131   - </el-form-item>
132   -
133   -
134 134 <el-form-item label="车辆数" prop="numberOfVehicles">
135 135 <editor v-model="form.numberOfVehicles" :min-height="192"/>
136 136 </el-form-item>
137   -
138   -
139   - </el-form>
140   - <div slot="footer" class="dialog-footer" >
141   - <el-button type="primary" @click="submitForm">确 定</el-button>
142   - <el-button @click="cancel">取 消</el-button>
143   - </div>
144   - </el-dialog>
145   - </div>
146   -</template>
147 137  
148   -<script>
149   -import { listSituation, getSituation, delSituation, addSituation, updateSituation, exportSituation } from "@/api/daily/situation";
150   -import Editor from '@/components/Editor';
151   -import {getToollist} from "@/api/daily/toollist";
  138 + <el-form-item label="平台各类预警值息(案卷情况)" prop="numberOfVehicles">
  139 + <editor v-model="form.caseFileInfo" :min-height="192"/>
  140 + </el-form-item>
152 141  
153   -export default {
154   - name: "Situation",
155   - components: { Editor },
156   - data() {
157   - return {
158   - // 遮罩层
159   - loading: true,
160   - border:true,
161   - // 选中数组
162   - ids: [],
163   - // 非单个禁用
164   - single: true,
165   - // 非多个禁用
166   - multiple: true,
167   - // 显示搜索条件
168   - showSearch: true,
169   - // 总条数
170   - total: 0,
171   - // 每日普查情况表格数据
172   - situationList: [],
173   - // 弹出层标题
174   - title: "",
175   - dayOfWeek:null,
176   - // 是否显示弹出层
177   - open: false,
178   - // 查询参数
179   - queryParams: {
180   - pageNum: 1,
181   - pageSize: 10,
182   - title: null,
183   - operator: null,
184   - updateTime: null
185   - },
186   - // 表单参数
187   - form: {},
188   - // 表单校验
189   - rules: {
190   - date: [
191   - { required: true, message: "不能为空", trigger: "blur" }
  142 + <el-form-item label="平台推送各类预警信息(案卷情况)" prop="numberOfVehicles">
  143 + <editor v-model="form.warningCaseFileInfo" :min-height="192"/>
  144 + </el-form-item>
  145 +
  146 +
  147 + </el-form>
  148 + <div slot="footer" class="dialog-footer" >
  149 + <el-button type="primary" @click="submitForm">确 定</el-button>
  150 + <el-button @click="cancel">取 消</el-button>
  151 + </div>
  152 + </el-dialog>
  153 + </div>
  154 +</template>
  155 +
  156 +<script>
  157 +import { listSituation, getSituation, delSituation, addSituation, updateSituation, exportSituation } from "@/api/daily/situation";
  158 +import Editor from '@/components/Editor';
  159 +import {getToollist} from "@/api/daily/toollist";
  160 +
  161 +export default {
  162 + name: "Situation",
  163 + components: { Editor },
  164 + data() {
  165 + return {
  166 + // 遮罩层
  167 + loading: true,
  168 + border:true,
  169 + // 选中数组
  170 + ids: [],
  171 + // 非单个禁用
  172 + single: true,
  173 + // 非多个禁用
  174 + multiple: true,
  175 + // 显示搜索条件
  176 + showSearch: true,
  177 + // 总条数
  178 + total: 0,
  179 + // 每日普查情况表格数据
  180 + situationList: [],
  181 + // 弹出层标题
  182 + title: "",
  183 + dayOfWeek:null,
  184 + // 是否显示弹出层
  185 + open: false,
  186 + // 查询参数
  187 + queryParams: {
  188 + pageNum: 1,
  189 + pageSize: 10,
  190 + title: null,
  191 + operator: null,
  192 + updateTime: null
  193 + },
  194 + // 表单参数
  195 + form: {},
  196 + // 表单校验
  197 + rules: {
  198 + date: [
  199 + { required: true, message: "不能为空", trigger: "blur" }
192 200 ],
193 201 weather: [
194 202 { required: true, message: "不能为空", trigger: "blur" }
... ... @@ -201,166 +209,166 @@ export default {
201 209 ],
202 210 numberOfVehicles: [
203 211 { required: true, message: "不能为空", trigger: "blur" }
204   - ],
205   - }
206   - };
207   - },
208   - created() {
209   - this.getList();
210   - },
211   - methods: {
212   - selectDate(date){
213   -
214   - let day = new Date(date).getDay();
215   -
216   - if(day == 0){
217   - day = 7;
218   - }
219   -
220   - this.dayOfWeek = day;
221   -
222   - },
223   -
224   - /** 查询每日普查情况列表 */
225   - getList() {
226   - this.loading = true;
227   - listSituation(this.queryParams).then(response => {
228   - this.situationList = response.rows;
229   - this.total = response.total;
230   - this.loading = false;
231   - });
232   - },
233   - // 取消按钮
234   - cancel() {
235   - this.open = false;
236   - this.reset();
237   - },
238   - // 表单重置
239   - reset() {
240   - this.form = {
241   - id: null,
242   - title: null,
243   - operator: null,
244   - date: null,
245   - weather: null,
246   - consumptionSiteSituation: null,
247   - numberOfVehicles: null,
248   - createTime: null,
249   - updateTime: null
250   - };
251   - this.resetForm("form");
252   - },
253   - /** 搜索按钮操作 */
254   - handleQuery() {
255   - this.queryParams.pageNum = 1;
256   - this.getList();
257   - },
258   - /** 重置按钮操作 */
259   - resetQuery() {
260   - this.resetForm("queryForm");
261   - this.handleQuery();
262   - },
263   - // 多选框选中数据
264   - handleSelectionChange(selection) {
265   - this.ids = selection.map(item => item.id)
266   - this.single = selection.length!==1
267   - this.multiple = !selection.length
268   - },
269   - /** 新增按钮操作 */
270   - handleAdd() {
271   - this.reset();
272   - this.open = true;
273   - this.title = "添加每日普查情况";
274   - },
275   - /** 修改按钮操作 */
276   - handleUpdate(row) {
277   - this.reset();
278   - const id = row.id || this.ids
279   - getSituation(id).then(response => {
280   - this.form = response.data;
281   -
282   - let day = new Date(this.form.date).getDay();
283   -
284   - if(day == 0){
285   - day = 7;
286   - }
287   -
288   - this.dayOfWeek = day;
289   -
290   -
291   - this.open = true;
292   - this.title = "修改每日普查情况";
293   - });
294   - },
295   - /** 查看详情按钮操作*/
296   - handleById(row){
297   - this.reset();
298   - const id = row.id ||this.ids
299   - getSituation(id).then(response => {
300   - this.form = response.data;
301   -
302   - let day = new Date(this.form.date).getDay();
303   -
304   - if(day == 0){
305   - day = 7;
306   - }
307   -
308   - this.dayOfWeek = day;
309   -
310   - this.open = true;
311   - this.title = "查看详情信息";
312   - });
313   - },
314   - /** 提交按钮 */
315   - submitForm() {
316   -
317   -
318   - this.$refs["form"].validate(valid => {
319   - if (valid) {
320   - this.form.title = this.form.date + "平台工作清单";
321   - if (this.form.id != null) {
322   - updateSituation(this.form).then(response => {
323   - this.msgSuccess("修改成功");
324   - this.open = false;
325   - this.getList();
326   - });
327   - } else {
328   - addSituation(this.form).then(response => {
329   - this.msgSuccess("新增成功");
330   - this.open = false;
331   - this.getList();
332   - });
333   - }
334   - }
335   - });
336   - },
337   - /** 删除按钮操作 */
338   - handleDelete(row) {
339   - const ids = row.id || this.ids;
340   - this.$confirm('是否确认删除每日普查情况编号为"' + ids + '"的数据项?', "警告", {
341   - confirmButtonText: "确定",
342   - cancelButtonText: "取消",
343   - type: "warning"
344   - }).then(function() {
345   - return delSituation(ids);
346   - }).then(() => {
347   - this.getList();
348   - this.msgSuccess("删除成功");
349   - })
350   - },
351   - /** 导出按钮操作 */
352   - handleExport() {
353   - const queryParams = this.queryParams;
354   - this.$confirm('是否确认导出所有每日普查情况数据项?', "警告", {
355   - confirmButtonText: "确定",
356   - cancelButtonText: "取消",
357   - type: "warning"
358   - }).then(function() {
359   - return exportSituation(queryParams);
360   - }).then(response => {
361   - this.download(response.message);
362   - })
363   - }
364   - }
365   -};
366   -</script>
  212 + ],
  213 + }
  214 + };
  215 + },
  216 + created() {
  217 + this.getList();
  218 + },
  219 + methods: {
  220 + selectDate(date){
  221 +
  222 + let day = new Date(date).getDay();
  223 +
  224 + if(day == 0){
  225 + day = 7;
  226 + }
  227 +
  228 + this.dayOfWeek = day;
  229 +
  230 + },
  231 +
  232 + /** 查询每日普查情况列表 */
  233 + getList() {
  234 + this.loading = true;
  235 + listSituation(this.queryParams).then(response => {
  236 + this.situationList = response.rows;
  237 + this.total = response.total;
  238 + this.loading = false;
  239 + });
  240 + },
  241 + // 取消按钮
  242 + cancel() {
  243 + this.open = false;
  244 + this.reset();
  245 + },
  246 + // 表单重置
  247 + reset() {
  248 + this.form = {
  249 + id: null,
  250 + title: null,
  251 + operator: null,
  252 + date: null,
  253 + weather: null,
  254 + consumptionSiteSituation: null,
  255 + numberOfVehicles: null,
  256 + createTime: null,
  257 + updateTime: null
  258 + };
  259 + this.resetForm("form");
  260 + },
  261 + /** 搜索按钮操作 */
  262 + handleQuery() {
  263 + this.queryParams.pageNum = 1;
  264 + this.getList();
  265 + },
  266 + /** 重置按钮操作 */
  267 + resetQuery() {
  268 + this.resetForm("queryForm");
  269 + this.handleQuery();
  270 + },
  271 + // 多选框选中数据
  272 + handleSelectionChange(selection) {
  273 + this.ids = selection.map(item => item.id)
  274 + this.single = selection.length!==1
  275 + this.multiple = !selection.length
  276 + },
  277 + /** 新增按钮操作 */
  278 + handleAdd() {
  279 + this.reset();
  280 + this.open = true;
  281 + this.title = "添加每日普查情况";
  282 + },
  283 + /** 修改按钮操作 */
  284 + handleUpdate(row) {
  285 + this.reset();
  286 + const id = row.id || this.ids
  287 + getSituation(id).then(response => {
  288 + this.form = response.data;
  289 +
  290 + let day = new Date(this.form.date).getDay();
  291 +
  292 + if(day == 0){
  293 + day = 7;
  294 + }
  295 +
  296 + this.dayOfWeek = day;
  297 +
  298 +
  299 + this.open = true;
  300 + this.title = "修改每日普查情况";
  301 + });
  302 + },
  303 + /** 查看详情按钮操作*/
  304 + handleById(row){
  305 + this.reset();
  306 + const id = row.id ||this.ids
  307 + getSituation(id).then(response => {
  308 + this.form = response.data;
  309 +
  310 + let day = new Date(this.form.date).getDay();
  311 +
  312 + if(day == 0){
  313 + day = 7;
  314 + }
  315 +
  316 + this.dayOfWeek = day;
  317 +
  318 + this.open = true;
  319 + this.title = "查看详情信息";
  320 + });
  321 + },
  322 + /** 提交按钮 */
  323 + submitForm() {
  324 +
  325 +
  326 + this.$refs["form"].validate(valid => {
  327 + if (valid) {
  328 + this.form.title = this.form.date + "平台工作清单";
  329 + if (this.form.id != null) {
  330 + updateSituation(this.form).then(response => {
  331 + this.msgSuccess("修改成功");
  332 + this.open = false;
  333 + this.getList();
  334 + });
  335 + } else {
  336 + addSituation(this.form).then(response => {
  337 + this.msgSuccess("新增成功");
  338 + this.open = false;
  339 + this.getList();
  340 + });
  341 + }
  342 + }
  343 + });
  344 + },
  345 + /** 删除按钮操作 */
  346 + handleDelete(row) {
  347 + const ids = row.id || this.ids;
  348 + this.$confirm('是否确认删除每日普查情况编号为"' + ids + '"的数据项?', "警告", {
  349 + confirmButtonText: "确定",
  350 + cancelButtonText: "取消",
  351 + type: "warning"
  352 + }).then(function() {
  353 + return delSituation(ids);
  354 + }).then(() => {
  355 + this.getList();
  356 + this.msgSuccess("删除成功");
  357 + })
  358 + },
  359 + /** 导出按钮操作 */
  360 + handleExport() {
  361 + const queryParams = this.queryParams;
  362 + this.$confirm('是否确认导出所有每日普查情况数据项?', "警告", {
  363 + confirmButtonText: "确定",
  364 + cancelButtonText: "取消",
  365 + type: "warning"
  366 + }).then(function() {
  367 + return exportSituation(queryParams);
  368 + }).then(response => {
  369 + this.download(response.message);
  370 + })
  371 + }
  372 + }
  373 +};
  374 +</script>
... ...
trash-ui/src/views/office/conference/index.vue
  View file @32edd86
... ... @@ -9,12 +9,12 @@
9 9 placeholder="选择会议时间">
10 10 </el-date-picker>
11 11 </el-form-item>
12   -<!-- <el-form-item label="发起部门" prop="deptId">-->
13   -<!-- <el-select v-model="queryParams.deptId" placeholder="请输入发起部门" style="width: 100%">-->
14   -<!-- <el-option label="全部" value=""/>-->
15   -<!-- <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>-->
16   -<!-- </el-select>-->
17   -<!-- </el-form-item>-->
  12 + <el-form-item label="发起部门" prop="deptName">
  13 + <el-select v-model="queryParams.deptName" placeholder="请输入发起部门" style="width: 100%">
  14 + <el-option label="全部" value=""/>
  15 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
  16 + </el-select>
  17 + </el-form-item>
18 18 <el-form-item label="会议地点" prop="conferenceSite">
19 19 <el-input v-model="queryParams.conferenceSite" placeholder="请输入会议地点"/>
20 20 </el-form-item>
... ... @@ -75,11 +75,7 @@
75 75 <el-table-column label="会议时间" align="center" prop="conferenceTime"/>
76 76 <el-table-column label="会议地点" align="center" prop="conferenceSite"/>
77 77 <el-table-column label="参会人员" align="center" prop="staff"/>
78   -<!-- <el-table-column label="发起部门" align="center" prop="deptId">-->
79   -<!-- <template slot-scope="scope">-->
80   -<!-- <span>{{ parseDept(scope.row.deptId) }}</span>-->
81   -<!-- </template>-->
82   -<!-- </el-table-column>-->
  78 + <el-table-column label="发起部门" align="center" prop="deptName"/>
83 79 <el-table-column label="审批状态" align="center">
84 80 <template slot-scope="scope">
85 81 <span>{{parseStatus(scope.row.status)}}</span>
... ... @@ -263,7 +259,7 @@ export default {
263 259 pageSize: 10,
264 260 conferenceTime: null,
265 261 conferenceSite: null,
266   - deptId: null,
  262 + deptName: null,
267 263 staff: null,
268 264 subject: null,
269 265 content: null,
... ... @@ -325,7 +321,7 @@ export default {
325 321 id: null,
326 322 conferenceTime: null,
327 323 conferenceSite: null,
328   - deptId: null,
  324 + deptName: null,
329 325 staff: null,
330 326 subject: null,
331 327 content: null,
... ... @@ -509,14 +505,6 @@ export default {
509 505 a.setAttribute('target', '_blank')
510 506 a.setAttribute('href', process.env.VUE_APP_BASE_API + url);
511 507 a.click()
512   - },
513   - parseDept(deptId){
514   - let dept = this.depts.filter(item=>{
515   - if(item.code == deptId){
516   - return item;
517   - }
518   - });
519   - return dept[0].name
520 508 }
521 509 }
522 510 };
... ...
trash-ui/src/views/office/handle/handleInfo.vue
  View file @32edd86
... ... @@ -2,16 +2,16 @@
2 2 <el-form ref="form" :model="form" label-width="110px">
3 3 <el-form-item label="办文办事类型" prop="type">
4 4 <el-select v-model="form.type" placeholder="请选择办文办事类型" style="width: 100%" :disabled="true">
5   - <el-option label="传阅学习类" value="0" />
6   - <el-option label="公文批办类" value="1" />
7   - <el-option label="热线举报类" value="2" />
8   - <el-option label="上级信访类" value="3" />
9   - <el-option label="现场信访类" value="4" />
  5 + <el-option label="传阅学习类" value="0"/>
  6 + <el-option label="公文批办类" value="1"/>
  7 + <el-option label="热线举报类" value="2"/>
  8 + <el-option label="上级信访类" value="3"/>
  9 + <el-option label="现场信访类" value="4"/>
10 10 </el-select>
11 11 </el-form-item>
12 12 <!-- 公文类 -->
13 13 <el-form-item label="来文单位" prop="company" v-if="form.type==0 || form.type==1">
14   - <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true" />
  14 + <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true"/>
15 15 </el-form-item>
16 16 <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
17 17 <el-date-picker clearable size="small" style="width: 100%"
... ... @@ -23,11 +23,11 @@
23 23 </el-date-picker>
24 24 </el-form-item>
25 25 <el-form-item label="文件标题" prop="title" v-if="form.type==0 || form.type==1">
26   - <el-input v-model="form.title" placeholder="请输入文件标题" :disabled="true" />
  26 + <el-input v-model="form.title" placeholder="请输入文件标题" :disabled="true"/>
27 27 </el-form-item>
28 28 <!-- 信访类 -->
29 29 <el-form-item label="信访单位(人)" prop="sendPerson" v-if="form.type==2 || form.type==3|| form.type==4">
30   - <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true" />
  30 + <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true"/>
31 31 </el-form-item>
32 32 <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
33 33 <el-date-picker clearable size="small" style="width: 100%"
... ... @@ -41,13 +41,54 @@
41 41 <el-form-item label="诉求" prop="appeal" v-if="form.type==2 || form.type==3|| form.type==4">
42 42 <el-input v-model="form.appeal" type="textarea" placeholder="请输入内容" :rows="6" :disabled="true"/>
43 43 </el-form-item>
44   - <!-- 意见处 -->
45   - <!-- <el-form-item label="办理意见" prop="opinion">-->
46   - <!-- <el-input v-model="form.opinion" placeholder="请输入办理意见" />-->
47   - <!-- </el-form-item>-->
48   - <!-- <el-form-item label="相关部门意见" prop="deptOpinion">-->
49   - <!-- <el-input v-model="form.deptOpinion" placeholder="请输入相关部门意见" />-->
50   - <!-- </el-form-item>-->
  44 + <el-form-item label="信访部门" prop="deptName"
  45 + v-if="((form.type==4 || form.type==2) && controlId=='FormProperty_214hj4h') ||
  46 + (form.type==3 && controlId=='FormProperty_2vu2250') ||
  47 + (form.deptName!=null && form.type!=1)">
  48 + <el-select ref="formDeptNameRef" v-model="form.deptId" placeholder="请选择信访部门" style="width: 100%"
  49 + :disabled="controlId!='FormProperty_2vu2250' && controlId!='FormProperty_214hj4h'">
  50 + <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  51 + </el-select>
  52 + </el-form-item>
  53 + <el-form-item label="意见" prop="appeal"
  54 + v-if="((form.type==4 || form.type==2) && controlId=='FormProperty_0orjdou') || (form.type==3 && controlId=='FormProperty_05v7lct') || form.opinion!=null">
  55 + <el-input type="textarea" v-model="form.opinion" :rows="4"
  56 + :disabled="controlId!='FormProperty_0orjdou' && controlId!='FormProperty_05v7lct'"/>
  57 + </el-form-item>
  58 + <el-form-item label="推送对象" v-if="controlId=='FormProperty_0aq22i0'">
  59 + <el-radio-group v-model="form.sendObject" :disabled="controlId!='FormProperty_0aq22i0'">
  60 + <el-radio :label="0">中心负责人</el-radio>
  61 + <el-radio :label="1">分管领导</el-radio>
  62 + </el-radio-group>
  63 + </el-form-item>
  64 + <el-form-item label="处理部门" prop="deptName" v-if="controlId=='FormProperty_11p96vq' || (businessKey=='gongwenchuli'&&form.type==1)">
  65 + <el-select ref="formDeptNameRef" v-model="form.deptId" placeholder="请选择处理部门" style="width: 100%"
  66 + :disabled="controlId!='FormProperty_11p96vq'">
  67 + <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  68 + </el-select>
  69 + </el-form-item>
  70 + <el-form-item label="办理意见" prop="opinion" v-if="controlId=='FormProperty_11p96vq'">
  71 + <el-input type="textarea" v-model="opinion" :rows="4" :disabled="controlId!='FormProperty_11p96vq'"/>
  72 + </el-form-item>
  73 + <el-form-item label="办理意见" prop="opinion"
  74 + v-if="form.type==1 && controlId!='FormProperty_11p96vq' && businessKey=='gongwenchuli'">
  75 + <el-input type="textarea" v-model="opinion1" :rows="4" :disabled="true"/>
  76 + </el-form-item>
  77 + <el-form-item label="回复意见" prop="opinion" v-if="controlId=='FormProperty_2jvcgq8'">
  78 + <el-input type="textarea" v-model="opinion" :rows="4" :disabled="controlId!='FormProperty_2jvcgq8'"/>
  79 + </el-form-item>
  80 + <el-form-item label="回复意见" prop="opinion"
  81 + v-if="form.type==1 && controlId!='FormProperty_2jvcgq8' && businessKey=='gongwenchuli' && controlId!='FormProperty_11p96vq'">
  82 + <el-input type="textarea" v-model="opinion2" :rows="4" :disabled="true"/>
  83 + </el-form-item>
  84 + <el-form-item label="阅览人" prop="userNames"
  85 + v-if="form.type==0 && businessKey=='yuelanxuexi1'">
  86 + <el-input v-model="form.userNames" :disabled="true"/>
  87 + </el-form-item>
  88 + <el-form-item label="已阅览人" prop="userNamesDone"
  89 + v-if="form.type==0 && businessKey=='yuelanxuexi1'">
  90 + <el-input v-model="form.userNamesDone" :disabled="true"/>
  91 + </el-form-item>
51 92 <el-row>
52 93 <el-table :data="fileEntityList">
53 94 <el-table-column property="name" label="附件名称" header-align="center" align="center"></el-table-column>
... ... @@ -70,32 +111,50 @@
70 111  
71 112 <script>
72 113 import {getHandle} from "@/api/office/handle";
  114 +import {listReplyApprovalProcess} from "@/api/casefile/replyApprovalProcess";
  115 +
73 116 export default {
74   - name: "contractInfo",
  117 + name: "handleInfo",
75 118 props: {
76 119 businessKey: {
77 120 type: String
78 121 },
79 122 idInfo: {
80   - type: Number
  123 + },
  124 + depts: {
  125 + type: Array
  126 + },
  127 + controlId: {
  128 + type: String
81 129 }
  130 +
82 131 },
83 132 data() {
84 133 return {
85 134 form: {},
86   - fileEntityList:[]
  135 + fileEntityList: [],
  136 + opinion: null,
  137 + opinion1: null,
  138 + opinion2: null,
87 139 }
88 140 },
89 141 created() {
90 142 this.init();
91 143 },
92   - methods:{
93   - init(){
  144 + methods: {
  145 + init() {
94 146 getHandle(this.idInfo).then(response => {
95 147 this.form = response.data.handleAffairs;
96 148 let files = JSON.stringify(response.data.uploadFiles);
97   - this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"))
  149 + this.fileEntityList = JSON.parse(files.replaceAll("filePath", "url").replaceAll("fileName", "name"));
98 150 });
  151 + listReplyApprovalProcess({tableName: 'handle_affairs', tableId: this.idInfo}).then(response => {
  152 + if(response.rows.length>0){
  153 + this.opinion1 = response.rows[0].reply;
  154 + this.opinion2 = response.rows[1].reply;
  155 + }
  156 + });
  157 +
99 158 },
100 159 /** 文件下载 */
101 160 downloadFA(row) {
... ...
trash-ui/src/views/office/handle/index.vue
  View file @32edd86
... ... @@ -3,6 +3,7 @@
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
4 4 <el-form-item label="办文办事类型" prop="type">
5 5 <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" clearable size="small">
  6 + <el-option label="全部" value=""/>
6 7 <el-option label="传阅学习类" value="0" />
7 8 <el-option label="公文批办类" value="1" />
8 9 <el-option label="热线举报类" value="2" />
... ... @@ -124,7 +125,7 @@
124 125 </el-table-column>
125 126 <el-table-column label="审批状态" align="center" prop="status">
126 127 <template slot-scope="scope">
127   - <span>{{parseStatus(scope.row.status)}}</span>
  128 + <span>{{parseStatusz(scope.row.status)}}</span>
128 129 </template>
129 130 </el-table-column>
130 131 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
... ... @@ -132,7 +133,7 @@
132 133 <el-button
133 134 size="mini"
134 135 type="text"
135   - icon="el-icon-edit"
  136 + icon="el-icon-view"
136 137 @click="handleInfo(scope.row)"
137 138 v-hasPermi="['office:handle:edit']"
138 139 >详情</el-button>
... ... @@ -260,7 +261,7 @@
260 261 </div>
261 262 </el-dialog>
262 263 <el-dialog :title="title" :visible.sync="openInfo" width="600px" append-to-body>
263   - <handleInfo :idInfo="idInfo" v-if="openInfo"/>
  264 + <handleInfo :idInfo="idInfo" v-if="openInfo" :businessKey="businessKey" :depts="depts"/>
264 265 <div slot="footer" class="dialog-footer">
265 266 <el-button @click="cancel">取 消</el-button>
266 267 </div>
... ... @@ -271,6 +272,7 @@
271 272 <script>
272 273 import { listHandle, getHandle, delHandle, addHandle, updateHandle, exportHandle } from "@/api/office/handle";
273 274 import handleInfo from "./handleInfo";
  275 +import {getDict} from "@/api/dict";
274 276 export default {
275 277 name: "Handle",
276 278 components: { handleInfo },
... ... @@ -331,9 +333,15 @@ export default {
331 333 fileEntityList: [],
332 334 idInfo: null,
333 335 openInfo: false,
  336 + businessKey:null,
  337 + depts:[],
334 338 };
335 339 },
336 340 created() {
  341 + let dep = {type:"CSUserDepartmentType"};
  342 + getDict(dep).then(res=>{
  343 + this.depts = res.result;
  344 + });
337 345 this.getList();
338 346 },
339 347 methods: {
... ... @@ -350,6 +358,7 @@ export default {
350 358 cancel() {
351 359 this.open = false;
352 360 this.openInfo = false;
  361 + this.businessKey = null;
353 362 this.reset();
354 363 },
355 364 // 表单重置
... ... @@ -397,6 +406,13 @@ export default {
397 406 this.idInfo = row.id;
398 407 this.openInfo = true;
399 408 this.title = "办文办事详情";
  409 +
  410 + console.log(row.type);
  411 + if(row.type==0){
  412 + this.businessKey = 'yuelanxuexi1';
  413 + }else if(row.type==1){
  414 + this.businessKey = 'gongwenchuli';
  415 + }
400 416 },
401 417 /** 修改按钮操作 */
402 418 handleUpdate(row) {
... ... @@ -576,6 +592,17 @@ export default {
576 592 this.rules.sendDate[0].required = true;
577 593 this.rules.appeal[0].required = true;
578 594 }
  595 + },
  596 + parseStatusz(status) {
  597 + if(status==1){
  598 + return "审批通过";
  599 + }else if(status==2){
  600 + return "审批驳回";
  601 + }else if(status==3){
  602 + return "收文完成";
  603 + }else{
  604 + return "审批中";
  605 + }
579 606 }
580 607 }
581 608 };
... ...
trash-ui/src/views/office/leaveApplication/index.vue
  View file @32edd86
... ... @@ -10,11 +10,12 @@
10 10  
11 11 />
12 12 </el-form-item>
13   - <el-form-item label="申请部门" prop="deptId">
14   - <el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable size="small">
15   - <el-option label="请选择字典生成" value=""/>
16   - </el-select>
17   - </el-form-item>
  13 +<!-- <el-form-item label="申请部门" prop="deptName">-->
  14 +<!-- <el-select v-model="queryParams.deptName" placeholder="请选择部门" clearable size="small">-->
  15 +<!-- <el-option label="全部" value=""/>-->
  16 +<!-- <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>-->
  17 +<!-- </el-select>-->
  18 +<!-- </el-form-item>-->
18 19 <el-form-item label="请假类型" prop="type">
19 20 <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
20 21 <el-option label="事假" value="事假"/>
... ... @@ -115,6 +116,7 @@
115 116 type="text"
116 117 icon="el-icon-edit"
117 118 @click="handleUpdate(scope.row)"
  119 + v-if="scope.row.status==2"
118 120 v-hasPermi="['office:leaveApplication:edit']"
119 121 >修改
120 122 </el-button>
... ... @@ -244,6 +246,7 @@ import {
244 246 } from "@/api/office/leaveApplication";
245 247 import Editor from '@/components/ZcEditor';
246 248 import leaveApplicationInfo from './leaveApplicationInfo';
  249 +import {getDict} from "@/api/dict";
247 250  
248 251 export default {
249 252 name: "LeaveApplication",
... ... @@ -273,7 +276,7 @@ export default {
273 276 pageNum: 1,
274 277 pageSize: 10,
275 278 applicant: null,
276   - deptId: null,
  279 + deptName: null,
277 280 positionId: null,
278 281 birthdate: null,
279 282 phone: null,
... ... @@ -318,9 +321,14 @@ export default {
318 321 openInfo: false,
319 322 idInfo: null,
320 323 fileEntityList:[],
  324 + depts:[]
321 325 };
322 326 },
323 327 created() {
  328 + let dep = {type:"CSUserDepartmentType"};
  329 + getDict(dep).then(res=>{
  330 + this.depts = res.result;
  331 + });
324 332 this.getList();
325 333 },
326 334 methods: {
... ... @@ -345,7 +353,7 @@ export default {
345 353 this.form = {
346 354 id: null,
347 355 applicant: null,
348   - deptId: null,
  356 + deptName: null,
349 357 positionId: null,
350 358 workDate: null,
351 359 birthdate: null,
... ...
trash-ui/src/views/office/logistics/index.vue
  View file @32edd86
1 1 <template>
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4   - <el-form-item label="申请部门" prop="deptId">
5   - <el-select v-model="queryParams.deptId" placeholder="请输入申请部门" style="width: 100%">
  4 + <el-form-item label="申请部门" prop="deptName">
  5 + <el-select v-model="queryParams.deptName" placeholder="请输入申请部门" style="width: 100%">
6 6 <el-option label="全部" value=""/>
7   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  7 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
8 8 </el-select>
9 9 </el-form-item>
10 10 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
... ... @@ -93,11 +93,7 @@
93 93  
94 94 <el-table v-loading="loading" :data="logisticsList" @selection-change="handleSelectionChange">
95 95 <el-table-column type="selection" width="55" align="center"/>
96   - <el-table-column label="申请部门" align="center" prop="deptId">
97   - <template slot-scope="scope">
98   - <span>{{ parseDept(scope.row.deptId) }}</span>
99   - </template>
100   - </el-table-column>
  96 + <el-table-column label="申请部门" align="center" prop="deptName"/>
101 97 <!-- 用章申请 -->
102 98 <el-table-column label="用章类型" align="center" prop="sealType" v-if="type==0"/>
103 99 <el-table-column label="更新时间" align="center" prop="sealUpdateTime" width="180" v-if="type==0">
... ... @@ -167,9 +163,9 @@
167 163 <!-- 添加或修改后勤管理对话框 -->
168 164 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body :close-on-click-modal="false">
169 165 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
170   - <el-form-item label="申请部门" prop="deptId">
171   - <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%">
172   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  166 + <el-form-item label="申请部门" prop="deptName">
  167 + <el-select v-model="form.deptName" placeholder="请输入申请部门" style="width: 100%">
  168 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
173 169 </el-select>
174 170 </el-form-item>
175 171 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
... ... @@ -279,7 +275,7 @@ export default {
279 275 pageNum: 1,
280 276 pageSize: 10,
281 277 type: this.type,
282   - deptId: null,
  278 + deptName: null,
283 279 sealType: null,
284 280 staff: null,
285 281 useDate: null,
... ... @@ -289,7 +285,7 @@ export default {
289 285 form: {},
290 286 // 表单校验
291 287 rules: {
292   - deptId: [
  288 + deptName: [
293 289 {required: true, message: "必填", trigger: "blur"}
294 290 ],
295 291 sealType: [
... ... @@ -348,7 +344,7 @@ export default {
348 344 // 表单重置
349 345 reset() {
350 346 this.form = {
351   - deptId: null,
  347 + deptName: null,
352 348 sealType: null,
353 349 sealUpdateTime: null,
354 350 sealEndTime: null,
... ... @@ -480,14 +476,6 @@ export default {
480 476 this.rules.goodsName[0].required = true;
481 477 this.rules.quantity[0].required = true;
482 478 }
483   - },
484   - parseDept(deptId){
485   - let dept = this.depts.filter(item=>{
486   - if(item.code == deptId){
487   - return item;
488   - }
489   - });
490   - return dept[0].name
491 479 }
492 480 }
493 481 };
... ...
trash-ui/src/views/office/logistics/logisticsInfo.vue
  View file @32edd86
... ... @@ -2,7 +2,7 @@
2 2 <el-form ref="form" :model="form" label-width="80px">
3 3 <el-form-item label="申请部门" prop="deptId">
4 4 <el-select v-model="form.deptId" placeholder="请输入申请部门" style="width: 100%" :disabled="true">
5   - <el-option v-for="item in depts" :label="item.name" :value="item.code" :key="item.code"/>
  5 + <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>
6 6 </el-select>
7 7 </el-form-item>
8 8 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @32edd86
... ... @@ -81,7 +81,7 @@ public class SupervisionThreestepController extends BaseController
81 81 {
82 82  
83 83 ExcelUtil<dayWork> util = new ExcelUtil<dayWork>(dayWork.class);
84   - return util.exportExcel(list, "dayWork");
  84 + return util.exportExcel(list, "日开工报表");
85 85  
86 86 }
87 87  
... ...
trash-workFlow/src/main/java/com/trash/casefile/controller/ReplyApprovalProcessController.java
  View file @32edd86
1 1 package com.trash.casefile.controller;
2 2  
3 3 import java.util.List;
  4 +
  5 +import com.trash.common.utils.DateUtils;
  6 +import com.trash.common.utils.SecurityUtils;
4 7 import org.springframework.security.access.prepost.PreAuthorize;
5 8 import org.springframework.beans.factory.annotation.Autowired;
6 9 import org.springframework.web.bind.annotation.GetMapping;
... ...
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsController.java
  View file @32edd86
... ... @@ -5,6 +5,7 @@ import java.util.ArrayList;
5 5 import java.util.List;
6 6  
7 7 import com.alibaba.fastjson.JSON;
  8 +import com.trash.common.utils.SecurityUtils;
8 9 import com.trash.office.domain.Conference;
9 10 import com.trash.office.domain.UploadFile;
10 11 import com.trash.office.domain.vo.ConferenceVo;
... ... @@ -107,4 +108,15 @@ public class HandleAffairsController extends BaseController {
107 108 public AjaxResult remove(@PathVariable Long[] ids) {
108 109 return toAjax(handleAffairsService.deleteHandleAffairsByIds(ids));
109 110 }
  111 +
  112 + /**
  113 + * 审批修改办文办事
  114 + */
  115 + @PreAuthorize("@ss.hasPermi('office:handle:edit')")
  116 + @Log(title = "办文办事", businessType = BusinessType.UPDATE)
  117 + @PostMapping("/updateHandleAffairs")
  118 + public AjaxResult updateHandleAffairs(@RequestBody HandleAffairs handleAffairs) {
  119 + handleAffairs.setUpdateBy(SecurityUtils.getLoginUser().getUsername());
  120 + return toAjax(handleAffairsService.updateHandleAffairsSp(handleAffairs));
  121 + }
110 122 }
... ...
trash-workFlow/src/main/java/com/trash/office/controller/LogisticsManagementController.java
  View file @32edd86
1 1 package com.trash.office.controller;
2 2  
3 3 import java.util.List;
  4 +
  5 +import com.trash.office.domain.LogisticsManagementGoods;
  6 +import com.trash.office.domain.LogisticsManagementSeal;
4 7 import org.springframework.security.access.prepost.PreAuthorize;
5 8 import org.springframework.beans.factory.annotation.Autowired;
6 9 import org.springframework.web.bind.annotation.GetMapping;
... ... @@ -53,9 +56,15 @@ public class LogisticsManagementController extends BaseController
53 56 @GetMapping("/export")
54 57 public AjaxResult export(LogisticsManagement logisticsManagement)
55 58 {
56   - List<LogisticsManagement> list = logisticsManagementService.selectLogisticsManagementList(logisticsManagement);
57   - ExcelUtil<LogisticsManagement> util = new ExcelUtil<LogisticsManagement>(LogisticsManagement.class);
58   - return util.exportExcel(list, "后勤管理");
  59 + if(logisticsManagement.getType().equals("0")) {
  60 + List<LogisticsManagementSeal> list = logisticsManagementService.selectLogisticsManagementSealList(logisticsManagement);
  61 + ExcelUtil<LogisticsManagementSeal> util = new ExcelUtil<>(LogisticsManagementSeal.class);
  62 + return util.exportExcel(list, "后勤管理");
  63 + }else{
  64 + List<LogisticsManagementGoods> list = logisticsManagementService.selectLogisticsManagementGoodsList(logisticsManagement);
  65 + ExcelUtil<LogisticsManagementGoods> util = new ExcelUtil<>(LogisticsManagementGoods.class);
  66 + return util.exportExcel(list, "后勤管理");
  67 + }
59 68 }
60 69  
61 70 /**
... ...
trash-workFlow/src/main/java/com/trash/office/domain/Conference.java
  View file @32edd86
1 1 package com.trash.office.domain;
2 2  
3 3 import java.util.Date;
  4 +
4 5 import com.fasterxml.jackson.annotation.JsonFormat;
5 6 import org.apache.commons.lang3.builder.ToStringBuilder;
6 7 import org.apache.commons.lang3.builder.ToStringStyle;
... ... @@ -9,52 +10,68 @@ import com.trash.common.core.domain.BaseEntity;
9 10  
10 11 /**
11 12 * 会议管理对象 office_conference
12   - *
  13 + *
13 14 * @author 2c
14 15 * @date 2023-05-04
15 16 */
16   -public class Conference extends BaseEntity
17   -{
  17 +public class Conference extends BaseEntity {
18 18 private static final long serialVersionUID = 1L;
19 19  
20   - /** $column.columnComment */
  20 + /**
  21 + * $column.columnComment
  22 + */
21 23 private Long id;
22 24  
23   - /** 会议时间 */
  25 + /**
  26 + * 会议时间
  27 + */
24 28 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
25 29 @Excel(name = "会议时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
26 30 private Date conferenceTime;
27 31  
28   - /** 会议地点 */
  32 + /**
  33 + * 会议地点
  34 + */
29 35 @Excel(name = "会议地点")
30 36 private String conferenceSite;
31 37  
32   - /** 科室id */
  38 + /**
  39 + * 科室id
  40 + */
33 41 private Integer deptId;
34 42  
35   -// @Excel(name = "部门")
  43 + @Excel(name = "发起部门")
36 44 private String deptName;
37 45  
38   - /** 参会人员 */
  46 + /**
  47 + * 参会人员
  48 + */
39 49 @Excel(name = "参会人员")
40 50 private String staff;
41 51  
42   - /** 会议主题 */
  52 + /**
  53 + * 会议主题
  54 + */
43 55 private String subject;
44 56  
45   - /** 会议内容 */
  57 + /**
  58 + * 会议内容
  59 + */
46 60 private String content;
47 61  
48   - /** 会议要求 */
  62 + /**
  63 + * 会议要求
  64 + */
49 65 private String requirement;
50 66  
51   - /** 通知区级分平台或者公司分平台
  67 + /**
  68 + * 通知区级分平台或者公司分平台
52 69 * 1:区级分平台，2：公司分平台，1,2：都通知
53 70 */
54 71 //@Excel(name = "通知区级分平台或者公司分平台")
55 72 private String notify;
56 73  
57   - @Excel(name = "审批状态")
  74 + @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回")
58 75 private Integer status;
59 76  
60 77 public Integer getStatus() {
... ... @@ -82,94 +99,86 @@ public class Conference extends BaseEntity
82 99 this.requirement = requirement;
83 100 }
84 101  
85   - public void setId(Long id)
86   - {
  102 + public void setId(Long id) {
87 103 this.id = id;
88 104 }
89 105  
90   - public Long getId()
91   - {
  106 + public Long getId() {
92 107 return id;
93 108 }
94   - public void setConferenceTime(Date conferenceTime)
95   - {
  109 +
  110 + public void setConferenceTime(Date conferenceTime) {
96 111 this.conferenceTime = conferenceTime;
97 112 }
98 113  
99   - public Date getConferenceTime()
100   - {
  114 + public Date getConferenceTime() {
101 115 return conferenceTime;
102 116 }
103   - public void setConferenceSite(String conferenceSite)
104   - {
  117 +
  118 + public void setConferenceSite(String conferenceSite) {
105 119 this.conferenceSite = conferenceSite;
106 120 }
107 121  
108   - public String getConferenceSite()
109   - {
  122 + public String getConferenceSite() {
110 123 return conferenceSite;
111 124 }
112   - public void setDeptId(Integer deptId)
113   - {
  125 +
  126 + public void setDeptId(Integer deptId) {
114 127 this.deptId = deptId;
115 128 }
116 129  
117   - public Integer getDeptId()
118   - {
  130 + public Integer getDeptId() {
119 131 return deptId;
120 132 }
121   - public void setStaff(String staff)
122   - {
  133 +
  134 + public void setStaff(String staff) {
123 135 this.staff = staff;
124 136 }
125 137  
126   - public String getStaff()
127   - {
  138 + public String getStaff() {
128 139 return staff;
129 140 }
130   - public void setSubject(String subject)
131   - {
  141 +
  142 + public void setSubject(String subject) {
132 143 this.subject = subject;
133 144 }
134 145  
135   - public String getSubject()
136   - {
  146 + public String getSubject() {
137 147 return subject;
138 148 }
139   - public void setContent(String content)
140   - {
  149 +
  150 + public void setContent(String content) {
141 151 this.content = content;
142 152 }
143 153  
144   - public String getContent()
145   - {
  154 + public String getContent() {
146 155 return content;
147 156 }
148   - public void setNotify(String notify)
149   - {
  157 +
  158 + public void setNotify(String notify) {
150 159 this.notify = notify;
151 160 }
152 161  
153   - public String getNotify()
154   - {
  162 + public String getNotify() {
155 163 return notify;
156 164 }
157 165  
158 166 @Override
159 167 public String toString() {
160   - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
161   - .append("id", getId())
162   - .append("conferenceTime", getConferenceTime())
163   - .append("conferenceSite", getConferenceSite())
164   - .append("deptId", getDeptId())
165   - .append("staff", getStaff())
166   - .append("subject", getSubject())
167   - .append("content", getContent())
168   - .append("notify", getNotify())
169   - .append("createTime", getCreateTime())
170   - .append("createBy", getCreateBy())
171   - .append("updateTime", getUpdateTime())
172   - .append("updateBy", getUpdateBy())
173   - .toString();
  168 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  169 + .append("id", getId())
  170 + .append("conferenceTime", getConferenceTime())
  171 + .append("conferenceSite", getConferenceSite())
  172 + .append("deptId", getDeptId())
  173 + .append("deptName", getDeptName())
  174 + .append("staff", getStaff())
  175 + .append("subject", getSubject())
  176 + .append("content", getContent())
  177 + .append("notify", getNotify())
  178 + .append("createTime", getCreateTime())
  179 + .append("createBy", getCreateBy())
  180 + .append("updateTime", getUpdateTime())
  181 + .append("updateBy", getUpdateBy())
  182 + .toString();
174 183 }
175 184 }
... ...
trash-workFlow/src/main/java/com/trash/office/domain/ContractManagement.java
  View file @32edd86
... ... @@ -73,7 +73,7 @@ public class ContractManagement extends BaseEntity {
73 73 private String contractState;
74 74  
75 75 /**
76   - * 责任科室id
  76 + * 责任科室
77 77 */
78 78 @Excel(name = "责任科室")
79 79 private String deptName;
... ...
trash-workFlow/src/main/java/com/trash/office/domain/HandleAffairs.java
  View file @32edd86
... ... @@ -23,6 +23,11 @@ public class HandleAffairs extends BaseEntity {
23 23 private Long id;
24 24  
25 25 /**
  26 + * 办文办事类型0:传阅学习类，1:公文批办类，2:热线举报，3：上级信访
  27 + */
  28 + @Excel(name = "办文办事类型", readConverterExp = "0=传阅学习类,1=公文批办类,2=热线举报,3=上级信访,4=现场信访")
  29 + private String type;
  30 + /**
26 31 * 来文单位
27 32 */
28 33 @Excel(name = "来文单位")
... ... @@ -41,17 +46,6 @@ public class HandleAffairs extends BaseEntity {
41 46 @Excel(name = "文件标题")
42 47 private String title;
43 48  
44   - /**
45   - * 办文办事类型0:传阅学习类，1:公文批办类，2:热线举报，3：上级信访
46   - */
47   - @Excel(name = "办文办事类型")
48   - private String type;
49   -
50   - /**
51   - * 诉求
52   - */
53   - @Excel(name = "诉求")
54   - private String appeal;
55 49  
56 50 /**
57 51 * 信访单位or人
... ... @@ -67,14 +61,64 @@ public class HandleAffairs extends BaseEntity {
67 61 private Date sendDate;
68 62  
69 63 /**
  64 + * 诉求
  65 + */
  66 + @Excel(name = "诉求")
  67 + private String appeal;
  68 +
  69 +
  70 +
  71 + /**
70 72 * 信访部门
71 73 */
72 74 private Integer deptId;
73 75  
  76 + private String deptName;
  77 +
  78 + private String opinion;
  79 +
  80 + private String sendObject;
  81 +
  82 + private String userNames;
  83 +
  84 + private String userNamesDone;
  85 +
  86 + public String getUserNames() {
  87 + return userNames;
  88 + }
  89 +
  90 + public void setUserNames(String userNames) {
  91 + this.userNames = userNames;
  92 + }
  93 +
  94 + public String getUserNamesDone() {
  95 + return userNamesDone;
  96 + }
  97 +
  98 + public void setUserNamesDone(String userNamesDone) {
  99 + this.userNamesDone = userNamesDone;
  100 + }
  101 +
  102 + public String getSendObject() {
  103 + return sendObject;
  104 + }
  105 +
  106 + public void setSendObject(String sendObject) {
  107 + this.sendObject = sendObject;
  108 + }
  109 +
  110 + public String getOpinion() {
  111 + return opinion;
  112 + }
  113 +
  114 + public void setOpinion(String opinion) {
  115 + this.opinion = opinion;
  116 + }
  117 +
74 118 /**
75 119 * 审批状态
76 120 */
77   - @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回")
  121 + @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回,3=收文完成")
78 122 private Integer status;
79 123  
80 124 public Integer getDeptId() {
... ... @@ -157,6 +201,14 @@ public class HandleAffairs extends BaseEntity {
157 201 return status;
158 202 }
159 203  
  204 + public String getDeptName() {
  205 + return deptName;
  206 + }
  207 +
  208 + public void setDeptName(String deptName) {
  209 + this.deptName = deptName;
  210 + }
  211 +
160 212 @Override
161 213 public String toString() {
162 214 return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
... ... @@ -164,6 +216,7 @@ public class HandleAffairs extends BaseEntity {
164 216 .append("company", getCompany())
165 217 .append("receiveTime", getReceiveTime())
166 218 .append("title", getTitle())
  219 + .append("deptName", getDeptName())
167 220 .append("type", getType())
168 221 .append("appeal", getAppeal())
169 222 .append("sendPerson", getSendPerson())
... ...
trash-workFlow/src/main/java/com/trash/office/domain/LeaveApplication.java
  View file @32edd86
1 1 package com.trash.office.domain;
2 2  
3 3 import java.util.Date;
  4 +
4 5 import com.fasterxml.jackson.annotation.JsonFormat;
5 6 import org.apache.commons.lang3.builder.ToStringBuilder;
6 7 import org.apache.commons.lang3.builder.ToStringStyle;
... ... @@ -9,178 +10,198 @@ import com.trash.common.core.domain.BaseEntity;
9 10  
10 11 /**
11 12 * leaveApplication对象 office_leave_application
12   - *
  13 + *
13 14 * @author 2c
14 15 * @date 2023-05-04
15 16 */
16   -public class LeaveApplication extends BaseEntity
17   -{
  17 +public class LeaveApplication extends BaseEntity {
18 18 private static final long serialVersionUID = 1L;
19 19  
20   - /** $column.columnComment */
  20 + /**
  21 + * $column.columnComment
  22 + */
21 23 private Long id;
22 24  
23   - /** 申请人 */
  25 + /**
  26 + * 申请人
  27 + */
24 28 @Excel(name = "申请人")
25 29 private String applicant;
26 30  
27   - /** 部门id */
  31 + /**
  32 + * 部门id
  33 + */
28 34 // @Excel(name = "部门id")
29 35 private Long deptId;
30 36  
31   - /** 职务id */
  37 + //@Excel(name = "部门申请")
  38 + private String deptName;
  39 +
  40 + /**
  41 + * 职务id
  42 + */
32 43 // @Excel(name = "职务id")
33 44 private Long positionId;
34 45  
35 46  
36   - /** 联系方式 */
  47 + /**
  48 + * 联系方式
  49 + */
37 50 @Excel(name = "联系方式")
38 51 private String phone;
39 52  
40   - /** 请假类型 */
  53 + /**
  54 + * 请假类型
  55 + */
41 56 @Excel(name = "请假类型")
42 57 private String type;
43 58  
44   - /** 请假开始时间 */
  59 + /**
  60 + * 请假开始时间
  61 + */
45 62 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
46 63 @Excel(name = "请假开始时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
47 64 private Date beginDate;
48 65  
49   - /** 请假结束时间 */
  66 + /**
  67 + * 请假结束时间
  68 + */
50 69 @JsonFormat(pattern = "yyyy-MM-dd")
51 70 @Excel(name = "请假结束时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
52 71 private Date endDate;
53 72  
54   - /** 请假天数 */
  73 + /**
  74 + * 请假天数
  75 + */
55 76 @Excel(name = "请假天数")
56 77 private String numberDays;
57 78  
58   - /** 请假事由 */
  79 + /**
  80 + * 请假事由
  81 + */
59 82 private String content;
60 83  
61   - /** 审批状态 0待审核/1审核通过/2驳回 */
  84 + /**
  85 + * 审批状态 0待审核/1审核通过/2驳回
  86 + */
62 87 @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回")
63 88 private Integer status;
64 89  
65   - public void setId(Long id)
66   - {
  90 + public void setId(Long id) {
67 91 this.id = id;
68 92 }
69 93  
70   - public Long getId()
71   - {
  94 + public Long getId() {
72 95 return id;
73 96 }
74   - public void setApplicant(String applicant)
75   - {
  97 +
  98 + public void setApplicant(String applicant) {
76 99 this.applicant = applicant;
77 100 }
78 101  
79   - public String getApplicant()
80   - {
  102 + public String getApplicant() {
81 103 return applicant;
82 104 }
83   - public void setDeptId(Long deptId)
84   - {
  105 +
  106 + public void setDeptId(Long deptId) {
85 107 this.deptId = deptId;
86 108 }
87 109  
88   - public Long getDeptId()
89   - {
  110 + public Long getDeptId() {
90 111 return deptId;
91 112 }
92   - public void setPositionId(Long positionId)
93   - {
  113 +
  114 + public void setPositionId(Long positionId) {
94 115 this.positionId = positionId;
95 116 }
96 117  
97   - public Long getPositionId()
98   - {
  118 + public Long getPositionId() {
99 119 return positionId;
100 120 }
101 121  
102   - public void setPhone(String phone)
103   - {
  122 + public void setPhone(String phone) {
104 123 this.phone = phone;
105 124 }
106 125  
107   - public String getPhone()
108   - {
  126 + public String getPhone() {
109 127 return phone;
110 128 }
111   - public void setType(String type)
112   - {
  129 +
  130 + public void setType(String type) {
113 131 this.type = type;
114 132 }
115 133  
116   - public String getType()
117   - {
  134 + public String getType() {
118 135 return type;
119 136 }
120   - public void setBeginDate(Date beginDate)
121   - {
  137 +
  138 + public void setBeginDate(Date beginDate) {
122 139 this.beginDate = beginDate;
123 140 }
124 141  
125   - public Date getBeginDate()
126   - {
  142 + public Date getBeginDate() {
127 143 return beginDate;
128 144 }
129   - public void setEndDate(Date endDate)
130   - {
  145 +
  146 + public void setEndDate(Date endDate) {
131 147 this.endDate = endDate;
132 148 }
133 149  
134   - public Date getEndDate()
135   - {
  150 + public Date getEndDate() {
136 151 return endDate;
137 152 }
138   - public void setNumberDays(String numberDays)
139   - {
  153 +
  154 + public void setNumberDays(String numberDays) {
140 155 this.numberDays = numberDays;
141 156 }
142 157  
143   - public String getNumberDays()
144   - {
  158 + public String getNumberDays() {
145 159 return numberDays;
146 160 }
147   - public void setContent(String content)
148   - {
  161 +
  162 + public void setContent(String content) {
149 163 this.content = content;
150 164 }
151 165  
152   - public String getContent()
153   - {
  166 + public String getContent() {
154 167 return content;
155 168 }
156   - public void setStatus(Integer status)
157   - {
  169 +
  170 + public void setStatus(Integer status) {
158 171 this.status = status;
159 172 }
160 173  
161   - public Integer getStatus()
162   - {
  174 + public Integer getStatus() {
163 175 return status;
164 176 }
165 177  
  178 + public String getDeptName() {
  179 + return deptName;
  180 + }
  181 +
  182 + public void setDeptName(String deptName) {
  183 + this.deptName = deptName;
  184 + }
  185 +
166 186 @Override
167 187 public String toString() {
168   - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
169   - .append("id", getId())
170   - .append("applicant", getApplicant())
171   - .append("deptId", getDeptId())
172   - .append("positionId", getPositionId())
173   - .append("phone", getPhone())
174   - .append("type", getType())
175   - .append("beginDate", getBeginDate())
176   - .append("endDate", getEndDate())
177   - .append("numberDays", getNumberDays())
178   - .append("content", getContent())
179   - .append("status", getStatus())
180   - .append("createTime", getCreateTime())
181   - .append("createBy", getCreateBy())
182   - .append("updateTime", getUpdateTime())
183   - .append("updateBy", getUpdateBy())
184   - .toString();
  188 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  189 + .append("id", getId())
  190 + .append("applicant", getApplicant())
  191 + .append("deptId", getDeptId())
  192 + .append("deptName", getDeptName())
  193 + .append("positionId", getPositionId())
  194 + .append("phone", getPhone())
  195 + .append("type", getType())
  196 + .append("beginDate", getBeginDate())
  197 + .append("endDate", getEndDate())
  198 + .append("numberDays", getNumberDays())
  199 + .append("content", getContent())
  200 + .append("status", getStatus())
  201 + .append("createTime", getCreateTime())
  202 + .append("createBy", getCreateBy())
  203 + .append("updateTime", getUpdateTime())
  204 + .append("updateBy", getUpdateBy())
  205 + .toString();
185 206 }
186 207 }
... ...
trash-workFlow/src/main/java/com/trash/office/domain/LogisticsManagement.java
  View file @32edd86
1 1 package com.trash.office.domain;
2 2  
3 3 import java.util.Date;
  4 +
4 5 import com.fasterxml.jackson.annotation.JsonFormat;
5 6 import org.apache.commons.lang3.builder.ToStringBuilder;
6 7 import org.apache.commons.lang3.builder.ToStringStyle;
... ... @@ -9,192 +10,213 @@ import com.trash.common.core.domain.BaseEntity;
9 10  
10 11 /**
11 12 * 后勤管理对象 office_logistics_management
12   - *
  13 + *
13 14 * @author 2c
14 15 * @date 2023-05-08
15 16 */
16   -public class LogisticsManagement extends BaseEntity
17   -{
  17 +public class LogisticsManagement extends BaseEntity {
18 18 private static final long serialVersionUID = 1L;
19 19  
20   - /** $column.columnComment */
  20 + /**
  21 + * $column.columnComment
  22 + */
21 23 private Long id;
22 24  
23   - /** 申请类型：1.用章申请，2.物品申请，3.物品采购申请 */
  25 + /**
  26 + * 申请类型：1.用章申请，2.物品申请，3.物品采购申请
  27 + */
24 28 @Excel(name = "申请类型")
25 29 private String type;
26 30  
27   - /** 申请部门 */
28   - @Excel(name = "申请部门")
  31 + /**
  32 + * 申请部门
  33 + */
29 34 private Integer deptId;
30 35  
31   - /** 用章类型 */
  36 + @Excel(name = "申请部门")
  37 + private String deptName;
  38 +
  39 + /**
  40 + * 用章类型
  41 + */
32 42 @Excel(name = "用章类型")
33 43 private String sealType;
34 44  
35   - /** 用章更新时间 */
  45 + /**
  46 + * 用章更新时间
  47 + */
36 48 @JsonFormat(pattern = "yyyy-MM-dd")
37 49 @Excel(name = "用章更新时间", width = 30, dateFormat = "yyyy-MM-dd")
38 50 private Date sealUpdateTime;
39 51  
40   - /** 结束时间 */
  52 + /**
  53 + * 结束时间
  54 + */
41 55 @JsonFormat(pattern = "yyyy-MM-dd")
42 56 @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
43 57 private Date sealEndTime;
44 58  
45   - /** 用途 */
  59 + /**
  60 + * 用途
  61 + */
46 62 @Excel(name = "用途")
47 63 private String purpose;
48 64  
49   - /** 申请人 */
  65 + /**
  66 + * 申请人
  67 + */
50 68 @Excel(name = "申请人")
51 69 private String staff;
52 70  
53   - /** 申请日期 */
  71 + /**
  72 + * 申请日期
  73 + */
54 74 @JsonFormat(pattern = "yyyy-MM-dd")
55 75 @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
56 76 private Date useDate;
57 77  
58   - /** 物品名称 */
  78 + /**
  79 + * 物品名称
  80 + */
59 81 @Excel(name = "物品名称")
60 82 private String goodsName;
61 83  
62   - /** 数量 */
  84 + /**
  85 + * 数量
  86 + */
63 87 @Excel(name = "数量")
64 88 private Integer quantity;
65 89  
66   - /** 审核状态 */
  90 + /**
  91 + * 审核状态
  92 + */
67 93 @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回")
68 94 private Integer status;
69 95  
70   - public void setId(Long id)
71   - {
  96 + public void setId(Long id) {
72 97 this.id = id;
73 98 }
74 99  
75   - public Long getId()
76   - {
  100 + public Long getId() {
77 101 return id;
78 102 }
79   - public void setType(String type)
80   - {
  103 +
  104 + public void setType(String type) {
81 105 this.type = type;
82 106 }
83 107  
84   - public String getType()
85   - {
  108 + public String getType() {
86 109 return type;
87 110 }
88   - public void setDeptId(Integer deptId)
89   - {
  111 +
  112 + public void setDeptId(Integer deptId) {
90 113 this.deptId = deptId;
91 114 }
92 115  
93   - public Integer getDeptId()
94   - {
  116 + public Integer getDeptId() {
95 117 return deptId;
96 118 }
97   - public void setSealType(String sealType)
98   - {
  119 +
  120 + public void setSealType(String sealType) {
99 121 this.sealType = sealType;
100 122 }
101 123  
102   - public String getSealType()
103   - {
  124 + public String getSealType() {
104 125 return sealType;
105 126 }
106   - public void setSealUpdateTime(Date sealUpdateTime)
107   - {
  127 +
  128 + public void setSealUpdateTime(Date sealUpdateTime) {
108 129 this.sealUpdateTime = sealUpdateTime;
109 130 }
110 131  
111   - public Date getSealUpdateTime()
112   - {
  132 + public Date getSealUpdateTime() {
113 133 return sealUpdateTime;
114 134 }
115   - public void setSealEndTime(Date sealEndTime)
116   - {
  135 +
  136 + public void setSealEndTime(Date sealEndTime) {
117 137 this.sealEndTime = sealEndTime;
118 138 }
119 139  
120   - public Date getSealEndTime()
121   - {
  140 + public Date getSealEndTime() {
122 141 return sealEndTime;
123 142 }
124   - public void setPurpose(String purpose)
125   - {
  143 +
  144 + public void setPurpose(String purpose) {
126 145 this.purpose = purpose;
127 146 }
128 147  
129   - public String getPurpose()
130   - {
  148 + public String getPurpose() {
131 149 return purpose;
132 150 }
133   - public void setStaff(String staff)
134   - {
  151 +
  152 + public void setStaff(String staff) {
135 153 this.staff = staff;
136 154 }
137 155  
138   - public String getStaff()
139   - {
  156 + public String getStaff() {
140 157 return staff;
141 158 }
142   - public void setUseDate(Date useDate)
143   - {
  159 +
  160 + public void setUseDate(Date useDate) {
144 161 this.useDate = useDate;
145 162 }
146 163  
147   - public Date getUseDate()
148   - {
  164 + public Date getUseDate() {
149 165 return useDate;
150 166 }
151   - public void setGoodsName(String goodsName)
152   - {
  167 +
  168 + public void setGoodsName(String goodsName) {
153 169 this.goodsName = goodsName;
154 170 }
155 171  
156   - public String getGoodsName()
157   - {
  172 + public String getGoodsName() {
158 173 return goodsName;
159 174 }
160   - public void setQuantity(Integer quantity)
161   - {
  175 +
  176 + public void setQuantity(Integer quantity) {
162 177 this.quantity = quantity;
163 178 }
164 179  
165   - public Integer getQuantity()
166   - {
  180 + public Integer getQuantity() {
167 181 return quantity;
168 182 }
169   - public void setStatus(Integer status)
170   - {
  183 +
  184 + public void setStatus(Integer status) {
171 185 this.status = status;
172 186 }
173 187  
174   - public Integer getStatus()
175   - {
  188 + public Integer getStatus() {
176 189 return status;
177 190 }
178 191  
  192 + public String getDeptName() {
  193 + return deptName;
  194 + }
  195 +
  196 + public void setDeptName(String deptName) {
  197 + this.deptName = deptName;
  198 + }
  199 +
179 200 @Override
180 201 public String toString() {
181   - return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
182   - .append("id", getId())
183   - .append("type", getType())
184   - .append("deptId", getDeptId())
185   - .append("sealType", getSealType())
186   - .append("sealUpdateTime", getSealUpdateTime())
187   - .append("sealEndTime", getSealEndTime())
188   - .append("purpose", getPurpose())
189   - .append("staff", getStaff())
190   - .append("useDate", getUseDate())
191   - .append("goodsName", getGoodsName())
192   - .append("quantity", getQuantity())
193   - .append("status", getStatus())
194   - .append("createTime", getCreateTime())
195   - .append("createBy", getCreateBy())
196   - .append("updateTime", getUpdateTime())
197   - .append("updateBy", getUpdateBy())
198   - .toString();
  202 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  203 + .append("id", getId())
  204 + .append("type", getType())
  205 + .append("deptId", getDeptId())
  206 + .append("deptName", getDeptName())
  207 + .append("sealType", getSealType())
  208 + .append("sealUpdateTime", getSealUpdateTime())
  209 + .append("sealEndTime", getSealEndTime())
  210 + .append("purpose", getPurpose())
  211 + .append("staff", getStaff())
  212 + .append("useDate", getUseDate())
  213 + .append("goodsName", getGoodsName())
  214 + .append("quantity", getQuantity())
  215 + .append("status", getStatus())
  216 + .append("createTime", getCreateTime())
  217 + .append("createBy", getCreateBy())
  218 + .append("updateTime", getUpdateTime())
  219 + .append("updateBy", getUpdateBy())
  220 + .toString();
199 221 }
200 222 }
... ...
trash-workFlow/src/main/java/com/trash/office/domain/LogisticsManagementGoods.java 0 → 100644
  View file @32edd86
  1 +package com.trash.office.domain;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.trash.common.annotation.Excel;
  5 +import com.trash.common.core.domain.BaseEntity;
  6 +import org.apache.commons.lang3.builder.ToStringBuilder;
  7 +import org.apache.commons.lang3.builder.ToStringStyle;
  8 +
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + * 后勤管理对象 office_logistics_management
  13 + *
  14 + * @author 2c
  15 + * @date 2023-05-08
  16 + */
  17 +public class LogisticsManagementGoods extends BaseEntity {
  18 + private static final long serialVersionUID = 1L;
  19 +
  20 + /**
  21 + * $column.columnComment
  22 + */
  23 + private Long id;
  24 +
  25 + /**
  26 + * 申请类型：1.用章申请，2.物品申请，3.物品采购申请
  27 + */
  28 +// @Excel(name = "申请类型")
  29 + private String type;
  30 +
  31 + /**
  32 + * 申请部门
  33 + */
  34 + private Integer deptId;
  35 +
  36 + @Excel(name = "申请部门")
  37 + private String deptName;
  38 +
  39 + /**
  40 + * 用章类型
  41 + */
  42 +// @Excel(name = "用章类型")
  43 + private String sealType;
  44 +
  45 + /**
  46 + * 用章更新时间
  47 + */
  48 + @JsonFormat(pattern = "yyyy-MM-dd")
  49 +// @Excel(name = "用章更新时间", width = 30, dateFormat = "yyyy-MM-dd")
  50 + private Date sealUpdateTime;
  51 +
  52 + /**
  53 + * 结束时间
  54 + */
  55 + @JsonFormat(pattern = "yyyy-MM-dd")
  56 +// @Excel(name = "结束时间", width = 30, dateFormat = "yyyy-MM-dd")
  57 + private Date sealEndTime;
  58 +
  59 + /**
  60 + * 用途
  61 + */
  62 +// @Excel(name = "用途")
  63 + private String purpose;
  64 +
  65 + /**
  66 + * 申请人
  67 + */
  68 + @Excel(name = "申请人")
  69 + private String staff;
  70 +
  71 + /**
  72 + * 申请日期
  73 + */
  74 + @JsonFormat(pattern = "yyyy-MM-dd")
  75 + @Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
  76 + private Date useDate;
  77 +
  78 + /**
  79 + * 物品名称
  80 + */
  81 + @Excel(name = "物品名称")
  82 + private String goodsName;
  83 +
  84 + /**
  85 + * 数量
  86 + */
  87 + @Excel(name = "数量")
  88 + private Integer quantity;
  89 +
  90 + /**
  91 + * 审核状态
  92 + */
  93 + @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回")
  94 + private Integer status;
  95 +
  96 + public void setId(Long id) {
  97 + this.id = id;
  98 + }
  99 +
  100 + public Long getId() {
  101 + return id;
  102 + }
  103 +
  104 + public void setType(String type) {
  105 + this.type = type;
  106 + }
  107 +
  108 + public String getType() {
  109 + return type;
  110 + }
  111 +
  112 + public void setDeptId(Integer deptId) {
  113 + this.deptId = deptId;
  114 + }
  115 +
  116 + public Integer getDeptId() {
  117 + return deptId;
  118 + }
  119 +
  120 + public void setSealType(String sealType) {
  121 + this.sealType = sealType;
  122 + }
  123 +
  124 + public String getSealType() {
  125 + return sealType;
  126 + }
  127 +
  128 + public void setSealUpdateTime(Date sealUpdateTime) {
  129 + this.sealUpdateTime = sealUpdateTime;
  130 + }
  131 +
  132 + public Date getSealUpdateTime() {
  133 + return sealUpdateTime;
  134 + }
  135 +
  136 + public void setSealEndTime(Date sealEndTime) {
  137 + this.sealEndTime = sealEndTime;
  138 + }
  139 +
  140 + public Date getSealEndTime() {
  141 + return sealEndTime;
  142 + }
  143 +
  144 + public void setPurpose(String purpose) {
  145 + this.purpose = purpose;
  146 + }
  147 +
  148 + public String getPurpose() {
  149 + return purpose;
  150 + }
  151 +
  152 + public void setStaff(String staff) {
  153 + this.staff = staff;
  154 + }
  155 +
  156 + public String getStaff() {
  157 + return staff;
  158 + }
  159 +
  160 + public void setUseDate(Date useDate) {
  161 + this.useDate = useDate;
  162 + }
  163 +
  164 + public Date getUseDate() {
  165 + return useDate;
  166 + }
  167 +
  168 + public void setGoodsName(String goodsName) {
  169 + this.goodsName = goodsName;
  170 + }
  171 +
  172 + public String getGoodsName() {
  173 + return goodsName;
  174 + }
  175 +
  176 + public void setQuantity(Integer quantity) {
  177 + this.quantity = quantity;
  178 + }
  179 +
  180 + public Integer getQuantity() {
  181 + return quantity;
  182 + }
  183 +
  184 + public void setStatus(Integer status) {
  185 + this.status = status;
  186 + }
  187 +
  188 + public Integer getStatus() {
  189 + return status;
  190 + }
  191 +
  192 + public String getDeptName() {
  193 + return deptName;
  194 + }
  195 +
  196 + public void setDeptName(String deptName) {
  197 + this.deptName = deptName;
  198 + }
  199 +
  200 + @Override
  201 + public String toString() {
  202 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  203 + .append("id", getId())
  204 + .append("type", getType())
  205 + .append("deptId", getDeptId())
  206 + .append("deptName", getDeptName())
  207 + .append("sealType", getSealType())
  208 + .append("sealUpdateTime", getSealUpdateTime())
  209 + .append("sealEndTime", getSealEndTime())
  210 + .append("purpose", getPurpose())
  211 + .append("staff", getStaff())
  212 + .append("useDate", getUseDate())
  213 + .append("goodsName", getGoodsName())
  214 + .append("quantity", getQuantity())
  215 + .append("status", getStatus())
  216 + .append("createTime", getCreateTime())
  217 + .append("createBy", getCreateBy())
  218 + .append("updateTime", getUpdateTime())
  219 + .append("updateBy", getUpdateBy())
  220 + .toString();
  221 + }
  222 +}
... ...
trash-workFlow/src/main/java/com/trash/office/domain/LogisticsManagementSeal.java 0 → 100644
  View file @32edd86
  1 +package com.trash.office.domain;
  2 +
  3 +import com.fasterxml.jackson.annotation.JsonFormat;
  4 +import com.trash.common.annotation.Excel;
  5 +import com.trash.common.core.domain.BaseEntity;
  6 +import org.apache.commons.lang3.builder.ToStringBuilder;
  7 +import org.apache.commons.lang3.builder.ToStringStyle;
  8 +
  9 +import java.util.Date;
  10 +
  11 +/**
  12 + * 后勤管理对象 office_logistics_management
  13 + *
  14 + * @author 2c
  15 + * @date 2023-05-08
  16 + */
  17 +public class LogisticsManagementSeal extends BaseEntity {
  18 + private static final long serialVersionUID = 1L;
  19 +
  20 + /**
  21 + * $column.columnComment
  22 + */
  23 + private Long id;
  24 +
  25 + /**
  26 + * 申请类型：1.用章申请，2.物品申请，3.物品采购申请
  27 + */
  28 + //@Excel(name = "申请类型")
  29 + private String type;
  30 +
  31 + /**
  32 + * 申请部门
  33 + */
  34 + private Integer deptId;
  35 +
  36 + @Excel(name = "申请部门")
  37 + private String deptName;
  38 +
  39 + /**
  40 + * 用章类型
  41 + */
  42 + @Excel(name = "用章类型")
  43 + private String sealType;
  44 +
  45 + /**
  46 + * 用章更新时间
  47 + */
  48 + @JsonFormat(pattern = "yyyy-MM-dd")
  49 + @Excel(name = "用章更新时间", width = 30, dateFormat = "yyyy-MM-dd")
  50 + private Date sealUpdateTime;
  51 +
  52 + /**
  53 + * 结束时间
  54 + */
  55 + @JsonFormat(pattern = "yyyy-MM-dd")
  56 + @Excel(name = "用章结束时间", width = 30, dateFormat = "yyyy-MM-dd")
  57 + private Date sealEndTime;
  58 +
  59 + /**
  60 + * 用途
  61 + */
  62 + @Excel(name = "用途")
  63 + private String purpose;
  64 +
  65 + /**
  66 + * 申请人
  67 + */
  68 + //@Excel(name = "申请人")
  69 + private String staff;
  70 +
  71 + /**
  72 + * 申请日期
  73 + */
  74 + @JsonFormat(pattern = "yyyy-MM-dd")
  75 + //@Excel(name = "申请日期", width = 30, dateFormat = "yyyy-MM-dd")
  76 + private Date useDate;
  77 +
  78 + /**
  79 + * 物品名称
  80 + */
  81 + //@Excel(name = "物品名称")
  82 + private String goodsName;
  83 +
  84 + /**
  85 + * 数量
  86 + */
  87 + //@Excel(name = "数量")
  88 + private Integer quantity;
  89 +
  90 + /**
  91 + * 审核状态
  92 + */
  93 + @Excel(name = "审批状态", readConverterExp = "0=审批中,1=审批通过,2=被驳回")
  94 + private Integer status;
  95 +
  96 + public void setId(Long id) {
  97 + this.id = id;
  98 + }
  99 +
  100 + public Long getId() {
  101 + return id;
  102 + }
  103 +
  104 + public void setType(String type) {
  105 + this.type = type;
  106 + }
  107 +
  108 + public String getType() {
  109 + return type;
  110 + }
  111 +
  112 + public void setDeptId(Integer deptId) {
  113 + this.deptId = deptId;
  114 + }
  115 +
  116 + public Integer getDeptId() {
  117 + return deptId;
  118 + }
  119 +
  120 + public void setSealType(String sealType) {
  121 + this.sealType = sealType;
  122 + }
  123 +
  124 + public String getSealType() {
  125 + return sealType;
  126 + }
  127 +
  128 + public void setSealUpdateTime(Date sealUpdateTime) {
  129 + this.sealUpdateTime = sealUpdateTime;
  130 + }
  131 +
  132 + public Date getSealUpdateTime() {
  133 + return sealUpdateTime;
  134 + }
  135 +
  136 + public void setSealEndTime(Date sealEndTime) {
  137 + this.sealEndTime = sealEndTime;
  138 + }
  139 +
  140 + public Date getSealEndTime() {
  141 + return sealEndTime;
  142 + }
  143 +
  144 + public void setPurpose(String purpose) {
  145 + this.purpose = purpose;
  146 + }
  147 +
  148 + public String getPurpose() {
  149 + return purpose;
  150 + }
  151 +
  152 + public void setStaff(String staff) {
  153 + this.staff = staff;
  154 + }
  155 +
  156 + public String getStaff() {
  157 + return staff;
  158 + }
  159 +
  160 + public void setUseDate(Date useDate) {
  161 + this.useDate = useDate;
  162 + }
  163 +
  164 + public Date getUseDate() {
  165 + return useDate;
  166 + }
  167 +
  168 + public void setGoodsName(String goodsName) {
  169 + this.goodsName = goodsName;
  170 + }
  171 +
  172 + public String getGoodsName() {
  173 + return goodsName;
  174 + }
  175 +
  176 + public void setQuantity(Integer quantity) {
  177 + this.quantity = quantity;
  178 + }
  179 +
  180 + public Integer getQuantity() {
  181 + return quantity;
  182 + }
  183 +
  184 + public void setStatus(Integer status) {
  185 + this.status = status;
  186 + }
  187 +
  188 + public Integer getStatus() {
  189 + return status;
  190 + }
  191 +
  192 + public String getDeptName() {
  193 + return deptName;
  194 + }
  195 +
  196 + public void setDeptName(String deptName) {
  197 + this.deptName = deptName;
  198 + }
  199 +
  200 + @Override
  201 + public String toString() {
  202 + return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
  203 + .append("id", getId())
  204 + .append("type", getType())
  205 + .append("deptId", getDeptId())
  206 + .append("deptName", getDeptName())
  207 + .append("sealType", getSealType())
  208 + .append("sealUpdateTime", getSealUpdateTime())
  209 + .append("sealEndTime", getSealEndTime())
  210 + .append("purpose", getPurpose())
  211 + .append("staff", getStaff())
  212 + .append("useDate", getUseDate())
  213 + .append("goodsName", getGoodsName())
  214 + .append("quantity", getQuantity())
  215 + .append("status", getStatus())
  216 + .append("createTime", getCreateTime())
  217 + .append("createBy", getCreateBy())
  218 + .append("updateTime", getUpdateTime())
  219 + .append("updateBy", getUpdateBy())
  220 + .toString();
  221 + }
  222 +}
... ...