日用气量上报

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/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-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/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="计划量">
-                  <el-input v-model="reportForm.fPlanQuan">
-                    <template slot="append">万立方</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="批复量">
-                  <el-input v-model="reportForm.fApprQuan">
-                    <template slot="append">万立方</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="供气量">
-                  <el-input v-model="reportForm.fSupGasVol">
-                    <template slot="append">万立方</template>
-                  </el-input>
-                </el-form-item>
-                <el-form-item label="存储量">
-                  <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-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="批复量" prop="fApprQuan">
+                <el-input v-model="reportForm.fApprQuan">
+                  <template slot="append">万立方</template>
+                </el-input>
+              </el-form-item>
+              <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="存储量" prop="fStorageVol">
+                <el-input v-model="reportForm.fStorageVol">
+                  <template slot="append">万立方</template>
+                </el-input>
+              </el-form-item>
+            </el-form>
+          </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" }
         ],
-        fRepStatus: [
-          { required: true, message: "上报状态 0-未上报，1-已上报不能为空", trigger: "change" }
+        fApprQuan: [
+          { required: true, message: "批复量不能为空", trigger: "blur" }
+        ],
+        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() {
-    this.getList();
+    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);
         });
       }
     },