youxiw2000 / trash · Commits

Commit e16a9f29458c8b0ecf7f73633a6b5ea468008347

Authored by youxiw2000
1 parent 12c8e7ef

m

Inline Side-by-side
Showing 96 changed files with 1301 additions and 873 deletions
trash-admin/src/main/resources/application-dev.yml
  View file @e16a9f2
... ... @@ -18,7 +18,7 @@ trash:
18 18 # 远程服务器地址
19 19 remotePath: http://183.66.242.6:6001
20 20 #remotePath: http://183.66.242.6:14601
21   -
  21 + token: durable:auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjg0MzI3NzQ1ODkyfQ.4BrpgD9i_1TwjLRGqa3wo4Ikx8t8Gcl3FzHfjL_uolPnNMm2rd7fCvrUoBBN4Qp4cMGzg9h2Nt4NNx8PYThTaQ
22 22 # 数据源配置
23 23 spring:
24 24 datasource:
... ... @@ -29,7 +29,7 @@ spring:
29 29 master:
30 30 url: jdbc:mysql://localhost:3306/trash?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8&nullCatalogMeansCurrent=true
31 31 username: root
32   - password: asd0731.
  32 + password: root
33 33 # 从库数据源
34 34 slave:
35 35 # 从数据源开关/默认关闭
... ... @@ -83,7 +83,7 @@ spring:
83 83 # 端口，默认为6379
84 84 port: 6379
85 85 # 密码
86   - password: bsth123
  86 + password:
87 87 # 连接超时时间
88 88 timeout: 10s
89 89 database: 10
... ...
trash-common/src/main/java/com/trash/common/config/trashConfig.java
  View file @e16a9f2
... ... @@ -28,11 +28,22 @@ public class trashConfig
28 28 private static String profile;
29 29  
30 30 private String remotePath;
  31 + private String token;
31 32  
32 33 /** 获取地址开关 */
33 34 private static boolean addressEnabled;
34 35  
35   - public String getName()
  36 +
  37 +
  38 + public String getToken() {
  39 + return token;
  40 + }
  41 +
  42 + public void setToken(String token) {
  43 + this.token = token;
  44 + }
  45 +
  46 + public String getName()
36 47 {
37 48 return name;
38 49 }
... ...
trash-daily/src/main/java/com/trash/situation/domain/DailySituation.java
  View file @e16a9f2
... ... @@ -30,6 +30,7 @@ public class DailySituation extends BaseEntity
30 30 private String operator;
31 31  
32 32  
  33 + @JsonFormat(pattern = "yyyy-MM-dd")
33 34 @Excel(name = "更新时间", width = 30, dateFormat = "yyyy-MM-dd")
34 35 private Date updateTime;
35 36  
... ...
trash-quartz/src/main/java/com/trash/quartz/task/DriverTask.java
  View file @e16a9f2
1 1 package com.trash.quartz.task;
2 2  
  3 +import java.io.IOException;
  4 +import java.text.ParseException;
3 5 import java.text.SimpleDateFormat;
4 6 import java.util.ArrayList;
5 7 import java.util.Date;
... ... @@ -7,6 +9,13 @@ import java.util.HashMap;
7 9 import java.util.List;
8 10 import java.util.Map;
9 11  
  12 +import javax.servlet.FilterChain;
  13 +import javax.servlet.ServletException;
  14 +import javax.servlet.http.HttpServletRequest;
  15 +import javax.servlet.http.HttpServletResponse;
  16 +
  17 +import org.springframework.beans.BeansException;
  18 +import org.springframework.beans.factory.annotation.Autowired;
10 19 import org.springframework.stereotype.Component;
11 20  
12 21 import com.alibaba.fastjson.JSONArray;
... ... @@ -20,11 +29,11 @@ import com.trash.business.service.ICompanyCreditService;
20 29 import com.trash.business.service.ISupervisionThreestepService;
21 30 import com.trash.business.service.ITruckActivateService;
22 31 import com.trash.business.service.ITruckCreditService;
23   -import com.trash.common.core.domain.model.LoginUser;
  32 +import com.trash.common.annotation.Log;
  33 +import com.trash.common.config.trashConfig;
  34 +import com.trash.common.utils.LogUtils;
24 35 import com.trash.common.utils.RemoteServerUtils;
25   -import com.trash.common.utils.SecurityUtils;
26 36 import com.trash.common.utils.spring.SpringUtils;
27   -import com.trash.framework.web.service.SysLoginService;
28 37 import com.trash.workflow.service.IWorkflowService;
29 38  
30 39 /**
... ... @@ -36,31 +45,53 @@ import com.trash.workflow.service.IWorkflowService;
36 45 public class DriverTask
37 46 {
38 47  
39   - String TOKEN = "auth:token:eyJhbGciOiJIUzUxMiJ9.eyJ5ZWEiOiJjc3poIiwiZXhwIjo0MTAyNDE1OTk5LCJjcmVhdGVkIjoxNjgzNTEzNjgyMzg0fQ.1sxO4bKk-UJKt_jJU7JKllUO3OSxrF2gkeawwh6JyfCJGa03QCH5z-Sc7GoDkyOio7tYl2ola99cNGUQ14QUFw";
  48 + String TOKEN;
40 49  
41 50 SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  51 + /** 系统基础配置 */
  52 + @Autowired
  53 + private trashConfig trashConfig;
42 54  
43 55 public void checkCredit()
44 56 {
45   - if(SecurityUtils.getAuthentication() == null){
46   - LoginUser loginUser = SpringUtils.getBean(SysLoginService.class).loginByRemote(TOKEN);
47   -
48   - if(loginUser == null){
49   - System.out.println("Task 登录失败");
50   - }
51   -
  57 +
  58 + if(RemoteServerUtils.remote == null){
  59 + RemoteServerUtils.remote = trashConfig.getRemotePath();
52 60 }
  61 + if(TOKEN == null){
  62 + TOKEN = trashConfig.getToken();
  63 + }
  64 +
  65 + LogUtils.getBlock("=================== checkCredit 定时器执行 当前时间: " + simpleDateFormat.format(new Date()));
  66 +
  67 +
  68 + try {
  69 + checkTruckCredit();
  70 + } catch (Exception e) {
  71 + e.printStackTrace();
  72 + }
  73 + try {
  74 + checkCompanyCredit();
  75 + } catch (Exception e) {
  76 + e.printStackTrace();
  77 + }
  78 + try {
  79 +
  80 + checkTruckByCompany();
  81 + } catch (Exception e) {
  82 + e.printStackTrace();
  83 + }
  84 + try {
  85 + checkDriverCredit(); //检查驾驶员信用
  86 + } catch (Exception e) {
  87 + e.printStackTrace();
  88 + }
  89 + try {
  90 + checkTruckActive();
  91 + } catch (Exception e) {
  92 + e.printStackTrace();
  93 + }
53 94  
54   -
55   -// checkCompanyCredit();
56   -
57   -// checkTruckCredit();
58   -
59   -// checkTruckByCompany();
60   -
61   - checkDriverCredit(); //检查驾驶员信用
62   -
63   - checkTruckActive();
64 95 }
65 96  
66 97  
... ... @@ -98,7 +129,7 @@ public class DriverTask
98 129 List<SupervisionThreestep> cs = SpringUtils.getBean(SupervisionThreestepMapper.class).selectTodayDataList(param);
99 130  
100 131 for(SupervisionThreestep c:cs){
101   - SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c);
  132 + SpringUtils.getBean(ISupervisionThreestepService.class).checkDataToActiveTruck(c,TOKEN);
102 133 }
103 134  
104 135 }
... ... @@ -108,61 +139,75 @@ public class DriverTask
108 139  
109 140  
110 141 }
  142 +
  143 + SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
111 144  
112 145  
  146 + @SuppressWarnings({ "unchecked", "rawtypes" })
113 147 private void checkTruckCredit() {
114   - Map map = new HashMap<>();
  148 + Map map = new HashMap<>();
115 149 map.put("size",9999);
116 150 map.put("dishonestState",0);
117 151 map.put("creditState",0);
118 152 map.put("valid",0);
119 153 map.put("page",1);
120 154  
121   - JSONArray trucks = RemoteServerUtils.getTruckList(map);
  155 + JSONArray trucks = RemoteServerUtils.getTruckList(map,TOKEN);
122 156  
123 157 List<Map> listParam = new ArrayList<Map>();
124 158  
125 159 if(trucks!=null){
126 160 for(Object jsonObject:trucks){
127 161 JSONObject truck = (JSONObject)jsonObject;
128   - if(new Date(truck.getString("transportCertValid")).getTime() < new Date().getTime() ||
129   - new Date(truck.getString("licenseValid")).getTime() < new Date().getTime()){
130   -
131   - TruckCredit truckCredit = new TruckCredit();
132   - truckCredit.setTime(new Date());
133   - truckCredit.setCreateBy("定时器");
134   - truckCredit.setReason("证件过期");
135   - truckCredit.setLostCredit(1L);
136   - truckCredit.setObjectId(truck.getString("id"));
137   - truckCredit.setLicensePlate(truck.getString("licenseplateNo"));
138   - truckCredit.setCompanyId(truck.getString("companyName"));
139   - truckCredit.setStatus(0L);
140   -
141   - Map param = new HashMap<>();
142   -
143   - param.put("id", truck.getString("id"));
144   - param.put("creditStatus", 1);
145   -
146   - listParam.add(param);
147   -
148   - SpringUtils.getBean(ITruckCreditService.class).insertTruckCredit(truckCredit);
149   - }
  162 + try {
  163 + if(sdf.parse(truck.getString("transportCertValid")).getTime() < new Date().getTime() ||
  164 + sdf.parse(truck.getString("licenseValid")).getTime() < new Date().getTime()){
  165 +
  166 + TruckCredit truckCredit = new TruckCredit();
  167 + truckCredit.setTime(new Date());
  168 + truckCredit.setCreateBy("定时器");
  169 + truckCredit.setReason("证件过期");
  170 + truckCredit.setLostCredit(1L);
  171 + truckCredit.setObjectId(truck.getString("id"));
  172 + truckCredit.setLicensePlate(truck.getString("licenseplateNo"));
  173 + truckCredit.setCompanyId(truck.getString("companyName"));
  174 + truckCredit.setStatus(0L);
  175 +
  176 + Map param = new HashMap<>();
  177 +
  178 + param.put("id", truck.getString("id"));
  179 + param.put("creditStatus", 1);
  180 +
  181 + listParam.add(param);
  182 +
  183 + SpringUtils.getBean(ITruckCreditService.class).insertTruckCredit(truckCredit);
  184 + }
  185 + } catch (BeansException e) {
  186 + // TODO Auto-generated catch block
  187 + e.printStackTrace();
  188 + } catch (ParseException e) {
  189 + // TODO Auto-generated catch block
  190 + e.printStackTrace();
  191 + } catch (Exception e) {
  192 + // TODO Auto-generated catch block
  193 + e.printStackTrace();
  194 + }
150 195 }
151   - RemoteServerUtils.updateTruckList(listParam);
  196 +
  197 + if(listParam.size() > 0)
  198 + RemoteServerUtils.updateTruckList(listParam,TOKEN);
152 199  
153 200 }
154 201  
155 202 }
156 203  
157   - SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
158   -
159 204 private void checkCompanyCredit() {
160 205 Map map = new HashMap<>();
161 206 map.put("size",9999);
162 207 map.put("dishonestState",0);
163 208 map.put("page",1);
164 209  
165   - JSONArray companys = RemoteServerUtils.getCompanyList(map);
  210 + JSONArray companys = RemoteServerUtils.getCompanyList(map,TOKEN);
166 211 if(companys != null){
167 212 for(Object jsonObject:companys){
168 213 JSONObject company = (JSONObject)jsonObject;
... ... @@ -177,7 +222,7 @@ public class DriverTask
177 222 companyCredit.setName(company.getString("name"));
178 223 companyCredit.setPlace(company.getString("areaName"));
179 224 companyCredit.setStatus(0L);
180   - SpringUtils.getBean(ICompanyCreditService.class).insertCompanyCredit(companyCredit);
  225 + SpringUtils.getBean(ICompanyCreditService.class).insertCompanyCredit(companyCredit,TOKEN);
181 226 }
182 227 } catch (Exception e) {
183 228 e.printStackTrace();
... ... @@ -196,15 +241,14 @@ public class DriverTask
196 241 List<CompanyCredit> companyList = SpringUtils.getBean(ICompanyCreditService.class).selectCompanyCreditList(companyCredit);
197 242  
198 243 for(CompanyCredit c:companyList){
199   - SpringUtils.getBean(ICompanyCreditService.class).updateRemoteCompanyAndTruck(c);
  244 + SpringUtils.getBean(ICompanyCreditService.class).updateRemoteCompanyAndTruck(c,TOKEN);
200 245 }
201 246  
202 247 }
203 248  
204 249 public void checkAllTask()
205 250 {
206   -
207   - System.out.println("=================== 删除超时报工数据 定时器执行 当前时间: " + simpleDateFormat.format(new Date()));
  251 + LogUtils.getBlock("=================== 删除超时报工数据 定时器执行 当前时间: " + simpleDateFormat.format(new Date()));
208 252  
209 253 SpringUtils.getBean(ITruckActivateService.class).endAllTruckUnActive();
210 254  
... ...
trash-ui/src/api/dict.js
  View file @e16a9f2
... ... @@ -104,6 +104,13 @@ export function contractList() {
104 104 data: data
105 105 });
106 106 }
  107 +export function getConstructionTruck(id) {
  108 + return requestRemote({
  109 + url: '/api/siteservice/cs/unitetransport/bysite/' + id,
  110 + method: 'get',
  111 + });
  112 +}
  113 +
107 114  
108 115  
109 116  
... ...
trash-ui/src/views/TrashData/TrashData/index.vue
  View file @e16a9f2
... ... @@ -9,7 +9,7 @@
9 9 </el-select>
10 10 </el-form-item>
11 11 <el-form-item label="填报日期" prop="time">
12   - <el-date-picker clearable size="small" style="width: 200px"
  12 + <el-date-picker size="small" style="width: 200px"
13 13 v-model="queryParams.time"
14 14 type="date"
15 15 value-format="yyyy-MM-dd"
... ... @@ -108,7 +108,7 @@
108 108 <el-col :span="12">
109 109  
110 110 <el-form-item label="年份" prop="year">
111   - <el-date-picker clearable size="small" style="width: 200px"
  111 + <el-date-picker size="small" style="width: 200px"
112 112 v-model="form.year"
113 113 type="year"
114 114 value-format="yyyy-MM-dd"
... ... @@ -129,7 +129,7 @@
129 129 <el-row>
130 130 <el-col :span="12">
131 131 <el-form-item label="填报日期" prop="time">
132   - <el-date-picker clearable size="small" style="width: 200px"
  132 + <el-date-picker size="small" style="width: 200px"
133 133 v-model="form.time"
134 134 type="date"
135 135 value-format="yyyy-MM-dd"
... ... @@ -211,7 +211,7 @@
211 211 <el-col :span="12">
212 212  
213 213 <el-form-item label="年份" prop="year">
214   - <el-date-picker clearable size="small" style="width: 200px" disabled
  214 + <el-date-picker size="small" style="width: 200px" disabled
215 215 v-model="form.year"
216 216 type="year"
217 217 value-format="yyyy-MM-dd"
... ... @@ -232,7 +232,7 @@
232 232 <el-row>
233 233 <el-col :span="12">
234 234 <el-form-item label="填报日期" prop="time">
235   - <el-date-picker clearable size="small" style="width: 200px" disabled
  235 + <el-date-picker size="small" style="width: 200px" disabled
236 236 v-model="form.time"
237 237 type="date"
238 238 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/activiti/definition/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.key"
7 7 placeholder="请输入流程KEY"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.name"
16 16 placeholder="请输入名称"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
... ...
trash-ui/src/views/activiti/task/index.vue
  View file @e16a9f2
1 1 <template>
2 2 <div class="app-container">
3   - <el-select v-model="queryParams.dept" filterable clearable reserve-keyword @change="getList">
  3 + <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
4 4 <el-option v-for="item in depts" :label="item.name"
5 5 :value="item.code" :key="item.code">
6 6 </el-option>
7 7 </el-select>
8   - <el-select v-model="queryParams.role" filterable clearable reserve-keyword @change="getList">
  8 + <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">
9 9 <el-option v-for="item in roles" :label="item.name"
10 10 :value="item.code" :key="item.code">
11 11 </el-option>
... ... @@ -612,8 +612,7 @@ import { addReplyApprovalProcess } from &quot;@/api/casefile/replyApprovalProcess&quot;;
612 612 }
613 613 }
614 614  
615   - this.form.checkTime = new Date();
616   - if (this.form.status == 1) {
  615 + if (this.form.status == 1 && this.taskName == "巡查") {
617 616 activeThreestep(this.form).then(res => {
618 617 formDataSave(this.id, this.form.formData).then(response => {
619 618 this.msgSuccess("审批成功");
... ...
trash-ui/src/views/activiti/task/taskCard.vue
  View file @e16a9f2
... ... @@ -55,9 +55,8 @@
55 55 }
56 56 },
57 57 created() {
58   -
59 58 if (this.task.definitionKey == "workflow_threestep") {
60   - this.task.type = this.threestep_type[this.task.type];
  59 + this.task.type = this.threestep_type[this.task.type + ""];
61 60 }
62 61 },
63 62 methods: {
... ...
trash-ui/src/views/business/CompanyCredit/index.vue
  View file @e16a9f2
... ... @@ -18,7 +18,7 @@
18 18 filterable
19 19 reserve-keyword
20 20 placeholder="运输企业"
21   - clearable
  21 +
22 22 size="small"
23 23 :loading="loading">
24 24 <el-option
... ... @@ -34,7 +34,7 @@
34 34 <el-select v-model="queryParams.place" placeholder="所属区域"
35 35 filterable
36 36 reserve-keyword
37   - clearable
  37 +
38 38 size="small"
39 39 :loading="loading">
40 40 <el-option
... ... @@ -50,7 +50,7 @@
50 50 <el-col>
51 51 </el-col><el-col>
52 52 <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
53   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
  53 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date"
54 54 value-format="yyyy-MM-dd" placeholder="失信日期">
55 55 </el-date-picker>
56 56 </el-form-item>
... ... @@ -99,7 +99,7 @@
99 99  
100 100 <!-- 添加或修改工地对话框 -->
101 101 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body v-loading="loading">
102   - <el-form ref="form" :model="form" :rules="rules" label-width="120px">
  102 + <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
103 103 <el-form-item label="运输企业" prop="name">
104 104 <el-select
105 105 v-model="form.name"
... ... @@ -136,7 +136,7 @@
136 136  
137 137  
138 138 <el-dialog title="撤销失信" :visible.sync="isEdit" width="500px" append-to-body v-loading="loading">
139   - <el-form ref="updateForm" :model="updateForm" :rules="rules2" label-width="120px">
  139 + <el-form ref="updateForm" :model="updateForm" :rules="rules2" label-width="120px" v-if="updateForm" >
140 140 <el-form-item label="情况说明" prop="reason" >
141 141 <el-input v-model="updateForm.reason" type="textarea" maxlength="200" show-word-limit/>
142 142 </el-form-item>
... ...
trash-ui/src/views/business/ConstructionCredit/index.vue
  View file @e16a9f2
... ... @@ -15,7 +15,7 @@
15 15 <el-row type="flex" justify="center">
16 16 <el-col>
17 17 <el-form-item label="工地名称" prop="name" style="float:right;">
18   - <el-select v-model="queryParams.name" filterable clearable reserve-keyword placeholder="工地名称" size="small"
  18 + <el-select v-model="queryParams.name" filterable reserve-keyword placeholder="工地名称" size="small"
19 19 :loading="loading">
20 20 <el-option v-for="item in dictNames" :label="item" :value="item" :key="item">
21 21 </el-option>
... ... @@ -25,7 +25,7 @@
25 25  
26 26 <el-col>
27 27 <el-form-item label="所属区域" prop="place">
28   - <el-select v-model="queryParams.place" filterable clearable reserve-keyword placeholder="所属场地" size="small"
  28 + <el-select v-model="queryParams.place" filterable reserve-keyword placeholder="所属场地" size="small"
29 29 :loading="loading">
30 30 <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item">
31 31 </el-option>
... ... @@ -36,7 +36,7 @@
36 36 <el-row type="flex" justify="center">
37 37 <el-col>
38 38 <el-form-item label="垃圾类型" prop="type" style="float:right;">
39   - <el-select v-model="queryParams.type" filterable clearable reserve-keyword placeholder="建筑垃圾类型" size="small"
  39 + <el-select v-model="queryParams.type" filterable reserve-keyword placeholder="建筑垃圾类型" size="small"
40 40 :loading="loading">
41 41 <el-option v-for="item in dictTypes" :label="item" :value="item" :key="item">
42 42 </el-option>
... ... @@ -45,7 +45,7 @@
45 45 </el-col>
46 46 <el-col>
47 47 <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
48   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
  48 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date"
49 49 value-format="yyyy-MM-dd" placeholder="失信日期">
50 50 </el-date-picker>
51 51 </el-form-item>
... ... @@ -98,7 +98,7 @@
98 98  
99 99 <!-- 添加或修改工地对话框 -->
100 100 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body v-loading="loading">
101   - <el-form ref="form" :model="form" :rules="rules" label-width="120px">
  101 + <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
102 102 <el-form-item label="工地名称" prop="name">
103 103 <el-select v-model="form.name" filterable reserve-keyword placeholder="工地名称">
104 104 <el-option @click.native="getObjId(item)" v-for="item in constructionList" :key="item.id" :label="item.name"
... ... @@ -129,7 +129,7 @@
129 129  
130 130  
131 131 <el-dialog title="撤销失信" :visible.sync="isEdit" width="500px" append-to-body v-loading="loading">
132   - <el-form ref="form" :model="updateForm" :rules="rules" label-width="120px">
  132 + <el-form ref="form" :model="updateForm" :rules="rules" label-width="120px" v-if="isEdit">
133 133 <el-form-item label="情况说明" prop="reason">
134 134 <el-input v-model="updateForm.reason" type="textarea" maxlength="200" show-word-limit />
135 135 </el-form-item>
... ... @@ -256,6 +256,7 @@
256 256 },
257 257 methods: {
258 258 init(){
  259 + this.reset();
259 260 this.resetQuery();
260 261 this.getList();
261 262 this.getNamesData();
... ... @@ -363,7 +364,9 @@
363 364 lostCredit: null,
364 365 objectId: null,
365 366 };
366   - this.updateForm = {};
  367 + this.updateForm = {
  368 + reason:null,
  369 + };
367 370 this.resetForm("updateForm");
368 371 this.resetForm("form");
369 372 },
... ... @@ -401,12 +404,8 @@
401 404 },
402 405 /** 提交按钮 */
403 406 submitForm() {
404   - if(this.open){
405   - this.updateForm.reason = "1";
406   - }
407 407 this.$refs["form"].validate(valid => {
408 408 if (valid) {
409   -
410 409 this.loading = true;
411 410 if (this.form.id != null) {
412 411 this.form.lostCredit = 0;
... ...
trash-ui/src/views/business/DriverCredit/index.vue
  View file @e16a9f2
... ... @@ -16,7 +16,7 @@
16 16 style="float:right;">
17 17 <el-select v-model="queryParams.name"
18 18 filterable
19   - clearable
  19 +
20 20 reserve-keyword
21 21 placeholder="驾驶员姓名"
22 22 size="small"
... ... @@ -32,7 +32,7 @@
32 32  
33 33 <el-col>
34 34 <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
35   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
  35 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date"
36 36 value-format="yyyy-MM-dd" placeholder="失信日期">
37 37 </el-date-picker>
38 38 </el-form-item>
... ...
trash-ui/src/views/business/EarthSitesCredit/index.vue
  View file @e16a9f2
... ... @@ -15,7 +15,7 @@
15 15 <el-row type="flex" justify="center">
16 16 <el-col>
17 17 <el-form-item label="消纳场名称" prop="name" style="float:right;">
18   - <el-select v-model="queryParams.name" filterable clearable reserve-keyword placeholder="消纳场名称" size="small"
  18 + <el-select v-model="queryParams.name" filterable reserve-keyword placeholder="消纳场名称" size="small"
19 19 :loading="loading">
20 20 <el-option v-for="item in dictNames" :label="item" :value="item" :key="item">
21 21 </el-option>
... ... @@ -25,7 +25,7 @@
25 25  
26 26 <el-col>
27 27 <el-form-item label="所属场地" prop="place">
28   - <el-select v-model="queryParams.place" filterable clearable reserve-keyword placeholder="所属场地" size="small" >
  28 + <el-select v-model="queryParams.place" filterable reserve-keyword placeholder="所属场地" size="small" >
29 29 <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item">
30 30 </el-option>
31 31 </el-select>
... ... @@ -35,7 +35,7 @@
35 35 <el-row type="flex" justify="center">
36 36 <el-col>
37 37 <el-form-item label="垃圾类型" prop="type" style="float:right;">
38   - <el-select v-model="queryParams.type" filterable clearable reserve-keyword placeholder="建筑垃圾类型" size="small"
  38 + <el-select v-model="queryParams.type" filterable reserve-keyword placeholder="建筑垃圾类型" size="small"
39 39 :loading="loading">
40 40 <el-option v-for="item in dictTypes" :label="item" :value="item" :key="item">
41 41 </el-option>
... ... @@ -44,7 +44,7 @@
44 44 </el-col>
45 45 <el-col>
46 46 <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
47   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
  47 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date"
48 48 value-format="yyyy-MM-dd" placeholder="失信日期">
49 49 </el-date-picker>
50 50 </el-form-item>
... ...
trash-ui/src/views/business/TruckCredit/index.vue
  View file @e16a9f2
... ... @@ -15,7 +15,7 @@
15 15 <el-row type="flex" justify="center">
16 16 <el-col>
17 17 <el-form-item label="车牌号码" prop="licensePlate" style="float:right;">
18   - <el-select v-model="queryParams.licensePlate" filterable reserve-keyword placeholder="车牌号码" clearable
  18 + <el-select v-model="queryParams.licensePlate" filterable reserve-keyword placeholder="车牌号码"
19 19 size="small" :loading="loading">
20 20 <el-option v-for="item in dictNames" :label="item" :value="item">
21 21 </el-option>
... ... @@ -25,7 +25,7 @@
25 25  
26 26 <el-col>
27 27 <el-form-item label="运输企业" prop="companyId">
28   - <el-select v-model="queryParams.companyId" filterable reserve-keyword placeholder="运输企业" clearable
  28 + <el-select v-model="queryParams.companyId" filterable reserve-keyword placeholder="运输企业"
29 29 size="small" :loading="loading">
30 30 <el-option v-for="item in dictCompanys" :label="item" :value="item">
31 31 </el-option>
... ... @@ -38,7 +38,7 @@
38 38 </el-col>
39 39 <el-col>
40 40 <el-form-item label="失信日期" prop="time" v-show="queryParams.status==0">
41   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.time" type="date"
  41 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.time" type="date"
42 42 value-format="yyyy-MM-dd" placeholder="失信日期">
43 43 </el-date-picker>
44 44 </el-form-item>
... ... @@ -91,7 +91,7 @@
91 91  
92 92 <!-- 添加或修改工地对话框 -->
93 93 <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body v-loading="loading">
94   - <el-form ref="form" :model="form" :rules="rules" label-width="120px">
  94 + <el-form ref="form" :model="form" :rules="rules" label-width="120px" v-if="open">
95 95 <el-form-item label="运输企业" prop="companyId">
96 96 <el-select v-model="form.companyId" filterable reserve-keyword placeholder="运输企业">
97 97 <el-option v-for="item in companyList" @click.native="form.licensePlate=null;" :key="item.name" :label="item.name" :value="item.name" v-if="item.dishonestState==0">
... ... @@ -118,7 +118,7 @@
118 118  
119 119  
120 120 <el-dialog title="撤销失信" :visible.sync="isEdit" width="500px" append-to-body v-loading="loading">
121   - <el-form ref="updateForm" :model="updateForm" :rules="rules2" label-width="120px">
  121 + <el-form ref="updateForm" :model="updateForm" :rules="rules2" label-width="120px" v-if="isEdit">
122 122 <el-form-item label="情况说明" prop="reason">
123 123 <el-input v-model="updateForm.reason" type="textarea" maxlength="200" show-word-limit />
124 124 </el-form-item>
... ...
trash-ui/src/views/business/dayWorkReport/index.vue
  View file @e16a9f2
... ... @@ -3,25 +3,31 @@
3 3  
4 4 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
5 5 <el-form-item label="工地名称" prop="name">
6   - <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable size="small"
  6 + <el-input v-model="queryParams.name" placeholder="请输入项目名称" size="small"
7 7 />
8 8 </el-form-item>
9   - <el-form-item label="消纳场名称" prop="name">
10   - <el-input v-model="queryParams.earthsitesName" placeholder="请输入项目名称" clearable size="small"
  9 + <el-form-item label="消纳场名称" prop="earthsitesName">
  10 + <el-input v-model="queryParams.earthsitesName" placeholder="请输入消纳场名称" size="small"
11 11 />
12 12 </el-form-item>
13   - <el-form-item label="工地所属区域" prop="place">
14   - <el-select v-model="queryParams.place" placeholder="工地所属区域 " clearable size="small">
  13 + <el-form-item label="工地区属" prop="place">
  14 + <el-select v-model="queryParams.place" placeholder="工地所属区域 " size="small">
  15 + <el-option v-for="item in areas" :label="item.name" :value="item.code" />
  16 + </el-select>
  17 + </el-form-item>
  18 +
  19 + <el-form-item label="消纳场区属" prop="subReason">
  20 + <el-select v-model="queryParams.subReason" placeholder="工地所属区域 " size="small">
15 21 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
16 22 </el-select>
17 23 </el-form-item>
18 24 <el-form-item label="开始时间" prop="workStartTime">
19   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
  25 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
20 26 value-format="yyyy-MM-dd" placeholder="开始时间">
21 27 </el-date-picker>
22 28 </el-form-item>
23 29 <el-form-item label="结束时间" prop="workEndTime">
24   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
  30 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
25 31 value-format="yyyy-MM-dd" placeholder="结束时间">
26 32 </el-date-picker>
27 33 </el-form-item>
... ... @@ -40,39 +46,19 @@
40 46 </el-row>
41 47  
42 48 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
43   - <el-table-column label="序号" align="center" prop="id" />
44   - <el-table-column label="日期" align="center" prop="createTime" width="180">
45   - <template slot-scope="scope">
46   - <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
47   - </template>
48   - </el-table-column>
49   - <el-table-column label="工地名称" align="center" prop="name" />
50   - <el-table-column label="项目类型" align="center" prop="type" />
51   - <el-table-column label="所属区域" align="center" prop="place" />
52   - <el-table-column label="开工状态" align="center" prop="status" >
53   - <template slot-scope="scope">
54   - <span>{{ scope.row.estatus == 1 ?"开工":"未开工" }}</span>
55   - </template>
56   - </el-table-column>
57   - <el-table-column label="申请开工时间" align="center" prop="self_check_time" />
58   - <el-table-column label="消纳场名称" align="center" prop="ename" width="180" />
59   - <el-table-column label="消纳场类型" align="center" prop="etype" width="180"/>
60   - <el-table-column label="所属区域" align="center" prop="eplace" />
61   - <el-table-column label="开工状态" align="center" prop="estatus" class-name="small-padding fixed-width">
62   - <template slot-scope="scope">
63   - <span>{{ scope.row.estatus == 1 ?"开工":"未开工" }}</span>
64   - </template>
65   -
66   - </el-table-column>
67   - <el-table-column label="申请开工时间" align="center" prop="eself_check_time" >
68   - <template slot-scope="scope">
69   - <span>{{ parseTime(scope.row.createTime, '{y}-{m}-{d}') }}</span>
70   - </template>
71   - </el-table-column>
72   - <el-table-column label="备注" align="center" prop="desc">
73   - </el-table-column>
74   -
75   -
  49 + <el-table-column label="序号" align="center" prop="id" />
  50 + <el-table-column label="日期" align="center" prop="createTime" />
  51 + <el-table-column label="工地名称" align="center" prop="name" />
  52 + <el-table-column label="项目类型" align="center" prop="type" />
  53 + <el-table-column label="所属区域" align="center" prop="place" />
  54 + <el-table-column label="开工状态" align="center" prop="status" />
  55 + <el-table-column label="申请开工时间" align="center" prop="selfCheckTime" width="180"/>
  56 + <el-table-column label="消纳场名称" align="center" prop="ename" />
  57 + <el-table-column label="消纳场类型" align="center" prop="etype" />
  58 + <el-table-column label="所属区域" align="center" prop="eplace" />
  59 + <el-table-column label="开工状态" align="center" prop="estatus" />
  60 + <el-table-column label="申请开工时间" align="center" prop="eselfCheckTime" width="180"/>
  61 + <el-table-column label="备注" align="center" prop="descript"/>
76 62 </el-table>
77 63  
78 64 <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize"
... ... @@ -127,7 +113,7 @@
127 113 showSearch: true,
128 114 // 总条数
129 115 total: 0,
130   - // 【请填写功能名称】表格数据
  116 + // 开工报表表格数据
131 117 threestepList: [],
132 118 fileList: [],
133 119 // 弹出层标题
... ... @@ -204,7 +190,7 @@
204 190 this.uploadImageDialog = false;
205 191 this.fileList = [];
206 192 },
207   - /** 查询【请填写功能名称】列表 */
  193 + /** 查询开工报表列表 */
208 194 getList(tabIdx) {
209 195  
210 196 this.loading = true;
... ... @@ -217,16 +203,8 @@
217 203 for(let i =0;i< this.threestepList.length;i++){
218 204 this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
219 205 if(this.outside.indexOf(this.threestepList[i].place) > -1){
220   - if(this.threestepList[i].status == 1){
221   - this.threestepList[i].estatus = "开工";
222   - }else{
223   - this.threestepList[i].estatus = "未开工";
224   - }
225   - }else{
226   - if(this.threestepList[i].status == 1 && this.threestepList[i].estatus == 1){
227   - this.threestepList[i].estatus = "开工";
228   - }else{
229   - this.threestepList[i].estatus = "未开工";
  206 + if(this.threestepList[i].status == "开工"){
  207 + this.threestepList[i].descript = "开工";
230 208 }
231 209 }
232 210 }
... ... @@ -238,7 +216,7 @@
238 216 this.constructionsitesList = res.result.list;
239 217 for(let i =0;i< this.threestepList.length;i++){
240 218 for(let j =0;j<this.constructionsitesList.length;j++){
241   - if(this.threestepList[i].object_id == this.constructionsitesList[j].id){
  219 + if(this.threestepList[i].objectId == this.constructionsitesList[j].id){
242 220 for(let x in this.projectTypes){
243 221 if(this.projectTypes[x].code == this.constructionsitesList[j].projectType){
244 222 this.threestepList[i].type = this.projectTypes[x].name;
... ... @@ -253,7 +231,8 @@
253 231 this.earthsitesList = res.result.list;
254 232 for(let i =0;i< this.threestepList.length;i++){
255 233 for(let j =0;j<this.earthsitesList.length;j++){
256   - if(this.threestepList[i].eobject_id == this.earthsitesList[j].id){
  234 + console.log(this.threestepList[i].eid + "==" + this.earthsitesList[j].id);
  235 + if(this.threestepList[i].eid == this.earthsitesList[j].id){
257 236 this.threestepList[i].etype = this.earthsitesList[j].typeName;
258 237 this.threestepList[i].eplace = this.earthsitesList[j].areaName;
259 238 }
... ... @@ -417,7 +396,7 @@
417 396 /** 删除按钮操作 */
418 397 handleDelete(row) {
419 398 const ids = row.id || this.ids;
420   - this.$confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项?', "警告", {
  399 + this.$confirm('是否确认删除开工报表编号为"' + ids + '"的数据项?', "警告", {
421 400 confirmButtonText: "确定",
422 401 cancelButtonText: "取消",
423 402 type: "warning"
... ... @@ -436,14 +415,19 @@
436 415  
437 416  
438 417 let obj = {
  418 + id:this.threestepList[i].id,
439 419 name:this.threestepList[i].name,
  420 + createTime:this.threestepList[i].createTime,
  421 + selfCheckTime:this.threestepList[i].selfCheckTime,
440 422 type:this.threestepList[i].type,
441 423 place:this.threestepList[i].place,
442   - subReason:this.threestepList[i].sub_reason,
  424 + status:this.threestepList[i].status,
443 425 ename:this.threestepList[i].ename,
444 426 etype:this.threestepList[i].etype,
445   - esubSeason:this.threestepList[i].esub_reason,
  427 + eplace:this.threestepList[i].eplace,
446 428 estatus:this.threestepList[i].estatus,
  429 + eselfCheckTime:this.threestepList[i].eselfCheckTime,
  430 + descript:this.threestepList[i].descript,
447 431 }
448 432  
449 433 data.push(obj);
... ... @@ -451,7 +435,7 @@
451 435  
452 436  
453 437 }
454   - this.$confirm('是否确认导出所有【请填写功能名称】数据项?', "警告", {
  438 + this.$confirm('是否确认导出所有开工报表数据项?', "警告", {
455 439 confirmButtonText: "确定",
456 440 cancelButtonText: "取消",
457 441 type: "warning"
... ...
trash-ui/src/views/business/supervisionSpecial/index.vue
  View file @e16a9f2
... ... @@ -2,17 +2,17 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4 <el-form-item label="类型" prop="type">
5   - <el-select v-model="queryParams.type" placeholder="请选择类型" clearable size="small">
  5 + <el-select v-model="queryParams.type" placeholder="请选择类型" size="small">
6 6 <el-option label="工地" value="0" />
7 7 <el-option label="消纳场" value="1" />
8 8 </el-select>
9 9 </el-form-item>
10 10 <el-form-item label="项目名称" prop="title">
11   - <el-input v-model="queryParams.title" placeholder="请输入项目名称" clearable size="small"
  11 + <el-input v-model="queryParams.title" placeholder="请输入项目名称" size="small"
12 12 />
13 13 </el-form-item>
14 14 <el-form-item label="所属区域" prop="place">
15   - <el-select v-model="queryParams.place" placeholder="请选择类型" clearable size="small">
  15 + <el-select v-model="queryParams.place" placeholder="请选择类型" size="small">
16 16 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
17 17 </el-select>
18 18 </el-form-item>
... ...
trash-ui/src/views/business/threestep/index.vue
  View file @e16a9f2
... ... @@ -14,29 +14,27 @@
14 14  
15 15 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
16 16 <el-form-item label="项目名称" prop="name">
17   - <el-select v-model="queryParams.name" placeholder="请选择项目类型 " clearable size="small">
18   - <el-option v-for="item in names" :label="item" :value="item" />
19   - </el-select>
  17 + <el-input v-model="queryParams.name" placeholder="请输入项目类型 " size="small" />
20 18 </el-form-item>
21 19 <el-form-item label="项目类型" prop="type">
22   - <el-select v-model="queryParams.type" placeholder="请选择项目类型 " clearable size="small">
  20 + <el-select v-model="queryParams.type" placeholder="请选择项目类型 " size="small">
23 21 <el-option label="工地" value="0" />
24 22 <el-option label="消纳场" value="1" />
25 23 </el-select>
26 24 </el-form-item>
27 25 <el-form-item label="所属区域" prop="place">
28   - <el-select v-model="queryParams.place" placeholder="请选择所属区域 " clearable size="small">
  26 + <el-select v-model="queryParams.place" placeholder="请选择所属区域 " size="small">
29 27 <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code" />
30 28 </el-select>
31 29 </el-form-item>
32 30  
33 31 <el-form-item label="开始时间" prop="workStartTime" v-if="this.queryParams.status==1">
34   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
  32 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date"
35 33 value-format="yyyy-MM-dd" placeholder="开始时间">
36 34 </el-date-picker>
37 35 </el-form-item>
38 36 <el-form-item label="结束时间" prop="workEndTime" v-if="this.queryParams.status==1">
39   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
  37 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date"
40 38 value-format="yyyy-MM-dd" placeholder="开始时间">
41 39 </el-date-picker>
42 40 </el-form-item>
... ... @@ -60,7 +58,7 @@
60 58  
61 59 <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange">
62 60 <el-table-column label="序号" align="center" prop="id" />
63   -
  61 +
64 62 <el-table-column label="项目类型" align="center" prop="type">
65 63 <template slot-scope="scope">
66 64 <span>{{ scope.row.type==0?"工地":"消纳场"}}</span>
... ... @@ -103,7 +101,7 @@
103 101 @pagination="getList" />
104 102  
105 103 <el-dialog :title="title" :visible.sync="open" width="800px" append-to-body v-loading="loading">
106   - <el-form ref="form" :model="form" :rules="rules" label-width="100px">
  104 + <el-form ref="form" :model="form" :rules="rules" label-width="100px" v-if="open">
107 105 <el-row type="flex" justify="center">
108 106 <el-col :span="12">
109 107 <el-form-item label="项目类型" prop="type">
... ... @@ -115,7 +113,7 @@
115 113 </el-col>
116 114 <el-col :span="12">
117 115 <el-form-item label="所属区域" prop="place">
118   - <el-select v-model="form.place" placeholder="请选择所属区域" filterable clearable reserve-keyword @clear="areaClear" @change="selectArea">
  116 + <el-select v-model="form.place" placeholder="请选择所属区域" filterable reserve-keyword @clear="areaClear" @change="selectArea">
119 117 <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code">
120 118 </el-option>
121 119 </el-select>
... ... @@ -125,7 +123,7 @@
125 123 <el-row type="flex" justify="center" v-if="form.type != null">
126 124 <el-col :span="12">
127 125 <el-form-item :label="labelName" prop="name">
128   - <el-select v-model="form.name" filterable clearable reserve-keyword>
  126 + <el-select v-model="form.name" filterable reserve-keyword>
129 127 <el-option @click.native="getObjId(item)" v-for="item in remoteData" :label="item.name"
130 128 :value="item.name" :key="item.id" v-if="areaCode == null || item.areaCode == areaCode">
131 129 </el-option>
... ... @@ -134,9 +132,13 @@
134 132 </el-col>
135 133 <el-col :span="12">
136 134 <el-form-item :label="labelName2" prop="place">
137   - <el-select v-model="bindname" filterable clearable reserve-keyword >
138   - <el-option @click.native="getEarthsiteId(item)" v-for="item in bindData" :label="item.name"
139   - :value="item.name" :key="item.id">
  135 + <el-select v-model="bindname" filterable reserve-keyword >
  136 + <el-option @click.native="getEarthsiteId(item)"
  137 + v-if="item.show"
  138 + v-for="item in bindData"
  139 + :label="item.name"
  140 + :value="item.name"
  141 + :key="item.id">
140 142 </el-option>
141 143 </el-select>
142 144 </el-form-item>
... ... @@ -145,7 +147,7 @@
145 147 <el-row type="flex" justify="center" v-if="form.type != null">
146 148 <el-col>
147 149 <el-form-item label="消纳合同" prop="contract">
148   - <el-select v-model="form.contract" filterable clearable reserve-keyword>
  150 + <el-select v-model="form.contract" filterable reserve-keyword>
149 151 <el-option @click.native="conractCheck(item)" v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id">
150 152 </el-option>
151 153 </el-select>
... ... @@ -155,29 +157,31 @@
155 157 <el-row type="flex" justify="center" v-if="form.type == 0">
156 158 <el-col :span="12">
157 159 <el-form-item label="运输企业" prop="companys">
158   - <el-select v-model="form.companys" filterable multiple clearable reserve-keyword @change="checkCompany">
159   - <el-option v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id" v-if="item.dishonestState == 0"/>
  160 + <el-select v-model="form.companys" filterable multiple reserve-keyword @change="checkCompany">
  161 + <el-option v-for="item in companyList" :label="item.name" :value="item.name" :key="item.id"
  162 + v-if="transportCompanyId == item.id"
  163 + />
160 164 </el-select>
161 165 </el-form-item>
162 166 </el-col>
163 167 <el-col :span="12">
164 168 <el-form-item label="运输车辆" prop="companyTrucks">
165   - <el-select v-model="form.companyTrucks" filterable multiple clearable reserve-keyword>
166   - <el-option v-for="item in truckList" :label="item.licenseplateNo" :value="item.id" :key="item.id" v-if="item.creditStatus==0 && form.companys && (form.companys.indexOf(item.companyName) > -1)"></el-option>
  169 + <el-select v-model="form.companyTrucks" filterable multiple reserve-keyword>
  170 + <el-option v-for="item in truckList" :label="item.licenseplateNo" :value="item.id" :key="item.id"
  171 + v-if="form.companys && (form.companys.indexOf(item.companyName) > -1)"></el-option>
167 172 </el-select>
168   -
169 173 </el-form-item>
170 174 </el-col>
171 175 </el-row>
172 176 <el-row type="flex" justify="center" v-if="form.type != null">
173 177 <el-col :span="12">
174 178 <el-form-item label="现场负责人" prop="person">
175   - <el-input v-model="form.person" :maxlength="20" show-word-limit clearable />
  179 + <el-input v-model="form.person" :maxlength="20" show-word-limit />
176 180 </el-form-item>
177 181 </el-col>
178 182 <el-col :span="12">
179 183 <el-form-item label="联系电话" prop="phone">
180   - <el-input v-model="form.phone" :maxlength="11" show-word-limit clearable />
  184 + <el-input v-model="form.phone" :maxlength="11" show-word-limit />
181 185 </el-select>
182 186 </el-form-item>
183 187 </el-col>
... ... @@ -355,6 +359,7 @@
355 359 companyList,
356 360 truckList,
357 361 contractList,
  362 + getConstructionTruck,
358 363 } from "@/api/dict";
359 364  
360 365 export default {
... ... @@ -451,7 +456,7 @@
451 456 companys: [{
452 457 required: true,
453 458 message: '请填写完整',
454   - trigger: 'change'
  459 + trigger: 'blur'
455 460 }, ],
456 461 objectId: [{
457 462 required: true,
... ... @@ -471,7 +476,7 @@
471 476 companyTrucks: [{
472 477 required: true,
473 478 message: '请填写完整',
474   - trigger: 'change'
  479 + trigger: 'blur'
475 480 }, ],
476 481 objectId: [{
477 482 required: true,
... ... @@ -499,12 +504,15 @@
499 504 remoteData: [{name:"a",id:"id"}],
500 505 remoteQueryData: {
501 506 "page": 1,
502   - "size": 9999
  507 + "size": 9999,
  508 + "auditStatus":1,
  509 + "creditStatus":0,
503 510 },
504 511 areas: [],
505 512 areaCode: null,
506 513 bindData: [{name:"a",id:"id"}],
507 514 bindname:null,
  515 + transportCompanyId:null,
508 516 };
509 517 },
510 518 created() {
... ... @@ -519,6 +527,19 @@
519 527 },
520 528 methods: {
521 529 conractCheck(item){
  530 + if(new Date(item.endTime).getTime() < new Date().getTime()){
  531 + this.form.contract = null;
  532 + this.$message("合同已过期");
  533 + return;
  534 + }
  535 + if(new Date(item.startTime).getTime() > new Date().getTime()){
  536 + this.form.contract = null;
  537 + this.$message("合同未生效");
  538 + return;
  539 + }
  540 +
  541 +
  542 +
522 543 if(this.form.type == 0){
523 544 this.form.name = item.constructionSiteName;
524 545 this.form.objectId = item.constructionSiteID;
... ... @@ -539,8 +560,14 @@
539 560 }
540 561  
541 562 }
  563 +
  564 +
  565 +
542 566 this.form.contractId = item.id;
543 567 this.bindname = this.form.earthsitesName;
  568 +
  569 +
  570 +
544 571 },
545 572 checkCompany(item){
546 573  
... ... @@ -581,6 +608,19 @@
581 608 this.form.place = Number(item.areaCode);
582 609 this.filterConract();
583 610  
  611 + if(this.form.type == 0){
  612 + this.transportCompanyId = item.transportCompanyId;
  613 + getConstructionTruck(item.id).then(res=>{
  614 + for(let i in res.result){
  615 + this.companyList.push({id:res.result[i].companyId , name: res.result[i].companyName});
  616 + this.form.companys.push(res.result[i].companyName);
  617 + for(let j in res.result.vehicleList){
  618 + this.truckList.push(res.result[i].vehicleList[j]);
  619 + }
  620 + }
  621 + });
  622 + }
  623 +
584 624 },
585 625 filterConract(){
586 626 let cId;
... ... @@ -592,12 +632,11 @@
592 632 cId = this.form.earthsitesId;
593 633 eId = this.form.objectId;
594 634 }
595   -
596 635 this.filterContract = [];
597 636 for(let i in this.contractList){
598 637  
599 638 let obj = this.contractList[i];
600   - let canId = false;
  639 + let canId = true;
601 640  
602 641 if(!cId && !eId){
603 642 this.filterContract = this.contractList;
... ... @@ -605,17 +644,37 @@
605 644 }
606 645  
607 646 //constructionSiteID //earthSiteID
608   - if(cId && cId == obj.constructionSiteID){
609   - canId = true;
610   - }else{
611   - canId = false;
  647 + if(cId && cId != obj.constructionSiteID){
  648 + continue;
  649 + }
  650 +
  651 + if(eId && eId != obj.earthSiteID){
  652 + continue;
612 653 }
613 654  
614   - if(canId && eId && eId == obj.earthSiteID){
615   - this.filterContract.push(obj);
  655 + this.filterContract.push(obj);
  656 + }
  657 +
  658 + for(let j in this.bindData){
  659 +
  660 + this.bindData[j].show = false;
  661 +
  662 + for(let i in this.filterContract){
  663 +
  664 + if(this.form.type == 0 && this.filterContract[i].earthSiteID == this.bindData[j].id){
  665 + this.bindData[j].show = true;
  666 + }
  667 +
  668 + if(this.form.type == 1 && this.filterContract[i].constructionSiteID == this.bindData[j].id){
  669 + this.bindData[j].show = true;
  670 + }
  671 +
616 672 }
  673 +
  674 +
617 675 }
618 676  
  677 +
619 678 },
620 679 getEarthsiteId(item) {
621 680 this.form.earthsitesName = item.name;
... ... @@ -700,12 +759,19 @@
700 759 this.remoteData = res.result.list;
701 760 } else {
702 761 this.bindData = res.result.list;
  762 +
  763 + for(let i in this.bindData){
  764 + this.bindData[i].show = true;
  765 + }
703 766 }
704 767 });
705 768  
706 769 earthsitesList(this.remoteQueryData).then(res => {
707 770 if (value == 0) {
708 771 this.bindData = res.result.list;
  772 + for(let i in this.bindData){
  773 + this.bindData[i].show = true;
  774 + }
709 775 } else {
710 776 this.remoteData = res.result.list;
711 777 }
... ... @@ -725,15 +791,25 @@
725 791  
726 792 /** 查询报工自查列表 */
727 793 getList(tabIdx) {
728   -
729 794 if(tabIdx == 1){
730 795 this.resetQuery();
731 796 this.queryParams.pageStatus = tabIdx;
732 797 this.queryParams.status = tabIdx;
  798 +
  799 + getNames(this.queryParams).then(res=>{
  800 +
  801 + this.names = res;
  802 + })
  803 +
733 804 }else if(tabIdx == 0){
734 805 this.resetQuery();
735 806 this.queryParams.pageStatus = tabIdx;
736 807 this.queryParams.status = null;
  808 +
  809 + getNames(this.queryParams).then(res=>{
  810 +
  811 + this.names = res;
  812 + })
737 813 }
738 814  
739 815 contractList().then(res=>{
... ... @@ -752,10 +828,7 @@
752 828 }
753 829 });
754 830  
755   - getNames(this.queryParams).then(res=>{
756 831  
757   - this.names = res;
758   - })
759 832  
760 833 let query = {
761 834 'page':1,
... ... @@ -778,7 +851,6 @@
778 851 truckList(query).then(res=>{
779 852 this.truckList = res.result.list;
780 853 });
781   -
782 854 });
783 855  
784 856  
... ... @@ -960,7 +1032,6 @@
960 1032 this.msgSuccess("新增成功");
961 1033 this.open = false;
962 1034 this.open2 = false;
963   - this.resetQuery();
964 1035 this.getList();
965 1036 },error=>{
966 1037 this.loading = false;
... ...
trash-ui/src/views/business/threestep/threestepInfo.vue
  View file @e16a9f2
... ... @@ -32,13 +32,13 @@
32 32 <el-row type="flex" justify="center">
33 33 <el-col>
34 34 <el-form-item label="消纳合同">
35   - <el-input v-model="infoData.contract" :maxlength="20" show-word-limit clearable disabled />
  35 + <el-input v-model="infoData.contract" :maxlength="20" show-word-limit disabled />
36 36 </el-form-item>
37 37  
38 38 </el-col>
39 39 <el-col>
40 40 <el-form-item label="自查时间">
41   - <el-input v-model="infoData.selfCheckTime" :maxlength="20" show-word-limit clearable disabled />
  41 + <el-input v-model="infoData.selfCheckTime" :maxlength="20" show-word-limit disabled />
42 42 </el-form-item>
43 43 </el-col>
44 44 </el-row>
... ... @@ -58,12 +58,12 @@
58 58 <el-row type="flex" justify="center">
59 59 <el-col :span="12">
60 60 <el-form-item label="现场负责人">
61   - <el-input v-model="infoData.person" :maxlength="20" show-word-limit clearable disabled />
  61 + <el-input v-model="infoData.person" :maxlength="20" show-word-limit disabled />
62 62 </el-form-item>
63 63 </el-col>
64 64 <el-col :span="12">
65 65 <el-form-item label="联系电话">
66   - <el-input v-model="infoData.phone" :maxlength="11" show-word-limit clearable disabled />
  66 + <el-input v-model="infoData.phone" :maxlength="11" show-word-limit disabled />
67 67 </el-select>
68 68 </el-form-item>
69 69 </el-col>
... ... @@ -204,12 +204,12 @@
204 204 <el-col>
205 205 <el-form-item label="巡查时间">
206 206  
207   - <el-input v-model="infoData.checkTime" :maxlength="20" show-word-limit clearable disabled />
  207 + <el-input v-model="infoData.checkTime" :maxlength="20" show-word-limit disabled />
208 208 </el-form-item>
209 209 </el-col>
210 210 <el-col>
211 211 <el-form-item label="渣管负责人">
212   - <el-input v-model="infoData.earthPipPerson" :maxlength="20" show-word-limit clearable disabled />
  212 + <el-input v-model="infoData.earthPipPerson" :maxlength="20" show-word-limit disabled />
213 213 </el-form-item>
214 214 </el-col>
215 215 </el-row>
... ... @@ -217,7 +217,7 @@
217 217 <el-row type="flex" justify="center" v-if="infoData.checkTime">
218 218 <el-col>
219 219 <el-form-item label="执法负责人">
220   - <el-input v-model="infoData.enforcePerson" :maxlength="20" show-word-limit clearable disabled />
  220 + <el-input v-model="infoData.enforcePerson" :maxlength="20" show-word-limit disabled />
221 221 </el-form-item>
222 222 </el-col>
223 223 <el-col>
... ... @@ -368,7 +368,7 @@
368 368 <el-row type="flex" justify="center" v-if="infoData.checkEndTime">
369 369 <el-col>
370 370 <el-form-item label="抽查时间">
371   - <el-input v-model="infoData.checkEndTime" :maxlength="20" show-word-limit clearable disabled />
  371 + <el-input v-model="infoData.checkEndTime" :maxlength="20" show-word-limit disabled />
372 372 </el-form-item>
373 373 </el-col>
374 374 <el-col>
... ...
trash-ui/src/views/business/truckActivate/index.vue
  View file @e16a9f2
... ... @@ -17,7 +17,7 @@
17 17 <el-input
18 18 v-model="queryParams.company"
19 19 placeholder="请输入所属企业"
20   - clearable
  20 +
21 21 size="small"
22 22  
23 23 />
... ... @@ -26,13 +26,13 @@
26 26 <el-input
27 27 v-model="queryParams.licensePlate"
28 28 placeholder="请输入车牌号"
29   - clearable
  29 +
30 30 size="small"
31 31  
32 32 />
33 33 </el-form-item>
34 34 <el-form-item label="激活时间" prop="activateTime">
35   - <el-date-picker clearable size="small" style="width: 200px"
  35 + <el-date-picker size="small" style="width: 200px"
36 36 v-model="queryParams.activateTime"
37 37 type="date"
38 38 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/caseOffline/caseOffline/caseOfflineInfo.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input v-model="form.type" type="textarea" :rows="3" disabled />
6 6 </el-form-item>
7 7 <el-form-item label="所属区域" prop="place">
8   - <el-select v-model="form.place" placeholder="请输入所属区域" clearable size="small" disabled>
  8 + <el-select v-model="form.place" placeholder="请输入所属区域" size="small" disabled>
9 9 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
10 10 </el-select>
11 11 </el-form-item>
... ...
trash-ui/src/views/caseOffline/caseOffline/index.vue
  View file @e16a9f2
... ... @@ -2,17 +2,17 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4 <el-form-item label="案卷类型" prop="type">
5   - <el-select v-model="queryParams.type" placeholder="请选择案卷类型" clearable size="small">
  5 + <el-select v-model="queryParams.type" placeholder="请选择案卷类型" size="small">
6 6 <el-option v-for="item in caseType" :label="item.name" :value="item.code" />
7 7 </el-select>
8 8 </el-form-item>
9 9 <el-form-item label="所属区域" prop="place">
10   - <el-select v-model="queryParams.place" placeholder="请选择案卷类型" clearable size="small">
  10 + <el-select v-model="queryParams.place" placeholder="请选择案卷类型" size="small">
11 11 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
12 12 </el-select>
13 13 </el-form-item>
14 14 <el-form-item label="时间" prop="createTime">
15   - <el-date-picker clearable size="small" style="width: 200px"
  15 + <el-date-picker size="small" style="width: 200px"
16 16 v-model="queryParams.createTime"
17 17 type="date"
18 18 value-format="yyyy-MM-dd"
... ... @@ -85,7 +85,7 @@
85 85 </el-select>
86 86 </el-form-item>
87 87 <el-form-item label="所属区域" prop="place">
88   - <el-select v-model="form.place" placeholder="请输入所属区域" clearable size="small">
  88 + <el-select v-model="form.place" placeholder="请输入所属区域" size="small">
89 89 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
90 90 </el-select>
91 91 </el-form-item>
... ...
trash-ui/src/views/casefile/violationCaseFile/index.vue
  View file @e16a9f2
... ... @@ -3,20 +3,20 @@
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4  
5 5 <el-form-item label="所属区域" prop="owningRegion">
6   - <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
  6 + <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" size="small">
7 7 <el-option v-for="item in areas" :label="item.name" :value="item.name" />
8 8 </el-select>
9 9  
10 10 </el-form-item>
11 11 <el-form-item label="违规类型" prop="violationType">
12   - <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
  12 + <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" size="small">
13 13 <el-option v-for="item in caseType" :label="item.name" :value="item.name" />
14 14 </el-select>
15 15 </el-form-item>
16 16  
17 17  
18 18 <el-form-item label="违规对象类型" prop="violationObjectType">
19   - <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
  19 + <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" size="small">
20 20 <el-option label="工地" value="0" />
21 21 <el-option label="消纳场" value="1" />
22 22 <el-option label="企业" value="2" />
... ... @@ -29,14 +29,14 @@
29 29 <el-input
30 30 v-model="queryParams.projectName"
31 31 placeholder="请输入项目名称"
32   - clearable
  32 +
33 33 size="small"
34 34  
35 35 />
36 36 </el-form-item>
37 37  
38 38 <el-form-item label="日期" prop="createTime">
39   - <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.createTime" type="date"
  39 + <el-date-picker size="small" style="width: 200px" v-model="queryParams.createTime" type="date"
40 40 value-format="yyyy-MM-dd" placeholder="开始时间">
41 41 </el-date-picker>
42 42 </el-form-item>
... ... @@ -150,7 +150,7 @@
150 150 </el-col>
151 151 <el-col :span="11">
152 152 <el-form-item label="违规对象类型" prop="violationObjectType">
153   - <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
  153 + <el-select v-model="form.violationObjectType" placeholder="请选择违规对象类型" size="small">
154 154 <el-option label="工地" value="0" />
155 155 <el-option label="消纳场" value="1" />
156 156 <el-option label="企业" value="2" />
... ...
trash-ui/src/views/casefile/violationWarningInformation/index.vue
  View file @e16a9f2
... ... @@ -2,19 +2,19 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="105px">
4 4 <el-form-item label="违规对象类型" prop="violationObjectType">
5   - <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" clearable size="small">
  5 + <el-select v-model="queryParams.violationObjectType" placeholder="请选择违规对象类型" size="small">
6 6 <el-option label="对象1" value="对象1" />
7 7 <el-option label="对象2" value="对象2" />
8 8 </el-select>
9 9 </el-form-item>
10 10 <el-form-item label="所属区域" prop="owningRegion">
11   - <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" clearable size="small">
  11 + <el-select v-model="queryParams.owningRegion" placeholder="请选择违规类型" size="small">
12 12 <el-option label="区域1" value="区域1" />
13 13 <el-option label="区域2" value="区域2" />
14 14 </el-select>
15 15 </el-form-item>
16 16 <el-form-item label="违规类型" prop="violationType">
17   - <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" clearable size="small">
  17 + <el-select v-model="queryParams.violationType" placeholder="请选择违规类型" size="small">
18 18 <el-option label="违规1" value="违规1" />
19 19 <el-option label="违规2" value="违规2" />
20 20 </el-select>
... ...
trash-ui/src/views/daily/information_sharing/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.dataHeader"
7 7 placeholder="请输入数据标题"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.retrieveDepartment"
16 16 placeholder="请输入调取部门"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
... ... @@ -110,7 +110,7 @@
110 110 </el-col>
111 111 <el-col :span="12">
112 112 <el-form-item label="调取时间" prop="retrieveTime">
113   - <el-date-picker clearable size="small"
  113 + <el-date-picker size="small"
114 114 v-model="form.retrieveTime"
115 115 type="date"
116 116 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/daily/report/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.title"
7 7 placeholder="请输入标题"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -102,7 +102,7 @@
102 102 <el-row type="flex" justify="center">
103 103 <el-col>
104 104 <el-form-item label="填写时间" prop="writeTime">
105   - <el-date-picker clearable size="small" style="width: 300px"
  105 + <el-date-picker size="small" style="width: 300px"
106 106 v-model="form.writeTime"
107 107 type="date"
108 108 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/daily/situation/index.vue
  View file @e16a9f2
1   -<template>
2   - <div class="app-container">
3   - <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4   - <el-form-item label="标题" prop="title">
5   - <el-input
6   - v-model="queryParams.title"
7   - placeholder="请输入标题"
8   - clearable
9   - size="small"
10   -
11   - />
12   - </el-form-item>
13   - <el-form-item label="操作人" prop="operator">
14   - <el-input
15   - v-model="queryParams.operator"
16   - placeholder="请输入操作人"
17   - clearable
18   - size="small"
19   -
20   - />
21   - </el-form-item>
22   - <el-form-item>
23   - <el-button type="cyan" size="mini" @click="handleQuery">搜索</el-button>
24   - </el-form-item>
25   - </el-form>
26   -
27   - <el-row :gutter="10" class="mb8">
28   - <el-col :span="1.5">
29   - <el-button
30   - type="primary"
31   - size="mini"
32   - @click="handleAdd"
33   - v-hasPermi="['daily:situation:add']"
34   - >新增</el-button>
35   - </el-col>
36   - <el-col :span="1.5">
37   - <el-button
38   - type="success"
39   - size="mini"
40   - :disabled="single"
41   - @click="handleUpdate"
42   - v-hasPermi="['daily:situation:edit']"
43   - >修改</el-button>
44   - </el-col>
45   - <el-col :span="1.5">
46   - <el-button
47   - type="danger"
48   - size="mini"
49   - :disabled="multiple"
50   - @click="handleDelete"
51   - v-hasPermi="['daily:situation:remove']"
52   - >删除</el-button>
53   - </el-col>
54   - <el-col :span="1.5">
55   - <el-button
56   - type="warning"
57   - size="mini"
58   - @click="handleExport"
59   - v-hasPermi="['daily:situation:export']"
60   - >导出</el-button>
61   - </el-col>
62   - <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
63   - </el-row>
64   -
65   - <el-table v-loading="loading" :data="situationList" border @selection-change="handleSelectionChange">
66   - <el-table-column type="selection" width="55" align="center" />
67   - <el-table-column label="标题" align="center" prop="title" />
68   - <el-table-column label="操作人" align="center" prop="operator" />
69   - <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
70   - <template slot-scope="scope">
71   - <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
72   - </template>
73   - </el-table-column>
74   - <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
75   - <template slot-scope="scope">
76   - <el-button
77   - size="mini"
78   - type="text"
79   - @click="handleById(scope.row)"
80   - v-hasPermi="['daily:situation:query']">
81   - 查看
82   - </el-button>
83   - </template>
84   - </el-table-column>
85   - </el-table>
86   -
87   - <pagination
88   - v-show="total>0"
89   - :total="total"
90   - :page.sync="queryParams.pageNum"
91   - :limit.sync="queryParams.pageSize"
92   - @pagination="getList"
93   - />
94   -
95   - <!-- 添加或修改每日普查情况对话框 -->
96   - <el-dialog :title="title" :visible.sync="open" append-to-body>
97   - <el-form ref="form" :model="form" :rules="rules" label-width="120px">
98   - <el-row type="flex" justify="center">
99   - <el-col>
100   - <el-form-item label="日期" prop="date">
101   - <el-date-picker clearable size="small" style="width: 200px"
102   - v-model="form.date"
103   - type="date"
104   - value-format="yyyy-MM-dd"
105   - placeholder="选择日期"
106   - @change="selectDate">
107   - </el-date-picker>
108   - </el-form-item>
109   - </el-col>
110   - <el-col>
111   - <el-form-item label="星期" >
112   - <el-input v-model="dayOfWeek" placeholder="" style="width: 200px" disabled/>
113   - </el-form-item>
114   - </el-col>
115   - </el-row>
116   - <el-row type="flex" justify="center">
117   - <el-col>
118   - <el-form-item label="天气" prop="weather">
119   - <el-input v-model="form.weather" placeholder="请输入天气" style="width: 200px"/>
120   - </el-form-item>
121   - </el-col>
122   - <el-col>
123   - <el-form-item label="操作人" prop="operator">
124   - <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px"/>
125   - </el-form-item>
126   - </el-col>
127   - </el-row>
128   -
129   - <el-form-item label="全市工地,消纳场开停情况" prop="consumptionSiteSituation">
130   - <editor v-model="form.consumptionSiteSituation" :min-height="192"/>
  1 +<template>
  2 + <div class="app-container">
  3 + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
  4 + <el-form-item label="标题" prop="title">
  5 + <el-input
  6 + v-model="queryParams.title"
  7 + placeholder="请输入标题"
  8 +
  9 + size="small"
  10 +
  11 + />
  12 + </el-form-item>
  13 + <el-form-item label="操作人" prop="operator">
  14 + <el-input
  15 + v-model="queryParams.operator"
  16 + placeholder="请输入操作人"
  17 +
  18 + size="small"
  19 +
  20 + />
  21 + </el-form-item>
  22 + <el-form-item>
  23 + <el-button type="cyan" size="mini" @click="handleQuery">搜索</el-button>
  24 + </el-form-item>
  25 + </el-form>
  26 +
  27 + <el-row :gutter="10" class="mb8">
  28 + <el-col :span="1.5">
  29 + <el-button
  30 + type="primary"
  31 + size="mini"
  32 + @click="handleAdd"
  33 + v-hasPermi="['daily:situation:add']"
  34 + >新增</el-button>
  35 + </el-col>
  36 + <el-col :span="1.5">
  37 + <el-button
  38 + type="success"
  39 + size="mini"
  40 + :disabled="single"
  41 + @click="handleUpdate"
  42 + v-hasPermi="['daily:situation:edit']"
  43 + >修改</el-button>
  44 + </el-col>
  45 + <el-col :span="1.5">
  46 + <el-button
  47 + type="danger"
  48 + size="mini"
  49 + :disabled="multiple"
  50 + @click="handleDelete"
  51 + v-hasPermi="['daily:situation:remove']"
  52 + >删除</el-button>
  53 + </el-col>
  54 + <el-col :span="1.5">
  55 + <el-button
  56 + type="warning"
  57 + size="mini"
  58 + @click="handleExport"
  59 + v-hasPermi="['daily:situation:export']"
  60 + >导出</el-button>
  61 + </el-col>
  62 + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
  63 + </el-row>
  64 +
  65 + <el-table v-loading="loading" :data="situationList" border @selection-change="handleSelectionChange">
  66 + <el-table-column type="selection" width="55" align="center" />
  67 + <el-table-column label="标题" align="center" prop="title" />
  68 + <el-table-column label="操作人" align="center" prop="operator" />
  69 + <el-table-column label="更新时间" align="center" prop="updateTime" width="180">
  70 + <template slot-scope="scope">
  71 + <span>{{ parseTime(scope.row.updateTime, '{y}-{m}-{d}') }}</span>
  72 + </template>
  73 + </el-table-column>
  74 + <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
  75 + <template slot-scope="scope">
  76 + <el-button
  77 + size="mini"
  78 + type="text"
  79 + @click="handleById(scope.row)"
  80 + v-hasPermi="['daily:situation:query']">
  81 + 查看
  82 + </el-button>
  83 + </template>
  84 + </el-table-column>
  85 + </el-table>
  86 +
  87 + <pagination
  88 + v-show="total>0"
  89 + :total="total"
  90 + :page.sync="queryParams.pageNum"
  91 + :limit.sync="queryParams.pageSize"
  92 + @pagination="getList"
  93 + />
  94 +
  95 + <!-- 添加或修改每日工作清单对话框 -->
  96 + <el-dialog :title="title" :visible.sync="open" append-to-body>
  97 + <el-form ref="form" :model="form" :rules="rules" label-width="120px">
  98 + <el-row type="flex" justify="center">
  99 + <el-col>
  100 + <el-form-item label="日期" prop="date">
  101 + <el-date-picker size="small" style="width: 200px"
  102 + v-model="form.date"
  103 + type="date"
  104 + value-format="yyyy-MM-dd"
  105 + placeholder="选择日期"
  106 + @change="selectDate">
  107 + </el-date-picker>
  108 + </el-form-item>
  109 + </el-col>
  110 + <el-col>
  111 + <el-form-item label="星期" >
  112 + <el-input v-model="dayOfWeek" placeholder="" style="width: 200px" disabled/>
  113 + </el-form-item>
  114 + </el-col>
  115 + </el-row>
  116 + <el-row type="flex" justify="center">
  117 + <el-col>
  118 + <el-form-item label="天气" prop="weather">
  119 + <el-input v-model="form.weather" placeholder="请输入天气" style="width: 200px"/>
  120 + </el-form-item>
  121 + </el-col>
  122 + <el-col>
  123 + <el-form-item label="操作人" prop="operator">
  124 + <el-input v-model="form.operator" placeholder="请输入操作人" style="width: 200px"/>
  125 + </el-form-item>
  126 + </el-col>
  127 + </el-row>
  128 +
  129 + <el-form-item label="全市工地,消纳场开停情况" prop="consumptionSiteSituation">
  130 + <editor v-model="form.consumptionSiteSituation" :min-height="192"/>
131 131 </el-form-item>
132 132  
133 133  
... ... @@ -142,61 +142,61 @@
142 142 <el-form-item label="平台推送各类预警信息(案卷情况)" prop="numberOfVehicles">
143 143 <editor v-model="form.warningCaseFileInfo" :min-height="192"/>
144 144 </el-form-item>
145   -
146   -
147   - </el-form>
148   - <div slot="footer" class="dialog-footer" >
149   - <el-button type="primary" @click="submitForm">确 定</el-button>
150   - <el-button @click="cancel">取 消</el-button>
151   - </div>
152   - </el-dialog>
153   - </div>
154   -</template>
155   -
156   -<script>
157   -import { listSituation, getSituation, delSituation, addSituation, updateSituation, exportSituation } from "@/api/daily/situation";
158   -import Editor from '@/components/Editor';
159   -import {getToollist} from "@/api/daily/toollist";
160   -
161   -export default {
162   - name: "Situation",
163   - components: { Editor },
164   - data() {
165   - return {
166   - // 遮罩层
167   - loading: true,
168   - border:true,
169   - // 选中数组
170   - ids: [],
171   - // 非单个禁用
172   - single: true,
173   - // 非多个禁用
174   - multiple: true,
175   - // 显示搜索条件
176   - showSearch: true,
177   - // 总条数
178   - total: 0,
179   - // 每日普查情况表格数据
180   - situationList: [],
181   - // 弹出层标题
182   - title: "",
183   - dayOfWeek:null,
184   - // 是否显示弹出层
185   - open: false,
186   - // 查询参数
187   - queryParams: {
188   - pageNum: 1,
189   - pageSize: 10,
190   - title: null,
191   - operator: null,
192   - updateTime: null
193   - },
194   - // 表单参数
195   - form: {},
196   - // 表单校验
197   - rules: {
198   - date: [
199   - { required: true, message: "不能为空", trigger: "blur" }
  145 +
  146 +
  147 + </el-form>
  148 + <div slot="footer" class="dialog-footer" >
  149 + <el-button type="primary" @click="submitForm">确 定</el-button>
  150 + <el-button @click="cancel">取 消</el-button>
  151 + </div>
  152 + </el-dialog>
  153 + </div>
  154 +</template>
  155 +
  156 +<script>
  157 +import { listSituation, getSituation, delSituation, addSituation, updateSituation, exportSituation } from "@/api/daily/situation";
  158 +import Editor from '@/components/Editor';
  159 +import {getToollist} from "@/api/daily/toollist";
  160 +
  161 +export default {
  162 + name: "Situation",
  163 + components: { Editor },
  164 + data() {
  165 + return {
  166 + // 遮罩层
  167 + loading: true,
  168 + border:true,
  169 + // 选中数组
  170 + ids: [],
  171 + // 非单个禁用
  172 + single: true,
  173 + // 非多个禁用
  174 + multiple: true,
  175 + // 显示搜索条件
  176 + showSearch: true,
  177 + // 总条数
  178 + total: 0,
  179 + // 每日工作清单表格数据
  180 + situationList: [],
  181 + // 弹出层标题
  182 + title: "",
  183 + dayOfWeek:null,
  184 + // 是否显示弹出层
  185 + open: false,
  186 + // 查询参数
  187 + queryParams: {
  188 + pageNum: 1,
  189 + pageSize: 10,
  190 + title: null,
  191 + operator: null,
  192 + updateTime: null
  193 + },
  194 + // 表单参数
  195 + form: {},
  196 + // 表单校验
  197 + rules: {
  198 + date: [
  199 + { required: true, message: "不能为空", trigger: "blur" }
200 200 ],
201 201 weather: [
202 202 { required: true, message: "不能为空", trigger: "blur" }
... ... @@ -209,166 +209,166 @@ export default {
209 209 ],
210 210 numberOfVehicles: [
211 211 { required: true, message: "不能为空", trigger: "blur" }
212   - ],
213   - }
214   - };
215   - },
216   - created() {
217   - this.getList();
218   - },
219   - methods: {
220   - selectDate(date){
221   -
222   - let day = new Date(date).getDay();
223   -
224   - if(day == 0){
225   - day = 7;
226   - }
227   -
228   - this.dayOfWeek = day;
229   -
230   - },
231   -
232   - /** 查询每日普查情况列表 */
233   - getList() {
234   - this.loading = true;
235   - listSituation(this.queryParams).then(response => {
236   - this.situationList = response.rows;
237   - this.total = response.total;
238   - this.loading = false;
239   - });
240   - },
241   - // 取消按钮
242   - cancel() {
243   - this.open = false;
244   - this.reset();
245   - },
246   - // 表单重置
247   - reset() {
248   - this.form = {
249   - id: null,
250   - title: null,
251   - operator: null,
252   - date: null,
253   - weather: null,
254   - consumptionSiteSituation: null,
255   - numberOfVehicles: null,
256   - createTime: null,
257   - updateTime: null
258   - };
259   - this.resetForm("form");
260   - },
261   - /** 搜索按钮操作 */
262   - handleQuery() {
263   - this.queryParams.pageNum = 1;
264   - this.getList();
265   - },
266   - /** 重置按钮操作 */
267   - resetQuery() {
268   - this.resetForm("queryForm");
269   - this.handleQuery();
270   - },
271   - // 多选框选中数据
272   - handleSelectionChange(selection) {
273   - this.ids = selection.map(item => item.id)
274   - this.single = selection.length!==1
275   - this.multiple = !selection.length
276   - },
277   - /** 新增按钮操作 */
278   - handleAdd() {
279   - this.reset();
280   - this.open = true;
281   - this.title = "添加每日普查情况";
282   - },
283   - /** 修改按钮操作 */
284   - handleUpdate(row) {
285   - this.reset();
286   - const id = row.id || this.ids
287   - getSituation(id).then(response => {
288   - this.form = response.data;
289   -
290   - let day = new Date(this.form.date).getDay();
291   -
292   - if(day == 0){
293   - day = 7;
294   - }
295   -
296   - this.dayOfWeek = day;
297   -
298   -
299   - this.open = true;
300   - this.title = "修改每日普查情况";
301   - });
302   - },
303   - /** 查看详情按钮操作*/
304   - handleById(row){
305   - this.reset();
306   - const id = row.id ||this.ids
307   - getSituation(id).then(response => {
308   - this.form = response.data;
309   -
310   - let day = new Date(this.form.date).getDay();
311   -
312   - if(day == 0){
313   - day = 7;
314   - }
315   -
316   - this.dayOfWeek = day;
317   -
318   - this.open = true;
319   - this.title = "查看详情信息";
320   - });
321   - },
322   - /** 提交按钮 */
323   - submitForm() {
324   -
325   -
326   - this.$refs["form"].validate(valid => {
327   - if (valid) {
328   - this.form.title = this.form.date + "平台工作清单";
329   - if (this.form.id != null) {
330   - updateSituation(this.form).then(response => {
331   - this.msgSuccess("修改成功");
332   - this.open = false;
333   - this.getList();
334   - });
335   - } else {
336   - addSituation(this.form).then(response => {
337   - this.msgSuccess("新增成功");
338   - this.open = false;
339   - this.getList();
340   - });
341   - }
342   - }
343   - });
344   - },
345   - /** 删除按钮操作 */
346   - handleDelete(row) {
347   - const ids = row.id || this.ids;
348   - this.$confirm('是否确认删除每日普查情况编号为"' + ids + '"的数据项?', "警告", {
349   - confirmButtonText: "确定",
350   - cancelButtonText: "取消",
351   - type: "warning"
352   - }).then(function() {
353   - return delSituation(ids);
354   - }).then(() => {
355   - this.getList();
356   - this.msgSuccess("删除成功");
357   - })
358   - },
359   - /** 导出按钮操作 */
360   - handleExport() {
361   - const queryParams = this.queryParams;
362   - this.$confirm('是否确认导出所有每日普查情况数据项?', "警告", {
363   - confirmButtonText: "确定",
364   - cancelButtonText: "取消",
365   - type: "warning"
366   - }).then(function() {
367   - return exportSituation(queryParams);
368   - }).then(response => {
369   - this.download(response.message);
370   - })
371   - }
372   - }
373   -};
374   -</script>
  212 + ],
  213 + }
  214 + };
  215 + },
  216 + created() {
  217 + this.getList();
  218 + },
  219 + methods: {
  220 + selectDate(date){
  221 +
  222 + let day = new Date(date).getDay();
  223 +
  224 + if(day == 0){
  225 + day = 7;
  226 + }
  227 +
  228 + this.dayOfWeek = day;
  229 +
  230 + },
  231 +
  232 + /** 查询每日工作清单列表 */
  233 + getList() {
  234 + this.loading = true;
  235 + listSituation(this.queryParams).then(response => {
  236 + this.situationList = response.rows;
  237 + this.total = response.total;
  238 + this.loading = false;
  239 + });
  240 + },
  241 + // 取消按钮
  242 + cancel() {
  243 + this.open = false;
  244 + this.reset();
  245 + },
  246 + // 表单重置
  247 + reset() {
  248 + this.form = {
  249 + id: null,
  250 + title: null,
  251 + operator: null,
  252 + date: null,
  253 + weather: null,
  254 + consumptionSiteSituation: null,
  255 + numberOfVehicles: null,
  256 + createTime: null,
  257 + updateTime: null
  258 + };
  259 + this.resetForm("form");
  260 + },
  261 + /** 搜索按钮操作 */
  262 + handleQuery() {
  263 + this.queryParams.pageNum = 1;
  264 + this.getList();
  265 + },
  266 + /** 重置按钮操作 */
  267 + resetQuery() {
  268 + this.resetForm("queryForm");
  269 + this.handleQuery();
  270 + },
  271 + // 多选框选中数据
  272 + handleSelectionChange(selection) {
  273 + this.ids = selection.map(item => item.id)
  274 + this.single = selection.length!==1
  275 + this.multiple = !selection.length
  276 + },
  277 + /** 新增按钮操作 */
  278 + handleAdd() {
  279 + this.reset();
  280 + this.open = true;
  281 + this.title = "添加每日工作清单";
  282 + },
  283 + /** 修改按钮操作 */
  284 + handleUpdate(row) {
  285 + this.reset();
  286 + const id = row.id || this.ids
  287 + getSituation(id).then(response => {
  288 + this.form = response.data;
  289 +
  290 + let day = new Date(this.form.date).getDay();
  291 +
  292 + if(day == 0){
  293 + day = 7;
  294 + }
  295 +
  296 + this.dayOfWeek = day;
  297 +
  298 +
  299 + this.open = true;
  300 + this.title = "修改每日工作清单";
  301 + });
  302 + },
  303 + /** 查看详情按钮操作*/
  304 + handleById(row){
  305 + this.reset();
  306 + const id = row.id ||this.ids
  307 + getSituation(id).then(response => {
  308 + this.form = response.data;
  309 +
  310 + let day = new Date(this.form.date).getDay();
  311 +
  312 + if(day == 0){
  313 + day = 7;
  314 + }
  315 +
  316 + this.dayOfWeek = day;
  317 +
  318 + this.open = true;
  319 + this.title = "查看详情信息";
  320 + });
  321 + },
  322 + /** 提交按钮 */
  323 + submitForm() {
  324 +
  325 +
  326 + this.$refs["form"].validate(valid => {
  327 + if (valid) {
  328 + this.form.title = this.form.date + "平台工作清单";
  329 + if (this.form.id != null) {
  330 + updateSituation(this.form).then(response => {
  331 + this.msgSuccess("修改成功");
  332 + this.open = false;
  333 + this.getList();
  334 + });
  335 + } else {
  336 + addSituation(this.form).then(response => {
  337 + this.msgSuccess("新增成功");
  338 + this.open = false;
  339 + this.getList();
  340 + });
  341 + }
  342 + }
  343 + });
  344 + },
  345 + /** 删除按钮操作 */
  346 + handleDelete(row) {
  347 + const ids = row.id || this.ids;
  348 + this.$confirm('是否确认删除每日工作清单编号为"' + ids + '"的数据项?', "警告", {
  349 + confirmButtonText: "确定",
  350 + cancelButtonText: "取消",
  351 + type: "warning"
  352 + }).then(function() {
  353 + return delSituation(ids);
  354 + }).then(() => {
  355 + this.getList();
  356 + this.msgSuccess("删除成功");
  357 + })
  358 + },
  359 + /** 导出按钮操作 */
  360 + handleExport() {
  361 + const queryParams = this.queryParams;
  362 + this.$confirm('是否确认导出所有每日工作清单数据项?', "警告", {
  363 + confirmButtonText: "确定",
  364 + cancelButtonText: "取消",
  365 + type: "warning"
  366 + }).then(function() {
  367 + return exportSituation(queryParams);
  368 + }).then(response => {
  369 + this.download(response.message);
  370 + })
  371 + }
  372 + }
  373 +};
  374 +</script>
... ...
trash-ui/src/views/daily/toollist/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.title"
7 7 placeholder="请输入标题"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.operator"
16 16 placeholder="请输入操作人"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
... ... @@ -98,7 +98,7 @@
98 98 </el-col>
99 99 <el-col :span='12'>
100 100 <el-form-item label="日期" prop="date">
101   - <el-date-picker clearable size="small"
  101 + <el-date-picker size="small"
102 102 v-model="form.date"
103 103 type="date"
104 104 value-format="yyyy-MM-dd"
... ... @@ -111,7 +111,7 @@
111 111 <el-row>
112 112 <el-col :span='12'>
113 113 <el-form-item label="区域" prop="region">
114   - <el-select v-model="form.region" placeholder="请选择区域" filterable clearable>
  114 + <el-select v-model="form.region" placeholder="请选择区域" filterable >
115 115 <el-option
116 116 v-for="item in areas"
117 117 :key="item.code"
... ...
trash-ui/src/views/h5/dayWorkReport/index.vue
  View file @e16a9f2
... ... @@ -5,22 +5,22 @@
5 5 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
6 6 <el-row>
7 7 <el-col :span="12">
8   - <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable />
  8 + <el-input v-model="queryParams.name" placeholder="请输入项目名称" />
9 9 </el-col>
10 10 <el-col :span="12">
11   - <el-select v-model="queryParams.place" placeholder="工地所属区域 " clearable size="small">
  11 + <el-select v-model="queryParams.place" placeholder="工地所属区域 " size="small">
12 12 <el-option v-for="item in areas" :label="item.name" :value="item.code" />
13 13 </el-select>
14 14 </el-col>
15 15 </el-row>
16 16 <el-row>
17 17 <el-col :span="12">
18   - <el-date-picker clearable size="small" style="width: 150px" v-model="queryParams.workStartTime" type="date"
  18 + <el-date-picker size="small" style="width: 150px" v-model="queryParams.workStartTime" type="date"
19 19 value-format="yyyy-MM-dd" placeholder="开始时间">
20 20 </el-date-picker>
21 21 </el-col>
22 22 <el-col :span="12">
23   - <el-date-picker clearable size="small" style="width: 150px" v-model="queryParams.workEndTime" type="date"
  23 + <el-date-picker size="small" style="width: 150px" v-model="queryParams.workEndTime" type="date"
24 24 value-format="yyyy-MM-dd" placeholder="结束时间">
25 25 </el-date-picker>
26 26 </el-col>
... ... @@ -103,7 +103,7 @@
103 103 showSearch: true,
104 104 // 总条数
105 105 total: 0,
106   - // 【请填写功能名称】表格数据
  106 + // 日开工报表表格数据
107 107 threestepList: [],
108 108 fileList: [],
109 109 // 弹出层标题
... ... @@ -180,9 +180,10 @@
180 180 this.uploadImageDialog = false;
181 181 this.fileList = [];
182 182 },
183   - /** 查询【请填写功能名称】列表 */
  183 + /** 查询日开工报表列表 */
184 184 getList(tabIdx) {
185 185  
  186 +
186 187 this.loading = true;
187 188  
188 189 dayWorkList(this.queryParams).then(response => {
... ... @@ -191,25 +192,8 @@
191 192 getArea().then(res => {
192 193 this.areas = res.result;
193 194 for(let i =0;i< this.threestepList.length;i++){
194   - this.threestepList[i].self_check_time = null;
195   - this.threestepList[i].eself_check_time = null;
196   - this.threestepList[i].create_time = null;
197   - this.threestepList[i].check_time = null;
198   -
199 195 this.threestepList[i].place = this.getAreaName(this.threestepList[i].place);
200   - if(this.outside.indexOf(this.threestepList[i].place) > -1){
201   - if(this.threestepList[i].status == 1){
202   - this.threestepList[i].estatus = "开工";
203   - }else{
204   - this.threestepList[i].estatus = "未开工";
205   - }
206   - }else{
207   - if(this.threestepList[i].status == 1 && this.threestepList[i].estatus == 1){
208   - this.threestepList[i].estatus = "开工";
209   - }else{
210   - this.threestepList[i].estatus = "未开工";
211   - }
212   - }
  196 +
213 197 }
214 198 });
215 199  
... ... @@ -219,7 +203,7 @@
219 203 this.constructionsitesList = res.result.list;
220 204 for(let i =0;i< this.threestepList.length;i++){
221 205 for(let j =0;j<this.constructionsitesList.length;j++){
222   - if(this.threestepList[i].object_id == this.constructionsitesList[j].id){
  206 + if(this.threestepList[i].objectId == this.constructionsitesList[j].id){
223 207 for(let x in this.projectTypes){
224 208 if(this.projectTypes[x].code == this.constructionsitesList[j].projectType){
225 209 this.threestepList[i].type = this.projectTypes[x].name;
... ... @@ -234,9 +218,17 @@
234 218 this.earthsitesList = res.result.list;
235 219 for(let i =0;i< this.threestepList.length;i++){
236 220 for(let j =0;j<this.earthsitesList.length;j++){
237   - if(this.threestepList[i].eobject_id == this.earthsitesList[j].id){
  221 + console.log(this.threestepList[i].eid + "==" + this.earthsitesList[j].id);
  222 + if(this.threestepList[i].eid == this.earthsitesList[j].id){
238 223 this.threestepList[i].etype = this.earthsitesList[j].typeName;
239 224 this.threestepList[i].eplace = this.earthsitesList[j].areaName;
  225 +
  226 + if(this.outside.indexOf(this.threestepList[i].eplace) > -1){
  227 + if(this.threestepList[i].status == "开工"){
  228 + this.threestepList[i].descript = "开工";
  229 + }
  230 + }
  231 +
240 232 }
241 233 }
242 234 }
... ... @@ -398,7 +390,7 @@
398 390 /** 删除按钮操作 */
399 391 handleDelete(row) {
400 392 const ids = row.id || this.ids;
401   - this.$confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项?', "警告", {
  393 + this.$confirm('是否确认删除日开工报表编号为"' + ids + '"的数据项?', "警告", {
402 394 confirmButtonText: "确定",
403 395 cancelButtonText: "取消",
404 396 type: "warning"
... ... @@ -417,23 +409,27 @@
417 409  
418 410  
419 411 let obj = {
  412 + id:this.threestepList[i].id,
420 413 name:this.threestepList[i].name,
  414 + createTime:this.threestepList[i].createTime,
  415 + selfCheckTime:this.threestepList[i].selfCheckTime,
421 416 type:this.threestepList[i].type,
422 417 place:this.threestepList[i].place,
423   - subReason:this.threestepList[i].sub_reason,
  418 + status:this.threestepList[i].status,
424 419 ename:this.threestepList[i].ename,
425 420 etype:this.threestepList[i].etype,
426   - esubSeason:this.threestepList[i].esub_reason,
  421 + eplace:this.threestepList[i].eplace,
427 422 estatus:this.threestepList[i].estatus,
  423 + eselfCheckTime:this.threestepList[i].eselfCheckTime,
  424 + descript:this.threestepList[i].descript,
428 425 }
429   -
430 426 data.push(obj);
431 427  
432 428  
433 429  
434 430 }
435 431  
436   - this.$confirm('是否确认导出所有【请填写功能名称】数据项?', "警告", {
  432 + this.$confirm('是否确认导出所有日开工报表数据项?', "警告", {
437 433 confirmButtonText: "确定",
438 434 cancelButtonText: "取消",
439 435 type: "warning"
... ...
trash-ui/src/views/h5/office/conference/conferenceInfo.vue
  View file @e16a9f2
... ... @@ -3,7 +3,7 @@
3 3 <el-row :gutter="2">
4 4 <el-col :span="11">
5 5 <el-form-item label="会议时间" prop="conferenceTime">
6   - <el-date-picker clearable size="small" style="width: 100%"
  6 + <el-date-picker size="small" style="width: 100%"
7 7 v-model="form.conferenceTime"
8 8 type="datetime"
9 9 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/conference/index.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4 <el-form-item label="会议时间" prop="conferenceTime">
5   - <el-date-picker clearable size="small" style="width: 200px"
  5 + <el-date-picker size="small" style="width: 200px"
6 6 v-model="queryParams.conferenceTime"
7 7 type="date"
8 8 value-format="yyyy-MM-dd"
... ... @@ -130,7 +130,7 @@
130 130 <el-row :gutter="2">
131 131 <el-col :span="11">
132 132 <el-form-item label="会议时间" prop="conferenceTime">
133   - <el-date-picker clearable size="small" style="width: 100%"
  133 + <el-date-picker size="small" style="width: 100%"
134 134 v-model="form.conferenceTime"
135 135 type="datetime"
136 136 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/handle/handleInfo.vue
  View file @e16a9f2
... ... @@ -14,7 +14,7 @@
14 14 <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true" />
15 15 </el-form-item>
16 16 <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
17   - <el-date-picker clearable size="small" style="width: 100%"
  17 + <el-date-picker size="small" style="width: 100%"
18 18 v-model="form.receiveTime"
19 19 type="datetime"
20 20 :disabled="true"
... ... @@ -30,7 +30,7 @@
30 30 <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true" />
31 31 </el-form-item>
32 32 <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
33   - <el-date-picker clearable size="small" style="width: 100%"
  33 + <el-date-picker size="small" style="width: 100%"
34 34 v-model="form.sendDate"
35 35 type="date"
36 36 :disabled="true"
... ...
trash-ui/src/views/h5/office/handle/index.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
4 4 <el-form-item label="办文办事类型" prop="type">
5   - <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" clearable size="small">
  5 + <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" size="small">
6 6 <el-option label="传阅学习类" value="0" />
7 7 <el-option label="公文批办类" value="1" />
8 8 <el-option label="热线举报类" value="2" />
... ... @@ -14,13 +14,13 @@
14 14 <el-input
15 15 v-model="queryParams.company"
16 16 placeholder="请输入来文单位"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
21 21 </el-form-item>
22 22 <el-form-item label="收文时间" prop="receiveTime">
23   - <el-date-picker clearable size="small" style="width: 200px"
  23 + <el-date-picker size="small" style="width: 200px"
24 24 v-model="queryParams.receiveTime"
25 25 type="date"
26 26 value-format="yyyy-MM-dd"
... ... @@ -31,7 +31,7 @@
31 31 <el-input
32 32 v-model="queryParams.title"
33 33 placeholder="请输入文件标题"
34   - clearable
  34 +
35 35 size="small"
36 36  
37 37 />
... ... @@ -40,13 +40,13 @@
40 40 <el-input
41 41 v-model="queryParams.sendPerson"
42 42 placeholder="请输入信访单位(人)"
43   - clearable
  43 +
44 44 size="small"
45 45  
46 46 />
47 47 </el-form-item>
48 48 <el-form-item label="信访日期" prop="sendDate">
49   - <el-date-picker clearable size="small" style="width: 200px"
  49 + <el-date-picker size="small" style="width: 200px"
50 50 v-model="queryParams.sendDate"
51 51 type="date"
52 52 value-format="yyyy-MM-dd"
... ... @@ -180,7 +180,7 @@
180 180 <el-input v-model="form.company" placeholder="请输入来文单位" />
181 181 </el-form-item>
182 182 <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
183   - <el-date-picker clearable size="small" style="width: 100%"
  183 + <el-date-picker size="small" style="width: 100%"
184 184 v-model="form.receiveTime"
185 185 type="datetime"
186 186 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -195,7 +195,7 @@
195 195 <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" />
196 196 </el-form-item>
197 197 <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
198   - <el-date-picker clearable size="small" style="width: 100%"
  198 + <el-date-picker size="small" style="width: 100%"
199 199 v-model="form.sendDate"
200 200 type="date"
201 201 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/h5/office/handleAffairsCommon/handleAffairsCommonInfo.vue
  View file @e16a9f2
... ... @@ -4,7 +4,7 @@
4 4 <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true"/>
5 5 </el-form-item>
6 6 <el-form-item label="收文时间" prop="receiveTime">
7   - <el-date-picker clearable size="small" style="width: 100%"
  7 + <el-date-picker size="small" style="width: 100%"
8 8 v-model="form.receiveTime"
9 9 type="datetime"
10 10 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/handleAffairsCommon/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.company"
7 7 placeholder="请输入来文单位"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="收文时间" prop="receiveTime">
14   - <el-date-picker clearable size="small" style="width: 200px"
  14 + <el-date-picker size="small" style="width: 200px"
15 15 v-model="queryParams.receiveTime"
16 16 type="date"
17 17 value-format="yyyy-MM-dd"
... ... @@ -19,7 +19,7 @@
19 19 </el-date-picker>
20 20 </el-form-item>
21 21 <el-form-item label="审批状态" prop="status">
22   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
  22 + <el-select v-model="queryParams.status" placeholder="请选择审批状态" size="small">
23 23 <el-option label="审核中" value="0" />
24 24 <el-option label="审核完成" value="1" />
25 25 <el-option label="被驳回" value="2" />
... ... @@ -129,7 +129,7 @@
129 129 <el-input v-model="form.company" placeholder="请输入来文单位" />
130 130 </el-form-item>
131 131 <el-form-item label="收文时间" prop="receiveTime">
132   - <el-date-picker clearable size="small" style="width: 100%"
  132 + <el-date-picker size="small" style="width: 100%"
133 133 v-model="form.receiveTime"
134 134 type="datetime"
135 135 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/handleAffairsXF/handleAffairsXFInfo.vue
  View file @e16a9f2
... ... @@ -4,7 +4,7 @@
4 4 <el-input v-model="form.company" placeholder="请输入信访单位(人)" :disabled="true"/>
5 5 </el-form-item>
6 6 <el-form-item label="信访日期" prop="receiveDate">
7   - <el-date-picker clearable size="small" style="width: 100%"
  7 + <el-date-picker size="small" style="width: 100%"
8 8 v-model="form.receiveDate"
9 9 type="date"
10 10 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/h5/office/handleAffairsXF/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.company"
7 7 placeholder="请输入信访单位(人)"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="信访日期" prop="receiveDate">
14   - <el-date-picker clearable size="small" style="width: 200px"
  14 + <el-date-picker size="small" style="width: 200px"
15 15 v-model="queryParams.receiveDate"
16 16 type="date"
17 17 value-format="yyyy-MM-dd"
... ... @@ -19,7 +19,7 @@
19 19 </el-date-picker>
20 20 </el-form-item>
21 21 <el-form-item label="审批状态" prop="status">
22   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
  22 + <el-select v-model="queryParams.status" placeholder="请选择审批状态" size="small">
23 23 <el-option label="审核中" value="0" />
24 24 <el-option label="审核完成" value="1" />
25 25 <el-option label="被驳回" value="2" />
... ... @@ -129,7 +129,7 @@
129 129 <el-input v-model="form.company" placeholder="请输入信访单位(人)" />
130 130 </el-form-item>
131 131 <el-form-item label="信访日期" prop="receiveDate">
132   - <el-date-picker clearable size="small" style="width: 100%"
  132 + <el-date-picker size="small" style="width: 100%"
133 133 v-model="form.receiveDate"
134 134 type="date"
135 135 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/h5/office/leaveApplication/index.vue
  View file @e16a9f2
... ... @@ -5,18 +5,18 @@
5 5 <el-input
6 6 v-model="queryParams.applicant"
7 7 placeholder="请输入申请人"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="申请部门" prop="deptId">
14   - <el-select v-model="queryParams.deptId" placeholder="请选择部门" clearable size="small">
  14 + <el-select v-model="queryParams.deptId" placeholder="请选择部门" size="small">
15 15 <el-option label="请选择字典生成" value=""/>
16 16 </el-select>
17 17 </el-form-item>
18 18 <el-form-item label="请假类型" prop="type">
19   - <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
  19 + <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
20 20 <el-option label="事假" value="事假"/>
21 21 <el-option label="病假" value="病假"/>
22 22 <el-option label="年假" value="年假"/>
... ... @@ -143,7 +143,7 @@
143 143 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
144 144  
145 145 <el-form-item label="联系方式" prop="phone">
146   - <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit clearable/>
  146 + <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit />
147 147 </el-form-item>
148 148  
149 149 <el-form-item label="请假类型" prop="type">
... ... @@ -164,7 +164,7 @@
164 164 </el-form-item>
165 165  
166 166 <el-form-item label="开始时间" prop="beginDate">
167   - <el-date-picker clearable size="small" style="width: 100%"
  167 + <el-date-picker size="small" style="width: 100%"
168 168 v-model="form.beginDate"
169 169 type="datetime"
170 170 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -172,7 +172,7 @@
172 172 </el-date-picker>
173 173 </el-form-item>
174 174 <el-form-item label="结束时间" prop="endDate">
175   - <el-date-picker clearable size="small" style="width: 100%"
  175 + <el-date-picker size="small" style="width: 100%"
176 176 v-model="form.endDate"
177 177 type="datetime"
178 178 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/leaveApplication/leaveApplicationInfo.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <el-form ref="form" :model="form" label-width="80px">
3 3  
4 4 <el-form-item label="联系方式" prop="phone">
5   - <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit clearable :disabled="true"/>
  5 + <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit :disabled="true"/>
6 6 </el-form-item>
7 7  
8 8 <el-form-item label="请假类型" prop="type">
... ... @@ -23,7 +23,7 @@
23 23 </el-form-item>
24 24  
25 25 <el-form-item label="开始时间" prop="beginDate">
26   - <el-date-picker clearable size="small" style="width: 100%"
  26 + <el-date-picker size="small" style="width: 100%"
27 27 v-model="form.beginDate"
28 28 type="datetime"
29 29 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -32,7 +32,7 @@
32 32 </el-date-picker>
33 33 </el-form-item>
34 34 <el-form-item label="结束时间" prop="endDate">
35   - <el-date-picker clearable size="small" style="width: 100%"
  35 + <el-date-picker size="small" style="width: 100%"
36 36 v-model="form.endDate"
37 37 type="datetime"
38 38 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/logistics/index.vue
  View file @e16a9f2
... ... @@ -8,7 +8,7 @@
8 8 </el-select>
9 9 </el-form-item>
10 10 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
11   - <el-select v-model="queryParams.sealType" placeholder="请选择用章类型" clearable size="small">
  11 + <el-select v-model="queryParams.sealType" placeholder="请选择用章类型" size="small">
12 12 <el-option label="党委用章" value="党委用章"/>
13 13 <el-option label="行政用章" value="行政用章"/>
14 14 <el-option label="工会用章" value="工会用章"/>
... ... @@ -18,13 +18,13 @@
18 18 <el-input
19 19 v-model="queryParams.staff"
20 20 placeholder="请输入申请人"
21   - clearable
  21 +
22 22 size="small"
23 23  
24 24 />
25 25 </el-form-item>
26 26 <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0">
27   - <el-date-picker clearable size="small" style="width: 200px"
  27 + <el-date-picker size="small" style="width: 200px"
28 28 v-model="queryParams.useDate"
29 29 type="date"
30 30 value-format="yyyy-MM-dd"
... ... @@ -35,7 +35,7 @@
35 35 <el-input
36 36 v-model="queryParams.goodsName"
37 37 placeholder="请输入物品名称"
38   - clearable
  38 +
39 39 size="small"
40 40  
41 41 />
... ... @@ -180,7 +180,7 @@
180 180 </el-select>
181 181 </el-form-item>
182 182 <el-form-item label="更新时间" prop="sealUpdateTime" v-if="type==0">
183   - <el-date-picker clearable size="small" style="width: 100%"
  183 + <el-date-picker size="small" style="width: 100%"
184 184 v-model="form.sealUpdateTime"
185 185 type="date"
186 186 value-format="yyyy-MM-dd"
... ... @@ -188,7 +188,7 @@
188 188 </el-date-picker>
189 189 </el-form-item>
190 190 <el-form-item label="结束时间" prop="sealEndTime" v-if="type==0">
191   - <el-date-picker clearable size="small" style="width: 100%"
  191 + <el-date-picker size="small" style="width: 100%"
192 192 v-model="form.sealEndTime"
193 193 type="date"
194 194 value-format="yyyy-MM-dd"
... ... @@ -202,7 +202,7 @@
202 202 <el-input v-model="form.staff" placeholder="请输入申请人"/>
203 203 </el-form-item>
204 204 <el-form-item label="申请日期" prop="useDate" v-if="type!=0">
205   - <el-date-picker clearable size="small" style="width: 100%"
  205 + <el-date-picker size="small" style="width: 100%"
206 206 v-model="form.useDate"
207 207 type="date"
208 208 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/h5/office/logistics/logisticsInfo.vue
  View file @e16a9f2
... ... @@ -13,7 +13,7 @@
13 13 </el-select>
14 14 </el-form-item>
15 15 <el-form-item label="更新时间" prop="sealUpdateTime" v-if="type==0">
16   - <el-date-picker clearable size="small" style="width: 100%"
  16 + <el-date-picker size="small" style="width: 100%"
17 17 v-model="form.sealUpdateTime"
18 18 type="date"
19 19 :disabled="true"
... ... @@ -22,7 +22,7 @@
22 22 </el-date-picker>
23 23 </el-form-item>
24 24 <el-form-item label="结束时间" prop="sealEndTime" v-if="type==0">
25   - <el-date-picker clearable size="small" style="width: 100%"
  25 + <el-date-picker size="small" style="width: 100%"
26 26 v-model="form.sealEndTime"
27 27 type="date"
28 28 value-format="yyyy-MM-dd"
... ... @@ -37,7 +37,7 @@
37 37 <el-input v-model="form.staff" placeholder="请输入申请人" :disabled="true"/>
38 38 </el-form-item>
39 39 <el-form-item label="申请日期" prop="useDate" v-if="type!=0">
40   - <el-date-picker clearable size="small" style="width: 100%"
  40 + <el-date-picker size="small" style="width: 100%"
41 41 v-model="form.useDate"
42 42 type="date"
43 43 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/h5/office/management/contractInfo.vue
  View file @e16a9f2
... ... @@ -27,7 +27,7 @@
27 27 <el-row :gutter="2">
28 28 <el-col :span="11">
29 29 <el-form-item label="开始时间" prop="contractBeginDate">
30   - <el-date-picker clearable size="small" style="width: 100%;"
  30 + <el-date-picker size="small" style="width: 100%;"
31 31 v-model="form.contractBeginDate"
32 32 type="datetime"
33 33 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -38,7 +38,7 @@
38 38 </el-col>
39 39 <el-col :span="11">
40 40 <el-form-item label="结束时间" prop="contractEndDate">
41   - <el-date-picker clearable size="small" style="width: 100%;"
  41 + <el-date-picker size="small" style="width: 100%;"
42 42 v-model="form.contractEndDate"
43 43 type="datetime"
44 44 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -72,7 +72,7 @@
72 72 <el-row :gutter="2">
73 73 <el-col :span="11">
74 74 <el-form-item label="合同签订时间" prop="signTime">
75   - <el-date-picker clearable size="small" style="width: 100%;"
  75 + <el-date-picker size="small" style="width: 100%;"
76 76 v-model="form.signTime"
77 77 type="datetime"
78 78 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/office/management/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.contractName"
7 7 placeholder="请输入合同名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -152,7 +152,7 @@
152 152 <el-row :gutter="2">
153 153 <el-col :span="11">
154 154 <el-form-item label="开始时间" prop="contractBeginDate">
155   - <el-date-picker clearable size="small" style="width: 100%;"
  155 + <el-date-picker size="small" style="width: 100%;"
156 156 v-model="form.contractBeginDate"
157 157 type="datetime"
158 158 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -162,7 +162,7 @@
162 162 </el-col>
163 163 <el-col :span="11">
164 164 <el-form-item label="结束时间" prop="contractEndDate">
165   - <el-date-picker clearable size="small" style="width: 100%;"
  165 + <el-date-picker size="small" style="width: 100%;"
166 166 v-model="form.contractEndDate"
167 167 type="datetime"
168 168 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -195,7 +195,7 @@
195 195 <el-row :gutter="2">
196 196 <el-col :span="11">
197 197 <el-form-item label="合同签订时间" prop="signTime">
198   - <el-date-picker clearable size="small" style="width: 100%;"
  198 + <el-date-picker size="small" style="width: 100%;"
199 199 v-model="form.signTime"
200 200 type="datetime"
201 201 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/h5/task/index.vue
  View file @e16a9f2
1 1 <template>
2 2 <div class="app-container">
3   - <el-select v-model="queryParams.dept" filterable clearable reserve-keyword @change="getList">
  3 + <el-select v-model="queryParams.dept" filterable reserve-keyword @change="getList">
4 4 <el-option v-for="item in depts" :label="item.name"
5 5 :value="item.code" :key="item.code" >
6 6 </el-option>
7 7 </el-select>
8   - <el-select v-model="queryParams.role" filterable clearable reserve-keyword @change="getList">
  8 + <el-select v-model="queryParams.role" filterable reserve-keyword @change="getList">
9 9 <el-option v-for="item in roles" :label="item.name"
10 10 :value="item.code" :key="item.code" >
11 11 </el-option>
... ...
trash-ui/src/views/h5/task/threestepInfo.vue
  View file @e16a9f2
... ... @@ -32,13 +32,13 @@
32 32  
33 33 <el-row>
34 34 <el-form-item label="消纳合同">
35   - <el-input v-model="infoData.contract" :maxlength="20" show-word-limit clearable disabled />
  35 + <el-input v-model="infoData.contract" :maxlength="20" show-word-limit disabled />
36 36 </el-form-item>
37 37  
38 38 </el-row>
39 39 <el-row>
40 40 <el-form-item label="自查时间">
41   - <el-input v-model="infoData.selfCheckTime" :maxlength="20" show-word-limit clearable disabled />
  41 + <el-input v-model="infoData.selfCheckTime" :maxlength="20" show-word-limit disabled />
42 42 </el-form-item>
43 43 </el-row>
44 44  
... ... @@ -57,12 +57,12 @@
57 57  
58 58 <el-row >
59 59 <el-form-item label="现场负责人">
60   - <el-input v-model="infoData.person" :maxlength="20" show-word-limit clearable disabled />
  60 + <el-input v-model="infoData.person" :maxlength="20" show-word-limit disabled />
61 61 </el-form-item>
62 62 </el-row>
63 63 <el-row >
64 64 <el-form-item label="联系电话">
65   - <el-input v-model="infoData.phone" :maxlength="11" show-word-limit clearable disabled />
  65 + <el-input v-model="infoData.phone" :maxlength="11" show-word-limit disabled />
66 66 </el-select>
67 67 </el-form-item>
68 68 </el-row>
... ... @@ -227,12 +227,12 @@
227 227 <el-col>
228 228 <el-form-item label="巡查时间">
229 229  
230   - <el-input v-model="infoData.checkTime" :maxlength="20" show-word-limit clearable disabled />
  230 + <el-input v-model="infoData.checkTime" :maxlength="20" show-word-limit disabled />
231 231 </el-form-item>
232 232 </el-col>
233 233 <el-col>
234 234 <el-form-item label="渣管负责人">
235   - <el-input v-model="infoData.earthPipPerson" :maxlength="20" show-word-limit clearable disabled />
  235 + <el-input v-model="infoData.earthPipPerson" :maxlength="20" show-word-limit disabled />
236 236 </el-form-item>
237 237 </el-col>
238 238 </el-row>
... ... @@ -241,7 +241,7 @@
241 241 <el-row type="flex" justify="center" v-if="infoData.checkTime">
242 242 <el-col>
243 243 <el-form-item label="执法负责人">
244   - <el-input v-model="infoData.enforcePerson" :maxlength="20" show-word-limit clearable disabled />
  244 + <el-input v-model="infoData.enforcePerson" :maxlength="20" show-word-limit disabled />
245 245 </el-form-item>
246 246 </el-col>
247 247 <el-col>
... ... @@ -420,7 +420,7 @@
420 420 <el-row type="flex" justify="center" v-if="infoData.checkEndTime">
421 421 <el-col>
422 422 <el-form-item label="抽查时间">
423   - <el-input v-model="infoData.checkEndTime" :maxlength="20" show-word-limit clearable disabled />
  423 + <el-input v-model="infoData.checkEndTime" :maxlength="20" show-word-limit disabled />
424 424 </el-form-item>
425 425 </el-col>
426 426 <el-col>
... ...
trash-ui/src/views/h5/truckActivate/index.vue
  View file @e16a9f2
... ... @@ -6,7 +6,7 @@
6 6 <el-input
7 7 v-model="queryParams.licensePlate"
8 8 placeholder="请输入车牌号搜索"
9   - clearable
  9 +
10 10 size="small"
11 11  
12 12 />
... ...
trash-ui/src/views/monitor/job/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.jobName"
7 7 placeholder="请输入任务名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="任务组名" prop="jobGroup">
14   - <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" clearable size="small">
  14 + <el-select v-model="queryParams.jobGroup" placeholder="请选择任务组名" size="small">
15 15 <el-option
16 16 v-for="dict in jobGroupOptions"
17 17 :key="dict.dictValue"
... ... @@ -21,7 +21,7 @@
21 21 </el-select>
22 22 </el-form-item>
23 23 <el-form-item label="任务状态" prop="status">
24   - <el-select v-model="queryParams.status" placeholder="请选择任务状态" clearable size="small">
  24 + <el-select v-model="queryParams.status" placeholder="请选择任务状态" size="small">
25 25 <el-option
26 26 v-for="dict in statusOptions"
27 27 :key="dict.dictValue"
... ...
trash-ui/src/views/monitor/job/log.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.jobName"
7 7 placeholder="请输入任务名称"
8   - clearable
  8 +
9 9 size="small"
10 10 style="width: 240px"
11 11  
... ... @@ -15,7 +15,7 @@
15 15 <el-select
16 16 v-model="queryParams.jobGroup"
17 17 placeholder="请任务组名"
18   - clearable
  18 +
19 19 size="small"
20 20 style="width: 240px"
21 21 >
... ... @@ -31,7 +31,7 @@
31 31 <el-select
32 32 v-model="queryParams.status"
33 33 placeholder="请选择执行状态"
34   - clearable
  34 +
35 35 size="small"
36 36 style="width: 240px"
37 37 >
... ...
trash-ui/src/views/monitor/logininfor/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.ipaddr"
7 7 placeholder="请输入登录地址"
8   - clearable
  8 +
9 9 style="width: 240px;"
10 10 size="small"
11 11  
... ... @@ -15,7 +15,7 @@
15 15 <el-input
16 16 v-model="queryParams.userName"
17 17 placeholder="请输入用户名称"
18   - clearable
  18 +
19 19 style="width: 240px;"
20 20 size="small"
21 21  
... ... @@ -25,7 +25,7 @@
25 25 <el-select
26 26 v-model="queryParams.status"
27 27 placeholder="登录状态"
28   - clearable
  28 +
29 29 size="small"
30 30 style="width: 240px"
31 31 >
... ...
trash-ui/src/views/monitor/online/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.ipaddr"
7 7 placeholder="请输入登录地址"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.userName"
16 16 placeholder="请输入用户名称"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
... ...
trash-ui/src/views/monitor/operlog/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.title"
7 7 placeholder="请输入系统模块"
8   - clearable
  8 +
9 9 style="width: 240px;"
10 10 size="small"
11 11  
... ... @@ -15,7 +15,7 @@
15 15 <el-input
16 16 v-model="queryParams.operName"
17 17 placeholder="请输入操作人员"
18   - clearable
  18 +
19 19 style="width: 240px;"
20 20 size="small"
21 21  
... ... @@ -25,7 +25,7 @@
25 25 <el-select
26 26 v-model="queryParams.businessType"
27 27 placeholder="操作类型"
28   - clearable
  28 +
29 29 size="small"
30 30 style="width: 240px"
31 31 >
... ... @@ -41,7 +41,7 @@
41 41 <el-select
42 42 v-model="queryParams.status"
43 43 placeholder="操作状态"
44   - clearable
  44 +
45 45 size="small"
46 46 style="width: 240px"
47 47 >
... ...
trash-ui/src/views/office/conference/conferenceInfo.vue
  View file @e16a9f2
... ... @@ -3,7 +3,7 @@
3 3 <el-row :gutter="2">
4 4 <el-col :span="11">
5 5 <el-form-item label="会议时间" prop="conferenceTime">
6   - <el-date-picker clearable size="small" style="width: 100%"
  6 + <el-date-picker size="small" style="width: 100%"
7 7 v-model="form.conferenceTime"
8 8 type="datetime"
9 9 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/conference/index.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4 <el-form-item label="会议时间" prop="conferenceTime">
5   - <el-date-picker clearable size="small" style="width: 200px"
  5 + <el-date-picker size="small" style="width: 200px"
6 6 v-model="queryParams.conferenceTime"
7 7 type="date"
8 8 value-format="yyyy-MM-dd"
... ... @@ -126,7 +126,7 @@
126 126 <el-row :gutter="2">
127 127 <el-col :span="11">
128 128 <el-form-item label="会议时间" prop="conferenceTime">
129   - <el-date-picker clearable size="small" style="width: 100%"
  129 + <el-date-picker size="small" style="width: 100%"
130 130 v-model="form.conferenceTime"
131 131 type="datetime"
132 132 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/handle/handleInfo.vue
  View file @e16a9f2
... ... @@ -14,7 +14,7 @@
14 14 <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true"/>
15 15 </el-form-item>
16 16 <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
17   - <el-date-picker clearable size="small" style="width: 100%"
  17 + <el-date-picker size="small" style="width: 100%"
18 18 v-model="form.receiveTime"
19 19 type="datetime"
20 20 :disabled="true"
... ... @@ -30,7 +30,7 @@
30 30 <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" :disabled="true"/>
31 31 </el-form-item>
32 32 <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
33   - <el-date-picker clearable size="small" style="width: 100%"
  33 + <el-date-picker size="small" style="width: 100%"
34 34 v-model="form.sendDate"
35 35 type="date"
36 36 :disabled="true"
... ...
trash-ui/src/views/office/handle/index.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="108px">
4 4 <el-form-item label="办文办事类型" prop="type">
5   - <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" clearable size="small">
  5 + <el-select v-model="queryParams.type" placeholder="请选择办文办事类型" size="small">
6 6 <el-option label="全部" value=""/>
7 7 <el-option label="传阅学习类" value="0" />
8 8 <el-option label="公文批办类" value="1" />
... ... @@ -15,13 +15,13 @@
15 15 <el-input
16 16 v-model="queryParams.company"
17 17 placeholder="请输入来文单位"
18   - clearable
  18 +
19 19 size="small"
20 20  
21 21 />
22 22 </el-form-item>
23 23 <el-form-item label="收文时间" prop="receiveTime">
24   - <el-date-picker clearable size="small" style="width: 200px"
  24 + <el-date-picker size="small" style="width: 200px"
25 25 v-model="queryParams.receiveTime"
26 26 type="date"
27 27 value-format="yyyy-MM-dd"
... ... @@ -32,7 +32,7 @@
32 32 <el-input
33 33 v-model="queryParams.title"
34 34 placeholder="请输入文件标题"
35   - clearable
  35 +
36 36 size="small"
37 37  
38 38 />
... ... @@ -41,13 +41,13 @@
41 41 <el-input
42 42 v-model="queryParams.sendPerson"
43 43 placeholder="请输入信访单位(人)"
44   - clearable
  44 +
45 45 size="small"
46 46  
47 47 />
48 48 </el-form-item>
49 49 <el-form-item label="信访日期" prop="sendDate">
50   - <el-date-picker clearable size="small" style="width: 200px"
  50 + <el-date-picker size="small" style="width: 200px"
51 51 v-model="queryParams.sendDate"
52 52 type="date"
53 53 value-format="yyyy-MM-dd"
... ... @@ -181,7 +181,7 @@
181 181 <el-input v-model="form.company" placeholder="请输入来文单位" />
182 182 </el-form-item>
183 183 <el-form-item label="收文时间" prop="receiveTime" v-if="form.type==0 || form.type==1">
184   - <el-date-picker clearable size="small" style="width: 100%"
  184 + <el-date-picker size="small" style="width: 100%"
185 185 v-model="form.receiveTime"
186 186 type="datetime"
187 187 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -196,7 +196,7 @@
196 196 <el-input v-model="form.sendPerson" placeholder="请输入信访单位(人)" />
197 197 </el-form-item>
198 198 <el-form-item label="信访日期" prop="sendDate" v-if="form.type==2 || form.type==3|| form.type==4">
199   - <el-date-picker clearable size="small" style="width: 100%"
  199 + <el-date-picker size="small" style="width: 100%"
200 200 v-model="form.sendDate"
201 201 type="date"
202 202 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/office/handleAffairsCommon/handleAffairsCommonInfo.vue
  View file @e16a9f2
... ... @@ -4,7 +4,7 @@
4 4 <el-input v-model="form.company" placeholder="请输入来文单位" :disabled="true"/>
5 5 </el-form-item>
6 6 <el-form-item label="收文时间" prop="receiveTime">
7   - <el-date-picker clearable size="small" style="width: 100%"
  7 + <el-date-picker size="small" style="width: 100%"
8 8 v-model="form.receiveTime"
9 9 type="datetime"
10 10 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/handleAffairsCommon/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.company"
7 7 placeholder="请输入来文单位"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="收文时间" prop="receiveTime">
14   - <el-date-picker clearable size="small" style="width: 200px"
  14 + <el-date-picker size="small" style="width: 200px"
15 15 v-model="queryParams.receiveTime"
16 16 type="date"
17 17 value-format="yyyy-MM-dd"
... ... @@ -19,7 +19,7 @@
19 19 </el-date-picker>
20 20 </el-form-item>
21 21 <el-form-item label="审批状态" prop="status">
22   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
  22 + <el-select v-model="queryParams.status" placeholder="请选择审批状态" size="small">
23 23 <el-option label="审核中" value="0" />
24 24 <el-option label="审核完成" value="1" />
25 25 <el-option label="被驳回" value="2" />
... ... @@ -129,7 +129,7 @@
129 129 <el-input v-model="form.company" placeholder="请输入来文单位" />
130 130 </el-form-item>
131 131 <el-form-item label="收文时间" prop="receiveTime">
132   - <el-date-picker clearable size="small" style="width: 100%"
  132 + <el-date-picker size="small" style="width: 100%"
133 133 v-model="form.receiveTime"
134 134 type="datetime"
135 135 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/handleAffairsXF/handleAffairsXFInfo.vue
  View file @e16a9f2
... ... @@ -4,7 +4,7 @@
4 4 <el-input v-model="form.company" placeholder="请输入信访单位(人)" :disabled="true"/>
5 5 </el-form-item>
6 6 <el-form-item label="信访日期" prop="receiveDate">
7   - <el-date-picker clearable size="small" style="width: 100%"
  7 + <el-date-picker size="small" style="width: 100%"
8 8 v-model="form.receiveDate"
9 9 type="date"
10 10 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/office/handleAffairsXF/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.company"
7 7 placeholder="请输入信访单位(人)"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="信访日期" prop="receiveDate">
14   - <el-date-picker clearable size="small" style="width: 200px"
  14 + <el-date-picker size="small" style="width: 200px"
15 15 v-model="queryParams.receiveDate"
16 16 type="date"
17 17 value-format="yyyy-MM-dd"
... ... @@ -19,7 +19,7 @@
19 19 </el-date-picker>
20 20 </el-form-item>
21 21 <el-form-item label="审批状态" prop="status">
22   - <el-select v-model="queryParams.status" placeholder="请选择审批状态" clearable size="small">
  22 + <el-select v-model="queryParams.status" placeholder="请选择审批状态" size="small">
23 23 <el-option label="审核中" value="0" />
24 24 <el-option label="审核完成" value="1" />
25 25 <el-option label="被驳回" value="2" />
... ... @@ -129,7 +129,7 @@
129 129 <el-input v-model="form.company" placeholder="请输入信访单位(人)" />
130 130 </el-form-item>
131 131 <el-form-item label="信访日期" prop="receiveDate">
132   - <el-date-picker clearable size="small" style="width: 100%"
  132 + <el-date-picker size="small" style="width: 100%"
133 133 v-model="form.receiveDate"
134 134 type="date"
135 135 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/office/leaveApplication/index.vue
  View file @e16a9f2
... ... @@ -5,19 +5,19 @@
5 5 <el-input
6 6 v-model="queryParams.applicant"
7 7 placeholder="请输入申请人"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <!-- <el-form-item label="申请部门" prop="deptName">-->
14   -<!-- <el-select v-model="queryParams.deptName" placeholder="请选择部门" clearable size="small">-->
  14 +<!-- <el-select v-model="queryParams.deptName" placeholder="请选择部门" size="small">-->
15 15 <!-- <el-option label="全部" value=""/>-->
16 16 <!-- <el-option v-for="item in depts" :label="item.name" :value="item.name" :key="item.code"/>-->
17 17 <!-- </el-select>-->
18 18 <!-- </el-form-item>-->
19 19 <el-form-item label="请假类型" prop="type">
20   - <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
  20 + <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
21 21 <el-option label="事假" value="事假"/>
22 22 <el-option label="病假" value="病假"/>
23 23 <el-option label="年假" value="年假"/>
... ... @@ -145,7 +145,7 @@
145 145 <el-form ref="form" :model="form" :rules="rules" label-width="80px">
146 146  
147 147 <el-form-item label="联系方式" prop="phone">
148   - <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit clearable/>
  148 + <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit />
149 149 </el-form-item>
150 150  
151 151 <el-form-item label="请假类型" prop="type">
... ... @@ -166,7 +166,7 @@
166 166 </el-form-item>
167 167  
168 168 <el-form-item label="开始时间" prop="beginDate">
169   - <el-date-picker clearable size="small" style="width: 100%"
  169 + <el-date-picker size="small" style="width: 100%"
170 170 v-model="form.beginDate"
171 171 type="datetime"
172 172 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -174,7 +174,7 @@
174 174 </el-date-picker>
175 175 </el-form-item>
176 176 <el-form-item label="结束时间" prop="endDate">
177   - <el-date-picker clearable size="small" style="width: 100%"
  177 + <el-date-picker size="small" style="width: 100%"
178 178 v-model="form.endDate"
179 179 type="datetime"
180 180 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/leaveApplication/leaveApplicationInfo.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <el-form ref="form" :model="form" label-width="80px">
3 3  
4 4 <el-form-item label="联系方式" prop="phone">
5   - <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit clearable :disabled="true"/>
  5 + <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit :disabled="true"/>
6 6 </el-form-item>
7 7  
8 8 <el-form-item label="请假类型" prop="type">
... ... @@ -23,7 +23,7 @@
23 23 </el-form-item>
24 24  
25 25 <el-form-item label="开始时间" prop="beginDate">
26   - <el-date-picker clearable size="small" style="width: 100%"
  26 + <el-date-picker size="small" style="width: 100%"
27 27 v-model="form.beginDate"
28 28 type="datetime"
29 29 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -32,7 +32,7 @@
32 32 </el-date-picker>
33 33 </el-form-item>
34 34 <el-form-item label="结束时间" prop="endDate">
35   - <el-date-picker clearable size="small" style="width: 100%"
  35 + <el-date-picker size="small" style="width: 100%"
36 36 v-model="form.endDate"
37 37 type="datetime"
38 38 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/logistics/index.vue
  View file @e16a9f2
... ... @@ -8,7 +8,7 @@
8 8 </el-select>
9 9 </el-form-item>
10 10 <el-form-item label="用章类型" prop="sealType" v-if="type==0">
11   - <el-select v-model="queryParams.sealType" placeholder="请选择用章类型" clearable size="small">
  11 + <el-select v-model="queryParams.sealType" placeholder="请选择用章类型" size="small">
12 12 <el-option label="党委用章" value="党委用章"/>
13 13 <el-option label="行政用章" value="行政用章"/>
14 14 <el-option label="工会用章" value="工会用章"/>
... ... @@ -18,13 +18,13 @@
18 18 <el-input
19 19 v-model="queryParams.staff"
20 20 placeholder="请输入申请人"
21   - clearable
  21 +
22 22 size="small"
23 23  
24 24 />
25 25 </el-form-item>
26 26 <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0">
27   - <el-date-picker clearable size="small" style="width: 200px"
  27 + <el-date-picker size="small" style="width: 200px"
28 28 v-model="queryParams.useDate"
29 29 type="date"
30 30 value-format="yyyy-MM-dd"
... ... @@ -35,7 +35,7 @@
35 35 <el-input
36 36 v-model="queryParams.goodsName"
37 37 placeholder="请输入物品名称"
38   - clearable
  38 +
39 39 size="small"
40 40  
41 41 />
... ... @@ -176,7 +176,7 @@
176 176 </el-select>
177 177 </el-form-item>
178 178 <el-form-item label="更新时间" prop="sealUpdateTime" v-if="type==0">
179   - <el-date-picker clearable size="small" style="width: 100%"
  179 + <el-date-picker size="small" style="width: 100%"
180 180 v-model="form.sealUpdateTime"
181 181 type="date"
182 182 value-format="yyyy-MM-dd"
... ... @@ -184,7 +184,7 @@
184 184 </el-date-picker>
185 185 </el-form-item>
186 186 <el-form-item label="结束时间" prop="sealEndTime" v-if="type==0">
187   - <el-date-picker clearable size="small" style="width: 100%"
  187 + <el-date-picker size="small" style="width: 100%"
188 188 v-model="form.sealEndTime"
189 189 type="date"
190 190 value-format="yyyy-MM-dd"
... ... @@ -198,7 +198,7 @@
198 198 <el-input v-model="form.staff" placeholder="请输入申请人"/>
199 199 </el-form-item>
200 200 <el-form-item label="申请日期" prop="useDate" v-if="type!=0">
201   - <el-date-picker clearable size="small" style="width: 100%"
  201 + <el-date-picker size="small" style="width: 100%"
202 202 v-model="form.useDate"
203 203 type="date"
204 204 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/office/logistics/logisticsInfo.vue
  View file @e16a9f2
... ... @@ -13,7 +13,7 @@
13 13 </el-select>
14 14 </el-form-item>
15 15 <el-form-item label="更新时间" prop="sealUpdateTime" v-if="type==0">
16   - <el-date-picker clearable size="small" style="width: 100%"
  16 + <el-date-picker size="small" style="width: 100%"
17 17 v-model="form.sealUpdateTime"
18 18 type="date"
19 19 :disabled="true"
... ... @@ -22,7 +22,7 @@
22 22 </el-date-picker>
23 23 </el-form-item>
24 24 <el-form-item label="结束时间" prop="sealEndTime" v-if="type==0">
25   - <el-date-picker clearable size="small" style="width: 100%"
  25 + <el-date-picker size="small" style="width: 100%"
26 26 v-model="form.sealEndTime"
27 27 type="date"
28 28 value-format="yyyy-MM-dd"
... ... @@ -37,7 +37,7 @@
37 37 <el-input v-model="form.staff" placeholder="请输入申请人" :disabled="true"/>
38 38 </el-form-item>
39 39 <el-form-item label="申请日期" prop="useDate" v-if="type!=0">
40   - <el-date-picker clearable size="small" style="width: 100%"
  40 + <el-date-picker size="small" style="width: 100%"
41 41 v-model="form.useDate"
42 42 type="date"
43 43 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/office/management/contractInfo.vue
  View file @e16a9f2
... ... @@ -27,7 +27,7 @@
27 27 <el-row :gutter="2">
28 28 <el-col :span="11">
29 29 <el-form-item label="开始时间" prop="contractBeginDate">
30   - <el-date-picker clearable size="small" style="width: 100%;"
  30 + <el-date-picker size="small" style="width: 100%;"
31 31 v-model="form.contractBeginDate"
32 32 type="datetime"
33 33 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -38,7 +38,7 @@
38 38 </el-col>
39 39 <el-col :span="11">
40 40 <el-form-item label="结束时间" prop="contractEndDate">
41   - <el-date-picker clearable size="small" style="width: 100%;"
  41 + <el-date-picker size="small" style="width: 100%;"
42 42 v-model="form.contractEndDate"
43 43 type="datetime"
44 44 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -72,7 +72,7 @@
72 72 <el-row :gutter="2">
73 73 <el-col :span="11">
74 74 <el-form-item label="合同签订时间" prop="signTime">
75   - <el-date-picker clearable size="small" style="width: 100%;"
  75 + <el-date-picker size="small" style="width: 100%;"
76 76 v-model="form.signTime"
77 77 type="datetime"
78 78 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/office/management/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.contractName"
7 7 placeholder="请输入合同名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -152,7 +152,7 @@
152 152 <el-row :gutter="2">
153 153 <el-col :span="11">
154 154 <el-form-item label="开始时间" prop="contractBeginDate">
155   - <el-date-picker clearable size="small" style="width: 100%;"
  155 + <el-date-picker size="small" style="width: 100%;"
156 156 v-model="form.contractBeginDate"
157 157 type="datetime"
158 158 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -162,7 +162,7 @@
162 162 </el-col>
163 163 <el-col :span="11">
164 164 <el-form-item label="结束时间" prop="contractEndDate">
165   - <el-date-picker clearable size="small" style="width: 100%;"
  165 + <el-date-picker size="small" style="width: 100%;"
166 166 v-model="form.contractEndDate"
167 167 type="datetime"
168 168 value-format="yyyy-MM-dd HH:mm:ss"
... ... @@ -195,7 +195,7 @@
195 195 <el-row :gutter="2">
196 196 <el-col :span="11">
197 197 <el-form-item label="合同签订时间" prop="signTime">
198   - <el-date-picker clearable size="small" style="width: 100%;"
  198 + <el-date-picker size="small" style="width: 100%;"
199 199 v-model="form.signTime"
200 200 type="datetime"
201 201 value-format="yyyy-MM-dd HH:mm:ss"
... ...
trash-ui/src/views/other/projectCheck/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.name"
7 7 placeholder="请输入工程名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="检查时间" prop="checkTime">
14   - <el-date-picker clearable size="small" style="width: 200px"
  14 + <el-date-picker size="small" style="width: 200px"
15 15 v-model="queryParams.checkTime"
16 16 type="date"
17 17 value-format="yyyy-MM-dd"
... ... @@ -19,7 +19,7 @@
19 19 </el-date-picker>
20 20 </el-form-item>
21 21 <el-form-item label="所属区域" prop="projectType">
22   - <el-select disabled v-model="queryParams.place" placeholder="请选择所属区域" clearable size="small">
  22 + <el-select disabled v-model="queryParams.place" placeholder="请选择所属区域" size="small">
23 23 <el-option v-for="item in areas" :label="item.name" :value="item.code" :key="item.code" />
24 24 </el-select>
25 25 </el-form-item>
... ... @@ -111,7 +111,7 @@
111 111 <el-row>
112 112 <el-col :span="12">
113 113 <el-form-item label="工程名称" prop="name">
114   - <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable clearable reserve-keyword>
  114 + <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable reserve-keyword>
115 115 <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :key="item.id" @click.native="form.place = item.areaCode;">
116 116 </el-option>
117 117 </el-select>
... ... @@ -127,7 +127,7 @@
127 127 <el-row>
128 128 <el-col :span="12">
129 129 <el-form-item label="工程期限" prop="timeLimit">
130   - <el-date-picker clearable size="small" style="width: 200px"
  130 + <el-date-picker size="small" style="width: 200px"
131 131 v-model="form.timeLimit"
132 132 type="date"
133 133 value-format="yyyy-MM-dd"
... ... @@ -137,7 +137,7 @@
137 137 </el-col>
138 138 <el-col :span="12">
139 139 <el-form-item label="检查时间" prop="checkTime">
140   - <el-date-picker clearable size="small" style="width: 200px"
  140 + <el-date-picker size="small" style="width: 200px"
141 141 v-model="form.checkTime"
142 142 type="date"
143 143 value-format="yyyy-MM-dd"
... ... @@ -448,7 +448,7 @@
448 448 <el-row>
449 449 <el-col :span="12">
450 450 <el-form-item label="工程名称" prop="name">
451   - <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable clearable reserve-keyword>
  451 + <el-select disabled v-model="form.name" placeholder="请选择所属区域" filterable reserve-keyword>
452 452 <el-option v-for="item in data[form.type]" :label="item.name" :value="item.name" :key="item.id" @click.native="form.place = item.areaCode;">
453 453 </el-option>
454 454 </el-select>
... ... @@ -464,7 +464,7 @@
464 464 <el-row>
465 465 <el-col :span="12">
466 466 <el-form-item label="工程期限" prop="timeLimit">
467   - <el-date-picker clearable size="small" style="width: 200px"
  467 + <el-date-picker size="small" style="width: 200px"
468 468 v-model="form.timeLimit"
469 469 type="date"
470 470 value-format="yyyy-MM-dd"
... ... @@ -474,7 +474,7 @@
474 474 </el-col>
475 475 <el-col :span="12">
476 476 <el-form-item label="检查时间" prop="checkTime">
477   - <el-date-picker clearable size="small" style="width: 200px"
  477 + <el-date-picker size="small" style="width: 200px"
478 478 v-model="form.checkTime"
479 479 type="date"
480 480 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/otherData/otherData/index.vue
  View file @e16a9f2
... ... @@ -9,7 +9,7 @@
9 9 </el-select>
10 10 </el-form-item>
11 11 <el-form-item label="填报日期" prop="time">
12   - <el-date-picker clearable size="small" style="width: 200px"
  12 + <el-date-picker size="small" style="width: 200px"
13 13 v-model="queryParams.time"
14 14 type="date"
15 15 value-format="yyyy-MM-dd"
... ... @@ -91,7 +91,7 @@
91 91 <el-input v-model="form.context" placeholder="请输入资料内容" type="textarea"/>
92 92 </el-form-item>
93 93 <el-form-item label="填报日期" prop="time">
94   - <el-date-picker clearable size="small" style="width: 200px"
  94 + <el-date-picker size="small" style="width: 200px"
95 95 v-model="form.time"
96 96 type="date"
97 97 value-format="yyyy-MM-dd"
... ... @@ -130,7 +130,7 @@
130 130 <el-input v-model="form.context" placeholder="请输入资料内容" type="textarea" disabled/>
131 131 </el-form-item>
132 132 <el-form-item label="填报日期" prop="time">
133   - <el-date-picker clearable size="small" style="width: 200px" disabled
  133 + <el-date-picker size="small" style="width: 200px" disabled
134 134 v-model="form.time"
135 135 type="date"
136 136 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/sign/sign/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.objectId"
7 7 placeholder="请输入基础数据ID"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.workflowId"
16 16 placeholder="请输入businessKey预留"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
... ...
trash-ui/src/views/system/config/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.configName"
7 7 placeholder="请输入参数名称"
8   - clearable
  8 +
9 9 size="small"
10 10 style="width: 240px"
11 11  
... ... @@ -15,14 +15,14 @@
15 15 <el-input
16 16 v-model="queryParams.configKey"
17 17 placeholder="请输入参数键名"
18   - clearable
  18 +
19 19 size="small"
20 20 style="width: 240px"
21 21  
22 22 />
23 23 </el-form-item>
24 24 <el-form-item label="系统内置" prop="configType">
25   - <el-select v-model="queryParams.configType" placeholder="系统内置" clearable size="small">
  25 + <el-select v-model="queryParams.configType" placeholder="系统内置" size="small">
26 26 <el-option
27 27 v-for="dict in typeOptions"
28 28 :key="dict.dictValue"
... ...
trash-ui/src/views/system/dept/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.deptName"
7 7 placeholder="请输入部门名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="状态" prop="status">
14   - <el-select v-model="queryParams.status" placeholder="部门状态" clearable size="small">
  14 + <el-select v-model="queryParams.status" placeholder="部门状态" size="small">
15 15 <el-option
16 16 v-for="dict in statusOptions"
17 17 :key="dict.dictValue"
... ...
trash-ui/src/views/system/dict/data.vue
  View file @e16a9f2
... ... @@ -15,13 +15,13 @@
15 15 <el-input
16 16 v-model="queryParams.dictLabel"
17 17 placeholder="请输入字典标签"
18   - clearable
  18 +
19 19 size="small"
20 20  
21 21 />
22 22 </el-form-item>
23 23 <el-form-item label="状态" prop="status">
24   - <el-select v-model="queryParams.status" placeholder="数据状态" clearable size="small">
  24 + <el-select v-model="queryParams.status" placeholder="数据状态" size="small">
25 25 <el-option
26 26 v-for="dict in statusOptions"
27 27 :key="dict.dictValue"
... ...
trash-ui/src/views/system/dict/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.dictName"
7 7 placeholder="请输入字典名称"
8   - clearable
  8 +
9 9 size="small"
10 10 style="width: 240px"
11 11  
... ... @@ -15,7 +15,7 @@
15 15 <el-input
16 16 v-model="queryParams.dictType"
17 17 placeholder="请输入字典类型"
18   - clearable
  18 +
19 19 size="small"
20 20 style="width: 240px"
21 21  
... ... @@ -25,7 +25,7 @@
25 25 <el-select
26 26 v-model="queryParams.status"
27 27 placeholder="字典状态"
28   - clearable
  28 +
29 29 size="small"
30 30 style="width: 240px"
31 31 >
... ...
trash-ui/src/views/system/menu/index.vue
  View file @e16a9f2
... ... @@ -5,13 +5,13 @@
5 5 <el-input
6 6 v-model="queryParams.menuName"
7 7 placeholder="请输入菜单名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
12 12 </el-form-item>
13 13 <el-form-item label="状态" prop="status">
14   - <el-select v-model="queryParams.status" placeholder="菜单状态" clearable size="small">
  14 + <el-select v-model="queryParams.status" placeholder="菜单状态" size="small">
15 15 <el-option
16 16 v-for="dict in statusOptions"
17 17 :key="dict.dictValue"
... ...
trash-ui/src/views/system/notice/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.noticeTitle"
7 7 placeholder="请输入公告标题"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,13 +14,13 @@
14 14 <el-input
15 15 v-model="queryParams.createBy"
16 16 placeholder="请输入操作人员"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
21 21 </el-form-item>
22 22 <el-form-item label="类型" prop="noticeType">
23   - <el-select v-model="queryParams.noticeType" placeholder="公告类型" clearable size="small">
  23 + <el-select v-model="queryParams.noticeType" placeholder="公告类型" size="small">
24 24 <el-option
25 25 v-for="dict in typeOptions"
26 26 :key="dict.dictValue"
... ...
trash-ui/src/views/system/post/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.postCode"
7 7 placeholder="请输入岗位编码"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,13 +14,13 @@
14 14 <el-input
15 15 v-model="queryParams.postName"
16 16 placeholder="请输入岗位名称"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
21 21 </el-form-item>
22 22 <el-form-item label="状态" prop="status">
23   - <el-select v-model="queryParams.status" placeholder="岗位状态" clearable size="small">
  23 + <el-select v-model="queryParams.status" placeholder="岗位状态" size="small">
24 24 <el-option
25 25 v-for="dict in statusOptions"
26 26 :key="dict.dictValue"
... ...
trash-ui/src/views/system/role/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.roleName"
7 7 placeholder="请输入角色名称"
8   - clearable
  8 +
9 9 size="small"
10 10 style="width: 240px"
11 11  
... ... @@ -15,7 +15,7 @@
15 15 <el-input
16 16 v-model="queryParams.roleKey"
17 17 placeholder="请输入权限字符"
18   - clearable
  18 +
19 19 size="small"
20 20 style="width: 240px"
21 21  
... ... @@ -25,7 +25,7 @@
25 25 <el-select
26 26 v-model="queryParams.status"
27 27 placeholder="角色状态"
28   - clearable
  28 +
29 29 size="small"
30 30 style="width: 240px"
31 31 >
... ...
trash-ui/src/views/system/user/index.vue
  View file @e16a9f2
... ... @@ -7,7 +7,7 @@
7 7 <el-input
8 8 v-model="deptName"
9 9 placeholder="请输入部门名称"
10   - clearable
  10 +
11 11 size="small"
12 12 prefix-icon="el-icon-search"
13 13 style="margin-bottom: 20px"
... ... @@ -32,7 +32,7 @@
32 32 <el-input
33 33 v-model="queryParams.userName"
34 34 placeholder="请输入用户名称"
35   - clearable
  35 +
36 36 size="small"
37 37 style="width: 240px"
38 38  
... ... @@ -42,7 +42,7 @@
42 42 <el-input
43 43 v-model="queryParams.phonenumber"
44 44 placeholder="请输入手机号码"
45   - clearable
  45 +
46 46 size="small"
47 47 style="width: 240px"
48 48  
... ... @@ -52,7 +52,7 @@
52 52 <el-select
53 53 v-model="queryParams.status"
54 54 placeholder="用户状态"
55   - clearable
  55 +
56 56 size="small"
57 57 style="width: 240px"
58 58 >
... ...
trash-ui/src/views/tool/build/CodeTypeDialog.vue
  View file @e16a9f2
... ... @@ -31,7 +31,7 @@
31 31 </el-radio-group>
32 32 </el-form-item>
33 33 <el-form-item v-if="showFileName" label="文件名" prop="fileName">
34   - <el-input v-model="formData.fileName" placeholder="请输入文件名" clearable />
  34 + <el-input v-model="formData.fileName" placeholder="请输入文件名" />
35 35 </el-form-item>
36 36 </el-col>
37 37 </el-form>
... ...
trash-ui/src/views/tool/build/IconsDialog.vue
  View file @e16a9f2
... ... @@ -16,7 +16,7 @@
16 16 :style="{width: '260px'}"
17 17 placeholder="请输入图标名称"
18 18 prefix-icon="el-icon-search"
19   - clearable
  19 +
20 20 />
21 21 </div>
22 22 <ul class="icon-ul">
... ...
trash-ui/src/views/tool/build/RightPanel.vue
  View file @e16a9f2
... ... @@ -82,7 +82,7 @@
82 82 <el-input v-model.number="activeData.labelWidth" type="number" placeholder="请输入标签宽度" />
83 83 </el-form-item>
84 84 <el-form-item v-if="activeData.style&&activeData.style.width!==undefined" label="组件宽度">
85   - <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" clearable />
  85 + <el-input v-model="activeData.style.width" placeholder="请输入组件宽度" />
86 86 </el-form-item>
87 87 <el-form-item v-if="activeData.vModel!==undefined" label="默认值">
88 88 <el-input
... ... @@ -211,7 +211,7 @@
211 211 v-model="activeData.accept"
212 212 placeholder="请选择文件类型"
213 213 :style="{ width: '100%' }"
214   - clearable
  214 +
215 215 >
216 216 <el-option label="图片" value="image/*" />
217 217 <el-option label="视频" value="video/*" />
... ... @@ -232,7 +232,7 @@
232 232 </el-input>
233 233 </el-form-item>
234 234 <el-form-item v-if="activeData.action !== undefined" label="上传地址">
235   - <el-input v-model="activeData.action" placeholder="请输入上传地址" clearable />
  235 + <el-input v-model="activeData.action" placeholder="请输入上传地址" />
236 236 </el-form-item>
237 237 <el-form-item v-if="activeData['list-type'] !== undefined" label="列表类型">
238 238 <el-radio-group v-model="activeData['list-type']" size="small">
... ... @@ -440,9 +440,6 @@
440 440 <el-form-item v-if="activeData.tag === 'el-cascader'" label="可否筛选">
441 441 <el-switch v-model="activeData.filterable" />
442 442 </el-form-item>
443   - <el-form-item v-if="activeData.clearable !== undefined" label="能否清空">
444   - <el-switch v-model="activeData.clearable" />
445   - </el-form-item>
446 443 <el-form-item v-if="activeData.showTip !== undefined" label="显示提示">
447 444 <el-switch v-model="activeData.showTip" />
448 445 </el-form-item>
... ...
trash-ui/src/views/tool/build/TreeNodeDialog.vue
  View file @e16a9f2
... ... @@ -24,7 +24,7 @@
24 24 <el-input
25 25 v-model="formData.label"
26 26 placeholder="请输入选项名"
27   - clearable
  27 +
28 28 />
29 29 </el-form-item>
30 30 </el-col>
... ... @@ -36,7 +36,7 @@
36 36 <el-input
37 37 v-model="formData.value"
38 38 placeholder="请输入选项值"
39   - clearable
  39 +
40 40 >
41 41 <el-select
42 42 slot="append"
... ...
trash-ui/src/views/tool/gen/editTable.vue
  View file @e16a9f2
... ... @@ -96,7 +96,7 @@
96 96 </el-table-column>
97 97 <el-table-column label="字典类型" min-width="12%">
98 98 <template slot-scope="scope">
99   - <el-select v-model="scope.row.dictType" clearable filterable placeholder="请选择">
  99 + <el-select v-model="scope.row.dictType" filterable placeholder="请选择">
100 100 <el-option
101 101 v-for="dict in dictOptions"
102 102 :key="dict.dictType"
... ...
trash-ui/src/views/tool/gen/importTable.vue
  View file @e16a9f2
... ... @@ -6,7 +6,7 @@
6 6 <el-input
7 7 v-model="queryParams.tableName"
8 8 placeholder="请输入表名称"
9   - clearable
  9 +
10 10 size="small"
11 11  
12 12 />
... ... @@ -15,7 +15,7 @@
15 15 <el-input
16 16 v-model="queryParams.tableComment"
17 17 placeholder="请输入表描述"
18   - clearable
  18 +
19 19 size="small"
20 20  
21 21 />
... ...
trash-ui/src/views/tool/gen/index.vue
  View file @e16a9f2
... ... @@ -5,7 +5,7 @@
5 5 <el-input
6 6 v-model="queryParams.tableName"
7 7 placeholder="请输入表名称"
8   - clearable
  8 +
9 9 size="small"
10 10  
11 11 />
... ... @@ -14,7 +14,7 @@
14 14 <el-input
15 15 v-model="queryParams.tableComment"
16 16 placeholder="请输入表描述"
17   - clearable
  17 +
18 18 size="small"
19 19  
20 20 />
... ...
trash-ui/src/views/workflow/index.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4 <el-form-item label="请假类型" prop="type">
5   - <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
  5 + <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
6 6 <el-option
7 7 v-for="dict in typeOptions"
8 8 :key="dict.dictValue"
... ... @@ -15,13 +15,13 @@
15 15 <el-input
16 16 v-model="queryParams.title"
17 17 placeholder="请输入标题"
18   - clearable
  18 +
19 19 size="small"
20 20  
21 21 />
22 22 </el-form-item>
23 23 <!-- <el-form-item label="开始时间" prop="leaveStartTime">-->
24   - <!-- <el-date-picker clearable size="small" style="width: 200px"-->
  24 + <!-- <el-date-picker size="small" style="width: 200px"-->
25 25 <!-- v-model="queryParams.leaveStartTime"-->
26 26 <!-- type="date"-->
27 27 <!-- value-format="yyyy-MM-dd"-->
... ... @@ -29,7 +29,7 @@
29 29 <!-- </el-date-picker>-->
30 30 <!-- </el-form-item>-->
31 31 <!-- <el-form-item label="结束时间" prop="leaveEndTime">-->
32   - <!-- <el-date-picker clearable size="small" style="width: 200px"-->
  32 + <!-- <el-date-picker size="small" style="width: 200px"-->
33 33 <!-- v-model="queryParams.leaveEndTime"-->
34 34 <!-- type="date"-->
35 35 <!-- value-format="yyyy-MM-dd"-->
... ... @@ -38,7 +38,7 @@
38 38 <!-- </el-form-item>-->
39 39  
40 40 <el-form-item label="状态" prop="state">
41   - <el-select v-model="queryParams.state" placeholder="请选择状态" clearable size="small">
  41 + <el-select v-model="queryParams.state" placeholder="请选择状态" size="small">
42 42 <el-option
43 43 v-for="dict in stateOptions"
44 44 :key="dict.dictValue"
... ... @@ -48,7 +48,7 @@
48 48 </el-select>
49 49 </el-form-item>
50 50 <!-- <el-form-item label="创建者" prop="createBy">-->
51   - <!-- <el-select v-model="queryParams.createBy" placeholder="请选择创建者" clearable size="small">-->
  51 + <!-- <el-select v-model="queryParams.createBy" placeholder="请选择创建者" size="small">-->
52 52 <!-- <el-option label="请选择字典生成" value="" />-->
53 53 <!-- </el-select>-->
54 54 <!-- </el-form-item>-->
... ... @@ -204,7 +204,7 @@
204 204 <el-input v-model="form.reason" type="textarea" placeholder="请输入内容"/>
205 205 </el-form-item>
206 206 <el-form-item label="开始时间" prop="leaveStartTime">
207   - <el-date-picker clearable size="small" style="width: 200px"
  207 + <el-date-picker size="small" style="width: 200px"
208 208 v-model="form.leaveStartTime"
209 209 type="date"
210 210 value-format="yyyy-MM-dd"
... ... @@ -212,7 +212,7 @@
212 212 </el-date-picker>
213 213 </el-form-item>
214 214 <el-form-item label="结束时间" prop="leaveEndTime">
215   - <el-date-picker clearable size="small" style="width: 200px"
  215 + <el-date-picker size="small" style="width: 200px"
216 216 v-model="form.leaveEndTime"
217 217 type="date"
218 218 value-format="yyyy-MM-dd"
... ...
trash-ui/src/views/workflow/leaveAll.vue
  View file @e16a9f2
... ... @@ -2,7 +2,7 @@
2 2 <div class="app-container">
3 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
4 4 <el-form-item label="请假类型" prop="type">
5   - <el-select v-model="queryParams.type" placeholder="请选择请假类型" clearable size="small">
  5 + <el-select v-model="queryParams.type" placeholder="请选择请假类型" size="small">
6 6 <el-option
7 7 v-for="dict in typeOptions"
8 8 :key="dict.dictValue"
... ... @@ -15,13 +15,13 @@
15 15 <el-input
16 16 v-model="queryParams.title"
17 17 placeholder="请输入标题"
18   - clearable
  18 +
19 19 size="small"
20 20  
21 21 />
22 22 </el-form-item>
23 23 <!-- <el-form-item label="开始时间" prop="leaveStartTime">-->
24   - <!-- <el-date-picker clearable size="small" style="width: 200px"-->
  24 + <!-- <el-date-picker size="small" style="width: 200px"-->
25 25 <!-- v-model="queryParams.leaveStartTime"-->
26 26 <!-- type="date"-->
27 27 <!-- value-format="yyyy-MM-dd"-->
... ... @@ -29,7 +29,7 @@
29 29 <!-- </el-date-picker>-->
30 30 <!-- </el-form-item>-->
31 31 <!-- <el-form-item label="结束时间" prop="leaveEndTime">-->
32   - <!-- <el-date-picker clearable size="small" style="width: 200px"-->
  32 + <!-- <el-date-picker size="small" style="width: 200px"-->
33 33 <!-- v-model="queryParams.leaveEndTime"-->
34 34 <!-- type="date"-->
35 35 <!-- value-format="yyyy-MM-dd"-->
... ... @@ -38,7 +38,7 @@
38 38 <!-- </el-form-item>-->
39 39  
40 40 <el-form-item label="状态" prop="state">
41   - <el-select v-model="queryParams.state" placeholder="请选择状态" clearable size="small">
  41 + <el-select v-model="queryParams.state" placeholder="请选择状态" size="small">
42 42 <el-option
43 43 v-for="dict in stateOptions"
44 44 :key="dict.dictValue"
... ... @@ -48,7 +48,7 @@
48 48 </el-select>
49 49 </el-form-item>
50 50 <!-- <el-form-item label="创建者" prop="createBy">-->
51   - <!-- <el-select v-model="queryParams.createBy" placeholder="请选择创建者" clearable size="small">-->
  51 + <!-- <el-select v-model="queryParams.createBy" placeholder="请选择创建者" size="small">-->
52 52 <!-- <el-option label="请选择字典生成" value="" />-->
53 53 <!-- </el-select>-->
54 54 <!-- </el-form-item>-->
... ...
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
  View file @e16a9f2
1 1 package com.trash.business.controller;
2 2  
3 3 import java.io.IOException;
  4 +import java.util.Date;
4 5 import java.util.List;
5 6 import java.util.Map;
6 7  
... ... @@ -71,7 +72,7 @@ public class SupervisionThreestepController extends BaseController
71 72 public TableDataInfo dayWorkList(SupervisionThreestep supervisionThreestep)
72 73 {
73 74 startPage();
74   - List<Map> list = supervisionThreestepService.selectDayWorkList(supervisionThreestep);
  75 + List<Map<String,String>> list = supervisionThreestepService.selectDayWorkList(supervisionThreestep);
75 76 return getDataTable(list);
76 77 }
77 78  
... ... @@ -185,6 +186,8 @@ public class SupervisionThreestepController extends BaseController
185 186 @PostMapping(value="/active")
186 187 public AjaxResult active(@RequestBody SupervisionThreestep supervisionThreestep)
187 188 {
  189 +
  190 + supervisionThreestep.setCheckTime(new Date());
188 191 return toAjax(supervisionThreestepService.activeSupervisionThreestep(supervisionThreestep));
189 192 }
190 193  
... ...
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
  View file @e16a9f2
... ... @@ -34,7 +34,7 @@ public class SupervisionThreestep extends BaseEntity
34 34 private String place;
35 35  
36 36 /** 自查时间 */
37   - @JsonFormat(pattern = "yyyy-MM-dd")
  37 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
38 38 @Excel(name = "自查时间", width = 30, dateFormat = "yyyy-MM-dd")
39 39 private Date selfCheckTime;
40 40  
... ... @@ -45,13 +45,13 @@ public class SupervisionThreestep extends BaseEntity
45 45 private String earthsitesId;
46 46  
47 47 /** 检查时间 */
48   - @JsonFormat(pattern = "yyyy-MM-dd")
  48 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
49 49 @Excel(name = "巡查时间", width = 30, dateFormat = "yyyy-MM-dd")
50 50 private Date checkTime;
51 51  
52 52  
53 53 /** 检查时间 */
54   - @JsonFormat(pattern = "yyyy-MM-dd")
  54 + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
55 55 @Excel(name = "抽查时间", width = 30, dateFormat = "yyyy-MM-dd")
56 56 private Date checkEndTime;
57 57  
... ... @@ -135,8 +135,12 @@ public class SupervisionThreestep extends BaseEntity
135 135 private Date workEndTime;
136 136  
137 137  
138   -
139   - public String getContractId() {
  138 +
  139 + public void setParams(String params) {
  140 + this.params = params;
  141 + }
  142 +
  143 + public String getContractId() {
140 144 return contractId;
141 145 }
142 146  
... ...
trash-workFlow/src/main/java/com/trash/business/domain/dayWork.java
  View file @e16a9f2
... ... @@ -17,6 +17,11 @@ public class dayWork extends BaseEntity
17 17 {
18 18 private static final long serialVersionUID = 1L;
19 19  
  20 + @Excel(name = "序号")
  21 + private Long id;
  22 +
  23 + @Excel(name = "日期")
  24 + private String createTime;
20 25 /** 工地名称 */
21 26 @Excel(name = "工地名称")
22 27 private String name;
... ... @@ -26,27 +31,37 @@ public class dayWork extends BaseEntity
26 31 private String type;
27 32  
28 33 /** 管辖区 */
29   - @Excel(name = "管辖区")
  34 + @Excel(name = "所属区域")
30 35 private String place;
31 36  
32   - @Excel(name = "审查意见")
33   - private String subReason;
34   -
  37 + @Excel(name = "开工状态")
  38 + private String status;
  39 +
  40 + @Excel(name = "申请开工时间")
  41 + private String selfCheckTime;
35 42  
36 43 /** 消纳场名称 */
37 44 @Excel(name = "消纳场名称")
38 45 private String ename;
39 46  
40 47 /** 项目类型 消纳场/工地 */
41   - @Excel(name = "消纳场类型类型")
  48 + @Excel(name = "消纳类型")
42 49 private String etype;
43 50  
44   -
45   - @Excel(name = "审查意见")
46   - private String esubSeason;
  51 + /** 管辖区 */
  52 + @Excel(name = "所属区域")
  53 + private String eplace;
47 54  
48 55 @Excel(name = "开工状态")
49 56 private String estatus;
  57 +
  58 + @Excel(name = "申请开工时间")
  59 + private String eselfCheckTime;
  60 +
  61 +
  62 + @Excel(name = "备注")
  63 + private String descript;
  64 +
50 65  
51 66 public String getName() {
52 67 return name;
... ... @@ -72,14 +87,6 @@ public class dayWork extends BaseEntity
72 87 this.place = place;
73 88 }
74 89  
75   - public String getSubReason() {
76   - return subReason;
77   - }
78   -
79   - public void setSubReason(String subReason) {
80   - this.subReason = subReason;
81   - }
82   -
83 90 public String getEname() {
84 91 return ename;
85 92 }
... ... @@ -96,14 +103,6 @@ public class dayWork extends BaseEntity
96 103 this.etype = etype;
97 104 }
98 105  
99   - public String getEsubSeason() {
100   - return esubSeason;
101   - }
102   -
103   - public void setEsubSeason(String esubSeason) {
104   - this.esubSeason = esubSeason;
105   - }
106   -
107 106 public String getEstatus() {
108 107 return estatus;
109 108 }
... ... @@ -111,6 +110,59 @@ public class dayWork extends BaseEntity
111 110 public void setEstatus(String estatus) {
112 111 this.estatus = estatus;
113 112 }
  113 +
  114 + public Long getId() {
  115 + return id;
  116 + }
  117 +
  118 + public void setId(Long id) {
  119 + this.id = id;
  120 + }
  121 +
  122 +
  123 + public void setCreateTime(String createTime) {
  124 + this.createTime = createTime;
  125 + }
  126 +
  127 + public String getStatus() {
  128 + return status;
  129 + }
  130 +
  131 + public void setStatus(String status) {
  132 + this.status = status;
  133 + }
  134 +
  135 + public String getSelfCheckTime() {
  136 + return selfCheckTime;
  137 + }
  138 +
  139 + public void setSelfCheckTime(String selfCheckTime) {
  140 + this.selfCheckTime = selfCheckTime;
  141 + }
  142 +
  143 + public String getEplace() {
  144 + return eplace;
  145 + }
  146 +
  147 + public void setEplace(String eplace) {
  148 + this.eplace = eplace;
  149 + }
  150 +
  151 + public String getEselfCheckTime() {
  152 + return eselfCheckTime;
  153 + }
  154 +
  155 + public void setEselfCheckTime(String eselfCheckTime) {
  156 + this.eselfCheckTime = eselfCheckTime;
  157 + }
  158 +
  159 + public String getDescript() {
  160 + return descript;
  161 + }
  162 +
  163 + public void setDescript(String descript) {
  164 + this.descript = descript;
  165 + }
114 166  
115 167  
116 168  
... ...
trash-workFlow/src/main/java/com/trash/business/mapper/SupervisionThreestepMapper.java
  View file @e16a9f2
... ... @@ -61,7 +61,7 @@ public interface SupervisionThreestepMapper
61 61 */
62 62 int deleteSupervisionThreestepByIds(Long[] ids);
63 63  
64   - public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep);
  64 + public List<SupervisionThreestep> selectDayWorkList(SupervisionThreestep supervisionThreestep);
65 65  
66 66 public SupervisionThreestep selectTodayData(SupervisionThreestep supervisionThreestep);
67 67  
... ...
trash-workFlow/src/main/java/com/trash/business/service/ICompanyCreditService.java
  View file @e16a9f2
... ... @@ -61,5 +61,7 @@ public interface ICompanyCreditService {
61 61  
62 62 public List<String> getPlaces(CompanyCredit credit);
63 63  
64   - public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit);
  64 + public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit,String token);
  65 +
  66 + public void insertCompanyCredit(CompanyCredit companyCredit, String token);
65 67 }
... ...
trash-workFlow/src/main/java/com/trash/business/service/ISupervisionThreestepService.java
  View file @e16a9f2
... ... @@ -61,18 +61,19 @@ public interface ISupervisionThreestepService
61 61  
62 62 /**
63 63 * 删除三查机制信息
  64 + * @param tOKEN
64 65 *
65 66 * @param id 三查机制ID
66 67 * @return 结果
67 68 */
68 69  
69   - public void checkDataToActiveTruck(SupervisionThreestep supervisionThreestep);
  70 + public void checkDataToActiveTruck(SupervisionThreestep supervisionThreestep, String tOKEN);
70 71  
71 72 int deleteSupervisionThreestepById(Long id);
72 73  
73 74 String upload(MultipartFile file);
74 75  
75   - public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep);
  76 + public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep);
76 77  
77 78 public int activeSupervisionThreestep(SupervisionThreestep supervisionThreestep);
78 79  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/CompanyCreditServiceImpl.java
  View file @e16a9f2
... ... @@ -67,27 +67,56 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService
67 67 @SuppressWarnings("unchecked")
68 68 @Override
69 69 public int insertCompanyCredit(CompanyCredit companyCredit)
70   - {
  70 + {
  71 + int i = 0;
71 72 companyCredit.setTime(new Date());
72   -
73   - int i = companyCreditMapper.insertCompanyCredit(companyCredit);
74 73  
75   - updateRemoteCompanyAndTruck(companyCredit);
  74 +
  75 + CompanyCredit cc = new CompanyCredit();
  76 +
  77 + cc.setStatus(0L);
  78 + cc.setLostCredit(companyCredit.getLostCredit());
  79 + cc.setObjectId(companyCredit.getObjectId());
  80 +
  81 + List old = selectCompanyCreditList(cc);
  82 +
  83 + if(old.size() > 0){
  84 + i = 1;
  85 + }else{
  86 + i = companyCreditMapper.insertCompanyCredit(companyCredit);
  87 + }
  88 +
  89 + updateRemoteCompanyAndTruck(companyCredit,null);
76 90  
77 91 return i;
78 92 }
79 93  
80 94  
  95 +
  96 + public void insertCompanyCredit(CompanyCredit companyCredit, String token){
  97 + companyCredit.setTime(new Date());
  98 +
  99 + int i = companyCreditMapper.insertCompanyCredit(companyCredit);
  100 +
  101 + updateRemoteCompanyAndTruck(companyCredit,token);
  102 +
  103 + return;
  104 + }
  105 +
  106 +
81 107 @Override
82   - public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit){
  108 + public void updateRemoteCompanyAndTruck(CompanyCredit companyCredit,String token){
83 109 long credit = companyCredit.getLostCredit();
84 110 String companyId = companyCredit.getObjectId();
85 111 Map map = new HashedMap<>();
86 112  
87 113 map.put("companyID",companyId);
88 114 map.put("valid",0);
89   -
90   - JSONArray turckList = RemoteServerUtils.getTruckList(map);
  115 + JSONArray turckList = null;
  116 + if(token == null)
  117 + turckList = RemoteServerUtils.getTruckList(map);
  118 + else
  119 + turckList = RemoteServerUtils.getTruckList(map,token);
91 120  
92 121 List<Map> updateList = new ArrayList();
93 122  
... ... @@ -156,7 +185,10 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService
156 185 }
157 186 }
158 187 if(updateList.size() > 0){
159   - RemoteServerUtils.updateTruckList(updateList);
  188 + if(token != null)
  189 + RemoteServerUtils.updateTruckList(updateList,token);
  190 + else
  191 + RemoteServerUtils.updateTruckList(updateList);
160 192 }
161 193 }
162 194  
... ... @@ -167,7 +199,10 @@ public class CompanyCreditServiceImpl implements ICompanyCreditService
167 199 upParam.put("id", companyId);
168 200 updateList.add(upParam);
169 201  
170   - RemoteServerUtils.updateCompanyList(updateList);
  202 + if(token != null)
  203 + RemoteServerUtils.updateTruckList(updateList,token);
  204 + else
  205 + RemoteServerUtils.updateTruckList(updateList);
171 206 }
172 207  
173 208 /**
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/DriverCreditServiceImpl.java
  View file @e16a9f2
... ... @@ -57,9 +57,22 @@ public class DriverCreditServiceImpl implements IDriverCreditService
57 57 public int insertDriverCredit(DriverCredit driverCredit)
58 58 {
59 59 driverCredit.setTime(new Date());
60   -
61   - int i = driverCreditMapper.insertDriverCredit(driverCredit);
62   -
  60 + int i;
  61 +
  62 + DriverCredit cc = new DriverCredit();
  63 +
  64 + cc.setStatus(0L);
  65 + cc.setLostCredit(driverCredit.getLostCredit());
  66 + cc.setObjectId(driverCredit.getObjectId());
  67 +
  68 + List old = selectDriverCreditList(cc);
  69 +
  70 + if(old.size() > 0){
  71 + i = 1;
  72 + }else{
  73 + i = driverCreditMapper.insertDriverCredit(driverCredit);
  74 + }
  75 +
63 76 sentDataToRemoteServer(driverCredit);
64 77  
65 78 return i;
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/SupervisionThreestepServiceImpl.java
  View file @e16a9f2
... ... @@ -5,6 +5,7 @@ import java.text.ParseException;
5 5 import java.text.SimpleDateFormat;
6 6 import java.util.ArrayList;
7 7 import java.util.Date;
  8 +import java.util.HashMap;
8 9 import java.util.List;
9 10 import java.util.Map;
10 11  
... ... @@ -30,6 +31,8 @@ import com.trash.common.utils.SecurityUtils;
30 31 import com.trash.common.utils.file.FileUploadUtils;
31 32 import com.trash.workflow.service.IWorkflowService;
32 33  
  34 +import net.sf.jsqlparser.expression.DateTimeLiteralExpression.DateTime;
  35 +
33 36 /**
34 37 * 三查机制Service业务层处理
35 38 *
... ... @@ -172,9 +175,12 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
172 175 return supervisionThreestepMapper.getNames(supervisionThreestep);
173 176 }
174 177  
175   -
  178 +
  179 + SimpleDateFormat dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
  180 +
  181 + @SuppressWarnings("unchecked")
176 182 @Override
177   - public List<Map> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
  183 + public List<Map<String,String>> selectDayWorkList(SupervisionThreestep supervisionThreestep) {
178 184  
179 185 if (supervisionThreestep.getWorkStartTime() == null) {
180 186 String start, end;
... ... @@ -203,22 +209,169 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
203 209 }
204 210 }
205 211  
206   - List<Map> list = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
207   -
208   - for (Map m : list) {
209   - if (m.get("status") == null) {
210   - m.put("status", 0);
  212 + List<SupervisionThreestep> allList = supervisionThreestepMapper.selectDayWorkList(supervisionThreestep);
  213 +
  214 + List<SupervisionThreestep> constructions = new ArrayList<>();
  215 + List<SupervisionThreestep> earthsites = new ArrayList<>();
  216 +
  217 + for(SupervisionThreestep s: allList){
  218 + if(s.getType() == 0){
  219 + constructions.add(s);
  220 + }else{
  221 + earthsites.add(s);
211 222 }
212   -
213   - if (m.get("ename") == null) {
214   - m.put("estatus", -1);
215   - m.put("ename", m.get("earthsites_name"));
216   - m.put("esub_reason", "-");
217   - m.put("eobject_id", m.get("earthsites_id"));
  223 + }
  224 +
  225 + List<Map<String,String>> list = new ArrayList<Map<String,String>>();
  226 +
  227 + for(SupervisionThreestep s:constructions){
  228 + Map<String,String> map = new HashMap<String, String>();
  229 + map.put("id", s.getId() + "");
  230 + map.put("createTime", yearFomat.format(s.getCreateTime()));
  231 + map.put("name", s.getName());
  232 + map.put("place", s.getPlace());
  233 + map.put("status", s.getStatus() == 1 ? "开工" : "未开工");
  234 + map.put("selfCheckTime", dateTime.format(s.getSelfCheckTime()));
  235 + map.put("objectId", s.getObjectId());
  236 + map.put("type", "");
  237 +
  238 + for(SupervisionThreestep e:earthsites){
  239 + if(s.getEarthsitesId().equals(e.getObjectId()) && yearFomat.format(s.getCreateTime()).equals(yearFomat.format(e.getCreateTime()))){
  240 + map.put("eid", e.getObjectId());
  241 + map.put("ename", e.getName());
  242 + map.put("eplace", e.getPlace());
  243 + map.put("estatus", e.getStatus() == 1 ? "开工" : "未开工");
  244 + map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
  245 + map.put("etype", "");
  246 +
  247 + if(s.getStatus() == 1 && e.getStatus() == 1){
  248 + map.put("descript", "开工");
  249 + }else{
  250 + String string = s.getStatus() != 1 ? "工地未开工" : "";
  251 + string += e.getStatus() != 1 ? "消纳场未开工" : "";
  252 + map.put("descript", string );
  253 + }
  254 + }
  255 + }
  256 +
  257 + if(map.get("ename") == null){
  258 +
  259 + Map map2 = new HashedMap<>();
  260 +
  261 + List ids = new ArrayList<>();
  262 + ids.add(s.getEarthsitesId());
  263 +
  264 + map2.put("ids", ids);
  265 + map2.put("size", 1);
  266 + map2.put("page", 1);
  267 +
  268 + JSONArray earthList = RemoteServerUtils.getEarthSitesList(map2);
  269 +
  270 + if(earthList != null && earthList.size() > 0){
  271 + earthList.get(0);
  272 + map.put("eplace",((JSONObject)earthList.get(0)).getString("areaCode"));
  273 + }
  274 +
  275 + map.put("eid", s.getEarthsitesId());
  276 + map.put("ename", s.getEarthsitesName());
  277 + map.put("estatus", "未报工");
  278 + map.put("descript", "未开工");
  279 + map.put("etype", "");
  280 +
  281 + }
  282 + list.add(map);
  283 + }
  284 +
  285 + List newList = new ArrayList<>();
  286 +
  287 + for(SupervisionThreestep e:earthsites){
  288 + Map map = new HashMap();
  289 + boolean needAdd = true;
  290 + for(Map<String,String> m:list){
  291 + if(e.getObjectId().equals(m.get("eid")) && m.get("createTime").equals(yearFomat.format(e.getCreateTime()))){
  292 + needAdd = false;
  293 + break;
  294 + }
218 295 }
  296 +
  297 + if(!needAdd)
  298 + continue;
  299 +
  300 + JSONObject con = RemoteServerUtils.getConstructionInfo(e.getEarthsitesId());
  301 +
  302 + map.put("id", e.getId() + "");
  303 + map.put("createTime", yearFomat.format(e.getCreateTime()));
  304 + map.put("name", e.getEarthsitesName());
  305 + map.put("place", con.getString("areaCode"));
  306 + map.put("status", "未报工");
  307 + map.put("objectId", e.getEarthsitesId());
  308 + map.put("eid", e.getObjectId());
  309 + map.put("etype", "");
  310 + map.put("type", "");
  311 + map.put("ename", e.getName());
  312 + map.put("eplace", e.getPlace());
  313 + map.put("estatus", e.getStatus() == 1 ? "开工" : "未开工");
  314 + map.put("eselfCheckTime", dateTime.format(e.getSelfCheckTime()));
  315 + map.put("descript", "未开工");
  316 +
  317 + newList.add(map);
  318 + }
  319 +
  320 + if(newList.size() >0){
  321 + list.addAll(newList);
219 322 }
  323 +
  324 +
  325 + List FilterList = new ArrayList<>();
  326 +
  327 + String place = null,eplace = null,name= null,ename= null;
  328 +
  329 + if(supervisionThreestep.getPlace()!=null){
  330 + place = supervisionThreestep.getPlace();
  331 + }
  332 + if(supervisionThreestep.getName()!=null){
  333 + name = supervisionThreestep.getName();
  334 + }
  335 + if(supervisionThreestep.getEarthsitesName()!=null){
  336 + ename = supervisionThreestep.getEarthsitesName();
  337 + }
  338 + if(supervisionThreestep.getSubReason() !=null){
  339 + eplace = supervisionThreestep.getSubReason();
  340 + }
  341 +
  342 + for(Map<String,String> map:list){
  343 + if(place != null){
  344 + if(!map.get("place").equals(place)){
  345 + continue;
  346 + }
  347 + }
  348 + if(eplace != null){
  349 + if(!map.get("eplace").equals(eplace)){
  350 + continue;
  351 + }
  352 + }
  353 + if(name != null){
  354 + if(map.get("name").indexOf(name) == -1){
  355 + continue;
  356 + }
  357 + }
  358 + if(ename != null){
  359 + if(map.get("ename").indexOf(ename) == -1){
  360 + continue;
  361 + }
  362 + }
  363 +
  364 +
  365 + FilterList.add(map);
  366 +
  367 + }
  368 +
  369 +
  370 +
  371 +
  372 +
220 373  
221   - return list;
  374 + return FilterList;
222 375 }
223 376  
224 377  
... ... @@ -341,7 +494,33 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
341 494 if (supervisionThreestep.getId() != null) {
342 495 supervisionThreestepMapper.deleteSupervisionThreestepById(supervisionThreestep.getId());
343 496 }
  497 + if(supervisionThreestep.getWorkStartTime() == null){
  498 + String start, end;
344 499  
  500 + Date date = new Date();
  501 +
  502 + if (new Date().getHours() < 8) {
  503 + end = yearFomat.format(date);
  504 + date.setDate(date.getDate() - 1);
  505 + start = yearFomat.format(date);
  506 + } else {
  507 + start = yearFomat.format(date);
  508 + date.setDate(date.getDate() + 1);
  509 + end = yearFomat.format(date);
  510 + }
  511 +
  512 + end += " 4:00:00";
  513 + start += " 8:00:00";
  514 +
  515 + try {
  516 + supervisionThreestep.setWorkStartTime(yearFomat.parse(start));
  517 + supervisionThreestep.setWorkEndTime(yearFomat.parse(end));
  518 + } catch (Exception e) {
  519 + // TODO Auto-generated catch block
  520 + e.printStackTrace();
  521 + }
  522 + }
  523 +
345 524 SupervisionThreestep todayData = supervisionThreestepMapper.selectTodayData(supervisionThreestep);
346 525  
347 526 if (todayData != null) {
... ... @@ -377,24 +556,23 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
377 556 }
378 557  
379 558  
380   - String[] outSide = {"430121","430122","430181","宁乡市","株洲市","湘潭市","汩罗市","湘阴县"};
381 559  
382 560 @Override
383 561 public int activeSupervisionThreestep(SupervisionThreestep supervisionThreestep) {
384   -
  562 +
385 563 int i = supervisionThreestepMapper.updateSupervisionThreestep(supervisionThreestep);
386 564  
387 565  
388 566 supervisionThreestep = supervisionThreestepMapper.selectSupervisionThreestepById(supervisionThreestep.getId());
389 567  
390 568 if(supervisionThreestep.getType() == 0 && supervisionThreestep.getStatus() == 1)
391   - checkDataToActiveTruck(supervisionThreestep);
  569 + checkDataToActiveTruck(supervisionThreestep,null);
392 570  
393 571 return i;
394 572 }
395 573  
396 574 @Override
397   - public void checkDataToActiveTruck(SupervisionThreestep construct){
  575 + public void checkDataToActiveTruck(SupervisionThreestep construct,String token){
398 576  
399 577 String trucks = construct.getCompanyTrucks();
400 578  
... ... @@ -407,8 +585,13 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
407 585 params.put("vehicleIds", truckArray);
408 586 params.put("page", 1);
409 587 params.put("size", 9999);
  588 + JSONArray array = null;
  589 + if(token ==null)
  590 + array = RemoteServerUtils.getTruckOnline(params);
  591 + else
  592 + array = RemoteServerUtils.getTruckOnline(params,token);
  593 +
410 594  
411   - JSONArray array = RemoteServerUtils.getTruckOnline(params);
412 595  
413 596 for(Object object :array){
414 597 JSONObject truckObject = (JSONObject)object;
... ... @@ -459,6 +642,8 @@ public class SupervisionThreestepServiceImpl implements ISupervisionThreestepSer
459 642 if(taList.size() > 0){
460 643 truckActivateMapper.updateTruckActivate(truckActivate);
461 644 }else{
  645 + truckActivate.setCreateTime(new Date());
  646 +
462 647 truckActivateMapper.insertTruckActivate(truckActivate);
463 648 }
464 649  
... ...
trash-workFlow/src/main/java/com/trash/business/service/impl/TruckCreditServiceImpl.java
  View file @e16a9f2
... ... @@ -7,6 +7,7 @@ import org.springframework.beans.factory.annotation.Autowired;
7 7 import org.springframework.stereotype.Service;
8 8 import org.springframework.transaction.annotation.Transactional;
9 9  
  10 +import com.trash.business.domain.CompanyCredit;
10 11 import com.trash.business.domain.TruckCredit;
11 12 import com.trash.business.mapper.TruckCreditMapper;
12 13 import com.trash.business.service.ITruckCreditService;
... ... @@ -55,10 +56,25 @@ public class TruckCreditServiceImpl implements ITruckCreditService
55 56 */
56 57 @Override
57 58 public int insertTruckCredit(TruckCredit truckCredit)
58   - {
59   - truckCredit.setTime(new Date());
  59 + {
60 60  
61   - int i = truckCreditMapper.insertTruckCredit(truckCredit);
  61 + int i;
  62 +
  63 + truckCredit.setTime(new Date());
  64 +
  65 + TruckCredit cc = new TruckCredit();
  66 +
  67 + cc.setStatus(0L);
  68 + cc.setLostCredit(truckCredit.getLostCredit());
  69 + cc.setObjectId(truckCredit.getObjectId());
  70 +
  71 + List old = selectTruckCreditList(cc);
  72 +
  73 + if(old.size() > 0){
  74 + i = 1;
  75 + }else{
  76 + i = truckCreditMapper.insertTruckCredit(truckCredit);
  77 + }
62 78  
63 79 return i;
64 80 }
... ...
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
  View file @e16a9f2
... ... @@ -152,8 +152,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
152 152 </select>
153 153  
154 154  
155   - <select id="selectDayWorkList" parameterType="SupervisionThreestep"
156   - resultType="java.util.HashMap">
  155 + <!-- <select id="selectDayWorkList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
157 156 select a.*,b.* from( select x.* from (select * from supervision_threestep a
158 157 <where>
159 158 type = 0
... ... @@ -175,7 +174,17 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
175 174  
176 175  
177 176  
  177 + </select> -->
  178 +
  179 + <select id="selectDayWorkList" parameterType="SupervisionThreestep" resultMap="SupervisionThreestepResult">
  180 + select * from supervision_threestep
  181 + <where>
  182 + and self_check_time BETWEEN #{workStartTime} and #{workEndTime}
  183 + </where>
  184 + ORDER BY create_time DESC
  185 +
178 186 </select>
  187 +
179 188  
180 189  
181 190  
... ...