manage-client 3.3.195 → 3.3.197

package/src/components/webmeter/newwebmeter/NewException/MeterExceptionList.vue

@@ -47,6 +47,7 @@
                                 <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                                 <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                               :field="$parent.$parent.getfield"
+                                              :header="$parent.$parent.other"
                                               sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="getExceptionList" template-name='异常查询'
                                               :choose-col="true"></export-excel>
                                 <!--<button class="button_export button_spacing" style="width: max-content" @click="$parent.$parent.showTotalForm()">显示汇总</button>-->
@@ -332,6 +333,7 @@
     let readySomething = async function (self) {
         await self.$MagLoadParams.loadParam()
         self.initParams()
+      self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
     }
     export default {
         title: '异常查看',
@@ -344,6 +346,8 @@
                 startDate: '',
                 endDate: '',
                 meterbrands: [],
+                other: [],
+                sumsmodel: {},
                 f_error_type:'',
                 groupname: ['year'],
                 getgroupname: [
@@ -504,7 +508,23 @@
             showTotalForm() {
                 this.echarts = false
                 this.isActiveTotalForm = true
-            }
+            },
+          getotherfooter() {
+            this.other = [];
+
+             let firstLine = [`导出时间: ${this.$login.toStandardTimeString()}`];
+
+
+            let secondLine = [
+              `开始时间（上报区间）: ${this.$refs.paged.$refs.cri.model.startDate}`,
+              `结束时间: ${this.$refs.paged.$refs.cri.model.endDate}`
+            ];
+
+            this.other.push(firstLine);
+            this.other.push(secondLine);
+
+            console.log('Header Data:', this.other);
+          },
         },
         watch: {
             'data'(val) {
@@ -513,8 +533,16 @@
                 } else {
                     this.reportStr = null
                 }
-            }
-        },
+            },
+          sumsmodel:{
+            handler: function(val) {
+              this.getotherfooter();
+            },
+            deep: true
+          },
+        }, mounted() {
+        this.getotherfooter();
+      },
         computed: {
             getCondition() {
                 let condition=this.$refs.paged.$refs.cri.condition + this.orgCondtionStr

package/src/components/webmeter/newwebmeter/WebhandMonthGas.vue

@@ -547,6 +547,10 @@ export default {
       let exportdata = this.getCondition;
       let otherInData=[];
       otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      let secondLine = [
+        `开始时间(抄表日期): ${this.$refs.paged.$refs.cri.model.handStartDate}`,
+        `结束时间: ${this.$refs.paged.$refs.cri.model.handEndDate}`
+      ];
       let footerData=[],exportfield=this.getfield;
       footerData.push("合计");
       let self = this;
@@ -555,6 +559,8 @@ export default {
       }
       this.footer.push(footerData);
       this.other.push(otherInData);
+      this.other.push(secondLine);
+
     },
     // async  getaddress(){
     //   let HttpReset = new HttpResetClass()

package/src/components/webmeter/recharge/RechargeList.vue

@@ -46,6 +46,7 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                   <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                 :field="$parent.$parent.getfield"
+                                :header="$parent.$parent.other"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="rechargeInstruct" template-name='充值指令查询'
                                 :choose-col="true"></export-excel>
                   <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
@@ -181,7 +182,7 @@
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initParams()
-    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '充值指令查询',
@@ -198,6 +199,7 @@
         gasproperties:[],
         condition:'',
         rowdata:{},
+        other: [],
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
@@ -215,6 +217,22 @@
       this.$refs.paged.$refs.criteria.model.f_end_date = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
     },
     methods: {
+      getotherfooter() {
+        this.other = [];
+
+        let firstLine = [`导出时间: ${this.$login.toStandardTimeString()}`];
+
+
+        let secondLine = [
+          `开始时间（充值）: ${this.$refs.paged.$refs.criteria.model.f_start_date}`,
+          `结束时间（充值）: ${this.$refs.paged.$refs.criteria.model.f_end_date}`
+        ];
+
+        this.other.push(firstLine);
+        this.other.push(secondLine);
+
+        console.log('Header Data:', this.other);
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -308,7 +326,13 @@
           this.f_filialeid = res[1]
           // this.updateParams()
         }
-      }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       getfield () {

package/src/components/webmeter/report/ReportList.vue

@@ -46,6 +46,7 @@
                   <button class="button_clear button_spacing" @click="$parent.$parent.clearmsg">清空</button>
                   <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                                 :field="$parent.$parent.getfield"
+                                :header="$parent.$parent.other"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="manage_getReportList" template-name='上报查询'
                                 :choose-col="true"></export-excel>
                   <div style="float: right"  class="button_spacing" :class="{'button_shrink_top':$parent.$parent.criteriaShow,'button_shrink_bottom':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.hidden()"></div>
@@ -234,7 +235,7 @@
   let readySomething = async function (self) {
     await self.$MagLoadParams.loadParam()
     self.initParams()
-    // self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+     self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '上报查询',
@@ -251,6 +252,7 @@
         gasproperties:[],
         condition:'',
         rowdata:{},
+        other: [],
         sumsmodel: {},
         orgid:[this.$login.f.orgid],
         criteriaShow:false,
@@ -269,6 +271,22 @@
       this.$refs.paged.$refs.criteria.model.f_end_date = Util.addDate(new Date(),-1).substring(0,10) + ' 23:59:59'
     },
     methods: {
+      getotherfooter() {
+        this.other = [];
+
+        let firstLine = [`导出时间: ${this.$login.toStandardTimeString()}`];
+
+
+        let secondLine = [
+          `开始时间: ${this.$refs.paged.$refs.criteria.model.f_start_date}`,
+          `结束时间: ${this.$refs.paged.$refs.criteria.model.f_end_date}`
+        ];
+
+        this.other.push(firstLine);
+        this.other.push(secondLine);
+
+        console.log('Header Data:', this.other);
+      },
       initParams() {
         // 初始化气表品牌
         let brandArr = []
@@ -351,7 +369,13 @@
           this.f_filialeid = res[1]
           // this.updateParams()
         }
-      }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       getPricenames() {

package/src/components/webmeter/reportdata/ReportDataQuery.vue

@@ -165,12 +165,14 @@
     await self.$MagLoadParams.loadParam()
     self.initParams()
     // self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '上报数据查询',
     data() {
       return {
         other:[],
+        sumsmodel: {},
         footer:[],
         model: new PagedList('api/af-revenue/sql/manage_getReportDataQuery', 20, {}),
         criteriaShow: false,
@@ -288,19 +290,29 @@
       // getRes(obj) {
       //   this.orgCondtionStr = obj
       // }
-      getotherfooter () {
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData = [];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData = [];
+      getotherfooter() {
         this.other = [];
         this.footer = [];
         let otherInData = [];
+        let secondLine = [
+          `开始时间: ${this.$refs.paged.$refs.cri.model.startDate}`,
+          `结束时间: ${this.$refs.paged.$refs.cri.model.startDate}`
+        ];
         otherInData.push(`导出时间: ${this.$login.toStandardTimeString()}`);
         let footerData = []
+
         this.footer.push(footerData);
         this.other.push(otherInData);
+        this.other.push(secondLine);
       }
     },
     watch: {
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       metertypes() {