manage-client 3.2.46-aode → 3.2.47-aode

package/package.json

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

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

@@ -340,7 +340,7 @@
     self.initParams()
   }
   export default {
-    title: '用气分析',
+    title: '用气月报',
     props: ['data'],
     components: {UserGasEcharts},
     data() {

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

@@ -38,13 +38,13 @@
                     <button @click="$parent.$parent.clearmsg" class="button_clear button_spacing">清空</button>
 
                     <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>
-<!--                    <easy-excel-export :data="$parent.$parent.getCondition"-->
-<!--                                  :defaultselect="$parent.$parent.selectfields"-->
-<!--                                  :field="$parent.$parent.getfield"-->
-<!--                                  :exportprogress="true" v-ref:exports-->
-<!--                                   sqlurl="rs/easyexcel/export" sql-name="webmeter_getUserGasList" :template-name="$parent.$parent.getName"-->
-<!--                                  :choose-col="true">-->
-<!--                    </easy-excel-export>-->
+                    <easy-excel-export :data="$parent.$parent.getCondition"
+                                  :defaultselect="$parent.$parent.selectfields"
+                                  :field="$parent.$parent.getfield"
+                                  :exportprogress="true" v-ref:exports
+                                   sqlurl="rs/easyexcel/export" sql-name="webmeter_getUserGasList" :template-name="$parent.$parent.getName"
+                                  :choose-col="true">
+                    </easy-excel-export>
                   </div>
                 </div>
                 <div class="row" >

package/src/components/webmeter/WebmeterHandplanQuery2CK.vue

@@ -33,7 +33,7 @@
                                      :field="$parent.$parent.getfield"
                                      tablename="t_cbcx"
                                      :exportprogress="true" v-ref:exports
-                                     sqlurl="rs/easyexcel/exportCkh" sql-name="singleTableParam" template-name="抄表查询导出"
+                                     sqlurl="rs/easyexcel/exportCkh" sql-name="singleTableParam" :template-name="$parent.$parent.getName"
                                      :choose-col="true">
                   </easy-excel-export>
                   <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>
@@ -377,6 +377,7 @@
   import {PagedList} from 'vue-client'
   import defaultPrint from '../sale/config/DefaultPrint'
   import exportConfig from '../sale/config/exportConfig'
+  import * as Util from "../../Util";
 
   let readySomething = async function (self) {
     self.$MagGetSaleParam.initinputtor();
@@ -651,6 +652,9 @@
       getCondition() {
         return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,startDate: this.$refs.paged.$refs.cri.model.inputStartDate,endDate:this.$refs.paged.$refs.cri.model.inputEndDate,tablename:'t_cbcx',f_orgid:this.orgCondtionStr}
       },
+      getName() {
+        return '抄表查询导出'+ Util.guid()
+      },
       getfield() {
         return exportConfig.webmeterHandplanFiles
       }