Merge remote-tracking branch 'origin/master'

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

 <template>
   <div class="app-container">
 
-    <div>
+    <div v-if="-2 == $store.state.user.enterpriseId">
       <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
         <el-form-item label="企业名称" prop="enterpriseName">
           <el-input
@@ -672,6 +672,7 @@ export default {
           if (this.reportForm.fRepUsgDayId != null) {
             updateDay(this.reportForm).then(response => {
               this.msgSuccess("上报成功");
+              this.getReportInfo();
             });
           } else {
             addDay(this.reportForm).then(response => {
@@ -680,6 +681,7 @@ export default {
               // 获取当月结束时间
               const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD');
               this.currentMonthReportInfo(startOfMonth,endOfMonth);
+              this.getReportInfo();
             });
           }
         }

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

@@ -511,6 +511,7 @@ export default {
       if (this.reportForm.fGasSupId != null) {
         updateSup(this.reportForm).then(response => {
           this.msgSuccess("上报成功");
+          this.getReportInfo();
         });
       } else {
         addSup(this.reportForm).then(response => {
@@ -519,6 +520,7 @@ export default {
           // 获取当月结束时间
           const endOfMonth = moment(this.reportDate).endOf('month').format('YYYY-MM-DD HH:mm:ss');
           this.currentMonthReportInfo(startOfMonth,endOfMonth);
+          this.getReportInfo();
         });
       }
     },