manage-client 3.2.77 → 3.2.78-aode

package/src/components/sale/report/aode/DayReportList.vue

@@ -4,13 +4,27 @@
       <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
         <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
           <div class="row">
-            <res-select-group :style="$parent.$parent.style" :initres="$parent.$parent.initres" @re-res="$parent.$parent.getRes" :mul="false" :style="$parent.$parent.style" v-ref:sel></res-select-group>
+            <res-select-group :style="$parent.$parent.style" :
+                              initres="$parent.$parent.initres"
+                              @re-res="$parent.$parent.getRes"
+                              :mul="false"
+                              :show-component="['company','department','operator']"
+                              :style="$parent.$parent.style"
+                              v-ref:sel></res-select-group>
+            <div :class="$parent.$parent.style" >
+              <label class="font_normal_body">片&emsp;&emsp;区</label>
+              <v-select :value.sync="model.slice_area" v-model="model.slice_area"
+                        :value-single="true"
+                        :options='$parent.$parent.sliceArea' placeholder='片区/管理站'
+                        close-on-select v-ref:slice>
+              </v-select>
+            </div>
             <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'"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
                            class="datepicker"
                            :show-reset-button="true"
                            class="select"
@@ -22,7 +36,7 @@
               <datepicker  placeholder="结束日期" style="width:60%"
                            v-model="model.f_endDate"
                            :value.sync="model.f_endDate"
-                           :format="'yyyy-MM-dd'"
+                           :format="'yyyy-MM-dd HH:mm:ss'"
                            class="datepicker"
                            :show-reset-button="true"
                            class="select"
@@ -31,44 +45,47 @@
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">用气性质</label>
-              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties" multiple
-                        :options='$parent.$parent.gasproperties' placeholder='请选择'
-                        condition="f_gasproperties in {}"
+              <v-select :value.sync="model.f_gasproperties" v-model="model.f_gasproperties"
+                        :options='$parent.$parent.useroptions' placeholder='请选择'
+                        condition="f_gasproperties = '{}'"
                         close-on-select></v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">操作类型</label>
               <v-select :value.sync="model.f_type" v-model="model.f_type"
                         :options='$parent.$parent.operates' placeholder='请选择'
+                        condition="f_type = '{}'"
                         close-on-select></v-select>
             </div>
             <div :class="$parent.$parent.style">
-              <label class="font_normal_body">收费状态</label>
-              <v-select :value.sync="model.f_state" v-model="model.f_state" multiple
-                        :options='$parent.$parent.sellstate' placeholder='请选择'
-                        condition="f_state in {}"
+              <label class="font_normal_body">操作状态</label>
+              <v-select :value.sync="model.f_state" v-model="model.f_state"
+                        :options='$parent.$parent.stateoptions' placeholder='请选择'
+                        condition="f_state = '{}'"
                         close-on-select></v-select>
             </div>
             <div :class="$parent.$parent.style">
               <label class="font_normal_body">包含APP</label>
               <v-select :value.sync="model.f_hasapp" v-model="model.f_hasapp"
-              :options='$parent.$parent.hasapps' placeholder='请选择'
-              condition="f_operator {} "
-              close-on-select></v-select>
+                        :options='$parent.$parent.hasapps' placeholder='请选择'
+                        condition=" {} "
+                        close-on-select></v-select>
             </div>
 
             <div class="button-range" 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 :data="$parent.$parent.getCondition"
+              <export-excel :data="$parent.$parent.getCondition" v-ref:exportexcel
                             :field="$parent.$parent.getfield"
+                            :defaultselect="$parent.$parent.selectfields"
                             sqlurl="rs/logic/exportfile" sql-name="aode_dayReport" template-name='日清单'  :choose-col="true"
                             class="button_export button_spacing"></export-excel>
-              <day-report-list-print :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></day-report-list-print>
+              <day-report-list-print  :countmodel="{sumsmodel:$parent.$parent.sumsmodel,model:$parent.$parent.model,orgname:$parent.$parent.orgname,depname:$parent.$parent.depname}"></day-report-list-print>
+<!--              <button v-if="$parent.$parent.pushncshow && $parent.$parent.pushncshow2 " class="button_search button_spacing" @click="$parent.$parent.showpushconfirm()">交账</button>-->
               <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 >
@@ -82,12 +99,21 @@
               <!--<nobr>客户姓名</nobr>-->
             </th>
             <th><nobr>地址</nobr></th>
+            <th>
+              <data-order field="f_user_type" name="客户类型"></data-order>
+            </th>
+            <th>
+              <data-order field="f_user_type" name="用气性质"></data-order>
+            </th>
             <th>
               <data-order field="f_meter_brand" name="气表厂家"></data-order>
             </th>
             <th><data-order field="f_operate_date" name="操作时间"></data-order>
               <!--<nobr>操作时间</nobr>-->
             </th>
+            <th><data-order field="f_operate_date" name="操作状态"></data-order>
+              <!--<nobr>操作时间</nobr>-->
+            </th>
             <th>
               <data-order field="f_stair1price" name="1单价"></data-order>
             </th>
@@ -114,67 +140,71 @@
             </th>
             <th>
               <data-order field="f_collection" name="实收金额"></data-order>
-
             </th>
             <th><nobr>上期余额</nobr></th>
             <th><nobr>本期余额</nobr></th>
             <th>
               <data-order field="f_payment" name="付款方式"></data-order>
-              <!--<nobr>付款方式</nobr>-->
             </th>
             <th>
-              <data-order field="f_type" name="收费类型"></data-order>
-              <!--<nobr>收费类型</nobr>-->
+              <data-order field="f_type" name="类型"></data-order>
             </th>
-            <th><nobr>收费状态</nobr></th>
+            <th><nobr>收费类型</nobr></th>
             <th>
               <data-order field="f_operator" name="操作员"></data-order>
             </th>
-            <th>
-              <data-order field="f_user_type" name="客户类型"></data-order>
-              <!--<nobr>客户类型</nobr>-->
-            </th>
             <th><nobr>备注</nobr></th>
 
           </tr>
         </template>
-        <template partial='body'>
-          <td style="text-align: center;"><nobr>
+        <template partial='body' >
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}" ><nobr>
             <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
           </nobr> </td>
-          <td style="text-align: left;"><nobr>{{row.f_user_name}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_address}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_meter_brand}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_operate_date}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_stair1price}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_stair1amount}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_stair2price}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_stair2amount}}</nobr></td>
-          <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_pregas}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_preamount}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_collection}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_balance}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_curbalance}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_payment}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_type}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_state}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_operator}}</nobr></td>
-          <td style="text-align: center;"><nobr>{{row.f_user_type}}</nobr></td>
-          <td style="text-align: left;"><nobr>{{row.f_comments}}</nobr></td>
+          <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_address}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_user_type}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_gasproperties}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_meter_brand}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_operate_date}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_state}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_stair1price}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_stair1amount}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_stair2price}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_stair2amount}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_stair3price}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_stair3amount}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_pregas}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_preamount}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_collection}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_balance}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_curbalance}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_payment}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_type}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_real_type}}</nobr></td>
+          <td style="text-align: center;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_operator}}</nobr></td>
+          <td style="text-align: left;" :style="{background:(row.f_state=='无效'?'#ffa8c0!important;':'')}"><nobr>{{row.f_comments}}</nobr></td>
         </template>
       </data-grid>
     </criteria-paged>
   </div>
+  <modal  v-if="pushconfirmflag" :show.sync="pushconfirmflag" :width="1300" title="交账数据确认" v-ref:modal large backdrop="false">
+    <article slot="modal-body" class="modal-body" style="height: 600px;padding: 0!important;">
+      <push-confirm-manage :searchcondition.sync="searchCondition" v-if="pushconfirmflag" :orgiddepid="orgCondtionStr"  :model.sync="model" v-ref:pushmanage ></push-confirm-manage>
+    </article>
+    <footer  slot="modal-footer" class="modal-footer" style="margin-top:60px;">
+      <button v-show="footershow && footershow3" type="button" class="button_search button_spacing" @click='pushncdata'>确认</button>
+      <button  type="button" class="button_clear button_spacing" @click='closeCode'>取消</button>
+    </footer>
+  </modal>
   <div v-if="listpage">
-    <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
+    <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
   </div>
 </template>
 
 <script>
 
-  import { PagedList } from 'vue-client'
+import {HttpResetClass, PagedList} from 'vue-client'
   import exportConfig from '../../config/exportConfig'
   import DayReportSummary from "./DayReportSummary";
   import getLodop from '../../../../plugins/LodopFuncs'
@@ -199,6 +229,7 @@
           dep:[this.$login.f.depids],
           user:[this.$login.f.id]
         },
+        sliceArea: [],
         model: new PagedList('rs/sql/aode_dayReport', 30, {orderitem: "'f_operate_date'"},{
           f_pregas: 0,
           f_collection: 0,
@@ -211,6 +242,14 @@
           f_count_bk: 0,
           f_pregas_bk: 0,
           f_collection_bk: 0,
+          f_count_zjbf:0,
+          f_collection_zjbf:0,
+          f_count_ysk:0,
+          f_collection_ysk:0,
+          f_count_iotbf:0,
+          f_collection_iotbf:0,
+          f_count_iotkf:0,
+          f_collection_iotkf:0,
           f_count_bq: 0,
           f_pregas_bq: 0,
           f_collection_bq: 0,
@@ -222,31 +261,110 @@
           f_collection_cz: 0,
           f_sum_count:0,
           f_shouru_gas:0,
-          f_shouru_fee:0
+          f_shouru_fee:0,
+          f_yingshou_fee:0,
+          f_usebenqi_fee:0,
+          f_benqi_fee:0,
+          f_sumgtwx:0,
+          f_sumcwsf:0,
+          f_sumxjjf:0,
+          f_sumzfb:0,
+          f_sumpos:0,
+          f_sumwxjf:0,
+          f_sumqp:0,
+          f_sumyysk:0,
+          f_sumjjbq:0,
+          f_sumbtk:0
         }),
         listpage:false,
         rowdata: {},
         orgCondtionStr: '',
         userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
-        count: 0,
+      count: 0,
         sumsmodel: {},
-        printshow: false,
+      printshow: false,
         all: false,
         orgname: '',
         depname: '',
+        operaname:'',
         criteriaShow: false,
-        operates: [{label: '全部', value: ''}, {label: '发卡售气', value: "发卡售气"},{label: '卡表收费', value: "卡表收费"},{label: '补气', value: "补气"},{label: '补卡', value: "补卡"},{label: '换表', value: "换表"},{label: '冲正', value: "冲正"}],
-        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
-      }
+        operates: [{label: '全部', value: ''},...this.$appdata.getParam('日清单操作类型')],
+        stateoptions:[{label: '全部', value: ''}, {label: '有效', value: "有效"},{label: '撤销', value: "撤销"},{label: '无效', value: "无效"},{label: '冲正', value: "冲正"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "f_operator != '悦生活'"},{label: '不包含POS', value: "len(f_voucher_number)<1"},{label: 'POS', value: "f_voucher_number!=''"}],
+        useroptions:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
+      selectfields:[],
+        pushncshow:false,
+        pushncshow2:false,
+        searchCondition:{},
+        pushconfirmflag: false,
+        footershow:true,
+        footershow3:false,
+    }
     },
     ready() {
+      if(this.$login.r.includes('收费推送')){
+        this.pushncshow = true;
+      }
+      this.initAreas(this.$login.f.orgid)
       this.$refs.paged.$refs.cri.condition += this.orgCondtionStr
-      this.$refs.paged.$refs.cri.model.f_hasapp = [`!= '悦生活'`]
-      this.$refs.paged.$refs.cri.model.f_startDate = this.$login.toStandardDateString()
-      this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
+      this.$refs.paged.$refs.cri.model.f_hasapp = [`f_operator != '悦生活'`]
+      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.dataReportConfig){
+        this.selectfields.push(item)
+      }
       // this.search()
     },
     methods: {
+      // 初始化片区
+      async initAreas (val) {
+        if (val) {
+          let http = new HttpResetClass()
+          let getAllArea = await http.load('POST', '/rs/search', {
+            source: 'this.getParentByType($organization$).getAllChildrens().where(row.getType() == $zone$)',
+            userid: this.$login.f.id
+          }, {resolveMsg: null, rejectMsg: '获取片区出错！！！'})
+          let arr = getAllArea.data.filter((res) => {
+            return res.parentid == val
+          })
+          console.log('过滤之后的片区', arr)
+          this.sliceArea = [{label: '全部', value: ''}]
+          arr.forEach((res) => {
+            this.sliceArea.push({label: res.name, value: res.name})
+          })
+        }
+      },
+      //推送数据
+      pushncdata(){
+        this.$refs.pushmanage.pushncdata();
+      },
+      //关闭推送确认窗口
+      closeCode(){
+        this.$refs.pushmanage.newmodel = {};
+        this.$refs.pushmanage.showmone = false;
+        this.pushconfirmflag = false;
+      },
+      //显示交账页面
+      showpushconfirm(){
+        this.search();
+        if(this.searchCondition.condition!=null && this.searchCondition.condition!='' && this.searchCondition.condition.includes("f_gasproperties") || this.searchCondition.condition.includes("f_type") ){
+          //this.$showMessage("交账失败,本次交账未保存,只能交账一天的数据,请确认交账时间后重新交账!!");
+          this.$showMessage("交账失败,本次交账未保存,请取消用气性质或操作类型选项,当前时间段内只允许交账一次!!");
+          return;
+        }
+        if(this.searchCondition.condition!=null && this.searchCondition.condition!='' && !this.searchCondition.condition.includes("f_state")){
+          this.$showAlert('请选择操作状态为有效进行交账!!','warning',2000);
+          return;
+        }
+        this.$showMessage("请进行一次查询后进行交账,",['confirm','cancel']).then(res=>{
+          if(res == 'confirm'){
+            this.pushconfirm();
+          }
+        })
+      },
+      pushconfirm(){
+        this.pushconfirmflag = true;
+      },
       showmsg(obj){
         this.criteriaShow = false
         this.$emit('close')
@@ -265,47 +383,73 @@
           f_orgstr = 'and f_orgid = ' + this.$login.f.orgid
         }
         args.condition = `${args.condition} ` + f_orgstr
+        let condvalue = '1=1'
+        if (this.$refs.paged.$refs.cri.model.slice_area) {
+          condvalue = condvalue + ` and isnull(ss.f_zones,u3.f_slice_area) = '${this.$refs.paged.$refs.cri.model.slice_area}'`
+        }
+        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.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'
-
-        this.model.params.operatorState = this.$refs.paged.$refs.cri.model.f_type + ''
-
-        await this.model.search(args.condition, args.model)
+        //推送条件: 需要 选择公司,部门
+        if(this.depname != null  && this.depname != '' ){
+          this.pushncshow2 = true;
+        }else{
+          this.pushncshow2= false;
+        }
+        this.searchCondition = this.getCondition;
+        await this.model.search(args.condition, args.model,condvalue)
 
         this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
         console.log('计算合计。', this.sumsmodel)
         if (this.$refs.paged.$refs.grid.model.rows.length === 0) {
           for (let key in this.sumsmodel) {
-            this.sumsmodel[key] = 0
+            this.sumsmodel[key] = 0;
           }
         }
         this.$dispatch('getdata', this.sumsmodel)
       },
       getRes(condition, obj) {
-        this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
+        //判断最新组织和存储组织不同时,清空已经选择人员
+        if(obj.depnames[0] != this.depname){
+          this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = []
+        }
+        this.orgCondtionStr = condition;
+        this.orgname = obj.orgnames[0];
+        this.depname = obj.depnames[0];
+        if(obj.operatornames.length>0){
+          this.operaname =obj.operatornames[0];
+        }else{
+          this.operaname='';
+        }
+        //当未选中组织时不可进行推送
+        if(this.depname == null || this.depname == '' ){
+          this.pushncshow2 = false;
+        }else{
+          this.pushncshow2 = true;
+        }
       },
       clear() {
         //清空部门和人员
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = []
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].selectres = [];
+        this.$refs.paged.$refs.cri.$refs.sel.$children[2].selectres = [];
         //部门和人员变为全选
-        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
+        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()
-        this.$refs.paged.$refs.cri.model.f_endDate = this.$login.toStandardDateString()
+        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';
       },
       close() {
         this.printshow = false
       },
       getfield() {
+
         return exportConfig.dataReportConfig
       },
       show() {
+        this.pushncshow2 = !this.pushncshow2;
         this.criteriaShow = !this.criteriaShow
         if (this.criteriaShow) {
           this.$emit('show')
@@ -335,26 +479,64 @@
 
         this.search()
       },
-    },
-    computed: {
-      getCondition() {
-          return {
-            condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-            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]
-          }
+  },
+  events:{
+      'showtogglefooter'(){
+        this.footershow=true;
       },
-      getfield() {
-        return exportConfig.dataReportConfig
+      'hiddentogglefooter'(){
+        this.footershow=false
+      },
+      'confirmcolse'(){
+        this.pushconfirmflag = false;
       },
-      gasproperties() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用气性质')]
+      'openbutton'(){
+        this.footershow3=true;
       },
-      sellstate() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费状态')]
+      'closebutton'(){
+        this.footershow3=false;
       }
+  },
+  computed: {
+    getCondition() {
+
+      return {
+        condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
+        startDate: this.$refs.paged.$refs.cri.model.f_startDate,
+        endDate: this.$refs.paged.$refs.cri.model.f_endDate,
+        orderitem: this.model.paramSource.orderitem.split("'")[1].split("'")[0]
+      }
+    },
+    getfield() {
+      //设置默认值
+
+      return exportConfig.daydataReportConfig
+    },
+    gasproperties() {
+      console.log("xxx");
+      console.log(this.$appdata.getParam('用气性质'));
+      console.log(this);
+      let options = this.$appdata.getParam('用气性质')
+      let resultoptions = [];
+      if(options.length>0){
+        resultoptions.push({label: ' 全部 ', value: ''})
+        options.forEach((item)=>{
+          console.log(item)
+          resultoptions.push(item)
+        })
+      }
+      console.log(resultoptions);
+      return resultoptions;
+      //return [{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')]
     }
+  },
+  watch:{
+      'pushncshow2'(val){
+        if(val){
+          this.search();
+        }
+      }
+  }
   }
 
 </script>