Commit 4ea8b8defefe4b8e9898c37abd5f4278869bd3b0

Authored by 2c
1 parent 817732d9

运输公司新增报价字段

trash-ui/src/views/unit/enterprise/info.vue
@@ -118,6 +118,13 @@ @@ -118,6 +118,13 @@
118 </el-form-item> 118 </el-form-item>
119 </el-col> 119 </el-col>
120 <el-col :span="7"> 120 <el-col :span="7">
  121 + <el-form-item label="报价" prop="offer">
  122 + <el-input v-model="form.offer" placeholder="请输入起始报价" />
  123 + </el-form-item>
  124 + </el-col>
  125 + </el-row>
  126 + <el-row :gutter="30">
  127 + <el-col>
121 <el-form-item label="备注" prop="remark"> 128 <el-form-item label="备注" prop="remark">
122 <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" /> 129 <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
123 </el-form-item> 130 </el-form-item>
@@ -463,6 +470,14 @@ export default { @@ -463,6 +470,14 @@ export default {
463 trigger: 'change' 470 trigger: 'change'
464 } 471 }
465 ], 472 ],
  473 + offer: [
  474 + {required: true, message: "必填", trigger: "blur"},
  475 + {
  476 + pattern: /^\d+(?:\.\d{1,2})?$/,
  477 + message: "请输入正确的金额",
  478 + trigger: "blur"
  479 + }
  480 + ],
466 }, 481 },
467 areas:[], 482 areas:[],
468 // 企业道路运输经营许可证 483 // 企业道路运输经营许可证
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
@@ -129,6 +129,18 @@ public class TransportationEnterprise extends BaseEntity @@ -129,6 +129,18 @@ public class TransportationEnterprise extends BaseEntity
129 @Excel(name = "公司类型") 129 @Excel(name = "公司类型")
130 private String servicePhone; 130 private String servicePhone;
131 131
  132 + /** 公司报价 */
  133 + @Excel(name = "公司报价")
  134 + private String offer;
  135 +
  136 + public String getOffer() {
  137 + return offer;
  138 + }
  139 +
  140 + public void setOffer(String offer) {
  141 + this.offer = offer;
  142 + }
  143 +
132 public String getOfficeAddressGps() { 144 public String getOfficeAddressGps() {
133 return officeAddressGps; 145 return officeAddressGps;
134 } 146 }
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
@@ -40,10 +40,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -40,10 +40,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
40 <result property="creditStatus" column="credit_status" /> 40 <result property="creditStatus" column="credit_status" />
41 <result property="qrCode" column="qr_code" /> 41 <result property="qrCode" column="qr_code" />
42 <result property="servicePhone" column="service_phone" /> 42 <result property="servicePhone" column="service_phone" />
  43 + <result property="offer" column="offer" />
43 </resultMap> 44 </resultMap>
44 45
45 <sql id="selectTransportationEnterpriseVo"> 46 <sql id="selectTransportationEnterpriseVo">
46 - select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone,office_address_gps from transportation_enterprise te 47 + select id, name, abbreviation, registration_area, transport_permission_date, enter_date, business_license_date, office_address, parking_lot_location, parking_area, (select count(id) from car_info where company_id = te.id) car_number, safety_manager_name, safety_manager_phone, social_uniform_credit_code_number, legal_representative, legal_representative_phone, safety_people_name, remark, transport_permission, enterprise_business_license, safety_officer_qualification_certificate, safety_certificate, car_park_panorama, business_unit, status, create_time, create_by, update_time, update_by, parent_id, company_type, credit_status, qr_code,service_phone,office_address_gps,offer from transportation_enterprise te
47 </sql> 48 </sql>
48 49
49 <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult"> 50 <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
@@ -122,6 +123,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -122,6 +123,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
122 <if test="qrCode != null">qr_code,</if> 123 <if test="qrCode != null">qr_code,</if>
123 <if test="servicePhone != null">service_phone,</if> 124 <if test="servicePhone != null">service_phone,</if>
124 <if test="officeAddressGps != null">office_address_gps,</if> 125 <if test="officeAddressGps != null">office_address_gps,</if>
  126 + <if test="offer != null">offer,</if>
125 </trim> 127 </trim>
126 <trim prefix="values (" suffix=")" suffixOverrides=","> 128 <trim prefix="values (" suffix=")" suffixOverrides=",">
127 <if test="name != null">#{name},</if> 129 <if test="name != null">#{name},</if>
@@ -158,6 +160,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -158,6 +160,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
158 <if test="qrCode != null">#{qrCode},</if> 160 <if test="qrCode != null">#{qrCode},</if>
159 <if test="servicePhone != null">#{servicePhone},</if> 161 <if test="servicePhone != null">#{servicePhone},</if>
160 <if test="officeAddressGps != null">#{officeAddressGps},</if> 162 <if test="officeAddressGps != null">#{officeAddressGps},</if>
  163 + <if test="offer != null">#{offer},</if>
161 </trim> 164 </trim>
162 </insert> 165 </insert>
163 166
@@ -198,6 +201,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot; @@ -198,6 +201,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
198 <if test="qrCode != null">qr_code = #{qrCode},</if> 201 <if test="qrCode != null">qr_code = #{qrCode},</if>
199 <if test="servicePhone != null">service_phone = #{servicePhone},</if> 202 <if test="servicePhone != null">service_phone = #{servicePhone},</if>
200 <if test="officeAddressGps != null">office_address_gps = #{officeAddressGps},</if> 203 <if test="officeAddressGps != null">office_address_gps = #{officeAddressGps},</if>
  204 + <if test="offer != null">offer = #{offer},</if>
201 </trim> 205 </trim>
202 where id = #{id} 206 where id = #{id}
203 </update> 207 </update>