日用气量上报

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalStopSupController.java

@@ -44,6 +44,8 @@ public class TSupBalStopSupController extends BaseController
         startPage();
         if(!"-2".equals(SecurityUtils.getLoginUser().getUser().getDeptId())){
             tSupBalStopSup.setfCompanyInfoId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        }else{
+            tSupBalStopSup.setfRepStatus("1");
         }
         List<TSupBalStopSup> list = tSupBalStopSupService.selectTSupBalStopSupList(tSupBalStopSup);
         return getDataTable(list);

zh-baseversion-admin/src/main/java/com/zehong/web/controller/supplybalance/TSupBalUsgDayController.java

+package com.zehong.web.controller.supplybalance;
+
+import java.util.List;
+
+import com.zehong.system.domain.TSupBalGasSup;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+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.TSupBalUsgDay;
+import com.zehong.system.service.ITSupBalUsgDayService;
+import com.zehong.common.utils.poi.ExcelUtil;
+import com.zehong.common.core.page.TableDataInfo;
+
+/**
+ * 供需平衡-企业每日填报Controller
+ * 
+ * @author zehong
+ * @date 2024-06-25
+ */
+@RestController
+@RequestMapping("/supplyBalance/day")
+public class TSupBalUsgDayController extends BaseController
+{
+    @Autowired
+    private ITSupBalUsgDayService tSupBalUsgDayService;
+
+    /**
+     * 查询供需平衡-企业每日填报列表
+     */
+    @GetMapping("/list")
+    public TableDataInfo list(TSupBalUsgDay tSupBalUsgDay)
+    {
+        startPage();
+        List<TSupBalUsgDay> list = tSupBalUsgDayService.selectTSupBalUsgDayList(tSupBalUsgDay);
+        return getDataTable(list);
+    }
+
+    /**
+     * 导出供需平衡-企业每日填报列表
+     */
+    @Log(title = "供需平衡-企业每日填报", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult export(TSupBalUsgDay tSupBalUsgDay)
+    {
+        List<TSupBalUsgDay> list = tSupBalUsgDayService.selectTSupBalUsgDayList(tSupBalUsgDay);
+        ExcelUtil<TSupBalUsgDay> util = new ExcelUtil<TSupBalUsgDay>(TSupBalUsgDay.class);
+        return util.exportExcel(list, "供需平衡-企业每日填报数据");
+    }
+
+    /**
+     * 获取供需平衡-企业每日填报详细信息
+     */
+    @GetMapping(value = "/{fRepUsgDayId}")
+    public AjaxResult getInfo(@PathVariable("fRepUsgDayId") Long fRepUsgDayId)
+    {
+        return AjaxResult.success(tSupBalUsgDayService.selectTSupBalUsgDayById(fRepUsgDayId));
+    }
+
+    /**
+     * 新增供需平衡-企业每日填报
+     */
+    @Log(title = "供需平衡-企业每日填报", businessType = BusinessType.INSERT)
+    @PostMapping
+    public AjaxResult add(@RequestBody TSupBalUsgDay tSupBalUsgDay)
+    {
+        return toAjax(tSupBalUsgDayService.insertTSupBalUsgDay(tSupBalUsgDay));
+    }
+
+    /**
+     * 修改供需平衡-企业每日填报
+     */
+    @Log(title = "供需平衡-企业每日填报", businessType = BusinessType.UPDATE)
+    @PutMapping
+    public AjaxResult edit(@RequestBody TSupBalUsgDay tSupBalUsgDay)
+    {
+        return toAjax(tSupBalUsgDayService.updateTSupBalUsgDay(tSupBalUsgDay));
+    }
+
+    /**
+     * 删除供需平衡-企业每日填报
+     */
+    @Log(title = "供需平衡-企业每日填报", businessType = BusinessType.DELETE)
+	@DeleteMapping("/{fRepUsgDayIds}")
+    public AjaxResult remove(@PathVariable Long[] fRepUsgDayIds)
+    {
+        return toAjax(tSupBalUsgDayService.deleteTSupBalUsgDayByIds(fRepUsgDayIds));
+    }
+
+    @GetMapping("/reportInfoList")
+    public AjaxResult reportInfoList(TSupBalUsgDay tSupBalUsgDay){
+        List<TSupBalUsgDay> list = tSupBalUsgDayService.selectTSupBalUsgDayList(tSupBalUsgDay);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 获取上报信息
+     * @param companyId 企业id
+     * @param reportDate 上报时间
+     * @return
+     */
+    @GetMapping(value = "/getReportInfoByCompany")
+    public AjaxResult getReportInfoByCompany(@RequestParam(value="companyId")String companyId, @RequestParam(value="reportDate")String reportDate){
+        return AjaxResult.success(tSupBalUsgDayService.getReportInfoByCompany(companyId,reportDate));
+    }
+}

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

@@ -48,7 +48,7 @@ public class TSupBalGasSup extends BaseEntity
     private Date fSupDate;
 
     /** 上报状态 0-未上报，1-已上报 */
-    @Excel(name = "上报状态 0-未上报，1-已上报")
+    @Excel(name = "上报状态",readConverterExp = "0=未上报,1=已上报")
     private String fRepStatus;
 
     /** 上报日期 */

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

+package com.zehong.system.domain;
+
+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;
+
+import java.util.Date;
+
+/**
+ * 供需平衡-企业每日填报对象 t_sup_bal_usg_day
+ * 
+ * @author zehong
+ * @date 2024-06-25
+ */
+public class TSupBalUsgDay extends BaseEntity
+{
+    private static final long serialVersionUID = 1L;
+
+    /** id */
+    private Long fRepUsgDayId;
+
+    /** 企业uuid */
+    private String fCompanyInfoId;
+
+    @Excel(name = "企业名称")
+    private String enterpriseName;
+
+    /** 天然气城镇居民用量（m3） */
+    @Excel(name = "天然气城镇居民用量(万立方米)")
+    private Long fUrbanGasUsage;
+
+    /** 天然气农村气代煤居民用量（m3） */
+    @Excel(name = "天然气农村气代煤居民用量(万立方米)")
+    private Long fRuralReplaceResidentsGasUsage;
+
+    /** 天然气农村非气代煤居民用量（m3） */
+    @Excel(name = "天然气农村非气代煤居民用量(万立方米)")
+    private Long fNoRuralReplaceResidentsGasUsage;
+
+    /** 天然气工业用量（m3） */
+    @Excel(name = "天然气工业用量(万立方米)")
+    private Long fIndustrialGasUsage;
+
+    /** 天然气商业用量（m3） */
+    @Excel(name = "天然气商业用量(万立方米)")
+    private Long fCommercialGasUsage;
+
+    /** 天然气公福用量（m3） */
+    @Excel(name = "天然气公福用量(万立方米)")
+    private Long fPublicGasUsage;
+
+    /** 天然气城市集中供热锅炉用量（m3） */
+    @Excel(name = "天然气城市集中供热锅炉用量(万立方米)")
+    private Long fCityHeatingGasUasge;
+
+    /** 天然气汽车用户用量（m3） */
+    @Excel(name = "天然气汽车用户用量(万立方米)")
+    private Long fCarGasUsage;
+
+    /** 出售给其他燃气企业的天然气量（m3） */
+    @Excel(name = "出售给其他燃气企业的天然气量(万立方米)")
+    private Long fSoldGasVolume;
+
+    /** 天然气总凄凉（m3） */
+    @Excel(name = "天然气总气量万(万立方米)")
+    private Long fGasUsage;
+
+    /** 液化石油气城镇居民用量 */
+    @Excel(name = "液化石油气城镇居民用量(万立方米)")
+    private Long fUrbanLpgUsage;
+
+    /** 液化石油气农村居民用量（吨） */
+    @Excel(name = "液化石油气农村居民用量(万立方米)")
+    private Long fRuralLpgUsage;
+
+    /** 液化石油气工业用量(吨) */
+    @Excel(name = "液化石油气工业用量(吨)")
+    private Long fIndustrialLpgUsage;
+
+    /** 液化石油气商业用量(吨) */
+    @Excel(name = "液化石油气商业用量(吨)")
+    private Long fCommercialLpgUsage;
+
+    /** 液化石油气公福用量(吨) */
+    @Excel(name = "液化石油气公福用量(吨)")
+    private Long fPublicLpgUsage;
+
+    /** 液化石油气汽车用户用量(吨) */
+    @Excel(name = "液化石油气汽车用户用量(吨)")
+    private Long fCarLpgUsage;
+
+    /** 出售或调拨给其他燃气企业液化石油气量(吨) */
+    @Excel(name = "出售或调拨给其他燃气企业液化石油气量(吨)")
+    private Long fSoldLpgVolume;
+
+    /** 液化石油气总量(吨) */
+    @Excel(name = "液化石油气总量(吨)")
+    private Long fLpgUsage;
+
+    /** 记录时间，日，格式:2023-09-01 */
+    private String fReportRecord;
+
+    /** 上报时间，日，格式:2023-09-01 */
+    @Excel(name = "上报时间")
+    private String fReportTime;
+
+    @Excel(name = "上报状态",readConverterExp = "0=未上报,1=已上报")
+    private String fReportStatus;
+
+    /** 创建时间 yyyy-MM-dd hh:mm:ss */
+    @Excel(name = "创建时间")
+    private String fCreateTime;
+
+    /** 最后修改时间 yyyy-MM-dd hh:mm:ss */
+    @Excel(name = "最后修改时间")
+    private String fUpdateTime;
+
+    private String beginRepDate;
+
+    private String endRepDate;
+
+    public void setfRepUsgDayId(Long fRepUsgDayId) 
+    {
+        this.fRepUsgDayId = fRepUsgDayId;
+    }
+
+    public Long getfRepUsgDayId() 
+    {
+        return fRepUsgDayId;
+    }
+    public void setfCompanyInfoId(String fCompanyInfoId) 
+    {
+        this.fCompanyInfoId = fCompanyInfoId;
+    }
+
+    public String getfCompanyInfoId() 
+    {
+        return fCompanyInfoId;
+    }
+
+    public String getEnterpriseName() {
+        return enterpriseName;
+    }
+
+    public void setEnterpriseName(String enterpriseName) {
+        this.enterpriseName = enterpriseName;
+    }
+
+    public void setfUrbanGasUsage(Long fUrbanGasUsage)
+    {
+        this.fUrbanGasUsage = fUrbanGasUsage;
+    }
+
+    public Long getfUrbanGasUsage() 
+    {
+        return fUrbanGasUsage;
+    }
+    public void setfRuralReplaceResidentsGasUsage(Long fRuralReplaceResidentsGasUsage) 
+    {
+        this.fRuralReplaceResidentsGasUsage = fRuralReplaceResidentsGasUsage;
+    }
+
+    public Long getfRuralReplaceResidentsGasUsage() 
+    {
+        return fRuralReplaceResidentsGasUsage;
+    }
+    public void setfNoRuralReplaceResidentsGasUsage(Long fNoRuralReplaceResidentsGasUsage) 
+    {
+        this.fNoRuralReplaceResidentsGasUsage = fNoRuralReplaceResidentsGasUsage;
+    }
+
+    public Long getfNoRuralReplaceResidentsGasUsage() 
+    {
+        return fNoRuralReplaceResidentsGasUsage;
+    }
+    public void setfIndustrialGasUsage(Long fIndustrialGasUsage) 
+    {
+        this.fIndustrialGasUsage = fIndustrialGasUsage;
+    }
+
+    public Long getfIndustrialGasUsage() 
+    {
+        return fIndustrialGasUsage;
+    }
+    public void setfCommercialGasUsage(Long fCommercialGasUsage) 
+    {
+        this.fCommercialGasUsage = fCommercialGasUsage;
+    }
+
+    public Long getfCommercialGasUsage() 
+    {
+        return fCommercialGasUsage;
+    }
+    public void setfPublicGasUsage(Long fPublicGasUsage) 
+    {
+        this.fPublicGasUsage = fPublicGasUsage;
+    }
+
+    public Long getfPublicGasUsage() 
+    {
+        return fPublicGasUsage;
+    }
+    public void setfCityHeatingGasUasge(Long fCityHeatingGasUasge) 
+    {
+        this.fCityHeatingGasUasge = fCityHeatingGasUasge;
+    }
+
+    public Long getfCityHeatingGasUasge() 
+    {
+        return fCityHeatingGasUasge;
+    }
+    public void setfCarGasUsage(Long fCarGasUsage) 
+    {
+        this.fCarGasUsage = fCarGasUsage;
+    }
+
+    public Long getfCarGasUsage() 
+    {
+        return fCarGasUsage;
+    }
+    public void setfSoldGasVolume(Long fSoldGasVolume) 
+    {
+        this.fSoldGasVolume = fSoldGasVolume;
+    }
+
+    public Long getfSoldGasVolume() 
+    {
+        return fSoldGasVolume;
+    }
+    public void setfGasUsage(Long fGasUsage) 
+    {
+        this.fGasUsage = fGasUsage;
+    }
+
+    public Long getfGasUsage() 
+    {
+        return fGasUsage;
+    }
+    public void setfUrbanLpgUsage(Long fUrbanLpgUsage) 
+    {
+        this.fUrbanLpgUsage = fUrbanLpgUsage;
+    }
+
+    public Long getfUrbanLpgUsage() 
+    {
+        return fUrbanLpgUsage;
+    }
+    public void setfRuralLpgUsage(Long fRuralLpgUsage) 
+    {
+        this.fRuralLpgUsage = fRuralLpgUsage;
+    }
+
+    public Long getfRuralLpgUsage() 
+    {
+        return fRuralLpgUsage;
+    }
+    public void setfIndustrialLpgUsage(Long fIndustrialLpgUsage) 
+    {
+        this.fIndustrialLpgUsage = fIndustrialLpgUsage;
+    }
+
+    public Long getfIndustrialLpgUsage() 
+    {
+        return fIndustrialLpgUsage;
+    }
+    public void setfCommercialLpgUsage(Long fCommercialLpgUsage) 
+    {
+        this.fCommercialLpgUsage = fCommercialLpgUsage;
+    }
+
+    public Long getfCommercialLpgUsage() 
+    {
+        return fCommercialLpgUsage;
+    }
+    public void setfPublicLpgUsage(Long fPublicLpgUsage) 
+    {
+        this.fPublicLpgUsage = fPublicLpgUsage;
+    }
+
+    public Long getfPublicLpgUsage() 
+    {
+        return fPublicLpgUsage;
+    }
+    public void setfCarLpgUsage(Long fCarLpgUsage) 
+    {
+        this.fCarLpgUsage = fCarLpgUsage;
+    }
+
+    public Long getfCarLpgUsage() 
+    {
+        return fCarLpgUsage;
+    }
+    public void setfSoldLpgVolume(Long fSoldLpgVolume) 
+    {
+        this.fSoldLpgVolume = fSoldLpgVolume;
+    }
+
+    public Long getfSoldLpgVolume() 
+    {
+        return fSoldLpgVolume;
+    }
+    public void setfLpgUsage(Long fLpgUsage) 
+    {
+        this.fLpgUsage = fLpgUsage;
+    }
+
+    public Long getfLpgUsage() 
+    {
+        return fLpgUsage;
+    }
+    public void setfReportRecord(String fReportRecord) 
+    {
+        this.fReportRecord = fReportRecord;
+    }
+
+    public String getfReportRecord() 
+    {
+        return fReportRecord;
+    }
+    public void setfReportTime(String fReportTime) 
+    {
+        this.fReportTime = fReportTime;
+    }
+
+    public String getfReportTime() 
+    {
+        return fReportTime;
+    }
+
+    public String getfReportStatus() {
+        return fReportStatus;
+    }
+
+    public void setfReportStatus(String fReportStatus) {
+        this.fReportStatus = fReportStatus;
+    }
+
+    public void setfCreateTime(String fCreateTime)
+    {
+        this.fCreateTime = fCreateTime;
+    }
+
+    public String getfCreateTime() 
+    {
+        return fCreateTime;
+    }
+    public void setfUpdateTime(String fUpdateTime) 
+    {
+        this.fUpdateTime = fUpdateTime;
+    }
+
+    public String getfUpdateTime() 
+    {
+        return fUpdateTime;
+    }
+
+    public String getBeginRepDate() {
+        return beginRepDate;
+    }
+
+    public void setBeginRepDate(String beginRepDate) {
+        this.beginRepDate = beginRepDate;
+    }
+
+    public String getEndRepDate() {
+        return endRepDate;
+    }
+
+    public void setEndRepDate(String endRepDate) {
+        this.endRepDate = endRepDate;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
+            .append("fRepUsgDayId", getfRepUsgDayId())
+            .append("fCompanyInfoId", getfCompanyInfoId())
+            .append("fUrbanGasUsage", getfUrbanGasUsage())
+            .append("fRuralReplaceResidentsGasUsage", getfRuralReplaceResidentsGasUsage())
+            .append("fNoRuralReplaceResidentsGasUsage", getfNoRuralReplaceResidentsGasUsage())
+            .append("fIndustrialGasUsage", getfIndustrialGasUsage())
+            .append("fCommercialGasUsage", getfCommercialGasUsage())
+            .append("fPublicGasUsage", getfPublicGasUsage())
+            .append("fCityHeatingGasUasge", getfCityHeatingGasUasge())
+            .append("fCarGasUsage", getfCarGasUsage())
+            .append("fSoldGasVolume", getfSoldGasVolume())
+            .append("fGasUsage", getfGasUsage())
+            .append("fUrbanLpgUsage", getfUrbanLpgUsage())
+            .append("fRuralLpgUsage", getfRuralLpgUsage())
+            .append("fIndustrialLpgUsage", getfIndustrialLpgUsage())
+            .append("fCommercialLpgUsage", getfCommercialLpgUsage())
+            .append("fPublicLpgUsage", getfPublicLpgUsage())
+            .append("fCarLpgUsage", getfCarLpgUsage())
+            .append("fSoldLpgVolume", getfSoldLpgVolume())
+            .append("fLpgUsage", getfLpgUsage())
+            .append("fReportRecord", getfReportRecord())
+            .append("fReportTime", getfReportTime())
+            .append("fCreateTime", getfCreateTime())
+            .append("fUpdateTime", getfUpdateTime())
+            .toString();
+    }
+}

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

+package com.zehong.system.mapper;
+
+import java.util.List;
+import java.util.Map;
+import com.zehong.system.domain.TSupBalUsgDay;
+
+/**
+ * 供需平衡-企业每日填报Mapper接口
+ * 
+ * @author zehong
+ * @date 2024-06-25
+ */
+public interface TSupBalUsgDayMapper 
+{
+    /**
+     * 查询供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayId 供需平衡-企业每日填报ID
+     * @return 供需平衡-企业每日填报
+     */
+    public TSupBalUsgDay selectTSupBalUsgDayById(Long fRepUsgDayId);
+
+    /**
+     * 查询供需平衡-企业每日填报列表
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 供需平衡-企业每日填报集合
+     */
+    public List<TSupBalUsgDay> selectTSupBalUsgDayList(TSupBalUsgDay tSupBalUsgDay);
+
+    /**
+     * 新增供需平衡-企业每日填报
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 结果
+     */
+    public int insertTSupBalUsgDay(TSupBalUsgDay tSupBalUsgDay);
+
+    /**
+     * 修改供需平衡-企业每日填报
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 结果
+     */
+    public int updateTSupBalUsgDay(TSupBalUsgDay tSupBalUsgDay);
+
+    /**
+     * 删除供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayId 供需平衡-企业每日填报ID
+     * @return 结果
+     */
+    public int deleteTSupBalUsgDayById(Long fRepUsgDayId);
+
+    /**
+     * 批量删除供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayIds 需要删除的数据ID
+     * @return 结果
+     */
+    public int deleteTSupBalUsgDayByIds(Long[] fRepUsgDayIds);
+
+    /**
+     * 获取上报信息
+     */
+    TSupBalUsgDay getReportInfoByCompany(Map<String, String> param);
+}

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

+package com.zehong.system.service;
+
+import java.util.List;
+
+import com.zehong.system.domain.TSupBalGasSup;
+import com.zehong.system.domain.TSupBalUsgDay;
+
+/**
+ * 供需平衡-企业每日填报Service接口
+ * 
+ * @author zehong
+ * @date 2024-06-25
+ */
+public interface ITSupBalUsgDayService 
+{
+    /**
+     * 查询供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayId 供需平衡-企业每日填报ID
+     * @return 供需平衡-企业每日填报
+     */
+    public TSupBalUsgDay selectTSupBalUsgDayById(Long fRepUsgDayId);
+
+    /**
+     * 查询供需平衡-企业每日填报列表
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 供需平衡-企业每日填报集合
+     */
+    public List<TSupBalUsgDay> selectTSupBalUsgDayList(TSupBalUsgDay tSupBalUsgDay);
+
+    /**
+     * 新增供需平衡-企业每日填报
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 结果
+     */
+    public int insertTSupBalUsgDay(TSupBalUsgDay tSupBalUsgDay);
+
+    /**
+     * 修改供需平衡-企业每日填报
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 结果
+     */
+    public int updateTSupBalUsgDay(TSupBalUsgDay tSupBalUsgDay);
+
+    /**
+     * 批量删除供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayIds 需要删除的供需平衡-企业每日填报ID
+     * @return 结果
+     */
+    public int deleteTSupBalUsgDayByIds(Long[] fRepUsgDayIds);
+
+    /**
+     * 删除供需平衡-企业每日填报信息
+     * 
+     * @param fRepUsgDayId 供需平衡-企业每日填报ID
+     * @return 结果
+     */
+    public int deleteTSupBalUsgDayById(Long fRepUsgDayId);
+
+    /**
+     * 获取上报信息
+     * @param companyId 企业id
+     * @param reportDate 上报时间
+     * @return
+     */
+    TSupBalUsgDay getReportInfoByCompany(String companyId, String reportDate);
+}

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

+package com.zehong.system.service.impl;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import com.zehong.common.utils.SecurityUtils;
+import com.zehong.system.domain.TSupBalGasSup;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import com.zehong.system.mapper.TSupBalUsgDayMapper;
+import com.zehong.system.domain.TSupBalUsgDay;
+import com.zehong.system.service.ITSupBalUsgDayService;
+
+/**
+ * 供需平衡-企业每日填报Service业务层处理
+ * 
+ * @author zehong
+ * @date 2024-06-25
+ */
+@Service
+public class TSupBalUsgDayServiceImpl implements ITSupBalUsgDayService 
+{
+    @Autowired
+    private TSupBalUsgDayMapper tSupBalUsgDayMapper;
+
+    /**
+     * 查询供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayId 供需平衡-企业每日填报ID
+     * @return 供需平衡-企业每日填报
+     */
+    @Override
+    public TSupBalUsgDay selectTSupBalUsgDayById(Long fRepUsgDayId)
+    {
+        return tSupBalUsgDayMapper.selectTSupBalUsgDayById(fRepUsgDayId);
+    }
+
+    /**
+     * 查询供需平衡-企业每日填报列表
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 供需平衡-企业每日填报
+     */
+    @Override
+    public List<TSupBalUsgDay> selectTSupBalUsgDayList(TSupBalUsgDay tSupBalUsgDay)
+    {
+        return tSupBalUsgDayMapper.selectTSupBalUsgDayList(tSupBalUsgDay);
+    }
+
+    /**
+     * 新增供需平衡-企业每日填报
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 结果
+     */
+    @Override
+    public int insertTSupBalUsgDay(TSupBalUsgDay tSupBalUsgDay)
+    {
+        tSupBalUsgDay.setfCreateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        tSupBalUsgDay.setfCompanyInfoId(SecurityUtils.getLoginUser().getUser().getDeptId());
+        return tSupBalUsgDayMapper.insertTSupBalUsgDay(tSupBalUsgDay);
+    }
+
+    /**
+     * 修改供需平衡-企业每日填报
+     * 
+     * @param tSupBalUsgDay 供需平衡-企业每日填报
+     * @return 结果
+     */
+    @Override
+    public int updateTSupBalUsgDay(TSupBalUsgDay tSupBalUsgDay)
+    {
+        tSupBalUsgDay.setfUpdateTime(new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()));
+        return tSupBalUsgDayMapper.updateTSupBalUsgDay(tSupBalUsgDay);
+    }
+
+    /**
+     * 批量删除供需平衡-企业每日填报
+     * 
+     * @param fRepUsgDayIds 需要删除的供需平衡-企业每日填报ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSupBalUsgDayByIds(Long[] fRepUsgDayIds)
+    {
+        return tSupBalUsgDayMapper.deleteTSupBalUsgDayByIds(fRepUsgDayIds);
+    }
+
+    /**
+     * 删除供需平衡-企业每日填报信息
+     * 
+     * @param fRepUsgDayId 供需平衡-企业每日填报ID
+     * @return 结果
+     */
+    @Override
+    public int deleteTSupBalUsgDayById(Long fRepUsgDayId)
+    {
+        return tSupBalUsgDayMapper.deleteTSupBalUsgDayById(fRepUsgDayId);
+    }
+
+    /**
+     * 获取上报信息
+     * @param companyId 企业id
+     * @param reportDate 上报时间
+     * @return
+     */
+    @Override
+    public TSupBalUsgDay getReportInfoByCompany(String companyId, String reportDate) {
+        Map<String,String> param = new HashMap();
+        param.put("companyId",companyId);
+        param.put("reportDate",reportDate);
+        return tSupBalUsgDayMapper.getReportInfoByCompany(param);
+    }
+
+
+}

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

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectTSupBalGasSupList" parameterType="TSupBalGasSup" resultMap="TSupBalGasSupResult">
         <include refid="selectTSupBalGasSupVo"/>
         <where>  
-            <if test="fCompanyInfoId != null  and fCompanyInfoId != ''"> and sup.f_company_info_id like concat('%', #{fCompanyInfoId}, '%')</if>
+            <if test="fCompanyInfoId != null  and fCompanyInfoId != ''"> and sup.f_company_info_id = #{fCompanyInfoId}</if>
             <if test="fPlanQuan != null "> and sup.f_plan_quan = #{fPlanQuan}</if>
             <if test="fApprQuan != null "> and sup.f_appr_quan = #{fApprQuan}</if>
             <if test="fSupGasVol != null "> and sup.f_sup_gas_vol = #{fSupGasVol}</if>
@@ -134,6 +134,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="getReportInfoByCompany" parameterType="Map" resultMap="TSupBalGasSupResult">
         <include refid="selectTSupBalGasSupVo"/>
-        where sup.f_company_info_id = #{companyId} and f_rep_date like concat('%', #{reportDate}, '%')
+        where sup.f_company_info_id = #{companyId} and sup.f_rep_date like concat('%', #{reportDate}, '%')
     </select>
 </mapper>
\ No newline at end of file

zh-baseversion-system/src/main/resources/mapper/system/TSupBalUsgDayMapper.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.TSupBalUsgDayMapper">
+    
+    <resultMap type="TSupBalUsgDay" id="TSupBalUsgDayResult">
+        <result property="fRepUsgDayId"    column="f_rep_usg_day_id"    />
+        <result property="fCompanyInfoId"    column="f_company_info_id"    />
+        <result property="fUrbanGasUsage"    column="f_urban_gas_usage"    />
+        <result property="fRuralReplaceResidentsGasUsage"    column="f_rural_replace_residents_gas_usage"    />
+        <result property="fNoRuralReplaceResidentsGasUsage"    column="f_no_rural_replace_residents_gas_usage"    />
+        <result property="fIndustrialGasUsage"    column="f_industrial_gas_usage"    />
+        <result property="fCommercialGasUsage"    column="f_commercial_gas_usage"    />
+        <result property="fPublicGasUsage"    column="f_public_gas_usage"    />
+        <result property="fCityHeatingGasUasge"    column="f_city_heating_gas_uasge"    />
+        <result property="fCarGasUsage"    column="f_car_gas_usage"    />
+        <result property="fSoldGasVolume"    column="f_sold_gas_volume"    />
+        <result property="fGasUsage"    column="f_gas_usage"    />
+        <result property="fUrbanLpgUsage"    column="f_urban_lpg_usage"    />
+        <result property="fRuralLpgUsage"    column="f_rural_lpg_usage"    />
+        <result property="fIndustrialLpgUsage"    column="f_industrial_lpg_usage"    />
+        <result property="fCommercialLpgUsage"    column="f_commercial_lpg_usage"    />
+        <result property="fPublicLpgUsage"    column="f_public_lpg_usage"    />
+        <result property="fCarLpgUsage"    column="f_car_lpg_usage"    />
+        <result property="fSoldLpgVolume"    column="f_sold_lpg_volume"    />
+        <result property="fLpgUsage"    column="f_lpg_usage"    />
+        <result property="fReportRecord"    column="f_report_record"    />
+        <result property="fReportTime"    column="f_report_time"    />
+        <result property="fCreateTime"    column="f_create_time"    />
+        <result property="fUpdateTime"    column="f_update_time"    />
+        <result property="fReportStatus"    column="f_report_status"    />
+    </resultMap>
+
+    <sql id="selectTSupBalUsgDayVo">
+        SELECT
+            da.f_rep_usg_day_id,
+            da.f_company_info_id,
+            da.f_urban_gas_usage,
+            da.f_rural_replace_residents_gas_usage,
+            da.f_no_rural_replace_residents_gas_usage,
+            da.f_industrial_gas_usage,
+            da.f_commercial_gas_usage,
+            da.f_public_gas_usage,
+            da.f_city_heating_gas_uasge,
+            da.f_car_gas_usage,
+            da.f_sold_gas_volume,
+            da.f_gas_usage,
+            da.f_urban_lpg_usage,
+            da.f_rural_lpg_usage,
+            da.f_industrial_lpg_usage,
+            da.f_commercial_lpg_usage,
+            da.f_public_lpg_usage,
+            da.f_car_lpg_usage,
+            da.f_sold_lpg_volume,
+            da.f_lpg_usage,
+            da.f_report_record,
+            da.f_report_time,
+            da.f_create_time,
+            da.f_update_time,
+            da.f_report_status,
+            en.enterprise_name AS enterpriseName
+        FROM
+            t_sup_bal_usg_day da
+        LEFT JOIN t_enterprise_info en ON en.enterprise_id = da.f_company_info_id
+    </sql>
+
+    <select id="selectTSupBalUsgDayList" parameterType="TSupBalUsgDay" resultMap="TSupBalUsgDayResult">
+        <include refid="selectTSupBalUsgDayVo"/>
+        <where>  
+            <if test="fCompanyInfoId != null  and fCompanyInfoId != ''"> and da.f_company_info_id = #{fCompanyInfoId}</if>
+            <if test="beginRepDate != null and endRepDate != null">and da.f_report_time between #{beginRepDate} and #{endRepDate}</if>
+            <if test="fReportStatus != null and fReportStatus != ''">da.f_report_status = #{fReportStatus}</if>
+            <if test="enterpriseName != null  and enterpriseName != ''"> and en.enterprise_name like concat('%', #{enterpriseName}, '%')</if>
+        </where>
+    </select>
+    
+    <select id="selectTSupBalUsgDayById" parameterType="Long" resultMap="TSupBalUsgDayResult">
+        <include refid="selectTSupBalUsgDayVo"/>
+        where da.f_rep_usg_day_id = #{fRepUsgDayId}
+    </select>
+        
+    <insert id="insertTSupBalUsgDay" parameterType="TSupBalUsgDay" useGeneratedKeys="true" keyProperty="fRepUsgDayId">
+        insert into t_sup_bal_usg_day
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="fCompanyInfoId != null and fCompanyInfoId != ''">f_company_info_id,</if>
+            <if test="fUrbanGasUsage != null">f_urban_gas_usage,</if>
+            <if test="fRuralReplaceResidentsGasUsage != null">f_rural_replace_residents_gas_usage,</if>
+            <if test="fNoRuralReplaceResidentsGasUsage != null">f_no_rural_replace_residents_gas_usage,</if>
+            <if test="fIndustrialGasUsage != null">f_industrial_gas_usage,</if>
+            <if test="fCommercialGasUsage != null">f_commercial_gas_usage,</if>
+            <if test="fPublicGasUsage != null">f_public_gas_usage,</if>
+            <if test="fCityHeatingGasUasge != null">f_city_heating_gas_uasge,</if>
+            <if test="fCarGasUsage != null">f_car_gas_usage,</if>
+            <if test="fSoldGasVolume != null">f_sold_gas_volume,</if>
+            <if test="fGasUsage != null">f_gas_usage,</if>
+            <if test="fUrbanLpgUsage != null">f_urban_lpg_usage,</if>
+            <if test="fRuralLpgUsage != null">f_rural_lpg_usage,</if>
+            <if test="fIndustrialLpgUsage != null">f_industrial_lpg_usage,</if>
+            <if test="fCommercialLpgUsage != null">f_commercial_lpg_usage,</if>
+            <if test="fPublicLpgUsage != null">f_public_lpg_usage,</if>
+            <if test="fCarLpgUsage != null">f_car_lpg_usage,</if>
+            <if test="fSoldLpgVolume != null">f_sold_lpg_volume,</if>
+            <if test="fLpgUsage != null">f_lpg_usage,</if>
+            <if test="fReportRecord != null">f_report_record,</if>
+            <if test="fReportTime != null">f_report_time,</if>
+            <if test="fCreateTime != null and fCreateTime != ''">f_create_time,</if>
+            <if test="fUpdateTime != null">f_update_time,</if>
+            <if test="fReportStatus != null and fReportStatus != ''">f_report_status,</if>
+         </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="fCompanyInfoId != null and fCompanyInfoId != ''">#{fCompanyInfoId},</if>
+            <if test="fUrbanGasUsage != null">#{fUrbanGasUsage},</if>
+            <if test="fRuralReplaceResidentsGasUsage != null">#{fRuralReplaceResidentsGasUsage},</if>
+            <if test="fNoRuralReplaceResidentsGasUsage != null">#{fNoRuralReplaceResidentsGasUsage},</if>
+            <if test="fIndustrialGasUsage != null">#{fIndustrialGasUsage},</if>
+            <if test="fCommercialGasUsage != null">#{fCommercialGasUsage},</if>
+            <if test="fPublicGasUsage != null">#{fPublicGasUsage},</if>
+            <if test="fCityHeatingGasUasge != null">#{fCityHeatingGasUasge},</if>
+            <if test="fCarGasUsage != null">#{fCarGasUsage},</if>
+            <if test="fSoldGasVolume != null">#{fSoldGasVolume},</if>
+            <if test="fGasUsage != null">#{fGasUsage},</if>
+            <if test="fUrbanLpgUsage != null">#{fUrbanLpgUsage},</if>
+            <if test="fRuralLpgUsage != null">#{fRuralLpgUsage},</if>
+            <if test="fIndustrialLpgUsage != null">#{fIndustrialLpgUsage},</if>
+            <if test="fCommercialLpgUsage != null">#{fCommercialLpgUsage},</if>
+            <if test="fPublicLpgUsage != null">#{fPublicLpgUsage},</if>
+            <if test="fCarLpgUsage != null">#{fCarLpgUsage},</if>
+            <if test="fSoldLpgVolume != null">#{fSoldLpgVolume},</if>
+            <if test="fLpgUsage != null">#{fLpgUsage},</if>
+            <if test="fReportRecord != null">#{fReportRecord},</if>
+            <if test="fReportTime != null">#{fReportTime},</if>
+            <if test="fCreateTime != null and fCreateTime != ''">#{fCreateTime},</if>
+            <if test="fUpdateTime != null">#{fUpdateTime},</if>
+            <if test="fReportStatus != null and fReportStatus != ''">#{fReportStatus},</if>
+         </trim>
+    </insert>
+
+    <update id="updateTSupBalUsgDay" parameterType="TSupBalUsgDay">
+        update t_sup_bal_usg_day
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="fCompanyInfoId != null and fCompanyInfoId != ''">f_company_info_id = #{fCompanyInfoId},</if>
+            <if test="fUrbanGasUsage != null">f_urban_gas_usage = #{fUrbanGasUsage},</if>
+            <if test="fRuralReplaceResidentsGasUsage != null">f_rural_replace_residents_gas_usage = #{fRuralReplaceResidentsGasUsage},</if>
+            <if test="fNoRuralReplaceResidentsGasUsage != null">f_no_rural_replace_residents_gas_usage = #{fNoRuralReplaceResidentsGasUsage},</if>
+            <if test="fIndustrialGasUsage != null">f_industrial_gas_usage = #{fIndustrialGasUsage},</if>
+            <if test="fCommercialGasUsage != null">f_commercial_gas_usage = #{fCommercialGasUsage},</if>
+            <if test="fPublicGasUsage != null">f_public_gas_usage = #{fPublicGasUsage},</if>
+            <if test="fCityHeatingGasUasge != null">f_city_heating_gas_uasge = #{fCityHeatingGasUasge},</if>
+            <if test="fCarGasUsage != null">f_car_gas_usage = #{fCarGasUsage},</if>
+            <if test="fSoldGasVolume != null">f_sold_gas_volume = #{fSoldGasVolume},</if>
+            <if test="fGasUsage != null">f_gas_usage = #{fGasUsage},</if>
+            <if test="fUrbanLpgUsage != null">f_urban_lpg_usage = #{fUrbanLpgUsage},</if>
+            <if test="fRuralLpgUsage != null">f_rural_lpg_usage = #{fRuralLpgUsage},</if>
+            <if test="fIndustrialLpgUsage != null">f_industrial_lpg_usage = #{fIndustrialLpgUsage},</if>
+            <if test="fCommercialLpgUsage != null">f_commercial_lpg_usage = #{fCommercialLpgUsage},</if>
+            <if test="fPublicLpgUsage != null">f_public_lpg_usage = #{fPublicLpgUsage},</if>
+            <if test="fCarLpgUsage != null">f_car_lpg_usage = #{fCarLpgUsage},</if>
+            <if test="fSoldLpgVolume != null">f_sold_lpg_volume = #{fSoldLpgVolume},</if>
+            <if test="fLpgUsage != null">f_lpg_usage = #{fLpgUsage},</if>
+            <if test="fReportRecord != null">f_report_record = #{fReportRecord},</if>
+            <if test="fReportTime != null">f_report_time = #{fReportTime},</if>
+            <if test="fCreateTime != null and fCreateTime != ''">f_create_time = #{fCreateTime},</if>
+            <if test="fUpdateTime != null">f_update_time = #{fUpdateTime},</if>
+            <if test="fReportStatus != null and fReportStatus != ''">f_report_status = #{fReportStatus},</if>
+        </trim>
+        where f_rep_usg_day_id = #{fRepUsgDayId}
+    </update>
+
+    <delete id="deleteTSupBalUsgDayById" parameterType="Long">
+        delete from t_sup_bal_usg_day where f_rep_usg_day_id = #{fRepUsgDayId}
+    </delete>
+
+    <delete id="deleteTSupBalUsgDayByIds" parameterType="String">
+        delete from t_sup_bal_usg_day where f_rep_usg_day_id in 
+        <foreach item="fRepUsgDayId" collection="array" open="(" separator="," close=")">
+            #{fRepUsgDayId}
+        </foreach>
+    </delete>
+
+    <select id="getReportInfoByCompany" parameterType="Map" resultMap="TSupBalUsgDayResult">
+        <include refid="selectTSupBalUsgDayVo"/>
+        where da.f_company_info_id = #{companyId} and da.f_report_time like concat('%', #{reportDate}, '%')
+    </select>
+</mapper>
\ No newline at end of file

zh-baseversion-web/src/api/supplybalance/day.js

+import request from '@/utils/request'
+
+// 查询供需平衡-企业每日填报列表
+export function listDay(query) {
+  return request({
+    url: '/supplyBalance/day/list',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询供需平衡-企业每日填报详细
+export function getDay(fRepUsgDayId) {
+  return request({
+    url: '/supplyBalance/day/' + fRepUsgDayId,
+    method: 'get'
+  })
+}
+
+// 新增供需平衡-企业每日填报
+export function addDay(data) {
+  return request({
+    url: '/supplyBalance/day',
+    method: 'post',
+    data: data
+  })
+}
+
+// 修改供需平衡-企业每日填报
+export function updateDay(data) {
+  return request({
+    url: '/supplyBalance/day',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除供需平衡-企业每日填报
+export function delDay(fRepUsgDayId) {
+  return request({
+    url: '/supplyBalance/day/' + fRepUsgDayId,
+    method: 'delete'
+  })
+}
+
+// 导出供需平衡-企业每日填报
+export function exportDay(query) {
+  return request({
+    url: '/supplyBalance/day/export',
+    method: 'get',
+    params: query
+  })
+}
+
+export function reportInfoList(query) {
+  return request({
+    url: '/supplyBalance/day/reportInfoList',
+    method: 'get',
+    params: query
+  })
+}
+
+export function getReportInfoByCompany(query) {
+  return request({
+    url: '/supplyBalance/day/getReportInfoByCompany',
+    method: 'get',
+    params: query
+  })
+}

zh-baseversion-web/src/views/supplybalance/day/components/DetailInfo.vue

+<template>
+  <el-dialog title="详情" :visible.sync="detailOpen" width="900px" append-to-body destroy-on-close :close-on-click-modal="false">
+
+    <el-form label-position="top" label-width="120px">
+      <el-row class="el-row-table">
+        <el-col :span="12">
+          <el-form-item label="企业名称">
+            <span v-if="detailInfo.enterpriseName">{{ detailInfo.enterpriseName }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气城镇居民用量(万立方米)">
+            <span v-if="detailInfo.fUrbanGasUsage">{{ detailInfo.fUrbanGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气农村气代煤居民用量(万立方米)">
+            <span v-if="detailInfo.fRuralReplaceResidentsGasUsage">{{ detailInfo.fRuralReplaceResidentsGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="天然气农村非气代煤居民用量(万立方米)">
+            <span v-if="detailInfo.fNoRuralReplaceResidentsGasUsage">{{ detailInfo.fNoRuralReplaceResidentsGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气工业用量(万立方米)">
+            <span v-if="detailInfo.fIndustrialGasUsage">{{ detailInfo.fIndustrialGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气商业用量(万立方米)">
+            <span v-if="detailInfo.fCommercialGasUsage">{{ detailInfo.fCommercialGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气公福用量(万立方米)">
+            <span v-if="detailInfo.fPublicGasUsage">{{ detailInfo.fPublicGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气城市集中供热锅炉用量(万立方米)">
+            <span v-if="detailInfo.fCityHeatingGasUasge">{{ detailInfo.fCityHeatingGasUasge }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气汽车用户用量(万立方米)">
+            <span v-if="detailInfo.fCarGasUsage">{{ detailInfo.fCarGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="出售给其他燃气企业的天然气量(万立方米)">
+            <span v-if="detailInfo.fSoldGasVolume">{{ detailInfo.fSoldGasVolume }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="天然气总气量(万立方米)">
+            <span v-if="detailInfo.fGasUsage">{{ detailInfo.fGasUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气城镇居民用量(万立方米)">
+            <span v-if="detailInfo.fUrbanLpgUsage">{{ detailInfo.fUrbanLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气农村居民用量(吨)">
+            <span v-if="detailInfo.fRuralLpgUsage">{{ detailInfo.fRuralLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气工业用量(吨)">
+            <span v-if="detailInfo.fIndustrialLpgUsage">{{ detailInfo.fIndustrialLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气商业用量(吨)">
+            <span v-if="detailInfo.fCommercialLpgUsage">{{ detailInfo.fCommercialLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气公福用量(吨)">
+            <span v-if="detailInfo.fPublicLpgUsage">{{ detailInfo.fPublicLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气汽车用户用量(吨)">
+            <span v-if="detailInfo.fCarLpgUsage">{{ detailInfo.fCarLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="出售或调拨给其他燃气企业液化石油气量(吨)">
+            <span v-if="detailInfo.fSoldLpgVolume">{{ detailInfo.fSoldLpgVolume }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+
+        <el-col :span="12">
+          <el-form-item label="液化石油气总量(吨)">
+            <span v-if="detailInfo.fLpgUsage">{{ detailInfo.fLpgUsage }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="上报时间">
+            <span v-if="detailInfo.fReportTime">{{ detailInfo.fReportTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="创建时间">
+            <span v-if="detailInfo.fCreateTime">{{ detailInfo.fCreateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+        <el-col :span="12">
+          <el-form-item label="最后修改时间">
+            <span v-if="detailInfo.fUpdateTime">{{ detailInfo.fUpdateTime }}</span>
+            <span v-else>-</span>
+          </el-form-item>
+        </el-col>
+
+      </el-row>
+
+    </el-form>
+
+  </el-dialog>
+
+</template>
+
+<script>
+  import { getDay } from "@/api/supplybalance/day";
+  export default {
+    name: "detail-info",
+    data(){
+        return{
+          detailInfo: {
+            fDeleteFlag: 0
+          },
+          detailOpen: false
+        }
+    },
+    methods:{
+      getDetailInfo(id){
+        getDay(id).then(res =>{
+          if(res.code == 200 && res.data){
+            this.detailInfo = res.data;
+            this.detailOpen = true;
+          }
+        })
+      }
+    }
+  }
+</script>
+
+<style scoped>
+
+</style>

zh-baseversion-web/src/views/supplybalance/day/index.vue

+<template>
+  <div class="app-container">
+
+    <div>
+      <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+        <el-form-item label="企业名称" prop="enterpriseName">
+          <el-input
+            v-model="queryParams.enterpriseName"
+            placeholder="请输入企业名称"
+            clearable
+            size="small"
+            @keyup.enter.native="handleQuery"
+          />
+        </el-form-item>
+
+        <el-form-item label="上报时间">
+          <el-date-picker
+            v-model="dateRange"
+            size="small"
+            style="width: 240px"
+            type="daterange"
+            start-placeholder="开始日期"
+            end-placeholder="结束日期"
+            value-format="yyyy-MM-dd"
+            @change="timeChange"
+          ></el-date-picker>
+        </el-form-item>
+
+        <el-form-item>
+          <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
+          <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
+        </el-form-item>
+      </el-form>
+
+      <el-row :gutter="10" class="mb8">
+        <el-col :span="1.5">
+          <!--<el-button
+            type="primary"
+            plain
+            icon="el-icon-plus"
+            size="mini"
+            @click="handleAdd"
+          >新增</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="success"
+            plain
+            icon="el-icon-edit"
+            size="mini"
+            :disabled="single"
+            @click="handleUpdate"
+            v-hasPermi="['system:day:edit']"
+          >修改</el-button>-->
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="danger"
+            plain
+            icon="el-icon-delete"
+            size="mini"
+            :disabled="multiple"
+            @click="handleDelete"
+          >删除</el-button>
+        </el-col>
+        <el-col :span="1.5">
+          <el-button
+            type="warning"
+            plain
+            icon="el-icon-download"
+            size="mini"
+            :loading="exportLoading"
+            @click="handleExport"
+          >导出</el-button>
+        </el-col>
+        <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+      </el-row>
+
+      <el-table v-loading="loading" :data="dayList" @selection-change="handleSelectionChange">
+        <el-table-column type="selection" width="55" align="center" :show-overflow-tooltip="true"/>
+        <el-table-column label="企业名称" align="center" prop="enterpriseName"  width="150" />
+        <el-table-column label="天然气总气量/wm³" align="center" prop="fGasUsage" width="150"/>
+        <el-table-column label="天然气城镇居民用量/wm³" align="center" prop="fUrbanGasUsage" width="180">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fUrbanGasUsage">{{ scope.row.fUrbanGasUsage }}</span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="天然气农村气代煤居民用量/wm³" align="center" prop="fRuralReplaceResidentsGasUsage" width="210">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fRuralReplaceResidentsGasUsage">{{ scope.row.fRuralReplaceResidentsGasUsage }}</span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="液化石油气总量/t" align="center" prop="fLpgUsage" width="150"/>
+        <el-table-column label="液化石油气城镇居民用量/t" align="center" prop="fUrbanLpgUsage" width="180">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fUrbanLpgUsage">{{ scope.row.fUrbanLpgUsage }}</span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="液化石油气农村居民用量/t" align="center" prop="fRuralLpgUsage" width="180">
+          <template slot-scope="scope">
+            <span v-if="scope.row.fRuralLpgUsage">{{ scope.row.fRuralLpgUsage }}</span>
+            <span v-else>-</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="上报时间" align="center" prop="fReportTime" />
+        <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+          <template slot-scope="scope">
+           <!-- <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-edit"
+              @click="handleUpdate(scope.row)"
+            >修改</el-button>-->
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-document"
+              @click="handleDetail(scope.row)"
+            >详情</el-button>
+            <el-button
+              size="mini"
+              type="text"
+              icon="el-icon-delete"
+              @click="handleDelete(scope.row)"
+            >删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+
+      <pagination
+        v-show="total>0"
+        :total="total"
+        :page.sync="queryParams.pageNum"
+        :limit.sync="queryParams.pageSize"
+        @pagination="getList"
+      />
+    </div>
+
+
+    <!-- 添加或修改供需平衡-企业每日填报对话框 -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="企业uuid" prop="fCompanyInfoId">
+          <el-input v-model="form.fCompanyInfoId" placeholder="请输入企业uuid" />
+        </el-form-item>
+        <el-form-item label="天然气城镇居民用量" prop="fUrbanGasUsage">
+          <el-input v-model="form.fUrbanGasUsage" placeholder="请输入天然气城镇居民用量" />
+        </el-form-item>
+        <el-form-item label="天然气农村气代煤居民用量" prop="fRuralReplaceResidentsGasUsage">
+          <el-input v-model="form.fRuralReplaceResidentsGasUsage" placeholder="请输入天然气农村气代煤居民用量" />
+        </el-form-item>
+        <el-form-item label="天然气农村非气代煤居民用量" prop="fNoRuralReplaceResidentsGasUsage">
+          <el-input v-model="form.fNoRuralReplaceResidentsGasUsage" placeholder="请输入天然气农村非气代煤居民用量" />
+        </el-form-item>
+        <el-form-item label="天然气工业用量" prop="fIndustrialGasUsage">
+          <el-input v-model="form.fIndustrialGasUsage" placeholder="请输入天然气工业用量" />
+        </el-form-item>
+        <el-form-item label="天然气商业用量" prop="fCommercialGasUsage">
+          <el-input v-model="form.fCommercialGasUsage" placeholder="请输入天然气商业用量" />
+        </el-form-item>
+        <el-form-item label="天然气公福用量" prop="fPublicGasUsage">
+          <el-input v-model="form.fPublicGasUsage" placeholder="请输入天然气公福用量" />
+        </el-form-item>
+        <el-form-item label="天然气城市集中供热锅炉用量" prop="fCityHeatingGasUasge">
+          <el-input v-model="form.fCityHeatingGasUasge" placeholder="请输入天然气城市集中供热锅炉用量" />
+        </el-form-item>
+        <el-form-item label="天然气汽车用户用量" prop="fCarGasUsage">
+          <el-input v-model="form.fCarGasUsage" placeholder="请输入天然气汽车用户用量" />
+        </el-form-item>
+        <el-form-item label="出售给其他燃气企业的天然气量" prop="fSoldGasVolume">
+          <el-input v-model="form.fSoldGasVolume" placeholder="请输入出售给其他燃气企业的天然气量" />
+        </el-form-item>
+        <el-form-item label="天然气总凄凉" prop="fGasUsage">
+          <el-input v-model="form.fGasUsage" placeholder="请输入天然气总凄凉" />
+        </el-form-item>
+        <el-form-item label="液化石油气城镇居民用量" prop="fUrbanLpgUsage">
+          <el-input v-model="form.fUrbanLpgUsage" placeholder="请输入液化石油气城镇居民用量" />
+        </el-form-item>
+        <el-form-item label="液化石油气农村居民用量" prop="fRuralLpgUsage">
+          <el-input v-model="form.fRuralLpgUsage" placeholder="请输入液化石油气农村居民用量" />
+        </el-form-item>
+        <el-form-item label="液化石油气工业用量(吨)" prop="fIndustrialLpgUsage">
+          <el-input v-model="form.fIndustrialLpgUsage" placeholder="请输入液化石油气工业用量(吨)" />
+        </el-form-item>
+        <el-form-item label="液化石油气商业用量(吨)" prop="fCommercialLpgUsage">
+          <el-input v-model="form.fCommercialLpgUsage" placeholder="请输入液化石油气商业用量(吨)" />
+        </el-form-item>
+        <el-form-item label="液化石油气公福用量(吨)" prop="fPublicLpgUsage">
+          <el-input v-model="form.fPublicLpgUsage" placeholder="请输入液化石油气公福用量(吨)" />
+        </el-form-item>
+        <el-form-item label="液化石油气汽车用户用量(吨)" prop="fCarLpgUsage">
+          <el-input v-model="form.fCarLpgUsage" placeholder="请输入液化石油气汽车用户用量(吨)" />
+        </el-form-item>
+        <el-form-item label="出售或调拨给其他燃气企业液化石油气量(吨)" prop="fSoldLpgVolume">
+          <el-input v-model="form.fSoldLpgVolume" placeholder="请输入出售或调拨给其他燃气企业液化石油气量(吨)" />
+        </el-form-item>
+        <el-form-item label="液化石油气总量(吨)" prop="fLpgUsage">
+          <el-input v-model="form.fLpgUsage" placeholder="请输入液化石油气总量(吨)" />
+        </el-form-item>
+        <el-form-item label="记录时间，日，格式:2023-09-01" prop="fReportRecord">
+          <el-input v-model="form.fReportRecord" placeholder="请输入记录时间，日，格式:2023-09-01" />
+        </el-form-item>
+        <el-form-item label="上报时间，日，格式:2023-09-01" prop="fReportTime">
+          <el-input v-model="form.fReportTime" placeholder="请输入上报时间，日，格式:2023-09-01" />
+        </el-form-item>
+        <el-form-item label="创建时间 yyyy-MM-dd hh:mm:ss" prop="fCreateTime">
+          <el-input v-model="form.fCreateTime" placeholder="请输入创建时间 yyyy-MM-dd hh:mm:ss" />
+        </el-form-item>
+        <el-form-item label="最后修改时间 yyyy-MM-dd hh:mm:ss" prop="fUpdateTime">
+          <el-input v-model="form.fUpdateTime" placeholder="请输入最后修改时间 yyyy-MM-dd hh:mm:ss" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <div v-if="-2 != $store.state.user.enterpriseId" class="report-content">
+      <el-row style="margin-left: -3.5px;margin-right: -3.5px">
+        <el-col :span="12" style="padding: 0px 3.5px 0px 3.5px">
+          <div class="report-title">
+            <div class="title">上报记录</div>
+          </div>
+          <div class="content">
+            <!-- 日历 -->
+            <Calendar
+              width="100%"
+              v-model="reportDate"
+              :scheduleData="scheduleData"
+              @dateChange="dateChange"
+            />
+          </div>
+        </el-col>
+
+        <el-col :span="12" style="padding: 0px 3.5px 0px 3.5px">
+          <div class="report-title flex-between">
+            <div class="title">上报情况</div>
+            <el-button
+              type="primary"
+              size="small"
+              @click="reportInfo"
+            >
+              上报
+            </el-button>
+          </div>
+          <div class="content">
+            <div class="state-warp">
+              <el-row>
+                <el-col :span="13">
+                  <div class="label-warp">状态</div>
+                  <div class="value-warp">
+                    <span v-if="reportForm.fRepStatus == '1'">已上报</span>
+                    <span v-else>未上报</span>
+                  </div>
+                </el-col>
+                <el-col :span="11" style="text-align: right">
+                  <div class="label-warp">上报时间</div>
+                  <div class="value-warp">
+                    <span v-if="reportForm.fRepDate">{{ reportForm.fRepDate }}</span>
+                    <span v-else>暂无</span>
+                  </div>
+                </el-col>
+              </el-row>
+            </div>
+
+            <div class="report-form" >
+              <el-form ref="reportForm" label-position="top" :rules="rules" label-width="80px" :model="reportForm">
+                <el-row class="el-row-table">
+                  <el-col :span="12" style="padding-right: 2px">
+                    <el-col :span="24" class="sort-type">
+                      天然气
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="天然气总气量(万立方米)" prop="fGasUsage">
+                        <el-input type="Number" v-model="reportForm.fGasUsage" placeholder="请输入天然气总气量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气农村气代煤居民用量(万立方米)" prop="fRuralReplaceResidentsGasUsage">
+                        <el-input type="Number" v-model="reportForm.fRuralReplaceResidentsGasUsage" placeholder="请输入天然气农村气代煤居民用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气工业用量(万立方米)" prop="fIndustrialGasUsage">
+                        <el-input type="Number" v-model="reportForm.fIndustrialGasUsage" placeholder="请输入天然气工业用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气公福用量(万立方米)" prop="fPublicGasUsage">
+                        <el-input type="Number" v-model="reportForm.fPublicGasUsage" placeholder="请输入天然气公福用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气汽车用户用量(万立方米)" prop="fCarGasUsage">
+                        <el-input type="Number" v-model="reportForm.fCarGasUsage" placeholder="请输入天然气汽车用户用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-col :span="24" class="sort-type">
+                        石油气
+                      </el-col>
+                      <el-form-item label="液化石油气总量(吨)" prop="fLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fLpgUsage" placeholder="请输入液化石油气总量(吨)" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="液化石油气农村居民用量(吨)" prop="fRuralLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fRuralLpgUsage" placeholder="请输入液化石油气农村居民用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="液化石油气商业用量(吨)" prop="fCommercialLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fCommercialLpgUsage" placeholder="请输入液化石油气商业用量(吨)" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="液化石油气汽车用户用量(吨)" prop="fCarLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fCarLpgUsage" placeholder="请输入液化石油气汽车用户用量(吨)" />
+                      </el-form-item>
+                    </el-col>
+
+
+                  </el-col>
+
+                  <el-col :span="12" style="padding-left: 2px;padding-right: 1px">
+                    <el-col :span="24" class="sort-type">
+
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="天然气城镇居民用量(万立方米)" prop="fUrbanGasUsage">
+                        <el-input type="Number" v-model="reportForm.fUrbanGasUsage" placeholder="请输入天然气城镇居民用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气农村非气代煤居民用量(万立方米)" prop="fNoRuralReplaceResidentsGasUsage">
+                        <el-input type="Number" v-model="reportForm.fNoRuralReplaceResidentsGasUsage" placeholder="请输入天然气农村非气代煤居民用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气商业用量(万立方米)" prop="fCommercialGasUsage">
+                        <el-input type="Number" v-model="reportForm.fCommercialGasUsage" placeholder="请输入天然气商业用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="天然气城市集中供热锅炉用量(万立方米)" prop="fCityHeatingGasUasge">
+                        <el-input type="Number" v-model="reportForm.fCityHeatingGasUasge" placeholder="请输入天然气城市集中供热锅炉用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="出售给其他燃气企业的天然气量(万立方米)" prop="fSoldGasVolume">
+                        <el-input type="Number" v-model="reportForm.fSoldGasVolume" placeholder="请输入出售给其他燃气企业的天然气量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24" class="sort-type">
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="液化石油气城镇居民用量" prop="fUrbanLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fUrbanLpgUsage" placeholder="请输入液化石油气城镇居民用量" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="液化石油气工业用量(吨)" prop="fIndustrialLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fIndustrialLpgUsage" placeholder="请输入液化石油气工业用量(吨)" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="液化石油气公福用量(吨)" prop="fPublicLpgUsage">
+                        <el-input type="Number" v-model="reportForm.fPublicLpgUsage" placeholder="请输入液化石油气公福用量(吨)" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+                      <el-form-item label="出售给其他燃气企业液化石油气量(吨)" prop="fSoldLpgVolume">
+                        <el-input type="Number" v-model="reportForm.fSoldLpgVolume" placeholder="请输入出售给其他燃气企业液化石油气量(吨)" />
+                      </el-form-item>
+                    </el-col>
+
+                    <el-col :span="24">
+
+                    </el-col>
+
+                  </el-col>
+
+                </el-row>
+              </el-form>
+            </div>
+
+            <!--<div style="border: 1px solid;height: 500px"></div>-->
+          </div>
+
+
+        </el-col>
+      </el-row>
+    </div>
+
+    <!-- 详情 -->
+    <DetailInfo ref="detail"/>
+  </div>
+</template>
+
+<script>
+import { listDay, getDay, delDay, addDay, updateDay, exportDay, reportInfoList, getReportInfoByCompany } from "@/api/supplybalance/day";
+import Calendar from "@/components/Calendar";
+import moment from "moment";
+import DetailInfo from "./components/DetailInfo";
+export default {
+  name: "Day",
+  components: {
+    Calendar,
+    DetailInfo
+  },
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 供需平衡-企业每日填报表格数据
+      dayList: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 10,
+        fCompanyInfoId: null,
+        enterpriseName: null,
+        beginRepDate: null,
+        endRepDate: null
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        fGasUsage: [
+          { required: true, message: "天然气总气量不能为空", trigger: "blur" }
+        ],
+        fLpgUsage: [
+          { required: true, message: "液化石油气总量不能为空", trigger: "blur" }
+        ],
+      },
+      scheduleData:[
+        {date:'2024-06-19',content:'已上报'},
+        {date:'2024-06-17',content:'未上报'},
+        {date:'2024-06-15',content:'已上报'},
+        {date:'2024-06-14',content:'已上报'}
+      ],
+      reportForm: {},
+      reportDate: moment().format('YYYY-MM-DD'),
+      dateRange: []
+    };
+  },
+  created() {
+    if(-2 == this.$store.state.user.enterpriseId){
+      this.getList();
+      //return;
+    }
+    // 获取当月开始时间
+    const startOfMonth = moment().startOf('month').format('YYYY-MM-DD HH:mm:ss');
+    // 获取当月结束时间
+    const endOfMonth = moment().endOf('month').format('YYYY-MM-DD HH:mm:ss');
+    this.currentMonthReportInfo(startOfMonth,endOfMonth);
+  },
+  mounted(){
+    this.getReportInfo();
+  },
+  methods: {
+    /** 查询供需平衡-企业每日填报列表 */
+    getList() {
+      this.loading = true;
+      listDay(this.queryParams).then(response => {
+        this.dayList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+    // 取消按钮
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    // 表单重置
+    reset() {
+      this.form = {
+        fRepUsgDayId: null,
+        fCompanyInfoId: null,
+        fUrbanGasUsage: null,
+        fRuralReplaceResidentsGasUsage: null,
+        fNoRuralReplaceResidentsGasUsage: null,
+        fIndustrialGasUsage: null,
+        fCommercialGasUsage: null,
+        fPublicGasUsage: null,
+        fCityHeatingGasUasge: null,
+        fCarGasUsage: null,
+        fSoldGasVolume: null,
+        fGasUsage: null,
+        fUrbanLpgUsage: null,
+        fRuralLpgUsage: null,
+        fIndustrialLpgUsage: null,
+        fCommercialLpgUsage: null,
+        fPublicLpgUsage: null,
+        fCarLpgUsage: null,
+        fSoldLpgVolume: null,
+        fLpgUsage: null,
+        fReportRecord: null,
+        fReportTime: null,
+        fCreateTime: null,
+        fUpdateTime: null
+      };
+      this.resetForm("form");
+    },
+    resetReportForm() {
+      this.reportForm = {
+        fRepUsgDayId: null,
+        fCompanyInfoId: null,
+        fUrbanGasUsage: null,
+        fRuralReplaceResidentsGasUsage: null,
+        fNoRuralReplaceResidentsGasUsage: null,
+        fIndustrialGasUsage: null,
+        fCommercialGasUsage: null,
+        fPublicGasUsage: null,
+        fCityHeatingGasUasge: null,
+        fCarGasUsage: null,
+        fSoldGasVolume: null,
+        fGasUsage: null,
+        fUrbanLpgUsage: null,
+        fRuralLpgUsage: null,
+        fIndustrialLpgUsage: null,
+        fCommercialLpgUsage: null,
+        fPublicLpgUsage: null,
+        fCarLpgUsage: null,
+        fSoldLpgVolume: null,
+        fLpgUsage: null,
+        fReportRecord: null,
+        fReportTime: null,
+        fCreateTime: null,
+        fUpdateTime: null
+      };
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.dateRange = [];
+      this.queryParams.beginRepDate = null;
+      this.queryParams.endRepDate = null;
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      this.ids = selection.map(item => item.fRepUsgDayId)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加供需平衡-企业每日填报";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const fRepUsgDayId = row.fRepUsgDayId || this.ids
+      getDay(fRepUsgDayId).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改供需平衡-企业每日填报";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (valid) {
+          if (this.form.fRepUsgDayId != null) {
+            updateDay(this.form).then(response => {
+              this.msgSuccess("修改成功");
+              this.open = false;
+              this.getList();
+            });
+          } else {
+            addDay(this.form).then(response => {
+              this.msgSuccess("新增成功");
+              this.open = false;
+              this.getList();
+            });
+          }
+        }
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const fRepUsgDayIds = row.fRepUsgDayId || this.ids;
+      this.$confirm('是否确认删除供需平衡-企业每日填报编号为"' + fRepUsgDayIds + '"的数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(function() {
+          return delDay(fRepUsgDayIds);
+        }).then(() => {
+          this.getList();
+          this.msgSuccess("删除成功");
+        }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      const queryParams = this.queryParams;
+      this.$confirm('是否确认导出所有供需平衡-企业每日填报数据项?', "警告", {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }).then(() => {
+          this.exportLoading = true;
+          return exportDay(queryParams);
+        }).then(response => {
+          this.download(response.msg);
+          this.exportLoading = false;
+        }).catch(() => {});
+    },
+    //日期切换
+    dateChange(val){
+      this.resetReportForm();
+      this.getReportInfo();
+      if(val == 0){
+        const startOfMonth = moment(this.reportDate).startOf('month').format('YYYY-MM-DD');
+        // 获取当月结束时间
+        const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD');
+        this.currentMonthReportInfo(startOfMonth,endOfMonth);
+      }
+    },
+    reportInfo(){
+      this.reportForm.fReportTime =  this.reportDate;
+      this.reportForm.fReportStatus = '1';
+      this.$refs["reportForm"].validate(valid => {
+        if (valid) {
+          if (this.reportForm.fRepUsgDayId != null) {
+            updateDay(this.reportForm).then(response => {
+              this.msgSuccess("上报成功");
+            });
+          } else {
+            addDay(this.reportForm).then(response => {
+              this.msgSuccess("上报成功");
+              const startOfMonth = moment(this.reportDate).startOf('month').format('YYYY-MM-DD');
+              // 获取当月结束时间
+              const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD');
+              this.currentMonthReportInfo(startOfMonth,endOfMonth);
+            });
+          }
+        }
+      });
+    },
+    currentMonthReportInfo(beginRepDate,endRepDate){
+      reportInfoList({fCompanyInfoId:this.$store.state.user.enterpriseId,beginRepDate:beginRepDate,endRepDate:endRepDate}).then(res =>{
+        if(res.code == 200 && res.data){
+          this.scheduleData = [];
+            res.data.forEach(item =>{
+              this.scheduleData.push({date:item.fReportTime,content:item.fReportStatus == '1'?"已上报":"未上报"})
+          })
+        }
+      })
+    },
+    getReportInfo(){
+      getReportInfoByCompany({companyId:this.$store.state.user.enterpriseId,reportDate:this.reportDate}).then(res =>{
+          if(res.code && res.data){
+          this.reportForm = res.data;
+        }
+      })
+    },
+    //详情
+    handleDetail(row){
+      this.$refs.detail.getDetailInfo(row.fRepUsgDayId);
+    },
+    timeChange(val){
+      this.queryParams.beginRepDate = val[0];
+      this.queryParams.endRepDate = val[1];
+    },
+  }
+};
+</script>
+<style scoped lang="scss">
+  .report-content{
+    //border: 1px solid;
+    margin: auto;
+    max-width: 1200px;
+    padding: 30px
+  }
+
+  .report-title{
+    background: rgb(241, 241, 242);
+    padding: 20px 30px;
+    border-radius: 3px;
+  }
+
+  .report-title .title{
+    line-height: 32px;
+    font-weight: 500;
+  }
+
+  .content{
+    background: var(--custom-background-soft);
+    box-shadow: 0 3px 14px #a9aaab80;
+    border-radius: 3px;
+    padding: 32px 48px;
+    height: 525px;
+  }
+
+  .report-form{
+    height: 84%;
+    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;
+    }
+
+    ::v-deep .el-form--label-top .el-form-item__label{
+      padding: 0px;
+      font-size: 12px;
+    }
+
+    ::v-deep .el-form-item {
+      margin-bottom: 7px;
+    }
+  }
+
+  .state-warp{
+    border-bottom: 1px solid #d4d4d4;
+    height: 54px;
+    margin-top: -10px;
+    padding-bottom: 8px;
+    margin-bottom: 24px;
+    color: var(--custom-main-text-color);
+  }
+  .label-warp{
+    font-size: 14px;
+    font-family: PingFangSC-Regular, PingFang SC;
+    font-weight: 400;
+    color: rgba(24, 31, 67, .5);
+    line-height: 20px;
+  }
+
+  .value-warp{
+    font-weight: 500;
+    font-size: 18px;
+    line-height: 25px;
+  }
+
+  .flex-between{
+    display: flex;
+    justify-content: space-between;
+  }
+
+  .sort-type{
+    height: 25px;
+    font-weight: 600;
+    margin: 0px 0px 6px 0px;
+  }
+</style>

zh-baseversion-web/src/views/supplybalance/gas/index.vue

@@ -221,33 +221,31 @@
                   </div>
                 </el-col>
               </el-row>
-              <el-form label-position="top" label-width="80px" :model="reportForm" style="margin-top: 23px">
-                <el-form-item label="计划量">
+            </div>
+
+            <el-form :rules="rules" label-position="top" label-width="80px" :model="reportForm">
+              <el-form-item label="计划量" prop="fPlanQuan">
                 <el-input v-model="reportForm.fPlanQuan">
                   <template slot="append">万立方</template>
                 </el-input>
               </el-form-item>
-                <el-form-item label="批复量">
+              <el-form-item label="批复量" prop="fApprQuan">
                 <el-input v-model="reportForm.fApprQuan">
                   <template slot="append">万立方</template>
                 </el-input>
               </el-form-item>
-                <el-form-item label="供气量">
+              <el-form-item label="供气量" prop="fSupGasVol">
                 <el-input v-model="reportForm.fSupGasVol">
                   <template slot="append">万立方</template>
                 </el-input>
               </el-form-item>
-                <el-form-item label="存储量">
+              <el-form-item label="存储量" prop="fStorageVol">
                 <el-input v-model="reportForm.fStorageVol">
                   <template slot="append">万立方</template>
                 </el-input>
               </el-form-item>
             </el-form>
           </div>
-            <!--<div style="border: 1px solid;height: 500px"></div>-->
-          </div>
-
-
         </el-col>
       </el-row>
 
@@ -309,11 +307,17 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        fCompanyInfoId: [
-          { required: true, message: "企业uuid不能为空", trigger: "blur" }
+        fPlanQuan: [
+          { required: true, message: "计划量不能为空", trigger: "blur" }
+        ],
+        fApprQuan: [
+          { required: true, message: "批复量不能为空", trigger: "blur" }
         ],
-        fRepStatus: [
-          { required: true, message: "上报状态 0-未上报，1-已上报不能为空", trigger: "change" }
+        fSupGasVol: [
+          { required: true, message: "供气量不能为空", trigger: "blur" }
+        ],
+        fStorageVol: [
+          { required: true, message: "存储量不能为空", trigger: "blur" }
         ],
       },
       reportDate: moment().format('YYYY-MM-DD'),
@@ -328,7 +332,10 @@ export default {
     };
   },
   created() {
+    if(-2 == this.$store.state.user.enterpriseId){
       this.getList();
+      return;
+    }
     const moment = require('moment');
     // 获取当月开始时间
     const startOfMonth = moment().startOf('month').format('YYYY-MM-DD HH:mm:ss');
@@ -508,6 +515,10 @@ export default {
       } else {
         addSup(this.reportForm).then(response => {
           this.msgSuccess("上报成功");
+          const startOfMonth = moment(this.reportDate).startOf('month').format('YYYY-MM-DD HH:mm:ss');
+          // 获取当月结束时间
+          const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD HH:mm:ss');
+          this.currentMonthReportInfo(startOfMonth,endOfMonth);
         });
       }
     },