manage-client 3.2.78-aode → 3.2.78-jb

package/src/components/sale/report/aode/life/LifeDayReportList.vue

@@ -5,12 +5,27 @@
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
             <res-select-group :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
+            <div class="span" style = "float:right;margin:10px;">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+              <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
+              <export-excel :data="$parent.$parent.getCondition"
+                            :field="$parent.$parent.getfield"
+                            sqlurl="rs/logic/exportfile" sql-name="aode_lifedayReport" template-name='悦生活日报表'  :choose-col="true"
+                            class="button_export button_spacing"></export-excel>
+              <life-day-report-list-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></life-day-report-list-print>
+              <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
+              <div style="float: right"  class="button_spacing"
+                   :class="{'button_shrink_top':$parent.$parent.criteriaShowTwo,'button_shrink_bottom':!$parent.$parent.criteriaShowTwo}"
+                   @click="$parent.$parent.hidden()"></div>
+            </div>
+          </div>
+          <div class="row" v-show="$parent.$parent.criteriaShowTwo">
             <div :class="$parent.$parent.style" >
               <label for="startDate" class="font_normal_body">开始日期</label>
               <datepicker  placeholder="开始日期" style="width:60%"
                            v-model="model.f_startDate"
                            :value.sync="model.f_startDate"
-                           :format="'yyyy-MM-dd HH:mm:ss'"
+                           :format="'yyyy-MM-dd'"
                            :show-reset-button="true"
                            class="select"
               >
@@ -21,50 +36,12 @@
               <datepicker  placeholder="结束日期" style="width:60%"
                            v-model="model.f_endDate"
                            :value.sync="model.f_endDate"
-                           :format="'yyyy-MM-dd HH:mm:ss'"
+                           :format="'yyyy-MM-dd'"
                            :show-reset-button="true"
-                           class="select"
-              >
+                           class="select">
               </datepicker>
             </div>
-            <div :class="$parent.$parent.style">
-              <label class="font_normal_body">用气性质</label>
-              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
-                        :options='$parent.$parent.gasproperties' placeholder='请选择'
-                        condition="f_gasproperties = '{}'"
-                        close-on-select></v-select>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">气表类型</label>
-              <v-select :value.sync="model.f_meter_type" value-single
-                        :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
-                        close-on-select></v-select>
-            </div>
-            <div class="col-sm-2 form-group">
-              <label class="font_normal_body">气表品牌</label>
-              <v-select :value.sync="model.f_meter_brand"
-                        v-model="model.f_meter_brand"
-                        :options='$parent.$parent.meterbrands' placeholder='请选择'
-                        condition="f_meter_brand = '{}'"
-                        close-on-select></v-select>
-            </div>
-            <div>
-              <div class="span" style = "float:right;margin:10px;">
-                <button class="button_search button_spacing" @click="search()">查询</button>
-                <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                <export-excel-hand :data="$parent.$parent.getCondition"
-                                   :field="$parent.$parent.getfield" v-ref:exports
-                                   :defaultselect="$parent.$parent.selectfields"
-                                   :other-data="$parent.$parent.other"
-                                   :footer-data="$parent.$parent.footer"
-                                   sqlurl="rs/logic/reportExportfile" sql-name="aode_lifedayReport" template-name='悦生活日报表'  :choose-col="true"
-                                   class="button_export button_spacing"></export-excel-hand>
-                <life-day-report-list-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></life-day-report-list-print>
-                <div style="float: right"  class="button_spacing" :class="{'button_shrink_left':$parent.$parent.criteriaShow,'button_shrink_right':!$parent.$parent.criteriaShow}"    @click="$parent.$parent.show()"></div>
-              </div>
-            </div>
           </div>
-
         </div>
       </criteria>
       <data-grid  :model="model" :sumsmodel="sumsmodel" partial='list' class="list_area table_sy" v-ref:grid >
@@ -75,9 +52,6 @@
               <!--<nobr>客户编号</nobr>-->
             </th>
             <th><data-order field="f_user_name" name="客户姓名"></data-order></th>
-            <th><data-order field="f_user_name" name="用气性质"></data-order></th>
-            <th><nobr>表具类型</nobr></th>
-            <th><nobr>表具型号</nobr></th>
             <th><nobr>气量</nobr></th>
             <th><nobr>金额</nobr></th>
             <th><data-order field="f_operate_date" name="写卡时间"></data-order>
@@ -93,18 +67,13 @@
               <data-order field="f_payment" name="付款方式"></data-order>
               <!--<nobr>付款方式</nobr>-->
             </th>
-            <th><nobr>订单号</nobr></th>
             <th><nobr>交易号</nobr></th>
             <th><nobr>写卡服务机</nobr></th>
-            <th><nobr>所属公司</nobr></th>
           </tr>
         </template>
         <template partial='body'>
           <td style="text-align: center;"><nobr>{{row.f_userinfo_code}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_user_name}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_gasproperties}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_meter_classify}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_pregas}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
@@ -115,10 +84,8 @@
           <td style="text-align: center;"><nobr>{{row.f_stair3price}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_stair3amount}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_serial_id}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_pay_id}}</nobr></td>
           <td style="text-align: center;"><nobr>{{row.f_terminal_num}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_orgname}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
@@ -129,10 +96,7 @@
 
   import { PagedList } from 'vue-client'
   import exportConfig from '../../../config/exportConfig'
-  let initdata = async function(self){
-    await self.$MagLoadParams.loadParam()
-    self.initParams()
-  }
+
   export default {
     title: '悦生活日报表',
     props: {
@@ -158,6 +122,7 @@
           f_shouru_fee:0
         }),
         orgCondtionStr: '',
+        criteriaShowTwo: false,
         userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
         count: 0,
         sumsmodel: {},
@@ -166,52 +131,17 @@
         orgname: '',
         depname: '',
         criteriaShow: false,
-        selectfields:[],
-        other:[],
-        footer:[],
-        gasproperties:[],
-        meterbrands: [], //气表品牌
       }
     },
     ready() {
       this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
-      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()+' 00:00:00'
-      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
-      for(var item in exportConfig.lifeDataReportConfig){
-        this.selectfields.push(item)
-      }
-      initdata(this);
+      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
+      // this.search()
     },
     methods: {
-      initParams() {
-        // 初始化气表品牌
-        let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
-          temp.value = item.value.f_meter_brand
-          brandArr.push(temp)
-        })
-        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      },
-      getotherfooter(){
-        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-
-        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
-        otherInData.push(`导出人：${this.$login.f.name}`)
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
+      hidden(){
+        this.criteriaShowTwo = !this.criteriaShowTwo
       },
       search() {
         this.$refs.paged.$refs.cri.search()
@@ -223,9 +153,8 @@
         }
         args.condition = `${args.condition} ` + f_orgstr +  ` and f_operator = '悦生活'`
 
-        this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate
-        this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate
-        this.model.params.f_meter_type = this.$refs.paged.$refs.cri.model.f_meter_type
+        this.model.params.startDate = this.$refs.paged.$refs.cri.model.f_startDate + ' 00:00:00'
+        this.model.params.endDate = this.$refs.paged.$refs.cri.model.f_endDate + ' 23:59:59'
 
         await this.model.search(args.condition, args.model)
 
@@ -251,10 +180,10 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = ''
+          this.$refs.paged.$refs.cri.model[key] = []
         })
-        this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()+' 00:00:00'
-        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()+' 23:59:59'
+        this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
+        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
       },
       close() {
         this.printshow = false
@@ -291,15 +220,11 @@
       },
     },
     computed: {
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
       getCondition() {
           return {
             condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr + ` and f_operator = '悦生活'`,
-            startDate: this.$refs.paged.$refs.cri.model.f_startDate,
-            endDate: this.$refs.paged.$refs.cri.model.f_endDate,
-            f_meter_type: this.$refs.paged.$refs.cri.model.f_meter_type,
+            startDate: this.$refs.paged.$refs.cri.model.f_startDate + ' 00:00:00',
+            endDate: this.$refs.paged.$refs.cri.model.f_endDate + ' 23:59:59',
             orderitem: this.model.paramSource.orderitem.split("'")[1].split("'")[0]
           }
 
@@ -310,14 +235,6 @@
       getfield() {
         return exportConfig.lifeDataReportConfig
       }
-    },
-    watch:{
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      }
     }
   }
 

package/src/components/sale/report/aode/life/LifeMonthReport.vue

@@ -54,50 +54,21 @@
                               >
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_type" value-single
-                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户类型</label>
-                  <v-select :value.sync="model.f_user_type"  multiple
-                            :options='$parent.$parent.usertypes' placeholder='请选择' v-model="model.f_user_type"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用气性质</label>
-                  <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"  multiple
-                            :options='$parent.$parent.gasproperties' placeholder='请选择'
-                            close-on-select></v-select>
-                </div>
-<!--                <div class="col-sm-2 form-group">-->
-<!--                  <label class="font_normal_body">气表品牌</label>-->
-<!--                  <v-select :value.sync="model.f_meter_brand"-->
-<!--                            v-model="model.f_meter_brand"-->
-<!--                            :options='$parent.$parent.meterbrands' placeholder='请选择'-->
-<!--                            condition="f_meter_brand = '{}'"-->
-<!--                            close-on-select></v-select>-->
-<!--                </div>-->
               </div>
               <div class="row">
                 <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.clear()">清空</button>
 
-                  <export-excel-hand :data="$parent.$parent.getCondition" class="button_export button_spacing"
-                                     :defaultselect="$parent.$parent.selectfields"
-                                     :other-data="$parent.$parent.other" v-ref:exports
-                                     :footer-data="$parent.$parent.footer"
-                                     :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
-                                sqlurl="rs/logic/reportExportfile" sql-name="aode_LifemonthByChargeType" template-name='悦生活月报表'
-                                :choose-col="true"></export-excel-hand>
+                  <export-excel :data="$parent.$parent.getCondition" class="button_export button_spacing"
+                                :field="$parent.$parent.getfield"  :sumname="$parent.$parent.sumName"
+                                sqlurl="rs/logic/exportfile" sql-name="aode_LifemonthByChargeType" template-name='悦生活月报表'
+                                :choose-col="true"></export-excel>
 
                   <!--<print-data :model="$parent.model" :field="$parent.$parent.getfield"-->
                   <!--:defaultfield="$parent.$parent.defaultfield" print-name="悦生活月报"></print-data>-->
 
-                  <life-month-print :printshow.sync="$parent.$parent.printshoworg" :countmodel="{sumsmodel:$parent.$parent.model.sums,model:$parent.$parent.model,orgname:$parent.$parent.orgname}"></life-month-print>
+                  <life-month-print :countmodel="{sumsmodel:$parent.$parent.model.sums,model:$parent.$parent.model,orgname:$parent.$parent.orgname}"></life-month-print>
 
                 </div>
               </div>
@@ -109,15 +80,6 @@
                 <th>
                   <nobr>购买日期</nobr>
                 </th>
-                <th v-if="$parent.$parent.$parent.usertypeflag" >
-                  <nobr>用户类型</nobr>
-                </th>
-                <th v-if="$parent.$parent.$parent.propertiesflag" >
-                  <nobr>用气性质</nobr>
-                </th>
-                <th>
-                  <nobr>表类型</nobr>
-                </th>
                 <th>
                   <nobr>人次</nobr>
                 </th>
@@ -133,15 +95,6 @@
               <td style="text-align: center;">
                 <nobr>{{row.f_operate_date}}</nobr>
               </td>
-              <td style="text-align: center;" v-if="$parent.$parent.$parent.usertypeflag" >
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
-              <td style="text-align: center;" v-if="$parent.$parent.$parent.propertiesflag" >
-                <nobr>{{row.f_gasproperties}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_classify}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_count}}</nobr>
               </td>
@@ -156,15 +109,6 @@
               <td style="text-align: center;background-color: mistyrose">
                 <nobr>合计：</nobr>
               </td>
-              <td style="text-align: center;background-color: mistyrose" v-if="$parent.$parent.$parent.usertypeflag" >
-                <nobr>&nbsp;</nobr>
-              </td>
-              <td style="text-align: center;background-color: mistyrose" v-if="$parent.$parent.$parent.propertiesflag" >
-                <nobr>&nbsp;</nobr>
-              </td>
-              <td style="text-align: center;background-color: mistyrose">
-                <nobr>&nbsp;</nobr>
-              </td>
               <td style="text-align: center;background-color: mistyrose">
                 <nobr>{{model.sums.f_count}}</nobr>
               </td>
@@ -190,8 +134,6 @@
 
   let readySomething = async function (self) {
     self.$refs.paged.$refs.cri.model.f_operate_date = self.$login.toStandardYearMonth()
-    await self.$MagLoadParams.loadParam()
-    self.initParams()
     // await self.$refs.paged.$refs.cri.search()
   }
 
@@ -200,7 +142,6 @@
     title: '悦生活月报',
     data() {
       return {
-        gasproperties:[...this.$appdata.getParam("用气性质")],
         model: new PagedList('rs/sql/aode_LifemonthByChargeType', 35, {f_operate_date: 'this.model.f_operate_date',f_begin_operate_date: 'this.model.f_begin_operate_date',f_end_operate_date: 'this.model.f_end_operate_date'}, {
           f_count: 0,
           f_pregas: 0,
@@ -219,21 +160,10 @@
         defaultfield: ["f_operate_date","f_count", "f_pregas", "f_collection"],
         sumName:[
         'f_count','f_pregas','f_collection'
-        ],
-        printshoworg:'',
-        selectfields:[],
-        other:[],
-        footer:[],
-        meterbrands: [], //气表品牌
-        showflag:true,
-        usertypeflag:false,
-        propertiesflag:false
+        ]
       }
     },
     ready() {
-      for(var item in exportConfig.lifeMonthByChargeConfig){
-        this.selectfields.push(item)
-      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
@@ -241,67 +171,13 @@
       })
     },
     methods: {
-      getotherfooter(){
-        this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-
-        otherInData.push(`导出时间: ${this.$login.toStandardDateString()}`);
-        otherInData.push(`导出人：${this.$login.f.name}`)
-        let footerData=[],exportfield=this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for(var field in self.sumsmodel){
-          footerData.push(`${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
-      isArray (value) {
-        return value && typeof value === 'object' && value.constructor === Array;
-      },
       selfSearch(args) {
-        this.model.sums.f_count = 0;
-        this.model.sums.f_pregas = 0;
-        this.model.sums.f_collection=0;
         let f_orgstr = this.orgCondtionStr
         if (!this.orgCondtionStr) {
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
-        this.model.params.f_meter_type = this.$refs.paged.$refs.cri.model.f_meter_type != null && this.$refs.paged.$refs.cri.model.f_meter_type!='' ?  this.$refs.paged.$refs.cri.model.f_meter_type:'';
-        if(this.$refs.paged.$refs.cri.model.f_user_type != null &&  this.$refs.paged.$refs.cri.model.f_user_type!='' && this.isArray(this.$refs.paged.$refs.cri.model.f_user_type) ){
-          let usertype = "";
-          this.$refs.paged.$refs.cri.model.f_user_type.forEach(item=>{
-            if(usertype == ""){
-              usertype = `'${item}'`
-            }else{
-              usertype = `${usertype},'${item}'`
-            }
-          })
-          this.model.params.f_user_type = usertype;
-        }else{
-          this.model.params.f_user_type="";
-        }
-        if(this.$refs.paged.$refs.cri.model.f_gasproperties != null && this.$refs.paged.$refs.cri.model.f_gasproperties !='' && this.isArray(this.$refs.paged.$refs.cri.model.f_gasproperties)  ){
-          let properties = "";
-          this.$refs.paged.$refs.cri.model.f_gasproperties.forEach(item=>{
-            if(properties == ""){ properties = `'${item}'` }else{
-              properties = `${properties},'${item}'`
-            }
-          })
-          this.model.params.f_gasproperties = properties;
-        }else{
-          this.model.params.f_gasproperties = "";
-        }
-
         args.condition = `${args.condition} ` + f_orgstr+  ` and f_operator = '悦生活'`
         this.model.search(args.condition, args.model)
-        this.usertypeflag = (this.$refs.paged.$refs.cri.model.f_user_type!=null && this.$refs.paged.$refs.cri.model.f_user_type!='')
-        this.propertiesflag = (this.$refs.paged.$refs.cri.model.f_gasproperties!=null && this.$refs.paged.$refs.cri.model.f_gasproperties!='')
-
       },
       ThePolesReverse(){
         if(this.typeInfo[0] === '选择月份'){
@@ -324,7 +200,7 @@
         this.$refs.paged.$refs.cri.$refs.sel.$children[1].$children[0].isSelectAll = false
         this.$refs.paged.$refs.cri.$refs.sel.$children[2].$children[0].isSelectAll = false
         Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = ''
+          this.$refs.paged.$refs.cri.model[key] = []
         })
       },
       show() {
@@ -335,9 +211,6 @@
       },
       getorg (obj) {
         this.orgname = obj.res
-        if(obj.res != null &&obj.res.length>0){
-          this.printshoworg=obj.res[0]
-        }
         this.orgCondtionStr = `and f_orgid in ${this.$login.convertToIn(obj.resids)}`
       },
       stamp() {
@@ -389,77 +262,20 @@
       'modelval.length'() {
         this.put()
       },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      }
     },
     computed: {
-      initParams() {
-        // 初始化气表品牌
-        let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
-          temp.value = item.value.f_meter_brand
-          brandArr.push(temp)
-        })
-        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      },
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-      usertypes() {
-        return [...this.$appdata.getParam('用户类型')]
-      },
       getCondition() {
-        let usetypecondition="";
-        let gaspropercondition="";
-        if(this.$refs.paged.$refs.cri.model.f_user_type != null &&  this.$refs.paged.$refs.cri.model.f_user_type!='' && this.isArray(this.$refs.paged.$refs.cri.model.f_user_type) ){
-          let usertype = "";
-          this.$refs.paged.$refs.cri.model.f_user_type.forEach(item=>{
-            if(usertype == ""){
-              usertype = `'${item}'`
-            }else{
-              usertype = `${usertype},'${item}'`
-            }
-          })
-          usetypecondition = usertype;
-        }else{
-          usetypecondition ="";
-        }
-        if(this.$refs.paged.$refs.cri.model.f_gasproperties != null && this.$refs.paged.$refs.cri.model.f_gasproperties !='' && this.isArray(this.$refs.paged.$refs.cri.model.f_gasproperties)  ){
-          let properties = "";
-          this.$refs.paged.$refs.cri.model.f_gasproperties.forEach(item=>{
-            if(properties == ""){ properties = `'${item}'` }else{
-              properties = `${properties},'${item}'`
-            }
-          })
-          gaspropercondition = properties;
-        }else{
-          gaspropercondition = "";
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr+  ` and f_operator = '悦生活'`,f_operate_date:`${this.$refs.paged.$refs.cri.model.f_operate_date}`
+           ,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}`,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`}
 
-        return {f_meter_type: this.$refs.paged.$refs.cri.model.f_meter_type!=null && this.$refs.paged.$refs.cri.model.f_meter_type!=''?this.$refs.paged.$refs.cri.model.f_meter_type:'',
-          f_user_type: usetypecondition,
-          f_gasproperties: gaspropercondition,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr+  ` and f_operator = '悦生活'`,
-          f_operate_date:`${this.$refs.paged.$refs.cri.model.f_operate_date}`
-          ,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` ,
-          f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`}
+      //  return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr+  ` and f_operator = '悦生活'`,f_operate_date:`${this.$refs.paged.$refs.cri.model.f_operate_date}`
+      //    + this.orgCondtionStr,f_begin_operate_date:`${this.$refs.paged.$refs.cri.model.f_begin_operate_date}` + this.orgCondtionStr,f_end_operate_date:`${this.$refs.paged.$refs.cri.model.f_end_operate_date}`}
       },
       getfield() {
-        let exportjson = exportConfig.lifeMonthByChargeConfig;
-        let newjson = JSON.parse(JSON.stringify(exportjson));
-        if(!this.usertypeflag){
-          delete newjson.f_user_type
-        }
-        if(!this.propertiesflag){
-          delete newjson.f_gasproperties
-        }
-        return newjson;
+        return exportConfig.lifeMonthByChargeConfig
+      },
+      userstates() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户状态')]
       },
       sliceArea() {
         let rs = new Array()