运输公司去掉营运单位，新增服务电话字段

2c
1 parent 0ca2eb74
Showing 3 changed files with 29 additions and 16 deletions
trash-ui/src/views/unit/enterprise/info.vue
trash-unit/src/main/java/com/trash/enterprise/domain/TransportationEnterprise.java
trash-unit/src/main/resources/mapper/unit/TransportationEnterpriseMapper.xml
@@ -113,10 +113,8 @@
           </el-form-item>
         </el-col>
         <el-col :span="7">
-          <el-form-item label="经营单位" prop="parentId">
-            <el-select v-model="form.parentId" placeholder="请选择经营单位" clearable style="width: 100%;">
-              <el-option v-for="(item,index) in enterpriseList" :label="item.name" :value="item.id" :key="index"/>
-            </el-select>
+          <el-form-item label="服务电话" prop="servicePhone">
+            <el-input v-model="form.servicePhone" placeholder="请输入企业服务电话"   :maxlength="11" show-word-limit/>
           </el-form-item>
         </el-col>
         <el-col :span="7">
@@ -417,6 +415,14 @@ export default {
         safetyPeopleName: [
           {required: true, message: "请输入安全管理人员", trigger: "blur"}
         ],
+        servicePhone: [
+          {required: true, message: "请输入企业服务手机号码", trigger: "blur"},
+          {
+            pattern: /^1(3|4|5|7|8|9)\d{9}$/,
+            message: '手机号格式错误',
+            trigger: 'change'
+          }
+        ],
       },
       areas:[],
       // 企业道路运输经营许可证
@@ -85,31 +85,24 @@ public class TransportationEnterprise extends BaseEntity
     private String legalRepresentativePhone;
     /** 安全管理人员 */
-    @Excel(name = "安全管理人员")
     private String safetyPeopleName;
     /** 企业道路运输经营许可证 */
-    @Excel(name = "企业道路运输经营许可证")
     private String transportPermission;
     /** 企业营业执照 */
-    @Excel(name = "企业营业执照")
     private String enterpriseBusinessLicense;
     /** 安全员考核合格证明 */
-    @Excel(name = "安全员考核合格证明")
     private String safetyOfficerQualificationCertificate;
     /** 企业负责人安全考核证 */
-    @Excel(name = "企业负责人安全考核证")
     private String safetyCertificate;
     /** 停车场全景图 */
-    @Excel(name = "停车场全景图")
     private String carParkPanorama;
     /** 经营单位 */
-    @Excel(name = "经营单位")
     private String businessUnit;
     /** 审批状态,0=审批中,1=审批通过,2=被驳回 */
@@ -117,7 +110,6 @@ public class TransportationEnterprise extends BaseEntity
     private Integer status;
     /** 父公司id */
-    @Excel(name = "父公司id")
     private Long parentId;
     /** 公司类型（0经营单位，1运输公司） */
@@ -125,14 +117,24 @@ public class TransportationEnterprise extends BaseEntity
     private Integer companyType;
     /** 信用状态 */
-    @Excel(name = "信用状态")
     private String creditStatus;
     /** 二维码 */
-    @Excel(name = "二维码")
     private String qrCode;
-    public void setId(Long id) 
+    /** 企业服务电话 */
+    @Excel(name = "公司类型")
+    private String servicePhone;
+
+    public String getServicePhone() {
+        return servicePhone;
+    }
+
+    public void setServicePhone(String servicePhone) {
+        this.servicePhone = servicePhone;
+    }
+
+    public void setId(Long id)
     {
         this.id = id;
     }
@@ -38,10 +38,11 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
         <result property="companyType"    column="company_type"    />
         <result property="creditStatus"    column="credit_status"    />
         <result property="qrCode"    column="qr_code"    />
+        <result property="servicePhone"   column="service_phone"    />
     </resultMap>
     <sql id="selectTransportationEnterpriseVo">
-        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 from transportation_enterprise te
+        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 from transportation_enterprise te
     </sql>
     <select id="selectTransportationEnterpriseList" parameterType="TransportationEnterprise" resultMap="TransportationEnterpriseResult">
@@ -74,6 +75,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null "> and company_type = #{companyType}</if>
             <if test="creditStatus != null  and creditStatus != ''"> and credit_status = #{creditStatus}</if>
             <if test="qrCode != null  and qrCode != ''"> and qr_code = #{qrCode}</if>
+            <if test="servicePhone != null  and servicePhone != ''"> and service_phone = #{servicePhone}</if>
         </where>
     </select>
@@ -117,6 +119,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null">company_type,</if>
             <if test="creditStatus != null">credit_status,</if>
             <if test="qrCode != null">qr_code,</if>
+            <if test="servicePhone != null">service_phone,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="name != null">#{name},</if>
@@ -151,6 +154,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null">#{companyType},</if>
             <if test="creditStatus != null">#{creditStatus},</if>
             <if test="qrCode != null">#{qrCode},</if>
+            <if test="servicePhone != null">#{servicePhone},</if>
          </trim>
     </insert>
@@ -189,6 +193,7 @@ PUBLIC &quot;-//mybatis.org//DTD Mapper 3.0//EN&quot;
             <if test="companyType != null">company_type = #{companyType},</if>
             <if test="creditStatus != null">credit_status = #{creditStatus},</if>
             <if test="qrCode != null">qr_code = #{qrCode},</if>
+            <if test="servicePhone != null">service_phone = #{servicePhone},</if>
         </trim>
         where id = #{id}
     </update>