youxiw2000 / trash · Commits

Commit 9c06308f18f88f8c832e62f0c7c11059f971b327

Authored by youxiw2000
1 parent 94deb252
build: skipped

m

Inline Side-by-side
Showing 88 changed files with 1888 additions and 749 deletions
trash-activiti/src/main/java/com/trash/activiti/controller/TaskController.java
  View file @9c06308
@@ -52,11 +52,16 @@ public class TaskController extends BaseController { @@ -52,11 +52,16 @@ public class TaskController extends BaseController {
52 } 52 }
53 } 53 }
54 54
55 -  
56 TableDataInfo tableDataInfo = getDataTable(hashMaps); 55 TableDataInfo tableDataInfo = getDataTable(hashMaps);
57 56
58 int pageNum = pageDomain.getPageNum(); 57 int pageNum = pageDomain.getPageNum();
59 int pageSize = pageDomain.getPageSize(); 58 int pageSize = pageDomain.getPageSize();
  59 +
  60 + tableDataInfo.setNames(names);
  61 +
  62 + if(tableDataInfo.getRows().size() <= pageSize){
  63 + return tableDataInfo;
  64 + }
60 65
61 if(tableDataInfo.getRows().size() > (pageNum)*pageSize){ 66 if(tableDataInfo.getRows().size() > (pageNum)*pageSize){
62 tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, (pageNum)*pageSize)); 67 tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, (pageNum)*pageSize));
@@ -64,7 +69,6 @@ public class TaskController extends BaseController { @@ -64,7 +69,6 @@ public class TaskController extends BaseController {
64 tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, tableDataInfo.getRows().size())); 69 tableDataInfo.setRows(tableDataInfo.getRows().subList((pageNum -1)*pageSize, tableDataInfo.getRows().size()));
65 } 70 }
66 71
67 - tableDataInfo.setNames(names);  
68 72
69 return tableDataInfo; 73 return tableDataInfo;
70 } 74 }
trash-activiti/src/main/java/com/trash/activiti/domain/dto/ActTaskDTO.java
  View file @9c06308
@@ -51,77 +51,110 @@ public class ActTaskDTO @@ -51,77 +51,110 @@ public class ActTaskDTO
51 51
52 private String checkStatus; 52 private String checkStatus;
53 53
  54 + private String createBy;
54 55
  56 + private String time;
  57 +
55 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 58 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
56 private Date createdDate; 59 private Date createdDate;
57 private String instanceName; 60 private String instanceName;
58 private String definitionKey; 61 private String definitionKey;
59 private String businessKey; 62 private String businessKey;
  63 +
  64 +
  65 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
  66 + SimpleDateFormat timeSdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
60 67
61 public ActTaskDTO() { 68 public ActTaskDTO() {
62 } 69 }
63 70
64 - public ActTaskDTO(ProcessInstance processInstance, Map<String, String> map,ActWorkflowFormData from) { 71 + public ActTaskDTO(ProcessInstance processInstance, Map<String, Object> map,ActWorkflowFormData from) {
65 this.id = processInstance.getId(); 72 this.id = processInstance.getId();
66 this.instanceName = processInstance.getName(); 73 this.instanceName = processInstance.getName();
67 this.definitionKey= processInstance.getProcessDefinitionKey(); 74 this.definitionKey= processInstance.getProcessDefinitionKey();
68 this.businessKey= processInstance.getBusinessKey(); 75 this.businessKey= processInstance.getBusinessKey();
69 this.checkStatus = from.getControlValue().equals("้€š่ฟ‡") ? "0" : "1"; 76 this.checkStatus = from.getControlValue().equals("้€š่ฟ‡") ? "0" : "1";
70 this.createdDate = from.getCreateTime(); 77 this.createdDate = from.getCreateTime();
71 - getData(map); 78 + try {
  79 + this.reason = map.get("reason").toString();;
  80 + this.type = map.get("type").toString();;
  81 +
  82 + this.time = map.get("createTime").toString();
  83 + this.createBy = map.get("create_by").toString();;
  84 + } catch (Exception e) {
  85 + e.printStackTrace();
  86 + }
72 } 87 }
73 88
74 - public ActTaskDTO(HistoricProcessInstance processInstance, Map<String, String> map,ActWorkflowFormData from) { 89 + public ActTaskDTO(HistoricProcessInstance processInstance, Map<String, Object> map) {
75 this.id = processInstance.getId(); 90 this.id = processInstance.getId();
76 this.instanceName = processInstance.getName(); 91 this.instanceName = processInstance.getName();
77 this.definitionKey= processInstance.getProcessDefinitionKey(); 92 this.definitionKey= processInstance.getProcessDefinitionKey();
78 this.businessKey= processInstance.getBusinessKey(); 93 this.businessKey= processInstance.getBusinessKey();
79 - this.checkStatus = from.getControlValue().equals("้€š่ฟ‡") ? "0" : "1";  
80 - this.createdDate = from.getCreateTime();  
81 -  
82 - getData(map); 94 + try {
  95 + this.checkStatus = map.get("state").toString();;
  96 + this.createdDate = timeSdf.parse(map.get("createTime").toString());
  97 + this.reason = map.get("reason").toString();;
  98 + this.type = map.get("type").toString();;
  99 + this.createBy = map.get("create_by").toString();;
  100 + this.time = map.get("createTime").toString();
  101 + } catch (Exception e) {
  102 + e.printStackTrace();
  103 + }
83 } 104 }
84 105
85 106
86 107
87 - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");  
88 108
89 - public ActTaskDTO(Task task, ProcessInstance processInstance,Map<String,String> map) { 109 + public ActTaskDTO(Task task, Map<String,Object> map) {
90 this.id = task.getId(); 110 this.id = task.getId();
91 this.name = task.getName(); 111 this.name = task.getName();
92 this.status = task.getStatus().toString(); 112 this.status = task.getStatus().toString();
93 this.createdDate = task.getCreatedDate(); 113 this.createdDate = task.getCreatedDate();
94 - this.instanceName = processInstance.getName();  
95 - this.definitionKey=processInstance.getProcessDefinitionKey();  
96 - this.businessKey=processInstance.getBusinessKey();  
97 -  
98 - getPrevNext(task, processInstance);  
99 -  
100 - getData(map); 114 + try {
  115 + this.instanceName = map.get("title").toString();
  116 + this.definitionKey = map.get("id").toString().split(":")[0];
  117 + this.businessKey = map.get("id").toString();
  118 + this.reason = map.get("reason").toString();
  119 + this.type = map.get("type").toString();
  120 + this.createBy = map.get("create_by").toString();
  121 + this.time = map.get("createTime").toString();
  122 + } catch (Exception e) {
  123 + e.printStackTrace();
  124 + }
  125 + getPrevNext(task);
  126 +
101 127
102 } 128 }
103 129
104 130
105 - private void getPrevNext(Task task, ProcessInstance processInstance) { 131 + private void getPrevNext(Task task) {
106 132
107 - BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(processInstance.getProcessDefinitionId());  
108 - 133 +
  134 + long date = new Date().getTime();
109 RedisCache cache = SpringUtils.getBean(RedisCache.class); 135 RedisCache cache = SpringUtils.getBean(RedisCache.class);
110 -  
111 - List<org.activiti.bpmn.model.Process> processes = model.getProcesses();  
112 - org.activiti.engine.task.Task et = SpringUtils.getBean(TaskService.class).createTaskQuery().taskId(this.id).singleResult(); 136 +
  137 + String exeId = cache.getCacheObject(this.id);
  138 + org.activiti.engine.task.Task et;
  139 +
  140 + if(exeId == null){
  141 + et = SpringUtils.getBean(TaskService.class).createTaskQuery().taskId(this.id).singleResult();
  142 + exeId = et.getExecutionId();
  143 + cache.setCacheObject(this.id, exeId);
  144 + }
113 145
114 - Map<String, Object> params= cache.getCacheMap(et.getExecutionId()); 146 + Map<String, Object> params= cache.getCacheMap(exeId);
115 147
116 if(params == null){ 148 if(params == null){
117 - params= SpringUtils.getBean(RuntimeService.class).getVariables(et.getExecutionId());  
118 - cache.setCacheMap(et.getExecutionId(), params); 149 + params= SpringUtils.getBean(RuntimeService.class).getVariables(exeId);
  150 + cache.setCacheMap(exeId, params);
119 } 151 }
120 152
121 String route = null; 153 String route = null;
122 String index = null; 154 String index = null;
123 155
124 - String key = processInstance.getProcessDefinitionKey(); 156 + String key = this.businessKey.split(":")[0];
  157 +
125 158
126 if(params.get("route")!=null){ 159 if(params.get("route")!=null){
127 route = params.get("route").toString(); 160 route = params.get("route").toString();
@@ -136,13 +169,17 @@ public class ActTaskDTO @@ -136,13 +169,17 @@ public class ActTaskDTO
136 if(list.size() > 0){ 169 if(list.size() > 0){
137 170
138 if(list.indexOf(task.getName())>0){ 171 if(list.indexOf(task.getName())>0){
139 - this.prev = list.get(list.indexOf(et.getName())-1); 172 + this.prev = list.get(list.indexOf(task.getName())-1);
140 } 173 }
141 if(list.size() > (list.indexOf(task.getName())+1)){ 174 if(list.size() > (list.indexOf(task.getName())+1)){
142 - this.next = list.get(list.indexOf(et.getName())+1); 175 + this.next = list.get(list.indexOf(task.getName())+1);
143 } 176 }
144 return; 177 return;
145 } 178 }
  179 +
  180 +
  181 + BpmnModel model = SpringUtils.getBean(RepositoryService.class).getBpmnModel(task.getProcessDefinitionId());
  182 + List<org.activiti.bpmn.model.Process> processes = model.getProcesses();
146 183
147 List<String> modelList = new ArrayList<String>(); 184 List<String> modelList = new ArrayList<String>();
148 185
@@ -200,14 +237,13 @@ public class ActTaskDTO @@ -200,14 +237,13 @@ public class ActTaskDTO
200 237
201 cache.setCacheList(key, modelList); 238 cache.setCacheList(key, modelList);
202 239
203 - if(modelList.indexOf(et.getName())>0){  
204 - this.prev = modelList.get(modelList.indexOf(et.getName())-1); 240 + if(modelList.indexOf(task.getName())>0){
  241 + this.prev = modelList.get(modelList.indexOf(task.getName())-1);
205 } 242 }
206 - if(modelList.size() > (modelList.indexOf(et.getName())+1)){  
207 - this.next = modelList.get(modelList.indexOf(et.getName())+1); 243 + if(modelList.size() > (modelList.indexOf(task.getName())+1)){
  244 + this.next = modelList.get(modelList.indexOf(task.getName())+1);
208 } 245 }
209 -  
210 - System.out.println(modelList.toString()); 246 +
211 // 247 //
212 // 248 //
213 249
@@ -311,14 +347,6 @@ public class ActTaskDTO @@ -311,14 +347,6 @@ public class ActTaskDTO
311 // } 347 // }
312 } 348 }
313 349
314 - private void getData(Map<String, String> map) {  
315 - try {  
316 - this.reason = map.get("reason");  
317 - this.type = map.get("type");  
318 - } catch (Exception e) {  
319 - e.printStackTrace();  
320 - }  
321 - }  
322 350
323 351
324 public String getId() { 352 public String getId() {
@@ -417,7 +445,23 @@ public class ActTaskDTO @@ -417,7 +445,23 @@ public class ActTaskDTO
417 public void setCheckStatus(String checkStatus) { 445 public void setCheckStatus(String checkStatus) {
418 this.checkStatus = checkStatus; 446 this.checkStatus = checkStatus;
419 } 447 }
420 -  
421 - 448 +
  449 + public String getCreateBy() {
  450 + return createBy;
  451 + }
  452 +
  453 + public void setCreateBy(String createBy) {
  454 + this.createBy = createBy;
  455 + }
  456 +
  457 + public String getTime() {
  458 + return time;
  459 + }
  460 +
  461 + public void setTime(String time) {
  462 + this.time = time;
  463 + }
  464 +
  465 +
422 466
423 } 467 }
trash-activiti/src/main/java/com/trash/activiti/mapper/ActReDeploymentMapper.java
  View file @9c06308
@@ -18,9 +18,9 @@ public interface ActReDeploymentMapper { @@ -18,9 +18,9 @@ public interface ActReDeploymentMapper {
18 18
19 public List<ActReDeploymentVO> selectActReDeploymentByIds(@Param("ids") Set<String> ids); 19 public List<ActReDeploymentVO> selectActReDeploymentByIds(@Param("ids") Set<String> ids);
20 20
21 - public List<Map<String, String>> selectWorkByIds(@Param("ids") Set<String> idString); 21 + public List<Map<String, Object>> selectWorkByIds(@Param("ids") Set<String> idString);
22 22
23 - public List<Map<String, String>> selectHistoryWorkByPIds(@Param("ids") Set<String> id); 23 + public List<Map<String, Object>> selectHistoryWorkByPIds(@Param("ids") Set<String> id);
24 24
25 public Set<String> selectUnCompleteWorkByUsername(Map map); 25 public Set<String> selectUnCompleteWorkByUsername(Map map);
26 26
trash-activiti/src/main/java/com/trash/activiti/service/impl/ActTaskServiceImpl.java
  View file @9c06308
@@ -10,7 +10,9 @@ import java.util.HashSet; @@ -10,7 +10,9 @@ import java.util.HashSet;
10 import java.util.List; 10 import java.util.List;
11 import java.util.Map; 11 import java.util.Map;
12 import java.util.Set; 12 import java.util.Set;
  13 +import java.util.concurrent.BlockingQueue;
13 import java.util.concurrent.TimeUnit; 14 import java.util.concurrent.TimeUnit;
  15 +import java.util.stream.Collector;
14 import java.util.stream.Collectors; 16 import java.util.stream.Collectors;
15 17
16 import javax.validation.constraints.Null; 18 import javax.validation.constraints.Null;
@@ -32,6 +34,7 @@ import org.activiti.engine.TaskService; @@ -32,6 +34,7 @@ import org.activiti.engine.TaskService;
32 import org.activiti.engine.history.HistoricProcessInstance; 34 import org.activiti.engine.history.HistoricProcessInstance;
33 import org.activiti.engine.history.HistoricProcessInstanceQuery; 35 import org.activiti.engine.history.HistoricProcessInstanceQuery;
34 import org.activiti.engine.runtime.ProcessInstance; 36 import org.activiti.engine.runtime.ProcessInstance;
  37 +import org.activiti.engine.runtime.ProcessInstanceQuery;
35 import org.activiti.engine.task.IdentityLink; 38 import org.activiti.engine.task.IdentityLink;
36 import org.apache.commons.collections4.map.HashedMap; 39 import org.apache.commons.collections4.map.HashedMap;
37 import org.springframework.beans.factory.annotation.Autowired; 40 import org.springframework.beans.factory.annotation.Autowired;
@@ -57,6 +60,8 @@ import com.trash.common.utils.SecurityUtils; @@ -57,6 +60,8 @@ import com.trash.common.utils.SecurityUtils;
57 import com.trash.common.utils.ServletUtils; 60 import com.trash.common.utils.ServletUtils;
58 import com.trash.common.utils.spring.SpringUtils; 61 import com.trash.common.utils.spring.SpringUtils;
59 62
  63 +import io.jsonwebtoken.lang.Strings;
  64 +
60 @Service 65 @Service
61 public class ActTaskServiceImpl implements IActTaskService { 66 public class ActTaskServiceImpl implements IActTaskService {
62 67
@@ -117,78 +122,96 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -117,78 +122,96 @@ public class ActTaskServiceImpl implements IActTaskService {
117 if(type != null && type.isEmpty()){ 122 if(type != null && type.isEmpty()){
118 type = null; 123 type = null;
119 } 124 }
120 - if(name != null && name.isEmpty()){  
121 - name = null;  
122 - }  
123 if(prev != null && prev.isEmpty()){ 125 if(prev != null && prev.isEmpty()){
124 prev = null; 126 prev = null;
125 } 127 }
126 128
127 - List<ActTaskDTO> cacheList = null;  
128 129
129 - if(cacheList != null){  
130 -  
131 - actTaskDTOS.addAll(cacheList); 130 + String[] strings;
  131 + Set<String> keys = new HashSet<String>();
  132 +
  133 + if(type != null && !type.isEmpty()){
  134 + strings = type.split(",");
  135 + keys = new HashSet<String>();
132 136
  137 + for(String str:strings ){
  138 + keys.add(str);
  139 + }
  140 + }
  141 + org.activiti.api.runtime.shared.query.Page<Task> pageTasks;
  142 +
  143 + int pageNum = pageDomain.getPageNum();
  144 + int pageSize = pageDomain.getPageSize();
  145 + if(prev == null){
  146 + pageTasks = taskRuntime.tasks(Pageable.of((pageNum-1) * pageSize,pageSize),null,keys,name);
133 }else{ 147 }else{
134 - org.activiti.api.runtime.shared.query.Page<Task> pageTasks = taskRuntime.tasks(Pageable.of(0,999999));  
135 - 148 + pageTasks = taskRuntime.tasks(Pageable.of(0,999999),null,keys,name);
  149 + }
  150 +
136 List<Task> tasks = pageTasks.getContent(); 151 List<Task> tasks = pageTasks.getContent();
137 int totalItems = pageTasks.getTotalItems(); 152 int totalItems = pageTasks.getTotalItems();
138 153
  154 + list.setTotal(totalItems);
  155 +
139 if (totalItems != 0) { 156 if (totalItems != 0) {
  157 +
  158 +
140 Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet()); 159 Set<String> processInstanceIdIds = tasks.parallelStream().map(t -> t.getProcessInstanceId()).collect(Collectors.toSet());
141 -  
142 - List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(processInstanceIdIds).list();  
143 160
  161 + ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery();
  162 +
  163 + if(name != null && !name.isEmpty()){
  164 + query.processInstanceNameLike(name);
  165 + }
  166 + if(keys.size()>0){
  167 + query.processDefinitionKeys(keys);
  168 + }
  169 +
  170 +
  171 + List<ProcessInstance> processInstanceList = query.processInstanceIds(processInstanceIdIds).list();
  172 +
144 173
145 Set<String> idString = new HashSet<String>(); 174 Set<String> idString = new HashSet<String>();
146 for (ProcessInstance pi : processInstanceList) { 175 for (ProcessInstance pi : processInstanceList) {
147 idString.add(pi.getBusinessKey()); 176 idString.add(pi.getBusinessKey());
148 } 177 }
  178 +
  179 + if(idString.size() == 0){
  180 + return list;
  181 + }
149 182
150 - List<Map<String, String>> maps = actMapper.selectWorkByIds(idString);  
151 - try {  
152 -  
153 -  
154 - for(Task t:tasks){  
155 - for(ProcessInstance pInstance : processInstanceList){  
156 - if(pInstance.getId().equals(t.getProcessInstanceId())){  
157 - for(Map map:maps){  
158 - if(pInstance.getId().equals(map.get("instance_id"))){  
159 - ActTaskDTO atc = new ActTaskDTO(t, pInstance, map);  
160 -  
161 - actTaskDTOS.add(atc);  
162 - break;  
163 - }  
164 - } 183 + List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
165 184
  185 +
  186 + for(Map<String, Object> map:maps){
  187 + try {
  188 + ActTaskDTO dto = new ActTaskDTO(tasks.parallelStream().filter(t -> t.getProcessInstanceId().equals(map.get("instance_id"))).findAny().get(),map);
  189 +
  190 + if(prev != null && !prev.isEmpty() && (dto.getPrev() == null || !dto.getPrev().contains(prev))){
  191 + continue;
166 } 192 }
  193 +
  194 + list.add(dto);
  195 + } catch (Exception e) {
  196 + e.printStackTrace();
167 } 197 }
168 } 198 }
169 - } catch (Exception e) {  
170 - e.printStackTrace();  
171 - }  
172 -  
173 -  
174 - }  
175 -  
176 - }  
177 -  
178 - for(ActTaskDTO dto:actTaskDTOS){  
179 - if(name != null && !name.isEmpty() && !name.equals(dto.getInstanceName())){  
180 - continue;  
181 - }  
182 - if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){  
183 - continue;  
184 } 199 }
185 - if(prev != null && !prev.isEmpty() && (dto.getPrev() == null || !dto.getPrev().contains(prev))){  
186 - continue; 200 +
  201 + if(prev != null){
  202 + list.setTotal(list.size());
187 } 203 }
188 - list.add(dto);  
189 - }  
190 -  
191 - list.setTotal(list.size()); 204 +
  205 +
  206 + list.sort(new Comparator<ActTaskDTO>() {
  207 +
  208 + @Override
  209 + public int compare(ActTaskDTO o1, ActTaskDTO o2) {
  210 + // TODO Auto-generated method stub
  211 + return (int) (o2.getCreatedDate().getTime() - o1.getCreatedDate().getTime());
  212 + }
  213 + });
  214 +
192 return list; 215 return list;
193 } 216 }
194 217
@@ -215,12 +238,9 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -215,12 +238,9 @@ public class ActTaskServiceImpl implements IActTaskService {
215 if(name != null) 238 if(name != null)
216 map.put("name", name); 239 map.put("name", name);
217 240
218 - List<String> collect = actMapper.selectCompleteWorkByUsername(map);  
219 -  
220 - if (collect.size() > 0) {  
221 - Set<String> set = new HashSet(collect); 241 +
222 List<HistoricProcessInstance> processInstanceList; 242 List<HistoricProcessInstance> processInstanceList;
223 - HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username).processInstanceIds(set); 243 + HistoricProcessInstanceQuery query = historyService.createHistoricProcessInstanceQuery().involvedUser(username);
224 244
225 if(name != null) 245 if(name != null)
226 query.processInstanceNameLike(name); 246 query.processInstanceNameLike(name);
@@ -233,16 +253,15 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -233,16 +253,15 @@ public class ActTaskServiceImpl implements IActTaskService {
233 idString.add(pi.getId()); 253 idString.add(pi.getId());
234 } 254 }
235 255
236 - List<Map<String, String>> maps = actMapper.selectHistoryWorkByPIds(idString); 256 + List<Map<String, Object>> maps = actMapper.selectHistoryWorkByPIds(idString);
237 257
238 - List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username); 258 +// List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
239 259
240 if (processInstanceList.size() > 0) { 260 if (processInstanceList.size() > 0) {
241 for (HistoricProcessInstance p : processInstanceList) { 261 for (HistoricProcessInstance p : processInstanceList) {
242 try { 262 try {
243 ActTaskDTO dto = new ActTaskDTO(p, 263 ActTaskDTO dto = new ActTaskDTO(p,
244 - maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get(),  
245 - dataList.parallelStream().filter(pi -> p.getBusinessKey().equals(pi.getBusinessKey())).findAny().get()); 264 + maps.parallelStream().filter(pi -> p.getId().equals(pi.get("instance_id"))).findAny().get());
246 265
247 266
248 if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){ 267 if(type != null && !type.isEmpty() && !type.contains(dto.getDefinitionKey())){
@@ -252,11 +271,11 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -252,11 +271,11 @@ public class ActTaskServiceImpl implements IActTaskService {
252 271
253 list.add(dto);} 272 list.add(dto);}
254 catch (Exception e) { 273 catch (Exception e) {
255 - // TODO: handle exception 274 + e.printStackTrace();
256 } 275 }
257 } 276 }
258 277
259 - } 278 +
260 } 279 }
261 280
262 list.sort(new Comparator<ActTaskDTO>() { 281 list.sort(new Comparator<ActTaskDTO>() {
@@ -295,11 +314,10 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -295,11 +314,10 @@ public class ActTaskServiceImpl implements IActTaskService {
295 } 314 }
296 315
297 316
298 - Set<String> collect = actMapper.selectUnCompleteWorkByUsername(map); 317 + List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().involvedUser(username).list();
299 318
300 - if (collect.size() > 0) { 319 + if (processInstanceList.size() > 0) {
301 320
302 - List<ProcessInstance> processInstanceList = runtimeService.createProcessInstanceQuery().processInstanceIds(collect).list();  
303 321
304 list.setTotal(processInstanceList.size()); 322 list.setTotal(processInstanceList.size());
305 323
@@ -308,7 +326,7 @@ public class ActTaskServiceImpl implements IActTaskService { @@ -308,7 +326,7 @@ public class ActTaskServiceImpl implements IActTaskService {
308 idString.add(pi.getBusinessKey()); 326 idString.add(pi.getBusinessKey());
309 } 327 }
310 328
311 - List<Map<String, String>> maps = actMapper.selectWorkByIds(idString); 329 + List<Map<String, Object>> maps = actMapper.selectWorkByIds(idString);
312 330
313 List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username); 331 List<ActWorkflowFormData> dataList = actWorkflowFormDataMapper.selectActWorkFlowFormDataListByUser(username);
314 if (processInstanceList.size() > 0) { 332 if (processInstanceList.size() > 0) {
trash-activiti/src/main/java/com/trash/activiti/service/impl/myTaskServiceImpl.java
  View file @9c06308
@@ -24,9 +24,12 @@ import org.activiti.api.task.model.payloads.UpdateTaskPayload; @@ -24,9 +24,12 @@ import org.activiti.api.task.model.payloads.UpdateTaskPayload;
24 import org.activiti.api.task.model.payloads.UpdateTaskVariablePayload; 24 import org.activiti.api.task.model.payloads.UpdateTaskVariablePayload;
25 import org.activiti.api.task.runtime.TaskRuntime; 25 import org.activiti.api.task.runtime.TaskRuntime;
26 import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration; 26 import org.activiti.api.task.runtime.conf.TaskRuntimeConfiguration;
  27 +import org.activiti.engine.RuntimeService;
27 import org.activiti.engine.TaskService; 28 import org.activiti.engine.TaskService;
28 import org.activiti.engine.impl.TaskQueryImpl; 29 import org.activiti.engine.impl.TaskQueryImpl;
29 import org.activiti.engine.query.QueryProperty; 30 import org.activiti.engine.query.QueryProperty;
  31 +import org.activiti.engine.runtime.ProcessInstance;
  32 +import org.activiti.engine.runtime.ProcessInstanceQuery;
30 import org.activiti.engine.task.IdentityLink; 33 import org.activiti.engine.task.IdentityLink;
31 import org.activiti.engine.task.IdentityLinkType; 34 import org.activiti.engine.task.IdentityLinkType;
32 import org.activiti.engine.task.NativeTaskQuery; 35 import org.activiti.engine.task.NativeTaskQuery;
@@ -35,6 +38,7 @@ import org.activiti.runtime.api.impl.TaskRuntimeHelper; @@ -35,6 +38,7 @@ import org.activiti.runtime.api.impl.TaskRuntimeHelper;
35 import org.activiti.runtime.api.model.impl.APITaskConverter; 38 import org.activiti.runtime.api.model.impl.APITaskConverter;
36 import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter; 39 import org.activiti.runtime.api.model.impl.APIVariableInstanceConverter;
37 import org.activiti.runtime.api.query.impl.PageImpl; 40 import org.activiti.runtime.api.query.impl.PageImpl;
  41 +import org.springframework.beans.factory.annotation.Autowired;
38 import org.springframework.security.access.prepost.PreAuthorize; 42 import org.springframework.security.access.prepost.PreAuthorize;
39 import org.springframework.stereotype.Service; 43 import org.springframework.stereotype.Service;
40 44
@@ -44,8 +48,12 @@ import com.trash.common.utils.SecurityUtils; @@ -44,8 +48,12 @@ import com.trash.common.utils.SecurityUtils;
44 48
45 import java.util.ArrayList; 49 import java.util.ArrayList;
46 import java.util.Date; 50 import java.util.Date;
  51 +import java.util.HashSet;
47 import java.util.List; 52 import java.util.List;
48 import java.util.Objects; 53 import java.util.Objects;
  54 +import java.util.Set;
  55 +import java.util.stream.Collector;
  56 +import java.util.stream.Collectors;
49 57
50 @PreAuthorize("hasRole('ACTIVITI_USER')") 58 @PreAuthorize("hasRole('ACTIVITI_USER')")
51 @Service 59 @Service
@@ -64,6 +72,9 @@ public class myTaskServiceImpl implements myTaskService { @@ -64,6 +72,9 @@ public class myTaskServiceImpl implements myTaskService {
64 private final SecurityManager securityManager; 72 private final SecurityManager securityManager;
65 73
66 private final TaskRuntimeHelper taskRuntimeHelper; 74 private final TaskRuntimeHelper taskRuntimeHelper;
  75 +
  76 + @Autowired
  77 + RuntimeService runtimeService;
67 78
68 public myTaskServiceImpl(TaskService taskService, 79 public myTaskServiceImpl(TaskService taskService,
69 UserGroupManager userGroupManager, 80 UserGroupManager userGroupManager,
@@ -101,18 +112,15 @@ public class myTaskServiceImpl implements myTaskService { @@ -101,18 +112,15 @@ public class myTaskServiceImpl implements myTaskService {
101 112
102 @Override 113 @Override
103 public Page<Task> tasks(Pageable pageable) { 114 public Page<Task> tasks(Pageable pageable) {
104 - return tasks(pageable,null); 115 + return tasks(pageable,null,null,null);
105 } 116 }
106 -  
107 @Override 117 @Override
108 - public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload) { 118 + public Page<Task> tasks(Pageable pageable,GetTasksPayload getTasksPayload,Set<String> defKey,String name) {
  119 +
109 120
110 TaskQuery crossQuery = taskService.createTaskQuery(); 121 TaskQuery crossQuery = taskService.createTaskQuery();
111 TaskQuery crossQuery1 = taskService.createTaskQuery(); 122 TaskQuery crossQuery1 = taskService.createTaskQuery();
112 123
113 -  
114 - TaskQuery crossQuery2 = taskService.createTaskQuery();  
115 -  
116 TaskQuery userQuery = taskService.createTaskQuery(); 124 TaskQuery userQuery = taskService.createTaskQuery();
117 125
118 userQuery.taskAssignee(SecurityUtils.getUsername()); 126 userQuery.taskAssignee(SecurityUtils.getUsername());
@@ -124,8 +132,7 @@ public class myTaskServiceImpl implements myTaskService { @@ -124,8 +132,7 @@ public class myTaskServiceImpl implements myTaskService {
124 132
125 List<String> posts = SecurityUtils.getLoginUser().getUser().getPostIds(); 133 List<String> posts = SecurityUtils.getLoginUser().getUser().getPostIds();
126 List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds(); 134 List<String> roles = SecurityUtils.getLoginUser().getUser().getRoleIds();
127 -  
128 - 135 +
129 if(posts == null || posts == null){ 136 if(posts == null || posts == null){
130 crossQuery.taskCandidateOrAssigned(SecurityUtils.getUsername()); 137 crossQuery.taskCandidateOrAssigned(SecurityUtils.getUsername());
131 crossQuery1.taskCandidateOrAssigned(SecurityUtils.getUsername()); 138 crossQuery1.taskCandidateOrAssigned(SecurityUtils.getUsername());
@@ -153,17 +160,38 @@ public class myTaskServiceImpl implements myTaskService { @@ -153,17 +160,38 @@ public class myTaskServiceImpl implements myTaskService {
153 } 160 }
154 } 161 }
155 162
  163 +
156 for(org.activiti.engine.task.Task tasks : userQuery.list()){ 164 for(org.activiti.engine.task.Task tasks : userQuery.list()){
157 pid.add(tasks.getProcessInstanceId()); 165 pid.add(tasks.getProcessInstanceId());
158 } 166 }
159 167
  168 +
  169 + ProcessInstanceQuery query = runtimeService.createProcessInstanceQuery();
  170 +
  171 + if(name != null && !name.isEmpty()){
  172 + query.processInstanceNameLike(name);
  173 + }
  174 + if(defKey.size()>0){
  175 + query.processDefinitionKeys(defKey);
  176 + }
  177 +
  178 + if(pid.size()>0){
  179 + Set<String> idSet = new HashSet<>();
  180 +
  181 + for(String str:pid){
  182 + idSet.add(str);
  183 + }
  184 +
  185 + pid = query.processInstanceIds(idSet).list().parallelStream().map(p->p.getId()).collect(Collectors.toList());
  186 + }
  187 +
  188 +
  189 +
160 if(pid.size() > 0){ 190 if(pid.size() > 0){
161 taskQuery.processInstanceIdIn(pid).orderByTaskCreateTime().desc(); 191 taskQuery.processInstanceIdIn(pid).orderByTaskCreateTime().desc();
162 }else{ 192 }else{
163 taskQuery.taskAssignee(SecurityUtils.getUsername()).orderByTaskCreateTime().desc(); 193 taskQuery.taskAssignee(SecurityUtils.getUsername()).orderByTaskCreateTime().desc();
164 } 194 }
165 -  
166 -  
167 195
168 List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(), 196 List<Task> tasks = taskConverter.from(taskQuery.listPage(pageable.getStartIndex(),
169 pageable.getMaxItems())); 197 pageable.getMaxItems()));
trash-activiti/src/main/java/com/trash/activiti/service/myTaskService.java
  View file @9c06308
1 package com.trash.activiti.service; 1 package com.trash.activiti.service;
2 import java.util.List; 2 import java.util.List;
  3 +import java.util.Set;
3 4
4 import org.activiti.api.model.shared.model.VariableInstance; 5 import org.activiti.api.model.shared.model.VariableInstance;
5 import org.activiti.api.runtime.shared.query.Page; 6 import org.activiti.api.runtime.shared.query.Page;
@@ -46,8 +47,10 @@ public interface myTaskService { @@ -46,8 +47,10 @@ public interface myTaskService {
46 * - the authenticated user is the actual assignee 47 * - the authenticated user is the actual assignee
47 * - the user belongs to a group that is a candidate for the task 48 * - the user belongs to a group that is a candidate for the task
48 */ 49 */
  50 +
  51 +
49 Page<Task> tasks(Pageable pageable, 52 Page<Task> tasks(Pageable pageable,
50 - GetTasksPayload getTasksPayload); 53 + GetTasksPayload getTasksPayload,Set<String> defKey,String name);
51 54
52 /** 55 /**
53 * Creates a task based on the following rules 56 * Creates a task based on the following rules
trash-activiti/src/main/resources/mapper/activiti/ActReDeploymentMapper.xml
  View file @9c06308
@@ -24,17 +24,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -24,17 +24,18 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
24 </select> 24 </select>
25 25
26 <select id="selectWorkByIds" parameterType="String" resultType="java.util.Map"> 26 <select id="selectWorkByIds" parameterType="String" resultType="java.util.Map">
27 - select start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime from workflow where id in 27 + select id,title,start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime,create_by,state from workflow where id in
28 <foreach item="id" collection="ids" open="(" separator="," close=")"> 28 <foreach item="id" collection="ids" open="(" separator="," close=")">
29 #{id} 29 #{id}
30 </foreach> 30 </foreach>
31 </select> 31 </select>
32 32
33 <select id="selectHistoryWorkByPIds" parameterType="String" resultType="java.util.Map"> 33 <select id="selectHistoryWorkByPIds" parameterType="String" resultType="java.util.Map">
34 - select start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime from workflow_hi where instance_id in 34 + select id,start_time as startTime,end_time as endTime, reason,type,instance_id,create_time as createTime,create_by,state from workflow_hi where instance_id in
35 <foreach item="id" collection="ids" open="(" separator="," close=")"> 35 <foreach item="id" collection="ids" open="(" separator="," close=")">
36 #{id} 36 #{id}
37 </foreach> 37 </foreach>
  38 + GROUP BY id ORDER BY create_time
38 </select> 39 </select>
39 40
40 41
trash-activiti/src/main/resources/mapper/activiti/ActWorkflowFormDataMapper.xml
  View file @9c06308
@@ -41,11 +41,13 @@ @@ -41,11 +41,13 @@
41 <select id="selectActWorkflowFormDataByBusinessKey" parameterType="string" resultMap="ActWorkflowFormDataResult"> 41 <select id="selectActWorkflowFormDataByBusinessKey" parameterType="string" resultMap="ActWorkflowFormDataResult">
42 <include refid="selectActWorkflowFormDataVo"/> 42 <include refid="selectActWorkflowFormDataVo"/>
43 where business_key = #{businessKey} 43 where business_key = #{businessKey}
  44 + order by create_time DESC
44 </select> 45 </select>
45 46
46 <select id="selectActWorkFlowFormDataListByUser" parameterType="string" resultMap="ActWorkflowFormDataResult"> 47 <select id="selectActWorkFlowFormDataListByUser" parameterType="string" resultMap="ActWorkflowFormDataResult">
47 - <include refid="selectActWorkflowFormDataVo"/>  
48 - where create_by = #{username} and control_name = "ๅฎกๆ‰น" GROUP BY business_key order by create_time DESC; 48 + select * from act_workflow_formdata where id in (
  49 + select max(id)from act_workflow_formdata
  50 + where create_by = #{username} and control_name = "ๅฎกๆ‰น" GROUP BY business_key );
49 </select> 51 </select>
50 52
51 53
trash-admin/src/main/java/com/trash/web/controller/system/SysLoginController.java
  View file @9c06308
@@ -132,7 +132,10 @@ public class SysLoginController @@ -132,7 +132,10 @@ public class SysLoginController
132 } 132 }
133 133
134 // // ๆƒ้™้›†ๅˆ 134 // // ๆƒ้™้›†ๅˆ
135 -// Set<String> permissions = permissionService.getMenuPermission(user); 135 + Set<String> ps = permissionService.getMenuPermission(user);
  136 +
  137 + permissions.addAll(ps);
  138 +
136 AjaxResult ajax = AjaxResult.success(); 139 AjaxResult ajax = AjaxResult.success();
137 ajax.put("user", user); 140 ajax.put("user", user);
138 ajax.put("roles", roles); 141 ajax.put("roles", roles);
trash-admin/src/main/resources/application-dev.yml
  View file @9c06308
@@ -10,7 +10,7 @@ trash: @@ -10,7 +10,7 @@ trash:
10 demoEnabled: true 10 demoEnabled: true
11 # ๆ–‡ไปถ่ทฏๅพ„ ็คบไพ‹๏ผˆ Windows้…็ฝฎD:/trash/uploadPath๏ผŒLinux้…็ฝฎ /home/trash/uploadPath๏ผŒๅญ˜ๅ‚จๆกถ trash/uploadPath,nginx้…็ฝฎ /trash/upload๏ผ‰ 11 # ๆ–‡ไปถ่ทฏๅพ„ ็คบไพ‹๏ผˆ Windows้…็ฝฎD:/trash/uploadPath๏ผŒLinux้…็ฝฎ /home/trash/uploadPath๏ผŒๅญ˜ๅ‚จๆกถ trash/uploadPath,nginx้…็ฝฎ /trash/upload๏ผ‰
12 # profile: E:/trash/uploadPath 12 # profile: E:/trash/uploadPath
13 - profile: D:/work/project/Documents/uploadPath/trash 13 + profile: F:/work/project/Documents/uploadPath/trash
14 # ่Žทๅ–ipๅœฐๅ€ๅผ€ๅ…ณ 14 # ่Žทๅ–ipๅœฐๅ€ๅผ€ๅ…ณ
15 addressEnabled: false 15 addressEnabled: false
16 # ้ชŒ่ฏ็ ็ฑปๅž‹ math ๆ•ฐ็ป„่ฎก็ฎ— char ๅญ—็ฌฆ้ชŒ่ฏ 16 # ้ชŒ่ฏ็ ็ฑปๅž‹ math ๆ•ฐ็ป„่ฎก็ฎ— char ๅญ—็ฌฆ้ชŒ่ฏ
@@ -32,7 +32,8 @@ spring: @@ -32,7 +32,8 @@ spring:
32 druid: 32 druid:
33 # ไธปๅบ“ๆ•ฐๆฎๆบ 33 # ไธปๅบ“ๆ•ฐๆฎๆบ
34 master: 34 master:
35 - url: jdbc:mysql://localhost:3306/trash1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true 35 + #url: jdbc:mysql://localhost:3306/trash1?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
  36 + url: jdbc:mysql://192.168.168.141:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
36 username: root 37 username: root
37 password: root 38 password: root
38 # ไปŽๅบ“ๆ•ฐๆฎๆบ 39 # ไปŽๅบ“ๆ•ฐๆฎๆบ
trash-common/src/main/java/com/trash/common/utils/RemoteServerUtils.java
  View file @9c06308
@@ -71,6 +71,35 @@ public class RemoteServerUtils { @@ -71,6 +71,35 @@ public class RemoteServerUtils {
71 71
72 public static String BasevehicleInfo = "/api/gpsservice/cs/basevehicle/"; 72 public static String BasevehicleInfo = "/api/gpsservice/cs/basevehicle/";
73 73
  74 +
  75 + public static String ContractList = "/api/siteservice/cs/sitecontract/ledger/list";
  76 +
  77 +
  78 + public static JSONArray getContractList(Map map){
  79 + JSONArray list=null;
  80 + Object object = post(ContractList,map);
  81 +
  82 + if(object != null){
  83 + JSONObject jsonObject = JSON.parseObject(object.toString());
  84 + list = jsonObject.getJSONArray("list");
  85 + }
  86 +
  87 + return list;
  88 + }
  89 +
  90 + public static JSONArray getContractList(Map map,String token){
  91 + JSONArray list=null;
  92 + Object object = post(ContractList,map,token);
  93 +
  94 + if(object != null){
  95 + JSONObject jsonObject = JSON.parseObject(object.toString());
  96 + list = jsonObject.getJSONArray("list");
  97 + }
  98 +
  99 + return list;
  100 + }
  101 +
  102 +
74 public static JSONArray getEarthSitesList(Map map){ 103 public static JSONArray getEarthSitesList(Map map){
75 JSONArray list=null; 104 JSONArray list=null;
76 Object object = post(EarthSitesList,map); 105 Object object = post(EarthSitesList,map);
@@ -450,9 +479,14 @@ public class RemoteServerUtils { @@ -450,9 +479,14 @@ public class RemoteServerUtils {
450 .readTimeout(30, TimeUnit.SECONDS) 479 .readTimeout(30, TimeUnit.SECONDS)
451 .build(); 480 .build();
452 } 481 }
  482 +
453 String token = SecurityUtils.getLoginUser().getToken(); 483 String token = SecurityUtils.getLoginUser().getToken();
454 -  
455 - token = "Bearer auth:token:"+ token; 484 +
  485 + if(token.contains("durable:")){
  486 + token = token.replace("durable:", "Bearer durable:auth:token:");
  487 + }else{
  488 + token = "Bearer auth:token:"+ token;
  489 + }
456 490
457 String param = JSON.toJSON(obj).toString(); 491 String param = JSON.toJSON(obj).toString();
458 492
@@ -492,9 +526,14 @@ public class RemoteServerUtils { @@ -492,9 +526,14 @@ public class RemoteServerUtils {
492 } 526 }
493 527
494 String token = SecurityUtils.getLoginUser().getToken(); 528 String token = SecurityUtils.getLoginUser().getToken();
495 -  
496 -  
497 - token = "Bearer auth:token:"+ token; 529 +
  530 +
  531 + if(token.contains("durable:")){
  532 + token = token.replace("durable:", "Bearer durable:auth:token:");
  533 + }else{
  534 + token = "Bearer auth:token:"+ token;
  535 + }
  536 +
498 String params = ""; 537 String params = "";
499 538
500 539
trash-framework/src/main/java/com/trash/framework/web/service/SysLoginService.java
  View file @9c06308
@@ -59,6 +59,7 @@ public class SysLoginService @@ -59,6 +59,7 @@ public class SysLoginService
59 59
60 @Autowired 60 @Autowired
61 UserDetailsService UserDetailsService; 61 UserDetailsService UserDetailsService;
  62 +
62 /** 63 /**
63 * ็™ปๅฝ•้ชŒ่ฏ 64 * ็™ปๅฝ•้ชŒ่ฏ
64 * 65 *
@@ -216,8 +217,16 @@ public class SysLoginService @@ -216,8 +217,16 @@ public class SysLoginService
216 217
217 loginUser.setUser(user); 218 loginUser.setUser(user);
218 219
  220 +
219 set.add("*:*:*");//ๆต‹่ฏ•็›ดๆŽฅ็ป™admin 221 set.add("*:*:*");//ๆต‹่ฏ•็›ดๆŽฅ็ป™admin
220 222
  223 + for(Object object:userJson.getJSONArray("menus")){
  224 + JSONObject menu = (JSONObject) object;
  225 +
  226 + set.add(menu.getString("code"));
  227 + }
  228 +
  229 +
221 SysRole role = new SysRole(); 230 SysRole role = new SysRole();
222 231
223 role.setRoleKey("admin"); 232 role.setRoleKey("admin");
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @9c06308
@@ -289,9 +289,14 @@ public class DriverTask @@ -289,9 +289,14 @@ public class DriverTask
289 } 289 }
290 290
291 public void checkAllTask() 291 public void checkAllTask()
292 - { 292 + {
293 LogUtils.getBlock("=================== ๅˆ ้™ค่ถ…ๆ—ถๆŠฅๅทฅๆ•ฐๆฎ ๅฎšๆ—ถๅ™จๆ‰ง่กŒ ๅฝ“ๅ‰ๆ—ถ้—ด: " + simpleDateFormat.format(new Date())); 293 LogUtils.getBlock("=================== ๅˆ ้™ค่ถ…ๆ—ถๆŠฅๅทฅๆ•ฐๆฎ ๅฎšๆ—ถๅ™จๆ‰ง่กŒ ๅฝ“ๅ‰ๆ—ถ้—ด: " + simpleDateFormat.format(new Date()));
294 294
  295 + if(TOKEN == null){
  296 + TOKEN = trashConfig.getToken();
  297 + }
  298 + SpringUtils.getBean(ISupervisionThreestepService.class).updateTodayData(TOKEN);
  299 +
295 SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep"); 300 SpringUtils.getBean(IActTaskService.class).endAllThreesteptask("workflow_threestep");
296 301
297 SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep"); 302 SpringUtils.getBean(IWorkflowService.class).deleteWorkflowByName("workflow_threestep");
trash-system/src/main/resources/mapper/system/SysMenuMapper.xml
  View file @9c06308
@@ -107,7 +107,7 @@ @@ -107,7 +107,7 @@
107 left join sys_role_menu rm on m.menu_id = rm.menu_id 107 left join sys_role_menu rm on m.menu_id = rm.menu_id
108 left join sys_user_role ur on rm.role_id = ur.role_id 108 left join sys_user_role ur on rm.role_id = ur.role_id
109 left join sys_role r on r.role_id = ur.role_id 109 left join sys_role r on r.role_id = ur.role_id
110 - where m.status = '0' and r.status = '0' and ur.user_id = #{userId} 110 + where m.status = '0' and r.status = '0'
111 </select> 111 </select>
112 112
113 <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult"> 113 <select id="selectMenuById" parameterType="Long" resultMap="SysMenuResult">
trash-ui/src/api/business/driver.js
  View file @9c06308
@@ -24,6 +24,16 @@ export function getNames(query) { @@ -24,6 +24,16 @@ export function getNames(query) {
24 params: query 24 params: query
25 }) 25 })
26 } 26 }
  27 +export function getlicenseplates(query) {
  28 + return request({
  29 + url: '/business/driverCredit/licenseplates',
  30 + method: 'get',
  31 + params: query
  32 + })
  33 +}
  34 +
  35 +
  36 +
27 37
28 export function historyCredit(query) { 38 export function historyCredit(query) {
29 return request({ 39 return request({
trash-ui/src/api/caseOfflineInfo.js
  View file @9c06308
@@ -47,6 +47,8 @@ export default { @@ -47,6 +47,8 @@ export default {
47 // ่กจๅ•ๆ ก้ชŒ 47 // ่กจๅ•ๆ ก้ชŒ
48 rules: {}, 48 rules: {},
49 caseType: [ 49 caseType: [
  50 + {code: 7, name: "ๆ— ่ฎธๅฏๆถˆ็บณ๏ผˆๅทฅ๏ผ‰"},
  51 + {code: 8, name: "ๆ— ่ฎธๅฏๆถˆ็บณ๏ผˆๆถˆ๏ผ‰"},
50 {code: 0, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐ๏ผˆๅซๅค„็†ๅœบๆ‰€๏ผ‰็š„ๆธฃๅœŸ่ฟ่พ“่ฝฆ่พ†ๅ‡บๅœบ่ฝฆ่บซไธๆด๏ผŒ่ฝฆ่ฝฎๅธฆๆณฅ"}, 52 {code: 0, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐ๏ผˆๅซๅค„็†ๅœบๆ‰€๏ผ‰็š„ๆธฃๅœŸ่ฟ่พ“่ฝฆ่พ†ๅ‡บๅœบ่ฝฆ่บซไธๆด๏ผŒ่ฝฆ่ฝฎๅธฆๆณฅ"},
51 {code: 1, name: "ๆœชๆด—่ฝฆๅ‡บๅœบๆˆ–่€…ๅ‡บๅœบๆธ…ๆดไธๅฝปๅบ•"}, 53 {code: 1, name: "ๆœชๆด—่ฝฆๅ‡บๅœบๆˆ–่€…ๅ‡บๅœบๆธ…ๆดไธๅฝปๅบ•"},
52 {code: 2, name: "ๆธฃๅœŸ่ฟ่พ“่ฝฆ่พ†่ดง็ฎฑ้กถ็›–ๆœชๆŒ‰่ง„ๅฎšๅ…ณ้—ญๅˆฐไฝๆˆ–ๆœชๆŒ‰่ง„ๅฎšๅ’Œๆ ‡ๅ‡†่ฃ…่ฝฝๆธฃๅœŸๅ‡บๅœบ"}, 54 {code: 2, name: "ๆธฃๅœŸ่ฟ่พ“่ฝฆ่พ†่ดง็ฎฑ้กถ็›–ๆœชๆŒ‰่ง„ๅฎšๅ…ณ้—ญๅˆฐไฝๆˆ–ๆœชๆŒ‰่ง„ๅฎšๅ’Œๆ ‡ๅ‡†่ฃ…่ฝฝๆธฃๅœŸๅ‡บๅœบ"},
@@ -54,8 +56,6 @@ export default { @@ -54,8 +56,6 @@ export default {
54 {code: 4, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆœชๆŒ‰่ง„ๅฎšๆ—ถ้—ดๅผ€ๅœๅทฅ"}, 56 {code: 4, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆœชๆŒ‰่ง„ๅฎšๆ—ถ้—ดๅผ€ๅœๅทฅ"},
55 {code: 5, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆด—่ฝฆ่ฎพๆ–ฝ็ญ‰็ ดๆŸใ€ๆœชๆญฃๅธธไฝฟ็”จๅŠๆŽชๆ–ฝไธๅˆฐไฝ็š„"}, 57 {code: 5, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆด—่ฝฆ่ฎพๆ–ฝ็ญ‰็ ดๆŸใ€ๆœชๆญฃๅธธไฝฟ็”จๅŠๆŽชๆ–ฝไธๅˆฐไฝ็š„"},
56 {code: 6, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐใ€ๅค„็†ๅœบๆ‰€(ๅซๅ›žๅกซๅœบ๏ผ‰ๅ‡บๅ…ฅๅฃไธคไพง50็ฑณ่Œƒๅ›ดๅ†…ๅ‡บ็ŽฐๆธฃๅœŸๆฑกๆŸ“ใ€ๆฑกๆฐดๅค–ๆŽ’็ญ‰็Žฐ่ฑก"}, 58 {code: 6, name: "ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐใ€ๅค„็†ๅœบๆ‰€(ๅซๅ›žๅกซๅœบ๏ผ‰ๅ‡บๅ…ฅๅฃไธคไพง50็ฑณ่Œƒๅ›ดๅ†…ๅ‡บ็ŽฐๆธฃๅœŸๆฑกๆŸ“ใ€ๆฑกๆฐดๅค–ๆŽ’็ญ‰็Žฐ่ฑก"},
57 - {code: 7, name: "ๅ…ถไป–1"},  
58 - {code: 8, name: "ๅ…ถไป–2"},  
59 {code: 9, name: "ๅ…ถไป–3"} 59 {code: 9, name: "ๅ…ถไป–3"}
60 ], 60 ],
61 fileList: [], 61 fileList: [],
trash-ui/src/api/dayWorkReport.js
  View file @9c06308
@@ -130,6 +130,28 @@ export default { @@ -130,6 +130,28 @@ export default {
130 }, 130 },
131 methods: { 131 methods: {
132 getInfo(row,type){ 132 getInfo(row,type){
  133 +
  134 + if(!type){
  135 + row.status = row.status == 1 ? "ๅผ€ๅทฅ" : row.status;
  136 + type = row.type;
  137 +
  138 + obj = {
  139 + objectId:row.objectId,
  140 + name:row.name,
  141 + selfCheckTime:row.selfCheckTime,
  142 + earthsitesId:row.eid,
  143 + type:row.type
  144 + }
  145 +
  146 + postThreestep(obj).then(res=>{
  147 + if(res){
  148 + this.businessKey = res.data.id + "";
  149 + this.info2 = true;
  150 + }
  151 + });
  152 +
  153 + return;
  154 + }
133 let obj = {}; 155 let obj = {};
134 if(type == 0){ 156 if(type == 0){
135 if(row.status != "ๅผ€ๅทฅ"){ 157 if(row.status != "ๅผ€ๅทฅ"){
@@ -204,6 +226,8 @@ export default { @@ -204,6 +226,8 @@ export default {
204 this.queryParams.page = 1; 226 this.queryParams.page = 1;
205 this.queryParams.pageSize = 9999; 227 this.queryParams.pageSize = 9999;
206 228
  229 + console.log(this.queryParams);
  230 +
207 if (this.queryParams.timeRange) { 231 if (this.queryParams.timeRange) {
208 this.queryParams.workStartTime = this.queryParams.timeRange[0]; 232 this.queryParams.workStartTime = this.queryParams.timeRange[0];
209 this.queryParams.workEndTime = this.queryParams.timeRange[1]; 233 this.queryParams.workEndTime = this.queryParams.timeRange[1];
@@ -294,9 +318,6 @@ export default { @@ -294,9 +318,6 @@ export default {
294 this.queryParams.his = tabIdx; 318 this.queryParams.his = tabIdx;
295 } 319 }
296 320
297 -  
298 -  
299 -  
300 const timeRange = this.queryParams.timeRange; 321 const timeRange = this.queryParams.timeRange;
301 if (this.queryParams.timeRange) { 322 if (this.queryParams.timeRange) {
302 this.queryParams.workStartTime = this.queryParams.timeRange[0]; 323 this.queryParams.workStartTime = this.queryParams.timeRange[0];
@@ -313,6 +334,12 @@ export default { @@ -313,6 +334,12 @@ export default {
313 this.queryParams.type = 1; 334 this.queryParams.type = 1;
314 } 335 }
315 336
  337 + getNames(this.queryParams).then(res => {
  338 +
  339 + this.names = res;
  340 + })
  341 +
  342 +
316 listThreestep(this.queryParams).then(response => { 343 listThreestep(this.queryParams).then(response => {
317 this.threestepList = response.rows; 344 this.threestepList = response.rows;
318 this.total = response.total; 345 this.total = response.total;
@@ -387,7 +414,7 @@ export default { @@ -387,7 +414,7 @@ export default {
387 /** ๆœ็ดขๆŒ‰้’ฎๆ“ไฝœ */ 414 /** ๆœ็ดขๆŒ‰้’ฎๆ“ไฝœ */
388 handleQuery() { 415 handleQuery() {
389 this.queryParams.pageNum = 1; 416 this.queryParams.pageNum = 1;
390 - this.getList(); 417 + this.getList(this.queryParams.his);
391 }, 418 },
392 /** ้‡็ฝฎๆŒ‰้’ฎๆ“ไฝœ */ 419 /** ้‡็ฝฎๆŒ‰้’ฎๆ“ไฝœ */
393 resetQuery() { 420 resetQuery() {
@@ -525,13 +552,13 @@ export default { @@ -525,13 +552,13 @@ export default {
525 }).then(response => { 552 }).then(response => {
526 this.download(response.message); 553 this.download(response.message);
527 }) 554 })
528 - 555 +
529 return; 556 return;
530 } 557 }
531 -  
532 -  
533 -  
534 - 558 +
  559 +
  560 +
  561 +
535 let curPage = this.queryParams.page; 562 let curPage = this.queryParams.page;
536 let curSize = this.queryParams.pageSize; 563 let curSize = this.queryParams.pageSize;
537 let that = this; 564 let that = this;
trash-ui/src/api/driver_credit.js
  View file @9c06308
@@ -6,6 +6,7 @@ import { @@ -6,6 +6,7 @@ import {
6 updateCredit, 6 updateCredit,
7 exportCredit, 7 exportCredit,
8 getNames, 8 getNames,
  9 + getlicenseplates,
9 historyCredit 10 historyCredit
10 } from "@/api/business/driver"; 11 } from "@/api/business/driver";
11 import h5Page from '@/views/h5/Pagination'; 12 import h5Page from '@/views/h5/Pagination';
@@ -38,7 +39,7 @@ export default { @@ -38,7 +39,7 @@ export default {
38 creditList: [], 39 creditList: [],
39 creditListInfo: [], 40 creditListInfo: [],
40 dictNames:[], 41 dictNames:[],
41 - dictTypes:[], 42 + dictLicenseplateNo:[],
42 dictPlaces:[], 43 dictPlaces:[],
43 driverList:[], 44 driverList:[],
44 names:[], 45 names:[],
@@ -58,7 +59,7 @@ export default { @@ -58,7 +59,7 @@ export default {
58 time: null, 59 time: null,
59 reason: null, 60 reason: null,
60 status: 0, 61 status: 0,
61 - lostCredit: 1 62 + lostCredit: 1,
62 }, 63 },
63 // ่กจๅ•ๅ‚ๆ•ฐ 64 // ่กจๅ•ๅ‚ๆ•ฐ
64 form: {}, 65 form: {},
@@ -82,6 +83,8 @@ export default { @@ -82,6 +83,8 @@ export default {
82 this.getList(); 83 this.getList();
83 this.getNamesData(); 84 this.getNamesData();
84 85
  86 + this.licenseplateData();
  87 +
85 88
86 let data = {valid:0}; 89 let data = {valid:0};
87 driverList(data).then(res=>{ 90 driverList(data).then(res=>{
@@ -99,6 +102,12 @@ export default { @@ -99,6 +102,12 @@ export default {
99 }); 102 });
100 103
101 }, 104 },
  105 + licenseplateData(){
  106 + getlicenseplates(this.queryParams).then(response => {
  107 + this.dictLicenseplateNo = response;
  108 + });
  109 + },
  110 +
102 getNamesData(){ 111 getNamesData(){
103 getNames(this.queryParams).then(response => { 112 getNames(this.queryParams).then(response => {
104 this.dictNames = response; 113 this.dictNames = response;
@@ -123,6 +132,12 @@ export default { @@ -123,6 +132,12 @@ export default {
123 if(this.driverList[i].name == value){ 132 if(this.driverList[i].name == value){
124 this.form.objectId = this.driverList[i].id; 133 this.form.objectId = this.driverList[i].id;
125 this.form.idNumber = this.driverList[i].identityNo; 134 this.form.idNumber = this.driverList[i].identityNo;
  135 + if(this.driverList[i].licenseplateNo){
  136 + this.form.licenseplateNo = this.driverList[i].licenseplateNo;
  137 + }else{
  138 + this.form.licenseplateNo = "ๆœช็ป‘ๅฎš่ฝฆ่พ†";
  139 + }
  140 + break;
126 } 141 }
127 } 142 }
128 }, 143 },
trash-ui/src/api/three_step.js
  View file @9c06308
@@ -60,6 +60,7 @@ export default { @@ -60,6 +60,7 @@ export default {
60 showSearch: true, 60 showSearch: true,
61 // ๆ€ปๆกๆ•ฐ 61 // ๆ€ปๆกๆ•ฐ
62 total: 0, 62 total: 0,
  63 + rangeNumber: 10,
63 // ๆŠฅๅทฅ่‡ชๆŸฅ่กจๆ ผๆ•ฐๆฎ 64 // ๆŠฅๅทฅ่‡ชๆŸฅ่กจๆ ผๆ•ฐๆฎ
64 names:[], 65 names:[],
65 threestepList: [], 66 threestepList: [],
@@ -109,6 +110,7 @@ export default { @@ -109,6 +110,7 @@ export default {
109 }, 110 },
110 // ่กจๅ•ๅ‚ๆ•ฐ 111 // ่กจๅ•ๅ‚ๆ•ฐ
111 form: { 112 form: {
  113 + trucks:[],
112 companys:null, 114 companys:null,
113 companyTrucks:null, 115 companyTrucks:null,
114 116
@@ -141,7 +143,7 @@ export default { @@ -141,7 +143,7 @@ export default {
141 message: '่ฏทๅกซๅ†™ๅฎŒๆ•ด', 143 message: '่ฏทๅกซๅ†™ๅฎŒๆ•ด',
142 trigger: 'change' 144 trigger: 'change'
143 },], 145 },],
144 - companyTrucks: [{ 146 + trucks: [{
145 required: false, 147 required: false,
146 message: '่ฏทๅกซๅ†™ๅฎŒๆ•ด', 148 message: '่ฏทๅกซๅ†™ๅฎŒๆ•ด',
147 trigger: 'change' 149 trigger: 'change'
@@ -183,6 +185,7 @@ export default { @@ -183,6 +185,7 @@ export default {
183 info2: false, 185 info2: false,
184 slides: [], 186 slides: [],
185 slidesArys: [], 187 slidesArys: [],
  188 + videos:[],
186 }; 189 };
187 }, 190 },
188 created() { 191 created() {
@@ -200,6 +203,10 @@ export default { @@ -200,6 +203,10 @@ export default {
200 } 203 }
201 }); 204 });
202 205
  206 + if(!this.checkPer(['business.supervision.threestep.selfcheck'])){
  207 + this.queryParams.pageStatus = 1;
  208 + }
  209 +
203 this.getList(this.queryParams.pageStatus); 210 this.getList(this.queryParams.pageStatus);
204 211
205 }, 212 },
@@ -298,13 +305,17 @@ export default { @@ -298,13 +305,17 @@ export default {
298 return; 305 return;
299 306
300 307
  308 + this.getCompanyTrucks(item.id);
  309 + },
  310 + getCompanyTrucks(objId){
  311 +
301 this.form.companys = null; 312 this.form.companys = null;
302 this.form.companyTrucks = null; 313 this.form.companyTrucks = null;
303 this.companyList = []; 314 this.companyList = [];
304 this.truckList = []; 315 this.truckList = [];
305 316
306 - constructionById(item.id).then(response => {  
307 - this.companyList.push({id: item.transportCompanyId, name: item.transportCompany}); 317 + constructionById(objId).then(response => {
  318 + this.companyList.push({id: response.result.transportCompanyId, name: response.result.transportCompany});
308 let query = { 319 let query = {
309 'page': 1, 320 'page': 1,
310 'size': 9999, 321 'size': 9999,
@@ -314,12 +325,12 @@ export default { @@ -314,12 +325,12 @@ export default {
314 325
315 let ids = []; 326 let ids = [];
316 327
317 - ids.push(item.transportCompanyId); 328 + ids.push(response.result.transportCompanyId);
318 329
319 query.companyID = ids + ""; 330 query.companyID = ids + "";
320 query.valid = 0; 331 query.valid = 0;
321 332
322 - getConstructionTruck(item.id).then(res => { 333 + getConstructionTruck(objId).then(res => {
323 for (let i in res.result) { 334 for (let i in res.result) {
324 this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName}); 335 this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName});
325 for (let j in res.result[i].vehicleList) { 336 for (let j in res.result[i].vehicleList) {
@@ -337,7 +348,9 @@ export default { @@ -337,7 +348,9 @@ export default {
337 }); 348 });
338 }); 349 });
339 }); 350 });
  351 +
340 }, 352 },
  353 +
341 downloadFile(path) { 354 downloadFile(path) {
342 window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path); 355 window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path);
343 }, 356 },
@@ -347,6 +360,11 @@ export default { @@ -347,6 +360,11 @@ export default {
347 this.slides[index].splice(i,1); 360 this.slides[index].splice(i,1);
348 } 361 }
349 } 362 }
  363 + for(let i=0;i<this.videos[index].length;i++){
  364 + if(this.videos[index][i].alt == img){
  365 + this.videos[index].splice(i,1);
  366 + }
  367 + }
350 let target = "img" + index; 368 let target = "img" + index;
351 this.form[target].splice(this.form[target].indexOf(img), 1); 369 this.form[target].splice(this.form[target].indexOf(img), 1);
352 this.$forceUpdate(); 370 this.$forceUpdate();
@@ -359,6 +377,11 @@ export default { @@ -359,6 +377,11 @@ export default {
359 this.slides[index1].splice(i,1); 377 this.slides[index1].splice(i,1);
360 } 378 }
361 } 379 }
  380 + for(let i=0;i<this.videos[index].length;i++){
  381 + if(this.videos[index][i].alt == img){
  382 + this.videos[index].splice(i,1);
  383 + }
  384 + }
362 this.$forceUpdate(); 385 this.$forceUpdate();
363 }, 386 },
364 387
@@ -384,30 +407,50 @@ export default { @@ -384,30 +407,50 @@ export default {
384 this.form[target].push(res); 407 this.form[target].push(res);
385 if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){ 408 if(file.name.indexOf('.jpg') > -1 ||file.name.indexOf('.png') > -1){
386 let url = URL.createObjectURL(file.raw) 409 let url = URL.createObjectURL(file.raw)
387 - this.slidesArys.push({ 410 + if(!this.slides[this.picIndex]){
  411 + this.slides[this.picIndex] = [];
  412 + }
  413 +
  414 + this.slides[this.picIndex].push({
388 url:url, 415 url:url,
389 alt:res 416 alt:res
390 }) 417 })
391 - this.slides[this.picIndex] = this.slidesArys;  
392 } 418 }
  419 + if(file.name.indexOf('.avi') > -1 ||file.name.indexOf('.mp4') > -1){
  420 +
  421 + let url = URL.createObjectURL(file.raw)
  422 + if(!this.videos[this.picIndex]){
  423 + this.videos[this.picIndex] = [];
  424 + }
  425 + this.videos[this.picIndex].push({
  426 + url:url,
  427 + alt:res
  428 + });
  429 + }
  430 +
393 }, 431 },
394 showFileUpload(i) { 432 showFileUpload(i) {
395 this.uploadImageDialog = true; 433 this.uploadImageDialog = true;
396 this.picIndex = i; 434 this.picIndex = i;
397 }, 435 },
398 beforeUpload(file) { 436 beforeUpload(file) {
  437 + console.log(file);
399 let isRightSize = file.size / 1024 / 1024 < 20 438 let isRightSize = file.size / 1024 / 1024 < 20
400 if (!isRightSize) { 439 if (!isRightSize) {
401 this.$message.error('ๆ–‡ไปถๅคงๅฐ่ถ…่ฟ‡ 20MB') 440 this.$message.error('ๆ–‡ไปถๅคงๅฐ่ถ…่ฟ‡ 20MB')
402 return isRightSize; 441 return isRightSize;
403 } 442 }
  443 +
404 let isAccept = false; 444 let isAccept = false;
405 - if (file.name.indexOf('.docx') > -1 || file.name.indexOf(".jpg") > -1 || file.name.indexOf('.doc') > -1 || file  
406 - .name.indexOf('.pdf') > -1||file.name.indexOf('.png') > -1) { 445 + let name = file.name + "";
  446 + name = name.toLowerCase();
  447 +
  448 + if (name.indexOf('.docx') > -1 || name.indexOf(".jpg") > -1 || name.indexOf('.doc') > -1 || file
  449 + .name.indexOf('.pdf') > -1||name.indexOf('.png') > -1 ||name.indexOf('.mp4') > -1 ||name.indexOf('.avi') > -1) {
407 isAccept = true; 450 isAccept = true;
408 } 451 }
409 if (!isAccept) { 452 if (!isAccept) {
410 - this.$message.error('ๅบ”่ฏฅ้€‰ๆ‹ฉPDFใ€PNGใ€JPGใ€WORD็ฑปๅž‹็š„ๆ–‡ไปถ') 453 + this.$message.error('ๅบ”่ฏฅ้€‰ๆ‹ฉPDFใ€PNGใ€JPGใ€MP4,AVI,WORD็ฑปๅž‹็š„ๆ–‡ไปถ')
411 return isAccept; 454 return isAccept;
412 } 455 }
413 456
@@ -420,7 +463,7 @@ export default { @@ -420,7 +463,7 @@ export default {
420 selectType(value) { 463 selectType(value) {
421 464
422 this.rules.companys[0].required = false; 465 this.rules.companys[0].required = false;
423 - this.rules.companyTrucks[0].required = false; 466 + this.rules.trucks[0].required = false;
424 467
425 this.form.name = null; 468 this.form.name = null;
426 this.bindname = null; 469 this.bindname = null;
@@ -430,7 +473,7 @@ export default { @@ -430,7 +473,7 @@ export default {
430 constructionsitesList(this.remoteQueryData).then(res => { 473 constructionsitesList(this.remoteQueryData).then(res => {
431 this.remoteData = res.result.list; 474 this.remoteData = res.result.list;
432 this.rules.companys[0].required = true; 475 this.rules.companys[0].required = true;
433 - this.rules.companyTrucks[0].required = true; 476 + this.rules.trucks[0].required = true;
434 477
435 }); 478 });
436 } else { 479 } else {
@@ -508,6 +551,7 @@ export default { @@ -508,6 +551,7 @@ export default {
508 selfCheckTime: null, 551 selfCheckTime: null,
509 objectId: null, 552 objectId: null,
510 earthsitesId: null, 553 earthsitesId: null,
  554 + trucks:[],
511 createTime: null, 555 createTime: null,
512 checkTime: null, 556 checkTime: null,
513 earthsitesName: null, 557 earthsitesName: null,
@@ -530,6 +574,8 @@ export default { @@ -530,6 +574,8 @@ export default {
530 person: null, 574 person: null,
531 phone: null 575 phone: null
532 }; 576 };
  577 + this.videos = [];
  578 + this.slides = [];
533 this.resetForm("form"); 579 this.resetForm("form");
534 }, 580 },
535 /** ๆœ็ดขๆŒ‰้’ฎๆ“ไฝœ */ 581 /** ๆœ็ดขๆŒ‰้’ฎๆ“ไฝœ */
@@ -569,10 +615,12 @@ export default { @@ -569,10 +615,12 @@ export default {
569 reSub(row) { 615 reSub(row) {
570 this.reset(); 616 this.reset();
571 617
572 - this.open = true;  
573 this.title = "ๅ†ๆฌกๆไบค"; 618 this.title = "ๅ†ๆฌกๆไบค";
  619 +
  620 + this.open = true;
574 getThreestep(row.id).then(res => { 621 getThreestep(row.id).then(res => {
575 this.form = res.data; 622 this.form = res.data;
  623 +
576 this.form.type = this.form.type + ""; 624 this.form.type = this.form.type + "";
577 this.form.place = Number(this.form.place); 625 this.form.place = Number(this.form.place);
578 this.bindname = res.data.earthsitesName; 626 this.bindname = res.data.earthsitesName;
@@ -580,13 +628,64 @@ export default { @@ -580,13 +628,64 @@ export default {
580 this.form.companys = res.data.companys.split(","); 628 this.form.companys = res.data.companys.split(",");
581 } 629 }
582 if (res.data.companyTrucks) { 630 if (res.data.companyTrucks) {
583 - this.form.companyTrucks = res.data.companyTrucks.split(","); 631 + this.form.trucks = res.data.companyTrucks.split(",");
584 } 632 }
585 for (let i = 0; i < 13; i++) { 633 for (let i = 0; i < 13; i++) {
586 if (this.form["img" + i]) { 634 if (this.form["img" + i]) {
587 this.form["img" + i] = this.form["img" + i].split(","); 635 this.form["img" + i] = this.form["img" + i].split(",");
588 } 636 }
589 } 637 }
  638 +
  639 + this.companyList = [];
  640 + this.truckList = [];
  641 +
  642 + constructionById(this.form.objectId).then(response => {
  643 + this.companyList.push({id: response.result.transportCompanyId, name: response.result.transportCompany});
  644 + let query = {
  645 + 'page': 1,
  646 + 'size': 9999,
  647 + 'dishonestState': 0,
  648 + 'valid': 0
  649 + }
  650 +
  651 + let ids = [];
  652 +
  653 + ids.push(response.result.transportCompanyId);
  654 +
  655 + query.companyID = ids + "";
  656 + query.valid = 0;
  657 +
  658 + getConstructionTruck(this.form.objectId).then(res => {
  659 + for (let i in res.result) {
  660 + this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName});
  661 + for (let j in res.result[i].vehicleList) {
  662 + this.truckList.push({
  663 + id: res.result[i].vehicleList[j].id,
  664 + licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
  665 + companyName: res.result[i].companyName
  666 + });
  667 + }
  668 + }
  669 + truckList(query).then(res => {
  670 + let trucks = [];
  671 + for (let i in res.result.list) {
  672 + for(let j in this.form.trucks){
  673 + if(this.form.trucks[j] == res.result.list[i].id){
  674 + trucks.push(res.result.list[i].licenseplateNo);
  675 + break;
  676 + }
  677 + }
  678 +
  679 + this.truckList.push(res.result.list[i]);
  680 + }
  681 + this.form.trucks = trucks;
  682 + });
  683 + });
  684 + });
  685 +
  686 +
  687 +
  688 +
590 }); 689 });
591 }, 690 },
592 691
@@ -615,6 +714,21 @@ export default { @@ -615,6 +714,21 @@ export default {
615 }, 714 },
616 /** ๆไบคๆŒ‰้’ฎ */ 715 /** ๆไบคๆŒ‰้’ฎ */
617 submitForm() { 716 submitForm() {
  717 + debugger;
  718 + if(this.form.trucks){
  719 + this.form.companyTrucks = [];
  720 + for(let i in this.form.trucks){
  721 + for(let j in this.truckList){
  722 + if(this.truckList[j].licenseplateNo == this.form.trucks[i]){
  723 + this.form.companyTrucks.push(this.truckList[j].id);
  724 + break;
  725 + }
  726 + }
  727 + }
  728 + }
  729 +
  730 +
  731 +
618 this.$refs["form"].validate(valid => { 732 this.$refs["form"].validate(valid => {
619 if (valid) { 733 if (valid) {
620 734
@@ -740,6 +854,11 @@ export default { @@ -740,6 +854,11 @@ export default {
740 } 854 }
741 }); 855 });
742 }, 856 },
  857 + loadMore(n) {
  858 + // nๆ˜ฏ้ป˜่ฎคๅˆๅง‹ๅฑ•็คบ็š„ๆกๆ•ฐไผšๅœจๆธฒๆŸ“็š„ๆ—ถๅ€™ๅฐฑๅฏไปฅ่Žทๅ–,ๅ…ทไฝ“ๅฏไปฅๆ‰“logๆŸฅ็œ‹
  859 + // elementuiไธ‹ๆ‹‰่ถ…่ฟ‡7ๆกๆ‰ไผšๅ‡บๆปšๅŠจๆก,ๅฆ‚ๆžœๅˆๅง‹ไธๅ‡บๆปšๅŠจๆกๆ— ๆณ•่งฆๅ‘loadMoreๆ–นๆณ•
  860 + return () => (this.rangeNumber += 5); // ๆฏๆฌกๆปšๅŠจๅˆฐๅบ•้ƒจๅฏไปฅๆ–ฐๅขžๆกๆ•ฐ ๅฏ่‡ชๅฎšไน‰
  861 + },
743 /** ๅˆ ้™คๆŒ‰้’ฎๆ“ไฝœ */ 862 /** ๅˆ ้™คๆŒ‰้’ฎๆ“ไฝœ */
744 handleDelete(row) { 863 handleDelete(row) {
745 const ids = row.id || this.ids; 864 const ids = row.id || this.ids;
@@ -767,5 +886,25 @@ export default { @@ -767,5 +886,25 @@ export default {
767 this.download(response.message); 886 this.download(response.message);
768 }) 887 })
769 } 888 }
770 - } 889 + },
  890 + directives:{
  891 + 'el-select-loadmore':(el, binding) => {
  892 + // ่Žทๅ–element-uiๅฎšไน‰ๅฅฝ็š„scroll็›’ๅญ
  893 + const SELECTWRAP_DOM = el.querySelector(".el-select-dropdown .el-select-dropdown__wrap");
  894 + if(SELECTWRAP_DOM){
  895 + SELECTWRAP_DOM.addEventListener("scroll", function () {
  896 + /**
  897 + * scrollHeight ่Žทๅ–ๅ…ƒ็ด ๅ†…ๅฎน้ซ˜ๅบฆ(ๅช่ฏป)
  898 + * scrollTop ่Žทๅ–ๆˆ–่€…่ฎพ็ฝฎๅ…ƒ็ด ็š„ๅ็งปๅ€ผ,
  899 + * ๅธธ็”จไบŽ:่ฎก็ฎ—ๆปšๅŠจๆก็š„ไฝ็ฝฎ, ๅฝ“ไธ€ไธชๅ…ƒ็ด ็š„ๅฎนๅ™จๆฒกๆœ‰ไบง็”Ÿๅž‚็›ดๆ–นๅ‘็š„ๆปšๅŠจๆก, ้‚ฃๅฎƒ็š„scrollTop็š„ๅ€ผ้ป˜่ฎคไธบ0.
  900 + * clientHeight ่ฏปๅ–ๅ…ƒ็ด ็š„ๅฏ่ง้ซ˜ๅบฆ(ๅช่ฏป)
  901 + * ๅฆ‚ๆžœๅ…ƒ็ด ๆปšๅŠจๅˆฐๅบ•, ไธ‹้ข็ญ‰ๅผ่ฟ”ๅ›žtrue, ๆฒกๆœ‰ๅˆ™่ฟ”ๅ›žfalse:
  902 + * ele.scrollHeight - ele.scrollTop === ele.clientHeight;
  903 + */
  904 + const condition = this.scrollHeight - this.scrollTop <= this.clientHeight;
  905 + if (condition) binding.value();
  906 + });
  907 + }
  908 + },
  909 + }
771 }; 910 };
trash-ui/src/api/truck_active.js
  View file @9c06308
@@ -147,38 +147,36 @@ export default { @@ -147,38 +147,36 @@ export default {
147 id: res.result.transportCompanyId, 147 id: res.result.transportCompanyId,
148 name: res.result.transportCompany 148 name: res.result.transportCompany
149 }); 149 });
  150 +
  151 + let query = {
  152 + 'page': 1,
  153 + 'size': 9999,
  154 + 'dishonestState': 0,
  155 + 'valid': 0
  156 + }
150 157
151 - mainworkcompany(item.id).then(response => {  
152 -  
153 - let query = {  
154 - 'page': 1,  
155 - 'size': 9999,  
156 - 'dishonestState': 0,  
157 - 'valid': 0  
158 - } 158 + let ids = [];
159 159
160 - query.companyID = res.result.transportCompanyId+ "";  
161 - query.valid = 0; 160 + ids.push(item.transportCompanyId);
162 161
163 - getConstructionTruck(item.objectId).then(res => {  
164 - for (let i in res.result) {  
165 - this.companyList.push({  
166 - id: res.result[i].companyId,  
167 - name: res.result[i].companyName 162 + query.companyID = ids + "";
  163 + query.valid = 0;
  164 +
  165 + getConstructionTruck(item.id).then(res => {
  166 + for (let i in res.result) {
  167 + this.companyList.push({id: res.result[i].companyId, name: res.result[i].companyName});
  168 + for (let j in res.result[i].vehicleList) {
  169 + this.truckList.push({
  170 + id: res.result[i].vehicleList[j].id,
  171 + licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,
  172 + companyName: res.result[i].companyName
168 }); 173 });
169 - for (let j in res.result[i].vehicleList) {  
170 - this.truckList.push({  
171 - id: res.result[i].vehicleList[j].id,  
172 - licenseplateNo: res.result[i].vehicleList[j].licenseplateNo,  
173 - companyName: res.result[i].companyName  
174 - });  
175 - }  
176 } 174 }
177 - truckList(query).then(res => {  
178 - for (let i in res.result.list) {  
179 - this.truckList.push(res.result.list[i]);  
180 - }  
181 - }); 175 + }
  176 + truckList(query).then(res => {
  177 + for (let i in res.result.list) {
  178 + this.truckList.push(res.result.list[i]);
  179 + }
182 }); 180 });
183 }); 181 });
184 }); 182 });
trash-ui/src/api/vio_casefile.js
  View file @9c06308
@@ -85,7 +85,7 @@ export default { @@ -85,7 +85,7 @@ export default {
85 {code: 5, name: "ๅ‡บๅ…ฅๅฃ้“่ทฏ็กฌๅŒ–"}, 85 {code: 5, name: "ๅ‡บๅ…ฅๅฃ้“่ทฏ็กฌๅŒ–"},
86 {code: 6, name: "่ฝฆ่พ†ๅ†ฒๆด—ๆ˜ฏๅฆๅˆฐไฝ"}, 86 {code: 6, name: "่ฝฆ่พ†ๅ†ฒๆด—ๆ˜ฏๅฆๅˆฐไฝ"},
87 {code: 7, name: "้›พ็‚ฎๆœบๆ˜ฏๅฆๆญฃๅธธๅผ€ๅฏ"}, 87 {code: 7, name: "้›พ็‚ฎๆœบๆ˜ฏๅฆๆญฃๅธธๅผ€ๅฏ"},
88 - {code: 8, name: "ไฝฟ็”จ่ดนไธ“็”จ่ฝฆ่ฟ่พ“"}, 88 + {code: 8, name: "ไฝฟ็”จ้žไธ“็”จ่ฝฆ่ฟ่พ“"},
89 {code: 9, name: "็›‘ๆŽง็‚นไฝๆœชๅฏนๅ‡†"}, 89 {code: 9, name: "็›‘ๆŽง็‚นไฝๆœชๅฏนๅ‡†"},
90 {code: 10, name: "ๆœชๆŠฅๅผ€ๅทฅไฝœไธš"}, 90 {code: 10, name: "ๆœชๆŠฅๅผ€ๅทฅไฝœไธš"},
91 {code: 11, name: "่ง†้ข‘่ฎพๅค‡็ฆป็บฟ่ถ…ๆ—ถๆŠฅ่ญฆ"}, 91 {code: 11, name: "่ง†้ข‘่ฎพๅค‡็ฆป็บฟ่ถ…ๆ—ถๆŠฅ่ญฆ"},
trash-ui/src/layout/index55.vue renamed to trash-ui/src/layout/index5.vue
  View file @9c06308
trash-ui/src/main.js
  View file @9c06308
@@ -17,6 +17,7 @@ import permission from &#39;./directive/permission&#39; @@ -17,6 +17,7 @@ import permission from &#39;./directive/permission&#39;
17 import './assets/icons' // icon 17 import './assets/icons' // icon
18 import './permission' // permission control 18 import './permission' // permission control
19 import { getDicts } from "@/api/system/dict/data"; 19 import { getDicts } from "@/api/system/dict/data";
  20 +import { checkPermi } from "@/utils/permission";
20 import { getConfigKey } from "@/api/system/config"; 21 import { getConfigKey } from "@/api/system/config";
21 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree,parseStatus } from "@/utils/trash"; 22 import { parseTime, resetForm, addDateRange, selectDictLabel, selectDictLabels, download, handleTree,parseStatus } from "@/utils/trash";
22 import Pagination from "@/components/Pagination"; 23 import Pagination from "@/components/Pagination";
@@ -34,6 +35,7 @@ Vue.prototype.selectDictLabels = selectDictLabels @@ -34,6 +35,7 @@ Vue.prototype.selectDictLabels = selectDictLabels
34 Vue.prototype.download = download 35 Vue.prototype.download = download
35 Vue.prototype.handleTree = handleTree 36 Vue.prototype.handleTree = handleTree
36 Vue.prototype.parseStatus = parseStatus 37 Vue.prototype.parseStatus = parseStatus
  38 +Vue.prototype.checkPer = checkPermi
37 39
38 Vue.prototype.msgSuccess = function (msg) { 40 Vue.prototype.msgSuccess = function (msg) {
39 this.$message({ showClose: true, message: msg, type: "success" }); 41 this.$message({ showClose: true, message: msg, type: "success" });
trash-ui/src/utils/permission.js
  View file @9c06308
@@ -46,4 +46,4 @@ export function checkRole(value) { @@ -46,4 +46,4 @@ export function checkRole(value) {
46 console.error(`need roles! Like checkRole="['admin','editor']"`) 46 console.error(`need roles! Like checkRole="['admin','editor']"`)
47 return false 47 return false
48 } 48 }
49 -}  
50 \ No newline at end of file 49 \ No newline at end of file
  50 +}
trash-ui/src/views/activiti/definition/index.vue
  View file @9c06308
@@ -71,7 +71,6 @@ @@ -71,7 +71,6 @@
71 type="text" 71 type="text"
72 icon="el-icon-edit" 72 icon="el-icon-edit"
73 @click="OnlineModificationProcess(scope.row)" 73 @click="OnlineModificationProcess(scope.row)"
74 - v-hasPermi="['activiti:modeler']"  
75 >ๆŸฅ็œ‹ 74 >ๆŸฅ็œ‹
76 </el-button> 75 </el-button>
77 <el-button 76 <el-button
@@ -79,7 +78,6 @@ @@ -79,7 +78,6 @@
79 type="text" 78 type="text"
80 icon="el-icon-edit" 79 icon="el-icon-edit"
81 @click="suspendOrActiveApply(scope.row)" 80 @click="suspendOrActiveApply(scope.row)"
82 - v-hasPermi="['activiti:modeler']"  
83 >{{scope.row.suspendState==1?'ๆŒ‚่ตท':'ๆฟ€ๆดป'}} 81 >{{scope.row.suspendState==1?'ๆŒ‚่ตท':'ๆฟ€ๆดป'}}
84 </el-button> 82 </el-button>
85 83
@@ -88,7 +86,6 @@ @@ -88,7 +86,6 @@
88 type="text" 86 type="text"
89 icon="el-icon-delete" 87 icon="el-icon-delete"
90 @click="handleDelete(scope.row)" 88 @click="handleDelete(scope.row)"
91 - v-hasPermi="['activiti:modeler']"  
92 >ๅˆ ้™ค 89 >ๅˆ ้™ค
93 </el-button> 90 </el-button>
94 </template> 91 </template>
trash-ui/src/views/activiti/task/companyInfo.vue
  View file @9c06308
1 <template> 1 <template>
2 - <div>  
3 - <div v-loading="loading" style="border: 1px solid black;">  
4 - <el-row >  
5 - <el-col :span="6" class="bd">ไผไธšๅ็งฐ</el-col>  
6 - <el-col :span="6" class="bd">{{infoData.name}}</el-col>  
7 - <el-col :span="6" class="bd bd_left">ไผไธš็ฎ€็งฐ</el-col>  
8 - <el-col :span="6" class="bd">{{infoData.abbreviation}}</el-col>  
9 - </el-row>  
10 - <el-row >  
11 - <el-col :span="6" class="bd">ๆณจๅ†Œๅœฐๆ‰€ๅฑžๅŒบๅŸŸ</el-col>  
12 - <el-col :span="6" class="bd">{{infoData.areaName}}</el-col>  
13 - <el-col :span="6" class="bd bd_left">ไผไธš้“่ทฏ่ฟ่พ“็ป่ฅ่ฎธๅฏ่ฏๆœ‰ๆ•ˆๆœŸ</el-col>  
14 - <el-col :span="6" class="bd">{{infoData.registrationValidTime}}</el-col>  
15 - </el-row>  
16 - <el-row >  
17 - <el-col :span="6" class="bd bd_left">ไผไธšๅ…ฅๅธ‚ๆ—ถ้—ด</el-col>  
18 - <el-col :span="6" class="bd">{{infoData.entryTime}}</el-col>  
19 - <el-col :span="6" class="bd">ไผไธš่ฅไธšๆ‰ง็…งๆœ‰ๆ•ˆๆœŸ</el-col>  
20 - <el-col :span="6" class="bd">{{infoData.businessLicenseValidTime}}</el-col>  
21 - </el-row>  
22 - <el-row >  
23 - <el-col :span="6" class="bd">ๅŠžๅ…ฌๅœฐๅ€</el-col>  
24 - <el-col :span="6" class="bd">{{infoData.officeAddress}}</el-col>  
25 - <el-col :span="6" class="bd bd_left">ๅœ่ฝฆๅœบไฝ็ฝฎ</el-col>  
26 - <el-col :span="6" class="bd">{{infoData.parkingAddress}}</el-col>  
27 - </el-row>  
28 - <el-row >  
29 - <el-col :span="6" class="bd">ๅœ่ฝฆๅœบ้ข็งฏ</el-col>  
30 - <el-col :span="6" class="bd">{{infoData.parkingArea}}</el-col>  
31 - <el-col :span="6" class="bd bd_left">่ฟ่พ“่ฝฆ่พ†ๆ€ปๆ•ฐ</el-col>  
32 - <el-col :span="6" class="bd">{{infoData.vehicleCount}}</el-col>  
33 - </el-row>  
34 - <el-row >  
35 - <el-col :span="6" class="bd">ไผไธšๅฎ‰ๅ…จ่ดŸ่ดฃไบบๅง“ๅๅŠ่”็ณปๆ–นๅผ</el-col>  
36 - <el-col :span="6" class="bd">{{infoData.principal}}:{{infoData.principalPhoneNo}}</el-col>  
37 - <el-col :span="6" class="bd">็คพไผš็ปŸไธ€ไฟก็”จไปฃ็ ็ผ–ๅท</el-col>  
38 - <el-col :span="6" class="bd">{{infoData.creditCode}}</el-col>  
39 - </el-row>  
40 - <el-row >  
41 - <el-col :span="6" class="bd bd_left">ๆณ•ไบบไปฃ่กจๅง“ๅๅŠ่”็ณปๆ–นๅผ</el-col>  
42 - <el-col :span="6" class="bd">{{infoData.corporation}}:{{infoData.corporationPhoneNo}}</el-col>  
43 - <el-col :span="6" class="bd bd_left">ๅฎ‰ๅ…จ็ฎก็†ไบบๅ‘˜</el-col>  
44 - <el-col :span="6" class="bd">{{infoData.safetyOfficer}}</el-col>  
45 - </el-row>  
46 - <el-row >  
47 - <el-col :span="6" class="bd bd_left">ๅค‡ๆณจ</el-col>  
48 - <el-col :span="18" class="bd">{{infoData.comment}}</el-col>  
49 - </el-row>  
50 -  
51 - <div v-for="dict in dicts">  
52 - <p >{{dict.name}}</p>  
53 - <el-image v-for="item in infoData.attachmentList"  
54 - style="width: 40px; height: 40px; margin: 5px;"  
55 - :src="'/remotedown/' + item.attachmentPath"  
56 - :z-index="2000"  
57 - v-if="item.typeCode == dict.code && (path.toLowerCase().indexOf(".jpg") > -1 || path.toLowerCase().indexOf(".png") > -1)">  
58 - </el-image>  
59 - <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;"  
60 - v-if="item.typeCode == dict.code  
61 - && path.toLowerCase().indexOf(".jpg") == -1  
62 - && path.toLowerCase().indexOf(".png") == -1"><p>{{item.name}}</p></a>  
63 - </div>  
64 - <!-- <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">  
65 - <el-image  
66 - style="width: 350px; height: 350px; margin: 5px;"  
67 - :src="'/remotedown/' + picImage"  
68 - :preview-src-list="[picImage]"  
69 - :z-index="2000">  
70 - </el-image>  
71 - </el-dialog> -->  
72 - </div>  
73 - </div> 2 + <iframe width="100%" height="600px" frameborder="no" id="iFrame" :src=src></iframe>
74 </template> 3 </template>
75 4
76 <script> 5 <script>
@@ -89,15 +18,20 @@ import store from &quot;@/store&quot;; @@ -89,15 +18,20 @@ import store from &quot;@/store&quot;;
89 } from "@/api/dict"; 18 } from "@/api/dict";
90 19
91 20
  21 +
92 export default { 22 export default {
93 name: "ThreestepInfo", 23 name: "ThreestepInfo",
94 props: { 24 props: {
95 businessKey: { 25 businessKey: {
96 type: String 26 type: String
97 }, 27 },
  28 + businessType: {
  29 + type: Number
  30 + },
98 }, 31 },
99 data() { 32 data() {
100 return { 33 return {
  34 + src:"",
101 sign: store.getters.avatar, //่ฃๅ‰ชๅ›พ็‰‡็š„ๅœฐๅ€ 35 sign: store.getters.avatar, //่ฃๅ‰ชๅ›พ็‰‡็š„ๅœฐๅ€
102 areas: [], 36 areas: [],
103 loading: null, 37 loading: null,
@@ -129,16 +63,7 @@ import store from &quot;@/store&quot;; @@ -129,16 +63,7 @@ import store from &quot;@/store&quot;;
129 }, 63 },
130 created() { 64 created() {
131 65
132 - getDict({type:"CSCompanyAttachmentType"}).then(res=>{  
133 - this.dicts = res.result;  
134 - });  
135 66
136 - this.loading = true;  
137 - this.getInfo();  
138 -  
139 - },  
140 - methods: {  
141 - getInfo() {  
142 let id; 67 let id;
143 if (this.businessKey.split(":").length == 2) { 68 if (this.businessKey.split(":").length == 2) {
144 id = this.businessKey.split(":")[1]; 69 id = this.businessKey.split(":")[1];
@@ -146,40 +71,28 @@ import store from &quot;@/store&quot;; @@ -146,40 +71,28 @@ import store from &quot;@/store&quot;;
146 id = this.businessKey; 71 id = this.businessKey;
147 } 72 }
148 73
149 - getCompanyInfo(id).then(response => {  
150 -  
151 - this.infoData = response.result;  
152 - // getArea().then(res => {  
153 - // this.areas = res.result;  
154 - // this.loading = false;  
155 - // for (let i = 0; i < this.areas.length; i++) {  
156 - // if (Number(this.infoData.place) == this.areas[i].code) {  
157 - // this.infoData.place = this.areas[i].name;  
158 - // }  
159 - // }  
160 - // });  
161 -  
162 - // for(let i in obj){  
163 - // if(this.objectDict[i]){  
164 - // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})  
165 - // }  
166 - // }  
167 - this.loading = false;  
168 - });  
169 - },  
170 - downloadFile(path){  
171 - let file = "/remotedown/" + path;  
172 -  
173 - if(path.indexOf(".jpg") != -1){  
174 - this.showPic = true; 74 + let http = "http://183.66.242.6:14601";
175 75
176 - this.picImage = file;  
177 - return; 76 + if(this.businessType == 0){
  77 + this.src = http + "/single/#/enterprise-information/information-detail?id=" + id;
  78 + }
  79 + if(this.businessType == 1){
  80 + this.src = http + "/single/#/vehicleInformation/information-detail?id=" + id;
  81 + }
  82 + if(this.businessType == 2){
  83 + this.src = http + "/single/#/constructionInfo/detail?id="+id+"&type=detail";
  84 + }
  85 + if(this.businessType == 3){
  86 + this.src = http + "/single/#/absorptionsitedetail?absorptionId=" + id;
  87 + }
  88 + if(this.businessType == 4){
  89 + this.src = http + "/single/#/contractInfo/detail?id=" + id;
  90 + }
  91 + if(this.businessType == 5){
  92 + this.src = http + "/single/#/driverdetail?driverId=" + id;
178 } 93 }
179 94
180 - window.open(file,"new window");  
181 - }  
182 - } 95 + },
183 96
184 } 97 }
185 </script> 98 </script>
trash-ui/src/views/activiti/task/companyInfo3.vue 0 โ†’ 100644
  View file @9c06308
  1 +<template>
  2 + <div>
  3 + <div v-loading="loading" style="border: 1px solid black;">
  4 + <el-row >
  5 + <el-col :span="6" class="bd">ไผไธšๅ็งฐ</el-col>
  6 + <el-col :span="6" class="bd">{{infoData.name}}</el-col>
  7 + <el-col :span="6" class="bd bd_left">ไผไธš็ฎ€็งฐ</el-col>
  8 + <el-col :span="6" class="bd">{{infoData.abbreviation}}</el-col>
  9 + </el-row>
  10 + <el-row >
  11 + <el-col :span="6" class="bd">ๆณจๅ†Œๅœฐๆ‰€ๅฑžๅŒบๅŸŸ</el-col>
  12 + <el-col :span="6" class="bd">{{infoData.areaName}}</el-col>
  13 + <el-col :span="6" class="bd bd_left">ไผไธš้“่ทฏ่ฟ่พ“็ป่ฅ่ฎธๅฏ่ฏๆœ‰ๆ•ˆๆœŸ</el-col>
  14 + <el-col :span="6" class="bd">{{infoData.registrationValidTime}}</el-col>
  15 + </el-row>
  16 + <el-row >
  17 + <el-col :span="6" class="bd bd_left">ไผไธšๅ…ฅๅธ‚ๆ—ถ้—ด</el-col>
  18 + <el-col :span="6" class="bd">{{infoData.entryTime}}</el-col>
  19 + <el-col :span="6" class="bd">ไผไธš่ฅไธšๆ‰ง็…งๆœ‰ๆ•ˆๆœŸ</el-col>
  20 + <el-col :span="6" class="bd">{{infoData.businessLicenseValidTime}}</el-col>
  21 + </el-row>
  22 + <el-row >
  23 + <el-col :span="6" class="bd">ๅŠžๅ…ฌๅœฐๅ€</el-col>
  24 + <el-col :span="6" class="bd">{{infoData.officeAddress}}</el-col>
  25 + <el-col :span="6" class="bd bd_left">ๅœ่ฝฆๅœบไฝ็ฝฎ</el-col>
  26 + <el-col :span="6" class="bd">{{infoData.parkingAddress}}</el-col>
  27 + </el-row>
  28 + <el-row >
  29 + <el-col :span="6" class="bd">ๅœ่ฝฆๅœบ้ข็งฏ</el-col>
  30 + <el-col :span="6" class="bd">{{infoData.parkingArea}}</el-col>
  31 + <el-col :span="6" class="bd bd_left">่ฟ่พ“่ฝฆ่พ†ๆ€ปๆ•ฐ</el-col>
  32 + <el-col :span="6" class="bd">{{infoData.vehicleCount}}</el-col>
  33 + </el-row>
  34 + <el-row >
  35 + <el-col :span="6" class="bd">ไผไธšๅฎ‰ๅ…จ่ดŸ่ดฃไบบๅง“ๅๅŠ่”็ณปๆ–นๅผ</el-col>
  36 + <el-col :span="6" class="bd">{{infoData.principal}}:{{infoData.principalPhoneNo}}</el-col>
  37 + <el-col :span="6" class="bd">็คพไผš็ปŸไธ€ไฟก็”จไปฃ็ ็ผ–ๅท</el-col>
  38 + <el-col :span="6" class="bd">{{infoData.creditCode}}</el-col>
  39 + </el-row>
  40 + <el-row >
  41 + <el-col :span="6" class="bd bd_left">ๆณ•ไบบไปฃ่กจๅง“ๅๅŠ่”็ณปๆ–นๅผ</el-col>
  42 + <el-col :span="6" class="bd">{{infoData.corporation}}:{{infoData.corporationPhoneNo}}</el-col>
  43 + <el-col :span="6" class="bd bd_left">ๅฎ‰ๅ…จ็ฎก็†ไบบๅ‘˜</el-col>
  44 + <el-col :span="6" class="bd">{{infoData.safetyOfficer}}</el-col>
  45 + </el-row>
  46 + <el-row >
  47 + <el-col :span="6" class="bd bd_left">ๅค‡ๆณจ</el-col>
  48 + <el-col :span="18" class="bd">{{infoData.comment}}</el-col>
  49 + </el-row>
  50 +
  51 + <div v-for="dict in dicts">
  52 + <p >{{dict.name}}</p>
  53 + <el-image v-for="item in infoData.attachmentList"
  54 + style="width: 40px; height: 40px; margin: 5px;"
  55 + :src="'/remotedown/' + item.attachmentPath"
  56 + :z-index="2000"
  57 + :preview-src-list="[slides1('/remotedown/' + item.attachmentPath)]"
  58 + v-if="item.typeCode == dict.code && (item.attachmentPath.toLowerCase().indexOf('.jpg') > -1 || item.attachmentPath.toLowerCase().indexOf('.png') > -1)">
  59 + </el-image>
  60 + <a v-for="item in infoData.attachmentList"
  61 + @click="downloadFile(item.attachmentPath);"
  62 + style="color:blue;"
  63 + v-if="item.typeCode == dict.code
  64 + && item.attachmentPath.toLowerCase().indexOf('.jpg') == -1
  65 + && item.attachmentPath.toLowerCase().indexOf('.png') == -1"><p>{{item.name}}</p></a>
  66 + </div>
  67 + <!-- <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">
  68 + <el-image
  69 + style="width: 350px; height: 350px; margin: 5px;"
  70 + :src="'/remotedown/' + picImage"
  71 + :preview-src-list="[picImage]"
  72 + :z-index="2000">
  73 + </el-image>
  74 + </el-dialog> -->
  75 + </div>
  76 + </div>
  77 +</template>
  78 +
  79 +<script>
  80 +
  81 +
  82 +import store from "@/store";
  83 + import {
  84 + getToken
  85 + } from "@/utils/auth";
  86 +
  87 +
  88 + import {
  89 + getCompanyInfo,
  90 + getArea,
  91 + getDict
  92 + } from "@/api/dict";
  93 +
  94 +
  95 + export default {
  96 + name: "ThreestepInfo",
  97 + props: {
  98 + businessKey: {
  99 + type: String
  100 + },
  101 + },
  102 + data() {
  103 + return {
  104 + sign: store.getters.avatar, //่ฃๅ‰ชๅ›พ็‰‡็š„ๅœฐๅ€
  105 + areas: [],
  106 + loading: null,
  107 + objectDict: {
  108 + constructionSiteID:"ๅทฅๅœฐID",
  109 + constructionSiteName:"ๅทฅๅœฐๅ็งฐ",
  110 + earthSiteID:"ๅค„็†ๅœบๆ‰€ID",
  111 + earthSiteName:"ๅค„็†ๅœบๆ‰€ๅ็งฐ",
  112 + absorbCapacity:"ๆถˆ็บณๅฎน้‡",
  113 + startTime:"ๆœ‰ๆ•ˆๆœŸๅผ€ๅง‹ๆ—ถ้—ด yyyy-mM-dd",
  114 + endTime:"ๆœ‰ๆ•ˆๆœŸ็ป“ๆŸๆ—ถ้—ด yyyy-mM-dd",
  115 + type:"ๅปบ็ญ‘ๅžƒๅœพ็ฑปๅž‹ID",
  116 + typeName:"ๅžƒๅœพ็ฑปๅž‹ๅ็งฐ",
  117 + contractNo:"ๆถˆ็บณๅˆๅŒ็ผ–ๅท",
  118 + routeName:"็บฟ่ทฏๅ็งฐ",
  119 + routeWidth:"็บฟ่ทฏๅฎฝๅบฆ",
  120 + auditStatus:"ๅฎกๆ ธ็Šถๆ€ 0-ๅฎกๆ ธไธญ 1-ๅฎกๆ ธ้€š่ฟ‡ 2-ๅฎกๆ ธ้ฉณๅ›ž",
  121 + auditStatusName:"ๅฎกๆ ธ็Šถๆ€ๅ็งฐ",
  122 + contractStatus:"ๅˆๅŒ็Šถๆ€",
  123 + contractStatusName:"ๅˆๅŒ็Šถๆ€ๅ็งฐ",
  124 + routePoints:"็บฟ่ทฏไฟกๆฏ"},
  125 +
  126 + infoData: {},
  127 +
  128 + dicts:null,
  129 + showPic:false,
  130 + picImage:null,
  131 + }
  132 + },
  133 + created() {
  134 +
  135 + getDict({type:"CSCompanyAttachmentType"}).then(res=>{
  136 + this.dicts = res.result;
  137 + });
  138 +
  139 + this.loading = true;
  140 + this.getInfo();
  141 +
  142 + },
  143 + methods: {
  144 + slides1(img){
  145 + return img;
  146 + },
  147 + getInfo() {
  148 + let id;
  149 + if (this.businessKey.split(":").length == 2) {
  150 + id = this.businessKey.split(":")[1];
  151 + } else {
  152 + id = this.businessKey;
  153 + }
  154 +
  155 + getCompanyInfo(id).then(response => {
  156 +
  157 + this.infoData = response.result;
  158 + // getArea().then(res => {
  159 + // this.areas = res.result;
  160 + // this.loading = false;
  161 + // for (let i = 0; i < this.areas.length; i++) {
  162 + // if (Number(this.infoData.place) == this.areas[i].code) {
  163 + // this.infoData.place = this.areas[i].name;
  164 + // }
  165 + // }
  166 + // });
  167 +
  168 + // for(let i in obj){
  169 + // if(this.objectDict[i]){
  170 + // this.infoData.push({label:this.objectDict[i] ,value:obj[i]})
  171 + // }
  172 + // }
  173 + this.loading = false;
  174 + });
  175 + },
  176 + downloadFile(path){
  177 + let file = "/remotedown/" + path;
  178 +
  179 + if(path.indexOf(".jpg") != -1){
  180 + this.showPic = true;
  181 +
  182 + this.picImage = file;
  183 + return;
  184 + }
  185 +
  186 + window.open(file,"new window");
  187 + }
  188 + }
  189 +
  190 + }
  191 +</script>
  192 +<style>
  193 + .bd{
  194 + padding:5px;
  195 + }
  196 +
  197 +
  198 +
  199 +</style>
trash-ui/src/views/activiti/task/driverInfo.vue
  View file @9c06308
@@ -36,18 +36,23 @@ @@ -36,18 +36,23 @@
36 <el-col :span="12" class="bd">{{infoData.remark}}</el-col> 36 <el-col :span="12" class="bd">{{infoData.remark}}</el-col>
37 </el-row> 37 </el-row>
38 38
39 - <div v-for="dict in dicts">  
40 - <p >{{dict.name}}</p>  
41 - <a v-for="item in infoData.attachment" @click="downloadFile(item.attachmentPath);" style="color:blue;" v-if="item.typeCode == dict.code"><p>{{item.name}}</p></a>  
42 - </div>  
43 - <el-dialog title="" :visible.sync="showPic" append-to-body width="400px">  
44 - <el-image  
45 - style="width: 350px; height: 350px; margin: 5px;"  
46 - :src="picImage"  
47 - :preview-src-list="[picImage]"  
48 - :z-index="2000">  
49 - </el-image>  
50 - </el-dialog> 39 + <div v-for="dict in dicts">
  40 + <p >{{dict.name}}</p>
  41 +
  42 + <el-image v-for="item in infoData.attachment"
  43 + style="width: 40px; height: 40px; margin: 5px;"
  44 + :src="'/remotedown/' + item.attachmentPath"
  45 + :z-index="2000"
  46 + :preview-src-list="[slides1('/remotedown/' + item.attachmentPath)]"
  47 + v-if="Number(item.typeCode) == (dict.code) && (item.attachmentPath.toLowerCase().indexOf('.jpg') > -1 || item.attachmentPath.toLowerCase().indexOf('.png') > -1)">
  48 + </el-image>
  49 + <a v-for="item in infoData.attachment"
  50 + @click="downloadFile(item.attachmentPath);"
  51 + style="color:blue;"
  52 + v-if="Number(item.typeCode) == (dict.code)
  53 + && item.attachmentPath.toLowerCase().indexOf('.jpg') == -1
  54 + && item.attachmentPath.toLowerCase().indexOf('.png') == -1"><p>{{item.name}}</p></a>
  55 + </div>
51 </div> 56 </div>
52 </div> 57 </div>
53 </template> 58 </template>
@@ -96,6 +101,9 @@ import store from &quot;@/store&quot;; @@ -96,6 +101,9 @@ import store from &quot;@/store&quot;;
96 101
97 }, 102 },
98 methods: { 103 methods: {
  104 + slides1(img){
  105 + return img;
  106 + },
99 getInfo() { 107 getInfo() {
100 let id; 108 let id;
101 if (this.businessKey.split(":").length == 2) { 109 if (this.businessKey.split(":").length == 2) {
trash-ui/src/views/activiti/task/index.vue
  View file @9c06308
@@ -40,10 +40,10 @@ @@ -40,10 +40,10 @@
40 <el-option label="็บชๆฃ€็ฃๅฏŸ" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/> 40 <el-option label="็บชๆฃ€็ฃๅฏŸ" value="supervision-gongdi,supervision_anjuan,supervision_company,supervision_xnc"/>
41 </el-select> 41 </el-select>
42 42
43 - <el-button type="primary" size="mini" @click="getList">ๆœ็ดข</el-button> 43 + <el-button type="primary" size="mini" @click="queryParams.pageNum = 1;getList();">ๆœ็ดข</el-button>
44 <el-button size="mini" @click="resetQuery">้‡็ฝฎ</el-button> 44 <el-button size="mini" @click="resetQuery">้‡็ฝฎ</el-button>
45 45
46 - 46 +
47 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/> 47 <taskCard :task="task" v-for="task in taskList" @sendToParent="showTask"/>
48 48
49 <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" 49 <pagination :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
@@ -60,7 +60,7 @@ @@ -60,7 +60,7 @@
60 60
61 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body> 61 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
62 <threestepInfo :businessKey="businessKey" v-if="open2"/> 62 <threestepInfo :businessKey="businessKey" v-if="open2"/>
63 - <el-form v-if="taskName == 'ๅทกๆŸฅ'" :rules="rules" label-width="120px"> 63 + <el-form :rules="rules" label-width="120px">
64 <el-row type="flex" justify="center"> 64 <el-row type="flex" justify="center">
65 <el-col> 65 <el-col>
66 <el-form-item label="่กฅๅ……่ฏดๆ˜Ž"> 66 <el-form-item label="่กฅๅ……่ฏดๆ˜Ž">
@@ -321,19 +321,27 @@ @@ -321,19 +321,27 @@
321 </el-dialog> 321 </el-dialog>
322 322
323 323
324 - <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>  
325 - <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/>  
326 - <el-row>  
327 - <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>  
328 - </el-row> 324 + <el-dialog :title="title" :visible.sync="construct" width="1200px" append-to-body>
  325 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
  326 + <div v-for="item in this.form.formData">
  327 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  328 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  329 + </div>
  330 +
  331 +
  332 + <el-table :data="hisfromData" v-if="hisfromData != null">
  333 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  334 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  335 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  336 + </el-table>
329 <div slot="footer" class="dialog-footer"> 337 <div slot="footer" class="dialog-footer">
330 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button> 338 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button>
331 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button> 339 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button>
332 </div> 340 </div>
333 </el-dialog> 341 </el-dialog>
334 342
335 - <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>  
336 - <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/> 343 + <el-dialog :title="title" :visible.sync="earthsites" width="1200px" append-to-body>
  344 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
337 <div v-for="item in this.form.formData"> 345 <div v-for="item in this.form.formData">
338 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" 346 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
339 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/> 347 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -352,8 +360,8 @@ @@ -352,8 +360,8 @@
352 </div> 360 </div>
353 </el-dialog> 361 </el-dialog>
354 362
355 - <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>  
356 - <contractInfo :businessKey="businessKey" v-if="contract"/> 363 + <el-dialog :title="title" :visible.sync="contract" width="1200px" append-to-body>
  364 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
357 365
358 <div v-for="item in this.form.formData"> 366 <div v-for="item in this.form.formData">
359 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" 367 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
@@ -543,8 +551,8 @@ @@ -543,8 +551,8 @@
543 </div> 551 </div>
544 </el-dialog> 552 </el-dialog>
545 553
546 - <el-dialog :title="title" :visible.sync="company" width="700px" append-to-body :close-on-click-modal="false">  
547 - <companyInfo :businessKey="businessKey" v-if="company"/> 554 + <el-dialog :title="title" :visible.sync="company" width="1200px" append-to-body :close-on-click-modal="false">
  555 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
548 <div v-for="item in this.form.formData"> 556 <div v-for="item in this.form.formData">
549 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" 557 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
550 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/> 558 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -562,8 +570,8 @@ @@ -562,8 +570,8 @@
562 </div> 570 </div>
563 </el-dialog> 571 </el-dialog>
564 572
565 - <el-dialog :title="title" :visible.sync="vehicle" width="700px" append-to-body :close-on-click-modal="false">  
566 - <vehicleInfo :businessKey="businessKey" v-if="vehicle"/> 573 + <el-dialog :title="title" :visible.sync="vehicle" width="1200px" append-to-body :close-on-click-modal="false">
  574 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
567 <div v-for="item in this.form.formData"> 575 <div v-for="item in this.form.formData">
568 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" 576 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
569 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/> 577 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -581,8 +589,8 @@ @@ -581,8 +589,8 @@
581 </div> 589 </div>
582 </el-dialog> 590 </el-dialog>
583 591
584 - <el-dialog :title="title" :visible.sync="driver" width="700px" append-to-body :close-on-click-modal="false">  
585 - <driverInfo :businessKey="businessKey" v-if="driver"/> 592 + <el-dialog :title="title" :visible.sync="driver" width="1200px" append-to-body :close-on-click-modal="false">
  593 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
586 <div v-for="item in this.form.formData"> 594 <div v-for="item in this.form.formData">
587 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue" 595 <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
588 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/> 596 placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
@@ -776,7 +784,7 @@ export default { @@ -776,7 +784,7 @@ export default {
776 getDict(dep).then(res => { 784 getDict(dep).then(res => {
777 this.depts = res.result; 785 this.depts = res.result;
778 for(let i in res.result){ 786 for(let i in res.result){
779 - if(res.result[i].indexOf("ๆธฃๅœŸๅŠž") < 1){ 787 + if(res.result[i].name.indexOf("ๆธฃๅœŸๅŠž") < 1){
780 this.prev.push(res.result[i]); 788 this.prev.push(res.result[i]);
781 } 789 }
782 } 790 }
@@ -945,12 +953,18 @@ export default { @@ -945,12 +953,18 @@ export default {
945 this.id = row.id; 953 this.id = row.id;
946 this.taskName = row.name; 954 this.taskName = row.name;
947 historyFromData(this.businessKey).then(response => { 955 historyFromData(this.businessKey).then(response => {
948 - this.hisfromData = response.data 956 + this.hisfromData = [];
  957 + this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time})
  958 + for(let i in response.data){
  959 +
  960 + this.hisfromData.push(response.data[i]);
  961 + }
949 }) 962 })
950 963
951 formDataShow(row.id).then(response => { 964 formDataShow(row.id).then(response => {
952 let datas = response.data; 965 let datas = response.data;
953 let formData = [] 966 let formData = []
  967 + let text = "";
954 for (let i = 0; i < datas.length; i++) { 968 for (let i = 0; i < datas.length; i++) {
955 let strings = datas[i].split('--__!!') 969 let strings = datas[i].split('--__!!')
956 let controlValue = null 970 let controlValue = null
@@ -960,6 +974,9 @@ export default { @@ -960,6 +974,9 @@ export default {
960 controlValue = idx; 974 controlValue = idx;
961 controlDefault = strings[4] 975 controlDefault = strings[4]
962 break; 976 break;
  977 + case 'textarea':
  978 + text = controlValue;
  979 + break;
963 // default: 980 // default:
964 } 981 }
965 formData.push({ 982 formData.push({
@@ -988,16 +1005,8 @@ export default { @@ -988,16 +1005,8 @@ export default {
988 return; 1005 return;
989 } 1006 }
990 1007
991 - if (this.definitionKey == "workflow_constructsite") {  
992 - getSignByObjId(this.businessKey.split(":")[1]).then(res => {  
993 - if (this.definitionKey == "workflow_constructsite") {  
994 -  
995 - this.signDataInfo = "็ป็ŽฐๅœบๆŸฅๅ‹˜ๅŠๆ ธๅฏน่ต„ๆ–™๏ผŒ็Žฐๅœบ่ฎพๆ–ฝๅŸบๆœฌ่พพๅˆฐๅ‡€่ฝฆๅ‡บๅœบๆ ‡ๅ‡†๏ผŒๅปบ่ฎฎๆŒ‰็จ‹ๅบๅŠž็†็›ธๅ…ณๆ‰‹็ปญ๏ผŒๅฆฅๅฆ๏ผŒ่ฏทๆ‰น็คบใ€‚";  
996 -  
997 - this.signData = res.data;  
998 - this.construct = true;  
999 - }  
1000 - }); 1008 + if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
  1009 + this.construct = true;
1001 return; 1010 return;
1002 } 1011 }
1003 if (this.definitionKey == "workflow_earthsites") { 1012 if (this.definitionKey == "workflow_earthsites") {
@@ -1072,7 +1081,6 @@ export default { @@ -1072,7 +1081,6 @@ export default {
1072 1081
1073 /** ๆไบคๆŒ‰้’ฎ */ 1082 /** ๆไบคๆŒ‰้’ฎ */
1074 submitForm(formid, value) { 1083 submitForm(formid, value) {
1075 - debugger;  
1076 this.form.formData[0].controlValue = value; 1084 this.form.formData[0].controlValue = value;
1077 this.form.formData[0].controlId = formid; 1085 this.form.formData[0].controlId = formid;
1078 this.form.id = this.businessKey.split(":")[1]; 1086 this.form.id = this.businessKey.split(":")[1];
@@ -1121,18 +1129,28 @@ export default { @@ -1121,18 +1129,28 @@ export default {
1121 let query = { 1129 let query = {
1122 objectId: objId, 1130 objectId: objId,
1123 }; 1131 };
  1132 + let text = "";
  1133 + for (let i = 0; i < this.form.formData.length; i++) {
  1134 + let strings = this.form.formData[i];
  1135 + switch (strings.controlType) {
  1136 + case 'textarea':
  1137 + text = strings.controlValue;
  1138 + break;
  1139 + }
  1140 + }
  1141 +
1124 if (this.taskName == "ๅ‹˜ๅฏŸ็ง‘ๅ‘˜") { 1142 if (this.taskName == "ๅ‹˜ๅฏŸ็ง‘ๅ‘˜") {
1125 query.idx = 0; 1143 query.idx = 0;
1126 - query.sign1Text = this.signDataInfo; 1144 + query.sign1Text = text;
1127 } else if (this.taskName == "ๅ ชๅฏŸ้ƒจ้•ฟ") { 1145 } else if (this.taskName == "ๅ ชๅฏŸ้ƒจ้•ฟ") {
1128 query.idx = 1; 1146 query.idx = 1;
1129 - query.sign2Text = this.signDataInfo; 1147 + query.sign2Text = text;
1130 } else if (this.taskName == "ๅ ชๅฏŸๅˆ†็ฎก้ข†ๅฏผ") { 1148 } else if (this.taskName == "ๅ ชๅฏŸๅˆ†็ฎก้ข†ๅฏผ") {
1131 query.idx = 2; 1149 query.idx = 2;
1132 - query.sign3Text = this.signDataInfo; 1150 + query.sign3Text = text
1133 } else if (this.taskName == "ไธญๅฟƒ่ดŸ่ดฃไบบ") { 1151 } else if (this.taskName == "ไธญๅฟƒ่ดŸ่ดฃไบบ") {
1134 query.idx = 3; 1152 query.idx = 3;
1135 - query.sign4Text = this.signDataInfo; 1153 + query.sign4Text = text;
1136 } 1154 }
1137 1155
1138 addSign(query).then(res => { 1156 addSign(query).then(res => {
@@ -1291,7 +1309,8 @@ export default { @@ -1291,7 +1309,8 @@ export default {
1291 } 1309 }
1292 if (this.definitionKey == "workflow_company" || 1310 if (this.definitionKey == "workflow_company" ||
1293 this.definitionKey == "workflow_driver" || 1311 this.definitionKey == "workflow_driver" ||
1294 - this.definitionKey == "workflow_vehicle") { 1312 + this.definitionKey == "workflow_vehicle" ||
  1313 + this.definitionKey == "workflow_constructsite_edit") {
1295 formDataSave(this.id, this.form.formData).then(response => { 1314 formDataSave(this.id, this.form.formData).then(response => {
1296 this.msgSuccess("ๅฎกๆ‰นๆˆๅŠŸ"); 1315 this.msgSuccess("ๅฎกๆ‰นๆˆๅŠŸ");
1297 this.cancel(); 1316 this.cancel();
trash-ui/src/views/activiti/task/sitePaper.vue
  View file @9c06308
@@ -4,10 +4,10 @@ @@ -4,10 +4,10 @@
4 <el-button @click="printBody" :style="{'display':hide}">ๆ‰“ๅฐ</el-button> 4 <el-button @click="printBody" :style="{'display':hide}">ๆ‰“ๅฐ</el-button>
5 5
6 <div id="printItem"> 6 <div id="printItem">
7 - <h2 style="text-align:center;">้•ฟๆฒ™ๅธ‚ๅปบ็ญ‘ๅžƒๅœพๅค„็ฝฎๆŠ€ๆœฏๅ‹˜ๅฏŸๆ„่ง่กจ</h2> 7 + <h2 style="text-align:center;">้•ฟๆฒ™ๅธ‚ๅปบ็ญ‘ๅžƒๅœพๅค„็ฝฎๆŠ€ๆœฏๅ‹˜ๆŸฅๆ„่ง่กจ</h2>
8 <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center"> 8 <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
9 <el-col :span="1" class="bd_padding"> 9 <el-col :span="1" class="bd_padding">
10 - ๅ‹˜ๅฏŸไบบๅ‘˜ๅกซๅ†™ 10 + ๅ‹˜ๆŸฅไบบๅ‘˜ๅกซๅ†™
11 </el-col> 11 </el-col>
12 <el-col :span="23" class="bd_left"> 12 <el-col :span="23" class="bd_left">
13 <el-row class="bd_bottom" > 13 <el-row class="bd_bottom" >
trash-ui/src/views/activiti/task/taskCard.vue
  View file @9c06308
1 <template> 1 <template>
2 <el-card class="box-card"> 2 <el-card class="box-card">
3 <div 3 <div
4 - :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='1',agree:task.checkStatus=='0'}">  
5 - {{task.checkStatus? task.checkStatus=="0"?"ๅทฒๅŒๆ„":"ๅทฒๆ‹’็ป" : "ๅพ…ๅฎกๆ‰น"}}</div> 4 + :class="{card_status:true,notcheck:!task.checkStatus,dismiss:task.checkStatus=='2',agree:task.checkStatus=='1'}">
  5 + {{task.checkStatus? task.checkStatus=="1"?"ๅทฒๅŒๆ„":"ๅทฒๆ‹’็ป" : "ๅพ…ๅฎกๆ‰น"}}</div>
6 <el-row class="card_row"> 6 <el-row class="card_row">
7 <el-col :span="20" class="card_grid"> 7 <el-col :span="20" class="card_grid">
8 <div class="card_title">{{task.instanceName}}</div> 8 <div class="card_title">{{task.instanceName}}</div>
trash-ui/src/views/activiti/task/vehicleInfo.vue
  View file @9c06308
@@ -50,10 +50,22 @@ @@ -50,10 +50,22 @@
50 <el-col :span="18" class="bd">{{infoData.comment}}</el-col> 50 <el-col :span="18" class="bd">{{infoData.comment}}</el-col>
51 </el-row> 51 </el-row>
52 52
53 - <div v-for="dict in dicts">  
54 - <p >{{dict.name}}</p>  
55 - <a v-for="item in infoData.attachmentList" @click="downloadFile(item.attachmentPath);" style="color:blue;" v-if="item.typeCode == dict.code"><p>{{item.name}}</p></a>  
56 - </div> 53 + <div v-for="dict in dicts">
  54 + <p >{{dict.name}}</p>
  55 + <el-image v-for="item in infoData.attachmentList"
  56 + style="width: 40px; height: 40px; margin: 5px;"
  57 + :src="'/remotedown/' + item.attachmentPath"
  58 + :z-index="2000"
  59 + :preview-src-list="[slides1('/remotedown/' + item.attachmentPath)]"
  60 + v-if="item.typeCode == dict.code && (item.attachmentPath.toLowerCase().indexOf('.jpg') > -1 || item.attachmentPath.toLowerCase().indexOf('.png') > -1)">
  61 + </el-image>
  62 + <a v-for="item in infoData.attachmentList"
  63 + @click="downloadFile(item.attachmentPath);"
  64 + style="color:blue;"
  65 + v-if="item.typeCode == dict.code
  66 + && item.attachmentPath.toLowerCase().indexOf('.jpg') == -1
  67 + && item.attachmentPath.toLowerCase().indexOf('.png') == -1"><p>{{item.name}}</p></a>
  68 + </div>
57 69
58 </div> 70 </div>
59 71
@@ -114,6 +126,9 @@ import store from &quot;@/store&quot;; @@ -114,6 +126,9 @@ import store from &quot;@/store&quot;;
114 126
115 }, 127 },
116 methods: { 128 methods: {
  129 + slides1(img){
  130 + return img;
  131 + },
117 getInfo() { 132 getInfo() {
118 let id; 133 let id;
119 if (this.businessKey.split(":").length == 2) { 134 if (this.businessKey.split(":").length == 2) {
trash-ui/src/views/activiti/taskhistory/index.vue
  View file @9c06308
@@ -43,12 +43,17 @@ @@ -43,12 +43,17 @@
43 </el-dialog> 43 </el-dialog>
44 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body> 44 <el-dialog :title="title" :visible.sync="open2" width="800px" append-to-body>
45 <threestepInfo :businessKey="businessKey" v-if="open2"/> 45 <threestepInfo :businessKey="businessKey" v-if="open2"/>
  46 + <el-table :data="hisfromData" v-if="hisfromData != null">
  47 +
  48 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  49 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  50 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  51 + </el-table>
46 </el-dialog> 52 </el-dialog>
47 53
48 - <el-dialog :title="title" :visible.sync="construct" width="800px" append-to-body>  
49 - <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct"/> 54 + <el-dialog :title="title" :visible.sync="construct" width="1200px" append-to-body>
  55 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
50 <el-table :data="hisfromData" v-if="hisfromData != null"> 56 <el-table :data="hisfromData" v-if="hisfromData != null">
51 -  
52 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/> 57 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
53 <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/> 58 <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
54 <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/> 59 <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
@@ -65,18 +70,17 @@ @@ -65,18 +70,17 @@
65 </el-dialog> 70 </el-dialog>
66 71
67 72
68 - <el-dialog :title="title" :visible.sync="earthsites" width="800px" append-to-body>  
69 - <earthsitesInfo :businessKey="businessKey" v-if="earthsites"/> 73 + <el-dialog :title="title" :visible.sync="earthsites" width="1200px" append-to-body>
  74 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
70 <el-table :data="hisfromData" v-if="hisfromData != null"> 75 <el-table :data="hisfromData" v-if="hisfromData != null">
71 -  
72 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/> 76 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
73 <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/> 77 <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
74 <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/> 78 <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
75 </el-table> 79 </el-table>
76 </el-dialog> 80 </el-dialog>
77 81
78 - <el-dialog :title="title" :visible.sync="contract" width="800px" append-to-body>  
79 - <contractInfo :businessKey="businessKey" v-if="contract"/> 82 + <el-dialog :title="title" :visible.sync="contract" width="1200px" append-to-body>
  83 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
80 <el-table :data="hisfromData" v-if="hisfromData != null"> 84 <el-table :data="hisfromData" v-if="hisfromData != null">
81 85
82 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/> 86 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
@@ -127,8 +131,8 @@ @@ -127,8 +131,8 @@
127 </el-table> 131 </el-table>
128 </el-dialog> 132 </el-dialog>
129 133
130 - <el-dialog :title="title" :visible.sync="company" width="850px" append-to-body :close-on-click-modal="false">  
131 - <companyInfo :businessKey="businessKey" v-if="company"/> 134 + <el-dialog :title="title" :visible.sync="company" width="1200px" append-to-body :close-on-click-modal="false">
  135 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
132 <el-table :data="hisfromData" v-if="hisfromData != null"> 136 <el-table :data="hisfromData" v-if="hisfromData != null">
133 137
134 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/> 138 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
@@ -138,7 +142,7 @@ @@ -138,7 +142,7 @@
138 </el-dialog> 142 </el-dialog>
139 143
140 <el-dialog :title="title" :visible.sync="vehicle" width="850px" append-to-body :close-on-click-modal="false"> 144 <el-dialog :title="title" :visible.sync="vehicle" width="850px" append-to-body :close-on-click-modal="false">
141 - <vehicleInfo :businessKey="businessKey" v-if="vehicle"/> 145 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
142 <el-table :data="hisfromData" v-if="hisfromData != null"> 146 <el-table :data="hisfromData" v-if="hisfromData != null">
143 147
144 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/> 148 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
@@ -148,7 +152,7 @@ @@ -148,7 +152,7 @@
148 </el-dialog> 152 </el-dialog>
149 153
150 <el-dialog :title="title" :visible.sync="driver" width="850px" append-to-body :close-on-click-modal="false"> 154 <el-dialog :title="title" :visible.sync="driver" width="850px" append-to-body :close-on-click-modal="false">
151 - <driverInfo :businessKey="businessKey" v-if="driver"/> 155 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
152 <el-table :data="hisfromData" v-if="hisfromData != null"> 156 <el-table :data="hisfromData" v-if="hisfromData != null">
153 157
154 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/> 158 <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
@@ -167,6 +171,8 @@ import { @@ -167,6 +171,8 @@ import {
167 formDataShow 171 formDataShow
168 } from "@/api/activiti/taskhistory"; 172 } from "@/api/activiti/taskhistory";
169 173
  174 +import {historyFromData} from '@/api/activiti/historyFormdata'
  175 +
170 import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign"; 176 import {getSignByObjId, addSign, updateSign} from "@/api/sign/sign";
171 import taskCard from "@/views/activiti/task/taskCard"; 177 import taskCard from "@/views/activiti/task/taskCard";
172 import earthSitesForm from "@/views/workflow/earthSitesForm"; 178 import earthSitesForm from "@/views/workflow/earthSitesForm";
@@ -317,7 +323,7 @@ export default { @@ -317,7 +323,7 @@ export default {
317 this.taskList = response.rows; 323 this.taskList = response.rows;
318 this.total = response.total; 324 this.total = response.total;
319 this.loading = false; 325 this.loading = false;
320 - 326 +
321 if(!this.names) 327 if(!this.names)
322 this.names = response.names; 328 this.names = response.names;
323 }); 329 });
@@ -358,7 +364,14 @@ export default { @@ -358,7 +364,14 @@ export default {
358 this.id = row.id; 364 this.id = row.id;
359 365
360 historyFromData(this.businessKey).then(response => { 366 historyFromData(this.businessKey).then(response => {
361 - this.hisfromData = response.data 367 +
  368 + this.hisfromData = [];
  369 +
  370 + this.hisfromData.push({createName:row.createBy,controlValue:row.reason,createTime:row.time});
  371 + for(let i in response.data){
  372 +
  373 + this.hisfromData.push(response.data[i]);
  374 + }
362 }) 375 })
363 376
364 377
@@ -408,12 +421,10 @@ export default { @@ -408,12 +421,10 @@ export default {
408 this.leaveApplicationOpen = true; 421 this.leaveApplicationOpen = true;
409 return; 422 return;
410 } 423 }
  424 + if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
  425 +
411 426
412 - if (this.definitionKey == "workflow_constructsite") {  
413 - getSignByObjId(this.businessKey.split(":")[1]).then(res => {  
414 - this.signData = res;  
415 this.construct = true; 427 this.construct = true;
416 - });  
417 return; 428 return;
418 } 429 }
419 if (this.definitionKey == "workflow_earthsites") { 430 if (this.definitionKey == "workflow_earthsites") {
trash-ui/src/views/business/CompanyCredit/index.vue
  View file @9c06308
@@ -61,7 +61,7 @@ @@ -61,7 +61,7 @@
61 61
62 <el-row :gutter="10" class="mb8"> 62 <el-row :gutter="10" class="mb8">
63 <el-col :span="1.5"> 63 <el-col :span="1.5">
64 - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['Company:credit:add']" v-if="queryParams.status==0">ๆ–ฐๅขž</el-button> 64 + <el-button type="primary" size="mini" @click="handleAdd" v-if="queryParams.status==0 && checkPer(['businessmanage.credit.CompanyCredit.add'])">ๆ–ฐๅขž</el-button>
65 </el-col> 65 </el-col>
66 <el-col :span="1.5"> 66 <el-col :span="1.5">
67 <el-button size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">ๅฏผๅ‡บ</el-button> 67 <el-button size="mini" @click="handleExport" v-hasPermi="['Company:credit:export']">ๅฏผๅ‡บ</el-button>
@@ -88,7 +88,8 @@ @@ -88,7 +88,8 @@
88 <el-table-column label="ๅคฑไฟกๅŽŸๅ› " align="center" prop="reason" /> 88 <el-table-column label="ๅคฑไฟกๅŽŸๅ› " align="center" prop="reason" />
89 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 89 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
90 <template slot-scope="scope"> 90 <template slot-scope="scope">
91 - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0">ๆ’ค้”€ๅคฑไฟก</el-button> 91 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['Company:credit:edit']" v-if="queryParams.status==0 &&
  92 + checkPer(['businessmanage.credit.CompanyCredit.revoke'])">ๆ’ค้”€ๅคฑไฟก</el-button>
92 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button> 93 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button>
93 </template> 94 </template>
94 </el-table-column> 95 </el-table-column>
@@ -168,4 +169,3 @@ @@ -168,4 +169,3 @@
168 169
169 170
170 <script src="../../../api/company_credit.js" /> 171 <script src="../../../api/company_credit.js" />
171 -  
trash-ui/src/views/business/ConstructionCredit/index.vue
  View file @9c06308
@@ -56,7 +56,8 @@ @@ -56,7 +56,8 @@
56 <el-row :gutter="10" class="mb8"> 56 <el-row :gutter="10" class="mb8">
57 <el-col :span="1.5"> 57 <el-col :span="1.5">
58 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']" 58 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:ConstructionCredit:add']"
59 - v-if="queryParams.status==0">ๆ–ฐๅขž</el-button> 59 + v-if="queryParams.status==0 &&
  60 + checkPer(['businessmanage.credit.ConstructionCredit.add'])">ๆ–ฐๅขž</el-button>
60 </el-col> 61 </el-col>
61 <el-col :span="1.5"> 62 <el-col :span="1.5">
62 <el-button size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">ๅฏผๅ‡บ</el-button> 63 <el-button size="mini" @click="handleExport" v-hasPermi="['business:ConstructionCredit:export']">ๅฏผๅ‡บ</el-button>
@@ -86,7 +87,8 @@ @@ -86,7 +87,8 @@
86 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 87 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
87 <template slot-scope="scope"> 88 <template slot-scope="scope">
88 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" 89 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
89 - v-hasPermi="['business:ConstructionCredit:edit']" v-if="queryParams.status==0">ๆ’ค้”€ๅคฑไฟก</el-button> 90 + v-hasPermi="['business:ConstructionCredit:edit']" v-if="queryParams.status==0&&
  91 + checkPer(['businessmanage.credit.ConstructionCredit.revoke'])">ๆ’ค้”€ๅคฑไฟก</el-button>
90 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" 92 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)"
91 v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button> 93 v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button>
92 </template> 94 </template>
trash-ui/src/views/business/DriverCredit/index.vue
  View file @9c06308
@@ -12,8 +12,7 @@ @@ -12,8 +12,7 @@
12 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch"> 12 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
13 <el-row type="flex" justify="center"> 13 <el-row type="flex" justify="center">
14 <el-col> 14 <el-col>
15 - <el-form-item label="้ฉพ้ฉถๅ‘˜ๅง“ๅ" prop="name"  
16 - style="float:right;"> 15 + <el-form-item label="้ฉพ้ฉถๅ‘˜ๅง“ๅ" prop="name">
17 <el-select v-model="queryParams.name" 16 <el-select v-model="queryParams.name"
18 filterable 17 filterable
19 18
@@ -29,7 +28,24 @@ @@ -29,7 +28,24 @@
29 </el-select> 28 </el-select>
30 </el-form-item> 29 </el-form-item>
31 </el-col> 30 </el-col>
  31 + <el-col>
  32 + <el-form-item label="่ฝฆ็‰Œๅท" prop="licenseplateNo">
  33 + <el-select v-model="queryParams.licenseplateNo"
  34 + filterable
  35 +
  36 + reserve-keyword
  37 + placeholder="่ฝฆ็‰Œๅท"
  38 + size="small"
  39 + :loading="loading">
  40 + <el-option
  41 + v-for="item in dictLicenseplateNo"
  42 + :label="item"
  43 + :value="item">
  44 + </el-option>
  45 + </el-select>
  46 + </el-form-item>
32 47
  48 + </el-col>
33 <el-col> 49 <el-col>
34 <el-form-item label="ๅคฑไฟกๆ—ฅๆœŸ" prop="time" v-show="queryParams.status==0"> 50 <el-form-item label="ๅคฑไฟกๆ—ฅๆœŸ" prop="time" v-show="queryParams.status==0">
35 <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date" 51 <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date"
@@ -43,7 +59,9 @@ @@ -43,7 +59,9 @@
43 59
44 <el-row :gutter="10" class="mb8"> 60 <el-row :gutter="10" class="mb8">
45 <el-col :span="1.5"> 61 <el-col :span="1.5">
46 - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']" v-if="queryParams.status==0">ๆ–ฐๅขž</el-button> 62 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['driver:credit:add']" v-if="queryParams.status==0
  63 + && checkPer(['businessmanage.credit.DriverCredit.add'])">ๆ–ฐๅขž</el-button>
  64 +
47 </el-col> 65 </el-col>
48 <el-col :span="1.5"> 66 <el-col :span="1.5">
49 <el-button size="mini" @click="handleExport" v-hasPermi="['driver:credit:export']">ๅฏผๅ‡บ</el-button> 67 <el-button size="mini" @click="handleExport" v-hasPermi="['driver:credit:export']">ๅฏผๅ‡บ</el-button>
@@ -62,6 +80,7 @@ @@ -62,6 +80,7 @@
62 <el-table-column label="ๅบๅท" align="center" type="index" /> 80 <el-table-column label="ๅบๅท" align="center" type="index" />
63 <el-table-column label="้ฉพ้ฉถๅ‘˜ๅง“ๅ" align="center" prop="name" /> 81 <el-table-column label="้ฉพ้ฉถๅ‘˜ๅง“ๅ" align="center" prop="name" />
64 <el-table-column label="่ฏไปถๅท็ " align="center" prop="idNumber" /> 82 <el-table-column label="่ฏไปถๅท็ " align="center" prop="idNumber" />
  83 + <el-table-column label="่ฝฆ็‰Œๅท" align="center" prop="licenseplateNo" />
65 <el-table-column label="ๅคฑไฟกๆ—ถ้—ด" align="center" prop="time" width="180" v-if="queryParams.status==0"> 84 <el-table-column label="ๅคฑไฟกๆ—ถ้—ด" align="center" prop="time" width="180" v-if="queryParams.status==0">
66 <template slot-scope="scope"> 85 <template slot-scope="scope">
67 <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span> 86 <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span>
@@ -70,7 +89,8 @@ @@ -70,7 +89,8 @@
70 <el-table-column label="ๅคฑไฟกๅŽŸๅ› " align="center" prop="reason" /> 89 <el-table-column label="ๅคฑไฟกๅŽŸๅ› " align="center" prop="reason" />
71 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 90 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
72 <template slot-scope="scope"> 91 <template slot-scope="scope">
73 - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['driver:credit:edit']" v-if="queryParams.status==0">ๆ’ค้”€ๅคฑไฟก</el-button> 92 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['driver:credit:edit']" v-if="queryParams.status==0&&
  93 + checkPer(['businessmanage.credit.DriverCredit.revoke'])">ๆ’ค้”€ๅคฑไฟก</el-button>
74 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button> 94 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button>
75 </template> 95 </template>
76 </el-table-column> 96 </el-table-column>
@@ -102,6 +122,9 @@ @@ -102,6 +122,9 @@
102 <el-form-item label="่ฏไปถๅท็ " prop="idNumber"> 122 <el-form-item label="่ฏไปถๅท็ " prop="idNumber">
103 <el-input v-model="form.idNumber" placeholder="่ฏไปถๅท็ " disabled/> 123 <el-input v-model="form.idNumber" placeholder="่ฏไปถๅท็ " disabled/>
104 </el-form-item> 124 </el-form-item>
  125 + <el-form-item label="่ฝฆ็‰Œๅท" prop="licenseplateNo">
  126 + <el-input v-model="form.licenseplateNo" placeholder="่ฝฆ็‰Œๅท" disabled/>
  127 + </el-form-item>
105 <el-form-item label="ๅคฑไฟกๅŽŸๅ› " prop="reason"> 128 <el-form-item label="ๅคฑไฟกๅŽŸๅ› " prop="reason">
106 <el-input v-model="form.reason" placeholder="ๅคฑไฟกๅŽŸๅ› " /> 129 <el-input v-model="form.reason" placeholder="ๅคฑไฟกๅŽŸๅ› " />
107 </el-form-item> 130 </el-form-item>
trash-ui/src/views/business/EarthSitesCredit/index.vue
  View file @9c06308
@@ -54,7 +54,8 @@ @@ -54,7 +54,8 @@
54 54
55 <el-row :gutter="10" class="mb8"> 55 <el-row :gutter="10" class="mb8">
56 <el-col :span="1.5"> 56 <el-col :span="1.5">
57 - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']" v-if="queryParams.status==0">ๆ–ฐๅขž</el-button> 57 + <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['EarthSites:credit:add']" v-if="queryParams.status==0&&
  58 + checkPer(['businessmanage.credit.EarthSitesCredi.add'])">ๆ–ฐๅขž</el-button>
58 </el-col> 59 </el-col>
59 <el-col :span="1.5"> 60 <el-col :span="1.5">
60 <el-button size="mini" @click="handleExport" v-hasPermi="['EarthSites:credit:export']">ๅฏผๅ‡บ</el-button> 61 <el-button size="mini" @click="handleExport" v-hasPermi="['EarthSites:credit:export']">ๅฏผๅ‡บ</el-button>
@@ -82,7 +83,8 @@ @@ -82,7 +83,8 @@
82 <el-table-column label="ๅคฑไฟกๅŽŸๅ› " align="center" prop="reason" /> 83 <el-table-column label="ๅคฑไฟกๅŽŸๅ› " align="center" prop="reason" />
83 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 84 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
84 <template slot-scope="scope"> 85 <template slot-scope="scope">
85 - <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['EarthSites:credit:edit']" v-if="queryParams.status==0">ๆ’ค้”€ๅคฑไฟก</el-button> 86 + <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" v-hasPermi="['EarthSites:credit:edit']" v-if="queryParams.status==0&&
  87 + checkPer(['businessmanage.credit.EarthSitesCredi.revoke'])">ๆ’ค้”€ๅคฑไฟก</el-button>
86 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button> 88 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button>
87 </template> 89 </template>
88 </el-table-column> 90 </el-table-column>
trash-ui/src/views/business/TruckCredit/index.vue
  View file @9c06308
@@ -50,7 +50,8 @@ @@ -50,7 +50,8 @@
50 <el-row :gutter="10" class="mb8"> 50 <el-row :gutter="10" class="mb8">
51 <el-col :span="1.5"> 51 <el-col :span="1.5">
52 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['truck:credit:add']" 52 <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['truck:credit:add']"
53 - v-if="queryParams.status==0">ๆ–ฐๅขž</el-button> 53 + v-if="queryParams.status==0&&
  54 + checkPer(['businessmanage.credit.TruckCredit.add'])">ๆ–ฐๅขž</el-button>
54 </el-col> 55 </el-col>
55 <el-col :span="1.5"> 56 <el-col :span="1.5">
56 <el-button size="mini" @click="handleExport" v-hasPermi="['truck:credit:export']">ๅฏผๅ‡บ</el-button> 57 <el-button size="mini" @click="handleExport" v-hasPermi="['truck:credit:export']">ๅฏผๅ‡บ</el-button>
@@ -79,7 +80,7 @@ @@ -79,7 +80,7 @@
79 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 80 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
80 <template slot-scope="scope"> 81 <template slot-scope="scope">
81 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)" 82 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
82 - v-hasPermi="['truck:credit:edit']" v-if="queryParams.status==0">ๆ’ค้”€ๅคฑไฟก</el-button> 83 + v-hasPermi="['truck:credit:edit']" v-if="queryParams.status==0&& checkPer(['businessmanage.credit.TruckCredit.revoke'])">ๆ’ค้”€ๅคฑไฟก</el-button>
83 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)" 84 <el-button size="mini" type="text" icon="el-icon-edit" @click="getDataInfo(scope.row)"
84 v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button> 85 v-if="queryParams.status==1">ๆŸฅ็œ‹</el-button>
85 </template> 86 </template>
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @9c06308
@@ -18,7 +18,7 @@ @@ -18,7 +18,7 @@
18 </el-row> 18 </el-row>
19 19
20 <el-form :model="queryParams" ref="queryForm" label-width="100px"> 20 <el-form :model="queryParams" ref="queryForm" label-width="100px">
21 - <el-row> 21 + <el-row v-if="this.queryParams.his < 2">
22 <el-col :span="6"> 22 <el-col :span="6">
23 <el-form-item label="ๅทฅๅœฐๅ็งฐ" > 23 <el-form-item label="ๅทฅๅœฐๅ็งฐ" >
24 <!-- <el-input v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅ้กน็›ฎๅ็งฐ" size="small" /> --> 24 <!-- <el-input v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅ้กน็›ฎๅ็งฐ" size="small" /> -->
@@ -52,6 +52,25 @@ @@ -52,6 +52,25 @@
52 </el-form-item> 52 </el-form-item>
53 </el-col> 53 </el-col>
54 </el-row> 54 </el-row>
  55 + <el-row v-if="this.queryParams.his > 1">
  56 + <el-col :span="6">
  57 + <el-form-item label="ๅ็งฐ" >
  58 + <!-- <el-input v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅ้กน็›ฎๅ็งฐ" size="small" /> -->
  59 +
  60 + <el-select v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅๅทฅๅœฐๅ็งฐ " filterable size="small">
  61 + <el-option v-for="item in names" :label="item" :value="item" />
  62 + </el-select>
  63 + </el-form-item>
  64 + </el-col>
  65 +
  66 + <el-col :span="6">
  67 + <el-form-item label="ๅŒบๅฑž" >
  68 + <el-select v-model="queryParams.place" placeholder="ๅทฅๅœฐๆ‰€ๅฑžๅŒบๅŸŸ " size="small">
  69 + <el-option v-for="item in areas" :label="item.name" :value="item.code" />
  70 + </el-select>
  71 + </el-form-item>
  72 + </el-col>
  73 + </el-row>
55 <el-row> 74 <el-row>
56 <el-col :span="6"> 75 <el-col :span="6">
57 <el-form-item label="ๅผ€ๅง‹ๆ—ถ้—ด" v-if="this.queryParams.his > 0"> 76 <el-form-item label="ๅผ€ๅง‹ๆ—ถ้—ด" v-if="this.queryParams.his > 0">
@@ -78,7 +97,7 @@ @@ -78,7 +97,7 @@
78 <el-col :span="1.5"> 97 <el-col :span="1.5">
79 <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">ๅฏผๅ‡บ</el-button> 98 <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">ๅฏผๅ‡บ</el-button>
80 </el-col> 99 </el-col>
81 - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> 100 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList(queryParams.his)"></right-toolbar>
82 </el-row> 101 </el-row>
83 102
84 <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="!queryParams.his || queryParams.his == 1"> 103 <el-table :data="threestepList" @selection-change="handleSelectionChange" v-if="!queryParams.his || queryParams.his == 1">
@@ -130,7 +149,7 @@ @@ -130,7 +149,7 @@
130 </el-table-column> 149 </el-table-column>
131 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 150 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
132 <template slot-scope="scope"> 151 <template slot-scope="scope">
133 - <el-button size="mini" type="text" @click="getInfo(scope.row,0);" v-hasPermi="['business:threestep:edit']">ๆŸฅ็œ‹่ฏฆๆƒ…</el-button> 152 + <el-button size="mini" type="text" @click="getInfo(scope.row);" v-hasPermi="['business:threestep:edit']">ๆŸฅ็œ‹่ฏฆๆƒ…</el-button>
134 </template> 153 </template>
135 </el-table-column> 154 </el-table-column>
136 </el-table> 155 </el-table>
trash-ui/src/views/business/threestep/index.vue
  View file @9c06308
@@ -3,11 +3,11 @@ @@ -3,11 +3,11 @@
3 <el-row :gutter="10" class="mb8"> 3 <el-row :gutter="10" class="mb8">
4 <el-col :span="1.5"> 4 <el-col :span="1.5">
5 <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" 5 <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini"
6 - @click="getList(0);">ๆŠฅๅทฅ่‡ชๆŸฅ</el-button> 6 + @click="getList(0);" v-if="checkPer(['business.supervision.threestep.selfcheck'])">ๆŠฅๅทฅ่‡ชๆŸฅ</el-button>
7 </el-col> 7 </el-col>
8 <el-col :span="1.5"> 8 <el-col :span="1.5">
9 <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini" 9 <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini"
10 - @click="getList(1);">ๆŠฅๅทฅๆŠฝๆŸฅ</el-button> 10 + @click="getList(1);" v-if="checkPer(['business.supervision.threestep.spotcheck'])">ๆŠฅๅทฅๆŠฝๆŸฅ</el-button>
11 </el-col> 11 </el-col>
12 </el-row> 12 </el-row>
13 13
@@ -48,10 +48,11 @@ @@ -48,10 +48,11 @@
48 48
49 <el-row :gutter="10" class="mb8"> 49 <el-row :gutter="10" class="mb8">
50 <el-col :span="1.5"> 50 <el-col :span="1.5">
51 - <el-button type="primary" size="mini" @click="handleAdd" v-hasPermi="['business:threestep:add']" v-if="this.queryParams.pageStatus==0 && new Date().getHours() > 7 && new Date().getHours() < 24">ๆ–ฐๅขž</el-button> 51 + <el-button type="primary" size="mini" @click="handleAdd" v-if="this.queryParams.pageStatus==0 && new Date().getHours() > 7 && new Date().getHours() < 24
  52 + && checkPer(['business.supervision.threestep.add'])">ๆ–ฐๅขž</el-button>
52 </el-col> 53 </el-col>
53 <el-col :span="1.5"> 54 <el-col :span="1.5">
54 - <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">ๅฏผๅ‡บ</el-button> 55 + <el-button size="mini" @click="handleExport">ๅฏผๅ‡บ</el-button>
55 </el-col> 56 </el-col>
56 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> 57 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
57 </el-row> 58 </el-row>
@@ -87,17 +88,16 @@ @@ -87,17 +88,16 @@
87 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width"> 88 <el-table-column label="ๆ“ไฝœ" align="center" class-name="small-padding fixed-width">
88 <template slot-scope="scope"> 89 <template slot-scope="scope">
89 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row,0)" 90 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row,0)"
90 - v-hasPermi="['business:threestep:edit']" v-if="queryParams.pageStatus==1 && scope.row.status==1 && scope.row.checkEndTime == null">ๆŠฝๆŸฅ</el-button> 91 + v-if="queryParams.pageStatus==1 && scope.row.status==1 && scope.row.checkEndTime == null
  92 + && checkPer(['business.supervision.threestep.spot'])">ๆŠฝๆŸฅ</el-button>
91 <el-button size="mini" type="text" icon="el-icon-edit" @click="reSub(scope.row)" 93 <el-button size="mini" type="text" icon="el-icon-edit" @click="reSub(scope.row)"
92 - v-hasPermi="['business:threestep:add']" v-if="scope.row.status==2">่ขซ้ฉณๅ›ž</el-button>  
93 -  
94 - <el-button size="mini" type="text" @click="handleUpdate(scope.row,1)" v-hasPermi="['business:threestep:edit']">ๆŸฅ็œ‹่ฏฆๆƒ…</el-button> 94 + v-if="scope.row.status==2 && checkPer(['business.supervision.threestep.add'])">่ขซ้ฉณๅ›ž</el-button>
  95 + <el-button size="mini" type="text" @click="handleUpdate(scope.row,1)">ๆŸฅ็œ‹่ฏฆๆƒ…</el-button>
95 </template> 96 </template>
96 </el-table-column> 97 </el-table-column>
97 </el-table> 98 </el-table>
98 99
99 - <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"  
100 - @pagination="getList" /> 100 + <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" @pagination="getList" />
101 101
102 <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body v-loading="loading"> 102 <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body v-loading="loading">
103 <el-form ref="form" :model="form" :rules="rules" label-width="100px" v-if="open"> 103 <el-form ref="form" :model="form" :rules="rules" label-width="100px" v-if="open">
@@ -122,38 +122,16 @@ @@ -122,38 +122,16 @@
122 <el-row type="flex" justify="center" v-if="form.type != null"> 122 <el-row type="flex" justify="center" v-if="form.type != null">
123 <el-col > 123 <el-col >
124 <el-form-item :label="labelName" prop="name"> 124 <el-form-item :label="labelName" prop="name">
125 - <el-select v-model="form.name" filterable reserve-keyword @change="getObjId">  
126 - <el-option v-for="item in remoteData" :label="item.name" 125 + <el-select v-model="form.name" filterable reserve-keyword @change="getObjId" v-el-select-loadmore="loadMore(rangeNumber)">
  126 + <el-option v-for="item in remoteData.slice(0, rangeNumber)" :label="item.name"
127 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place"> 127 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
128 </el-option> 128 </el-option>
129 </el-select> 129 </el-select>
130 </el-form-item> 130 </el-form-item>
131 </el-col> 131 </el-col>
132 - <!-- <el-col :span="12">  
133 - <el-form-item :label="labelName2" prop="place">  
134 - <el-select v-model="bindname" filterable reserve-keyword @change="getEarthsiteId">  
135 - <el-option v-if="item.show"  
136 - v-for="item in bindData"  
137 - :label="item.name"  
138 - :value="item.name"  
139 - :key="item.id">  
140 - </el-option>  
141 - </el-select>  
142 - </el-form-item>  
143 - </el-col> -->  
144 </el-row> 132 </el-row>
145 - <!-- <el-row type="flex" justify="center" v-if="form.type != null">  
146 - <el-col>  
147 - <el-form-item label="ๆถˆ็บณๅˆๅŒ" prop="contract">  
148 - <el-select v-model="form.contract" filterable reserve-keyword @change="conractCheck">  
149 - <el-option v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">  
150 - </el-option>  
151 - </el-select>  
152 - </el-form-item>  
153 - </el-col>  
154 - </el-row> -->  
155 <el-row type="flex" justify="center" v-if="form.type == 0" > 133 <el-row type="flex" justify="center" v-if="form.type == 0" >
156 - <el-col :span="12" > 134 + <el-col :span="24" >
157 <el-form-item label="่ฟ่พ“ไผไธš" prop="companys"> 135 <el-form-item label="่ฟ่พ“ไผไธš" prop="companys">
158 <el-select v-model="form.companys" filterable multiple @change="checkCompany" > 136 <el-select v-model="form.companys" filterable multiple @change="checkCompany" >
159 <el-option v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id" 137 <el-option v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id"
@@ -161,12 +139,14 @@ @@ -161,12 +139,14 @@
161 </el-select> 139 </el-select>
162 </el-form-item> 140 </el-form-item>
163 </el-col> 141 </el-col>
164 - <el-col :span="12" >  
165 - <el-form-item label="่ฟ่พ“่ฝฆ่พ†" prop="companyTrucks" >  
166 - <el-select v-model="form.companyTrucks" filterable multiple reserve-keyword >  
167 - <el-option v-for="item in truckList" :label="item.licenseplateNo" :value="item.id" :key="item.id"  
168 - v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"></el-option>  
169 - </el-select> 142 + </el-row>
  143 +
  144 + <el-row type="flex" justify="center" v-if="form.type == 0" >
  145 + <el-col :span="24" >
  146 + <el-form-item label="่ฟ่พ“่ฝฆ่พ†" prop="trucks" >
  147 + <el-checkbox-group v-model="form.trucks" style="max-height: 200px;overflow: auto;">
  148 + <el-checkbox :label="item.licenseplateNo" v-for="item in truckList" v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"/>
  149 + </el-checkbox-group>
170 </el-form-item> 150 </el-form-item>
171 </el-col> 151 </el-col>
172 </el-row> 152 </el-row>
@@ -196,6 +176,10 @@ @@ -196,6 +176,10 @@
196 :preview-src-list="[item.url]" 176 :preview-src-list="[item.url]"
197 :z-index="2000"> 177 :z-index="2000">
198 </el-image> 178 </el-image>
  179 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  180 + v-for="item in videos[0]">
  181 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  182 + </div>
199 <el-input v-model="form.img0" type="hidden"></el-input> 183 <el-input v-model="form.img0" type="hidden"></el-input>
200 <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p> 184 <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
201 </el-col> 185 </el-col>
@@ -208,6 +192,11 @@ @@ -208,6 +192,11 @@
208 :preview-src-list="[item.url]" 192 :preview-src-list="[item.url]"
209 :z-index="2000"> 193 :z-index="2000">
210 </el-image> 194 </el-image>
  195 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  196 + v-for="item in videos[1]" >
  197 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  198 + </div>
  199 +
211 <el-input v-model="form.img1" type="hidden"></el-input> 200 <el-input v-model="form.img1" type="hidden"></el-input>
212 <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p> 201 <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
213 </el-col> 202 </el-col>
@@ -220,6 +209,10 @@ @@ -220,6 +209,10 @@
220 :preview-src-list="[item.url]" 209 :preview-src-list="[item.url]"
221 :z-index="2000"> 210 :z-index="2000">
222 </el-image> 211 </el-image>
  212 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  213 + v-for="item in videos[2]" >
  214 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  215 + </div>
223 <el-input v-model="form.img2" type="hidden"></el-input> 216 <el-input v-model="form.img2" type="hidden"></el-input>
224 <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p> 217 <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
225 </el-col> 218 </el-col>
@@ -232,6 +225,10 @@ @@ -232,6 +225,10 @@
232 :preview-src-list="[item.url]" 225 :preview-src-list="[item.url]"
233 :z-index="2000"> 226 :z-index="2000">
234 </el-image> 227 </el-image>
  228 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  229 + v-for="item in videos[3]" >
  230 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  231 + </div>
235 <el-input v-model="form.img3" type="hidden"></el-input> 232 <el-input v-model="form.img3" type="hidden"></el-input>
236 <p v-for="(img,index) in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p> 233 <p v-for="(img,index) in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p>
237 </el-col> 234 </el-col>
@@ -246,6 +243,10 @@ @@ -246,6 +243,10 @@
246 :preview-src-list="[item.url]" 243 :preview-src-list="[item.url]"
247 :z-index="2000"> 244 :z-index="2000">
248 </el-image> 245 </el-image>
  246 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  247 + v-for="item in videos[4]" >
  248 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  249 + </div>
249 <el-input v-model="form.img4" type="hidden"></el-input> 250 <el-input v-model="form.img4" type="hidden"></el-input>
250 <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p> 251 <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
251 </el-col> 252 </el-col>
@@ -258,6 +259,10 @@ @@ -258,6 +259,10 @@
258 :preview-src-list="[item.url]" 259 :preview-src-list="[item.url]"
259 :z-index="2000"> 260 :z-index="2000">
260 </el-image> 261 </el-image>
  262 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  263 + v-for="item in videos[5]" >
  264 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  265 + </div>
261 <el-input v-model="form.img5" type="hidden"></el-input> 266 <el-input v-model="form.img5" type="hidden"></el-input>
262 <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p> 267 <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
263 </el-col> 268 </el-col>
@@ -270,6 +275,10 @@ @@ -270,6 +275,10 @@
270 :preview-src-list="[item.url]" 275 :preview-src-list="[item.url]"
271 :z-index="2000"> 276 :z-index="2000">
272 </el-image> 277 </el-image>
  278 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  279 + v-for="item in videos[6]" >
  280 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  281 + </div>
273 <el-input v-model="form.img6" type="hidden"></el-input> 282 <el-input v-model="form.img6" type="hidden"></el-input>
274 <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p> 283 <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
275 </el-col> 284 </el-col>
@@ -282,6 +291,10 @@ @@ -282,6 +291,10 @@
282 :preview-src-list="[item.url]" 291 :preview-src-list="[item.url]"
283 :z-index="2000"> 292 :z-index="2000">
284 </el-image> 293 </el-image>
  294 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  295 + v-for="item in videos[7]" >
  296 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  297 + </div>
285 <el-input v-model="form.img7" type="hidden"></el-input> 298 <el-input v-model="form.img7" type="hidden"></el-input>
286 <p v-for="(img,index) in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p> 299 <p v-for="(img,index) in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p>
287 </el-col> 300 </el-col>
@@ -296,6 +309,10 @@ @@ -296,6 +309,10 @@
296 :preview-src-list="[item.url]" 309 :preview-src-list="[item.url]"
297 :z-index="2000"> 310 :z-index="2000">
298 </el-image> 311 </el-image>
  312 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  313 + v-for="item in videos[8]" >
  314 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  315 + </div>
299 <el-input v-model="form.img8" type="hidden"></el-input> 316 <el-input v-model="form.img8" type="hidden"></el-input>
300 <p v-for="(img,index) in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p> 317 <p v-for="(img,index) in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p>
301 </el-col> 318 </el-col>
@@ -308,6 +325,10 @@ @@ -308,6 +325,10 @@
308 :preview-src-list="[item.url]" 325 :preview-src-list="[item.url]"
309 :z-index="2000"> 326 :z-index="2000">
310 </el-image> 327 </el-image>
  328 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  329 + v-for="item in videos[9]" >
  330 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  331 + </div>
311 <el-input v-model="form.img9" type="hidden"></el-input> 332 <el-input v-model="form.img9" type="hidden"></el-input>
312 <p v-for="(img,index) in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p> 333 <p v-for="(img,index) in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p>
313 </el-col> 334 </el-col>
@@ -320,6 +341,10 @@ @@ -320,6 +341,10 @@
320 :preview-src-list="[item.url]" 341 :preview-src-list="[item.url]"
321 :z-index="2000"> 342 :z-index="2000">
322 </el-image> 343 </el-image>
  344 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  345 + v-for="item in videos[10]" >
  346 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  347 + </div>
323 <el-input v-model="form.img10" type="hidden"></el-input> 348 <el-input v-model="form.img10" type="hidden"></el-input>
324 <p v-for="(img,index) in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a></p> 349 <p v-for="(img,index) in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a></p>
325 </el-col> 350 </el-col>
@@ -332,6 +357,10 @@ @@ -332,6 +357,10 @@
332 :preview-src-list="[item.url]" 357 :preview-src-list="[item.url]"
333 :z-index="2000"> 358 :z-index="2000">
334 </el-image> 359 </el-image>
  360 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  361 + v-for="item in videos[11]" >
  362 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  363 + </div>
335 <el-input v-model="form.img11" type="hidden"></el-input> 364 <el-input v-model="form.img11" type="hidden"></el-input>
336 <p v-for="(img,index) in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a></p> 365 <p v-for="(img,index) in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a></p>
337 </el-col> 366 </el-col>
@@ -344,6 +373,10 @@ @@ -344,6 +373,10 @@
344 :preview-src-list="[item.url]" 373 :preview-src-list="[item.url]"
345 :z-index="2000"> 374 :z-index="2000">
346 </el-image> 375 </el-image>
  376 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  377 + v-for="item in videos[12]" >
  378 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  379 + </div>
347 <el-input v-model="form.img12" type="hidden"></el-input> 380 <el-input v-model="form.img12" type="hidden"></el-input>
348 <p v-for="(img,index) in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a></p> 381 <p v-for="(img,index) in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a></p>
349 </el-col> 382 </el-col>
@@ -378,6 +411,10 @@ @@ -378,6 +411,10 @@
378 :preview-src-list="[item.url]" 411 :preview-src-list="[item.url]"
379 :z-index="2000"> 412 :z-index="2000">
380 </el-image> 413 </el-image>
  414 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  415 + v-for="item in videos[91]" >
  416 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  417 + </div>
381 <el-input v-model="form.attchItem1" type="hidden"></el-input> 418 <el-input v-model="form.attchItem1" type="hidden"></el-input>
382 <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img,91)" style="color:red"> x</a></p> 419 <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img,91)" style="color:red"> x</a></p>
383 </el-col> 420 </el-col>
@@ -390,6 +427,10 @@ @@ -390,6 +427,10 @@
390 :preview-src-list="[item.url]" 427 :preview-src-list="[item.url]"
391 :z-index="2000"> 428 :z-index="2000">
392 </el-image> 429 </el-image>
  430 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  431 + v-for="item in videos[92]" >
  432 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  433 + </div>
393 <el-input v-model="form.attchItem2" type="hidden"></el-input> 434 <el-input v-model="form.attchItem2" type="hidden"></el-input>
394 <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img,92)" style="color:red"> x</a></p> 435 <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img,92)" style="color:red"> x</a></p>
395 </el-col> 436 </el-col>
@@ -402,6 +443,10 @@ @@ -402,6 +443,10 @@
402 :preview-src-list="[item.url]" 443 :preview-src-list="[item.url]"
403 :z-index="2000"> 444 :z-index="2000">
404 </el-image> 445 </el-image>
  446 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  447 + v-for="item in videos[93]" >
  448 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  449 + </div>
405 <el-input v-model="form.attchItem3" type="hidden"></el-input> 450 <el-input v-model="form.attchItem3" type="hidden"></el-input>
406 <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img,93)" style="color:red"> x</a></p> 451 <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img,93)" style="color:red"> x</a></p>
407 </el-col> 452 </el-col>
@@ -424,7 +469,7 @@ @@ -424,7 +469,7 @@
424 <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList" 469 <el-upload multiple :headers="upload.headers" :action="upload.url" :file-list="fileList"
425 :on-success="uploadSuccess" :before-upload="beforeUpload"> 470 :on-success="uploadSuccess" :before-upload="beforeUpload">
426 <el-button size="small" type="primary">้€‰ๆ‹ฉ้™„ไปถ</el-button> 471 <el-button size="small" type="primary">้€‰ๆ‹ฉ้™„ไปถ</el-button>
427 - <div slot="tip" class="el-upload__tip">ๅช่ƒฝไธŠไผ ไธ่ถ…่ฟ‡ 20MB ็š„jpgใ€pngใ€pdfใ€wordๆ–‡ไปถ</div> 472 + <div slot="tip" class="el-upload__tip">ๅช่ƒฝไธŠไผ ไธ่ถ…่ฟ‡ 20MB ็š„jpgใ€pngใ€pdfใ€mp4,avi,wordๆ–‡ไปถ</div>
428 </el-upload> 473 </el-upload>
429 <div style="height: 40px;width:100%;"> 474 <div style="height: 40px;width:100%;">
430 <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">ๅ…ณ้—ญ</el-button> 475 <el-button type="primary" style="margin-top: 20px;float:right;" @click="handleClose">ๅ…ณ้—ญ</el-button>
trash-ui/src/views/business/threestep/threestepInfo.vue
  View file @9c06308
@@ -79,6 +79,11 @@ @@ -79,6 +79,11 @@
79 :preview-src-list="[slides1(img)]" 79 :preview-src-list="[slides1(img)]"
80 :z-index="2000"> 80 :z-index="2000">
81 </el-image> 81 </el-image>
  82 +
  83 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  84 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  85 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  86 + </div>
82 <br/> 87 <br/>
83 <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a> 88 <a @click="downloadFile(img);" style="color: blue;">{{img.split("/")[img.split("/").length -1]}}</a>
84 </el-col> 89 </el-col>
@@ -94,6 +99,10 @@ @@ -94,6 +99,10 @@
94 :preview-src-list="[slides1(img)]" 99 :preview-src-list="[slides1(img)]"
95 :z-index="2000"> 100 :z-index="2000">
96 </el-image> 101 </el-image>
  102 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  103 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  104 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  105 + </div>
97 <br/> 106 <br/>
98 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 107 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
99 </el-col> 108 </el-col>
@@ -109,6 +118,10 @@ @@ -109,6 +118,10 @@
109 :preview-src-list="[slides1(img)]" 118 :preview-src-list="[slides1(img)]"
110 :z-index="2000"> 119 :z-index="2000">
111 </el-image> 120 </el-image>
  121 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  122 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  123 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  124 + </div>
112 <br/> 125 <br/>
113 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 126 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
114 </el-col> 127 </el-col>
@@ -124,6 +137,10 @@ @@ -124,6 +137,10 @@
124 :preview-src-list="[slides1(img)]" 137 :preview-src-list="[slides1(img)]"
125 :z-index="2000"> 138 :z-index="2000">
126 </el-image> 139 </el-image>
  140 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  141 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  142 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  143 + </div>
127 <br/> 144 <br/>
128 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 145 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
129 </el-col> 146 </el-col>
@@ -139,6 +156,10 @@ @@ -139,6 +156,10 @@
139 :preview-src-list="[slides1(img)]" 156 :preview-src-list="[slides1(img)]"
140 :z-index="2000"> 157 :z-index="2000">
141 </el-image> 158 </el-image>
  159 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  160 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  161 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  162 + </div>
142 <br/> 163 <br/>
143 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 164 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
144 </el-col> 165 </el-col>
@@ -154,6 +175,10 @@ @@ -154,6 +175,10 @@
154 :preview-src-list="[slides1(img)]" 175 :preview-src-list="[slides1(img)]"
155 :z-index="2000"> 176 :z-index="2000">
156 </el-image> 177 </el-image>
  178 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  179 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  180 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  181 + </div>
157 <br/> 182 <br/>
158 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 183 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
159 </el-col> 184 </el-col>
@@ -169,6 +194,10 @@ @@ -169,6 +194,10 @@
169 :preview-src-list="[slides1(img)]" 194 :preview-src-list="[slides1(img)]"
170 :z-index="2000"> 195 :z-index="2000">
171 </el-image> 196 </el-image>
  197 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  198 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  199 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  200 + </div>
172 <br/> 201 <br/>
173 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 202 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
174 </el-col> 203 </el-col>
@@ -184,6 +213,10 @@ @@ -184,6 +213,10 @@
184 :preview-src-list="[slides1(img)]" 213 :preview-src-list="[slides1(img)]"
185 :z-index="2000"> 214 :z-index="2000">
186 </el-image> 215 </el-image>
  216 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  217 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  218 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  219 + </div>
187 <br/> 220 <br/>
188 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 221 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
189 </el-col> 222 </el-col>
@@ -199,6 +232,10 @@ @@ -199,6 +232,10 @@
199 :preview-src-list="[slides1(img)]" 232 :preview-src-list="[slides1(img)]"
200 :z-index="2000"> 233 :z-index="2000">
201 </el-image> 234 </el-image>
  235 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  236 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  237 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  238 + </div>
202 <br/> 239 <br/>
203 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 240 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
204 </el-col> 241 </el-col>
@@ -214,6 +251,10 @@ @@ -214,6 +251,10 @@
214 :preview-src-list="[slides1(img)]" 251 :preview-src-list="[slides1(img)]"
215 :z-index="2000"> 252 :z-index="2000">
216 </el-image> 253 </el-image>
  254 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  255 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  256 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  257 + </div>
217 <br/> 258 <br/>
218 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 259 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
219 </el-col> 260 </el-col>
@@ -229,6 +270,10 @@ @@ -229,6 +270,10 @@
229 :preview-src-list="[slides1(img)]" 270 :preview-src-list="[slides1(img)]"
230 :z-index="2000"> 271 :z-index="2000">
231 </el-image> 272 </el-image>
  273 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  274 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  275 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  276 + </div>
232 <br/> 277 <br/>
233 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 278 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
234 </el-col> 279 </el-col>
@@ -244,6 +289,10 @@ @@ -244,6 +289,10 @@
244 :preview-src-list="[slides1(img)]" 289 :preview-src-list="[slides1(img)]"
245 :z-index="2000"> 290 :z-index="2000">
246 </el-image> 291 </el-image>
  292 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  293 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  294 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  295 + </div>
247 <br/> 296 <br/>
248 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 297 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
249 </el-col> 298 </el-col>
@@ -259,6 +308,10 @@ @@ -259,6 +308,10 @@
259 :preview-src-list="[slides1(img)]" 308 :preview-src-list="[slides1(img)]"
260 :z-index="2000"> 309 :z-index="2000">
261 </el-image> 310 </el-image>
  311 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  312 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  313 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  314 + </div>
262 <br/> 315 <br/>
263 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 316 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
264 </el-col> 317 </el-col>
@@ -307,6 +360,10 @@ @@ -307,6 +360,10 @@
307 :preview-src-list="[slides1(img)]" 360 :preview-src-list="[slides1(img)]"
308 :z-index="2000"> 361 :z-index="2000">
309 </el-image> 362 </el-image>
  363 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  364 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  365 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  366 + </div>
310 <br/> 367 <br/>
311 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 368 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
312 </el-col> 369 </el-col>
@@ -322,6 +379,10 @@ @@ -322,6 +379,10 @@
322 :preview-src-list="[slides1(img)]" 379 :preview-src-list="[slides1(img)]"
323 :z-index="2000"> 380 :z-index="2000">
324 </el-image> 381 </el-image>
  382 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  383 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  384 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  385 + </div>
325 <br/> 386 <br/>
326 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 387 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
327 </el-col> 388 </el-col>
@@ -337,6 +398,10 @@ @@ -337,6 +398,10 @@
337 :preview-src-list="[slides1(img)]" 398 :preview-src-list="[slides1(img)]"
338 :z-index="2000"> 399 :z-index="2000">
339 </el-image> 400 </el-image>
  401 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  402 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  403 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  404 + </div>
340 <br/> 405 <br/>
341 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 406 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
342 </el-col> 407 </el-col>
@@ -352,6 +417,10 @@ @@ -352,6 +417,10 @@
352 :preview-src-list="[slides1(img)]" 417 :preview-src-list="[slides1(img)]"
353 :z-index="2000"> 418 :z-index="2000">
354 </el-image> 419 </el-image>
  420 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  421 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  422 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  423 + </div>
355 <br/> 424 <br/>
356 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 425 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
357 </el-col> 426 </el-col>
@@ -367,6 +436,10 @@ @@ -367,6 +436,10 @@
367 :preview-src-list="[slides1(img)]" 436 :preview-src-list="[slides1(img)]"
368 :z-index="2000"> 437 :z-index="2000">
369 </el-image> 438 </el-image>
  439 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  440 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  441 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  442 + </div>
370 <br/> 443 <br/>
371 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 444 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
372 </el-col> 445 </el-col>
@@ -382,6 +455,10 @@ @@ -382,6 +455,10 @@
382 :preview-src-list="[slides1(img)]" 455 :preview-src-list="[slides1(img)]"
383 :z-index="2000"> 456 :z-index="2000">
384 </el-image> 457 </el-image>
  458 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  459 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  460 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  461 + </div>
385 <br/> 462 <br/>
386 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 463 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
387 </el-col> 464 </el-col>
@@ -397,6 +474,10 @@ @@ -397,6 +474,10 @@
397 :preview-src-list="[slides1(img)]" 474 :preview-src-list="[slides1(img)]"
398 :z-index="2000"> 475 :z-index="2000">
399 </el-image> 476 </el-image>
  477 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  478 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  479 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  480 + </div>
400 <br/> 481 <br/>
401 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 482 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
402 </el-col> 483 </el-col>
@@ -412,6 +493,10 @@ @@ -412,6 +493,10 @@
412 :preview-src-list="[slides1(img)]" 493 :preview-src-list="[slides1(img)]"
413 :z-index="2000"> 494 :z-index="2000">
414 </el-image> 495 </el-image>
  496 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  497 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  498 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  499 + </div>
415 <br/> 500 <br/>
416 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 501 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
417 </el-col> 502 </el-col>
@@ -427,6 +512,10 @@ @@ -427,6 +512,10 @@
427 :preview-src-list="[slides1(img)]" 512 :preview-src-list="[slides1(img)]"
428 :z-index="2000"> 513 :z-index="2000">
429 </el-image> 514 </el-image>
  515 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  516 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  517 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  518 + </div>
430 <br/> 519 <br/>
431 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 520 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
432 </el-col> 521 </el-col>
@@ -442,6 +531,10 @@ @@ -442,6 +531,10 @@
442 :preview-src-list="[slides1(img)]" 531 :preview-src-list="[slides1(img)]"
443 :z-index="2000"> 532 :z-index="2000">
444 </el-image> 533 </el-image>
  534 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  535 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  536 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  537 + </div>
445 <br/> 538 <br/>
446 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 539 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
447 </el-col> 540 </el-col>
@@ -457,6 +550,10 @@ @@ -457,6 +550,10 @@
457 :preview-src-list="[slides1(img)]" 550 :preview-src-list="[slides1(img)]"
458 :z-index="2000"> 551 :z-index="2000">
459 </el-image> 552 </el-image>
  553 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  554 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  555 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  556 + </div>
460 <br/> 557 <br/>
461 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 558 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
462 </el-col> 559 </el-col>
@@ -472,6 +569,10 @@ @@ -472,6 +569,10 @@
472 :preview-src-list="[slides1(img)]" 569 :preview-src-list="[slides1(img)]"
473 :z-index="2000"> 570 :z-index="2000">
474 </el-image> 571 </el-image>
  572 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  573 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  574 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  575 + </div>
475 <br/> 576 <br/>
476 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 577 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
477 </el-col> 578 </el-col>
@@ -487,6 +588,10 @@ @@ -487,6 +588,10 @@
487 :preview-src-list="[slides1(img)]" 588 :preview-src-list="[slides1(img)]"
488 :z-index="2000"> 589 :z-index="2000">
489 </el-image> 590 </el-image>
  591 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  592 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  593 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  594 + </div>
490 <br/> 595 <br/>
491 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a> 596 <a @click="downloadFile(img);" style="color: blue;" >{{img.split("/")[img.split("/").length -1]}}</a>
492 </el-col> 597 </el-col>
trash-ui/src/views/business/truckActivate/index.vue
  View file @9c06308
@@ -45,7 +45,7 @@ @@ -45,7 +45,7 @@
45 <el-row :gutter="10" class="mb8"> 45 <el-row :gutter="10" class="mb8">
46 <el-col :span="1.5"> 46 <el-col :span="1.5">
47 <el-button 47 <el-button
48 - v-if="this.queryParams.status==0" 48 + v-if="this.queryParams.status==0 && checkPer(['business.supervision.truckActivate.active'])"
49 type="primary" 49 type="primary"
50 size="mini" 50 size="mini"
51 @click="handleAdd" 51 @click="handleAdd"
trash-ui/src/views/caseOffline/caseOffline/index.vue
  View file @9c06308
@@ -33,6 +33,7 @@ @@ -33,6 +33,7 @@
33 size="mini" 33 size="mini"
34 @click="handleAdd" 34 @click="handleAdd"
35 v-hasPermi="['caseOffline:caseOffline:add']" 35 v-hasPermi="['caseOffline:caseOffline:add']"
  36 + v-if="checkPer(['intelligencecontrols.messagemanage.add'])"
36 >ๆ–ฐๅขž 37 >ๆ–ฐๅขž
37 </el-button> 38 </el-button>
38 </el-col> 39 </el-col>
@@ -96,7 +97,7 @@ @@ -96,7 +97,7 @@
96 </el-select> 97 </el-select>
97 </el-form-item> 98 </el-form-item>
98 <el-form-item :label="form.siteType==0?'ๅทฅๅœฐๅ็งฐ':'ๅค„็†ๅœบๆ‰€ๅ็งฐ'" prop="siteName"> 99 <el-form-item :label="form.siteType==0?'ๅทฅๅœฐๅ็งฐ':'ๅค„็†ๅœบๆ‰€ๅ็งฐ'" prop="siteName">
99 - <el-select v-model="form.siteName" placeholder="่ฏท้€‰ๆ‹ฉ็ฑปๅž‹"> 100 + <el-select v-model="form.siteName" placeholder="่ฏท้€‰ๆ‹ฉ็ฑปๅž‹" allow-create filterable>
100 <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" 101 <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name"
101 @native.click="getSite(item)"/> 102 @native.click="getSite(item)"/>
102 </el-select> 103 </el-select>
@@ -124,8 +125,8 @@ @@ -124,8 +125,8 @@
124 <video width="100%" controls="controls" height="100%" :src="item.url"></video> 125 <video width="100%" controls="controls" height="100%" :src="item.url"></video>
125 </div> 126 </div>
126 <el-input v-model="form.attach" type="hidden"></el-input> 127 <el-input v-model="form.attach" type="hidden"></el-input>
127 - <div style="color: blue;" v-for="(img,index) in form.attach">{{ img.split("/")[img.split("/").length - 1] }}<a  
128 - @click="removeAttchItem(index,img)" style="color:red;">X</a></div> 128 + <div style="color: blue;" v-for="(img,index) in form.attach">{{ img.split("/")[img.split("/").length - 1] }}
  129 + <a @click="removeAttchItem(index,img)" style="color:red;">X</a></div>
129 </el-form-item> 130 </el-form-item>
130 131
131 </el-form> 132 </el-form>
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @9c06308
@@ -54,6 +54,8 @@ @@ -54,6 +54,8 @@
54 size="mini" 54 size="mini"
55 @click="handleAdd" 55 @click="handleAdd"
56 v-hasPermi="['casefile:violationCaseFile:add']" 56 v-hasPermi="['casefile:violationCaseFile:add']"
  57 +
  58 + v-if="checkPer(['intelligencecontrols.messagemanage.enter'])"
57 >่ฟ่ง„ๆกˆๅทๅฝ•ๅ…ฅ</el-button> 59 >่ฟ่ง„ๆกˆๅทๅฝ•ๅ…ฅ</el-button>
58 </el-col> 60 </el-col>
59 <!-- <el-col :span="1.5">--> 61 <!-- <el-col :span="1.5">-->
trash-ui/src/views/casefile/violationWarningInformation/index.vue
  View file @9c06308
@@ -46,6 +46,8 @@ @@ -46,6 +46,8 @@
46 size="mini" 46 size="mini"
47 @click="handleAdd" 47 @click="handleAdd"
48 v-hasPermi="['casefile:violationWarningInformation:add']" 48 v-hasPermi="['casefile:violationWarningInformation:add']"
  49 +
  50 + v-if="checkPer(['taskrun.messagetask.add'])"
49 >้ข„่ญฆไฟกๆฏๅฝ•ๅ…ฅ</el-button> 51 >้ข„่ญฆไฟกๆฏๅฝ•ๅ…ฅ</el-button>
50 </el-col> 52 </el-col>
51 <!-- <el-col :span="1.5">--> 53 <!-- <el-col :span="1.5">-->
trash-ui/src/views/h5/caseOffline/index.vue
  View file @9c06308
@@ -95,7 +95,7 @@ @@ -95,7 +95,7 @@
95 </el-select> 95 </el-select>
96 </el-form-item> 96 </el-form-item>
97 <el-form-item :label="form.siteType==0?'ๅทฅๅœฐๅ็งฐ':'ๅค„็†ๅœบๆ‰€ๅ็งฐ'" prop="siteName"> 97 <el-form-item :label="form.siteType==0?'ๅทฅๅœฐๅ็งฐ':'ๅค„็†ๅœบๆ‰€ๅ็งฐ'" prop="siteName">
98 - <el-select v-model="form.siteName" placeholder="่ฏท้€‰ๆ‹ฉ็ฑปๅž‹"> 98 + <el-select v-model="form.siteName" placeholder="่ฏท้€‰ๆ‹ฉ็ฑปๅž‹" allow-create filterable>
99 <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" @native.click="getSite(item)"/> 99 <el-option v-for="item in data[form.siteType]" :label="item.name" :value="item.name" @native.click="getSite(item)"/>
100 </el-select> 100 </el-select>
101 </el-form-item> 101 </el-form-item>
trash-ui/src/views/h5/dayWorkReport/index.vue
  View file @9c06308
1 <template> 1 <template>
2 <div class="app-container" > 2 <div class="app-container" >
3 <el-row :gutter="10" class="mb8"> 3 <el-row :gutter="10" class="mb8">
4 - <el-col :span="1.5">  
5 - <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini"  
6 - @click="getList(0);">ๆŠฅๅทฅ่ฎฐๅฝ•</el-button>  
7 - </el-col>  
8 - <el-col :span="1.5">  
9 - <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini"  
10 - @click="getList(1);">ๅŽ†ๅฒๆŠฅๅทฅ่ฎฐๅฝ•</el-button>  
11 - </el-col>  
12 - </el-row> 4 + <el-col :span="1.5">
  5 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==0}" size="mini" @click="getList(0);">ๆœ‰ๆ•ˆๆŠฅๅทฅ่ฎฐๅฝ•</el-button>
  6 + </el-col>
  7 + <el-col :span="1.5">
  8 + <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==1}" size="mini" @click="getList(1);">ๅŽ†ๅฒๆŠฅๅทฅ่ฎฐๅฝ•</el-button>
  9 + </el-col>
  10 +
  11 + <el-col :span="1.5">
  12 + <el-button :class="{'el-button':true, 'el-button--primary':this.queryParams.pageStatus==2}" size="mini" @click="getList(2);">ๅทฅๅœฐๆŠฅๅทฅ่ฎฐๅฝ•</el-button>
  13 + </el-col>
  14 + <el-col :span="1.5">
  15 + <el-button :class="{'el-button':true,'el-button--primary':this.queryParams.pageStatus==3}" size="mini" @click="getList(3);">ๅค„็†ๅœบๆ‰€ๆŠฅๅทฅ่ฎฐๅฝ•</el-button>
  16 + </el-col>
  17 +
  18 + </el-row>
  19 +
  20 + <el-form :model="queryParams" ref="queryForm" label-width="100px">
  21 + <el-row v-if="this.queryParams.his < 2">
  22 + <el-form-item label="ๅทฅๅœฐๅ็งฐ" >
  23 + <!-- <el-input v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅ้กน็›ฎๅ็งฐ" size="small" /> -->
  24 +
  25 + <el-select v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅๅทฅๅœฐๅ็งฐ " filterable size="small">
  26 + <el-option v-for="item in names" :label="item" :value="item" />
  27 + </el-select>
  28 + </el-form-item>
  29 + <el-form-item label="ๅค„็†ๅœบๆ‰€ๅ็งฐ" >
  30 + <!-- <el-input v-model="queryParams.earthsitesName" placeholder="่ฏท่พ“ๅ…ฅๅค„็†ๅœบๆ‰€ๅ็งฐ" size="small" />-->
  31 +
  32 + <el-select v-model="queryParams.earthsitesName" placeholder="่ฏท่พ“ๅ…ฅๅค„็†ๅœบๆ‰€ๅ็งฐ " filterable size="small">
  33 + <el-option v-for="item in enames" :label="item" :value="item" />
  34 + </el-select>
  35 + </el-form-item>
  36 + <el-form-item label="ๅทฅๅœฐๅŒบๅฑž" >
  37 + <el-select v-model="queryParams.place" placeholder="ๅทฅๅœฐๆ‰€ๅฑžๅŒบๅŸŸ " size="small">
  38 + <el-option v-for="item in areas" :label="item.name" :value="item.code" />
  39 + </el-select>
  40 + </el-form-item>
  41 + <el-form-item label="ๅค„็†ๅœบๆ‰€ๅŒบๅฑž" >
  42 + <el-select v-model="queryParams.subReason" placeholder="ๅทฅๅœฐๆ‰€ๅฑžๅŒบๅŸŸ " size="small">
  43 + <el-option v-for="item in areas" :label="item.name" :value="item.name" />
  44 + </el-select>
  45 + </el-form-item>
  46 + </el-row>
  47 + <el-row v-if="this.queryParams.his > 1">
  48 + <el-form-item label="ๅ็งฐ" >
  49 + <!-- <el-input v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅ้กน็›ฎๅ็งฐ" size="small" /> -->
13 50
14 - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="100px">  
15 - <el-form-item label="ๅทฅๅœฐๅ็งฐ" prop="name">  
16 - <el-input v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅ้กน็›ฎๅ็งฐ" size="small"  
17 - />  
18 - </el-form-item>  
19 - <el-form-item label="ๅค„็†ๅœบๆ‰€ๅ็งฐ" prop="earthsitesName">  
20 - <el-input v-model="queryParams.earthsitesName" placeholder="่ฏท่พ“ๅ…ฅๅค„็†ๅœบๆ‰€ๅ็งฐ" size="small"  
21 - />  
22 - </el-form-item>  
23 - <el-form-item label="ๅทฅๅœฐๅŒบๅฑž" prop="place">  
24 - <el-select v-model="queryParams.place" placeholder="ๅทฅๅœฐๆ‰€ๅฑžๅŒบๅŸŸ " size="small">  
25 - <el-option v-for="item in areas" :label="item.name" :value="item.code" />  
26 - </el-select>  
27 - </el-form-item>  
28 -  
29 - <el-form-item label="ๅค„็†ๅœบๆ‰€ๅŒบๅฑž" prop="subReason">  
30 - <el-select v-model="queryParams.subReason" placeholder="ๅทฅๅœฐๆ‰€ๅฑžๅŒบๅŸŸ " size="small">  
31 - <el-option v-for="item in areas" :label="item.name" :value="item.name" />  
32 - </el-select>  
33 - </el-form-item>  
34 - <el-form-item label="ๅผ€ๅง‹ๆ—ถ้—ด" prop="workStartTime" v-if="this.queryParams.his==1">  
35 - <el-date-picker size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"  
36 - value-format="yyyy-MM-dd" placeholder="ๅผ€ๅง‹ๆ—ถ้—ด">  
37 - </el-date-picker>  
38 - </el-form-item>  
39 - <el-form-item label="็ป“ๆŸๆ—ถ้—ด" prop="workEndTime" v-if="this.queryParams.his==1">  
40 - <el-date-picker size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"  
41 - value-format="yyyy-MM-dd" placeholder="็ป“ๆŸๆ—ถ้—ด">  
42 - </el-date-picker>  
43 - </el-form-item>  
44 -  
45 - <el-form-item>  
46 - <el-button type="primary" size="mini" @click="handleQuery">ๆœ็ดข</el-button>  
47 - <el-button size="mini" @click="resetQuery">้‡็ฝฎ</el-button>  
48 - </el-form-item>  
49 - </el-form>  
50 -  
51 -  
52 - <p> {{dayWorkCount}}</p> 51 + <el-select v-model="queryParams.name" placeholder="่ฏท่พ“ๅ…ฅๅทฅๅœฐๅ็งฐ " filterable size="small">
  52 + <el-option v-for="item in names" :label="item" :value="item" />
  53 + </el-select>
  54 + </el-form-item>
  55 +
  56 + <el-form-item label="ๅŒบๅฑž" >
  57 + <el-select v-model="queryParams.place" placeholder="ๅทฅๅœฐๆ‰€ๅฑžๅŒบๅŸŸ " size="small">
  58 + <el-option v-for="item in areas" :label="item.name" :value="item.code" />
  59 + </el-select>
  60 + </el-form-item>
  61 + </el-row>
  62 + <el-row>
  63 + <el-form-item label="ๅผ€ๅง‹ๆ—ถ้—ด" v-if="this.queryParams.his > 0">
  64 + <el-date-picker
  65 + v-model="queryParams.timeRange"
  66 + value-format="yyyy-MM-dd HH:mm:ss"
  67 + type="datetimerange"
  68 + range-separator="่‡ณ"
  69 + start-placeholder="ๅผ€ๅง‹ๆ—ฅๆœŸ"
  70 + end-placeholder="็ป“ๆŸๆ—ฅๆœŸ">
  71 + </el-date-picker>
  72 + </el-form-item>
  73 + </el-row>
  74 + <el-form-item>
  75 + <el-button type="primary" size="mini" @click="handleQuery">ๆœ็ดข</el-button>
  76 + <el-button size="mini" @click="resetQuery">้‡็ฝฎ</el-button>
  77 + </el-form-item>
  78 + </el-form>
  79 +
  80 + <p v-if="queryParams.his < 2"> {{dayWorkCount}}</p>
53 81
54 82
55 <el-row :gutter="10" class="mb8"> 83 <el-row :gutter="10" class="mb8">
56 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> 84 <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
57 </el-row> 85 </el-row>
58 86
59 - <el-card class="box-card" v-for="item in threestepList" style="margin-bottom: 10px;"> 87 + <el-card class="box-card" v-for="item in threestepList" style="margin-bottom: 10px;" v-if="!queryParams.his || queryParams.his == 1">
60 <p>{{item.createTime}} {{item.descript}}</p> 88 <p>{{item.createTime}} {{item.descript}}</p>
61 <el-row class="card_row"> 89 <el-row class="card_row">
62 <el-col :span="24" class="card_grid"> 90 <el-col :span="24" class="card_grid">
@@ -94,6 +122,27 @@ @@ -94,6 +122,27 @@
94 <div>็”ณ่ฏทๆŠฅๅทฅๆ—ถ้—ด:{{item.eselfCheckTime}}</div> 122 <div>็”ณ่ฏทๆŠฅๅทฅๆ—ถ้—ด:{{item.eselfCheckTime}}</div>
95 </el-col> 123 </el-col>
96 </el-row> 124 </el-row>
  125 + </el-card>
  126 +
  127 + <el-card class="box-card" v-for="item in threestepList" style="margin-bottom: 10px;" v-if="queryParams.his > 1">
  128 + <el-row class="card_row">
  129 + <el-col :span="24" class="card_grid">
  130 + <div class="card_title" style="font-weight: bold;">ๅ็งฐ:{{item.name}}</div>
  131 + </el-col>
  132 + </el-row>
  133 + <el-row class="card_row">
  134 + <el-col :span="24" class="card_grid">
  135 + <div class="card_title" style="font-weight: bold;">็ฑปๅž‹:{{ item.type==0?"ๅทฅๅœฐ":"ๅค„็†ๅœบๆ‰€"}}</div>
  136 + </el-col>
  137 + </el-row>
  138 + <el-row class="card_row">
  139 + <el-col :span="24" class="card_grid" >
  140 + <span >ๆ‰€ๅฑžๅŒบ:{{item.place}}</span>
  141 + </el-col>
  142 + <el-col :span="24" class="card_grid" >
  143 + <span >็”ณ่ฏทๆŠฅๅทฅๆ—ถ้—ด:{{item.selfCheckTime}}</span>
  144 + </el-col>
  145 + </el-row>
97 146
98 </el-card> 147 </el-card>
99 148
trash-ui/src/views/h5/task/companyInfo.vue 0 โ†’ 100644
  View file @9c06308
  1 +<template>
  2 + <iframe width="100%" height="600px" frameborder="no" id="iFrame" :src=src></iframe>
  3 +</template>
  4 +
  5 +<script>
  6 +
  7 +
  8 +import store from "@/store";
  9 + import {
  10 + getToken
  11 + } from "@/utils/auth";
  12 +
  13 +
  14 + import {
  15 + getCompanyInfo,
  16 + getArea,
  17 + getDict
  18 + } from "@/api/dict";
  19 +
  20 +
  21 +
  22 + export default {
  23 + name: "ThreestepInfo",
  24 + props: {
  25 + businessKey: {
  26 + type: String
  27 + },
  28 + businessType: {
  29 + type: Number
  30 + },
  31 + },
  32 + data() {
  33 + return {
  34 + src:"",
  35 + sign: store.getters.avatar, //่ฃๅ‰ชๅ›พ็‰‡็š„ๅœฐๅ€
  36 + areas: [],
  37 + loading: null,
  38 + objectDict: {
  39 + constructionSiteID:"ๅทฅๅœฐID",
  40 + constructionSiteName:"ๅทฅๅœฐๅ็งฐ",
  41 + earthSiteID:"ๅค„็†ๅœบๆ‰€ID",
  42 + earthSiteName:"ๅค„็†ๅœบๆ‰€ๅ็งฐ",
  43 + absorbCapacity:"ๆถˆ็บณๅฎน้‡",
  44 + startTime:"ๆœ‰ๆ•ˆๆœŸๅผ€ๅง‹ๆ—ถ้—ด yyyy-mM-dd",
  45 + endTime:"ๆœ‰ๆ•ˆๆœŸ็ป“ๆŸๆ—ถ้—ด yyyy-mM-dd",
  46 + type:"ๅปบ็ญ‘ๅžƒๅœพ็ฑปๅž‹ID",
  47 + typeName:"ๅžƒๅœพ็ฑปๅž‹ๅ็งฐ",
  48 + contractNo:"ๆถˆ็บณๅˆๅŒ็ผ–ๅท",
  49 + routeName:"็บฟ่ทฏๅ็งฐ",
  50 + routeWidth:"็บฟ่ทฏๅฎฝๅบฆ",
  51 + auditStatus:"ๅฎกๆ ธ็Šถๆ€ 0-ๅฎกๆ ธไธญ 1-ๅฎกๆ ธ้€š่ฟ‡ 2-ๅฎกๆ ธ้ฉณๅ›ž",
  52 + auditStatusName:"ๅฎกๆ ธ็Šถๆ€ๅ็งฐ",
  53 + contractStatus:"ๅˆๅŒ็Šถๆ€",
  54 + contractStatusName:"ๅˆๅŒ็Šถๆ€ๅ็งฐ",
  55 + routePoints:"็บฟ่ทฏไฟกๆฏ"},
  56 +
  57 + infoData: {},
  58 +
  59 + dicts:null,
  60 + showPic:false,
  61 + picImage:null,
  62 + }
  63 + },
  64 + created() {
  65 +
  66 +
  67 + let id;
  68 + if (this.businessKey.split(":").length == 2) {
  69 + id = this.businessKey.split(":")[1];
  70 + } else {
  71 + id = this.businessKey;
  72 + }
  73 +
  74 + let http = "http://183.66.242.6:14601";
  75 +
  76 + if(this.businessType == 0){
  77 + this.src = http + "/single/#/enterprise-information/information-detail?id=" + id;
  78 + }
  79 + if(this.businessType == 1){
  80 + this.src = http + "/single/#/vehicleInformation/information-detail?id=" + id;
  81 + }
  82 + if(this.businessType == 2){
  83 + this.src = http + "/single/#/constructionInfo/detail?id="+id+"&type=detail";
  84 + }
  85 + if(this.businessType == 3){
  86 + this.src = http + "/single/#/absorptionsitedetail?absorptionId=" + id;
  87 + }
  88 + if(this.businessType == 4){
  89 + this.src = http + "/single/#/contractInfo/detail?id=" + id;
  90 + }
  91 + if(this.businessType == 5){
  92 + this.src = http + "/single/#/driverdetail?driverId=" + id;
  93 + }
  94 +
  95 + },
  96 +
  97 + }
  98 +</script>
  99 +<style>
  100 + .bd{
  101 + padding:5px;
  102 + }
  103 +
  104 +
  105 +
  106 +</style>
trash-ui/src/views/h5/task/index.vue
  View file @9c06308
@@ -19,7 +19,6 @@ @@ -19,7 +19,6 @@
19 19
20 <!-- ๅฎกๆ‰นๅฏน่ฏๆก† --> 20 <!-- ๅฎกๆ‰นๅฏน่ฏๆก† -->
21 <el-dialog :title="title" :visible.sync="open" v-if="open" width="300px" append-to-body> 21 <el-dialog :title="title" :visible.sync="open" v-if="open" width="300px" append-to-body>
22 -  
23 <div slot="footer" class="dialog-footer"> 22 <div slot="footer" class="dialog-footer">
24 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button> 23 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button>
25 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button> 24 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button>
@@ -28,7 +27,7 @@ @@ -28,7 +27,7 @@
28 27
29 <el-dialog :title="title" :visible.sync="open2" width="400px" append-to-body> 28 <el-dialog :title="title" :visible.sync="open2" width="400px" append-to-body>
30 <threestepInfo :businessKey="businessKey" v-if="open2" /> 29 <threestepInfo :businessKey="businessKey" v-if="open2" />
31 - <el-form v-if="taskName == 'ๅทกๆŸฅ'" :rules="rules" label-width="100px"> 30 + <el-form :rules="rules" label-width="100px">
32 <el-row > 31 <el-row >
33 <el-form-item label="่กฅๅ……่ฏดๆ˜Ž"> 32 <el-form-item label="่กฅๅ……่ฏดๆ˜Ž">
34 <el-input type="textarea" v-model="form.subReason" /> 33 <el-input type="textarea" v-model="form.subReason" />
@@ -194,11 +193,17 @@ @@ -194,11 +193,17 @@
194 193
195 194
196 <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body> 195 <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
197 - <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" />  
198 - <el-row> 196 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
  197 + <div v-for="item in this.form.formData">
  198 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  199 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  200 + </div>
199 201
200 - <el-input v-model="signDataInfo" type="textarea" :rows="4" style="margin-top: 10px;"></el-input>  
201 - </el-row> 202 + <el-table :data="hisfromData" v-if="hisfromData != null">
  203 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  204 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  205 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  206 + </el-table>
202 <div slot="footer" class="dialog-footer"> 207 <div slot="footer" class="dialog-footer">
203 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button> 208 <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> 209 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button>
@@ -207,7 +212,18 @@ @@ -207,7 +212,18 @@
207 212
208 213
209 <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body> 214 <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
210 - <earthsitesInfo :businessKey="businessKey" v-if="earthsites" /> 215 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
  216 + <div v-for="item in this.form.formData">
  217 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  218 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  219 + </div>
  220 +
  221 + <el-table :data="hisfromData" v-if="hisfromData != null">
  222 +
  223 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  224 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  225 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  226 + </el-table>
211 <div slot="footer" class="dialog-footer"> 227 <div slot="footer" class="dialog-footer">
212 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button> 228 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button>
213 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button> 229 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button>
@@ -215,7 +231,19 @@ @@ -215,7 +231,19 @@
215 </el-dialog> 231 </el-dialog>
216 232
217 <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body> 233 <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
218 - <contractInfo :businessKey="businessKey" v-if="contract" /> 234 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
  235 +
  236 + <div v-for="item in this.form.formData">
  237 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  238 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  239 + </div>
  240 +
  241 + <el-table :data="hisfromData" v-if="hisfromData != null">
  242 +
  243 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  244 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  245 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  246 + </el-table>
219 <div slot="footer" class="dialog-footer"> 247 <div slot="footer" class="dialog-footer">
220 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button> 248 <el-button type="danger" @click="submitForm(form.formData[0].controlId ,1)">้ฉณๅ›ž</el-button>
221 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button> 249 <el-button type="primary" @click="submitForm(form.formData[0].controlId ,0)">้€š่ฟ‡</el-button>
@@ -340,7 +368,18 @@ @@ -340,7 +368,18 @@
340 </el-dialog> 368 </el-dialog>
341 369
342 <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false"> 370 <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
343 - <companyInfo :businessKey="businessKey" v-if="company"/> 371 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
  372 + <div v-for="item in this.form.formData">
  373 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  374 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  375 + </div>
  376 +
  377 + <el-table :data="hisfromData" v-if="hisfromData != null">
  378 +
  379 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  380 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  381 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  382 + </el-table>
344 <div slot="footer" class="dialog-footer"> 383 <div slot="footer" class="dialog-footer">
345 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">้ฉณๅ›ž</el-button> 384 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">้ฉณๅ›ž</el-button>
346 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">้€š่ฟ‡</el-button> 385 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">้€š่ฟ‡</el-button>
@@ -348,7 +387,18 @@ @@ -348,7 +387,18 @@
348 </el-dialog> 387 </el-dialog>
349 388
350 <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false"> 389 <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
351 - <vehicleInfo :businessKey="businessKey" v-if="vehicle"/> 390 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
  391 + <div v-for="item in this.form.formData">
  392 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  393 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  394 + </div>
  395 +
  396 + <el-table :data="hisfromData" v-if="hisfromData != null">
  397 +
  398 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  399 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  400 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  401 + </el-table>
352 <div slot="footer" class="dialog-footer"> 402 <div slot="footer" class="dialog-footer">
353 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">้ฉณๅ›ž</el-button> 403 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">้ฉณๅ›ž</el-button>
354 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">้€š่ฟ‡</el-button> 404 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">้€š่ฟ‡</el-button>
@@ -356,7 +406,18 @@ @@ -356,7 +406,18 @@
356 </el-dialog> 406 </el-dialog>
357 407
358 <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false"> 408 <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
359 - <driverInfo :businessKey="businessKey" v-if="driver"/> 409 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
  410 + <div v-for="item in this.form.formData">
  411 + <el-input v-if="item.controlType=='textarea'" :label="item.controlLable" v-model="item.controlValue"
  412 + placeholder="ๆ‰นๆณจ" type="textarea" :rows="3" style="margin-top:20px;"/>
  413 + </div>
  414 +
  415 + <el-table :data="hisfromData" v-if="hisfromData != null">
  416 +
  417 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  418 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  419 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  420 + </el-table>
360 <div slot="footer" class="dialog-footer"> 421 <div slot="footer" class="dialog-footer">
361 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">้ฉณๅ›ž</el-button> 422 <el-button type="danger" @click="submitForm(form.formData[0].controlId,1)">้ฉณๅ›ž</el-button>
362 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">้€š่ฟ‡</el-button> 423 <el-button type="primary" @click="submitForm(form.formData[0].controlId,0)">้€š่ฟ‡</el-button>
@@ -672,8 +733,7 @@ export default { @@ -672,8 +733,7 @@ export default {
672 this.leaveApplicationOpen = true; 733 this.leaveApplicationOpen = true;
673 return; 734 return;
674 } 735 }
675 -  
676 - if (this.definitionKey == "workflow_constructsite") { 736 + if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
677 737
678 this.construct = true; 738 this.construct = true;
679 return; 739 return;
@@ -980,7 +1040,8 @@ export default { @@ -980,7 +1040,8 @@ export default {
980 } 1040 }
981 if(this.definitionKey == "workflow_company" || 1041 if(this.definitionKey == "workflow_company" ||
982 this.definitionKey == "workflow_driver" || 1042 this.definitionKey == "workflow_driver" ||
983 - this.definitionKey == "workflow_vehicle" ){ 1043 + this.definitionKey == "workflow_vehicle" ||
  1044 + this.definitionKey == "workflow_constructsite_edit"){
984 formDataSave(this.id, this.form.formData).then(response => { 1045 formDataSave(this.id, this.form.formData).then(response => {
985 this.msgSuccess("ๅฎกๆ‰นๆˆๅŠŸ"); 1046 this.msgSuccess("ๅฎกๆ‰นๆˆๅŠŸ");
986 this.cancel(); 1047 this.cancel();
trash-ui/src/views/h5/task/sitePaper.vue
  View file @9c06308
@@ -2,10 +2,10 @@ @@ -2,10 +2,10 @@
2 <div v-loading="loading"> 2 <div v-loading="loading">
3 3
4 <div id="printItem"> 4 <div id="printItem">
5 - <h2 style="text-align:center;">้•ฟๆฒ™ๅธ‚ๅปบ็ญ‘ๅžƒๅœพๅค„็ฝฎๆŠ€ๆœฏๅ‹˜ๅฏŸๆ„่ง่กจ</h2> 5 + <h2 style="text-align:center;">้•ฟๆฒ™ๅธ‚ๅปบ็ญ‘ๅžƒๅœพๅค„็ฝฎๆŠ€ๆœฏๅ‹˜ๆŸฅๆ„่ง่กจ</h2>
6 <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center"> 6 <el-row style="border: 1px solid black;" type="flex" align="middle" justify="center">
7 <el-col :span="2" class="bd_padding"> 7 <el-col :span="2" class="bd_padding">
8 - ๅ‹˜ๅฏŸไบบๅ‘˜ๅกซๅ†™ 8 + ๅ‹˜ๆŸฅไบบๅ‘˜ๅกซๅ†™
9 </el-col> 9 </el-col>
10 <el-col :span="22" class="bd_left"> 10 <el-col :span="22" class="bd_left">
11 <el-row class="bd_bottom" > 11 <el-row class="bd_bottom" >
trash-ui/src/views/h5/task/threestepInfo.vue
  View file @9c06308
@@ -81,6 +81,10 @@ @@ -81,6 +81,10 @@
81 :preview-src-list="[slides1(img)]" 81 :preview-src-list="[slides1(img)]"
82 :z-index="2000"> 82 :z-index="2000">
83 </el-image> 83 </el-image>
  84 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  85 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  86 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  87 + </div>
84 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 88 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
85 </el-row> 89 </el-row>
86 </el-col> 90 </el-col>
@@ -98,6 +102,10 @@ @@ -98,6 +102,10 @@
98 :preview-src-list="[slides1(img)]" 102 :preview-src-list="[slides1(img)]"
99 :z-index="2000"> 103 :z-index="2000">
100 </el-image> 104 </el-image>
  105 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  106 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  107 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  108 + </div>
101 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 109 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
102 </el-row> 110 </el-row>
103 </el-col> 111 </el-col>
@@ -115,6 +123,10 @@ @@ -115,6 +123,10 @@
115 :preview-src-list="[slides1(img)]" 123 :preview-src-list="[slides1(img)]"
116 :z-index="2000"> 124 :z-index="2000">
117 </el-image> 125 </el-image>
  126 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  127 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  128 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  129 + </div>
118 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 130 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
119 131
120 </el-row> 132 </el-row>
@@ -133,6 +145,10 @@ @@ -133,6 +145,10 @@
133 :preview-src-list="[slides1(img)]" 145 :preview-src-list="[slides1(img)]"
134 :z-index="2000"> 146 :z-index="2000">
135 </el-image> 147 </el-image>
  148 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  149 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  150 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  151 + </div>
136 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 152 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
137 153
138 </el-row> 154 </el-row>
@@ -151,6 +167,10 @@ @@ -151,6 +167,10 @@
151 :preview-src-list="[slides1(img)]" 167 :preview-src-list="[slides1(img)]"
152 :z-index="2000"> 168 :z-index="2000">
153 </el-image> 169 </el-image>
  170 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  171 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  172 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  173 + </div>
154 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 174 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
155 175
156 </el-row> 176 </el-row>
@@ -169,6 +189,10 @@ @@ -169,6 +189,10 @@
169 :preview-src-list="[slides1(img)]" 189 :preview-src-list="[slides1(img)]"
170 :z-index="2000"> 190 :z-index="2000">
171 </el-image> 191 </el-image>
  192 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  193 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  194 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  195 + </div>
172 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 196 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
173 197
174 </el-row> 198 </el-row>
@@ -187,6 +211,10 @@ @@ -187,6 +211,10 @@
187 :preview-src-list="[slides1(img)]" 211 :preview-src-list="[slides1(img)]"
188 :z-index="2000"> 212 :z-index="2000">
189 </el-image> 213 </el-image>
  214 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  215 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  216 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  217 + </div>
190 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 218 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
191 219
192 </el-row> 220 </el-row>
@@ -205,6 +233,10 @@ @@ -205,6 +233,10 @@
205 :preview-src-list="[slides1(img)]" 233 :preview-src-list="[slides1(img)]"
206 :z-index="2000"> 234 :z-index="2000">
207 </el-image> 235 </el-image>
  236 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  237 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  238 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  239 + </div>
208 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 240 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
209 241
210 </el-row> 242 </el-row>
@@ -223,6 +255,10 @@ @@ -223,6 +255,10 @@
223 :preview-src-list="[slides1(img)]" 255 :preview-src-list="[slides1(img)]"
224 :z-index="2000"> 256 :z-index="2000">
225 </el-image> 257 </el-image>
  258 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  259 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  260 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  261 + </div>
226 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 262 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
227 263
228 </el-row> 264 </el-row>
@@ -241,6 +277,10 @@ @@ -241,6 +277,10 @@
241 :preview-src-list="[slides1(img)]" 277 :preview-src-list="[slides1(img)]"
242 :z-index="2000"> 278 :z-index="2000">
243 </el-image> 279 </el-image>
  280 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  281 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  282 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  283 + </div>
244 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 284 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
245 285
246 </el-row> 286 </el-row>
@@ -259,6 +299,10 @@ @@ -259,6 +299,10 @@
259 :preview-src-list="[slides1(img)]" 299 :preview-src-list="[slides1(img)]"
260 :z-index="2000"> 300 :z-index="2000">
261 </el-image> 301 </el-image>
  302 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  303 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  304 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  305 + </div>
262 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 306 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
263 307
264 </el-row> 308 </el-row>
@@ -277,8 +321,12 @@ @@ -277,8 +321,12 @@
277 :preview-src-list="[slides1(img)]" 321 :preview-src-list="[slides1(img)]"
278 :z-index="2000"> 322 :z-index="2000">
279 </el-image> 323 </el-image>
  324 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  325 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  326 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  327 + </div>
280 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 328 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
281 - 329 +
282 </el-row> 330 </el-row>
283 </el-col> 331 </el-col>
284 </el-row> 332 </el-row>
@@ -295,6 +343,10 @@ @@ -295,6 +343,10 @@
295 :preview-src-list="[slides1(img)]" 343 :preview-src-list="[slides1(img)]"
296 :z-index="2000"> 344 :z-index="2000">
297 </el-image> 345 </el-image>
  346 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  347 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  348 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  349 + </div>
298 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 350 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
299 351
300 </el-row> 352 </el-row>
@@ -340,6 +392,10 @@ @@ -340,6 +392,10 @@
340 :preview-src-list="[slides1(img)]" 392 :preview-src-list="[slides1(img)]"
341 :z-index="2000"> 393 :z-index="2000">
342 </el-image> 394 </el-image>
  395 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  396 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  397 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  398 + </div>
343 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 399 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
344 400
345 </el-row> 401 </el-row>
@@ -358,6 +414,10 @@ @@ -358,6 +414,10 @@
358 :preview-src-list="[slides1(img)]" 414 :preview-src-list="[slides1(img)]"
359 :z-index="2000"> 415 :z-index="2000">
360 </el-image> 416 </el-image>
  417 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  418 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  419 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  420 + </div>
361 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 421 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
362 422
363 </el-row> 423 </el-row>
@@ -376,6 +436,10 @@ @@ -376,6 +436,10 @@
376 :preview-src-list="[slides1(img)]" 436 :preview-src-list="[slides1(img)]"
377 :z-index="2000"> 437 :z-index="2000">
378 </el-image> 438 </el-image>
  439 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  440 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  441 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  442 + </div>
379 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 443 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
380 444
381 </el-row> 445 </el-row>
@@ -394,6 +458,10 @@ @@ -394,6 +458,10 @@
394 :preview-src-list="[slides1(img)]" 458 :preview-src-list="[slides1(img)]"
395 :z-index="2000"> 459 :z-index="2000">
396 </el-image> 460 </el-image>
  461 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  462 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  463 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  464 + </div>
397 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 465 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
398 466
399 </el-row> 467 </el-row>
@@ -412,6 +480,10 @@ @@ -412,6 +480,10 @@
412 :preview-src-list="[slides1(img)]" 480 :preview-src-list="[slides1(img)]"
413 :z-index="2000"> 481 :z-index="2000">
414 </el-image> 482 </el-image>
  483 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  484 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  485 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  486 + </div>
415 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 487 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
416 488
417 </el-row> 489 </el-row>
@@ -430,6 +502,10 @@ @@ -430,6 +502,10 @@
430 :preview-src-list="[slides1(img)]" 502 :preview-src-list="[slides1(img)]"
431 :z-index="2000"> 503 :z-index="2000">
432 </el-image> 504 </el-image>
  505 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  506 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  507 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  508 + </div>
433 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 509 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
434 510
435 </el-row> 511 </el-row>
@@ -448,6 +524,10 @@ @@ -448,6 +524,10 @@
448 :preview-src-list="[slides1(img)]" 524 :preview-src-list="[slides1(img)]"
449 :z-index="2000"> 525 :z-index="2000">
450 </el-image> 526 </el-image>
  527 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  528 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  529 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  530 + </div>
451 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 531 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
452 532
453 </el-row> 533 </el-row>
@@ -466,6 +546,10 @@ @@ -466,6 +546,10 @@
466 :preview-src-list="[slides1(img)]" 546 :preview-src-list="[slides1(img)]"
467 :z-index="2000"> 547 :z-index="2000">
468 </el-image> 548 </el-image>
  549 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  550 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  551 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  552 + </div>
469 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 553 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
470 554
471 </el-row> 555 </el-row>
@@ -484,6 +568,10 @@ @@ -484,6 +568,10 @@
484 :preview-src-list="[slides1(img)]" 568 :preview-src-list="[slides1(img)]"
485 :z-index="2000"> 569 :z-index="2000">
486 </el-image> 570 </el-image>
  571 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  572 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  573 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  574 + </div>
487 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 575 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
488 576
489 </el-row> 577 </el-row>
@@ -502,6 +590,10 @@ @@ -502,6 +590,10 @@
502 :preview-src-list="[slides1(img)]" 590 :preview-src-list="[slides1(img)]"
503 :z-index="2000"> 591 :z-index="2000">
504 </el-image> 592 </el-image>
  593 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  594 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  595 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  596 + </div>
505 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 597 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
506 598
507 </el-row> 599 </el-row>
@@ -520,6 +612,10 @@ @@ -520,6 +612,10 @@
520 :preview-src-list="[slides1(img)]" 612 :preview-src-list="[slides1(img)]"
521 :z-index="2000"> 613 :z-index="2000">
522 </el-image> 614 </el-image>
  615 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  616 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  617 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  618 + </div>
523 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 619 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
524 620
525 </el-row> 621 </el-row>
@@ -538,6 +634,10 @@ @@ -538,6 +634,10 @@
538 :preview-src-list="[slides1(img)]" 634 :preview-src-list="[slides1(img)]"
539 :z-index="2000"> 635 :z-index="2000">
540 </el-image> 636 </el-image>
  637 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  638 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  639 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  640 + </div>
541 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 641 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
542 642
543 </el-row> 643 </el-row>
@@ -556,6 +656,10 @@ @@ -556,6 +656,10 @@
556 :preview-src-list="[slides1(img)]" 656 :preview-src-list="[slides1(img)]"
557 :z-index="2000"> 657 :z-index="2000">
558 </el-image> 658 </el-image>
  659 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  660 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  661 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  662 + </div>
559 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a> 663 <a @click="downloadFile(img);" style="color: blue;">{{ img.split("/")[img.split("/").length - 1] }}</a>
560 664
561 </el-row> 665 </el-row>
@@ -589,6 +693,10 @@ @@ -589,6 +693,10 @@
589 :preview-src-list="[slides1(sub_img)]" 693 :preview-src-list="[slides1(sub_img)]"
590 :z-index="2000"> 694 :z-index="2000">
591 </el-image> 695 </el-image>
  696 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  697 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  698 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  699 + </div>
592 <a @click="downloadFile(sub_img);" style="color: blue;">้™„ไปถ1 - {{ index + 1 }}</a> 700 <a @click="downloadFile(sub_img);" style="color: blue;">้™„ไปถ1 - {{ index + 1 }}</a>
593 701
594 </el-row> 702 </el-row>
@@ -607,6 +715,10 @@ @@ -607,6 +715,10 @@
607 :preview-src-list="[slides1(sub_img)]" 715 :preview-src-list="[slides1(sub_img)]"
608 :z-index="2000"> 716 :z-index="2000">
609 </el-image> 717 </el-image>
  718 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  719 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  720 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  721 + </div>
610 <a @click="downloadFile(sub_img);" style="color: blue;">้™„ไปถ2 - {{ index + 1 }}</a> 722 <a @click="downloadFile(sub_img);" style="color: blue;">้™„ไปถ2 - {{ index + 1 }}</a>
611 723
612 </el-row> 724 </el-row>
@@ -625,6 +737,10 @@ @@ -625,6 +737,10 @@
625 :preview-src-list="[slides1(sub_img)]" 737 :preview-src-list="[slides1(sub_img)]"
626 :z-index="2000"> 738 :z-index="2000">
627 </el-image> 739 </el-image>
  740 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  741 + v-if="img.indexOf('.mp4') > -1 || img.indexOf('.avi') > -1" >
  742 + <video width="100%" controls="controls" height="100%" :src="slides1(img)"></video>
  743 + </div>
628 <a @click="downloadFile(sub_img);" style="color: blue;">้™„ไปถ3 - {{ index + 1 }}</a> 744 <a @click="downloadFile(sub_img);" style="color: blue;">้™„ไปถ3 - {{ index + 1 }}</a>
629 745
630 </el-row> 746 </el-row>
trash-ui/src/views/h5/taskhistory/index.vue
  View file @9c06308
@@ -11,7 +11,13 @@ @@ -11,7 +11,13 @@
11 </el-dialog> 11 </el-dialog>
12 12
13 <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body> 13 <el-dialog :title="title" :visible.sync="construct" width="300px" append-to-body>
14 - <constructsiteInfo :businessKey="businessKey" :signData="signData" v-if="construct" /> 14 + <companyInfo :businessKey="businessKey" :businessType="2" :signData="signData" v-if="construct"/>
  15 +
  16 + <el-table :data="hisfromData" v-if="hisfromData != null">
  17 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  18 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  19 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  20 + </el-table>
15 </el-dialog> 21 </el-dialog>
16 <!-- ไผš่ฎฎ็ฎก็† --> 22 <!-- ไผš่ฎฎ็ฎก็† -->
17 <el-dialog :title="title" :visible.sync="conferenceOpen" width="300px" append-to-body> 23 <el-dialog :title="title" :visible.sync="conferenceOpen" width="300px" append-to-body>
@@ -25,11 +31,27 @@ @@ -25,11 +31,27 @@
25 31
26 32
27 <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body> 33 <el-dialog :title="title" :visible.sync="earthsites" width="300px" append-to-body>
28 - <earthsitesInfo :businessKey="businessKey" v-if="earthsites" /> 34 + <companyInfo :businessKey="businessKey" :businessType="3" v-if="earthsites"/>
  35 +
  36 +
  37 + <el-table :data="hisfromData" v-if="hisfromData != null">
  38 +
  39 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  40 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  41 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  42 + </el-table>
29 </el-dialog> 43 </el-dialog>
30 44
31 <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body> 45 <el-dialog :title="title" :visible.sync="contract" width="300px" append-to-body>
32 - <contractInfo :businessKey="businessKey" v-if="contract" /> 46 + <companyInfo :businessKey="businessKey" :businessType="4" v-if="contract"/>
  47 +
  48 +
  49 + <el-table :data="hisfromData" v-if="hisfromData != null">
  50 +
  51 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  52 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  53 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  54 + </el-table>
33 </el-dialog> 55 </el-dialog>
34 56
35 57
@@ -67,15 +89,36 @@ @@ -67,15 +89,36 @@
67 <supervisionInfo :infoData="supervisionData"/> 89 <supervisionInfo :infoData="supervisionData"/>
68 </el-dialog> 90 </el-dialog>
69 <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false"> 91 <el-dialog :title="title" :visible.sync="company" width="300px" append-to-body :close-on-click-modal="false">
70 - <companyInfo :businessKey="businessKey" v-if="company"/> 92 + <companyInfo :businessKey="businessKey" :businessType="0" v-if="company"/>
  93 +
  94 + <el-table :data="hisfromData" v-if="hisfromData != null">
  95 +
  96 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  97 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  98 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  99 + </el-table>
71 </el-dialog> 100 </el-dialog>
72 101
73 <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false"> 102 <el-dialog :title="title" :visible.sync="vehicle" width="300px" append-to-body :close-on-click-modal="false">
74 - <vehicleInfo :businessKey="businessKey" v-if="vehicle"/> 103 + <companyInfo :businessKey="businessKey" :businessType="1" v-if="vehicle"/>
  104 +
  105 + <el-table :data="hisfromData" v-if="hisfromData != null">
  106 +
  107 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  108 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  109 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  110 + </el-table>
75 </el-dialog> 111 </el-dialog>
76 112
77 <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false"> 113 <el-dialog :title="title" :visible.sync="driver" width="300px" append-to-body :close-on-click-modal="false">
78 - <driverInfo :businessKey="businessKey" v-if="driver"/> 114 + <companyInfo :businessKey="businessKey" :businessType="5" v-if="driver"/>
  115 +
  116 + <el-table :data="hisfromData" v-if="hisfromData != null">
  117 +
  118 + <el-table-column label="ๅฎกๆ‰นๆ„่ง" align="center" prop="controlValue"/>
  119 + <el-table-column label="ๅฎกๆ‰นไบบ" align="center" prop="createName"/>
  120 + <el-table-column label="ๅฎกๆ‰นๆ—ถ้—ด" align="center" prop="createTime"/>
  121 + </el-table>
79 </el-dialog> 122 </el-dialog>
80 123
81 </div> 124 </div>
@@ -319,12 +362,9 @@ @@ -319,12 +362,9 @@
319 this.leaveApplicationOpen = true; 362 this.leaveApplicationOpen = true;
320 return; 363 return;
321 } 364 }
  365 + if (this.definitionKey == "workflow_constructsite" || this.definitionKey == "workflow_constructsite_edit") {
322 366
323 - if(this.definitionKey == "workflow_constructsite"){  
324 - getSignByObjId(this.businessKey.split(":")[1]).then(res=>{  
325 - this.signData = res;  
326 this.construct = true; 367 this.construct = true;
327 - });  
328 return; 368 return;
329 } 369 }
330 if(this.definitionKey == "workflow_earthsites"){ 370 if(this.definitionKey == "workflow_earthsites"){
trash-ui/src/views/h5/threestep/index.vue
  View file @9c06308
@@ -91,30 +91,13 @@ @@ -91,30 +91,13 @@
91 </el-select> 91 </el-select>
92 </el-form-item> 92 </el-form-item>
93 <el-form-item :label="labelName" prop="name" v-if="form.type!=null"> 93 <el-form-item :label="labelName" prop="name" v-if="form.type!=null">
94 - <el-select v-model="form.name" filterable reserve-keyword @change="getObjId">  
95 - <el-option v-for="item in remoteData" :label="item.name" 94 + <el-select v-model="form.name" filterable reserve-keyword @change="getObjId" v-el-select-loadmore="loadMore(rangeNumber)">
  95 + <el-option v-for="item in remoteData.slice(0, rangeNumber)" :label="item.name"
96 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place"> 96 :value="item.name" :key="item.id" v-if="!form.place || item.areaCode == form.place">
97 </el-option> 97 </el-option>
98 </el-select> 98 </el-select>
99 </el-form-item> 99 </el-form-item>
100 100
101 - <el-form-item :label="labelName2" prop="place" v-if="form.type!=null">  
102 - <el-select v-model="bindname" filterable reserve-keyword @change="getEarthsiteId">  
103 - <el-option v-if="item.show"  
104 - v-for="item in bindData"  
105 - :label="item.name"  
106 - :value="item.name"  
107 - :key="item.id">  
108 - </el-option>  
109 - </el-select>  
110 - </el-form-item>  
111 -  
112 - <el-form-item label="ๆถˆ็บณๅˆๅŒ" prop="contract" v-if="form.type!=null">  
113 - <el-select v-model="form.contract" filterable reserve-keyword @change="conractCheck">  
114 - <el-option v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">  
115 - </el-option>  
116 - </el-select>  
117 - </el-form-item>  
118 101
119 <el-form-item label="่ฟ่พ“ไผไธš" prop="companys" v-if="form.type==0"> 102 <el-form-item label="่ฟ่พ“ไผไธš" prop="companys" v-if="form.type==0">
120 <el-select v-model="form.companys" filterable multiple @change="checkCompany" > 103 <el-select v-model="form.companys" filterable multiple @change="checkCompany" >
@@ -123,12 +106,11 @@ @@ -123,12 +106,11 @@
123 </el-select> 106 </el-select>
124 </el-form-item> 107 </el-form-item>
125 108
126 - <el-form-item label="่ฟ่พ“่ฝฆ่พ†" prop="companyTrucks" v-if="form.type==0">  
127 - <el-select v-model="form.companyTrucks" filterable multiple reserve-keyword >  
128 - <el-option v-for="item in truckList" :label="item.licenseplateNo" :value="item.id" :key="item.id"  
129 - v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"></el-option>  
130 - </el-select>  
131 - </el-form-item> 109 + <el-form-item label="่ฟ่พ“่ฝฆ่พ†" prop="trucks" >
  110 + <el-checkbox-group v-model="form.trucks" style="max-height: 200px;overflow: auto;">
  111 + <el-checkbox :label="item.licenseplateNo" v-for="item in truckList" v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"/>
  112 + </el-checkbox-group>
  113 + </el-form-item>
132 114
133 <el-form-item label="็Žฐๅœบ่ดŸ่ดฃไบบ" prop="person" v-if="form.type!=null"> 115 <el-form-item label="็Žฐๅœบ่ดŸ่ดฃไบบ" prop="person" v-if="form.type!=null">
134 <el-input v-model="form.person" :maxlength="20" show-word-limit /> 116 <el-input v-model="form.person" :maxlength="20" show-word-limit />
@@ -149,6 +131,10 @@ @@ -149,6 +131,10 @@
149 :preview-src-list="[item.url]" 131 :preview-src-list="[item.url]"
150 :z-index="2000"> 132 :z-index="2000">
151 </el-image> 133 </el-image>
  134 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  135 + v-for="item in videos[0]" >
  136 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  137 + </div>
152 <el-input v-model="form.img0" type="hidden"></el-input> 138 <el-input v-model="form.img0" type="hidden"></el-input>
153 <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p> 139 <p v-for="(img,index) in form.img0">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(0,img)" style="color:red"> x</a></p>
154 </el-col> 140 </el-col>
@@ -160,6 +146,10 @@ @@ -160,6 +146,10 @@
160 :preview-src-list="[item.url]" 146 :preview-src-list="[item.url]"
161 :z-index="2000"> 147 :z-index="2000">
162 </el-image> 148 </el-image>
  149 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  150 + v-for="item in videos[1]" >
  151 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  152 + </div>
163 <el-input v-model="form.img1" type="hidden"></el-input> 153 <el-input v-model="form.img1" type="hidden"></el-input>
164 <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p> 154 <p v-for="(img,index) in form.img1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(1,img)" style="color:red"> x</a></p>
165 </el-col> 155 </el-col>
@@ -173,6 +163,10 @@ @@ -173,6 +163,10 @@
173 :preview-src-list="[item.url]" 163 :preview-src-list="[item.url]"
174 :z-index="2000"> 164 :z-index="2000">
175 </el-image> 165 </el-image>
  166 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  167 + v-for="item in videos[2]" >
  168 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  169 + </div>
176 <el-input v-model="form.img2" type="hidden"></el-input> 170 <el-input v-model="form.img2" type="hidden"></el-input>
177 <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p> 171 <p v-for="(img,index) in form.img2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(2,img)" style="color:red"> x</a></p>
178 </el-col> 172 </el-col>
@@ -184,6 +178,10 @@ @@ -184,6 +178,10 @@
184 :preview-src-list="[item.url]" 178 :preview-src-list="[item.url]"
185 :z-index="2000"> 179 :z-index="2000">
186 </el-image> 180 </el-image>
  181 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  182 + v-for="item in videos[3]" >
  183 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  184 + </div>
187 <el-input v-model="form.img3" type="hidden"></el-input> 185 <el-input v-model="form.img3" type="hidden"></el-input>
188 <p v-for="(img,index) in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p> 186 <p v-for="(img,index) in form.img3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(3,img)" style="color:red"> x</a></p>
189 </el-col> 187 </el-col>
@@ -197,6 +195,10 @@ @@ -197,6 +195,10 @@
197 :preview-src-list="[item.url]" 195 :preview-src-list="[item.url]"
198 :z-index="2000"> 196 :z-index="2000">
199 </el-image> 197 </el-image>
  198 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  199 + v-for="item in videos[4]" >
  200 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  201 + </div>
200 <el-input v-model="form.img4" type="hidden"></el-input> 202 <el-input v-model="form.img4" type="hidden"></el-input>
201 <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p> 203 <p v-for="(img,index) in form.img4">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(4,img)" style="color:red"> x</a></p>
202 </el-col> 204 </el-col>
@@ -208,6 +210,10 @@ @@ -208,6 +210,10 @@
208 :preview-src-list="[item.url]" 210 :preview-src-list="[item.url]"
209 :z-index="2000"> 211 :z-index="2000">
210 </el-image> 212 </el-image>
  213 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  214 + v-for="item in videos[5]" >
  215 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  216 + </div>
211 <el-input v-model="form.img5" type="hidden"></el-input> 217 <el-input v-model="form.img5" type="hidden"></el-input>
212 <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p> 218 <p v-for="(img,index) in form.img5">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(5,img)" style="color:red"> x</a></p>
213 </el-col> 219 </el-col>
@@ -221,6 +227,10 @@ @@ -221,6 +227,10 @@
221 :preview-src-list="[item.url]" 227 :preview-src-list="[item.url]"
222 :z-index="2000"> 228 :z-index="2000">
223 </el-image> 229 </el-image>
  230 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  231 + v-for="item in videos[6]" >
  232 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  233 + </div>
224 <el-input v-model="form.img6" type="hidden"></el-input> 234 <el-input v-model="form.img6" type="hidden"></el-input>
225 <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p> 235 <p v-for="(img,index) in form.img6">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(6,img)" style="color:red"> x</a></p>
226 </el-col> 236 </el-col>
@@ -232,6 +242,10 @@ @@ -232,6 +242,10 @@
232 :preview-src-list="[item.url]" 242 :preview-src-list="[item.url]"
233 :z-index="2000"> 243 :z-index="2000">
234 </el-image> 244 </el-image>
  245 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  246 + v-for="item in videos[7]" >
  247 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  248 + </div>
235 <el-input v-model="form.img7" type="hidden"></el-input> 249 <el-input v-model="form.img7" type="hidden"></el-input>
236 <p v-for="(img,index) in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p> 250 <p v-for="(img,index) in form.img7">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(7,img)" style="color:red"> x</a></p>
237 </el-col> 251 </el-col>
@@ -245,6 +259,10 @@ @@ -245,6 +259,10 @@
245 :preview-src-list="[item.url]" 259 :preview-src-list="[item.url]"
246 :z-index="2000"> 260 :z-index="2000">
247 </el-image> 261 </el-image>
  262 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  263 + v-for="item in videos[8]" >
  264 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  265 + </div>
248 <el-input v-model="form.img8" type="hidden"></el-input> 266 <el-input v-model="form.img8" type="hidden"></el-input>
249 <p v-for="(img,index) in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p> 267 <p v-for="(img,index) in form.img8">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(8,img)" style="color:red"> x</a></p>
250 </el-col> 268 </el-col>
@@ -256,6 +274,10 @@ @@ -256,6 +274,10 @@
256 :preview-src-list="[item.url]" 274 :preview-src-list="[item.url]"
257 :z-index="2000"> 275 :z-index="2000">
258 </el-image> 276 </el-image>
  277 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  278 + v-for="item in videos[9]" >
  279 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  280 + </div>
259 <el-input v-model="form.img9" type="hidden"></el-input> 281 <el-input v-model="form.img9" type="hidden"></el-input>
260 <p v-for="(img,index) in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p> 282 <p v-for="(img,index) in form.img9">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(9,img)" style="color:red"> x</a></p>
261 </el-col> 283 </el-col>
@@ -269,6 +291,10 @@ @@ -269,6 +291,10 @@
269 :preview-src-list="[item.url]" 291 :preview-src-list="[item.url]"
270 :z-index="2000"> 292 :z-index="2000">
271 </el-image> 293 </el-image>
  294 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  295 + v-for="item in videos[10]" >
  296 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  297 + </div>
272 <el-input v-model="form.img10" type="hidden"></el-input> 298 <el-input v-model="form.img10" type="hidden"></el-input>
273 <p v-for="(img,index) in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a></p> 299 <p v-for="(img,index) in form.img10">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(10,img)" style="color:red"> x</a></p>
274 </el-col> 300 </el-col>
@@ -280,6 +306,10 @@ @@ -280,6 +306,10 @@
280 :preview-src-list="[item.url]" 306 :preview-src-list="[item.url]"
281 :z-index="2000"> 307 :z-index="2000">
282 </el-image> 308 </el-image>
  309 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  310 + v-for="item in videos[11]" >
  311 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  312 + </div>
283 <el-input v-model="form.img11" type="hidden"></el-input> 313 <el-input v-model="form.img11" type="hidden"></el-input>
284 <p v-for="(img,index) in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a></p> 314 <p v-for="(img,index) in form.img11">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(11,img)" style="color:red"> x</a></p>
285 </el-col> 315 </el-col>
@@ -293,6 +323,10 @@ @@ -293,6 +323,10 @@
293 :preview-src-list="[item.url]" 323 :preview-src-list="[item.url]"
294 :z-index="2000"> 324 :z-index="2000">
295 </el-image> 325 </el-image>
  326 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  327 + v-for="item in videos[12]" >
  328 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  329 + </div>
296 <el-input v-model="form.img12" type="hidden"></el-input> 330 <el-input v-model="form.img12" type="hidden"></el-input>
297 <p v-for="(img,index) in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a></p> 331 <p v-for="(img,index) in form.img12">{{img.split("/")[img.split("/").length -1]}}<a @click="removeImage(12,img)" style="color:red"> x</a></p>
298 </el-col> 332 </el-col>
@@ -326,6 +360,10 @@ @@ -326,6 +360,10 @@
326 :preview-src-list="[item.url]" 360 :preview-src-list="[item.url]"
327 :z-index="2000"> 361 :z-index="2000">
328 </el-image> 362 </el-image>
  363 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  364 + v-for="item in videos[91]" >
  365 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  366 + </div>
329 <el-input v-model="form.attchItem1" type="hidden"></el-input> 367 <el-input v-model="form.attchItem1" type="hidden"></el-input>
330 <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img,91)" style="color:red"> x</a></p> 368 <p v-for="(img,index) in form.attchItem1">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(1,img,91)" style="color:red"> x</a></p>
331 </el-col> 369 </el-col>
@@ -337,6 +375,10 @@ @@ -337,6 +375,10 @@
337 :preview-src-list="[item.url]" 375 :preview-src-list="[item.url]"
338 :z-index="2000"> 376 :z-index="2000">
339 </el-image> 377 </el-image>
  378 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  379 + v-for="item in videos[92]" >
  380 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  381 + </div>
340 <el-input v-model="form.attchItem2" type="hidden"></el-input> 382 <el-input v-model="form.attchItem2" type="hidden"></el-input>
341 <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img,92)" style="color:red"> x</a></p> 383 <p v-for="(img,index) in form.attchItem2">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(2,img,92)" style="color:red"> x</a></p>
342 </el-col> 384 </el-col>
@@ -348,6 +390,10 @@ @@ -348,6 +390,10 @@
348 :preview-src-list="[item.url]" 390 :preview-src-list="[item.url]"
349 :z-index="2000"> 391 :z-index="2000">
350 </el-image> 392 </el-image>
  393 + <div style="display: inline-block;margin: 5px;position: relative; width: 150px;height: 100px;overflow:hidden;"
  394 + v-for="item in videos[93]" >
  395 + <video width="100%" controls="controls" height="100%" :src="item.url"></video>
  396 + </div>
351 <el-input v-model="form.attchItem3" type="hidden"></el-input> 397 <el-input v-model="form.attchItem3" type="hidden"></el-input>
352 <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img,93)" style="color:red"> x</a></p> 398 <p v-for="(img,index) in form.attchItem3">{{img.split("/")[img.split("/").length -1]}}<a @click="removeAttchItem(3,img,93)" style="color:red"> x</a></p>
353 </el-col> 399 </el-col>
trash-workFlow/src/main/java/com/trash/business/controller/CompanyCreditController.java
  View file @9c06308
@@ -47,7 +47,6 @@ public class CompanyCreditController extends BaseController @@ -47,7 +47,6 @@ public class CompanyCreditController extends BaseController
47 return getDataTable(list); 47 return getDataTable(list);
48 } 48 }
49 49
50 - @PreAuthorize("@ss.hasPermi('business:credit:list')")  
51 @GetMapping("/historyCredit") 50 @GetMapping("/historyCredit")
52 public TableDataInfo historyCredit(CompanyCredit companyCredit) 51 public TableDataInfo historyCredit(CompanyCredit companyCredit)
53 { 52 {
@@ -75,7 +74,6 @@ public class CompanyCreditController extends BaseController @@ -75,7 +74,6 @@ public class CompanyCreditController extends BaseController
75 /** 74 /**
76 * ๅฏผๅ‡บไผไธšๅคฑไฟกๅˆ—่กจ 75 * ๅฏผๅ‡บไผไธšๅคฑไฟกๅˆ—่กจ
77 */ 76 */
78 - @PreAuthorize("@ss.hasPermi('Company:credit:export')")  
79 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.EXPORT) 77 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.EXPORT)
80 @GetMapping("/export") 78 @GetMapping("/export")
81 public AjaxResult export(CompanyCredit companyCredit) 79 public AjaxResult export(CompanyCredit companyCredit)
@@ -109,7 +107,6 @@ public class CompanyCreditController extends BaseController @@ -109,7 +107,6 @@ public class CompanyCreditController extends BaseController
109 /** 107 /**
110 * ่Žทๅ–ไผไธšๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ 108 * ่Žทๅ–ไผไธšๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ
111 */ 109 */
112 - @PreAuthorize("@ss.hasPermi('Company:credit:query')")  
113 @GetMapping(value = "/{id}") 110 @GetMapping(value = "/{id}")
114 public AjaxResult getInfo(@PathVariable("id") Long id) 111 public AjaxResult getInfo(@PathVariable("id") Long id)
115 { 112 {
@@ -119,7 +116,6 @@ public class CompanyCreditController extends BaseController @@ -119,7 +116,6 @@ public class CompanyCreditController extends BaseController
119 /** 116 /**
120 * ๆ–ฐๅขžไผไธšๅคฑไฟก 117 * ๆ–ฐๅขžไผไธšๅคฑไฟก
121 */ 118 */
122 - @PreAuthorize("@ss.hasPermi('Company:credit:add')")  
123 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.INSERT) 119 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.INSERT)
124 @PostMapping 120 @PostMapping
125 public AjaxResult add(@RequestBody CompanyCredit companyCredit) 121 public AjaxResult add(@RequestBody CompanyCredit companyCredit)
@@ -134,7 +130,6 @@ public class CompanyCreditController extends BaseController @@ -134,7 +130,6 @@ public class CompanyCreditController extends BaseController
134 /** 130 /**
135 * ไฟฎๆ”นไผไธšๅคฑไฟก 131 * ไฟฎๆ”นไผไธšๅคฑไฟก
136 */ 132 */
137 - @PreAuthorize("@ss.hasPermi('Company:credit:edit')")  
138 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.UPDATE) 133 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.UPDATE)
139 @PutMapping 134 @PutMapping
140 public AjaxResult edit(@RequestBody CompanyCredit companyCredit) 135 public AjaxResult edit(@RequestBody CompanyCredit companyCredit)
@@ -149,7 +144,6 @@ public class CompanyCreditController extends BaseController @@ -149,7 +144,6 @@ public class CompanyCreditController extends BaseController
149 /** 144 /**
150 * ๅˆ ้™คไผไธšๅคฑไฟก 145 * ๅˆ ้™คไผไธšๅคฑไฟก
151 */ 146 */
152 - @PreAuthorize("@ss.hasPermi('Company:credit:remove')")  
153 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.DELETE) 147 @Log(title = "ไผไธšๅคฑไฟก", businessType = BusinessType.DELETE)
154 @DeleteMapping("/{ids}") 148 @DeleteMapping("/{ids}")
155 public AjaxResult remove(@PathVariable Long[] ids) 149 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionCreditController.java
  View file @9c06308
@@ -47,7 +47,6 @@ public class ConstructionCreditController extends BaseController @@ -47,7 +47,6 @@ public class ConstructionCreditController extends BaseController
47 return getDataTable(list); 47 return getDataTable(list);
48 } 48 }
49 49
50 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:list')")  
51 @GetMapping("/historyCredit") 50 @GetMapping("/historyCredit")
52 public TableDataInfo historyCredit(ConstructionCredit constructionCredit) 51 public TableDataInfo historyCredit(ConstructionCredit constructionCredit)
53 { 52 {
@@ -60,7 +59,6 @@ public class ConstructionCreditController extends BaseController @@ -60,7 +59,6 @@ public class ConstructionCreditController extends BaseController
60 /** 59 /**
61 * ๅฏผๅ‡บๅทฅๅœฐๅคฑไฟกๅˆ—่กจ 60 * ๅฏผๅ‡บๅทฅๅœฐๅคฑไฟกๅˆ—่กจ
62 */ 61 */
63 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:export')")  
64 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.EXPORT) 62 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.EXPORT)
65 @GetMapping("/export") 63 @GetMapping("/export")
66 public AjaxResult export(ConstructionCredit constructionCredit) 64 public AjaxResult export(ConstructionCredit constructionCredit)
@@ -86,7 +84,6 @@ public class ConstructionCreditController extends BaseController @@ -86,7 +84,6 @@ public class ConstructionCreditController extends BaseController
86 /** 84 /**
87 * ่Žทๅ–ๅทฅๅœฐๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ 85 * ่Žทๅ–ๅทฅๅœฐๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ
88 */ 86 */
89 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:query')")  
90 @GetMapping(value = "/{id}") 87 @GetMapping(value = "/{id}")
91 public AjaxResult getInfo(@PathVariable("id") Long id) 88 public AjaxResult getInfo(@PathVariable("id") Long id)
92 { 89 {
@@ -96,7 +93,6 @@ public class ConstructionCreditController extends BaseController @@ -96,7 +93,6 @@ public class ConstructionCreditController extends BaseController
96 /** 93 /**
97 * ๆ–ฐๅขžๅทฅๅœฐๅคฑไฟก 94 * ๆ–ฐๅขžๅทฅๅœฐๅคฑไฟก
98 */ 95 */
99 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:add')")  
100 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.INSERT) 96 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.INSERT)
101 @PostMapping 97 @PostMapping
102 public AjaxResult add(@RequestBody ConstructionCredit constructionCredit) 98 public AjaxResult add(@RequestBody ConstructionCredit constructionCredit)
@@ -107,7 +103,6 @@ public class ConstructionCreditController extends BaseController @@ -107,7 +103,6 @@ public class ConstructionCreditController extends BaseController
107 /** 103 /**
108 * ไฟฎๆ”นๅทฅๅœฐๅคฑไฟก 104 * ไฟฎๆ”นๅทฅๅœฐๅคฑไฟก
109 */ 105 */
110 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:edit')")  
111 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.UPDATE) 106 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.UPDATE)
112 @PutMapping 107 @PutMapping
113 public AjaxResult edit(@RequestBody ConstructionCredit constructionCredit) 108 public AjaxResult edit(@RequestBody ConstructionCredit constructionCredit)
@@ -143,7 +138,6 @@ public class ConstructionCreditController extends BaseController @@ -143,7 +138,6 @@ public class ConstructionCreditController extends BaseController
143 /** 138 /**
144 * ๅˆ ้™คๅทฅๅœฐๅคฑไฟก 139 * ๅˆ ้™คๅทฅๅœฐๅคฑไฟก
145 */ 140 */
146 - @PreAuthorize("@ss.hasPermi('business:ConstructionCredit:remove')")  
147 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.DELETE) 141 @Log(title = "ๅทฅๅœฐๅคฑไฟก", businessType = BusinessType.DELETE)
148 @DeleteMapping("/{ids}") 142 @DeleteMapping("/{ids}")
149 public AjaxResult remove(@PathVariable Long[] ids) 143 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/ConstructionSignController.java
  View file @9c06308
@@ -36,7 +36,6 @@ public class ConstructionSignController extends BaseController @@ -36,7 +36,6 @@ public class ConstructionSignController extends BaseController
36 /** 36 /**
37 * ๆŸฅ่ฏขsignๅˆ—่กจ 37 * ๆŸฅ่ฏขsignๅˆ—่กจ
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('sign:sign:list')")  
40 @GetMapping("/list") 39 @GetMapping("/list")
41 public TableDataInfo list(ConstructionSign constructionSign) 40 public TableDataInfo list(ConstructionSign constructionSign)
42 { 41 {
@@ -48,7 +47,6 @@ public class ConstructionSignController extends BaseController @@ -48,7 +47,6 @@ public class ConstructionSignController extends BaseController
48 /** 47 /**
49 * ๅฏผๅ‡บsignๅˆ—่กจ 48 * ๅฏผๅ‡บsignๅˆ—่กจ
50 */ 49 */
51 - @PreAuthorize("@ss.hasPermi('sign:sign:export')")  
52 @Log(title = "sign", businessType = BusinessType.EXPORT) 50 @Log(title = "sign", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 51 @GetMapping("/export")
54 public AjaxResult export(ConstructionSign constructionSign) 52 public AjaxResult export(ConstructionSign constructionSign)
@@ -62,10 +60,6 @@ public class ConstructionSignController extends BaseController @@ -62,10 +60,6 @@ public class ConstructionSignController extends BaseController
62 return util.exportExcel(list, "sign"); 60 return util.exportExcel(list, "sign");
63 } 61 }
64 62
65 - /**  
66 - * ่Žทๅ–sign่ฏฆ็ป†ไฟกๆฏ  
67 - */  
68 - @PreAuthorize("@ss.hasPermi('sign:sign:query')")  
69 @GetMapping(value = "/{id}") 63 @GetMapping(value = "/{id}")
70 public AjaxResult getInfo(@PathVariable("id") Long id) 64 public AjaxResult getInfo(@PathVariable("id") Long id)
71 { 65 {
@@ -86,7 +80,6 @@ public class ConstructionSignController extends BaseController @@ -86,7 +80,6 @@ public class ConstructionSignController extends BaseController
86 /** 80 /**
87 * ๆ–ฐๅขžsign 81 * ๆ–ฐๅขžsign
88 */ 82 */
89 - @PreAuthorize("@ss.hasPermi('sign:sign:add')")  
90 @Log(title = "sign", businessType = BusinessType.INSERT) 83 @Log(title = "sign", businessType = BusinessType.INSERT)
91 @PostMapping 84 @PostMapping
92 public AjaxResult add(@RequestBody ConstructionSign constructionSign) 85 public AjaxResult add(@RequestBody ConstructionSign constructionSign)
@@ -94,10 +87,6 @@ public class ConstructionSignController extends BaseController @@ -94,10 +87,6 @@ public class ConstructionSignController extends BaseController
94 return toAjax(constructionSignService.insertConstructionSign(constructionSign)); 87 return toAjax(constructionSignService.insertConstructionSign(constructionSign));
95 } 88 }
96 89
97 - /**  
98 - * ไฟฎๆ”นsign  
99 - */  
100 - @PreAuthorize("@ss.hasPermi('sign:sign:edit')")  
101 @Log(title = "sign", businessType = BusinessType.UPDATE) 90 @Log(title = "sign", businessType = BusinessType.UPDATE)
102 @PutMapping 91 @PutMapping
103 public AjaxResult edit(@RequestBody ConstructionSign constructionSign) 92 public AjaxResult edit(@RequestBody ConstructionSign constructionSign)
@@ -108,7 +97,6 @@ public class ConstructionSignController extends BaseController @@ -108,7 +97,6 @@ public class ConstructionSignController extends BaseController
108 /** 97 /**
109 * ๅˆ ้™คsign 98 * ๅˆ ้™คsign
110 */ 99 */
111 - @PreAuthorize("@ss.hasPermi('sign:sign:remove')")  
112 @Log(title = "sign", businessType = BusinessType.DELETE) 100 @Log(title = "sign", businessType = BusinessType.DELETE)
113 @DeleteMapping("/{ids}") 101 @DeleteMapping("/{ids}")
114 public AjaxResult remove(@PathVariable Long[] ids) 102 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/DriverCreditController.java
  View file @9c06308
@@ -19,6 +19,7 @@ import com.trash.common.core.controller.BaseController; @@ -19,6 +19,7 @@ import com.trash.common.core.controller.BaseController;
19 import com.trash.common.core.domain.AjaxResult; 19 import com.trash.common.core.domain.AjaxResult;
20 import com.trash.common.enums.BusinessType; 20 import com.trash.common.enums.BusinessType;
21 import com.trash.business.domain.DriverCredit; 21 import com.trash.business.domain.DriverCredit;
  22 +import com.trash.business.mapper.DriverCreditMapper;
22 import com.trash.business.service.IDriverCreditService; 23 import com.trash.business.service.IDriverCreditService;
23 import com.trash.common.utils.poi.ExcelUtil; 24 import com.trash.common.utils.poi.ExcelUtil;
24 import com.trash.common.core.page.TableDataInfo; 25 import com.trash.common.core.page.TableDataInfo;
@@ -35,6 +36,9 @@ public class DriverCreditController extends BaseController @@ -35,6 +36,9 @@ public class DriverCreditController extends BaseController
35 { 36 {
36 @Autowired 37 @Autowired
37 private IDriverCreditService driverCreditService; 38 private IDriverCreditService driverCreditService;
  39 +
  40 + @Autowired
  41 + private DriverCreditMapper mapper;
38 42
39 /** 43 /**
40 * ๆŸฅ่ฏข้ฉพ้ฉถๅ‘˜ๅคฑไฟกๅˆ—่กจ 44 * ๆŸฅ่ฏข้ฉพ้ฉถๅ‘˜ๅคฑไฟกๅˆ—่กจ
@@ -47,7 +51,6 @@ public class DriverCreditController extends BaseController @@ -47,7 +51,6 @@ public class DriverCreditController extends BaseController
47 return getDataTable(list); 51 return getDataTable(list);
48 } 52 }
49 53
50 - @PreAuthorize("@ss.hasPermi('driver:credit:list')")  
51 @GetMapping("/historyCredit") 54 @GetMapping("/historyCredit")
52 public TableDataInfo historyCredit(DriverCredit driverCredit) 55 public TableDataInfo historyCredit(DriverCredit driverCredit)
53 { 56 {
@@ -63,13 +66,22 @@ public class DriverCreditController extends BaseController @@ -63,13 +66,22 @@ public class DriverCreditController extends BaseController
63 if(credit.getStatus() == 1){ 66 if(credit.getStatus() == 1){
64 credit.setStatus(null); 67 credit.setStatus(null);
65 } 68 }
66 - return driverCreditService.getNames(credit); 69 + return mapper.getNames(credit);
  70 + }
  71 +
  72 + @GetMapping("/licenseplates")
  73 + public List<String> getLicenseplates(DriverCredit credit)
  74 + {
  75 +
  76 + if(credit.getStatus() == 1){
  77 + credit.setStatus(null);
  78 + }
  79 + return mapper.getLicenseplate(credit);
67 } 80 }
68 81
69 /** 82 /**
70 * ๅฏผๅ‡บ้ฉพ้ฉถๅ‘˜ๅคฑไฟกๅˆ—่กจ 83 * ๅฏผๅ‡บ้ฉพ้ฉถๅ‘˜ๅคฑไฟกๅˆ—่กจ
71 */ 84 */
72 - @PreAuthorize("@ss.hasPermi('driver:credit:export')")  
73 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.EXPORT) 85 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.EXPORT)
74 @GetMapping("/export") 86 @GetMapping("/export")
75 public AjaxResult export(DriverCredit driverCredit) 87 public AjaxResult export(DriverCredit driverCredit)
@@ -96,7 +108,6 @@ public class DriverCreditController extends BaseController @@ -96,7 +108,6 @@ public class DriverCreditController extends BaseController
96 /** 108 /**
97 * ่Žทๅ–้ฉพ้ฉถๅ‘˜ๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ 109 * ่Žทๅ–้ฉพ้ฉถๅ‘˜ๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ
98 */ 110 */
99 - @PreAuthorize("@ss.hasPermi('driver:credit:query')")  
100 @GetMapping(value = "/{id}") 111 @GetMapping(value = "/{id}")
101 public AjaxResult getInfo(@PathVariable("id") Long id) 112 public AjaxResult getInfo(@PathVariable("id") Long id)
102 { 113 {
@@ -106,7 +117,6 @@ public class DriverCreditController extends BaseController @@ -106,7 +117,6 @@ public class DriverCreditController extends BaseController
106 /** 117 /**
107 * ๆ–ฐๅขž้ฉพ้ฉถๅ‘˜ๅคฑไฟก 118 * ๆ–ฐๅขž้ฉพ้ฉถๅ‘˜ๅคฑไฟก
108 */ 119 */
109 - @PreAuthorize("@ss.hasPermi('driver:credit:add')")  
110 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.INSERT) 120 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.INSERT)
111 @PostMapping 121 @PostMapping
112 public AjaxResult add(@RequestBody DriverCredit driverCredit) 122 public AjaxResult add(@RequestBody DriverCredit driverCredit)
@@ -117,7 +127,6 @@ public class DriverCreditController extends BaseController @@ -117,7 +127,6 @@ public class DriverCreditController extends BaseController
117 /** 127 /**
118 * ไฟฎๆ”น้ฉพ้ฉถๅ‘˜ๅคฑไฟก 128 * ไฟฎๆ”น้ฉพ้ฉถๅ‘˜ๅคฑไฟก
119 */ 129 */
120 - @PreAuthorize("@ss.hasPermi('driver:credit:edit')")  
121 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.UPDATE) 130 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.UPDATE)
122 @PutMapping 131 @PutMapping
123 public AjaxResult edit(@RequestBody DriverCredit driverCredit) 132 public AjaxResult edit(@RequestBody DriverCredit driverCredit)
@@ -128,7 +137,6 @@ public class DriverCreditController extends BaseController @@ -128,7 +137,6 @@ public class DriverCreditController extends BaseController
128 /** 137 /**
129 * ๅˆ ้™ค้ฉพ้ฉถๅ‘˜ๅคฑไฟก 138 * ๅˆ ้™ค้ฉพ้ฉถๅ‘˜ๅคฑไฟก
130 */ 139 */
131 - @PreAuthorize("@ss.hasPermi('driver:credit:remove')")  
132 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.DELETE) 140 @Log(title = "้ฉพ้ฉถๅ‘˜ๅคฑไฟก", businessType = BusinessType.DELETE)
133 @DeleteMapping("/{ids}") 141 @DeleteMapping("/{ids}")
134 public AjaxResult remove(@PathVariable Long[] ids) 142 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/EarthsitesCreditController.java
  View file @9c06308
@@ -50,7 +50,7 @@ public class EarthsitesCreditController extends BaseController @@ -50,7 +50,7 @@ public class EarthsitesCreditController extends BaseController
50 /** 50 /**
51 * ๅฏผๅ‡บๆถˆ็บณๅœบๅคฑไฟกๅˆ—่กจ 51 * ๅฏผๅ‡บๆถˆ็บณๅœบๅคฑไฟกๅˆ—่กจ
52 */ 52 */
53 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:export')") 53 +
54 54
55 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.EXPORT) 55 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.EXPORT)
56 @GetMapping("/export") 56 @GetMapping("/export")
@@ -77,7 +77,6 @@ public class EarthsitesCreditController extends BaseController @@ -77,7 +77,6 @@ public class EarthsitesCreditController extends BaseController
77 /** 77 /**
78 * ่Žทๅ–ๆถˆ็บณๅœบๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ 78 * ่Žทๅ–ๆถˆ็บณๅœบๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ
79 */ 79 */
80 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:query')")  
81 @GetMapping(value = "/{id}") 80 @GetMapping(value = "/{id}")
82 public AjaxResult getInfo(@PathVariable("id") Long id) 81 public AjaxResult getInfo(@PathVariable("id") Long id)
83 { 82 {
@@ -87,7 +86,6 @@ public class EarthsitesCreditController extends BaseController @@ -87,7 +86,6 @@ public class EarthsitesCreditController extends BaseController
87 /** 86 /**
88 * ๆ–ฐๅขžๆถˆ็บณๅœบๅคฑไฟก 87 * ๆ–ฐๅขžๆถˆ็บณๅœบๅคฑไฟก
89 */ 88 */
90 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:add')")  
91 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.INSERT) 89 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.INSERT)
92 @PostMapping 90 @PostMapping
93 public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit) 91 public AjaxResult add(@RequestBody EarthsitesCredit earthsitesCredit)
@@ -98,7 +96,6 @@ public class EarthsitesCreditController extends BaseController @@ -98,7 +96,6 @@ public class EarthsitesCreditController extends BaseController
98 /** 96 /**
99 * ไฟฎๆ”นๆถˆ็บณๅœบๅคฑไฟก 97 * ไฟฎๆ”นๆถˆ็บณๅœบๅคฑไฟก
100 */ 98 */
101 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:edit')")  
102 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.UPDATE) 99 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.UPDATE)
103 @PutMapping 100 @PutMapping
104 public AjaxResult edit(@RequestBody EarthsitesCredit earthsitesCredit) 101 public AjaxResult edit(@RequestBody EarthsitesCredit earthsitesCredit)
@@ -109,7 +106,6 @@ public class EarthsitesCreditController extends BaseController @@ -109,7 +106,6 @@ public class EarthsitesCreditController extends BaseController
109 /** 106 /**
110 * ๅˆ ้™คๆถˆ็บณๅœบๅคฑไฟก 107 * ๅˆ ้™คๆถˆ็บณๅœบๅคฑไฟก
111 */ 108 */
112 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:remove')")  
113 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.DELETE) 109 @Log(title = "ๆถˆ็บณๅœบๅคฑไฟก", businessType = BusinessType.DELETE)
114 @DeleteMapping("/{ids}") 110 @DeleteMapping("/{ids}")
115 public AjaxResult remove(@PathVariable Long[] ids) 111 public AjaxResult remove(@PathVariable Long[] ids)
@@ -117,7 +113,6 @@ public class EarthsitesCreditController extends BaseController @@ -117,7 +113,6 @@ public class EarthsitesCreditController extends BaseController
117 return toAjax(earthsitesCreditService.deleteEarthsitesCreditByIds(ids)); 113 return toAjax(earthsitesCreditService.deleteEarthsitesCreditByIds(ids));
118 } 114 }
119 115
120 - @PreAuthorize("@ss.hasPermi('EarthSites:credit:list')")  
121 @GetMapping("/historyCredit") 116 @GetMapping("/historyCredit")
122 public TableDataInfo historyCredit(EarthsitesCredit earthsitesCredit) 117 public TableDataInfo historyCredit(EarthsitesCredit earthsitesCredit)
123 { 118 {
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionSpecialController.java
  View file @9c06308
@@ -36,7 +36,6 @@ public class SupervisionSpecialController extends BaseController @@ -36,7 +36,6 @@ public class SupervisionSpecialController extends BaseController
36 /** 36 /**
37 * ๆŸฅ่ฏขไธ“้กน็ฃๅฏŸๅˆ—่กจ 37 * ๆŸฅ่ฏขไธ“้กน็ฃๅฏŸๅˆ—่กจ
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:list')")  
40 @GetMapping("/list") 39 @GetMapping("/list")
41 public TableDataInfo list(SupervisionSpecial supervisionSpecial) 40 public TableDataInfo list(SupervisionSpecial supervisionSpecial)
42 { 41 {
@@ -48,7 +47,6 @@ public class SupervisionSpecialController extends BaseController @@ -48,7 +47,6 @@ public class SupervisionSpecialController extends BaseController
48 /** 47 /**
49 * ๅฏผๅ‡บไธ“้กน็ฃๅฏŸๅˆ—่กจ 48 * ๅฏผๅ‡บไธ“้กน็ฃๅฏŸๅˆ—่กจ
50 */ 49 */
51 - @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:export')")  
52 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.EXPORT) 50 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 51 @GetMapping("/export")
54 public AjaxResult export(SupervisionSpecial supervisionSpecial) 52 public AjaxResult export(SupervisionSpecial supervisionSpecial)
@@ -65,7 +63,6 @@ public class SupervisionSpecialController extends BaseController @@ -65,7 +63,6 @@ public class SupervisionSpecialController extends BaseController
65 /** 63 /**
66 * ่Žทๅ–ไธ“้กน็ฃๅฏŸ่ฏฆ็ป†ไฟกๆฏ 64 * ่Žทๅ–ไธ“้กน็ฃๅฏŸ่ฏฆ็ป†ไฟกๆฏ
67 */ 65 */
68 - @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:query')")  
69 @GetMapping(value = "/{id}") 66 @GetMapping(value = "/{id}")
70 public AjaxResult getInfo(@PathVariable("id") String id) 67 public AjaxResult getInfo(@PathVariable("id") String id)
71 { 68 {
@@ -75,7 +72,6 @@ public class SupervisionSpecialController extends BaseController @@ -75,7 +72,6 @@ public class SupervisionSpecialController extends BaseController
75 /** 72 /**
76 * ๆ–ฐๅขžไธ“้กน็ฃๅฏŸ 73 * ๆ–ฐๅขžไธ“้กน็ฃๅฏŸ
77 */ 74 */
78 - @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:add')")  
79 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.INSERT) 75 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.INSERT)
80 @PostMapping 76 @PostMapping
81 public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial) 77 public AjaxResult add(@RequestBody SupervisionSpecial supervisionSpecial)
@@ -86,7 +82,6 @@ public class SupervisionSpecialController extends BaseController @@ -86,7 +82,6 @@ public class SupervisionSpecialController extends BaseController
86 /** 82 /**
87 * ไฟฎๆ”นไธ“้กน็ฃๅฏŸ 83 * ไฟฎๆ”นไธ“้กน็ฃๅฏŸ
88 */ 84 */
89 - @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:edit')")  
90 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.UPDATE) 85 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.UPDATE)
91 @PutMapping 86 @PutMapping
92 public AjaxResult edit(@RequestBody SupervisionSpecial supervisionSpecial) 87 public AjaxResult edit(@RequestBody SupervisionSpecial supervisionSpecial)
@@ -97,7 +92,6 @@ public class SupervisionSpecialController extends BaseController @@ -97,7 +92,6 @@ public class SupervisionSpecialController extends BaseController
97 /** 92 /**
98 * ๅˆ ้™คไธ“้กน็ฃๅฏŸ 93 * ๅˆ ้™คไธ“้กน็ฃๅฏŸ
99 */ 94 */
100 - @PreAuthorize("@ss.hasPermi('SupervisionSpecial:SupervisionSpecial:remove')")  
101 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.DELETE) 95 @Log(title = "ไธ“้กน็ฃๅฏŸ", businessType = BusinessType.DELETE)
102 @DeleteMapping("/{ids}") 96 @DeleteMapping("/{ids}")
103 public AjaxResult remove(@PathVariable String[] ids) 97 public AjaxResult remove(@PathVariable String[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @9c06308
@@ -62,7 +62,6 @@ public class SupervisionThreestepController extends BaseController @@ -62,7 +62,6 @@ public class SupervisionThreestepController extends BaseController
62 /** 62 /**
63 * ๆŸฅ่ฏขไธ‰ๆŸฅๆœบๅˆถๅˆ—่กจ 63 * ๆŸฅ่ฏขไธ‰ๆŸฅๆœบๅˆถๅˆ—่กจ
64 */ 64 */
65 - @PreAuthorize("@ss.hasPermi('business:threestep:list')")  
66 @GetMapping("/list") 65 @GetMapping("/list")
67 public TableDataInfo list(SupervisionThreestep supervisionThreestep) 66 public TableDataInfo list(SupervisionThreestep supervisionThreestep)
68 { 67 {
@@ -115,7 +114,6 @@ public class SupervisionThreestepController extends BaseController @@ -115,7 +114,6 @@ public class SupervisionThreestepController extends BaseController
115 return getDataTable(list); 114 return getDataTable(list);
116 } 115 }
117 116
118 - @PreAuthorize("@ss.hasPermi('business:threestep:list')")  
119 @PostMapping("/list") 117 @PostMapping("/list")
120 public AjaxResult postList(@RequestBody SupervisionThreestep supervisionThreestep) 118 public AjaxResult postList(@RequestBody SupervisionThreestep supervisionThreestep)
121 { 119 {
@@ -130,7 +128,6 @@ public class SupervisionThreestepController extends BaseController @@ -130,7 +128,6 @@ public class SupervisionThreestepController extends BaseController
130 /** 128 /**
131 * ๆŸฅ่ฏขไธ‰ๆŸฅๆœบๅˆถๅˆ—่กจ 129 * ๆŸฅ่ฏขไธ‰ๆŸฅๆœบๅˆถๅˆ—่กจ
132 */ 130 */
133 - @PreAuthorize("@ss.hasPermi('business:threestep:list')")  
134 @GetMapping("/dayWorkList") 131 @GetMapping("/dayWorkList")
135 public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep) 132 public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep)
136 { 133 {
@@ -276,7 +273,6 @@ public class SupervisionThreestepController extends BaseController @@ -276,7 +273,6 @@ public class SupervisionThreestepController extends BaseController
276 /** 273 /**
277 * ๅฏผๅ‡บไธ‰ๆŸฅๆœบๅˆถๅˆ—่กจ 274 * ๅฏผๅ‡บไธ‰ๆŸฅๆœบๅˆถๅˆ—่กจ
278 */ 275 */
279 - @PreAuthorize("@ss.hasPermi('business:threestep:export')")  
280 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.EXPORT) 276 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.EXPORT)
281 @GetMapping("/export") 277 @GetMapping("/export")
282 public AjaxResult export(SupervisionThreestep supervisionThreestep) 278 public AjaxResult export(SupervisionThreestep supervisionThreestep)
@@ -329,7 +325,6 @@ public class SupervisionThreestepController extends BaseController @@ -329,7 +325,6 @@ public class SupervisionThreestepController extends BaseController
329 /** 325 /**
330 * ๆ–ฐๅขžไธ‰ๆŸฅๆœบๅˆถ 326 * ๆ–ฐๅขžไธ‰ๆŸฅๆœบๅˆถ
331 */ 327 */
332 - @PreAuthorize("@ss.hasPermi('business:threestep:add')")  
333 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.INSERT) 328 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.INSERT)
334 @PostMapping 329 @PostMapping
335 public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep) 330 public AjaxResult add(@RequestBody SupervisionThreestep supervisionThreestep)
@@ -347,7 +342,6 @@ public class SupervisionThreestepController extends BaseController @@ -347,7 +342,6 @@ public class SupervisionThreestepController extends BaseController
347 /** 342 /**
348 * ไฟฎๆ”นไธ‰ๆŸฅๆœบๅˆถ 343 * ไฟฎๆ”นไธ‰ๆŸฅๆœบๅˆถ
349 */ 344 */
350 - @PreAuthorize("@ss.hasPermi('business:threestep:edit')")  
351 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.UPDATE) 345 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.UPDATE)
352 @PutMapping 346 @PutMapping
353 public AjaxResult edit(@RequestBody SupervisionThreestep supervisionThreestep) 347 public AjaxResult edit(@RequestBody SupervisionThreestep supervisionThreestep)
@@ -355,7 +349,6 @@ public class SupervisionThreestepController extends BaseController @@ -355,7 +349,6 @@ public class SupervisionThreestepController extends BaseController
355 return toAjax(supervisionThreestepService.updateSupervisionThreestep(supervisionThreestep)); 349 return toAjax(supervisionThreestepService.updateSupervisionThreestep(supervisionThreestep));
356 } 350 }
357 351
358 - @PreAuthorize("@ss.hasPermi('business:threestep:edit')")  
359 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.UPDATE) 352 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.UPDATE)
360 @PostMapping(value="/active") 353 @PostMapping(value="/active")
361 public AjaxResult active(@RequestBody SupervisionThreestep supervisionThreestep) 354 public AjaxResult active(@RequestBody SupervisionThreestep supervisionThreestep)
@@ -368,7 +361,6 @@ public class SupervisionThreestepController extends BaseController @@ -368,7 +361,6 @@ public class SupervisionThreestepController extends BaseController
368 /** 361 /**
369 * ๅˆ ้™คไธ‰ๆŸฅๆœบๅˆถ 362 * ๅˆ ้™คไธ‰ๆŸฅๆœบๅˆถ
370 */ 363 */
371 - @PreAuthorize("@ss.hasPermi('business:threestep:remove')")  
372 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.DELETE) 364 @Log(title = "ไธ‰ๆŸฅๆœบๅˆถ", businessType = BusinessType.DELETE)
373 @DeleteMapping("/{ids}") 365 @DeleteMapping("/{ids}")
374 public AjaxResult remove(@PathVariable Long[] ids) 366 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/TruckActivateController.java
  View file @9c06308
@@ -40,7 +40,6 @@ public class TruckActivateController extends BaseController @@ -40,7 +40,6 @@ public class TruckActivateController extends BaseController
40 /** 40 /**
41 * ๆŸฅ่ฏข่ฝฆ่พ†ๆฟ€ๆดปๅˆ—่กจ 41 * ๆŸฅ่ฏข่ฝฆ่พ†ๆฟ€ๆดปๅˆ—่กจ
42 */ 42 */
43 - @PreAuthorize("@ss.hasPermi('business:truckActivate:list')")  
44 @GetMapping("/list") 43 @GetMapping("/list")
45 public TableDataInfo list(TruckActivate truckActivate) 44 public TableDataInfo list(TruckActivate truckActivate)
46 { 45 {
@@ -52,7 +51,6 @@ public class TruckActivateController extends BaseController @@ -52,7 +51,6 @@ public class TruckActivateController extends BaseController
52 /** 51 /**
53 * ๅฏผๅ‡บ่ฝฆ่พ†ๆฟ€ๆดปๅˆ—่กจ 52 * ๅฏผๅ‡บ่ฝฆ่พ†ๆฟ€ๆดปๅˆ—่กจ
54 */ 53 */
55 - @PreAuthorize("@ss.hasPermi('business:truckActivate:export')")  
56 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.EXPORT) 54 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.EXPORT)
57 @GetMapping("/export") 55 @GetMapping("/export")
58 public AjaxResult export(TruckActivate truckActivate) 56 public AjaxResult export(TruckActivate truckActivate)
@@ -81,7 +79,6 @@ public class TruckActivateController extends BaseController @@ -81,7 +79,6 @@ public class TruckActivateController extends BaseController
81 /** 79 /**
82 * ่Žทๅ–่ฝฆ่พ†ๆฟ€ๆดป่ฏฆ็ป†ไฟกๆฏ 80 * ่Žทๅ–่ฝฆ่พ†ๆฟ€ๆดป่ฏฆ็ป†ไฟกๆฏ
83 */ 81 */
84 - @PreAuthorize("@ss.hasPermi('business:truckActivate:query')")  
85 @GetMapping(value = "/{id}") 82 @GetMapping(value = "/{id}")
86 public AjaxResult getInfo(@PathVariable("id") Long id) 83 public AjaxResult getInfo(@PathVariable("id") Long id)
87 { 84 {
@@ -91,7 +88,6 @@ public class TruckActivateController extends BaseController @@ -91,7 +88,6 @@ public class TruckActivateController extends BaseController
91 /** 88 /**
92 * ๆ–ฐๅขž่ฝฆ่พ†ๆฟ€ๆดป 89 * ๆ–ฐๅขž่ฝฆ่พ†ๆฟ€ๆดป
93 */ 90 */
94 - @PreAuthorize("@ss.hasPermi('business:truckActivate:add')")  
95 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.INSERT) 91 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.INSERT)
96 @PostMapping 92 @PostMapping
97 public AjaxResult add(@RequestBody TruckActivate truckActivate) 93 public AjaxResult add(@RequestBody TruckActivate truckActivate)
@@ -128,7 +124,6 @@ public class TruckActivateController extends BaseController @@ -128,7 +124,6 @@ public class TruckActivateController extends BaseController
128 /** 124 /**
129 * ไฟฎๆ”น่ฝฆ่พ†ๆฟ€ๆดป 125 * ไฟฎๆ”น่ฝฆ่พ†ๆฟ€ๆดป
130 */ 126 */
131 - @PreAuthorize("@ss.hasPermi('business:truckActivate:edit')")  
132 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.UPDATE) 127 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.UPDATE)
133 @PutMapping 128 @PutMapping
134 public AjaxResult edit(@RequestBody TruckActivate truckActivate) 129 public AjaxResult edit(@RequestBody TruckActivate truckActivate)
@@ -155,7 +150,6 @@ public class TruckActivateController extends BaseController @@ -155,7 +150,6 @@ public class TruckActivateController extends BaseController
155 /** 150 /**
156 * ๅˆ ้™ค่ฝฆ่พ†ๆฟ€ๆดป 151 * ๅˆ ้™ค่ฝฆ่พ†ๆฟ€ๆดป
157 */ 152 */
158 - @PreAuthorize("@ss.hasPermi('business:truckActivate:remove')")  
159 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.DELETE) 153 @Log(title = "่ฝฆ่พ†ๆฟ€ๆดป", businessType = BusinessType.DELETE)
160 @DeleteMapping("/{ids}") 154 @DeleteMapping("/{ids}")
161 public AjaxResult remove(@PathVariable Long[] ids) 155 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/controller/TruckCreditController.java
  View file @9c06308
@@ -47,7 +47,6 @@ public class TruckCreditController extends BaseController @@ -47,7 +47,6 @@ public class TruckCreditController extends BaseController
47 return getDataTable(list); 47 return getDataTable(list);
48 } 48 }
49 49
50 - @PreAuthorize("@ss.hasPermi('business:credit:list')")  
51 @GetMapping("/historyCredit") 50 @GetMapping("/historyCredit")
52 public TableDataInfo historyCredit(TruckCredit truckCredit) 51 public TableDataInfo historyCredit(TruckCredit truckCredit)
53 { 52 {
@@ -76,7 +75,6 @@ public class TruckCreditController extends BaseController @@ -76,7 +75,6 @@ public class TruckCreditController extends BaseController
76 /** 75 /**
77 * ๅฏผๅ‡บ่ฝฆ่พ†ๅคฑไฟกๅˆ—่กจ 76 * ๅฏผๅ‡บ่ฝฆ่พ†ๅคฑไฟกๅˆ—่กจ
78 */ 77 */
79 - @PreAuthorize("@ss.hasPermi('truck:credit:export')")  
80 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.EXPORT) 78 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.EXPORT)
81 @GetMapping("/export") 79 @GetMapping("/export")
82 public AjaxResult export(TruckCredit truckCredit) 80 public AjaxResult export(TruckCredit truckCredit)
@@ -103,7 +101,6 @@ public class TruckCreditController extends BaseController @@ -103,7 +101,6 @@ public class TruckCreditController extends BaseController
103 /** 101 /**
104 * ่Žทๅ–่ฝฆ่พ†ๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ 102 * ่Žทๅ–่ฝฆ่พ†ๅคฑไฟก่ฏฆ็ป†ไฟกๆฏ
105 */ 103 */
106 - @PreAuthorize("@ss.hasPermi('truck:credit:query')")  
107 @GetMapping(value = "/{id}") 104 @GetMapping(value = "/{id}")
108 public AjaxResult getInfo(@PathVariable("id") Long id) 105 public AjaxResult getInfo(@PathVariable("id") Long id)
109 { 106 {
@@ -113,7 +110,6 @@ public class TruckCreditController extends BaseController @@ -113,7 +110,6 @@ public class TruckCreditController extends BaseController
113 /** 110 /**
114 * ๆ–ฐๅขž่ฝฆ่พ†ๅคฑไฟก 111 * ๆ–ฐๅขž่ฝฆ่พ†ๅคฑไฟก
115 */ 112 */
116 - @PreAuthorize("@ss.hasPermi('truck:credit:add')")  
117 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.INSERT) 113 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.INSERT)
118 @PostMapping 114 @PostMapping
119 public AjaxResult add(@RequestBody TruckCredit truckCredit) 115 public AjaxResult add(@RequestBody TruckCredit truckCredit)
@@ -124,7 +120,6 @@ public class TruckCreditController extends BaseController @@ -124,7 +120,6 @@ public class TruckCreditController extends BaseController
124 /** 120 /**
125 * ไฟฎๆ”น่ฝฆ่พ†ๅคฑไฟก 121 * ไฟฎๆ”น่ฝฆ่พ†ๅคฑไฟก
126 */ 122 */
127 - @PreAuthorize("@ss.hasPermi('truck:credit:edit')")  
128 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.UPDATE) 123 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.UPDATE)
129 @PutMapping 124 @PutMapping
130 public AjaxResult edit(@RequestBody TruckCredit truckCredit) 125 public AjaxResult edit(@RequestBody TruckCredit truckCredit)
@@ -135,7 +130,6 @@ public class TruckCreditController extends BaseController @@ -135,7 +130,6 @@ public class TruckCreditController extends BaseController
135 /** 130 /**
136 * ๅˆ ้™ค่ฝฆ่พ†ๅคฑไฟก 131 * ๅˆ ้™ค่ฝฆ่พ†ๅคฑไฟก
137 */ 132 */
138 - @PreAuthorize("@ss.hasPermi('truck:credit:remove')")  
139 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.DELETE) 133 @Log(title = "่ฝฆ่พ†ๅคฑไฟก", businessType = BusinessType.DELETE)
140 @DeleteMapping("/{ids}") 134 @DeleteMapping("/{ids}")
141 public AjaxResult remove(@PathVariable Long[] ids) 135 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/business/domain/DriverCredit.java
  View file @9c06308
@@ -28,6 +28,10 @@ public class DriverCredit extends BaseEntity @@ -28,6 +28,10 @@ public class DriverCredit extends BaseEntity
28 /** ่ฏไปถๅท็  */ 28 /** ่ฏไปถๅท็  */
29 @Excel(name = "่ฏไปถๅท็ ") 29 @Excel(name = "่ฏไปถๅท็ ")
30 private String idNumber; 30 private String idNumber;
  31 +
  32 + @Excel(name = "่ฝฆ็‰Œๅท")
  33 + private String licenseplateNo;
  34 +
31 35
32 /** ๅคฑไฟกๆ—ถ้—ด */ 36 /** ๅคฑไฟกๆ—ถ้—ด */
33 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") 37 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@@ -50,7 +54,15 @@ public class DriverCredit extends BaseEntity @@ -50,7 +54,15 @@ public class DriverCredit extends BaseEntity
50 54
51 55
52 56
53 - public void setId(Long id) 57 + public String getLicenseplateNo() {
  58 + return licenseplateNo;
  59 + }
  60 +
  61 + public void setLicenseplateNo(String licenseplateNo) {
  62 + this.licenseplateNo = licenseplateNo;
  63 + }
  64 +
  65 + public void setId(Long id)
54 { 66 {
55 this.id = id; 67 this.id = id;
56 } 68 }
trash-workFlow/src/main/java/com/trash/business/mapper/DriverCreditMapper.java
  View file @9c06308
@@ -63,4 +63,6 @@ public interface DriverCreditMapper @@ -63,4 +63,6 @@ public interface DriverCreditMapper
63 List<String> getNames(DriverCredit driverCredit); 63 List<String> getNames(DriverCredit driverCredit);
64 64
65 List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit); 65 List<DriverCredit> selectDriverCreditHistory(DriverCredit driverCredit);
  66 +
  67 + List<String> getLicenseplate(DriverCredit credit);
66 } 68 }
67 \ No newline at end of file 69 \ No newline at end of file
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionThreestepService.java
  View file @9c06308
@@ -81,6 +81,8 @@ public interface ISupervisionThreestepService @@ -81,6 +81,8 @@ public interface ISupervisionThreestepService
81 public List<String> getNames(SupervisionThreestep supervisionThreestep); 81 public List<String> getNames(SupervisionThreestep supervisionThreestep);
82 82
83 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep); 83 public List<Map> selectDayWorkListByType(SupervisionThreestep supervisionThreestep);
  84 +
  85 + void updateTodayData(String token);
84 86
85 87
86 } 88 }
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @9c06308
@@ -218,10 +218,15 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -218,10 +218,15 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
218 e.printStackTrace(); 218 e.printStackTrace();
219 } 219 }
220 } 220 }
221 - }else{  
222 -  
223 } 221 }
224 222
  223 + Map param = new HashMap<>();
  224 +
  225 + param.put("page", 1);
  226 + param.put("size", 99999);
  227 +
  228 + JSONArray contracts = RemoteServerUtils.getContractList(param);
  229 +
225 List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep); 230 List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
226 231
227 long start = new Date().getTime(); 232 long start = new Date().getTime();
@@ -264,33 +269,47 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -264,33 +269,47 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
264 269
265 for(SupervisionThreestep s:constructions){ 270 for(SupervisionThreestep s:constructions){
266 271
267 - for(SupervisionThreestep e:earthsites){ 272 +
  273 + for(Object object : contracts){
  274 + JSONObject jsonObject = (JSONObject) object;
268 275
269 - if(s.getEarthsitesId().contains(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))){ 276 + if(!s.getObjectId().equals(jsonObject.getString("constructionSiteID")))
  277 + continue;
  278 +
  279 + for(SupervisionThreestep e:earthsites){
270 280
271 - if(s.getStatus() != 1 || e.getStatus() != 1){ 281 + if(!supervisionThreestep.getHis().equals("1") && !e.getObjectId().equals(jsonObject.getString("earthSiteID")))
272 continue; 282 continue;
273 - }  
274 283
275 - Map<String,String> map = new HashMap<String, String>();  
276 - map.put("id", s.getId() + "");  
277 - map.put("createTime", yearFomat.format(s.getCreateTime()));  
278 - map.put("name", s.getName());  
279 - map.put("place", s.getPlace());  
280 - map.put("status", "ๅผ€ๅทฅ");  
281 - map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));  
282 - map.put("objectId", s.getObjectId());  
283 - map.put("type", "");  
284 - map.put("eid", e.getObjectId());  
285 - map.put("ename", e.getName());  
286 - map.put("eplace", e.getPlace());  
287 - map.put("estatus", "ๅผ€ๅทฅ" );  
288 - map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));  
289 - map.put("etype", "");  
290 -  
291 - map.put("descript", "ๆœ‰ๆ•ˆๅผ€ๅทฅ"); 284 + if(supervisionThreestep.getHis().equals("1") && !s.getEarthsitesId().contains(e.getObjectId()))
  285 + continue;
292 286
293 - list.add(map); 287 + if(yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))){
  288 +
  289 + if(s.getStatus() != 1 || e.getStatus() != 1){
  290 + continue;
  291 + }
  292 +
  293 + Map<String,String> map = new HashMap<String, String>();
  294 + map.put("id", s.getId() + "");
  295 + map.put("createTime", yearFomat.format(s.getCreateTime()));
  296 + map.put("name", s.getName());
  297 + map.put("place", s.getPlace());
  298 + map.put("status", "ๅผ€ๅทฅ");
  299 + map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
  300 + map.put("objectId", s.getObjectId());
  301 + map.put("type", "");
  302 + map.put("eid", e.getObjectId());
  303 + map.put("ename", e.getName());
  304 + map.put("eplace", e.getPlace());
  305 + map.put("estatus", "ๅผ€ๅทฅ" );
  306 + map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
  307 + map.put("etype", "");
  308 +
  309 + map.put("descript", "ๆœ‰ๆ•ˆๅผ€ๅทฅ");
  310 +
  311 + list.add(map);
  312 + }
294 } 313 }
295 } 314 }
296 } 315 }
@@ -774,6 +793,84 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer @@ -774,6 +793,84 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
774 } 793 }
775 794
776 @Override 795 @Override
  796 + public void updateTodayData(String token){
  797 + Map param = new HashMap<>();
  798 +
  799 + param.put("page", 1);
  800 + param.put("size", 99999);
  801 +
  802 + JSONArray contracts = RemoteServerUtils.getContractList(param,token);
  803 +
  804 + SupervisionThreestep supervisionThreestep = new SupervisionThreestep();
  805 +
  806 + String start, end;
  807 +
  808 + Date date = new Date();
  809 +
  810 + end = yearFomat.format(date);
  811 + date.setDate(date.getDate() - 1);
  812 + start = yearFomat.format(date);
  813 +
  814 + end += " 8:00:00";
  815 + start += " 8:00:00";
  816 +
  817 + try {
  818 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  819 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
  820 + supervisionThreestep.setStatus(1L);
  821 + supervisionThreestep.setType(0L);
  822 + } catch (Exception e) {
  823 + // TODO Auto-generated catch block
  824 + e.printStackTrace();
  825 + }
  826 +
  827 + List<SupervisionThreestep> list = supervisionThreestepMapper.selectSupervisionThreestepList(supervisionThreestep);
  828 +
  829 +
  830 +
  831 +
  832 + for(SupervisionThreestep s: list){
  833 + String cid = "";
  834 + String cname = "";
  835 + String eid = "";
  836 + String ename = "";
  837 +
  838 + for(Object object : contracts){
  839 + JSONObject jsonObject = (JSONObject) object;
  840 +
  841 + if(s.getObjectId().equals(jsonObject.getString("constructionSiteID"))){
  842 + cid += jsonObject.getString("id") + ",";
  843 + cname += jsonObject.getString("contractNo")+ ",";
  844 + eid += jsonObject.getString("earthSiteID")+ ",";
  845 + ename += jsonObject.getString("earthSiteName")+ ",";
  846 + }
  847 +
  848 + }
  849 + if(cid.length() > 0){
  850 + cid = cid.substring(0,cid.length()-1);
  851 + }
  852 + if(cname.length() > 0){
  853 + cname = cid.substring(0,cname.length()-1);
  854 + }
  855 + if(eid.length() > 0){
  856 + eid = cid.substring(0,eid.length()-1);
  857 + }
  858 + if(ename.length() > 0){
  859 + ename = cid.substring(0,ename.length()-1);
  860 + }
  861 + s.setContractId(cid);
  862 + s.setContract(cname);
  863 + s.setEarthsitesId(eid);
  864 + s.setEarthsitesName(ename);
  865 +
  866 + supervisionThreestepMapper.updateSupervisionThreestep(s);
  867 + }
  868 +
  869 +
  870 +
  871 + }
  872 +
  873 + @Override
777 public SupervisionThreestep getSupervisionThreestepInfo(SupervisionThreestep supervisionThreestep) { 874 public SupervisionThreestep getSupervisionThreestepInfo(SupervisionThreestep supervisionThreestep) {
778 return supervisionThreestepMapper.getSupervisionThreestepInfo(supervisionThreestep); 875 return supervisionThreestepMapper.getSupervisionThreestepInfo(supervisionThreestep);
779 } 876 }
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckActivateServiceImpl.java
  View file @9c06308
@@ -2,17 +2,23 @@ package com.trash.business.service.impl; @@ -2,17 +2,23 @@ package com.trash.business.service.impl;
2 2
3 import java.text.DateFormat; 3 import java.text.DateFormat;
4 import java.text.SimpleDateFormat; 4 import java.text.SimpleDateFormat;
  5 +import java.util.ArrayList;
5 import java.util.Date; 6 import java.util.Date;
  7 +import java.util.HashMap;
6 import java.util.List; 8 import java.util.List;
7 import java.util.Map; 9 import java.util.Map;
8 10
9 import com.trash.common.utils.DateUtils; 11 import com.trash.common.utils.DateUtils;
  12 +import com.trash.common.utils.RemoteServerUtils;
  13 +
10 import org.apache.commons.lang3.time.DateFormatUtils; 14 import org.apache.commons.lang3.time.DateFormatUtils;
11 import org.springframework.beans.factory.annotation.Autowired; 15 import org.springframework.beans.factory.annotation.Autowired;
12 import org.springframework.stereotype.Service; 16 import org.springframework.stereotype.Service;
13 17
14 import com.trash.business.mapper.SupervisionThreestepMapper; 18 import com.trash.business.mapper.SupervisionThreestepMapper;
15 import com.trash.business.mapper.TruckActivateMapper; 19 import com.trash.business.mapper.TruckActivateMapper;
  20 +import com.alibaba.fastjson.JSONArray;
  21 +import com.alibaba.fastjson.JSONObject;
16 import com.trash.business.domain.SupervisionThreestep; 22 import com.trash.business.domain.SupervisionThreestep;
17 import com.trash.business.domain.TruckActivate; 23 import com.trash.business.domain.TruckActivate;
18 import com.trash.business.service.ISupervisionThreestepService; 24 import com.trash.business.service.ISupervisionThreestepService;
@@ -287,12 +293,27 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -287,12 +293,27 @@ public class TruckActivateServiceImpl implements ITruckActivateService
287 293
288 Map<String,String> m = truckActivateMapper.getConractByObjectId(turck); 294 Map<String,String> m = truckActivateMapper.getConractByObjectId(turck);
289 295
290 - if(m == null || m.get("earthsites_id") == null || m.get("earthsites_id").isEmpty()){ 296 + Map param = new HashMap<>();
  297 +
  298 + List<String> ids =new ArrayList<>();
  299 +
  300 + ids.add(m.get("object_id"));
  301 +
  302 + param.put("constructionSiteID", ids);
  303 + param.put("page", 1);
  304 + param.put("size", 99999);
  305 +
  306 + JSONArray array = RemoteServerUtils.getContractList(param);
  307 +
  308 + if(array == null || m.size() == 0){
291 return null; 309 return null;
292 } 310 }
293 311
294 - for(String str:m.get("earthsites_id").split(",")){  
295 - threestep.setObjectId(str); 312 + for(Object object:array){
  313 +
  314 + JSONObject jsonObject = (JSONObject) object;
  315 +
  316 + threestep.setObjectId(jsonObject.getString("earthSiteID"));
296 threestep.setType(1L); 317 threestep.setType(1L);
297 threestep.setStatus(1L); 318 threestep.setStatus(1L);
298 List<SupervisionThreestep> list = threestepMapper.selectSupervisionThreestepList(threestep); 319 List<SupervisionThreestep> list = threestepMapper.selectSupervisionThreestepList(threestep);
@@ -300,21 +321,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService @@ -300,21 +321,7 @@ public class TruckActivateServiceImpl implements ITruckActivateService
300 321
301 322
302 if(list.size() == 1){ 323 if(list.size() == 1){
303 -  
304 - String[] objs = list.get(0).getEarthsitesId().split(",");  
305 -  
306 - for(int j = 0 ; j<objs.length;j++){  
307 - SupervisionThreestep construction = new SupervisionThreestep();  
308 - construction.setWorkStartTime(threestep.getWorkStartTime());  
309 - construction.setWorkEndTime(threestep.getWorkEndTime());  
310 - construction.setObjectId(objs[j]);  
311 - construction.setType(0L);  
312 - construction.setStatus(1L);  
313 - if(threestepMapper.selectSupervisionThreestepList(construction).size() == 1){  
314 - conractIds += list.get(0).getContractId().split(",")[j] + ",";  
315 - }  
316 -  
317 - } 324 + conractIds += jsonObject.getString("id") + ",";
318 } 325 }
319 } 326 }
320 327
trash-workFlow/src/main/java/com/trash/caseOffline/controller/CaseOfflineController.java
  View file @9c06308
@@ -39,7 +39,6 @@ public class CaseOfflineController extends BaseController @@ -39,7 +39,6 @@ public class CaseOfflineController extends BaseController
39 /** 39 /**
40 * ๆŸฅ่ฏข็บฟไธ‹ไบคๅŠžๆกˆๅทๅˆ—่กจ 40 * ๆŸฅ่ฏข็บฟไธ‹ไบคๅŠžๆกˆๅทๅˆ—่กจ
41 */ 41 */
42 - @PreAuthorize("@ss.hasPermi('caseOffline:caseOffline:list')")  
43 @GetMapping("/list") 42 @GetMapping("/list")
44 public TableDataInfo list(CaseOffline caseOffline) 43 public TableDataInfo list(CaseOffline caseOffline)
45 { 44 {
@@ -51,7 +50,6 @@ public class CaseOfflineController extends BaseController @@ -51,7 +50,6 @@ public class CaseOfflineController extends BaseController
51 /** 50 /**
52 * ๅฏผๅ‡บ็บฟไธ‹ไบคๅŠžๆกˆๅทๅˆ—่กจ 51 * ๅฏผๅ‡บ็บฟไธ‹ไบคๅŠžๆกˆๅทๅˆ—่กจ
53 */ 52 */
54 - @PreAuthorize("@ss.hasPermi('caseOffline:caseOffline:export')")  
55 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.EXPORT) 53 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.EXPORT)
56 @GetMapping("/export") 54 @GetMapping("/export")
57 public AjaxResult export(CaseOffline caseOffline) 55 public AjaxResult export(CaseOffline caseOffline)
@@ -79,7 +77,6 @@ public class CaseOfflineController extends BaseController @@ -79,7 +77,6 @@ public class CaseOfflineController extends BaseController
79 /** 77 /**
80 * ่Žทๅ–็บฟไธ‹ไบคๅŠžๆกˆๅท่ฏฆ็ป†ไฟกๆฏ 78 * ่Žทๅ–็บฟไธ‹ไบคๅŠžๆกˆๅท่ฏฆ็ป†ไฟกๆฏ
81 */ 79 */
82 - @PreAuthorize("@ss.hasPermi('caseOffline:caseOffline:query')")  
83 @GetMapping(value = "/{id}") 80 @GetMapping(value = "/{id}")
84 public AjaxResult getInfo(@PathVariable("id") Long id) 81 public AjaxResult getInfo(@PathVariable("id") Long id)
85 { 82 {
@@ -98,7 +95,6 @@ public class CaseOfflineController extends BaseController @@ -98,7 +95,6 @@ public class CaseOfflineController extends BaseController
98 /** 95 /**
99 * ๆ–ฐๅขž็บฟไธ‹ไบคๅŠžๆกˆๅท 96 * ๆ–ฐๅขž็บฟไธ‹ไบคๅŠžๆกˆๅท
100 */ 97 */
101 - @PreAuthorize("@ss.hasPermi('caseOffline:caseOffline:add')")  
102 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.INSERT) 98 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.INSERT)
103 @PostMapping 99 @PostMapping
104 public AjaxResult add(@RequestBody CaseOffline caseOffline) 100 public AjaxResult add(@RequestBody CaseOffline caseOffline)
@@ -109,7 +105,6 @@ public class CaseOfflineController extends BaseController @@ -109,7 +105,6 @@ public class CaseOfflineController extends BaseController
109 /** 105 /**
110 * ไฟฎๆ”น็บฟไธ‹ไบคๅŠžๆกˆๅท 106 * ไฟฎๆ”น็บฟไธ‹ไบคๅŠžๆกˆๅท
111 */ 107 */
112 - @PreAuthorize("@ss.hasPermi('caseOffline:caseOffline:edit')")  
113 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.UPDATE) 108 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.UPDATE)
114 @PutMapping 109 @PutMapping
115 public AjaxResult edit(@RequestBody CaseOffline caseOffline) 110 public AjaxResult edit(@RequestBody CaseOffline caseOffline)
@@ -120,7 +115,6 @@ public class CaseOfflineController extends BaseController @@ -120,7 +115,6 @@ public class CaseOfflineController extends BaseController
120 /** 115 /**
121 * ๅˆ ้™ค็บฟไธ‹ไบคๅŠžๆกˆๅท 116 * ๅˆ ้™ค็บฟไธ‹ไบคๅŠžๆกˆๅท
122 */ 117 */
123 - @PreAuthorize("@ss.hasPermi('caseOffline:caseOffline:remove')")  
124 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.DELETE) 118 @Log(title = "็บฟไธ‹ไบคๅŠžๆกˆๅท", businessType = BusinessType.DELETE)
125 @DeleteMapping("/{ids}") 119 @DeleteMapping("/{ids}")
126 public AjaxResult remove(@PathVariable Long[] ids) 120 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/caseOffline/domain/CaseOffline.java
  View file @9c06308
@@ -30,7 +30,7 @@ public class CaseOffline extends BaseEntity @@ -30,7 +30,7 @@ public class CaseOffline extends BaseEntity
30 + "่ฝฆ่ฝฎๅธฆๆณฅ,1=ๆœชๆด—่ฝฆๅ‡บๅœบๆˆ–่€…ๅ‡บๅœบๆธ…ๆดไธๅฝปๅบ•,2=ๆธฃๅœŸ่ฟ่พ“่ฝฆ่พ†่ดง็ฎฑ้กถ็›–ๆœชๆŒ‰่ง„ๅฎšๅ…ณ้—ญๅˆฐไฝๆˆ–ๆœชๆŒ‰่ง„ๅฎšๅ’Œๆ ‡ๅ‡†่ฃ…่ฝฝๆธฃๅœŸๅ‡บๅœบ," 30 + "่ฝฆ่ฝฎๅธฆๆณฅ,1=ๆœชๆด—่ฝฆๅ‡บๅœบๆˆ–่€…ๅ‡บๅœบๆธ…ๆดไธๅฝปๅบ•,2=ๆธฃๅœŸ่ฟ่พ“่ฝฆ่พ†่ดง็ฎฑ้กถ็›–ๆœชๆŒ‰่ง„ๅฎšๅ…ณ้—ญๅˆฐไฝๆˆ–ๆœชๆŒ‰่ง„ๅฎšๅ’Œๆ ‡ๅ‡†่ฃ…่ฝฝๆธฃๅœŸๅ‡บๅœบ,"
31 + "3=้žๆ ธๅ‡†่ฝฆ่พ†่ฟ›ๅ…ฅๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐ่ฟ่พ“ๆธฃๅœŸ,4=ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆœชๆŒ‰่ง„ๅฎšๆ—ถ้—ดๅผ€ๅœๅทฅ," 31 + "3=้žๆ ธๅ‡†่ฝฆ่พ†่ฟ›ๅ…ฅๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐ่ฟ่พ“ๆธฃๅœŸ,4=ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆœชๆŒ‰่ง„ๅฎšๆ—ถ้—ดๅผ€ๅœๅทฅ,"
32 + "5=ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆด—่ฝฆ่ฎพๆ–ฝ็ญ‰็ ดๆŸใ€ๆœชๆญฃๅธธไฝฟ็”จๅŠๆŽชๆ–ฝไธๅˆฐไฝ็š„,6=ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐใ€ๆถˆ็บณๅœบ(ๅซๅ›žๅกซๅœบ๏ผ‰ๅ‡บๅ…ฅๅฃไธคไพง50็ฑณ่Œƒๅ›ดๅ†…ๅ‡บ็ŽฐๆธฃๅœŸๆฑกๆŸ“ใ€ๆฑกๆฐดๅค–ๆŽ’็ญ‰็Žฐ่ฑก" 32 + "5=ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐๆด—่ฝฆ่ฎพๆ–ฝ็ญ‰็ ดๆŸใ€ๆœชๆญฃๅธธไฝฟ็”จๅŠๆŽชๆ–ฝไธๅˆฐไฝ็š„,6=ๆธฃๅœŸๅค„็ฝฎๅทฅๅœฐใ€ๆถˆ็บณๅœบ(ๅซๅ›žๅกซๅœบ๏ผ‰ๅ‡บๅ…ฅๅฃไธคไพง50็ฑณ่Œƒๅ›ดๅ†…ๅ‡บ็ŽฐๆธฃๅœŸๆฑกๆŸ“ใ€ๆฑกๆฐดๅค–ๆŽ’็ญ‰็Žฐ่ฑก"
33 - + "7=ๅ…ถไป–1,8=ๅ…ถไป–2,9=ๅ…ถไป–3") 33 + + "7=ๆ— ่ฎธๅฏๆถˆ็บณ๏ผˆๅทฅ๏ผ‰,8=ๆ— ่ฎธๅฏๆถˆ็บณ๏ผˆๆถˆ๏ผ‰,9=ๅ…ถไป–3")
34 private String type; 34 private String type;
35 35
36 36
trash-workFlow/src/main/java/com/trash/casefile/controller/ReplyApprovalProcessController.java
  View file @9c06308
@@ -41,7 +41,6 @@ public class ReplyApprovalProcessController extends BaseController @@ -41,7 +41,6 @@ public class ReplyApprovalProcessController extends BaseController
41 /** 41 /**
42 * ๆŸฅ่ฏขๅ›žๅคๅฎกๆ‰นๆต็จ‹ๅˆ—่กจ 42 * ๆŸฅ่ฏขๅ›žๅคๅฎกๆ‰นๆต็จ‹ๅˆ—่กจ
43 */ 43 */
44 - @PreAuthorize("@ss.hasPermi('replyApprovalProcess:replyApprovalProcess:list')")  
45 @GetMapping("/list") 44 @GetMapping("/list")
46 public TableDataInfo list(ReplyApprovalProcess replyApprovalProcess) 45 public TableDataInfo list(ReplyApprovalProcess replyApprovalProcess)
47 { 46 {
@@ -53,7 +52,6 @@ public class ReplyApprovalProcessController extends BaseController @@ -53,7 +52,6 @@ public class ReplyApprovalProcessController extends BaseController
53 /** 52 /**
54 * ๅฏผๅ‡บๅ›žๅคๅฎกๆ‰นๆต็จ‹ๅˆ—่กจ 53 * ๅฏผๅ‡บๅ›žๅคๅฎกๆ‰นๆต็จ‹ๅˆ—่กจ
55 */ 54 */
56 - @PreAuthorize("@ss.hasPermi('replyApprovalProcess:replyApprovalProcess:export')")  
57 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.EXPORT) 55 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.EXPORT)
58 @GetMapping("/export") 56 @GetMapping("/export")
59 public AjaxResult export(ReplyApprovalProcess replyApprovalProcess) 57 public AjaxResult export(ReplyApprovalProcess replyApprovalProcess)
@@ -71,7 +69,6 @@ public class ReplyApprovalProcessController extends BaseController @@ -71,7 +69,6 @@ public class ReplyApprovalProcessController extends BaseController
71 /** 69 /**
72 * ่Žทๅ–ๅ›žๅคๅฎกๆ‰นๆต็จ‹่ฏฆ็ป†ไฟกๆฏ 70 * ่Žทๅ–ๅ›žๅคๅฎกๆ‰นๆต็จ‹่ฏฆ็ป†ไฟกๆฏ
73 */ 71 */
74 - @PreAuthorize("@ss.hasPermi('replyApprovalProcess:replyApprovalProcess:query')")  
75 @GetMapping(value = "/{id}") 72 @GetMapping(value = "/{id}")
76 public AjaxResult getInfo(@PathVariable("id") Long id) 73 public AjaxResult getInfo(@PathVariable("id") Long id)
77 { 74 {
@@ -81,7 +78,6 @@ public class ReplyApprovalProcessController extends BaseController @@ -81,7 +78,6 @@ public class ReplyApprovalProcessController extends BaseController
81 /** 78 /**
82 * ๆ–ฐๅขžๅ›žๅคๅฎกๆ‰นๆต็จ‹ 79 * ๆ–ฐๅขžๅ›žๅคๅฎกๆ‰นๆต็จ‹
83 */ 80 */
84 - @PreAuthorize("@ss.hasPermi('replyApprovalProcess:replyApprovalProcess:add')")  
85 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.INSERT) 81 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.INSERT)
86 @PostMapping 82 @PostMapping
87 public AjaxResult add(@RequestBody ReplyApprovalProcess replyApprovalProcess) 83 public AjaxResult add(@RequestBody ReplyApprovalProcess replyApprovalProcess)
@@ -94,7 +90,6 @@ public class ReplyApprovalProcessController extends BaseController @@ -94,7 +90,6 @@ public class ReplyApprovalProcessController extends BaseController
94 /** 90 /**
95 * ไฟฎๆ”นๅ›žๅคๅฎกๆ‰นๆต็จ‹ 91 * ไฟฎๆ”นๅ›žๅคๅฎกๆ‰นๆต็จ‹
96 */ 92 */
97 - @PreAuthorize("@ss.hasPermi('replyApprovalProcess:replyApprovalProcess:edit')")  
98 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.UPDATE) 93 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.UPDATE)
99 @PutMapping 94 @PutMapping
100 public AjaxResult edit(@RequestBody ReplyApprovalProcess replyApprovalProcess) 95 public AjaxResult edit(@RequestBody ReplyApprovalProcess replyApprovalProcess)
@@ -105,7 +100,6 @@ public class ReplyApprovalProcessController extends BaseController @@ -105,7 +100,6 @@ public class ReplyApprovalProcessController extends BaseController
105 /** 100 /**
106 * ๅˆ ้™คๅ›žๅคๅฎกๆ‰นๆต็จ‹ 101 * ๅˆ ้™คๅ›žๅคๅฎกๆ‰นๆต็จ‹
107 */ 102 */
108 - @PreAuthorize("@ss.hasPermi('replyApprovalProcess:replyApprovalProcess:remove')")  
109 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.DELETE) 103 @Log(title = "ๅ›žๅคๅฎกๆ‰นๆต็จ‹", businessType = BusinessType.DELETE)
110 @DeleteMapping("/{ids}") 104 @DeleteMapping("/{ids}")
111 public AjaxResult remove(@PathVariable Long[] ids) 105 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationCaseFileController.java
  View file @9c06308
@@ -42,7 +42,6 @@ public class ViolationCaseFileController extends BaseController @@ -42,7 +42,6 @@ public class ViolationCaseFileController extends BaseController
42 /** 42 /**
43 * ๆŸฅ่ฏขๅนณๅฐ่ฟ่ง„ๆกˆๅทๅˆ—่กจ 43 * ๆŸฅ่ฏขๅนณๅฐ่ฟ่ง„ๆกˆๅทๅˆ—่กจ
44 */ 44 */
45 - @PreAuthorize("@ss.hasPermi('casefile:violationCaseFile:list')")  
46 @GetMapping("/list") 45 @GetMapping("/list")
47 public TableDataInfo list(ViolationCaseFile violationCaseFile) 46 public TableDataInfo list(ViolationCaseFile violationCaseFile)
48 { 47 {
@@ -54,7 +53,6 @@ public class ViolationCaseFileController extends BaseController @@ -54,7 +53,6 @@ public class ViolationCaseFileController extends BaseController
54 /** 53 /**
55 * ๅฏผๅ‡บๅนณๅฐ่ฟ่ง„ๆกˆๅทๅˆ—่กจ 54 * ๅฏผๅ‡บๅนณๅฐ่ฟ่ง„ๆกˆๅทๅˆ—่กจ
56 */ 55 */
57 - @PreAuthorize("@ss.hasPermi('casefile:violationCaseFile:export')")  
58 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.EXPORT) 56 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.EXPORT)
59 @GetMapping("/export") 57 @GetMapping("/export")
60 public AjaxResult export(ViolationCaseFile violationCaseFile) 58 public AjaxResult export(ViolationCaseFile violationCaseFile)
@@ -71,7 +69,6 @@ public class ViolationCaseFileController extends BaseController @@ -71,7 +69,6 @@ public class ViolationCaseFileController extends BaseController
71 /** 69 /**
72 * ่Žทๅ–ๅนณๅฐ่ฟ่ง„ๆกˆๅท่ฏฆ็ป†ไฟกๆฏ 70 * ่Žทๅ–ๅนณๅฐ่ฟ่ง„ๆกˆๅท่ฏฆ็ป†ไฟกๆฏ
73 */ 71 */
74 - @PreAuthorize("@ss.hasPermi('casefile:violationCaseFile:query')")  
75 @GetMapping(value = "/{id}") 72 @GetMapping(value = "/{id}")
76 public AjaxResult getInfo(@PathVariable("id") Long id) 73 public AjaxResult getInfo(@PathVariable("id") Long id)
77 { 74 {
@@ -81,7 +78,6 @@ public class ViolationCaseFileController extends BaseController @@ -81,7 +78,6 @@ public class ViolationCaseFileController extends BaseController
81 /** 78 /**
82 * ๆ–ฐๅขžๅนณๅฐ่ฟ่ง„ๆกˆๅท 79 * ๆ–ฐๅขžๅนณๅฐ่ฟ่ง„ๆกˆๅท
83 */ 80 */
84 - @PreAuthorize("@ss.hasPermi('casefile:violationCaseFile:add')")  
85 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.INSERT) 81 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.INSERT)
86 @PostMapping 82 @PostMapping
87 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, ViolationCaseFile violationCaseFile) throws IOException 83 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, ViolationCaseFile violationCaseFile) throws IOException
@@ -92,7 +88,6 @@ public class ViolationCaseFileController extends BaseController @@ -92,7 +88,6 @@ public class ViolationCaseFileController extends BaseController
92 /** 88 /**
93 * ไฟฎๆ”นๅนณๅฐ่ฟ่ง„ๆกˆๅท 89 * ไฟฎๆ”นๅนณๅฐ่ฟ่ง„ๆกˆๅท
94 */ 90 */
95 - @PreAuthorize("@ss.hasPermi('casefile:violationCaseFile:edit')")  
96 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.UPDATE) 91 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.UPDATE)
97 @PutMapping 92 @PutMapping
98 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files, String violationCaseFile, String[] uploadFilesList) throws IOException 93 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files, String violationCaseFile, String[] uploadFilesList) throws IOException
@@ -197,7 +192,6 @@ public class ViolationCaseFileController extends BaseController @@ -197,7 +192,6 @@ public class ViolationCaseFileController extends BaseController
197 /** 192 /**
198 * ๅˆ ้™คๅนณๅฐ่ฟ่ง„ๆกˆๅท 193 * ๅˆ ้™คๅนณๅฐ่ฟ่ง„ๆกˆๅท
199 */ 194 */
200 - @PreAuthorize("@ss.hasPermi('casefile:violationCaseFile:remove')")  
201 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.DELETE) 195 @Log(title = "ๅนณๅฐ่ฟ่ง„ๆกˆๅท", businessType = BusinessType.DELETE)
202 @DeleteMapping("/{ids}") 196 @DeleteMapping("/{ids}")
203 public AjaxResult remove(@PathVariable Long[] ids) throws IOException 197 public AjaxResult remove(@PathVariable Long[] ids) throws IOException
trash-workFlow/src/main/java/com/trash/casefile/controller/ViolationWarningInformationController.java
  View file @9c06308
@@ -44,7 +44,6 @@ public class ViolationWarningInformationController extends BaseController @@ -44,7 +44,6 @@ public class ViolationWarningInformationController extends BaseController
44 /** 44 /**
45 * ๆŸฅ่ฏข่ฟ่ง„้ข„่ญฆไฟกๆฏๅˆ—่กจ 45 * ๆŸฅ่ฏข่ฟ่ง„้ข„่ญฆไฟกๆฏๅˆ—่กจ
46 */ 46 */
47 - @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:list')")  
48 @GetMapping("/list") 47 @GetMapping("/list")
49 public TableDataInfo list(ViolationWarningInformation violationWarningInformation) 48 public TableDataInfo list(ViolationWarningInformation violationWarningInformation)
50 { 49 {
@@ -56,7 +55,6 @@ public class ViolationWarningInformationController extends BaseController @@ -56,7 +55,6 @@ public class ViolationWarningInformationController extends BaseController
56 /** 55 /**
57 * ๅฏผๅ‡บ่ฟ่ง„้ข„่ญฆไฟกๆฏๅˆ—่กจ 56 * ๅฏผๅ‡บ่ฟ่ง„้ข„่ญฆไฟกๆฏๅˆ—่กจ
58 */ 57 */
59 - @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:export')")  
60 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.EXPORT) 58 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.EXPORT)
61 @GetMapping("/export") 59 @GetMapping("/export")
62 public AjaxResult export(ViolationWarningInformation violationWarningInformation) 60 public AjaxResult export(ViolationWarningInformation violationWarningInformation)
@@ -73,7 +71,6 @@ public class ViolationWarningInformationController extends BaseController @@ -73,7 +71,6 @@ public class ViolationWarningInformationController extends BaseController
73 /** 71 /**
74 * ่Žทๅ–่ฟ่ง„้ข„่ญฆไฟกๆฏ่ฏฆ็ป†ไฟกๆฏ 72 * ่Žทๅ–่ฟ่ง„้ข„่ญฆไฟกๆฏ่ฏฆ็ป†ไฟกๆฏ
75 */ 73 */
76 - @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:query')")  
77 @GetMapping(value = "/{id}") 74 @GetMapping(value = "/{id}")
78 public AjaxResult getInfo(@PathVariable("id") Long id) 75 public AjaxResult getInfo(@PathVariable("id") Long id)
79 { 76 {
@@ -83,7 +80,6 @@ public class ViolationWarningInformationController extends BaseController @@ -83,7 +80,6 @@ public class ViolationWarningInformationController extends BaseController
83 /** 80 /**
84 * ๆ–ฐๅขž่ฟ่ง„้ข„่ญฆไฟกๆฏ 81 * ๆ–ฐๅขž่ฟ่ง„้ข„่ญฆไฟกๆฏ
85 */ 82 */
86 - @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:add')")  
87 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.INSERT) 83 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.INSERT)
88 @PostMapping 84 @PostMapping
89 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, ViolationWarningInformation violationWarningInformation) throws IOException { 85 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, ViolationWarningInformation violationWarningInformation) throws IOException {
@@ -93,7 +89,6 @@ public class ViolationWarningInformationController extends BaseController @@ -93,7 +89,6 @@ public class ViolationWarningInformationController extends BaseController
93 /** 89 /**
94 * ไฟฎๆ”น่ฟ่ง„้ข„่ญฆไฟกๆฏ 90 * ไฟฎๆ”น่ฟ่ง„้ข„่ญฆไฟกๆฏ
95 */ 91 */
96 - @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:edit')")  
97 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.UPDATE) 92 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.UPDATE)
98 @PutMapping 93 @PutMapping
99 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files, String violationWarningInformation, String[] uploadFilesList) throws IOException { 94 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files, String violationWarningInformation, String[] uploadFilesList) throws IOException {
@@ -194,7 +189,6 @@ public class ViolationWarningInformationController extends BaseController @@ -194,7 +189,6 @@ public class ViolationWarningInformationController extends BaseController
194 /** 189 /**
195 * ๅˆ ้™ค่ฟ่ง„้ข„่ญฆไฟกๆฏ 190 * ๅˆ ้™ค่ฟ่ง„้ข„่ญฆไฟกๆฏ
196 */ 191 */
197 - @PreAuthorize("@ss.hasPermi('casefile:violationWarningInformation:remove')")  
198 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.DELETE) 192 @Log(title = "่ฟ่ง„้ข„่ญฆไฟกๆฏ", businessType = BusinessType.DELETE)
199 @DeleteMapping("/{ids}") 193 @DeleteMapping("/{ids}")
200 public AjaxResult remove(@PathVariable Long[] ids) 194 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/office/controller/ConferenceController.java
  View file @9c06308
@@ -38,7 +38,6 @@ public class ConferenceController extends BaseController @@ -38,7 +38,6 @@ public class ConferenceController extends BaseController
38 /** 38 /**
39 * ๆŸฅ่ฏขไผš่ฎฎ็ฎก็†ๅˆ—่กจ 39 * ๆŸฅ่ฏขไผš่ฎฎ็ฎก็†ๅˆ—่กจ
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('office:conference:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(Conference conference) 42 public TableDataInfo list(Conference conference)
44 { 43 {
@@ -50,7 +49,6 @@ public class ConferenceController extends BaseController @@ -50,7 +49,6 @@ public class ConferenceController extends BaseController
50 /** 49 /**
51 * ๅฏผๅ‡บไผš่ฎฎ็ฎก็†ๅˆ—่กจ 50 * ๅฏผๅ‡บไผš่ฎฎ็ฎก็†ๅˆ—่กจ
52 */ 51 */
53 - @PreAuthorize("@ss.hasPermi('office:conference:export')")  
54 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.EXPORT) 52 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.EXPORT)
55 @GetMapping("/export") 53 @GetMapping("/export")
56 public AjaxResult export(Conference conference) 54 public AjaxResult export(Conference conference)
@@ -67,7 +65,6 @@ public class ConferenceController extends BaseController @@ -67,7 +65,6 @@ public class ConferenceController extends BaseController
67 /** 65 /**
68 * ่Žทๅ–ไผš่ฎฎ็ฎก็†่ฏฆ็ป†ไฟกๆฏ 66 * ่Žทๅ–ไผš่ฎฎ็ฎก็†่ฏฆ็ป†ไฟกๆฏ
69 */ 67 */
70 - @PreAuthorize("@ss.hasPermi('office:conference:query')")  
71 @GetMapping(value = "/{id}") 68 @GetMapping(value = "/{id}")
72 public AjaxResult getInfo(@PathVariable("id") Long id) 69 public AjaxResult getInfo(@PathVariable("id") Long id)
73 { 70 {
@@ -77,7 +74,6 @@ public class ConferenceController extends BaseController @@ -77,7 +74,6 @@ public class ConferenceController extends BaseController
77 /** 74 /**
78 * ๆ–ฐๅขžไผš่ฎฎ็ฎก็† 75 * ๆ–ฐๅขžไผš่ฎฎ็ฎก็†
79 */ 76 */
80 - @PreAuthorize("@ss.hasPermi('office:conference:add')")  
81 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.INSERT) 77 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.INSERT)
82 @PostMapping 78 @PostMapping
83 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, Conference conference) throws IOException { 79 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, Conference conference) throws IOException {
@@ -87,7 +83,6 @@ public class ConferenceController extends BaseController @@ -87,7 +83,6 @@ public class ConferenceController extends BaseController
87 /** 83 /**
88 * ไฟฎๆ”นไผš่ฎฎ็ฎก็† 84 * ไฟฎๆ”นไผš่ฎฎ็ฎก็†
89 */ 85 */
90 - @PreAuthorize("@ss.hasPermi('office:conference:edit')")  
91 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.UPDATE) 86 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.UPDATE)
92 @PutMapping 87 @PutMapping
93 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String conference,String[] uploadFilesList) throws IOException { 88 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String conference,String[] uploadFilesList) throws IOException {
@@ -109,7 +104,6 @@ public class ConferenceController extends BaseController @@ -109,7 +104,6 @@ public class ConferenceController extends BaseController
109 /** 104 /**
110 * ๅˆ ้™คไผš่ฎฎ็ฎก็† 105 * ๅˆ ้™คไผš่ฎฎ็ฎก็†
111 */ 106 */
112 - @PreAuthorize("@ss.hasPermi('office:conference:remove')")  
113 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.DELETE) 107 @Log(title = "ไผš่ฎฎ็ฎก็†", businessType = BusinessType.DELETE)
114 @DeleteMapping("/{ids}") 108 @DeleteMapping("/{ids}")
115 public AjaxResult remove(@PathVariable Long[] ids) 109 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/office/controller/ContractManagementController.java
  View file @9c06308
@@ -36,7 +36,6 @@ public class ContractManagementController extends BaseController @@ -36,7 +36,6 @@ public class ContractManagementController extends BaseController
36 /** 36 /**
37 * ๆŸฅ่ฏขๅˆๅŒ็ฎก็†ๅˆ—่กจ 37 * ๆŸฅ่ฏขๅˆๅŒ็ฎก็†ๅˆ—่กจ
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('office:management:list')")  
40 @GetMapping("/list") 39 @GetMapping("/list")
41 public TableDataInfo list(ContractManagement contractManagement) 40 public TableDataInfo list(ContractManagement contractManagement)
42 { 41 {
@@ -48,7 +47,6 @@ public class ContractManagementController extends BaseController @@ -48,7 +47,6 @@ public class ContractManagementController extends BaseController
48 /** 47 /**
49 * ๅฏผๅ‡บๅˆๅŒ็ฎก็†ๅˆ—่กจ 48 * ๅฏผๅ‡บๅˆๅŒ็ฎก็†ๅˆ—่กจ
50 */ 49 */
51 - @PreAuthorize("@ss.hasPermi('office:management:export')")  
52 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.EXPORT) 50 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 51 @GetMapping("/export")
54 public AjaxResult export(ContractManagement contractManagement) 52 public AjaxResult export(ContractManagement contractManagement)
@@ -65,7 +63,6 @@ public class ContractManagementController extends BaseController @@ -65,7 +63,6 @@ public class ContractManagementController extends BaseController
65 /** 63 /**
66 * ่Žทๅ–ๅˆๅŒ็ฎก็†่ฏฆ็ป†ไฟกๆฏ 64 * ่Žทๅ–ๅˆๅŒ็ฎก็†่ฏฆ็ป†ไฟกๆฏ
67 */ 65 */
68 - @PreAuthorize("@ss.hasPermi('office:management:query')")  
69 @GetMapping(value = "/{id}") 66 @GetMapping(value = "/{id}")
70 public AjaxResult getInfo(@PathVariable("id") Long id) 67 public AjaxResult getInfo(@PathVariable("id") Long id)
71 { 68 {
@@ -75,7 +72,6 @@ public class ContractManagementController extends BaseController @@ -75,7 +72,6 @@ public class ContractManagementController extends BaseController
75 /** 72 /**
76 * ๆ–ฐๅขžๅˆๅŒ็ฎก็† 73 * ๆ–ฐๅขžๅˆๅŒ็ฎก็†
77 */ 74 */
78 - @PreAuthorize("@ss.hasPermi('office:management:add')")  
79 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.INSERT) 75 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.INSERT)
80 @PostMapping 76 @PostMapping
81 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files,ContractManagement contractManagement) throws IOException { 77 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files,ContractManagement contractManagement) throws IOException {
@@ -85,7 +81,6 @@ public class ContractManagementController extends BaseController @@ -85,7 +81,6 @@ public class ContractManagementController extends BaseController
85 /** 81 /**
86 * ไฟฎๆ”นๅˆๅŒ็ฎก็† 82 * ไฟฎๆ”นๅˆๅŒ็ฎก็†
87 */ 83 */
88 - @PreAuthorize("@ss.hasPermi('office:management:edit')")  
89 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.UPDATE) 84 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.UPDATE)
90 @PutMapping 85 @PutMapping
91 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String contractManagement,String[] uploadFilesList) throws IOException { 86 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String contractManagement,String[] uploadFilesList) throws IOException {
@@ -107,7 +102,6 @@ public class ContractManagementController extends BaseController @@ -107,7 +102,6 @@ public class ContractManagementController extends BaseController
107 /** 102 /**
108 * ๅˆ ้™คๅˆๅŒ็ฎก็† 103 * ๅˆ ้™คๅˆๅŒ็ฎก็†
109 */ 104 */
110 - @PreAuthorize("@ss.hasPermi('office:management:remove')")  
111 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.DELETE) 105 @Log(title = "ๅˆๅŒ็ฎก็†", businessType = BusinessType.DELETE)
112 @DeleteMapping("/{ids}") 106 @DeleteMapping("/{ids}")
113 public AjaxResult remove(@PathVariable Long[] ids) throws IOException { 107 public AjaxResult remove(@PathVariable Long[] ids) throws IOException {
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsCommonController.java
  View file @9c06308
@@ -38,7 +38,6 @@ public class HandleAffairsCommonController extends BaseController @@ -38,7 +38,6 @@ public class HandleAffairsCommonController extends BaseController
38 /** 38 /**
39 * ๆŸฅ่ฏขๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑปๅˆ—่กจ 39 * ๆŸฅ่ฏขๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑปๅˆ—่กจ
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('office:handleAffairsCommon:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(HandleAffairsCommon handleAffairsCommon) 42 public TableDataInfo list(HandleAffairsCommon handleAffairsCommon)
44 { 43 {
@@ -50,7 +49,6 @@ public class HandleAffairsCommonController extends BaseController @@ -50,7 +49,6 @@ public class HandleAffairsCommonController extends BaseController
50 /** 49 /**
51 * ๅฏผๅ‡บๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑปๅˆ—่กจ 50 * ๅฏผๅ‡บๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑปๅˆ—่กจ
52 */ 51 */
53 - @PreAuthorize("@ss.hasPermi('office:handleAffairsCommon:export')")  
54 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.EXPORT) 52 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.EXPORT)
55 @GetMapping("/export") 53 @GetMapping("/export")
56 public AjaxResult export(HandleAffairsCommon handleAffairsCommon) 54 public AjaxResult export(HandleAffairsCommon handleAffairsCommon)
@@ -67,7 +65,6 @@ public class HandleAffairsCommonController extends BaseController @@ -67,7 +65,6 @@ public class HandleAffairsCommonController extends BaseController
67 /** 65 /**
68 * ่Žทๅ–ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป่ฏฆ็ป†ไฟกๆฏ 66 * ่Žทๅ–ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป่ฏฆ็ป†ไฟกๆฏ
69 */ 67 */
70 - @PreAuthorize("@ss.hasPermi('office:handleAffairsCommon:query')")  
71 @GetMapping(value = "/{id}") 68 @GetMapping(value = "/{id}")
72 public AjaxResult getInfo(@PathVariable("id") Long id) 69 public AjaxResult getInfo(@PathVariable("id") Long id)
73 { 70 {
@@ -77,7 +74,6 @@ public class HandleAffairsCommonController extends BaseController @@ -77,7 +74,6 @@ public class HandleAffairsCommonController extends BaseController
77 /** 74 /**
78 * ๆ–ฐๅขžๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป 75 * ๆ–ฐๅขžๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป
79 */ 76 */
80 - @PreAuthorize("@ss.hasPermi('office:handleAffairsCommon:add')")  
81 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.INSERT) 77 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.INSERT)
82 @PostMapping 78 @PostMapping
83 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, HandleAffairsCommon handleAffairsCommon) throws IOException 79 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, HandleAffairsCommon handleAffairsCommon) throws IOException
@@ -88,7 +84,7 @@ public class HandleAffairsCommonController extends BaseController @@ -88,7 +84,7 @@ public class HandleAffairsCommonController extends BaseController
88 /** 84 /**
89 * ไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป 85 * ไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป
90 */ 86 */
91 - @PreAuthorize("@ss.hasPermi('office:handleAffairsCommon:edit')") 87 +
92 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.UPDATE) 88 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.UPDATE)
93 @PutMapping 89 @PutMapping
94 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairsCommon,String[] uploadFilesList) throws IOException 90 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairsCommon,String[] uploadFilesList) throws IOException
@@ -111,7 +107,6 @@ public class HandleAffairsCommonController extends BaseController @@ -111,7 +107,6 @@ public class HandleAffairsCommonController extends BaseController
111 /** 107 /**
112 * ๅˆ ้™คๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป 108 * ๅˆ ้™คๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป
113 */ 109 */
114 - @PreAuthorize("@ss.hasPermi('office:handleAffairsCommon:remove')")  
115 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.DELETE) 110 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹-ๆ™ฎ้€š็ฑป", businessType = BusinessType.DELETE)
116 @DeleteMapping("/{ids}") 111 @DeleteMapping("/{ids}")
117 public AjaxResult remove(@PathVariable Long[] ids) 112 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsController.java
  View file @9c06308
@@ -38,7 +38,6 @@ public class HandleAffairsController extends BaseController { @@ -38,7 +38,6 @@ public class HandleAffairsController extends BaseController {
38 /** 38 /**
39 * ๆŸฅ่ฏขๅŠžๆ–‡ๅŠžไบ‹ๅˆ—่กจ 39 * ๆŸฅ่ฏขๅŠžๆ–‡ๅŠžไบ‹ๅˆ—่กจ
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('office:handle:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(HandleAffairs handleAffairs) { 42 public TableDataInfo list(HandleAffairs handleAffairs) {
44 startPage(); 43 startPage();
@@ -49,7 +48,6 @@ public class HandleAffairsController extends BaseController { @@ -49,7 +48,6 @@ public class HandleAffairsController extends BaseController {
49 /** 48 /**
50 * ๅฏผๅ‡บๅŠžๆ–‡ๅŠžไบ‹ๅˆ—่กจ 49 * ๅฏผๅ‡บๅŠžๆ–‡ๅŠžไบ‹ๅˆ—่กจ
51 */ 50 */
52 - @PreAuthorize("@ss.hasPermi('office:handle:export')")  
53 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.EXPORT) 51 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.EXPORT)
54 @GetMapping("/export") 52 @GetMapping("/export")
55 public AjaxResult export(HandleAffairs handleAffairs) { 53 public AjaxResult export(HandleAffairs handleAffairs) {
@@ -65,7 +63,6 @@ public class HandleAffairsController extends BaseController { @@ -65,7 +63,6 @@ public class HandleAffairsController extends BaseController {
65 /** 63 /**
66 * ่Žทๅ–ๅŠžๆ–‡ๅŠžไบ‹่ฏฆ็ป†ไฟกๆฏ 64 * ่Žทๅ–ๅŠžๆ–‡ๅŠžไบ‹่ฏฆ็ป†ไฟกๆฏ
67 */ 65 */
68 - @PreAuthorize("@ss.hasPermi('office:handle:query')")  
69 @GetMapping(value = "/{id}") 66 @GetMapping(value = "/{id}")
70 public AjaxResult getInfo(@PathVariable("id") Long id) { 67 public AjaxResult getInfo(@PathVariable("id") Long id) {
71 return AjaxResult.success(handleAffairsService.selectHandleAffairsById(id)); 68 return AjaxResult.success(handleAffairsService.selectHandleAffairsById(id));
@@ -74,7 +71,6 @@ public class HandleAffairsController extends BaseController { @@ -74,7 +71,6 @@ public class HandleAffairsController extends BaseController {
74 /** 71 /**
75 * ๆ–ฐๅขžๅŠžๆ–‡ๅŠžไบ‹ 72 * ๆ–ฐๅขžๅŠžๆ–‡ๅŠžไบ‹
76 */ 73 */
77 - @PreAuthorize("@ss.hasPermi('office:handle:add')")  
78 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.INSERT) 74 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.INSERT)
79 @PostMapping 75 @PostMapping
80 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files,HandleAffairs handleAffairs) throws IOException { 76 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files,HandleAffairs handleAffairs) throws IOException {
@@ -84,7 +80,6 @@ public class HandleAffairsController extends BaseController { @@ -84,7 +80,6 @@ public class HandleAffairsController extends BaseController {
84 /** 80 /**
85 * ไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹ 81 * ไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹
86 */ 82 */
87 - @PreAuthorize("@ss.hasPermi('office:handle:edit')")  
88 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.UPDATE) 83 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.UPDATE)
89 @PutMapping 84 @PutMapping
90 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairs,String[] uploadFilesList) throws IOException { 85 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairs,String[] uploadFilesList) throws IOException {
@@ -106,7 +101,6 @@ public class HandleAffairsController extends BaseController { @@ -106,7 +101,6 @@ public class HandleAffairsController extends BaseController {
106 /** 101 /**
107 * ๅˆ ้™คๅŠžๆ–‡ๅŠžไบ‹ 102 * ๅˆ ้™คๅŠžๆ–‡ๅŠžไบ‹
108 */ 103 */
109 - @PreAuthorize("@ss.hasPermi('office:handle:remove')")  
110 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.DELETE) 104 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.DELETE)
111 @DeleteMapping("/{ids}") 105 @DeleteMapping("/{ids}")
112 public AjaxResult remove(@PathVariable Long[] ids) { 106 public AjaxResult remove(@PathVariable Long[] ids) {
@@ -116,7 +110,6 @@ public class HandleAffairsController extends BaseController { @@ -116,7 +110,6 @@ public class HandleAffairsController extends BaseController {
116 /** 110 /**
117 * ๅฎกๆ‰นไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹ 111 * ๅฎกๆ‰นไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹
118 */ 112 */
119 - @PreAuthorize("@ss.hasPermi('office:handle:edit')")  
120 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.UPDATE) 113 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹", businessType = BusinessType.UPDATE)
121 @PostMapping("/updateHandleAffairs") 114 @PostMapping("/updateHandleAffairs")
122 public AjaxResult updateHandleAffairs(@RequestBody HandleAffairs handleAffairs) { 115 public AjaxResult updateHandleAffairs(@RequestBody HandleAffairs handleAffairs) {
trash-workFlow/src/main/java/com/trash/office/controller/HandleAffairsXfController.java
  View file @9c06308
@@ -38,7 +38,6 @@ public class HandleAffairsXfController extends BaseController @@ -38,7 +38,6 @@ public class HandleAffairsXfController extends BaseController
38 /** 38 /**
39 * ๆŸฅ่ฏขๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑปๅˆ—่กจ 39 * ๆŸฅ่ฏขๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑปๅˆ—่กจ
40 */ 40 */
41 - @PreAuthorize("@ss.hasPermi('office:handleAffairsXF:list')")  
42 @GetMapping("/list") 41 @GetMapping("/list")
43 public TableDataInfo list(HandleAffairsXf handleAffairsXf) 42 public TableDataInfo list(HandleAffairsXf handleAffairsXf)
44 { 43 {
@@ -50,7 +49,6 @@ public class HandleAffairsXfController extends BaseController @@ -50,7 +49,6 @@ public class HandleAffairsXfController extends BaseController
50 /** 49 /**
51 * ๅฏผๅ‡บๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑปๅˆ—่กจ 50 * ๅฏผๅ‡บๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑปๅˆ—่กจ
52 */ 51 */
53 - @PreAuthorize("@ss.hasPermi('office:handleAffairsXF:export')")  
54 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.EXPORT) 52 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.EXPORT)
55 @GetMapping("/export") 53 @GetMapping("/export")
56 public AjaxResult export(HandleAffairsXf handleAffairsXf) 54 public AjaxResult export(HandleAffairsXf handleAffairsXf)
@@ -67,17 +65,12 @@ public class HandleAffairsXfController extends BaseController @@ -67,17 +65,12 @@ public class HandleAffairsXfController extends BaseController
67 /** 65 /**
68 * ่Žทๅ–ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป่ฏฆ็ป†ไฟกๆฏ 66 * ่Žทๅ–ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป่ฏฆ็ป†ไฟกๆฏ
69 */ 67 */
70 - @PreAuthorize("@ss.hasPermi('office:handleAffairsXF:query')")  
71 @GetMapping(value = "/{id}") 68 @GetMapping(value = "/{id}")
72 public AjaxResult getInfo(@PathVariable("id") Long id) 69 public AjaxResult getInfo(@PathVariable("id") Long id)
73 { 70 {
74 return AjaxResult.success(handleAffairsXfService.selectHandleAffairsXfById(id)); 71 return AjaxResult.success(handleAffairsXfService.selectHandleAffairsXfById(id));
75 } 72 }
76 73
77 - /**  
78 - * ๆ–ฐๅขžๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป  
79 - */  
80 - @PreAuthorize("@ss.hasPermi('office:handleAffairsXF:add')")  
81 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.INSERT) 74 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.INSERT)
82 @PostMapping 75 @PostMapping
83 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, HandleAffairsXf handleAffairsXf) throws IOException 76 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, HandleAffairsXf handleAffairsXf) throws IOException
@@ -85,10 +78,6 @@ public class HandleAffairsXfController extends BaseController @@ -85,10 +78,6 @@ public class HandleAffairsXfController extends BaseController
85 return toAjax(handleAffairsXfService.insertHandleAffairsXf(files,handleAffairsXf)); 78 return toAjax(handleAffairsXfService.insertHandleAffairsXf(files,handleAffairsXf));
86 } 79 }
87 80
88 - /**  
89 - * ไฟฎๆ”นๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป  
90 - */  
91 - @PreAuthorize("@ss.hasPermi('office:handleAffairsXF:edit')")  
92 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.UPDATE) 81 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.UPDATE)
93 @PutMapping 82 @PutMapping
94 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairsXf,String[] uploadFilesList) throws IOException { 83 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String handleAffairsXf,String[] uploadFilesList) throws IOException {
@@ -110,7 +99,6 @@ public class HandleAffairsXfController extends BaseController @@ -110,7 +99,6 @@ public class HandleAffairsXfController extends BaseController
110 /** 99 /**
111 * ๅˆ ้™คๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป 100 * ๅˆ ้™คๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป
112 */ 101 */
113 - @PreAuthorize("@ss.hasPermi('office:handleAffairsXF:remove')")  
114 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.DELETE) 102 @Log(title = "ๅŠžๆ–‡ๅŠžไบ‹ไฟก่ฎฟ็ฑป", businessType = BusinessType.DELETE)
115 @DeleteMapping("/{ids}") 103 @DeleteMapping("/{ids}")
116 public AjaxResult remove(@PathVariable Long[] ids) 104 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/office/controller/LeaveApplicationController.java
  View file @9c06308
@@ -36,10 +36,7 @@ public class LeaveApplicationController extends BaseController @@ -36,10 +36,7 @@ public class LeaveApplicationController extends BaseController
36 @Autowired 36 @Autowired
37 private ILeaveApplicationService leaveApplicationService; 37 private ILeaveApplicationService leaveApplicationService;
38 38
39 - /**  
40 - * ๆŸฅ่ฏขleaveApplicationๅˆ—่กจ  
41 - */  
42 - @PreAuthorize("@ss.hasPermi('office:leaveApplication:list')") 39 +
43 @GetMapping("/list") 40 @GetMapping("/list")
44 public TableDataInfo list(LeaveApplication leaveApplication) 41 public TableDataInfo list(LeaveApplication leaveApplication)
45 { 42 {
@@ -51,7 +48,6 @@ public class LeaveApplicationController extends BaseController @@ -51,7 +48,6 @@ public class LeaveApplicationController extends BaseController
51 /** 48 /**
52 * ๅฏผๅ‡บleaveApplicationๅˆ—่กจ 49 * ๅฏผๅ‡บleaveApplicationๅˆ—่กจ
53 */ 50 */
54 - @PreAuthorize("@ss.hasPermi('office:leaveApplication:export')")  
55 @Log(title = "leaveApplication", businessType = BusinessType.EXPORT) 51 @Log(title = "leaveApplication", businessType = BusinessType.EXPORT)
56 @GetMapping("/export") 52 @GetMapping("/export")
57 public AjaxResult export(LeaveApplication leaveApplication) 53 public AjaxResult export(LeaveApplication leaveApplication)
@@ -68,7 +64,6 @@ public class LeaveApplicationController extends BaseController @@ -68,7 +64,6 @@ public class LeaveApplicationController extends BaseController
68 /** 64 /**
69 * ่Žทๅ–leaveApplication่ฏฆ็ป†ไฟกๆฏ 65 * ่Žทๅ–leaveApplication่ฏฆ็ป†ไฟกๆฏ
70 */ 66 */
71 - @PreAuthorize("@ss.hasPermi('office:leaveApplication:query')")  
72 @GetMapping(value = "/{id}") 67 @GetMapping(value = "/{id}")
73 public AjaxResult getInfo(@PathVariable("id") Long id) 68 public AjaxResult getInfo(@PathVariable("id") Long id)
74 { 69 {
@@ -78,7 +73,6 @@ public class LeaveApplicationController extends BaseController @@ -78,7 +73,6 @@ public class LeaveApplicationController extends BaseController
78 /** 73 /**
79 * ๆ–ฐๅขžleaveApplication 74 * ๆ–ฐๅขžleaveApplication
80 */ 75 */
81 - @PreAuthorize("@ss.hasPermi('office:leaveApplication:add')")  
82 @Log(title = "leaveApplication", businessType = BusinessType.INSERT) 76 @Log(title = "leaveApplication", businessType = BusinessType.INSERT)
83 @PostMapping 77 @PostMapping
84 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, LeaveApplication leaveApplication) throws IOException { 78 public AjaxResult add(@RequestParam(value = "fileList") MultipartFile[] files, LeaveApplication leaveApplication) throws IOException {
@@ -90,7 +84,6 @@ public class LeaveApplicationController extends BaseController @@ -90,7 +84,6 @@ public class LeaveApplicationController extends BaseController
90 /** 84 /**
91 * ไฟฎๆ”นleaveApplication 85 * ไฟฎๆ”นleaveApplication
92 */ 86 */
93 - @PreAuthorize("@ss.hasPermi('office:leaveApplication:edit')")  
94 @Log(title = "leaveApplication", businessType = BusinessType.UPDATE) 87 @Log(title = "leaveApplication", businessType = BusinessType.UPDATE)
95 @PutMapping 88 @PutMapping
96 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String leaveApplication,String[] uploadFilesList) throws IOException { 89 public AjaxResult edit(@RequestParam(value = "fileList") MultipartFile[] files,String leaveApplication,String[] uploadFilesList) throws IOException {
@@ -112,7 +105,6 @@ public class LeaveApplicationController extends BaseController @@ -112,7 +105,6 @@ public class LeaveApplicationController extends BaseController
112 /** 105 /**
113 * ๅˆ ้™คleaveApplication 106 * ๅˆ ้™คleaveApplication
114 */ 107 */
115 - @PreAuthorize("@ss.hasPermi('office:leaveApplication:remove')")  
116 @Log(title = "leaveApplication", businessType = BusinessType.DELETE) 108 @Log(title = "leaveApplication", businessType = BusinessType.DELETE)
117 @DeleteMapping("/{ids}") 109 @DeleteMapping("/{ids}")
118 public AjaxResult remove(@PathVariable Long[] ids) 110 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/office/controller/LogisticsManagementController.java
  View file @9c06308
@@ -39,7 +39,6 @@ public class LogisticsManagementController extends BaseController @@ -39,7 +39,6 @@ public class LogisticsManagementController extends BaseController
39 /** 39 /**
40 * ๆŸฅ่ฏขๅŽๅ‹ค็ฎก็†ๅˆ—่กจ 40 * ๆŸฅ่ฏขๅŽๅ‹ค็ฎก็†ๅˆ—่กจ
41 */ 41 */
42 - @PreAuthorize("@ss.hasPermi('office:logistics:list')")  
43 @GetMapping("/list") 42 @GetMapping("/list")
44 public TableDataInfo list(LogisticsManagement logisticsManagement) 43 public TableDataInfo list(LogisticsManagement logisticsManagement)
45 { 44 {
@@ -51,7 +50,6 @@ public class LogisticsManagementController extends BaseController @@ -51,7 +50,6 @@ public class LogisticsManagementController extends BaseController
51 /** 50 /**
52 * ๅฏผๅ‡บๅŽๅ‹ค็ฎก็†ๅˆ—่กจ 51 * ๅฏผๅ‡บๅŽๅ‹ค็ฎก็†ๅˆ—่กจ
53 */ 52 */
54 - @PreAuthorize("@ss.hasPermi('office:logistics:export')")  
55 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.EXPORT) 53 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.EXPORT)
56 @GetMapping("/export") 54 @GetMapping("/export")
57 public AjaxResult export(LogisticsManagement logisticsManagement) 55 public AjaxResult export(LogisticsManagement logisticsManagement)
@@ -83,7 +81,6 @@ public class LogisticsManagementController extends BaseController @@ -83,7 +81,6 @@ public class LogisticsManagementController extends BaseController
83 /** 81 /**
84 * ่Žทๅ–ๅŽๅ‹ค็ฎก็†่ฏฆ็ป†ไฟกๆฏ 82 * ่Žทๅ–ๅŽๅ‹ค็ฎก็†่ฏฆ็ป†ไฟกๆฏ
85 */ 83 */
86 - @PreAuthorize("@ss.hasPermi('office:logistics:query')")  
87 @GetMapping(value = "/{id}") 84 @GetMapping(value = "/{id}")
88 public AjaxResult getInfo(@PathVariable("id") Long id) 85 public AjaxResult getInfo(@PathVariable("id") Long id)
89 { 86 {
@@ -93,7 +90,6 @@ public class LogisticsManagementController extends BaseController @@ -93,7 +90,6 @@ public class LogisticsManagementController extends BaseController
93 /** 90 /**
94 * ๆ–ฐๅขžๅŽๅ‹ค็ฎก็† 91 * ๆ–ฐๅขžๅŽๅ‹ค็ฎก็†
95 */ 92 */
96 - @PreAuthorize("@ss.hasPermi('office:logistics:add')")  
97 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.INSERT) 93 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.INSERT)
98 @PostMapping 94 @PostMapping
99 public AjaxResult add(@RequestBody LogisticsManagement logisticsManagement) 95 public AjaxResult add(@RequestBody LogisticsManagement logisticsManagement)
@@ -104,7 +100,6 @@ public class LogisticsManagementController extends BaseController @@ -104,7 +100,6 @@ public class LogisticsManagementController extends BaseController
104 /** 100 /**
105 * ไฟฎๆ”นๅŽๅ‹ค็ฎก็† 101 * ไฟฎๆ”นๅŽๅ‹ค็ฎก็†
106 */ 102 */
107 - @PreAuthorize("@ss.hasPermi('office:logistics:edit')")  
108 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.UPDATE) 103 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.UPDATE)
109 @PutMapping 104 @PutMapping
110 public AjaxResult edit(@RequestBody LogisticsManagement logisticsManagement) 105 public AjaxResult edit(@RequestBody LogisticsManagement logisticsManagement)
@@ -115,7 +110,6 @@ public class LogisticsManagementController extends BaseController @@ -115,7 +110,6 @@ public class LogisticsManagementController extends BaseController
115 /** 110 /**
116 * ๅˆ ้™คๅŽๅ‹ค็ฎก็† 111 * ๅˆ ้™คๅŽๅ‹ค็ฎก็†
117 */ 112 */
118 - @PreAuthorize("@ss.hasPermi('office:logistics:remove')")  
119 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.DELETE) 113 @Log(title = "ๅŽๅ‹ค็ฎก็†", businessType = BusinessType.DELETE)
120 @DeleteMapping("/{ids}") 114 @DeleteMapping("/{ids}")
121 public AjaxResult remove(@PathVariable Long[] ids) 115 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/other/controller/OtherDataController.java
  View file @9c06308
@@ -36,7 +36,6 @@ public class OtherDataController extends BaseController @@ -36,7 +36,6 @@ public class OtherDataController extends BaseController
36 /** 36 /**
37 * ๆŸฅ่ฏขๅ…ถไป–ไธ“้กน่ต„ๆ–™ๅˆ—่กจ 37 * ๆŸฅ่ฏขๅ…ถไป–ไธ“้กน่ต„ๆ–™ๅˆ—่กจ
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('otherData:otherData:list')")  
40 @GetMapping("/list") 39 @GetMapping("/list")
41 public TableDataInfo list(OtherData otherData) 40 public TableDataInfo list(OtherData otherData)
42 { 41 {
@@ -48,7 +47,6 @@ public class OtherDataController extends BaseController @@ -48,7 +47,6 @@ public class OtherDataController extends BaseController
48 /** 47 /**
49 * ๅฏผๅ‡บๅ…ถไป–ไธ“้กน่ต„ๆ–™ๅˆ—่กจ 48 * ๅฏผๅ‡บๅ…ถไป–ไธ“้กน่ต„ๆ–™ๅˆ—่กจ
50 */ 49 */
51 - @PreAuthorize("@ss.hasPermi('otherData:otherData:export')")  
52 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.EXPORT) 50 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 51 @GetMapping("/export")
54 public AjaxResult export(OtherData otherData) 52 public AjaxResult export(OtherData otherData)
@@ -65,7 +63,6 @@ public class OtherDataController extends BaseController @@ -65,7 +63,6 @@ public class OtherDataController extends BaseController
65 /** 63 /**
66 * ่Žทๅ–ๅ…ถไป–ไธ“้กน่ต„ๆ–™่ฏฆ็ป†ไฟกๆฏ 64 * ่Žทๅ–ๅ…ถไป–ไธ“้กน่ต„ๆ–™่ฏฆ็ป†ไฟกๆฏ
67 */ 65 */
68 - @PreAuthorize("@ss.hasPermi('otherData:otherData:query')")  
69 @GetMapping(value = "/{id}") 66 @GetMapping(value = "/{id}")
70 public AjaxResult getInfo(@PathVariable("id") Long id) 67 public AjaxResult getInfo(@PathVariable("id") Long id)
71 { 68 {
@@ -75,7 +72,6 @@ public class OtherDataController extends BaseController @@ -75,7 +72,6 @@ public class OtherDataController extends BaseController
75 /** 72 /**
76 * ๆ–ฐๅขžๅ…ถไป–ไธ“้กน่ต„ๆ–™ 73 * ๆ–ฐๅขžๅ…ถไป–ไธ“้กน่ต„ๆ–™
77 */ 74 */
78 - @PreAuthorize("@ss.hasPermi('otherData:otherData:add')")  
79 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.INSERT) 75 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.INSERT)
80 @PostMapping 76 @PostMapping
81 public AjaxResult add(@RequestBody OtherData otherData) 77 public AjaxResult add(@RequestBody OtherData otherData)
@@ -86,7 +82,6 @@ public class OtherDataController extends BaseController @@ -86,7 +82,6 @@ public class OtherDataController extends BaseController
86 /** 82 /**
87 * ไฟฎๆ”นๅ…ถไป–ไธ“้กน่ต„ๆ–™ 83 * ไฟฎๆ”นๅ…ถไป–ไธ“้กน่ต„ๆ–™
88 */ 84 */
89 - @PreAuthorize("@ss.hasPermi('otherData:otherData:edit')")  
90 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.UPDATE) 85 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.UPDATE)
91 @PutMapping 86 @PutMapping
92 public AjaxResult edit(@RequestBody OtherData otherData) 87 public AjaxResult edit(@RequestBody OtherData otherData)
@@ -97,7 +92,6 @@ public class OtherDataController extends BaseController @@ -97,7 +92,6 @@ public class OtherDataController extends BaseController
97 /** 92 /**
98 * ๅˆ ้™คๅ…ถไป–ไธ“้กน่ต„ๆ–™ 93 * ๅˆ ้™คๅ…ถไป–ไธ“้กน่ต„ๆ–™
99 */ 94 */
100 - @PreAuthorize("@ss.hasPermi('otherData:otherData:remove')")  
101 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.DELETE) 95 @Log(title = "ๅ…ถไป–ไธ“้กน่ต„ๆ–™", businessType = BusinessType.DELETE)
102 @DeleteMapping("/{ids}") 96 @DeleteMapping("/{ids}")
103 public AjaxResult remove(@PathVariable Long[] ids) 97 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/other/controller/ProjectCheckController.java
  View file @9c06308
@@ -36,7 +36,6 @@ public class ProjectCheckController extends BaseController @@ -36,7 +36,6 @@ public class ProjectCheckController extends BaseController
36 /** 36 /**
37 * ๆŸฅ่ฏขๅคงๆŽ’ๆŸฅๅˆ—่กจ 37 * ๆŸฅ่ฏขๅคงๆŽ’ๆŸฅๅˆ—่กจ
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('other:projectCheck:list')")  
40 @GetMapping("/list") 39 @GetMapping("/list")
41 public TableDataInfo list(ProjectCheck projectCheck) 40 public TableDataInfo list(ProjectCheck projectCheck)
42 { 41 {
@@ -48,7 +47,6 @@ public class ProjectCheckController extends BaseController @@ -48,7 +47,6 @@ public class ProjectCheckController extends BaseController
48 /** 47 /**
49 * ๅฏผๅ‡บๅคงๆŽ’ๆŸฅๅˆ—่กจ 48 * ๅฏผๅ‡บๅคงๆŽ’ๆŸฅๅˆ—่กจ
50 */ 49 */
51 - @PreAuthorize("@ss.hasPermi('other:projectCheck:export')")  
52 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.EXPORT) 50 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 51 @GetMapping("/export")
54 public AjaxResult export(ProjectCheck projectCheck) 52 public AjaxResult export(ProjectCheck projectCheck)
@@ -65,7 +63,6 @@ public class ProjectCheckController extends BaseController @@ -65,7 +63,6 @@ public class ProjectCheckController extends BaseController
65 /** 63 /**
66 * ่Žทๅ–ๅคงๆŽ’ๆŸฅ่ฏฆ็ป†ไฟกๆฏ 64 * ่Žทๅ–ๅคงๆŽ’ๆŸฅ่ฏฆ็ป†ไฟกๆฏ
67 */ 65 */
68 - @PreAuthorize("@ss.hasPermi('other:projectCheck:query')")  
69 @GetMapping(value = "/{id}") 66 @GetMapping(value = "/{id}")
70 public AjaxResult getInfo(@PathVariable("id") Long id) 67 public AjaxResult getInfo(@PathVariable("id") Long id)
71 { 68 {
@@ -75,7 +72,6 @@ public class ProjectCheckController extends BaseController @@ -75,7 +72,6 @@ public class ProjectCheckController extends BaseController
75 /** 72 /**
76 * ๆ–ฐๅขžๅคงๆŽ’ๆŸฅ 73 * ๆ–ฐๅขžๅคงๆŽ’ๆŸฅ
77 */ 74 */
78 - @PreAuthorize("@ss.hasPermi('other:projectCheck:add')")  
79 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.INSERT) 75 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.INSERT)
80 @PostMapping 76 @PostMapping
81 public AjaxResult add(@RequestBody ProjectCheck projectCheck) 77 public AjaxResult add(@RequestBody ProjectCheck projectCheck)
@@ -86,7 +82,6 @@ public class ProjectCheckController extends BaseController @@ -86,7 +82,6 @@ public class ProjectCheckController extends BaseController
86 /** 82 /**
87 * ไฟฎๆ”นๅคงๆŽ’ๆŸฅ 83 * ไฟฎๆ”นๅคงๆŽ’ๆŸฅ
88 */ 84 */
89 - @PreAuthorize("@ss.hasPermi('other:projectCheck:edit')")  
90 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.UPDATE) 85 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.UPDATE)
91 @PutMapping 86 @PutMapping
92 public AjaxResult edit(@RequestBody ProjectCheck projectCheck) 87 public AjaxResult edit(@RequestBody ProjectCheck projectCheck)
@@ -97,7 +92,6 @@ public class ProjectCheckController extends BaseController @@ -97,7 +92,6 @@ public class ProjectCheckController extends BaseController
97 /** 92 /**
98 * ๅˆ ้™คๅคงๆŽ’ๆŸฅ 93 * ๅˆ ้™คๅคงๆŽ’ๆŸฅ
99 */ 94 */
100 - @PreAuthorize("@ss.hasPermi('other:projectCheck:remove')")  
101 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.DELETE) 95 @Log(title = "ๅคงๆŽ’ๆŸฅ", businessType = BusinessType.DELETE)
102 @DeleteMapping("/{ids}") 96 @DeleteMapping("/{ids}")
103 public AjaxResult remove(@PathVariable Long[] ids) 97 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/other/controller/TrashDataController.java
  View file @9c06308
@@ -36,7 +36,6 @@ public class TrashDataController extends BaseController @@ -36,7 +36,6 @@ public class TrashDataController extends BaseController
36 /** 36 /**
37 * ๆŸฅ่ฏข่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ตๅˆ—่กจ 37 * ๆŸฅ่ฏข่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ตๅˆ—่กจ
38 */ 38 */
39 - @PreAuthorize("@ss.hasPermi('TrashData:TrashData:list')")  
40 @GetMapping("/list") 39 @GetMapping("/list")
41 public TableDataInfo list(TrashData trashData) 40 public TableDataInfo list(TrashData trashData)
42 { 41 {
@@ -48,7 +47,6 @@ public class TrashDataController extends BaseController @@ -48,7 +47,6 @@ public class TrashDataController extends BaseController
48 /** 47 /**
49 * ๅฏผๅ‡บ่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ตๅˆ—่กจ 48 * ๅฏผๅ‡บ่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ตๅˆ—่กจ
50 */ 49 */
51 - @PreAuthorize("@ss.hasPermi('TrashData:TrashData:export')")  
52 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.EXPORT) 50 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.EXPORT)
53 @GetMapping("/export") 51 @GetMapping("/export")
54 public AjaxResult export(TrashData trashData) 52 public AjaxResult export(TrashData trashData)
@@ -74,7 +72,6 @@ public class TrashDataController extends BaseController @@ -74,7 +72,6 @@ public class TrashDataController extends BaseController
74 /** 72 /**
75 * ่Žทๅ–่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต่ฏฆ็ป†ไฟกๆฏ 73 * ่Žทๅ–่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต่ฏฆ็ป†ไฟกๆฏ
76 */ 74 */
77 - @PreAuthorize("@ss.hasPermi('TrashData:TrashData:query')")  
78 @GetMapping(value = "/{id}") 75 @GetMapping(value = "/{id}")
79 public AjaxResult getInfo(@PathVariable("id") Long id) 76 public AjaxResult getInfo(@PathVariable("id") Long id)
80 { 77 {
@@ -84,7 +81,6 @@ public class TrashDataController extends BaseController @@ -84,7 +81,6 @@ public class TrashDataController extends BaseController
84 /** 81 /**
85 * ๆ–ฐๅขž่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต 82 * ๆ–ฐๅขž่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต
86 */ 83 */
87 - @PreAuthorize("@ss.hasPermi('TrashData:TrashData:add')")  
88 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.INSERT) 84 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.INSERT)
89 @PostMapping 85 @PostMapping
90 public AjaxResult add(@RequestBody TrashData trashData) 86 public AjaxResult add(@RequestBody TrashData trashData)
@@ -95,7 +91,6 @@ public class TrashDataController extends BaseController @@ -95,7 +91,6 @@ public class TrashDataController extends BaseController
95 /** 91 /**
96 * ไฟฎๆ”น่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต 92 * ไฟฎๆ”น่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต
97 */ 93 */
98 - @PreAuthorize("@ss.hasPermi('TrashData:TrashData:edit')")  
99 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.UPDATE) 94 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.UPDATE)
100 @PutMapping 95 @PutMapping
101 public AjaxResult edit(@RequestBody TrashData trashData) 96 public AjaxResult edit(@RequestBody TrashData trashData)
@@ -106,7 +101,6 @@ public class TrashDataController extends BaseController @@ -106,7 +101,6 @@ public class TrashDataController extends BaseController
106 /** 101 /**
107 * ๅˆ ้™ค่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต 102 * ๅˆ ้™ค่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต
108 */ 103 */
109 - @PreAuthorize("@ss.hasPermi('TrashData:TrashData:remove')")  
110 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.DELETE) 104 @Log(title = "่ต„ๆบๅŒ–ๅˆฉ็”จๆƒ…ๅ†ต", businessType = BusinessType.DELETE)
111 @DeleteMapping("/{ids}") 105 @DeleteMapping("/{ids}")
112 public AjaxResult remove(@PathVariable Long[] ids) 106 public AjaxResult remove(@PathVariable Long[] ids)
trash-workFlow/src/main/java/com/trash/workflow/service/impl/WorkflowServiceImpl.java
  View file @9c06308
@@ -100,7 +100,9 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -100,7 +100,9 @@ public class WorkflowServiceImpl implements IWorkflowService {
100 @Override 100 @Override
101 @Transactional 101 @Transactional
102 public int createWorkFlow(Map<String, Object> data) { // ็ฌฌไธ‰ๆ–น้€š็”จๆŽฅๆ”ถๆŽฅๅฃ 102 public int createWorkFlow(Map<String, Object> data) { // ็ฌฌไธ‰ๆ–น้€š็”จๆŽฅๆ”ถๆŽฅๅฃ
103 - 103 +
  104 + SysUser user = SecurityUtils.getLoginUser().getUser();
  105 +
104 String flowType = data.get("type").toString(); 106 String flowType = data.get("type").toString();
105 107
106 Map map = (Map) data.get("data"); 108 Map map = (Map) data.get("data");
@@ -138,7 +140,7 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -138,7 +140,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
138 140
139 constructionSign.setObjectId(map.get("id").toString()); 141 constructionSign.setObjectId(map.get("id").toString());
140 142
141 - SysUser user = SecurityUtils.getLoginUser().getUser(); 143 +
142 144
143 if (!user.getAvatar().contains("null")) { 145 if (!user.getAvatar().contains("null")) {
144 constructionSign.setSign1(SecurityUtils.getLoginUser().getUser().getAvatar()); 146 constructionSign.setSign1(SecurityUtils.getLoginUser().getUser().getAvatar());
@@ -159,6 +161,7 @@ public class WorkflowServiceImpl implements IWorkflowService { @@ -159,6 +161,7 @@ public class WorkflowServiceImpl implements IWorkflowService {
159 workflow.setInstanceId(processInstance.getId()); 161 workflow.setInstanceId(processInstance.getId());
160 workflow.setState("0"); 162 workflow.setState("0");
161 workflow.setCreateTime(new Date()); 163 workflow.setCreateTime(new Date());
  164 + workflow.setCreateBy(user.getUserName());
162 165
163 return workflowMapper.insertWorkflow(workflow); 166 return workflowMapper.insertWorkflow(workflow);
164 } catch (Exception e) { 167 } catch (Exception e) {
trash-workFlow/src/main/resources/mapper/CompanyCreditMapper.xml
  View file @9c06308
@@ -31,6 +31,7 @@ @@ -31,6 +31,7 @@
31 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if> 31 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
32 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if> 32 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
33 </where> 33 </where>
  34 + order by time DESC
34 </select> 35 </select>
35 36
36 <select id="selectCompanyCreditById" parameterType="Long" resultMap="CompanyCreditResult"> 37 <select id="selectCompanyCreditById" parameterType="Long" resultMap="CompanyCreditResult">
trash-workFlow/src/main/resources/mapper/ConstructionCreditMapper.xml
  View file @9c06308
@@ -32,6 +32,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -32,6 +32,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
32 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if> 32 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
33 <if test="objectId != null "> and object_id = #{objectId}</if> 33 <if test="objectId != null "> and object_id = #{objectId}</if>
34 </where> 34 </where>
  35 + order by time DESC
35 </select> 36 </select>
36 37
37 <select id="selectConstructionCreditById" parameterType="Long" resultMap="ConstructionCreditResult"> 38 <select id="selectConstructionCreditById" parameterType="Long" resultMap="ConstructionCreditResult">
trash-workFlow/src/main/resources/mapper/DriverCreditMapper.xml
  View file @9c06308
@@ -8,6 +8,8 @@ @@ -8,6 +8,8 @@
8 <result property="id" column="id" /> 8 <result property="id" column="id" />
9 <result property="name" column="name" /> 9 <result property="name" column="name" />
10 <result property="idNumber" column="id_number" /> 10 <result property="idNumber" column="id_number" />
  11 + <result property="licenseplateNo" column="licenseplate_no" />
  12 +
11 <result property="time" column="time" /> 13 <result property="time" column="time" />
12 <result property="reason" column="reason" /> 14 <result property="reason" column="reason" />
13 <result property="status" column="status" /> 15 <result property="status" column="status" />
@@ -17,7 +19,7 @@ @@ -17,7 +19,7 @@
17 </resultMap> 19 </resultMap>
18 20
19 <sql id="selectDriverCreditVo"> 21 <sql id="selectDriverCreditVo">
20 - select id, name, id_number, time, reason, status, lost_credit, object_id, create_by from driver_credit 22 + select id, name, id_number, licenseplate_no,time, reason, status, lost_credit, object_id, create_by from driver_credit
21 </sql> 23 </sql>
22 24
23 <select id="selectDriverCreditList" parameterType="DriverCredit" resultMap="DriverCreditResult"> 25 <select id="selectDriverCreditList" parameterType="DriverCredit" resultMap="DriverCreditResult">
@@ -25,12 +27,14 @@ @@ -25,12 +27,14 @@
25 <where> 27 <where>
26 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> 28 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
27 <if test="idNumber != null and idNumber != ''"> and id_number = #{idNumber}</if> 29 <if test="idNumber != null and idNumber != ''"> and id_number = #{idNumber}</if>
  30 + <if test="licenseplateNo != null and licenseplateNo != ''"> and licenseplate_no = #{licenseplateNo}</if>
28 <if test="time != null "> and DATE_FORMAT(time,("%y%m%d")) = DATE_FORMAT(#{time},("%y%m%d")) </if> 31 <if test="time != null "> and DATE_FORMAT(time,("%y%m%d")) = DATE_FORMAT(#{time},("%y%m%d")) </if>
29 <if test="reason != null and reason != ''"> and reason = #{reason}</if> 32 <if test="reason != null and reason != ''"> and reason = #{reason}</if>
30 <if test="status != null "> and status = #{status}</if> 33 <if test="status != null "> and status = #{status}</if>
31 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if> 34 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
32 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if> 35 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
33 </where> 36 </where>
  37 + order by time DESC
34 </select> 38 </select>
35 39
36 <select id="selectDriverCreditById" parameterType="Long" resultMap="DriverCreditResult"> 40 <select id="selectDriverCreditById" parameterType="Long" resultMap="DriverCreditResult">
@@ -43,6 +47,7 @@ @@ -43,6 +47,7 @@
43 <trim prefix="(" suffix=")" suffixOverrides=","> 47 <trim prefix="(" suffix=")" suffixOverrides=",">
44 <if test="name != null">name,</if> 48 <if test="name != null">name,</if>
45 <if test="idNumber != null">id_number,</if> 49 <if test="idNumber != null">id_number,</if>
  50 + <if test="licenseplateNo != null">licenseplate_no,</if>
46 <if test="time != null">time,</if> 51 <if test="time != null">time,</if>
47 <if test="reason != null">reason,</if> 52 <if test="reason != null">reason,</if>
48 <if test="status != null">status,</if> 53 <if test="status != null">status,</if>
@@ -53,6 +58,7 @@ @@ -53,6 +58,7 @@
53 <trim prefix="values (" suffix=")" suffixOverrides=","> 58 <trim prefix="values (" suffix=")" suffixOverrides=",">
54 <if test="name != null">#{name},</if> 59 <if test="name != null">#{name},</if>
55 <if test="idNumber != null">#{idNumber},</if> 60 <if test="idNumber != null">#{idNumber},</if>
  61 + <if test="licenseplateNo != null">#{licenseplateNo},</if>
56 <if test="time != null">#{time},</if> 62 <if test="time != null">#{time},</if>
57 <if test="reason != null">#{reason},</if> 63 <if test="reason != null">#{reason},</if>
58 <if test="status != null">#{status},</if> 64 <if test="status != null">#{status},</if>
@@ -67,6 +73,7 @@ @@ -67,6 +73,7 @@
67 <trim prefix="SET" suffixOverrides=","> 73 <trim prefix="SET" suffixOverrides=",">
68 <if test="name != null">name = #{name},</if> 74 <if test="name != null">name = #{name},</if>
69 <if test="idNumber != null">id_number = #{idNumber},</if> 75 <if test="idNumber != null">id_number = #{idNumber},</if>
  76 + <if test="licenseplateNo != null"> licenseplate_no = #{licenseplateNo},</if>
70 <if test="time != null">time = #{time},</if> 77 <if test="time != null">time = #{time},</if>
71 <if test="reason != null">reason = #{reason},</if> 78 <if test="reason != null">reason = #{reason},</if>
72 <if test="status != null">status = #{status},</if> 79 <if test="status != null">status = #{status},</if>
@@ -93,10 +100,23 @@ @@ -93,10 +100,23 @@
93 select DISTINCT name from driver_credit 100 select DISTINCT name from driver_credit
94 <where> 101 <where>
95 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> 102 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  103 + <if test="licenseplateNo != null"> licenseplate_no = #{licenseplateNo},</if>
96 <if test="status != null "> and status = #{status}</if> 104 <if test="status != null "> and status = #{status}</if>
97 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if> 105 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
98 </where> 106 </where>
99 </select> 107 </select>
  108 +
  109 + <select id="getLicenseplate" parameterType="DriverCredit" resultType="String">
  110 +
  111 + select DISTINCT licenseplate_no from driver_credit
  112 + <where>
  113 + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
  114 + <if test="licenseplateNo != null"> licenseplate_no = #{licenseplateNo},</if>
  115 + <if test="status != null "> and status = #{status}</if>
  116 + <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
  117 + </where>
  118 + </select>
  119 +
100 120
101 121
102 <select id="selectDriverCreditHistory" parameterType="DriverCredit" resultMap="DriverCreditResult"> 122 <select id="selectDriverCreditHistory" parameterType="DriverCredit" resultMap="DriverCreditResult">
@@ -106,5 +126,6 @@ @@ -106,5 +126,6 @@
106 <where> 126 <where>
107 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> 127 <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
108 </where> 128 </where>
  129 +
109 </select> 130 </select>
110 </mapper> 131 </mapper>
111 \ No newline at end of file 132 \ No newline at end of file
trash-workFlow/src/main/resources/mapper/EarthsitesCreditMapper.xml
  View file @9c06308
@@ -32,6 +32,7 @@ @@ -32,6 +32,7 @@
32 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if> 32 <if test="lostCredit != null "> and lost_credit = #{lostCredit}</if>
33 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if> 33 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
34 </where> 34 </where>
  35 + order by time DESC
35 </select> 36 </select>
36 37
37 <select id="selectEarthsitesCreditById" parameterType="Long" resultMap="EarthsitesCreditResult"> 38 <select id="selectEarthsitesCreditById" parameterType="Long" resultMap="EarthsitesCreditResult">
trash-workFlow/src/main/resources/mapper/TruckCreditMapper.xml
  View file @9c06308
@@ -34,6 +34,7 @@ @@ -34,6 +34,7 @@
34 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if> 34 <if test="objectId != null and objectId != ''"> and object_id = #{objectId}</if>
35 <if test="time != null "> and DATE_FORMAT(time,("%y%m%d")) = DATE_FORMAT(#{time},("%y%m%d"))</if> 35 <if test="time != null "> and DATE_FORMAT(time,("%y%m%d")) = DATE_FORMAT(#{time},("%y%m%d"))</if>
36 </where> 36 </where>
  37 + order by time DESC
37 </select> 38 </select>
38 39
39 <select id="selectTruckCreditById" parameterType="Long" resultMap="TruckCreditResult"> 40 <select id="selectTruckCreditById" parameterType="Long" resultMap="TruckCreditResult">