Commit 25712633af646c3ec501221612a07ef48ca422d8

Authored by 2c
1 parent 6121fefc

经营单位改投放点信息

trash-ui/src/views/unit/businessUnit/index.vue
1 <template> 1 <template>
2 <div class="app-container"> 2 <div class="app-container">
3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px"> 3 <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="88px">
4 - <el-form-item label="企业名称" prop="name"> 4 + <el-form-item label="投放点名称" prop="name">
5 <el-input 5 <el-input
6 v-model="queryParams.name" 6 v-model="queryParams.name"
7 - placeholder="请输入企业名称" 7 + placeholder="请输入投放点名称"
8 clearable 8 clearable
9 size="small" 9 size="small"
10 @keyup.enter.native="handleQuery" 10 @keyup.enter.native="handleQuery"
@@ -83,7 +83,7 @@ @@ -83,7 +83,7 @@
83 <el-table v-loading="loading" :data="enterpriseList" @selection-change="handleSelectionChange"> 83 <el-table v-loading="loading" :data="enterpriseList" @selection-change="handleSelectionChange">
84 <el-table-column type="selection" width="55" align="center" /> 84 <el-table-column type="selection" width="55" align="center" />
85 <el-table-column type="index" width="55" align="center" label="序号"/> 85 <el-table-column type="index" width="55" align="center" label="序号"/>
86 - <el-table-column label="企业名称" align="center" prop="name" /> 86 + <el-table-column label="投放点名称" align="center" prop="name" />
87 <el-table-column label="简称" align="center" prop="abbreviation" /> 87 <el-table-column label="简称" align="center" prop="abbreviation" />
88 <el-table-column label="所属区域" align="center" prop="registrationArea" /> 88 <el-table-column label="所属区域" align="center" prop="registrationArea" />
89 <el-table-column label="车辆数" align="center" prop="carNumber" /> 89 <el-table-column label="车辆数" align="center" prop="carNumber" />
@@ -146,7 +146,7 @@ export default { @@ -146,7 +146,7 @@ export default {
146 showSearch: true, 146 showSearch: true,
147 // 总条数 147 // 总条数
148 total: 0, 148 total: 0,
149 - // 运输企业管理表格数据 149 + // 运输投放点管理表格数据
150 enterpriseList: [], 150 enterpriseList: [],
151 // 弹出层标题 151 // 弹出层标题
152 title: "", 152 title: "",
@@ -202,7 +202,7 @@ export default { @@ -202,7 +202,7 @@ export default {
202 '$route.query.unitRefresh':'getList' 202 '$route.query.unitRefresh':'getList'
203 }, 203 },
204 methods: { 204 methods: {
205 - /** 查询运输企业管理列表 */ 205 + /** 查询运输投放点管理列表 */
206 getList() { 206 getList() {
207 this.loading = true; 207 this.loading = true;
208 this.queryParams.companyType = "0"; 208 this.queryParams.companyType = "0";
@@ -243,7 +243,7 @@ export default { @@ -243,7 +243,7 @@ export default {
243 /** 删除按钮操作 */ 243 /** 删除按钮操作 */
244 handleDelete(row) { 244 handleDelete(row) {
245 const ids = row.id || this.ids; 245 const ids = row.id || this.ids;
246 - this.$confirm('是否确认删除运输企业管理编号为"' + ids + '"的数据项?', "警告", { 246 + this.$confirm('是否确认删除运输投放点管理编号为"' + ids + '"的数据项?', "警告", {
247 confirmButtonText: "确定", 247 confirmButtonText: "确定",
248 cancelButtonText: "取消", 248 cancelButtonText: "取消",
249 type: "warning" 249 type: "warning"
@@ -257,7 +257,7 @@ export default { @@ -257,7 +257,7 @@ export default {
257 /** 导出按钮操作 */ 257 /** 导出按钮操作 */
258 handleExport() { 258 handleExport() {
259 const queryParams = this.queryParams; 259 const queryParams = this.queryParams;
260 - this.$confirm('是否确认导出所有运输企业管理数据项?', "警告", { 260 + this.$confirm('是否确认导出所有运输投放点管理数据项?', "警告", {
261 confirmButtonText: "确定", 261 confirmButtonText: "确定",
262 cancelButtonText: "取消", 262 cancelButtonText: "取消",
263 type: "warning" 263 type: "warning"
trash-ui/src/views/unit/businessUnit/info.vue
@@ -8,8 +8,8 @@ @@ -8,8 +8,8 @@
8 <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top"> 8 <el-form ref="form" :model="form" :rules="rules" label-width="80px" label-position="top">
9 <el-row :gutter="30"> 9 <el-row :gutter="30">
10 <el-col :span="7"> 10 <el-col :span="7">
11 - <el-form-item label="企业名称" prop="name">  
12 - <el-input v-model="form.name" placeholder="请输入企业名称" /> 11 + <el-form-item label="投放点名称" prop="name">
  12 + <el-input v-model="form.name" placeholder="请输入投放点名称" />
13 </el-form-item> 13 </el-form-item>
14 </el-col> 14 </el-col>
15 <el-col :span="7"> 15 <el-col :span="7">
@@ -27,32 +27,32 @@ @@ -27,32 +27,32 @@
27 </el-row> 27 </el-row>
28 <el-row :gutter="30"> 28 <el-row :gutter="30">
29 <el-col :span="7"> 29 <el-col :span="7">
30 - <el-form-item label="企业道路运输经营许可证有效期" prop="transportPermissionDate"> 30 + <el-form-item label="投放点道路运输经营许可证有效期" prop="transportPermissionDate">
31 <el-date-picker clearable size="small" style="width: 100%;" 31 <el-date-picker clearable size="small" style="width: 100%;"
32 v-model="form.transportPermissionDate" 32 v-model="form.transportPermissionDate"
33 type="date" 33 type="date"
34 value-format="yyyy-MM-dd" 34 value-format="yyyy-MM-dd"
35 - placeholder="选择企业道路运输经营许可证有效期"> 35 + placeholder="选择投放点道路运输经营许可证有效期">
36 </el-date-picker> 36 </el-date-picker>
37 </el-form-item> 37 </el-form-item>
38 </el-col> 38 </el-col>
39 <el-col :span="7"> 39 <el-col :span="7">
40 - <el-form-item label="企业入市时间" prop="enterDate"> 40 + <el-form-item label="投放点入市时间" prop="enterDate">
41 <el-date-picker clearable size="small" style="width: 100%;" 41 <el-date-picker clearable size="small" style="width: 100%;"
42 v-model="form.enterDate" 42 v-model="form.enterDate"
43 type="date" 43 type="date"
44 value-format="yyyy-MM-dd" 44 value-format="yyyy-MM-dd"
45 - placeholder="选择企业入市时间"> 45 + placeholder="选择投放点入市时间">
46 </el-date-picker> 46 </el-date-picker>
47 </el-form-item> 47 </el-form-item>
48 </el-col> 48 </el-col>
49 <el-col :span="7"> 49 <el-col :span="7">
50 - <el-form-item label="企业营业执照有效期" prop="businessLicenseDate"> 50 + <el-form-item label="投放点营业执照有效期" prop="businessLicenseDate">
51 <el-date-picker clearable size="small" style="width: 100%;" 51 <el-date-picker clearable size="small" style="width: 100%;"
52 v-model="form.businessLicenseDate" 52 v-model="form.businessLicenseDate"
53 type="date" 53 type="date"
54 value-format="yyyy-MM-dd" 54 value-format="yyyy-MM-dd"
55 - placeholder="选择企业营业执照有效期"> 55 + placeholder="选择投放点营业执照有效期">
56 </el-date-picker> 56 </el-date-picker>
57 </el-form-item> 57 </el-form-item>
58 </el-col> 58 </el-col>
@@ -76,7 +76,7 @@ @@ -76,7 +76,7 @@
76 </el-row> 76 </el-row>
77 <el-row :gutter="30"> 77 <el-row :gutter="30">
78 <el-col :span="7"> 78 <el-col :span="7">
79 - <el-form-item label="企业安全负责人姓名及联系方式" prop="safetyManagerName"> 79 + <el-form-item label="投放点安全负责人姓名及联系方式" prop="safetyManagerName">
80 <el-row> 80 <el-row>
81 <el-col :span="6"> 81 <el-col :span="6">
82 <el-input v-model="form.safetyManagerName" placeholder="姓名" /> 82 <el-input v-model="form.safetyManagerName" placeholder="姓名" />
@@ -121,7 +121,7 @@ @@ -121,7 +121,7 @@
121 <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;"> 121 <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
122 <el-col :span="3"> 122 <el-col :span="3">
123 <div class="upload_lable"> 123 <div class="upload_lable">
124 - 企业道路运输经营许可证 124 + 投放点道路运输经营许可证
125 <el-upload 125 <el-upload
126 ref="upload" 126 ref="upload"
127 action="" 127 action=""
@@ -160,7 +160,7 @@ @@ -160,7 +160,7 @@
160 <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;"> 160 <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
161 <el-col :span="3"> 161 <el-col :span="3">
162 <div class="upload_lable"> 162 <div class="upload_lable">
163 - 企业营业执照 163 + 投放点营业执照
164 <el-upload 164 <el-upload
165 ref="upload" 165 ref="upload"
166 action="" 166 action=""
@@ -236,7 +236,7 @@ @@ -236,7 +236,7 @@
236 <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;"> 236 <el-row style="border: 1px solid #dcdfe6;border-radius: 2px;">
237 <el-col :span="3"> 237 <el-col :span="3">
238 <div class="upload_lable"> 238 <div class="upload_lable">
239 - 企业负责人安全考核证 239 + 投放点负责人安全考核证
240 <el-upload 240 <el-upload
241 ref="upload" 241 ref="upload"
242 action="" 242 action=""
@@ -318,8 +318,8 @@ @@ -318,8 +318,8 @@
318 <!-- <el-form-item label="" prop="otherInformation">--> 318 <!-- <el-form-item label="" prop="otherInformation">-->
319 <!-- <el-input v-model="form." type="textarea" placeholder="请输入内容" />--> 319 <!-- <el-input v-model="form." type="textarea" placeholder="请输入内容" />-->
320 <!-- </el-form-item>--> 320 <!-- </el-form-item>-->
321 - <!-- <el-form-item label="运输企业" prop="companyIds">-->  
322 - <!-- <el-input v-model="form.companyIds" placeholder="请输入运输企业" />--> 321 + <!-- <el-form-item label="运输投放点" prop="companyIds">-->
  322 + <!-- <el-input v-model="form.companyIds" placeholder="请输入运输投放点" />-->
323 <!-- </el-form-item>--> 323 <!-- </el-form-item>-->
324 <!-- <el-form-item label="审批状态,0=审批中,1=审批通过,2=被驳回">--> 324 <!-- <el-form-item label="审批状态,0=审批中,1=审批通过,2=被驳回">-->
325 <!-- <el-radio-group v-model="form.status">--> 325 <!-- <el-radio-group v-model="form.status">-->
@@ -371,7 +371,7 @@ export default { @@ -371,7 +371,7 @@ export default {
371 // 表单校验 371 // 表单校验
372 rules: { 372 rules: {
373 name: [ 373 name: [
374 - {required: true, message: "请输入企业名称", trigger: "blur"} 374 + {required: true, message: "请输入投放点名称", trigger: "blur"}
375 ], 375 ],
376 abbreviation: [ 376 abbreviation: [
377 {required: true, message: "请输入简称", trigger: "blur"} 377 {required: true, message: "请输入简称", trigger: "blur"}
@@ -380,13 +380,13 @@ export default { @@ -380,13 +380,13 @@ export default {
380 {required: true, message: "请输入注册地所在区域", trigger: "blur"} 380 {required: true, message: "请输入注册地所在区域", trigger: "blur"}
381 ], 381 ],
382 transportPermissionDate: [ 382 transportPermissionDate: [
383 - {required: true, message: "请选择企业道路运输经营许可证有效期", trigger: "blur"} 383 + {required: true, message: "请选择投放点道路运输经营许可证有效期", trigger: "blur"}
384 ], 384 ],
385 enterDate: [ 385 enterDate: [
386 - {required: true, message: "请选择企业入市时间", trigger: "blur"} 386 + {required: true, message: "请选择投放点入市时间", trigger: "blur"}
387 ], 387 ],
388 businessLicenseDate: [ 388 businessLicenseDate: [
389 - {required: true, message: "请选择企业营业执照有效期", trigger: "blur"} 389 + {required: true, message: "请选择投放点营业执照有效期", trigger: "blur"}
390 ], 390 ],
391 officeAddress: [ 391 officeAddress: [
392 {required: true, message: "请输入办公地址", trigger: "blur"} 392 {required: true, message: "请输入办公地址", trigger: "blur"}
@@ -399,7 +399,7 @@ export default { @@ -399,7 +399,7 @@ export default {
399 {pattern: /^\d+(\.\d+)?$/, message: "只能输入正数和小数", trigger: "blur"} 399 {pattern: /^\d+(\.\d+)?$/, message: "只能输入正数和小数", trigger: "blur"}
400 ], 400 ],
401 safetyManagerName: [ 401 safetyManagerName: [
402 - {required: true, message: "请输入企业安全负责人姓名", trigger: "blur"} 402 + {required: true, message: "请输入投放点安全负责人姓名", trigger: "blur"}
403 ], 403 ],
404 socialUniformCreditCodeNumber: [ 404 socialUniformCreditCodeNumber: [
405 {required: true, message: "请输入社会统一信用代码编号", trigger: "blur"} 405 {required: true, message: "请输入社会统一信用代码编号", trigger: "blur"}
@@ -412,13 +412,13 @@ export default { @@ -412,13 +412,13 @@ export default {
412 ], 412 ],
413 }, 413 },
414 areas:[], 414 areas:[],
415 - // 企业道路运输经营许可证 415 + // 投放点道路运输经营许可证
416 transportPermission:[], 416 transportPermission:[],
417 - // 企业营业执照 417 + // 投放点营业执照
418 enterpriseBusinessLicense:[], 418 enterpriseBusinessLicense:[],
419 // 安全员考核合格证明 419 // 安全员考核合格证明
420 safetyOfficerQualificationCertificate:[], 420 safetyOfficerQualificationCertificate:[],
421 - // 企业负责人安全考核证 421 + // 投放点负责人安全考核证
422 safetyCertificate:[], 422 safetyCertificate:[],
423 // 停车场全景图 423 // 停车场全景图
424 carParkPanorama:[], 424 carParkPanorama:[],
@@ -521,7 +521,7 @@ export default { @@ -521,7 +521,7 @@ export default {
521 if (valid) { 521 if (valid) {
522 let phoneTest = /^1[3456789]\d{9}$/; 522 let phoneTest = /^1[3456789]\d{9}$/;
523 if(phoneTest.test(this.form.safetyManagerPhone)===false){ 523 if(phoneTest.test(this.form.safetyManagerPhone)===false){
524 - this.msgError("请输入正确的企业安全负责人联系方式"); 524 + this.msgError("请输入正确的投放点安全负责人联系方式");
525 return false; 525 return false;
526 } 526 }
527 if(phoneTest.test(this.form.legalRepresentativePhone)===false){ 527 if(phoneTest.test(this.form.legalRepresentativePhone)===false){
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
@@ -117,7 +117,7 @@ public class TransportationEnterprise extends BaseEntity @@ -117,7 +117,7 @@ public class TransportationEnterprise extends BaseEntity
117 private Long parentId; 117 private Long parentId;
118 118
119 /** 公司类型(0经营单位,1运输公司) */ 119 /** 公司类型(0经营单位,1运输公司) */
120 - @Excel(name = "公司类型", readConverterExp = "0=经营单位,1运输公司") 120 +// @Excel(name = "公司类型", readConverterExp = "0=投放点信息,1运输公司")
121 private Integer companyType; 121 private Integer companyType;
122 122
123 /** 信用状态 */ 123 /** 信用状态 */