Commit a398f9f6984f7e221d90cf419ea6a467ff80a9fe
1 parent
2d15c1cd
m
Showing
72 changed files
with
1359 additions
and
256 deletions
trash-daily/src/main/java/com/trash/situation/domain/DailySituation.java
| 1 | 1 | package com.trash.situation.domain; |
| 2 | 2 | |
| 3 | +import com.fasterxml.jackson.annotation.JsonFormat; | |
| 3 | 4 | import com.trash.common.annotation.Excel; |
| 4 | 5 | import com.trash.common.core.domain.BaseEntity; |
| 5 | 6 | import org.apache.commons.lang3.builder.ToStringBuilder; |
| ... | ... | @@ -29,6 +30,7 @@ public class DailySituation extends BaseEntity |
| 29 | 30 | private String operator; |
| 30 | 31 | |
| 31 | 32 | /** 日期 */ |
| 33 | + @JsonFormat(pattern = "yyyy-MM-dd") | |
| 32 | 34 | private Date date; |
| 33 | 35 | |
| 34 | 36 | /** 天气 */ | ... | ... |
trash-daily/src/main/resources/mapper/report/WorkReportMapper.xml
| ... | ... | @@ -26,7 +26,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 26 | 26 | <select id="selectWorkReportList" parameterType="WorkReport" resultMap="WorkReportResult"> |
| 27 | 27 | <include refid="selectWorkReportVo"/> |
| 28 | 28 | <where> |
| 29 | - <if test="title != null and title != ''"> and title = #{title}</if> | |
| 29 | + <if test="title != null and title != ''"> and title like concat('%', #{title}, '%')</if> | |
| 30 | 30 | <if test="type != null and type != ''"> and type = #{type}</if> |
| 31 | 31 | <if test="createBy != null and createBy != ''"> and create_by = #{createBy}</if> |
| 32 | 32 | </where> |
| ... | ... | @@ -45,9 +45,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 45 | 45 | <if test="writeTime != null">write_time,</if> |
| 46 | 46 | <if test="startTime != null">start_time,</if> |
| 47 | 47 | <if test="endTime != null">end_time,</if> |
| 48 | - <if test="reportContent != null and reportContent != ''">report_content,</if> | |
| 48 | + <if test="reportContent != null ">report_content,</if> | |
| 49 | 49 | <if test="createBy != ''">create_by,</if> |
| 50 | - <if test="attachmentLink!= null and attachmentLink != ''">attachment_link,</if> | |
| 50 | + <if test="attachmentLink!= null">attachment_link,</if> | |
| 51 | 51 | create_time, |
| 52 | 52 | type, |
| 53 | 53 | </trim> |
| ... | ... | @@ -57,9 +57,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 57 | 57 | <if test="writeTime != null">#{writeTime},</if> |
| 58 | 58 | <if test="startTime != null">#{startTime},</if> |
| 59 | 59 | <if test="endTime != null">#{endTime},</if> |
| 60 | - <if test="reportContent != null and reportContent != ''">#{reportContent},</if> | |
| 60 | + <if test="reportContent != null ">#{reportContent},</if> | |
| 61 | 61 | <if test="createBy != ''">#{createBy},</if> |
| 62 | - <if test="attachmentLink!= null and attachmentLink != ''">#{attachmentLink},</if> | |
| 62 | + <if test="attachmentLink!= null ">#{attachmentLink},</if> | |
| 63 | 63 | NOW(), |
| 64 | 64 | #{type} |
| 65 | 65 | </trim> |
| ... | ... | @@ -73,8 +73,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 73 | 73 | <if test="writeTime != null">write_time = #{writeTime},</if> |
| 74 | 74 | <if test="startTime != null">start_time = #{startTime},</if> |
| 75 | 75 | <if test="endTime != null">end_time = #{endTime},</if> |
| 76 | - <if test="reportContent != null and reportContent != ''">report_content = #{reportContent},</if> | |
| 77 | - <if test="attachmentLink!= null and attachmentLink != ''">attachment_link = #{attachmentLink},</if> | |
| 76 | + <if test="reportContent != null ">report_content = #{reportContent},</if> | |
| 77 | + <if test="attachmentLink!= null ">attachment_link = #{attachmentLink},</if> | |
| 78 | 78 | </trim> |
| 79 | 79 | where id = #{id} |
| 80 | 80 | </update> | ... | ... |
trash-ui/src/api/business/daywork.js
| ... | ... | @@ -7,4 +7,13 @@ export function dayWorkList(query) { |
| 7 | 7 | method: 'get', |
| 8 | 8 | params: query |
| 9 | 9 | }) |
| 10 | -} | |
| 11 | 10 | \ No newline at end of file |
| 11 | +} | |
| 12 | + | |
| 13 | +// 查询【请填写功能名称】列表 | |
| 14 | +export function exportDayWorkList(data) { | |
| 15 | + return request({ | |
| 16 | + url: '/business/threestep/exportDayWorkList', | |
| 17 | + method: 'post', | |
| 18 | + data: data | |
| 19 | + }) | |
| 20 | +} | ... | ... |
trash-ui/src/router/index.js
| ... | ... | @@ -257,6 +257,18 @@ export const constantRoutes = [ |
| 257 | 257 | name: 'leaveApplication', |
| 258 | 258 | meta: { title: 'leaveApplication' } |
| 259 | 259 | }, |
| 260 | + { | |
| 261 | + path: 'truckActivate', | |
| 262 | + component: (resolve) => require(['@/views/h5/truckActivate'], resolve), | |
| 263 | + name: 'truckActivate', | |
| 264 | + meta: { title: 'truckActivate' } | |
| 265 | + }, | |
| 266 | + { | |
| 267 | + path: 'dayWorkReport', | |
| 268 | + component: (resolve) => require(['@/views/h5/dayWorkReport'], resolve), | |
| 269 | + name: 'dayWorkReport', | |
| 270 | + meta: { title: 'dayWorkReport' } | |
| 271 | + }, | |
| 260 | 272 | ], |
| 261 | 273 | |
| 262 | 274 | }, | ... | ... |
trash-ui/src/views/TrashData/TrashData/index.vue
| ... | ... | @@ -342,31 +342,31 @@ export default { |
| 342 | 342 | // 表单校验 |
| 343 | 343 | rules: { |
| 344 | 344 | param1: [ |
| 345 | - { required: true, message: '请填写完整', trigger: 'blur' }, | |
| 345 | + { required: true, message: '请填写完整', trigger: 'change' }, | |
| 346 | 346 | ], |
| 347 | 347 | param2: [ |
| 348 | - { required: true, message: '请填写完整', trigger: 'blur' }, | |
| 348 | + { required: true, message: '请填写完整', trigger: 'change' }, | |
| 349 | 349 | ], |
| 350 | 350 | param3: [ |
| 351 | - { required: true, message: '请填写完整', trigger: 'blur' }, | |
| 351 | + { required: true, message: '请填写完整', trigger: 'change' }, | |
| 352 | 352 | ], |
| 353 | 353 | param4: [ |
| 354 | - { required: true, message: '请填写完整', trigger: 'blur' }, | |
| 354 | + { required: true, message: '请填写完整', trigger: 'change' }, | |
| 355 | 355 | ], |
| 356 | 356 | time: [ |
| 357 | - { required: true, message: '请选择时间', trigger: 'blur' }, | |
| 357 | + { required: true, message: '请选择时间', trigger: 'change' }, | |
| 358 | 358 | ], |
| 359 | 359 | people: [ |
| 360 | - { required: true, message: '请填写完整', trigger: 'blur' }, | |
| 360 | + { required: true, message: '请填写完整', trigger: 'change' }, | |
| 361 | 361 | ], |
| 362 | 362 | season: [ |
| 363 | - { required: true, message: '请填写完整', trigger: 'blur' }, | |
| 363 | + { required: true, message: '请填写完整', trigger: 'change' }, | |
| 364 | 364 | ], |
| 365 | 365 | year: [ |
| 366 | - { required: true, message: '请选择时间', trigger: 'blur' }, | |
| 366 | + { required: true, message: '请选择时间', trigger: 'change' }, | |
| 367 | 367 | ], |
| 368 | 368 | place: [ |
| 369 | - { required: true, message: '请填写区域', trigger: 'blur' }, | |
| 369 | + { required: true, message: '请填写区域', trigger: 'change' }, | |
| 370 | 370 | ]}, |
| 371 | 371 | |
| 372 | 372 | open2 : false, | ... | ... |
trash-ui/src/views/activiti/definition/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入流程KEY" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="名称" prop="name"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入名称" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item> | ... | ... |
trash-ui/src/views/activiti/task/index.vue
trash-ui/src/views/business/CompanyCredit/index.vue
| ... | ... | @@ -150,7 +150,7 @@ |
| 150 | 150 | <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body center="true"> |
| 151 | 151 | <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border> |
| 152 | 152 | <el-table-column label="序号" align="center" prop="id" /> |
| 153 | - <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0"> | |
| 153 | + <el-table-column label="失信时间" align="center" prop="time" width="180"> | |
| 154 | 154 | <template slot-scope="scope"> |
| 155 | 155 | <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span> |
| 156 | 156 | </template> |
| ... | ... | @@ -230,15 +230,15 @@ |
| 230 | 230 | // 表单校验 |
| 231 | 231 | rules: { |
| 232 | 232 | name: [ |
| 233 | - { required: true, message: '请选择运输企业', trigger: 'blur' }, | |
| 233 | + { required: true, message: '请选择运输企业', trigger: 'change' }, | |
| 234 | 234 | ], |
| 235 | 235 | reason: [ |
| 236 | - { required: true, message: '请填写原因', trigger: 'blur' }, | |
| 236 | + { required: true, message: '请填写原因', trigger: 'change' }, | |
| 237 | 237 | ], |
| 238 | 238 | }, |
| 239 | 239 | rules2: { |
| 240 | 240 | reason: [ |
| 241 | - { required: true, message: '请填写原因', trigger: 'blur' }, | |
| 241 | + { required: true, message: '请填写原因', trigger: 'change' }, | |
| 242 | 242 | ], |
| 243 | 243 | }, |
| 244 | 244 | }; |
| ... | ... | @@ -248,6 +248,7 @@ |
| 248 | 248 | }, |
| 249 | 249 | methods: { |
| 250 | 250 | init(){ |
| 251 | + this.resetQuery(); | |
| 251 | 252 | this.getList(); |
| 252 | 253 | getNames(this.queryParams).then(response => { |
| 253 | 254 | this.dictNames = response; | ... | ... |
trash-ui/src/views/business/ConstructionCredit/index.vue
| ... | ... | @@ -24,7 +24,7 @@ |
| 24 | 24 | </el-col> |
| 25 | 25 | |
| 26 | 26 | <el-col> |
| 27 | - <el-form-item label="所属场地" prop="place"> | |
| 27 | + <el-form-item label="所属区域" prop="place"> | |
| 28 | 28 | <el-select v-model="queryParams.place" filterable clearable reserve-keyword placeholder="所属场地" size="small" |
| 29 | 29 | :loading="loading"> |
| 30 | 30 | <el-option v-for="item in dictPlaces" :label="item" :value="item" :key="item"> |
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 | reason: [{ |
| 234 | 234 | required: true, |
| 235 | 235 | message: '请填写原因', |
| 236 | - trigger: 'blur' | |
| 236 | + trigger: 'change' | |
| 237 | 237 | }, ] |
| 238 | 238 | }, |
| 239 | 239 | areas:[], |
| ... | ... | @@ -256,6 +256,7 @@ |
| 256 | 256 | }, |
| 257 | 257 | methods: { |
| 258 | 258 | init(){ |
| 259 | + this.resetQuery(); | |
| 259 | 260 | this.getList(); |
| 260 | 261 | this.getNamesData(); |
| 261 | 262 | this.getTypesData(); |
| ... | ... | @@ -405,7 +406,7 @@ |
| 405 | 406 | } |
| 406 | 407 | this.$refs["form"].validate(valid => { |
| 407 | 408 | if (valid) { |
| 408 | - | |
| 409 | + | |
| 409 | 410 | this.loading = true; |
| 410 | 411 | if (this.form.id != null) { |
| 411 | 412 | this.form.lostCredit = 0; | ... | ... |
trash-ui/src/views/business/DriverCredit/index.vue
| ... | ... | @@ -210,9 +210,9 @@ export default { |
| 210 | 210 | updateForm:{}, |
| 211 | 211 | // 表单校验 |
| 212 | 212 | rules: {name: [ |
| 213 | - { required: true, message: '请选择驾驶员', trigger: 'blur' }, | |
| 213 | + { required: true, message: '请选择驾驶员', trigger: 'change' }, | |
| 214 | 214 | ],reason: [ |
| 215 | - { required: true, message: '请填写原因', trigger: 'blur' }, | |
| 215 | + { required: true, message: '请填写原因', trigger: 'change' }, | |
| 216 | 216 | ]} |
| 217 | 217 | }; |
| 218 | 218 | }, |
| ... | ... | @@ -223,8 +223,9 @@ export default { |
| 223 | 223 | init(){ |
| 224 | 224 | this.reset(); |
| 225 | 225 | |
| 226 | - this.getList(); | |
| 227 | - this.getNamesData(); | |
| 226 | + this.resetQuery(); | |
| 227 | + this.getList(); | |
| 228 | + this.getNamesData(); | |
| 228 | 229 | |
| 229 | 230 | let query = { |
| 230 | 231 | 'page':1, |
| ... | ... | @@ -281,10 +282,7 @@ export default { |
| 281 | 282 | }, |
| 282 | 283 | getObjId(a){ |
| 283 | 284 | this.form.objectId = a.id; |
| 284 | - if(a.identityNo) | |
| 285 | - this.form.idNumber = a.identityNo; | |
| 286 | - else | |
| 287 | - this.form.idNumber = a.phoneNo ; | |
| 285 | + this.form.idNumber = a.identityNo; | |
| 288 | 286 | }, |
| 289 | 287 | getList() { |
| 290 | 288 | this.loading = true; |
| ... | ... | @@ -363,7 +361,7 @@ export default { |
| 363 | 361 | } |
| 364 | 362 | this.$refs["form"].validate(valid => { |
| 365 | 363 | if (valid) { |
| 366 | - | |
| 364 | + | |
| 367 | 365 | this.loading = true; |
| 368 | 366 | if (this.form.id != null) { |
| 369 | 367 | this.updateForm.id = this.form.id; | ... | ... |
trash-ui/src/views/business/EarthSitesCredit/index.vue
| ... | ... | @@ -226,9 +226,9 @@ export default { |
| 226 | 226 | updateForm:{}, |
| 227 | 227 | // 表单校验 |
| 228 | 228 | rules: {name: [ |
| 229 | - { required: true, message: '请选择消纳场', trigger: 'blur' }, | |
| 229 | + { required: true, message: '请选择消纳场', trigger: 'change' }, | |
| 230 | 230 | ],reason: [ |
| 231 | - { required: true, message: '请填写原因', trigger: 'blur' }, | |
| 231 | + { required: true, message: '请填写原因', trigger: 'change' }, | |
| 232 | 232 | ]} |
| 233 | 233 | }; |
| 234 | 234 | }, |
| ... | ... | @@ -237,6 +237,7 @@ export default { |
| 237 | 237 | }, |
| 238 | 238 | methods: { |
| 239 | 239 | init(){ |
| 240 | + this.resetQuery(); | |
| 240 | 241 | this.reset(); |
| 241 | 242 | this.getList(); |
| 242 | 243 | this.getNamesData(); |
| ... | ... | @@ -278,7 +279,7 @@ export default { |
| 278 | 279 | getData(stauts){ |
| 279 | 280 | this.queryParams.status=0; |
| 280 | 281 | this.queryParams.lostCredit=stauts; |
| 281 | - this.getList(); | |
| 282 | + this.init(); | |
| 282 | 283 | }, |
| 283 | 284 | getHistoryData(){ |
| 284 | 285 | this.queryParams.status=1; | ... | ... |
trash-ui/src/views/business/TruckCredit/index.vue
| ... | ... | @@ -132,7 +132,7 @@ |
| 132 | 132 | <el-dialog title="历史失信" :visible.sync="infoDialog" width="800px" append-to-body center="true"> |
| 133 | 133 | <el-table v-loading="loading" :data="creditListInfo" :cell-style="colStyle" border> |
| 134 | 134 | <el-table-column label="序号" align="center" prop="id" /> |
| 135 | - <el-table-column label="失信时间" align="center" prop="time" width="180" v-if="queryParams.status==0"> | |
| 135 | + <el-table-column label="失信时间" align="center" prop="time" width="180" > | |
| 136 | 136 | <template slot-scope="scope"> |
| 137 | 137 | <span>{{ parseTime(scope.row.time, '{y}-{m}-{d}') }}</span> |
| 138 | 138 | </template> |
| ... | ... | @@ -221,7 +221,7 @@ |
| 221 | 221 | reason: [{ |
| 222 | 222 | required: true, |
| 223 | 223 | message: '请填写原因', |
| 224 | - trigger: 'blur' | |
| 224 | + trigger: 'change' | |
| 225 | 225 | }, ], |
| 226 | 226 | licensePlate: [{ |
| 227 | 227 | required: true, |
| ... | ... | @@ -233,7 +233,7 @@ |
| 233 | 233 | reason: [{ |
| 234 | 234 | required: true, |
| 235 | 235 | message: '请填写原因', |
| 236 | - trigger: 'blur' | |
| 236 | + trigger: 'change' | |
| 237 | 237 | }, ], |
| 238 | 238 | } |
| 239 | 239 | }; |
| ... | ... | @@ -244,7 +244,7 @@ |
| 244 | 244 | methods: { |
| 245 | 245 | |
| 246 | 246 | init() { |
| 247 | - | |
| 247 | + this.resetQuery(); | |
| 248 | 248 | this.getList(); |
| 249 | 249 | getNames(this.queryParams).then(response => { |
| 250 | 250 | this.dictNames = response; | ... | ... |
trash-ui/src/views/business/dayWorkReport/index.vue
| ... | ... | @@ -2,22 +2,30 @@ |
| 2 | 2 | <div class="app-container"> |
| 3 | 3 | |
| 4 | 4 | <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> |
| 5 | - <el-form-item label="项目名称" prop="name"> | |
| 5 | + <el-form-item label="工地名称" prop="name"> | |
| 6 | 6 | <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable size="small" |
| 7 | - @keyup.enter.native="handleQuery" /> | |
| 7 | + /> | |
| 8 | 8 | </el-form-item> |
| 9 | - <el-form-item label="项目类型" prop="type"> | |
| 10 | - <el-select v-model="queryParams.type" placeholder="请选择项目类型 " clearable size="small"> | |
| 11 | - <el-option label="工地" value="0" /> | |
| 12 | - <el-option label="消纳场" value="1" /> | |
| 13 | - </el-select> | |
| 9 | + <el-form-item label="消纳场名称" prop="name"> | |
| 10 | + <el-input v-model="queryParams.earthsitesName" placeholder="请输入项目名称" clearable size="small" | |
| 11 | + /> | |
| 14 | 12 | </el-form-item> |
| 15 | - <el-form-item label="所属区域" prop="place"> | |
| 16 | - <el-select v-model="queryParams.place" placeholder="请选择所属区域 " clearable size="small"> | |
| 17 | - <el-option label="工地" value="0" /> | |
| 18 | - <el-option label="消纳场" value="1" /> | |
| 13 | + <el-form-item label="工地所属区域" prop="place"> | |
| 14 | + <el-select v-model="queryParams.place" placeholder="工地所属区域 " clearable size="small"> | |
| 15 | + <el-option v-for="item in areas" :label="item.name" :value="item.code" /> | |
| 19 | 16 | </el-select> |
| 20 | 17 | </el-form-item> |
| 18 | + <el-form-item label="开始时间" prop="workStartTime"> | |
| 19 | + <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.workStartTime" type="date" | |
| 20 | + value-format="yyyy-MM-dd" placeholder="开始时间"> | |
| 21 | + </el-date-picker> | |
| 22 | + </el-form-item> | |
| 23 | + <el-form-item label="结束时间" prop="workEndTime"> | |
| 24 | + <el-date-picker clearable size="small" style="width: 200px" v-model="queryParams.workEndTime" type="date" | |
| 25 | + value-format="yyyy-MM-dd" placeholder="结束时间"> | |
| 26 | + </el-date-picker> | |
| 27 | + </el-form-item> | |
| 28 | + | |
| 21 | 29 | <el-form-item> |
| 22 | 30 | <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button> |
| 23 | 31 | <el-button size="mini" @click="resetQuery">重置</el-button> |
| ... | ... | @@ -53,6 +61,7 @@ |
| 53 | 61 | <script> |
| 54 | 62 | import { |
| 55 | 63 | dayWorkList, |
| 64 | + exportDayWorkList | |
| 56 | 65 | } from "@/api/business/daywork"; |
| 57 | 66 | |
| 58 | 67 | |
| ... | ... | @@ -398,13 +407,33 @@ |
| 398 | 407 | }, |
| 399 | 408 | /** 导出按钮操作 */ |
| 400 | 409 | handleExport() { |
| 401 | - const queryParams = this.queryParams; | |
| 410 | + | |
| 411 | + let data = []; | |
| 412 | + for(let i in this.threestepList){ | |
| 413 | + | |
| 414 | + | |
| 415 | + let obj = { | |
| 416 | + name:this.threestepList[i].name, | |
| 417 | + type:this.threestepList[i].type, | |
| 418 | + place:this.threestepList[i].place, | |
| 419 | + subReason:this.threestepList[i].sub_reason, | |
| 420 | + ename:this.threestepList[i].ename, | |
| 421 | + etype:this.threestepList[i].etype, | |
| 422 | + esubSeason:this.threestepList[i].esub_reason, | |
| 423 | + estatus:this.threestepList[i].estatus, | |
| 424 | + } | |
| 425 | + | |
| 426 | + data.push(obj); | |
| 427 | + | |
| 428 | + | |
| 429 | + | |
| 430 | + } | |
| 402 | 431 | this.$confirm('是否确认导出所有【请填写功能名称】数据项?', "警告", { |
| 403 | 432 | confirmButtonText: "确定", |
| 404 | 433 | cancelButtonText: "取消", |
| 405 | 434 | type: "warning" |
| 406 | 435 | }).then(function() { |
| 407 | - return exportThreestep(queryParams); | |
| 436 | + return exportDayWorkList(data); | |
| 408 | 437 | }).then(response => { |
| 409 | 438 | this.download(response.message); |
| 410 | 439 | }) | ... | ... |
trash-ui/src/views/business/supervisionSpecial/index.vue
| ... | ... | @@ -9,7 +9,7 @@ |
| 9 | 9 | </el-form-item> |
| 10 | 10 | <el-form-item label="项目名称" prop="title"> |
| 11 | 11 | <el-input v-model="queryParams.title" placeholder="请输入项目名称" clearable size="small" |
| 12 | - @keyup.enter.native="handleQuery" /> | |
| 12 | + /> | |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="所属区域" prop="place"> |
| 15 | 15 | <el-select v-model="queryParams.place" placeholder="请选择类型" clearable size="small"> | ... | ... |
trash-ui/src/views/business/threestep/index.vue
| ... | ... | @@ -60,17 +60,17 @@ |
| 60 | 60 | |
| 61 | 61 | <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange"> |
| 62 | 62 | <el-table-column label="序号" align="center" prop="id" /> |
| 63 | - <el-table-column label="工地名称" align="center" prop="name" /> | |
| 63 | + | |
| 64 | 64 | <el-table-column label="项目类型" align="center" prop="type"> |
| 65 | 65 | <template slot-scope="scope"> |
| 66 | 66 | <span>{{ scope.row.type==0?"工地":"消纳场"}}</span> |
| 67 | 67 | </template> |
| 68 | - | |
| 69 | 68 | </el-table-column> |
| 69 | + <el-table-column label="项目名称" align="center" prop="name" /> | |
| 70 | + | |
| 70 | 71 | <el-table-column label="管辖区" align="center" prop="place"> |
| 71 | 72 | </el-table-column> |
| 72 | 73 | |
| 73 | - | |
| 74 | 74 | <el-table-column label="自查时间" align="center" prop="selfCheckTime" width="180"> |
| 75 | 75 | <template slot-scope="scope"> |
| 76 | 76 | <span>{{ parseTime(scope.row.selfCheckTime, '{y}-{m}-{d}') }}</span> |
| ... | ... | @@ -125,7 +125,7 @@ |
| 125 | 125 | <el-row type="flex" justify="center" v-if="form.type != null"> |
| 126 | 126 | <el-col :span="12"> |
| 127 | 127 | <el-form-item :label="labelName" prop="name"> |
| 128 | - <el-select v-model="form.name" filterable clearable reserve-keyword > | |
| 128 | + <el-select v-model="form.name" filterable clearable reserve-keyword> | |
| 129 | 129 | <el-option @click.native="getObjId(item)" v-for="item in remoteData" :label="item.name" |
| 130 | 130 | :value="item.name" :key="item.id" v-if="areaCode == null || item.areaCode == areaCode"> |
| 131 | 131 | </el-option> |
| ... | ... | @@ -134,7 +134,7 @@ |
| 134 | 134 | </el-col> |
| 135 | 135 | <el-col :span="12"> |
| 136 | 136 | <el-form-item :label="labelName2" prop="place"> |
| 137 | - <el-select v-model="bindname"> | |
| 137 | + <el-select v-model="bindname" filterable clearable reserve-keyword > | |
| 138 | 138 | <el-option @click.native="getEarthsiteId(item)" v-for="item in bindData" :label="item.name" |
| 139 | 139 | :value="item.name" :key="item.id"> |
| 140 | 140 | </el-option> |
| ... | ... | @@ -146,7 +146,7 @@ |
| 146 | 146 | <el-col> |
| 147 | 147 | <el-form-item label="消纳合同" prop="contract"> |
| 148 | 148 | <el-select v-model="form.contract" filterable clearable reserve-keyword> |
| 149 | - <el-option @click.native="conractCheck(item)" v-for="item in contractList" :label="item.contractNo" :value="item.contractNo" :key="item.id"> | |
| 149 | + <el-option @click.native="conractCheck(item)" v-for="item in filterContract" :label="item.contractNo" :value="item.contractNo" :key="item.id"> | |
| 150 | 150 | </el-option> |
| 151 | 151 | </el-select> |
| 152 | 152 | </el-form-item> |
| ... | ... | @@ -216,19 +216,19 @@ |
| 216 | 216 | <p v-for="img,index in form.img4">硬质路面照片 - {{index+1}}<a @click="removeImage(4,img)" style="color:red"> x</a></p> |
| 217 | 217 | </el-col> |
| 218 | 218 | <el-col :span="6"> |
| 219 | - <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">摄像头视频截图1</a> | |
| 219 | + <a style="color:blue;font-size: 12px;" @click="showFileUpload(5)">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}}</a> | |
| 220 | 220 | <el-input v-model="form.img5" type="hidden"></el-input> |
| 221 | - <p v-for="img,index in form.img5">摄像头视频截图1 - {{index+1}}<a @click="removeImage(5,img)" style="color:red"> x</a></p> | |
| 221 | + <p v-for="img,index in form.img5">{{form.type==0?"摄像头视频截图1":"洗车设施照片"}} - {{index+1}}<a @click="removeImage(5,img)" style="color:red"> x</a></p> | |
| 222 | 222 | </el-col> |
| 223 | 223 | <el-col :span="6"> |
| 224 | - <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">摄像头视频截图2</a> | |
| 224 | + <a style="color:blue;font-size: 12px;" @click="showFileUpload(6)">{{form.type==0?"摄像头视频截图2":"雾炮机"}}</a> | |
| 225 | 225 | <el-input v-model="form.img6" type="hidden"></el-input> |
| 226 | - <p v-for="img,index in form.img6">摄像头视频截图2 - {{index+1}}<a @click="removeImage(6,img)" style="color:red"> x</a></p> | |
| 226 | + <p v-for="img,index in form.img6">{{form.type==0?"摄像头视频截图2":"雾炮机"}} - {{index+1}}<a @click="removeImage(6,img)" style="color:red"> x</a></p> | |
| 227 | 227 | </el-col> |
| 228 | 228 | <el-col :span="6"> |
| 229 | - <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">摄像头视频截图3</a> | |
| 229 | + <a style="color:blue;font-size: 12px;" @click="showFileUpload(7)">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}}</a> | |
| 230 | 230 | <el-input v-model="form.img7" type="hidden"></el-input> |
| 231 | - <p v-for="img,index in form.img7">摄像头视频截图3 - {{index+1}}<a @click="removeImage(7,img)" style="color:red"> x</a></p> | |
| 231 | + <p v-for="img,index in form.img7">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} - {{index+1}}<a @click="removeImage(7,img)" style="color:red"> x</a></p> | |
| 232 | 232 | </el-col> |
| 233 | 233 | </el-row> |
| 234 | 234 | <el-row type="flex" justify="center" v-if="form.type != null"> |
| ... | ... | @@ -385,7 +385,7 @@ |
| 385 | 385 | showSearch: true, |
| 386 | 386 | // 总条数 |
| 387 | 387 | total: 0, |
| 388 | - // 【请填写功能名称】表格数据 | |
| 388 | + // 报工自查表格数据 | |
| 389 | 389 | names:[], |
| 390 | 390 | threestepList: [], |
| 391 | 391 | fileList: [], |
| ... | ... | @@ -441,47 +441,47 @@ |
| 441 | 441 | name: [{ |
| 442 | 442 | required: true, |
| 443 | 443 | message: '请填写完整', |
| 444 | - trigger: 'blur' | |
| 444 | + trigger: 'change' | |
| 445 | 445 | }, ], |
| 446 | 446 | contract: [{ |
| 447 | 447 | required: true, |
| 448 | 448 | message: '请填写完整', |
| 449 | - trigger: 'blur' | |
| 449 | + trigger: 'change' | |
| 450 | 450 | }, ], |
| 451 | 451 | companys: [{ |
| 452 | 452 | required: true, |
| 453 | 453 | message: '请填写完整', |
| 454 | - trigger: 'blur' | |
| 454 | + trigger: 'change' | |
| 455 | 455 | }, ], |
| 456 | 456 | objectId: [{ |
| 457 | 457 | required: true, |
| 458 | 458 | message: '请填写完整', |
| 459 | - trigger: 'blur' | |
| 459 | + trigger: 'change' | |
| 460 | 460 | }, ], |
| 461 | 461 | type: [{ |
| 462 | 462 | required: true, |
| 463 | 463 | message: '请填写完整', |
| 464 | - trigger: 'blur' | |
| 464 | + trigger: 'change' | |
| 465 | 465 | }, ], |
| 466 | 466 | place: [{ |
| 467 | 467 | required: true, |
| 468 | 468 | message: '请填写完整', |
| 469 | - trigger: 'blur' | |
| 469 | + trigger: 'change' | |
| 470 | 470 | }, ], |
| 471 | 471 | companyTrucks: [{ |
| 472 | 472 | required: true, |
| 473 | 473 | message: '请填写完整', |
| 474 | - trigger: 'blur' | |
| 474 | + trigger: 'change' | |
| 475 | 475 | }, ], |
| 476 | 476 | objectId: [{ |
| 477 | 477 | required: true, |
| 478 | 478 | message: '请填写完整', |
| 479 | - trigger: 'blur' | |
| 479 | + trigger: 'change' | |
| 480 | 480 | }, ], |
| 481 | 481 | person: [{ |
| 482 | 482 | required: true, |
| 483 | 483 | message: '请填写完整', |
| 484 | - trigger: 'blur' | |
| 484 | + trigger: 'change' | |
| 485 | 485 | }, ], |
| 486 | 486 | phone: [{ |
| 487 | 487 | required: true, |
| ... | ... | @@ -491,7 +491,7 @@ |
| 491 | 491 | { |
| 492 | 492 | pattern: /^1(3|4|5|7|8|9)\d{9}$/, |
| 493 | 493 | message: '手机号格式错误', |
| 494 | - trigger: 'blur' | |
| 494 | + trigger: 'change' | |
| 495 | 495 | }, |
| 496 | 496 | ] |
| 497 | 497 | }, |
| ... | ... | @@ -579,10 +579,48 @@ |
| 579 | 579 | getObjId(item) { |
| 580 | 580 | this.form.objectId = item.id; |
| 581 | 581 | this.form.place = Number(item.areaCode); |
| 582 | + this.filterConract(); | |
| 583 | + | |
| 584 | + }, | |
| 585 | + filterConract(){ | |
| 586 | + let cId; | |
| 587 | + let eId; | |
| 588 | + if(this.form.type == 0){ | |
| 589 | + cId = this.form.objectId; | |
| 590 | + eId = this.form.earthsitesId; | |
| 591 | + }else{ | |
| 592 | + cId = this.form.earthsitesId; | |
| 593 | + eId = this.form.objectId; | |
| 594 | + } | |
| 595 | + | |
| 596 | + this.filterContract = []; | |
| 597 | + for(let i in this.contractList){ | |
| 598 | + | |
| 599 | + let obj = this.contractList[i]; | |
| 600 | + let canId = false; | |
| 601 | + | |
| 602 | + if(!cId && !eId){ | |
| 603 | + this.filterContract = this.contractList; | |
| 604 | + return; | |
| 605 | + } | |
| 606 | + | |
| 607 | + //constructionSiteID //earthSiteID | |
| 608 | + if(cId && cId == obj.constructionSiteID){ | |
| 609 | + canId = true; | |
| 610 | + }else{ | |
| 611 | + canId = false; | |
| 612 | + } | |
| 613 | + | |
| 614 | + if(canId && eId && eId == obj.earthSiteID){ | |
| 615 | + this.filterContract.push(obj); | |
| 616 | + } | |
| 617 | + } | |
| 618 | + | |
| 582 | 619 | }, |
| 583 | 620 | getEarthsiteId(item) { |
| 584 | 621 | this.form.earthsitesName = item.name; |
| 585 | 622 | this.form.earthsitesId = item.id; |
| 623 | + this.filterConract(); | |
| 586 | 624 | }, |
| 587 | 625 | downloadFile(path) { |
| 588 | 626 | window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(path); |
| ... | ... | @@ -685,7 +723,7 @@ |
| 685 | 723 | return code; |
| 686 | 724 | }, |
| 687 | 725 | |
| 688 | - /** 查询【请填写功能名称】列表 */ | |
| 726 | + /** 查询报工自查列表 */ | |
| 689 | 727 | getList(tabIdx) { |
| 690 | 728 | |
| 691 | 729 | if(tabIdx == 1){ |
| ... | ... | @@ -701,7 +739,7 @@ |
| 701 | 739 | contractList().then(res=>{ |
| 702 | 740 | |
| 703 | 741 | this.contractList = res.result.list; |
| 704 | - | |
| 742 | + this.filterContract = this.contractList | |
| 705 | 743 | }); |
| 706 | 744 | |
| 707 | 745 | this.loading = true; |
| ... | ... | @@ -877,7 +915,7 @@ |
| 877 | 915 | this.form["img" + i] = this.form["img" + i].split(","); |
| 878 | 916 | } |
| 879 | 917 | } |
| 880 | - }); | |
| 918 | + }); | |
| 881 | 919 | }else{ |
| 882 | 920 | this.form.companys = this.form.companys + ""; |
| 883 | 921 | this.form.companyTrucks = this.form.companyTrucks + ""; |
| ... | ... | @@ -896,7 +934,6 @@ |
| 896 | 934 | this.loading = false; |
| 897 | 935 | },error=>{ |
| 898 | 936 | this.loading = false; |
| 899 | - console.log(this.form); | |
| 900 | 937 | this.form.companys = this.form.companys.split(","); |
| 901 | 938 | this.form.companyTrucks = this.form.companyTrucks.split(","); |
| 902 | 939 | |
| ... | ... | @@ -927,6 +964,14 @@ |
| 927 | 964 | this.getList(); |
| 928 | 965 | },error=>{ |
| 929 | 966 | this.loading = false; |
| 967 | + this.form.companys = this.form.companys.split(","); | |
| 968 | + this.form.companyTrucks = this.form.companyTrucks.split(","); | |
| 969 | + | |
| 970 | + for (let i = 0; i < 13; i++) { | |
| 971 | + if (this.form["img" + i]) { | |
| 972 | + this.form["img" + i] = this.form["img" + i].split(","); | |
| 973 | + } | |
| 974 | + } | |
| 930 | 975 | }) |
| 931 | 976 | } |
| 932 | 977 | } |
| ... | ... | @@ -935,7 +980,7 @@ |
| 935 | 980 | /** 删除按钮操作 */ |
| 936 | 981 | handleDelete(row) { |
| 937 | 982 | const ids = row.id || this.ids; |
| 938 | - this.$confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项?', "警告", { | |
| 983 | + this.$confirm('是否确认删除报工自查编号为"' + ids + '"的数据项?', "警告", { | |
| 939 | 984 | confirmButtonText: "确定", |
| 940 | 985 | cancelButtonText: "取消", |
| 941 | 986 | type: "warning" |
| ... | ... | @@ -949,7 +994,7 @@ |
| 949 | 994 | /** 导出按钮操作 */ |
| 950 | 995 | handleExport() { |
| 951 | 996 | const queryParams = this.queryParams; |
| 952 | - this.$confirm('是否确认导出所有【请填写功能名称】数据项?', "警告", { | |
| 997 | + this.$confirm('是否确认导出所有报工自查数据项?', "警告", { | |
| 953 | 998 | confirmButtonText: "确定", |
| 954 | 999 | cancelButtonText: "取消", |
| 955 | 1000 | type: "warning" | ... | ... |
trash-ui/src/views/business/threestep/threestepInfo.vue
| ... | ... | @@ -121,31 +121,31 @@ |
| 121 | 121 | </el-row> |
| 122 | 122 | <el-row v-if="infoData.img5" > |
| 123 | 123 | <el-col :span="4"> |
| 124 | - 摄像头视频截图1 | |
| 124 | + {{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}} | |
| 125 | 125 | </el-col> |
| 126 | 126 | <el-col :span="20"> |
| 127 | 127 | <el-row v-for="img,index in infoData.img5.split(',')" style="margin-bottom:10px;"> |
| 128 | - <a @click="downloadFile(img);" style="color: blue;">摄像头视频截图1 - {{index+1}}</a> | |
| 128 | + <a @click="downloadFile(img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}} - {{index+1}}</a> | |
| 129 | 129 | </el-row> |
| 130 | 130 | </el-col> |
| 131 | 131 | </el-row> |
| 132 | 132 | <el-row v-if="infoData.img6" > |
| 133 | 133 | <el-col :span="4"> |
| 134 | - 摄像头视频截图2 | |
| 134 | + {{infoData.type==0?"摄像头视频截图2":"雾炮机"}} | |
| 135 | 135 | </el-col> |
| 136 | 136 | <el-col :span="20"> |
| 137 | 137 | <el-row v-for="img,index in infoData.img6.split(',')" style="margin-bottom:10px;"> |
| 138 | - <a @click="downloadFile(img);" style="color: blue;">摄像头视频截图2 - {{index+1}}</a> | |
| 138 | + <a @click="downloadFile(img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图2":"雾炮机"}} - {{index+1}}</a> | |
| 139 | 139 | </el-row> |
| 140 | 140 | </el-col> |
| 141 | 141 | </el-row> |
| 142 | 142 | <el-row v-if="infoData.img7" > |
| 143 | 143 | <el-col :span="4"> |
| 144 | - 摄像头视频截图3 | |
| 144 | + {{infoData.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} | |
| 145 | 145 | </el-col> |
| 146 | 146 | <el-col :span="20"> |
| 147 | 147 | <el-row v-for="img,index in infoData.img7.split(',')" style="margin-bottom:10px;"> |
| 148 | - <a @click="downloadFile(img);" style="color: blue;">摄像头视频截图3 - {{index+1}}</a> | |
| 148 | + <a @click="downloadFile(img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} - {{index+1}}</a> | |
| 149 | 149 | </el-row> |
| 150 | 150 | </el-col> |
| 151 | 151 | </el-row> |
| ... | ... | @@ -285,31 +285,31 @@ |
| 285 | 285 | </el-row> |
| 286 | 286 | <el-row v-if="infoData.sub_img5" > |
| 287 | 287 | <el-col :span="4"> |
| 288 | - 摄像头视频截图1 | |
| 288 | + {{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}} | |
| 289 | 289 | </el-col> |
| 290 | 290 | <el-col :span="20"> |
| 291 | 291 | <el-row v-for="sub_img,index in infoData.sub_img5.split(',')" style="margin-bottom:10px;"> |
| 292 | - <a @click="downloadFile(sub_img);" style="color: blue;">摄像头视频截图1 - {{index+1}}</a> | |
| 292 | + <a @click="downloadFile(sub_img);" style="color: blue;">{{infoData.type==0?"摄像头视频截图1":"洗车设施照片"}} - {{index+1}}</a> | |
| 293 | 293 | </el-row> |
| 294 | 294 | </el-col> |
| 295 | 295 | </el-row> |
| 296 | 296 | <el-row v-if="infoData.sub_img6" > |
| 297 | 297 | <el-col :span="4"> |
| 298 | - 摄像头视频截图2 | |
| 298 | + {{form.type==0?"摄像头视频截图2":"雾炮机"}} | |
| 299 | 299 | </el-col> |
| 300 | 300 | <el-col :span="20"> |
| 301 | 301 | <el-row v-for="sub_img,index in infoData.sub_img6.split(',')" style="margin-bottom:10px;"> |
| 302 | - <a @click="downloadFile(sub_img);" style="color: blue;">摄像头视频截图2 - {{index+1}}</a> | |
| 302 | + <a @click="downloadFile(sub_img);" style="color: blue;">{{form.type==0?"摄像头视频截图2":"雾炮机"}} - {{index+1}}</a> | |
| 303 | 303 | </el-row> |
| 304 | 304 | </el-col> |
| 305 | 305 | </el-row> |
| 306 | 306 | <el-row v-if="infoData.sub_img7" > |
| 307 | 307 | <el-col :span="4"> |
| 308 | - 摄像头视频截图3 | |
| 308 | + {{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} | |
| 309 | 309 | </el-col> |
| 310 | 310 | <el-col :span="20"> |
| 311 | 311 | <el-row v-for="sub_img,index in infoData.sub_img7.split(',')" style="margin-bottom:10px;"> |
| 312 | - <a @click="downloadFile(sub_img);" style="color: blue;">摄像头视频截图3 - {{index+1}}</a> | |
| 312 | + <a @click="downloadFile(sub_img);" style="color: blue;">{{form.type==0?"摄像头视频截图3":"裸露黄土覆盖照片"}} - {{index+1}}</a> | |
| 313 | 313 | </el-row> |
| 314 | 314 | </el-col> |
| 315 | 315 | </el-row> | ... | ... |
trash-ui/src/views/business/truckActivate/index.vue
| ... | ... | @@ -19,7 +19,7 @@ |
| 19 | 19 | placeholder="请输入所属企业" |
| 20 | 20 | clearable |
| 21 | 21 | size="small" |
| 22 | - @keyup.enter.native="handleQuery" | |
| 22 | + | |
| 23 | 23 | /> |
| 24 | 24 | </el-form-item> |
| 25 | 25 | <el-form-item label="车牌号" prop="licensePlate"> |
| ... | ... | @@ -28,7 +28,7 @@ |
| 28 | 28 | placeholder="请输入车牌号" |
| 29 | 29 | clearable |
| 30 | 30 | size="small" |
| 31 | - @keyup.enter.native="handleQuery" | |
| 31 | + | |
| 32 | 32 | /> |
| 33 | 33 | </el-form-item> |
| 34 | 34 | <el-form-item label="激活时间" prop="activateTime"> |
| ... | ... | @@ -187,20 +187,20 @@ export default { |
| 187 | 187 | construction: [{ |
| 188 | 188 | required: true, |
| 189 | 189 | message: '请填写完整', |
| 190 | - trigger: 'blur' | |
| 190 | + trigger: 'change' | |
| 191 | 191 | }, ], |
| 192 | 192 | |
| 193 | 193 | company: [{ |
| 194 | 194 | required: true, |
| 195 | 195 | message: '请填写完整', |
| 196 | - trigger: 'blur' | |
| 196 | + trigger: 'change' | |
| 197 | 197 | }, ], |
| 198 | 198 | |
| 199 | 199 | |
| 200 | 200 | licensePlate: [{ |
| 201 | 201 | required: true, |
| 202 | 202 | message: '请填写完整', |
| 203 | - trigger: 'blur' | |
| 203 | + trigger: 'change' | |
| 204 | 204 | }, ], |
| 205 | 205 | }, |
| 206 | 206 | constList:[], | ... | ... |
trash-ui/src/views/casefile/violationCaseFile/index.vue
| ... | ... | @@ -31,7 +31,7 @@ |
| 31 | 31 | placeholder="请输入项目名称" |
| 32 | 32 | clearable |
| 33 | 33 | size="small" |
| 34 | - @keyup.enter.native="handleQuery" | |
| 34 | + | |
| 35 | 35 | /> |
| 36 | 36 | </el-form-item> |
| 37 | 37 | |
| ... | ... | @@ -597,7 +597,7 @@ export default { |
| 597 | 597 | }).then(function() { |
| 598 | 598 | return exportViolationCaseFile(queryParams); |
| 599 | 599 | }).then(response => { |
| 600 | - this.download(response.msg); | |
| 600 | + this.download(response.message); | |
| 601 | 601 | }) |
| 602 | 602 | }, |
| 603 | 603 | /** 生成案卷编号 */ | ... | ... |
trash-ui/src/views/daily/information_sharing/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入数据标题" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="调取部门" prop="retrieveDepartment"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入调取部门" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item> |
| ... | ... | @@ -122,7 +122,8 @@ |
| 122 | 122 | <el-form-item label="调取内容"> |
| 123 | 123 | <editor v-model="form.retrieveContent" :min-height="192"/> |
| 124 | 124 | </el-form-item> |
| 125 | - <a v-if="form.attachmentLink!='' " style="color: blue;margin-left: 10px;" @click="download">附件下载</a> <a style="color: red;" @click="form.attachmentLink='';" v-if="form.attachmentLink!=''">删除</a> | |
| 125 | + <a v-if="form.attachmentLink!='' " style="color: blue;margin-left: 10px;" @click="download">附件下载</a> <a style="color: red;" | |
| 126 | + @click="form.attachmentLink='';" v-if="form.attachmentLink!=''">删除</a> | |
| 126 | 127 | <el-row> |
| 127 | 128 | <el-col :span="6"> |
| 128 | 129 | <el-form-item label="附件" v-if="form.attachmentLink==''"> | ... | ... |
trash-ui/src/views/daily/report/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入标题" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item> |
| ... | ... | @@ -244,9 +244,6 @@ export default { |
| 244 | 244 | }, |
| 245 | 245 | methods: { |
| 246 | 246 | |
| 247 | - download(){ | |
| 248 | - window.location.href = process.env.VUE_APP_BASE_API + "/business/threestep/download?path=" + encodeURI(this.form.attachmentLink) | |
| 249 | - }, | |
| 250 | 247 | getList() { |
| 251 | 248 | this.loading = true; |
| 252 | 249 | listReport(this.queryParams).then(response => { | ... | ... |
trash-ui/src/views/daily/situation/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入标题" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="操作人" prop="operator"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入操作人" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item> |
| ... | ... | @@ -126,15 +126,18 @@ |
| 126 | 126 | </el-col> |
| 127 | 127 | </el-row> |
| 128 | 128 | |
| 129 | - <el-form-item label="车辆数"> | |
| 130 | - <el-input v-model="form.numberOfVehicles" type="number" style="width: 200px"/> | |
| 131 | - </el-form-item> | |
| 132 | - | |
| 133 | - <el-form-item label="全市工地,消纳场开停情况" > | |
| 129 | + <el-form-item label="全市工地,消纳场开停情况" prop="consumptionSiteSituation"> | |
| 134 | 130 | <editor v-model="form.consumptionSiteSituation" :min-height="192"/> |
| 135 | 131 | </el-form-item> |
| 132 | + | |
| 133 | + | |
| 134 | + <el-form-item label="车辆数" prop="numberOfVehicles"> | |
| 135 | + <editor v-model="form.numberOfVehicles" :min-height="192"/> | |
| 136 | + </el-form-item> | |
| 137 | + | |
| 138 | + | |
| 136 | 139 | </el-form> |
| 137 | - <div slot="footer" class="dialog-footer"> | |
| 140 | + <div slot="footer" class="dialog-footer" > | |
| 138 | 141 | <el-button type="primary" @click="submitForm">确 定</el-button> |
| 139 | 142 | <el-button @click="cancel">取 消</el-button> |
| 140 | 143 | </div> |
| ... | ... | @@ -184,8 +187,20 @@ export default { |
| 184 | 187 | form: {}, |
| 185 | 188 | // 表单校验 |
| 186 | 189 | rules: { |
| 187 | - id: [ | |
| 188 | - { required: true, message: "主键id不能为空", trigger: "blur" } | |
| 190 | + date: [ | |
| 191 | + { required: true, message: "不能为空", trigger: "blur" } | |
| 192 | + ], | |
| 193 | + weather: [ | |
| 194 | + { required: true, message: "不能为空", trigger: "blur" } | |
| 195 | + ], | |
| 196 | + operator: [ | |
| 197 | + { required: true, message: "不能为空", trigger: "blur" } | |
| 198 | + ], | |
| 199 | + consumptionSiteSituation: [ | |
| 200 | + { required: true, message: "不能为空", trigger: "blur" } | |
| 201 | + ], | |
| 202 | + numberOfVehicles: [ | |
| 203 | + { required: true, message: "不能为空", trigger: "blur" } | |
| 189 | 204 | ], |
| 190 | 205 | } |
| 191 | 206 | }; |
| ... | ... | @@ -298,8 +313,8 @@ export default { |
| 298 | 313 | }, |
| 299 | 314 | /** 提交按钮 */ |
| 300 | 315 | submitForm() { |
| 301 | - | |
| 302 | - | |
| 316 | + | |
| 317 | + | |
| 303 | 318 | this.$refs["form"].validate(valid => { |
| 304 | 319 | if (valid) { |
| 305 | 320 | this.form.title = this.form.date + "平台工作清单"; | ... | ... |
trash-ui/src/views/daily/toollist/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入标题" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="操作人" prop="operator"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入操作人" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item> |
| ... | ... | @@ -77,14 +77,6 @@ |
| 77 | 77 | </el-button> |
| 78 | 78 | </template> |
| 79 | 79 | </el-table-column> |
| 80 | - <el-table-column label="打印" align="center" class-name="small-padding fixed-width"> | |
| 81 | - <template slot-scope="scope"> | |
| 82 | - <el-button | |
| 83 | - size="mini" | |
| 84 | - type="text" | |
| 85 | - >打印</el-button> | |
| 86 | - </template> | |
| 87 | - </el-table-column> | |
| 88 | 80 | </el-table> |
| 89 | 81 | |
| 90 | 82 | <pagination |
| ... | ... | @@ -225,37 +217,37 @@ export default { |
| 225 | 217 | date: [{ |
| 226 | 218 | required: true, |
| 227 | 219 | message: '请将信息填写完整', |
| 228 | - trigger: 'blur' | |
| 220 | + trigger: 'change' | |
| 229 | 221 | }, ], |
| 230 | 222 | region: [{ |
| 231 | 223 | required: true, |
| 232 | 224 | message: '请将信息填写完整', |
| 233 | - trigger: 'blur' | |
| 225 | + trigger: 'change' | |
| 234 | 226 | }, ], |
| 235 | 227 | operator: [{ |
| 236 | 228 | required: true, |
| 237 | 229 | message: '请将信息填写完整', |
| 238 | - trigger: 'blur' | |
| 230 | + trigger: 'change' | |
| 239 | 231 | }, ], |
| 240 | 232 | numberOfConstructionSites: [{ |
| 241 | 233 | required: true, |
| 242 | 234 | message: '请将信息填写完整', |
| 243 | - trigger: 'blur' | |
| 235 | + trigger: 'change' | |
| 244 | 236 | }, ], |
| 245 | 237 | censusStructure: [{ |
| 246 | 238 | required: true, |
| 247 | 239 | message: '请将信息填写完整', |
| 248 | - trigger: 'blur' | |
| 240 | + trigger: 'change' | |
| 249 | 241 | }, ], |
| 250 | 242 | lawEnforcementOfficer: [{ |
| 251 | 243 | required: true, |
| 252 | 244 | message: '请将信息填写完整', |
| 253 | - trigger: 'blur' | |
| 245 | + trigger: 'change' | |
| 254 | 246 | }, ], |
| 255 | 247 | managementLeader: [{ |
| 256 | 248 | required: true, |
| 257 | 249 | message: '请将信息填写完整', |
| 258 | - trigger: 'blur' | |
| 250 | + trigger: 'change' | |
| 259 | 251 | }, ], |
| 260 | 252 | |
| 261 | 253 | }, | ... | ... |
trash-ui/src/views/h5/dayWorkReport/index.vue
0 → 100644
| 1 | +<template> | |
| 2 | + <div class="app-container"> | |
| 3 | + | |
| 4 | + | |
| 5 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> | |
| 6 | + <el-row> | |
| 7 | + <el-col :span="12"> | |
| 8 | + <el-input v-model="queryParams.name" placeholder="请输入项目名称" clearable /> | |
| 9 | + </el-col> | |
| 10 | + <el-col :span="12"> | |
| 11 | + <el-select v-model="queryParams.place" placeholder="工地所属区域 " clearable size="small"> | |
| 12 | + <el-option v-for="item in areas" :label="item.name" :value="item.code" /> | |
| 13 | + </el-select> | |
| 14 | + </el-col> | |
| 15 | + </el-row> | |
| 16 | + <el-row> | |
| 17 | + <el-col :span="12"> | |
| 18 | + <el-date-picker clearable size="small" style="width: 150px" v-model="queryParams.workStartTime" type="date" | |
| 19 | + value-format="yyyy-MM-dd" placeholder="开始时间"> | |
| 20 | + </el-date-picker> | |
| 21 | + </el-col> | |
| 22 | + <el-col :span="12"> | |
| 23 | + <el-date-picker clearable size="small" style="width: 150px" v-model="queryParams.workEndTime" type="date" | |
| 24 | + value-format="yyyy-MM-dd" placeholder="结束时间"> | |
| 25 | + </el-date-picker> | |
| 26 | + </el-col> | |
| 27 | + </el-row> | |
| 28 | + <el-form-item> | |
| 29 | + <el-button type="primary" size="mini" @click="handleQuery">搜索</el-button> | |
| 30 | + <el-button size="mini" @click="resetQuery">重置</el-button> | |
| 31 | + </el-form-item> | |
| 32 | + </el-form> | |
| 33 | + | |
| 34 | + <el-row :gutter="10" class="mb8"> | |
| 35 | + <el-col :span="1.5"> | |
| 36 | + <el-button size="mini" @click="handleExport" v-hasPermi="['business:threestep:export']">导出</el-button> | |
| 37 | + </el-col> | |
| 38 | + <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar> | |
| 39 | + </el-row> | |
| 40 | + | |
| 41 | + <el-table v-loading="loading" :data="threestepList" @selection-change="handleSelectionChange"> | |
| 42 | + <el-table-column label="序号" align="center" prop="id" /> | |
| 43 | + <el-table-column label="工地名称" align="center" prop="name" /> | |
| 44 | + <el-table-column label="项目类型" align="center" prop="type" /> | |
| 45 | + <el-table-column label="管辖区" align="center" prop="place" /> | |
| 46 | + <el-table-column label="审查意见" align="center" prop="sub_reason" width="180" /> | |
| 47 | + <el-table-column label="消纳场名称" align="center" prop="ename" width="180" /> | |
| 48 | + <el-table-column label="消纳场类型" align="center" prop="etype" width="180"/> | |
| 49 | + <el-table-column label="管辖区" align="center" prop="eplace" /> | |
| 50 | + <el-table-column label="审查意见" align="center" prop="esub_reason" width="180" /> | |
| 51 | + <el-table-column label="开工状态" align="center" prop="estatus" class-name="small-padding fixed-width"/> | |
| 52 | + </el-table> | |
| 53 | + | |
| 54 | + <pagination v-show="total>0" :total="total" :page.sync="queryParams.pageNum" :limit.sync="queryParams.pageSize" | |
| 55 | + @pagination="getList" /> | |
| 56 | + </div> | |
| 57 | + | |
| 58 | +</template> | |
| 59 | + | |
| 60 | +<script> | |
| 61 | + import { | |
| 62 | + dayWorkList, | |
| 63 | + exportDayWorkList, | |
| 64 | + } from "@/api/business/daywork"; | |
| 65 | + | |
| 66 | + | |
| 67 | + import { | |
| 68 | + Upload | |
| 69 | + } from "element-ui"; | |
| 70 | + import { | |
| 71 | + getToken | |
| 72 | + } from "@/utils/auth"; | |
| 73 | + | |
| 74 | + import { | |
| 75 | + earthsitesList, | |
| 76 | + constructionsitesList, | |
| 77 | + getDict, | |
| 78 | + getArea | |
| 79 | + } from "@/api/dict"; | |
| 80 | + | |
| 81 | + export default { | |
| 82 | + name: "dayWorkReport", | |
| 83 | + data() { | |
| 84 | + return { | |
| 85 | + // 遮罩层 | |
| 86 | + loading: true, | |
| 87 | + | |
| 88 | + reUpdate : false, | |
| 89 | + | |
| 90 | + info: false, | |
| 91 | + | |
| 92 | + infoData: null, | |
| 93 | + businessKey:null, | |
| 94 | + picSample: false, | |
| 95 | + uploadImageDialog: false, | |
| 96 | + // 选中数组 | |
| 97 | + ids: [], | |
| 98 | + // 非单个禁用 | |
| 99 | + single: true, | |
| 100 | + // 非多个禁用 | |
| 101 | + multiple: true, | |
| 102 | + // 显示搜索条件 | |
| 103 | + showSearch: true, | |
| 104 | + // 总条数 | |
| 105 | + total: 0, | |
| 106 | + // 【请填写功能名称】表格数据 | |
| 107 | + threestepList: [], | |
| 108 | + fileList: [], | |
| 109 | + // 弹出层标题 | |
| 110 | + title: "", | |
| 111 | + // 是否显示弹出层 | |
| 112 | + open: false, | |
| 113 | + // 查询参数 | |
| 114 | + queryParams: { | |
| 115 | + pageNum: 1, | |
| 116 | + pageSize: 10 | |
| 117 | + }, | |
| 118 | + // 表单参数 | |
| 119 | + form: { | |
| 120 | + }, | |
| 121 | + picIndex: null, | |
| 122 | + // 表单校验 | |
| 123 | + rules: { | |
| 124 | + }, | |
| 125 | + SiteWorkAreaCodeType: [], | |
| 126 | + remoteData: [{name:"a",id:"id"}], | |
| 127 | + remoteQueryData: { | |
| 128 | + "page": 1, | |
| 129 | + "size": 9999 | |
| 130 | + }, | |
| 131 | + areas: [{ | |
| 132 | + code:"a", | |
| 133 | + name:"A"} | |
| 134 | + ], | |
| 135 | + constructionsitesList:[], | |
| 136 | + earthsitesList:[], | |
| 137 | + areaCode: null, | |
| 138 | + bindData: [{name:"a",id:"id"}], | |
| 139 | + bindname:null, | |
| 140 | + projectTypes:null, | |
| 141 | + earthsitesTypes:null, | |
| 142 | + | |
| 143 | + outside:["长沙县","望城区","浏阳市","宁乡市","株洲市","湘潭市","汩罗市","湘阴县"], | |
| 144 | + }; | |
| 145 | + }, | |
| 146 | + created() { | |
| 147 | + this.getList(0); | |
| 148 | + getDict({type:"CSConsSiteProjectType"}).then(res=>{ | |
| 149 | + this.projectTypes = res.result; | |
| 150 | + }); | |
| 151 | + | |
| 152 | + getDict({type:"CSDisSiteType"}).then(res=>{ | |
| 153 | + this.earthsitesTypes = res.result; | |
| 154 | + }); | |
| 155 | + }, | |
| 156 | + methods: { | |
| 157 | + areaClear() { | |
| 158 | + this.areaCode = null; | |
| 159 | + }, | |
| 160 | + selectArea(a) { | |
| 161 | + this.areaCode = a; | |
| 162 | + }, | |
| 163 | + getObjId(item) { | |
| 164 | + if (this.form.type == 0) { | |
| 165 | + this.form.objectId = item.id; | |
| 166 | + this.form.place = Number(item.areaCode); | |
| 167 | + } else { | |
| 168 | + this.form.earthsitesId = item.id; | |
| 169 | + this.form.place = Number(item.areaCode); | |
| 170 | + } | |
| 171 | + }, | |
| 172 | + getEarthsiteId(item) { | |
| 173 | + if (this.form.type == 0) { | |
| 174 | + this.form.objectId = item.id; | |
| 175 | + } else { | |
| 176 | + this.form.earthsitesId = item.id; | |
| 177 | + } | |
| 178 | + }, | |
| 179 | + handleClose() { | |
| 180 | + this.uploadImageDialog = false; | |
| 181 | + this.fileList = []; | |
| 182 | + }, | |
| 183 | + /** 查询【请填写功能名称】列表 */ | |
| 184 | + getList(tabIdx) { | |
| 185 | + | |
| 186 | + this.loading = true; | |
| 187 | + | |
| 188 | + dayWorkList(this.queryParams).then(response => { | |
| 189 | + this.threestepList = response.rows; | |
| 190 | + | |
| 191 | + getArea().then(res => { | |
| 192 | + this.areas = res.result; | |
| 193 | + 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 | + 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 | + } | |
| 213 | + } | |
| 214 | + }); | |
| 215 | + | |
| 216 | + | |
| 217 | + | |
| 218 | + constructionsitesList(this.remoteQueryData).then(res => { | |
| 219 | + this.constructionsitesList = res.result.list; | |
| 220 | + for(let i =0;i< this.threestepList.length;i++){ | |
| 221 | + for(let j =0;j<this.constructionsitesList.length;j++){ | |
| 222 | + if(this.threestepList[i].object_id == this.constructionsitesList[j].id){ | |
| 223 | + for(let x in this.projectTypes){ | |
| 224 | + if(this.projectTypes[x].code == this.constructionsitesList[j].projectType){ | |
| 225 | + this.threestepList[i].type = this.projectTypes[x].name; | |
| 226 | + } | |
| 227 | + } | |
| 228 | + } | |
| 229 | + } | |
| 230 | + } | |
| 231 | + }); | |
| 232 | + | |
| 233 | + earthsitesList(this.remoteQueryData).then(res => { | |
| 234 | + this.earthsitesList = res.result.list; | |
| 235 | + for(let i =0;i< this.threestepList.length;i++){ | |
| 236 | + for(let j =0;j<this.earthsitesList.length;j++){ | |
| 237 | + if(this.threestepList[i].eobject_id == this.earthsitesList[j].id){ | |
| 238 | + this.threestepList[i].etype = this.earthsitesList[j].typeName; | |
| 239 | + this.threestepList[i].eplace = this.earthsitesList[j].areaName; | |
| 240 | + } | |
| 241 | + } | |
| 242 | + } | |
| 243 | + }); | |
| 244 | + | |
| 245 | + this.total = response.total; | |
| 246 | + this.loading = false; | |
| 247 | + }); | |
| 248 | + | |
| 249 | + | |
| 250 | + }, | |
| 251 | + // 取消按钮 | |
| 252 | + cancel() { | |
| 253 | + this.open = false; | |
| 254 | + this.reset(); | |
| 255 | + }, | |
| 256 | + // 表单重置 | |
| 257 | + reset() { | |
| 258 | + this.form = { | |
| 259 | + id: null, | |
| 260 | + name: null, | |
| 261 | + type: null, | |
| 262 | + place: null, | |
| 263 | + selfCheckTime: null, | |
| 264 | + objectId: null, | |
| 265 | + earthsitesId: null, | |
| 266 | + createTime: null, | |
| 267 | + checkTime: null, | |
| 268 | + earthsitesName: null, | |
| 269 | + contract: null, | |
| 270 | + companys: null, | |
| 271 | + companyTrucks: null, | |
| 272 | + img0: null, | |
| 273 | + img1: null, | |
| 274 | + img2: null, | |
| 275 | + img3: null, | |
| 276 | + img4: null, | |
| 277 | + img5: null, | |
| 278 | + img6: null, | |
| 279 | + img7: null, | |
| 280 | + img8: null, | |
| 281 | + img9: null, | |
| 282 | + img10: null, | |
| 283 | + img11: null, | |
| 284 | + img12: null, | |
| 285 | + person: null, | |
| 286 | + phone: null | |
| 287 | + }; | |
| 288 | + this.resetForm("form"); | |
| 289 | + }, | |
| 290 | + /** 搜索按钮操作 */ | |
| 291 | + handleQuery() { | |
| 292 | + this.queryParams.pageNum = 1; | |
| 293 | + this.getList(); | |
| 294 | + }, | |
| 295 | + /** 重置按钮操作 */ | |
| 296 | + resetQuery() { | |
| 297 | + this.resetForm("queryForm"); | |
| 298 | + this.handleQuery(); | |
| 299 | + }, | |
| 300 | + // 多选框选中数据 | |
| 301 | + handleSelectionChange(selection) { | |
| 302 | + this.ids = selection.map(item => item.id) | |
| 303 | + this.single = selection.length !== 1 | |
| 304 | + this.multiple = !selection.length | |
| 305 | + }, | |
| 306 | + /** 新增按钮操作 */ | |
| 307 | + handleAdd() { | |
| 308 | + this.reset(); | |
| 309 | + this.open = true; | |
| 310 | + this.title = "报工自查"; | |
| 311 | + }, | |
| 312 | + /** 修改按钮操作 */ | |
| 313 | + handleUpdate(row) { | |
| 314 | + this.reset(); | |
| 315 | + this.businessKey = row.id +""; | |
| 316 | + this.info = true; | |
| 317 | + }, | |
| 318 | + getAreaName(code){ | |
| 319 | + for(let i =0;i<this.areas.length;i++){ | |
| 320 | + if(Number(code) == this.areas[i].code){ | |
| 321 | + return this.areas[i].name; | |
| 322 | + break; | |
| 323 | + } | |
| 324 | + } | |
| 325 | + return code; | |
| 326 | + }, | |
| 327 | + | |
| 328 | + reSub(row){ | |
| 329 | + this.reset(); | |
| 330 | + | |
| 331 | + this.open = true; | |
| 332 | + this.title = "再次提交"; | |
| 333 | + getThreestep(row.id).then(res=>{ | |
| 334 | + this.form = res.data; | |
| 335 | + this.form.type = this.form.type + ""; | |
| 336 | + | |
| 337 | + for (let i = 0; i < 13; i++) { | |
| 338 | + if (this.form["img" + i]) { | |
| 339 | + this.form["img" + i] = this.form["img" + i].split(","); | |
| 340 | + } | |
| 341 | + } | |
| 342 | + | |
| 343 | + | |
| 344 | + this.form.status = 0; | |
| 345 | + this.form.id = null; | |
| 346 | + }); | |
| 347 | + | |
| 348 | + | |
| 349 | + | |
| 350 | + }, | |
| 351 | + | |
| 352 | + checkEndSuccess(){ | |
| 353 | + this.form.checkEndTime = new Date(); | |
| 354 | + this.form.id = this.businessKey; | |
| 355 | + for (let i = 1; i < 4; i++) { | |
| 356 | + if (this.form["attchItem" + i]) { | |
| 357 | + this.form["attchItem" + i] = this.form["attchItem" + i] + ""; | |
| 358 | + } | |
| 359 | + } | |
| 360 | + this.submitForm(); | |
| 361 | + }, | |
| 362 | + checkEndError(){ | |
| 363 | + console.log(this.form, this.businessKey); | |
| 364 | + //发起案卷 | |
| 365 | + }, | |
| 366 | + | |
| 367 | + /** 提交按钮 */ | |
| 368 | + submitForm() { | |
| 369 | + this.$refs["form"].validate(valid => { | |
| 370 | + if (valid) { | |
| 371 | + if (this.form.id != null) { | |
| 372 | + updateThreestep(this.form).then(response => { | |
| 373 | + this.msgSuccess("修改成功"); | |
| 374 | + this.open = false; | |
| 375 | + this.open2 = false; | |
| 376 | + this.getList(); | |
| 377 | + }); | |
| 378 | + } else { | |
| 379 | + this.form.companys = this.form.companys + ""; | |
| 380 | + this.form.companyTrucks = this.form.companyTrucks + ""; | |
| 381 | + | |
| 382 | + for (let i = 0; i < 13; i++) { | |
| 383 | + if (this.form["img" + i]) { | |
| 384 | + | |
| 385 | + this.form["img" + i] = this.form["img" + i] + ""; | |
| 386 | + } | |
| 387 | + } | |
| 388 | + addThreestep(this.form).then(response => { | |
| 389 | + this.msgSuccess("新增成功"); | |
| 390 | + this.open = false; | |
| 391 | + this.open2 = false; | |
| 392 | + this.getList(); | |
| 393 | + }); | |
| 394 | + } | |
| 395 | + } | |
| 396 | + }); | |
| 397 | + }, | |
| 398 | + /** 删除按钮操作 */ | |
| 399 | + handleDelete(row) { | |
| 400 | + const ids = row.id || this.ids; | |
| 401 | + this.$confirm('是否确认删除【请填写功能名称】编号为"' + ids + '"的数据项?', "警告", { | |
| 402 | + confirmButtonText: "确定", | |
| 403 | + cancelButtonText: "取消", | |
| 404 | + type: "warning" | |
| 405 | + }).then(function() { | |
| 406 | + return delThreestep(ids); | |
| 407 | + }).then(() => { | |
| 408 | + this.getList(); | |
| 409 | + this.msgSuccess("删除成功"); | |
| 410 | + }) | |
| 411 | + }, | |
| 412 | + /** 导出按钮操作 */ | |
| 413 | + handleExport() { | |
| 414 | + | |
| 415 | + let data = []; | |
| 416 | + for(let i in this.threestepList){ | |
| 417 | + | |
| 418 | + | |
| 419 | + let obj = { | |
| 420 | + name:this.threestepList[i].name, | |
| 421 | + type:this.threestepList[i].type, | |
| 422 | + place:this.threestepList[i].place, | |
| 423 | + subReason:this.threestepList[i].sub_reason, | |
| 424 | + ename:this.threestepList[i].ename, | |
| 425 | + etype:this.threestepList[i].etype, | |
| 426 | + esubSeason:this.threestepList[i].esub_reason, | |
| 427 | + estatus:this.threestepList[i].estatus, | |
| 428 | + } | |
| 429 | + | |
| 430 | + data.push(obj); | |
| 431 | + | |
| 432 | + | |
| 433 | + | |
| 434 | + } | |
| 435 | + | |
| 436 | + this.$confirm('是否确认导出所有【请填写功能名称】数据项?', "警告", { | |
| 437 | + confirmButtonText: "确定", | |
| 438 | + cancelButtonText: "取消", | |
| 439 | + type: "warning" | |
| 440 | + }).then(function() { | |
| 441 | + return exportDayWorkList(data); | |
| 442 | + }).then(response => { | |
| 443 | + this.download(response.message); | |
| 444 | + }) | |
| 445 | + } | |
| 446 | + } | |
| 447 | + }; | |
| 448 | +</script> | ... | ... |
trash-ui/src/views/h5/office/handle/index.vue
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入来文单位" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item label="收文时间" prop="receiveTime"> |
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | placeholder="请输入文件标题" |
| 34 | 34 | clearable |
| 35 | 35 | size="small" |
| 36 | - @keyup.enter.native="handleQuery" | |
| 36 | + | |
| 37 | 37 | /> |
| 38 | 38 | </el-form-item> |
| 39 | 39 | <el-form-item label="信访单位(人)" prop="sendPerson"> |
| ... | ... | @@ -42,7 +42,7 @@ |
| 42 | 42 | placeholder="请输入信访单位(人)" |
| 43 | 43 | clearable |
| 44 | 44 | size="small" |
| 45 | - @keyup.enter.native="handleQuery" | |
| 45 | + | |
| 46 | 46 | /> |
| 47 | 47 | </el-form-item> |
| 48 | 48 | <el-form-item label="信访日期" prop="sendDate"> | ... | ... |
trash-ui/src/views/h5/office/handleAffairsCommon/index.vue
trash-ui/src/views/h5/office/handleAffairsXF/index.vue
trash-ui/src/views/h5/office/leaveApplication/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入申请人" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="申请部门" prop="deptId"> |
| ... | ... | @@ -285,33 +285,33 @@ export default { |
| 285 | 285 | // 表单校验 |
| 286 | 286 | rules: { |
| 287 | 287 | type: [ |
| 288 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 288 | + {required: true, message: '必填', trigger: 'change'}, | |
| 289 | 289 | ], |
| 290 | 290 | beginDate: [ |
| 291 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 291 | + {required: true, message: '必填', trigger: 'change'}, | |
| 292 | 292 | ], |
| 293 | 293 | endDate: [ |
| 294 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 294 | + {required: true, message: '必填', trigger: 'change'}, | |
| 295 | 295 | ], |
| 296 | 296 | phone: [ |
| 297 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 297 | + {required: true, message: '必填', trigger: 'change'}, | |
| 298 | 298 | { |
| 299 | 299 | pattern: /^1(3|4|5|7|8|9)\d{9}$/, |
| 300 | 300 | message: '手机号格式错误', |
| 301 | - trigger: 'blur' | |
| 301 | + trigger: 'change' | |
| 302 | 302 | } |
| 303 | 303 | ], |
| 304 | 304 | numberDays: [ |
| 305 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 305 | + {required: true, message: '必填', trigger: 'change'}, | |
| 306 | 306 | { |
| 307 | 307 | pattern: /^(0|[1-9]\d*)(\.5)?$/, |
| 308 | 308 | message: '只能为整数或者0.5', |
| 309 | - trigger: 'blur' | |
| 309 | + trigger: 'change' | |
| 310 | 310 | }, |
| 311 | 311 | { |
| 312 | 312 | pattern: /^(?!0+(\.0+)?$)\d+(\.\d+)?$/, |
| 313 | 313 | message: '不能为0', |
| 314 | - trigger: 'blur' | |
| 314 | + trigger: 'change' | |
| 315 | 315 | } |
| 316 | 316 | ] |
| 317 | 317 | }, | ... | ... |
trash-ui/src/views/h5/office/logistics/index.vue
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | placeholder="请输入申请人" |
| 21 | 21 | clearable |
| 22 | 22 | size="small" |
| 23 | - @keyup.enter.native="handleQuery" | |
| 23 | + | |
| 24 | 24 | /> |
| 25 | 25 | </el-form-item> |
| 26 | 26 | <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0"> |
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | placeholder="请输入物品名称" |
| 38 | 38 | clearable |
| 39 | 39 | size="small" |
| 40 | - @keyup.enter.native="handleQuery" | |
| 40 | + | |
| 41 | 41 | /> |
| 42 | 42 | </el-form-item> |
| 43 | 43 | <el-form-item> |
| ... | ... | @@ -449,7 +449,7 @@ export default { |
| 449 | 449 | }).then(function () { |
| 450 | 450 | return exportLogistics(queryParams); |
| 451 | 451 | }).then(response => { |
| 452 | - this.download(response.msg); | |
| 452 | + this.download(response.message); | |
| 453 | 453 | }) |
| 454 | 454 | }, |
| 455 | 455 | changeType() { | ... | ... |
trash-ui/src/views/h5/office/management/index.vue
trash-ui/src/views/h5/task/index.vue
trash-ui/src/views/h5/truckActivate/index.vue
0 → 100644
| 1 | +<template> | |
| 2 | + <div class="app-container"> | |
| 3 | + <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px"> | |
| 4 | + <el-row> | |
| 5 | + <el-col :span="18"> | |
| 6 | + <el-input | |
| 7 | + v-model="queryParams.licensePlate" | |
| 8 | + placeholder="请输入车牌号搜索" | |
| 9 | + clearable | |
| 10 | + size="small" | |
| 11 | + | |
| 12 | + /> | |
| 13 | + </el-form-item></el-col> | |
| 14 | + | |
| 15 | + <el-col :span="6"> | |
| 16 | + <el-form-item style="float: right;"> | |
| 17 | + <el-button type="cyan" icon="el-icon-search" size="mini" @click="handleQuery"></el-button> | |
| 18 | + </el-form-item> | |
| 19 | + </el-col> | |
| 20 | + </el-row> | |
| 21 | + </el-form> | |
| 22 | + | |
| 23 | + <el-row :gutter="10" class="mb8"> | |
| 24 | + <el-col :span="1.5"> | |
| 25 | + <el-button | |
| 26 | + v-if="this.queryParams.status==0" | |
| 27 | + type="primary" | |
| 28 | + size="mini" | |
| 29 | + @click="handleAdd" | |
| 30 | + v-hasPermi="['business:truckActivate:add']" | |
| 31 | + >添加车辆并激活</el-button> | |
| 32 | + </el-col> | |
| 33 | + </el-row> | |
| 34 | + | |
| 35 | + <el-card class="box-card" v-for="item in truckActivateList" style="margin-bottom: 10px;"> | |
| 36 | + | |
| 37 | + <el-row class="card_row"> | |
| 38 | + <el-col :span="12" class="card_grid"> | |
| 39 | + <div class="card_title" style="font-weight: bold;">{{item.licensePlate}}</div> | |
| 40 | + </el-col> | |
| 41 | + <el-col :span="12" class="card_grid" > | |
| 42 | + <span v-if="item.activateTime!=null" style="float:right;margin-top:20px;">已激活</span> | |
| 43 | + <el-button v-if="item.activateTime==null" | |
| 44 | + style="float:right;" | |
| 45 | + @click="handleUpdate(item)" | |
| 46 | + >手动激活</el-button> | |
| 47 | + </el-col> | |
| 48 | + | |
| 49 | + </el-row> | |
| 50 | + | |
| 51 | + <el-row class="card_row" style="margin-top: 5px;"> | |
| 52 | + <el-col :span="24"> | |
| 53 | + <div>{{item.company}}</div> | |
| 54 | + </el-col> | |
| 55 | + </el-row> | |
| 56 | + | |
| 57 | + <el-row class="card_row" style="margin-top: 20px;"> | |
| 58 | + <el-col :span="24"> | |
| 59 | + <div>{{item.construction}}</div> | |
| 60 | + </el-col> | |
| 61 | + </el-row> | |
| 62 | + </el-card> | |
| 63 | + | |
| 64 | + | |
| 65 | + | |
| 66 | +<!-- <el-table v-loading="loading" :data="truckActivateList" @selection-change="handleSelectionChange"> | |
| 67 | + <el-table-column label="序号" align="center" prop="id" /> | |
| 68 | + <el-table-column label="所属企业" align="center" prop="company" /> | |
| 69 | + <el-table-column label="车牌号" align="center" prop="licensePlate" /> | |
| 70 | + <el-table-column label="所属工地" align="center" prop="construction" /> | |
| 71 | + <el-table-column label="消纳场" align="center" prop="earthsite" /> | |
| 72 | + <el-table-column label="激活时间" align="center" prop="activateTime" width="180"> | |
| 73 | + <template slot-scope="scope"> | |
| 74 | + <span>{{ parseTime(scope.row.activateTime, '{y}-{m}-{d}') }}</span> | |
| 75 | + </template> | |
| 76 | + </el-table-column> | |
| 77 | + <el-table-column label="激活状态" prop="objectId"> | |
| 78 | + <template slot-scope="scope"> | |
| 79 | + <span v-if="scope.row.activateTime!=null">已激活</span> | |
| 80 | + | |
| 81 | + <el-button v-if="scope.row.activateTime==null" | |
| 82 | + size="mini" | |
| 83 | + type="text" | |
| 84 | + @click="handleUpdate(scope.row)" | |
| 85 | + v-hasPermi="['business:truckActivate:edit']" | |
| 86 | + >手动激活</el-button> | |
| 87 | + </template> | |
| 88 | + </el-table-column> | |
| 89 | + | |
| 90 | + </el-table> --> | |
| 91 | + | |
| 92 | + <pagination | |
| 93 | + v-show="total>0" | |
| 94 | + :total="total" | |
| 95 | + :page.sync="queryParams.pageNum" | |
| 96 | + :limit.sync="queryParams.pageSize" | |
| 97 | + @pagination="getList" | |
| 98 | + /> | |
| 99 | + | |
| 100 | + <!-- 添加或修改车辆激活对话框 --> | |
| 101 | + <el-dialog :title="title" :visible.sync="open" width="400px" append-to-body> | |
| 102 | + <el-form ref="form" :model="form" :rules="rules" label-width="80px"> | |
| 103 | + <el-form-item label="所属工地" prop="construction"> | |
| 104 | + <el-select v-model="form.construction" placeholder="请选择所属工地"> | |
| 105 | + <el-option v-for="item in constList" @click.native="getCompany(item)" :label="item.name" :value="item.name" :key="item.id"></el-option> | |
| 106 | + </el-select> | |
| 107 | + </el-form-item> | |
| 108 | + <el-form-item label="所属企业" prop="company"> | |
| 109 | + <el-select v-model="form.company" filterable reserve-keyword> | |
| 110 | + <el-option v-for="item in constCompany" :label="item" :value="item" @click.native="getTruckListByCompanyName(item)"/> | |
| 111 | + </el-select> | |
| 112 | + </el-form-item> | |
| 113 | + <el-form-item label="车牌号" prop="licensePlate"> | |
| 114 | + <el-select v-model="form.licensePlate" placeholder="请选择车辆"> | |
| 115 | + <el-option v-if="!construction.companyTrucks || construction.companyTrucks.indexOf(item.id) == -1" | |
| 116 | + v-for="item in companyTruckList" | |
| 117 | + :label="item.licenseplateNo" | |
| 118 | + :value="item.licenseplateNo" | |
| 119 | + :key="item.id" | |
| 120 | + @click.native="getTruck(item)"/> | |
| 121 | + </el-select> | |
| 122 | + </el-form-item> | |
| 123 | + </el-form> | |
| 124 | + <div slot="footer" class="dialog-footer"> | |
| 125 | + <el-button type="primary" @click="submitForm">确 定</el-button> | |
| 126 | + <el-button @click="cancel">取 消</el-button> | |
| 127 | + </div> | |
| 128 | + </el-dialog> | |
| 129 | + </div> | |
| 130 | +</template> | |
| 131 | + | |
| 132 | +<script> | |
| 133 | +import { listTruckActivate, getTruckActivate, delTruckActivate, addTruckActivate, updateTruckActivate, exportTruckActivate } from "@/api/business/truckActivate"; | |
| 134 | + | |
| 135 | + import { | |
| 136 | + todayDataList, | |
| 137 | + } from "@/api/business/threestep"; | |
| 138 | + | |
| 139 | +import { | |
| 140 | + truckList, | |
| 141 | + companyList, | |
| 142 | +} from "@/api/dict"; | |
| 143 | + | |
| 144 | +export default { | |
| 145 | + name: "TruckActivate", | |
| 146 | + data() { | |
| 147 | + return { | |
| 148 | + // 遮罩层 | |
| 149 | + loading: true, | |
| 150 | + // 选中数组 | |
| 151 | + ids: [], | |
| 152 | + // 非单个禁用 | |
| 153 | + single: true, | |
| 154 | + // 非多个禁用 | |
| 155 | + multiple: true, | |
| 156 | + // 显示搜索条件 | |
| 157 | + showSearch: true, | |
| 158 | + // 总条数 | |
| 159 | + total: 0, | |
| 160 | + // 车辆激活表格数据 | |
| 161 | + truckActivateList: [], | |
| 162 | + // 弹出层标题 | |
| 163 | + title: "", | |
| 164 | + // 是否显示弹出层 | |
| 165 | + open: false, | |
| 166 | + companyList:[], | |
| 167 | + // 查询参数 | |
| 168 | + queryParams: { | |
| 169 | + pageNum: 1, | |
| 170 | + pageSize: 10, | |
| 171 | + company: null, | |
| 172 | + licensePlate: null, | |
| 173 | + time: null, | |
| 174 | + construction: null, | |
| 175 | + status: null, | |
| 176 | + earthsite: null, | |
| 177 | + objectId: null, | |
| 178 | + createType: null, | |
| 179 | + activateTime: null, | |
| 180 | + }, | |
| 181 | + // 表单参数 | |
| 182 | + form: {}, | |
| 183 | + // 表单校验 | |
| 184 | + rules: { | |
| 185 | + construction: [{ | |
| 186 | + required: true, | |
| 187 | + message: '请填写完整', | |
| 188 | + trigger: 'change' | |
| 189 | + }, ], | |
| 190 | + | |
| 191 | + company: [{ | |
| 192 | + required: true, | |
| 193 | + message: '请填写完整', | |
| 194 | + trigger: 'change' | |
| 195 | + }, ], | |
| 196 | + | |
| 197 | + | |
| 198 | + licensePlate: [{ | |
| 199 | + required: true, | |
| 200 | + message: '请填写完整', | |
| 201 | + trigger: 'change' | |
| 202 | + }, ], | |
| 203 | + }, | |
| 204 | + constList:[], | |
| 205 | + constCompany:[], | |
| 206 | + companyTruckList:[], | |
| 207 | + | |
| 208 | + construction : null, | |
| 209 | + truck : null, | |
| 210 | + company:null, | |
| 211 | + }; | |
| 212 | + }, | |
| 213 | + created() { | |
| 214 | + this.getList(0); | |
| 215 | + }, | |
| 216 | + methods: { | |
| 217 | + /** 查询车辆激活列表 */ | |
| 218 | + getList(index) { | |
| 219 | + if(index == 0){ | |
| 220 | + this.queryParams.status = 0; | |
| 221 | + } | |
| 222 | + if(index == 1){ | |
| 223 | + this.queryParams.status = 1; | |
| 224 | + } | |
| 225 | + this.loading = true; | |
| 226 | + listTruckActivate(this.queryParams).then(response => { | |
| 227 | + this.truckActivateList = response.rows; | |
| 228 | + this.total = response.total; | |
| 229 | + this.loading = false; | |
| 230 | + }); | |
| 231 | + | |
| 232 | + let query = { | |
| 233 | + 'page':1, | |
| 234 | + 'size':9999, | |
| 235 | + 'creditStatus':0 | |
| 236 | + } | |
| 237 | + companyList(query).then(response => { | |
| 238 | + this.companyList = response.result.list; | |
| 239 | + }); | |
| 240 | + | |
| 241 | + | |
| 242 | + let data = { | |
| 243 | + type : 0, | |
| 244 | + status:1, | |
| 245 | + } | |
| 246 | + | |
| 247 | + todayDataList(data).then(res=>{ | |
| 248 | + this.constList = res; | |
| 249 | + }); | |
| 250 | + | |
| 251 | + }, | |
| 252 | + getCompany(obj){ | |
| 253 | + if(obj.companys){ | |
| 254 | + this.constCompany = obj.companys.split(","); | |
| 255 | + } | |
| 256 | + this.form.company = null; | |
| 257 | + this.construction = obj; | |
| 258 | + }, | |
| 259 | + | |
| 260 | + getTruckListByCompanyName(name){ | |
| 261 | + this.form.licensePlate = null; | |
| 262 | + for(let i in this.companyList){ | |
| 263 | + if(this.companyList[i].name == name){ | |
| 264 | + this.company = this.companyList[i]; | |
| 265 | + let remoteQuery = { | |
| 266 | + page:1, | |
| 267 | + size:9999, | |
| 268 | + companyID:this.companyList[i].id, | |
| 269 | + valid:0, | |
| 270 | + dishonestState:0, | |
| 271 | + } | |
| 272 | + truckList(remoteQuery).then(res=>{ | |
| 273 | + this.companyTruckList = res.result.list; | |
| 274 | + }); | |
| 275 | + | |
| 276 | + break; | |
| 277 | + } | |
| 278 | + } | |
| 279 | + }, | |
| 280 | + getTruck(truck){ | |
| 281 | + this.truck = truck; | |
| 282 | + }, | |
| 283 | + // 取消按钮 | |
| 284 | + cancel() { | |
| 285 | + this.open = false; | |
| 286 | + this.reset(); | |
| 287 | + }, | |
| 288 | + // 表单重置 | |
| 289 | + reset() { | |
| 290 | + this.form = { | |
| 291 | + id: null, | |
| 292 | + company: null, | |
| 293 | + licensePlate: null, | |
| 294 | + time: null, | |
| 295 | + construction: null, | |
| 296 | + status: 0, | |
| 297 | + earthsite: null, | |
| 298 | + objectId: null, | |
| 299 | + createBy: null, | |
| 300 | + createType: null, | |
| 301 | + activateTime: null, | |
| 302 | + createTime: null | |
| 303 | + }; | |
| 304 | + this.resetForm("form"); | |
| 305 | + }, | |
| 306 | + /** 搜索按钮操作 */ | |
| 307 | + handleQuery() { | |
| 308 | + this.queryParams.pageNum = 1; | |
| 309 | + this.getList(); | |
| 310 | + }, | |
| 311 | + /** 重置按钮操作 */ | |
| 312 | + resetQuery() { | |
| 313 | + this.resetForm("queryForm"); | |
| 314 | + this.handleQuery(); | |
| 315 | + }, | |
| 316 | + // 多选框选中数据 | |
| 317 | + handleSelectionChange(selection) { | |
| 318 | + this.ids = selection.map(item => item.id) | |
| 319 | + this.single = selection.length!==1 | |
| 320 | + this.multiple = !selection.length | |
| 321 | + }, | |
| 322 | + /** 新增按钮操作 */ | |
| 323 | + handleAdd() { | |
| 324 | + this.reset(); | |
| 325 | + this.open = true; | |
| 326 | + this.title = "添加车辆激活"; | |
| 327 | + }, | |
| 328 | + /** 修改按钮操作 */ | |
| 329 | + handleUpdate(row) { | |
| 330 | + this.reset(); | |
| 331 | + this.form.id = row.id; | |
| 332 | + updateTruckActivate(this.form).then(response => { | |
| 333 | + this.msgSuccess("修改成功"); | |
| 334 | + this.open = false; | |
| 335 | + this.getList(); | |
| 336 | + }); | |
| 337 | + | |
| 338 | + }, | |
| 339 | + /** 提交按钮 */ | |
| 340 | + submitForm() { | |
| 341 | + this.$refs["form"].validate(valid => { | |
| 342 | + if (valid) { | |
| 343 | + this.form.objectId = this.truck.id; | |
| 344 | + this.form.company = this.company.name; | |
| 345 | + this.form.earthsite = this.construction.earthsitesName; | |
| 346 | + this.form.status = 0; | |
| 347 | + this.form.activateTime = new Date(); | |
| 348 | + | |
| 349 | + addTruckActivate(this.form).then(response => { | |
| 350 | + this.msgSuccess("新增成功"); | |
| 351 | + this.open = false; | |
| 352 | + this.getList(); | |
| 353 | + }); | |
| 354 | + } | |
| 355 | + }); | |
| 356 | + }, | |
| 357 | + /** 删除按钮操作 */ | |
| 358 | + handleDelete(row) { | |
| 359 | + const ids = row.id || this.ids; | |
| 360 | + this.$confirm('是否确认删除车辆激活编号为"' + ids + '"的数据项?', "警告", { | |
| 361 | + confirmButtonText: "确定", | |
| 362 | + cancelButtonText: "取消", | |
| 363 | + type: "warning" | |
| 364 | + }).then(function() { | |
| 365 | + return delTruckActivate(ids); | |
| 366 | + }).then(() => { | |
| 367 | + this.getList(); | |
| 368 | + this.msgSuccess("删除成功"); | |
| 369 | + }) | |
| 370 | + }, | |
| 371 | + /** 导出按钮操作 */ | |
| 372 | + handleExport() { | |
| 373 | + const queryParams = this.queryParams; | |
| 374 | + this.$confirm('是否确认导出所有车辆激活数据项?', "警告", { | |
| 375 | + confirmButtonText: "确定", | |
| 376 | + cancelButtonText: "取消", | |
| 377 | + type: "warning" | |
| 378 | + }).then(function() { | |
| 379 | + return exportTruckActivate(queryParams); | |
| 380 | + }).then(response => { | |
| 381 | + this.download(response.message); | |
| 382 | + }) | |
| 383 | + } | |
| 384 | + } | |
| 385 | +}; | |
| 386 | +</script> | |
| 387 | + | |
| 388 | +<style scope> | |
| 389 | + div{ | |
| 390 | + font-size:12px; | |
| 391 | + } | |
| 392 | + | |
| 393 | +</style> | ... | ... |
trash-ui/src/views/monitor/job/index.vue
trash-ui/src/views/monitor/job/log.vue
trash-ui/src/views/monitor/logininfor/index.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | clearable |
| 9 | 9 | style="width: 240px;" |
| 10 | 10 | size="small" |
| 11 | - @keyup.enter.native="handleQuery" | |
| 11 | + | |
| 12 | 12 | /> |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="用户名称" prop="userName"> |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | clearable |
| 19 | 19 | style="width: 240px;" |
| 20 | 20 | size="small" |
| 21 | - @keyup.enter.native="handleQuery" | |
| 21 | + | |
| 22 | 22 | /> |
| 23 | 23 | </el-form-item> |
| 24 | 24 | <el-form-item label="状态" prop="status"> | ... | ... |
trash-ui/src/views/monitor/online/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入登录地址" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="用户名称" prop="userName"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入用户名称" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item> | ... | ... |
trash-ui/src/views/monitor/operlog/index.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | clearable |
| 9 | 9 | style="width: 240px;" |
| 10 | 10 | size="small" |
| 11 | - @keyup.enter.native="handleQuery" | |
| 11 | + | |
| 12 | 12 | /> |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="操作人员" prop="operName"> |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | clearable |
| 19 | 19 | style="width: 240px;" |
| 20 | 20 | size="small" |
| 21 | - @keyup.enter.native="handleQuery" | |
| 21 | + | |
| 22 | 22 | /> |
| 23 | 23 | </el-form-item> |
| 24 | 24 | <el-form-item label="类型" prop="businessType"> | ... | ... |
trash-ui/src/views/office/handle/index.vue
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入来文单位" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item label="收文时间" prop="receiveTime"> |
| ... | ... | @@ -33,7 +33,7 @@ |
| 33 | 33 | placeholder="请输入文件标题" |
| 34 | 34 | clearable |
| 35 | 35 | size="small" |
| 36 | - @keyup.enter.native="handleQuery" | |
| 36 | + | |
| 37 | 37 | /> |
| 38 | 38 | </el-form-item> |
| 39 | 39 | <el-form-item label="信访单位(人)" prop="sendPerson"> |
| ... | ... | @@ -42,7 +42,7 @@ |
| 42 | 42 | placeholder="请输入信访单位(人)" |
| 43 | 43 | clearable |
| 44 | 44 | size="small" |
| 45 | - @keyup.enter.native="handleQuery" | |
| 45 | + | |
| 46 | 46 | /> |
| 47 | 47 | </el-form-item> |
| 48 | 48 | <el-form-item label="信访日期" prop="sendDate"> | ... | ... |
trash-ui/src/views/office/handleAffairsCommon/index.vue
trash-ui/src/views/office/handleAffairsXF/index.vue
trash-ui/src/views/office/leaveApplication/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入申请人" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="申请部门" prop="deptId"> |
| ... | ... | @@ -285,33 +285,33 @@ export default { |
| 285 | 285 | // 表单校验 |
| 286 | 286 | rules: { |
| 287 | 287 | type: [ |
| 288 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 288 | + {required: true, message: '必填', trigger: 'change'}, | |
| 289 | 289 | ], |
| 290 | 290 | beginDate: [ |
| 291 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 291 | + {required: true, message: '必填', trigger: 'change'}, | |
| 292 | 292 | ], |
| 293 | 293 | endDate: [ |
| 294 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 294 | + {required: true, message: '必填', trigger: 'change'}, | |
| 295 | 295 | ], |
| 296 | 296 | phone: [ |
| 297 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 297 | + {required: true, message: '必填', trigger: 'change'}, | |
| 298 | 298 | { |
| 299 | 299 | pattern: /^1(3|4|5|7|8|9)\d{9}$/, |
| 300 | 300 | message: '手机号格式错误', |
| 301 | - trigger: 'blur' | |
| 301 | + trigger: 'change' | |
| 302 | 302 | } |
| 303 | 303 | ], |
| 304 | 304 | numberDays: [ |
| 305 | - {required: true, message: '必填', trigger: 'blur'}, | |
| 305 | + {required: true, message: '必填', trigger: 'change'}, | |
| 306 | 306 | { |
| 307 | 307 | pattern: /^(0|[1-9]\d*)(\.5)?$/, |
| 308 | 308 | message: '只能为整数或者0.5', |
| 309 | - trigger: 'blur' | |
| 309 | + trigger: 'change' | |
| 310 | 310 | }, |
| 311 | 311 | { |
| 312 | 312 | pattern: /^(?!0+(\.0+)?$)\d+(\.\d+)?$/, |
| 313 | 313 | message: '不能为0', |
| 314 | - trigger: 'blur' | |
| 314 | + trigger: 'change' | |
| 315 | 315 | } |
| 316 | 316 | ] |
| 317 | 317 | }, | ... | ... |
trash-ui/src/views/office/logistics/index.vue
| ... | ... | @@ -20,7 +20,7 @@ |
| 20 | 20 | placeholder="请输入申请人" |
| 21 | 21 | clearable |
| 22 | 22 | size="small" |
| 23 | - @keyup.enter.native="handleQuery" | |
| 23 | + | |
| 24 | 24 | /> |
| 25 | 25 | </el-form-item> |
| 26 | 26 | <el-form-item label="物品申请日期" prop="useDate" v-if="type!=0"> |
| ... | ... | @@ -37,7 +37,7 @@ |
| 37 | 37 | placeholder="请输入物品名称" |
| 38 | 38 | clearable |
| 39 | 39 | size="small" |
| 40 | - @keyup.enter.native="handleQuery" | |
| 40 | + | |
| 41 | 41 | /> |
| 42 | 42 | </el-form-item> |
| 43 | 43 | <el-form-item> |
| ... | ... | @@ -449,7 +449,7 @@ export default { |
| 449 | 449 | }).then(function () { |
| 450 | 450 | return exportLogistics(queryParams); |
| 451 | 451 | }).then(response => { |
| 452 | - this.download(response.msg); | |
| 452 | + this.download(response.message); | |
| 453 | 453 | }) |
| 454 | 454 | }, |
| 455 | 455 | changeType() { | ... | ... |
trash-ui/src/views/office/management/index.vue
trash-ui/src/views/other/projectCheck/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入工程名称" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="检查时间" prop="checkTime"> |
| ... | ... | @@ -1150,7 +1150,7 @@ export default { |
| 1150 | 1150 | }).then(function() { |
| 1151 | 1151 | return exportProjectCheck(queryParams); |
| 1152 | 1152 | }).then(response => { |
| 1153 | - this.download(response.msg); | |
| 1153 | + this.download(response.message); | |
| 1154 | 1154 | }) |
| 1155 | 1155 | } |
| 1156 | 1156 | } | ... | ... |
trash-ui/src/views/otherData/otherData/index.vue
| ... | ... | @@ -207,15 +207,15 @@ export default { |
| 207 | 207 | }, |
| 208 | 208 | // 表单校验 |
| 209 | 209 | rules: {place: [ |
| 210 | - { required: true, message: '请选择区域', trigger: 'blur' }, | |
| 210 | + { required: true, message: '请选择区域', trigger: 'change' }, | |
| 211 | 211 | ],type: [ |
| 212 | - { required: true, message: '请填写类型', trigger: 'blur' }, | |
| 212 | + { required: true, message: '请填写类型', trigger: 'change' }, | |
| 213 | 213 | ],context: [ |
| 214 | - { required: true, message: '请填写内容', trigger: 'blur' }, | |
| 214 | + { required: true, message: '请填写内容', trigger: 'change' }, | |
| 215 | 215 | ],time: [ |
| 216 | - { required: true, message: '请选择时间', trigger: 'blur' }, | |
| 216 | + { required: true, message: '请选择时间', trigger: 'change' }, | |
| 217 | 217 | ],people: [ |
| 218 | - { required: true, message: '请填写人员', trigger: 'blur' }, | |
| 218 | + { required: true, message: '请填写人员', trigger: 'change' }, | |
| 219 | 219 | ]}, |
| 220 | 220 | fileList:[], |
| 221 | 221 | areas: [], | ... | ... |
trash-ui/src/views/sign/sign/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入基础数据ID" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="businessKey预留" prop="workflowId"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入businessKey预留" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item> |
| ... | ... | @@ -280,7 +280,7 @@ export default { |
| 280 | 280 | }).then(function() { |
| 281 | 281 | return exportSign(queryParams); |
| 282 | 282 | }).then(response => { |
| 283 | - this.download(response.msg); | |
| 283 | + this.download(response.message); | |
| 284 | 284 | }) |
| 285 | 285 | } |
| 286 | 286 | } | ... | ... |
trash-ui/src/views/system/config/index.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | 10 | style="width: 240px" |
| 11 | - @keyup.enter.native="handleQuery" | |
| 11 | + | |
| 12 | 12 | /> |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="参数键名" prop="configKey"> |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | clearable |
| 19 | 19 | size="small" |
| 20 | 20 | style="width: 240px" |
| 21 | - @keyup.enter.native="handleQuery" | |
| 21 | + | |
| 22 | 22 | /> |
| 23 | 23 | </el-form-item> |
| 24 | 24 | <el-form-item label="系统内置" prop="configType"> | ... | ... |
trash-ui/src/views/system/dept/index.vue
trash-ui/src/views/system/dict/data.vue
trash-ui/src/views/system/dict/index.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | 10 | style="width: 240px" |
| 11 | - @keyup.enter.native="handleQuery" | |
| 11 | + | |
| 12 | 12 | /> |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="字典类型" prop="dictType"> |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | clearable |
| 19 | 19 | size="small" |
| 20 | 20 | style="width: 240px" |
| 21 | - @keyup.enter.native="handleQuery" | |
| 21 | + | |
| 22 | 22 | /> |
| 23 | 23 | </el-form-item> |
| 24 | 24 | <el-form-item label="状态" prop="status"> | ... | ... |
trash-ui/src/views/system/menu/index.vue
trash-ui/src/views/system/notice/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入公告标题" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="操作人员" prop="createBy"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入操作人员" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item label="类型" prop="noticeType"> | ... | ... |
trash-ui/src/views/system/post/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入岗位编码" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="岗位名称" prop="postName"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入岗位名称" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item label="状态" prop="status"> | ... | ... |
trash-ui/src/views/system/role/index.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | 10 | style="width: 240px" |
| 11 | - @keyup.enter.native="handleQuery" | |
| 11 | + | |
| 12 | 12 | /> |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="权限字符" prop="roleKey"> |
| ... | ... | @@ -18,7 +18,7 @@ |
| 18 | 18 | clearable |
| 19 | 19 | size="small" |
| 20 | 20 | style="width: 240px" |
| 21 | - @keyup.enter.native="handleQuery" | |
| 21 | + | |
| 22 | 22 | /> |
| 23 | 23 | </el-form-item> |
| 24 | 24 | <el-form-item label="状态" prop="status"> | ... | ... |
trash-ui/src/views/system/user/index.vue
| ... | ... | @@ -35,7 +35,7 @@ |
| 35 | 35 | clearable |
| 36 | 36 | size="small" |
| 37 | 37 | style="width: 240px" |
| 38 | - @keyup.enter.native="handleQuery" | |
| 38 | + | |
| 39 | 39 | /> |
| 40 | 40 | </el-form-item> |
| 41 | 41 | <el-form-item label="手机号码" prop="phonenumber"> |
| ... | ... | @@ -45,7 +45,7 @@ |
| 45 | 45 | clearable |
| 46 | 46 | size="small" |
| 47 | 47 | style="width: 240px" |
| 48 | - @keyup.enter.native="handleQuery" | |
| 48 | + | |
| 49 | 49 | /> |
| 50 | 50 | </el-form-item> |
| 51 | 51 | <el-form-item label="状态" prop="status"> | ... | ... |
trash-ui/src/views/tool/build/CodeTypeDialog.vue
trash-ui/src/views/tool/build/TreeNodeDialog.vue
| ... | ... | @@ -89,14 +89,14 @@ export default { |
| 89 | 89 | { |
| 90 | 90 | required: true, |
| 91 | 91 | message: '请输入选项名', |
| 92 | - trigger: 'blur' | |
| 92 | + trigger: 'change' | |
| 93 | 93 | } |
| 94 | 94 | ], |
| 95 | 95 | value: [ |
| 96 | 96 | { |
| 97 | 97 | required: true, |
| 98 | 98 | message: '请输入选项值', |
| 99 | - trigger: 'blur' | |
| 99 | + trigger: 'change' | |
| 100 | 100 | } |
| 101 | 101 | ] |
| 102 | 102 | }, | ... | ... |
trash-ui/src/views/tool/gen/importTable.vue
| ... | ... | @@ -8,7 +8,7 @@ |
| 8 | 8 | placeholder="请输入表名称" |
| 9 | 9 | clearable |
| 10 | 10 | size="small" |
| 11 | - @keyup.enter.native="handleQuery" | |
| 11 | + | |
| 12 | 12 | /> |
| 13 | 13 | </el-form-item> |
| 14 | 14 | <el-form-item label="表描述" prop="tableComment"> |
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | placeholder="请输入表描述" |
| 18 | 18 | clearable |
| 19 | 19 | size="small" |
| 20 | - @keyup.enter.native="handleQuery" | |
| 20 | + | |
| 21 | 21 | /> |
| 22 | 22 | </el-form-item> |
| 23 | 23 | <el-form-item> | ... | ... |
trash-ui/src/views/tool/gen/index.vue
| ... | ... | @@ -7,7 +7,7 @@ |
| 7 | 7 | placeholder="请输入表名称" |
| 8 | 8 | clearable |
| 9 | 9 | size="small" |
| 10 | - @keyup.enter.native="handleQuery" | |
| 10 | + | |
| 11 | 11 | /> |
| 12 | 12 | </el-form-item> |
| 13 | 13 | <el-form-item label="表描述" prop="tableComment"> |
| ... | ... | @@ -16,7 +16,7 @@ |
| 16 | 16 | placeholder="请输入表描述" |
| 17 | 17 | clearable |
| 18 | 18 | size="small" |
| 19 | - @keyup.enter.native="handleQuery" | |
| 19 | + | |
| 20 | 20 | /> |
| 21 | 21 | </el-form-item> |
| 22 | 22 | <el-form-item label="创建时间"> | ... | ... |
trash-ui/src/views/workflow/index.vue
| ... | ... | @@ -17,7 +17,7 @@ |
| 17 | 17 | placeholder="请输入标题" |
| 18 | 18 | clearable |
| 19 | 19 | size="small" |
| 20 | - @keyup.enter.native="handleQuery" | |
| 20 | + | |
| 21 | 21 | /> |
| 22 | 22 | </el-form-item> |
| 23 | 23 | <!-- <el-form-item label="开始时间" prop="leaveStartTime">--> |
| ... | ... | @@ -292,16 +292,16 @@ |
| 292 | 292 | {required: true, message: '请假类型不能为空', trigger: 'change'} |
| 293 | 293 | ], |
| 294 | 294 | title: [ |
| 295 | - {required: true, message: '标题不能为空', trigger: 'blur'} | |
| 295 | + {required: true, message: '标题不能为空', trigger: 'change'} | |
| 296 | 296 | ], |
| 297 | 297 | reason: [ |
| 298 | - {required: true, message: '原因不能为空', trigger: 'blur'} | |
| 298 | + {required: true, message: '原因不能为空', trigger: 'change'} | |
| 299 | 299 | ], |
| 300 | 300 | leaveStartTime: [ |
| 301 | - {required: true, message: '开始时间不能为空', trigger: 'blur'} | |
| 301 | + {required: true, message: '开始时间不能为空', trigger: 'change'} | |
| 302 | 302 | ], |
| 303 | 303 | leaveEndTime: [ |
| 304 | - {required: true, message: '结束时间不能为空', trigger: 'blur'} | |
| 304 | + {required: true, message: '结束时间不能为空', trigger: 'change'} | |
| 305 | 305 | ] |
| 306 | 306 | } |
| 307 | 307 | } | ... | ... |
trash-ui/src/views/workflow/leaveAll.vue
trash-workFlow/pom.xml
| ... | ... | @@ -21,5 +21,10 @@ |
| 21 | 21 | <groupId>com.trash</groupId> |
| 22 | 22 | <artifactId>trash-common</artifactId> |
| 23 | 23 | </dependency> |
| 24 | + <dependency> | |
| 25 | + <groupId>com.google.code.gson</groupId> | |
| 26 | + <artifactId>gson</artifactId> | |
| 27 | + <version>2.3.1</version> | |
| 28 | + </dependency> | |
| 24 | 29 | </dependencies> |
| 25 | 30 | </project> |
| 26 | 31 | \ No newline at end of file | ... | ... |
trash-workFlow/src/main/java/com/trash/business/controller/SupervisionThreestepController.java
| ... | ... | @@ -25,8 +25,14 @@ import com.trash.common.config.trashConfig; |
| 25 | 25 | import com.trash.common.core.controller.BaseController; |
| 26 | 26 | import com.trash.common.core.domain.AjaxResult; |
| 27 | 27 | import com.trash.common.enums.BusinessType; |
| 28 | +import com.alibaba.fastjson.JSON; | |
| 29 | +import com.alibaba.fastjson.JSONArray; | |
| 30 | +import com.alibaba.fastjson.JSONObject; | |
| 31 | +import com.google.gson.Gson; | |
| 28 | 32 | import com.trash.business.domain.SupervisionThreestep; |
| 33 | +import com.trash.business.domain.dayWork; | |
| 29 | 34 | import com.trash.business.service.ISupervisionThreestepService; |
| 35 | +import com.trash.common.utils.RemoteServerUtils; | |
| 30 | 36 | import com.trash.common.utils.StringUtils; |
| 31 | 37 | import com.trash.common.utils.file.FileUtils; |
| 32 | 38 | import com.trash.common.utils.poi.ExcelUtil; |
| ... | ... | @@ -69,6 +75,17 @@ public class SupervisionThreestepController extends BaseController |
| 69 | 75 | return getDataTable(list); |
| 70 | 76 | } |
| 71 | 77 | |
| 78 | + | |
| 79 | + @PostMapping("/exportDayWorkList") | |
| 80 | + public AjaxResult exportDayWorkList(@RequestBody List<dayWork> list) | |
| 81 | + { | |
| 82 | + | |
| 83 | + ExcelUtil<dayWork> util = new ExcelUtil<dayWork>(dayWork.class); | |
| 84 | + return util.exportExcel(list, "dayWork"); | |
| 85 | + | |
| 86 | + } | |
| 87 | + | |
| 88 | + | |
| 72 | 89 | @PostMapping("/todayDataList") |
| 73 | 90 | public List<SupervisionThreestep> todayDataList(@RequestBody SupervisionThreestep supervisionThreestep) |
| 74 | 91 | { |
| ... | ... | @@ -100,7 +117,23 @@ public class SupervisionThreestepController extends BaseController |
| 100 | 117 | public AjaxResult export(SupervisionThreestep supervisionThreestep) |
| 101 | 118 | { |
| 102 | 119 | List<SupervisionThreestep> list = supervisionThreestepService.selectSupervisionThreestepList(supervisionThreestep); |
| 120 | + | |
| 121 | + JSONArray array = RemoteServerUtils.getAreas(); | |
| 122 | + | |
| 123 | + for(Object object :array){ | |
| 124 | + JSONObject jsonObject = (JSONObject)object; | |
| 125 | + for(SupervisionThreestep sThreestep : list){ | |
| 126 | + if(jsonObject.getString("code").equals(sThreestep.getPlace())){ | |
| 127 | + sThreestep.setPlace(jsonObject.getString("name")); | |
| 128 | + | |
| 129 | + } | |
| 130 | + | |
| 131 | + } | |
| 132 | + | |
| 133 | + } | |
| 134 | + | |
| 103 | 135 | ExcelUtil<SupervisionThreestep> util = new ExcelUtil<SupervisionThreestep>(SupervisionThreestep.class); |
| 136 | + | |
| 104 | 137 | return util.exportExcel(list, "threestep"); |
| 105 | 138 | } |
| 106 | 139 | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/CompanyCredit.java
| ... | ... | @@ -17,7 +17,7 @@ public class CompanyCredit extends BaseEntity |
| 17 | 17 | { |
| 18 | 18 | private static final long serialVersionUID = 1L; |
| 19 | 19 | |
| 20 | - /** 序号 */ | |
| 20 | + @Excel(name = "序号") | |
| 21 | 21 | private Long id; |
| 22 | 22 | |
| 23 | 23 | /** 运输企业 */ |
| ... | ... | @@ -25,7 +25,7 @@ public class CompanyCredit extends BaseEntity |
| 25 | 25 | private String name; |
| 26 | 26 | |
| 27 | 27 | /** 失信时间 */ |
| 28 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 28 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 29 | 29 | @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd") |
| 30 | 30 | private Date time; |
| 31 | 31 | |
| ... | ... | @@ -38,15 +38,13 @@ public class CompanyCredit extends BaseEntity |
| 38 | 38 | private String reason; |
| 39 | 39 | |
| 40 | 40 | /** 0当前 1历史 */ |
| 41 | - @Excel(name = "0当前 1历史") | |
| 42 | 41 | private Long status; |
| 43 | 42 | |
| 44 | 43 | /** 0撤销 1失信 */ |
| 45 | - @Excel(name = "0撤销 1失信") | |
| 44 | + @Excel(name = "状态" , readConverterExp = "0=撤销失信,1=失信") | |
| 46 | 45 | private Long lostCredit; |
| 47 | 46 | |
| 48 | 47 | /** 基础数据ID */ |
| 49 | - @Excel(name = "基础数据ID") | |
| 50 | 48 | private String objectId; |
| 51 | 49 | |
| 52 | 50 | public void setId(Long id) | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/ConstructionCredit.java
| ... | ... | @@ -17,22 +17,23 @@ public class ConstructionCredit extends BaseEntity |
| 17 | 17 | { |
| 18 | 18 | private static final long serialVersionUID = 1L; |
| 19 | 19 | |
| 20 | + @Excel(name = "序号") | |
| 20 | 21 | private Long id; |
| 21 | 22 | |
| 22 | 23 | @Excel(name = "工地名称") |
| 23 | 24 | private String name; |
| 24 | 25 | |
| 25 | - @Excel(name = "工地垃圾类型") | |
| 26 | + @Excel(name = "建筑垃圾类型") | |
| 26 | 27 | private String type; |
| 27 | 28 | |
| 28 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 29 | - @Excel(name = "操作日期",dateFormat="yyyy-MM-dd") | |
| 29 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 30 | + @Excel(name = "失信时间",dateFormat="yyyy-MM-dd") | |
| 30 | 31 | private Date time; |
| 31 | 32 | |
| 32 | 33 | @Excel(name = "所属区域") |
| 33 | 34 | private String place; |
| 34 | 35 | |
| 35 | - @Excel(name = "操作原因") | |
| 36 | + @Excel(name = "失信原因") | |
| 36 | 37 | private String reason; |
| 37 | 38 | |
| 38 | 39 | private Long status; | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/DriverCredit.java
| ... | ... | @@ -18,6 +18,7 @@ public class DriverCredit extends BaseEntity |
| 18 | 18 | private static final long serialVersionUID = 1L; |
| 19 | 19 | |
| 20 | 20 | /** 序号 */ |
| 21 | + @Excel(name = "序号") | |
| 21 | 22 | private Long id; |
| 22 | 23 | |
| 23 | 24 | /** 运输企业 */ |
| ... | ... | @@ -29,7 +30,7 @@ public class DriverCredit extends BaseEntity |
| 29 | 30 | private String idNumber; |
| 30 | 31 | |
| 31 | 32 | /** 失信时间 */ |
| 32 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 33 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 33 | 34 | @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd") |
| 34 | 35 | private Date time; |
| 35 | 36 | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/EarthsitesCredit.java
| ... | ... | @@ -18,6 +18,7 @@ public class EarthsitesCredit extends BaseEntity |
| 18 | 18 | private static final long serialVersionUID = 1L; |
| 19 | 19 | |
| 20 | 20 | /** 序号 */ |
| 21 | + @Excel(name = "序号") | |
| 21 | 22 | private Long id; |
| 22 | 23 | |
| 23 | 24 | /** 消纳场名称 */ |
| ... | ... | @@ -29,7 +30,7 @@ public class EarthsitesCredit extends BaseEntity |
| 29 | 30 | private String type; |
| 30 | 31 | |
| 31 | 32 | /** 失信时间 */ |
| 32 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 33 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 33 | 34 | @Excel(name = "失信时间", width = 30, dateFormat = "yyyy-MM-dd") |
| 34 | 35 | private Date time; |
| 35 | 36 | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/SupervisionThreestep.java
| ... | ... | @@ -18,16 +18,17 @@ public class SupervisionThreestep extends BaseEntity |
| 18 | 18 | private static final long serialVersionUID = 1L; |
| 19 | 19 | |
| 20 | 20 | /** 序号 */ |
| 21 | + @Excel(name = "序号") | |
| 21 | 22 | private Long id; |
| 22 | 23 | |
| 23 | - /** 工地名称 */ | |
| 24 | - @Excel(name = "工地名称") | |
| 25 | - private String name; | |
| 26 | 24 | |
| 27 | 25 | /** 项目类型 消纳场/工地 */ |
| 28 | - @Excel(name = "项目类型 消纳场/工地") | |
| 26 | + @Excel(name = "项目类型",readConverterExp = "0=工地,1=消纳场") | |
| 29 | 27 | private Long type; |
| 30 | 28 | |
| 29 | + /** 工地名称 */ | |
| 30 | + @Excel(name = "项目名称") | |
| 31 | + private String name; | |
| 31 | 32 | /** 管辖区 */ |
| 32 | 33 | @Excel(name = "管辖区") |
| 33 | 34 | private String place; |
| ... | ... | @@ -38,11 +39,9 @@ public class SupervisionThreestep extends BaseEntity |
| 38 | 39 | private Date selfCheckTime; |
| 39 | 40 | |
| 40 | 41 | /** 基础数据ID */ |
| 41 | - @Excel(name = "基础数据ID") | |
| 42 | 42 | private String objectId; |
| 43 | 43 | |
| 44 | 44 | /** 消纳场ID */ |
| 45 | - @Excel(name = "消纳场ID") | |
| 46 | 45 | private String earthsitesId; |
| 47 | 46 | |
| 48 | 47 | /** 检查时间 */ |
| ... | ... | @@ -56,23 +55,18 @@ public class SupervisionThreestep extends BaseEntity |
| 56 | 55 | @Excel(name = "抽查时间", width = 30, dateFormat = "yyyy-MM-dd") |
| 57 | 56 | private Date checkEndTime; |
| 58 | 57 | |
| 59 | - | |
| 60 | 58 | /** 消纳场名称 */ |
| 61 | - @Excel(name = "消纳场名称") | |
| 62 | 59 | private String earthsitesName; |
| 63 | 60 | |
| 64 | 61 | /** 消纳合同编号 */ |
| 65 | - @Excel(name = "消纳合同编号") | |
| 66 | 62 | private String contract; |
| 67 | 63 | |
| 68 | 64 | private String contractId; |
| 69 | 65 | |
| 70 | 66 | /** 运输企业 */ |
| 71 | - @Excel(name = "运输企业") | |
| 72 | 67 | private String companys; |
| 73 | 68 | |
| 74 | 69 | /** 运输车辆 */ |
| 75 | - @Excel(name = "运输车辆") | |
| 76 | 70 | private String companyTrucks; |
| 77 | 71 | |
| 78 | 72 | private String params; |
| ... | ... | @@ -343,11 +337,9 @@ public class SupervisionThreestep extends BaseEntity |
| 343 | 337 | } |
| 344 | 338 | |
| 345 | 339 | /** 现场负责人 */ |
| 346 | - @Excel(name = "现场负责人") | |
| 347 | 340 | private String person; |
| 348 | 341 | |
| 349 | 342 | /** 电话 */ |
| 350 | - @Excel(name = "电话") | |
| 351 | 343 | private String phone; |
| 352 | 344 | |
| 353 | 345 | private Long status; | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/TruckCredit.java
| ... | ... | @@ -19,6 +19,7 @@ public class TruckCredit extends BaseEntity |
| 19 | 19 | private static final long serialVersionUID = 1L; |
| 20 | 20 | |
| 21 | 21 | /** 序号 */ |
| 22 | + @Excel(name = "序号") | |
| 22 | 23 | private Long id; |
| 23 | 24 | |
| 24 | 25 | /** 运输企业编号 */ |
| ... | ... | @@ -41,12 +42,11 @@ public class TruckCredit extends BaseEntity |
| 41 | 42 | private Long lostCredit; |
| 42 | 43 | |
| 43 | 44 | /** 基础数据ID */ |
| 44 | - @Excel(name = "基础数据ID") | |
| 45 | 45 | private String objectId; |
| 46 | 46 | |
| 47 | 47 | private Long createType; |
| 48 | 48 | |
| 49 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 49 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 50 | 50 | @Excel(name = "${失信时间}", dateFormat = "yyyy-MM-dd") |
| 51 | 51 | private Date time; |
| 52 | 52 | ... | ... |
trash-workFlow/src/main/java/com/trash/business/domain/dayWork.java
0 → 100644
| 1 | +package com.trash.business.domain; | |
| 2 | + | |
| 3 | +import java.util.Date; | |
| 4 | +import com.fasterxml.jackson.annotation.JsonFormat; | |
| 5 | +import org.apache.commons.lang3.builder.ToStringBuilder; | |
| 6 | +import org.apache.commons.lang3.builder.ToStringStyle; | |
| 7 | +import com.trash.common.annotation.Excel; | |
| 8 | +import com.trash.common.core.domain.BaseEntity; | |
| 9 | + | |
| 10 | +/** | |
| 11 | + * 三查机制对象 supervision_threestep | |
| 12 | + * | |
| 13 | + * @author trash | |
| 14 | + * @date 2023-04-24 | |
| 15 | + */ | |
| 16 | +public class dayWork extends BaseEntity | |
| 17 | +{ | |
| 18 | + private static final long serialVersionUID = 1L; | |
| 19 | + | |
| 20 | + /** 工地名称 */ | |
| 21 | + @Excel(name = "工地名称") | |
| 22 | + private String name; | |
| 23 | + | |
| 24 | + /** 项目类型 消纳场/工地 */ | |
| 25 | + @Excel(name = "项目类型") | |
| 26 | + private String type; | |
| 27 | + | |
| 28 | + /** 管辖区 */ | |
| 29 | + @Excel(name = "管辖区") | |
| 30 | + private String place; | |
| 31 | + | |
| 32 | + @Excel(name = "审查意见") | |
| 33 | + private String subReason; | |
| 34 | + | |
| 35 | + | |
| 36 | + /** 消纳场名称 */ | |
| 37 | + @Excel(name = "消纳场名称") | |
| 38 | + private String ename; | |
| 39 | + | |
| 40 | + /** 项目类型 消纳场/工地 */ | |
| 41 | + @Excel(name = "消纳场类型类型") | |
| 42 | + private String etype; | |
| 43 | + | |
| 44 | + | |
| 45 | + @Excel(name = "审查意见") | |
| 46 | + private String esubSeason; | |
| 47 | + | |
| 48 | + @Excel(name = "开工状态") | |
| 49 | + private String estatus; | |
| 50 | + | |
| 51 | + public String getName() { | |
| 52 | + return name; | |
| 53 | + } | |
| 54 | + | |
| 55 | + public void setName(String name) { | |
| 56 | + this.name = name; | |
| 57 | + } | |
| 58 | + | |
| 59 | + public String getType() { | |
| 60 | + return type; | |
| 61 | + } | |
| 62 | + | |
| 63 | + public void setType(String type) { | |
| 64 | + this.type = type; | |
| 65 | + } | |
| 66 | + | |
| 67 | + public String getPlace() { | |
| 68 | + return place; | |
| 69 | + } | |
| 70 | + | |
| 71 | + public void setPlace(String place) { | |
| 72 | + this.place = place; | |
| 73 | + } | |
| 74 | + | |
| 75 | + public String getSubReason() { | |
| 76 | + return subReason; | |
| 77 | + } | |
| 78 | + | |
| 79 | + public void setSubReason(String subReason) { | |
| 80 | + this.subReason = subReason; | |
| 81 | + } | |
| 82 | + | |
| 83 | + public String getEname() { | |
| 84 | + return ename; | |
| 85 | + } | |
| 86 | + | |
| 87 | + public void setEname(String ename) { | |
| 88 | + this.ename = ename; | |
| 89 | + } | |
| 90 | + | |
| 91 | + public String getEtype() { | |
| 92 | + return etype; | |
| 93 | + } | |
| 94 | + | |
| 95 | + public void setEtype(String etype) { | |
| 96 | + this.etype = etype; | |
| 97 | + } | |
| 98 | + | |
| 99 | + public String getEsubSeason() { | |
| 100 | + return esubSeason; | |
| 101 | + } | |
| 102 | + | |
| 103 | + public void setEsubSeason(String esubSeason) { | |
| 104 | + this.esubSeason = esubSeason; | |
| 105 | + } | |
| 106 | + | |
| 107 | + public String getEstatus() { | |
| 108 | + return estatus; | |
| 109 | + } | |
| 110 | + | |
| 111 | + public void setEstatus(String estatus) { | |
| 112 | + this.estatus = estatus; | |
| 113 | + } | |
| 114 | + | |
| 115 | + | |
| 116 | + | |
| 117 | + | |
| 118 | + | |
| 119 | +} | ... | ... |
trash-workFlow/src/main/java/com/trash/caseOffline/domain/CaseOffline.java
| ... | ... | @@ -63,19 +63,19 @@ public class CaseOffline extends BaseEntity |
| 63 | 63 | private String advice2; |
| 64 | 64 | |
| 65 | 65 | /** 失信时间 */ |
| 66 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 66 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 67 | 67 | private Date advice2Time; |
| 68 | 68 | |
| 69 | 69 | /** 审批意见 */ |
| 70 | 70 | private String advice3; |
| 71 | 71 | /** 失信时间 */ |
| 72 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 72 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 73 | 73 | private Date advice3Time; |
| 74 | 74 | |
| 75 | 75 | /** 审批意见 */ |
| 76 | 76 | private String advice4; |
| 77 | 77 | /** 失信时间 */ |
| 78 | - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:SS") | |
| 78 | + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") | |
| 79 | 79 | private Date advice4Time; |
| 80 | 80 | |
| 81 | 81 | /** 审批意见 */ | ... | ... |
trash-workFlow/src/main/resources/mapper/SupervisionThreestepMapper.xml
| ... | ... | @@ -155,8 +155,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 155 | 155 | <select id="selectDayWorkList" parameterType="SupervisionThreestep" |
| 156 | 156 | resultType="java.util.HashMap"> |
| 157 | 157 | select a.*,b.* from( select x.* from (select * from supervision_threestep a |
| 158 | - where type = 0 | |
| 159 | - and self_check_time BETWEEN #{workStartTime} and #{workEndTime} | |
| 158 | + <where> | |
| 159 | + type = 0 | |
| 160 | + and self_check_time BETWEEN #{workStartTime} and #{workEndTime} | |
| 161 | + <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if> | |
| 162 | + <if test="place != null and place != ''"> and place = #{place}</if> | |
| 163 | + <if test="earthsitesName != null and earthsitesName != ''"> and earthsites_name like concat('%', #{earthsitesName},'%')</if> | |
| 164 | + </where> | |
| 165 | + | |
| 160 | 166 | ORDER BY self_check_time DESC) x GROUP BY object_id) a |
| 161 | 167 | LEFT JOIN |
| 162 | 168 | (select name ename,object_id eobject_id,sub_reason esub_reason,place |
| ... | ... | @@ -166,6 +172,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 166 | 172 | and DATE_FORMAT(a.self_check_time,("%y%m%d")) = |
| 167 | 173 | DATE_FORMAT(b.eself_check_time,("%y%m%d")) |
| 168 | 174 | ORDER BY a.create_time DESC |
| 175 | + | |
| 176 | + | |
| 177 | + | |
| 169 | 178 | </select> |
| 170 | 179 | |
| 171 | 180 | ... | ... |
trash-workFlow/src/main/resources/mapper/TruckActivateMapper.xml
| ... | ... | @@ -27,7 +27,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" |
| 27 | 27 | <include refid="selectTruckActivateVo"/> |
| 28 | 28 | <where> |
| 29 | 29 | <if test="company != null and company != ''"> and company = #{company}</if> |
| 30 | - <if test="licensePlate != null and licensePlate != ''"> and license_plate = #{licensePlate}</if> | |
| 30 | + <if test="licensePlate != null and licensePlate != ''"> and license_plate like concat('%', #{licensePlate}, '%')</if> | |
| 31 | 31 | <if test="time != null "> and time = #{time}</if> |
| 32 | 32 | <if test="construction != null and construction != ''"> and construction = #{construction}</if> |
| 33 | 33 | <if test="status != null "> and status = #{status}</if> | ... | ... |