配送记录

zh-baseversion-admin/src/main/java/com/zehong/web/controller/lpgRegulation/TLpgDeliveryRecordController.java

+package com.zehong.web.controller.lpgRegulation;
+
+import java.util.List;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zehong.common.annotation.Log;
+import com.zehong.common.core.controller.BaseController;
+import com.zehong.common.core.domain.AjaxResult;
+import com.zehong.common.enums.BusinessType;
+import com.zehong.system.domain.TLpgDeliveryRecord;
+import com.zehong.system.service.ITLpgDeliveryRecordService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 液化石油配送记录Controller
+ * 
+ * @author zehong
+ * @date 2024-07-22
+ */
+@RestController
+@RequestMapping("/lpg/record")
+public class TLpgDeliveryRecordController extends BaseController
+{
+    @Autowired
+    private ITLpgDeliveryRecordService tLpgDeliveryRecordService;
+
+    /**
+     * 查询液化石油配送记录列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        startPage();
+        List<TLpgDeliveryRecord> list = tLpgDeliveryRecordService.selectTLpgDeliveryRecordList(tLpgDeliveryRecord);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出液化石油配送记录列表
+     */
+    @Log(title = "液化石油配送记录", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        List<TLpgDeliveryRecord> list = tLpgDeliveryRecordService.selectTLpgDeliveryRecordList(tLpgDeliveryRecord);
+        ExcelUtil<TLpgDeliveryRecord> util = new ExcelUtil<TLpgDeliveryRecord>(TLpgDeliveryRecord.class);
+        return util.exportExcel(list, "液化石油配送记录数据");
+    }
+
+    /**
+     * 获取液化石油配送记录详细信息
+     */
+    @GetMapping(value = "/{deliveryRecordId}")
+    public AjaxResult getInfo(@PathVariable("deliveryRecordId") Long deliveryRecordId)
+    {
+        return AjaxResult.success(tLpgDeliveryRecordService.selectTLpgDeliveryRecordById(deliveryRecordId));
+    }
+
+    /**
+     * 新增液化石油配送记录
+     */
+    @Log(title = "液化石油配送记录", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        return toAjax(tLpgDeliveryRecordService.insertTLpgDeliveryRecord(tLpgDeliveryRecord));
+    }
+
+    /**
+     * 修改液化石油配送记录
+     */
+    @Log(title = "液化石油配送记录", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        return toAjax(tLpgDeliveryRecordService.updateTLpgDeliveryRecord(tLpgDeliveryRecord));
+    }
+
+    /**
+     * 删除液化石油配送记录
+     */
+    @Log(title = "液化石油配送记录", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{deliveryRecordIds}")
+    public AjaxResult remove(@PathVariable Long[] deliveryRecordIds)
+    {
+        return toAjax(tLpgDeliveryRecordService.deleteTLpgDeliveryRecordByIds(deliveryRecordIds));
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/domain/TLpgDeliveryRecord.java

+package com.zehong.system.domain;
+
+import java.util.Date;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
+import com.zehong.common.annotation.Excel;
+import com.zehong.common.core.domain.BaseEntity;
+
+/**
+ * 液化石油配送记录对象 t_lpg_delivery_record
+ * 
+ * @author zehong
+ * @date 2024-07-22
+ */
+public class TLpgDeliveryRecord extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 配送记录主键 */
+    private Long deliveryRecordId;
+
+    /** 储配站 */
+    @Excel(name = "储配站")
+    private Long stationName;
+
+    /** 气瓶主键 */
+    private Long bottleId;
+
+    @Excel(name = "气瓶条码")
+    private String fQRcode;
+
+    /** 配送人员 */
+    @Excel(name = "配送人员")
+    private String deliveryPerson;
+
+    /** 车辆代码 */
+    @Excel(name = "车辆代码")
+    private String vehicleCode;
+
+    /** 用户 */
+    @Excel(name = "用户")
+    private String gasUser;
+
+    /** 0.居民 1.非居民 */
+    @Excel(name = "用户类型",readConverterExp = "0=居民,1=非居民")
+    private String gasUserType;
+
+    /** 配送地址 */
+    @Excel(name = "配送地址")
+    private String deliveryAddress;
+
+    /** 配送时间 */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    @Excel(name = "配送时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
+    private Date deliveryDate;
+
+    /** 删除状态：0.否 1.是 */
+    private String isDel;
+
+    public void setDeliveryRecordId(Long deliveryRecordId) 
+    {
+        this.deliveryRecordId = deliveryRecordId;
+    }
+
+    public Long getDeliveryRecordId() 
+    {
+        return deliveryRecordId;
+    }
+    public void setStationName(Long stationName) 
+    {
+        this.stationName = stationName;
+    }
+
+    public Long getStationName() 
+    {
+        return stationName;
+    }
+    public void setBottleId(Long bottleId) 
+    {
+        this.bottleId = bottleId;
+    }
+
+    public Long getBottleId() 
+    {
+        return bottleId;
+    }
+
+    public String getfQRcode() {
+        return fQRcode;
+    }
+
+    public void setfQRcode(String fQRcode) {
+        this.fQRcode = fQRcode;
+    }
+
+    public void setDeliveryPerson(String deliveryPerson)
+    {
+        this.deliveryPerson = deliveryPerson;
+    }
+
+    public String getDeliveryPerson() 
+    {
+        return deliveryPerson;
+    }
+    public void setVehicleCode(String vehicleCode) 
+    {
+        this.vehicleCode = vehicleCode;
+    }
+
+    public String getVehicleCode() 
+    {
+        return vehicleCode;
+    }
+    public void setGasUser(String gasUser) 
+    {
+        this.gasUser = gasUser;
+    }
+
+    public String getGasUser() 
+    {
+        return gasUser;
+    }
+    public void setGasUserType(String gasUserType) 
+    {
+        this.gasUserType = gasUserType;
+    }
+
+    public String getGasUserType() 
+    {
+        return gasUserType;
+    }
+    public void setDeliveryAddress(String deliveryAddress) 
+    {
+        this.deliveryAddress = deliveryAddress;
+    }
+
+    public String getDeliveryAddress() 
+    {
+        return deliveryAddress;
+    }
+    public void setDeliveryDate(Date deliveryDate) 
+    {
+        this.deliveryDate = deliveryDate;
+    }
+
+    public Date getDeliveryDate() 
+    {
+        return deliveryDate;
+    }
+    public void setIsDel(String isDel) 
+    {
+        this.isDel = isDel;
+    }
+
+    public String getIsDel() 
+    {
+        return isDel;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("deliveryRecordId", getDeliveryRecordId())
+            .append("stationName", getStationName())
+            .append("bottleId", getBottleId())
+            .append("deliveryPerson", getDeliveryPerson())
+            .append("vehicleCode", getVehicleCode())
+            .append("gasUser", getGasUser())
+            .append("gasUserType", getGasUserType())
+            .append("deliveryAddress", getDeliveryAddress())
+            .append("deliveryDate", getDeliveryDate())
+            .append("createTime", getCreateTime())
+            .append("updateTime", getUpdateTime())
+            .append("isDel", getIsDel())
+            .append("remark", getRemark())
+            .toString();
+    }
+}

zh-baseversion-system/src/main/java/com/zehong/system/mapper/TLpgDeliveryRecordMapper.java

+package com.zehong.system.mapper;
+
+import java.util.List;
+import com.zehong.system.domain.TLpgDeliveryRecord;
+
+/**
+ * 液化石油配送记录Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-07-22
+ */
+public interface TLpgDeliveryRecordMapper 
+{
+    /**
+     * 查询液化石油配送记录
+     * 
+     * @param deliveryRecordId 液化石油配送记录ID
+     * @return 液化石油配送记录
+     */
+    public TLpgDeliveryRecord selectTLpgDeliveryRecordById(Long deliveryRecordId);
+
+    /**
+     * 查询液化石油配送记录列表
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 液化石油配送记录集合
+     */
+    public List<TLpgDeliveryRecord> selectTLpgDeliveryRecordList(TLpgDeliveryRecord tLpgDeliveryRecord);
+
+    /**
+     * 新增液化石油配送记录
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 结果
+     */
+    public int insertTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord);
+
+    /**
+     * 修改液化石油配送记录
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 结果
+     */
+    public int updateTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord);
+
+    /**
+     * 删除液化石油配送记录
+     * 
+     * @param deliveryRecordId 液化石油配送记录ID
+     * @return 结果
+     */
+    public int deleteTLpgDeliveryRecordById(Long deliveryRecordId);
+
+    /**
+     * 批量删除液化石油配送记录
+     * 
+     * @param deliveryRecordIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTLpgDeliveryRecordByIds(Long[] deliveryRecordIds);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/ITLpgDeliveryRecordService.java

+package com.zehong.system.service;
+
+import java.util.List;
+import com.zehong.system.domain.TLpgDeliveryRecord;
+
+/**
+ * 液化石油配送记录Service接口
+ * 
+ * @author zehong
+ * @date 2024-07-22
+ */
+public interface ITLpgDeliveryRecordService 
+{
+    /**
+     * 查询液化石油配送记录
+     * 
+     * @param deliveryRecordId 液化石油配送记录ID
+     * @return 液化石油配送记录
+     */
+    public TLpgDeliveryRecord selectTLpgDeliveryRecordById(Long deliveryRecordId);
+
+    /**
+     * 查询液化石油配送记录列表
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 液化石油配送记录集合
+     */
+    public List<TLpgDeliveryRecord> selectTLpgDeliveryRecordList(TLpgDeliveryRecord tLpgDeliveryRecord);
+
+    /**
+     * 新增液化石油配送记录
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 结果
+     */
+    public int insertTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord);
+
+    /**
+     * 修改液化石油配送记录
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 结果
+     */
+    public int updateTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord);
+
+    /**
+     * 批量删除液化石油配送记录
+     * 
+     * @param deliveryRecordIds 需要删除的液化石油配送记录ID
+     * @return 结果
+     */
+    public int deleteTLpgDeliveryRecordByIds(Long[] deliveryRecordIds);
+
+    /**
+     * 删除液化石油配送记录信息
+     * 
+     * @param deliveryRecordId 液化石油配送记录ID
+     * @return 结果
+     */
+    public int deleteTLpgDeliveryRecordById(Long deliveryRecordId);
+}

zh-baseversion-system/src/main/java/com/zehong/system/service/impl/TLpgDeliveryRecordServiceImpl.java

+package com.zehong.system.service.impl;
+
+import java.util.List;
+import com.zehong.common.utils.DateUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TLpgDeliveryRecordMapper;
+import com.zehong.system.domain.TLpgDeliveryRecord;
+import com.zehong.system.service.ITLpgDeliveryRecordService;
+
+/**
+ * 液化石油配送记录Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-07-22
+ */
+@Service
+public class TLpgDeliveryRecordServiceImpl implements ITLpgDeliveryRecordService 
+{
+    @Autowired
+    private TLpgDeliveryRecordMapper tLpgDeliveryRecordMapper;
+
+    /**
+     * 查询液化石油配送记录
+     * 
+     * @param deliveryRecordId 液化石油配送记录ID
+     * @return 液化石油配送记录
+     */
+    @Override
+    public TLpgDeliveryRecord selectTLpgDeliveryRecordById(Long deliveryRecordId)
+    {
+        return tLpgDeliveryRecordMapper.selectTLpgDeliveryRecordById(deliveryRecordId);
+    }
+
+    /**
+     * 查询液化石油配送记录列表
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 液化石油配送记录
+     */
+    @Override
+    public List<TLpgDeliveryRecord> selectTLpgDeliveryRecordList(TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        return tLpgDeliveryRecordMapper.selectTLpgDeliveryRecordList(tLpgDeliveryRecord);
+    }
+
+    /**
+     * 新增液化石油配送记录
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 结果
+     */
+    @Override
+    public int insertTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        tLpgDeliveryRecord.setCreateTime(DateUtils.getNowDate());
+        return tLpgDeliveryRecordMapper.insertTLpgDeliveryRecord(tLpgDeliveryRecord);
+    }
+
+    /**
+     * 修改液化石油配送记录
+     * 
+     * @param tLpgDeliveryRecord 液化石油配送记录
+     * @return 结果
+     */
+    @Override
+    public int updateTLpgDeliveryRecord(TLpgDeliveryRecord tLpgDeliveryRecord)
+    {
+        tLpgDeliveryRecord.setUpdateTime(DateUtils.getNowDate());
+        return tLpgDeliveryRecordMapper.updateTLpgDeliveryRecord(tLpgDeliveryRecord);
+    }
+
+    /**
+     * 批量删除液化石油配送记录
+     * 
+     * @param deliveryRecordIds 需要删除的液化石油配送记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTLpgDeliveryRecordByIds(Long[] deliveryRecordIds)
+    {
+        return tLpgDeliveryRecordMapper.deleteTLpgDeliveryRecordByIds(deliveryRecordIds);
+    }
+
+    /**
+     * 删除液化石油配送记录信息
+     * 
+     * @param deliveryRecordId 液化石油配送记录ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTLpgDeliveryRecordById(Long deliveryRecordId)
+    {
+        return tLpgDeliveryRecordMapper.deleteTLpgDeliveryRecordById(deliveryRecordId);
+    }
+}

zh-baseversion-system/src/main/resources/mapper/system/TLpgDeliveryRecordMapper.xml

+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.zehong.system.mapper.TLpgDeliveryRecordMapper">
+    
+    <resultMap type="TLpgDeliveryRecord" id="TLpgDeliveryRecordResult">
+        <result property="deliveryRecordId"    column="delivery_record_id"    />
+        <result property="stationName"    column="station_name"    />
+        <result property="bottleId"    column="bottle_id"    />
+        <result property="deliveryPerson"    column="delivery_person"    />
+        <result property="vehicleCode"    column="vehicle_code"    />
+        <result property="gasUser"    column="gas_user"    />
+        <result property="gasUserType"    column="gas_user_type"    />
+        <result property="deliveryAddress"    column="delivery_address"    />
+        <result property="deliveryDate"    column="delivery_date"    />
+        <result property="createTime"    column="create_time"    />
+        <result property="updateTime"    column="update_time"    />
+        <result property="isDel"    column="is_del"    />
+        <result property="remark"    column="remark"    />
+    </resultMap>
+
+    <sql id="selectTLpgDeliveryRecordVo">
+        SELECT
+            delivery.delivery_record_id,
+            delivery.station_name,
+            delivery.bottle_id,
+            delivery.delivery_person,
+            delivery.vehicle_code,
+            delivery.gas_user,
+            delivery.gas_user_type,
+            delivery.delivery_address,
+            delivery.delivery_date,
+            delivery.create_time,
+            delivery.update_time,
+            delivery.is_del,
+            delivery.remark,
+            bottle.f_q_rcode as fQRcode
+        FROM
+            t_lpg_delivery_record delivery
+        LEFT JOIN t_lpg_gas_bottle_files bottle ON delivery.bottle_id = bottle.f_gas_bottle_files_id
+    </sql>
+
+    <select id="selectTLpgDeliveryRecordList" parameterType="TLpgDeliveryRecord" resultMap="TLpgDeliveryRecordResult">
+        <include refid="selectTLpgDeliveryRecordVo"/>
+        <where>  
+            <if test="stationName != null "> and delivery.station_name like concat('%', #{stationName}, '%')</if>
+            <if test="bottleId != null "> and delivery.bottle_id = #{bottleId}</if>
+            <if test="deliveryPerson != null  and deliveryPerson != ''"> and delivery.delivery_person like concat('%', #{deliveryPerson}, '%')</if>
+            <if test="vehicleCode != null  and vehicleCode != ''"> and delivery.vehicle_code = #{vehicleCode}</if>
+            <if test="gasUser != null  and gasUser != ''"> and delivery.gas_user like concat('%', #{gasUser}, '%')</if>
+            <if test="gasUserType != null  and gasUserType != ''"> and delivery.gas_user_type = #{gasUserType}</if>
+            <if test="deliveryAddress != null  and deliveryAddress != ''"> and delivery.delivery_address = #{deliveryAddress}</if>
+            <if test="deliveryDate != null "> and delivery.delivery_date = #{deliveryDate}</if>
+            <if test="isDel != null  and isDel != ''"> and delivery.is_del = #{isDel}</if>
+            <if test="fQRcode != null  and fQRcode != ''"> and bottle.f_q_rcode like concat('%', #{fQRcode}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectTLpgDeliveryRecordById" parameterType="Long" resultMap="TLpgDeliveryRecordResult">
+        <include refid="selectTLpgDeliveryRecordVo"/>
+        where delivery.delivery_record_id = #{deliveryRecordId}
+    </select>
+        
+    <insert id="insertTLpgDeliveryRecord" parameterType="TLpgDeliveryRecord" useGeneratedKeys="true" keyProperty="deliveryRecordId">
+        insert into t_lpg_delivery_record
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="stationName != null">station_name,</if>
+            <if test="bottleId != null">bottle_id,</if>
+            <if test="deliveryPerson != null">delivery_person,</if>
+            <if test="vehicleCode != null">vehicle_code,</if>
+            <if test="gasUser != null">gas_user,</if>
+            <if test="gasUserType != null">gas_user_type,</if>
+            <if test="deliveryAddress != null">delivery_address,</if>
+            <if test="deliveryDate != null">delivery_date,</if>
+            <if test="createTime != null">create_time,</if>
+            <if test="updateTime != null">update_time,</if>
+            <if test="isDel != null">is_del,</if>
+            <if test="remark != null">remark,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="stationName != null">#{stationName},</if>
+            <if test="bottleId != null">#{bottleId},</if>
+            <if test="deliveryPerson != null">#{deliveryPerson},</if>
+            <if test="vehicleCode != null">#{vehicleCode},</if>
+            <if test="gasUser != null">#{gasUser},</if>
+            <if test="gasUserType != null">#{gasUserType},</if>
+            <if test="deliveryAddress != null">#{deliveryAddress},</if>
+            <if test="deliveryDate != null">#{deliveryDate},</if>
+            <if test="createTime != null">#{createTime},</if>
+            <if test="updateTime != null">#{updateTime},</if>
+            <if test="isDel != null">#{isDel},</if>
+            <if test="remark != null">#{remark},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTLpgDeliveryRecord" parameterType="TLpgDeliveryRecord">
+        update t_lpg_delivery_record
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="stationName != null">station_name = #{stationName},</if>
+            <if test="bottleId != null">bottle_id = #{bottleId},</if>
+            <if test="deliveryPerson != null">delivery_person = #{deliveryPerson},</if>
+            <if test="vehicleCode != null">vehicle_code = #{vehicleCode},</if>
+            <if test="gasUser != null">gas_user = #{gasUser},</if>
+            <if test="gasUserType != null">gas_user_type = #{gasUserType},</if>
+            <if test="deliveryAddress != null">delivery_address = #{deliveryAddress},</if>
+            <if test="deliveryDate != null">delivery_date = #{deliveryDate},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+            <if test="isDel != null">is_del = #{isDel},</if>
+            <if test="remark != null">remark = #{remark},</if>
+        </trim>
+        where delivery_record_id = #{deliveryRecordId}
+    </update>
+
+    <delete id="deleteTLpgDeliveryRecordById" parameterType="Long">
+        delete from t_lpg_delivery_record where delivery_record_id = #{deliveryRecordId}
+    </delete>
+
+    <delete id="deleteTLpgDeliveryRecordByIds" parameterType="String">
+        delete from t_lpg_delivery_record where delivery_record_id in 
+        <foreach item="deliveryRecordId" collection="array" open="(" separator="," close=")">
+            #{deliveryRecordId}
+        </foreach>
+    </delete>
+</mapper>
\ No newline at end of file

zh-baseversion-web/src/api/lpgRegulation/record.js

+import request from '@/utils/request'
+
+// 查询液化石油配送记录列表
+export function listRecord(query) {
+  return request({
+    url: '/lpg/record/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询液化石油配送记录详细
+export function getRecord(deliveryRecordId) {
+  return request({
+    url: '/lpg/record/' + deliveryRecordId,
+    method: 'get'
+  })
+}
+
+// 新增液化石油配送记录
+export function addRecord(data) {
+  return request({
+    url: '/lpg/record',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改液化石油配送记录
+export function updateRecord(data) {
+  return request({
+    url: '/lpg/record',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除液化石油配送记录
+export function delRecord(deliveryRecordId) {
+  return request({
+    url: '/lpg/record/' + deliveryRecordId,
+    method: 'delete'
+  })
+}
+
+// 导出液化石油配送记录
+export function exportRecord(query) {
+  return request({
+    url: '/lpg/record/export',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/views/lpgRegulation/check/components/DetailInfo.vue

 <template>
   <el-dialog title="安检记录详情" :visible.sync="detailOpen" width="900px" append-to-body>
-    <el-form label-width="120px">
+    <el-form label-width="120px" class="detailInfo">
       <el-row>
         <el-col :span="12">
           <el-form-item label="储配站">
-            <span>{{ detailInfo.stationName}}</span>
+            <span v-if="detailInfo.stationName">{{ detailInfo.stationName }}</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="用户名称">
-            <span>{{ detailInfo.gasUser}}</span>
+            <span v-if="detailInfo.gasUser">{{ detailInfo.gasUser }}</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -18,12 +20,14 @@
         <el-col :span="12">
           <el-form-item label="用户类型">
             <span v-if="detailInfo.gasUserType == '0'">居民</span>
-            <span v-if="detailInfo.gasUserType == '1'">非居民</span>
+            <span v-else-if="detailInfo.gasUserType == '1'">非居民</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="联系方式">
-            <span>{{ detailInfo.telNum}}</span>
+            <span v-if="detailInfo.telNum">{{ detailInfo.telNum }}</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
 
@@ -32,12 +36,14 @@
       <el-row>
         <el-col :span="12">
           <el-form-item label="安检时间">
-            <span>{{ detailInfo.safeCheckDate}}</span>
+            <span v-if="detailInfo.safeCheckDate">{{ detailInfo.safeCheckDate }}</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="安检人">
-            <span>{{ detailInfo.safeCheckPerson}}</span>
+            <span v-if="detailInfo.safeCheckPerson">{{ detailInfo.safeCheckPerson }}</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
 
@@ -47,12 +53,14 @@
         <el-col :span="12">
           <el-form-item label="入户状态">
             <span v-if="detailInfo.checkInStatus == '0'">正常入户</span>
-            <span v-if="detailInfo.checkInStatus == '1'">拒绝安检</span>
+            <span v-else-if="detailInfo.checkInStatus == '1'">拒绝安检</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="用户地址">
-            <span>{{ detailInfo.gasUserAddress}}</span>
+            <span v-if="detailInfo.gasUserAddress">{{ detailInfo.gasUserAddress }}</span>
+            <span v-else>-</span>
           </el-form-item>
         </el-col>
       </el-row>
@@ -61,18 +69,18 @@
         <el-col :span="12" v-if="detailInfo.stoveCheckStatus">
           <el-form-item label="燃气灶具检查情况">
             <div v-if="detailInfo.stoveCheckStatus == '0'">合格</div>
-            <div v-if="detailInfo.stoveCheckStatus == '1'">无3C认证</div>
-            <div v-if="detailInfo.stoveCheckStatus == '2'">无熄火保护装置</div>
+            <div v-else-if="detailInfo.stoveCheckStatus == '1'">无3C认证</div>
+            <div v-else="detailInfo.stoveCheckStatus == '2'">无熄火保护装置</div>
             <el-image v-if="detailInfo.stoveCheckPic" :src="detailInfo.stoveCheckPic" :preview-src-list="[detailInfo.stoveCheckPic]" :z-index="9999" style="width: 230px;height: 170px;"/>
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="连接软管检查情况" v-if="detailInfo.hoseCheckStatus">
             <div v-if="detailInfo.hoseCheckStatus == '0'">合格</div>
-            <div v-if="detailInfo.hoseCheckStatus == '1'">普通橡胶软管</div>
-            <div v-if="detailInfo.hoseCheckStatus == '2'">三通连接软管</div>
-            <div v-if="detailInfo.hoseCheckStatus == '3'">长度超过两米且未使用硬质钢管链接</div>
-            <div v-if="detailInfo.hoseCheckStatus == '4'">穿越墙体、门窗顶棚和地面</div>
+            <div v-else-if="detailInfo.hoseCheckStatus == '1'">普通橡胶软管</div>
+            <div v-else-if="detailInfo.hoseCheckStatus == '2'">三通连接软管</div>
+            <div v-else-if="detailInfo.hoseCheckStatus == '3'">长度超过两米且未使用硬质钢管链接</div>
+            <div v-else="detailInfo.hoseCheckStatus == '4'">穿越墙体、门窗顶棚和地面</div>
             <el-image v-if="detailInfo.hoseCheckPic" :src="detailInfo.hoseCheckPic" :preview-src-list="[detailInfo.hoseCheckPic]" :z-index="9999" style="width: 230px;height: 170px;"/>
           </el-form-item>
         </el-col>
@@ -82,17 +90,17 @@
         <el-col :span="12" v-if="detailInfo.valveCheckStatus">
           <el-form-item label="减压阀检查情况">
             <div v-if="detailInfo.valveCheckStatus == '0'">合格</div>
-            <div v-if="detailInfo.valveCheckStatus == '1'">可调节</div>
-            <div v-if="detailInfo.valveCheckStatus == '2'">五自闭功能</div>
+            <div v-else-if="detailInfo.valveCheckStatus == '1'">可调节</div>
+            <div v-else="detailInfo.valveCheckStatus == '2'">五自闭功能</div>
             <el-image v-if="detailInfo.valveCheckPic" :src="detailInfo.valveCheckPic" :preview-src-list="[detailInfo.valveCheckPic]" :z-index="9999" style="width: 230px;height: 170px;"/>
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="detailInfo.bottleCheckStatus">
           <el-form-item label="液化气钢瓶检查情况">
             <div v-if="detailInfo.bottleCheckStatus == '0'">合格</div>
-            <div v-if="detailInfo.bottleCheckStatus == '1'">部分有码且可追溯</div>
-            <div v-if="detailInfo.bottleCheckStatus == '2'">有码但不可追溯</div>
-            <div v-if="detailInfo.bottleCheckStatus == '3'">钢瓶无码</div>
+            <div v-else-if="detailInfo.bottleCheckStatus == '1'">部分有码且可追溯</div>
+            <div v-else-if="detailInfo.bottleCheckStatus == '2'">有码但不可追溯</div>
+            <div v-else="detailInfo.bottleCheckStatus == '3'">钢瓶无码</div>
             <el-image v-if="detailInfo.bottleCheckPic" :src="detailInfo.bottleCheckPic" :preview-src-list="[detailInfo.bottleCheckPic]" :z-index="9999" style="width: 230px;height: 170px;"/>
           </el-form-item>
         </el-col>
@@ -102,21 +110,21 @@
         <el-col :span="12" v-if="detailInfo.alarmCheckStatus">
           <el-form-item label="报警器加电磁切断阀检查情况">
             <div v-if="detailInfo.alarmCheckStatus == '0'">合格</div>
-            <div v-if="detailInfo.alarmCheckStatus == '1'">有但未使用</div>
-            <div v-if="detailInfo.alarmCheckStatus == '2'">有但未实现联动</div>
-            <div v-if="detailInfo.alarmCheckStatus == '3'">无</div>
-            <div v-if="detailInfo.alarmCheckStatus == '4'">非液化气专用报警器</div>
-            <div v-if="detailInfo.alarmCheckStatus == '5'">安装位置大于0.3米</div>
+            <div v-else-if="detailInfo.alarmCheckStatus == '1'">有但未使用</div>
+            <div v-else-if="detailInfo.alarmCheckStatus == '2'">有但未实现联动</div>
+            <div v-else-if="detailInfo.alarmCheckStatus == '3'">无</div>
+            <div v-else-if="detailInfo.alarmCheckStatus == '4'">非液化气专用报警器</div>
+            <div v-else="detailInfo.alarmCheckStatus == '5'">安装位置大于0.3米</div>
             <el-image v-if="detailInfo.alarmCheckPic" :src="detailInfo.alarmCheckPic" :preview-src-list="[detailInfo.alarmCheckPic]" :z-index="9999" style="width: 230px;height: 170px;"/>
           </el-form-item>
         </el-col>
         <el-col :span="12" v-if="detailInfo.placeCheckStatus">
           <el-form-item label="液化气钢瓶检查情况">
             <div v-if="detailInfo.placeCheckStatus == '0'">合格</div>
-            <div v-if="detailInfo.placeCheckStatus == '1'">高层建筑（裙房）</div>
-            <div v-if="detailInfo.placeCheckStatus == '2'">地下（半地下）室 </div>
-            <div v-if="detailInfo.placeCheckStatus == '3'">车库或半地下车库 </div>
-            <div v-if="detailInfo.placeCheckStatus == '4'">通风不良的场所 5.50公斤钢瓶超过两只或15公斤钢瓶超过七只未设置独立的气瓶间 </div>
+            <div v-else-if="detailInfo.placeCheckStatus == '1'">高层建筑（裙房）</div>
+            <div v-else-if="detailInfo.placeCheckStatus == '2'">地下（半地下）室 </div>
+            <div v-else-if="detailInfo.placeCheckStatus == '3'">车库或半地下车库 </div>
+            <div v-else="detailInfo.placeCheckStatus == '4'">通风不良的场所 5.50公斤钢瓶超过两只或15公斤钢瓶超过七只未设置独立的气瓶间 </div>
             <el-image v-if="detailInfo.placeCheckPic" :src="detailInfo.placeCheckPic" :preview-src-list="[detailInfo.placeCheckPic]" :z-index="9999" style="width: 230px;height: 170px;"/>
           </el-form-item>
         </el-col>
@@ -164,7 +172,7 @@
 
 <style scoped lang="scss">
   .detailInfo{
-    height: 350px;
+    height: 500px;
     overflow-y: auto;
     &::-webkit-scrollbar {
       /* 设置滚动条宽度 */

zh-baseversion-web/src/views/lpgRegulation/check/index.vue

@@ -83,8 +83,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="recordList" @selection-change="handleSelectionChange">
-      <el-table-column type="selection" width="55" align="center" />
+    <el-table v-loading="loading" :data="recordList">
       <el-table-column label="储配站" align="center" prop="stationName" />
       <el-table-column label="用户名" align="center" prop="gasUser" />
       <el-table-column label="用户类型" align="center" prop="gasUserType">

zh-baseversion-web/src/views/lpgRegulation/deliveryrecord/components/DetailInfo.vue

+<template>
+  <el-dialog title="配送记录详情" :visible.sync="detailOpen" width="900px" append-to-body>
+    <el-form label-width="120px">
+      <el-row class="el-row-table">
+
+
+        <el-col :span="12">
+          <el-form-item label="储配站">
+            <span v-if="detailInfo.stationName">{{ detailInfo.stationName }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+        <el-col :span="12">
+          <el-form-item label="气瓶条码">
+            <span v-if="detailInfo.fQRcode">{{ detailInfo.fQRcode }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="气瓶条码">
+            <span v-if="detailInfo.fQRcode">{{ detailInfo.fQRcode }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="配送人员">
+            <span v-if="detailInfo.deliveryPerson">{{ detailInfo.deliveryPerson }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="车辆代码">
+            <span v-if="detailInfo.vehicleCode">{{ detailInfo.vehicleCode }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="用户">
+            <span v-if="detailInfo.gasUser">{{ detailInfo.gasUser }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="用户类型">
+            <span v-if="detailInfo.gasUserType == '0'">居民</span>
+            <span v-else-if="detailInfo.gasUserType == '1'">非居民</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="配送地址">
+            <span v-if="detailInfo.deliveryAddress">{{ detailInfo.deliveryAddress }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="配送时间" prop="deliveryDate">
+            <span v-if="detailInfo.deliveryDate">{{ detailInfo.deliveryDate }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+    </el-form>
+  </el-dialog>
+</template>
+
+<script>
+  import { getRecord } from "@/api/lpgRegulation/record";
+  export default {
+    name: "index",
+    data(){
+      return{
+        detailOpen: false,
+        detailInfo: {}
+      }
+    },
+    methods:{
+      getDetailInfo(id){
+        getRecord(id).then(res =>{
+          if(res.code == 200 && res.data){
+            this.detailInfo = res.data;
+            this.detailOpen = true;
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped lang="scss">
+  .detailInfo{
+    height: 350px;
+    overflow-y: auto;
+    &::-webkit-scrollbar {
+      /* 设置滚动条宽度 */
+      width: 4px;
+      /* 设置滚动条背景色 */
+      //background: black;
+    }
+
+    //滚动条轨道
+    &::-webkit-scrollbar-track {
+      background-color:transparent;
+      -webkit-border-radius: 2em;
+      -moz-border-radius: 2em;
+      border-radius:2em;
+    }
+
+    //滚动条滑块
+    &::-webkit-scrollbar-thumb {
+      background-color: rgb(147,147,153,0.5);
+      -webkit-border-radius: 2em;
+      -moz-border-radius: 2em;
+      border-radius:2em;
+    }
+  }
+</style>