manage-client 3.2.22 → 3.2.24-aode

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

@@ -1,619 +1,406 @@
-<template>
-  <div id="unit" class="flex-row">
-    <div class="basic-main" @keyup.enter="search">
-      <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">
-                <div class="col-sm-2 form-group">
-                  <label for="startDate" 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_operate_date >= '{}'">
-                  </datepicker>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label for="endDate" 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_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" @click="search()">查询</button>
-                  <button class="button_clear button_spacing" @click="$parent.$parent.clear()">清空</button>
-                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
-
-                  <export-excel :data="$parent.$parent.getCondition" :footer="$parent.$parent.footer"
-                                :field="$parent.$parent.getfield" :header="$parent.$parent.other"
-                                sqlurl="rs/logic/exportfile" sql-name="otherChargeQuery" 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="其他收费记录"
-                              :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 :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.f_address"
-                         condition="f_address like '%{}%'" placeholder='客户地址'>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">收费类型</label>
-                  <v-select v-model="model.f_brand_spec"
-                            placeholder='请选择'
-                            condition="f_brand_spec in {}"
-                            :value.sync="model.f_brand_spec" multiple
-                            :options='$parent.$parent.chargetype'
-                            @change="$parent.$parent.setTypename"
-                            close-on-select clear-button></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">品名规格</label>
-                  <v-select v-model="model.f_typename"
-                            placeholder='请选择'
-                            condition="f_typename in {}"
-                            :value.sync="model.f_typename" multiple
-                            :options='$parent.$parent.typeNameList'
-                            @change="$parent.$parent.setTypenumber"
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">型&emsp;&emsp;号</label>
-                  <v-select v-model="model.f_typenumber"
-                            placeholder='请选择'
-                            condition="f_typenumber = '{}'"
-                            :value.sync="model.f_typenumber"
-                            :options='$parent.$parent.typenumberList'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用户类型</label>
-                  <v-select id="f_user_type"
-                            v-model="model.f_user_type"
-                            placeholder='请选择'
-                            condition="f_user_type ='{}'"
-                            :value.sync="model.f_user_type"
-                            @change="$parent.$parent.userTypeChange(model.f_user_type)"
-                            :options='$parent.$parent.userTypes'
-                            close-on-select clear-button></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">用气性质</label>
-                  <v-select id="f_gasproperties"
-                            v-model="model.f_gasproperties"
-                            placeholder='请选择'
-                            condition="f_gasproperties ='{}'"
-                            :value.sync="model.f_gasproperties"
-                            :options='$parent.$parent.gasproperties'
-                            close-on-select clear-button></v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">收费状态</label>
-                  <v-select id="f_state"
-                            v-model="model.f_state"
-                            placeholder='请选择'
-                            condition="f_state in {}"
-                            multiple="true"
-                            :value.sync="model.f_state"
-                            :options='$parent.$parent.chargeState'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
-
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">付款方式</label>
-                  <v-select id="f_payment"
-                            v-model="model.f_payment"
-                            placeholder='请选择'
-                            condition="f_payment in {}"
-                            multiple="true"
-                            :value.sync="model.f_payment"
-                            :options='$parent.$parent.payments'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">服务人员</label>
-                  <v-select id="f_service_person"
-                            v-model="model.f_service_person"
-                            placeholder='请选择'
-                            condition="f_service_person ='{}'"
-                            :value.sync="model.f_service_person"
-                            :options='$parent.$parent.service_person'
-                            close-on-select clear-button>
-                  </v-select>
-                </div>
-                <div class="col-sm-2 form-group">
-                  <label class="font_normal_body">气表类型</label>
-                  <v-select :value.sync="model.f_meter_classify" multiple
-                            :options='$parent.$parent.metertypes' placeholder='请选择' v-model="model.f_meter_classify"
-                            condition="f_meter_classify 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_meter_brand" multiple
-                            v-model="model.f_meter_brand"
-                            :options='$parent.$parent.meterbrands' placeholder='请选择'
-                            condition="f_meter_brand in {}"
-                            close-on-select></v-select>
-                </div>
-              </div>
-            </div>
-          </criteria>
-
-          <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>
-                </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>
-                <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 @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.id}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <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_user_phone}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_classify}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_meter_brand}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_card_id}}</nobr>
-              </td>
-
-              <td style="text-align: center;">
-                <nobr>{{row.f_bill_number}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_brand_spec}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_typename}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_typenumber}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_unitprice}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_number}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_money}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_payment}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_state}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_operate_date}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_service_person}}</nobr>
-              </td>
-              <td style="text-align: center;">
-                <nobr>{{row.f_comments}}</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>
-              <button class="button_search button_spacing width-60" @click.stop="$parent.$parent.$parent.view(row)">查看</button>
-            </nobr></td>
-              <!--<td style="text-align: center;">-->
-                <!--<button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>-->
-              <!--</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">
-              收款合计:&emsp;{{sumsmodel.f_money}}
-            </td>
-          </tr>
-        </table>
-
-      </div>
-      <div class="flex" v-if="show">
-        <user-info-detail-manage-new :f_userinfo_id="rowdata.f_userinfo_id" @cancel-main="cancel"></user-info-detail-manage-new>
-      </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" 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>
-
-    <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
-      <article slot="modal-body" class="modal-body">
-        <other-charge-detail-query :otherchargeid="otherchargeid" ></other-charge-detail-query>
-      </article>
-      <footer slot="modal-footer" class="modal-footer">
-      </footer>
-    </modal>
-
-</template>
-
-<script>
-  import {PagedList} from 'vue-client'
-  import defaultPrint from '../config/DefaultPrint'
-  import exportConfig from '../config/exportConfig'
-  import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
-
-  let readySomething = async function (self) {
-    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.startDate = self.$login.toStandardDateString() + ' 00:00:00'
-    // self.$refs.paged.$refs.cri.model.endDate = self.$login.toStandardDateString() + ' 23:59:59'
-    // await 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
-  }
-  export default {
-    components: {
-      OtherChargeDetailQuery
-    },
-    props:['data'],
-    title: '其他收费查询',
-    data() {
-      return {
-        data: {},
-        other:[],
-        footer:[],
-        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_money: 0}),
-        criteriaShow: false,
-        orgCondtionStr: '',
-        modelval: [],
-        printshow: false,
-        all: false,
-        fields: {},
-        config: {
-          defaultPrint: ['f_userinfo_code', 'f_user_name', 'f_brand_spec', 'f_typename', 'f_typenumber', 'f_unitprice', 'f_number', 'f_money','f_operate_date', 'f_operator']
-        },
-        //默认打印列
-        defaultfield: [],
-        thead: '',
-        tfoot: '',
-        initres: {
-          org:[this.$login.f.orgid],
-          dep:[],
-          user:[],
-        },
-        show:false,
-        showdetail:false,
-        otherchargeid:'',
-        rowdata:{},
-        meterbrands: [],
-        //合计数据
-        sumsmodel: {},
-        showupload:false,
-        selected:{},
-        // 用气性质
-        gasproperties: [],
-        // 品名规格
-        typeNameList: [],
-        // 型号
-        typenumberList: []
-      }
-    },
-    ready() {
-      readySomething(this).then(() => {
-        this.$emit('ready')
-      }).catch((error) => {
-        this.$emit('error', error)
-      })
-    },
-    methods: {
-      view(row){
-        this.showupload = true
-        this.selected= row
-      },
-      initParams() {
-        // 初始化气表品牌
-        let brandArr = []
-        this.$MagGetSaleParam.getGasbrand().forEach((item) => {
-          let temp = {}
-          temp.label = item.label
-          temp.value = item.value.f_meter_brand
-          brandArr.push(temp)
-        })
-        this.meterbrands = [{label: '全部', value: ''}, ...brandArr]
-      },
-      getotherfooter(){
-        // this.$refs.paged.$refs.cri.$refs.exports.otherData=[];
-        // this.$refs.paged.$refs.cri.$refs.exports.footerData=[];
-        this.other=[];
-        this.footer=[];
-        let exportdata = this.getCondition;
-        let otherInData=[];
-        otherInData.push(`导出时间: ${this.$login.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);
-      },
-      search(){
-        this.$refs.paged.$refs.cri.search()
-      },
-      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
-        }
-        args.condition = `${args.condition}` + this.orgCondtionStr
-        this.model.search(args.condition, args.model)
-        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
-      },
-      clear() {
-        //清空部门和人员
-        this.$refs.paged.$refs.cri.$refs.sel.$children[1].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
-        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
-          this.$refs.paged.$refs.cri.model[key] = []
-        })
-      },
-      show() {
-        this.criteriaShow = true
-      },
-      hidden() {
-        this.criteriaShow = !this.criteriaShow
-      },
-      getRes(obj) {
-        this.orgCondtionStr = obj
-      },
-      cancel() {
-        this.show = false
-      },
-      dealmsg(val) {
-        console.log('---------------dealmsg')
-        this.rowdata=val
-        this.show=true
-        val.model = this.model.model
-        this.$dispatch('deal-msg', val)
-      },
-      stamp() {
-        this.all = false
-        //默认选择要打印的列
-        this.modelval = defaultPrint.config
-        this.fields = this.getfield
-        console.log('所有打印字段', this.fields)
-        this.printshow = true
-        this.put()
-      },
-      put() {
-        // 对Modelval进行排序
-        this.sortModelval()
-        this.thead = `<tr><th colspan=${this.modelval.length}>其他收费查询统计报表</th></tr><tr>`
-        for (let key of this.modelval) {
-          this.thead += '<th>' + this.fields[key] + '</th>'
-        }
-        this.thead += '</tr>'
-      },
-      print() {
-        this.$refs.print.PrintAsFile()
-        this.printshow = false
-      },
-      close() {
-        this.printshow = false
-        this.all = false
-      },
-      // 对选择的列进行排序
-      sortModelval() {
-        let sortModel = []
-        Object.keys(this.fields).forEach((key) => {
-          if (this.modelval.includes(key)) {
-            sortModel.push(key)
-          }
-        })
-        this.modelval = sortModel
-        console.log('选择的打印的字段', this.modelval)
-      },
-      showchargedetail(row){
-        this.showdetail=true
-        this.otherchargeid=row.id
-      },
-      userTypeChange (f_user_type) {
-        this.gasproperties = []
-        if (f_user_type) {
-          this.$refs.paged.$refs.cri.model.f_gasproperties = ''
-          this.gasproperties = this.$appdata.getParam(this.$refs.paged.$refs.cri.model.f_user_type[0])
-        } else {
-          this.gasproperties = [{label: '全部', value: ''}]
-        }
-      },
-      setTypename (val) {
-        this.typenumberList = []
-        this.typeNameList = this.$appdata.getParam(val)
-      },
-      setTypenumber (val) {
-        this.typenumberList = this.$appdata.getParam(val)
-      }
-    },
-    watch: {
-      'all'(val) {
-        if (val) {
-          this.modelval = this.bodyData
-        } else {
-          this.modelval = defaultPrint.config
-          this.put()
-        }
-      },
-      'modelval.length'() {
-        this.put()
-      },
-      sumsmodel:{
-        handler: function(val) {
-          this.getotherfooter();
-        },
-        deep: true
-      }
-    },
-    computed: {
-      getCondition() {
-        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
-      },
-      service_person() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
-      },
-      getfield() {
-        return exportConfig.otherchargeConfig
-      },
-      chargetype() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('品名及规格')]
-      },
-      userTypes() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('用户类型')]
-      },
-      chargeState() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
-      },
-      metertypes() {
-        return [{label: ' 全部 ', value: ''}, ...this.$appdata.getParam('气表类型')]
-      },
-      payments() {
-        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
-      }
-    }
-  }
-</script>
+<template>
+  <div id="unit" class="flex-row">
+    <div class="basic-main" @keyup.enter="search">
+      <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">
+                <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 for="startDate" 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_operate_date >= '{}'">
+                  </datepicker>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label for="endDate" 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_operate_date <= '{}'">
+                  </datepicker>
+                </div>
+                <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>
+                  <!--<button class="btn btn-default" @click="$parent.$parent.stamp()">打印</button>-->
+
+                  <export-excel :data="$parent.$parent.getCondition" :defaultselect="$parent.$parent.selectfields"
+                                :field="$parent.$parent.getfield"
+                                sqlurl="rs/logic/exportfile" sql-name="otherChargeQuery" template-name='其他收费查询导出'
+                                :choose-col="true"></export-excel>
+
+                  <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>
+              <res-select-group :initres="$parent.$parent.initres"  @re-res="$parent.$parent.getRes" v-ref:sel></res-select-group>
+              <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_address"
+                         condition="f_address like '%{}%'" placeholder='客户地址'>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费类型</label>
+                  <v-select id="f_type"
+                            v-model="model.f_brand_spec"
+                            placeholder='请选择'
+                            condition="f_type ='{}'"
+                            :value.sync="model.f_type"
+                            :options='$parent.$parent.chargetype'
+                            close-on-select clear-button></v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">收费状态</label>
+                  <v-select id="f_state"
+                            v-model="model.f_state"
+                            placeholder='请选择'
+                            condition="f_state ='{}'"
+                            :value.sync="model.f_state"
+                            :options='$parent.$parent.chargeState'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">付款方式</label>
+                  <v-select id="f_payment"
+                            v-model="model.f_payment"
+                            placeholder='请选择'
+                            condition="f_payment ='{}'"
+                            :value.sync="model.f_payment"
+                            :options='$parent.$parent.payments'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+                <div class="col-sm-2 form-group">
+                  <label class="font_normal_body">服务人员</label>
+                  <v-select id="f_service_person"
+                            v-model="model.f_service_person"
+                            placeholder='请选择'
+                            condition="f_service_person ='{}'"
+                            :value.sync="model.f_service_person"
+                            :options='$parent.$parent.service_person'
+                            close-on-select clear-button>
+                  </v-select>
+                </div>
+              </div>
+            </div>
+          </criteria>
+
+          <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>
+                </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 @click="$parent.$parent.$parent.dealmsg(row)"><a>{{row.f_userinfo_code}}</a></span></nobr>
+              </td>
+              <td style="text-align: center;">
+                <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_collection}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_payment}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_state}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_operate_date}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_service_person}}</nobr>
+              </td>
+              <td style="text-align: center;">
+                <nobr>{{row.f_comments}}</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;">
+                <button class="btn btn-link" @click.stop="$parent.$parent.$parent.showchargedetail(row)">查看</button>
+              </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">
+              收款合计:&emsp;{{sumsmodel.f_collection}}
+            </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>
+  </div>
+
+    <modal v-if="showdetail" :show.sync="showdetail" title="详细记录" v-ref:modal large backdrop="false">
+      <article slot="modal-body" class="modal-body">
+        <other-charge-detail-query :otherchargeid="otherchargeid" ></other-charge-detail-query>
+      </article>
+      <footer slot="modal-footer" class="modal-footer">
+      </footer>
+    </modal>
+
+</template>
+
+<script>
+  import {PagedList} from 'vue-client'
+  import defaultPrint from '../config/DefaultPrint'
+  import exportConfig from '../config/exportConfig'
+  import OtherChargeDetailQuery from "./OtherChargeDetailQuery";
+
+  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'
+    // await self.$refs.paged.$refs.cri.search()
+    await self.$MagLoadParams.loadParam()
+
+    self.sumsmodel = self.$refs.paged.$refs.grid.model.sums
+  }
+  export default {
+    components: {
+      OtherChargeDetailQuery
+    },
+    data() {
+      return {
+        selectfields:[],
+        data: {},
+        model: new PagedList('rs/sql/otherChargeQuery', 20, {}, {f_collection: 0}),
+        criteriaShow: false,
+        orgCondtionStr: '',
+        modelval: [],
+        printshow: false,
+        all: false,
+        fields: {},
+        thead: '',
+        tfoot: '',
+        initres: {
+          org:[this.$login.f.orgid],
+          dep:[],
+          user:[],
+        },
+        show:false,
+        showdetail:false,
+        otherchargeid:'',
+        rowdata:{},
+        //合计数据
+        sumsmodel: {}
+      }
+    },
+    props:['selectorg'],
+    ready() {
+      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.dataReportConfig){
+        this.selectfields.push(item)
+      }
+    },
+    methods: {
+      search(){
+        this.$refs.paged.$refs.cri.search()
+      },
+      selfSearch(args) {
+        args.condition = `${args.condition}` + this.orgCondtionStr
+        this.model.search(args.condition, args.model)
+        this.sumsmodel = this.$refs.paged.$refs.grid.model.sums
+      },
+      clear() {
+        //清空部门和人员
+        this.$refs.paged.$refs.cri.$refs.sel.$children[1].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
+        Object.keys(this.$refs.paged.$refs.cri.model).forEach((key) => {
+          this.$refs.paged.$refs.cri.model[key] = ''
+        })
+      },
+      show() {
+        this.criteriaShow = true
+      },
+      hidden() {
+        this.criteriaShow = !this.criteriaShow
+      },
+      getRes(obj) {
+        this.orgCondtionStr = obj
+      },
+      cancel() {
+        this.show = false
+      },
+      dealmsg(val) {
+        console.log('---------------dealmsg')
+        this.rowdata=val
+        this.show=true
+        val.model = this.model.model
+        this.$dispatch('deal-msg', val)
+      },
+      stamp() {
+        this.all = false
+        //默认选择要打印的列
+        this.modelval = defaultPrint.config
+        this.fields = this.getfield
+        console.log('所有打印字段', this.fields)
+        this.printshow = true
+        this.put()
+      },
+      put() {
+        // 对Modelval进行排序
+        this.sortModelval()
+        this.thead = `<tr><th colspan=${this.modelval.length}>其他收费查询统计报表</th></tr><tr>`
+        for (let key of this.modelval) {
+          this.thead += '<th>' + this.fields[key] + '</th>'
+        }
+        this.thead += '</tr>'
+      },
+      print() {
+        this.$refs.print.PrintAsFile()
+        this.printshow = false
+      },
+      close() {
+        this.printshow = false
+        this.all = false
+      },
+      // 对选择的列进行排序
+      sortModelval() {
+        let sortModel = []
+        Object.keys(this.fields).forEach((key) => {
+          if (this.modelval.includes(key)) {
+            sortModel.push(key)
+          }
+        })
+        this.modelval = sortModel
+        console.log('选择的打印的字段', this.modelval)
+      },
+      showchargedetail(row){
+        this.showdetail=true
+        this.otherchargeid=row.id
+      }
+    },
+    watch: {
+      'all'(val) {
+        if (val) {
+          this.modelval = this.bodyData
+        } else {
+          this.modelval = defaultPrint.config
+          this.put()
+        }
+      },
+      'modelval.length'() {
+        this.put()
+      },
+      'orgCondtionStr'(val) {
+        let res = val.match(/'(.*?)'/)
+        console.log('正则提取:',res && res[1])
+        if (res) {
+          this.selectorg = res[1]
+        }
+      }
+    },
+    computed: {
+      getCondition() {
+        return {condition: `${this.$refs.paged.$refs.cri.condition}` + this.orgCondtionStr}
+      },
+      service_person() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('服务人员')]
+      },
+      getfield() {
+        return exportConfig.otherchargeConfig
+      },
+      chargetype() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('品名及规格')]
+      },
+      chargeState() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('收费状态')]
+      },
+      payments() {
+        return [{label: '全部', value: ''}, ...this.$appdata.getParam('付款方式')]
+      }
+    }
+  }
+</script>