manage-client 3.2.8 → 3.2.10-aode

package/src/components/sale/businessquery/ChargeQuery.vue

@@ -1,11 +1,45 @@
 <template>
   <div id="unit" class="flex-row">
     <div class="basic-main" @keyup.enter="search">
-      <div class="flex" :class="{showbottom:showbottomsum}" v-if="!show">
-        <criteria-paged :model="model" v-ref:paged  @sort="sort">
+      <div class="flex" v-if="!show">
+        <criteria-paged :model="model" v-ref:paged>
           <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 :initres.sync="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+                <div class="span" style="float:right;">
+                  <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" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
+                                :choose-col="true"></export-excel>
+
+                  <print-data :model="$parent.model" :field="$parent.$parent.getfield"
+                              :defaultfield="$parent.$parent.defaultfield" print-name="收费查询"
+                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
+                  <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>
+
+                </div>
+              </div>
+
+              <div class="row" v-show="$parent.$parent.criteriaShow">
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
+                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">客户名称</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
+                         condition="f_user_name like '%{}%'" placeholder="客户名称">
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费编号</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.id"
+                         condition="id = '{}'" placeholder="收费编号">
+                </div>
                 <div class="col-sm-2 form-group">
                   <label for="startDate" class="font_normal_body">开始日期</label>
                   <datepicker id="startDate" placeholder="开始日期" style="width:60%"
@@ -26,45 +60,7 @@
                               condition="f_operate_date <= '{}'">
                   </datepicker>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_userinfo_code"
-                         condition="f_userinfo_code = '{}' " placeholder="客户编号">
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">客户名称</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_user_name"
-                         condition="f_user_name like '%{}%'" placeholder="客户名称">
-                </div>
-
-                <div class="span" style="float:right;">
-                  <button class="button_search button_spacing" v-show="false" @click="$parent.$parent.ReadIDCard()">读取身份证</button>
-                  <read-card :is-single.sync="$parent.$parent.isSingleUser" @read-info="$parent.$parent.cardBtn"  v-ref:readcard></read-card>
-                  <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" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                :defaultselect="$parent.$parent.defaultexport"
-                                sqlurl="rs/logic/exportfile" sql-name="chargeQuery" template-name='收费查询导出'
-                                :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"
-                              :sumsmodel="$parent.$parent.sumsmodel"></print-data>
-                  <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>
 
-                </div>
-              </div>
-              <div class="row" v-show="$parent.$parent.criteriaShow">
-                <res-select-group :show-component="$parent.$parent.resshow" :selectin="true" :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">收费编号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.id"
-                         condition="id = '{}'" placeholder="收费编号">
-                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户电话</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_user_phone"
@@ -75,52 +71,31 @@
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_idnumber"
                          condition="f_idnumber like '%{}%'" placeholder="身份证号">
                 </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
+                  <input type="text" style="width:60%" class="input_search" v-model="model.f_residential_area"
+                         condition="f_residential_area like '%{}%'" placeholder="小区"/>
+                </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户地址</label>
                   <input type="text" style="width:60%" class="input_search" v-model="model.f_address"
                          condition="f_address like '%{}%'" placeholder='客户地址'>
                 </div>
                 <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;小区&nbsp;&nbsp;&nbsp;</label>
-                  <v-select :value.sync="model.f_residential_area"
-                            class="select_list select"
-                            v-model="model.f_residential_area"
-                            style="width: 60%"
-                            multiple
-                            condition="f_residential_area in {}"
-                            :options='$parent.$parent.residentialArea' placeholder='选择小区'
-                            close-on-select>
-
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="参数:付款方式查询">付款方式</label>
-                  <v-select :value.sync="model.f_payment" multiple
+                  <label class="font_normal_body">付款方式</label>
+                  <v-select :value.sync="model.f_payment"
                             v-model="model.f_payment"
                             :options='$parent.$parent.payment' placeholder='请选择'
-                            condition="f_payment in {}"
-                            close-on-select></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="参数:支付渠道查询">支付渠道</label>
-                  <v-select :value.sync="model.f_bank_type" multiple
-                            v-model="model.f_bank_type"
-                            :options='$parent.$parent.banktype' placeholder='请选择'
-                            condition="f_bank_type in {}"
+                            condition="f_payment = '{}'"
                             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_type"
+                  <v-select :value.sync="model.f_type"
                             v-model="model.f_type"
                             :options='$parent.$parent.chargetype' placeholder='请选择'
                             condition="f_type = '{}'"
-                            close-on-select></v-select>-->
-                  <v-select :value.sync="model.f_type" multiple
-                            :options='$parent.$parent.chargetype' placeholder='请选择'
-                            close-on-select clear-button
-                            condition="f_type in {}"
-                            v-model="model.f_type"></v-select>
+                            close-on-select></v-select>
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">客户类型</label>
@@ -159,328 +134,163 @@
                 </div>
                 <div class="col-sm-2 form-group">
                   <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_type" multiple
+                  <v-select :value.sync="model.f_meter_type"
                             :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_type"
-                            condition="f_meter_type in {}"
+                            condition="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" multiple
+                  <v-select :value.sync="model.f_meter_brand"
                             v-model="model.f_meter_brand"
                             :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand in {}"
+                            condition="f_meter_brand = '{}'"
                             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_table_state"-->
+                <!--                            v-model="model.f_table_state"-->
+                <!--                            :options='$parent.$parent.tablestate' placeholder='请选择'-->
+                <!--                            condition="f_table_state in {}"-->
+                <!--                            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_state" multiple
+                  <v-select :value.sync="model.f_state"
                             v-model="model.f_state"
                             :options='$parent.$parent.charge_state' placeholder='请选择'
-                            condition="f_state in {}"
-                            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_bank_name"
-                            v-model="model.f_bank_name"
-                            :options='$parent.$parent.bank' placeholder='请选择'
-                            condition="f_bank_name = '{}'"
+                            condition="f_state = '{}'"
                             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_privilege_money"
-                            v-model="model.f_privilege_money"
-                            :options='$parent.$parent.privilege_money' placeholder='请选择'
-                            condition="f_privilege_money {}"
+                <div class="col-sm-2">
+                  <label class="font_normal_body">壁&nbsp;&nbsp;挂&nbsp;炉</label>
+                  <v-select :value.sync="model.isbgl" v-model="model.isbgl"
+                            :options='$parent.$parent.bgl' placeholder='请选择'
+                            condition="isbgl = '{}'"
                             close-on-select></v-select>
                 </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">收&ensp;据&ensp;号</label>
-                  <input type="text" style="width:30%" class="input_search" title="大于等于"
-                         v-model="model.f_bill_number_big" condition="f_bill_number >= {}" placeholder='大于等于'>
-                  <input type="text" style="width:30%" class="input_search" title="小于等于"
-                         v-model="model.f_bill_number_small" condition="f_bill_number <= {}" placeholder='小于等于'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">&nbsp;&nbsp;&nbsp;流水号</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_serial_id"
-                         condition="f_serial_id = '{}'" placeholder='流水号'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">发票号码</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_invoice_num"
-                         condition="f_invoice_num = '{}'" placeholder='发票号码'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" title="发票类型查询">发票类型</label>
-                  <v-select :value.sync="model.f_invoice_type"
-                            v-model="model.f_invoice_type"
-                            :options='$parent.$parent.invoiceType' placeholder='请选择'
-                            condition="f_invoice_type = '{}'"
-                            close-on-select :value-single="true" :search="false">
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">开&ensp;票&ensp;人</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_invoiceuse_operator"
-                         condition="f_invoiceuse_operator like '%{}%'" placeholder='开票人'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" class="font_normal_body">开票时间</label>
-                  <datepicker id="startDate1" placeholder="开始日期" style="width:60%"
-                              v-model="model.invoice_startDate"
-                              :value.sync="model.invoice_startDate"
-                              :format="'yyyy-MM-dd'"
-                              :show-reset-button="true"
-                              condition="f_invoice_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" class="font_normal_body">开票时间</label>
-                  <datepicker id="endDate1" placeholder="结束日期" style="width:60%"
-                              v-model="model.invoice_endDate"
-                              :value.sync="model.invoice_endDate"
-                              :format="'yyyy-MM-dd'"
-                              :show-reset-button="true"
-                              condition="f_invoice_date <= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body" >抄&nbsp;&nbsp;表&nbsp;员</label>
-                  <v-select :value.sync="model.f_inputtor"
-                            v-model="model.f_inputtor"
-                            :options='$parent.$parent.inputtores' placeholder='请选择'
-                            condition="f_inputtor = '{}'"
-                            close-on-select :search="false">
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">抄&ensp;表&ensp;册</label>
-                  <v-select :value.sync="model.f_meter_book" v-model="model.f_meter_book"
-                            :options='$parent.$parent.meterbooks' placeholder='抄表册'
-                            style="width:60%"
-                            close-on-select
-                            condition="f_meter_book_num = '{}'"></v-select>
-                </div>
-                  <div class="col-sm-2 form-group">
-                      <label class="font_normal_body">写卡状态</label>
-                      <v-select :value.sync="model.f_write_card" v-model="model.f_write_card"
-                                :options='$parent.$parent.writecard' placeholder='写卡状态'
-                                style="width:60%"
-                                close-on-select
-                                condition="f_write_card = '{}'"></v-select>
-                  </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">街&ensp;&ensp;&ensp;&ensp;道</label>
-                  <input type="text" style="width:60%" class="input_search" v-model="model.f_street"
-                         condition="f_street like '%{}%'" placeholder='街道'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">数&ensp;据&ensp;包</label>
-                  <v-select :value.sync="model.f_bluetooth_package" v-model="model.f_bluetooth_package"
-                            :options='$parent.$parent.bluetoothpackage' placeholder='数据包状态'
-                            style="width:60%"
-                            close-on-select
-                            condition="f_bluetooth_package = '{}'"></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">pos设备&nbsp;</label>
-                  <v-select :value.sync="model.f_terminal_name" multiple
-                            v-model="model.f_terminal_name"
-                            :options='$parent.$parent.posEquipment' placeholder='请选择'
-                            condition="f_operator in {}"
+                <div class="col-sm-2">
+                  <label class="font_normal_body">煤&nbsp;&nbsp;改&nbsp;气</label>
+                  <v-select :value.sync="model.f_is_mgq" v-model="model.f_is_mgq"
+                            :options='$parent.$parent.ismgq' placeholder='是否煤改气'
+                            condition="f_is_mgq = '{}'"
                             close-on-select></v-select>
                 </div>
               </div>
             </div>
           </criteria>
 
-          <data-grid :model="model" partial='list' class="list_area table_sy" style="height: 95%" v-ref:grid>
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid>
             <template partial='head'>
               <tr>
                 <th>
                   <nobr>收费编号</nobr>
                 </th>
                 <th>
-<!--                  <nobr>客户编号</nobr>-->
-                  <data-order field="f_userinfo_code" name="客户编号"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_userinfo_code"></data-order>
+                  <nobr>客户编号</nobr>
                 </th>
-                <th><nobr>街道</nobr></th>
                 <th>
                   <nobr>客户名称</nobr>
                 </th>
                 <th>
-                  <nobr>片区</nobr>
-                </th>
-                <th>
-<!--                  <nobr>客户地址</nobr>-->
-                  <data-order field="f_address" name="客户地址"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_address"></data-order>
+                  <nobr>客户地址</nobr>
                 </th>
                 <th>
-                  <nobr>客户类型</nobr>
-                </th>
-                <th>
-                  <nobr>用气性质</nobr>
+                  <nobr>气价类型</nobr>
                 </th>
+
                 <th>
                   <nobr>表号</nobr>
-                </th>
-                  <th>
-                      <nobr>气表品牌</nobr>
-                  </th>
-                <th>
-                  <nobr>卡号</nobr>
                 </th>
                 <th>
                   <nobr>购气次数</nobr>
                 </th>
                 <th>
-                  <nobr>气量</nobr>
-                </th>
-                <th>
-                  <nobr>金额</nobr>
-                </th>
-                <th>
-                  <nobr>滞纳金</nobr>
-                </th>
-                <th>
-                  <nobr>燃气费</nobr>
-                </th>
-                <th>
-                  <nobr>清缴金额</nobr>
-                </th>
-                <th>
-                  <nobr>预存金额</nobr>
-                </th>
-                <th>
-                  <nobr>上期结余</nobr>
+                  <nobr  >1单价</nobr>
                 </th>
                 <th>
-                  <nobr>收款</nobr>
+                  <nobr  >1气量</nobr>
                 </th>
-                <!--<th>-->
-<!--&lt;!&ndash;                  <nobr>所属年月</nobr>&ndash;&gt;-->
-                  <!--<data-order field="f_rest_date" name="所属年月"-->
-                              <!--:order.sync="$parent.$parent.$parent.orderFields.f_rest_date"></data-order>-->
-
-                <!--</th>-->
                 <th>
-<!--                  <nobr>收费日期</nobr>-->
-                  <data-order field="f_operate_date" name="收费日期"
-                              :order.sync="$parent.$parent.$parent.orderFields.f_operate_date"></data-order>
+                  <nobr  >1气费</nobr>
                 </th>
                 <th>
-                  <nobr>优惠金额</nobr>
+                  <nobr  >2单价</nobr>
                 </th>
                 <th>
-                  <nobr>本期结余</nobr>
+                  <nobr  >2气量</nobr>
                 </th>
                 <th>
-                  <nobr>付款方式</nobr>
+                  <nobr  >2气费</nobr>
                 </th>
-              <th>
-                  <nobr>写卡状态</nobr>
-              </th>
                 <th>
-                  <nobr>支付渠道</nobr>
+                  <nobr >3单价</nobr>
                 </th>
                 <th>
-                  <nobr>银行名称</nobr>
+                  <nobr  >3气量</nobr>
                 </th>
                 <th>
-                  <nobr>收费类型</nobr>
+                  <nobr  >3气费</nobr>
                 </th>
                 <th>
-                  <nobr>终端号</nobr>
+                  <nobr>气量</nobr>
                 </th>
+
                 <th>
-                  <nobr>蓝牙数据包状态</nobr>
+                  <nobr>金额</nobr>
                 </th>
                 <th>
-                  <nobr>状态</nobr>
+                  <nobr>滞纳金</nobr>
                 </th>
-
                 <th>
-                  <nobr>备注</nobr>
+                  <nobr>收款</nobr>
                 </th>
                 <th>
-                  <nobr>补打次数</nobr>
+                  <nobr>清缴金额</nobr>
                 </th>
                 <th>
-                  <nobr>人员</nobr>
+                  <nobr>预存金额</nobr>
                 </th>
                 <th>
-                  <nobr>部门</nobr>
+                  <nobr>上期结余</nobr>
                 </th>
                 <th>
-                  <nobr>公司</nobr>
+                  <nobr>本期结余</nobr>
                 </th>
                 <th>
-                  <nobr>流水号</nobr>
+                  <nobr>付款方式</nobr>
                 </th>
                 <th>
-                  <nobr>收据号</nobr>
+                  <nobr>收费类型</nobr>
                 </th>
                 <th>
-                  <nobr>业务单号</nobr>
+                  <nobr>状态</nobr>
                 </th>
                 <th>
-                  <nobr>发票号码</nobr>
+                  <nobr>收费日期</nobr>
                 </th>
                 <th>
-                  <nobr>发票类型</nobr>
+                  <nobr>备注</nobr>
                 </th>
                 <th>
-                  <nobr>开票人</nobr>
+                  <nobr>补打次数</nobr>
                 </th>
                 <th>
-                  <nobr>开票时间</nobr>
+                  <nobr>是否壁挂炉</nobr>
                 </th>
                 <th>
-                  <nobr>累计写卡气量</nobr>
+                  <nobr>是否煤改气</nobr>
                 </th>
                 <th>
-                  <nobr>实际写卡金额</nobr>
+                  <nobr>人员</nobr>
                 </th>
                 <th>
-                  <nobr>冲正人</nobr>
+                  <nobr>部门</nobr>
                 </th>
                 <th>
-                  <nobr>冲正时间</nobr>
+                  <nobr>公司</nobr>
                 </th>
-                  <th>
-                      <nobr>一阶气量</nobr>
-                  </th>
-                  <th>
-                      <nobr>一阶单价</nobr>
-                  </th>
-                  <th>
-                      <nobr>一阶气费</nobr>
-                  </th>
-                  <th>
-                      <nobr>二阶气量</nobr>
-                  </th>
-                  <th>
-                      <nobr>二阶单价</nobr>
-                  </th>
-                  <th>
-                      <nobr>二阶气费</nobr>
-                  </th>
-                  <th>
-                      <nobr>三阶气量</nobr>
-                  </th>
-                  <th>
-                      <nobr>三阶单价</nobr>
-                  </th>
-                  <th>
-                      <nobr>三阶气费</nobr>
-                  </th>
-                <th><nobr>附件</nobr></th>
               </tr>
             </template>
             <template partial='body'>
@@ -488,49 +298,43 @@
                 <nobr>{{row.id}}</nobr>
               </td>
               <td style="text-align: center;"><nobr>
-                <nobr>{{row.f_userinfo_code}}</nobr>
+                <span @click="$parent.$parent.$parent.showmsg(row)"><a>{{row.f_userinfo_code}}</a></span>
               </nobr> </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_street}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_user_name}}</nobr>
               </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_zones}}</nobr>
-              </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_address}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_user_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_gasproperties}}</nobr>
+                <nobr>{{row.f_price_type}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_meternumber}}</nobr>
-              </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_meter_brand}}</nobr>
-                </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_card_id}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_times}}</nobr>
               </td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair1price==null?0:row.f_stair1price}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stairamount1==null?0:row.f_stairamount1}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair1fee==null?0:row.f_stair1fee}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair2price==null?0:row.f_stair2price}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair2amount==null?0:row.f_stair2amount}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair2fee==null?0:row.f_stair2fee}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair3price==null?0:row.f_stair3price}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair3amount==null?0:row.f_stair3amount}}</nobr></td>
+              <td style="text-align: center;" ><nobr>{{row.f_stair3fee==null?0:row.f_stair3fee}}</nobr></td>
               <td style="text-align: center;">
                 <nobr>{{row.f_pregas}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.fee}}</nobr>
+                <nobr>{{row.f_preamount}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_delaypay}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_preamount}}</nobr>
+                <nobr>{{row.f_collection}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_charge_money}}</nobr>
@@ -539,52 +343,23 @@
                 <nobr>{{row.f_yucun}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr v-if="row.f_meter_type === '物联网表'">{{row.f_balance_amount}}</nobr>
-                <nobr v-else>{{row.f_balance}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_collection}}</nobr>
-              </td>
-              <!--<td style="text-align: center;">-->
-                <!--<nobr>{{row.f_rest_date}}</nobr>-->
-              <!--</td>-->
-              <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
+                <nobr>{{row.f_balance}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_privilege_money}}</nobr>
-              </td>
-
-
-              <td style="text-align: center;">
-                <nobr v-if="row.f_meter_type === '物联网表'">{{row.f_curbalance_amount}}</nobr>
-                <nobr v-else>{{row.f_curbalance}}</nobr>
+                <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_write_card}}</nobr>
-                </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bank_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bank_name}}</nobr>
               </td>
               <td style="text-align: center;">
                 <nobr>{{row.f_type}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_terminal_num}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bluetooth_package}}</nobr>
+                <nobr>{{row.f_state}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_state}}</nobr>
+                <nobr>{{row.f_operate_date}}</nobr>
               </td>
-
               <td style="text-align: center;">
                 <nobr>{{row.f_comments}}</nobr>
               </td>
@@ -592,232 +367,89 @@
                 <nobr>{{row.filltimes}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_operator}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_depname}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_orgname}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_serial_id}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_bill_number}}</nobr>
+                <nobr>{{row.isbgl}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_serial_number}}</nobr>
+                <nobr>{{row.f_is_mgq}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_invoice_num}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_invoice_type}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_invoiceuse_operator}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_invoice_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_write_totalgas}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_write_money}}</nobr>
+                <nobr>{{row.f_operator}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_corr_operator}}</nobr>
+                <nobr>{{row.f_depname}}</nobr>
               </td>
               <td style="text-align: center;">
-                <nobr>{{row.f_corr_operate_date}}</nobr>
+                <nobr>{{row.f_orgname}}</nobr>
               </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_stairamount1}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_stair1price}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{(row.f_stair1fee - 0).toFixed(2)}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_stair2amount}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_stair2price}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{(row.f_stair2fee - 0).toFixed(2)}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_stair3amount}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{row.f_stair3price}}</nobr>
-                </td>
-                <td style="text-align: center;">
-                    <nobr>{{(row.f_stair3fee - 0).toFixed(2)}}</nobr>
-                </td>
-              <td style="text-align: center;"><nobr>
-                <button style=" height: 28px;line-height: 16px;" class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
-              </nobr></td>
             </template>
             <template partial='foot'></template>
           </data-grid>
+
         </criteria-paged>
+
         <table class="table-hover">
           <tr style="position: relative" class="table-bordered">
             <td
               style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;color: #5CB95C;font-weight: bold">
               汇总信息
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               气量合计:&emsp;{{sumsmodel.f_pregas}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              应交金额合计:&emsp;{{sumsmodel.fee}}
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
+              应交金额合计:&emsp;{{sumsmodel.f_preamount}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               滞纳金合计:&emsp;{{sumsmodel.f_delaypay}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              燃气费合计:&emsp;{{sumsmodel.f_preamount}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              预存金额合计:&emsp;{{sumsmodel.f_yucun}}
-            </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
+            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px">
               收款合计:&emsp;{{sumsmodel.f_collection}}
             </td>
-            <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-              优惠合计:&emsp;{{sumsmodel.f_privilege_money}}
-            </td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  一阶气量合计:&emsp;{{sumsmodel.f_stairamount1}}
-              </td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  一阶气费合计:&emsp;{{sumsmodel.f_stair1fee}}
-              </td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  二阶气量合计:&emsp;{{sumsmodel.f_stair2amount}}
-              </td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  二阶气费合计:&emsp;{{sumsmodel.f_stair2fee}}
-              </td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  三阶气量合计:&emsp;{{sumsmodel.f_stair3amount}}
-              </td>
-              <td style="display: inline-block;width: auto;border-right: 1px solid #F2F6FA;padding: 0px 10px 0px 10px;font-weight: bold">
-                  三阶气费合计:&emsp;{{sumsmodel.f_stair3fee}}
-              </td>
           </tr>
         </table>
       </div>
-      <!--<div v-if="show">-->
-        <!--<user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>-->
-      <!--</div>-->
+      <div v-if="show">
+        <user-info-detail-manage :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage>
+      </div>
     </div>
-    <modal :show.sync="showupload" v-if="showupload" width="80%" style="width:auto;"  v-ref:modal middle backdrop="false">
-      <article slot="modal-body">
-        <upload :blodid="selected.f_userinfo_id" :businessid="selected.id" v-ref:upload isupload="false" takeimg="false"  fusetype="%收费" :isremark="false" style="width:auto" ></upload>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
   </div>
-  <high-meter-idcard :show.sync="false"  v-ref:highcard  ></high-meter-idcard>
 </template>
 
 <script>
-  import {HttpResetClass, PagedList} from 'vue-client'
+  import {PagedList} from 'vue-client'
   import exportConfig from '../config/exportConfig'
-  let cardBtnGen = async function (self, val) {
-    self.cardInfo = val.data
-
-    // 判断读卡是否需要卡密码
-    console.log('读卡上的信息', self.cardInfo)
 
-    if (self.cardInfo.NewParam) {
-      if (self.cardInfo.NewParam.error) {
-        if (self.cardInfo.NewParam.error === '0001') {
-          // 需要重新读卡并传卡密码
-          if (self.model.rows.length == 1 && self.model.rows[0].f_alias === self.cardInfo.Factory) {
-            self.readCardParam = self.model.rows[0].f_card_password
-            self.cardInfo = await self.$refs.paged.$refs.cri.$refs.readcard.readCard2(self.model.rows[0].f_card_password)
-          } else {
-            self.$showAlert('此卡需要先获取客户信息。请通过条件查询该客户信息之后进行读卡！！', 'warning', 2000)
-            return
-          }
-        }
-      }
-    }
-    self.card=self.cardInfo.CardID
-    self.search()
-  }
   let readySomething = async function (self) {
-    //加载抄表册
-    self.initmeterbook();
-    // self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-    self.$refs.paged.$refs.cri.model.startDate = self.data ? self.data.startDate : self.$login.toStandardDateString() + ' 00:00:00'
-    self.$refs.paged.$refs.cri.model.endDate = self.data ? self.data.endDate : self.$login.toStandardDateString() + ' 23:59:59'
-    // self.$refs.paged.$refs.cri.model.f_state=['有效'];
+    self.$refs.paged.$refs.cri.model.startDate = self.$login.toStandardDateString() + ' 00:00:00'
+    self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
     // self.$refs.paged.$refs.cri.search()
     self.defaultfield = [...self.defaultfield, ...self.config.defaultPrint]
     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 {
-    props:['data'],
-    title: '收费查询',
-     data() {
+    data() {
       return {
-        IdCardInfo:'',
-        card:'',
-        isSingleUser: null,
-        startDate1:'',
-        endDate1:'',
-        resshow:['company','department','operator','slicearea'],
-        other:[],
-
-        footer:[],
         config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_pregas', 'f_collection', 'f_stairamount1', 'f_stair2amount', 'f_stair3amount','f_operate_date']
-        },
-        //排序
-        orderitem:'f_operate_date desc',
-        orderFields: {
-          f_operate_date: 'no'
+          defaultPrint: ['f_userinfo_code', 'f_address', 'f_pregas', 'f_preamount']
         },
         //f_price_name:[],
         gasproperties:[],
         showinfo: false,
         data: {},
-        getstart:'',
         show:false,
         rowdata:{},
         initres: {
           org:[this.$login.f.orgid],
           dep:[],
-          user:[]
+          user:[],
         },
-        model: new PagedList('rs/sql/chargeQuery', 20, {orderitem: this.orderitem?'"' + this.orderitem + ' "':`'f_operate_date desc'`},{
+        model: new PagedList('rs/sql/chargeQuery', 20, {}, {
           f_pregas: 0,
           f_preamount: 0,
           f_delaypay: 0,
-          fee:0,
-          f_yucun:0,
-          f_privilege_money: 0,
-          f_collection: 0,
-          f_stairamount1:0,
-          f_stair1fee:0,
-          f_stair2amount:0,
-          f_stair2fee:0,
-          f_stair3amount:0,
-          f_stair3fee:0,
+          f_collection: 0
         }),
         criteriaShow: false,
         orgCondtionStr: '',
@@ -825,153 +457,30 @@
         meterbrands: [],
         pricenames: [],
         prices: [],
-        area: [],
-        //默认打印列
+        //合计数据
         defaultfield: [],
-        //小区
-        residentialArea: [],
         sumsmodel: {},
-        f_filialeid: this.$login.f.orgid,
-        wxstate:[
-          {label: '全部', value: ''},
-          {label: '已退款', value: `= '3'`},
-          {label: '未退款', value: `!= '3'`}
-        ],
-        privilege_money:[
-          {label: '全部', value: ''},
-          {label: '已优惠', value: '> 0'},
-          {label: '未优惠', value: '= 0'}
-        ],
-        showupload:false,
-        selected:{},
-        meterbooks:[{label: '全部',value: ''}],  //抄表册
-        inputtores:[{label: '全部',value: ''}],
-        writecard:[{label: '全部',value: ''},{label: '已写卡',value: '已写卡'},{label: '未写卡',value: '未写卡'}],
-        bluetoothpackage:[{label: '全部',value: ''},{label: '发送成功',value: '发送成功'},{label: '执行成功',value: '执行成功'}],
-        allorgid:[],
-        tempfalg :false,
-        lastorgstr:'',
-        // pos设备列表
-        posEquipment: [{label: '全部',value: ''}],
-        showbottomsum:false  //页面下方是否有合计: 默认为false, 在watch修改
+        f_filialeid: this.$login.f.f_orgid,
+        selectfields:[]
       }
     },
+    props:['selectorg'],
     ready() {
-      this.$refs.paged.$refs.cri.model.f_state=['有效']
-      this.getaddress()
-      this.getEquipment()
-      //加载抄表册
-      this.$MagGetSaleParam.initinputtor();
-      this.getinputtores();
-      // this.initres.dep.push(this.$login.f.depids)
+      if(this.selectorg != null && this.selectorg != null != ''){
+        this.initres.org=[]
+        this.initres.org.push(this.selectorg);
+      }
       readySomething(this).then(() => {
         this.$emit('ready')
       }).catch((error) => {
         this.$emit('error', error)
       })
+      for(var item in exportConfig.chargeConfig){
+        this.selectfields.push(item)
+      }
     },
     methods: {
-      // 获取设备下拉选
-      async getEquipment () {
-        let HttpReset = new HttpResetClass()
-        let param = {
-          items: 'f_terminal_name',
-          tablename: 't_equipment',
-          condition: `f_equipment_type = 'POS' and f_state = '正常' and f_orgid = '${this.$login.f.orgid}'`,
-          orderitem: 'id'
-        }
-        var data = await HttpReset.load('POST', 'rs/sql/manage_singleTable', {data: param}, {resolveMsg: null, rejectMsg: '获取设备列表失败!'})
-        for (let row of data.data) {
-          this.posEquipment.push({label: row.f_terminal_name, value: row.f_terminal_name})
-        }
-      },
-      ReadIDCard(){
-        this.$refs.highcard.sendMsg(this.$refs.highcard.CLT_MSG.READ_IDCARD, (msg) => {
-          console.log('======',msg)
-          if(msg.err !== 0){ return}
-          this.IdCardInfo=msg.strID
-        })
-        if(this.IdCardInfo) {
-          this.search()
-        }else{
-          alert("读取失败，找不到用户信息")
-        }
-      },
-      cardBtn (val) {
-        // this.clear()
-        cardBtnGen(this, val)
-      },
-      async initmeterbook(orgstr){
-        if(orgstr == null ){
-          orgstr = this.f_filialeid;
-        }
-        //获取新的抄表册,先去清理所有的抄表册
-        this.$GetSaleParam.meterbooks = [];
-        //开始加载新的抄表册
-        await this.$LoadParams.loadMeterBook(orgstr)
-        this.meterbooks = [{label: '全部', value: ''}, ...this.$GetSaleParam.getMeterBooks()]
-      },
-      async getinputtores () {
-        // 获取抄表员
-        let rs = []
-        if (this.$login.f.f_gasman.length > 0) {
-          for (let i = 0; i < this.$login.f.f_gasman.length; i++) {
-            let temp = {
-              label: this.$login.f.f_gasman[i].name,
-              value: this.$login.f.f_gasman[i].name
-            }
-            rs.push(temp)
-          }
-        }
-        this.inputtores = [{label: '全部', value: ''}, ...rs]
-      },
-       //显示附件
-      view(row){
-        this.showupload = true
-        this.selected= row
-      },
-      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.toStandardTimeString()}`);
-        let footerData = [], exportfield = this.getfield;
-        footerData.push("合计");
-        let self = this;
-        for (var field in self.sumsmodel) {
-          footerData.push(`${exportfield[field]}合计:${self.sumsmodel[field]}`);
-        }
-        this.footer.push(footerData);
-        this.other.push(otherInData);
-      },
-      async  getaddress(){
-        let HttpReset = new HttpResetClass()
-        var data = await HttpReset.load('POST', 'rs/sql/manage_getarealist', {
-          data: {
-            condition: `1=1 and s.f_orgid = '${this.$login.f.orgid}'`
-          }
-        }, {resolveMsg: null, rejectMsg: '获取小区失败!'})
-        console.log('小区',data)
-        let house = [{label: '全部', value: ''}]
-        for (let row of data.data){
-          house.push({label: row.f_residential_area, value: row.f_residential_area})
-        }
-        this.residentialArea = house
-      },
-      //把数据库查询数据转换为下拉数据
-      calculate(rows){
-        let data = []
-        rows.forEach((row, n) => {
-          data[n] = {label: row.f_residential_area, value: row.id}
-        })
-        return data
-      },
-
       search(){
-
         this.$refs.paged.$refs.cri.search()
       },
       cancel() {
@@ -983,9 +492,12 @@
       },
       userTypeChange () {
         this.gasproperties=[]
-        if(this.$refs.paged.$refs.cri.model !==null) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties=''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
+        if(this.$refs.paged.model.model !==null) {
+          this.$refs.paged.model.model.f_gasproperties=''
+
+            console.log(this.$refs.paged.model.model.f_user_type[0])
+          this.gasproperties = this.$appdata.getParam(this.$refs.paged.model.model.f_user_type[0])
+          // this.gasproperties.push({label: '全部', value: ''})
         }
         else{
           this.gasproperties =[{label: '全部', value: ''}]
@@ -1005,23 +517,10 @@
         this.prices = this.$MagGetSaleParam.getPrices();
       },
       selfSearch(args) {
-        if (this.data) {
-          this.$parent.$parent.$parent.data.startDate=this.$refs.paged.$refs.cri.model.startDate
-          this.$parent.$parent.$parent.data.endDate=this.$refs.paged.$refs.cri.model.endDate
-        }
-
         let f_orgstr = this.orgCondtionStr
         args.condition = `${args.condition} ` + f_orgstr
-        if(this.card!=''){
-            args.condition+=` and f_card_id='${this.card}'`
-        }
-        if(this.IdCardInfo!=''){
-          args.condition +=` and f_idnumber='${this.IdCardInfo}'`
-        }
         this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums;
-        this.card=''
-        this.IdCardInfo=''
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
       },
       clear() {
         //清空部门和人员
@@ -1034,11 +533,9 @@
         })
 
       },
-      dealmsg(val,startDate,endDate) {
+      dealmsg(val) {
         val.model = this.model.model
-        startDate=this.startDate1
-        endDate=this.endDate1
-        this.$dispatch('deal-msg', val,startDate,endDate)
+        this.$dispatch('deal-msg', val)
       },
       show() {
         this.criteriaShow = true
@@ -1046,120 +543,41 @@
       hidden() {
         this.criteriaShow = !this.criteriaShow
       },
-      async getRes(condition,obj) {
+      getRes(condition,obj) {
         this.orgCondtionStr = condition
-        this.orgname = obj.orgnames[0]
-        this.depname = obj.depnames[0]
-
-
       },
       async updateParams() {
         await this.$MagLoadParams.loadParam(this.f_filialeid)
-        this.inputtores = [];
-        this.inputtores.push({label: "全部", value: ""})
-        if(this.allorgid!=null){
-          this.allorgid.forEach((res)=>{
-            this.inputtores = this.inputtores.concat(this.$MagGetSaleParam.getresinputtor(res));
-          })
-        }
         this.initParams()
       },
-      sort (field, rule) {
-        // 将所有排序方式设为不排序，实现相互排斥
-        for (let key in this.orderFields) {
-          if (key === field) {
-            this.orderFields[key] = rule
-          } else {
-            this.orderFields[key] = 'no'
-          }
-        }
-        // 如果新规则不排序，还原为默认排序
-        if (rule === 'no') {
-          this.model.paramSource.orderitem = `'${this.orderitem}'`
-        } else {
-          this.model.paramSource.orderitem = `'${field} ${rule}'`
-        }
-
-        this.search()
-      }
-
-    },
-    events:{
-      'getidcard'(IdCard){
-        // console.log(param)
-        this.$refs.paged.$refs.cri.model.f_info_idnumber=IdCard.strID
-      }
     },
     watch: {
-      'model.rows'(val) {
-        //如果有合计 这里为true, 其他为false ,反正相反
-        this.showbottomsum=true;
-        if(val.length === 0){
-          this.sumsmodel = {}
-          this.showbottomsum=false;
-        }
-      },
-      'model.rows.length' () {
-        this.isSingleUser = this.model.rows
+      'model'(val) {
+        console.log(val, "12222222222222222222")
       },
-      async 'orgCondtionStr'(val) {
-        //更新抄表册
-        this.$refs.paged.$refs.cri.model.f_inputtor=[]
-        this.$refs.paged.$refs.cri.model.f_meter_book = []
-        this.meterbooks = [{label: '全部',value: ''}];
-        if(this.lastorgstr != val){
-          this.tempfalg = true;
-          this.lastorgstr = val;
-        }
-        if(this.tempfalg && val != null && val!=''  && val.indexOf("(")>-1){
-          this.tempfalg = false;
-          let a = val.substring(val.indexOf("(")+2)
-          await this.initmeterbook(a.substring(0,a.indexOf(")")-1));
-        }
+      'orgCondtionStr'(val) {
         let res = val.match(/'(.*?)'/)
         console.log('正则提取:',res && res[1])
         if (res) {
+          this.selectorg = res[1]
           this.f_filialeid = res[1]
-          if(res.input !=null){
-            let resorgid = res.input.substring(res.input.indexOf("'"));
-            if(resorgid!= null && resorgid!=''){
-              resorgid = resorgid.substring(0,resorgid.lastIndexOf("'")+1);
-             // resorgid = resorgid.replaceAll("'","");
-              resorgid = resorgid.replace(/'/g,"");
-              this.allorgid = resorgid.split(",")
-            }
-          }
           this.updateParams()
         }
-      },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
       }
     },
     computed: {
-      getstart(){
-        return `开始时间：${this.$refs.paged.$refs.cri.model.startDate} 结束时间：${this.$refs.paged.$refs.cri.model.endDate}`
-      },
-         chooserow(){
-             let aaa= true
-             if(this.$login.r && this.$login.r.includes('打印项选择')){
-                 aaa =  false
-             }
-             return aaa
-         },
       getPricenames() {
-        let f_user_type = this.$refs.paged.$refs.cri.model.f_user_type;
-        let f_gasproperties = this.$refs.paged.$refs.cri.model.f_gasproperties;
-        let pricetype = this.$refs.paged.$refs.cri.model.pricetype;
+        let f_user_type = this.$refs.paged.model.model.f_user_type;
+        let f_gasproperties = this.$refs.paged.model.model.f_gasproperties;
+        let pricetype = this.$refs.paged.model.model.pricetype;
         console.log("打印一下:",f_user_type,f_gasproperties,pricetype,this.f_filialeid,this.prices)
-        if(this.$refs.paged.$refs.cri.model !==null) {
+        if(this.$refs.paged.model.model !==null) {
           let rs = []
           let priceArr = []
-          if ( pricetype.length >0) {
+          if (f_user_type.length > 0 && f_gasproperties.length > 0 && pricetype.length >0) {
             let params = {
+              f_user_type: f_user_type[0],
+              f_gasproperties: f_gasproperties[0],
               f_price_type: pricetype[0],
               filter: this.f_filialeid,
               prices: this.prices
@@ -1174,32 +592,21 @@
           }
           if (rs.length === 0) {
             console.log('rs读出来是空')
-            this.$refs.paged.$refs.cri.model.f_price_name = ''
+            this.$refs.paged.model.model.f_price_name = ''
           }
           return rs
         }
       },
       getCondition() {
-        return {
-          startDate: this.$refs.paged.$refs.cri.model.startDate,
-          endDate: this.$refs.paged.$refs.cri.model.endDate,
-          condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr,
-          orderitem: this.orderitem?`${this.orderitem}`: " f_operate_date desc"
-        }
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
       },
       getfield() {
         return exportConfig.chargeConfig
       },
-      defaultexport() {
-          return exportConfig.chargeexportConfig
-      },
       pricetypes() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('气价类型')]
       },
 
-      invoiceType() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('发票类型查询')]
-      },
       usertypes() {
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('用户类型')]
       },
@@ -1214,22 +621,17 @@
         return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('收费类型')]
       },
       payment() {
-        return [...this.$appdata.getParam('付款方式查询')]
-      },
-      banktype() {
-        return [...this.$appdata.getParam('支付渠道查询')]
+        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('付款方式')]
       },
       charge_state() {
         return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
       },
-      bank(){
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('银行名称')]
+      bgl(){
+        return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
+      },
+      ismgq(){
+        return [{label: '全部', value: ''}, {label: '是', value: '是'}, {label: '否', value: '否'}]
       }
     }
   }
 </script>
-<style scoped>
-  .showbottom{
-    height:95%
-  }
-</style>