manage-client 3.1.24 → 3.1.25-aode

package/src/components/sale/ncpush/ncpushmanage/NCpushSummary.vue

@@ -0,0 +1,110 @@
+<template>
+  <div style="margin: 3%;height:93%;overflow-y: scroll;">
+    <!--    第一行数据-->
+    <div class="row" style="height: 50px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >开户人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_open}}</label></div>
+      <div class="col-xs-2"><label type="text" class="form-control mystylecenter font_normal_body"> 开户气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_open}}</label></div>
+      <div class="col-xs-2"><label type="text" class="form-control mystylecenter font_normal_body" >开户金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_open}}</label></div>
+    </div>
+    <div class="row" style="height: 50px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_zg}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_zg}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >再购金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_zg}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_bq}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_bq}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补气金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_bq}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_bk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡气量</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_bk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >补卡金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_bk}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >其他收费人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_othercharge}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >其他收费金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_othercharge}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >涨价补费人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_zjbf}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >涨价补费金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_zjbf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表人次</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_hb}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表气量</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_hb}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >预收款金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_ysk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >预收款人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_ysk}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >换表金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_hb}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_count_cz}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_pregas_cz}}</label></div>
+   </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >冲正金额</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_collection_cz}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务人次</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sum_count}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >业务气量</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_shouru_gas}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >实收金额</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_shouru_fee}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >应收金额</label></div><div class="col-xs-2"><label type="text"   class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_yingshou_fee}}</label></div>
+      <div class="col-xs-3"><label type="text" :title="sumsmodel.f_benqi_fee"  class="form-control mystylecenter font_normal_body" >本期新增结余</label></div><div class="col-xs-1"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_benqi_fee}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-3"><label :title="sumsmodel.f_usebenqi_fee" type="text"  class="form-control mystylecenter font_normal_body" >本期使用结余</label></div><div   class="col-xs-1"><label type="text"   class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_usebenqi_fee}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >柜台微信</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumgtwx}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >财务收款</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumcwsf}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >现金缴费</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumxjjf}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >柜台支付宝</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumzfb}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >pos</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumpos}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >销售气票</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumqp}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >银行码收款</label></div><div class="col-xs-2"><label type="text" class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumyysk}}</label></div>
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >降价补气</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumjjbq}}</label></div>
+    </div>
+    <div class="row" style="height: 60px">
+      <div class="col-xs-2"><label type="text"  class="form-control mystylecenter font_normal_body" >煤改气补贴款</label></div><div class="col-xs-2"><label type="text"  class="mystyleboder font_bold_body linelabel" >{{sumsmodel.f_sumbtk}}</label></div>
+    </div>
+  </div>
+</template>
+
+<script>
+  export default {
+    name: "DayReportSummary",
+    props: {
+      sumsmodel: {}
+    },
+    watch: {
+      sumsmodel(val){
+        console.log(val,"====================")
+      }
+    }
+  }
+</script>
+
+<style scoped>
+  .datapanel {
+    color: #333;
+    background-color: white;
+    box-shadow: darkgrey 0.5px 0.5px 0.5px 0.5px ;
+    padding: 10px 30px 10px 30px;
+    border-radius:15px;
+    width: 100%;
+  }
+  .mystyleboder{
+    border: 0px;
+    text-align: left;
+    padding-left: 3px;
+  }
+  .mystylecenter{
+    border: 0px;
+    text-align: center;
+    padding-left: 3px;
+  }
+  .linelabel{
+    line-height: 60px!important;
+  }
+</style>

package/src/components/sale/ncpush/ncrecord/pushRecordQuery.vue

@@ -0,0 +1,252 @@
+<template>
+  <div id="unit" class="flex-row" class="foot_tabset"  @keyup.enter="search">
+    <div class="basic-main">
+      <div class="flex">
+        <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>
+              <res-select-group :show-component="$parent.$parent.shouc" :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>
+                <datepicker id="startDate" placeholder="开始日期" style="width:60%"
+                            v-model="model.startDate"
+                            :value.sync="model.startDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_save_date >= '{}'">
+                </datepicker>
+              </div>
+              <div class="col-sm-2 form-group">
+                <label class="font_normal_body">结束日期</label>
+                <datepicker id="endDate" placeholder="结束日期" style="width:60%"
+                            v-model="model.endDate"
+                            :value.sync="model.endDate"
+                            :format="'yyyy-MM-dd HH:mm:ss'"
+                            :show-reset-button="true"
+                            condition="f_save_date <= '{}'">
+                </datepicker>
+              </div>
+              <div class="row">
+                <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>
+
+                  <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>
+                  <v-select :value.sync="model.f_state"
+                            v-model="model.f_state"
+                            :options='$parent.$parent.chargestate' placeholder='请选择'
+                            condition="f_state = '{}'"
+                            close-on-select></v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <data-grid :model="model" partial='list' class="list_area table_sy" v-ref:grid @dblclick="$parent.$parent.toBusiness">
+            <template partial='head'>
+              <tr>
+                <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>
+                </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'>
+              <td style="text-align: center;"><nobr>
+                <span>{{$index+1}}</span>
+              </nobr> </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operator}}</nobr>
+              </td>
+              <!--<td style="text-align: center;">-->
+              <!--<nobr>{{row.f_orgname}}</nobr>-->
+            <!--</td>-->
+              <!--<td style="text-align: center;">-->
+                <!--<nobr>{{row.f_depname}}</nobr>-->
+              <!--</td>-->
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_orgname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_depname}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.allsum}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_total_money}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_describe}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_save_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_save_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_start_date+'~'+row.f_push_end_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_push_info}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr><button @click="$parent.$parent.$parent.showpushbill(row)" class="btn btn-link">查看交账单</button></nobr>
+                <nobr><button v-show="row.f_push_state=='交账成功'" @click="$parent.$parent.$parent.showpush(row)" class="btn btn-link">查看交账用户</button></nobr>
+              </td>
+            </template>
+          </data-grid>
+        </criteria-paged>
+    </div>
+  </div>
+  </div>
+    <modal v-if="pushdatashow" :show.sync="pushdatashow" width="80%" title="查看交账用户明细" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
+        <push-data-list  :searchcondition="selectdata" ></push-data-list>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+    <modal v-if="pushdatashowbill" :show.sync="pushdatashowbill" width="80%" title="查看交账单" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body" style="height: 700px;padding: 0!important;">
+        <push-bill-data-list  :searchcondition="selectdata" ></push-bill-data-list>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+
+
+  let readySomething = async function (self) {
+    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.search();
+  }
+  export default {
+    title: '交账记录查询',
+    data() {
+      return {
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[]
+        },
+        orgCondtionStr:'',
+        condition: '1=1',
+        model: new PagedList('rs/sql/pushRecordQuery', 20),
+        //row数据
+        rowsdata: [],
+        printModel: {
+          rows: []
+        },
+        selectfields:[],
+        criteriaShow: false,
+        pushdatashow:false,
+        selectdata:{},
+        pushdatashowbill:false,
+        shouc:['company','department','operator']
+      }
+    },
+    ready() {
+      readySomething(this)
+    },
+    methods: {
+      showpushbill(row){
+        this.pushdatashowbill = true;
+        this.selectdata=row;
+      },
+      showpush(row){
+        this.pushdatashow = true;
+        this.selectdata=row;
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj;
+        if(this.orgCondtionStr !=''){
+          this.orgCondtionStr = this.orgCondtionStr.replace("f_orgid","f_push_orgid");
+          this.orgCondtionStr = this.orgCondtionStr.replace("f_depid","f_push_depid");
+        }
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search();
+        // this.model.search(this.condition, {})
+      },
+    },
+    computed:{
+      chargestate(){
+        return [{label:'全部',value:''},... this.$appdata.getParam("交账状态")];
+      }
+    }
+
+  }
+</script>
+

package/src/components/sale/ncpush/ncrecord/pushbilldatalist.vue

@@ -0,0 +1,166 @@
+<template>
+  <div   @keyup.enter="search">
+    <criteria-paged :model="model" v-ref:paged @sort="sort">
+      <criteria partial='criteria' @condition-changed='$parent.selfSearch' v-ref:cri>
+        <div novalidate class="form-horizontal select-overspread container-fluid auto" partial>
+          <div class="row" style="margin-right: 20px;margin-bottom: 10px;">
+            <div class="col-sm-8 form-group" style="margin-left: 22px;">
+              <label class="font_normal_body">交账汇总:</label>
+              <p style="height:6px;">{{$parent.$parent.searchcondition.f_push_describe}}</p>
+            </div>
+            <div class="button-range" style="float:right;margin-top:10px">
+              <button class="button_search button_spacing" @click="search()">查询</button>
+            </div>
+          </div>
+        </div>
+      </criteria>
+      <data-grid  :model="model" partial='list' class="list_area table_sy" v-ref:grid >
+        <template partial='head'>
+          <tr>
+            <th>
+              <data-order field="f_inoutbusi" name="收支项目"></data-order>
+            </th>
+            <th>
+              <data-order field="f_customer" name="客户编号"></data-order>
+            </th>
+            <th><data-order field="f_user_name" name="客户姓名"></data-order>
+            </th>
+            <th><data-order field="f_payment" name="结算方式"></data-order></th>
+            <th><data-order field="f_payment" name="笔数"></data-order>
+            </th>
+            <th><data-order field="f_sum_pregas" name="气量"></data-order>
+            </th>
+            <th>
+              <data-order field="f_sum_money" name="金额"></data-order>
+            </th>
+            <th>
+              <data-order field="f_payment_accounts_id" name="账户"></data-order>
+            </th>
+          </tr>
+        </template>
+        <template partial='body' >
+          <td style="text-align: center;" ><nobr>{{row.f_inoutbusi}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_customer}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_user_name}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_payment}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_push_count}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_sum_pregas}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_sum_money}}</nobr></td>
+          <td style="text-align: center;" ><nobr>{{row.f_pay_accounts}}</nobr></td>
+        </template>
+      </data-grid>
+    </criteria-paged>
+  </div>
+</template>
+
+<script>
+  import { PagedList } from 'vue-client'
+
+  export default {
+    title: '交账详细记录',
+    props: {
+      style: {
+        type: String,
+        default: 'col-sm-2 form-group'
+      },
+    },
+    data() {
+      return {
+        orderDefault: "'f_operate_date'",
+        orderFields: {
+          f_userinfo_code: 'no'
+        },
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[this.$login.f.depids],
+          user:[this.$login.f.id]
+        },
+        model: new PagedList('rs/sql/pushuserdetailQuery', 30, {orderitem: "'f_operate_date'"}),
+        listpage:false,
+        rowdata: {},
+        orgCondtionStr: '',
+        userTypes: [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')],
+      count: 0,
+      printshow: false,
+        all: false,
+        orgname: '',
+        depname: '',
+        criteriaShow: false,
+        operates: [{label: '全部', value: ''}, {label: '发卡售气', value: "发卡售气"},{label: '卡表收费', value: "卡表收费"},{label: '补气', value: "补气"},{label: '补卡', value: "补卡"},{label: '换表', value: "换表"},{label: '冲正', value: "冲正"}],
+        stateoptions:[{label: '全部', value: ''}, {label: '有效', value: "有效"},{label: '撤销', value: "撤销"},{label: '无效', value: "无效"},{label: '冲正', value: "冲正"}],
+        hasapps: [{label: '包含APP', value: ''}, {label: '不包含APP', value: "!= '悦生活'"}],
+        useroptions:[{label: ' 全部 ', value: ''},...this.$appdata.getParam('用气性质')],
+      selectfields:[],
+        pushncshow:false,
+        pushncshow2:false,
+        newsearchCondition:{},
+        pushid:''
+    }
+    },
+    props:['searchcondition'],
+    ready() {
+      //数据转化
+      if(this.searchcondition.id !=null && this.searchcondition!=''){
+        this.pushid = this.searchcondition.id;
+      }
+    },
+    methods: {
+      showmsg(obj){
+        this.criteriaShow = false
+        this.$emit('close')
+        this.rowdata=obj
+        this.listpage=true
+      },
+      cancel() {
+        this.listpage = false
+      },
+      search() {
+        this.$refs.paged.$refs.cri.search()
+      },
+      async selfSearch(args) {
+        args.condition =  `${args.condition} and f_pushrecord_id = '${this.pushid}'`;
+        await this.model.search(args.condition,args.model)
+  },
+  close() {
+    this.printshow = false
+  },
+  show() {
+    this.pushncshow2 = !this.pushncshow2;
+    this.criteriaShow = !this.criteriaShow
+    if (this.criteriaShow) {
+      this.$emit('show')
+    } else {
+      this.$emit('close')
+    }
+  },
+  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.orderDefault}'`
+    } else {
+      this.model.paramSource.orderitem = `'${field} ${rule}'`
+    }
+    this.search()
+  }
+  }
+  }
+</script>
+
+<style scoped>
+
+  .col {
+    width: 300px;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+</style>