manage-client 3.3.196 → 3.3.198

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "manage-client",
-    "version": "3.3.196",
+    "version": "3.3.198",
     "description": "经营管控模块前台组件",
     "main": "src/index.js",
     "directories": {

package/src/components/webmeter/DrillData/GetNoMetereadData.vue

@@ -38,6 +38,7 @@
               <button class="button_clear button_spacing" @click="clear">清空</button>
               <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                             :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
+                            :header="$parent.$parent.other"
                             sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getNoMetereadData" template-name='未上报查询'
                             :choose-col="true"></export-excel>
 
@@ -219,6 +220,8 @@
     self.initParams()
     self.$refs.paged.$refs.cri.model.startDate =  Util.toStandardDateString() +' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
+
   }
   export default {
     title: '未上报查询',
@@ -240,6 +243,8 @@
         endDate: '',
         criteriaShow:false,
         outlets: [],
+        other: [],
+        sumsmodel: {},
         gasproperties:[{label: '全部', value: ''}],
         operator: [],
         meterbrands: [],
@@ -255,7 +260,22 @@
       readySomething(this)
     },
     methods: {
+      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);
+      },
       userTypeChange () {
         this.gasproperties=[{label: '全部', value: ''}]
         if(this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
@@ -319,6 +339,12 @@
       }
     },
     watch: {
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       getCondition() {

package/src/components/webmeter/DrillData/LostContactAnalysisList.vue

@@ -44,6 +44,7 @@
               <button class="button_clear button_spacing" @click="clear">清空</button>
               <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                             :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
+                            :header="$parent.$parent.other"
                             sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getAllLoseQuery" template-name='失联分析'
                             :choose-col="true"></export-excel>
 <!--              <button class="button_export button_spacing" @click="$parent.$parent.SaveAsFile('lostuserlist')">导出</button>-->
@@ -380,6 +381,7 @@
     // self.$refs.paged.$refs.cri.model.startDate = Util.toStandardDateString() + ' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
     self.$refs.paged.$refs.cri.model.f_user_state='正常'
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '失联分析',
@@ -411,6 +413,8 @@
         show: false,
         showdetail:false,
         rowdata:{},
+        other: [],
+        sumsmodel: {},
         startDate: '',
         endDate: '',
         criteriaShow:false,
@@ -448,6 +452,22 @@
       this.getMeterTypeAndBrand('f_meter_brand', '1=1')
     },
     methods: {
+      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);
+      },
       getMeterType() {
         this.Warningstyle = [{label: '全部', value: ''}]
         this.styles = false
@@ -599,7 +619,13 @@
         } else {
           this.reportStr = null
         }
-      }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       // usertypes () {

package/src/components/webmeter/DrillData/UserLostContactAnalysis.vue

@@ -45,6 +45,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"  :sumname="$parent.$parent.sumName"
+                              :header="$parent.$parent.other"
                               sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeter_getUserLoseQuery" template-name='用户失联查询'
                               :choose-col="true"></export-excel>
     <!--              <button class="button_export button_spacing" @click="$parent.$parent.SaveAsFile('lostuserlist')">导出</button>-->
@@ -342,6 +343,7 @@
     self.$refs.paged.$refs.cri.model.notappear='不包含'
     self.$refs.paged.$refs.cri.model.SLday1=10
     self.$refs.paged.$refs.cri.model.f_user_state='正常'
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '失联分析',
@@ -374,6 +376,8 @@
         criteriaShow:false,
         outlets: [],
         operator: [],
+        other: [],
+        sumsmodel: {},
         filename: '',
         WarningType: [
           {label: '全部', value: ''}
@@ -403,6 +407,22 @@
     },
 
     methods: {
+      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);
+      },
       getMeterType() {
         this.Warningstyle = [{label: '全部', value: ''}]
         this.styles = false
@@ -543,7 +563,13 @@
         } else {
           this.reportStr = null
         }
-      }
+      },
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       // usertypes () {

package/src/components/webmeter/gasAnalysis/WebmeterSettlementAnalysis.vue

@@ -38,6 +38,7 @@
                 <button class="button_clear button_spacing" @click="clear">清空</button>
                 <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
                               :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
+                              :header="$parent.$parent.other"
                               sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="webmeterSettlementAnalysis" template-name='物联网表结算分析'
                               :choose-col="true"></export-excel>
 
@@ -276,6 +277,7 @@
     self.$refs.paged.$refs.cri.model.startDate =  Util.toStandardDateString() +' 00:00:00'
     self.$refs.paged.$refs.cri.model.endDate = Util.toStandardDateString() + ' 23:59:59'
     self.$refs.paged.$refs.cri.search()
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
   }
   export default {
     title: '物联网表结算分析',
@@ -300,6 +302,8 @@
         endDate: '',
         criteriaShow:false,
         outlets: [],
+        other: [],
+        sumsmodel: {},
         gasproperties:[{label: '全部', value: ''}],
         operator: [],
         meterbrands: [],
@@ -316,7 +320,22 @@
       readySomething(this)
     },
     methods: {
+      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);
+      },
       userTypeChange () {
         this.gasproperties=[{label: '全部', value: ''}]
         if(this.$refs.paged.$refs.cri.model && this.$refs.paged.$refs.cri.model.f_user_type) {
@@ -381,6 +400,12 @@
       }
     },
     watch: {
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
     },
     computed: {
       getCondition() {
@@ -390,7 +415,6 @@
           startDate:`${this.$refs.paged.$refs.cri.model.startDate}`,
           endDate:`${this.$refs.paged.$refs.cri.model.endDate}`
         }
-
       },
       usertypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]

package/src/components/webmeter/instruction/NewQueryInstruct.vue

@@ -49,6 +49,7 @@
                           f_start_date: $parent.$parent.f_start_date,
                           f_end_date: $parent.$parent.f_end_date
                           }"
+                  :header="$parent.$parent.other"
                   :field="$parent.$parent.getfield" sql-name="manage_getNewQueryInstruct" sqlurl="api/af-revenue/logic/openapi/exportfile"
                   template-name='指令查看'></export-excel>
                 <div
@@ -337,6 +338,7 @@
     console.log('指令查看config', self.config)
     self.getfield = self.config.excelHeaders
     self.getOperators(self.$login.f.orgid)
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums;
     // self.reflash()
   }
   export default {
@@ -351,6 +353,8 @@
         Gasproperties:[],
         meterbrand: [],
         operators:[],
+        other: [],
+        sumsmodel: {},
         userType:[],
         instructtype:[],
         instructstate:[],
@@ -546,15 +550,43 @@
         await this.$refs.paged.$refs.grid.displayColumnSettings(undefined)
 
       },
+      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);
+      },
 
     },
+    watch:{
+      sumsmodel:{
+        handler: function(val) {
+          this.getotherfooter();
+        },
+        deep: true
+      },
+    },
     computed: {
      userType () {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
        Gasproperties () {
       return [{label: '全部', value: ''}, ...this.$appdata.getParam('用气性质')]
-    }
+    },
+      mounted() {
+        this.getotherfooter();
+      }
+
 
     }
   }

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() {

package/src/filiale/kelai/GasStatistics.vue

@@ -34,10 +34,13 @@
                 <div class="span" style="float:right;margin-top:10px">
                   <button class="button_search button_spacing" @click="search()">查询</button>
                   <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"
+                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
                                 sqlurl="api/af-revenue/logic/openapi/exportfile" sql-name="gasStatisticsQuery" template-name='用气量统计表'
-                                :choose-col="true"></export-excel>
+                                :choose-col="true">
+                  </export-excel>
+
                   <print-data :sum-field="$parent.$parent.getfield" :model="$parent.model" :field="$parent.$parent.getfield"
                               :defaultfield="$parent.$parent.defaultfield"
                               titletable="缴费记录报表" :starthead="$parent.$parent.getstart"
@@ -315,6 +318,8 @@ export default {
       //f_filialeid: this.$login.f.f_orgid,
       detaillist: [],
       meterbrands: [],
+      other:[],
+      sumsmodel: {},
       prices: [],
       gasproperties:[],
       condition:'',
@@ -324,7 +329,6 @@ export default {
         defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_meternumber', 'f_gasproperties', 'f_balance', 'f_last_tablebase','f_tablebase',
           'f_oughtamount', 'f_oughtfee', 'f_collection', 'f_curbalance', 'f_gas_state', 'f_changetable_state', 'f_input_date']
       },
-      sumsmodel: {},
       orgid:[this.$login.f.orgid],
       criteriaShow:false,
       //默认打印列
@@ -361,6 +365,21 @@ export default {
     // this.$refs.paged.$refs.criteria.search()
   },
   methods: {
+    getotherfooter() {
+      this.other=[];
+      let exportdata=this.getCondition;
+      // 第一行数据
+      let firstLine = [];
+      firstLine.push(`导出时间: ${this.$login.toStandardTimeString()}`);
+      // 第二行数据
+      let secondLine = [];
+      secondLine.push(`开始时间: ${this.$refs.paged.$refs.criteria.model.startDate}`);
+      secondLine.push(`结束时间: ${this.$refs.paged.$refs.criteria.model.endDate}`);
+      let self = this;
+      // 将每行数据作为一个独立的数组添加到other数组中
+      this.other.push(firstLine); // 添加第一行
+      this.other.push(secondLine); // 添加第二行
+    },
     initParams() {
       // 初始化气表品牌
       let brandArr = []
@@ -453,7 +472,13 @@ export default {
         this.f_filialeid = res[1]
         // this.updateParams()
       }
-    }
+    },
+    sumsmodel:{
+      handler: function(val) {
+        this.getotherfooter();
+      },
+      deep: true
+    },
   },
   computed: {
     getCondition() {